diff --git a/app/Services/Subscription/SubscriptionService.php b/app/Services/Subscription/SubscriptionService.php index 08d803d52ef5..87848cf0abdb 100644 --- a/app/Services/Subscription/SubscriptionService.php +++ b/app/Services/Subscription/SubscriptionService.php @@ -88,7 +88,6 @@ class SubscriptionService $recurring_invoice = $recurring_invoice_repo->save([], $recurring_invoice); $recurring_invoice->auto_bill = $this->subscription->auto_bill; - /* Start the recurring service */ $recurring_invoice->service() ->start() @@ -111,9 +110,10 @@ class SubscriptionService '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 { $invoice = Invoice::withTrashed()->find($payment_hash->fee_invoice_id); @@ -131,7 +131,7 @@ class SubscriptionService /* 06-04-2022 */ /* We may not be in a state where the user is present */ 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)); } } } diff --git a/lang/en/texts.php b/lang/en/texts.php index 72e62179c4d8..18fa7cc2195a 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -5008,6 +5008,8 @@ $LANG = array( 'bank_code' => 'Bank Code', 'bic' => 'BIC', 'change_plan_description' => 'Upgrade or downgrade your current plan.', + 'add_company_logo' => 'Add Logo', + 'add_stripe' => 'Add Stripe', ); diff --git a/resources/views/portal/ninja2020/subscriptions/show.blade.php b/resources/views/portal/ninja2020/subscriptions/show.blade.php index ae390898ac9e..a2e226cd928c 100644 --- a/resources/views/portal/ninja2020/subscriptions/show.blade.php +++ b/resources/views/portal/ninja2020/subscriptions/show.blade.php @@ -95,7 +95,7 @@ @if($invoice->subscription && $invoice->subscription->allow_plan_changes)

{{ ctrans('texts.change_plan') }}

-

Upgrade or downgrade your current plan.

+

{{ ctrans('texts.change_plan_description') }}

@foreach($invoice->subscription->service()->getPlans() as $subscription)