Skip to content
Snippets Groups Projects
Commit ab3eaaf8 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

Fixed wrong format of amount strings

parent aca28625
No related branches found
No related tags found
No related merge requests found
Pipeline #328 passed
...@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.math.RoundingMode;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -59,20 +60,22 @@ public class HelpersService ...@@ -59,20 +60,22 @@ public class HelpersService
public String getCurrencyString(double amount) public String getCurrencyString(double amount)
{ {
return getAmountString(amount) + " " + settingsRepository.findOne(0).getCurrency(); return getAmountString(amount, true) + " " + settingsRepository.findOne(0).getCurrency();
} }
public String getAmountString(int amount) public String getAmountString(int amount)
{ {
return getAmountString(Math.abs(amount) / 100.0); return getAmountString(Math.abs(amount) / 100.0, false);
} }
public String getAmountString(double amount) public String getAmountString(double amount, boolean useGrouping)
{ {
Settings settings = settingsRepository.findOne(0); Settings settings = settingsRepository.findOne(0);
NumberFormat format = NumberFormat.getNumberInstance(settings.getLanguage().getLocale()); NumberFormat format = NumberFormat.getNumberInstance(settings.getLanguage().getLocale());
format.setMaximumFractionDigits(2); format.setMaximumFractionDigits(2);
format.setMinimumFractionDigits(2); format.setMinimumFractionDigits(2);
format.setRoundingMode(RoundingMode.HALF_UP);
format.setGroupingUsed(useGrouping);
return String.valueOf(format.format(amount)); return String.valueOf(format.format(amount));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment