@@ -218,8 +218,25 @@ $GLOBALS['TL_DCA']['tl_vr_wa_reservation'] = array

         'behaelter_numbers' => array

         (

             'exclude'                 => true,

-            'inputType'               => 'text',

-            'eval'                    => array('tl_class'=>'clr', 'preserveTags'=>true),

+            'inputType'               => 'multiColumnWizard',

+            'eval'                    => array(

+                'tl_class' => 'clr',

+                'columnFields' => array

+                (

+                    'behaelter' => array

+                    (

+                        'label' => &$GLOBALS['TL_LANG']['MSC']['wa_behaelter_number'],

+                        'inputType' => 'text',

+                        'eval' => array('style' => 'width:200px', 'mandatory' => true, 'rgxp' => 'natural')

+                    ),

+                    'member' => array

+                    (

+                        'label' => &$GLOBALS['TL_LANG']['MSC']['wa_member_number'],

+                        'inputType' => 'text',

+                        'eval' => array('style' => 'width:200px', 'rgxp' => 'natural')

+                    )

+                )

+            ),

             'sql'                     => "text NULL"

         ),

     )

@@ -10,6 +10,8 @@

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

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

+$GLOBALS['TL_LANG']['MSC']['wa_behaelter_number'] = 'Behälternummer';

+$GLOBALS['TL_LANG']['MSC']['wa_member_number'] = 'Mitgliedsnummer';

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

 $GLOBALS['TL_LANG']['MSC']['wa_approval_pending'] = 'Freigabe ausstehend';

@@ -62,14 +62,25 @@

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

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

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

-                            <fieldset>

-                                <label for="behaelter-number-{{ i }}"><strong>Behälter {{ i }}</strong><sup class="text-danger">*</sup></label>

-                                <select id="behaelter-number-{{ i }}" name="behaelter_numbers[]" required data-loaded="false">

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

-                                    <!-- Options will be loaded via Ajax when the select is focused -->

-                                </select>

-                            </fieldset>

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

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

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

+                                    <fieldset>

+                                        <label for="behaelter-number-{{ i }}"><strong>Behälter {{ i }}</strong><sup class="text-danger">*</sup></label>

+                                        <select id="behaelter-number-{{ i }}" name="behaelter_numbers[]" required data-loaded="false">

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

+                                            <!-- Options will be loaded via Ajax when the select is focused -->

+                                        </select>

+                                    </fieldset>

+                                </div>

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

+                                    <fieldset>

+                                        <label for="member-number-{{ i }}"><strong>Mitgliedsnummer</strong></label>

+                                        <input type="text" id="member-number-{{ i }}" name="member_numbers[]" value="{{ current_member.memberno|default('') }}" placeholder="Mitgliedsnummer">

+                                        <p class="text-sm text-muted">Leer lassen für aktuelle Mitgliedsnummer: {{ current_member.memberno|default('Keine') }}</p>

+                                    </fieldset>

+                                </div>

+                            </div>

                         </div>

                     {% endfor %}

                 </div>

@@ -142,7 +142,9 @@

                                                     </div>

                                                     <div class="col-10 behaelter_nummern">

                                                         <div class="t-label">Eingecheckte Behälternummern</div>

-                                                        {{ booking.behaelter_numbers|join(', ') }}

+                                                        {% for behaelter in booking.behaelter_numbers %}

+                                                            {% if loop.index != 1 %}, {% endif %}{{ behaelter.behaelter }} [M:{{ behaelter.member }}]

+                                                        {% endfor %}

                                                     </div>

                                                 {% endif %}

                                                 <div class="col px-1 u-text-right action">

@@ -19,6 +19,7 @@ use Contao\Date;

 use Contao\Environment;

 use Contao\FrontendUser;

 use Contao\Input;

+use Contao\MemberModel;

 use Contao\StringUtil;

 use Contao\System;

 use Doctrine\DBAL\Connection;

@@ -273,6 +274,23 @@ class WeinanlieferungBookingsController extends AbstractController

                         $strStandort = $Standort->title;

                     }

+                    $behaelterNumbers = json_decode($booking->behaelter_numbers, true);

+                    $isNewFormat = isset($behaelterNumbers[0]) && is_array($behaelterNumbers[0]) && isset($behaelterNumbers[0]['behaelter']);

+

+                    // If it's the old format, convert it to the new format for compatibility

+                    if (!$isNewFormat) {

+                        $oldFormat = $behaelterNumbers;

+                        $memberModel = MemberModel::findById($booking->uid);

+

+                        $behaelterNumbers = [];

+                        foreach ($oldFormat as $number) {

+                            $behaelterNumbers[] = [

+                                'behaelter' => $number,

+                                'member' => $memberModel->memberno

+                            ];

+                        }

+                    }

+

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

                         'sorte'              => $arrSorten,

                         'ernteart' => $arrErnteart,

@@ -280,7 +298,7 @@ class WeinanlieferungBookingsController extends AbstractController

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

                         'standort' => $strStandort,

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

-                        'behaelter_numbers' => \json_decode($booking->behaelter_numbers)

+                        'behaelter_numbers' => $behaelterNumbers

                     ]);

                 }

             }

@@ -24,6 +24,7 @@ use Contao\FormFileUpload;

 use Contao\Frontend;

 use Contao\FrontendUser;

 use Contao\Input;

+use Contao\MemberModel;

 use Contao\StringUtil;

 use Contao\System;

 use Doctrine\DBAL\Connection;

@@ -746,6 +747,10 @@ class SlotAjaxController extends AbstractController

             }

         }

+        // Load the member model for the booking's user

+        $memberModel = MemberModel::findById($Booking->uid);

+        $currentMemberModel = MemberModel::findById(FrontendUser::getInstance()->id);

+

         $arrData = array_merge($arrData, [

             'modal' => $blnModal,

             'id' => $Booking->id,

@@ -760,7 +765,9 @@ class SlotAjaxController extends AbstractController

             'standort' => $Standort,

             'checkin' => [

                 'behaelter' => $Booking->behaelter,

-            ]

+            ],

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

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

         ]);

         if (!empty($error))

@@ -791,6 +798,19 @@ class SlotAjaxController extends AbstractController

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

         }

+        // Get member numbers from the form

+        $memberNumbers = Input::post('member_numbers');

+

+        // If member numbers are not provided or not an array, initialize an empty array

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

+        {

+            $memberNumbers = array_fill(0, count($behaelterNumbers), '');

+        }

+

+        // Get the current member's number to use as fallback

+        $currentMember = MemberModel::findById(FrontendUser::getInstance()->id);

+        $currentMemberNo = $currentMember ? $currentMember->memberno : '';

+

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

         $numbersForDuplicateCheck = array_filter($behaelterNumbers, function($number) {

             return $number !== '9999';

@@ -802,11 +822,21 @@ class SlotAjaxController extends AbstractController

             return $this->renderCheckin(false, '<div class="toast toast--danger mx-0">Jede Nummer kann nur einmal verwendet werden.</div>');

         }

+        // Create combined array with behaelter numbers and member numbers

+        $combinedData = [];

+        foreach ($behaelterNumbers as $index => $behaelterNumber) {

+            $memberNumber = !empty($memberNumbers[$index]) ? $memberNumbers[$index] : $currentMemberNo;

+            $combinedData[] = [

+                'behaelter' => $behaelterNumber,

+                'member' => $memberNumber

+            ];

+        }

+

         // Save the check-in data

         $time = time();

         $Booking->checked_in = '1';

         $Booking->checked_in_on = $time;

-        $Booking->behaelter_numbers = json_encode($behaelterNumbers);

+        $Booking->behaelter_numbers = json_encode($combinedData);

         $Booking->tstamp = $time;

         $Booking->save();

@@ -115,6 +115,22 @@ class CheckInCompletedListener implements EventSubscriberInterface

             return;

         }

+        // Check if we have the new format (array of objects with behaelter and member)

+        // or the old format (simple array of behaelter numbers)

+        $isNewFormat = isset($behaelterNumbers[0]) && is_array($behaelterNumbers[0]) && isset($behaelterNumbers[0]['behaelter']);

+

+        // If it's the old format, convert it to the new format for compatibility

+        if (!$isNewFormat) {

+            $oldFormat = $behaelterNumbers;

+            $behaelterNumbers = [];

+            foreach ($oldFormat as $number) {

+                $behaelterNumbers[] = [

+                    'behaelter' => $number,

+                    'member' => $memberModel->memberno

+                ];

+            }

+        }

+

         // Format check-in date

         $checkInDate = date('d.m.Y', $reservationData['checked_in_on']);

@@ -166,16 +182,41 @@ class CheckInCompletedListener implements EventSubscriberInterface

             'vollernter' => 'V'

         ];

-        // Prepare CSV data

-        $csvData = [];

+        // Group CSV data by member number

+        $csvDataByMember = [];

+        $memberNames = []; // Store member names for logging

+

+        // For each behaelter, create a line in the CSV and group by member number

+        foreach ($behaelterNumbers as $behaelterData) {

+            // Get behaelter number and member number from the data

+            $behaelterNumber = $isNewFormat ? $behaelterData['behaelter'] : $behaelterData;

+            $memberNo = $isNewFormat && isset($behaelterData['member']) ? $behaelterData['member'] : $memberModel->memberno;

-        // For each behaelter, create a line in the CSV

-        foreach ($behaelterNumbers as $behaelterNumber) {

             // Skip special value 9999 if needed

             if ($behaelterNumber === '9999') {

                 continue;

             }

+            // If member number is empty, use the booking member's number

+            if (empty($memberNo)) {

+                $memberNo = $memberModel->memberno;

+            }

+

+            // Get member name - use the booking member's name as default

+            $memberName = $memberModel->firstname . ' ' . $memberModel->lastname;

+

+            // If the member number is different from the booking member's number,

+            // try to find the corresponding member to get their name

+            if ($memberNo !== $memberModel->memberno) {

+                $otherMember = MemberModel::findByMemberno($memberNo);

+                if ($otherMember) {

+                    $memberName = $otherMember->firstname . ' ' . $otherMember->lastname;

+                }

+            }

+

+            // Store member name for logging

+            $memberNames[$memberNo] = $memberName;

+

             // Use the first sorte, leseart, and lage if available

             $rebsorteId = !empty($sortenData) ? $sortenData[0]['rebsorte_id'] : '';

             $rebsorteTitle = !empty($sortenData) ? $sortenData[0]['rebsorte_title'] : '';

@@ -193,10 +234,14 @@ class CheckInCompletedListener implements EventSubscriberInterface

                 }

             }

-            // Create CSV line

-            $csvData[] = [

-                $memberModel->memberno, // member id

-                $memberModel->firstname . ' ' . $memberModel->lastname, // member first and lastname

+            // Create CSV line and add to the appropriate member group

+            if (!isset($csvDataByMember[$memberNo])) {

+                $csvDataByMember[$memberNo] = [];

+            }

+

+            $csvDataByMember[$memberNo][] = [

+                $memberNo, // member id (now using the member number associated with this behaelter)

+                $memberName, // member first and lastname

                 $rebsorteId, // rebsorte identifikator

                 $rebsorteTitle, // rebsorte title

                 $lageId, // lage identifikator

@@ -206,25 +251,47 @@ class CheckInCompletedListener implements EventSubscriberInterface

                 $ernteart, // ernteart (H for handlese, V for vollernter)

                 $behaelterNumber, // behaelter number

                 $checkInDate, // check-in date

-                $reservationData['behaelter'] // behaelter amount for the whole checked-in booking

+//                $reservationData['behaelter'] // behaelter amount for the whole checked-in booking

             ];

         }

-        // Generate CSV file

-        $filename = $reservationData['id'] . '_' . $memberModel->memberno . '.csv';

-        $filepath = $exportDir . '/' . $filename;

+        // Generate a separate CSV file for each member

+        $generatedFiles = [];

+        foreach ($csvDataByMember as $memberNo => $csvData) {

+            // Generate CSV file with the naming scheme "bookingId_memberno.csv"

+            $filename = $reservationData['id'] . '_' . $memberNo . '.csv';

+            $filepath = $exportDir . '/' . $filename;

+            $generatedFiles[] = $filepath;

-        $file = fopen($filepath, 'w');

+            $file = fopen($filepath, 'w');

-        foreach ($csvData as $line) {

-            fputcsv($file, $line, ';');

-        }

+            foreach ($csvData as $line) {

+                $line[] = count($csvData);

+                fputcsv($file, $line, ';');

+            }

-        fclose($file);

+            fclose($file);

+

+            $this->logger->log(

+                LogLevel::INFO,

+                sprintf('CSV export created for reservation ID: %s, member: %s (%s) at %s',

+                    $reservationData['id'],

+                    $memberNo,

+                    $memberNames[$memberNo],

+                    $filepath

+                ),

+                ['contao' => new ContaoContext(__METHOD__, 'CHECK_IN_CSV_EXPORT')]

+            );

+        }

+        // Log summary of all generated files

         $this->logger->log(

             LogLevel::INFO,

-            sprintf('CSV export created for reservation ID: %s at %s', $reservationData['id'], $filepath),

+            sprintf('CSV export completed for reservation ID: %s. Generated %d file(s) for %d member(s).',

+                $reservationData['id'],

+                count($generatedFiles),

+                count($csvDataByMember)

+            ),

             ['contao' => new ContaoContext(__METHOD__, 'CHECK_IN_CSV_EXPORT')]

         );

     }

@@ -175,7 +175,34 @@ class WeinanlieferungReservationContainerListener

     {

         if (!empty($varValue))

         {

-            $varValue = implode(', ',\json_decode($varValue));

+            $decodedValue = \json_decode($varValue, true);

+

+            // Check if we have the new format (array of objects with behaelter and member)

+            // or the old format (simple array of behaelter numbers)

+            $isNewFormat = isset($decodedValue[0]) && is_array($decodedValue[0]) && isset($decodedValue[0]['behaelter']);

+

+            if ($isNewFormat) {

+                // The data is already in the correct format for the multiColumnWizard

+                return $decodedValue;

+            } else {

+                // Convert old format to new format

+                $result = [];

+

+                // Get the member associated with this reservation as fallback

+                $reservation = \vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel::findByPk($dc->id);

+                $memberId = $reservation ? $reservation->uid : 0;

+                $memberModel = \Contao\MemberModel::findById($memberId);

+                $defaultMemberNo = $memberModel ? $memberModel->memberno : '';

+

+                foreach ($decodedValue as $behaelterNumber) {

+                    $result[] = [

+                        'behaelter' => $behaelterNumber,

+                        'member' => $defaultMemberNo

+                    ];

+                }

+

+                return $result;

+            }

         }

         return $varValue;

     }

@@ -185,10 +212,9 @@ class WeinanlieferungReservationContainerListener

      */

     public function onBehaelterNumbersSaveCallback($varValue, DataContainer $dc)

     {

-        if (!empty($varValue))

+        $varValue = StringUtil::deserialize($varValue, true);

+        if (!empty($varValue) && is_array($varValue))

         {

-            $values = array_map('trim', explode(',', $varValue));

-

             // Get the reservation model

             $reservation = \vonRotenberg\WeinanlieferungBundle\Model\WeinanlieferungReservationModel::findByPk($dc->id);

             if ($reservation === null) {

@@ -204,15 +230,20 @@ class WeinanlieferungReservationContainerListener

             // Check if the booking is in the past

             $isInPast = $slot->time < time();

+            // Extract behaelter numbers from the multiColumnWizard data

+            $behaelterNumbers = array_map(function($item) {

+                return $item['behaelter'];

+            }, $varValue);

+

             // 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($values) != $reservation->behaelter) {

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

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

                 }

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

-                $numbersForDuplicateCheck = array_filter($values, function($number) {

+                $numbersForDuplicateCheck = array_filter($behaelterNumbers, function($number) {

                     return $number !== '9999';

                 });

@@ -247,8 +278,20 @@ class WeinanlieferungReservationContainerListener

                 while ($row = $result->fetchAssociative()) {

                     $numbers = json_decode($row['behaelter_numbers'], true);

                     if (is_array($numbers)) {

-                        foreach ($numbers as $number) {

-                            $usedNumbers[] = $number;

+                        // Check if we have the new format (array of objects with behaelter and member)

+                        // or the old format (simple array of behaelter numbers)

+                        $isNewFormat = isset($numbers[0]) && is_array($numbers[0]) && isset($numbers[0]['behaelter']);

+

+                        if ($isNewFormat) {

+                            // Extract just the behaelter numbers from the new format

+                            foreach ($numbers as $item) {

+                                $usedNumbers[] = $item['behaelter'];

+                            }

+                        } else {

+                            // Old format - simple array of behaelter numbers

+                            foreach ($numbers as $number) {

+                                $usedNumbers[] = $number;

+                            }

                         }

                     }

                 }

@@ -267,7 +310,27 @@ class WeinanlieferungReservationContainerListener

                 }

             }

-            $varValue = json_encode($values);

+            // Get the member associated with this reservation as fallback

+            $memberId = $reservation->uid;

+            $memberModel = \Contao\MemberModel::findById($memberId);

+            $defaultMemberNo = $memberModel ? $memberModel->memberno : '';

+

+            // Process the data from the multiColumnWizard

+            $processedData = [];

+            foreach ($varValue as $item) {

+                $behaelterNumber = $item['behaelter'];

+

+                // If member number is empty, use the default member number

+                $memberNumber = !empty($item['member']) ? $item['member'] : $defaultMemberNo;

+

+                $processedData[] = [

+                    'behaelter' => $behaelterNumber,

+                    'member' => $memberNumber

+                ];

+            }

+

+            // Return the processed data as JSON

+            return json_encode($processedData);

         }

         return $varValue;

     }