vuestorefront#2810 fix using the wrong import; using store getters fo…

…r orders history items
Hackbard · May 24, 2019 · 4fc3111 · 4fc3111
1 parent 02f7b48
commit 4fc3111
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/core/modules/order/components/UserOrders.ts b/core/modules/order/components/UserOrders.ts
@@ -1,3 +1,4 @@
+import { mapGetters } from 'vuex';
 
 /**
  * Component responsible for displaying user orders. Requires User module.
@@ -6,13 +7,14 @@ export const UserOrders = {
   name: 'UserOrders',
   computed: {
     ordersHistory () {
-      return this.$store.state.user.orders_history.items
+      return this.ordersHistoryItems()
     },
     isHistoryEmpty () {
-      return this.$store.state.user.orders_history.items.length < 1
+      return this.ordersHistoryItems().length < 1
     }
   },
   methods: {
+    ...mapGetters('user', ['ordersHistoryItems']),
     remakeOrder (products) {
       products.forEach(item => {
         this.$store.dispatch('product/single', { options: { sku: item.sku }, setCurrentProduct: false, selectDefaultVariant: false }).then((product) => {

diff --git a/core/modules/user/store/getters.ts b/core/modules/user/store/getters.ts
@@ -9,6 +9,9 @@ const getters: GetterTree<UserState, RootState> = {
   isLocalDataLoaded: state => state.local_data_loaded,
   getUserToken (state) {
     return state.token
+  },
+  ordersHistoryItems (state) {
+    return state.orders_history.items
   }
 }
 

diff --git a/src/modules/order-history/components/UserOrders.ts b/src/modules/order-history/components/UserOrders.ts
@@ -1,9 +1,10 @@
 import { isServer, bottomVisible } from '@vue-storefront/core/helpers'
-import MyOrder from '@vue-storefront/core/compatibility/components/blocks/MyAccount/MyOrder'
+import MyOrders from '@vue-storefront/core/compatibility/components/blocks/MyAccount/MyOrders'
+import { mapGetters } from 'vuex';
 
 export default {
   name: 'UserOrders',
-  mixins: [MyOrder],
+  mixins: [MyOrders],
   data () {
     return {
       pagination: {
@@ -31,15 +32,11 @@ export default {
   },
   computed: {
     ordersHistory () {
-      let items = []
-      items = this.$store.state.user.orders_history.items
+      let items = this.ordersHistoryItems()
       if (!isServer && this.lazyLoadOrdersOnscroll) {
         items = this.paginate(items, this.pagination.perPage, this.pagination.current)
       }
       return items
-    },
-    isHistoryEmpty () {
-      return this.$store.state.user.orders_history.items.length < 1
     }
   },
   methods: {