#68 - watch shipping address data

SnowdogApps · Dec 21, 2018 · e5379a9 · e5379a9
1 parent 573549e
commit e5379a9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/view/frontend/web/js/components/ShippingAddressForm.vue b/view/frontend/web/js/components/ShippingAddressForm.vue
@@ -177,18 +177,34 @@ export default {
     },
     ready () {
       return !this.$v.address.$invalid
+    },
+    addressData () {
+      if (this.$store.state.shippingAddress !== null) {
+        return this.$store.getters.addressByType('shippingAddress')
+      } else {
+        return null
+      }
     }
   },
   watch: {
     ready (val) {
-      if (val) {
-        this.$store.commit(
-          'setAddress',
-          { type: 'shippingAddress', address: this.address }
-        )
-      }
-
       this.$emit('ready', val)
+    },
+    address: {
+      handler () {
+        if (this.ready) {
+          this.$store.commit(
+            'setAddress',
+            { type: 'shippingAddress', address: this.address }
+          )
+        }
+      },
+      deep: true
+    }
+  },
+  created () {
+    if (this.addressData !== null) {
+      this.address = this.addressData
     }
   },
   methods: {
@@ -219,4 +235,3 @@ export default {
     }
   }
 </style>
-
diff --git a/view/frontend/web/js/components/steps/TheShippingStep.vue b/view/frontend/web/js/components/steps/TheShippingStep.vue
@@ -11,6 +11,7 @@
         @ready="isReady => customerEmailReadyToSubmit = isReady"
       />
       <ShippingAddressForm
+        v-if="!isCustomerLoggedIn"
         ref="shippingsAddressForm"
         @ready="isReady => shippingAddressReadyToSubmit = isReady"
       />
@@ -67,7 +68,7 @@ export default {
 
       if (
         !this.shippingAddressReadyToSubmit ||
-        !this.shippingMethodsReadyToSubmit ||
+        (!this.isCustomerLoggedIn && !this.shippingMethodsReadyToSubmit) ||
         (!this.isCustomerLoggedIn && !this.customerEmailReadyToSubmit)
       ) {
         return