Merge pull request #191 from vtex-apps/fix/duplicated-number

Puerto Rico country rules + address form duplicated number
vtex-apps · Apr 13, 2023 · 3f81cf9 · 3f81cf9
2 parents f2efb08 + 876498d
commit 3f81cf9
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+- Puerto Rico country rules
+
+### Fixed
+
+- address form duplicated number
+
 ## [0.9.2] - 2023-04-07
 
 ### Fixed

diff --git a/checkout-ui-custom/checkout6-custom.css b/checkout-ui-custom/checkout6-custom.css
diff --git a/checkout-ui-custom/checkout6-custom.js b/checkout-ui-custom/checkout6-custom.js
diff --git a/checkout-ui-custom/src/_js/_countries.js b/checkout-ui-custom/src/_js/_countries.js
@@ -490,6 +490,13 @@ module.exports._countriesrules = {
     number: false,
     postalCode: true,
   },
+  PRI: {
+    state: 'administrative_area_level_1',
+    city: 'administrative_are_level_2',
+    neighborhood: 'locality',
+    number: false,
+    postalCode: true,
+  },
 }
 
 // _countries.find(i=>i[0]=="US")

diff --git a/checkout-ui-custom/src/_js/_customAddressForm.js b/checkout-ui-custom/src/_js/_customAddressForm.js
@@ -93,7 +93,7 @@ class fnsCustomAddressForm {
     geoCoordinates = ''
   ) {
     $('.vcustom--vtex-omnishipping-1-x-address #v-custom-ship-street').val(
-      formattedStreet || street
+      'number' in this.addressrules ? street : formattedStreet || street
     )
     $('.vcustom--vtex-omnishipping-1-x-address #ship-complement').val(
       complement
@@ -105,11 +105,11 @@ class fnsCustomAddressForm {
     )
     $('.vcustom--vtex-omnishipping-1-x-address #v-custom-ship-street').attr(
       'data-street',
-      formattedStreet || street
+      'number' in this.addressrules ? street : formattedStreet || street
     )
     $('.vcustom--vtex-omnishipping-1-x-address #v-custom-ship-street').attr(
       'data-number',
-      number
+      'number' in this.addressrules ? number : null
     )
     $('.vcustom--vtex-omnishipping-1-x-address #v-custom-ship-street').attr(
       'data-neighborhood',

diff --git a/checkout-ui-custom/src/_js/_v.custom.checkout.ui.js b/checkout-ui-custom/src/_js/_v.custom.checkout.ui.js
@@ -961,6 +961,7 @@ class checkoutCustom {
 
     if (
       window.location.hash === '#/payment' &&
+      orderForm.shippingData.address &&
       orderForm.shippingData.address.addressType !== 'search' &&
       orderForm.shippingData.address.street === null &&
       _this.customAddressForm

diff --git a/node/templates/checkout6-custom.css b/node/templates/checkout6-custom.css
diff --git a/node/templates/checkout6-custom.js b/node/templates/checkout6-custom.js