Merge branch 'strip-dollar-sign' into ep-upgrade-stage

CruGlobal · Oct 25, 2023 · 4ea6dd5 · 4ea6dd5
2 parents bb6392c + 13c2e86
commit 4ea6dd5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/app/productConfig/productConfigForm/productConfigForm.component.js b/src/app/productConfig/productConfigForm/productConfigForm.component.js
@@ -363,15 +363,10 @@ class ProductConfigFormController {
   }
 
   transformAmountIfNecessary (amount) {
-    let transformedAmount = amount
     if (!angular.isNumber(amount)) {
-      transformedAmount = amount.replace('$', '')
-      transformedAmount = parseFloat(transformedAmount)
-      if (isNaN(transformedAmount)) {
-        return amount
-      }
+      return amount.replace('$', '')
     }
-    return transformedAmount
+    return amount
   }
 
   displayId () {

diff --git a/src/app/productConfig/productConfigForm/productConfigForm.component.spec.js b/src/app/productConfig/productConfigForm/productConfigForm.component.spec.js
@@ -719,10 +719,13 @@ describe('product config form component', function () {
       it('should transform the amount', () => {
         $ctrl.itemConfig.AMOUNT = '$85'
         $ctrl.itemConfigForm.$dirty = true
+        const overrideArgs = isEdit
+          ? ['uri', 'items/crugive/<some id>', { AMOUNT: '85' }]
+          : ['items/crugive/<some id>', { AMOUNT: '85' }, undefined]
         $ctrl.saveGiftToCart()
 
         expect($ctrl.submittingGift).toEqual(false)
-        expect($ctrl.cartService[operation]).toHaveBeenCalledWith(...operationArgs)
+        expect($ctrl.cartService[operation]).toHaveBeenCalledWith(...overrideArgs)
         expect($ctrl.$scope.$emit).toHaveBeenCalledWith(cartEvent)
         expect($ctrl.onStateChange).toHaveBeenCalledWith({ state: 'submitted' })
         expect($ctrl.errorAlreadyInCart).toEqual(false)
@@ -779,17 +782,22 @@ describe('product config form component', function () {
   describe('transformAmountIfNecessary', () => {
     it('should not change the int amount', () => {
       const amount = '5'
-      expect($ctrl.transformAmountIfNecessary(amount)).toEqual(5)
+      expect($ctrl.transformAmountIfNecessary(amount)).toEqual(amount)
     })
 
     it('should not change the float amount', () => {
       const amount = '5.12'
-      expect($ctrl.transformAmountIfNecessary(amount)).toEqual(5.12)
+      expect($ctrl.transformAmountIfNecessary(amount)).toEqual(amount)
     })
 
     it('should remove the $', () => {
       const amount = '$50'
-      expect($ctrl.transformAmountIfNecessary(amount)).toEqual(50)
+      expect($ctrl.transformAmountIfNecessary(amount)).toEqual('50')
+    })
+
+    it('should not strip other characters', () => {
+      const amount = '23,00'
+      expect($ctrl.transformAmountIfNecessary(amount)).toEqual(amount)
     })
 
     it('should pass through the original amount', () => {