From 78488ea8fdd4d03ef1c9a2d772b0e030ff6b8eed Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Tue, 18 Jan 2022 17:10:45 -0500
Subject: [PATCH] LP1904036 Ang Checkout Support Auto-Renew

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts      | 10 ++++++++--
 .../src/app/staff/share/circ/open-circ-dialog.component.html   |  8 ++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts b/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts
index 38c17629e2..636af454a1 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts
@@ -500,6 +500,12 @@ export class CircService {
                 return this.handlePrecat(result);
 
             case 'OPEN_CIRCULATION_EXISTS':
+
+                if (result.firstEvent.payload.auto_renew) {
+                    const coParams = Object.assign({}, result.params); // clone
+                    return this.renew(coParams);
+                }
+
                 return this.handleOpenCirc(result);
 
             case 'COPY_IN_TRANSIT':
@@ -590,7 +596,7 @@ export class CircService {
             this.components.openCircDialog.sameUser = sameUser;
             this.components.openCircDialog.circDate = circ.xact_start();
 
-            return this.components.openCircDialog.open().toPromise();
+            return this.components.openCircDialog.open({size: 'lg'}).toPromise();
         })
 
         .then(fromDialog => {
@@ -600,7 +606,7 @@ export class CircService {
 
             const coParams = Object.assign({}, result.params); // clone
 
-            if (sameUser) {
+            if (fromDialog.renew) {
                 coParams.void_overdues = fromDialog.forgiveFines;
                 return this.renew(coParams);
             }
diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/open-circ-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/open-circ-dialog.component.html
index c50d7c3def..ba5e812bd4 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/open-circ-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/open-circ-dialog.component.html
@@ -31,12 +31,12 @@
     <div class="flex-1"></div>
 
     <div>
-      <button type="button" class="btn btn-success" *ngIf="!sameUser"
-        (click)="close({forgiveFines: forgiveFines})" i18n>
+      <button type="button" class="btn btn-success"
+        (click)="close({checkout: true, forgiveFines: forgiveFines})" i18n>
         Normal Checkin Then Checkout</button>
 
-      <button type="button" class="btn btn-success" *ngIf="sameUser"
-        (click)="close({forgiveFines: forgiveFines})" i18n>Renew</button>
+      <button type="button" class="btn btn-info ml-2" *ngIf="sameUser"
+        (click)="close({renew: true, forgiveFines: forgiveFines})" i18n>Renew</button>
 
       <button type="button" class="btn btn-warning ml-2"
         (click)="close()" i18n>Cancel</button>
-- 
2.11.0