Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix an issue where the AmountOff percentage is cast to an int, even t… #2004

Merged
merged 4 commits into from
Nov 5, 2024
Merged

Fix an issue where the AmountOff percentage is cast to an int, even t… #2004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d31f42e
Fix an issue where the AmountOff percentage is cast to an int, even t…
Oct 25, 2024
d662d52
chore: fix code style
actions-user Oct 25, 2024
68ed338
Use a Pest dataset for testing the AmountOff calculation. Also added …
Oct 30, 2024
7321875
Merge branch '1.x' into fix/amount-off-percentage-with-decimals
alecritson Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core/src/DiscountTypes/AmountOff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ protected function getEligibleLines(Cart $cart): \Illuminate\Support\Collection
/**
* Apply the percentage to the cart line.
*/
private function applyPercentage(int $value, Cart $cart): Cart
private function applyPercentage(float $value, Cart $cart): Cart
{
$lines = $this->getEligibleLines($cart);

Expand Down
35 changes: 24 additions & 11 deletions tests/core/Unit/DiscountTypes/AmountOffTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,16 @@
expect($lastLine->discountTotal->value)->toEqual(333);
});

test('can apply percentage discount', function () {
test('can apply percentage discount', function (
string $coupon,
float $percentage,
int $discountTotalForOne,
int $taxTotalForOne,
int $totalForOne,
int $discountTotalForTwo,
int $taxTotalForTwo,
int $totalForTwo
) {
$customerGroup = CustomerGroup::getDefault();

$channel = Channel::getDefault();
Expand All @@ -794,7 +803,7 @@
$cart = Cart::factory()->create([
'channel_id' => $channel->id,
'currency_id' => $currency->id,
'coupon_code' => '10PERCENTOFF',
'coupon_code' => $coupon,
]);

$purchasable = ProductVariant::factory()->create();
Expand All @@ -816,9 +825,9 @@
$discount = Discount::factory()->create([
'type' => AmountOff::class,
'name' => 'Test Coupon',
'coupon' => '10PERCENTOFF',
'coupon' => $coupon,
'data' => [
'percentage' => 10,
'percentage' => $percentage,
'fixed_value' => false,
],
]);
Expand All @@ -843,9 +852,9 @@

$cart = $cart->calculate();

expect($cart->discountTotal->value)->toEqual(100);
expect($cart->taxTotal->value)->toEqual(180);
expect($cart->total->value)->toEqual(1080);
expect($cart->discountTotal->value)->toEqual($discountTotalForOne);
expect($cart->taxTotal->value)->toEqual($taxTotalForOne);
expect($cart->total->value)->toEqual($totalForOne);

$cart->lines()->delete();

Expand All @@ -857,10 +866,14 @@

$cart = $cart->refresh()->calculate();

expect($cart->discountTotal->value)->toEqual(200);
expect($cart->taxTotal->value)->toEqual(360);
expect($cart->total->value)->toEqual(2160);
});
expect($cart->discountTotal->value)->toEqual($discountTotalForTwo);
expect($cart->taxTotal->value)->toEqual($taxTotalForTwo);
expect($cart->total->value)->toEqual($totalForTwo);
})->with([
'10% Discount' => ['10PERCENTOFF', 10, 100, 180, 1080, 200, 360, 2160],
'10.25% Discount' => ['10PT25PERCENTOFF', 10.25, 103, 179, 1076, 205, 359, 2154],
'10.5% Discount' => ['10PT5PERCENTOFF', 10.5, 105, 179, 1074, 210, 358, 2148],
]);

test('can only same discount to line once', function () {
$customerGroup = CustomerGroup::getDefault();
Expand Down