@@ -14,6 +14,7 @@ use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungStandortModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungUnitModel;

 use Contao\ArrayUtil;

 ArrayUtil::arrayInsert($GLOBALS['BE_MOD'],1,[

@@ -21,7 +22,11 @@ ArrayUtil::arrayInsert($GLOBALS['BE_MOD'],1,[

         'weinanlieferung' => [

             'tables'     => array('tl_vr_wa_standort', 'tl_vr_wa_slot', 'tl_vr_wa_rebsorte','tl_vr_wa_leseart','tl_vr_wa_lage','tl_vr_wa_reservation'),

             'stylesheet' => array('bundles/vonrotenbergweinanlieferung/css/backend.css')

-        ]

+        ],

+        'wa_units' => [

+            'tables'     => array('tl_vr_wa_unit'),

+            'stylesheet' => array('bundles/vonrotenbergweinanlieferung/css/backend.css')

+        ],

     ]

 ]);

@@ -32,6 +37,7 @@ $GLOBALS['TL_MODELS']['tl_vr_wa_rebsorte'] = WeinanlieferungRebsorteModel::class

 $GLOBALS['TL_MODELS']['tl_vr_wa_leseart'] = WeinanlieferungLeseartModel::class;

 $GLOBALS['TL_MODELS']['tl_vr_wa_lage'] = WeinanlieferungLageModel::class;

 $GLOBALS['TL_MODELS']['tl_vr_wa_reservation'] = WeinanlieferungReservationModel::class;

+$GLOBALS['TL_MODELS']['tl_vr_wa_unit'] = WeinanlieferungUnitModel::class;

 // Notification

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

     'palettes' => array

     (

         '__selector__' => array('checked_in'),

-        'default' => 'pid,uid,behaelter,sorten,lage,ernteart,upload;{approval_legend},approved;{checkin_legend},checked_in'

+        'default' => 'pid,uid,behaelter,unit_id,unit_amount,sorten,lage,ernteart,upload;{approval_legend},approved;{checkin_legend},checked_in'

     ),

     // Subpalettes

@@ -154,6 +154,22 @@ $GLOBALS['TL_DCA']['tl_vr_wa_reservation'] = array

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

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

         ),

+        'unit_id' => array

+        (

+            'exclude'   => true,

+            'inputType' => 'select',

+            'foreignKey' => 'tl_vr_wa_unit.title',

+            'eval'      => array('includeBlankOption'=>true,'chosen'=>true,'tl_class'=>'w50'),

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

+            'relation'  => array('type' => 'belongsTo', 'load' => 'lazy')

+        ),

+        'unit_amount' => array

+        (

+            'exclude'   => true,

+            'inputType' => 'text',

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

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

+        ),

         'sorten'       => array

         (

             'exclude'                 => true,

new file mode 100644

@@ -0,0 +1,99 @@

+<?php

+

+/**

+ * This file is part of contao-weinanlieferung-bundle.

+ *

+ * (c) vonRotenberg

+ *

+ * @license commercial

+ */

+

+use Contao\DC_Table;

+use Contao\DataContainer;

+

+$GLOBALS['TL_DCA']['tl_vr_wa_unit'] = [

+    // Config

+    'config' => [

+        'dataContainer' => DC_Table::class,

+        'sql' => [

+            'keys' => [

+                'id' => 'primary',

+            ],

+        ],

+    ],

+

+    // List

+    'list' => [

+        'sorting' => [

+            'mode' => DataContainer::MODE_SORTED,

+            'fields' => ['title'],

+            'panelLayout' => 'filter;sort,search,limit',

+        ],

+        'label' => [

+            'fields' => ['title', 'multiplier'],

+            'format' => '%s (x%s)'

+        ],

+        'global_operations' => [

+            'all' => [

+                'href' => 'act=select',

+                'class' => 'header_edit_all',

+                'attributes' => 'onclick="Backend.getScrollOffset()" accesskey="e"',

+            ],

+        ],

+        'operations' => [

+            'edit' => [

+                'href'  => 'act=edit',

+                'icon'  => 'edit.gif',

+            ],

+            'copy' => [

+                'href' => 'act=paste&mode=copy',

+                'icon' => 'copy.svg',

+            ],

+            'delete' => [

+                'href' => 'act=delete',

+                'icon' => 'delete.gif',

+            ],

+            'show' => [

+                'icon' => 'show.gif',

+            ],

+        ],

+    ],

+

+    // Palettes

+    'palettes' => [

+        'default' => 'title,multiplier',

+    ],

+

+    // Fields

+    'fields' => [

+        'id' => [

+            'sql' => "int(10) unsigned NOT NULL auto_increment",

+        ],

+        'tstamp' => [

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

+        ],

+        'title' => [

+            'exclude' => true,

+            'search' => true,

+            'inputType' => 'text',

+            'eval' => [

+                'mandatory' => true,

+                'maxlength' => 255,

+                'tl_class' => 'w50',

+            ],

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

+        ],

+        'multiplier' => [

+            'exclude' => true,

+            'inputType' => 'text',

+            'eval' => [

+                'mandatory' => true,

+                'rgxp' => 'natural',

+                'minval' => 1,

+                'maxlength' => 4,

+                'tl_class' => 'w50',

+            ],

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

+        ],

+    ],

+];

@@ -4,6 +4,28 @@

         <div class="frame__header">

             <h3>Reservierung</h3>

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

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

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

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

+                    <div class="t-label">Gebuchte Behälterkapazität</div>

+                </div>

+                <div class="">{{ buchung.behaelter }}</div>

+            </div>

+            {% if buchung is defined %}

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

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

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

+                    <div class="t-label">Einheit</div>

+                </div>

+                {% set uTitle = buchung.unit_title|default('Behälter') %}

+                {% set uAmount = buchung.unit_amount_display|default(0) %}

+                {% if uAmount > 0 %}

+                    <div class="">{{ uAmount }} × {{ uTitle }}</div>

+                {% else %}

+                    <div class="">{{ buchung.behaelter }} × {{ 'Behälter' }}</div>

+                {% endif %}

+            </div>

+            {% endif %}

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

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

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

@@ -42,22 +64,44 @@

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

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

                 <fieldset>

-                    <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.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 %}

+                    <label for="bok-unit"><strong>Einheit</strong><sup class="text-danger">*</sup></label>

+                    <select id="bok-unit" name="unit_id" required>

+                        {% for unit in buchen.units %}

+                            <option value="{{ unit.id }}" data-multiplier="{{ unit.multiplier }}"{% if buchung.unit_id == unit.id %} selected{% endif %}>{{ unit.title }}</option>

                         {% endfor %}

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

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

-                        {% endfor %}#}

                     </select>

                 </fieldset>

                 <fieldset>

+                    <label for="bok-unit-amount"><strong>Anzahl</strong><sup class="text-danger">*</sup></label>

+                    <select id="bok-unit-amount" name="unit_amount" required>

+                    </select>

+                    {#<div class="text-sm text-muted">Verbleibende Kapazität (Basis): {{ slot.behaelterAvailable }}</div>#}

+                </fieldset>

+                <script>

+                    (function(){

+                        var container = document.getElementById('wa-booking-{{ id }}');

+                        if(!container) return;

+                        var units = {{ buchen.units|json_encode|raw }};

+                        var unitSel = container.querySelector('#bok-unit');

+                        var amtSel = container.querySelector('#bok-unit-amount');

+                        var selectedAmount = {{ buchung.unit_amount|default(0) }};

+                        function fillAmounts(){

+                            if(!unitSel||!amtSel) return;

+                            var id = parseInt(unitSel.value||0,10);

+                            var u = units.find(function(x){return x.id == id;});

+                            if(!u){ amtSel.innerHTML=''; return; }

+                            var html = '<option value="">-</option>';

+                            for(var i=1;i<=u.max_amount;i++){ html += '<option value="'+i+'"'+(selectedAmount==i?' selected':'')+'>'+i+'</option>'; }

+                            amtSel.innerHTML = html;

+                        }

+                        if(unitSel){

+                            unitSel.onchange = null;

+                            unitSel.addEventListener('change', function(){ selectedAmount = 0; fillAmounts();});

+                        }

+                        fillAmounts();

+                    })();

+                </script>

+                <fieldset>

                   <legend>Anliefernde Rebsorte(n)<sup class="text-danger">*</sup></legend>

                     {% for value,label in buchen.sorten %}

                         <label><input type="checkbox" name="sorten[]" value="{{ value }}"{{ value in buchung.sorten|keys ? ' checked' : '' }}> <span class="checkable">{{ label }}</span></label><br>

@@ -101,6 +145,30 @@

         <script>

             (function ($) {

+                // Define an idempotent initializer for this modal instance

+                window.initWaBookingDetails{{ id }} = function() {

+                    var container = document.getElementById('wa-booking-{{ id }}');

+                    if(!container) return;

+                    var units = {{ buchen.units|json_encode|raw }};

+                    var unitSel = container.querySelector('#bok-unit');

+                    var amtSel = container.querySelector('#bok-unit-amount');

+                    var selectedAmount = {{ buchung.unit_amount|default(0) }};

+                    function fillAmounts(){

+                        if(!unitSel||!amtSel) return;

+                        var id = parseInt(unitSel.value||0,10);

+                        var u = units.find(function(x){return x.id == id;});

+                        if(!u){ amtSel.innerHTML=''; return; }

+                        var html = '<option value="">-</option>';

+                        for(var i=1;i<=u.max_amount;i++){ html += '<option value="'+i+'"'+(selectedAmount==i?' selected':'')+'>'+i+'</option>'; }

+                        amtSel.innerHTML = html;

+                    }

+                    if(unitSel){

+                        unitSel.onchange = null;

+                        unitSel.addEventListener('change', function(){ selectedAmount = 0; fillAmounts();});

+                    }

+                    fillAmounts();

+                };

+

                 window.modals = window.modals || []

                 window.modals.wa_bookings = window.modals.wa_bookings || []

@@ -116,11 +184,15 @@

                     overlay: true,

                     closeOnClick: false,

                     zIndex: 'auto',

-                    addClass: ''

+                    addClass: '',

+                    onOpen: function(){

+                        if (window.initWaBookingDetails{{ id }}) { window.initWaBookingDetails{{ id }}(); }

+                    }

                 }).open();

                 } else {

                     window.modals.wa_bookings.details{{ id }}.content.empty();

                     window.modals.wa_bookings.details{{ id }}.setContent($('#wa-booking-{{ id }}')).open();

+                    if (window.initWaBookingDetails{{ id }}) { window.initWaBookingDetails{{ id }}(); }

                 }

             })(jQuery);

@@ -27,6 +27,22 @@

                     </div>

                     <div class="">{{ buchung.behaelter }}</div>

                 </div>

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

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

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

+                        <div class="t-label">Erforderliche Eingaben</div>

+                    </div>

+                    <div class="">{{ checkin.expected }}</div>

+                </div>

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

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

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

+                        <div class="t-label">Einheit</div>

+                    </div>

+                    {% set uTitle = checkin.unit_title|default('Behälter') %}

+                    {% set uAmount = checkin.unit_amount_display|default(checkin.behaelter) %}

+                    <div class="">{{ uAmount }} × {{ uTitle }}</div>

+                </div>

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

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

@@ -64,7 +80,8 @@

                 </datalist>

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

-                    {% for i in 1..checkin.behaelter %}

+                    {% set expected = checkin.expected|default(checkin.behaelter) %}

+                    {% for i in 1..expected %}

                         <div class="grid-c-12">

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

                                 <div class="grid-c-6">

@@ -90,6 +90,9 @@

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

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

                                         {{ reservation.behaelter }}

+                                        {% set uTitle = reservation.unit_title|default('Behälter') %}

+                                        {% set uAmount = reservation.unit_amount_display|default(reservation.behaelter) %}

+                                        <span class="text-sm text-muted"> ({{ uAmount }} × {{ uTitle }})</span>

                                     </div>

                                 </div>

                                 <div class="col-6">

@@ -138,22 +141,45 @@

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

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

                         <fieldset>

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

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

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

-                                {% for option in buchen.behaelter %}

-                                    {% if option > slot.behaelterAvailable %}

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

-                                    {% else %}

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

-                                    {% endif %}

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

+                            <select id="res-unit" name="unit_id" required>

+                                {% for unit in buchen.units %}

+                                    <option value="{{ unit.id }}" data-multiplier="{{ unit.multiplier }}">{{ unit.title }}</option>

                                 {% endfor %}

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

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

-                                {% endfor %}#}

                             </select>

                         </fieldset>

                         <fieldset>

+                            <label for="res-unit-amount"><strong>Anzahl<sup class="text-danger">*</sup></strong></label>

+                            <select id="res-unit-amount" name="unit_amount" required>

+                                <!-- options will be populated by script based on selected unit and capacity -->

+                            </select>

+                            {#<div class="text-sm text-muted">Verbleibende Kapazität (Basis): {{ slot.behaelterAvailable }}</div>#}

+                        </fieldset>

+                        <script>

+                            (function(){

+                                var container = document.getElementById('wa-slot-{{ id }}');

+                                if(!container) return;

+                                var units = {{ buchen.units|json_encode|raw }};

+                                var unitSel = container.querySelector('#res-unit');

+                                var amtSel = container.querySelector('#res-unit-amount');

+                                function fillAmounts(){

+                                    if(!unitSel||!amtSel) return;

+                                    var id = parseInt(unitSel.value||0,10);

+                                    var u = units.find(function(x){return x.id == id;});

+                                    if(!u){ amtSel.innerHTML=''; return; }

+                                    var html = '<option value="">-</option>';

+                                    for(var i=1;i<=u.max_amount;i++){ html += '<option value="'+i+'">'+i+'</option>'; }

+                                    amtSel.innerHTML = html;

+                                }

+                                if(unitSel){

+                                    // avoid duplicate listeners by resetting

+                                    unitSel.onchange = null;

+                                    unitSel.addEventListener('change', fillAmounts, { once:false });

+                                }

+                                fillAmounts();

+                            })();

+                        </script>

+                        <fieldset>

                           <legend>Anliefernde Rebsorte(n)<sup class="text-danger">*</sup></legend>

                             {% for value,label in buchen.sorten %}

                                 <label><input type="checkbox" name="sorten[]" value="{{ value }}"> <span class="checkable">{{ label }}</span></label><br>

@@ -195,6 +221,29 @@

         <script>

             (function ($) {

+                // Define an idempotent initializer for this modal instance

+                window.initWaSlotDetails{{ id }} = function() {

+                    var container = document.getElementById('wa-slot-{{ id }}');

+                    if(!container) return;

+                    var units = {{ buchen.units|json_encode|raw }};

+                    var unitSel = container.querySelector('#res-unit');

+                    var amtSel = container.querySelector('#res-unit-amount');

+                    function fillAmounts(){

+                        if(!unitSel||!amtSel) return;

+                        var id = parseInt(unitSel.value||0,10);

+                        var u = units.find(function(x){return x.id == id;});

+                        if(!u){ amtSel.innerHTML=''; return; }

+                        var html = '<option value="">-</option>';

+                        for(var i=1;i<=u.max_amount;i++){ html += '<option value="'+i+'">'+i+'</option>'; }

+                        amtSel.innerHTML = html;

+                    }

+                    if(unitSel){

+                        unitSel.onchange = null;

+                        unitSel.addEventListener('change', fillAmounts, { once:false });

+                    }

+                    fillAmounts();

+                };

+

                 window.modals = window.modals || []

                 window.modals.wa_slots = window.modals.wa_slots || []

@@ -210,11 +259,15 @@

                     overlay: true,

                     closeOnClick: false,

                     zIndex: 'auto',

-                    addClass: ''

+                    addClass: '',

+                    onOpen: function(){

+                        if (window.initWaSlotDetails{{ id }}) { window.initWaSlotDetails{{ id }}(); }

+                    }

                 }).open();

                 } else {

                     window.modals.wa_slots.details{{ id }}.content.empty();

                     window.modals.wa_slots.details{{ id }}.setContent($('#wa-slot-{{ id }}')).open();

+                    if (window.initWaSlotDetails{{ id }}) { window.initWaSlotDetails{{ id }}(); }

                 }

             })(jQuery);

@@ -134,10 +134,16 @@

                                                                     <div class="t-label">Anliefernde Sorten</div>

                                                                     {{ booking.sorte|join(', ') }}

                                                                 </div>

-                                                                <div class="col-3 behaelter icon-behaelter-outline">

-                                                                    <div class="t-label">Gebuchte Behälterkapazität</div>

+                                                                <div class="col-1 behaelter icon-behaelter-outline">

+                                                                    <div class="t-label">Gebucht</div>

                                                                     {{ booking.behaelter }}

                                                                 </div>

+                                                                <div class="col-2 behaelter icon-behaelter-outline">

+                                                                    <div class="t-label">Einheit</div>

+                                                                    {% set uTitle = booking.unit_title|default('Behälter') %}

+                                                                    {% set uAmount = booking.unit_amount_display|default(booking.behaelter) %}

+                                                                    {{ uAmount }} × {{ uTitle }}

+                                                                </div>

                                                                 <div class="additional-facts col-12 p-0 m-0">

                                                                     <div class="row u-items-flex-start pb-0">

                                                                         <div class="col-1">

@@ -69,6 +69,9 @@

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

                                                     <span class="t-label">Gebuchte Behälterkapazität</span>

                                                     {{ booking.behaelter }}

+                                                    {% set uTitle = booking.unit_title|default('Behälter') %}

+                                                    {% set uAmount = booking.unit_amount_display|default(booking.behaelter) %}

+                                                    <span class="text-sm text-muted"> ({{ uAmount }} × {{ uTitle }})</span>

                                                 </div>

                                             </div>

                                             <div class="grid-c-6 rebsorten bg-white p-1">

@@ -33,6 +33,7 @@ use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungUnitModel;

 /**

  * @Route("contao/weinanlieferung/buchungsliste", name=WeinanlieferungBookingsController::class, defaults={"_scope" = "backend"})

@@ -309,6 +310,22 @@ class WeinanlieferungBookingsController extends AbstractController

                         }

                     }

+                    // Compute unit display fields for backend list

+                    $unitTitle = 'Behälter';

+                    $unitAmountDisplay = (int) $booking->behaelter;

+                    if (!empty($booking->unit_id) && (int)$booking->unit_id > 0) {

+                        $unitModel = WeinanlieferungUnitModel::findByPk((int)$booking->unit_id);

+                        if (null !== $unitModel) {

+                            $unitTitle = (string)$unitModel->title;

+                        }

+                        $unitAmountDisplay = (int) ($booking->unit_amount ?: 0);

+                        if ($unitAmountDisplay <= 0) {

+                            // Fallback just in case: derive amount by multiplier if available

+                            $mult = (int) ($unitModel ? $unitModel->multiplier : 0);

+                            $unitAmountDisplay = $mult > 0 ? max(1, (int) ($booking->behaelter / $mult)) : (int) $booking->behaelter;

+                        }

+                    }

+

                     $arrData['days'][$day->dayBegin][$Slot->pid]['times'][$Slot->time]['items'][] = array_merge($booking->row(), [

                         'sorte'              => $arrSorten,

                         'ernteart' => $arrErnteart,

@@ -317,7 +334,9 @@ class WeinanlieferungBookingsController extends AbstractController

                         'standort' => $strStandort,

                         'member' => $booking->getRelated('uid') !== null ? $booking->getRelated('uid')->row() : null,

                         'behaelter_numbers' => $behaelterNumbers,

-                        'upload_file' => $uploadFile

+                        'upload_file' => $uploadFile,

+                        'unit_title' => $unitTitle,

+                        'unit_amount_display' => $unitAmountDisplay,

                     ]);

                 }

             }

@@ -39,6 +39,7 @@ use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungLeseartModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungRebsorteModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel;

 use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungSlotsModel;

+use vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungUnitModel;

 /**

  * @Route("/_ajax/vr_wa/v1/slot", name="vr_wa_slot_ajax", defaults={"_scope" = "frontend", "_token_check" = false})

@@ -154,8 +155,25 @@ class SlotAjaxController extends AbstractController

                 {

                     $arrSortenBooked = $Sorten->fetchEach('title');

                 }*/

+                // Compute unit display fields for this reservation

+                $unitTitle = $GLOBALS['TL_LANG']['MSC']['wa_unit_base'] ?? 'Behälter';

+                $unitAmountDisplay = (int) $reservation->behaelter;

+                if ((int)$reservation->unit_id > 0) {

+                    $unitModel = WeinanlieferungUnitModel::findByPk((int)$reservation->unit_id);

+                    if (null !== $unitModel) {

+                        $unitTitle = (string)$unitModel->title;

+                    }

+                    $unitAmountDisplay = (int) ($reservation->unit_amount ?: 0);

+                    if ($unitAmountDisplay <= 0) {

+                        $mult = (int) ($unitModel ? $unitModel->multiplier : 0);

+                        $unitAmountDisplay = $mult > 0 ? max(1, (int) ($reservation->behaelter / $mult)) : (int) $reservation->behaelter;

+                    }

+                }

+

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

-                    'sorten' => $arrSortenBooked

+                    'sorten' => $arrSortenBooked,

+                    'unit_title' => $unitTitle,

+                    'unit_amount_display' => $unitAmountDisplay,

                 ]);

             }

         }

@@ -207,6 +225,7 @@ class SlotAjaxController extends AbstractController

             'buchen' => [

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

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

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

                 'sorten' => $arrSorten,

                 'lage' => $arrLage,

                 'ernteart' => $arrErnteart,

@@ -277,6 +296,7 @@ class SlotAjaxController extends AbstractController

             'buchen' => [

                 'buchbar' => (boolean) $intAvailableBehaelter,

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

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

                 'sorten' => $arrSorten

             ],

         ];

@@ -396,7 +416,9 @@ class SlotAjaxController extends AbstractController

         }

         $intReservedBehaelter = $Slot->getReservedBehaelter();

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

+        // While editing, available base units should include the current booking's base units,

+        // because the edit will override the former amount.

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

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

         $arrData = array_merge($arrData,[

@@ -413,11 +435,30 @@ class SlotAjaxController extends AbstractController

                 'sorten' => $arrSortenBooked,

                 'ernteart' => $arrErnteartBooked,

                 'lage' => $arrLagenBooked,

+                // display fields

+                'unit_title' => (function() use ($Booking) {

+                    if ((int)$Booking->unit_id > 0) {

+                        $m = WeinanlieferungUnitModel::findByPk((int)$Booking->unit_id);

+                        return $m ? (string)$m->title : ($GLOBALS['TL_LANG']['MSC']['wa_unit_base'] ?? 'Behälter');

+                    }

+                    return $GLOBALS['TL_LANG']['MSC']['wa_unit_base'] ?? 'Behälter';

+                })(),

+                'unit_amount_display' => (function() use ($Booking) {

+                    if ((int)$Booking->unit_id > 0) {

+                        $m = WeinanlieferungUnitModel::findByPk((int)$Booking->unit_id);

+                        $amount = (int) ($Booking->unit_amount ?: 0);

+                        if ($amount > 0) return $amount;

+                        $mult = (int) ($m ? $m->multiplier : 0);

+                        return $mult > 0 ? max(1, (int) ($Booking->behaelter / $mult)) : (int) $Booking->behaelter;

+                    }

+                    return (int) $Booking->behaelter;

+                })(),

             ]),

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

             'buchen' => [

                 'buchbar' => (boolean) $intAvailableBehaelter,

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

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

                 'sorten' => $arrSortenAvailable,

                 'ernteart' => $arrErnteartAvailable,

                 'lage' => $arrLagenAvailable,

@@ -463,23 +504,41 @@ class SlotAjaxController extends AbstractController

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

         }

-        // Form validation

+        // Form validation and unit capacity

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

         {

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

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

+            $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())

             {

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

             }

         }

         $arrError = [];

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

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

         {

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

             {

                 $arrError = [$field];

             }

         }

+        // Require either (unit selection (allowing 0) with unit_amount, or behaelter fallback)

+        $postedUnitId = Input::post('unit_id');

+        $hasUnitId = ($postedUnitId !== null && $postedUnitId !== '' && $postedUnitId !== false);

+        if (!$hasUnitId || empty(Input::post('unit_amount')))

+        {

+            if (empty(Input::post('behaelter')))

+            {

+                $arrError[] = 'behaelter';

+            }

+        }

         if (count($arrError))

         {

@@ -523,11 +582,24 @@ class SlotAjaxController extends AbstractController

             $arrData['approved_on'] = $time;

         }

+        // 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' => Input::post('behaelter'),

+            'behaelter' => $baseUnits,

+            'unit_id' => $unitId,

+            'unit_amount' => $unitAmount,

             'sorten' => $arrSorten,

             'ernteart' => $arrErnteart,

             'lage' => $arrLage

@@ -588,20 +660,37 @@ class SlotAjaxController extends AbstractController

         /** @var WeinanlieferungSlotsModel $Slot */

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

         {

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

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

+            $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)

             {

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

             }

         }

         $arrError = [];

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

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

         {

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

             {

                 $arrError = [$field];

             }

         }

+        $postedUnitId = Input::post('unit_id');

+        $hasUnitId = ($postedUnitId !== null && $postedUnitId !== '' && $postedUnitId !== false);

+        if (!$hasUnitId || empty(Input::post('unit_amount')))

+        {

+            if (empty(Input::post('behaelter')))

+            {

+                $arrError[] = 'behaelter';

+            }

+        }

         if (count($arrError))

         {

@@ -644,7 +733,18 @@ class SlotAjaxController extends AbstractController

         }

         $Reservation->tstamp = $time;

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

+        // 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->unit_id = $unitId;

+        $Reservation->unit_amount = $unitAmount;

         $Reservation->sorten = $arrSorten;

         $Reservation->ernteart = $arrErnteart;

         $Reservation->lage = $arrLage;

@@ -768,6 +868,24 @@ class SlotAjaxController extends AbstractController

             'standort' => $Standort,

             'checkin' => [

                 'behaelter' => $Booking->behaelter,

+                'expected' => ($Booking->unit_amount ?? 0) > 0 ? (int)$Booking->unit_amount : (int)$Booking->behaelter,

+                'unit_title' => (function() use ($Booking) {

+                    if ((int)$Booking->unit_id > 0) {

+                        $m = WeinanlieferungUnitModel::findByPk((int)$Booking->unit_id);

+                        return $m ? (string)$m->title : ($GLOBALS['TL_LANG']['MSC']['wa_unit_base'] ?? 'Behälter');

+                    }

+                    return $GLOBALS['TL_LANG']['MSC']['wa_unit_base'] ?? 'Behälter';

+                })(),

+                'unit_amount_display' => (function() use ($Booking) {

+                    if ((int)$Booking->unit_id > 0) {

+                        $m = WeinanlieferungUnitModel::findByPk((int)$Booking->unit_id);

+                        $amount = (int) ($Booking->unit_amount ?: 0);

+                        if ($amount > 0) return $amount;

+                        $mult = (int) ($m ? $m->multiplier : 0);

+                        return $mult > 0 ? max(1, (int) ($Booking->behaelter / $mult)) : (int) $Booking->behaelter;

+                    }

+                    return (int) $Booking->behaelter;

+                })(),

             ],

             'member' => $memberModel ? $memberModel->row() : null,

             'current_member' => $currentMemberModel ? $currentMemberModel->row() : null

@@ -801,14 +919,15 @@ class SlotAjaxController extends AbstractController

         // Validate that we have the correct number of behaelter numbers

         $behaelterNumbers = Input::post('behaelter_numbers');

-        if (!is_array($behaelterNumbers) || count($behaelterNumbers) != $Booking->behaelter)

+        $expectedCount = ($Booking->unit_amount ?? 0) > 0 ? (int)$Booking->unit_amount : (int)$Booking->behaelter;

+        if (!is_array($behaelterNumbers) || count($behaelterNumbers) != $expectedCount)

         {

             // Prepare form data to preserve input values

             $formData = [

                 'behaelter_numbers' => $behaelterNumbers ?: [],

                 'member_numbers' => Input::post('member_numbers') ?: []

             ];

-            return $this->renderCheckin(false, '<div class="toast toast--danger mx-0">Bitte wählen Sie für jeden Behälter eine Nummer aus.</div>', $formData);

+            return $this->renderCheckin(false, '<div class="toast toast--danger mx-0">Bitte wählen Sie für jede Einheit eine Nummer aus.</div>', $formData);

         }

         // Get member numbers from the form

@@ -1117,4 +1236,39 @@ class SlotAjaxController extends AbstractController

         // If we got here, the number is valid

         return new Response(json_encode(['valid' => true]), 200, ['Content-Type' => 'application/json']);

     }

+

+    protected function getAvailableUnitsForCapacity(int $availableBaseUnits): array

+    {

+        // Always include the base unit (Behälter) with multiplier 1

+        $units = [];

+        $units[] = [

+            'id' => 0,

+            'title' => $GLOBALS['TL_LANG']['MSC']['wa_unit_base'] ?? 'Behälter',

+            'multiplier' => 1,

+            'max_amount' => $availableBaseUnits, // one check-in per base unit

+        ];

+

+        // Load custom units from DB

+        if (($all = WeinanlieferungUnitModel::findAll()) !== null) {

+            foreach ($all as $unit) {

+                $mult = (int)($unit->multiplier ?? 0);

+                if ($mult < 1) {

+                    continue; // skip invalid

+                }

+                // A unit fits if at least one of it can be placed into remaining capacity

+                $maxAmount = intdiv(max(0, $availableBaseUnits), $mult);

+                if ($maxAmount < 1) {

+                    continue; // does not fit current capacity

+                }

+                $units[] = [

+                    'id' => (int)$unit->id,

+                    'title' => (string)$unit->title,

+                    'multiplier' => $mult,

+                    'max_amount' => $maxAmount,

+                ];

+            }

+        }

+

+        return $units;

+    }

 }

@@ -98,6 +98,21 @@ class WeinanlieferungBookedListModuleController extends AbstractFrontendModuleCo

                         $arrLage = $Lage->fetchEach('title');

                     }

+                    // Compute unit display fields for frontend list

+                    $unitTitle = $GLOBALS['TL_LANG']['MSC']['wa_unit_base'] ?? 'Behälter';

+                    $unitAmountDisplay = (int) $booking->behaelter;

+                    if (!empty($booking->unit_id) && (int)$booking->unit_id > 0) {

+                        $unitModel = \vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungUnitModel::findByPk((int)$booking->unit_id);

+                        if (null !== $unitModel) {

+                            $unitTitle = (string)$unitModel->title;

+                        }

+                        $unitAmountDisplay = (int) ($booking->unit_amount ?: 0);

+                        if ($unitAmountDisplay <= 0) {

+                            $mult = (int) ($unitModel ? $unitModel->multiplier : 0);

+                            $unitAmountDisplay = $mult > 0 ? max(1, (int) ($booking->behaelter / $mult)) : (int) $booking->behaelter;

+                        }

+                    }

+

                     $arrData['days'][$day->dayBegin][] = array_merge($booking->row(), [

                         'sorte'              => $arrSorten,

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

@@ -106,6 +121,8 @@ class WeinanlieferungBookedListModuleController extends AbstractFrontendModuleCo

                         'standort' => $strStandort,

                         'ernteart' => $arrErnteart,

                         'lage' => $arrLage,

+                        'unit_title' => $unitTitle,

+                        'unit_amount_display' => $unitAmountDisplay,

                     ]);

                 }

             }

@@ -261,9 +261,10 @@ class WeinanlieferungReservationContainerListener

             // Only perform validation if the booking is not in the past

             if (!$isInPast) {

-                // Check if the number of container numbers matches the number of booked containers

-                if (count($behaelterNumbers) != $reservation->behaelter) {

-                    throw new \Exception('Die Anzahl der Behälternummern muss mit der Anzahl der gebuchten Behälter übereinstimmen.');

+                // Check if the number of container numbers matches the number of required check-ins (unit amount or base behaelter)

+                $expectedCount = ($reservation->unit_amount ?? 0) > 0 ? (int)$reservation->unit_amount : (int)$reservation->behaelter;

+                if (count($behaelterNumbers) != $expectedCount) {

+                    throw new \Exception('Die Anzahl der Behälternummern muss mit der Anzahl der gebuchten Einheiten übereinstimmen.');

                 }

                 // Filter out the special value 9999 ("Nummer nicht bekannt") for duplicate check

new file mode 100644

@@ -0,0 +1,20 @@

+<?php

+

+declare(strict_types=1);