beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix error 500 on the checkout page, small code refactor and total display fix (#963)

Browse source 
* fix: replaced number_format by round because this caused error 500 on checkout

* refactor: code has been made more readable

* fix: incorrect display of total on checkout
This commit is contained in:
MrWeez 2024-05-24 10:38:31 +03:00 committed by GitHub
parent 396d255f6b
commit 4bf534ad50
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Models/ShopProduct.php
View file

@ -80,7 +80,9 @@ class ShopProduct extends Model
public function getPriceAfterDiscount() public function getPriceAfterDiscount()
{ {
return number_format($this->price - ($this->price * PartnerDiscount::getDiscount() / 100), 2); $discountRate = PartnerDiscount::getDiscount() / 100;
$discountedPrice = $this->price * (1 - $discountRate);
return round($discountedPrice, 2);
} }
/** /**
@ -90,7 +92,8 @@ class ShopProduct extends Model
*/ */
public function getTaxValue() public function getTaxValue()
{ {
return number_format($this->getPriceAfterDiscount() * $this->getTaxPercent() / 100, 2); $taxValue = $this->getPriceAfterDiscount() * $this->getTaxPercent() / 100;
return round($taxValue, 2);
} }
/** /**
@ -100,6 +103,7 @@ class ShopProduct extends Model
*/ */
public function getTotalPrice() public function getTotalPrice()
{ {
return number_format($this->getPriceAfterDiscount() + $this->getTaxValue(), 2); $total = $this->getPriceAfterDiscount() + $this->getTaxValue();
return round($total, 2);
} }
} }

2
themes/default/views/store/checkout.blade.php
View file

@ -237,7 +237,7 @@
payment_method: '', payment_method: '',
coupon_code: '', coupon_code: '',
submitted: false, submitted: false,
totalPrice: {{ $discountedprice }}, totalPrice: {{ $total }},
couponDiscountedValue: 0, couponDiscountedValue: 0,