Merge pull request #1153 from batuhawk/master
Portal extra invoice status deleted
This commit is contained in:
commit
61a6ea6687
@ -18,7 +18,7 @@ class Dashboard extends Controller
|
|||||||
{
|
{
|
||||||
$contact = user()->contact;
|
$contact = user()->contact;
|
||||||
|
|
||||||
$invoices = Invoice::with('status')->accrued()->where('contact_id', $contact->id)->get();
|
$invoices = Invoice::accrued()->where('contact_id', $contact->id)->get();
|
||||||
|
|
||||||
$start = Date::parse(request('start', Date::today()->startOfYear()->format('Y-m-d')));
|
$start = Date::parse(request('start', Date::today()->startOfYear()->format('Y-m-d')));
|
||||||
$end = Date::parse(request('end', Date::today()->endOfYear()->format('Y-m-d')));
|
$end = Date::parse(request('end', Date::today()->endOfYear()->format('Y-m-d')));
|
||||||
|
@ -26,7 +26,7 @@ class Invoices extends Controller
|
|||||||
*/
|
*/
|
||||||
public function index()
|
public function index()
|
||||||
{
|
{
|
||||||
$invoices = Invoice::with(['contact', 'status', 'items', 'payments', 'histories'])
|
$invoices = Invoice::with(['contact', 'items', 'payments', 'histories'])
|
||||||
->accrued()->where('contact_id', user()->contact->id)
|
->accrued()->where('contact_id', user()->contact->id)
|
||||||
->collect(['invoice_number'=> 'desc']);
|
->collect(['invoice_number'=> 'desc']);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user