Attachment 97979 Details for Bug 24490 – Bug 24339: Do not assume there are exactly 3 SIP* AVs

[patch] Bug 24339: Do not assume there are exactly 3 SIP* AVs

Bug-24339-Do-not-assume-there-are-exactly-3-SIP-AV.patch (text/plain), 3.21 KB, created by ByWater Sandboxes on 2020-01-27 14:10:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ByWater Sandboxes

Created: 2020-01-27 14:10:27 UTC

Size: 3.21 KB

patch

obsolete

>From eca3f2f8106f3582b85b0262c411ef37f49d9e66 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 27 Jan 2020 11:03:46 +0100
>Subject: [PATCH] Bug 24339: Do not assume there are exactly 3 SIP* AVs
>
>Update DB entry 19.06.00.017:
>We created SIP* AV from accountlines if '^Pay[[:digit:]]{2}$', so I
>think we should assume that more than SIP00, SIP01, SIP02 can exist.
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>
>Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
>
>https://bugs.koha-community.org/show_bug.cgi?id=24490
>---
> .../prog/en/modules/members/paycollect.tt          | 22 ++++++++++++----------
> 1 file changed, 12 insertions(+), 10 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>index 61220f1584..ae2f53d486 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>@@ -123,17 +123,18 @@
>         <label>Change to give: </label>
>         <span id="change">0.00</span>
>     </li>
>-    [% SET payment_types = AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %]
>-    [% SET excluded = ['SIP00', 'SIP01', 'SIP02'] %]
>-    [% IF payment_types.size > 3 %]
>+    [% SET payment_types = [] %]
>+    [% FOR pt IN AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %]
>+        [% NEXT IF pt.authorised_value.grep("^SIP[[:digit:]]{2}$").size() %]
>+        [% payment_types.push(pt) %]
>+    [% END %]
>+    [% IF payment_types.size > 0 %]
>         <li>
>             <label for="payment_type">Payment type: </label>
>             <select name="payment_type" id="payment_type">
>                 <option value=""></option>
>                 [% FOREACH pt IN payment_types %]
>-                    [% UNLESS excluded.grep("^$pt.authorised_value\$").size %]
>                     <option value="[% pt.authorised_value | html %]">[% pt.lib | html %]</option>
>-                    [% END %]
>                 [% END %]
>             </select>
>         </li>
>@@ -256,17 +257,18 @@
>             <label>Change to give: </label>
>             <span id="change">0.00</span>
>         </li>
>-    [% SET payment_types = AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %]
>-    [% SET excluded = ['SIP00', 'SIP01', 'SIP02'] %]
>-    [% IF payment_types.size > 3 %]
>+    [% SET payment_types = [] %]
>+    [% FOR pt IN AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %]
>+        [% NEXT IF pt.authorised_value.grep("^SIP[[:digit:]]{2}$").size() %]
>+        [% payment_types.push(pt) %]
>+    [% END %]
>+    [% IF payment_types.size > 0 %]
>         <li>
>             <label for="payment_type">Payment type: </label>
>             <select name="payment_type" id="payment_type">
>                 <option value=""></option>
>                 [% FOREACH pt IN payment_types %]
>-                    [% UNLESS excluded.grep("^$pt.authorised_value\$").size %]
>                     <option value="[% pt.authorised_value | html %]">[% pt.lib | html %]</option>
>-                    [% END %]
>                 [% END %]
>             </select>
>         </li>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24490: 97872 | 97879 | 97930 | 97979 | 97985 | 97992 | 98358