Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 14:24:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
David Bomba 2023-07-22 11:13:18 +10:00
parent 52d037ae07
commit 42b29fe89f
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
View File

@ -144,7 +144,7 @@ class StoreRecurringInvoiceRequest extends Request
unset($input['number']); unset($input['number']);
} }
if (array_key_exists('exchange_rate', $input) && is_null($input['exchange_rate'])) { if (array_key_exists('exchange_rate', $input) && (is_null($input['exchange_rate']) || $input['exchange_rate'] == 0)) {
$input['exchange_rate'] = 1; $input['exchange_rate'] = 1;
} }

2
app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
View File

@ -122,7 +122,7 @@ class UpdateRecurringInvoiceRequest extends Request
unset($input['documents']); unset($input['documents']);
} }
if (array_key_exists('exchange_rate', $input) && is_null($input['exchange_rate'])) { if (array_key_exists('exchange_rate', $input) && (is_null($input['exchange_rate']) || $input['exchange_rate'] == 0)) {
$input['exchange_rate'] = 1; $input['exchange_rate'] = 1;
} }

3
app/Import/Providers/BaseImport.php
View File

@ -765,7 +765,8 @@ class BaseImport
{ {
$keys = array_shift($data); $keys = array_shift($data);
ksort($keys); ksort($keys);
// nlog($data);
// nlog($keys);
return array_map(function ($values) use ($keys) { return array_map(function ($values) use ($keys) {
return array_combine($keys, $values); return array_combine($keys, $values);
}, $data); }, $data);