Attachment 47238 Details for Bug 11573 – Bug 11573: Follow-up: Include changes in OPAC templates

[patch] Bug 11573: Follow-up: Include changes in OPAC templates

Bug-11573-Follow-up-Include-changes-in-OPAC-templa.patch (text/plain), 9.90 KB, created by Mark Tompsett on 2016-01-25 02:51:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Tompsett

Created: 2016-01-25 02:51:30 UTC

Size: 9.90 KB

patch

obsolete

>From 8a1e4a4117f1fcae6a862a44324ff7bfa35b1c93 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <Katrin.Fischer.83@web.de>
>Date: Wed, 30 Apr 2014 22:42:33 +0200
>Subject: [PATCH] Bug 11573: Follow-up: Include changes in OPAC templates
>
>Patch adds changes from earlier patches to OPAC prog and
>bootstrap templates.
>
>Patch radds a description for FU - Accrued fine.
>
>Removes a stray space before the comma, using some TT magic.
>
>To test:
>- Test like the other patch, display in OPAC prog, OPAC bootstrap,
>  Staff Pay fines tab and Staff Accounts tab should be the same.
>- No ' , ' should be seen.
>- FU fines should now display a description.
>---
> .../prog/en/modules/members/boraccount.tt          | 39 ++++++++++---------
> .../intranet-tmpl/prog/en/modules/members/pay.tt   | 38 +++++++++----------
> .../opac-tmpl/bootstrap/en/modules/opac-account.tt | 44 +++++++++++-----------
> 3 files changed, 60 insertions(+), 61 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>index e4867a9..819b3c8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>@@ -72,32 +72,31 @@ $(document).ready(function() {
>         </tr>
>     </thead>
> 
>-	
>   [% FOREACH account IN accounts %]
> 
>    [% IF ( loop.odd ) %]<tr>[% ELSE %]<tr class="highlight">[% END %]
>    <td><span title="[% account.date %]">[% account.date |$KohaDates %]</span></td>
>       <td>
>         [% SWITCH account.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 '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 %][% account.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
>+          [%- CASE 'W' -%]Writeoff
>+          [%- CASE 'FU' -%]Accruing fine
>+          [%- CASE 'Rent' -%]Rental
>+          [%- CASE 'FOR' -%]Forgiven
>+          [%- CASE 'LR' -%]Lost item fee refund
>+          [%- CASE 'PAY' -%]Payment
>+          [%- CASE 'WO' -%]Writeoff
>+          [%- CASE 'C' -%]Credit
>+          [%- CASE 'CR' -%]Credit
>+          [%- CASE -%][% account.accounttype %]
>         [%- END -%]
>         [%- IF account.description %], [% account.description %][% END %]
>         &nbsp;[% IF ( account.itemnumber ) %]<a title="[% account.title %]" href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&amp;itemnumber=[% account.itemnumber %]">View item</a>&nbsp;[% END %]</td>
>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 6d3427d..aa194c6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>@@ -116,25 +116,25 @@ function enableCheckboxActions(){
>     </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 '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 %]
>+          [%- 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
>+          [%- CASE 'W' -%]Writeoff
>+          [%- CASE 'FU' -%]Accruing fine
>+          [%- CASE 'Rent' -%]Rental
>+          [%- 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 %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
>index 8e38e1a..46c826c 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
>@@ -103,28 +103,28 @@
>                                         <td>[% ACCOUNT_LINE.date | $KohaDates %]</td>
>                                         <td>
>                                             [% SWITCH ACCOUNT_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 '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 %][% ACCOUNT_LINE.accounttype %]
>-                                          [%- END -%]
>-                                          [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description %][% END %]
>-                                          [% IF ACCOUNT_LINE.title %]([% ACCOUNT_LINE.title %])[% END %]
>+                                            [%- 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
>+                                            [%- CASE 'W' -%]Writeoff
>+                                            [%- CASE 'FU' -%]Accruing fine
>+                                            [%- CASE 'Rent' -%]Rental
>+                                            [%- CASE 'FOR' -%]Forgiven
>+                                            [%- CASE 'LR' -%]Lost item fee refund
>+                                            [%- CASE 'PAY' -%]Payment
>+                                            [%- CASE 'WO' -%]Writeoff
>+                                            [%- CASE 'C' -%]Credit
>+                                            [%- CASE 'CR' -%]Credit
>+                                            [%- CASE -%][% ACCOUNT_LINE.accounttype %]
>+                                            [%- END -%]
>+                                            [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description %][% END %]
>+                                            [% IF ACCOUNT_LINE.title %]([% ACCOUNT_LINE.title %])[% END %]
>                                         </td>
>                                         [% IF ( ACCOUNT_LINE.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amount %]</td>
>                                         [% IF ( ACCOUNT_LINE.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amountoutstanding %]</td>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 11573: 24473 | 24485 | 24486 | 25715 | 27822 | 27823 | 27824 | 47236 | 47237 | 47238 | 47239 | 47240 | 47241 | 47242 | 47288 | 47289 | 47290 | 47291 | 88549 | 88600 | 88601 | 88602 | 88603 | 88604 | 88605 | 88606 | 88726 | 88727 | 88728 | 88729 | 90231 | 90232 | 90233 | 90234 | 90246 | 90256 | 90313 | 90314 | 90315 | 90316 | 91529 | 91530 | 91531 | 91532 | 91800 | 91801 | 91802 | 91803 | 91804 | 91805 | 91806