mirror of
https://github.com/kevin-DL/LaravelShoppingcart.git
synced 2026-01-24 07:55:35 +00:00
Codestyle
This commit is contained in:
@@ -4,7 +4,6 @@ namespace Gloudemans\Shoppingcart;
|
|||||||
|
|
||||||
trait CanBeBought
|
trait CanBeBought
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the identifier of the Buyable item.
|
* Get the identifier of the Buyable item.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -189,6 +189,7 @@ class Cart
|
|||||||
|
|
||||||
if ($cartItem->qty <= 0) {
|
if ($cartItem->qty <= 0) {
|
||||||
$this->remove($cartItem->rowId);
|
$this->remove($cartItem->rowId);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
$content->put($cartItem->rowId, $cartItem);
|
$content->put($cartItem->rowId, $cartItem);
|
||||||
@@ -461,7 +462,7 @@ class Cart
|
|||||||
*/
|
*/
|
||||||
public function associate($rowId, $model)
|
public function associate($rowId, $model)
|
||||||
{
|
{
|
||||||
if(is_string($model) && !class_exists($model)) {
|
if (is_string($model) && !class_exists($model)) {
|
||||||
throw new UnknownModelException("The supplied model {$model} does not exist.");
|
throw new UnknownModelException("The supplied model {$model} does not exist.");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -597,7 +598,7 @@ class Cart
|
|||||||
$identifier = $identifier->getInstanceIdentifier();
|
$identifier = $identifier->getInstanceIdentifier();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!$this->storedCartWithIdentifierExists($identifier)) {
|
if (!$this->storedCartWithIdentifierExists($identifier)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -637,7 +638,7 @@ class Cart
|
|||||||
*/
|
*/
|
||||||
public function merge($identifier, $keepDiscount = false, $keepTax = false)
|
public function merge($identifier, $keepDiscount = false, $keepTax = false)
|
||||||
{
|
{
|
||||||
if(!$this->storedCartWithIdentifierExists($identifier)) {
|
if (!$this->storedCartWithIdentifierExists($identifier)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ class CartItem implements Arrayable, Jsonable
|
|||||||
if (empty($name)) {
|
if (empty($name)) {
|
||||||
throw new \InvalidArgumentException('Please supply a valid 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.');
|
throw new \InvalidArgumentException('Please supply a valid price.');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -255,8 +255,9 @@ class CartItem implements Arrayable, Jsonable
|
|||||||
*/
|
*/
|
||||||
public function setQuantity($qty)
|
public function setQuantity($qty)
|
||||||
{
|
{
|
||||||
if(empty($qty) || ! is_numeric($qty))
|
if (empty($qty) || !is_numeric($qty)) {
|
||||||
throw new \InvalidArgumentException('Please supply a valid quantity.');
|
throw new \InvalidArgumentException('Please supply a valid quantity.');
|
||||||
|
}
|
||||||
|
|
||||||
$this->qty = $qty;
|
$this->qty = $qty;
|
||||||
}
|
}
|
||||||
@@ -270,9 +271,9 @@ class CartItem implements Arrayable, Jsonable
|
|||||||
*/
|
*/
|
||||||
public function updateFromBuyable(Buyable $item)
|
public function updateFromBuyable(Buyable $item)
|
||||||
{
|
{
|
||||||
$this->id = $item->getBuyableIdentifier($this->options);
|
$this->id = $item->getBuyableIdentifier($this->options);
|
||||||
$this->name = $item->getBuyableDescription($this->options);
|
$this->name = $item->getBuyableDescription($this->options);
|
||||||
$this->price = $item->getBuyablePrice($this->options);
|
$this->price = $item->getBuyablePrice($this->options);
|
||||||
$this->priceTax = $this->price + $this->tax;
|
$this->priceTax = $this->price + $this->tax;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -285,13 +286,13 @@ class CartItem implements Arrayable, Jsonable
|
|||||||
*/
|
*/
|
||||||
public function updateFromArray(array $attributes)
|
public function updateFromArray(array $attributes)
|
||||||
{
|
{
|
||||||
$this->id = array_get($attributes, 'id', $this->id);
|
$this->id = array_get($attributes, 'id', $this->id);
|
||||||
$this->qty = array_get($attributes, 'qty', $this->qty);
|
$this->qty = array_get($attributes, 'qty', $this->qty);
|
||||||
$this->name = array_get($attributes, 'name', $this->name);
|
$this->name = array_get($attributes, 'name', $this->name);
|
||||||
$this->price = array_get($attributes, 'price', $this->price);
|
$this->price = array_get($attributes, 'price', $this->price);
|
||||||
$this->weight = array_get($attributes, 'weight', $this->weight);
|
$this->weight = array_get($attributes, 'weight', $this->weight);
|
||||||
$this->priceTax = $this->price + $this->tax;
|
$this->priceTax = $this->price + $this->tax;
|
||||||
$this->options = new CartItemOptions(array_get($attributes, 'options', $this->options));
|
$this->options = new CartItemOptions(array_get($attributes, 'options', $this->options));
|
||||||
|
|
||||||
$this->rowId = $this->generateRowId($this->id, $this->options->all());
|
$this->rowId = $this->generateRowId($this->id, $this->options->all());
|
||||||
}
|
}
|
||||||
@@ -347,12 +348,11 @@ class CartItem implements Arrayable, Jsonable
|
|||||||
*/
|
*/
|
||||||
public function __get($attribute)
|
public function __get($attribute)
|
||||||
{
|
{
|
||||||
if(property_exists($this, $attribute)) {
|
if (property_exists($this, $attribute)) {
|
||||||
return $this->{$attribute};
|
return $this->{$attribute};
|
||||||
}
|
}
|
||||||
|
|
||||||
switch($attribute)
|
switch ($attribute) {
|
||||||
{
|
|
||||||
case 'discount':
|
case 'discount':
|
||||||
return $this->price * ($this->discountRate / 100);
|
return $this->price * ($this->discountRate / 100);
|
||||||
case 'priceTarget':
|
case 'priceTarget':
|
||||||
@@ -373,12 +373,13 @@ class CartItem implements Arrayable, Jsonable
|
|||||||
return $this->weight * $this->qty;
|
return $this->weight * $this->qty;
|
||||||
|
|
||||||
case 'model':
|
case 'model':
|
||||||
if (isset($this->associatedModel))
|
if (isset($this->associatedModel)) {
|
||||||
return with(new $this->associatedModel)->find($this->id);
|
return with(new $this->associatedModel)->find($this->id);
|
||||||
return null;
|
}
|
||||||
|
return;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return null;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -436,7 +437,7 @@ class CartItem implements Arrayable, Jsonable
|
|||||||
{
|
{
|
||||||
ksort($options);
|
ksort($options);
|
||||||
|
|
||||||
return md5($id . serialize($options));
|
return md5($id.serialize($options));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -456,7 +457,7 @@ class CartItem implements Arrayable, Jsonable
|
|||||||
'options' => $this->options->toArray(),
|
'options' => $this->options->toArray(),
|
||||||
'discount' => $this->discount,
|
'discount' => $this->discount,
|
||||||
'tax' => $this->tax,
|
'tax' => $this->tax,
|
||||||
'subtotal' => $this->subtotal
|
'subtotal' => $this->subtotal,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user