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

Return redirects

Browse Source
This commit is contained in:
David Bomba 2023-03-01 11:16:18 +11:00
parent fde68813d8
commit fa26c29d5b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,6 @@ class SubscriptionService
$recurring_invoice = $recurring_invoice_repo->save([], $recurring_invoice); $recurring_invoice = $recurring_invoice_repo->save([], $recurring_invoice);
$recurring_invoice->auto_bill = $this->subscription->auto_bill; $recurring_invoice->auto_bill = $this->subscription->auto_bill;
/* Start the recurring service */ /* Start the recurring service */
$recurring_invoice->service() $recurring_invoice->service()
->start() ->start()
@ -111,9 +110,10 @@ class SubscriptionService
'account_key' => $recurring_invoice->client->custom_value2, 'account_key' => $recurring_invoice->client->custom_value2,
]; ];
$response = $this->triggerWebhook($context); $response = $this->triggerWebhook($context);
return $this->handleRedirect('/client/recurring_invoices/'.$recurring_invoice->hashed_id);
$this->handleRedirect('/client/recurring_invoices/'.$recurring_invoice->hashed_id);
} else { } else {
$invoice = Invoice::withTrashed()->find($payment_hash->fee_invoice_id); $invoice = Invoice::withTrashed()->find($payment_hash->fee_invoice_id);
@ -131,7 +131,7 @@ class SubscriptionService
/* 06-04-2022 */ /* 06-04-2022 */
/* We may not be in a state where the user is present */ /* We may not be in a state where the user is present */
if (auth()->guard('contact')) { if (auth()->guard('contact')) {
$this->handleRedirect('/client/invoices/'.$this->encodePrimaryKey($payment_hash->fee_invoice_id)); return $this->handleRedirect('/client/invoices/'.$this->encodePrimaryKey($payment_hash->fee_invoice_id));
} }
} }
} }

2
lang/en/texts.php
View File

@ -5008,6 +5008,8 @@ $LANG = array(
'bank_code' => 'Bank Code', 'bank_code' => 'Bank Code',
'bic' => 'BIC', 'bic' => 'BIC',
'change_plan_description' => 'Upgrade or downgrade your current plan.', 'change_plan_description' => 'Upgrade or downgrade your current plan.',
'add_company_logo' => 'Add Logo',
'add_stripe' => 'Add Stripe',
); );

2
resources/views/portal/ninja2020/subscriptions/show.blade.php
View File

@ -95,7 +95,7 @@
@if($invoice->subscription && $invoice->subscription->allow_plan_changes) @if($invoice->subscription && $invoice->subscription->allow_plan_changes)
<div class="bg-white shadow overflow-hidden px-4 py-5 lg:rounded-lg mt-4"> <div class="bg-white shadow overflow-hidden px-4 py-5 lg:rounded-lg mt-4">
<h3 class="text-lg leading-6 font-medium text-gray-900">{{ ctrans('texts.change_plan') }}</h3> <h3 class="text-lg leading-6 font-medium text-gray-900">{{ ctrans('texts.change_plan') }}</h3>
<p class="mt-1 max-w-2xl text-sm leading-5 text-gray-500">Upgrade or downgrade your current plan.</p> <p class="mt-1 max-w-2xl text-sm leading-5 text-gray-500">{{ ctrans('texts.change_plan_description') }}</p>
<div class="flex mt-4 space-x-2"> <div class="flex mt-4 space-x-2">
@foreach($invoice->subscription->service()->getPlans() as $subscription) @foreach($invoice->subscription->service()->getPlans() as $subscription)