Missed some references to ab_payments in d463239
This commit is contained in:
parent
7a963c8461
commit
10e6c73b2b
@ -528,7 +528,7 @@ class User extends Authenticatable
|
||||
*/
|
||||
private function query_payment_items()
|
||||
{
|
||||
return DB::table('ab_payment_item')
|
||||
return DB::table('payment_items')
|
||||
->select([
|
||||
'payment_id',
|
||||
'invoice_id',
|
||||
@ -573,9 +573,9 @@ class User extends Authenticatable
|
||||
DB::raw('SUM(fees_amt) AS payment_fees'),
|
||||
])
|
||||
->from($this->query_payment_items(),'PI')
|
||||
->join('ab_payment',['ab_payment.id'=>'PI.payment_id'])
|
||||
->join('payments',['payments.id'=>'PI.payment_id'])
|
||||
->whereIN('account_id',$this->all_accounts()->pluck('id')->unique()->toArray())
|
||||
//->where('ab_payment.active',TRUE) // @todo To implement
|
||||
//->where('payments.active',TRUE) // @todo To implement
|
||||
->groupBy(['invoice_id']);
|
||||
|
||||
$summary = (new Invoice)
|
||||
@ -618,20 +618,20 @@ class User extends Authenticatable
|
||||
|
||||
])
|
||||
->from($this->query_payment_items(),'PI')
|
||||
//->where('ab_payment.active',TRUE) // @todo To implement
|
||||
//->where('payments.active',TRUE) // @todo To implement
|
||||
->groupBy(['payment_id']);
|
||||
|
||||
return (new Payment)
|
||||
->select([
|
||||
DB::raw('ab_payment.id AS id'),
|
||||
DB::raw('payments.id AS id'),
|
||||
'date_orig',
|
||||
'payment_date',
|
||||
'total_amt',
|
||||
//'fees_amt',
|
||||
DB::raw('total_amt-allocate AS balance'),
|
||||
])
|
||||
->rightJoin('ab_payment',['ab_payment.id'=>'summary.id'])
|
||||
//->where('ab_payment.active',TRUE) // @todo To implement
|
||||
->rightJoin('payments',['payments.id'=>'summary.id'])
|
||||
//->where('payments.active',TRUE) // @todo To implement
|
||||
->whereIN('account_id',$this->all_accounts()->pluck('id')->unique()->toArray())
|
||||
->from($payment,'summary');
|
||||
}
|
||||
|
@ -5,7 +5,7 @@
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
@if(($x=$o->payments()->where('ab_payment.date_orig','>',\Carbon\Carbon::now()->subMonths(12)->unix())->with(['items','account'])->get())->count())
|
||||
@if(($x=$o->payments()->where('payments.date_orig','>',\Carbon\Carbon::now()->subMonths(12)->unix())->with(['items','account'])->get())->count())
|
||||
<table class="table table-bordered w-100" id="payments_past">
|
||||
<thead>
|
||||
<tr>
|
||||
|
Loading…
Reference in New Issue
Block a user