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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (-2 / +2 lines)
Lines 27-34 $(document).ready(function(){ Link Here
27
<ul class="ui-tabs-nav">
27
<ul class="ui-tabs-nav">
28
	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Account</a></li>
28
	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Account</a></li>
29
	<li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" >Pay fines</a></li>
29
	<li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" >Pay fines</a></li>
30
	<li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrowernumber %]" >Create Manual Invoice</a></li>
30
	<li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrowernumber %]" >Create manual invoice</a></li>
31
	<li class="ui-tabs-selected"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrowernumber %]" >Create Manual Credit</a></li>
31
	<li class="ui-tabs-selected"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrowernumber %]" >Create manual credit</a></li>
32
</ul>
32
</ul>
33
<div class="tabs-container">
33
<div class="tabs-container">
34
34
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-2 / +2 lines)
Lines 27-34 $(document).ready(function(){ Link Here
27
<ul class="ui-tabs-nav">
27
<ul class="ui-tabs-nav">
28
	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Account</a></li>
28
	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Account</a></li>
29
	<li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" >Pay fines</a></li>
29
	<li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" >Pay fines</a></li>
30
	<li class="ui-tabs-selected"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrowernumber %]" >Create Manual Invoice</a></li>
30
	<li class="ui-tabs-selected"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrowernumber %]" >Create manual invoice</a></li>
31
	<li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrowernumber %]" >Create Manual Credit</a></li>
31
	<li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrowernumber %]" >Create manual credit</a></li>
32
</ul>
32
</ul>
33
<div class="tabs-container">
33
<div class="tabs-container">
34
34
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-19 / +28 lines)
Lines 1-19 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Patrons &rsaquo; Pay Fines for  [% borrower.firstname %] [% borrower.surname %]</title>
2
<title>Koha &rsaquo; Patrons &rsaquo; Pay Fines for  [% borrower.firstname %] [% borrower.surname %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type= "text/javascript">
5
//<![CDATA[
6
    $(document).ready(function(){
7
        $("#woall").click(function(event){
8
            var answer = confirm(_("Are you sure you want to write off [% total | format('%.2f') %] in outstanding fines? This cannot be undone!"));
9
                if (!answer){
10
                    event.preventDefault();
11
                }
12
        });
13
    });
14
//]]>
15
</script>
4
</head>
16
</head>
5
<body>
17
<body>
6
[% INCLUDE 'header.inc' %]
18
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'patron-search.inc' %]
19
[% INCLUDE 'patron-search.inc' %]
8
20
9
<script type=text/javascript>
10
11
function confirmWriteoffAll() {
12
    return confirm(_("Are you sure you want to writeoff all fines?"));
13
}
14
15
</script>
16
17
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Pay Fines for [% borrower.firstname %] [% borrower.surname %]</div>
21
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Pay Fines for [% borrower.firstname %] [% borrower.surname %]</div>
18
22
19
<div id="doc3" class="yui-t2">
23
<div id="doc3" class="yui-t2">
Lines 28-35 function confirmWriteoffAll() { Link Here
28
<ul class="ui-tabs-nav">
32
<ul class="ui-tabs-nav">
29
	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Account</a></li>
33
	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Account</a></li>
30
	<li class="ui-tabs-selected"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]" >Pay fines</a></li>
34
	<li class="ui-tabs-selected"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]" >Pay fines</a></li>
31
	<li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrower.borrowernumber %]" >Create Manual Invoice</a></li>
35
	<li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual invoice</a></li>
32
	<li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrower.borrowernumber %]" >Create Manual Credit</a></li>
36
	<li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual credit</a></li>
33
</ul>
37
</ul>
34
<div class="tabs-container">
38
<div class="tabs-container">
35
39
Lines 38-43 function confirmWriteoffAll() { Link Here
38
	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
42
	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
39
43
40
<table>
44
<table>
45
<thead>
41
<tr>
46
<tr>
42
	<th>Fines &amp; Charges</th>
47
	<th>Fines &amp; Charges</th>
43
    <th>Sel</th>
48
    <th>Sel</th>
Lines 48-61 function confirmWriteoffAll() { Link Here
48
	<th>Amount</th>
53
	<th>Amount</th>
49
	<th>Amount Outstanding</th>
54
	<th>Amount Outstanding</th>
50
</tr>
55
</tr>
51
56
</thead>
57
<tfoot>
58
<tr>
59
    <td class="total" colspan="7">Total Due:</td>
60
    <td>[% total | format('%.2f') %]</td>
61
</tr>
62
</tfoot>
63
<tbody>
52
[% FOREACH account_grp IN accounts %]
64
[% FOREACH account_grp IN accounts %]
53
    [% FOREACH line IN account_grp.accountlines %]
65
    [% FOREACH line IN account_grp.accountlines %]
54
<tr>
66
<tr>
55
    <td>
67
    <td>
56
    [% IF ( line.amountoutstanding > 0 ) %]
68
    [% IF ( line.amountoutstanding > 0 ) %]
57
        <input type="submit" name="pay_indiv_[% line.accountno %]" value="Pay" />
69
        <input type="submit" name="pay_indiv_[% line.accountno %]" value="Pay" />
58
        <input type="submit" name="wo_indiv_[% line.accountno %]" value="Writeoff" />
70
        <input type="submit" name="wo_indiv_[% line.accountno %]" value="Write off" />
59
    [% END %]
71
    [% END %]
60
    <input type="hidden" name="itemnumber[% line.accountno %]" value="[% line.itemnumber %]" />
72
    <input type="hidden" name="itemnumber[% line.accountno %]" value="[% line.itemnumber %]" />
61
    <input type="hidden" name="description[% line.accountno %]" value="[% line.description %]" />
73
    <input type="hidden" name="description[% line.accountno %]" value="[% line.description %]" />
Lines 89-103 function confirmWriteoffAll() { Link Here
89
</tr>
101
</tr>
90
[% END %]
102
[% END %]
91
[% END %]
103
[% END %]
92
<tr>
104
</tbody>
93
    <td class="total" colspan="7">Total Due:</td>
94
    <td>[% total | format('%.2f') %]</td>
95
</tr>
96
</table>
105
</table>
97
<fieldset class="action">
106
<fieldset class="action">
98
<input type="submit" name="paycollect"  value="Pay Amount" class="submit" />
107
<input type="submit" name="paycollect"  value="Pay amount" class="submit" />
99
<input type="submit" name="woall"  value="Writeoff All" class="submit" onclick="return confirmWriteoffAll()" />
108
<input type="submit" name="woall"  id="woall" value="Write off all" class="submit" />
100
<input type="submit" name="payselected"  value="Pay Selected" class="submit"/>
109
<input type="submit" name="payselected"  value="Pay selected" class="submit" />
101
<a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a>
110
<a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a>
102
</fieldset>
111
</fieldset>
103
</form>
112
</form>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-86 / +74 lines)
Lines 57-63 function moneyFormat(textObj) { Link Here
57
<body>
57
<body>
58
[% INCLUDE 'header.inc' %]
58
[% INCLUDE 'header.inc' %]
59
[% INCLUDE 'patron-search.inc' %]
59
[% INCLUDE 'patron-search.inc' %]
60
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Pay Fines for [% borrower.firstname %] [% borrower.surname %]</div>
60
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Pay Fines for [% borrower.firstname %] [% borrower.surname %]</a> &rsaquo; [% IF ( pay_individual ) %]Pay an individual fine[% ELSIF ( writeoff_individual ) %]Write off an individual fine[% ELSE %][% IF ( selected_accts ) %]Pay an amount toward selected fines[% ELSE %]Pay an amount toward all fines[% END %][% END %]</div>
61
61
62
<div id="doc3" class="yui-t2">
62
<div id="doc3" class="yui-t2">
63
63
Lines 77-86 function moneyFormat(textObj) { Link Here
77
    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]" >Pay fines</a>
77
    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]" >Pay fines</a>
78
    </li>
78
    </li>
79
    <li>
79
    <li>
80
    <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrower.borrowernumber %]" >Create Manual Invoice</a>
80
    <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual invoice</a>
81
    </li>
81
    </li>
82
    <li>
82
    <li>
83
    <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrower.borrowernumber %]" >Create Manual Credit</a>
83
    <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual credit</a>
84
    </li>
84
    </li>
85
</ul>
85
</ul>
86
<div class="tabs-container">
86
<div class="tabs-container">
Lines 103-152 function moneyFormat(textObj) { Link Here
103
    <input type="hidden" name="amountoutstanding" id="amountoutstanding" value="[% amountoutstanding %]" />
103
    <input type="hidden" name="amountoutstanding" id="amountoutstanding" value="[% amountoutstanding %]" />
104
    <input type="hidden" name="accountno" id="accountno" value="[% accountno %]" />
104
    <input type="hidden" name="accountno" id="accountno" value="[% accountno %]" />
105
    <input type="hidden" name="title" id="title" value="[% title %]" />
105
    <input type="hidden" name="title" id="title" value="[% title %]" />
106
107
<fieldset class="rows">
108
    <legend>Pay an individual fine</legend>
106
    <table>
109
    <table>
107
    <tr>
110
    <thead><tr>
108
        <th>Description</th>
111
            <th>Description</th>
109
        <th>Account Type</th>
112
            <th>Account Type</th>
110
        <th>Notify id</th>
113
            <th>Notify id</th>
111
        <th>Level</th>
114
            <th>Level</th>
112
        <th>Amount</th>
115
            <th>Amount</th>
113
        <th>Amount Outstanding</th>
116
            <th>Amount Outstanding</th>
114
    </tr>
117
        </tr></thead>
115
    <tr>
118
    <tfoot>
116
        <td>
119
        <td colspan="5">Total amount payable:</td><td>[% amountoutstanding | format('%.2f') %]</td>
117
            [% description %] [% title  %]
120
    </tfoot>
118
        </td>
121
    <tbody><tr>
119
        <td>[% accounttype %]</td>
122
            <td>
120
        <td>[% notify_id %]</td>
123
                [% description %] [% title  %]
121
        <td>[% notify_level %]</td>
124
            </td>
122
        <td class="debit">[% amount | format('%.2f') %]</td>
125
            <td>[% accounttype %]</td>
123
        <td class="debit">[% amountoutstanding | format('%.2f') %]</td>
126
            <td>[% notify_id %]</td>
124
    </tr>
127
            <td>[% notify_level %]</td>
125
    <tr>
128
            <td class="debit">[% amount | format('%.2f') %]</td>
126
        <td>Total Amount Payable : </td>
129
            <td class="debit">[% amountoutstanding | format('%.2f') %]</td>
127
        <td>[% amountoutstanding | format('%.2f') %]</td>
130
        </tr></tbody>
128
        <td colspan="4"></td>
131
</table>
129
    </tr>
132
130
    <tr><td colspan="6"> </td></tr>
133
<ol>
131
    <tr>
134
132
        <td>Collect From Patron: </td>
135
    <li>
133
        <td>
136
        <label for="paid">Collect from patron: </label>
134
            <!-- default to paying all -->
137
            <!-- default to paying all -->
135
        <input name="paid" id="paid" value="[% amountoutstanding | format('%.2f') %]" onchange="moneyFormat(document.payindivfine.paid)"/>
138
        <input name="paid" id="paid" value="[% amountoutstanding | format('%.2f') %]" onchange="moneyFormat(document.payindivfine.paid)"/>
136
        </td>
139
    </li>
137
    </tr>
140
</ol>
138
    <tr><td colspan="6"></td></tr>
141
</fieldset>
139
    <tr>
140
        <td colspan="6">
141
        <input type="submit" name="submitbutton" value="Confirm" />
142
        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a>
143
        </td>
144
    </tr>
145
142
146
    </table>
143
    <div class="action"><input type="submit" name="submitbutton" value="Confirm" />
144
        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a></div>
147
    </form>
145
    </form>
148
[% ELSIF ( writeoff_individual ) %]
146
[% ELSIF ( writeoff_individual ) %]
149
    <form name="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
147
    <form name="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
148
    <fieldset class="rows">
149
    <legend>Write off an individual fine</legend>
150
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
150
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
151
    <input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
151
    <input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
152
    <input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
152
    <input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
Lines 159-191 function moneyFormat(textObj) { Link Here
159
    <input type="hidden" name="accountno" id="accountno" value="[% accountno %]" />
159
    <input type="hidden" name="accountno" id="accountno" value="[% accountno %]" />
160
    <input type="hidden" name="title" id="title" value="[% title %]" />
160
    <input type="hidden" name="title" id="title" value="[% title %]" />
161
    <table>
161
    <table>
162
    <tr>
162
    <thead><tr>
163
        <th>Description</th>
163
            <th>Description</th>
164
        <th>Account Type</th>
164
            <th>Account Type</th>
165
        <th>Notify id</th>
165
            <th>Notify id</th>
166
        <th>Level</th>
166
            <th>Level</th>
167
        <th>Amount</th>
167
            <th>Amount</th>
168
        <th>Amount Outstanding</th>
168
            <th>Amount Outstanding</th>
169
    </tr>
169
        </tr></thead>
170
    <tr>
170
    <tfoot><td colspan="5">Total amount to be written off:</td><td>[% amountoutstanding | format('%.2f') %]</td></tfoot>
171
        <td>[% description %] [% title %]</td>
171
    <tbody><tr>
172
        <td>[% accounttype %]</td>
172
            <td>[% description %] [% title %]</td>
173
        <td>[% notify_id %]</td>
173
            <td>[% accounttype %]</td>
174
        <td>[% notify_level %]</td>
174
            <td>[% notify_id %]</td>
175
        <td class="debit">[% amount | format('%.2f') %]</td>
175
            <td>[% notify_level %]</td>
176
        <td class="debit">[% amountoutstanding | format('%.2f') %]</td>
176
            <td class="debit">[% amount | format('%.2f') %]</td>
177
    </tr>
177
            <td class="debit">[% amountoutstanding | format('%.2f') %]</td>
178
    <tr><td colspan="6"> </td></tr>
178
        </tr></tbody>
179
    <tr><td colspan="6"><strong>Writeoff This Charge?</strong></td></tr>
180
    <tr><td> </td></tr>
181
    <tr>
182
        <td colspan="6">
183
        <input type="submit" name="confirm_writeoff" id="confirm_writeoff" value="Confirm" />
184
        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a>
185
        </td>
186
    </tr>
187
188
    </table>
179
    </table>
180
    </fieldset>
181
    <div class="action"><input type="submit" name="confirm_writeoff" id="confirm_writeoff" value="Write off this charge" />
182
        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a></div>
189
    </form>
183
    </form>
190
[% ELSE %]
184
[% ELSE %]
191
185
Lines 194-220 function moneyFormat(textObj) { Link Here
194
    <input type="hidden" name="selected_accts" id="selected_accts" value="[% selected_accts %]" />
188
    <input type="hidden" name="selected_accts" id="selected_accts" value="[% selected_accts %]" />
195
    <input type="hidden" name="total" id="total" value="[% total %]" />
189
    <input type="hidden" name="total" id="total" value="[% total %]" />
196
190
197
    <table>
191
    <fieldset class="rows">
198
    <tr>
192
    [% IF ( selected_accts ) %]<legend>Pay an amount toward selected fines</legend>[% ELSE %]<legend>Pay an amount toward all fines</legend>[% END %]
199
        <td>Total Amount Outstanding : </td>
193
    <ol>
200
        <td class="debit">[% total | format('%.2f') %]</td>
194
        <li>
201
    </tr>
195
            <span class="label">Total amount outstanding: </span>
202
    <tr><td colspan="2"> </td></tr>
196
            <span class="debit">[% total | format('%.2f') %]</span>
203
    <tr>
197
        </li>
204
        <td>Collect From Patron: </td>
198
    <li>
205
        <td>
199
        <label for="paid">Collect from patron: </label>
206
        <!-- default to paying all -->
200
        <!-- default to paying all -->
207
        <input name="paid" id="paid" value="[% total | format('%.2f') %]" onchange="moneyFormat(document.payfine.paid)"/>
201
        <input name="paid" id="paid" value="[% total | format('%.2f') %]" onchange="moneyFormat(document.payfine.paid)"/>
208
        </td>
202
    </li>
209
    </tr>
203
    </ol>
210
    <tr><td></td></tr>
204
    </fieldset>
211
    <tr>
205
    <div class="action"><input type="submit" name="submitbutton" value="Confirm" />
212
        <td colspan="2">
206
        <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a></div>
213
        <input type="submit" name="submitbutton" value="Confirm" />
214
        <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a>
215
        </td>
216
    </tr>
217
    </table>
218
    </form>
207
    </form>
219
[% END %]
208
[% END %]
220
</div></div>
209
</div></div>
221
- 

Return to bug 7080