mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-04 02:27:29 -05:00 
			
		
		
		
	Merge branch 'v5-stable' of https://github.com/turbo124/invoiceninja into v5-stable
This commit is contained in:
		
						commit
						f2f8837269
					
				@ -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}" => [
 | 
			
		||||
 | 
			
		||||
            $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();
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user