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

[13.x] Fix adding metered plan to subscription #1189

Merged
merged 3 commits into from
Jun 10, 2021
Merged

[13.x] Fix adding metered plan to subscription #1189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
096a546
Add Failing test
hailwood Jun 8, 2021
95e13a5
Fix adding metered price to existing subscription
hailwood Jun 8, 2021
9e453de
cleanup
driesvints Jun 10, 2021
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
17 changes: 9 additions & 8 deletions src/Subscription.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,14 +830,15 @@ public function addPrice($price, $quantity = 1, array $options = [])
throw SubscriptionUpdateFailure::duplicatePrice($this, $price);
}

$stripeSubscriptionItem = $this->owner->stripe()->subscriptionItems->create(array_merge([
'subscription' => $this->stripe_id,
'price' => $price,
'quantity' => $quantity,
'tax_rates' => $this->getPriceTaxRatesForPayload($price),
'payment_behavior' => $this->paymentBehavior(),
'proration_behavior' => $this->prorateBehavior(),
], $options));
$stripeSubscriptionItem = $this->owner->stripe()->subscriptionItems
->create(array_filter(array_merge([
'subscription' => $this->stripe_id,
'price' => $price,
'quantity' => $quantity,
'tax_rates' => $this->getPriceTaxRatesForPayload($price),
'payment_behavior' => $this->paymentBehavior(),
'proration_behavior' => $this->prorateBehavior(),
], $options)));

$this->items()->create([
'stripe_id' => $stripeSubscriptionItem->id,
Expand Down
21 changes: 21 additions & 0 deletions tests/Feature/MeteredBillingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,27 @@ public function test_swap_metered_price_to_different_price_with_a_multiprice_sub
$this->assertNull($subscription->quantity);
}

public function test_add_metered_price_to_a_multiprice_subscription()
{
$user = $this->createCustomer('add_metered_price_to_a_multiprice_subscription');

$subscription = $user->newSubscription('main')
->meteredPrice(static::$meteredPrice)
->create('pm_card_visa');

$this->assertSame(static::$meteredPrice, $subscription->stripe_price);
$this->assertNull($subscription->quantity);

$subscription = $subscription->addMeteredPrice(static::$otherMeteredPrice);

$subscription->findItemOrFail(self::$meteredPrice);
$subscription->findItemOrFail(self::$otherMeteredPrice);

$this->assertCount(2, $subscription->items);
$this->assertNull($subscription->stripe_price);
$this->assertNull($subscription->quantity);
}

public function test_cancel_metered_subscription()
{
$user = $this->createCustomer('cancel_metered_subscription');
Expand Down