merge

database/migrations/2019_12_04_180355_add_first_name_last_name_column.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddFirstNameLastNameColumn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table("users", function (Blueprint $table) {
+            $table->string('first_name', 255)->nullable()->after('name');
+            $table->string('last_name', 255)->nullable()->after('first_name');
+        });
+
+        $dbName = config("crm.db_name");
+        Schema::table($dbName . ".clients", function (Blueprint $table) {
+            $table->string('first_name', 255)->nullable()->after('name');
+            $table->string('last_name', 255)->nullable()->after('first_name');
+            $table->string('file_code', 255)->nullable()->after('last_name');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

public/mix-manifest.json

@@ -1,10 +1,10 @@
 {
     "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=bdb019075751400113d2",
-    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=06f2fab586e56c93a083",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=0f2509ab2e6ee25fc143",
-    "/js/vue/Modules/Store/app.js": "/js/vue/Modules/Store/app.js?id=3d2c86d87800840b2999",
-    "/js/vue/Product/app.js": "/js/vue/Product/app.js?id=5febea49fd7f73ab9586",
-    "/js/vue/SMS/app.js": "/js/vue/SMS/app.js?id=2fe6a039549fc2425949",
-    "/js/vue/Service/app.js": "/js/vue/Service/app.js?id=28fb0a0bf9f0332144f1",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=fa83f558736170b60e58"
+    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=9e4c9a7b6ea1067ccd01",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=ab8eedabce3d64af5729",
+    "/js/vue/Modules/Store/app.js": "/js/vue/Modules/Store/app.js?id=edc5c14a0153faef1679",
+    "/js/vue/Product/app.js": "/js/vue/Product/app.js?id=4901943c401368ac7853",
+    "/js/vue/SMS/app.js": "/js/vue/SMS/app.js?id=6575c8bba184faa39425",
+    "/js/vue/Service/app.js": "/js/vue/Service/app.js?id=a06cc144d84163443b76",
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=a24faa82a7567853c1b5"
 }

resources/js/Global/components/Misc/InfoBlock-Multiple.vue

@@ -15,7 +15,7 @@ export default {
     props: {
         icon:           { default: 'check' },
         label:          { default: " عنوان " },
-        values:         { default: [] },
+        values:         {  },
         direction:      { default: '' },
     },
 };

resources/js/Global/components/Modals/Helper.vue

@@ -1,12 +1,12 @@
 <template>
-    <v-dialog v-model="modal" :width="properties.width || '40%'" transition="slide-x-transition">
+    <v-dialog v-model="modal" :width="properties.properties &&  properties.properties.width ? properties.properties.width : '40%'" transition="slide-x-transition">
         <v-card class="RTL">
-            <v-card-title class="red lighten-5" primary-title>
+            <v-card-title :class="[properties.properties &&  properties.properties.color ? properties.properties.color : 'orange', 'lighten-5']" primary-title>
                 <WM-PartTitle
                     class="WM-Margin-T-20"
                     :TitleFa="properties.name || 'عنوان'"
                     :TitleEn="properties.name_en || 'title'"
-                    :color="properties.color || 'orange'"
+                    :color="properties.properties &&  properties.properties.color ? properties.properties.color : 'orange'"
                 ></WM-PartTitle>
             </v-card-title>
             <v-card-text>
@@ -19,7 +19,7 @@
             <v-card-actions>
                 <v-spacer></v-spacer>
                 <v-btn
-                    :color="properties.color || 'orange'"
+                    :color="properties.properties &&  properties.properties.color ? properties.properties.color : 'orange'"
                     depressed
                     dark
                     @click="$_closeModalStack()"
@@ -60,6 +60,7 @@ export default {
                 let response = await axios.get(url('help', {help: this.getModal(this.$options.name).slug}));
                 if (response && response.status == 200) {
                     this.properties = response.data.data;
+                    this.properties.properties = (response.data.data.properties) ? JSON.parse(response.data.data.properties) : null;
                 }
             }
         }