fix(currency): Handling default currency of NONE

bullhorn · Jan 30, 2018 · 9f4c4f7 · 9f4c4f7
2 parents 02173f6 + 52d9d89
commit 9f4c4f7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/lib/currency-overrides.ts b/src/lib/currency-overrides.ts
@@ -6,4 +6,4 @@ export const currencyOverridesMap = {
     SEK: 'kr',
     NOK: 'kr',
     ZAR: 'R'
-};
+};
diff --git a/src/lib/formats.spec.ts b/src/lib/formats.spec.ts
@@ -202,6 +202,12 @@ test('currency should use the override currency if set', t => {
     t.is(t.context.formats.formatCurrency(123456.789), 'RUB123,456.79');
 });
 
+test('currency should be able to format with currency format of None', t => {
+    t.context.formats.setLocale('en-US');
+    t.context.formats.overrideCurrency = 'None';
+    t.is(t.context.formats.formatCurrency(123456.789), '123,456.79');
+});
+
 // formatDate(value, format)
 
 test('formatDate should default to en-US for unknown locale', t => {

diff --git a/src/lib/formats.ts b/src/lib/formats.ts
@@ -1,5 +1,5 @@
 import { mergeDeep } from './object-assign-deep';
-import { currencyOverridesMap } from './currency-overrides'
+import { currencyOverridesMap } from './currency-overrides';
 
 // Interface for defaults
 export interface IFormatDefaults {
@@ -55,6 +55,9 @@ export class Formats {
         let _format: Intl.NumberFormatOptions = (typeof format === 'string') ? mergeDeep({}, { currency: format }, this.defaults.currency) : mergeDeep({}, format, this.defaults.currency);
         let options = mergeDeep({ style: 'currency', currency: 'USD' }, _format);
         if (this.overrideCurrency) {
+            if (this.overrideCurrency === 'None') {
+                return new Intl.NumberFormat([this.locale, 'en-US'], {minimumFractionDigits: 2, maximumFractionDigits: 2}).format(value);
+            }
             options.currency = this.overrideCurrency;
         }