fix(addesses): check address properties to select

ecomplus · May 21, 2020 · 430c7c5 · 430c7c5
1 parent ff72116
commit 430c7c5
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/@ecomplus/storefront-app/src/components/js/EcAddresses.js b/@ecomplus/storefront-app/src/components/js/EcAddresses.js
@@ -173,14 +173,22 @@ export default {
         }
       }
     } else {
-      let address
+      let addressIndex
       if (this.zipCode) {
-        address = this.addresses.find(addr => addr.zip === this.zipCode)
+        addressIndex = this.addresses.findIndex(addr => addr.zip === this.zipCode)
       }
-      if (!address) {
-        address = this.addresses.find(addr => addr.default) || this.addresses[0]
+      if (!(addressIndex >= 0)) {
+        addressIndex = this.addresses.findIndex(addr => addr.default)
+        if (addressIndex === -1) {
+          addressIndex = 0
+        }
+      }
+      const address = this.addresses[addressIndex]
+      if (address.name && address.street && address.city) {
+        this.selectAddress(address)
+      } else {
+        this.editedAddressIndex = addressIndex
       }
-      this.selectAddress(address)
     }
   }
 }