Merge branch 'release/3.0.5'

Author: Skullbock

src/Storage/EloquentStorage.php

@@ -3,8 +3,10 @@
 namespace Weble\LaravelEcommerce\Storage;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Collection;
+use Weble\LaravelEcommerce\Cart\CartItem;
 
 class EloquentStorage implements StorageInterface
 {
@@ -73,8 +75,10 @@ public function get(string $key, $default = null)
                 return $default;
             }
 
-            return $items->map(function ($model) {
-                return $model->toCartValue();
+            return $items->mapWithKeys(function (Model|StoresEcommerceData $model) {
+                /** @var CartItem $cartItem */
+                $cartItem = $model->toCartValue();
+                return [$cartItem->getId() => $cartItem];
             });
         }
 

tests/Cart/CartTest.php

@@ -99,6 +99,23 @@ public function can_add_to_cart($driver)
         $this->assertEquals($cartItem, $retrievedCartItem);
     }
 
+    /**
+     * @test
+     * @dataProvider driversProvider
+     */
+    public function can_check_if_item_is_in_cart($driver)
+    {
+        $this->setCartStorageDriver($driver);
+
+        $product  = ProductFactory::new(['price' => money(100)])->create();
+
+        /** @var Cart $cart */
+        $cart     = app('ecommerce.cart');
+        $cartItem = $cart->add($product, 1);
+
+        $this->assertTrue($cart->has($cartItem->getId()));
+    }
+
     /**
      * @test
      * @dataProvider driversProvider
@@ -404,15 +421,15 @@ public function can_add_discount_to_cart_storing_in_db()
     public function driversProvider()
     {
         return [
-            [
+            'session' => [
                 'session',
                 SessionStorage::class,
             ],
-            [
+            'cache' => [
                 'cache',
                 CacheStorage::class,
             ],
-            [
+            'eloquent' => [
                 'eloquent',
                 EloquentStorage::class,
             ],