@@ -69,9 +69,11 @@ class WeinanlieferungSlotsListModuleController extends AbstractFrontendModuleCon

             // Support unit-prefixed values like "u1-16" (unit-specific) and legacy "u-16". Both resolve to numeric capacity 16 for SQL.

             $filterNumeric = null;

-            if (preg_match('/^u\d+-(\d+)$/', $filterRaw, $m)) {

+            $filterUnitId = null;

+            if (preg_match('/^u(\d+)-(\d+)$/', $filterRaw, $m)) {

                 // New format: u<unitId>-<capacity>

-                $filterNumeric = (int) $m[1];

+                $filterUnitId = (int) $m[1];

+                $filterNumeric = (int) $m[2];

             } elseif (preg_match('/^u-(\d+)$/', $filterRaw, $m)) {

                 // Legacy format kept for backward compatibility: u-<capacity>

                 $filterNumeric = (int) $m[1];

@@ -79,8 +81,16 @@ class WeinanlieferungSlotsListModuleController extends AbstractFrontendModuleCon

                 $filterNumeric = (int) $filterRaw;

             }

+            // Capacity availability condition

             $arrOptions['column'][] = '(SELECT tl_vr_wa_slot.behaelter - IFNULL(SUM(tl_vr_wa_reservation.behaelter),0) FROM tl_vr_wa_reservation WHERE tl_vr_wa_reservation.pid = tl_vr_wa_slot.id) >= ?';

             $arrOptions['value'][] = $filterNumeric;

+

+            // If a specific unit was selected (new format), restrict slots to Standorte that have this unit enabled

+            if ($filterUnitId !== null) {

+                // units is a serialized array, match serialized occurrence of the unit id

+                $arrOptions['column'][] = 'pid IN (SELECT id FROM tl_vr_wa_standort WHERE units REGEXP ?)';

+                $arrOptions['value'][] = 's:[0-9]+:"' . $filterUnitId . '"';

+            }

         }

         if (!empty($_GET['filter_standort']))

         {

@@ -209,10 +219,49 @@ class WeinanlieferungSlotsListModuleController extends AbstractFrontendModuleCon

                 }

             }

-            // Append unit options at the bottom, without exceeding max capacity and only for allowed units

+            // Build a map of units enabled per shown Standort and compute per-unit max available capacity across shown slots

+            $unitsPerStandort = [];

+            $unitMaxAvailable = [];

+            if (!empty($shownStandortIds)) {

+                if (($ShownStandorte = WeinanlieferungStandortModel::findBy(["id IN (" . implode(',', $shownStandortIds) . ")"], null)) !== null) {

+                    foreach ($ShownStandorte as $ShownStandort) {

+                        $sid = (int) $ShownStandort->id;

+                        $ids = \Contao\StringUtil::deserialize($ShownStandort->units, true);

+                        if (!empty($ids)) {

+                            foreach ($ids as $uid) {

+                                $uid = (int) $uid;

+                                $unitsPerStandort[$sid][$uid] = true;

+                                // initialize unit max availability bucket

+                                if (!isset($unitMaxAvailable[$uid])) {

+                                    $unitMaxAvailable[$uid] = 0;

+                                }

+                            }

+                        }

+                    }

+                }

+            }

+

+            // Iterate the shown slots and, for each, update max available for the units enabled at that slot's Standort

+            if (!empty($unitsPerStandort) && !empty($slotIds)) {

+                foreach ($slots as $slot) {

+                    $sid = (int) $slot->pid;

+                    if (empty($unitsPerStandort[$sid])) {

+                        continue;

+                    }

+                    $available = max(0, (int) $slot->getAvailableBehaelter());

+                    foreach ($unitsPerStandort[$sid] as $uid => $_true) {

+                        if ($available > ($unitMaxAvailable[$uid] ?? 0)) {

+                            $unitMaxAvailable[$uid] = $available;

+                        }

+                    }

+                }

+            }

+

+            // Append unit options at the bottom, without exceeding per-unit max availability and only for allowed units

             if (!empty($allowedUnitIds) && ($Units = WeinanlieferungUnitsModel::findAll()) !== null) {

                 foreach ($Units as $unit) {

-                    if (empty($allowedUnitIds[(int)$unit->id])) {

+                    $unitId = (int) $unit->id;

+                    if (empty($allowedUnitIds[$unitId])) {

                         continue; // this unit is not enabled on any shown standort

                     }

@@ -222,14 +271,18 @@ class WeinanlieferungSlotsListModuleController extends AbstractFrontendModuleCon

                     }

                     $unitName = $unit->description ?: $unit->title; // visible unit name

-                    $multiplierMax = intdiv($max, $unitContainers);

+                    $unitCap = (int) ($unitMaxAvailable[$unitId] ?? 0);

+                    $multiplierMax = intdiv($unitCap, $unitContainers);

+                    if ($multiplierMax <= 0) {

+                        continue; // nothing available for this unit across shown slots

+                    }

                     for ($m = 1; $m <= $multiplierMax; $m++) {

                         $value = (string) ($m * $unitContainers);

                         $label = $m . ' ' . $unitName;

                         $options[] = [

-                            'value' => 'u' . $unit->id . '-' . $value,

+                            'value' => 'u' . $unitId . '-' . $value,

                             'label' => $label,

                         ];

                     }