Bug 17014 - Remove more event attributes from patron templates
There are many patron-related templates which still use event attributes
to define events. This patch updates these templates so that events are
defined in JavaScript.
To test apply the patch and check out to a patron.
- From the Print menu in the toolbar, choose "Print summary." The patron
summary page should open and the print dialog should be automatically
triggered.
- From the Print menu in the toolbar, choose "Print slip." The patron
slip page should open and the print dialog should be automatically
triggered.
- From the Print menu in the toolbar, choose "Print quick slip." The
patron quick slip page should open and the print dialog should be
automatically triggered.
- Click the patron's "Fines" tab in the left-hand sidebar and then
choose the "Account" tab.
-- Click the "Print" button for an account payment (the link should
point to printfeercpt.pl). A print receipt page should open and
the print dialog should be automatically triggered.
-- Follow the same procedure for a transaction which is not an account
payment (the link should point to printinvoice.pl).
- Click the "Create manual invoice" tab.
-- Select one of the "type" choices. Doing so should automatically
populate the "Description" field with the corresponding code.
-- If necessary, define one or more values for the MANUAL_INV
authorized value and confirm that those invoice types work as well.
- From the patron's "Pay fines" tab, click the "Pay amount" button. In
the "collect from patron" field, enter any combination of letters,
numbers, and symbols. When you tab away from that field your text
should be reformatted to currency format.
- From the patrons home page, change the filter in the left-hand sidebar
and submit it. The correct results should be returned.
Signed-off-by: EricGosselin <eric.gosselin.5@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
parent
70377b3757
commit
a7bdc6eb3e
|
|
@ -2,9 +2,9 @@
|
|||
[% IF ( Koha.Preference('IntranetSlipPrinterJS') ) %]
|
||||
[% Koha.Preference('IntranetSlipPrinterJS') %]
|
||||
[% ELSE %]
|
||||
function printThenClose() {
|
||||
$( window ).load(function() {
|
||||
window.print();
|
||||
setTimeout('window.close()', 1);
|
||||
}
|
||||
});
|
||||
[% END %]
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
[% INCLUDE 'slip-print.inc' #printThenClose %]
|
||||
</head>
|
||||
<body id="circ_printslip" class="circ" onload="printThenClose();">
|
||||
<body id="circ_printslip" class="circ">
|
||||
<div id="receipt">
|
||||
|
||||
[% IF plain %]
|
||||
|
|
|
|||
|
|
@ -4,9 +4,22 @@
|
|||
[% INCLUDE 'doc-head-close.inc' %]
|
||||
<script type="text/javascript">
|
||||
//<![CDATA[
|
||||
var type_fees = new Array();
|
||||
type_fees['L'] = '';
|
||||
type_fees['F'] = '';
|
||||
type_fees['A'] = '';
|
||||
type_fees['N'] = '';
|
||||
type_fees['M'] = '';
|
||||
[% FOREACH invoice_types_loo IN invoice_types_loop %]
|
||||
type_fees['[% invoice_types_loo.authorised_value %]'] = "[% invoice_types_loo.lib %]";
|
||||
[% END %]
|
||||
$(document).ready(function(){
|
||||
$('#maninvoice').preventDoubleFormSubmit();
|
||||
$("fieldset.rows input, fieldset.rows select").addClass("noEnterSubmit");
|
||||
$("#invoice_type").on("change",function(){
|
||||
this.form.desc.value = this.options[this.selectedIndex].value;
|
||||
this.form.amount.value = type_fees[this.options[this.selectedIndex].value];
|
||||
});
|
||||
});
|
||||
//]]>
|
||||
</script>
|
||||
|
|
@ -44,19 +57,8 @@ $(document).ready(function(){
|
|||
<legend>Manual invoice</legend>
|
||||
<ol>
|
||||
<li>
|
||||
<script type="text/javascript">
|
||||
var type_fees = new Array();
|
||||
type_fees['L'] = '';
|
||||
type_fees['F'] = '';
|
||||
type_fees['A'] = '';
|
||||
type_fees['N'] = '';
|
||||
type_fees['M'] = '';
|
||||
[% FOREACH invoice_types_loo IN invoice_types_loop %]
|
||||
type_fees['[% invoice_types_loo.authorised_value %]'] = "[% invoice_types_loo.lib %]";
|
||||
[% END %]
|
||||
</script>
|
||||
<label for="type">Type: </label>
|
||||
<select name="type" id="type" onchange="this.form.desc.value=this.options[this.selectedIndex].value; this.form.amount.value=type_fees[this.options[this.selectedIndex].value];">
|
||||
<select name="type" id="invoice_type">
|
||||
<option value="L">Lost item</option>
|
||||
<option value="F">Fine</option>
|
||||
<option value="A">Account management fee</option>
|
||||
|
|
|
|||
|
|
@ -109,6 +109,9 @@ $(document).ready(function() {
|
|||
e.preventDefault();
|
||||
clearFilters(true);
|
||||
});
|
||||
$("#searchform").on("submit",function(){
|
||||
return filter();
|
||||
});
|
||||
});
|
||||
|
||||
var dtMemberResults;
|
||||
|
|
@ -409,7 +412,7 @@ function filterByFirstLetterSurname(letter) {
|
|||
</div>
|
||||
</div>
|
||||
<div class="yui-b">
|
||||
<form onsubmit="return filter();" id="searchform">
|
||||
<form method="get" id="searchform">
|
||||
<input type="hidden" id="firstletter_filter" value="" />
|
||||
<fieldset class="brief">
|
||||
<h3>Filters</h3>
|
||||
|
|
|
|||
|
|
@ -5,12 +5,9 @@
|
|||
[% INCLUDE 'doc-head-open.inc' %]
|
||||
<title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title>
|
||||
[% INCLUDE 'doc-head-close.inc' %]
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
|
||||
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print.css" />
|
||||
[% INCLUDE 'slip-print.inc' #printThenClose %]
|
||||
</head>
|
||||
<body id="pat_moremember-print" class="pat" onload="printThenClose();">
|
||||
<body id="pat_moremember-print" class="pat">
|
||||
<div id="main">
|
||||
<h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">Account summary: [% firstname %] [% surname %] ([% cardnumber %])</a></h3>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
[% INCLUDE 'slip-print.inc' #printThenClose %]
|
||||
</head>
|
||||
<body id="pat_moremember-receipt" class="pat" onload="printThenClose();">
|
||||
<body id="pat_moremember-receipt" class="pat">
|
||||
|
||||
<div id="receipt">
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
//<![CDATA[
|
||||
$(document).ready(function() {
|
||||
$('#payindivfine, #woindivfine, #payfine').preventDoubleFormSubmit();
|
||||
$("#paid").on("change",function(){
|
||||
moneyFormat( this );
|
||||
});
|
||||
});
|
||||
//]]>
|
||||
</script>
|
||||
<script type= "text/javascript">
|
||||
//<![CDATA[
|
||||
|
||||
function moneyFormat(textObj) {
|
||||
var newValue = textObj.value;
|
||||
var decAmount = "";
|
||||
|
|
@ -100,7 +100,7 @@ function moneyFormat(textObj) {
|
|||
[% END %]
|
||||
|
||||
[% IF ( pay_individual ) %]
|
||||
<form name="payindivfine" id="payindivfine" onsubmit="return validatePayment(this);" method="post" action="/cgi-bin/koha/members/paycollect.pl">
|
||||
<form name="payindivfine" id="payindivfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
|
||||
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
|
||||
<input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
|
||||
<input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
|
||||
|
|
@ -146,7 +146,7 @@ function moneyFormat(textObj) {
|
|||
<li>
|
||||
<label for="paid">Collect from patron: </label>
|
||||
<!-- default to paying all -->
|
||||
<input name="paid" id="paid" value="[% amountoutstanding | format('%.2f') %]" onchange="moneyFormat(document.payindivfine.paid)"/>
|
||||
<input name="paid" id="paid" value="[% amountoutstanding | format('%.2f') %]" />
|
||||
</li>
|
||||
</ol>
|
||||
</fieldset>
|
||||
|
|
@ -196,7 +196,7 @@ function moneyFormat(textObj) {
|
|||
</form>
|
||||
[% ELSE %]
|
||||
|
||||
<form name="payfine" id="payfine" onsubmit="return validatePayment(this);" method="post" action="/cgi-bin/koha/members/paycollect.pl">
|
||||
<form name="payfine" id="payfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
|
||||
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
|
||||
<input type="hidden" name="selected_accts" id="selected_accts" value="[% selected_accts %]" />
|
||||
<input type="hidden" name="total" id="total" value="[% total %]" />
|
||||
|
|
@ -211,7 +211,7 @@ function moneyFormat(textObj) {
|
|||
<li>
|
||||
<label for="paid">Collect from patron: </label>
|
||||
<!-- default to paying all -->
|
||||
<input name="paid" id="paid" value="[% total | format('%.2f') %]" onchange="moneyFormat(document.payfine.paid)"/>
|
||||
<input name="paid" id="paid" value="[% total | format('%.2f') %]" />
|
||||
</li>
|
||||
<li>
|
||||
<label for="selected_accts_notes">Note: </label>
|
||||
|
|
|
|||
|
|
@ -3,12 +3,10 @@
|
|||
[% INCLUDE 'doc-head-open.inc' %]
|
||||
<title>Print Receipt for [% cardnumber %]</title>
|
||||
[% INCLUDE 'doc-head-close.inc' %]
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
|
||||
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice.css" />
|
||||
[% INCLUDE 'slip-print.inc' #printThenClose %]
|
||||
</head>
|
||||
<body id="pat_printfeercpt" class="pat" onload="printThenClose();">
|
||||
<body id="pat_printfeercpt" class="pat">
|
||||
|
||||
<div id="receipt">
|
||||
<!-- The table with the account items -->
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
[% USE Koha %]
|
||||
[% INCLUDE 'doc-head-open.inc' %]
|
||||
<title>Print Receipt for [% cardnumber %]</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
|
||||
<title>Print receipt for [% cardnumber %]</title>
|
||||
[% INCLUDE 'doc-head-close.inc' %]
|
||||
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice.css" />
|
||||
[% INCLUDE 'slip-print.inc' #printThenClose %]
|
||||
</head>
|
||||
<body id="printinvoice" class="pat" onload="printThenClose();">
|
||||
<body id="printinvoice" class="pat">
|
||||
|
||||
<div id="receipt">
|
||||
<!-- The table with the account items -->
|
||||
|
|
|
|||
Loading…
Reference in New Issue