Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updates for billing profiles

Browse Source
This commit is contained in:
David Bomba 2023-04-29 12:32:57 +10:00
parent 4a3846dce8
commit c0dbd9b0ba
4 changed files with 10 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

@ -447,6 +447,7 @@ class BillingPortalPurchase extends Component
return; return;
} }
$utm = isset($this->request_data['utm']) ? $this->request_data['utm'] : null;
return $this->subscription->service()->handleNoPaymentRequired([ return $this->subscription->service()->handleNoPaymentRequired([
'email' => $this->email ?? $this->contact->email, 'email' => $this->email ?? $this->contact->email,
@ -454,6 +455,7 @@ class BillingPortalPurchase extends Component
'contact_id' => $this->contact->id, 'contact_id' => $this->contact->id,
'client_id' => $this->contact->client->id, 'client_id' => $this->contact->client->id,
'coupon' => $this->coupon, 'coupon' => $this->coupon,
'utm' => $utm
]); ]);
} }

2
app/Models/Account.php
View File

@ -68,7 +68,7 @@ use Laracasts\Presenter\PresentableTrait;
* @property int $is_verified_account * @property int $is_verified_account
* @property string|null $account_sms_verification_code * @property string|null $account_sms_verification_code
* @property string|null $account_sms_verification_number * @property string|null $account_sms_verification_number
* @property int $account_sms_verified * @property bool $account_sms_verified
* @property string|null $bank_integration_account_id * @property string|null $bank_integration_account_id
* @property int $is_trial * @property int $is_trial
* @property-read int|null $bank_integrations_count * @property-read int|null $bank_integrations_count

4
app/Services/Subscription/SubscriptionService.php
View File

@ -121,6 +121,10 @@ class SubscriptionService
'account_key' => $recurring_invoice->client->custom_value2, 'account_key' => $recurring_invoice->client->custom_value2,
]; ];
if (!property_exists($payment_hash->data->billing_context, 'utm') && $payment_hash->data->billing_context->utm) {
$context['utm'] = $payment_hash->data->billing_context->utm;
}
$response = $this->triggerWebhook($context); $response = $this->triggerWebhook($context);
return $this->handleRedirect('/client/recurring_invoices/'.$recurring_invoice->hashed_id); return $this->handleRedirect('/client/recurring_invoices/'.$recurring_invoice->hashed_id);

3
app/Services/Subscription/ZeroCostProduct.php
View File

@ -79,6 +79,9 @@ class ZeroCostProduct extends AbstractService
'redirect_url' => "/client/recurring_invoices/{$recurring_invoice->hashed_id}", 'redirect_url' => "/client/recurring_invoices/{$recurring_invoice->hashed_id}",
]; ];
if(isset($this->data['utm']))
$context['utm'] = $this->data['utm'];
return $context; return $context;
} }