From 467703415dfc87a6e74c99b34c705d46ad041264 Mon Sep 17 00:00:00 2001
From: Saeid <saeidkhakbazan@gmail.com>
Date: Tue, 3 Dec 2019 17:46:04 +0330
Subject: [PATCH 1/2] work in office

---
 public/mix-manifest.json                           | 14 +++++++-------
 .../Global/components/Misc/InfoBlock-Multiple.vue  |  2 +-
 resources/js/Global/components/Modals/Helper.vue   |  9 +++++----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 18a9db9..1c60284 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,9 +1,9 @@
 {
-    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=704f9944e6888047986d",
-    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=7d6c4f1f24a6d559a576",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=4024f09cac7702728462",
-    "/js/vue/Product/app.js": "/js/vue/Product/app.js?id=e50506192ad708debe22",
-    "/js/vue/SMS/app.js": "/js/vue/SMS/app.js?id=3dfdad00a15564daf88e",
-    "/js/vue/Service/app.js": "/js/vue/Service/app.js?id=23d8714760af2482908b",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=848c3771c97bd147e175"
+    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=86c8306546ec92ee742b",
+    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=12d8a67b7717c5cf42cb",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=960c3f1fca94b71efb93",
+    "/js/vue/Product/app.js": "/js/vue/Product/app.js?id=5269e9090b8ef43f02ee",
+    "/js/vue/SMS/app.js": "/js/vue/SMS/app.js?id=fac81cc4bc5556c5aec4",
+    "/js/vue/Service/app.js": "/js/vue/Service/app.js?id=5887ff13c8fd27746504",
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=c8c209e0a980ae71b6be"
 }
diff --git a/resources/js/Global/components/Misc/InfoBlock-Multiple.vue b/resources/js/Global/components/Misc/InfoBlock-Multiple.vue
index 1ecd468..62a4fa1 100644
--- a/resources/js/Global/components/Misc/InfoBlock-Multiple.vue
+++ b/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: '' },
     },
 };
diff --git a/resources/js/Global/components/Modals/Helper.vue b/resources/js/Global/components/Modals/Helper.vue
index 748c947..c1e238f 100644
--- a/resources/js/Global/components/Modals/Helper.vue
+++ b/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;
                 }
             }
         }

From 711dd3a3fcd7ba281853c19026e41ad26e6453c8 Mon Sep 17 00:00:00 2001
From: Farid Saravi <farid@Alirezas-MacBook-Air.local>
Date: Thu, 5 Dec 2019 06:22:40 +0330
Subject: [PATCH 2/2] add temp migration

---
 ...180355_add_first_name_last_name_column.php | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 database/migrations/2019_12_04_180355_add_first_name_last_name_column.php

diff --git a/database/migrations/2019_12_04_180355_add_first_name_last_name_column.php b/database/migrations/2019_12_04_180355_add_first_name_last_name_column.php
new file mode 100644
index 0000000..ba439e0
--- /dev/null
+++ b/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()
+    {
+        //
+    }
+}