From 01a93cf10eeee2c9b97ad71ca24c98a7d722d5a9 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 26 Jan 2015 10:28:27 +0100 Subject: [PATCH] Bug 13352: On editing, prices should not be formatted Bug 12979 refactored the way to display prices. The price format configuration was duplicated everywhere it was used. All calls looks good except the one in admin/aqbudgetperiods.pl In this one, the prices are formatted for an edition field (input). This means the input is incorrectly filled even if the user does not update the field. At the end, maybe should we manage formatted prices everywhere, even in inputs, but it's not in the scope of this bug. Technically, a new subroutine format_for_editing is added to the Koha::Number::Price module. It should be called everywhere a price is displayed in an input field. At the moment, it only does a sprintf("%.2f"), but it is a first step to let the number of decimals to display configurable. To test: 1/ Verify the issue described is fixed (editing a budget with a total amount > 1000 (With CurrencyFormat is US or FR). 2/ Verify you can edit a fund with a total amount > 1000 Signed-off-by: Paola Rossi Signed-off-by: Katrin Fischer --- Koha/Number/Price.pm | 15 +++++++++++++++ Koha/Template/Plugin/Price.pm | 9 +++++++-- admin/aqbudgetperiods.pl | 5 ----- admin/aqbudgets.pl | 1 - .../prog/en/modules/admin/aqbudgetperiods.tt | 7 +++---- .../intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 6 +++--- 6 files changed, 28 insertions(+), 15 deletions(-) diff --git a/Koha/Number/Price.pm b/Koha/Number/Price.pm index 80854ab..f0da1e0 100644 --- a/Koha/Number/Price.pm +++ b/Koha/Number/Price.pm @@ -44,6 +44,21 @@ sub format { return Number::Format->new(%$format_params)->format_price($self->value); } +sub format_for_editing { + my ( $self, $params ) = @_; + return unless defined $self->value; + + my $format_params = $self->_format_params( $params ); + $format_params = { + %$format_params, + int_curr_symbol => '', + mon_thousands_sep => '', + mon_decimal_point => '.', + }; + + return Number::Format->new(%$format_params)->format_price($self->value); +} + sub unformat { my ( $self, $params ) = @_; return unless defined $self->value; diff --git a/Koha/Template/Plugin/Price.pm b/Koha/Template/Plugin/Price.pm index f5d2a42..807f301 100644 --- a/Koha/Template/Plugin/Price.pm +++ b/Koha/Template/Plugin/Price.pm @@ -23,11 +23,16 @@ use Template::Plugin::Filter; use base qw( Template::Plugin::Filter ); use Koha::Number::Price; +our $DYNAMIC = 1; sub filter { - my ( $self, $value ) = @_; + my ( $self, $value, $args, $config ) = @_; $value ||= 0; - return Koha::Number::Price->new( $value )->format; + $config->{on_editing} //= 0; + my $formatted_price; + return $config->{on_editing} + ? Koha::Number::Price->new( $value )->format_for_editing + : Koha::Number::Price->new( $value )->format; } 1; diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl index 119884a..9ad0a2c 100755 --- a/admin/aqbudgetperiods.pl +++ b/admin/aqbudgetperiods.pl @@ -58,8 +58,6 @@ use C4::Acquisition; use C4::Budgets; use C4::Debug; -use Koha::Number::Price; - my $dbh = C4::Context->dbh; my $input = new CGI; @@ -107,9 +105,6 @@ if ( $op eq 'add_form' ) { my $budgetperiod_hash=GetBudgetPeriod($budget_period_id); # get dropboxes - $budgetperiod_hash->{budget_period_total} = - Koha::Number::Price->new( $budgetperiod_hash->{budget_period_total} ) - ->format; $template->param( %$budgetperiod_hash ); diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl index 8d3f3e8..775a6ec 100755 --- a/admin/aqbudgets.pl +++ b/admin/aqbudgets.pl @@ -130,7 +130,6 @@ if ($op eq 'add_form') { $dropbox_disabled = BudgetHasChildren($budget_id); my $borrower = &GetMember( borrowernumber=>$budget->{budget_owner_id} ); $budget->{budget_owner_name} = ( $borrower ? $borrower->{'firstname'} . ' ' . $borrower->{'surname'} : '' ); - $$budget{$_}= sprintf("%.2f", $budget->{$_}) for grep{ /amount|encumb|expend/ } keys %$budget; } # build budget hierarchy diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index a0a811a..6e78916 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -1,5 +1,4 @@ [% USE KohaDates %] -[% USE format %] [% USE Price %] [%- BLOCK action_menu %] @@ -360,7 +359,7 @@ + size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 %]" />
  • @@ -498,7 +497,7 @@ [% IF r.orders_moved.size > 0 %] [% FOR order IN r.orders_moved %] - [% r.budget.budget_name %] (id=[% r.budget.budget_id %]) Amount=[% r.budget.budget_amount | format ("%.2f") %][% IF r.unspent_moved %] ([% r.unspent_moved | format ("%.2f")%] remaining has been moved)[% END %] + [% r.budget.budget_name %] (id=[% r.budget.budget_id %]) Amount=[% r.budget.budget_amount | $Price %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price %] remaining has been moved)[% END %] [% order.basketname %] [% order.ordernumber %] Moved! @@ -515,7 +514,7 @@ [% ELSE %] [% IF r.error == 'budget_code_not_exists' %] - [% r.budget.budget_id %] [% r.budget.budget_amount | format ("%.2f") %][% IF r.unspent_moved %] ([% r.unspent_moved | format ("%.2f") %] remaining has been moved)[% END %] + [% r.budget.budget_id %] [% r.budget.budget_amount | $Price %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price %] remaining has been moved)[% END %] This fund code does not exist in the destination budget. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index 2adf469..a73dd57 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -449,18 +449,18 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
  • - +
  • - + 0 to disable
  • - + 0 to disable
    • -- 2.1.0