@ecomplus/storefront-components 1.0.0-beta.193 → 1.0.0-beta.195

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecomplus/storefront-components",
-  "version": "1.0.0-beta.193",
+  "version": "1.0.0-beta.195",
   "description": "Vue components for E-Com Plus Storefront",
   "main": "dist/storefront-components.min.js",
   "scripts": {
@@ -49,5 +49,6 @@
     "vue": "2.6.14",
     "vue-cleave-component": "^2.1.3",
     "vue-social-sharing": "^3.0.9"
-  }
+  },
+  "gitHead": "7bd93207fb4aabba3ee8811f764db781771e227f"
 }

package/src/js/AddressForm.js

@@ -113,37 +113,55 @@ export default {
       }
     },
 
-    fetchAddressInfo (zipCode, isRetry = false) {
+    setAddressFields (zipCode, fields) {
+      if (zipCode === this.localAddress.zip) {
+        fields.forEach(([field, value]) => {
+          this.$set(this.localAddress, field, value || '')
+          this.$set(this.addressFromZip, field, Boolean(value))
+        })
+        this.$nextTick(() => {
+          setTimeout(() => {
+            if (this.$refs.inputNumber) {
+              this.$refs.inputNumber.select()
+            }
+          }, 300)
+        })
+      }
+    },
+
+    fetchAddressInfo (zipCode) {
       if (zipCode === this.localAddress.zip) {
         this.zipLoading = zipCode
-        axios.get(`https://viacep.com.br/ws/${zipCode}/json/`, { timeout: 4000 })
+        axios.get(`https://brasilapi.com.br/api/cep/v2/${zipCode}`, { timeout: 4000 })
           .then(({ data }) => {
-            if (!data.erro && zipCode === this.localAddress.zip) {
-              ;[
-                ['province_code', data.uf],
-                ['city', data.localidade],
-                ['borough', data.bairro],
-                ['street', data.logradouro]
-              ].forEach(([field, value]) => {
-                this.$set(this.localAddress, field, value || '')
-                this.$set(this.addressFromZip, field, Boolean(value))
-              })
-              this.$nextTick(() => {
-                setTimeout(() => {
-                  if (this.$refs.inputNumber) {
-                    this.$refs.inputNumber.select()
-                  }
-                }, 300)
-              })
-            }
+            this.setAddressFields(zipCode, [
+              ['province_code', data.state],
+              ['city', data.city],
+              ['borough', data.neighborhood],
+              ['street', data.street]
+            ])
           })
           .catch(err => {
             console.error(err)
-            if (!isRetry) {
-              setTimeout(() => {
-                this.fetchAddressInfo(zipCode, true)
-              }, 300)
-            }
+            setTimeout(() => {
+              axios.get(`https://viacep.com.br/ws/${zipCode}/json/`, { timeout: 4000 })
+                .then(({ data }) => {
+                  if (!data.erro) {
+                    this.setAddressFields(zipCode, [
+                      ['province_code', data.uf],
+                      ['city', data.localidade],
+                      ['borough', data.bairro],
+                      ['street', data.logradouro]
+                    ])
+                  }
+                })
+                .catch(e => console.error(e))
+                .finally(() => {
+                  if (zipCode === this.zipLoading) {
+                    this.zipLoading = null
+                  }
+                })
+            }, 300)
           })
           .finally(() => {
             if (zipCode === this.zipLoading) {

package/src/js/InputDocNumber.js

@@ -22,37 +22,40 @@ export default {
       type: [String, Number],
       required: true
     },
-    isCompany: Boolean
+    isCompany: Boolean,
+    allowBoth: Boolean
   },
 
   computed: {
     placeholder () {
-      return countryCode === 'BR'
-        ? this.isCompany
-          ? 'CNPJ'
-          : 'CPF'
-        : i18n(i19docNumber)
+      if (countryCode === 'BR') {
+        if (this.allowBoth) return 'CPF / CNPJ'
+        return this.isCompany ? 'CNPJ' : 'CPF'
+      }
+      return i18n(i19docNumber)
     },
 
     pattern () {
       if (countryCode === 'BR') {
-        if (this.isCompany) {
-          return '[\\d]{2}\\..{15}'
-        } else {
-          return '[\\d]{3}\\..{10}'
-        }
+        if (this.allowBoth) return '[\\d]{11}|[\\d]{14}'
+        if (this.isCompany) return '[\\d]{2}\\..{15}'
+        return '[\\d]{3}\\..{10}'
       }
       return '[\\d]+{9,19}'
     },
 
     isInvalid () {
       if (countryCode === 'BR') {
-        const docNumber = this.localValue.toString().replace(/D/g, '')
+        const docNumber = this.localValue.toString().replace(/\D/g, '')
+        if (this.allowBoth) {
+          if (docNumber.length === 11) return !validateCPF(this.localValue)
+          if (docNumber.length === 14) return !validateCNPJ(this.localValue)
+          return false
+        }
+        const docNumberLegacy = this.localValue.toString().replace(/D/g, '')
         if (this.isCompany) {
-          if (docNumber.length === 14) {
-            return !validateCNPJ(this.localValue)
-          }
-        } else if (docNumber.length === 11) {
+          if (docNumberLegacy.length === 14) return !validateCNPJ(this.localValue)
+        } else if (docNumberLegacy.length === 11) {
           return !validateCPF(this.localValue)
         }
       }
@@ -69,6 +72,7 @@ export default {
     },
 
     cleaveOptions () {
+      if (this.allowBoth) return { blocks: [30] }
       return countryCode === 'BR'
         ? this.isCompany
           ? { blocks: [2, 3, 3, 4, 2], delimiters: ['.', '.', '/', '-'] }