Revert "lp1965579 stop gap for negative bills in opac"

This reverts commit 7018281303cf2cec99a2845989563ea9c55192bd.

diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2
index f3319c5..451fc0c 100755 (executable)
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2
@@ -168,7 +168,7 @@
                 </tr>
             </thead>
             <tbody id='myopac_trans_tbody'>
-                [% c = 0; neg_or_zero = 0; %]
+                [% c = 0; %]
                 [% FOR f IN ctx.fines.grocery %]
                 <tr class ='myopac_trans_row'>
                 [% c = c + 1; %]
@@ -185,7 +185,6 @@
                             [% money(f.xact.balance_owed) %]
                         </strong>
                          <input type="hidden" class="fineAmount" value="[% f.xact.balance_owed %]" hidden />
-                        [% IF f.xact.balance_owed <= 0; neg_or_zero = neg_or_zero + 1; END %]
                     </td>
                     
                     <td>
@@ -216,15 +215,12 @@
     [% UNLESS ctx.fines.grocery.size OR ctx.fines.circulation.size %]
     <div>[% l('You have no current fines.') %]</div>
     [% ELSIF myopac_cc_allowed %]
-        [% IF neg_or_zero > 0 %]
-            <div class="my-3">[% 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 %]
-            <div class="my-3">
-                <button type="submit" value="[% l('Pay selected charges') %] - [% money(ctx.user_stats.fines.balance_owed) %]" title="[% l('Pay selected charges') %]" class="btn btn-confirm my-1"
-                    id="selectPay"> <i class='fas fa-money-bill-wave' aria-hidden="true"></i> [% l('Pay Selected Charges') %] - [% money(ctx.user_stats.fines.balance_owed) %]</button>
-            <button type="submit" class="btn btn-confirm my-1"><i class="fas fa-cash-register" aria-hidden="true"></i> [% l('Pay All Charges') %] - [% money(ctx.user_stats.fines.balance_owed) %]</button>
-            </div>
-        [% END %]
+   
+    <div class="my-3">
+        <button type="submit" value="[% l('Pay selected charges') %] - [% money(ctx.user_stats.fines.balance_owed) %]" title="[% l('Pay selected charges') %]" class="btn btn-confirm my-1"
+            id="selectPay"> <i class='fas fa-money-bill-wave' aria-hidden="true"></i> [% l('Pay Selected Charges') %] - [% money(ctx.user_stats.fines.balance_owed) %]</button>
+    <button type="submit" class="btn btn-confirm my-1"><i class="fas fa-cash-register" aria-hidden="true"></i> [% l('Pay All Charges') %] - [% money(ctx.user_stats.fines.balance_owed) %]</button>
+    </div>
     [% END %]
 [% IF myopac_cc_allowed %]
 </form>

diff --git a/Open-ILS/src/templates/opac/myopac/main.tt2 b/Open-ILS/src/templates/opac/myopac/main.tt2
index b4bd72f..c663bce 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/main.tt2
+++ b/Open-ILS/src/templates/opac/myopac/main.tt2
@@ -154,7 +154,6 @@
                 </tr>
             </thead>
             <tbody id='myopac_trans_tbody'>
-                [% neg_or_zero = 0; %]
                 [% FOR f IN ctx.fines.grocery %]
                 <tr id='myopac_trans_row'>
                 
@@ -170,7 +169,6 @@
                         <strong>
                             [% money(f.xact.balance_owed) %]
                         </strong>
-                        [% IF f.xact.balance_owed <= 0; neg_or_zero = neg_or_zero + 1; END %]
                     </td>
                     
                     <td>[% f.xact.last_billing_type %]</td>
@@ -194,16 +192,12 @@
     [% UNLESS ctx.fines.grocery.size OR ctx.fines.circulation.size %]
     <div>[% l('You have no current fines.') %]</div>
     [% ELSIF myopac_cc_allowed %]
-        [% IF neg_or_zero > 0 %]
-            <div class="text-left pad-top-ten">[% 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 %]
-            <div class="text-left pad-top-ten">
-                <input type="submit"
-                    value="[% l('Pay selected charges') %]"
-                    title="[% l('Pay selected charges') %]"
-                    class="opac-button" />
-            </div>
-        [% END %]
+    <div class="text-left pad-top-ten">
+        <input type="submit"
+            value="[% l('Pay selected charges') %]"
+            title="[% l('Pay selected charges') %]"
+            class="opac-button" />
+    </div>
     [% END %]
 [% IF myopac_cc_allowed %]
 </form>

diff --git a/docs/RELEASE_NOTES_NEXT/miscellaneous.adoc b/docs/RELEASE_NOTES_NEXT/miscellaneous.adoc
index 55e809f..e69de29 100644 (file)
--- a/docs/RELEASE_NOTES_NEXT/miscellaneous.adoc
+++ b/docs/RELEASE_NOTES_NEXT/miscellaneous.adoc
@@ -1,5 +0,0 @@
-* 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.