work in homw

public/mix-manifest.json

@@ -1,6 +1,6 @@
 {
-    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=7c4825c4679a1e4ed1e1",
+    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=0792ffd7217143c46a77",
-    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=aca7fc409acbfefc01c8",
+    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=41b7adb225049bb18a64",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=66c0e1949570a888ac45",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=827cddb7746c2a2510d1",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=f1630a1732ec04e32100"
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=c593ac79fc42fa89a05f"
 }

resources/js/Global/components/Inputs/Dropzone.vue

@@ -8,6 +8,7 @@
 import vue2Dropzone from 'vue2-dropzone'
 import { TokenService } from '@Global/services/storage.services'
 import commonState from '@Global/store/modules/common/state';
+import Routes from '@Global/utils/common/routes';
 import { url } from '@Common/mixins/urls';
 import axios from 'axios';
 import 'vue2-dropzone/dist/vue2Dropzone.min.css'
@@ -23,7 +24,7 @@ export default {
 	data() {
         return {
             dropzoneOptions: {
-                url: url('storeFile'),
+                url: Routes.api() + url('storeFile'),
                 thumbnailWidth: 200,
                 headers: { "Authorization":  `Bearer ${TokenService.getToken()}`, "Module": `${commonState.current_module}` },
                 addRemoveLinks: true,

resources/js/Global/utils/common/routes.js

@@ -11,4 +11,7 @@ export default {
     originHostName() {
         return process.env.MIX_PUSHER_APP_ORIGIN_HOST_NAME || 'www.willaengine.ir';
     },
+    api() {
+        return process.env.MIX_PUSHER_APP_API || '';
+    },
 }

resources/js/Home/components/Modules/PaymentConfirmation.vue

@@ -56,21 +56,20 @@
 <script>
 import {mapGetters} from 'vuex';
 export default {
+    name: "modal_rolePermission_paymentConfirm",
     computed: {
-        ...mapGetters("modal", ["isModal"]),
+        ...mapGetters("modal", ["isModalStack", "getModal"]),
         modal: {
             get() {
-                return this.isModal("role_permission/payment_confirmation");
+                return this.isModalStack(this.$options.name);
             },
             set(value) {
-                if (value) {
+                if (!value) {
-                    this.$_openModal("role_permission/payment_confirmation");
+                    this.$_closeModalStack();
-                } else {
-                    this.$_closeModal("role_permission/payment_confirmation");
-                }
                 }
             }
         },
+    },
 }
 </script>
 <style lang="scss" scoped>

resources/js/Home/components/Modules/TrialConfirmation.vue

@@ -24,7 +24,7 @@
                     <tbody>
                         <tr class="LTR">
                             <td class="Itrator">1</td>
-                            <td class="Title">{{ getCurrentModule.title_fa }}</td>
+                            <td class="Title">{{ modal && getModal(this.$options.name).model ? getModal(this.$options.name).model.title_fa : '' }}</td>
                             <td class="Price En">{{  expiredDate | moment("jYYYY-jMM-jDD") }} 24:00</td>
                         </tr>
                     </tbody>
@@ -34,7 +34,7 @@
             <v-divider></v-divider>
             <v-card-actions>
                 <v-spacer></v-spacer>
-                <v-btn color="red" depressed dark @click="$_closeModal('role_permission/trial_confirmation')">
+                <v-btn color="red" depressed dark @click="$_closeModalStack();">
                     <v-icon dark right>fas fa-times</v-icon>انصراف
                 </v-btn>
                 <v-btn color="black" depressed dark @click="register">
@@ -47,27 +47,27 @@
 <script>
 import {mapGetters, mapActions} from 'vuex';
 export default {
+    name: "modal_rolePermission_trialConfirm",
     methods: {
         async register() {
-            let response = await this.actviveTrial(this.getCurrentModule.id);
+            if (this.modal && this.getModal(this.$options.name).model) {
+                let response = await this.actviveTrial(this.getModal(this.$options.name).model.id);
                 if (response.status == 200) {
-                this.$_closeModal('role_permission/trial_confirmation')
+                    this.$_closeModalStack();
+                }
             }
         },
-        ...mapActions("role_permission", ["actviveTrial"])
+        ...mapActions("rolePermission", ["actviveTrial"])
     },
     computed: {
-        ...mapGetters("modal", ["isModal"]),
+        ...mapGetters("modal", ["isModalStack", "getModal"]),
-        ...mapGetters("role_permission", ["getCurrentModule"]),
         modal: {
             get() {
-                return this.isModal("role_permission/trial_confirmation");
+                return this.isModalStack(this.$options.name);
             },
             set(value) {
-                if (value) {
+                if (!value) {
-                    this.$_openModal("role_permission/trial_confirmation");
+                    this.$_closeModalStack();
-                } else {
-                    this.$_closeModal("role_permission/trial_confirmation");
                 }
             }
         },

resources/js/Home/views/AddModule.vue

@@ -31,7 +31,7 @@
 									<v-btn
 										v-on="on"
 										small
-										@click.native="$_openModal('role_permission/trial_confirmation'), SET_CURRENT_MODULE(module)"
+										@click.native="$_openModalStack({ name: 'rolePermission_trialConfirm', model: module})"
 										slot="activator"
 										fab
 										:color="module.color_class"
@@ -44,7 +44,7 @@
 							<!-- <v-tooltip top transition="slide-x-transition" color="black" v-if="module.has_module == 'no' || module.is_trial == 'yes'">
 								<template v-slot:activator="{ on }">
 									<v-btn
-										@click.native="$_openModal('role_permission/payment_confirmation'), SET_CURRENT_ALL_MODULE(module)"
+										@click.native="$_openModalStack({ name: 'rolePermission_paymentConfirm', model: module})"
 										slot="activator"
 										fab
 										:color="module.color_class"
@@ -110,9 +110,6 @@ export default {
 		// "wm-payment-confirmation": PaymentConfirmation,
 		"wm-trial-confirmation": TrialConfirmation
 	},
-	props: {
-		color: { default: "grey darken-4" }
-	},
 	data() {
 		return {
 			breadcrumbItems: [
@@ -131,15 +128,13 @@ export default {
 		};
 	},
 	computed: {
-        ...mapGetters("role_permission", ["getAllModules", "getModules"])
+        ...mapGetters("rolePermission", ["getAllModules", "getModules"])
     },
     methods: {
-        ...mapActions("role_permission", ["loadAllModules", "loadModules"]),
+        ...mapActions("rolePermission", ["loadAllModules", "loadModules"]),
-		...mapMutations("role_permission", ["SET_CURRENT_MODULE"]),
 		async loadPage() {
 			await this.loadAllModules({ home_page: true });
-			let response = await this.loadModules({ home_page: true });
+			await this.loadModules({ home_page: true });
-			if (response && response.status == 200) {
 			for (const allModule of this.getAllModules) {
 				let module = this.getModules.find(x => x.id == allModule.id);
 				if (module) {
@@ -149,7 +144,6 @@ export default {
 					allModule['has_module'] = 'no';
 				}
 			}
-			}
 			this.allModules = this.getAllModules;
 		}
     },

resources/js/Home/views/Home.vue

@@ -41,15 +41,14 @@ export default {
         "wm-tile": Tile,
     },
     computed: {
-        ...mapGetters("role_permission", ["getModules"]),
+        ...mapGetters("rolePermission", ["getModules"]),
         ...mapGetters("auth", ["getAuthUser"]),
     },
     methods: {
-        ...mapActions("role_permission", ["loadModules"]),
+        ...mapActions("rolePermission", ["loadModules"]),
     },
     created() {
         this.loadModules({ home_page: true });
-        
     }
 };
 </script>