Merge pull request #28 from lukepolo/dev

Fixing issue if somone put items into the subItem Array
lukepolo · Nov 10, 2015 · 918eb54 · 918eb54
2 parents 89752b2 + d70c480
commit 918eb54
Show file tree

Hide file tree

Showing 6 changed files with 525 additions and 474 deletions.
diff --git a/build/logs/clover.xml b/build/logs/clover.xml
diff --git a/src/CartSubItem.php b/src/CartSubItem.php
@@ -11,6 +11,8 @@
  */
 class CartSubItem
 {
+    const ITEMS = 'items';
+
     use CartOptionsMagicMethodsTrait;
 
     private $itemHash;
@@ -26,10 +28,16 @@ class CartSubItem
     public function __construct($options)
     {
         $this->itemHash = app(LaraCart::HASH, $options);
-        if (isset($options[LaraCart::PRICE]) === true) {
+        if (isset($options[LaraCart::PRICE])) {
             $this->price = $options[LaraCart::PRICE];
             array_forget($options, LaraCart::PRICE);
         }
+
+        if (isset($options[self::ITEMS])) {
+            $this->items = $options[self::ITEMS];
+            array_forget($options, self::ITEMS);
+        }
+
         $this->options = $options;
     }
 

diff --git a/src/Coupons/Percentage.php b/src/Coupons/Percentage.php
@@ -55,6 +55,6 @@ public function discount()
      */
     public function displayValue()
     {
-        return ($this->value * 100).'%';
+        return ($this->value * 100) . '%';
     }
 }
diff --git a/src/LaraCart.php b/src/LaraCart.php
@@ -55,7 +55,7 @@ public function setInstance($instance = 'default')
      */
     public function get($instance = 'default')
     {
-        if (empty($this->cart = \Session::get(config('laracart.cache_prefix', 'laracart.').$instance))) {
+        if (empty($this->cart = \Session::get(config('laracart.cache_prefix', 'laracart.') . $instance))) {
             $this->cart = new Cart($instance);
         }
 
@@ -67,7 +67,7 @@ public function get($instance = 'default')
      */
     public function update()
     {
-        \Session::set(config('laracart.cache_prefix', 'laracart.').$this->cart->instance, $this->cart);
+        \Session::set(config('laracart.cache_prefix', 'laracart.') . $this->cart->instance, $this->cart);
 
         \Event::fire('laracart.update', $this->cart);
     }

diff --git a/src/LaraCartServiceProvider.php b/src/LaraCartServiceProvider.php
@@ -20,7 +20,7 @@ public function boot()
     {
         $this->publishes(
             [
-                __DIR__.'/config/laracart.php' => config_path('laracart.php'),
+                __DIR__ . '/config/laracart.php' => config_path('laracart.php'),
             ]
         );
     }

diff --git a/src/Traits/CouponTrait.php b/src/Traits/CouponTrait.php
@@ -52,7 +52,7 @@ public function checkMinAmount($minAmount, $throwErrors)
             return true;
         } else {
             if ($throwErrors) {
-                throw new \Exception('You must have at least a total of '.LaraCart::formatMoney($minAmount));
+                throw new \Exception('You must have at least a total of ' . LaraCart::formatMoney($minAmount));
             } else {
                 return false;
             }
@@ -75,7 +75,7 @@ public function maxDiscount($maxDiscount, $discount, $throwErrors)
             return $discount;
         } else {
             if ($throwErrors) {
-                throw new \Exception('This has a max discount of '.LaraCart::formatMoney($maxDiscount));
+                throw new \Exception('This has a max discount of ' . LaraCart::formatMoney($maxDiscount));
             } else {
                 return $maxDiscount;
             }