LP1904036 more billing

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.ts
index 887ae89..6056061 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.ts
@@ -266,7 +266,7 @@ export class BillsComponent implements OnInit, AfterViewInit {
                 this.paymentNote,
                 this.checkNumber,
                 this.ccPaymentParams,
-                this.convertChangeToCredit
+                this.convertChangeToCredit ? this.pendingChange() : null
             );
         })
         .then(resp => {
@@ -274,6 +274,8 @@ export class BillsComponent implements OnInit, AfterViewInit {
             return this.handlePayReceipt(payments, resp.payments);
         })
 
+        .then(_ => this.context.refreshPatron())
+
         // refresh affected xact IDs
         .then(_ => this.billGrid.reload())
 

diff --git a/Open-ILS/src/eg2/src/app/staff/share/billing/billing.service.ts b/Open-ILS/src/eg2/src/app/staff/share/billing/billing.service.ts
index 89f04bd..884eba2 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/billing/billing.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/billing/billing.service.ts
@@ -78,7 +78,7 @@ export class BillingService {
         paymentNote?: string,
         checkNumber?: string,
         creditCardParams?: CreditCardPaymentParams,
-        convertChangeToCredit?: boolean): Promise<PaymentResponse> {
+        addPatronCredit?: number): Promise<PaymentResponse> {
 
        return this.net.request(
             'open-ils.circ',
@@ -89,7 +89,7 @@ export class BillingService {
                 payment_type: paymentType,
                 check_number: checkNumber,
                 payments: payments,
-                patron_credit: convertChangeToCredit,
+                patron_credit: addPatronCredit,
                 cc_args: creditCardParams
             }, patronLastXactId).toPromise()