@designcrowd/fe-shared-lib 1.2.17-free-label-fix → 1.2.17-ml-currency

package/src/atoms/components/Price/Price.fixtures.js

@@ -14,12 +14,72 @@ export const audCurrency = {
   abbreviation: 'AU',
 };
 
+export const gbpCurrency = {
+  id: 3,
+  name: 'British Pound',
+  iso4127Code: 'GBP',
+  symbol: '£',
+  abbreviation: 'UK',
+};
+
 export const euroCurrency = {
-  id: 999,
+  id: 4,
   name: 'Euro',
   iso4127Code: 'EUR',
   symbol: '€',
   abbreviation: 'EU',
 };
 
-export const currencies = [usdCurrency, audCurrency, euroCurrency];
+export const inrCurrency = {
+  id: 5,
+  name: 'Indian Rupee',
+  iso4127Code: 'INR',
+  symbol: '₹',
+  abbreviation: 'IN',
+};
+
+export const phpCurrency = {
+  id: 6,
+  name: 'Philippine Peso',
+  iso4127Code: 'PHP',
+  symbol: '₱',
+  abbreviation: 'PH',
+};
+
+export const brlCurrency = {
+  id: 7,
+  name: 'Brazilian Real',
+  iso4127Code: 'BRL',
+  symbol: 'R$',
+  abbreviation: 'R',
+};
+
+export const mxnCurrency = {
+  id: 8,
+  name: 'Mexican Peso',
+  iso4127Code: 'MXN',
+  symbol: 'MX$',
+  abbreviation: 'MX',
+};
+
+export const zarCurrency = {
+  id: 9,
+  name: 'South African Rand',
+  iso4127Code: 'ZAR',
+  symbol: 'R',
+  abbreviation: 'R',
+};
+
+export const currencies = [
+  usdCurrency,
+  audCurrency,
+  gbpCurrency,
+  euroCurrency,
+  inrCurrency,
+  phpCurrency,
+  brlCurrency,
+  mxnCurrency,
+  zarCurrency,
+];
+
+export const locales = [ 'en_US', 'fr_FR', 'es_ES', 'pt_PT', 'de-DE']

package/src/atoms/components/Price/Price.stories.js

@@ -1,5 +1,8 @@
 import Price from './Price.vue';
-import { currencies } from './Price.fixtures';
+import { currencies, locales } from './Price.fixtures';
+import {setSharedLibLocaleAsync} from "../../../useSharedLibTranslate";
+
+await setSharedLibLocaleAsync();
 
 // noinspection JSUnusedGlobalSymbols
 export default {
@@ -7,6 +10,7 @@ export default {
   component: Price,
   args: {
     currencyName: currencies[0].name,
+    locale: locales[0]
   },
   argTypes: {
     amount: {
@@ -16,6 +20,10 @@ export default {
       control: { type: 'select' },
       options: currencies.map((x) => x.name),
     },
+    locale: {
+      control: { type: 'select' },
+      options: locales,
+    },
   },
 };
 
@@ -31,12 +39,16 @@ export const Sample = {
         selectedCurrency() {
           return currencies.find((x) => x.name === this.args.currencyName);
         },
+        selectedLocale() {
+          return locales.find((x) => x === this.args.locale);
+        },
       },
       template: `
       <span>
         <price 
             v-bind="args"
             :currency="selectedCurrency"
+            :locale="selectedLocale"
         />
       </span>
     `,
@@ -59,6 +71,9 @@ export const WithFraction = {
         selectedCurrency() {
           return currencies.find((x) => x.name === this.args.currencyName);
         },
+        selectedLocale() {
+          return locales.find((x) => x === this.args.locale);
+        },
       },
       template: `
       <span>
@@ -66,7 +81,7 @@ export const WithFraction = {
             v-bind="args"
             :currency="selectedCurrency"
             fraction="2"
-            :show-abbreviation="true"
+            :locale="selectedLocale"
         />
       </span>
     `,
@@ -89,6 +104,9 @@ export const AlwaysShowFractionOn = {
         selectedCurrency() {
           return currencies.find((x) => x.name === this.args.currencyName);
         },
+        selectedLocale() {
+          return locales.find((x) => x === this.args.locale);
+        },
       },
       template: `
       <span>
@@ -97,7 +115,7 @@ export const AlwaysShowFractionOn = {
             :always-show-fraction="true"
             :currency="selectedCurrency"
             fraction="2"
-            :show-abbreviation="true"
+            :locale="selectedLocale"
         />
       </span>
     `,
@@ -128,7 +146,7 @@ export const AlwaysShowFractionOff = {
             :always-show-fraction="false"
             :currency="selectedCurrency"
             fraction="2"
-            :show-abbreviation="true"
+            :locale="selectedLocale"
           />
       </span>
     `,
@@ -151,6 +169,9 @@ export const WithSuffix = {
         selectedCurrency() {
           return currencies.find((x) => x.name === this.args.currencyName);
         },
+        selectedLocale() {
+          return locales.find((x) => x === this.args.locale);
+        },
       },
       template: `
       <span>
@@ -159,8 +180,8 @@ export const WithSuffix = {
             :always-show-fraction="true"
             :currency="selectedCurrency"
             fraction="2"
-            :show-abbreviation="true"
             :suffix="suffix"
+            :locale="selectedLocale"
           />
       </span>
     `,
@@ -171,3 +192,35 @@ export const WithSuffix = {
     suffix: '/yr',
   },
 };
+
+export const WithLocale = {
+  render: (args, { argTypes }) => {
+    return {
+      components: { Price },
+      props: Object.keys(argTypes),
+      setup() {
+        return { args };
+      },
+      computed: {
+        selectedCurrency() {
+          return currencies.find((x) => x.name === this.args.currencyName);
+        },
+        selectedLocale() {
+          return locales.find((x) => x === this.args.locale);
+        },
+      },
+      template: `
+      <span>
+        <price
+            v-bind="args"
+            :currency="selectedCurrency"
+            :locale="selectedLocale"
+        />
+      </span>
+    `,
+    };
+  },
+  args: {
+    amount: 22.0,
+  },
+};

package/src/atoms/components/Price/Price.vue

@@ -5,7 +5,8 @@
   </span>
 </template>
 <script>
-import { priceTr } from '../../../useSharedLibTranslate';
+
+import { priceTr, formatCurrency } from "../../../useSharedLibTranslate";
 
 export default {
   props: {
@@ -24,6 +25,11 @@ export default {
       required: false,
       default: null,
     },
+    locale: {
+      type: String,
+      required: false,
+      default: null,
+    },
     fraction: {
       type: [Number, String],
       required: false,
@@ -36,7 +42,7 @@ export default {
     },
     wrapInParentheses: {
       type: Boolean,
-      required: false,
+      requred: false,
       default: false,
     },
     suffix: {
@@ -50,13 +56,13 @@ export default {
       default: false,
     },
   },
+  data() {
+    return {
+      domainCreditUsed: priceTr('domainCreditUsed') ?? 'Domain credit used',
+      free: priceTr('free') ?? 'Free',
+    };
+  },
   computed: {
-    domainCreditUsed() {
-      return priceTr('domainCreditUsed') ?? 'Domain credit used';
-    },
-    free() {
-      return priceTr('free') ?? 'Free';
-    },
     amountFormatted() {
       if (this.isDomainCredit) {
         return this.domainCreditUsed;
@@ -66,6 +72,21 @@ export default {
         return this.free;
       }
 
+      if (this.locale != null)
+      {
+        const formattedCurrency = formatCurrency(
+          this.amount,
+          this.locale,
+          this.currency,
+          this.fraction,
+          this.showAbbreviation
+        );
+        
+        if (formattedCurrency) {
+          return formattedCurrency;
+        }
+      }
+
       const parsedAmount = Number.parseFloat(this.amount);
 
       if (Number.isNaN(parsedAmount)) {
@@ -81,10 +102,10 @@ export default {
       return parsedAmount.toFixed(this.fraction);
     },
     currencyAbbreviation() {
-      return this.showAbbreviation && this.amount > 0 ? this.currency?.abbreviation?.trim() : '';
+      return this.showAbbreviation && this.amount && !this.locale > 0 ? this.currency?.abbreviation?.trim() : '';
     },
     currencySymbol() {
-      if (!this.amount || this.amount === 0) {
+      if (!this.amount || this.amount === 0 || this.locale) {
         return '';
       }
 

package/src/useSharedLibTranslate.js

@@ -67,6 +67,42 @@ const getCurrentLocale = () => {
   return i18next.language || 'en-US';
 };
 
+const formatCurrency = (amount, locale, currency, fraction = 0, showAbbreviation = false) => {
+  let localeAmount = i18next.t('{{val, currency}}', {
+    ns: 'fe-shared-lib',
+    val: amount,
+    currency: currency.iso4127Code,
+    locale: locale,
+    maximumFractionDigits: fraction,
+    useGrouping: false,
+  });
+
+  // i18next always uses iso code for ZAR, prefer symbol over iso code
+  if (localeAmount.includes(currency.iso4127Code)) {
+    return localeAmount.replace(currency.iso4127Code, currency.symbol);
+  }
+
+  // show abbreviation locale logic
+  // note: showAbbreviaton is only passed as true for symbol = "$"
+  if (currency.symbol != '$') {
+    return localeAmount;
+  }
+
+  // AUD edge case for en_US
+  if (currency.iso4127Code == 'AUD') {
+    localeAmount = localeAmount.replace('A$', currency.symbol);
+  }
+
+  if (showAbbreviation && !localeAmount.includes(currency.abbreviation)) {
+    return `${currency?.abbreviation}${localeAmount}`;
+  
+  } else if (!showAbbreviation && localeAmount.includes(currency.abbreviation)) {
+    return localeAmount.replace(currency.abbreviation, '');
+  }
+
+  return localeAmount;
+}
+
 export {
   setSharedLibLocaleAsync,
   getCurrentLocale,
@@ -81,4 +117,5 @@ export {
   uploadYourLogoTr,
   sharedPaymentConfigTr,
   priceTr,
+  formatCurrency,
 };

package/.claude/settings.local.json

@@ -1,10 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(npm config:*)",
-      "Bash(ls:*)",
-      "Bash(npm run build:*)"
-    ],
-    "deny": []
-  }
-}