Merge pull request 'dev' (#83) from dev into master

Reviewed-on: WillaEngine-Project/WillaEngine#83

package.json

@@ -41,7 +41,7 @@
         "prismjs": "^1.21.0",
         "raw-loader": "^0.5.1",
         "v-mask": "^2.2.3",
-        "vee-validate": "^2.2.15",
+        "vee-validate": "^3.4.5",
         "vue-advanced-cropper": "^0.14.1",
         "vue-apexcharts": "^1.4.0",
         "vue-apollo": "^3.0.0-alpha.3",

resources/js/Default/services/storage.text

@@ -1,7 +1,7 @@
 import { Paginate, Sort } from '@Global/services/storage.|-module-|';
 const |-MODULE-| = '|-module-|';
 
-const |-Module-|Paginate =  {
+const |-module-|Paginate =  {
     get() {
         return Paginate.get(|-MODULE-|);
     },
@@ -39,4 +39,4 @@ const SortPaginate = {
 }
 
 
-export { |-Module-|Paginate, SortPaginate }
+export { |-module-|Paginate, SortPaginate }

resources/js/Default/store/category/getters.text

@@ -9,6 +9,5 @@ export default {
     isFiltered|-Module-|: state =>state.is_filtered,
     getFilter|-Module-|: state =>state.filter,
     get|-Module-|Loading: state => state.loading,
-	get|-Module-|Selected: state => state.selected,
 
 };

resources/js/Default/store/store/getters.text

@@ -1,10 +1,9 @@
 export default {
 	get|-Module-|s: state => state.|-module-|_list,
-	get|-Module-|: state => product => state.product_list.find(item => item.id == |-module-|),
     get|-Module-|Loading: state => state.loading,
 	get|-Module-|Pagination: state => state.pagination,
 	getRowsPerPageItems: state => state.rowsPerPageItems,
-	get|-Module-|Selected: state => state.selected,
+	get|-Module-|Selected: state => state.|-module-|_selected,
     isFiltered|-Module-|: state => state.is_filtered,
 
 };

resources/js/Default/store/store/mutations.text

@@ -6,33 +6,35 @@ export default {
 	},
 
 	UPDATE_|-MODULE-|(state, |-module-|) {
-        const index = state.|-module-|.findIndex(x => x.id === |-module-|.id);
-        |-module-| = {...state.|-module-|[index], ...|-module-|};
-		Vue.set(state.|-module-|, index, |-module-|);
+        const index = state.|-module-|_list.findIndex(x => x.id === |-module-|.id);
+        |-module-| = {...state.|-module-|_list[index], ...|-module-|};
+		Vue.set(state.|-module-|_list, index, |-module-|);
 	},
 
     SET_|-MODULE-|_PAGINATION(state, pagination) {
-        Vue.set(state, "pagination", pagination);
+        Vue.set(state, "pagination", {...state.pagination, ...pagination});
+        //|-module-|Paginate.save(pagination);
 	},
 
 	REMOVE_|-MODULE-|(state, id) {
-        const Index = state.|-module-|.findIndex(x => x.id === id);
+        const Index = state.|-module-|_list.findIndex(x => x.id === id);
         const selectedIndex = state.|-module-|_selected.findIndex(x => x.id === id);
-        Vue.delete(state.|-module-|, Index);
+        Vue.delete(state.|-module-|_list, Index);
         Vue.delete(state.|-module-|_selected, selectedIndex);
         Vue.set(state.pagination, 'itemsLength', state.pagination.itemsLength - 1);
         Vue.set(state.pagination, 'pageStop', state.pagination.pageStop - 1);
 	},
 
 	ADD_|-MODULE-|(state, |-module-|) {
-        state.|-module-|.unshift(|-module-|);
-        Vue.set(state, '|-module-|', state.|-module-|);
+        state.|-module-|_list.unshift(|-module-|);
+        Vue.set(state, '|-module-|_list', state.|-module-|_list);
+
 		Vue.set(state.pagination, 'itemsLength', state.pagination.itemsLength + 1);
         Vue.set(state.pagination, 'pageStop', state.pagination.pageStop + 1);
 	},
 
 	ADD_|-MODULE-|_SELECTED(state, |-module-|Id) {
-        const |-module-| = state.|-module-|.find(x => x.id === |-module-|Id);
+        const |-module-| = state.|-module-|_list.find(x => x.id === |-module-|Id);
 		Vue.set(state.|-module-|_selected, state.|-module-|_selected.length, |-module-|);
 	},
 

webpack.mix.js

@@ -39,11 +39,11 @@ require('./modules/wm-common/webpack.mix');
 require('./modules/wm-crm/webpack.mix');
 require('./modules/wm-blog/webpack.mix');
 require('./modules/wm-portfolio/webpack.mix');
-require('./modules/wm-finance/webpack.mix');
+//require('./modules/wm-finance/webpack.mix');
 require('./modules/wm-product/webpack.mix');
 require('./modules/wm-service/webpack.mix');
 require('./modules/wm-store/webpack.mix');
-require('./modules/wm-warehouse/webpack.mix');
+//require('./modules/wm-warehouse/webpack.mix');
 require('./modules/wm-admin/webpack.mix');
 // require('./modules/wm-web-builder/webpack.mix');
 // require('./modules/wm-reservation/webpack.mix');