From 2642fd858c4757f0f858095b84869184714cc8d7 Mon Sep 17 00:00:00 2001 From: Saeid Date: Thu, 3 Oct 2019 21:16:59 +0330 Subject: [PATCH] work in office --- package-lock.json | 5 +++++ package.json | 1 + public/mix-manifest.json | 10 +++++----- resources/js/Global/plugins/auth.js | 2 +- resources/js/Global/services/storage.services.js | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index c6143cb..b173289 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11431,6 +11431,11 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "vue-the-mask": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/vue-the-mask/-/vue-the-mask-0.11.1.tgz", + "integrity": "sha512-UquSfnSWejD0zAfcD+3jJ1chUAkOAyoxya9Lxh9acCRtrlmGcAIvd0cQYraWqKenbuZJUdum+S174atv2AuEHQ==" + }, "vue-tinymce-editor": { "version": "1.6.2", "resolved": "https://registry.npmjs.org/vue-tinymce-editor/-/vue-tinymce-editor-1.6.2.tgz", diff --git a/package.json b/package.json index 5d471d5..04f7597 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "vue-moment": "^4.0.0", "vue-router": "^3.0.2", "vue-scroll-reveal": "^1.0.11", + "vue-the-mask": "^0.11.1", "vue-tinymce-editor": "^1.6.2", "vuetify": "^2.0.19" }, diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 92b9f6c..bb64330 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,7 +1,7 @@ { - "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=dc072ea26c92af6777a0", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=db8af10412509ee0586b", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=76afa0e5e8d8410f111f", - "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=8058a4ba779b6aaf4121", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=7e0e6ca7915af5a841bc" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=14083efcda55bc46c26b", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=2dd1c98b1ceea1da6989", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=82839dc8a42d40626004", + "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=3b8ef5f0a685c7a4ec8b", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=832c04a781cf0db77dd0" } diff --git a/resources/js/Global/plugins/auth.js b/resources/js/Global/plugins/auth.js index 37f8b0d..f740619 100644 --- a/resources/js/Global/plugins/auth.js +++ b/resources/js/Global/plugins/auth.js @@ -9,7 +9,7 @@ if (TokenService.getToken()) { if (PermissionService.get()) { store.commit('auth/SET_AUTH_PERMISSIONS', PermissionService.get()) -} else if (TokenService.getToken()){ +} else if (TokenService.getToken() && UserService.get() && UserService.get().is_owner == false) { store.dispatch('auth/loadAuthPermissions'); } diff --git a/resources/js/Global/services/storage.services.js b/resources/js/Global/services/storage.services.js index ffd195e..124ae90 100644 --- a/resources/js/Global/services/storage.services.js +++ b/resources/js/Global/services/storage.services.js @@ -68,7 +68,7 @@ const VirtualActivityService = { }, save(virtualActivity = null) { - virtualActivity = qs.stringify(virtualActivity); + virtualActivity = qs.stringify(virtualActivity); localStorage.setItem(VIRTUALACTIVITY, virtualActivity) },