From: Jason Etheridge Date: Wed, 20 Apr 2022 18:27:14 +0000 (-0400) Subject: lp1965579 stop gap for negative bills in opac X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=7018281303cf2cec99a2845989563ea9c55192bd;p=evergreen%2Fpines.git lp1965579 stop gap for negative bills in opac and zero bills. If present, disallows payment and points the patron to their library to resolve. Cribbed from Terran's rel_3_8_0_temp_fix_for_stripe_negative_bill_bug @ evergreen/pines.git Signed-off-by: Jason Etheridge Signed-off-by: Terran McCanna --- diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 index 451fc0c170..f3319c5a69 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 @@ -168,7 +168,7 @@ - [% c = 0; %] + [% c = 0; neg_or_zero = 0; %] [% FOR f IN ctx.fines.grocery %] [% c = c + 1; %] @@ -185,6 +185,7 @@ [% money(f.xact.balance_owed) %] + [% IF f.xact.balance_owed <= 0; neg_or_zero = neg_or_zero + 1; END %] @@ -215,12 +216,15 @@ [% UNLESS ctx.fines.grocery.size OR ctx.fines.circulation.size %]
[% l('You have no current fines.') %]
[% ELSIF myopac_cc_allowed %] - -
- - -
+ [% IF neg_or_zero > 0 %] +
[% l('There are negative bills on your account that must be resolved before you are able to make a payment. Please contact your library for assistance.') %] + [% ELSE %] +
+ + +
+ [% END %] [% END %] [% IF myopac_cc_allowed %] diff --git a/Open-ILS/src/templates/opac/myopac/main.tt2 b/Open-ILS/src/templates/opac/myopac/main.tt2 index c663bce895..b4bd72f858 100644 --- a/Open-ILS/src/templates/opac/myopac/main.tt2 +++ b/Open-ILS/src/templates/opac/myopac/main.tt2 @@ -154,6 +154,7 @@ + [% neg_or_zero = 0; %] [% FOR f IN ctx.fines.grocery %] @@ -169,6 +170,7 @@ [% money(f.xact.balance_owed) %] + [% IF f.xact.balance_owed <= 0; neg_or_zero = neg_or_zero + 1; END %] [% f.xact.last_billing_type %] @@ -192,12 +194,16 @@ [% UNLESS ctx.fines.grocery.size OR ctx.fines.circulation.size %]
[% l('You have no current fines.') %]
[% ELSIF myopac_cc_allowed %] -
- -
+ [% IF neg_or_zero > 0 %] +
[% l('There are negative bills on your account that must be resolved before you are able to make a payment. Please contact your library for assistance.') %] + [% ELSE %] +
+ +
+ [% END %] [% END %] [% IF myopac_cc_allowed %] diff --git a/docs/RELEASE_NOTES_NEXT/miscellaneous.adoc b/docs/RELEASE_NOTES_NEXT/miscellaneous.adoc index e69de29bb2..55e809f5d4 100644 --- a/docs/RELEASE_NOTES_NEXT/miscellaneous.adoc +++ b/docs/RELEASE_NOTES_NEXT/miscellaneous.adoc @@ -0,0 +1,5 @@ +* The patron record juvenile flag is now available to the checkout and + items out print templates. +* The Notices / Action Triggers administration interface (under Local + Administration) is ported to Angular. +* Disallow payments via the OPAC if negative or zero billings are present.