vuestorefront#2593 - Payment - fixed issue when no address set

szafran89 · Mar 21, 2019 · f5b06a1 · f5b06a1
1 parent f9c6d10
commit f5b06a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/core/modules/checkout/components/Payment.ts b/core/modules/checkout/components/Payment.ts
@@ -36,7 +36,10 @@ export const Payment = {
     }
   },
   mounted () {
-    if (this.payment.firstName.length === 0) {
+    if (
+      this.payment.hasOwnProperty('firstName') &&
+      this.payment.firstName.length === 0
+    ) {
       this.initializeBillingAddress()
     } else {
       if (this.payment.company) {

diff --git a/core/pages/Category.js b/core/pages/Category.js
@@ -87,7 +87,7 @@ export default {
       const defaultFilters = store.state.config.products.defaultFilters
       store.dispatch('category/resetFilters')
       EventBus.$emit('filter-reset')
-      
+
       await store.dispatch('category/list', { level: store.state.config.entities.category.categoriesDynamicPrefetch && store.state.config.entities.category.categoriesDynamicPrefetchLevel ? store.state.config.entities.category.categoriesDynamicPrefetchLevel : null, includeFields: store.state.config.entities.optimize && Vue.prototype.$isServer ? store.state.config.entities.category.includeFields : null })
       await store.dispatch('attribute/list', { // load filter attributes for this specific category
         filterValues: defaultFilters, // TODO: assign specific filters/ attribute codes dynamicaly to specific categories