Merge branch 'master' of https://git.willaspace.com/WillaEngine-Project/WillaEngine

database/migrations/2020_05_13_073148_update_table_users.php

@@ -16,6 +16,7 @@ class UpdateTableUsers extends Migration
         Schema::table('users', function (Blueprint $table) {
             $table->string('file_code')->nullable();
             $table->enum('user_type', ['natural','juridical'])->default('natural');
+            $table->string('responsibility')->default('client');
             $table->string('father_name')->nullable();
             $table->string('website')->nullable();
             $table->text('description')->nullable();

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

@@ -1,7 +1,7 @@
 <template>
     <v-row class="radio-group">
         <v-col v-for="(item, index) in items" :key="index"  :xl="item.size" class="pt-0"  @click="changeSelected($event, item || {})">
-            <div :class="{'active':item.id == currentSelect, [item.theme]: true, ['bubble']: true}">
+            <div :class="{'active':value ? value == item.id : item.id == currentSelect, [item.theme]: true, ['bubble']: true}">
                 <div class="body">
                     <div class="icon">
                         <v-icon>WMi-{{ item.icon }}</v-icon>
@@ -24,6 +24,7 @@
         props: {
             items: {},
             initialSelect: {default: 1},
+            value: {default: null},
             name: {default: 'default_name'},
         },
         data() {
@@ -35,6 +36,7 @@
             changeSelected($event, item) {
                 this.currentSelect = item.id;
                 this.$emit('changeState', {'name':this.name,'value':item.value})
+                this.$emit('input', item.id);
             }
         }
     }

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

@@ -39,16 +39,16 @@ export const initTiny = (batch_id) => ({
     plugins: [
         "advlist autolink lists link image charmap print preview anchor",
         "searchreplace visualblocks code fullscreen",
-        "insertdatetime media table paste code wordcount directionality"
+        "insertdatetime media table paste code wordcount directionality link"
     ],
     toolbar:
         "undo redo | fontsizeselect formatselect | bold italic backcolor | \
         alignleft aligncenter alignright alignjustify | \
-        bullist numlist outdent indent | removeformat | image | ltr rtl",
+        bullist numlist outdent indent | removeformat | image | ltr rtl | link",
     // 'fontselect'
     // 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_url: "/api/v1/files",
     relative_urls : false,
     remove_script_host : false,
     document_base_url: window.location.origin,
@@ -60,7 +60,7 @@ export const initTiny = (batch_id) => ({
         let formData = new FormData();
         formData.append("file", blobInfo.blob(), blobInfo.filename());
         formData.append("batch_id", batch_id);
-        let response = await axios.post('/api/file', formData);
+        let response = await axios.post('/api/v1/file', formData);
 
         if (response && response.status == 200) {
             return success(response.data.data.url);

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

@@ -12,7 +12,7 @@ export default {
     },
     async loadCategoryName({ commit }) {
         try {
-            const response = await axios.get("/api/config");
+            const response = await axios.get("/api/v1/config");
             if (response && response.status == 200) {
                 CategoryNameService.save(response.data);
                 commit("SET_CATEGORY_NAME", response.data);
@@ -22,4 +22,4 @@ export default {
 			return false;
 		}
     },
-}
+}