Jonathan Druart
0ab22e1c7c
In order to simplify and make uniform the code, the controller scripts send a Koha::Patron object to the templates instead of all attributes of a patron. That will make the code much more easier to maintain and will be less error-prone. The variable "patron" sent to the templates is supposed to represent the patron the librarian is editing the detail. In the members module and some scripts of the circulation module, the patron's detail are sent one by one to the template. That leads to frustration from developpers (making sure everything is passed from all scripts) and to regression (we got tone of bugs in the last year because of this way to do). With this patch set it will be easy access patron's detail, passing only 1 variable from the controllers. Test plan: Play with the patron and circulation module and make sur the detail of the patron you are editing/seeing info are correctly displayed. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
235 lines
9.8 KiB
Text
235 lines
9.8 KiB
Text
[% USE Koha %]
|
|
[% USE Branches %]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Patrons › Collect fine payment for [% patron.firstname %] [% patron.surname %]</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
</head>
|
|
|
|
<body id="pat_paycollect" class="pat">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'patron-search.inc' %]
|
|
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> › <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">Pay fines for [% patron.firstname %] [% patron.surname %]</a> › [% 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>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
|
|
|
|
|
|
<!-- The manual invoice and credit buttons -->
|
|
<div class="statictabs">
|
|
<ul>
|
|
<li>
|
|
<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a>
|
|
</li>
|
|
<li class="active">
|
|
<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a>
|
|
</li>
|
|
<li>
|
|
<a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a>
|
|
</li>
|
|
<li>
|
|
<a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a>
|
|
</li>
|
|
</ul>
|
|
<div class="tabs-container">
|
|
[% IF ( error_over ) %]
|
|
<div id="error_message" class="dialog alert">
|
|
You must pay a value less than or equal to [% total_due | format('%.2f') %].
|
|
</div>
|
|
[% END %]
|
|
|
|
[% IF ( pay_individual ) %]
|
|
<form name="payindivfine" id="payindivfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
|
|
<input type="hidden" name="csrf_token" value="[% csrf_token %]" />
|
|
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
|
|
<input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
|
|
<input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
|
|
<input type="hidden" name="description" id="description" value="[% description %]" />
|
|
<input type="hidden" name="accounttype" id="accounttype" value="[% accounttype %]" />
|
|
<input type="hidden" name="amount" id="amount" value="[% amount %]" />
|
|
<input type="hidden" name="amountoutstanding" id="amountoutstanding" value="[% amountoutstanding %]" />
|
|
<input type="hidden" name="accountlines_id" id="accountlines_id" value="[% accountlines_id %]" />
|
|
<input type="hidden" name="title" id="title" value="[% title %]" />
|
|
|
|
<fieldset class="rows">
|
|
<legend>Pay an individual fine</legend>
|
|
<input type="hidden" name="payment_note" id="payment_note" value="[% payment_note %]" />
|
|
<table>
|
|
<thead><tr>
|
|
<th>Description</th>
|
|
<th>Account type</th>
|
|
<th>Amount</th>
|
|
<th>Amount outstanding</th>
|
|
</tr></thead>
|
|
<tfoot>
|
|
<td colspan="3">Total amount payable:</td><td>[% amountoutstanding | format('%.2f') %]</td>
|
|
</tfoot>
|
|
<tbody><tr>
|
|
<td>
|
|
[% individual_description %]
|
|
</td>
|
|
<td>[% accounttype %]</td>
|
|
<td class="debit">[% amount | format('%.2f') %]</td>
|
|
<td class="debit">[% amountoutstanding | format('%.2f') %]</td>
|
|
</tr></tbody>
|
|
</table>
|
|
|
|
<ol>
|
|
|
|
<li>
|
|
<label for="paid">Collect from patron: </label>
|
|
<!-- default to paying all -->
|
|
<input name="paid" id="paid" value="[% amountoutstanding %]" />
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
|
|
<div class="action"><input type="submit" name="submitbutton" value="Confirm" />
|
|
<a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></div>
|
|
</form>
|
|
[% ELSIF ( writeoff_individual ) %]
|
|
<form name="woindivfine" id="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
|
|
<input type="hidden" name="csrf_token" value="[% csrf_token %]" />
|
|
<fieldset class="rows">
|
|
<legend>Write off an individual fine</legend>
|
|
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
|
|
<input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
|
|
<input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
|
|
<input type="hidden" name="description" id="description" value="[% description %]" />
|
|
<input type="hidden" name="accounttype" id="accounttype" value="[% accounttype %]" />
|
|
<input type="hidden" name="amount" id="amount" value="[% amount %]" />
|
|
<input type="hidden" name="accountlines_id" id="accountlines_id" value="[% accountlines_id %]" />
|
|
<input type="hidden" name="title" id="title" value="[% title %]" />
|
|
<input type="hidden" name="payment_note" id="payment_note" value="[% payment_note %]" />
|
|
<table>
|
|
<thead><tr>
|
|
<th>Description</th>
|
|
<th>Account type</th>
|
|
<th>Amount</th>
|
|
<th>Amount outstanding</th>
|
|
</tr></thead>
|
|
<tfoot><td colspan="3">Total amount outstanding:</td><td>[% amountoutstanding | format('%.2f') %]</td></tfoot>
|
|
<tbody><tr>
|
|
<td>[% description %] [% title %]</td>
|
|
<td>[% accounttype %]</td>
|
|
<td class="debit">[% amount | format('%.2f') %]</td>
|
|
<td class="debit">[% amountoutstanding | format('%.2f') %]</td>
|
|
</tr></tbody>
|
|
</table>
|
|
|
|
<ol>
|
|
<li>
|
|
<label for="paid">Writeoff amount: </label>
|
|
<!-- default to writing off all -->
|
|
<input name="amountwrittenoff" id="amountwrittenoff" value="[% amountoutstanding %]" />
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
<div class="action"><input type="submit" name="confirm_writeoff" id="confirm_writeoff" value="Write off this charge" />
|
|
<a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></div>
|
|
</form>
|
|
[% ELSE %]
|
|
|
|
<form name="payfine" id="payfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
|
|
<input type="hidden" name="csrf_token" value="[% csrf_token %]" />
|
|
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
|
|
<input type="hidden" name="selected_accts" id="selected_accts" value="[% selected_accts %]" />
|
|
<input type="hidden" name="total" id="total" value="[% total %]" />
|
|
|
|
<fieldset class="rows">
|
|
[% IF ( selected_accts ) %]<legend>Pay an amount toward selected fines</legend>[% ELSE %]<legend>Pay an amount toward all fines</legend>[% END %]
|
|
<ol>
|
|
<li>
|
|
<span class="label">Total amount outstanding: </span>
|
|
<span class="debit">[% total | format('%.2f') %]</span>
|
|
</li>
|
|
<li>
|
|
<label for="paid">Collect from patron: </label>
|
|
<!-- default to paying all -->
|
|
<input name="paid" id="paid" value="[% total | format('%.2f') %]" />
|
|
</li>
|
|
<li>
|
|
<label for="selected_accts_notes">Note: </label>
|
|
<textarea name="selected_accts_notes" id="selected_accts_notes">[% selected_accts_notes %]</textarea>
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
<div class="action"><input type="submit" name="submitbutton" value="Confirm" />
|
|
<a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></div>
|
|
</form>
|
|
[% END %]
|
|
</div></div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="yui-b">
|
|
[% INCLUDE 'circ-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
<script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script>
|
|
<script type= "text/javascript">
|
|
$(document).ready(function() {
|
|
$('#payindivfine, #woindivfine, #payfine').preventDoubleFormSubmit();
|
|
$("#paid").on("change",function(){
|
|
moneyFormat( this );
|
|
});
|
|
});
|
|
|
|
function moneyFormat(textObj) {
|
|
var newValue = textObj.value;
|
|
var decAmount = "";
|
|
var dolAmount = "";
|
|
var decFlag = false;
|
|
var aChar = "";
|
|
|
|
for(i=0; i < newValue.length; i++) {
|
|
aChar = newValue.substring(i, i+1);
|
|
if (aChar >= "0" && aChar <= "9") {
|
|
if(decFlag) {
|
|
decAmount = "" + decAmount + aChar;
|
|
}
|
|
else {
|
|
dolAmount = "" + dolAmount + aChar;
|
|
}
|
|
}
|
|
if (aChar == ".") {
|
|
if (decFlag) {
|
|
dolAmount = "";
|
|
break;
|
|
}
|
|
decFlag = true;
|
|
}
|
|
}
|
|
|
|
if (dolAmount == "") {
|
|
dolAmount = "0";
|
|
}
|
|
// Strip leading 0s
|
|
if (dolAmount.length > 1) {
|
|
while(dolAmount.length > 1 && dolAmount.substring(0,1) == "0") {
|
|
dolAmount = dolAmount.substring(1,dolAmount.length);
|
|
}
|
|
}
|
|
if (decAmount.length > 2) {
|
|
decAmount = decAmount.substring(0,2);
|
|
}
|
|
// Pad right side
|
|
if (decAmount.length == 1) {
|
|
decAmount = decAmount + "0";
|
|
}
|
|
if (decAmount.length == 0) {
|
|
decAmount = decAmount + "00";
|
|
}
|
|
|
|
textObj.value = dolAmount + "." + decAmount;
|
|
}
|
|
</script>
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|