Merge pull request #6604 from turbo124/v5-stable

v5.3.8

VERSION.txt

@@ -1 +1 @@
-5.3.7
+5.3.8

app/Http/Controllers/BaseController.php

@@ -301,7 +301,7 @@ class BaseController extends Controller
 
             },
             'company.recurring_invoices'=> function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents', 'client.gateway_tokens', 'client.group_settings');
+                $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents', 'client.gateway_tokens', 'client.group_settings', 'client.company');
 
                 if(!$user->hasPermission('view_recurring_invoice'))
                   $query->where('recurring_invoices.user_id', $user->id)->orWhere('recurring_invoices.assigned_user_id', $user->id);
@@ -534,7 +534,7 @@ class BaseController extends Controller
 
             },
             'company.recurring_invoices'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('invitations', 'documents');
+                $query->where('created_at', '>=', $created_at)->with('invitations', 'documents', 'client.gateway_tokens', 'client.group_settings', 'client.company');
 
                 if(!$user->hasPermission('view_recurring_invoice'))
                   $query->where('recurring_invoices.user_id', $user->id)->orWhere('recurring_invoices.assigned_user_id', $user->id);

app/Http/Middleware/QueryLogging.php

@@ -55,7 +55,7 @@ class QueryLogging
             // nlog("Query count = {$count}");
         
              if($count > 175){
-                 nlog("Quer count = {$count}");
+                 nlog("Query count = {$count}");
                  nlog($queries);
              }
                         

app/PaymentDrivers/Stripe/CreditCard.php

@@ -76,7 +76,8 @@ class CreditCard
 
     private function decodeUnicodeString($string)
     {
-        return iconv("UTF-8", "ISO-8859-1//TRANSLIT", $this->decode_encoded_utf8($string));
+        return html_entity_decode($string, ENT_QUOTES, 'UTF-8');
+        // return iconv("UTF-8", "ISO-8859-1//TRANSLIT", $this->decode_encoded_utf8($string));
     }
 
     private function decode_encoded_utf8($string){

app/Transformers/RecurringInvoiceTransformer.php

@@ -150,7 +150,8 @@ class RecurringInvoiceTransformer extends EntityTransformer
             'entity_type' => 'recurringInvoice',
             'frequency_id' => (string) $invoice->frequency_id,
             'remaining_cycles' => (int) $invoice->remaining_cycles,
-            'recurring_dates' => (array) $invoice->recurringDates(),
+            //'recurring_dates' => (array) $invoice->recurringDates(),
+            'recurring_dates' => [],
             'auto_bill' => (string) $invoice->auto_bill,
             'auto_bill_enabled' => (bool) $invoice->auto_bill_enabled,
             'due_date_days' => (string) $invoice->due_date_days ?: '',

app/Utils/HtmlEngine.php

@@ -184,8 +184,10 @@ class HtmlEngine
         $data['$invoice.subtotal'] = &$data['$subtotal'];
 
         if ($this->entity->partial > 0) {
-            $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->partial, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')];
+            $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->partial, $this->client) ?: ' ', 'label' => ctrans('texts.partial_due')];
-            $data['$balance_due_raw'] = ['value' => $this->entity->partial, 'label' => ctrans('texts.balance_due')];
+            $data['$balance_due_raw'] = ['value' => $this->entity->partial, 'label' => ctrans('texts.partial_due')];
+            $data['$due_date'] = ['value' => $this->translateDate($this->entity->partial_due_date, $this->entity->client->date_format(), $this->entity->client->locale()) ?: ' ', 'label' => ctrans('texts.'.$this->entity_string.'_due_date')];
+
         } else {
 
             if($this->entity->status_id == 1){

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