Bugzilla – Attachment 61764 Details for
Bug 2454
Improve display of credits on pay fines tab
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 2545 - Removed credits being shown on the Pay fines tab.
Bug-2545---Removed-credits-being-shown-on-the-Pay-.patch (text/plain), 8.09 KB, created by
Alex Buckley
on 2017-04-01 01:00:05 UTC
(
hide
)
Description:
Bug 2545 - Removed credits being shown on the Pay fines tab.
Filename:
MIME Type:
Creator:
Alex Buckley
Created:
2017-04-01 01:00:05 UTC
Size:
8.09 KB
patch
obsolete
>From dbfe4ab3bb839066d18936dbc5e44d7ee3300470 Mon Sep 17 00:00:00 2001 >From: Alex Buckley <alexbuckley@catalyst.net.nz> >Date: Sun, 19 Mar 2017 09:26:12 +0000 >Subject: [PATCH] Bug 2545 - Removed credits being shown on the Pay fines tab. > >Now instead of showing a whole row for each credit there is a credit >subtotal shown in order to make it clear what the users total >outstanding fine is > >https://bugs.koha-community.org/show_bug.cgi?id=2454 >--- > .../intranet-tmpl/prog/en/modules/members/pay.tt | 130 +++++++++++---------- > 1 file changed, 69 insertions(+), 61 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >index 092cc0d..5c168f0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -94,69 +94,77 @@ function enableCheckboxActions(){ > <tbody> > [% FOREACH account_grp IN accounts %] > [% FOREACH line IN account_grp.accountlines %] >-<tr> >- <td> >- [% IF ( line.amountoutstanding > 0 ) %] >- <input class="cb" type="checkbox" checked="checked" name="incl_par_[% line.accountlines_id %]" /> >+ <tr> >+ [% IF line.amountoutstanding > 0 %] >+ <td> >+ [% IF ( line.amountoutstanding > 0 ) %] >+ <input class="cb" type="checkbox" checked="checked" name="incl_par_[% line.accountlines_id %]" /> >+ [% END %] >+ </td> >+ <td> >+ [% IF ( line.amountoutstanding > 0 ) %] >+ <input type="submit" name="pay_indiv_[% line.accountlines_id %]" value="Pay" /> >+ [% IF CAN_user_updatecharges_writeoff %]<input type="submit" name="wo_indiv_[% line.accountlines_id %]" value="Write off" />[% END %] >+ [% END %] >+ >+ <input type="hidden" name="itemnumber[% line.accountlines_id %]" value="[% line.itemnumber %]" /> >+ <input type="hidden" name="description[% line.accountlines_id %]" value="[% line.description %]" /> >+ <input type="hidden" name="accounttype[% line.accountlines_id %]" value="[% line.accounttype %]" /> >+ <input type="hidden" name="amount[% line.accountlines_id %]" value="[% line.amount %]" /> >+ <input type="hidden" name="accountlines_id[% line.accountlines_id %]" value="[% line.accountlines_id %]" /> >+ <input type="hidden" name="amountoutstanding[% line.accountlines_id %]" value="[% line.amountoutstanding %]" /> >+ <input type="hidden" name="borrowernumber[% line.accountlines_id %]" value="[% line.borrowernumber %]" /> >+ <input type="hidden" name="notify_id[% line.accountlines_id %]" value="[% line.notify_id %]" /> >+ <input type="hidden" name="notify_level[% line.accountlines_id %]" value="[% line.notify_level %]" /> >+ <input type="hidden" name="totals[% line.accountlines_id %]" value="[% line.totals %]" /> >+ </td> >+ <td> >+ [% SWITCH line.accounttype %] >+ [% CASE 'Pay' %]Payment, thanks >+ [% CASE 'Pay00' %]Payment, thanks (cash via SIP2) >+ [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2) >+ [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2) >+ [% CASE 'N' %]New card >+ [% CASE 'F' %]Fine >+ [% CASE 'A' %]Account management fee >+ [% CASE 'M' %]Sundry >+ [% CASE 'L' %]Lost item >+ [% CASE 'W' %]Writeoff >+ [% CASE 'FU' %]Accruing fine >+ [% CASE 'HE' %]Hold waiting too long >+ [% CASE 'Rent' %]Rental fee >+ [% CASE 'FOR' %]Forgiven >+ [% CASE 'LR' %]Lost item fee refund >+ [% CASE 'PAY' %]Payment >+ [% CASE 'WO' %]Writeoff >+ [% CASE 'C' %]Credit >+ [% CASE 'CR' %]Credit >+ [% CASE %][% line.accounttype %] >+ [%- END -%] >+ [%- IF line.description %], [% line.description %][% END %] >+ [% IF line.title %]([% line.title %])[% END %] >+ </td> >+ <td><input type="text" name="payment_note_[% line.accountlines_id %]" /></td> >+ <td>[% line.accounttype %]</td> >+ <td>[% line.notify_id %]</td> >+ <td>[% line.notify_level %]</td> >+ >+ <td class="debit" style="text-align: right;">[% line.amount | $Price %]</td> >+ <td class="debit" style="text-align: right;">[% line.amountoutstanding | $Price %]</td> >+ [% END %] >+ </tr> > [% END %] >- </td> >- <td> >- [% IF ( line.amountoutstanding > 0 ) %] >- <input type="submit" name="pay_indiv_[% line.accountlines_id %]" value="Pay" /> >- [% IF CAN_user_updatecharges_writeoff %]<input type="submit" name="wo_indiv_[% line.accountlines_id %]" value="Write off" />[% END %] >+ [% IF ( account_grp.total ) > 0 %] >+ <tr> >+ <td class="total" colspan="8" style="text-align: right;">Sub total:</td> >+ <td style="text-align: right;">[% account_grp.total | $Price %]</td> >+ </tr> >+ [% ELSE %] >+ <tr> >+ <td class="total" colspan="8" style="text-align: right;">Credit Sub total:</td> >+ <td style="text-align: right;">[% account_grp.total | $Price %]</td> >+ </tr> > [% END %] >- <input type="hidden" name="itemnumber[% line.accountlines_id %]" value="[% line.itemnumber %]" /> >- <input type="hidden" name="description[% line.accountlines_id %]" value="[% line.description %]" /> >- <input type="hidden" name="accounttype[% line.accountlines_id %]" value="[% line.accounttype %]" /> >- <input type="hidden" name="amount[% line.accountlines_id %]" value="[% line.amount %]" /> >- <input type="hidden" name="accountlines_id[% line.accountlines_id %]" value="[% line.accountlines_id %]" /> >- <input type="hidden" name="amountoutstanding[% line.accountlines_id %]" value="[% line.amountoutstanding %]" /> >- <input type="hidden" name="borrowernumber[% line.accountlines_id %]" value="[% line.borrowernumber %]" /> >- <input type="hidden" name="notify_id[% line.accountlines_id %]" value="[% line.notify_id %]" /> >- <input type="hidden" name="notify_level[% line.accountlines_id %]" value="[% line.notify_level %]" /> >- <input type="hidden" name="totals[% line.accountlines_id %]" value="[% line.totals %]" /> >- </td> >- <td> >- [% SWITCH line.accounttype %] >- [% CASE 'Pay' %]Payment, thanks >- [% CASE 'Pay00' %]Payment, thanks (cash via SIP2) >- [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2) >- [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2) >- [% CASE 'N' %]New card >- [% CASE 'F' %]Fine >- [% CASE 'A' %]Account management fee >- [% CASE 'M' %]Sundry >- [% CASE 'L' %]Lost item >- [% CASE 'W' %]Writeoff >- [% CASE 'FU' %]Accruing fine >- [% CASE 'HE' %]Hold waiting too long >- [% CASE 'Rent' %]Rental fee >- [% CASE 'FOR' %]Forgiven >- [% CASE 'LR' %]Lost item fee refund >- [% CASE 'PAY' %]Payment >- [% CASE 'WO' %]Writeoff >- [% CASE 'C' %]Credit >- [% CASE 'CR' %]Credit >- [% CASE %][% line.accounttype %] >- [%- END -%] >- [%- IF line.description %], [% line.description %][% END %] >- [% IF line.title %]([% line.title %])[% END %] >- </td> >- <td><input type="text" name="payment_note_[% line.accountlines_id %]" /></td> >- <td>[% line.accounttype %]</td> >- <td>[% line.notify_id %]</td> >- <td>[% line.notify_level %]</td> >- <td class="debit" style="text-align: right;">[% line.amount | $Price %]</td> >- <td class="debit" style="text-align: right;">[% line.amountoutstanding | $Price %]</td> >-</tr> >-[% END %] >-[% IF ( account_grp.total ) %] >-<tr> >- >- <td class="total" colspan="8" style="text-align: right;">Sub total:</td> >- <td style="text-align: right;">[% account_grp.total | $Price %]</td> >-</tr> >-[% END %] > [% END %] > </tbody> > </table> >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 2454
:
672
|
673
|
61764
|
61765
|
62194
|
62953
|
62991
|
62994
|
68470
|
69098
|
69210