@@ -170,3 +170,90 @@ $GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['weinanlieferung']['wa_slot

         'slot_ncsent',

     )

 );

+

+$GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['weinanlieferung']['wa_booking_checkin'] = array

+(

+    'recipients'    => array

+    (

+        'member_email', // The email address of the recipient

+        'admin_email' // The email address of the recipient

+    ),

+    'email_sender_address'    => array

+    (

+        'member_email', // The email address of the recipient

+        'admin_email' // The email address of the recipient

+    ),

+    'email_sender_name'    => array

+    (

+        'member_email', // The email address of the recipient

+        'admin_email' // The email address of the recipient

+    ),

+    'email_subject'        => array

+    (

+        'domain',

+        'member_email',

+        'admin_email',

+        'slot_date',

+        'slot_time',

+        'slot_standort',

+        'booking_ncsent',

+        'booking_approved',

+        'booking_approved_on',

+        'booking_checked_in',

+        'booking_checked_in_on',

+        'booking_checked_in_ncsent',

+        'booking_checkin_incomplete',

+    ),

+    'email_text'    => array

+    (

+        'member_firstname', // The firstname of the recipient

+        'member_lastname', // The lastname of the recipient

+        'member_memberno', // The member account number of the recipient

+        'slot_date',

+        'slot_time',

+        'slot_standort',

+        'slot_behaelter',

+        'slot_sorten',

+        'slot_ernteart',

+        'slot_lage',

+        'slot_anmerkungen',

+        'booking_ncsent',

+        'booking_behaelter',

+        'booking_sorten',

+        'booking_ernteart',

+        'booking_lage',

+        'booking_approved',

+        'booking_approved_on',

+        'booking_checked_in',

+        'booking_checked_in_on',

+        'booking_checked_in_ncsent',

+        'booking_checkin_incomplete',

+        'booking_behaelter_numbers',

+    ),

+    'email_html'    => array

+    (

+        'member_firstname', // The firstname of the recipient

+        'member_lastname', // The lastname of the recipient

+        'member_memberno', // The member account number of the recipient

+        'slot_date',

+        'slot_time',

+        'slot_standort',

+        'slot_behaelter',

+        'slot_sorten',

+        'slot_ernteart',

+        'slot_lage',

+        'slot_anmerkungen',

+        'booking_ncsent',

+        'booking_behaelter',

+        'booking_sorten',

+        'booking_ernteart',

+        'booking_lage',

+        'booking_approved',

+        'booking_approved_on',

+        'booking_checked_in',

+        'booking_checked_in_on',

+        'booking_checked_in_ncsent',

+        'booking_checkin_incomplete',

+        'booking_behaelter_numbers',

+    )

+);

@@ -96,13 +96,14 @@ $GLOBALS['TL_DCA']['tl_vr_wa_reservation'] = array

     // Palettes

     'palettes' => array

     (

-        '__selector__' => array(),

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

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

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

     ),

     // Subpalettes

     'subpalettes' => array

     (

+        'checked_in' => 'behaelter_numbers'

     ),

     // Fields

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

         (

             'exclude'                 => true,

             'inputType'               => 'checkbox',

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

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

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

         ),

         'checked_in_on' => array

@@ -111,7 +111,7 @@ $GLOBALS['TL_DCA']['tl_vr_wa_standort'] = array

     // Subpalettes

     'subpalettes' => array

     (

-        'nc_enable' => 'nc_notification,nc_notification_slots,nc_notification_groups'

+        'nc_enable' => 'nc_notification,nc_notification_checkin,nc_notification_slots,nc_notification_groups'

     ),

     // Fields

@@ -159,6 +159,13 @@ $GLOBALS['TL_DCA']['tl_vr_wa_standort'] = array

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

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

         ),

+        'nc_notification_checkin' => array

+        (

+            'exclude'                   => true,

+            'inputType'                 => 'select',

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

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

+        ),

         'nc_notification_groups' => array

         (

             'exclude'                 => true,

@@ -13,3 +13,5 @@ $GLOBALS['TL_LANG']['tl_nc_notification']['type']['wa_booking_change'][0] = 'Neu

 $GLOBALS['TL_LANG']['tl_nc_notification']['type']['wa_booking_change'][1] = 'Wenn eine neue Buchung eingeht, oder eine vorhandene Buchung geändert wird.';

 $GLOBALS['TL_LANG']['tl_nc_notification']['type']['wa_slot_change'][0] = 'Neuer buchbarer Slot / Slot-Aktualisierung';

 $GLOBALS['TL_LANG']['tl_nc_notification']['type']['wa_slot_change'][1] = 'Wenn eine neuer buchbarer Slot zur Verfügung steht, oder ein vorhandener Slot geändert wird.';

+$GLOBALS['TL_LANG']['tl_nc_notification']['type']['wa_booking_checkin'][0] = 'Check-In erfolgt';

+$GLOBALS['TL_LANG']['tl_nc_notification']['type']['wa_booking_checkin'][1] = 'Wenn der Check-In einer Buchung erfolgreich durchgeführt wurde.';

@@ -16,6 +16,8 @@ $GLOBALS['TL_LANG']['tl_vr_wa_standort']['nc_notification'][0] = 'Benachrichtigu

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['nc_notification'][1] = 'Die zu versendende Benachrichtigung.';

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['nc_notification_slots'][0] = 'Benachrichtigung für Slots';

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['nc_notification_slots'][1] = 'Die zu versendende Benachrichtigung für Slot-Änderungen.';

+$GLOBALS['TL_LANG']['tl_vr_wa_standort']['nc_notification_checkin'][0] = 'Benachrichtigung nach Check-In';

+$GLOBALS['TL_LANG']['tl_vr_wa_standort']['nc_notification_checkin'][1] = 'Die zu versendende Benachrichtigung nach Check-In.';

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['nc_notification_groups'][0] = 'Mitgliedergruppen';

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['nc_notification_groups'][1] = 'Die Mitgliedergruppen, die benachrichtigt werden sollen.';

 $GLOBALS['TL_LANG']['tl_vr_wa_standort']['number_ranges'][0] = 'Büttennummern';

@@ -63,7 +63,7 @@ class SendCheckInNotificationJob

                 // The key difference from SendBookingChangeNotificationJob is the WHERE clause:

                 // We look for r.checked_in = '1' AND r.checked_in_on > r.checked_in_nc_sent

                 $Bookings = $this->db->executeQuery(

-                    "SELECT r.id, r.pid, r.uid, r.behaelter, r.sorten, r.lage, r.ernteart, r.upload, r.checked_in_nc_sent,

+                    "SELECT r.id, r.pid, r.uid, r.behaelter, r.sorten, r.lage, r.ernteart, r.upload, r.nc_sent, r.checked_in_nc_sent,

                     s.date as slot_date, s.time as slot_time, s.behaelter as slot_behaelter,

                     s.sorten as slot_sorten, s.ernteart as slot_ernteart, s.lage as slot_lage,

                     s.anmerkungen as slot_anmerkungen, r.approved, r.approved_on, r.checked_in,

@@ -75,7 +75,7 @@ class SendCheckInNotificationJob

                 );

                 // Load notification model if we have check-ins to notify

-                if ($Bookings->rowCount() && ($Notification = Notification::findByPk($Location->nc_notification)) !== null) {

+                if ($Bookings->rowCount() && ($Notification = Notification::findByPk($Location->nc_notification_checkin)) !== null) {

                     foreach ($Bookings->iterateAssociative() as $Booking) {

                         // Get member

                         $Member = MemberModel::findOneBy(

@@ -162,6 +162,33 @@ class SendCheckInNotificationJob

                                 }

                             }

+                            // Behaelter numbers handling

+                            $blnIsIncomplete = false;

+                            $arrBehaelterNumbers = [];

+

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

+                                    ];

+                                }

+                            }

+                            foreach ($behaelterNumbers as $behaelterNumber) {

+                                if ($behaelterNumber['behaelter'] === '9999') {

+                                    $blnIsIncomplete = true;

+                                }

+                                $arrBehaelterNumbers[] = $behaelterNumber['behaelter'] . ' [Mitglied: ' . $behaelterNumber['member'] . ']';

+                            }

+

                             // Send notification with all booking data

                             // We include the check-in specific fields: checked_in, checked_in_on, behaelter_numbers

                             $Notification->send(

@@ -178,7 +205,7 @@ class SendCheckInNotificationJob

                                     'slot_ernteart'      => implode(', ', $arrErnteartAvailable),

                                     'slot_lage'          => implode(', ', $arrLageAvailable),

                                     'slot_anmerkungen'   => $Booking['slot_anmerkungen'],

-                                    'booking_checked_in_ncsent'     => $Booking['checked_in_nc_sent'],

+                                    'booking_ncsent'     => $Booking['nc_sent'],

                                     'booking_behaelter'  => $Booking['behaelter'],

                                     'booking_sorten'     => implode(', ', $arrSortenBooked),

                                     'booking_ernteart'   => implode(', ', $arrErnteartBooked),

@@ -187,7 +214,9 @@ class SendCheckInNotificationJob

                                     'booking_approved_on'=> $Booking['approved_on'],

                                     'booking_checked_in' => $Booking['checked_in'],

                                     'booking_checked_in_on' => $Booking['checked_in_on'],

-                                    'booking_behaelter_numbers' => $Booking['behaelter_numbers'],

+                                    'booking_checked_in_ncsent'     => $Booking['checked_in_nc_sent'],

+                                    'booking_checkin_incomplete'     => $blnIsIncomplete,

+                                    'booking_behaelter_numbers' => \implode(', ', $arrBehaelterNumbers),

                                     'admin_email'        => $admin_email,

                                 ],

                                 $GLOBALS['TL_LANGUAGE']

@@ -70,6 +70,27 @@ class WeinanlieferungStandortContainerListener

     }

     /**

+     * @Callback(table="tl_vr_wa_standort", target="fields.nc_notification_checkin.options")

+     */

+    public function onNcNotificationCheckinOptionsCallback(DataContainer $dc)

+    {

+        $arrOptions = [];

+        $objNotifications = $this->db->executeQuery("SELECT id,title FROM tl_nc_notification WHERE type='wa_booking_checkin' ORDER BY title");

+

+        if (!$objNotifications->rowCount())

+        {

+            return $arrOptions;

+        }

+

+        foreach ($objNotifications->fetchAllAssociative() as $notification)

+        {

+            $arrOptions[$notification['id']] = $notification['title'];

+        }

+

+        return $arrOptions;

+    }

+

+    /**

      * @Callback(table="tl_vr_wa_standort", target="fields.number_ranges.save")

      */

     public function onNumberRangesSaveCallback($varValue, DataContainer $dc)