From 291b0c5669ba0a4201658ffbf9b5fed8508b5d7c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 21 Feb 2022 07:41:13 +1100
Subject: [PATCH 1/3] Revert for markdown parser

---
 app/Utils/Helpers.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php
index 6f633612e4f8..ca4a7e5d5b7f 100644
--- a/app/Utils/Helpers.php
+++ b/app/Utils/Helpers.php
@@ -262,9 +262,11 @@ class Helpers
             }
         }
 
-        $x = str_replace(["\n", "<br>"], ["\r", "<br>"], $value);
+        return $value;
 
-        return $x;
+        // $x = str_replace(["\n", "<br>"], ["\r", "<br>"], $value);
+
+        // return $x;
     }
 
     /**

From ce0bcd494d7fe951bb429e3c59c6cb622d2fb3ed Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 21 Feb 2022 07:51:49 +1100
Subject: [PATCH 2/3] Revert for gateway query

---
 app/Services/Client/PaymentMethod.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/Services/Client/PaymentMethod.php b/app/Services/Client/PaymentMethod.php
index 4a18387d2215..f36fb2b2d3db 100644
--- a/app/Services/Client/PaymentMethod.php
+++ b/app/Services/Client/PaymentMethod.php
@@ -70,16 +70,16 @@ class PaymentMethod
 
             $transformed_ids = $this->transformKeys(explode(',', $company_gateways));
 
-            $this->gateways = 
-                             CompanyGateway::with('gateway')
-                             ->where('company_id', $this->client->company_id)
+            $this->gateways = $this->client
+                             ->company
+                             ->company_gateways
                              ->whereIn('id', $transformed_ids)
                              ->where('is_deleted', false)
                              ->whereNull('deleted_at')
                              ->where('gateway_key', '!=', '54faab2ab6e3223dbe848b1686490baa')
                              ->sortby(function ($model) use ($transformed_ids) { //company gateways are sorted in order of priority
                                  return array_search($model->id, $transformed_ids);// this closure sorts for us
-                             })->get();
+                             });
 
         } else {
 
@@ -105,15 +105,16 @@ class PaymentMethod
 
             $transformed_ids = $this->transformKeys(explode(',', $company_gateways));
 
-            $this->gateways = CompanyGateway::with('gateway')
-                             ->where('company_id', $this->client->company_id)
+            $this->gateways = $this->client
+                             ->company
+                             ->company_gateways
                              ->whereIn('id', $transformed_ids)
                              ->where('is_deleted', false)
                              ->whereNull('deleted_at')
                              ->where('gateway_key', '54faab2ab6e3223dbe848b1686490baa')
                              ->sortby(function ($model) use ($transformed_ids) { //company gateways are sorted in order of priority
                                  return array_search($model->id, $transformed_ids);// this closure sorts for us
-                             })->get();
+                             });
 
         } else {
 

From 091ad58bb37318f983146e0c21ee004f4852f66b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 21 Feb 2022 08:35:03 +1100
Subject: [PATCH 3/3] Format due date in client portal

---
 resources/views/portal/ninja2020/invoices/payment.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/portal/ninja2020/invoices/payment.blade.php b/resources/views/portal/ninja2020/invoices/payment.blade.php
index a3969763b6e5..b45fd4435575 100644
--- a/resources/views/portal/ninja2020/invoices/payment.blade.php
+++ b/resources/views/portal/ninja2020/invoices/payment.blade.php
@@ -78,7 +78,7 @@
                                     {{ ctrans('texts.due_date') }}
                                 </dt>
                                 <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                    {{ $invoice->due_date }}
+                                    {{ $invoice->translateDate($invoice->due_date, $invoice->client->date_format(), $invoice->client->locale()) }}
                                 </dd>
                             </div>
                             @endif