From 072b3baa90c97670e298689509d3d342883dec8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9rick?= Date: Tue, 10 Dec 2013 16:51:39 -0500 Subject: [PATCH] Bug 11373: Add a "cash register" feature to the fine payment form. Works as intended. Signed-off-by: Simon Pouchol --- .../prog/en/modules/members/paycollect.tt | 80 +++++++++++++++++++--- members/paycollect.pl | 31 +++++++-- 2 files changed, 95 insertions(+), 16 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 a00afb2..ccc7772 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -53,12 +53,31 @@
-[% IF ( error_over ) %] +[% IF (error_negative) %]
- You must pay a value less than or equal to [% total_due | format('%.2f') %]. + The amount paid can't be negative!
[% END %] +[% IF (error_collected_less) %] +
+ The amount collected can't be lower than the amount paid! +
+[% END %] + +[% UNLESS (writeoff_individual) %] +
+[% END %] + +[% IF (give_change) %] +
+ The amount collected is greater than the total amount paid.
+ Change to give back: [% give_change %]

+ + Cancel +
+[% END %] + [% IF ( pay_individual ) %] @@ -96,11 +115,30 @@
    - + [% IF ( give_change ) %] +
  1. + + + + [% amount_paid %] +
  2. - - - + + [% amount_collected %] +
  3. +
  4. + + [% give_change %] +
  5. + [% ELSE %] +
  6. + + + [% amount_paid %] +
  7. +
  8. + +
  9. [% SET payment_types = AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %] [% IF payment_types %] @@ -114,6 +152,7 @@ [% END %] + [% END %]
@@ -190,14 +229,34 @@ Total amount outstanding: [% total | format('%.2f') %] + [% IF ( give_change ) %] +
  • + + + [% amount_paid %] +
  • +
  • + + + [% amount_collected %] +
  • +
  • + + [% give_change %] +
  • + [% ELSE %] +
  • + + +
  • [% IF type == 'writeoff' %] - + [% ELSE %] - + [% END %] - +
  • [% SET payment_types = AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %] [% IF payment_types %] @@ -211,6 +270,7 @@ [% END %] + [% END %]
  • @@ -236,7 +296,7 @@ [% Asset.js("js/members-menu.js") %]