totole/LaravelShoppingcart
1
0
Fork 0
mirror of https://github.com/kevin-DL/LaravelShoppingcart.git synced 2026-01-23 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

manuall readded reverted changes

Browse Source
This commit is contained in:
Patrick Henninger
2019-01-09 13:06:16 +01:00
parent 6767fdd944
commit 70073ccb92
8 changed files with 281 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
src/Cart.php
View File

@@ -110,14 +110,14 @@ class Cart
*/
public function add($id, $name = null, $qty = null, $price = null, array $options = [])
{
if ($this->isMulti($id)) {
if ($this->isMulti($id))
{
return array_map(function ($item) {
return $this->add($item);
}, $id);
}
$cartItem = $this->createCartItem($id, $name, $qty, $price, $options);
return $this->addCartItem($cartItem);;
}
@@ -139,9 +139,8 @@ class Cart
$content = $this->getContent();
if ($content->has($item->rowId)) {
if ($content->has($item->rowId))
$item->qty += $content->get($item->rowId)->qty;
}
$content->put($item->rowId, $item);
@@ -163,31 +162,34 @@ class Cart
{
$cartItem = $this->get($rowId);
if ($qty instanceof Buyable) {
if ($qty instanceof Buyable)
$cartItem->updateFromBuyable($qty);
} elseif (is_array($qty)) {
elseif (is_array($qty))
$cartItem->updateFromArray($qty);
} else {
else
$cartItem->qty = $qty;
}
$content = $this->getContent();
if ($rowId !== $cartItem->rowId) {
if ($rowId !== $cartItem->rowId)
{
$content->pull($rowId);
if ($content->has($cartItem->rowId)) {
if ($content->has($cartItem->rowId))
{
$existingCartItem = $this->get($cartItem->rowId);
$cartItem->setQuantity($existingCartItem->qty + $cartItem->qty);
}
}
if ($cartItem->qty <= 0) {
if ($cartItem->qty <= 0)
{
$this->remove($cartItem->rowId);
return;
} else {
$content->put($cartItem->rowId, $cartItem);
}
else
$content->put($cartItem->rowId, $cartItem);
$this->events->fire('cart.updated', $cartItem);
@@ -248,10 +250,8 @@ class Cart
*/
public function content()
{
if (is_null($this->session->get($this->instance))) {
if (is_null($this->session->get($this->instance)))
return new Collection([]);
}
return $this->session->get($this->instance);
}
@@ -262,9 +262,7 @@ class Cart
*/
public function count()
{
$content = $this->getContent();
return $content->sum('qty');
return $this->getContent()->sum('qty');
}
/**
@@ -274,9 +272,7 @@ class Cart
*/
public function countInstances()
{
$content = $this->getContent();
return $content->count();
return $this->getContent()->count();
}
/**
@@ -286,13 +282,9 @@ class Cart
*/
public function totalFloat()
{
$content = $this->getContent();
$total = $content->reduce(function ($total, CartItem $cartItem) {
return $this->getContent()->reduce(function ($total, CartItem $cartItem) {
return $total + $cartItem->total;
}, 0);
return $total;
}
/**
@@ -315,13 +307,9 @@ class Cart
*/
public function taxFloat()
{
$content = $this->getContent();
$tax = $content->reduce(function ($tax, CartItem $cartItem) {
return $this->getContent()->reduce(function ($tax, CartItem $cartItem) {
return $tax + $cartItem->taxTotal;
}, 0);
return $tax;
}
/**
@@ -344,13 +332,9 @@ class Cart
*/
public function subtotalFloat()
{
$content = $this->getContent();
$subTotal = $content->reduce(function ($subTotal, CartItem $cartItem) {
return $this->getContent()->reduce(function ($subTotal, CartItem $cartItem) {
return $subTotal + $cartItem->subtotal;
}, 0);
return $subTotal;
}
/**
@@ -373,13 +357,9 @@ class Cart
*/
public function discountFloat()
{
$content = $this->getContent();
$discount = $content->reduce(function ($discount, CartItem $cartItem) {
return $this->getContent()->reduce(function ($discount, CartItem $cartItem) {
return $discount + $cartItem->discountTotal;
}, 0);
return $discount;
}
/**
@@ -402,13 +382,9 @@ class Cart
*/
public function initialFloat()
{
$content = $this->getContent();
$initial = $content->reduce(function ($initial, CartItem $cartItem) {
return $this->getContent()->reduce(function ($initial, CartItem $cartItem) {
return $initial + ($cartItem->qty * $cartItem->price);
}, 0);
return $initial;
}
/**
@@ -424,6 +400,31 @@ class Cart
return $this->numberFormat($this->initialFloat(), $decimals, $decimalPoint, $thousandSeperator);
}
/**
* Get the total weight of the items in the cart.
*
* @return float
*/
public function weightFloat()
{
return $this->getContent()->reduce(function ($total, CartItem $cartItem) {
return $total + ($cartItem->qty * $cartItem->weight);
}, 0);
}
/**
* Get the total weight of the items in the cart.
*
* @param int $decimals
* @param string $decimalPoint
* @param string $thousandSeperator
* @return string
*/
public function weight($decimals = null, $decimalPoint = null, $thousandSeperator = null)
{
return $this->numberFormat($this->weightFloat(), $decimals, $decimalPoint, $thousandSeperator);
}
/**
* Search the cart content for a cart item matching the given search closure.
*
@@ -432,9 +433,7 @@ class Cart
*/
public function search(Closure $search)
{
$content = $this->getContent();
return $content->filter($search);
return $this->getContent()->filter($search);
}
/**
@@ -446,9 +445,8 @@ class Cart
*/
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.");
}
$cartItem = $this->get($rowId);
@@ -492,7 +490,8 @@ class Cart
$this->taxRate = $taxRate;
$content = $this->getContent();
if ($content && $content->count()) {
if ($content && $content->count())
{
$content->each(function ($item, $key) {
$item->setTaxRate($this->taxRate);
});
@@ -530,7 +529,8 @@ class Cart
$this->discount = $discount;
$content = $this->getContent();
if ($content && $content->count()) {
if ($content && $content->count())
{
$content->each(function ($item, $key) {
$item->setDiscountRate($this->discount);
});
@@ -547,9 +547,8 @@ class Cart
{
$content = $this->getContent();
if ($this->storedCartWithIdentifierExists($identifier)) {
if ($this->storedCartWithIdentifierExists($identifier))
throw new CartAlreadyStoredException("A cart with identifier {$identifier} was already stored.");
}
$this->getConnection()->table($this->getTableName())->insert([
'identifier' => $identifier,
@@ -568,9 +567,8 @@ class Cart
*/
public function restore($identifier)
{
if( ! $this->storedCartWithIdentifierExists($identifier)) {
if( ! $this->storedCartWithIdentifierExists($identifier))
return;
}
$stored = $this->getConnection()->table($this->getTableName())
->where('identifier', $identifier)->first();
@@ -583,9 +581,8 @@ class Cart
$content = $this->getContent();
foreach ($storedContent as $cartItem) {
foreach ($storedContent as $cartItem)
$content->put($cartItem->rowId, $cartItem);
}
$this->events->fire('cart.restored');
@@ -603,22 +600,22 @@ class Cart
* @param mixed $identifier Identifier of the Cart to merge with.
* @param bool $keepDiscount Keep the discount of the CartItems.
* @param bool $keepTax Keep the tax of the CartItems.
* @return void
* @return bool
*/
public function merge( $identifier, $keepDiscount = false, $keepTax = false )
{
if( ! $this->storedCartWithIdentifierExists($identifier)) {
return;
}
if( ! $this->storedCartWithIdentifierExists($identifier))
return false;
$stored = $this->getConnection()->table($this->getTableName())
->where('identifier', $identifier)->first();
$storedContent = unserialize($stored->content);
foreach ($storedContent as $cartItem) {
foreach ($storedContent as $cartItem)
$this->addCartItem($cartItem, $keepDiscount, $keepTax);
}
return true;
}
/**
@@ -629,19 +626,17 @@ class Cart
*/
public function __get($attribute)
{
if($attribute === 'total') {
return $this->total();
switch($attribute)
{
case 'total':
return $this->total();
case 'tax':
return $this->tax();
case 'subtotal':
return $this->subtotal();
default:
return null;
}
if($attribute === 'tax') {
return $this->tax();
}
if($attribute === 'subtotal') {
return $this->subtotal();
}
return null;
}
/**
@@ -651,11 +646,9 @@ class Cart
*/
protected function getContent()
{
$content = $this->session->has($this->instance)
? $this->session->get($this->instance)
: new Collection;
return $content;
if ($this->session->has($this->instance))
return $this->session->get($this->instance);
return new Collection;
}
/**
@@ -693,8 +686,8 @@ class Cart
*/
private function isMulti($item)
{
if ( ! is_array($item)) return false;
if ( ! is_array($item))
return false;
return is_array(head($item)) || head($item) instanceof Buyable;
}
@@ -714,9 +707,7 @@ class Cart
*/
private function getConnection()
{
$connectionName = $this->getConnectionName();
return app(DatabaseManager::class)->connection($connectionName);
return app(DatabaseManager::class)->connection($this->getConnectionName());
}
/**
@@ -752,15 +743,13 @@ class Cart
*/
private function numberFormat($value, $decimals, $decimalPoint, $thousandSeperator)
{
if(is_null($decimals)){
$decimals = is_null(config('cart.format.decimals')) ? 2 : config('cart.format.decimals');
}
if(is_null($decimalPoint)){
$decimalPoint = is_null(config('cart.format.decimal_point')) ? '.' : config('cart.format.decimal_point');
}
if(is_null($thousandSeperator)){
$thousandSeperator = is_null(config('cart.format.thousand_separator')) ? ',' : config('cart.format.thousand_separator');
}
if(is_null($decimals))
$decimals = config('cart.format.decimals', 2);
if(is_null($decimalPoint))
$decimalPoint = config('cart.format.decimal_point', '.');
if(is_null($thousandSeperator))
$thousandSeperator = config('cart.format.thousand_separator', ',');
return number_format($value, $decimals, $decimalPoint, $thousandSeperator);
}

112
src/CartItem.php
View File

@@ -43,6 +43,13 @@ class CartItem implements Arrayable, Jsonable
*/
public $price;
/**
* The weight of the product.
*
* @var float
*/
public $weight;
/**
* The options for this cart item.
*
@@ -79,7 +86,7 @@ class CartItem implements Arrayable, Jsonable
* @param float $price
* @param array $options
*/
public function __construct($id, $name, $price, array $options = [])
public function __construct($id, $name, $price, $weight = 0, array $options = [])
{
if(empty($id)) {
throw new \InvalidArgumentException('Please supply a valid identifier.');
@@ -94,10 +101,24 @@ class CartItem implements Arrayable, Jsonable
$this->id = $id;
$this->name = $name;
$this->price = floatval($price);
$this->weight = floatval($weight);
$this->options = new CartItemOptions($options);
$this->rowId = $this->generateRowId($id, $options);
}
/**
* Returns the formatted weight.
*
* @param int $decimals
* @param string $decimalPoint
* @param string $thousandSeperator
* @return string
*/
public function weight($decimals = null, $decimalPoint = null, $thousandSeperator = null)
{
return $this->numberFormat($this->weight, $decimals, $decimalPoint, $thousandSeperator);
}
/**
* Returns the formatted price without TAX.
*
@@ -256,6 +277,7 @@ class CartItem implements Arrayable, Jsonable
$this->qty = array_get($attributes, 'qty', $this->qty);
$this->name = array_get($attributes, 'name', $this->name);
$this->price = array_get($attributes, 'price', $this->price);
$this->weight = array_get($attributes, 'weight', $this->weight);
$this->priceTax = $this->price + $this->tax;
$this->options = new CartItemOptions(array_get($attributes, 'options', $this->options));
@@ -312,44 +334,36 @@ class CartItem implements Arrayable, Jsonable
if(property_exists($this, $attribute)) {
return $this->{$attribute};
}
if($attribute === 'discount') {
return $this->price * ($this->discountRate / 100);
}
if($attribute === 'priceTarget') {
return $this->price - $this->discount;
}
if($attribute === 'subtotal') {
return $this->qty * $this->priceTarget;
}
if($attribute === 'tax') {
return $this->priceTarget * ($this->taxRate / 100);
}
if($attribute === 'priceTax') {
return $this->priceTarget + $this->tax;
}
if($attribute === 'total') {
return $this->qty * $this->priceTax;
switch($attribute)
{
case 'discount':
return $this->price * ($this->discountRate / 100);
case 'priceTarget':
return $this->price - $this->discount;
case 'subtotal':
return $this->priceTarget * $this->qty;
case 'tax':
return $this->priceTarget * ($this->taxRate / 100);
case 'priceTax':
return $this->priceTarget + $this->tax;
case 'total':
return $this->priceTax * $this->qty;
case 'taxTotal':
return $this->tax * $this->qty;
case 'discountTotal':
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 null;
default:
return null;
}
if($attribute === 'taxTotal') {
return $this->tax * $this->qty;
}
if($attribute === 'discountTotal') {
return $this->discount * $this->qty;
}
if($attribute === 'model' && isset($this->associatedModel)) {
return with(new $this->associatedModel)->find($this->id);
}
return null;
}
/**
@@ -361,7 +375,7 @@ class CartItem implements Arrayable, Jsonable
*/
public static function fromBuyable(Buyable $item, array $options = [])
{
return new self($item->getBuyableIdentifier($options), $item->getBuyableDescription($options), $item->getBuyablePrice($options), $options);
return new self($item->getBuyableIdentifier($options), $item->getBuyableDescription($options), $item->getBuyablePrice($options), $item->getBuyableWeight($options), $options);
}
/**
@@ -374,7 +388,7 @@ class CartItem implements Arrayable, Jsonable
{
$options = array_get($attributes, 'options', []);
return new self($attributes['id'], $attributes['name'], $attributes['price'], $options);
return new self($attributes['id'], $attributes['name'], $attributes['price'], $attributes['weight'], $options);
}
/**
@@ -386,9 +400,9 @@ class CartItem implements Arrayable, Jsonable
* @param array $options
* @return \Gloudemans\Shoppingcart\CartItem
*/
public static function fromAttributes($id, $name, $price, array $options = [])
public static function fromAttributes($id, $name, $price, $weight, array $options = [])
{
return new self($id, $name, $price, $options);
return new self($id, $name, $price, $weight, $options);
}
/**
@@ -418,6 +432,7 @@ class CartItem implements Arrayable, Jsonable
'name' => $this->name,
'qty' => $this->qty,
'price' => $this->price,
'weight' => $this->weight,
'options' => $this->options->toArray(),
'discount' => $this->discount,
'tax' => $this->tax,
@@ -447,17 +462,14 @@ class CartItem implements Arrayable, Jsonable
*/
private function numberFormat($value, $decimals, $decimalPoint, $thousandSeperator)
{
if (is_null($decimals)){
$decimals = is_null(config('cart.format.decimals')) ? 2 : config('cart.format.decimals');
}
if (is_null($decimals))
$decimals = config('cart.format.decimals', 2);
if (is_null($decimalPoint)){
$decimalPoint = is_null(config('cart.format.decimal_point')) ? '.' : config('cart.format.decimal_point');
}
if (is_null($decimalPoint))
$decimalPoint = config('cart.format.decimal_point', '.');
if (is_null($thousandSeperator)){
$thousandSeperator = is_null(config('cart.format.thousand_separator')) ? ',' : config('cart.format.thousand_separator');
}
if (is_null($thousandSeperator))
$thousandSeperator = config('cart.format.thousand_separator', ',');
return number_format($value, $decimals, $decimalPoint, $thousandSeperator);
}

7
src/Contracts/Buyable.php
View File

@@ -24,4 +24,11 @@ interface Buyable
* @return float
*/
public function getBuyablePrice($options = null);
/**
* Get the weight of the Buyable item.
*
* @return float
*/
public function getBuyableWeight($options = null);
}