Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_8054' into 3.12-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2013-03-11 08:14:24 -04:00
commit 43c340c53e
4 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
View file

@ -5,6 +5,7 @@
//<![CDATA[
$(document).ready(function(){
$("fieldset.rows input").keydown(function(e){ return checkEnter(e); });
$('#mancredit').preventDoubleFormSubmit();
});
//]]>
</script>
@ -32,7 +33,7 @@ $(document).ready(function(){
</ul>
<div class="tabs-container">
<form action="/cgi-bin/koha/members/mancredit.pl" method="post">
<form action="/cgi-bin/koha/members/mancredit.pl" method="post" id="mancredit">
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
<fieldset class="rows">

3
koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
View file

@ -5,6 +5,7 @@
//<![CDATA[
$(document).ready(function(){
$("fieldset.rows input").keydown(function(e){ return checkEnter(e); });
$('#maninvoice').preventDoubleFormSubmit();
});
//]]>
</script>
@ -37,7 +38,7 @@ $(document).ready(function(){
ERROR an invalid itemnumber was entered, please hit back and try again
[% END %]
[% ELSE %]
<form action="/cgi-bin/koha/members/maninvoice.pl" method="post"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
<form action="/cgi-bin/koha/members/maninvoice.pl" method="post" id="maninvoice"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
<fieldset class="rows">
<legend>Manual Invoice</legend>
<ol>

3
koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
View file

@ -5,6 +5,7 @@
<script type= "text/javascript">
//<![CDATA[
$(document).ready(function(){
$('#pay-fines-form').preventDoubleFormSubmit();
$("#woall").click(function(event){
var answer = confirm(_("Are you sure you want to write off [% total | format('%.2f') %] in outstanding fines? This cannot be undone!"));
if (!answer){
@ -41,7 +42,7 @@
<div class="tabs-container">
[% IF ( accounts ) %]
<form action="/cgi-bin/koha/members/pay.pl" method="post">
<form action="/cgi-bin/koha/members/pay.pl" method="post" id="pay-fines-form">
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
<p><span class="checkall"><a id="CheckAll" href="#">Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#">Clear all</a></span></p>
<table id="finest">

13
koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
View file

@ -3,6 +3,13 @@
[% INCLUDE 'doc-head-close.inc' %]
<script type= "text/javascript">
//<![CDATA[
$(document).ready(function() {
$('#payindivfine, #woindivfine, #payfine').preventDoubleFormSubmit();
});
//]]>
</script>
<script type= "text/javascript">
//<![CDATA[
function moneyFormat(textObj) {
var newValue = textObj.value;
var decAmount = "";
@ -91,7 +98,7 @@ function moneyFormat(textObj) {
[% END %]
[% IF ( pay_individual ) %]
<form name="payindivfine" onsubmit="return validatePayment(this);" method="post" action="/cgi-bin/koha/members/paycollect.pl">
<form name="payindivfine" id="payindivfine" onsubmit="return validatePayment(this);" 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 %]" />
@ -145,7 +152,7 @@ function moneyFormat(textObj) {
<a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a></div>
</form>
[% ELSIF ( writeoff_individual ) %]
<form name="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
<form name="woindivfine" id="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
<fieldset class="rows">
<legend>Write off an individual fine</legend>
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
@ -185,7 +192,7 @@ function moneyFormat(textObj) {
</form>
[% ELSE %]
<form name="payfine" onsubmit="return validatePayment(this);" method="post" action="/cgi-bin/koha/members/paycollect.pl">
<form name="payfine" id="payfine" onsubmit="return validatePayment(this);" 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 %]" />