Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 08:51:34 +02:00
Code Issues Releases Activity

Merge pull request #7299 from turbo124/v5-develop

Browse Source 
v5.3.71
This commit is contained in:
David Bomba 2022-03-18 08:37:08 +11:00 committed by GitHub
commit dc54167543
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.3.70 5.3.71

2
app/PaymentDrivers/Eway/CreditCard.php
View File

@ -237,6 +237,7 @@ class CreditCard
{ {
$amount = array_sum(array_column($payment_hash->invoices(), 'amount')) + $payment_hash->fee_total; $amount = array_sum(array_column($payment_hash->invoices(), 'amount')) + $payment_hash->fee_total;
$invoice_numbers = '';
if($this->eway_driver->payment_hash->data) if($this->eway_driver->payment_hash->data)
$invoice_numbers = collect($this->eway_driver->payment_hash->data->invoices)->pluck('invoice_number')->implode(','); $invoice_numbers = collect($this->eway_driver->payment_hash->data->invoices)->pluck('invoice_number')->implode(',');
@ -251,7 +252,6 @@ class CreditCard
'TotalAmount' => $this->convertAmountForEway($amount), 'TotalAmount' => $this->convertAmountForEway($amount),
'CurrencyCode' => $this->eway_driver->client->currency()->code, 'CurrencyCode' => $this->eway_driver->client->currency()->code,
'InvoiceNumber' => $invoice_numbers, 'InvoiceNumber' => $invoice_numbers,
'InvoiceDescription' => $description,
'InvoiceReference' => $description, 'InvoiceReference' => $description,
], ],
'TransactionType' => \Eway\Rapid\Enum\TransactionType::RECURRING, 'TransactionType' => \Eway\Rapid\Enum\TransactionType::RECURRING,

2
app/Utils/SystemHealth.php
View File

@ -187,7 +187,7 @@ class SystemHealth
config(['database.connections.mysql.password' => $request->input('db_password')]); config(['database.connections.mysql.password' => $request->input('db_password')]);
config(['database.default' => 'mysql']); config(['database.default' => 'mysql']);
DB::purge('db-ninja-01'); DB::purge('mysql');
} }
if (!config('ninja.db.multi_db_enabled')) { if (!config('ninja.db.multi_db_enabled')) {

4
config/ninja.php
View File

@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.3.70', 'app_version' => '5.3.71',
'app_tag' => '5.3.70', 'app_tag' => '5.3.71',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),