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

Merge pull request #4387 from turbo124/v5-stable

Browse Source 
Fixes for import
This commit is contained in:
David Bomba 2020-11-28 17:23:08 +11:00 committed by GitHub
commit 4505e9b0e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Jobs/Util/Import.php
View File

@ -1107,12 +1107,20 @@ class Import implements ShouldQueue
$old_user_key = array_key_exists('user_id', $resource) ?? $this->user->id;
$this->ids['expense_categories'] = [
"expense_categories_{$old_user_key}" => [
'old' => $resource['id'],
$key = "expense_categories_{$resource['id']}";
$this->ids['expense_categories'][$key] = [
'old' => $resource['id'],
'new' => $expense_category->id,
],
];
// $this->ids['expense_categories'] = [
// "expense_categories_{$old_user_key}" => [
// 'old' => $resource['id'],
// 'new' => $expense_category->id,
// ],
// ];
}
ExpenseCategory::reguard();