mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-24 02:14:21 -04:00
Fixes for showing tasks in client portal
This commit is contained in:
parent
d06f383a98
commit
d62bdbedcb
@ -157,6 +157,7 @@ class RecurringInvoiceController extends BaseController
|
||||
$user = auth()->user();
|
||||
|
||||
$recurring_invoice = RecurringInvoiceFactory::create($user->company()->id, $user->id);
|
||||
$recurring_invoice->auto_bill = $user->company()->settings->auto_bill;
|
||||
|
||||
return $this->itemResponse($recurring_invoice);
|
||||
}
|
||||
|
@ -39,11 +39,11 @@ class TasksTable extends Component
|
||||
->where('is_deleted', false)
|
||||
->where('client_id', auth()->guard('contact')->user()->client_id);
|
||||
|
||||
if ($this->company->getSetting('show_all_tasks_client_portal') === 'invoiced') {
|
||||
if ( auth()->guard('contact')->user()->client->getSetting('show_all_tasks_client_portal') === 'invoiced') {
|
||||
$query = $query->whereNotNull('invoice_id');
|
||||
}
|
||||
|
||||
if ($this->company->getSetting('show_all_tasks_client_portal') === 'uninvoiced') {
|
||||
if ( auth()->guard('contact')->user()->client->getSetting('show_all_tasks_client_portal') === 'uninvoiced') {
|
||||
$query = $query->whereNull('invoice_id');
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user