Merge pull request #8322 from turbo124/v5-develop

Fixes for react

VERSION.txt

@@ -1 +1 @@
-5.5.77
+5.5.78

app/PaymentDrivers/BaseDriver.php

@@ -32,6 +32,7 @@ use App\Utils\Traits\MakesHash;
 use App\Exceptions\PaymentFailed;
 use App\Jobs\Mail\NinjaMailerJob;
 use App\Models\ClientGatewayToken;
+use Illuminate\Support\Facades\App;
 use App\Jobs\Mail\NinjaMailerObject;
 use App\Utils\Traits\SystemLogTrait;
 use App\Events\Invoice\InvoiceWasPaid;
@@ -726,6 +727,11 @@ class BaseDriver extends AbstractPaymentDriver
      */
     public function getDescription(bool $abbreviated = true)
     {
+        App::forgetInstance('translator');
+        $t = app('translator');
+        $t->replace(Ninja::transformTranslations($this->client->getMergedSettings()));
+        App::setLocale($this->client->company->locale());
+
         if (! $this->payment_hash || !$this->client) {
             return 'No description';
         }

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));
             }
         }
     }

config/ninja.php

@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.5.77',
+    'app_version' => '5.5.78',
-    'app_tag' => '5.5.77',
+    'app_tag' => '5.5.78',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),

lang/en/texts.php

@@ -5007,7 +5007,9 @@ $LANG = array(
     'bank_name' => 'Bank Name',
     'bank_code' => 'Bank Code',
     'bic' => 'BIC',
-
+    'change_plan_description' => 'Upgrade or downgrade your current plan.',
+    'add_company_logo' => 'Add Logo',
+    'add_stripe' => 'Add Stripe',
 );
 
 

resources/views/portal/ninja2020/subscriptions/show.blade.php

@@ -6,7 +6,7 @@
         <div class="bg-white shadow overflow-hidden sm:rounded-lg">
             <div class="px-4 py-5 border-b border-gray-200 sm:px-6">
                 <h3 class="text-lg leading-6 font-medium text-gray-900">
-                   {{ $subscription->name }}.
+                   {{ $subscription->name }}
                 </h3>
             </div>
             <div>
@@ -95,7 +95,7 @@
         @if($invoice->subscription && $invoice->subscription->allow_plan_changes)
             <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>
-                <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">
                     @foreach($invoice->subscription->service()->getPlans() as $subscription)