List categories based on the current location

assets/js/local.timeslot.js

@@ -52,7 +52,6 @@
         $('[data-timepicker-option]').removeClass('active')
         $('[data-timepicker-option="'+value+'"]').addClass('active')
 
-        console.log(this.selectedType, value)
         if (value === 'asap') {
             $container.addClass('hide')
         } else {

components/Categories.php

@@ -1,6 +1,7 @@
 <?php namespace SamPoyigi\Local\Components;
 
 use Admin\Models\Categories_model;
+use Location;
 use Main\Template\Page;
 
 class Categories extends \System\Classes\BaseComponent
@@ -24,26 +25,25 @@ public static function getMenusPageOptions()
     public function onRun()
     {
         $this->page['menusPage'] = $this->property('menusPage');
-        $this->page['selectedCategory'] = $this->getSelectedCategory();
-        $this->page['categories'] = $this->loadCategories();
+        $this->page['categories'] = $categories = $this->loadCategories();
+        $this->page['selectedCategory'] = $this->findSelectedCategory($categories);
     }
 
     protected function loadCategories()
     {
         $query = Categories_model::orderBy('name');
 
-        // category must have at least one menu
-//        $query->whereHasMenus();
+        $query->whereHasOrDoesntHaveLocation(Location::getId());
 
         return $query->get()->toTree();
     }
 
-    protected function getSelectedCategory()
+    protected function findSelectedCategory($categories)
     {
         $slug = $this->param('category');
         if (!strlen($slug))
             return null;
 
-        return Categories_model::whereSlug($slug)->first();
+        return $categories->where('permalink_slug', $slug)->first();
     }
 }

components/Menu.php

@@ -2,8 +2,8 @@
 
 namespace SamPoyigi\Local\Components;
 
-use Admin\Models\Categories_model;
 use Admin\Models\Menus_model;
+use Location;
 
 class Menu extends \System\Classes\BaseComponent
 {
@@ -12,10 +12,6 @@ class Menu extends \System\Classes\BaseComponent
     public function defineProperties()
     {
         return [
-            'isGrouped'       => [
-                'label' => 'Group Menu Items',
-                'type'  => 'switch',
-            ],
             'menusPerPage'    => [
                 'label'   => 'Menus Per Page',
                 'type'    => 'number',
@@ -42,13 +38,11 @@ public function defineProperties()
 
     public function onRun()
     {
-        $this->page['menuIsGrouped'] = $isGrouped = $this->property('isGrouped');
         $this->page['showMenuImages'] = $this->property('showMenuImages');
         $this->page['menuImageWidth'] = $this->property('menuImageWidth');
         $this->page['menuImageHeight'] = $this->property('menuImageHeight');
 
-        $this->page['menuList'] = $isGrouped ?
-            $this->loadGroupedList() : $this->loadList();
+        $this->page['menuList'] = $this->loadList();
     }
 
     protected function loadList()
@@ -57,33 +51,10 @@ protected function loadList()
             'page'      => $this->param('page'),
             'pageLimit' => $this->property('menusPerPage'),
             'sort'      => $this->property('sort', 'menu_priority asc'),
+            'location'  => Location::getId(),
             'category'  => $this->param('category'),
         ]);
 
         return $list;
     }
-
-    protected function loadGroupedList()
-    {
-        $query = Categories_model::with([
-            'menus' => function ($menusQuery) {
-                $menusQuery->listFrontEnd([
-                    'pageLimit' => null,
-                    'sort'      => $this->property('sort', 'menu_priority asc'),
-                ]);
-            },
-            'menus.special',
-            'menus.mealtime',
-            'menus.menu_options',
-        ]);
-
-        $query->whereHasMenus();
-
-        if ($this->param('category'))
-            $query->whereSlug($this->param('category'));
-
-        $list = $query->get();
-
-        return $list;
-    }
 }

components/menu/default.php

@@ -1,11 +1,7 @@
 <div class="menu-list">
-    <?php if ($menuIsGrouped) { ?>
-        <?= partial('@grouped'); ?>
-    <?php } else { ?>
-        <?= partial('@items', ['menuItems' => $menuList]); ?>
+    <?= partial('@items', ['menuItems' => $menuList]); ?>
 
-        <div class="pagination-bar text-right">
-            <div class="links"><?= $menuList->links(); ?></div>
-        </div>
-    <?php } ?>
+    <div class="pagination-bar text-right">
+        <div class="links"><?= $menuList->links(); ?></div>
+    </div>
 </div>