Code refactor

Signed-off-by: Sam Poyigi <[email protected]>
tastyigniter · May 18, 2024 · 50d4e1c · 50d4e1c
1 parent 3052f46
commit 50d4e1c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/CartConditions/Delivery.php b/src/CartConditions/Delivery.php
@@ -40,6 +40,6 @@ public function getActions()
 
     public function getValue()
     {
-        return $this->calculatedValue > 0 ? $this->calculatedValue : lang('main::lang.text_free');
+        return $this->calculatedValue > 0 ? $this->calculatedValue : lang('igniter::main.text_free');
     }
 }
diff --git a/src/Classes/CoveredAreaCondition.php b/src/Classes/CoveredAreaCondition.php
@@ -22,7 +22,7 @@ public function __construct(array $condition = [])
 
     public function getLabel()
     {
-        $condition['amount'] = lang('main::lang.text_free');
+        $condition['amount'] = lang('igniter::main.text_free');
         if ($this->amount < 0) {
             $condition['amount'] = lang('igniter.local::default.text_delivery_not_available');
         } elseif ($this->amount > 0) {

diff --git a/src/Http/Middleware/CheckLocation.php b/src/Http/Middleware/CheckLocation.php
@@ -29,6 +29,16 @@ public function handle(Request $request, Closure $next)
             $request->route()->setParameter('location', $location->permalink_slug);
         }
 
+        if ($request->route()->parameter('location') !== Location::current()->permalink_slug) {
+            return redirect()->to(page_url('home'));
+        }
+
+        if ((!$location?->isEnabled() && !AdminAuth::getUser()?->hasPermission('Admin.Locations'))) {
+            flash()->error(lang('igniter.local::default.alert_location_required'));
+
+            return redirect()->to(page_url('home'));
+        }
+
         return $next($request);
     }