@@ -223,8 +223,8 @@ class SlotAjaxController extends AbstractController

             'lage' => $arrLage,

             'ernteart' => $arrErnteart,

             'buchen' => [

-                'buchbar' => (boolean) ($Slot->behaelter*3 > $intReservedBehaelter),

-                'behaelter' => range(min($intAvailableBehaelter,1),$Slot->behaelter*3-$intReservedBehaelter),

+                'buchbar' => (boolean) ($Slot->behaelter*1.5 > $intReservedBehaelter),

+                'behaelter' => range(min($intAvailableBehaelter,1),$Slot->behaelter*1.5-$intReservedBehaelter),

                 'units' => $this->getAvailableUnitsForCapacity($intAvailableBehaelter),

                 'sorten' => $arrSorten,

                 'lage' => $arrLage,

@@ -457,7 +457,7 @@ class SlotAjaxController extends AbstractController

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

             'buchen' => [

                 'buchbar' => (boolean) $intAvailableBehaelter,

-                'behaelter' => range(min($intAvailableBehaelter,1),$Slot->behaelter*3-$Slot->getReservedBehaelter()+$Booking->behaelter),

+                'behaelter' => range(min($intAvailableBehaelter,1),$Slot->behaelter*1.5-$Slot->getReservedBehaelter()+$Booking->behaelter),

                 'units' => $this->getAvailableUnitsForCapacity($intAvailableBehaelter),

                 'sorten' => $arrSortenAvailable,

                 'ernteart' => $arrErnteartAvailable,

@@ -504,19 +504,23 @@ class SlotAjaxController extends AbstractController

             return new Response('Missing parameter',412);

         }

+        // recompute the base units

+        $unitId = (int) Input::post('unit_id');

+        $unitAmount = (int) Input::post('unit_amount');

+        $multiplier = 1;

+        if ($unitId > 0) {

+            if (($u = WeinanlieferungUnitModel::findByPk($unitId)) !== null) {

+                $multiplier = max(1, (int) $u->multiplier);

+            }

+        }

+

+        $intBehaelter = $unitAmount > 0 ? $unitAmount * $multiplier : (int) Input::post('behaelter');

+

         // Form validation and unit capacity

         if (($Slot = WeinanlieferungSlotsModel::findByPk($_REQUEST['id'])) !== null)

         {

-            $unitId = (int) Input::post('unit_id');

-            $unitAmount = (int) Input::post('unit_amount');

-            $multiplier = 1;

-            if ($unitId > 0) {

-                if (($u = WeinanlieferungUnitModel::findByPk($unitId)) !== null) {

-                    $multiplier = max(1, (int) $u->multiplier);

-                }

-            }

-            $baseUnitsRequested = $unitAmount > 0 ? $unitAmount * $multiplier : (int) Input::post('behaelter');

-            if ($baseUnitsRequested > $Slot->behaelter*3 - $Slot->getReservedBehaelter())

+

+            if ($intBehaelter > $Slot->behaelter*1.5 - $Slot->getReservedBehaelter())

             {

                 return $this->renderDetails(false,sprintf('<div class="toast toast--danger mx-0">Fehler: Es sind mittlerweile nur noch %s Behälter verfügbar.</div>',$Slot->getAvailableBehaelter()));

             }

@@ -573,7 +577,7 @@ class SlotAjaxController extends AbstractController

         $time = time();

-        if (Input::post('behaelter') > $Slot->behaelter - $Slot->getReservedBehaelter())

+        if ($intBehaelter > $Slot->behaelter - $Slot->getReservedBehaelter())

         {

             $arrData['approved'] = '';

             $arrData['approved_on'] = 0;

@@ -583,21 +587,11 @@ class SlotAjaxController extends AbstractController

         }

         // Determine fields to store

-        $unitId = (int) Input::post('unit_id');

-        $unitAmount = (int) Input::post('unit_amount');

-        $multiplier = 1;

-        if ($unitId > 0) {

-            if (($u = WeinanlieferungUnitModel::findByPk($unitId)) !== null) {

-                $multiplier = max(1, (int) $u->multiplier);

-            }

-        }

-        $baseUnits = $unitAmount > 0 ? $unitAmount * $multiplier : (int) Input::post('behaelter');

-

         $arrData = array_merge($arrData,[

             'pid' => $_REQUEST['id'],

             'tstamp' => $time,

             'uid' => FrontendUser::getInstance()->id,

-            'behaelter' => $baseUnits,

+            'behaelter' => $intBehaelter,

             'unit_id' => $unitId,

             'unit_amount' => $unitAmount,

             'sorten' => $arrSorten,

@@ -656,20 +650,23 @@ class SlotAjaxController extends AbstractController

             }

         }

+        // recompute base units

+        $unitId = (int) Input::post('unit_id');

+        $unitAmount = (int) Input::post('unit_amount');

+        $multiplier = 1;

+        if ($unitId > 0) {

+            if (($u = WeinanlieferungUnitModel::findByPk($unitId)) !== null) {

+                $multiplier = max(1, (int) $u->multiplier);

+            }

+        }

+

+        $intBehaelter = $unitAmount > 0 ? $unitAmount * $multiplier : (int) Input::post('behaelter');

+

         // Form validation

         /** @var WeinanlieferungSlotsModel $Slot */

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

         {

-            $unitId = (int) Input::post('unit_id');

-            $unitAmount = (int) Input::post('unit_amount');

-            $multiplier = 1;

-            if ($unitId > 0) {

-                if (($u = WeinanlieferungUnitModel::findByPk($unitId)) !== null) {

-                    $multiplier = max(1, (int) $u->multiplier);

-                }

-            }

-            $baseUnitsRequested = $unitAmount > 0 ? $unitAmount * $multiplier : (int) Input::post('behaelter');

-            if ($baseUnitsRequested > $Slot->behaelter*3 - $Slot->getReservedBehaelter() + $Reservation->behaelter)

+            if ($intBehaelter > $Slot->behaelter*1.5 - $Slot->getReservedBehaelter() + $Reservation->behaelter)

             {

                 return $this->renderBooking(false,sprintf('<div class="toast toast--danger mx-0">Fehler: Es sind mittlerweile nur noch %s Behälter verfügbar.</div>',$Slot->getAvailableBehaelter()+$Reservation->behaelter));

             }

@@ -723,7 +720,7 @@ class SlotAjaxController extends AbstractController

         $time = time();

-        if (Input::post('behaelter') > $Slot->behaelter - $Slot->getReservedBehaelter() + $Reservation->behaelter)

+        if ($intBehaelter > $Slot->behaelter - $Slot->getReservedBehaelter() + $Reservation->behaelter)

         {

             $Reservation->approved = '';

             $Reservation->approved_on = 0;

@@ -733,16 +730,7 @@ class SlotAjaxController extends AbstractController

         }

         $Reservation->tstamp = $time;

-        // recompute base units

-        $unitId = (int) Input::post('unit_id');

-        $unitAmount = (int) Input::post('unit_amount');

-        $multiplier = 1;

-        if ($unitId > 0) {

-            if (($u = WeinanlieferungUnitModel::findByPk($unitId)) !== null) {

-                $multiplier = max(1, (int) $u->multiplier);

-            }

-        }

-        $Reservation->behaelter = $unitAmount > 0 ? $unitAmount * $multiplier : (int) Input::post('behaelter');

+        $Reservation->behaelter = $intBehaelter;

         $Reservation->unit_id = $unitId;

         $Reservation->unit_amount = $unitAmount;

         $Reservation->sorten = $arrSorten;