add more currency display type

pkg/models/currency.go

@@ -7,15 +7,17 @@ type CurrencyDisplayType byte
 
 // Currency Display Type
 const (
-	CURRENCY_DISPLAY_TYPE_DEFAULT              CurrencyDisplayType = 0
+	CURRENCY_DISPLAY_TYPE_DEFAULT                            CurrencyDisplayType = 0
-	CURRENCY_DISPLAY_TYPE_NONE                 CurrencyDisplayType = 1
+	CURRENCY_DISPLAY_TYPE_NONE                               CurrencyDisplayType = 1
-	CURRENCY_DISPLAY_TYPE_SYMBOL_BEFORE_AMOUNT CurrencyDisplayType = 2
+	CURRENCY_DISPLAY_TYPE_SYMBOL_BEFORE_AMOUNT               CurrencyDisplayType = 2
-	CURRENCY_DISPLAY_TYPE_SYMBOL_AFTER_AMOUNT  CurrencyDisplayType = 3
+	CURRENCY_DISPLAY_TYPE_SYMBOL_AFTER_AMOUNT                CurrencyDisplayType = 3
-	CURRENCY_DISPLAY_TYPE_CODE_BEFORE_AMOUNT   CurrencyDisplayType = 4
+	CURRENCY_DISPLAY_TYPE_SYMBOL_BEFORE_AMOUNT_WITHOUT_SPACE CurrencyDisplayType = 4
-	CURRENCY_DISPLAY_TYPE_CODE_AFTER_AMOUNT    CurrencyDisplayType = 5
+	CURRENCY_DISPLAY_TYPE_SYMBOL_AFTER_AMOUNT_WITHOUT_SPACE  CurrencyDisplayType = 5
-	CURRENCY_DISPLAY_TYPE_NAME_BEFORE_AMOUNT   CurrencyDisplayType = 6
+	CURRENCY_DISPLAY_TYPE_CODE_BEFORE_AMOUNT                 CurrencyDisplayType = 6
-	CURRENCY_DISPLAY_TYPE_NAME_AFTER_AMOUNT    CurrencyDisplayType = 7
+	CURRENCY_DISPLAY_TYPE_CODE_AFTER_AMOUNT                  CurrencyDisplayType = 7
-	CURRENCY_DISPLAY_TYPE_INVALID              CurrencyDisplayType = 255
+	CURRENCY_DISPLAY_TYPE_NAME_BEFORE_AMOUNT                 CurrencyDisplayType = 8
+	CURRENCY_DISPLAY_TYPE_NAME_AFTER_AMOUNT                  CurrencyDisplayType = 9
+	CURRENCY_DISPLAY_TYPE_INVALID                            CurrencyDisplayType = 255
 )
 
 // String returns a textual representation of the currency display type enum
@@ -29,6 +31,10 @@ func (d CurrencyDisplayType) String() string {
 		return "Symbol Before Amount"
 	case CURRENCY_DISPLAY_TYPE_SYMBOL_AFTER_AMOUNT:
 		return "Symbol After Amount"
+	case CURRENCY_DISPLAY_TYPE_SYMBOL_BEFORE_AMOUNT_WITHOUT_SPACE:
+		return "Symbol Before Amount Without Space"
+	case CURRENCY_DISPLAY_TYPE_SYMBOL_AFTER_AMOUNT_WITHOUT_SPACE:
+		return "Symbol After Amount Without Space"
 	case CURRENCY_DISPLAY_TYPE_CODE_BEFORE_AMOUNT:
 		return "Code Before Amount"
 	case CURRENCY_DISPLAY_TYPE_CODE_AFTER_AMOUNT:

pkg/models/user.go

@@ -153,7 +153,7 @@ type UserProfileUpdateRequest struct {
 	DecimalSeparator     *DecimalSeparator     `json:"decimalSeparator" binding:"omitempty,min=0,max=3"`
 	DigitGroupingSymbol  *DigitGroupingSymbol  `json:"digitGroupingSymbol" binding:"omitempty,min=0,max=4"`
 	DigitGrouping        *DigitGroupingType    `json:"digitGrouping" binding:"omitempty,min=0,max=2"`
-	CurrencyDisplayType  *CurrencyDisplayType  `json:"currencyDisplayType" binding:"omitempty,min=0,max=7"`
+	CurrencyDisplayType  *CurrencyDisplayType  `json:"currencyDisplayType" binding:"omitempty,min=0,max=9"`
 }
 
 // UserProfileUpdateResponse represents the data returns to frontend after updating profile

src/consts/currency.js

@@ -674,29 +674,43 @@ const allCurrencyDisplayType = {
         location: allCurrencyDisplayLocation.AfterAmount,
         separator: ' '
     },
-    CodeBeforeAmount: {
+    SymbolBeforeAmountWithoutSpace: {
         type: 4,
+        name: 'Currency Symbol',
+        symbol: allCurrencyDisplaySymbol.Symbol,
+        location: allCurrencyDisplayLocation.BeforeAmount,
+        separator: ''
+    },
+    SymbolAfterAmountWithoutSpace: {
+        type: 5,
+        name: 'Currency Symbol',
+        symbol: allCurrencyDisplaySymbol.Symbol,
+        location: allCurrencyDisplayLocation.AfterAmount,
+        separator: ''
+    },
+    CodeBeforeAmount: {
+        type: 6,
         name: 'Currency Code',
         symbol: allCurrencyDisplaySymbol.Code,
         location: allCurrencyDisplayLocation.BeforeAmount,
         separator: ' '
     },
     CodeAfterAmount: {
-        type: 5,
+        type: 7,
         name: 'Currency Code',
         symbol: allCurrencyDisplaySymbol.Code,
         location: allCurrencyDisplayLocation.AfterAmount,
         separator: ' '
     },
     NameBeforeAmount: {
-        type: 6,
+        type: 8,
         name: 'Currency Name',
         symbol: allCurrencyDisplaySymbol.Name,
         location: allCurrencyDisplayLocation.BeforeAmount,
         separator: ' '
     },
     NameAfterAmount: {
-        type: 7,
+        type: 9,
         name: 'Currency Name',
         symbol: allCurrencyDisplaySymbol.Name,
         location: allCurrencyDisplayLocation.AfterAmount,
@@ -708,6 +722,8 @@ const allCurrencyDisplayTypeArray = [
     allCurrencyDisplayType.None,
     allCurrencyDisplayType.SymbolBeforeAmount,
     allCurrencyDisplayType.SymbolAfterAmount,
+    allCurrencyDisplayType.SymbolBeforeAmountWithoutSpace,
+    allCurrencyDisplayType.SymbolAfterAmountWithoutSpace,
     allCurrencyDisplayType.CodeBeforeAmount,
     allCurrencyDisplayType.CodeAfterAmount,
     allCurrencyDisplayType.NameBeforeAmount,
@@ -718,6 +734,8 @@ const allCurrencyDisplayTypeMap = {
     [allCurrencyDisplayType.None.type]: allCurrencyDisplayType.None,
     [allCurrencyDisplayType.SymbolBeforeAmount.type]: allCurrencyDisplayType.SymbolBeforeAmount,
     [allCurrencyDisplayType.SymbolAfterAmount.type]: allCurrencyDisplayType.SymbolAfterAmount,
+    [allCurrencyDisplayType.SymbolBeforeAmountWithoutSpace.type]: allCurrencyDisplayType.SymbolBeforeAmountWithoutSpace,
+    [allCurrencyDisplayType.SymbolAfterAmountWithoutSpace.type]: allCurrencyDisplayType.SymbolAfterAmountWithoutSpace,
     [allCurrencyDisplayType.CodeBeforeAmount.type]: allCurrencyDisplayType.CodeBeforeAmount,
     [allCurrencyDisplayType.CodeAfterAmount.type]: allCurrencyDisplayType.CodeAfterAmount,
     [allCurrencyDisplayType.NameBeforeAmount.type]: allCurrencyDisplayType.NameBeforeAmount,