[% USE Koha %]
[% USE Branches %]
[% USE KohaDates %]
-[% USE ColumnsSettings %]
+[% USE TablesSettings %]
[% USE AuthorisedValues %]
[% USE Price %]
[% USE Branches %]
+[% USE Registers %]
[% SET footerjs = 1 %]
+[% SET registers = Registers.all( filters => { current_branch => 1 } ) %]
[% PROCESS 'accounts.inc' %]
[% INCLUDE 'doc-head-open.inc' %]
-<title>Koha › Patrons › Account for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
+<title>Account for [% INCLUDE 'patron-title.inc' no_html = 1 %] › Patrons › Koha</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
[% 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> › Account for [% INCLUDE 'patron-title.inc' %]</div>
+<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
+ <ol>
+ <li>
+ <a href="/cgi-bin/koha/mainpage.pl">Home</a>
+ </li>
+ <li>
+ <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
+ </li>
+ <li>
+ <a href="#" aria-current="page">
+ Account for [% INCLUDE 'patron-title.inc' %]
+ </a>
+ </li>
+ </ol>
+</nav>
<div class="main container-fluid">
<div class="row">
<li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a></li>
</ul>
<div class="tabs-container">
+[% INCLUDE 'renew_results.inc' renew_results=renew_results %]
<!-- The table with the account items -->
<table id="table_account_fines">
<thead>
<tr>
- <th class="title-string">Date</th>
+ <th>Created</th>
+ <th>Updated</th>
+ <th>Credit number</th>
<th>Account type</th>
<th>Description of charges</th>
<th>Barcode</th>
<th>Due date</th>
- <th>Return date</th>
+ <th>Checkin date</th>
+ <th>Checkout date</th>
+ <th class="checked_out_from">Checked out from</th>
<th>Home library</th>
<th>Note</th>
<th>Amount</th>
<th>Outstanding</th>
- <th>Actions</th>
+ <th class="NoSort noExport">Actions</th>
</tr>
</thead>
[% FOREACH account IN accounts %]
<tr>
- <td><span title="[% account.date | html %]">[% account.date |$KohaDates %]</span></td>
+ <td data-order="[% account.date | html %]">[% account.date | $KohaDates %]</td>
+ <td data-order="[% account.timestamp | html %]">[% account.timestamp | $KohaDates with_hours = 1 %]</td>
+ <td>[% account.credit_number | html %]</td>
<td>[% PROCESS account_type_description account=account %]</td>
<td>
[%- IF account.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
<td>[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% account.itemnumber | uri %]&biblionumber=[% account.item.biblionumber | uri %]#item[% account.itemnumber | uri %]">[% account.item.barcode | html %]</a>[% END %]</td>
<td>[% IF ( account.issue_id ) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %]</td>
<td>[% IF ( account.issue_id ) %][% account.checkout.returndate | $KohaDates with_hours => 1 %][% END %]</td>
+ <td>[% IF ( account.issue_id ) %][% account.checkout.issuedate | $KohaDates %][% END %]</td>
+ <td class="checked_out_from">
+ [% IF account.issue_id && account.checkout.library %]
+ [% account.checkout.library.branchname | html %]
+ [% END %]
+ </td>
<td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td>
<td>[% account.note | html_line_break %]</td>
[% IF account.amount <= 0 %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price %]</td>
[% IF account.amountoutstanding <= 0 %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding | $Price %]</td>
<td class="actions">
[% IF ( account.is_credit ) %]
- <a target="_blank" href="printfeercpt.pl?action=print&accountlines_id=[% account.accountlines_id | uri %]&borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a>
+ <a target="_blank" href="printfeercpt.pl?action=print&accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a>
[% ELSE %]
- <a target="_blank" href="printinvoice.pl?action=print&accountlines_id=[% account.accountlines_id | uri %]&borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a>
+ <a target="_blank" href="printinvoice.pl?action=print&accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a>
[% END %]
<a href="accountline-details.pl?accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a>
- [% IF account.is_credit %]
- <a href="boraccount.pl?action=void&accountlines_id=[% account.accountlines_id | uri %]&borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs void"><i class="fa fa-ban"></i> Void</a>
+ [% IF account.is_debit && account.amountoutstanding > 0 %]
+ <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% account.borrowernumber | html %]&pay_individual=1&debit_type_code=[% account.debit_type_code | html %]&amount=[% account.amount | html %]&amountoutstanding=[% account.amountoutstanding | html %]&description=[% account.description | html %]&itemnumber=[% account.itemnumber | html %]&accountlines_id=[% account.accountlines_id | html %]"><i class="fa fa-money"></i> Pay</a>
+ [% END %]
+ [% IF account.is_credit && account.status != 'VOID' %]
+ <a href="boraccount.pl?action=void&accountlines_id=[% account.accountlines_id | uri %]&borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs void"><i class="fa fa-ban"></i> Void payment</a>
+ [% END %]
+ [% IF account.is_debit && account.amount == account.amountoutstanding && account.status != 'CANCELLED' && !(account.debit_type_code == 'PAYOUT') %]
+ <form method="post" action="/cgi-bin/koha/members/cancel-charge.pl">
+ <input type="hidden" name="csrf_token" value="[% csrf_token | html %]">
+ <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]">
+ <input type="hidden" name="accountlines_id" value="[% account.accountlines_id | html %]">
+ <button type="submit" class="btn btn-default btn-xs">
+ <i class="fa fa-ban"></i>
+ Cancel charge
+ </button>
+ </form>
[% END %]
[% IF CAN_user_updatecharges_payout && account.is_credit && ( account.amountoutstanding < 0 ) %]
<button type="button" data-toggle="modal" data-target="#issuePayoutModal" data-account="[%- PROCESS account_type_description account=account -%]" data-accountline="[% account.accountlines_id | html %]" data-amount="[% account.amountoutstanding | $Price %]" class="btn btn-default btn-xs"><i class="fa fa-money"></i> Issue payout</button>
[% END %]
- [% IF CAN_user_updatecharges_refund && account.is_debit && ( account.amountoutstanding != account.amount ) && !(account.status == 'REFUNDED' ) %]
- <button type="button" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=account -%]" data-accountline="[% account.accountlines_id | html %]" data-amount="[% account.amount | $Price %]" data-amountoutstanding="[% account.amountoutstanding | $Price %]" class="btn btn-default btn-xs"><i class="fa fa-money"></i> Issue refund</button>
+ [% IF CAN_user_updatecharges_refund && account.is_debit && ( account.amountoutstanding != account.amount ) && !(account.status == 'REFUNDED') && !(account.debit_type_code == 'PAYOUT') %]
+ <button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=account -%]" data-accountline="[% account.accountlines_id | html %]" data-amount="[% account.amount | $Price %]" data-amountoutstanding="[% account.amountoutstanding | $Price %]" data-member="[% account.borrowernumber | html %]"><i class="fa fa-money"></i> Issue refund</button>
+ [% END %]
+ [% IF CAN_user_updatecharges_discount && account.is_debit && ( account.amountoutstanding == account.amount ) && !(account.debit_type_code == 'PAYOUT') %]
+ <button type="button" data-toggle="modal" data-target="#applyDiscountModal" data-item="[%- PROCESS account_type_description account=account -%]" data-accountline="[% account.accountlines_id | html %]" data-amount="[% account.amount | $Price %]" data-amountoutstanding="[% account.amountoutstanding | $Price %]" class="btn btn-default btn-xs">Apply discount</button>
[% END %]
</td>
</tr>
[% END %]
<tfoot>
<tr>
- <td colspan="9">Total due</td>
+ <td colspan="13">Total due</td>
[% IF ( totalcredit ) %]
<td class="credit" style="text-align: right;">[% total | $Price %]</td>
+ <td>
+ [% IF CAN_user_updatecharges_payout %]
+ <button type="button" data-toggle="modal" data-target="#issuePayoutModal" data-amount="[% total | $Price %]" class="btn btn-default btn-xs"><i class="fa fa-money"></i> Payout amount</button>
+ [% END %]
+ </td>
[% ELSE %]
<td class="debit"style="text-align: right;">[% total | $Price %]</td>
+ <td></td>
[% END %]
- <td></td>
</tr>
</tfoot>
</table>
<h4 class="modal-title" id="issuePayoutLabel">Issue payout</h4>
</div>
<div class="modal-body">
+ [% IF Koha.Preference('UseCashRegisters') && ( registers.size == 0 ) %]
+ <div id="payout_error" class="dialog alert">
+ You must have at least one cash register associated with this branch before you can record cash payouts.
+ </div>
+ [% END %]
<fieldset class="rows">
<ol>
<li>
</li>
<li>
<label class="required" for="amount">Returned to patron: </label>
- <input type="number" step="0.01" id="amount" name="amount" min="0.00" required="required">
+ <input type="text" inputmode="numeric" pattern="[0-9]*" id="amount" name="amount" required="required">
<span class="required">Required</span>
</li>
- [% SET payment_types = AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %]
- [% IF payment_types %]
- <li>
- <label for="transaction_type">Transaction type: </label>
- <select name="transaction_type" id="transaction_type">
- [% FOREACH pt IN payment_types %]
- <option value="[% pt.authorised_value | html %]">[% pt.lib | html %]</option>
- [% END %]
- </select>
- </li>
- [% END %]
+
+ [% INCLUDE 'transaction_types.inc' type="payout" %]
[% IF Koha.Preference('UseCashRegisters') %]
<li>
- <label for="cash_register">Cash register: </label>
- <select name="cash_register" id="cash_register">
- [% FOREACH register IN registers %]
- [% IF register.id == registerid %]
- <option value="[% register.id | html %]" selected="selected">[% register.name | html %]</option>
- [% ELSE %]
- <option value="[% register.id | html %]">[% register.name | html %]</option>
- [% END %]
- [% END %]
+ <label for="registerid">Cash register: </label>
+ <select name="registerid" id="payout_registerid">
+ <option id="noregister" disabled selected="selected" value="">-- Select an option--</option>
+ [% PROCESS options_for_registers %]
</select>
</li>
[% END %]
</fieldset> <!-- /.rows -->
</div> <!-- /.modal-body -->
<div class="modal-footer">
- <input type="hidden" name="registerid" value="[% register.id | html %]">
<input type="hidden" name="op" value="payout">
- <button type="submit" class="btn btn-default">Confirm</button>
+ <button type="submit" class="btn btn-default" id="borr_payout_confirm">Confirm</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
</div> <!-- /.modal-footer -->
</div> <!-- /.modal-content -->
<h4 class="modal-title" id="issueRefundLabel">Issue refund</h4>
</div>
<div class="modal-body">
+ [% IF Koha.Preference('UseCashRegisters') && ( registers.size == 0 ) %]
+ <div id="refund_error" class="dialog alert">
+ You must have at least one cash register associated with this branch before you can record cash refunds.
+ </div>
+ [% END %]
<fieldset class="rows">
<ol>
<li>
</li>
<li>
<label class="required" for="amount">Returned to patron: </label>
- <input type="number" step="0.01" id="returned" name="amount" min="0.00" required="required">
+ <input type="text" inputmode="numeric" pattern="[0-9]*" id="returned" name="amount" required="required">
<span class="required">Required</span>
</li>
- [% SET payment_types = AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %]
- <li>
- <label for="transaction_type">Transaction type: </label>
- <select name="transaction_type" id="transaction_type">
- <option value="AC">Account credit</option>
- [% IF payment_types %]
- [% FOREACH pt IN payment_types %]
- <option value="[% pt.authorised_value | html %]">[% pt.lib | html %]</option>
- [% END %]
- [% END %]
- </select>
- </li>
+
+ [% INCLUDE 'transaction_types.inc' type="refund" %]
[% IF Koha.Preference('UseCashRegisters') %]
<li>
- <label for="cash_register">Cash register: </label>
- <select name="cash_register" id="cash_register">
- [% FOREACH register IN registers %]
- [% IF register.id == registerid %]
- <option value="[% register.id | html %]" selected="selected">[% register.name | html %]</option>
- [% ELSE %]
- <option value="[% register.id | html %]">[% register.name | html %]</option>
- [% END %]
- [% END %]
+ <label for="registerid">Cash register: </label>
+ <select name="registerid" id="refund_registerid">
+ <option id="noregister" disabled selected="selected" value="">-- Select an option--</option>
+ [% PROCESS options_for_registers %]
</select>
</li>
[% END %]
</fieldset> <!-- /.rows -->
</div> <!-- /.modal-body -->
<div class="modal-footer">
- <input type="hidden" name="registerid" value="[% register.id | html %]">
<input type="hidden" name="op" value="refund">
- <button type="submit" class="btn btn-default">Confirm</button>
+ <button type="submit" class="btn btn-default" id="borr_refund_confirm">Confirm</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
</div> <!-- /.modal-footer -->
</div> <!-- /.modal-content -->
</form> <!-- /#refund_form -->
</div> <!-- /#issueRefundModal -->
+ <!-- Apply discount modal -->
+ <div class="modal" id="applyDiscountModal" tabindex="-1" role="dialog" aria-labelledby="applyDiscountLabel">
+ <form id="discount_form" action="/cgi-bin/koha/members/boraccount.pl" method="get" enctype="multipart/form-data" class="validated">
+ <input type="hidden" name="accountlines_id" value="" id="discountline">
+ <input type="hidden" name="action" value="discount">
+ <input type="hidden" name="borrowernumber" value="[% account.borrowernumber | html %]">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+ <h4 class="modal-title" id="applyDiscountLabel">Apply discount</h4>
+ </div>
+ <div class="modal-body">
+ <fieldset class="rows">
+ <ol>
+ <li>
+ <span id="item" class="label">Account type: </span><span></span>
+ </li>
+ <li>
+ <span id="charged" class="label">Amount charged: </span><span></span>
+ </li>
+ <li>
+ <label class="required" for="amount">Discount to apply: </label>
+ <input type="text" inputmode="numeric" pattern="[0-9]*" id="discount" name="amount" required="required">
+ <span class="required">Required</span>
+ </li>
+ </ol>
+ </fieldset> <!-- /.rows -->
+ </div> <!-- /.modal-body -->
+ <div class="modal-footer">
+ <input type="hidden" name="op" value="discount">
+ <button type="submit" class="btn btn-default">Confirm</button>
+ <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+ </div> <!-- /.modal-footer -->
+ </div> <!-- /.modal-content -->
+ </div> <!-- /.modal-dialog -->
+ </form> <!-- /#discount_form -->
+ </div> <!-- /#applyDiscountModal -->
+
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'columns_settings.inc' %]
<script>
$(document).ready(function() {
[% IF payment_id && Koha.Preference('FinePaymentAutoPopup') %]
- window.open('/cgi-bin/koha/members/printfeercpt.pl?action=print&change_given=[% change_given | html %]&accountlines_id=[% payment_id | html %]&borrowernumber=[% patron.borrowernumber | html %]', '_blank');
+ window.open('/cgi-bin/koha/members/printfeercpt.pl?action=print&change_given=[% change_given | html %]&accountlines_id=[% payment_id | html %]', '_blank');
[% END %]
var txtActivefilter = _("Filter paid transactions");
var txtInactivefilter = _("Show all transactions");
- var columns_settings = [% ColumnsSettings.GetColumns('members', 'fines', 'account-fines', 'json') | $raw %];
+ var columns_settings = [% TablesSettings.GetColumns('members', 'fines', 'account-fines', 'json') | $raw %];
var table_account_fines = KohaTable("table_account_fines", {
"sPaginationType": "full",
'aaSorting': [[0, 'desc']],
"sDom": 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>',
- "aoColumnDefs": [
- { "sType": "title-string", "aTargets" : [ "title-string" ] },
- { "bSortable": false, "bSearchable": false, "aTargets": [-1] }
- ]
}, columns_settings);
$("#filter_c").html('<p><a href="#" id="filter_transacs"><i class="fa fa-filter"></i> '+txtActivefilter+'</a>');
$('#filter_transacs').click(function(e) {
var filteredValue = '^((?!0.00).*)$'; //Filter not matching 0.00 http://stackoverflow.com/a/406408
$(this).html('<i class="fa fa-filter"></i> '+txtInactivefilter);
}
- table_account_fines.fnFilter(filteredValue, 9, true, false);
+ table_account_fines.fnFilter(filteredValue, 10, true, false);
$(this).toggleClass('filtered');
});
$('#payoutline').val(accountline);
var amount = button.data('amount') * -1;
$("#paid + span").replaceWith(amount);
- $("#amount").attr({ "value": amount, "max": amount });
- $("#amount, #transaction_type").focus();
+ $("#amount").attr({ "value": amount, "max": amount, "min": 0 });
+ $("#amount, #payout_transaction_type").focus();
});
$("#issueRefundModal").on("shown.bs.modal", function(e){
var accountline = button.data('accountline');
$('#refundline').val(accountline);
var amount = button.data('amount');
- var amountoutstanding = button.data('amountoutstanding');
+ var amountoutstanding = button.data('amountoutstanding') || 0;
var paid = amount - amountoutstanding;
$("#paid + span").replaceWith(paid);
- $("#returned").attr({ "value": paid, "max": paid });
- $("#returned, #transaction_type").focus();
+ $("#returned").attr({ "value": paid, "max": paid, "min": 0 });
+ var member = button.data('member');
+ if ( member === '' ) {
+ $("#refund_type option[value='AC']").remove();
+ } else if ( $("#refund_type option[value='AC']").length == 0 ) {
+ $("#refund_type").prepend('<option value="AC" selected="selected">Account credit</option>');
+ }
+ $("#returned, #refund_type").focus();
+ });
+
+ $("#applyDiscountModal").on("shown.bs.modal", function(e){
+ var button = $(e.relatedTarget);
+ var item = button.data('item');
+ $("#item + span").replaceWith(item);
+ var accountline = button.data('accountline');
+ $('#discountline').val(accountline);
+ var amount = button.data('amount');
+ $("#charged + span").replaceWith(amount);
+ $("#discount").attr({ "max": amount, "min": 0 });
+ $("#discount").focus();
});
});
</script>
projects / srvgit / blobdiff