eSales Media Git repositories
Browse code

Add bookable timeframe start and stop times to slot notifications

Benjamin Roth authored on09/09/2024 12:33:03
Showing2 changed files
contao/config/config.php
History View file @b0f24a7
... ... 
@@ -138,6 +138,8 @@ $GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['weinanlieferung']['wa_slot
138 138 
         'slot_ncsent',
139 139 
         'slot_behaelter',
140 140 
         'slot_behaelterBuchbar',
141 
+        'slot_buchbar_ab',
142 
+        'slot_buchbar_bis',
141 143 
     ),
142 144 
     'email_text'    => array
143 145 
     (
... ... 
@@ -154,6 +156,8 @@ $GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['weinanlieferung']['wa_slot
154 156 
         'slot_lage',
155 157 
         'slot_anmerkungen',
156 158 
         'slot_ncsent',
159 
+        'slot_buchbar_ab',
160 
+        'slot_buchbar_bis',
157 161 
     ),
158 162 
     'email_html'    => array
159 163 
     (
... ... 
@@ -170,5 +174,7 @@ $GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['weinanlieferung']['wa_slot
170 174 
         'slot_lage',
171 175 
         'slot_anmerkungen',
172 176 
         'slot_ncsent',
177 
+        'slot_buchbar_ab',
178 
+        'slot_buchbar_bis',
173 179 
     )
174 180 
 );
src/Cron/SendSlotChangeNotificationJob.php
History View file @b0f24a7
... ... 
@@ -76,7 +76,7 @@ class SendSlotChangeNotificationJob
76 76 
                 $Members = MemberModel::findBy(array("(".implode(' OR ',$memberGroupSqlFragment).")","(start='' OR start<='$time') AND (stop='' OR stop>'" . ($time + 60) . "') AND disable=''"),null);
77 77
78 78 
                 // Do we have updateable items
79 
-                $Slots = $this->db->executeQuery("SELECT s.id, s.date, s.time, s.duration, s.behaelter, s.sorten, s.ernteart, s.lage, s.anmerkungen, s.nc_sent FROM tl_vr_wa_slot s WHERE s.pid = ? AND s.nc_sent < s.tstamp AND s.published='1' AND (buchbar_ab='' OR buchbar_ab<='$time') AND (buchbar_bis='' OR buchbar_bis>'" . ($time + 60) . "')",[$Location->id]);
79 
+                $Slots = $this->db->executeQuery("SELECT s.id, s.date, s.time, s.duration, s.behaelter, s.sorten, s.ernteart, s.lage, s.anmerkungen, s.nc_sent, s.buchbar_ab, s.buchbar_bis FROM tl_vr_wa_slot s WHERE s.pid = ? AND s.nc_sent < s.tstamp AND s.published='1' AND (buchbar_ab='' OR buchbar_ab<='$time') AND (buchbar_bis='' OR buchbar_bis>'" . ($time + 60) . "')",[$Location->id]);
80 80
81 81 
                 // Load groups and notification models if we have news to share
82 82 
                 if ($Members !== null && $Slots->rowCount() && ($Notification = Notification::findByPk($Location->nc_notification_slots)) !== null)
... ... 
@@ -139,6 +139,8 @@ class SendSlotChangeNotificationJob
139 139 
                                 'slot_lage'             => implode(', ',$arrLageAvailable),
140 140 
                                 'slot_anmerkungen'      => $Slot['anmerkungen'],
141 141 
                                 'slot_ncsent'           => $Slot['nc_sent'],
142 
+                                'slot_buchbar_ab'       => Date::parse(Date::getNumericDatimFormat(),$Slot['buchbar_ab']),
143 
+                                'slot_buchbar_bis'      => Date::parse(Date::getNumericDatimFormat(),$Slot['buchbar_bis']),
142 144 
                                 'admin_email'           => $admin_email,
143 145 
                             ),
144 146 
                                 $GLOBALS['TL_LANGUAGE']);