Attachment 98552 Details for Bug 24610 – Bug 24610: Let user switch between 'Pay' and 'Write off' mode

[patch] Bug 24610: Let user switch between 'Pay' and 'Write off' mode

Bug-24610-Let-user-switch-between-Pay-and-Write-of.patch (text/plain), 5.27 KB, created by Julian Maurice on 2020-02-07 10:54:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2020-02-07 10:54:27 UTC

Size: 5.27 KB

patch

obsolete

>From b2e6379bfae4a8914ee9f35e3ca53f40a18cd7aa Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Fri, 7 Feb 2020 11:21:43 +0100
>Subject: [PATCH] Bug 24610: Let user switch between 'Pay' and 'Write off' mode
>
>In patron's accounting section, under 'Make a payment' tab, you have the
>choice between 'Pay' and 'Write off'. It takes you to another form, but
>once there you cannot change mode. You have to click on Cancel,
>re-select the lines you had selected (if you made a selection) and click
>on the right button.
>
>This patch adds link above the form to easily switch between the two
>modes.
>
>Also fixes a CSS bug to be able to use Bootstrap's nav pills inside
>.statictabs
>
>Test plan:
>1. Create some manual invoices
>2. Go to 'Make a payment' tab
>3. Click on the 'Pay' button in a table row
>4. Above the form you should see two links ('Pay' and 'Write off').
>   Click on 'Write off', confirm the write off and verify that it did
>   make a 'write off'.
>5. Go to 'Make a payment' tab
>6. Click on the 'Write off' button in a table row
>7. Click 'Pay', confirm the pay and verify that it did make a 'pay'
>8. Go to 'Make a payment' tab
>9. Select some lines and click on 'Pay selected'
>10. Click on 'Write off', confirm the 'write off' and verify that it did
>    make a 'write off'
>11. Go to 'Make a payment' tab
>12. Select some lines and click on 'Write off selected'
>13. Click on 'Pay', confirm the pay and verify that it did make a 'pay'
>---
> .../prog/css/src/staff-global.scss            |  2 +-
> .../prog/en/modules/members/paycollect.tt     | 22 +++++++++++++++++++
> 2 files changed, 23 insertions(+), 1 deletion(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>index 5e02ed1d3c..a35f6d4001 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -2677,7 +2677,7 @@ li {
> }
> 
> .statictabs {
>-    ul {
>+    > ul {
>         background: none repeat scroll 0 0 transparent;
>         border: 0 none;
>         border-bottom-left-radius: 4px;
>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 ae2f53d486..79c2701b94 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>@@ -73,6 +73,11 @@
>     </div>
>     [% ELSE %]
> 
>+    <ul class="nav nav-pills">
>+        <li role="presentation" class="active"><a>Pay</a></li>
>+        <li role="presentation"><a href="/cgi-bin/koha/members/paycollect.pl?writeoff_individual=1&borrowernumber=[% patron.borrowernumber | uri %]&debit_type_code=[% debit_type_code | uri %]&amount=[% amount | uri %]&amountoutstanding=[% amountoutstanding | uri %]&description=[% individual_description | uri %]&itemnumber=[% itemnumber | uri %]&accountlines_id=[% accountlines_id | uri %]&payment_note=[% payment_note | uri %]">Write off</a></li>
>+    </ul>
>+
>     <form name="payindivfine" id="payindivfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
>     <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
>     <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" />
>@@ -163,6 +168,11 @@
>     </form>
>     [% END %]
> [% ELSIF ( writeoff_individual ) %]
>+    <ul class="nav nav-pills">
>+        <li role="presentation"><a href="/cgi-bin/koha/members/paycollect.pl?pay_individual=1&borrowernumber=[% patron.borrowernumber | uri %]&debit_type_code=[% debit_type_code | uri %]&amount=[% amount | uri %]&amountoutstanding=[% amountoutstanding | uri %]&description=[% individual_description | uri %]&itemnumber=[% itemnumber | uri %]&accountlines_id=[% accountlines_id | uri %]&payment_note=[% payment_note | uri %]">Pay</a></li>
>+        <li role="presentation" class="active"><a>Write off</a></li>
>+    </ul>
>+
>     <form name="woindivfine" id="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
>     <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
>     <fieldset class="rows">
>@@ -215,6 +225,18 @@
>     </div>
>     [% ELSE %]
> 
>+    [% IF selected_accts %]
>+        <ul class="nav nav-pills">
>+            [% IF type == 'WRITEOFF' %]
>+                <li role="presentation"><a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]&type=PAYMENT&amt=[% amt | uri %]&selected=[% selected_accts | uri %]&notes=[% selected_accts_notes | uri %]">Pay</a></li>
>+                <li role="presentation" class="active"><a>Write off</a></li>
>+            [% ELSE %]
>+                <li role="presentation" class="active"><a>Pay</a></li>
>+                <li role="presentation"><a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]&type=WRITEOFF&amt=[% amt | uri %]&selected=[% selected_accts | uri %]&notes=[% selected_accts_notes | uri %]">Write off</a></li>
>+            [% END %]
>+        </ul>
>+    [% END %]
>+
>     <form name="payfine" id="payfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
>     <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
>     <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" />
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 24610: 98552 | 98553 | 98566 | 98567 | 102006 | 102007 | 107653 | 107902