@@ -, +, @@ --- .../prog/en/modules/members/paycollect.tt | 43 +++++++++++----------- members/paycollect.pl | 12 +++--- 2 files changed, 28 insertions(+), 27 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -1,5 +1,6 @@ [% USE Asset %] [% USE Koha %] +[% USE Price %] [% USE Branches %] [% USE AuthorisedValues %] [% USE Price %] @@ -55,13 +56,13 @@
[% IF (error_negative) %]
- The amount paid can't be negative! + The amount paid can't be negative.
[% END %] [% IF (error_collected_less) %]
- The amount collected can't be lower than the amount paid! + The amount collected can't be lower than the amount paid.
[% END %] @@ -102,15 +103,15 @@ Amount outstanding - Total amount payable:[% amountoutstanding | format('%.2f') %] + Total amount payable:[% amountoutstanding | $Price %] [% individual_description %] [% accounttype %] - [% amount | format('%.2f') %] - [% amountoutstanding | format('%.2f') %] + [% amount | $Price %] + [% amountoutstanding | $Price %] @@ -120,25 +121,25 @@ - [% amount_paid %] + [% amount_paid | $Price %]
  • - [% amount_collected %] + [% amount_collected | $Price %]
  • - [% give_change %] + [% give_change | $Price %]
  • [% ELSE %]
  • - - - [% amount_paid %] + + + [% amount_paid | $Price %]
  • - +
  • [% SET payment_types = AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %] [% IF payment_types %] @@ -182,12 +183,12 @@ Amount Amount outstanding - Total amount outstanding:[% amountoutstanding | format('%.2f') %] + Total amount outstanding:[% amountoutstanding | $Price %] [% description %] [% title %] [% accounttype %] - [% amount | format('%.2f') %] - [% amountoutstanding | format('%.2f') %] + [% amount | $Price %] + [% amountoutstanding | $Price %] @@ -227,27 +228,27 @@
    1. Total amount outstanding: - [% total | format('%.2f') %] + [% total | $Price %]
    2. [% IF ( give_change ) %]
    3. - [% amount_paid %] + [% amount_paid | $Price %]
    4. - [% amount_collected %] + [% amount_collected | $Price %]
    5. - [% give_change %] + [% give_change | $Price %]
    6. [% ELSE %]
    7. - +
    8. [% IF type == 'writeoff' %] @@ -256,7 +257,7 @@ [% END %] - +
    9. [% SET payment_types = AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %] [% IF payment_types %] --- a/members/paycollect.pl +++ a/members/paycollect.pl @@ -119,16 +119,16 @@ if ( $total_paid and $total_paid ne '0.00' ) { } elsif ($total_paid >= $total_due and $total_collected ne $total_paid) { $template->param( - amount_paid => sprintf('%.2f', $total_due), - amount_collected => sprintf('%.2f', $total_collected), - give_change => sprintf('%.2f',($total_collected-$total_due)) + amount_paid => $total_due, + amount_collected => $total_collected, + give_change => $total_collected-$total_due, ); } elsif ($total_paid < $total_due and $total_collected ne $total_paid) { $template->param( - amount_paid => sprintf('%.2f', $total_paid), - amount_collected => sprintf('%.2f', $total_collected), - give_change => sprintf('%.2f',($total_collected-$total_paid)) + amount_paid => $total_paid, + amount_collected => $total_collected, + give_change => $total_collected-$total_paid, ); } else { die "Wrong CSRF token" --