Bug fixes

ryanmitchell · Aug 25, 2021 · 1580c0b · 1580c0b
1 parent a028d69
commit 1580c0b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/Extension.php b/Extension.php
@@ -22,7 +22,7 @@ public function boot()
                     ->where(function ($subquery) {
                         return $subquery->whereNull('timeout')
                             ->orWhere([
-                                ['timeout', '<', Carbon::now()->format('Y-m-d H:i:s')]
+                                ['timeout', '>', Carbon::now()->format('Y-m-d H:i:s')]
                             ]);
                     })
                     ->get()
@@ -33,7 +33,7 @@ public function boot()
                     ->where(function ($subquery) {
                         return $subquery->whereNull('timeout')
                             ->orWhere([
-                                ['timeout', '<', Carbon::now()->format('Y-m-d H:i:s')]
+                                ['timeout', '>', Carbon::now()->format('Y-m-d H:i:s')]
                             ]);
                     })
                     ->get()
@@ -44,7 +44,7 @@ public function boot()
                     ->where(function ($subquery) {
                         return $subquery->whereNull('timeout')
                             ->orWhere([
-                                ['timeout', '<', Carbon::now()->format('Y-m-d H:i:s')]
+                                ['timeout', '>', Carbon::now()->format('Y-m-d H:i:s')]
                             ]);
                     })
                     ->get()

diff --git a/controllers/Categories.php b/controllers/Categories.php
@@ -15,6 +15,7 @@ class Categories extends \Admin\Classes\AdminController
 {
     public $implement = [
         'Admin\Actions\ListController',
+        'Admin\Actions\LocationAwareController',
     ];
 
     public $listConfig = [
@@ -46,7 +47,7 @@ public function index()
             $this->vars['noLocation'] = true;
 
         Outofstock::where([
-            ['type', '=', 'categories'],
+            ['type', '=', 'menuitems'],
             ['timeout', '<', Carbon::now()->format('Y-m-d H:i:s')]
         ])->delete();
 

diff --git a/controllers/Menuitems.php b/controllers/Menuitems.php
@@ -16,6 +16,7 @@ class Menuitems extends \Admin\Classes\AdminController
 {
     public $implement = [
         'Admin\Actions\ListController',
+        'Admin\Actions\LocationAwareController',
     ];
 
     public $listConfig = [

diff --git a/controllers/Menus.php b/controllers/Menus.php
@@ -15,6 +15,7 @@ class Menus extends \Admin\Classes\AdminController
 {
     public $implement = [
         'Admin\Actions\ListController',
+        'Admin\Actions\LocationAwareController',
     ];
 
     public $listConfig = [

diff --git a/models/config/categories.php b/models/config/categories.php
@@ -14,7 +14,7 @@
 		        'menus' => [
 		            'label' => 'lang:thoughtco.outofstock::default.button_menuitems',
 		            'class' => 'btn btn-secondary',
-		            'href' => 'thoughtco/outofstock/categories',
+		            'href' => 'thoughtco/outofstock/menus',
 		        ],
 		        'menuitems' => [
 		            'label' => 'lang:thoughtco.outofstock::default.button_menuoptions',

diff --git a/models/config/menus.php b/models/config/menus.php
@@ -51,7 +51,6 @@
 						    <a class="dropdown-item" href="'.admin_url('thoughtco/outofstock/menus/nostock/'.$value).'?hours=closing">'.lang('thoughtco.outofstock::default.button_closing').'</a>
 						    <a class="dropdown-item" href="'.admin_url('thoughtco/outofstock/menus/nostock/'.$value).'">'.lang('thoughtco.outofstock::default.button_forever').'</a>
 						  </div>';
-
 				}
 			],
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,6 @@ @@
     						    <a class="dropdown-item" href="'.admin_url('thoughtco/outofstock/menus/nostock/'.$value).'?hours=closing">'.lang('thoughtco.outofstock::default.button_closing').'</a>
     						    <a class="dropdown-item" href="'.admin_url('thoughtco/outofstock/menus/nostock/'.$value).'">'.lang('thoughtco.outofstock::default.button_forever').'</a>
     						  </div>';
     				}
     			],
@@ Expand Down @@