@@ -97,7 +97,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_reservation'] = array

     'palettes' => array

     (

         '__selector__' => array(),

-        'default' => 'pid,uid,behaelter,sorten,lage,ernteart,upload'

+        'default' => 'pid,uid,behaelter,sorten,lage,ernteart,upload,approved'

     ),

     // Subpalettes

@@ -151,7 +151,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_reservation'] = array

             'exclude'                 => true,

             'inputType'               => 'text',

             'eval'       => array('rgxp'=>'natural','tl_class'=>'w50'),

-            'sql'        => "smallint(3) unsigned NOT NULL default 0",

+            'sql'        => "int(4) unsigned NOT NULL default 0",

         ),

         'sorten'       => array

         (

@@ -185,5 +185,19 @@ $GLOBALS['TL_DCA']['tl_vr_wa_reservation'] = array

             ),

             'sql'                     => "varchar(255) BINARY NOT NULL default ''"

         ),

+        'approved' => array

+        (

+            'exclude'                 => true,

+            'inputType'               => 'checkbox',

+            'eval'                    => array('tl_class'=>'w50 m12'),

+            'sql'                     => "char(1) NOT NULL default '1'"

+        ),

+        'approved_on' => array

+        (

+            'exclude'                 => true,

+            'inputType'               => 'text',

+            'eval'                    => array('rgxp' => 'datim', 'datepicker' => true, 'tl_class' => 'clr w50 wizard'),

+            'sql'                     => "int(10) unsigned NOT NULL default '0'"

+        ),

     )

 );

@@ -151,20 +151,20 @@ $GLOBALS['TL_DCA']['tl_vr_wa_slot'] = array

             'sql'       => "blob NULL",

             'relation'   => array('type' => 'hasMany', 'load' => 'lazy')

         ),

-        'behaelter'   => array

+        'behaelter' => array

         (

             'exclude'   => true,

-            'inputType' => 'select',

-            'options_callback'   => function () {

-                $range = [];

-                for ($i = 1; $i <= 30; $i++)

-                {

-                    $range[] = $i;

-                }

-                return $range;

-            },

-            'eval'      => array('rgxp' => 'natural', 'mandatory' => true, 'includeBlankOption' => true, 'tl_class' => 'w50'),

-            'sql'       => "smallint(3) unsigned NOT NULL default 0"

+            'inputType' => 'text',

+            'eval'      => array

+            (

+                'mandatory' => true,

+                'maxlength' => 4,

+                'maxval'    => 9999,

+                'minval'    => 1,

+                'rgxp'      => 'natural',

+                'tl_class'  => 'w50'

+            ),

+            'sql'       => "int(4) unsigned NOT NULL default 0"

         ),

         'sorten'       => array

         (

@@ -10,6 +10,7 @@

 $GLOBALS['TL_LANG']['MSC']['wa_sorte'] = 'Rebsorte';

 $GLOBALS['TL_LANG']['MSC']['wa_leseart'] = 'Leseart';

+$GLOBALS['TL_LANG']['MSC']['wa_approval_needed'] = 'erfordert Freigabe';

 $GLOBALS['TL_LANG']['REF']['wa_ernteart'] = [

     'handlese' => 'Handlese',

@@ -46,8 +46,15 @@

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

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

                         {% for option in buchen.behaelter %}

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

+                            {% if option > slot.behaelter %}

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

+                            {% else %}

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

+                            {% endif %}

                         {% endfor %}

+                        {#{% for option in buchen.behaelter %}

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

+                        {% endfor %}#}

                     </select>

                 </fieldset>

                 <fieldset>

@@ -109,8 +109,15 @@

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

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

                                 {% for option in buchen.behaelter %}

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

+                                    {% if option > slot.behaelterAvailable %}

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

+                                    {% else %}

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

+                                    {% endif %}

                                 {% endfor %}

+                                {#{% for option in buchen.behaelter %}

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

+                                {% endfor %}#}

                             </select>

                         </fieldset>

                         <fieldset>

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

             'ernteart' => $arrErnteart,

             'buchen' => [

                 'buchbar' => (boolean) $intAvailableBehaelter,

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

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

                 'sorten' => $arrSorten,

                 'lage' => $arrLage,

                 'ernteart' => $arrErnteart,

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

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

             'buchen' => [

                 'buchbar' => (boolean) $intAvailableBehaelter,

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

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

                 'sorten' => $arrSortenAvailable,

                 'ernteart' => $arrErnteartAvailable,

                 'lage' => $arrLagenAvailable,

@@ -433,7 +433,8 @@ class SlotAjaxController extends AbstractController

         // Form validation

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

         {

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

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

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

             {

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

             }

@@ -532,7 +533,8 @@ class SlotAjaxController extends AbstractController

         // Form validation

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

         {

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

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

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

             {

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

             }