@@ -67,7 +67,7 @@

                             <select id="res-behaelter" name="behaelter" required>

                                 <option value="">-</option>

                                 {% for option in buchen.behaelter %}

-                                    {% if option > slot.behaelter %}

+                                    {% if option > slot.behaelterAvailable %}

                                         <option value="{{ option }}"{{ buchung.amount == option ? ' selected' : '' }}>{{ option }} ({{ 'MSC.wa_overbooking'|trans([], 'contao_default') }})</option>

                                     {% else %}

                                         <option value="{{ option }}"{{ buchung.amount == option ? ' selected' : '' }}>{{ option }}</option>

@@ -298,6 +298,7 @@ class SlotAjaxController extends AbstractController

         $intAvailableBehaelter = max(0,$Slot->getAvailableBehaelter());

         $intBookableBehaelter = $Slot->getAvailableBehaelter() + $Slot->getOvercapacityBehaelter();

+        $intUnitAmount = $intBookableBehaelter+$Booking->behaelter;

         $arrUnits = [];

         if (($Site = $Slot->getRelated('pid')) !== null)

@@ -310,6 +311,16 @@ class SlotAjaxController extends AbstractController

                 }

             }

+            if ($Booking->unit > 0 && \in_array($Booking->unit, array_keys($arrUnits)))

+            {

+                if (($Unit = WeinanlieferungUnitsModel::findByPk($Booking->unit)) === null)

+                {

+                    return new Response('Could not load unit data', 500);

+                }

+

+                $intUnitAmount = floor($intUnitAmount / max(1, $Unit->containers));

+            }

+

         }

         $arrData = array_merge($arrData,[

@@ -317,13 +328,13 @@ class SlotAjaxController extends AbstractController

             'id'       => $Booking->id,

             'slot'     => array_merge($Slot->row(),[

                 'anmerkungen' => $insertTagService->replace($Slot->anmerkungen ?? ''),

-                'behaelterAvailable' => $intAvailableBehaelter,

+                'behaelterAvailable' => $intAvailableBehaelter + $Booking->behaelter,

             ]),

             'buchung' => $Booking->row(),

             'standort' => $Slot->getRelated('pid'),

             'buchen' => [

                 'buchbar' => (boolean) $intBookableBehaelter,

-                'behaelter' => range(min($intBookableBehaelter,1),$intBookableBehaelter+$Booking->behaelter),

+                'behaelter' => $intUnitAmount ? range(1,$intUnitAmount) : [],

                 'units' => $arrUnits,

             ]

         ]);

@@ -556,7 +567,6 @@ class SlotAjaxController extends AbstractController

     protected function renderAvailableUnitAmount(): Response

     {

-        // Todo: Respect the overcapacity feature

         if (empty($_REQUEST['id']))

         {

             return new Response('Required parameter missing',412);

@@ -569,6 +579,11 @@ class SlotAjaxController extends AbstractController

         $intAvailableBehaelter = max(0,$Slot->getAvailableBehaelter());

         $intAmount = $intAvailableBehaelter;

+        if ($intAvailableBehaelter > 0)

+        {

+            $intOvercapacityBehaelter = $Slot->getOvercapacityBehaelter();

+            $intAmount += $intOvercapacityBehaelter;

+        }

         if (!empty($_REQUEST['unit']) && intval($_REQUEST['unit']) > 0)

         {

@@ -584,7 +599,12 @@ class SlotAjaxController extends AbstractController

 <option value=\"\">-</option>\n";

         for ($i = 1; $i <= $intAmount; $i++)

         {

-            $strOutput .= "<option value=\"$i\">$i</option>\n";

+            if ($intAvailableBehaelter < $i)

+            {

+                $strOutput .= "<option value=\"$i\">$i (".$this->translator->trans('MSC.wa_overbooking',[], 'contao_default').")</option>\n";

+            } else {

+                $strOutput .= "<option value=\"$i\">$i</option>\n";

+            }

         }

         $strOutput .= "</select>\n";

@@ -593,7 +613,6 @@ class SlotAjaxController extends AbstractController

     protected function renderAvailableBookingUnitAmount(): Response

     {

-        // Todo: Respect the overcapacity feature

         if (empty($_REQUEST['id']))

         {

             return new Response('Required parameter missing',412);

@@ -606,6 +625,11 @@ class SlotAjaxController extends AbstractController

         $intAvailableBehaelter = max(0,$Slot->getAvailableBehaelter())+$Reservation->behaelter;

         $intAmount = $intAvailableBehaelter;

+        if ($intAvailableBehaelter > 0)

+        {

+            $intOvercapacityBehaelter = $Slot->getOvercapacityBehaelter();

+            $intAmount += $intOvercapacityBehaelter;

+        }

         if (!empty($_REQUEST['unit']) && intval($_REQUEST['unit']) > 0)

         {

@@ -621,7 +645,12 @@ class SlotAjaxController extends AbstractController

 <option value=\"\">-</option>\n";

         for ($i = 1; $i <= $intAmount; $i++)

         {

-            $strOutput .= "<option value=\"$i\">$i</option>\n";

+            if ($intAvailableBehaelter < $i)

+            {

+                $strOutput .= "<option value=\"$i\">$i (".$this->translator->trans('MSC.wa_overbooking',[], 'contao_default').")</option>\n";

+            } else {

+                $strOutput .= "<option value=\"$i\">$i</option>\n";

+            }

         }

         $strOutput .= "</select>\n";

@@ -146,11 +146,28 @@ class WeinanlieferungSlotsModel extends Model

             $intReserved += $intOffset;

         }

-        return (int) $this->behaelter + $intOvercapacity - $intReserved;

+        return (int) max(0,$this->behaelter + $intOvercapacity - $intReserved);

     }

-    public function getOvercapacityBehaelter()

+    public function getOvercapacityBehaelter(bool $blnGross=false)

     {

-        return round($this->behaelter/100*$this->overcapacity);

+        $intOvercapacity = round($this->behaelter/100*$this->overcapacity);

+

+        if ($blnGross)

+        {

+            return $intOvercapacity;

+        }

+

+        /** @var Connection $db */

+        $db = Controller::getContainer()->get('database_connection');

+

+        $ReservedBehaelter = $db->prepare("SELECT SUM(behaelter) FROM tl_vr_wa_reservation WHERE pid = ?")

+            ->executeQuery([$this->id]);

+

+        $intReserved = $ReservedBehaelter->fetchOne();

+

+        $intAmount = min($intOvercapacity,$this->behaelter+$intOvercapacity-$intReserved);

+

+        return $intAmount;

     }

 }