Merge pull request #27 from offline-agency/fix-options-cart

Fix Cart getOptions
offline-agency · Apr 15, 2022 · 6541084 · 6541084
2 parents 9501deb + c7186e4
commit 6541084
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -17,8 +17,8 @@
         "illuminate/events": "^5.0|^5.8|^6.0|^7.0|^8.0|^9.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0|^7.0|^8.0",
-        "orchestra/testbench": "^3.1|^4.0",
+        "phpunit/phpunit": "^6.0|^7.0|^8.0|^9.0",
+        "orchestra/testbench": "^3.1|^4.0|^5.0|^6.0|^7.0",
         "mockery/mockery": "^1.0",
         "doctrine/dbal": "^2.5",
         "php-coveralls/php-coveralls": "^2.4"

diff --git a/src/Cart.php b/src/Cart.php
@@ -2,6 +2,7 @@
 
 namespace OfflineAgency\LaravelCart;
 
+use ArrayAccess;
 use Carbon\Carbon;
 use Closure;
 use Illuminate\Contracts\Events\Dispatcher;
@@ -18,11 +19,12 @@
 class Cart
 {
     const DEFAULT_INSTANCE = 'default';
+    const CART_OPTIONS_KEY = 'options';
 
     /**
-     * @var array
+     * @var
      */
-    private $options;
+    private $options = [];
 
     /**
      * Instance of the session manager.
@@ -477,6 +479,18 @@ protected function getContent(): Collection
             : new Collection();
     }
 
+    /**
+     * Get the cart generic info, if there is no cart set yet, return a new empty Collection.
+     *
+     * @return Collection
+     */
+    protected function getCartInfo(): Collection
+    {
+        return $this->session->has($this->getCartInstance())
+        ? $this->session->get($this->getCartInstance())
+        : new Collection();
+    }
+
     /**
      * * Create a new CartItem from the supplied attributes.
      *
@@ -765,7 +779,7 @@ public function hasGlobalCoupon()
 
     /**
      * @param  string  $couponCode
-     * @return array|\ArrayAccess|mixed|null
+     * @return array|ArrayAccess|mixed|null
      */
     public function getCoupon(
         string $couponCode
@@ -844,14 +858,40 @@ private function applyGlobalCoupon(
      */
     public function getOptions(): array
     {
-        return $this->options;
+        $cart_info = $this->getCartInfo();
+
+        return Arr::has($cart_info, self::CART_OPTIONS_KEY) ? Arr::get($cart_info, self::CART_OPTIONS_KEY) : [];
     }
 
     /**
      * @param  array  $options
      */
     public function setOptions(array $options): void
     {
-        $this->options = $options;
+        $content = $this->getCartInfo();
+
+        $content->put(self::CART_OPTIONS_KEY, $options);
+
+        $this->session->put($this->getCartInstance(), $content);
+    }
+
+    /**
+     * @return string
+     */
+    private function getCartInstance(): string
+    {
+        return $this->instance.'_cart_info';
+    }
+
+    /**
+     * @param $key
+     * @param $default_value
+     * @return array|ArrayAccess|mixed|null
+     */
+    public function getOptionsByKey($key, $default_value = null)
+    {
+        $options = $this->getOptions();
+
+        return Arr::has($options, $key) ? Arr::get($options, $key) : $default_value;
     }
 }
diff --git a/tests/CartTest.php b/tests/CartTest.php
@@ -1823,7 +1823,17 @@ public function it_can_set_and_get_options_on_cart()
     {
         $cart = $this->getCart();
         $cart->setOptions(['test' => 'test']);
+
         $this->assertEquals(['test' => 'test'], $cart->getOptions());
+
+        $cart->getOptionsByKey('test');
+        $this->assertEquals('test', $cart->getOptionsByKey('test'));
+
+        $cart->getOptionsByKey('option_not_existing_with_default_value', false);
+        $this->assertEquals(false, $cart->getOptionsByKey('option_not_existing_with_default_value'));
+
+        $cart->getOptionsByKey('option_not_existing_without_default_value');
+        $this->assertNull($cart->getOptionsByKey('option_not_existing_without_default_value'));
     }
 
     /**