refactor(cart): set cart condition session key based on cart instance name to store cart conditions per location

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

Author: sampoyigi

src/CartCondition.php

@@ -43,7 +43,7 @@ abstract class CartCondition implements Arrayable, Jsonable
     // Object properties
     //
 
-    protected $sessionKey = 'cart.conditions.%s';
+    protected ?string $sessionKey = null;
 
     protected null|CartContent|CartItem $target = null;
 
@@ -56,11 +56,13 @@ abstract class CartCondition implements Arrayable, Jsonable
      *
      * @param array $config
      */
-    public function __construct(/**
-     * The config for this cart condition.
-     */
+    public function __construct(
+        /**
+         * The config for this cart condition.
+         */
         protected $config = [])
     {
+        $this->setSessionKey(sprintf('%s.conditions.%s', array_get($this->config, 'cartInstance', 'default'), $this->name));
         $this->fillFromConfig($this->config);
     }
 

src/Classes/CheckoutForm.php

@@ -29,7 +29,7 @@ public function validationRules(): array
     {
         $rules = $this->getConfig('rules', []);
 
-        $prefixedKeys = array_map(fn($key) => is_string($key) ? 'fields.'.$key : $key, array_keys($rules));
+        $prefixedKeys = array_map(fn(int|string $key) => is_string($key) ? 'fields.'.$key : $key, array_keys($rules));
 
         return array_combine($prefixedKeys, $rules);
     }
@@ -38,16 +38,16 @@ public function validationMessages(): array
     {
         $messages = $this->getConfig('messages', []);
 
-        $prefixedKeys = array_map(fn($key) => is_string($key) ? 'fields.'.$key : $key, array_keys($messages));
+        $prefixedKeys = array_map(fn(int|string $key) => is_string($key) ? 'fields.'.$key : $key, array_keys($messages));
 
         return array_combine($prefixedKeys, $messages);
     }
 
     public function validationAttributes(): array
     {
-        $attributes = array_map(fn($field): string => lang($field['label'] ?? $field['name']), $this->fields);
+        $attributes = array_map(fn(array $field): string => lang($field['label'] ?? $field['name']), $this->fields);
 
-        $prefixedKeys = array_map(fn($key) => is_string($key) ? 'fields.'.$key : $key, array_keys($attributes));
+        $prefixedKeys = array_map(fn(int|string $key) => is_string($key) ? 'fields.'.$key : $key, array_keys($attributes));
 
         return array_combine($prefixedKeys, $attributes);
     }

src/Classes/OrderManager.php

@@ -9,6 +9,7 @@
 use Igniter\Cart\Models\Order;
 use Igniter\Flame\Exception\ApplicationException;
 use Igniter\Flame\Geolite\Facades\Geocoder;
+use Igniter\Flame\Geolite\Model\Location as UserLocation;
 use Igniter\Local\Classes\CoveredArea;
 use Igniter\Local\Classes\Location;
 use Igniter\Local\Models\LocationArea;
@@ -151,14 +152,17 @@ public function validateDeliveryAddress(array $address): void
             $address['country'] = app('country')->getCountryNameById($address['country_id']);
         }
 
-        $collection = Geocoder::geocode(implode(' ', array_only($address, [
-            'address_1', 'address_2', 'city', 'state', 'postcode', 'country',
-        ])));
+        $addressInfo = array_only($address, ['address_1', 'address_2', 'city', 'state', 'postcode', 'country']);
+        if (empty($addressInfo)) {
+            throw new ApplicationException(lang('igniter.local::default.alert_invalid_search_query'));
+        }
 
+        $collection = Geocoder::geocode(implode(' ', $addressInfo));
         if ($collection->isEmpty()) {
             throw new ApplicationException(lang('igniter.local::default.alert_invalid_search_query'));
         }
 
+        /** @var UserLocation $userLocation */
         $userLocation = $collection->first();
         if (!$userLocation->getStreetNumber() || !$userLocation->getStreetName()) {
             throw new ApplicationException(lang('igniter.local::default.alert_missing_street_address'));
@@ -428,9 +432,10 @@ public function applyCurrentPaymentFee($code): ?CartCondition
         $this->setCurrentPaymentCode($code);
 
         $condition = $this->cart->getCondition('paymentFee');
-        $condition->setMetaData(['code' => $code]);
-
-        $this->cart->loadCondition($condition);
+        if ($condition instanceof CartCondition) {
+            $condition->setMetaData(['code' => $code]);
+            $this->cart->loadCondition($condition);
+        }
 
         return $condition;
     }

src/Concerns/CartConditionHelper.php

@@ -210,8 +210,15 @@ protected function valueIsToBeDivided(string $value): bool
     // Session
     //
 
-    protected function getSessionKey(): string
+    public function getSessionKey(): string
     {
-        return sprintf($this->sessionKey, $this->name);
+        return $this->sessionKey;
+    }
+
+    public function setSessionKey(string $sessionKey): static
+    {
+        $this->sessionKey = $sessionKey;
+
+        return $this;
     }
 }

src/Extension.php

@@ -227,6 +227,7 @@ public function registerSettings(): array
     {
         return [
             'settings' => [
+                'priority' => 1,
                 'label' => 'Cart Settings',
                 'description' => 'Manage cart conditions and tipping settings.',
                 'icon' => 'fa fa-cart-shopping',

src/Http/Middleware/InjectStatusWorkflow.php

@@ -22,17 +22,14 @@ public function handle($request, Closure $next)
         }
 
         if ($response->isSuccessful()) {
-            $orderWorkflowModalView = $this->renderOrderWorkflowView();
-
             $content = $response->getContent();
             $insertPos = strripos((string)$content, '</body>');
             if ($insertPos !== false) {
                 $content = substr((string)$content, 0, $insertPos);
-                $content .= $orderWorkflowModalView;
+                $content .= $this->renderOrderWorkflowView();
                 $content .= substr($content, $insertPos);
+                $response->setContent($content);
             }
-
-            $response->setContent($content);
         }
 
         return $response;

tests/Classes/OrderManagerTest.php

@@ -120,6 +120,14 @@
         ->toThrow(ApplicationException::class, lang('igniter.cart::default.checkout.alert_customer_not_logged'));
 });
 
+it('validateDeliveryAddress throws exception when delivery address is empty', function(): void {
+    $address = [];
+    Geocoder::shouldReceive('geocode')->andReturn(collect());
+
+    expect(fn() => $this->manager->validateDeliveryAddress($address))
+        ->toThrow(ApplicationException::class, lang('igniter.local::default.alert_invalid_search_query'));
+});
+
 it('validateDeliveryAddress throws exception when delivery address is invalid', function(): void {
     $address = [
         'address_1' => '123 Main St',