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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt (-15 / +26 lines)
Lines 3-8 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE KohaDates %]
4
[% USE KohaDates %]
5
[% USE Branches %]
5
[% USE Branches %]
6
[% USE Price %]
6
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
7
[% INCLUDE 'doc-head-open.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Print receipt for [% patron.cardnumber | html %]</title>
9
<title>Print receipt for [% patron.cardnumber | html %]</title>
Lines 36-42 Link Here
36
 <tr>
37
 <tr>
37
    <th colspan=4 >
38
    <th colspan=4 >
38
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
39
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
39
        Card number : [% patron.cardnumber | html %]<br />
40
        Card number: [% patron.cardnumber | html %]<br />
40
	</th>
41
	</th>
41
 </tr>
42
 </tr>
42
  <tr>
43
  <tr>
Lines 51-79 Link Here
51
      <td>[% account.date | $KohaDates %]</td>
52
      <td>[% account.date | $KohaDates %]</td>
52
      <td>
53
      <td>
53
        [% SWITCH account.accounttype %]
54
        [% SWITCH account.accounttype %]
54
          [% CASE 'Pay' %]Payment, thanks
55
            [% CASE 'Pay' %]Payment, thanks
55
          [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)
56
            [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)
56
          [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2)
57
            [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2)
57
          [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
58
            [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
58
          [% CASE 'N' %]New Card
59
            [% CASE 'N' %]New card
59
          [% CASE 'F' %]Fine
60
            [% CASE 'F' %]Fine
60
          [% CASE 'A' %]Account management fee
61
            [% CASE 'A' %]Account management fee
61
          [% CASE 'M' %]Sundry
62
            [% CASE 'M' %]Sundry
62
          [% CASE 'L' %]Lost Item
63
            [% CASE 'L' %]Lost item
63
          [% CASE 'W' %]Writeoff
64
            [% CASE 'W' %]Writeoff
64
          [% CASE %][% account.accounttype | html %]
65
            [% CASE 'FU' %]Accruing fine
66
            [% CASE 'HE' %]Hold waiting too long
67
            [% CASE 'Rent' %]Rental fee
68
            [% CASE 'FOR' %]Forgiven
69
            [% CASE 'LR' %]Lost item fee refund
70
            [% CASE 'PF' %]Processing fee
71
            [% CASE 'PAY' %]Payment
72
            [% CASE 'WO' %]Writeoff
73
            [% CASE 'C' %]Credit
74
            [% CASE 'CR' %]Credit
75
            [% CASE %][% account.accounttype | html %]
65
        [%- END -%]
76
        [%- END -%]
66
        [%- IF account.description %], [% account.description | html %][% END %]
77
        [%- IF account.description %], [% account.description | html %][% END %]
67
      </td>
78
      </td>
68
      <td>[% account.note | html %]</td>
79
      <td>[% account.note | html %]</td>
69
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount | html %]</td>
80
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount | $Price %]</td>
70
    </tr>
81
    </tr>
71
82
72
  [% END %]
83
  [% END %]
73
<tfoot>
84
<tfoot>
74
  <tr>
85
  <tr>
75
    <td colspan="3">Total outstanding dues as on date : </td>
86
    <td colspan="3">Total outstanding dues as on date: </td>
76
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | html %]</td>
87
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
77
  </tr>
88
  </tr>
78
  </tfoot>
89
  </tfoot>
79
</table>
90
</table>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt (-13 / +24 lines)
Lines 3-8 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE Branches %]
4
[% USE Branches %]
5
[% USE KohaDates %]
5
[% USE KohaDates %]
6
[% USE Price %]
6
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
7
[% INCLUDE 'doc-head-open.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Print receipt for [% patron.cardnumber | html %]</title>
9
<title>Print receipt for [% patron.cardnumber | html %]</title>
Lines 51-80 Link Here
51
      <td>[% account.date | $KohaDates%]</td>
52
      <td>[% account.date | $KohaDates%]</td>
52
       <td>
53
       <td>
53
        [% SWITCH account.accounttype %]
54
        [% SWITCH account.accounttype %]
54
          [% CASE 'Pay' %]Payment, thanks
55
            [% CASE 'Pay' %]Payment, thanks
55
          [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)
56
            [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)
56
          [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2)
57
            [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2)
57
          [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
58
            [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
58
          [% CASE 'N' %]New Card
59
            [% CASE 'N' %]New card
59
          [% CASE 'F' %]Fine
60
            [% CASE 'F' %]Fine
60
          [% CASE 'A' %]Account management fee
61
            [% CASE 'A' %]Account management fee
61
          [% CASE 'M' %]Sundry
62
            [% CASE 'M' %]Sundry
62
          [% CASE 'L' %]Lost Item
63
            [% CASE 'L' %]Lost item
63
          [% CASE 'W' %]Writeoff
64
            [% CASE 'W' %]Writeoff
64
          [% CASE %][% account.accounttype | html %]
65
            [% CASE 'FU' %]Accruing fine
66
            [% CASE 'HE' %]Hold waiting too long
67
            [% CASE 'Rent' %]Rental fee
68
            [% CASE 'FOR' %]Forgiven
69
            [% CASE 'LR' %]Lost item fee refund
70
            [% CASE 'PF' %]Processing fee
71
            [% CASE 'PAY' %]Payment
72
            [% CASE 'WO' %]Writeoff
73
            [% CASE 'C' %]Credit
74
            [% CASE 'CR' %]Credit
75
            [% CASE %][% account.accounttype | html %]
65
        [%- END -%]
76
        [%- END -%]
66
        [%- IF account.description %], [% account.description | html %][% END %]
77
        [%- IF account.description %], [% account.description | html %][% END %]
67
      </td>
78
      </td>
68
      <td>[% account.note | html %]</td>
79
      <td>[% account.note | html %]</td>
69
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount | html %]</td>
80
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount | html %]</td>
70
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding | html %]</td>
81
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding | $Price %]</td>
71
    </tr>
82
    </tr>
72
83
73
  [% END %]
84
  [% END %]
74
<tfoot>
85
<tfoot>
75
  <tr>
86
  <tr>
76
    <td colspan="4">Total outstanding dues as on date: </td>
87
    <td colspan="4">Total outstanding dues as on date: </td>
77
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | html %]</td>
88
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
78
  </tr>
89
  </tr>
79
  </tfoot>
90
  </tfoot>
80
</table>
91
</table>
(-)a/members/printfeercpt.pl (-5 / +3 lines)
Lines 84-92 my %row = ( Link Here
84
    'amountcredit'            => $accountline->{'amountcredit'},
84
    'amountcredit'            => $accountline->{'amountcredit'},
85
    'amountoutstandingcredit' => $accountline->{'amountoutstandingcredit'},
85
    'amountoutstandingcredit' => $accountline->{'amountoutstandingcredit'},
86
    'description'             => $accountline->{'description'},
86
    'description'             => $accountline->{'description'},
87
    'amount'                  => sprintf( "%.2f", $accountline->{'amount'} ),
87
    'amount'                  => $accountline->{'amount'},
88
    'amountoutstanding' =>
88
    'amountoutstanding'       => $accountline->{'amountoutstanding'},
89
      sprintf( "%.2f", $accountline->{'amountoutstanding'} ),
90
    'accountno' => $accountline->{'accountno'},
89
    'accountno' => $accountline->{'accountno'},
91
    accounttype => $accountline->{accounttype},
90
    accounttype => $accountline->{accounttype},
92
    'note'      => $accountline->{'note'},
91
    'note'      => $accountline->{'note'},
Lines 96-102 my %row = ( Link Here
96
$template->param(
95
$template->param(
97
    patron               => $patron,
96
    patron               => $patron,
98
    finesview           => 1,
97
    finesview           => 1,
99
    total               => sprintf("%.2f",$total),
98
    total               => $total,
100
    totalcredit         => $totalcredit,
99
    totalcredit         => $totalcredit,
101
    accounts            => [$accountline], # FIXME There is always only 1 row!
100
    accounts            => [$accountline], # FIXME There is always only 1 row!
102
);
101
);
103
- 

Return to bug 21167