Merge pull request #1702 from pkarw/develop

1.3.0 release

Author: pkarw

core/components/blocks/MyAccount/MyNewsletter.js

@@ -36,7 +36,9 @@ export default {
       this.isEdited = false
     },
     getNewsletter () {
-      this.user.isSubscribed = this.isSubscribed
+      this.$store.dispatch('user/loadNewsletterPreferences').then((res) => {
+        this.user.isSubscribed = res.isSubscribed
+      })
     }
   },
   mixins: [subscribe, unsubscribe, isSubscribed]

core/modules/newsletter/features/isSubscribed.ts

@@ -9,7 +9,7 @@
 export const isSubscribed = {
   computed: {
     isSubscribed () {
-      return this.$store.state.user.newsletter.isSubscribed ? this.$store.state.user.newsletter.isSubscribed : false
+      return this.$store.state.user.newsletter ? (this.$store.state.user.newsletter.isSubscribed ? this.$store.state.user.newsletter.isSubscribed : false) : false
     }
   }
 }

core/store/lib/storage.ts

@@ -25,19 +25,19 @@ class LocalForageCacheDriver {
     if (typeof this.cacheErrorsCount[collectionName] === 'undefined') {
       this.cacheErrorsCount[collectionName] = 0
     }
-    if (typeof this.localCache === 'undefined') {
-      this.localCache = {}
+    if (typeof Vue.prototype.$localCache === 'undefined') {
+      Vue.prototype.$localCache = {}
     }
-    if (typeof this.localCache[dbName] === 'undefined') {
-      this.localCache[dbName] = {}
+    if (typeof Vue.prototype.$localCache[dbName] === 'undefined') {
+      Vue.prototype.$localCache[dbName] = {}
     }
-    if (typeof this.localCache[dbName][collectionName] === 'undefined') {
-      this.localCache[dbName][collectionName] = {}
+    if (typeof Vue.prototype.$localCache[dbName][collectionName] === 'undefined') {
+      Vue.prototype.$localCache[dbName][collectionName] = {}
     }
     this._collectionName = collectionName
     this._dbName = dbName
     this._useLocalCacheByDefault = useLocalCacheByDefault
-    this._localCache = this.localCache[dbName][collectionName]
+    this._localCache = Vue.prototype.$localCache[dbName][collectionName]
     this._localForageCollection = collection
     this._lastError = null
     this._persistenceErrorNotified = false

core/store/modules/user/actions.ts

@@ -41,16 +41,25 @@ const actions: ActionTree<UserState, RootState> = {
       Vue.prototype.$bus.$emit('session-after-started')
     })
 
+    context.dispatch('loadNewsletterPreferences')
+  },
+  loadNewsletterPreferences (context) {
     const newsletterStorage = Vue.prototype.$db.newsletterPreferencesCollection
-    newsletterStorage.getItem('newsletter-preferences', (err, res) => {
-      if (err) {
-        console.error(err)
-        return
-      }
+    return new Promise((resolve, reject) => {
+      newsletterStorage.getItem('newsletter-preferences', (err, res) => {
+        if (err) {
+          console.error(err)
+          reject(err)
+          return
+        }
 
-      if (res) {
-        context.commit(types.USER_UPDATE_PREFERENCES, res)
-      }
+        if (res) {
+          context.commit(types.USER_UPDATE_PREFERENCES, res)
+          resolve(res)
+        } else {
+          resolve ({ isSubscribed: false })
+        }
+      })
     })
   },
   /**

core/store/modules/user/types/UserState.ts

@@ -2,12 +2,12 @@ export default interface UserState {
   token: string,
   refreshToken: string,
   groupToken: string,
-  groupId: null,
+  groupId: any,
   current: {
     email: string
   } | null,
   current_storecode: string,
   session_started: Date,
-  newsletter: null,
-  orders_history: null
+  newsletter: any,
+  orders_history: any
 }