Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

VERSION.txt

@@ -1 +1 @@
-5.3.57
+5.3.58

app/Http/Controllers/PreviewController.php

@@ -311,7 +311,7 @@ class PreviewController extends BaseController
         $t = app('translator');
         $t->replace(Ninja::transformTranslations(auth()->user()->company()->settings));
 
-        $invitation = InvoiceInvitation::where('company_id', auth()->user()->company()->id)->first();
+        $invitation = InvoiceInvitation::where('company_id', auth()->user()->company()->id)->orderBy('id', 'desc')->first();
 
         /* If we don't have a valid invitation in the system - create a mock using transactions */
         if(!$invitation)
@@ -387,6 +387,9 @@ class PreviewController extends BaseController
                     'user_id' => auth()->user()->id,
                     'company_id' => auth()->user()->company()->id,
                     'client_id' => $client->id,
+                    'terms' => 'Sample Terms',
+                    'footer' => 'Sample Footer',
+                    'public_notes' => 'Sample Public Notes',
                 ]);
 
         $invitation = InvoiceInvitation::factory()->create([

app/Mail/Engine/PaymentEmailEngine.php

@@ -243,6 +243,9 @@ class PaymentEmailEngine extends BaseEmailEngine
         $data['$invoice.po_number'] = ['value' => $this->formatPoNumber(), 'label' => ctrans('texts.po_number')];
         $data['$poNumber'] = &$data['$invoice.po_number'];
 
+        $arrKeysLength = array_map('strlen', array_keys($data));
+        array_multisort($arrKeysLength, SORT_DESC, $data);
+        
         return $data;
     }
 

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

public/flutter_service_worker.js

@@ -28,11 +28,11 @@ const RESOURCES = {
 "assets/NOTICES": "9a4bf0423a5e265f38c4df37f7a0a913",
 "assets/fonts/MaterialIcons-Regular.otf": "4e6447691c9509f7acdbf8a931a85ca1",
 "favicon.ico": "51636d3a390451561744c42188ccd628",
-"/": "9a6d03b86fbbbe937744bd4e18e8f03a",
+"/": "d9829928376d8c2193b8af876898ddaa",
 "version.json": "a00481850d5c63ba5df4e22636643438",
 "icons/Icon-512.png": "0f9aff01367f0a0c69773d25ca16ef35",
 "icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed",
-"main.dart.js": "299333488d94a781eef76d041cb91148",
+"main.dart.js": "90f76748bc2c212eb97403132f720821",
 "favicon.png": "dca91c54388f52eded692718d5a98b8b",
 "manifest.json": "ef43d90e57aa7682d7e2cfba2f484a40",
 "canvaskit/profiling/canvaskit.js": "3783918f48ef691e230156c251169480",

resources/views/portal/ninja2020/auth/register.blade.php

@@ -53,7 +53,7 @@
                                     <select 
                                         id="shipping_country"
                                         class="input w-full form-select"
-                                        name="shipping_country">
+                                        name="country_id">
                                             <option value="none"></option>
                                         @foreach(App\Utils\TranslationHelper::getCountries() as $country)
                                             <option