From ec2ac7706511dadbbc16c688197cd0445f36afa1 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Fri, 16 Apr 2021 16:37:54 -0400 Subject: [PATCH] LP1904036 billing history Signed-off-by: Bill Erickson Signed-off-by: Jane Sandberg Signed-off-by: Galen Charlton --- .../circ/patron/billing-history.component.html | 103 +++++++++++++++++---- .../staff/circ/patron/billing-history.component.ts | 30 +++--- 2 files changed, 96 insertions(+), 37 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.html index d7166365b2..088642f8dd 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.html +++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.html @@ -3,31 +3,94 @@ + + + {{r.title}} + + {{r.title}} + + + + + {{r.copy_barcode}} + + + + + + {{r.volume.prefix().label()}} {{r.volume.label()}} {{r.volume.suffix().label()}} + + UNCATALOGED + +
  • Transactions - - - - - - - - - - - - - +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  • diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.ts index 751140aa48..d895a8c184 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.ts @@ -14,6 +14,7 @@ import {PatronService} from '@eg/staff/share/patron/patron.service'; import {PatronContextService, BillGridEntry} from './patron.service'; import {GridDataSource, GridColumn, GridCellTextGenerator} from '@eg/share/grid/grid'; import {GridComponent} from '@eg/share/grid/grid.component'; +import {GridFlatDataService} from '@eg/share/grid/grid-flat-data.service'; import {Pager} from '@eg/share/util/pager'; import {CircService, CircDisplayInfo} from '@eg/staff/share/circ/circ.service'; import {PrintService} from '@eg/share/print/print.service'; @@ -56,6 +57,7 @@ export class BillingHistoryComponent implements OnInit { private circ: CircService, private billing: BillingService, private printer: PrintService, + private flatData: GridFlatDataService, public patronService: PatronService, public context: PatronContextService ) {} @@ -63,24 +65,18 @@ export class BillingHistoryComponent implements OnInit { ngOnInit() { this.xactsDataSource.getRows = (pager: Pager, sort: any[]) => { - const orderBy: any = {}; - if (sort.length) { - orderBy.mb = sort[0].name + ' ' + sort[0].dir; - } - return this.pcrud.search('mbt', {usr: this.patronId}, { - order_by: orderBy, - join: { - mbts: { - filter: { - '-or': [ - {balance_owed: {'<>': 0}}, - {last_payment_ts: {'<>': null}} - ] - } - } - } - }); + const query: any = { + usr: this.patronId, + xact_start: {between: ['2020-04-16', 'now']}, + '-or': [ + {'summary.balance_owed': {'<>': 0}}, + {'summary.last_payment_ts': {'<>': null}} + ] + }; + + return this.flatData.getRows( + this.xactsGrid.context, query, pager, sort); }; /* -- 2.11.0