@@ -42,12 +42,12 @@

             <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 Behältermenge</strong><sup class="text-danger">*</sup></label>

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

+                    <label for="bok-behaelter"><strong>Liefernde Behältermenge</strong><sup class="text-danger">*</sup></label>

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

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

                         {% for option in buchen.behaelter %}

-                            {% if option > slot.behaelterAvailable %}

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

+                            {% if option > slot.behaelterOcThreshold %}

+                                <option value="{{ option }}"{{ buchung.behaelter == option ? ' selected' : '' }} data-oc>{{ option }} ({{ 'MSC.wa_approval_needed'|trans([], 'contao_default') }})</option>

                             {% else %}

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

                             {% endif %}

@@ -81,15 +81,15 @@

                         <div class="u-flex u-items-center u-gap-1"><a href="{{ file.link }}">{{ file.name }}</a> <a href="javascript:;" hx-get="/_ajax/vr_wa/v1/slot?do=booking&id={{ id }}&modal=false&deleteFile=true" hx-target="closest .frame" hx-swap="outerHTML" class="tag tag__close-btn tag--danger tag--xs"></a></div>

                     </fieldset>

                     <fieldset>

-                        <label for="res-upload"><strong>Datei überschreiben</strong></label>

+                        <label for="bok-upload"><strong>Datei überschreiben</strong></label>

                 {% else %}

                     <fieldset>

-                        <label for="res-upload"><strong>Datei hochladen</strong></label>

+                        <label for="bok-upload"><strong>Datei hochladen</strong></label>

                 {% endif %}

-                    <input type="file" id="res-upload" name="upload">

+                    <input type="file" id="bok-upload" name="upload">

                 </fieldset>

                 <fieldset>

-                    <button type="submit">Speichern</button>

+                    <button id="bok-submit" type="submit" data-label-oc="Anfragen" data-label-default="Speichern">Speichern</button>

                 </fieldset>

             </form>

         </div>

@@ -115,7 +115,7 @@

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

                                 {% for option in buchen.behaelter %}

                                     {% if option > slot.behaelterAvailable %}

-                                        <option value="{{ option }}">{{ option }} ({{ 'MSC.wa_approval_needed'|trans([], 'contao_default') }})</option>

+                                        <option value="{{ option }}" data-oc>{{ option }} ({{ 'MSC.wa_approval_needed'|trans([], 'contao_default') }})</option>

                                     {% else %}

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

                                     {% endif %}

@@ -148,7 +148,7 @@

                             <input type="file" id="res-upload" name="upload">

                         </fieldset>

                         <fieldset>

-                            <button type="submit">Reservieren</button>

+                            <button id="res-submit" type="submit" data-label-oc="Anfragen" data-label-default="Reservieren">Reservieren</button>

                         </fieldset>

                     </form>

                 {% else %}

@@ -132,6 +132,49 @@

     {% endblock %}

     {% block script %}

+        <script>

+            document.addEventListener("DOMContentLoaded", () => {

+                htmx.onLoad((elements) => {

+                    if (htmx.find(document, '#bok-behaelter') !== null)

+                    {

+                        htmx.find(document, '#bok-behaelter').addEventListener("change", (e) => {

+                            var selectedOption = e.target.options[e.target.selectedIndex];

+                            var dataInfo = selectedOption.hasAttribute("data-oc");

+                            var button = htmx.find(document, '#bok-submit');

+

+                            if (dataInfo)

+                            {

+                                button.innerHTML = button.getAttribute("data-label-oc");

+                                button.classList.add('btn-info');

+                            } else

+                            {

+                                button.innerHTML = button.getAttribute("data-label-default");

+                                button.classList.remove('btn-info');

+                            }

+                        });

+                    }

+

+                    if (htmx.find(elements, '#res-behaelter') !== null)

+                    {

+                        htmx.find(elements, '#res-behaelter').addEventListener("change", (e) => {

+                            var selectedOption = e.target.options[e.target.selectedIndex];

+                            var dataInfo = selectedOption.hasAttribute("data-oc");

+                            var button = htmx.find(document, '#res-submit');

+

+                            if (dataInfo)

+                            {

+                                button.innerHTML = button.getAttribute("data-label-oc");

+                                button.classList.add('btn-info');

+                            } else

+                            {

+                                button.innerHTML = button.getAttribute("data-label-default");

+                                button.classList.remove('btn-info');

+                            }

+                        });

+                    }

+                });

+            });

+        </script>

         {#<script>

             jQuery(function($) {

                 $(".mod_wa_slots_list").accordion({

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

             'ernteart' => $arrErnteart,

             'buchen' => [

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

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

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

                 'sorten' => $arrSorten,

                 'lage' => $arrLage,

                 'ernteart' => $arrErnteart,

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

         $intReservedBehaelter = $Slot->getReservedBehaelter();

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

+        $intOcTreshold = $intAvailableBehaelter - $intReservedBehaelter + $Slot->behaelter;

         $arrData = array_merge($arrData,[

             'modal' => $blnModal,

@@ -378,6 +379,7 @@ class SlotAjaxController extends AbstractController

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

                 'sorte' => $arrSortenAvailable,

                 'behaelterAvailable' => $intAvailableBehaelter,

+                'behaelterOcThreshold' => $intOcTreshold,

                 'behaelterBooked' => $Slot->getReservedBehaelter(),

             ]),

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

@@ -482,9 +484,21 @@ class SlotAjaxController extends AbstractController

         }

         $Reservation = new WeinanlieferungReservationModel();

+

+        $time = time();

+

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

+        {

+            $arrData['approved'] = '';

+            $arrData['approved_on'] = 0;

+        } else {

+            $arrData['approved'] = '1';

+            $arrData['approved_on'] = $time;

+        }

+

         $arrData = array_merge($arrData,[

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

-            'tstamp' => time(),

+            'tstamp' => $time,

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

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

             'sorten' => $arrSorten,

@@ -493,9 +507,13 @@ class SlotAjaxController extends AbstractController

         ]);

         $Reservation->setRow($arrData);

-

         $Reservation->save();

+        if (empty($Reservation->approved))

+        {

+            return new Response('<div class="toast toast--warning mx-0"><p>Wir haben Ihre Anfrage erhalten. Bitte warten Sie auf eine Freigabe durch uns.</p></div>',200,['HX-Trigger'=> 'updateWaBooking']);

+        }

+

         return new Response('<div class="toast toast--success mx-0"><p>Reservierung erfolgreich</p></div>',200,['HX-Trigger'=> 'updateWaList']);

     }

@@ -513,6 +531,11 @@ class SlotAjaxController extends AbstractController

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

         }

+        if (FrontendUser::getInstance()->id != $Reservation->uid)

+        {

+            return new Response('Member not authorized tu update this reservation',500);

+        }

+

         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'));

@@ -535,10 +558,11 @@ class SlotAjaxController extends AbstractController

         }

         // Form validation

+        /** @var WeinanlieferungSlotsModel $Slot */

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

         {

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

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

+            if (Input::post('behaelter') > $Slot->behaelter*3-$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));

             }

@@ -581,7 +605,18 @@ class SlotAjaxController extends AbstractController

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

         }

-        $Reservation->tstamp = time();

+        $time = time();

+

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

+        {

+            $Reservation->approved = '';

+            $Reservation->approved_on = 0;

+        } else {

+            $Reservation->approved = '1';

+            $Reservation->approved_on = $time;

+        }

+

+        $Reservation->tstamp = $time;

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

         $Reservation->sorten = $arrSorten;

         $Reservation->ernteart = $arrErnteart;

@@ -589,6 +624,11 @@ class SlotAjaxController extends AbstractController

         $Reservation->save();

+        if (empty($Reservation->approved))

+        {

+            return new Response('<div class="toast toast--warning mx-0"><p>Wir haben Ihre Anfrage erhalten. Bitte warten Sie auf eine Freigabe durch uns.</p></div>',200,['HX-Trigger'=> 'updateWaBooking']);

+        }

+

         return new Response('<div class="toast toast--success mx-0"><p>Reservierung erfolgreich geändert</p></div>',200,['HX-Trigger'=> 'updateWaBooking']);

     }