Replaced array_get() with Arr::get(), array_get() removed in Laravel 6.0

.travis.yml

@@ -1,11 +1,10 @@
 language: php
 
 php:
-  - 5.6
   - 7.0
 
 before_script:
   - composer self-update
   - composer install --prefer-source --no-interaction
 
-script: vendor/bin/phpunit
+script: vendor/bin/phpunit

README.md

@@ -1,8 +1,8 @@
 ## LaravelShoppingcart
-[![Build Status](https://travis-ci.org/Crinsane/LaravelShoppingcart.png?branch=master)](https://travis-ci.org/Crinsane/LaravelShoppingcart)
-[![Total Downloads](https://poser.pugx.org/gloudemans/shoppingcart/downloads.png)](https://packagist.org/packages/gloudemans/shoppingcart)
-[![Latest Stable Version](https://poser.pugx.org/gloudemans/shoppingcart/v/stable)](https://packagist.org/packages/gloudemans/shoppingcart)
-[![Latest Unstable Version](https://poser.pugx.org/gloudemans/shoppingcart/v/unstable)](https://packagist.org/packages/gloudemans/shoppingcart)
+[![Build Status](https://travis-ci.org/hardevine/LaravelShoppingcart.png?branch=master)](https://travis-ci.org/hardevine/LaravelShoppingcart)
+[![Total Downloads](https://poser.pugx.org/hardevine/shoppingcart/downloads.png)](https://packagist.org/packages/hardevine/shoppingcart)
+[![Latest Stable Version](https://poser.pugx.org/hardevine/shoppingcart/v/stable)](https://packagist.org/packages/hardevine/shoppingcart)
+[![Latest Unstable Version](https://poser.pugx.org/hardevine/shoppingcart/v/unstable)](https://packagist.org/packages/hardevine/shoppingcart)
 [![License](https://poser.pugx.org/gloudemans/shoppingcart/license)](https://packagist.org/packages/gloudemans/shoppingcart)
 
 A simple shoppingcart implementation for Laravel.
@@ -13,7 +13,7 @@ Install the package through [Composer](http://getcomposer.org/).
 
 Run the Composer require command from the Terminal:
 
-    composer require gloudemans/shoppingcart
+    composer require hardevine/shoppingcart
 
 If you're using Laravel 5.5, this is all there is to do. 
 
@@ -71,9 +71,13 @@ Maybe you prefer to add the item using an array? As long as the array contains t
 Cart::add(['id' => '293ad', 'name' => 'Product 1', 'qty' => 1, 'price' => 9.99, 'options' => ['size' => 'large']]);
 ```
 
-New in version 2 of the package is the possibility to work with the `Buyable` interface. The way this works is that you have a model implement the `Buyable` interface, which will make you implement a few methods so the package knows how to get the id, name and price from your model. 
+New in version 2 of the package is the possibility to work with the [Buyable](#buyable) interface. The way this works is that you have a model implement the `Buyable` interface, which will make you implement a few methods so the package knows how to get the id, name and price from your model. 
 This way you can just pass the `add()` method a model and the quantity and it will automatically add it to the cart. 
 
+The path to the `Buyable` interface is:
+
+    Gloudemans\Shoppingcart\Contracts\Buyable;
+
 **As an added bonus it will automatically associate the model with the CartItem**
 
 ```php
@@ -325,11 +329,56 @@ foreach(Cart::content() as $row) {
 	echo 'You have ' . $row->qty . ' items of ' . $row->model->name . ' with description: "' . $row->model->description . '" in your cart.';
 }
 ```
+
+### Buyable
+
+For the convenience of faster adding items to cart and their automatic association, your model can implement `Buyable` interface. To do so, it must implement such functions:
+
+```php
+    public function getBuyableIdentifier(){
+        return $this->id;
+    }
+
+    public function getBuyableDescription(){
+        return $this->name;
+    }
+
+    public function getBuyablePrice(){
+        return $this->price;
+    }
+```
+
+Example:
+
+```php
+<?php
+
+namespace App\Models;
+
+use Gloudemans\Shoppingcart\Contracts\Buyable;
+use Illuminate\Database\Eloquent\Model;
+
+class Product exends Model implements Buyable {
+    public function getBuyableIdentifier($options = null) {
+        return $this->id;
+    }
+
+    public function getBuyableDescription($options = null) {
+        return $this->name;
+    }
+
+    public function getBuyablePrice($options = null) {
+        return $this->price;
+    }
+}
+```
+
+
 ## Database
 
 - [Config](#configuration)
-- [Storing the cart](#save-cart-to-database)
-- [Restoring the cart](#retrieve-cart-from-database)
+- [Storing the cart](#storing-the-cart)
+- [Restoring the cart](#restoring-the-cart)
 
 ### Configuration
 To save cart into the database so you can retrieve it later, the package needs to know which database connection to use and what the name of the table is.

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "gloudemans/shoppingcart",
+    "name": "hardevine/shoppingcart",
     "description": "Laravel Shoppingcart",
     "keywords": ["laravel", "shoppingcart"],
     "license": "MIT",
@@ -10,9 +10,9 @@
         }
     ],
     "require": {
-        "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
-        "illuminate/session": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
-        "illuminate/events": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*"
+        "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|~6.0",
+        "illuminate/session": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|~6.0",
+        "illuminate/events": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|~6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.0|~6.0|~7.0",

src/Cart.php

@@ -21,11 +21,11 @@ class Cart
      *
      * @var \Illuminate\Session\SessionManager
      */
-    private $session;
+    protected $session;
 
     /**
      * Instance of the event dispatcher.
-     * 
+     *
      * @var \Illuminate\Contracts\Events\Dispatcher
      */
     private $events;
@@ -94,7 +94,11 @@ public function add($id, $name = null, $qty = null, $price = null, array $option
             }, $id);
         }
 
-        $cartItem = $this->createCartItem($id, $name, $qty, $price, $options);
+        if ($id instanceof CartItem) {
+            $cartItem = $id;
+        } else {
+            $cartItem = $this->createCartItem($id, $name, $qty, $price, $options);
+        }
 
         $content = $this->getContent();
 
@@ -103,8 +107,8 @@ public function add($id, $name = null, $qty = null, $price = null, array $option
         }
 
         $content->put($cartItem->rowId, $cartItem);
-        
-        $this->events->fire('cart.added', $cartItem);
+
+        $this->events->dispatch('cart.added', $cartItem);
 
         $this->session->put($this->instance, $content);
 
@@ -148,7 +152,7 @@ public function update($rowId, $qty)
             $content->put($cartItem->rowId, $cartItem);
         }
 
-        $this->events->fire('cart.updated', $cartItem);
+        $this->events->dispatch('cart.updated', $cartItem);
 
         $this->session->put($this->instance, $content);
 
@@ -169,7 +173,7 @@ public function remove($rowId)
 
         $content->pull($cartItem->rowId);
 
-        $this->events->fire('cart.removed', $cartItem);
+        $this->events->dispatch('cart.removed', $cartItem);
 
         $this->session->put($this->instance, $content);
     }
@@ -350,17 +354,21 @@ public function store($identifier)
     {
         $content = $this->getContent();
 
-        if ($this->storedCartWithIdentifierExists($identifier)) {
-            throw new CartAlreadyStoredException("A cart with identifier {$identifier} was already stored.");
-        }
+
+        $this->getConnection()
+             ->table($this->getTableName())
+             ->where('identifier', $identifier)
+             ->delete();
+
 
         $this->getConnection()->table($this->getTableName())->insert([
             'identifier' => $identifier,
             'instance' => $this->currentInstance(),
-            'content' => serialize($content)
+            'content' => serialize($content),
+            'created_at'=> new \DateTime()
         ]);
 
-        $this->events->fire('cart.stored');
+        $this->events->dispatch('cart.stored');
     }
 
     /**
@@ -390,16 +398,30 @@ public function restore($identifier)
             $content->put($cartItem->rowId, $cartItem);
         }
 
-        $this->events->fire('cart.restored');
+        $this->events->dispatch('cart.restored');
 
         $this->session->put($this->instance, $content);
 
         $this->instance($currentInstance);
 
-        $this->getConnection()->table($this->getTableName())
-            ->where('identifier', $identifier)->delete();
     }
 
+
+
+    /**
+     * Deletes the stored cart with given identifier
+     *
+     * @param mixed $identifier
+     */
+    protected function deleteStoredCart($identifier) {
+        $this->getConnection()
+             ->table($this->getTableName())
+             ->where('identifier', $identifier)
+             ->delete();
+    }
+
+
+
     /**
      * Magic method to make accessing the total, tax and subtotal properties possible.
      *
@@ -483,7 +505,7 @@ private function isMulti($item)
      * @param $identifier
      * @return bool
      */
-    private function storedCartWithIdentifierExists($identifier)
+    protected function storedCartWithIdentifierExists($identifier)
     {
         return $this->getConnection()->table($this->getTableName())->where('identifier', $identifier)->exists();
     }
@@ -493,7 +515,7 @@ private function storedCartWithIdentifierExists($identifier)
      *
      * @return \Illuminate\Database\Connection
      */
-    private function getConnection()
+    protected function getConnection()
     {
         $connectionName = $this->getConnectionName();
 
@@ -505,7 +527,7 @@ private function getConnection()
      *
      * @return string
      */
-    private function getTableName()
+    protected function getTableName()
     {
         return config('cart.database.table', 'shoppingcart');
     }

src/CartItem.php

@@ -64,6 +64,13 @@ class CartItem implements Arrayable, Jsonable
      */
     private $taxRate = 0;
 
+    /**
+     * Is item saved for later.
+     *
+     * @var boolean
+     */
+    private $isSaved = false;
+
     /**
      * CartItem constructor.
      *
@@ -242,6 +249,19 @@ public function setTaxRate($taxRate)
         return $this;
     }
 
+    /**
+     * Set saved state.
+     *
+     * @param bool $bool
+     * @return \Gloudemans\Shoppingcart\CartItem
+     */
+    public function setSaved($bool)
+    {
+        $this->isSaved = $bool;
+
+        return $this;
+    }
+
     /**
      * Get an attribute from the cart item or get the associated model.
      *
@@ -254,24 +274,24 @@ public function __get($attribute)
             return $this->{$attribute};
         }
 
-        if($attribute === 'priceTax') {
-            return $this->price + $this->tax;
+        if ($attribute === 'priceTax') {
+            return number_format(($this->price + $this->tax), 2, '.', '');
         }
-        
-        if($attribute === 'subtotal') {
-            return $this->qty * $this->price;
+
+        if ($attribute === 'subtotal') {
+            return number_format(($this->qty * $this->price), 2, '.', '');
         }
-        
-        if($attribute === 'total') {
-            return $this->qty * ($this->priceTax);
+
+        if ($attribute === 'total') {
+            return number_format(($this->qty * $this->priceTax), 2, '.', '');
         }
 
-        if($attribute === 'tax') {
-            return $this->price * ($this->taxRate / 100);
+        if ($attribute === 'tax') {
+            return number_format(($this->price * ($this->taxRate / 100)), 2, '.', '');
         }
-        
-        if($attribute === 'taxTotal') {
-            return $this->tax * $this->qty;
+
+        if ($attribute === 'taxTotal') {
+            return number_format(($this->tax * $this->qty), 2, '.', '');
         }
 
         if($attribute === 'model' && isset($this->associatedModel)) {
@@ -349,6 +369,7 @@ public function toArray()
             'price'    => $this->price,
             'options'  => $this->options->toArray(),
             'tax'      => $this->tax,
+            'isSaved'      => $this->isSaved,
             'subtotal' => $this->subtotal
         ];
     }
@@ -373,7 +394,7 @@ public function toJson($options = 0)
      * @param string $thousandSeperator
      * @return string
      */
-    private function numberFormat($value, $decimals, $decimalPoint, $thousandSeperator)
+    private function numberFormat($value, $decimals = null, $decimalPoint = null, $thousandSeperator = null)
     {
         if (is_null($decimals)){
             $decimals = is_null(config('cart.format.decimals')) ? 2 : config('cart.format.decimals');

tests/CartItemTest.php

@@ -35,8 +35,9 @@ public function it_can_be_cast_to_an_array()
                 'size' => 'XL',
                 'color' => 'red'
             ],
-            'tax' => 0,
+            'tax' => 0.0,
             'subtotal' => 20.00,
+            'isSaved' => false
         ], $cartItem->toArray());
     }
 
@@ -48,8 +49,8 @@ public function it_can_be_cast_to_json()
 
         $this->assertJson($cartItem->toJson());
 
-        $json = '{"rowId":"07d5da5550494c62daf9993cf954303f","id":1,"name":"Some item","qty":2,"price":10,"options":{"size":"XL","color":"red"},"tax":0,"subtotal":20}';
+        $json = '{"rowId":"07d5da5550494c62daf9993cf954303f","id":1,"name":"Some item","qty":2,"price":10,"options":{"size":"XL","color":"red"},"tax":"0.00","isSaved":false,"subtotal":"20.00"}';
 
         $this->assertEquals($json, $cartItem->toJson());
     }
-}
+}