Merge pull request #8254 from turbo124/v5-develop

fixes for light design

VERSION.txt

@@ -1 +1 @@
-5.5.67
+5.5.68

app/PaymentDrivers/BaseDriver.php

@@ -359,6 +359,10 @@ class BaseDriver extends AbstractPaymentDriver
         event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
 
         if (property_exists($this->payment_hash->data, 'billing_context') && $status == Payment::STATUS_COMPLETED) {
+
+            if(is_int($this->payment_hash->data->billing_context->subscription_id))
+                $billing_subscription = \App\Models\Subscription::find($this->payment_hash->data->billing_context->subscription_id);
+            else
                 $billing_subscription = \App\Models\Subscription::find($this->decodePrimaryKey($this->payment_hash->data->billing_context->subscription_id));
 
             // To access campaign hash => $this->payment_hash->data->billing_context->campaign;

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.67',
-    'app_tag' => '5.5.67',
+    'app_version' => '5.5.68',
+    'app_tag' => '5.5.68',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),

resources/views/email/template/client.blade.php

@@ -110,20 +110,14 @@
             position: relative;
         } 
 
-        .doc_links {
-
+        a.doc_links {
+            text-decoration: none;
             padding-bottom: 10px;
             display: inline-block;
-            
-        }
-
-        a {
-
-            text-decoration: none;
             color: inherit !important;
-
         }
 
+
     </style>
 
     <!--[if gte mso 9]>