From ccf6a48952499119e0d5a7b6c8951f2b14172ee9 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 25 Aug 2021 12:28:18 -0400
Subject: [PATCH] LP1904036 Billing history payments fix date filter

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../src/app/staff/circ/patron/billing-history.component.html   |  8 ++++----
 .../eg2/src/app/staff/circ/patron/billing-history.component.ts | 10 ++++++++--
 2 files changed, 12 insertions(+), 6 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 37ad704fd4..a3f4998e38 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
@@ -129,13 +129,13 @@
         </div>
         <div class="col-lg-4 form-inline">
           <span class="mr-2" i18n>Start Date:</span>
-          <eg-date-select [initialIso]="xactsStart"
-            (onChangeAsIso)="dateChange('xactsStart', $event)"></eg-date-select>
+          <eg-date-select [initialIso]="paymentsStart"
+            (onChangeAsDate)="dateChange('paymentsStart', $event)"></eg-date-select>
         </div>
         <div class="col-lg-4 form-inline">
           <span class="mr-2" i18n>End Date:</span>
-          <eg-date-select [initialIso]="xactsEnd"
-            (onChangeAsIso)="dateChange('xactsEnd', $event)"></eg-date-select>
+          <eg-date-select [initialIso]="paymentsEnd"
+            (onChangeAsDate)="dateChange('paymentsEnd', $event)"></eg-date-select>
         </div>
       </div>
 
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 41d45277c5..b36bd0ed49 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
@@ -118,9 +118,15 @@ export class BillingHistoryComponent implements OnInit {
         };
     }
 
-    dateChange(which: string, iso: string) {
+    dateChange(which: string, d: Date) {
 
-        this[which] = iso;
+        if (which.match(/End/)) {
+            // Add a day to the end date so the DB query includes all of
+            // the selected date.
+            d.setDate(d.getDate() + 1);
+        }
+
+        this[which] = DateUtil.localYmdFromDate(d);
 
         if (which.match(/xacts/)) {
             this.xactsGrid.reload();
-- 
2.11.0