Code improvements
This commit is contained in:
@@ -20,7 +20,7 @@ class InvoiceRepository {
|
||||
];
|
||||
|
||||
|
||||
$user = auth()->user();
|
||||
$user = currentUser();
|
||||
if (null === $user) {
|
||||
return $invoices;
|
||||
}
|
||||
@@ -41,7 +41,7 @@ class InvoiceRepository {
|
||||
}
|
||||
|
||||
public function getUnexportedInvoices() : Collection {
|
||||
return Invoice::where(['tenant' => app('tenant')->slug, 'status' => InvoiceStatus::INVOICE_STATUS_EXPORTED, 'upload_required' => true])->get();
|
||||
return Invoice::where(['tenant' => currentTenant()->slug, 'status' => InvoiceStatus::INVOICE_STATUS_EXPORTED, 'upload_required' => true])->get();
|
||||
}
|
||||
|
||||
public function getByStatus(CostUnit $costUnit, string $status, bool $forDisplay = true) : array {
|
||||
@@ -63,8 +63,8 @@ class InvoiceRepository {
|
||||
foreach (Invoice::where(
|
||||
[
|
||||
'status' => $status,
|
||||
'user_id' => auth()->user()->id,
|
||||
'tenant' => app('tenant')->slug,
|
||||
'user_id' => currentUserOrFail()->id,
|
||||
'tenant' => currentTenant()->slug,
|
||||
|
||||
]
|
||||
)->get() as $invoice) {
|
||||
@@ -79,7 +79,7 @@ class InvoiceRepository {
|
||||
return null;
|
||||
}
|
||||
|
||||
$isTreasurer = $invoice->costUnit()->first()->treasurers()->where('user_id', auth()->user()->id)->exists();
|
||||
$isTreasurer = $invoice->costUnit()->first()->treasurers()->where('user_id', currentUserOrFail()->id)->exists();
|
||||
if ($isTreasurer) {
|
||||
return $invoice;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user