From a5aa1007e12156173ac3fa0af56e74eb6c115ef5 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 20 Nov 2019 16:01:56 +0000 Subject: [PATCH] Bug 22359: Improvements to payment collection inputs This patch attempts to clarify the uses of the various input fields on the paycollect screens. It does this by adding validation to the form such that entering a 'collected' value that is lower than the 'paid' value is now forbidden. Signed-off-by: Michal Denar --- .../prog/en/modules/members/paycollect.tt | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt index fa358135e6..42ba9fb5d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -113,11 +113,11 @@
  • - +
  • - +
  • @@ -237,22 +237,22 @@
  • [% IF type == 'WRITEOFF' %] - + [% ELSE %] - + [% END %] - +
  • - [% IF type != 'WRITEOFF' %]
  • - +
  • 0.00
  • + [% SET payment_types = AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %] [% IF payment_types %]
  • @@ -265,6 +265,7 @@
  • [% END %] + [% END %] [% IF Koha.Preference('UseCashRegisters') %]
  • @@ -280,7 +281,6 @@
  • [% END %] - [% END %]
  • @@ -366,6 +366,15 @@ $('#modal_submit').click(function() { forms[0].submit(); }); + + $( "#payindivfine, #payfine" ).validate({ + rules: { + paid: { required: true }, + collected: { + required: true + } + } + }); }); prevent_default = 1; @@ -439,6 +448,10 @@ var change = $('#change')[0]; 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) }); + $( "#payindivfine, #payfine" ).valid(); change.innerHTML = "0.00"; $('input[name="change_given"]').val('0.00'); } else { -- 2.20.1