kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix rounding of custom-formatted negative amounts

Browse source 
closes #39349
This commit is contained in:
Jannosch Müller 2020-05-19 13:33:28 +02:00
parent 1ab0e6b6d8
commit 31575b39ca
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
activesupport/lib/active_support/number_helper/number_to_currency_converter.rb
View file

@ -9,16 +9,12 @@ module ActiveSupport
def convert
number = self.number.to_s.strip
number_f = number.to_f
format = options[:format]
if number_f.negative?
number = number_f.abs
unless options[:precision] == 0 && number < 0.5
if number.sub!(/^-/, "") &&
(options[:precision] != 0 || number.to_f > 0.5)
format = options[:negative_format]
end
end
rounded_number = NumberToRoundedConverter.convert(number, options)
format.gsub("%n", rounded_number).gsub("%u", options[:unit])

6
activesupport/test/number_helper_test.rb
View file

@ -79,6 +79,12 @@ module ActiveSupport
assert_equal("1,234,567,890.50 - K&#269;", number_helper.number_to_currency("-1234567890.50", unit: "K&#269;", format: "%n %u", negative_format: "%n - %u"))
assert_equal("0.00", number_helper.number_to_currency(+0.0, unit: "", negative_format: "(%n)"))
assert_equal("$0", number_helper.number_to_currency(-0.456789, precision: 0))
assert_equal("$1,11", number_helper.number_to_currency("1,11"))
assert_equal("$0,11", number_helper.number_to_currency("0,11"))
assert_equal("$,11", number_helper.number_to_currency(",11"))
assert_equal("-$1,11", number_helper.number_to_currency("-1,11"))
assert_equal("-$0,11", number_helper.number_to_currency("-0,11"))
assert_equal("-$,11", number_helper.number_to_currency("-,11"))
end
end