Bug 24519: Match paycollect form validation for change collection
This patch adds form validation to the Point Of Sale payment page such
that one cannot submit the form with a 'collected' value that is less
than the 'owed' amount.
Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk>
Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 080288bce4)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
parent
7e25a22baf
commit
f5d1436a1d
|
|
@ -253,14 +253,19 @@
|
|||
var zero_formatted = "[% 0 | $Price %]";
|
||||
change.innerHTML = Math.round(($('#collected')[0].value - $('#paid')[0].value) * 100) / 100;
|
||||
if (change.innerHTML <= 0) {
|
||||
var paid = $('#paid')[0];
|
||||
moneyFormat(paid);
|
||||
$('#collected').rules( "add", { min: Number(paid.value) });
|
||||
$("#payForm").valid()
|
||||
change.innerHTML = zero_formatted;
|
||||
$(':input[name="change"]').val(zero_formatted);
|
||||
} else {
|
||||
change.value = change.innerHTML;
|
||||
moneyFormat(change);
|
||||
change.innerHTML = change.value;
|
||||
$(':input[name="change"]').val(change.value);
|
||||
}
|
||||
|
||||
$(':input[name="change"]').val(change.value);
|
||||
$('#modal_change').html(change.innerHTML);
|
||||
}
|
||||
|
||||
|
|
@ -363,6 +368,15 @@
|
|||
$('#payForm').submit();
|
||||
});
|
||||
|
||||
$( "#payForm" ).validate({
|
||||
rules: {
|
||||
paid: { required: true },
|
||||
collected: {
|
||||
required: true
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
$('#payForm').submit(function(e){
|
||||
if (change != undefined && change.innerHTML > 0.00 && !checked) {
|
||||
e.preventDefault();
|
||||
|
|
|
|||
Loading…
Reference in New Issue