Display menu with same date logic everywhere

carsso · Dec 6, 2024 · faaf05e · faaf05e
1 parent db6b0c7
commit faaf05e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
@@ -22,15 +22,17 @@ public function index()
     }
     public function menu($dateString = null)
     {
-        if(!$dateString) {
-            $dateString = date('Y-m-d');
+        $dateToday = strtotime('today 10 am');
+        $date = $dateToday;
+        if(date('H') >= 15) {
+            $date = strtotime('+1 day', $date);
         }
-        $date = strtotime('today 10 am');
         if(preg_match('/^\d{4}-\d{2}-\d{2}$/', $dateString)) {
             $date = strtotime($dateString.' 10 am');
         }
-        if(date('N', $date) >= 6) {
-            $date = strtotime('+1 week', $date);
+        $menu = Menu::where('date', '>=', date('Y-m-d', $date))->orderBy('date', 'asc')->first();
+        if($menu) {
+            $date = strtotime($menu->date.' 10 am');
         }
         $mondayTime = strtotime('monday this week 10 am', $date);
         $sundayTime = strtotime('sunday this week 10 am', $date);

diff --git a/app/Http/Controllers/MenuController.php b/app/Http/Controllers/MenuController.php
@@ -15,18 +15,17 @@ class MenuController extends Controller
 {
     public function menu($dateString = null)
     {
-        if(!$dateString) {
-            $dateString = date('Y-m-d');
-        }
-        $date = strtotime('today 10 am');
+        $dateToday = strtotime('today 10 am');
+        $date = $dateToday;
         if(date('H') >= 15) {
             $date = strtotime('+1 day', $date);
         }
         if(preg_match('/^\d{4}-\d{2}-\d{2}$/', $dateString)) {
             $date = strtotime($dateString.' 10 am');
         }
-        if(date('N', $date) >= 6) {
-            $date = strtotime('+1 week', $date);
+        $menu = Menu::where('date', '>=', date('Y-m-d', $date))->orderBy('date', 'asc')->first();
+        if($menu) {
+            $date = strtotime($menu->date.' 10 am');
         }
         $mondayTime = strtotime('monday this week 10 am', $date);
         $sundayTime = strtotime('sunday this week 10 am', $date);