From 44dd0c975e699cf9503295346e978207b1451c00 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 22 May 2023 08:20:49 +1000
Subject: [PATCH 01/14] Minor fixes for rendering

---
 public/js/clients/shared/pdf.js    | 22 ++++++++++++++++++++--
 public/mix-manifest.json           |  2 +-
 resources/js/clients/shared/pdf.js | 22 ++++++++++++++++++++--
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/public/js/clients/shared/pdf.js b/public/js/clients/shared/pdf.js
index fbf628b2323f..117fb2d34942 100644
--- a/public/js/clients/shared/pdf.js
+++ b/public/js/clients/shared/pdf.js
@@ -29,10 +29,10 @@ var PDF = /*#__PURE__*/function () {
     this.context = canvas.getContext('2d');
     this.currentPage = 1;
     this.maxPages = 1;
-    this.currentScale = 1.25;
+    this.currentScale = 1;
     this.currentScaleText = document.getElementById('zoom-level');
     if (matchMedia('only screen and (max-width: 480px)').matches) {
-      this.currentScale = 1.25;
+      this.currentScale = 1;
     }
     this.currentScaleText.textContent = this.currentScale * 100 + '%';
   }
@@ -135,6 +135,24 @@ var PDF = /*#__PURE__*/function () {
                 viewport: viewport
               });
               this.setPagesInViewport();
+
+              /* document.addEventListener("webviewerloaded", function () {
+                  PDFViewerApplication.initializedPromise.then(function () {
+                      PDFViewerApplication.eventBus.on("pagerendered", function handler(event) {
+                          try {
+                              if (window.chrome && !/Edge/.test(navigator.userAgent) && !event.source.__rerendered) {
+                                  console.log("Chrome-like browser detected, re-rendering page %d for the first time.", event.pageNumber);
+                                  var currentScale = event.source.scale;
+                                  event.source.__rerendered = true;
+                                  event.source.update(currentScale * 0.99);
+                                  event.source.update(currentScale);
+                              }
+                          } catch (e) {
+                              console.error(e);
+                          }
+                      });
+                  });
+              }); */
             case 14:
             case "end":
               return _context.stop();
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 795e4ebed0e4..53dba6447150 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -19,7 +19,7 @@
     "/js/clients/payments/stripe-credit-card.js": "/js/clients/payments/stripe-credit-card.js?id=b483e14d15000c04edfe4c9c80fb97c9",
     "/js/setup/setup.js": "/js/setup/setup.js?id=086b9e114b0b9ee01f909d686f489162",
     "/js/clients/payments/card-js.min.js": "/js/clients/payments/card-js.min.js?id=cf50b5ba1fcd1d184bf0c10d710672c8",
-    "/js/clients/shared/pdf.js": "/js/clients/shared/pdf.js?id=40f4f82b01d751c284337279b92b9297",
+    "/js/clients/shared/pdf.js": "/js/clients/shared/pdf.js?id=c9593b44d66f89874d13f99bc3e6ff33",
     "/js/clients/shared/multiple-downloads.js": "/js/clients/shared/multiple-downloads.js?id=bc6756a5ef373ffab30373a6b689d5d4",
     "/js/clients/linkify-urls.js": "/js/clients/linkify-urls.js?id=a9c53bbbced7b1f09cae117f667638cf",
     "/js/clients/payments/braintree-credit-card.js": "/js/clients/payments/braintree-credit-card.js?id=e0020a4104a2d88c21e47ec6679de7ef",
diff --git a/resources/js/clients/shared/pdf.js b/resources/js/clients/shared/pdf.js
index a3b2ed4e9bea..0e9ebc998101 100644
--- a/resources/js/clients/shared/pdf.js
+++ b/resources/js/clients/shared/pdf.js
@@ -15,11 +15,11 @@ class PDF {
         this.context = canvas.getContext('2d');
         this.currentPage = 1;
         this.maxPages = 1;
-        this.currentScale = 1.25;
+        this.currentScale = 1;
         this.currentScaleText = document.getElementById('zoom-level');
 
         if (matchMedia('only screen and (max-width: 480px)').matches) {
-            this.currentScale = 1.25;
+            this.currentScale = 1;
         }
 
         this.currentScaleText.textContent = this.currentScale * 100 + '%';
@@ -131,6 +131,24 @@ class PDF {
         });
 
         this.setPagesInViewport();
+
+        /* document.addEventListener("webviewerloaded", function () {
+            PDFViewerApplication.initializedPromise.then(function () {
+                PDFViewerApplication.eventBus.on("pagerendered", function handler(event) {
+                    try {
+                        if (window.chrome && !/Edge/.test(navigator.userAgent) && !event.source.__rerendered) {
+                            console.log("Chrome-like browser detected, re-rendering page %d for the first time.", event.pageNumber);
+                            var currentScale = event.source.scale;
+                            event.source.__rerendered = true;
+                            event.source.update(currentScale * 0.99);
+                            event.source.update(currentScale);
+                        }
+                    } catch (e) {
+                        console.error(e);
+                    }
+                });
+            });
+        }); */
     }
 }
 

From a38d011d56911d434c572d1f23d00d8a032b94d1 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 22 May 2023 17:41:12 +1000
Subject: [PATCH 02/14] next send date

---
 app/Http/Controllers/TaskStatusController.php    | 1 +
 app/Repositories/TaskStatusRepository.php        | 9 ++++++++-
 app/Transformers/RecurringInvoiceTransformer.php | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/TaskStatusController.php b/app/Http/Controllers/TaskStatusController.php
index 01f6756a3970..6eff15de446c 100644
--- a/app/Http/Controllers/TaskStatusController.php
+++ b/app/Http/Controllers/TaskStatusController.php
@@ -124,6 +124,7 @@ class TaskStatusController extends BaseController
      */
     public function update(UpdateTaskStatusRequest $request, TaskStatus $task_status)
     {
+        nlog($request->all());
         
         $task_status->fill($request->all());
         $reorder = $task_status->isDirty('status_order');
diff --git a/app/Repositories/TaskStatusRepository.php b/app/Repositories/TaskStatusRepository.php
index 0ff8904d0c79..3740325a4c96 100644
--- a/app/Repositories/TaskStatusRepository.php
+++ b/app/Repositories/TaskStatusRepository.php
@@ -56,13 +56,20 @@ class TaskStatusRepository extends BaseRepository
 
     public function reorder(TaskStatus $task_status)
     {
+nlog("i am dirty");
 
+nlog(TaskStatus::query()
+                  ->where('company_id', $task_status->company_id)
+                  ->orderByRaw('ISNULL(status_order), status_order ASC')
+                  ->orderBy('status_order', 'DESC')->pluck('name'));
+                  
         TaskStatus::query()
                   ->where('company_id', $task_status->company_id)
                   ->orderByRaw('ISNULL(status_order), status_order ASC')
-                  ->orderBy('updated_at', 'DESC')
+                  ->orderBy('status_order', 'DESC')
                   ->cursor()
                   ->each(function ($task_status, $index) {
+                    nlog($index." ".$task_status->name);
                       $task_status->update(['status_order' => $index+1]);
                   });
 
diff --git a/app/Transformers/RecurringInvoiceTransformer.php b/app/Transformers/RecurringInvoiceTransformer.php
index 5addf17b6aab..b692ff838fdd 100644
--- a/app/Transformers/RecurringInvoiceTransformer.php
+++ b/app/Transformers/RecurringInvoiceTransformer.php
@@ -91,6 +91,7 @@ class RecurringInvoiceTransformer extends EntityTransformer
             'date' => $invoice->date ?: '',
             'last_sent_date' => $invoice->last_sent_date ?: '',
             'next_send_date' => $invoice->next_send_date_client ?: '',
+            'next_send_datetime' => $invoice->next_send_date ?: '',
             'due_date' => $invoice->due_date ?: '',
             'terms' => $invoice->terms ?: '',
             'public_notes' => $invoice->public_notes ?: '',

From 49bfcd278e14aa16bcd138ea011bcf9ce020bd51 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 22 May 2023 21:59:07 +1000
Subject: [PATCH 03/14] Fixes for task statuses

---
 app/Http/Controllers/TaskStatusController.php |  6 +--
 app/Repositories/TaskStatusRepository.php     | 43 +++++++++++--------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/TaskStatusController.php b/app/Http/Controllers/TaskStatusController.php
index 6eff15de446c..4dc1e3f11f37 100644
--- a/app/Http/Controllers/TaskStatusController.php
+++ b/app/Http/Controllers/TaskStatusController.php
@@ -124,16 +124,16 @@ class TaskStatusController extends BaseController
      */
     public function update(UpdateTaskStatusRequest $request, TaskStatus $task_status)
     {
-        nlog($request->all());
-        
+    
         $task_status->fill($request->all());
         $reorder = $task_status->isDirty('status_order');
         $task_status->save();
-
+        
         if ($reorder) 
             $this->task_status_repo->reorder($task_status);
 
         return $this->itemResponse($task_status->fresh());
+    
     }
 
     /**
diff --git a/app/Repositories/TaskStatusRepository.php b/app/Repositories/TaskStatusRepository.php
index 3740325a4c96..ad085012d88e 100644
--- a/app/Repositories/TaskStatusRepository.php
+++ b/app/Repositories/TaskStatusRepository.php
@@ -45,8 +45,8 @@ class TaskStatusRepository extends BaseRepository
         $new_status = $task_status ? $task_status->id : null;
         
         Task::where('status_id', $task_status->id)
-        ->where('company_id', $task_status->company_id)
-        ->update(['status_id' => $new_status]);
+            ->where('company_id', $task_status->company_id)
+            ->update(['status_id' => $new_status]);
 
 
         parent::archive($task_status);
@@ -56,22 +56,31 @@ class TaskStatusRepository extends BaseRepository
 
     public function reorder(TaskStatus $task_status)
     {
-nlog("i am dirty");
 
-nlog(TaskStatus::query()
-                  ->where('company_id', $task_status->company_id)
-                  ->orderByRaw('ISNULL(status_order), status_order ASC')
-                  ->orderBy('status_order', 'DESC')->pluck('name'));
-                  
-        TaskStatus::query()
-                  ->where('company_id', $task_status->company_id)
-                  ->orderByRaw('ISNULL(status_order), status_order ASC')
-                  ->orderBy('status_order', 'DESC')
-                  ->cursor()
-                  ->each(function ($task_status, $index) {
-                    nlog($index." ".$task_status->name);
-                      $task_status->update(['status_order' => $index+1]);
-                  });
+        TaskStatus::where('company_id', $task_status->company_id)
+                    ->where('id', '!=', $task_status->id)
+                    ->orderByRaw('ISNULL(status_order), status_order ASC')
+                    ->cursor()
+                    ->each(function ($ts, $key) use($task_status){
+                    
+                        if($ts->status_order < $task_status->status_order) {
+                            $ts->status_order--;
+                            $ts->save();
+                        } elseif($ts->status_order >= $task_status->status_order) {
+                            $ts->status_order ++;
+                            $ts->save();
+                        }
+                    
+                    });
+
+
+        TaskStatus::where('company_id', $task_status->company_id)
+                ->orderByRaw('ISNULL(status_order), status_order ASC')
+                ->cursor()
+                ->each(function ($ts, $key) {
+                    $ts->status_order = $key;
+                    $ts->save();
+                });
 
     }
 }

From f170fc54c73f150d1b4a6b2dff63c21d44f37df1 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 22 May 2023 22:25:16 +1000
Subject: [PATCH 04/14] Remove PDF .js

---
 .../views/portal/ninja2020/components/pdf-viewer.blade.php     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/portal/ninja2020/components/pdf-viewer.blade.php b/resources/views/portal/ninja2020/components/pdf-viewer.blade.php
index 9ef7d22ba57b..8c7ba1ce3ab7 100644
--- a/resources/views/portal/ninja2020/components/pdf-viewer.blade.php
+++ b/resources/views/portal/ninja2020/components/pdf-viewer.blade.php
@@ -1,5 +1,6 @@
 @php
-    $mobile = stripos(request()->server('HTTP_USER_AGENT'), 'Android') || stripos(request()->server('HTTP_USER_AGENT'), 'iPhone') || stripos(request()->server('HTTP_USER_AGENT'), 'iPod') || stripos(request()->server('HTTP_USER_AGENT'), 'iPad');
+    //$mobile = stripos(request()->server('HTTP_USER_AGENT'), 'Android') || stripos(request()->server('HTTP_USER_AGENT'), 'iPhone') || stripos(request()->server('HTTP_USER_AGENT'), 'iPod') || stripos(request()->server('HTTP_USER_AGENT'), 'iPad');
+    $mobile = false;
 @endphp
 
 @push('head')

From 73625a24d90e68f33cc7273a9c6f10a27dd80cda Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 23 May 2023 20:00:36 +1000
Subject: [PATCH 05/14] Fixes for shipping details

---
 app/Utils/HtmlEngine.php               | 3 ++-
 resources/views/pdf-designs/plain.html | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 17c613482d44..c9524bfe01a3 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -114,7 +114,8 @@ class HtmlEngine
         $data['$company_logo_size'] = ['value' => $this->resolveCompanyLogoSize(), 'label' => ''];
         $data['$show_shipping_address'] = ['value' => $this->settings?->show_shipping_address ? 'flex' : 'none', 'label' => ''];
         $data['$show_shipping_address_block'] = ['value' => $this->settings?->show_shipping_address ? 'block' : 'none', 'label' => ''];
-        $data['$show_shipping_address_visibility'] = ['value' => $this->settings?->show_shipping_address ? 'visible' : 'hidden', 'label' => ''];
+        // $data['$show_shipping_address_visibility'] = ['value' => $this->settings?->show_shipping_address ? 'visible' : 'hidden', 'label' => ''];
+        $data['$show_shipping_address_visibility'] = ['value' => $this->settings?->show_shipping_address ? 1 : 0, 'label' => ''];
         
         $data['$tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
         $data['$app_url'] = ['value' => $this->generateAppUrl(), 'label' => ''];
diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html
index b77804d85223..e07feea10af1 100644
--- a/resources/views/pdf-designs/plain.html
+++ b/resources/views/pdf-designs/plain.html
@@ -96,7 +96,7 @@
     }
 
     #shipping-details {
-        visibility: $show_shipping_address_visibility;
+        opacity: $show_shipping_address_visibility;
         flex-direction: column;
         line-height: var(--line-height);
         white-space: nowrap;

From a8103fc6a3eb2045a48e8ad96acaa6d845b59606 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 23 May 2023 20:01:52 +1000
Subject: [PATCH 06/14] Update designs

---
 database/migrations/2023_05_15_103212_e_invoice_ssl_storage.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/database/migrations/2023_05_15_103212_e_invoice_ssl_storage.php b/database/migrations/2023_05_15_103212_e_invoice_ssl_storage.php
index 5f13774326e0..59b2740c4f50 100644
--- a/database/migrations/2023_05_15_103212_e_invoice_ssl_storage.php
+++ b/database/migrations/2023_05_15_103212_e_invoice_ssl_storage.php
@@ -20,6 +20,8 @@ return new class extends Migration
             $table->text('origin_tax_data')->nullable();
         });
 
+        \Illuminate\Support\Facades\Artisan::call('ninja:design-update');
+
     }
 
     /**

From 3066379ff8bd0b29d935331533713fe9f298500b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 23 May 2023 20:08:00 +1000
Subject: [PATCH 07/14] Do not update taxes in products

---
 app/Jobs/Product/UpdateOrCreateProduct.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Jobs/Product/UpdateOrCreateProduct.php b/app/Jobs/Product/UpdateOrCreateProduct.php
index dd3ad2ab5633..7405ed4ee1c6 100644
--- a/app/Jobs/Product/UpdateOrCreateProduct.php
+++ b/app/Jobs/Product/UpdateOrCreateProduct.php
@@ -106,12 +106,12 @@ class UpdateOrCreateProduct implements ShouldQueue
                 $product->quantity = isset($item->quantity) ? $item->quantity : 0;
             }
 
-            $product->tax_name1 = isset($item->tax_name1) ? $item->tax_name1 : '';
-            $product->tax_rate1 = isset($item->tax_rate1) ? $item->tax_rate1 : 0;
-            $product->tax_name2 = isset($item->tax_name2) ? $item->tax_name2 : '';
-            $product->tax_rate2 = isset($item->tax_rate2) ? $item->tax_rate2 : 0;
-            $product->tax_name3 = isset($item->tax_name3) ? $item->tax_name3 : '';
-            $product->tax_rate3 = isset($item->tax_rate3) ? $item->tax_rate3 : 0;
+            // $product->tax_name1 = isset($item->tax_name1) ? $item->tax_name1 : '';
+            // $product->tax_rate1 = isset($item->tax_rate1) ? $item->tax_rate1 : 0;
+            // $product->tax_name2 = isset($item->tax_name2) ? $item->tax_name2 : '';
+            // $product->tax_rate2 = isset($item->tax_rate2) ? $item->tax_rate2 : 0;
+            // $product->tax_name3 = isset($item->tax_name3) ? $item->tax_name3 : '';
+            // $product->tax_rate3 = isset($item->tax_rate3) ? $item->tax_rate3 : 0;
 
             if (isset($item->custom_value1) && strlen($item->custom_value1) >=1) {
                 $product->custom_value1 = $item->custom_value1;

From a7ad937e843401b0514d5acfbb88b562f5a0de62 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 23 May 2023 20:29:55 +1000
Subject: [PATCH 08/14] Fixes for Task Statuses

---
 app/Repositories/TaskStatusRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Repositories/TaskStatusRepository.php b/app/Repositories/TaskStatusRepository.php
index ad085012d88e..4cadccd4d645 100644
--- a/app/Repositories/TaskStatusRepository.php
+++ b/app/Repositories/TaskStatusRepository.php
@@ -78,7 +78,7 @@ class TaskStatusRepository extends BaseRepository
                 ->orderByRaw('ISNULL(status_order), status_order ASC')
                 ->cursor()
                 ->each(function ($ts, $key) {
-                    $ts->status_order = $key;
+                    $ts->status_order = $key+1;
                     $ts->save();
                 });
 

From 55f72ba45089b6c48f1db989fb6f832a0d42f9de Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 23 May 2023 23:27:28 +1000
Subject: [PATCH 09/14] add pending as valid refund state for Stripe

---
 app/PaymentDrivers/StripePaymentDriver.php | 7 ++++++-
 app/Utils/Traits/CleanLineItems.php        | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php
index e5cbc4b895c4..70c2f009730a 100644
--- a/app/PaymentDrivers/StripePaymentDriver.php
+++ b/app/PaymentDrivers/StripePaymentDriver.php
@@ -617,7 +617,7 @@ class StripePaymentDriver extends BaseDriver
                 'amount' => $this->convertToStripeAmount($amount, $this->client->currency()->precision, $this->client->currency()),
             ], $meta);
 
-            if ($response->status == $response::STATUS_SUCCEEDED) {
+            if (in_array($response->status, [$response::STATUS_SUCCEEDED, 'pending'])) {
                 SystemLogger::dispatch(['server_response' => $response, 'data' => request()->all()], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_SUCCESS, SystemLog::TYPE_STRIPE, $this->client, $this->client->company);
 
                 return [
@@ -712,6 +712,11 @@ class StripePaymentDriver extends BaseDriver
                 }
 
                 if ($payment) {
+
+                    if(isset($transaction['payment_method_details']['au_becs_debit'])) {
+                        $payment->transaction_reference = $transaction['id'];
+                    }
+
                     $payment->status_id = Payment::STATUS_COMPLETED;
                     $payment->save();
                 }
diff --git a/app/Utils/Traits/CleanLineItems.php b/app/Utils/Traits/CleanLineItems.php
index 19938c0dce0b..8c6a79b85478 100644
--- a/app/Utils/Traits/CleanLineItems.php
+++ b/app/Utils/Traits/CleanLineItems.php
@@ -76,7 +76,7 @@ trait CleanLineItems
             
         }
 
-        if (array_key_exists('id', $item)) {
+        if (array_key_exists('id', $item) || array_key_exists('_id', $item)) {
             unset($item['id']);
         }
 

From c9e66b34ec7d6258d68e213a35c2ba3c16e2e354 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 24 May 2023 08:08:01 +1000
Subject: [PATCH 10/14] Paytrace sandbox

---
 app/PaymentDrivers/PaytracePaymentDriver.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/PaymentDrivers/PaytracePaymentDriver.php b/app/PaymentDrivers/PaytracePaymentDriver.php
index 33196ee1d32e..74f797024f92 100644
--- a/app/PaymentDrivers/PaytracePaymentDriver.php
+++ b/app/PaymentDrivers/PaytracePaymentDriver.php
@@ -173,7 +173,10 @@ class PaytracePaymentDriver extends BaseDriver
     /*Helpers*/
     private function generateAuthHeaders()
     {
-        $url = 'https://api.paytrace.com/oauth/token';
+        $api_endpoint = $this->company_gateway->getConfigField('testMode') ? 'https://api.sandbox.paytrace.com' : 'https://api.paytrace.com';
+
+        $url = "{$api_endpoint}/oauth/token";
+        
         $data = [
             'grant_type' => 'password',
             'username' => $this->company_gateway->getConfigField('username'),
@@ -197,9 +200,12 @@ class PaytracePaymentDriver extends BaseDriver
 
     public function getAuthToken()
     {
+
+        $api_endpoint = $this->company_gateway->getConfigField('testMode') ? 'https://api.sandbox.paytrace.com' : 'https://api.paytrace.com';
+
         $headers = $this->generateAuthHeaders();
 
-        $response = CurlUtils::post('https://api.paytrace.com/v1/payment_fields/token/create', [], $headers);
+        $response = CurlUtils::post("{$api_endpoint}/v1/payment_fields/token/create", [], $headers);
 
         $response = json_decode($response);
 
@@ -212,7 +218,10 @@ class PaytracePaymentDriver extends BaseDriver
 
     public function gatewayRequest($uri, $data, $headers = false)
     {
-        $base_url = "https://api.paytrace.com{$uri}";
+        
+        $api_endpoint = $this->company_gateway->getConfigField('testMode') ? 'https://api.sandbox.paytrace.com' : 'https://api.paytrace.com';
+
+        $base_url = "{$api_endpoint}{$uri}";
 
         $headers = $this->generateAuthHeaders();
 

From ed4db8963b64f5649909805fd130a66aaca78efb Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 24 May 2023 09:37:29 +1000
Subject: [PATCH 11/14] Paytrace sandbox

---
 app/PaymentDrivers/PaytracePaymentDriver.php  | 29 ++++++++++++++-----
 .../gateways/paytrace/authorize.blade.php     |  6 +++-
 .../ninja2020/gateways/paytrace/pay.blade.php |  4 +++
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/app/PaymentDrivers/PaytracePaymentDriver.php b/app/PaymentDrivers/PaytracePaymentDriver.php
index 74f797024f92..2097ea89ce86 100644
--- a/app/PaymentDrivers/PaytracePaymentDriver.php
+++ b/app/PaymentDrivers/PaytracePaymentDriver.php
@@ -11,18 +11,19 @@
 
 namespace App\PaymentDrivers;
 
-use App\Exceptions\SystemError;
-use App\Http\Requests\Payments\PaymentWebhookRequest;
-use App\Jobs\Util\SystemLogger;
-use App\Models\ClientGatewayToken;
-use App\Models\GatewayType;
+use App\Models\Invoice;
 use App\Models\Payment;
+use App\Utils\CurlUtils;
+use App\Models\SystemLog;
+use App\Models\GatewayType;
 use App\Models\PaymentHash;
 use App\Models\PaymentType;
-use App\Models\SystemLog;
-use App\PaymentDrivers\PayTrace\CreditCard;
-use App\Utils\CurlUtils;
+use App\Exceptions\SystemError;
+use App\Jobs\Util\SystemLogger;
 use App\Utils\Traits\MakesHash;
+use App\Models\ClientGatewayToken;
+use App\PaymentDrivers\PayTrace\CreditCard;
+use App\Http\Requests\Payments\PaymentWebhookRequest;
 
 class PaytracePaymentDriver extends BaseDriver
 {
@@ -125,14 +126,26 @@ class PaytracePaymentDriver extends BaseDriver
     {
         $amount = array_sum(array_column($payment_hash->invoices(), 'amount')) + $payment_hash->fee_total;
 
+        $_invoice = collect($payment_hash->data->invoices)->first();
+        $invoice = Invoice::withTrashed()->find($this->decodePrimaryKey($_invoice->invoice_id));
+
+        if ($invoice) {
+            $invoice_id =  ctrans('texts.invoice_number').'# '.$invoice->number;
+        }
+
+        $invoice_id = ctrans('texts.invoice_number').'# '.substr($payment_hash->hash, 0, 6);
+
         $data = [
             'customer_id' => $cgt->token,
             'integrator_id' =>  $this->company_gateway->getConfigField('integratorId'),
             'amount' => $amount,
+            'invoice_id' => $invoice_id,
         ];
 
         $response = $this->gatewayRequest('/v1/transactions/sale/by_customer', $data);
 
+        nlog($response);
+
         if ($response && $response->success) {
             $data = [
                 'gateway_type_id' => $cgt->gateway_type_id,
diff --git a/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php b/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
index c84c6052171a..3a358432da9b 100644
--- a/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/paytrace/authorize.blade.php
@@ -32,6 +32,10 @@
 @endsection
 
 @section('gateway_footer')
-    <script src="https://protect.paytrace.com/js/protect.min.js"></script>
+    @if($gateway->company_gateway->getConfigField('testMode'))
+    <script src='https://protect.sandbox.paytrace.com/js/protect.min.js'></script>
+    @else
+    <script src='https://protect.paytrace.com/js/protect.min.js'></script>
+    @endif
     <script src="{{ asset('js/clients/payments/paytrace-credit-card.js') }}"></script>
 @endsection
diff --git a/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php b/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
index 6d2933188b07..4807c15827e2 100644
--- a/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
@@ -59,6 +59,10 @@
 @endsection
 
 @section('gateway_footer')
+    @if($gateway->company_gateway->getConfigField('testMode'))
+    <script src='https://protect.sandbox.paytrace.com/js/protect.min.js'></script>
+    @else
     <script src='https://protect.paytrace.com/js/protect.min.js'></script>
+    @endif
     <script src="{{ asset('js/clients/payments/paytrace-credit-card.js') }}"></script>
 @endsection

From eda8439f02971e68fe6bed351a95228dd65a7999 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 24 May 2023 09:53:11 +1000
Subject: [PATCH 12/14] Paytrace Credit card Styling

---
 .../clients/payments/paytrace-credit-card.js  | 92 +++++++++++++------
 public/mix-manifest.json                      |  2 +-
 .../clients/payments/paytrace-credit-card.js  | 92 +++++++++++++------
 3 files changed, 129 insertions(+), 57 deletions(-)

diff --git a/public/js/clients/payments/paytrace-credit-card.js b/public/js/clients/payments/paytrace-credit-card.js
index 7ca72b202f4c..4609fc16ba0c 100644
--- a/public/js/clients/payments/paytrace-credit-card.js
+++ b/public/js/clients/payments/paytrace-credit-card.js
@@ -28,46 +28,82 @@ var PayTraceCreditCard = /*#__PURE__*/function () {
     key: "creditCardStyles",
     get: function get() {
       return {
-        font_color: '#111827',
-        border_color: 'rgba(210,214,220,1)',
-        label_color: '#111827',
-        label_size: '12pt',
-        background_color: 'white',
-        border_style: 'solid',
-        font_size: '15pt',
-        height: '30px',
-        width: '100%'
+        'font_color': '#000',
+        'border_color': '#a1b1c9',
+        'border_style': 'dotted',
+        'font_size': '13pt',
+        'input_border_radius': '3px',
+        'input_border_width': '1px',
+        'input_font': 'Times New Roman, arial, fantasy',
+        'input_font_weight': '400',
+        'input_margin': '5px 0px 5px 0px',
+        'input_padding': '0px 5px 0px 5px',
+        'label_color': '#a0aec0',
+        'label_size': '16px',
+        'label_width': '150px',
+        'label_font': 'Times New Roman, sans-serif, serif',
+        'label_font_weight': 'light',
+        'label_margin': '5px 0px 0px 0px',
+        'label_padding': '0px 5px 0px 5px',
+        'background_color': 'white',
+        'height': '30px',
+        'width': '370px',
+        'padding_bottom': '0px'
       };
     }
   }, {
     key: "codeStyles",
     get: function get() {
       return {
-        font_color: '#111827',
-        border_color: 'rgba(210,214,220,1)',
-        label_color: '#111827',
-        label_size: '12pt',
-        background_color: 'white',
-        border_style: 'solid',
-        font_size: '15pt',
-        height: '30px',
-        width: '300px'
+        'font_color': '#000',
+        'border_color': '#a1b1c9',
+        'border_style': 'dotted',
+        'font_size': '13pt',
+        'input_border_radius': '2px',
+        'input_border_width': '1px',
+        'input_font': 'serif, cursive, fantasy',
+        'input_font_weight': '700',
+        'input_margin': '5px 0px 5px 20px',
+        'input_padding': '0px 5px 0px 5px',
+        'label_color': '#a0aec0',
+        'label_size': '16px',
+        'label_width': '150px',
+        'label_font': 'sans-serif, arial, serif',
+        'label_font_weight': 'bold',
+        'label_margin': '5px 0px 0px 20px',
+        'label_padding': '2px 5px 2px 5px',
+        'background_color': 'white',
+        'height': '30px',
+        'width': '150px',
+        'padding_bottom': '2px'
       };
     }
   }, {
     key: "expStyles",
     get: function get() {
       return {
-        font_color: '#111827',
-        border_color: 'rgba(210,214,220,1)',
-        label_color: '#111827',
-        label_size: '12pt',
-        background_color: 'white',
-        border_style: 'solid',
-        font_size: '15pt',
-        height: '30px',
-        width: '85px',
-        type: 'dropdown'
+        'font_color': '#000',
+        'border_color': '#a1b1c9',
+        'border_style': 'dashed',
+        'font_size': '12pt',
+        'input_border_radius': '0px',
+        'input_border_width': '2px',
+        'input_font': 'arial, cursive, fantasy',
+        'input_font_weight': '400',
+        'input_margin': '5px 0px 5px 0px',
+        'input_padding': '0px 5px 0px 5px',
+        'label_color': '#a0aec0',
+        'label_size': '16px',
+        'label_width': '150px',
+        'label_font': 'arial, fantasy, serif',
+        'label_font_weight': 'normal',
+        'label_margin': '5px 0px 0px 0px',
+        'label_padding': '2px 5px 2px 5px',
+        'background_color': 'white',
+        'height': '30px',
+        'width': '85px',
+        'padding_bottom': '2px',
+        'type': 'dropdown'
       };
     }
   }, {
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 53dba6447150..46c313e24b3f 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -26,7 +26,7 @@
     "/js/clients/payments/braintree-paypal.js": "/js/clients/payments/braintree-paypal.js?id=881f15cb83dc9d0412625da80f094912",
     "/js/clients/payments/wepay-credit-card.js": "/js/clients/payments/wepay-credit-card.js?id=b8b588f18e7c692faa44b598f3f1bde0",
     "/js/clients/payment_methods/wepay-bank-account.js": "/js/clients/payment_methods/wepay-bank-account.js?id=e984eca06a662d2e8a8e01cae085794c",
-    "/js/clients/payments/paytrace-credit-card.js": "/js/clients/payments/paytrace-credit-card.js?id=5ff9cc69d2923a89c05412bff3a8c862",
+    "/js/clients/payments/paytrace-credit-card.js": "/js/clients/payments/paytrace-credit-card.js?id=800e95b9c19d54e844338d619e87c9dc",
     "/js/clients/payments/mollie-credit-card.js": "/js/clients/payments/mollie-credit-card.js?id=2f72b969507e6135b5c52a65522ab3ae",
     "/js/clients/payments/eway-credit-card.js": "/js/clients/payments/eway-credit-card.js?id=0d1c8957b02c5601b7d57c39740bff75",
     "/js/clients/payment_methods/braintree-ach.js": "/js/clients/payment_methods/braintree-ach.js?id=2f8e5af9ba5ce266d2ee49b084fbe291",
diff --git a/resources/js/clients/payments/paytrace-credit-card.js b/resources/js/clients/payments/paytrace-credit-card.js
index ba49c834e975..cce2ada0386a 100644
--- a/resources/js/clients/payments/paytrace-credit-card.js
+++ b/resources/js/clients/payments/paytrace-credit-card.js
@@ -17,44 +17,80 @@ class PayTraceCreditCard {
 
     get creditCardStyles() {
         return {
-            font_color: '#111827',
-            border_color: 'rgba(210,214,220,1)',
-            label_color: '#111827',
-            label_size: '12pt',
-            background_color: 'white',
-            border_style: 'solid',
-            font_size: '15pt',
-            height: '30px',
-            width: '100%',
+            'font_color': '#000',
+            'border_color': '#a1b1c9',
+            'border_style': 'dotted',
+            'font_size': '13pt',
+            'input_border_radius': '3px',
+            'input_border_width': '1px',
+            'input_font': 'Times New Roman, arial, fantasy',
+            'input_font_weight': '400',
+            'input_margin': '5px 0px 5px 0px',
+            'input_padding': '0px 5px 0px 5px',
+            'label_color': '#a0aec0',
+            'label_size': '16px',
+            'label_width': '150px',
+            'label_font': 'Times New Roman, sans-serif, serif',
+            'label_font_weight': 'light',
+            'label_margin': '5px 0px 0px 0px',
+            'label_padding': '0px 5px 0px 5px',
+            'background_color': 'white',
+            'height': '30px',
+            'width': '370px',
+            'padding_bottom': '0px'
         };
     }
 
     get codeStyles() {
         return {
-            font_color: '#111827',
-            border_color: 'rgba(210,214,220,1)',
-            label_color: '#111827',
-            label_size: '12pt',
-            background_color: 'white',
-            border_style: 'solid',
-            font_size: '15pt',
-            height: '30px',
-            width: '300px',
+            'font_color': '#000',
+            'border_color': '#a1b1c9',
+            'border_style': 'dotted',
+            'font_size': '13pt',
+            'input_border_radius': '2px',
+            'input_border_width': '1px',
+            'input_font': 'serif, cursive, fantasy',
+            'input_font_weight': '700',
+            'input_margin': '5px 0px 5px 20px',
+            'input_padding': '0px 5px 0px 5px',
+            'label_color': '#a0aec0',
+            'label_size': '16px',
+            'label_width': '150px',
+            'label_font': 'sans-serif, arial, serif',
+            'label_font_weight': 'bold',
+            'label_margin': '5px 0px 0px 20px',
+            'label_padding': '2px 5px 2px 5px',
+            'background_color': 'white',
+            'height': '30px',
+            'width': '150px',
+            'padding_bottom': '2px'
         };
     }
 
     get expStyles() {
         return {
-            font_color: '#111827',
-            border_color: 'rgba(210,214,220,1)',
-            label_color: '#111827',
-            label_size: '12pt',
-            background_color: 'white',
-            border_style: 'solid',
-            font_size: '15pt',
-            height: '30px',
-            width: '85px',
-            type: 'dropdown',
+            'font_color': '#000',
+            'border_color': '#a1b1c9',
+            'border_style': 'dashed',
+            'font_size': '12pt',
+            'input_border_radius': '0px',
+            'input_border_width': '2px',
+            'input_font': 'arial, cursive, fantasy',
+            'input_font_weight': '400',
+            'input_margin': '5px 0px 5px 0px',
+            'input_padding': '0px 5px 0px 5px',
+            'label_color': '#a0aec0',
+            'label_size': '16px',
+            'label_width': '150px',
+            'label_font': 'arial, fantasy, serif',
+            'label_font_weight': 'normal',
+            'label_margin': '5px 0px 0px 0px',
+            'label_padding': '2px 5px 2px 5px',
+            'background_color': 'white',
+            'height': '30px',
+            'width': '85px',
+            'padding_bottom': '2px',
+            'type': 'dropdown'
         };
     }
 

From 881aa4add91d80b4e68fc10e74de0d00ed4eb753 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 24 May 2023 14:47:05 +1000
Subject: [PATCH 13/14] Fixes for custom email template

---
 app/PaymentDrivers/PaytracePaymentDriver.php |  2 --
 app/Services/Email/EmailDefaults.php         | 16 +++++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/PaymentDrivers/PaytracePaymentDriver.php b/app/PaymentDrivers/PaytracePaymentDriver.php
index 2097ea89ce86..5f33ea843e3a 100644
--- a/app/PaymentDrivers/PaytracePaymentDriver.php
+++ b/app/PaymentDrivers/PaytracePaymentDriver.php
@@ -144,8 +144,6 @@ class PaytracePaymentDriver extends BaseDriver
 
         $response = $this->gatewayRequest('/v1/transactions/sale/by_customer', $data);
 
-        nlog($response);
-
         if ($response && $response->success) {
             $data = [
                 'gateway_type_id' => $cgt->gateway_type_id,
diff --git a/app/Services/Email/EmailDefaults.php b/app/Services/Email/EmailDefaults.php
index 79f1612915bf..47d80f5702b0 100644
--- a/app/Services/Email/EmailDefaults.php
+++ b/app/Services/Email/EmailDefaults.php
@@ -168,14 +168,10 @@ class EmailDefaults
      */
     private function setBody(): self
     {
-        if ($this->template == 'email.template.custom') {
-            $this->email->email_object->body = (str_replace('$body', $this->email->email_object->body, $this->email->email_object->settings->email_style_custom));
-            return $this;
-        }
-
-        if ($this->email->email_object->body) {
+                
+        if (strlen($this->email->email_object->body) > 3) {
             // A Custom Message has been set in the email screen.
-            return $this;
+            // return $this;
         } elseif (strlen($this->email->email_object->settings?->{$this->email->email_object->email_template_body}) > 3) {
             // A body has been saved in the settings.
             $this->email->email_object->body = $this->email->email_object->settings?->{$this->email->email_object->email_template_body};
@@ -183,7 +179,13 @@ class EmailDefaults
             // Default template to be used
             $this->email->email_object->body = EmailTemplateDefaults::getDefaultTemplate($this->email->email_object->email_template_body, $this->locale);
         }
+
+        if ($this->template == 'email.template.custom') {
+            $this->email->email_object->body = (str_replace('$body', $this->email->email_object->body, str_replace(["\r","\n"], "", $this->email->email_object->settings->email_style_custom)));
+        }
+
         return $this;
+
     }
 
     /**

From 96bad39740eca922371748960c498943b7763fc9 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 24 May 2023 14:47:31 +1000
Subject: [PATCH 14/14] v5.5.120

---
 VERSION.txt      | 2 +-
 config/ninja.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index ec9ff787c070..b48289f67fcd 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.5.119
\ No newline at end of file
+5.5.120
\ No newline at end of file
diff --git a/config/ninja.php b/config/ninja.php
index c0a09c9c87d9..f532428b0202 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -15,8 +15,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.119',
-    'app_tag' => '5.5.119',
+    'app_version' => '5.5.120',
+    'app_tag' => '5.5.120',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),