Merge branch 'master' of https://gitlab.com/wm-managementsystem/willamall-admin

.idea/composerJson.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ComposerJsonPluginSettings">
+    <unboundedVersionInspectionSettings>
+      <excludedPackages />
+    </unboundedVersionInspectionSettings>
+    <customRepositories />
+    <composerUpdateOptions />
+  </component>
+</project>

app/Console/Kernel.php

@@ -24,11 +24,8 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')
+        $schedule->command('today:schedule')->daily();
-        //          ->hourly();
+        $schedule->command('today:run')->everyFiveMinutes();
-        // $schedule->call(function () {
-        //     \DB::table('wmuser_common.comments')->limit(1)->delete();
-        // })->cron('*/2 * * * *')->sendOutputTo(storage_path('task.txt'));
     }
 
     /**

resources/js/Global/plugins/auth.js

@@ -18,10 +18,10 @@ if (UserService.get()) {
     store.commit('auth/SET_AUTH_USER', UserService.get())
 }
 
-// if (CategoryNameService.get()) {
+if (CategoryNameService.get()) {
-//     Globalstore.commit('common/SET_CATEGORY_NAME', CategoryNameService.get())
+    Globalstore.commit('common/SET_CATEGORY_NAME', CategoryNameService.get())
-// } else {
+} else {
     Globalstore.dispatch('common/loadCategoryName');
-// }
+}
 
 import '@Global/services/errorHandler.services'

resources/js/Global/plugins/tinymce/tinymce.js

@@ -49,7 +49,9 @@ export const initTiny = (batch_id) => ({
     // font_formats : "IranYekan=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;AkrutiKndPadmini=Akpdmi-n",
     fontsize_formats: '10pt 12pt 14pt 16pt 18pt 20pt 22pt 24pt 36pt 60pt 72pt',
     images_upload_url: "/api/files",
-    images_upload_base_path: "/api/files",
+    relative_urls : false,
+    remove_script_host : false,
+    document_base_url: window.location.origin,
     images_upload_credentials: true,
     automatic_uploads: false,
     file_picker_types: "file image media",
@@ -61,7 +63,7 @@ export const initTiny = (batch_id) => ({
         let response = await axios.post('/api/file', formData);
 
         if (response && response.status == 200) {
-            return success(response.path);
+            return success(response.data.data.url);
         } else {
             return failure("HTTP Error: " + response.status);
         }

resources/js/Global/policy/can.js

@@ -2,20 +2,21 @@ import policyClasses from '@Global/policy';
 import { UserService } from "@Global/services/storage.services";
 import globalStore from "@Global/store";
 import authStore from "@Core/store";
- 
+import Routes from "@Global/utils/common/routes"
+
 export default  (model, object, module = null) =>  {
     //Access To All Place For Site Manager
     let siteOwner = UserService.get().is_owner == "true";
-    if (siteOwner) {
+    if (siteOwner || window.location.hostname === Routes.originHostName()) {
         return true;
     }
-        
+
     let policyClass = model.split('::')[0] + 'Policy';
     let policymethod = model.split('::')[1];
     module = module ? module : globalStore.state.common.current_module;
     let rootPermissions = authStore.state.auth.permissions;
     let permissions = rootPermissions[module] ? Object.values(rootPermissions[module]) : [] ;
-    
+
     //instance policty class
     let policy = new policyClasses[policyClass];
     if (typeof policy == 'object' && typeof policy[policymethod] == 'function' ) {
@@ -23,4 +24,4 @@ export default  (model, object, module = null) =>  {
     } else {
         return false;
     }
-};
+};

resources/js/Global/store/modules/modal/actions.js

@@ -13,11 +13,11 @@ export default {
                 state.modals.push(data);
                 let module = data.name.split("_");
                 if (data.rel) {
-                    rootState[module[1]].relation = data.rel   
+                    rootState[module[1]].relation = data.rel;
                     state.rel.push(data.rel);
                 }
                 if (data.model) {
-                    rootState[module[1]].current_model = data.model;   
+                    rootState[module[1]].current_model = data.model;
                     state.model.push(data.model);
                 }
                 rootState[module[1]].page_type = data.page_type ? data.page_type : 'modal';
@@ -27,8 +27,8 @@ export default {
     $_closeModalStack({ state, rootState }) {
         if (state.modals.length) {
             let last_data = [...state.modals].pop();
-            let module = last_data.name.split("_")[1];  
+            let module = last_data.name.split("_")[1];
-                      
+
             if (state.modals.length > 1) {
                 state.modals[state.modals.length - 2]['last_modal_data'] = last_data;
             } else {
@@ -58,7 +58,7 @@ export default {
     $_dialog:({commit, dispatch}, properties) => {
         properties['name'] = 'modal_dialog';
         dispatch('$_openModalStack', properties);
-        
+
         commit('SET_DIALOG_TYPE', properties.type);
         commit('SET_DIALOG_PROPERTIES', properties);
     },

resources/js/Global/utils/common/createSortObject.js

@@ -0,0 +1,8 @@
+const createSortObject = sorts => {
+    let main_sorts = '';
+    for (const sort of sorts) {
+        main_sorts += `sorts[]=${sort}&`;
+    }
+    return main_sorts;
+};
+export default createSortObject;

resources/js/Global/utils/date/jalali-date.js

@@ -2,8 +2,8 @@ import moment from "jalali-moment";
 
 const convertToJalali = function (date = null, format = "jYYYY/jMM/jDD", defaultDate = 'مشخص نشده است.' ) {
     return date ? moment(date).format(format) : defaultDate ;
-}
+};
 const convertNowToJalali = function (date = null, format = "jYYYY/jMM/jDD" ) {
     return date ? moment(date).format(format) : moment(new Date()).format(format) ;
-}
+};
-export { convertToJalali, convertNowToJalali };
+export { convertToJalali, convertNowToJalali };