View | Details | Raw Unified | Return to bug 11573
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-14 / +14 lines)
Lines 39-64 Link Here
39
    <th>Print</th>
39
    <th>Print</th>
40
  </tr>
40
  </tr>
41
41
42
	<!-- FIXME: Shouldn't hardcode dollar signs, since Euro or Pound might be needed -->
43
  [% FOREACH account IN accounts %]
42
  [% FOREACH account IN accounts %]
44
43
45
   [% IF ( loop.odd ) %]<tr>[% ELSE %]<tr class="highlight">[% END %]
44
   [% IF ( loop.odd ) %]<tr>[% ELSE %]<tr class="highlight">[% END %]
46
      <td>[% account.date %]</td>
45
      <td>[% account.date %]</td>
47
      <td>
46
      <td>
48
        [% SWITCH account.accounttype %]
47
        [% SWITCH account.accounttype %]
49
          [% CASE 'Pay' %]Payment,thanks
48
          [%- CASE 'Pay' -%]Payment, thanks
50
          [% CASE 'Pay00' %]Payment,thanks (cash via SIP2)
49
          [%- CASE 'Pay00' -%]Payment, thanks (cash via SIP2)
51
          [% CASE 'Pay01' %]Payment,thanks (VISA via SIP2)
50
          [%- CASE 'Pay01' -%]Payment, thanks (VISA via SIP2)
52
          [% CASE 'Pay02' %]Payment,thanks (credit card via SIP2)
51
          [%- CASE 'Pay02' -%]Payment, thanks (credit card via SIP2)
53
          [% CASE 'N' %]New Card
52
          [%- CASE 'N' -%]New Card
54
          [% CASE 'F' %]Fine, [% account.title %]
53
          [%- CASE 'F' -%]Fine
55
          [% CASE 'A' %]Account management fee
54
          [%- CASE 'FU' -%]Accrued fine
56
          [% CASE 'M' %]Sundry
55
          [%- CASE 'A' -%]Account management fee
57
          [% CASE 'L' %]Lost
56
          [%- CASE 'M' -%]Sundry
58
          [% CASE 'W' %]Writeoff
57
          [%- CASE 'L' -%]Lost
59
          [% CASE %][% account.accounttype %]
58
          [%- CASE 'W' -%]Writeoff
60
        [%- END -%]
59
          [%- CASE 'Rent' -%]Rental
61
        [%- IF account.description %], [% account.description %][% END %]
60
          [%- CASE -%][% account.accounttype %]
61
        [%- END -%][% IF account.description %], [% account.description %][% END %]
62
        &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>
62
        &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>
63
      <td>[% account.note | html_line_break %]</td>
63
      <td>[% account.note | html_line_break %]</td>
64
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>
64
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-11 / +13 lines)
Lines 115-131 function enableCheckboxActions(){ Link Here
115
    </td>
115
    </td>
116
    <td>
116
    <td>
117
        [% SWITCH line.accounttype %]
117
        [% SWITCH line.accounttype %]
118
          [% CASE 'Pay' %]Payment,thanks
118
          [%- CASE 'Pay' -%]Payment, thanks
119
          [% CASE 'Pay00' %]Payment,thanks (cash via SIP2)
119
          [%- CASE 'Pay00' -%]Payment, thanks (cash via SIP2)
120
          [% CASE 'Pay01' %]Payment,thanks (VISA via SIP2)
120
          [%- CASE 'Pay01' -%]Payment, thanks (VISA via SIP2)
121
          [% CASE 'Pay02' %]Payment,thanks (credit card via SIP2)
121
          [%- CASE 'Pay02' -%]Payment, thanks (credit card via SIP2)
122
          [% CASE 'N' %]New Card
122
          [%- CASE 'N' -%]New Card
123
          [% CASE 'F' %]Fine
123
          [%- CASE 'F' -%]Fine
124
          [% CASE 'A' %]Account management fee
124
          [%- CASE 'FU' -%]Accrued fine
125
          [% CASE 'M' %]Sundry
125
          [%- CASE 'A' -%]Account management fee
126
          [% CASE 'L' %]Lost Item
126
          [%- CASE 'M' -%]Sundry
127
          [% CASE 'W' %]Writeoff
127
          [%- CASE 'L' -%]Lost
128
          [% CASE %][% line.accounttype %]
128
          [%- CASE 'W' -%]Writeoff
129
          [%- CASE 'Rent' -%]Rental
130
          [%- CASE -%][% line.accounttype %]
129
        [%- END -%]
131
        [%- END -%]
130
        [%- IF line.description %], [% line.description %][% END %]
132
        [%- IF line.description %], [% line.description %][% END %]
131
        [% IF line.title %]([% line.title |html_entity %])[% END %]
133
        [% IF line.title %]([% line.title |html_entity %])[% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt (-11 / +13 lines)
Lines 50-66 Link Here
50
                                        <td>[% ACCOUNT_LINE.date | $KohaDates %]</td>
50
                                        <td>[% ACCOUNT_LINE.date | $KohaDates %]</td>
51
                                        <td>
51
                                        <td>
52
                                          [% SWITCH ACCOUNT_LINE.accounttype %]
52
                                          [% SWITCH ACCOUNT_LINE.accounttype %]
53
                                            [% CASE 'Pay' %]Payment,thanks
53
                                          [%- CASE 'Pay' -%]Payment, thanks
54
                                            [% CASE 'Pay00' %]Payment,thanks (cash via SIP2)
54
                                          [%- CASE 'Pay00' -%]Payment, thanks (cash via SIP2)
55
                                            [% CASE 'Pay01' %]Payment,thanks (VISA via SIP2)
55
                                          [%- CASE 'Pay01' -%]Payment, thanks (VISA via SIP2)
56
                                            [% CASE 'Pay02' %]Payment,thanks (credit card via SIP2)
56
                                          [%- CASE 'Pay02' -%]Payment, thanks (credit card via SIP2)
57
                                            [% CASE 'N' %]New Card
57
                                          [%- CASE 'N' -%]New Card
58
                                            [% CASE 'F' %]Fine
58
                                          [%- CASE 'F' -%]Fine
59
                                            [% CASE 'A' %]Account management fee
59
                                          [%- CASE 'FU' -%]Accrued fine
60
                                            [% CASE 'M' %]Sundry
60
                                          [%- CASE 'A' -%]Account management fee
61
                                            [% CASE 'L' %]Lost Item
61
                                          [%- CASE 'M' -%]Sundry
62
                                            [% CASE 'W' %]Writeoff
62
                                          [%- CASE 'L' -%]Lost
63
                                            [% CASE %][% ACCOUNT_LINE.accounttype %]
63
                                          [%- CASE 'W' -%]Writeoff
64
                                          [%- CASE 'Rent' -%]Rental
65
                                          [%- CASE -%][% ACCOUNT_LINE.accounttype %]
64
                                          [%- END -%]
66
                                          [%- END -%]
65
                                          [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description %][% END %]
67
                                          [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description %][% END %]
66
                                          [% IF line.title %]([% line.title |html_entity %])[% END %]
68
                                          [% IF line.title %]([% line.title |html_entity %])[% END %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt (-11 / +12 lines)
Lines 41-56 Link Here
41
                        <td>[% ACCOUNT_LINE.date | $KohaDates %]</td>
41
                        <td>[% ACCOUNT_LINE.date | $KohaDates %]</td>
42
                        <td>
42
                        <td>
43
                          [% SWITCH ACCOUNT_LINE.accounttype %]
43
                          [% SWITCH ACCOUNT_LINE.accounttype %]
44
                            [% CASE 'Pay' %]Payment,thanks
44
                            [%- CASE 'Pay' -%]Payment, thanks
45
                            [% CASE 'Pay00' %]Payment,thanks (cash via SIP2)
45
                            [%- CASE 'Pay00' -%]Payment, thanks (cash via SIP2)
46
                            [% CASE 'Pay01' %]Payment,thanks (VISA via SIP2)
46
                            [%- CASE 'Pay01' -%]Payment, thanks (VISA via SIP2)
47
                            [% CASE 'Pay02' %]Payment,thanks (credit card via SIP2)
47
                            [%- CASE 'Pay02' -%]Payment, thanks (credit card via SIP2)
48
                            [% CASE 'N' %]New Card
48
                            [%- CASE 'N' -%]New Card
49
                            [% CASE 'F' %]Fine
49
                            [%- CASE 'F' -%]Fine
50
                            [% CASE 'A' %]Account management fee
50
                            [%- CASE 'FU' -%]Accrued fine
51
                            [% CASE 'M' %]Sundry
51
                            [%- CASE 'A' -%]Account management fee
52
                            [% CASE 'L' %]Lost Item
52
                            [%- CASE 'M' -%]Sundry
53
                            [% CASE 'W' %]Writeoff
53
                            [%- CASE 'L' -%]Lost
54
                            [%- CASE 'W' -%]Writeoff
55
                            [%- CASE 'Rent' -%]Rental
54
                            [% CASE %][% ACCOUNT_LINE.accounttype %]
56
                            [% CASE %][% ACCOUNT_LINE.accounttype %]
55
                          [%- END -%]
57
                          [%- END -%]
56
                          [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description %][% END %]
58
                          [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description %][% END %]
57
- 

Return to bug 11573