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

(-)a/C4/Reserves.pm (-1 / +1 lines)
Lines 584-590 sub ChargeReserveFee { Link Here
584
            accountno         => $nextacctno,
584
            accountno         => $nextacctno,
585
            date              => dt_from_string(),
585
            date              => dt_from_string(),
586
            amount            => $fee,
586
            amount            => $fee,
587
            description       => "Reserve Charge - $title",
587
            description       => $title,
588
            accounttype       => 'Res',
588
            accounttype       => 'Res',
589
            amountoutstanding => $fee,
589
            amountoutstanding => $fee,
590
            branchcode        => $branchcode
590
            branchcode        => $branchcode
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (+1 lines)
Lines 21-26 Link Here
21
        [%- CASE 'WO'    -%]<span>Writeoff</span>
21
        [%- CASE 'WO'    -%]<span>Writeoff</span>
22
        [%- CASE 'C'     -%]<span>Credit</span>
22
        [%- CASE 'C'     -%]<span>Credit</span>
23
        [%- CASE 'CR'    -%]<span>Credit</span>
23
        [%- CASE 'CR'    -%]<span>Credit</span>
24
        [%- CASE 'Res'    -%]<span>Hold fee</span>
24
        [%- CASE         -%][% account.accounttype | html %]
25
        [%- CASE         -%][% account.accounttype | html %]
25
    [%- END -%]
26
    [%- END -%]
26
[%- END -%]
27
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-4 / +5 lines)
Lines 44-49 Link Here
44
    <thead>
44
    <thead>
45
      <tr>
45
      <tr>
46
          <th class="title-string">Date</th>
46
          <th class="title-string">Date</th>
47
          <th>Account type</th>
47
          <th>Description of charges</th>
48
          <th>Description of charges</th>
48
          <th>Home library</th>
49
          <th>Home library</th>
49
          <th>Note</th>
50
          <th>Note</th>
Lines 58-67 Link Here
58
59
59
   <tr>
60
   <tr>
60
   <td><span title="[% account.date | html %]">[% account.date |$KohaDates %]</span></td>
61
   <td><span title="[% account.date | html %]">[% account.date |$KohaDates %]</span></td>
62
        <td>[% PROCESS account_type_description account=account %]</td>
61
      <td>
63
      <td>
62
        [% PROCESS account_type_description account=account %]
64
        [%- IF account.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
63
        [%- IF account.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
65
        [%- IF account.description %][% account.description | html %][% END %]
64
        [%- IF account.description %], [% account.description | html %][% END %]
65
        &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>[% END %]</td>
66
        &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>[% END %]</td>
66
      <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td>
67
      <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td>
67
      <td>[% account.note | html_line_break %]</td>
68
      <td>[% account.note | html_line_break %]</td>
Lines 83-89 Link Here
83
  [% END %]
84
  [% END %]
84
<tfoot>
85
<tfoot>
85
  <tr>
86
  <tr>
86
    <td colspan="5">Total due</td>
87
    <td colspan="6">Total due</td>
87
    [% IF ( totalcredit ) %]
88
    [% IF ( totalcredit ) %]
88
        <td class="credit" style="text-align: right;">[% total | $Price %]</td>
89
        <td class="credit" style="text-align: right;">[% total | $Price %]</td>
89
    [% ELSE %]
90
    [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-26 / +6 lines)
Lines 7-12 Link Here
7
[% USE ColumnsSettings %]
7
[% USE ColumnsSettings %]
8
[% USE KohaDates %]
8
[% USE KohaDates %]
9
[% SET footerjs = 1 %]
9
[% SET footerjs = 1 %]
10
[% PROCESS 'accounts.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
11
<title>Koha &rsaquo; Patrons &rsaquo; Make a payment for  [% patron.firstname | html %] [% patron.surname | html %]</title>
12
<title>Koha &rsaquo; Patrons &rsaquo; Make a payment for  [% patron.firstname | html %] [% patron.surname | html %]</title>
12
[% INCLUDE 'doc-head-close.inc' %]
13
[% INCLUDE 'doc-head-close.inc' %]
Lines 44-53 Link Here
44
<tr>
45
<tr>
45
    <th class="NoSort">&nbsp;</th>
46
    <th class="NoSort">&nbsp;</th>
46
    <th class="NoSort">Actions</th>
47
    <th class="NoSort">Actions</th>
48
    <th>Account type</th>
47
    <th>Description</th>
49
    <th>Description</th>
48
    <th class="title-string">Date</th>
50
    <th class="title-string">Date</th>
49
    <th class="NoSort">Payment note</th>
51
    <th class="NoSort">Payment note</th>
50
    <th>Account type</th>
51
    <th>Amount</th>
52
    <th>Amount</th>
52
    <th>Amount outstanding</th>
53
    <th>Amount outstanding</th>
53
</tr>
54
</tr>
Lines 77-106 Link Here
77
    <input type="hidden" name="borrowernumber[% line.accountlines_id | html %]" value="[% line.borrowernumber | html %]" />
78
    <input type="hidden" name="borrowernumber[% line.accountlines_id | html %]" value="[% line.borrowernumber | html %]" />
78
    </td>
79
    </td>
79
    <td>
80
    <td>
80
        [% SWITCH line.accounttype %]
81
        [% PROCESS account_type_description account=line %]
81
          [% CASE 'Pay' %]Payment, thanks
82
    </td>
82
          [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)
83
    <td>
83
          [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2)
84
        [%- IF line.description %][% line.description | html %][% END %]
84
          [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
85
          [% CASE 'N' %]New card
86
          [% CASE 'F' %]Fine
87
          [% CASE 'A' %]Account management fee
88
          [% CASE 'M' %]Sundry
89
          [% CASE 'L' %]Lost item
90
          [% CASE 'W' %]Writeoff
91
          [% CASE 'FU' %]Accruing fine
92
          [% CASE 'HE' %]Hold waiting too long
93
          [% CASE 'Rent' %]Rental fee
94
          [% CASE 'FOR' %]Forgiven
95
          [% CASE 'LR' %]Lost item fee refund
96
          [% CASE 'PF' %]Processing fee
97
          [% CASE 'PAY' %]Payment
98
          [% CASE 'WO' %]Writeoff
99
          [% CASE 'C' %]Credit
100
          [% CASE 'CR' %]Credit
101
          [% CASE %][% line.accounttype | html %]
102
        [%- END -%]
103
        [%- IF line.description %], [% line.description | html %][% END %]
104
        [% IF line.title %]([% line.title | html %])[% END %]
85
        [% IF line.title %]([% line.title | html %])[% END %]
105
    </td>
86
    </td>
106
    <td>
87
    <td>
Lines 110-116 Link Here
110
        <a href="#" class="add-note" data-accountlines_id="[% line.accountlines_id | html %]"><i class="fa fa-plus"></i> Add note</a>
91
        <a href="#" class="add-note" data-accountlines_id="[% line.accountlines_id | html %]"><i class="fa fa-plus"></i> Add note</a>
111
        <span class="payment_note" id="payment_note_[% line.accountlines_id | html %]" style="display:none"><input type="text" size="10" name="payment_note_[% line.accountlines_id | html %]" value="" /> <a href="#" class="cancel-note"><i class="fa fa-remove"></i></a></span>
92
        <span class="payment_note" id="payment_note_[% line.accountlines_id | html %]" style="display:none"><input type="text" size="10" name="payment_note_[% line.accountlines_id | html %]" value="" /> <a href="#" class="cancel-note"><i class="fa fa-remove"></i></a></span>
112
    </td>
93
    </td>
113
    <td>[% line.accounttype | html %]</td>
114
    <td class="debit" style="text-align: right;">[% line.amount | $Price %]</td>
94
    <td class="debit" style="text-align: right;">[% line.amount | $Price %]</td>
115
    <td class="debit" style="text-align: right;">[% line.amountoutstanding | $Price %]</td>
95
    <td class="debit" style="text-align: right;">[% line.amountoutstanding | $Price %]</td>
116
</tr>
96
</tr>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt (-4 / +8 lines)
Lines 75-80 Link Here
75
                                <tr>
75
                                <tr>
76
                                    [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
76
                                    [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
77
                                    <th class="title-string">Date</th>
77
                                    <th class="title-string">Date</th>
78
                                    <th>Type</th>
78
                                    <th>Description</th>
79
                                    <th>Description</th>
79
                                    <th>Fine amount</th>
80
                                    <th>Fine amount</th>
80
                                    <th>Amount outstanding</th>
81
                                    <th>Amount outstanding</th>
Lines 84-92 Link Here
84
                            <tfoot>
85
                            <tfoot>
85
                            <tr>
86
                            <tr>
86
                                [%- IF ENABLE_OPAC_PAYMENTS -%]
87
                                [%- IF ENABLE_OPAC_PAYMENTS -%]
87
                                    [%- SET COLSPAN = 4 -%]
88
                                    [%- SET COLSPAN = 5 -%]
88
                                [%- ELSE -%]
89
                                [%- ELSE -%]
89
                                    [%- SET COLSPAN = 3 -%]
90
                                    [%- SET COLSPAN = 4 -%]
90
                                [%- END -%]
91
                                [%- END -%]
91
                                <th class="sum" colspan="[% COLSPAN | html %]">Total due</th>
92
                                <th class="sum" colspan="[% COLSPAN | html %]">Total due</th>
92
                                <td class="sum">[% total | $Price %]</td>
93
                                <td class="sum">[% total | $Price %]</td>
Lines 128-137 Link Here
128
                                            [% CASE 'WO' %]Writeoff
129
                                            [% CASE 'WO' %]Writeoff
129
                                            [% CASE 'C' %]Credit
130
                                            [% CASE 'C' %]Credit
130
                                            [% CASE 'CR' %]Credit
131
                                            [% CASE 'CR' %]Credit
132
                                            [%- CASE 'Res'    -%]Hold fee
131
                                            [% CASE %][% ACCOUNT_LINE.accounttype | html %]
133
                                            [% CASE %][% ACCOUNT_LINE.accounttype | html %]
132
                                          [%- END -%]
134
                                          [%- END -%]
133
                                          [%- IF ACCOUNT_LINE.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', ACCOUNT_LINE.payment_type, 1) | html %][% END %]
135
                                          </td>
134
                                          [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description | html %][% END %]
136
                                          <td>
137
                                                [%- IF ACCOUNT_LINE.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', ACCOUNT_LINE.payment_type, 1) | html %][% END %]
138
                                                [%- IF ACCOUNT_LINE.description %][% ACCOUNT_LINE.description | html %][% END %]
135
                                          [% IF ACCOUNT_LINE.title %]([% ACCOUNT_LINE.title | html %])[% END %]
139
                                          [% IF ACCOUNT_LINE.title %]([% ACCOUNT_LINE.title | html %])[% END %]
136
                                        </td>
140
                                        </td>
137
                                        [% IF ( ACCOUNT_LINE.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amount | $Price %]</td>
141
                                        [% IF ( ACCOUNT_LINE.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amount | $Price %]</td>
(-)a/opac/sco/sco-main.pl (-2 / +1 lines)
Lines 229-235 elsif ( $patron and $op eq "checkout" ) { Link Here
229
                        {
229
                        {
230
                            borrowernumber => $borrower->{borrowernumber},
230
                            borrowernumber => $borrower->{borrowernumber},
231
                            accounttype    => 'Res',
231
                            accounttype    => 'Res',
232
                            description    => 'Reserve Charge - ' . $item->biblio->title,
232
                            description    => $item->biblio->title,
233
                            date           => $dtf->format_date(dt_from_string)
233
                            date           => $dtf->format_date(dt_from_string)
234
                        }
234
                        }
235
                      )->count,
235
                      )->count,
236
- 

Return to bug 12166