Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 06:32:40 +01:00
Code Issues Releases Activity

Merge branch 'v5-stable' of https://github.com/turbo124/invoiceninja into v5-stable

Browse Source
This commit is contained in:
David Bomba 2020-11-30 08:32:27 +11:00
commit f2f8837269
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; $old_user_key = array_key_exists('user_id', $resource) ?? $this->user->id;
$this->ids['expense_categories'] = [
"expense_categories_{$old_user_key}" => [ $key = "expense_categories_{$resource['id']}";
'old' => $resource['id'],
$this->ids['expense_categories'][$key] = [
'old' => $resource['id'],
'new' => $expense_category->id, 'new' => $expense_category->id,
],
]; ];
// $this->ids['expense_categories'] = [
// "expense_categories_{$old_user_key}" => [
// 'old' => $resource['id'],
// 'new' => $expense_category->id,
// ],
// ];
} }
ExpenseCategory::reguard(); ExpenseCategory::reguard();