Minor improvements

Signed-off-by: Sam Poyigi <[email protected]>

classes/Location.php

@@ -271,16 +271,18 @@ public function orderDateTime()
         return make_carbon($dateTime);
     }
 
-    public function scheduleTimeslot()
+    public function scheduleTimeslot($orderType = null)
     {
-        $orderType = $this->orderType();
+        if (is_null($orderType))
+            $orderType = $this->orderType();
+
         if (array_key_exists($orderType, $this->scheduleCache))
             return $this->scheduleCache[$orderType];
 
         $leadMinutes = $this->model->getOption($orderType.'_add_lead_time')
             ? $this->orderLeadTime() : 0;
 
-        $result = $this->getOrderType()->getSchedule()->getTimeslot(
+        $result = $this->getOrderType($orderType)->getSchedule()->getTimeslot(
             $this->orderTimeInterval(), null, $leadMinutes
         );
 

components/LocalList.php

@@ -263,13 +263,8 @@ protected function filterQueryResult($collection, $searchDeliveryAreas = FALSE)
 
     protected function buildPageUrl()
     {
-        $url = page_url().'?';
-        if ($searchTerm = $this->getSearchTerm())
-            $url .= $this->property('searchParamName').'='.$searchTerm.'&';
-
-        if ($sortBy = $this->getSortBy())
-            $url .= $this->property('sortByParamName').'='.$sortBy.'&';
+        $query = array_except(request()->query(), [$this->property('orderTypeParamName')]);
 
-        return $url;
+        return page_url().'?'.http_build_query($query).'&';
     }
 }

components/Menu.php

@@ -236,15 +236,16 @@ public function createMenuItemObject($menuItem)
 
         $mealtimes = optional($menuItem->mealtimes)->where('mealtime_status', 1);
         $object->hasMealtime = count($mealtimes);
-        $object->mealtimeIsNotAvailable = !$menuItem->isAvailable(Location::orderDateTime());
+        $object->mealtimeIsAvailable = $menuItem->isAvailable(Location::orderDateTime());
+        $object->mealtimeIsNotAvailable = !$object->mealtimeIsAvailable;
 
         $object->mealtimeTitles = [];
         foreach ($mealtimes ?? [] as $mealtime) {
             $object->mealtimeTitles[] = sprintf(
                 lang('igniter.local::default.text_mealtime'),
                 $mealtime->mealtime_name,
-                $mealtime->start_time,
-                $mealtime->end_time
+                now()->setTimeFromTimeString($mealtime->start_time)->isoFormat(lang('system::lang.moment.time_format')),
+                now()->setTimeFromTimeString($mealtime->end_time)->isoFormat(lang('system::lang.moment.time_format'))
             );
         }
 

language/en/default.php

@@ -73,7 +73,7 @@
     'label_hide_min_order_amount' => 'Hide Min. Order Amount',
     'label_lang' => 'Language Line',
     'label_status' => 'Status',
-    'label_search_query' => 'Enter your address or postcode to order',
+    'label_search_query' => 'Enter delivery address',
     'label_menu_search' => 'Search menu items.',
     'label_redirect' => 'Page to redirect to when no location is selected',
     'label_menu_page' => 'Menus Page',