mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-31 06:14:35 -04:00
Include bank transaction rules to first load
This commit is contained in:
parent
3fa0373abb
commit
9091951f41
@ -108,6 +108,7 @@ class BaseController extends Controller
|
|||||||
'company.system_logs',
|
'company.system_logs',
|
||||||
'company.bank_integrations',
|
'company.bank_integrations',
|
||||||
'company.bank_transactions',
|
'company.bank_transactions',
|
||||||
|
'company.bank_transaction_rules',
|
||||||
];
|
];
|
||||||
|
|
||||||
private $mini_load = [
|
private $mini_load = [
|
||||||
@ -126,6 +127,7 @@ class BaseController extends Controller
|
|||||||
'company.expense_categories',
|
'company.expense_categories',
|
||||||
'company.subscriptions',
|
'company.subscriptions',
|
||||||
'company.bank_integrations',
|
'company.bank_integrations',
|
||||||
|
'company.bank_transaction_rules',
|
||||||
];
|
];
|
||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
@ -456,6 +458,13 @@ class BaseController extends Controller
|
|||||||
$query->where('bank_transactions.user_id', $user->id);
|
$query->where('bank_transactions.user_id', $user->id);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
'company.bank_transaction_rules'=> function ($query) use ($updated_at, $user) {
|
||||||
|
$query->where('updated_at', '>=', $updated_at);
|
||||||
|
|
||||||
|
if (! $user->isAdmin()) {
|
||||||
|
$query->where('bank_transaction_rules.user_id', $user->id);
|
||||||
|
}
|
||||||
|
},
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -530,6 +539,12 @@ class BaseController extends Controller
|
|||||||
$query->where('bank_integrations.user_id', $user->id);
|
$query->where('bank_integrations.user_id', $user->id);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
'company.bank_transaction_rules'=> function ($query) use ($updated_at, $user) {
|
||||||
|
|
||||||
|
if (! $user->isAdmin()) {
|
||||||
|
$query->where('bank_transaction_rules.user_id', $user->id);
|
||||||
|
}
|
||||||
|
},
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user