Payment summary improvements, removed invoice/payment API calls

This commit is contained in:
Deon George
2020-07-21 17:41:24 +10:00
parent 444f2cf52d
commit c97835edd1
10 changed files with 132 additions and 185 deletions

View File

@@ -69,13 +69,29 @@
<div class="card-body">
@include('widgets.invoice',[
'o'=>$o->query_invoice_summary()->whereIN('account_id',$o->accounts()->pluck('id')->toArray())->where('due_date','>',now()->subYear()->timestamp),
'o'=>$o->query_invoice_summary()->whereIN('account_id',$o->accounts()->pluck('id')->toArray())->where('due_date','>',now()->subYear()->timestamp)->having('balance','=',0),
'widget_invoice_name'=>'widget-invoice-last'
])
</div>
</div>
@include('common.payment.widget.history')
<!-- Show last 10 invoices -->
<div class="card card-warning card-outline">
<div class="card-header">
<h4 class="card-title">Payments - Last 12 Months</h4>
<div class="card-tools">
<button type="button" class="btn btn-tool" data-widget="collapse"><i class="fas fa-minus"></i></button>
</div>
</div>
<div class="card-body">
@include('widgets.payment',[
'o'=>$o->query_payment_summary()->where('date_payment','>',now()->subYear()->timestamp)->with(['items']),
'widget_payment_name'=>'widget-payment-last'
])
</div>
</div>
</div>
</div>
</div>