Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-05 10:14:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5196 from beganovich/v5-2003-fix-billing-subscription-integration

Browse Source 
(v5) Construct the billing service with correct dependency
This commit is contained in:
Benjamin Beganović 2021-03-22 11:15:19 +01:00 committed by GitHub
commit d804dc6f17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Livewire/BillingPortalPurchase.php
View File

@ -262,6 +262,7 @@ class BillingPortalPurchase extends Component
'client_contact_id' => $this->contact->hashed_id, 'client_contact_id' => $this->contact->hashed_id,
]], ]],
'user_input_promo_code' => $this->coupon, 'user_input_promo_code' => $this->coupon,
'coupon' => $this->coupon,
'quantity' => $this->quantity, 'quantity' => $this->quantity,
]; ];
@ -273,6 +274,7 @@ class BillingPortalPurchase extends Component
->save(); ->save();
Cache::put($this->hash, [ Cache::put($this->hash, [
'billing_subscription_id' => $this->billing_subscription->id,
'email' => $this->email ?? $this->contact->email, 'email' => $this->email ?? $this->contact->email,
'client_id' => $this->contact->client->id, 'client_id' => $this->contact->client->id,
'invoice_id' => $this->invoice->id, 'invoice_id' => $this->invoice->id,

6
app/PaymentDrivers/BaseDriver.php
View File

@ -241,7 +241,11 @@ class BaseDriver extends AbstractPaymentDriver
event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars())); event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
//(new BillingSubscriptionService)->completePurchase($this->payment_hash); if (property_exists($this->payment_hash->data, 'billing_context')) {
$billing_subscription = \App\Models\BillingSubscription::find($this->payment_hash->data->billing_context->billing_subscription_id);
(new BillingSubscriptionService($billing_subscription))->completePurchase($this->payment_hash);
}
return $payment->service()->applyNumber()->save(); return $payment->service()->applyNumber()->save();
} }