@@ -, +, @@ form. --- .../prog/en/modules/members/paycollect.tt | 95 ++++++++++++++++++---- members/paycollect.pl | 31 +++++-- 2 files changed, 103 insertions(+), 23 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -1,6 +1,7 @@ [% USE raw %] [% USE Asset %] [% USE Koha %] +[% USE Price %] [% USE Branches %] [% USE AuthorisedValues %] [% USE Price %] @@ -54,12 +55,31 @@
-[% IF ( error_over ) %] +[% IF (error_negative) %] +
+ The amount paid can't be negative. +
+[% END %] + +[% IF (error_collected_less) %]
- You must pay a value less than or equal to [% total_due | format('%.2f') %]. + 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 ) %] @@ -84,24 +104,43 @@ Amount outstanding - Total amount payable:[% amountoutstanding | format('%.2f') %] + Total amount payable:[% amountoutstanding | $Price %] [% individual_description | html %] [% accounttype | html %] - [% amount | format('%.2f') %] - [% amountoutstanding | format('%.2f') %] + [% amount | $Price %] + [% amountoutstanding | $Price %]
    - + [% IF ( give_change ) %] +
  1. + + + + [% amount_paid | $Price %] +
  2. +
  3. + + [% amount_collected | $Price %] +
  4. +
  5. + + [% give_change | $Price %] +
  6. + [% ELSE %] +
  7. + + + [% amount_paid | $Price %] +
  8. - - - + +
  9. [% SET payment_types = AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %] [% IF payment_types %] @@ -115,6 +154,7 @@ [% END %] + [% END %]
@@ -144,12 +184,12 @@ Amount Amount outstanding - Total amount outstanding:[% amountoutstanding | format('%.2f') %] + Total amount outstanding:[% amountoutstanding | $Price %] [% description | html %] [% title | html %] [% accounttype | html %] - [% amount | format('%.2f') %] - [% amountoutstanding | format('%.2f') %] + [% amount | $Price %] + [% amountoutstanding | $Price %] @@ -189,16 +229,36 @@
  1. Total amount outstanding: - [% total | format('%.2f') %] + [% total | $Price %]
  2. + [% IF ( give_change ) %] +
  3. + + + [% amount_paid | $Price %] +
  4. +
  5. + + + [% amount_collected | $Price %] +
  6. +
  7. + + [% give_change | $Price %] +
  8. + [% ELSE %] +
  9. + + +
  10. [% IF type == 'writeoff' %] - + [% ELSE %] - + [% END %] - +
  11. [% SET payment_types = AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %] [% IF payment_types %] @@ -212,6 +272,7 @@ [% END %] + [% END %]
  12. @@ -238,7 +299,7 @@ [% Asset.js("js/members-menu.js") | $raw %]