From 1499941570d282750abd374df8da25a467fbb7c2 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 25 Aug 2021 12:13:14 -0400
Subject: [PATCH] LP1904036 Bill details voider / accepting user

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../app/staff/circ/patron/bill-statement.component.html |  2 +-
 .../app/staff/circ/patron/bill-statement.component.ts   | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.html
index df88b72073..7324746d56 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.html
@@ -218,7 +218,7 @@
         </eg-grid>
       </div>
       <div class="mt-3">
-        <eg-grid idlClass="mp" [dataSource]="paymentDataSource" 
+        <eg-grid idlClass="mbp" [dataSource]="paymentDataSource" 
           persistKey="circ.patron.xact_details_details_payments"
           i18n-toolbarLabel toolbarLabel="Payments" [sortable]="true">
           <eg-grid-toolbar-action label="Edit Note" i18n-label
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.ts
index 03a5e82cec..a9c276240d 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.ts
@@ -76,20 +76,25 @@ export class BillStatementComponent implements OnInit {
             if (sort.length) {
                 orderBy.mb = sort[0].name + ' ' + sort[0].dir;
             }
-            return this.pcrud.search(
-                'mb', {xact: this.xactId}, {order_by: orderBy});
+            return this.pcrud.search('mb', {xact: this.xactId}, {
+                flesh: 1,
+                flesh_fields: {mb: ['voider']},
+                order_by: orderBy
+            });
         };
 
         this.paymentDataSource.getRows = (pager: Pager, sort: any[]) => {
             const orderBy: any = {};
             if (sort.length) {
-                orderBy.mp = sort[0].name + ' ' + sort[0].dir;
+                orderBy.mbp = sort[0].name + ' ' + sort[0].dir;
             }
-            return this.pcrud.search(
-                'mp', {xact: this.xactId}, {order_by: orderBy});
+            return this.pcrud.search('mbp', {xact: this.xactId}, {
+                flesh: 1,
+                flesh_fields: {mbp: ['accepting_usr']},
+                order_by: orderBy
+            });
         };
 
-
         this.net.request(
             'open-ils.circ',
             'open-ils.circ.money.statement.retrieve',
-- 
2.11.0