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

Update CartItem.php

Browse Source 
Changes according to moneyphp/money@30da0b34af
This commit is contained in:
Patrick
2022-02-06 19:21:53 +01:00
committed by GitHub
parent f4e19fb198
commit 9808bd623f
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/CartItem.php
View File

@@ -180,12 +180,10 @@ class CartItem implements Arrayable, Jsonable
*/ */
public function discount(): Money public function discount(): Money
{ {
$price = $this->price();
if ($this->discount instanceof Money) { if ($this->discount instanceof Money) {
return $this->price()->subtract($this->discount); return $this->price()->subtract($this->discount);
} else { } else {
$result = $this->price()->multiply($this->discount, Config::get('cart.rounding', Money::ROUND_UP)); return $this->price()->multiply(sprintf('%.14F', $this->discount), Config::get('cart.rounding', Money::ROUND_UP));
return $this->price()->multiply($this->discount, Config::get('cart.rounding', Money::ROUND_UP));
} }
} }
@@ -195,7 +193,6 @@ class CartItem implements Arrayable, Jsonable
*/ */
public function subtotal(): Money public function subtotal(): Money
{ {
$subtotal = $this->price()->add($this->discount());
return Money::max(new Money(0, $this->price->getCurrency()), $this->price()->subtract($this->discount())); return Money::max(new Money(0, $this->price->getCurrency()), $this->price()->subtract($this->discount()));
} }
@@ -204,8 +201,7 @@ class CartItem implements Arrayable, Jsonable
*/ */
public function tax(): Money public function tax(): Money
{ {
$tax = $this->subtotal()->multiply($this->taxRate, Config::get('cart.rounding', Money::ROUND_UP)); return $this->subtotal()->multiply(sprintf('%.14F', $this->taxRate), Config::get('cart.rounding', Money::ROUND_UP));
return $this->subtotal()->multiply($this->taxRate, Config::get('cart.rounding', Money::ROUND_UP));
} }
/** /**