diff --git a/src/Cart.php b/src/Cart.php index 746ef7d..7e7e6b3 100644 --- a/src/Cart.php +++ b/src/Cart.php @@ -501,13 +501,13 @@ class Cart /** * Set the global tax rate for the cart. * This will set the tax rate for all items. - * + * * @param float $discount */ public function setGlobalTax($taxRate) { $this->taxRate = $taxRate; - + $content = $this->getContent(); if ($content && $content->count()) { $content->each(function ($item, $key) { @@ -597,7 +597,7 @@ class Cart if ($identifier instanceof InstanceIdentifier) { $identifier = $identifier->getInstanceIdentifier(); } - + if (!$this->storedCartWithIdentifierExists($identifier)) { return; } @@ -685,6 +685,7 @@ class Cart if ($this->session->has($this->instance)) { return $this->session->get($this->instance); } + return new Collection(); } @@ -728,6 +729,7 @@ class Cart if (!is_array($item)) { return false; } + return is_array(head($item)) || head($item) instanceof Buyable; } diff --git a/src/CartItem.php b/src/CartItem.php index 75009bf..ffafaf9 100644 --- a/src/CartItem.php +++ b/src/CartItem.php @@ -94,7 +94,7 @@ class CartItem implements Arrayable, Jsonable if (empty($name)) { throw new \InvalidArgumentException('Please supply a valid name.'); } - if (strlen($price) < 0 ||!is_numeric($price)) { + if (strlen($price) < 0 || !is_numeric($price)) { throw new \InvalidArgumentException('Please supply a valid price.'); } @@ -371,13 +371,14 @@ class CartItem implements Arrayable, Jsonable return $this->discount * $this->qty; case 'weightTotal': return $this->weight * $this->qty; - + case 'model': if (isset($this->associatedModel)) { - return with(new $this->associatedModel)->find($this->id); + return with(new $this->associatedModel())->find($this->id); } + return; - + default: return; } diff --git a/styleci.yml b/styleci.yml index 0285f17..9d32921 100644 --- a/styleci.yml +++ b/styleci.yml @@ -1 +1,5 @@ preset: laravel + +finder: + exclude: + - "tests" \ No newline at end of file