From f59b31ab7075a69a7c1b1569320fd69376bb17d4 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 17 Mar 2022 19:37:40 +1100 Subject: [PATCH 1/2] Add invoice numbers --- app/PaymentDrivers/Eway/CreditCard.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/PaymentDrivers/Eway/CreditCard.php b/app/PaymentDrivers/Eway/CreditCard.php index ab85688fe5..b79c6a2afc 100644 --- a/app/PaymentDrivers/Eway/CreditCard.php +++ b/app/PaymentDrivers/Eway/CreditCard.php @@ -237,7 +237,8 @@ class CreditCard { $amount = array_sum(array_column($payment_hash->invoices(), 'amount')) + $payment_hash->fee_total; - + $invoice_numbers = ''; + if($this->eway_driver->payment_hash->data) $invoice_numbers = collect($this->eway_driver->payment_hash->data->invoices)->pluck('invoice_number')->implode(','); @@ -251,7 +252,6 @@ class CreditCard 'TotalAmount' => $this->convertAmountForEway($amount), 'CurrencyCode' => $this->eway_driver->client->currency()->code, 'InvoiceNumber' => $invoice_numbers, - 'InvoiceDescription' => $description, 'InvoiceReference' => $description, ], 'TransactionType' => \Eway\Rapid\Enum\TransactionType::RECURRING, From 95999a7aa6fd7e233edae083b6d95c6fdfd11508 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 18 Mar 2022 08:36:29 +1100 Subject: [PATCH 2/2] v5.3.71 --- VERSION.txt | 2 +- app/Utils/SystemHealth.php | 2 +- config/ninja.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index b2c42b050e..4e06b9704c 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.3.70 \ No newline at end of file +5.3.71 \ No newline at end of file diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php index 1e77d29da0..3cb6dd1612 100644 --- a/app/Utils/SystemHealth.php +++ b/app/Utils/SystemHealth.php @@ -187,7 +187,7 @@ class SystemHealth config(['database.connections.mysql.password' => $request->input('db_password')]); config(['database.default' => 'mysql']); - DB::purge('db-ninja-01'); + DB::purge('mysql'); } if (!config('ninja.db.multi_db_enabled')) { diff --git a/config/ninja.php b/config/ninja.php index cc95a2475b..8d242e42b8 100644 --- a/config/ninja.php +++ b/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.70', - 'app_tag' => '5.3.70', + 'app_version' => '5.3.71', + 'app_tag' => '5.3.71', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),