@@ -1,6 +1,6 @@

 {% block content %}

     {% if modal %}<div class="modal-content">{% endif %}

-    <div id="wa-booking-{{ id }}" hx-target="this" hx-swap="outerHTML" class="frame">

+    <div id="wa-booking-{{ id }}" hx-target="this" hx-swap="outerHTML" class="frame" hx-indicator="#wa-booking-{{ id }}">

         <div class="frame__header">

             <h3>Reservierung</h3>

             <div class="grid-md u-gap-2">

@@ -49,15 +49,30 @@

             {% endif %}

             <form hx-post="/_ajax/vr_wa/v1/slot?do=updateReservation" enctype="multipart/form-data">

                 <input type="hidden" name="id" value="{{ id }}">

-                <fieldset>

-                    <label for="res-behaelter"><strong>Liefernde Bottichmenge</strong><sup class="text-danger">*</sup></label>

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

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

-                        {% for option in buchen.behaelter %}

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

-                        {% endfor %}

-                    </select>

-                </fieldset>

+                <div class="grid-md u-gap-2">

+                    <div class="grid-c-6 mb-2 mb-0-md">

+                        <fieldset>

+                            <label for="res-behaeltereinheit"><strong>Liefernde Botticheinheit<sup class="text-danger">*</sup></strong></label>

+                            <select id="res-behaeltereinheit" name="unit" hx-get="/_ajax/vr_wa/v1/slot?do=availableBookingUnitAmount&id={{ id }}" hx-target="#wa-booking-{{ id }} #res-behaelter">

+                                <option value="">{{ 'tl_vr_wa_units.containers.0'|trans([], 'contao_tl_vr_wa_units') }}</option>

+                                {% for value, option in buchen.units %}

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

+                                {% endfor %}

+                            </select>

+                        </fieldset>

+                    </div>

+                    <div class="grid-c-6 mb-2 mb-0-md">

+                        <fieldset>

+                            <label for="res-behaelter"><strong>Menge<sup class="text-danger">*</sup></strong></label>

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

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

+                                {% for option in buchen.behaelter %}

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

+                                {% endfor %}

+                            </select>

+                        </fieldset>

+                    </div>

+                </div>

                 {% if file is defined %}

                     <fieldset>

                         <div class="t-label">Aktuelle Datei</div>

@@ -76,6 +91,8 @@

                 </fieldset>

             </form>

         </div>

+

+        <div class="loader animated loading"></div>

     {% if modal %}</div>{% endif %}

 {% endblock %}

@@ -1,6 +1,6 @@

 {% block content %}

     {% if modal %}<div class="modal-content">{% endif %}

-        <div id="wa-slot-{{ id }}" class="frame" hx-get="/_ajax/vr_wa/v1/slot?do=details&id={{ id }}&modal=false" hx-target="this" hx-swap="outerHTML" hx-trigger="updateWaBooking from:body">

+        <div id="wa-slot-{{ id }}" class="frame" hx-get="/_ajax/vr_wa/v1/slot?do=details&id={{ id }}&modal=false" hx-target="this" hx-swap="outerHTML" hx-trigger="updateWaBooking from:body" hx-indicator="#wa-slot-{{ id }}">

             <div class="frame__header">

                 <h3>Zeitslot</h3>

                 <div class="grid-md u-gap-2">

@@ -60,7 +60,8 @@

                                 <div class="col-7">

                                     <div class="u-flex u-items-center u-gap-1">

                                         <i class="icon-behaelter-outline"></i>

-                                        {{ reservation.behaelter }}

+                                        {{ reservation.amount }} x {{ reservation.unitLabel }}

+                                        {% if reservation.unit > 0 %}({{ reservation.behaelter }} {{ 'tl_vr_wa_units.containers.0'|trans([], 'contao_tl_vr_wa_units') }}){% endif %}

                                     </div>

                                 </div>

                                 <div class="col u-text-right">

@@ -86,7 +87,7 @@

                             <div class="grid-c-6 mb-2 mb-0-md">

                                 <fieldset>

                                     <label for="res-behaeltereinheit"><strong>Liefernde Botticheinheit<sup class="text-danger">*</sup></strong></label>

-                                    <select id="res-behaeltereinheit" name="unit" hx-get="/_ajax/vr_wa/v1/slot?do=availableUnitAmount&id={{ id }}" hx-target="#wa-slot-{{ id }} #res-behaelter" hx-indicator="#wa-slot-{{ id }}">

+                                    <select id="res-behaeltereinheit" name="unit" hx-get="/_ajax/vr_wa/v1/slot?do=availableUnitAmount&id={{ id }}" hx-target="#wa-slot-{{ id }} #res-behaelter">

                                         <option value="">{{ 'tl_vr_wa_units.containers.0'|trans([], 'contao_tl_vr_wa_units') }}</option>

                                         {% for value, option in buchen.units %}

                                             <option value="{{ value }}">{{ option }}</option>

@@ -95,6 +95,9 @@ class SlotAjaxController extends AbstractController

             case 'availableUnitAmount':

                 return $this->renderAvailableUnitAmount();

+            case 'availableBookingUnitAmount':

+                return $this->renderAvailableBookingUnitAmount();

+

             case 'delete':

                 return $this->deleteReservation();

         }

@@ -123,7 +126,10 @@ class SlotAjaxController extends AbstractController

         {

             foreach ($Reservations as $reservation)

             {

-                $arrReservations[] = $reservation->row();

+                $Unit = WeinanlieferungUnitsModel::findByPk($reservation->unit);

+                $arrReservations[] = array_merge($reservation->row(),[

+                    'unitLabel' => $Unit->title ?? $this->translator->trans('tl_vr_wa_units.containers.0', [], 'contao_tl_vr_wa_units')

+                ]);

             }

         }

@@ -290,6 +296,19 @@ class SlotAjaxController extends AbstractController

         }

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

+        $arrUnits = [];

+

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

+        {

+            if (($Units = $Site->getRelated('units')) !== null)

+            {

+                foreach ($Units as $unit)

+                {

+                    $arrUnits[$unit->id] = $unit->title . ' (' . $unit->containers . ' '.$this->translator->trans('tl_vr_wa_units.containers.0', [], 'contao_tl_vr_wa_units').')';

+                }

+            }

+

+        }

         $arrData = array_merge($arrData,[

             'modal' => $blnModal,

@@ -303,6 +322,7 @@ class SlotAjaxController extends AbstractController

             'buchen' => [

                 'buchbar' => (boolean) $intAvailableBehaelter,

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

+                'units' => $arrUnits,

             ]

         ]);

@@ -319,6 +339,11 @@ class SlotAjaxController extends AbstractController

         Controller::loadDataContainer('tl_vr_wa_reservation');

         $arrData = [];

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

+        {

+            return $this->renderDetails(false,'<div class="toast toast--danger mx-0">Fehler: der Zeitslot ist nicht verfügbar.</div>');

+        }

+

         if (($rootPage = Frontend::getRootPageFromUrl()) !== null && !empty($rootPage->vr_wa_uploadFolderSRC))

         {

             $File = new FormFileUpload(\Contao\Widget::getAttributesFromDca($GLOBALS['TL_DCA']['tl_vr_wa_reservation']['fields']['upload'], 'upload'));

@@ -346,13 +371,13 @@ class SlotAjaxController extends AbstractController

         }

         // Form validation

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

+        $intBehaelter = Input::post('behaelter');

+

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

         {

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

-            {

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

-            }

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

         }

+

         $arrError = [];

         foreach (['behaelter'] as $field)

         {

@@ -362,6 +387,29 @@ class SlotAjaxController extends AbstractController

             }

         }

+        // Get allowed units

+        if (Input::post('unit'))

+        {

+            if (($SelectedUnit = WeinanlieferungUnitsModel::findByPk(intval(Input::post('unit')))) === null)

+            {

+                return $this->renderDetails(false, '<div class="toast toast--danger mx-0">Die gewünschte Botticheinheit steht nicht zur Verfügung. Bitte versuchen Sie es noch einmal.</div>');

+            }

+

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

+            {

+                $unitIds = StringUtil::deserialize($Site->units, true);

+                $Units = WeinanlieferungUnitsModel::findMultipleByIds($unitIds);

+

+                if (!\in_array(intval(Input::post('unit')), $Units->fetchEach('id')))

+                {

+                    return $this->renderDetails(false, '<div class="toast toast--danger mx-0">Die gewünschte Botticheinheit steht nicht mehr zur Verfügung. Bitte versuchen Sie es noch einmal.</div>');

+                }

+            }

+

+            $intBehaelter = intval($intBehaelter) * intval($SelectedUnit->containers);

+        }

+

+

         if (count($arrError))

         {

             return $this->renderDetails(false,'<div class="toast toast--danger mx-0">Bitte geben Sie alle Pflichtangaben (mit * markierte Felder) an</div>');

@@ -372,7 +420,8 @@ class SlotAjaxController extends AbstractController

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

             'tstamp' => time(),

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

-            'behaelter' => Input::post('behaelter'),

+            'unit' => intval(Input::post('unit')),

+            'behaelter' => $intBehaelter,

             'amount' => Input::post('behaelter'),

         ]);

         $Reservation->setRow($arrData);

@@ -392,7 +441,12 @@ class SlotAjaxController extends AbstractController

         if (($Reservation = WeinanlieferungReservationModel::findById($_REQUEST['id'])) === null)

         {

-            return new Response('Could not load booking data',500);

+            return $this->renderBooking(false,'<div class="toast toast--danger mx-0">Fehler: Buchung kann nicht geladen werden.</div>');

+        }

+

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

+        {

+            return $this->renderBooking(false,'<div class="toast toast--danger mx-0">Fehler: der Zeitslot ist nicht verfügbar.</div>');

         }

         if (($rootPage = Frontend::getRootPageFromUrl()) !== null && !empty($rootPage->vr_wa_uploadFolderSRC))

@@ -417,15 +471,15 @@ class SlotAjaxController extends AbstractController

         }

         // Form validation

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

+        $intBehaelter = Input::post('behaelter');

+

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

         {

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

-            {

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

-            }

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

         }

+

         $arrError = [];

-        foreach (['behaelter','sorten','ernteart','lage'] as $field)

+        foreach (['behaelter'] as $field)

         {

             if (empty(Input::post($field)))

             {

@@ -433,41 +487,37 @@ class SlotAjaxController extends AbstractController

             }

         }

-        if (count($arrError))

+        // Get allowed units

+        if (Input::post('unit'))

         {

-            return $this->renderBooking(false,'<div class="toast toast--danger mx-0">Bitte geben Sie alle Pflichtangaben (mit * markierte Felder) an</div>');

-        }

+            if (($SelectedUnit = WeinanlieferungUnitsModel::findByPk(intval(Input::post('unit')))) === null)

+            {

+                return $this->renderDetails(false, '<div class="toast toast--danger mx-0">Die gewünschte Botticheinheit steht nicht zur Verfügung. Bitte versuchen Sie es noch einmal.</div>');

+            }

-        $arrSorten = [];

-        if (!is_array(Input::post('sorten')))

-        {

-            $arrSorten[] = Input::post('sorten');

-        } else {

-            $arrSorten = implode(';', Input::post('sorten'));

-        }

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

+            {

+                $unitIds = StringUtil::deserialize($Site->units, true);

+                $Units = WeinanlieferungUnitsModel::findMultipleByIds($unitIds);

-        $arrErnteart = [];

-        if (!is_array(Input::post('ernteart')))

-        {

-            $arrErnteart[] = Input::post('ernteart');

-        } else {

-            $arrErnteart = implode(',', Input::post('ernteart'));

+                if (!\in_array(intval(Input::post('unit')), $Units->fetchEach('id')))

+                {

+                    return $this->renderDetails(false, '<div class="toast toast--danger mx-0">Die gewünschte Botticheinheit steht nicht mehr zur Verfügung. Bitte versuchen Sie es noch einmal.</div>');

+                }

+            }

+

+            $intBehaelter = intval($intBehaelter) * intval($SelectedUnit->containers);

         }

-        $arrLage = [];

-        if (!is_array(Input::post('lage')))

+        if (count($arrError))

         {

-            $arrLage[] = Input::post('lage');

-        } else {

-            $arrLage = implode(',', Input::post('lage'));

+            return $this->renderBooking(false,'<div class="toast toast--danger mx-0">Bitte geben Sie alle Pflichtangaben (mit * markierte Felder) an</div>');

         }

         $Reservation->tstamp = time();

-        $Reservation->behaelter = Input::post('behaelter');

+        $Reservation->unit = intval(Input::post('unit'));

+        $Reservation->behaelter = $intBehaelter;

         $Reservation->amount = Input::post('behaelter');

-        $Reservation->sorten = $arrSorten;

-        $Reservation->ernteart = $arrErnteart;

-        $Reservation->lage = $arrLage;

         $Reservation->save();

@@ -538,4 +588,40 @@ class SlotAjaxController extends AbstractController

         return new Response($strOutput);

     }

+    protected function renderAvailableBookingUnitAmount(): Response

+    {

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

+        {

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

+        }

+

+        if (($Reservation = WeinanlieferungReservationModel::findByPk($_REQUEST['id'])) === null || ($Slot = $Reservation->getRelated('pid')) === null)

+        {

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

+        }

+

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

+        $intAmount = $intAvailableBehaelter;

+

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

+        {

+            if (($Site = $Slot->getRelated('pid')) === null || ($Unit = WeinanlieferungUnitsModel::findByPk($_REQUEST['unit'])) === null)

+            {

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

+            }

+

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

+        }

+

+        $strOutput = "<select id=\"res-behaelter\" name=\"behaelter\" required>

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

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

+        {

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

+        }

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

+

+        return new Response($strOutput);

+    }

+

 }