Skip to content

Support variant rewards when automatically adding BuyXGetY rewards #2631

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

Merged
glennjacobs merged 2 commits into from
Aug 25, 2026
Merged

Support variant rewards when automatically adding BuyXGetY rewards #2631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
577cb68
Support variant rewards when automatically adding BuyXGetY rewards
kha333n Aug 24, 2026
379ee3d
Merge branch '1.x' into fix/buyxgety-variant-rewards
glennjacobs Aug 25, 2026
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
3 changes: 3 additions & 0 deletions packages/core/src/DiscountTypes/BuyXGetY.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Pipeline\Pipeline;
use Illuminate\Support\Collection;
use Lunar\Base\Purchasable;
use Lunar\Base\ValueObjects\Cart\DiscountBreakdown;
use Lunar\Base\ValueObjects\Cart\DiscountBreakdownLine;
use Lunar\DataTypes\Price;
Expand Down Expand Up @@ -251,6 +252,8 @@ private function processAutomaticRewards(CartContract $cart, int $remainingRewar
$product = $selectedRewardItem->products()->inRandomOrder()->first();
$purchasable = $product?->variants()->first();
$selectedRewardItem = $product;
} elseif ($selectedRewardItem instanceof Purchasable) {
$purchasable = $selectedRewardItem;
} else {
$purchasable = $selectedRewardItem->variants->first();
}
Expand Down
92 changes: 92 additions & 0 deletions tests/core/Unit/DiscountTypes/BuyXGetYTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1548,3 +1548,95 @@
// productC (not in collection) should not be discounted
expect($lineC->discountTotal->value)->toEqual(0);
});

test('can add an eligible variant reward when not in cart', function () {
$customerGroup = CustomerGroup::factory()->create([
'default' => true,
]);

$channel = Channel::factory()->create([
'default' => true,
]);

$currency = Currency::factory()->create([
'code' => 'GBP',
]);

$cart = Cart::factory()->create([
'channel_id' => $channel->id,
'currency_id' => $currency->id,
]);

$productA = Product::factory()->create();
$productB = Product::factory()->create();

$purchasableA = ProductVariant::factory()->create([
'product_id' => $productA->id,
]);
$purchasableB = ProductVariant::factory()->create([
'product_id' => $productB->id,
]);

Price::factory()->create([
'price' => 1000, // £10
'min_quantity' => 1,
'currency_id' => $currency->id,
'priceable_type' => $purchasableA->getMorphClass(),
'priceable_id' => $purchasableA->id,
]);

Price::factory()->create([
'price' => 1000, // £10
'min_quantity' => 1,
'currency_id' => $currency->id,
'priceable_type' => $purchasableB->getMorphClass(),
'priceable_id' => $purchasableB->id,
]);

$cart->lines()->create([
'purchasable_type' => $purchasableA->getMorphClass(),
'purchasable_id' => $purchasableA->id,
'quantity' => 1,
]);

$discount = Discount::factory()->create([
'type' => BuyXGetY::class,
'name' => 'Test Variant Reward Discount',
'data' => [
'min_qty' => 1,
'reward_qty' => 2,
'automatically_add_rewards' => true,
],
]);

$discount->customerGroups()->sync([
$customerGroup->id => [
'enabled' => true,
'starts_at' => now(),
],
]);

$discount->channels()->sync([
$channel->id => [
'enabled' => true,
'starts_at' => now()->subHour(),
],
]);

$discount->discountableConditions()->create([
'discountable_type' => $productA->getMorphClass(),
'discountable_id' => $productA->id,
]);

// The reward is a variant, which the admin allows selecting.
$discount->discountableRewards()->create([
'discountable_type' => $purchasableB->getMorphClass(),
'discountable_id' => $purchasableB->id,
'type' => 'reward',
]);

$cart = $cart->calculate();

$this->assertEquals(1200, $cart->total->value);
$this->assertCount(1, $cart->freeItems);
});