From 62ac61fd93309bf5120225cd935adadbd575b508 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 12 Feb 2022 16:05:05 +1100
Subject: [PATCH] Fixes for client registration

---
 app/Http/Controllers/PreviewController.php               | 3 +++
 app/Mail/Engine/PaymentEmailEngine.php                   | 3 +++
 resources/views/portal/ninja2020/auth/register.blade.php | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 008827dfe971..28d28df4d86d 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -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([
diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index 4b18ef43ef68..28f3220660c8 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/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;
     }
 
diff --git a/resources/views/portal/ninja2020/auth/register.blade.php b/resources/views/portal/ninja2020/auth/register.blade.php
index a3fa0befc8ce..3e8771022361 100644
--- a/resources/views/portal/ninja2020/auth/register.blade.php
+++ b/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