From 5702e83b2fd2f6c63a0f2cf2b3faf88661f5570e Mon Sep 17 00:00:00 2001
From: Saeid <saeidkhakbazan@gmail.com>
Date: Thu, 19 Nov 2020 16:03:22 +0330
Subject: [PATCH 1/6] fix: fix Product

---
 resources/js/Global/components/Drawer/SideBar.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/js/Global/components/Drawer/SideBar.vue b/resources/js/Global/components/Drawer/SideBar.vue
index 6c5c24f..1daede8 100644
--- a/resources/js/Global/components/Drawer/SideBar.vue
+++ b/resources/js/Global/components/Drawer/SideBar.vue
@@ -81,6 +81,7 @@ export default {
 					titleFa: " مدیریت محصولات ",
 					icon: "dropbox",
 					permissionClass: "Product::index",
+                    module: "core",
 					href: '/product/home',
                     tileClass: 'cyan-theme',
 				},

From 692d6f1c5f1951b010f13ec0dcd93e1f53f4a407 Mon Sep 17 00:00:00 2001
From: Saeid <saeidkhakbazan@gmail.com>
Date: Thu, 19 Nov 2020 16:19:07 +0330
Subject: [PATCH 2/6] fix: font family in sidebar

---
 resources/js/Global/components/Drawer/SideBar.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/js/Global/components/Drawer/SideBar.vue b/resources/js/Global/components/Drawer/SideBar.vue
index 1daede8..76e4b4c 100644
--- a/resources/js/Global/components/Drawer/SideBar.vue
+++ b/resources/js/Global/components/Drawer/SideBar.vue
@@ -217,4 +217,7 @@ export default {
 .drawer.open {
 	left: 0px;
 }
+.v-application .caption {
+    font-family: iranyekan-regular!important;
+}
 </style>

From cfb12f914ae4acd67baa07392809c2cb5e75cc7b Mon Sep 17 00:00:00 2001
From: Saeid <saeidkhakbazan@gmail.com>
Date: Thu, 26 Nov 2020 16:44:05 +0330
Subject: [PATCH 3/6] refactor: refactor modal structure

---
 .../Global/components/Modals/BasicModal.vue   | 26 ++++++++---------
 .../js/Global/components/Modals/Dialog.vue    | 18 +++---------
 .../js/Global/components/Modals/Helper.vue    | 29 +++++--------------
 .../js/Global/plugins/globalComponent.js      |  3 ++
 resources/js/Home/App.vue                     |  4 +--
 .../Modules/PaymentConfirmation.vue           | 13 +--------
 .../components/Modules/TrialConfirmation.vue  | 16 ++--------
 7 files changed, 34 insertions(+), 75 deletions(-)

diff --git a/resources/js/Global/components/Modals/BasicModal.vue b/resources/js/Global/components/Modals/BasicModal.vue
index 8066561..b4f41c6 100644
--- a/resources/js/Global/components/Modals/BasicModal.vue
+++ b/resources/js/Global/components/Modals/BasicModal.vue
@@ -1,30 +1,24 @@
 <template>
-    <v-dialog v-model="modal" :width="width" :transition="transition">
-        <component v-if="modal" :is="name" />
+    <v-dialog v-model="modal" :max-width="maxWidth" :width="width" :transition="transition">
+        <slot :modal="modal" :data="data" v-if="modal" ></slot>
     </v-dialog>
 </template>
 
 
 <script>
     import {mapGetters} from "vuex";
-
     export default {
         props: {
-            width:{default: '60%'},
-            name:{default: ''},
+            width:{default: null},
+            maxWidth:{default: null},
+            name:{default: null},
             transition:{default: 'slide-x-transition'},
         },
-        data:() => ({
-        }),
-        components:{
-            'modal_task_list': () => '@Common/components/Task/Timeline/Modal-Layout.vue',
-            'modal_task_add': () => '@Common/components/Task/AddEdit/Modal-Add.vue'
-        },
         computed: {
-            ...mapGetters("modal", ["isModal"]),
+            ...mapGetters("modal", ["isModal", "getModal"]),
             modal: {
                 get() {
-                    return this.isModal(this.name);
+                    return this.isModal(this.modalName);
                 },
                 set(value) {
                     if (!value) {
@@ -32,6 +26,12 @@
                     }
                 }
             },
+            modalName() {
+                return this.name ? this.name : this.$parent.$options.name;
+            },
+            data() {
+                return this.getModal(this.modalName);
+            }
         },
 
     }
diff --git a/resources/js/Global/components/Modals/Dialog.vue b/resources/js/Global/components/Modals/Dialog.vue
index d81e1f1..a37416a 100644
--- a/resources/js/Global/components/Modals/Dialog.vue
+++ b/resources/js/Global/components/Modals/Dialog.vue
@@ -1,5 +1,5 @@
 <template>
-    <v-dialog v-model="modal" width="40%" transition="slide-x-transition">
+    <basic-modal width="40%" transition="slide-x-transition">
         <v-card class="RTL">
             <v-card-title class="red lighten-5" primary-title>
                 <WM-PartTitle
@@ -38,11 +38,11 @@
                 </v-btn>
             </v-card-actions>
         </v-card>
-    </v-dialog>
+    </basic-modal>
 </template>
 
 <script>
-import { mapActions, mapGetters } from "vuex";
+import { mapGetters } from "vuex";
 export default {
     name: "modal_modal_dialog",
     data: () => ({
@@ -77,17 +77,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters("modal", ["isModal", "getModal", "getDialogType", "getDialogProperties"]),
-        modal: {
-			get() {
-                return this.isModal(this.$options.name);
-			},
-			set(value) {
-				if (!value) {
-					this.$_closeModal();
-				}
-			}
-		},
+        ...mapGetters("modal", ["getDialogType", "getDialogProperties"]),
     },
     methods: {
         async confirm() {
diff --git a/resources/js/Global/components/Modals/Helper.vue b/resources/js/Global/components/Modals/Helper.vue
index 7949743..c574f7b 100644
--- a/resources/js/Global/components/Modals/Helper.vue
+++ b/resources/js/Global/components/Modals/Helper.vue
@@ -1,5 +1,5 @@
 <template>
-    <v-dialog v-model="modal" :width="properties.properties &&  properties.properties.width ? properties.properties.width : '60%'" transition="slide-x-transition">
+    <basic-modal :width="properties.properties &&  properties.properties.width ? properties.properties.width : '60%'" transition="slide-x-transition">
         <v-card class="RTL">
             <v-card-title :class="[properties.properties &&  properties.properties.color ? properties.properties.color : 'blue', 'lighten-5']" primary-title>
                 <WM-PartTitle
@@ -28,12 +28,11 @@
                 </v-btn>
             </v-card-actions>
         </v-card>
-    </v-dialog>
+    </basic-modal>
 </template>
 
 <script>
-import { mapActions, mapGetters } from "vuex";
-import axios from 'axios';
+import { mapGetters } from "vuex";
 import { url } from '@Common/mixins/urls';
 export default {
     name: "modal_modal_helper",
@@ -41,26 +40,14 @@ export default {
         properties: {}
     }),
     computed: {
-        ...mapGetters("modal", ["isModal", "getModal"]),
-        modal: {
-			get() {
-                return this.isModal(this.$options.name);
-			},
-			set(value) {
-				if (!value) {
-					this.$_closeModal();
-				}
-			}
-		},
+        ...mapGetters("modal", ["getModal"]),
     },
     methods: {
         async getDate() {
-            if (this.modal) {
-                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;
-                }
+            let response = await this.$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;
             }
         }
     },
diff --git a/resources/js/Global/plugins/globalComponent.js b/resources/js/Global/plugins/globalComponent.js
index 5360535..898fc05 100644
--- a/resources/js/Global/plugins/globalComponent.js
+++ b/resources/js/Global/plugins/globalComponent.js
@@ -24,6 +24,9 @@ Vue.component("section-title", SectionTitle);
 import SectionTitleVertical from "@Global/components/Dividers/SectionTitle-Vertical.vue";
 Vue.component("section-title-vertical", SectionTitleVertical);
 
+import BasicModal from "@Global/components/Modals/BasicModal";
+Vue.component("basic-modal", BasicModal);
+
 import Breadcrumbs from "@Global/components/Misc/Breadcrumbs";
 import Dialog from "@Global/components/Modals/Dialog.vue";
 import Helper from "@Global/components/Modals/Helper.vue";
diff --git a/resources/js/Home/App.vue b/resources/js/Home/App.vue
index 8a82bc7..2b2da7f 100644
--- a/resources/js/Home/App.vue
+++ b/resources/js/Home/App.vue
@@ -3,14 +3,14 @@
 		<div id="app" class="we-dark">
 			<wm-background C1="fff" C2="f1f1f1" C3="fff"/>
 			<app-menu/>
-			<v-content>
+			<v-main>
 				<v-container fluid class="Login">
 					<div class="Tile">
 						<router-view/>
 						<!-- <wm-tiles-layout></wm-tiles-layout> -->
 					</div>
 				</v-container>
-			</v-content>
+			</v-main>
 		</div>
 	</v-app>
 </template>
diff --git a/resources/js/Home/components/Modules/PaymentConfirmation.vue b/resources/js/Home/components/Modules/PaymentConfirmation.vue
index 23e325b..75a48be 100644
--- a/resources/js/Home/components/Modules/PaymentConfirmation.vue
+++ b/resources/js/Home/components/Modules/PaymentConfirmation.vue
@@ -38,7 +38,7 @@
     </v-dialog>
 </template>
 <script>
-import { mapGetters, mapActions, mapMutations } from "vuex";
+import { mapGetters, mapMutations } from "vuex";
 export default {
     name: "modal_rolePermission_paymentConfirm",
     data() {
@@ -60,20 +60,9 @@ export default {
         }
     },
     computed: {
-        ...mapGetters("modal", ["isModal", "getModal"]),
         ...mapGetters([
             'getModuleState'
         ]),
-        modal: {
-            get() {
-                return this.isModal(this.$options.name);
-            },
-            set(value) {
-                if (!value) {
-                    this.$_closeModal();
-                }
-            }
-        },
     },
     methods: {
         ...mapMutations([
diff --git a/resources/js/Home/components/Modules/TrialConfirmation.vue b/resources/js/Home/components/Modules/TrialConfirmation.vue
index 90e1635..3acb1b6 100644
--- a/resources/js/Home/components/Modules/TrialConfirmation.vue
+++ b/resources/js/Home/components/Modules/TrialConfirmation.vue
@@ -57,9 +57,9 @@ export default {
     },
     methods: {
         async register() {
-            if (this.modal && this.getModal(this.$options.name).model) {
+            if (this.getModal(this.$options.name) && this.getModal(this.$options.name).model) {
                 let response = await this.actviveTrial(this.getModal(this.$options.name).model.id);
-                if (response.status == 200) {
+                if (response.status === 200) {
                     this.$_closeModal();
                 }
             }
@@ -67,17 +67,7 @@ export default {
         ...mapActions("rolePermission", ["actviveTrial"])
     },
     computed: {
-        ...mapGetters("modal", ["isModal", "getModal"]),
-        modal: {
-            get() {
-                return this.isModal(this.$options.name);
-            },
-            set(value) {
-                if (!value) {
-                    this.$_closeModal();
-                }
-            }
-        },
+        ...mapGetters("modal", ["getModal"]),
         expiredDate() {
             var today = new Date();
             return new Date(today.setDate(today.getDate() + 15));

From f999b8777774f68e2481f0157f99447c71d9df85 Mon Sep 17 00:00:00 2001
From: fateme <you@example.com>
Date: Sat, 28 Nov 2020 20:03:22 +0330
Subject: [PATCH 4/6] fix database

---
 app/Providers/AppServiceProvider.php          |  2 +
 ...6_temp_bussiness_add_is_virtual_column.php | 34 -------------
 ...054915_temp_append_role_name_en_column.php | 34 -------------
 ...nd_permission_name_en_module_id_column.php | 36 -------------
 ...temp_module_business_column_expires_at.php | 37 --------------
 ...9_09_05_192945_add_load_in_home_column.php | 31 ------------
 .../2019_10_06_173827_temp_update_columns.php | 50 -------------------
 ...180355_add_first_name_last_name_column.php | 38 --------------
 .../2020_05_13_073148_update_table_users.php  | 45 -----------------
 ...20_06_13_110825_new_update_table_users.php | 42 ----------------
 database/seeds/DatabaseSeeder.php             | 10 +++-
 11 files changed, 11 insertions(+), 348 deletions(-)
 delete mode 100644 database/migrations/2019_08_06_170736_temp_bussiness_add_is_virtual_column.php
 delete mode 100644 database/migrations/2019_08_12_054915_temp_append_role_name_en_column.php
 delete mode 100644 database/migrations/2019_08_12_055107_temp_append_permission_name_en_module_id_column.php
 delete mode 100644 database/migrations/2019_08_17_133716_temp_module_business_column_expires_at.php
 delete mode 100644 database/migrations/2019_09_05_192945_add_load_in_home_column.php
 delete mode 100644 database/migrations/2019_10_06_173827_temp_update_columns.php
 delete mode 100644 database/migrations/2019_12_04_180355_add_first_name_last_name_column.php
 delete mode 100644 database/migrations/2020_05_13_073148_update_table_users.php
 delete mode 100644 database/migrations/2020_06_13_110825_new_update_table_users.php

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index d52268f..f12c8e1 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use App\Services\MorphModelFinder;
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
@@ -15,6 +16,7 @@ class AppServiceProvider extends ServiceProvider
     public function boot()
     {
         app(MorphModelFinder::class)->map();
+        Schema::defaultStringLength(191);
     }
 
     /**
diff --git a/database/migrations/2019_08_06_170736_temp_bussiness_add_is_virtual_column.php b/database/migrations/2019_08_06_170736_temp_bussiness_add_is_virtual_column.php
deleted file mode 100644
index 34f290e..0000000
--- a/database/migrations/2019_08_06_170736_temp_bussiness_add_is_virtual_column.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class TempBussinessAddIsVirtualColumn extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('businesses', function (Blueprint $table) {
-            $table->enum('is_virtual', ['yes', 'no'])->default('yes');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        if (Schema::hasColumn('businesses', 'is_virtual')) {
-            Schema::table('businesses', function (Blueprint $table) {
-                $table->dropColumn('is_virtual');
-            });
-        }
-    }
-}
diff --git a/database/migrations/2019_08_12_054915_temp_append_role_name_en_column.php b/database/migrations/2019_08_12_054915_temp_append_role_name_en_column.php
deleted file mode 100644
index e602f5c..0000000
--- a/database/migrations/2019_08_12_054915_temp_append_role_name_en_column.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class TempAppendRoleNameEnColumn extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('tbl_roles', function (Blueprint $table) {
-            $table->string('name_en');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        if (Schema::hasColumn('tbl_roles', 'name_en')) {
-            Schema::table('tbl_roles', function (Blueprint $table) {
-                $table->dropColumn('name_en');
-            });
-        }
-    }
-}
diff --git a/database/migrations/2019_08_12_055107_temp_append_permission_name_en_module_id_column.php b/database/migrations/2019_08_12_055107_temp_append_permission_name_en_module_id_column.php
deleted file mode 100644
index 2c65786..0000000
--- a/database/migrations/2019_08_12_055107_temp_append_permission_name_en_module_id_column.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class TempAppendPermissionNameEnModuleIdColumn extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('tbl_permissions', function (Blueprint $table) {
-            $table->string('name_en');
-            $table->unsignedInteger('module_id')->nullable();
-            $table->index('module_id');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        if (Schema::hasColumn('tbl_permissions', 'name_en')) {
-            Schema::table('tbl_roles', function (Blueprint $table) {
-                $table->dropColumn('name_en');
-            });
-        }
-    }
-}
diff --git a/database/migrations/2019_08_17_133716_temp_module_business_column_expires_at.php b/database/migrations/2019_08_17_133716_temp_module_business_column_expires_at.php
deleted file mode 100644
index a2f7424..0000000
--- a/database/migrations/2019_08_17_133716_temp_module_business_column_expires_at.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class TempModuleBusinessColumnExpiresAt extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        $dbName = config('core.db_name');
-
-        Schema::table($dbName . '.module_business', function (Blueprint $table) {
-            $table->timestamp('expires_at')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        $dbName = config('core.db_name');
-        if (Schema::hasColumn($dbName . '.module_business', 'expires_at')) {
-            Schema::table($dbName . '.module_business', function (Blueprint $table) {
-                $table->dropColumn('expires_at');
-            });
-        }
-    }
-}
diff --git a/database/migrations/2019_09_05_192945_add_load_in_home_column.php b/database/migrations/2019_09_05_192945_add_load_in_home_column.php
deleted file mode 100644
index ddc3b3c..0000000
--- a/database/migrations/2019_09_05_192945_add_load_in_home_column.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddLoadInHomeColumn extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        $dbName = config('core.db_name');
-        Schema::table($dbName . '.modules', function (Blueprint $table) {
-            $table->enum('load_in_home', ['yes', 'no'])->default('yes');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-
-    }
-}
diff --git a/database/migrations/2019_10_06_173827_temp_update_columns.php b/database/migrations/2019_10_06_173827_temp_update_columns.php
deleted file mode 100644
index ad4a96d..0000000
--- a/database/migrations/2019_10_06_173827_temp_update_columns.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class TempUpdateColumns extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        $dbName = config('crm.db_name');
-
-        Schema::table("$dbName.clients", function (Blueprint $table) {
-            $table->string('father_name', 255)->nullable();
-            $table->string('telegram', 255)->nullable();
-            $table->string('website', 255)->nullable();
-            $table->text('description')->nullable();
-            $table->unsignedInteger('client_title_id')->nullable();
-            $table->foreign('client_title_id')->references('id')->on('client_titles');
-            $table->dropColumn('client_category_id');
-        });
-
-        Schema::table("$dbName.client_statuses", function (Blueprint $table) {
-            $table->string('color', 255)->nullable();
-            $table->string('icon', 255)->nullable();
-        });
-
-        $dbName = config('common.db_name');
-
-        Schema::table("$dbName.task_statuses", function (Blueprint $table) {
-            $table->string('color', 255)->nullable();
-            $table->string('icon', 255)->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-
-    }
-}
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
deleted file mode 100644
index ba439e0..0000000
--- a/database/migrations/2019_12_04_180355_add_first_name_last_name_column.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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()
-    {
-        //
-    }
-}
diff --git a/database/migrations/2020_05_13_073148_update_table_users.php b/database/migrations/2020_05_13_073148_update_table_users.php
deleted file mode 100644
index 8f9c3b6..0000000
--- a/database/migrations/2020_05_13_073148_update_table_users.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class UpdateTableUsers extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        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();
-            $table->unsignedInteger('user_status_id')->nullable();
-            $table->unsignedInteger('user_title_id')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('users', function (Blueprint $table) {
-            $table->dropColumn('file_code');
-            $table->dropColumn('user_type');
-            $table->dropColumn('father_name');
-            $table->dropColumn('website');
-            $table->dropColumn('description');
-            $table->dropColumn('user_status_id');
-            $table->dropColumn('user_title_id');
-        });
-    }
-}
diff --git a/database/migrations/2020_06_13_110825_new_update_table_users.php b/database/migrations/2020_06_13_110825_new_update_table_users.php
deleted file mode 100644
index bfc2145..0000000
--- a/database/migrations/2020_06_13_110825_new_update_table_users.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class NewUpdateTableUsers extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('users', function (Blueprint $table) {
-            $table->date('marriage_date')->nullable();
-            $table->string('company_type', 50)->nullable();
-            $table->enum('sex', ['male','female'])->nullable();
-            $table->string('registration_number',50)->nullable();
-            $table->string('economic_code', 50)->nullable();
-            $table->timestamp('modified_at')->nullable()->default(\DB::raw('CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP'));
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('users', function (Blueprint $table) {
-            $table->dropColumn('marriage_date');
-            $table->dropColumn('company_type');
-            $table->dropColumn('sex');
-            $table->dropColumn('registration_number');
-            $table->dropColumn('economic_code');
-            $table->dropColumn('modified_at');
-        });
-    }
-}
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 757f745..43264e8 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -11,7 +11,15 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        // $this->call(ModuleSeeder::class);
+        $this->call(UserSeeder::class);
+        $this->call(BusinessSeeder::class);
+        $this->call(CategorySeeder::class);
+        $this->call(CitiesSeeder::class);
+        $this->call(DistrictSeeder::class);
+        $this->call(DomainSeeder::class);
         $this->call(HelpSeeder::class);
+        $this->call(ModuleSeeder::class);
+        $this->call(PermissionCategorySeeder::class);
+        $this->call(RoleSeeder::class);
     }
 }

From 44f324f8ab5e040ffb9557b2fa282a0f7b351a6a Mon Sep 17 00:00:00 2001
From: farid saravi <f.saravi@yahoo.com>
Date: Sun, 29 Nov 2020 20:38:05 +0330
Subject: [PATCH 5/6] fix: remove unused migrations

---
 database/migrations/.keep              |  0
 database/seeds/CrmCategoriesSeeder.php | 18 ------------------
 2 files changed, 18 deletions(-)
 create mode 100644 database/migrations/.keep
 delete mode 100644 database/seeds/CrmCategoriesSeeder.php

diff --git a/database/migrations/.keep b/database/migrations/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/database/seeds/CrmCategoriesSeeder.php b/database/seeds/CrmCategoriesSeeder.php
deleted file mode 100644
index f7e2ad8..0000000
--- a/database/seeds/CrmCategoriesSeeder.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-use Illuminate\Database\Seeder;
-
-class CrmCategoriesSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        factory(WM\CRM\Models\Category::class, 50)->create()->each(function ($category) {
-
-        });
-    }
-}

From 214613fa5899ab1e3e27aae8af009859fdbd2f22 Mon Sep 17 00:00:00 2001
From: farid saravi <f.saravi@yahoo.com>
Date: Sun, 29 Nov 2020 20:43:00 +0330
Subject: [PATCH 6/6] change city seeder name

---
 database/seeds/DatabaseSeeder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 43264e8..2e49b8d 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -14,7 +14,7 @@ class DatabaseSeeder extends Seeder
         $this->call(UserSeeder::class);
         $this->call(BusinessSeeder::class);
         $this->call(CategorySeeder::class);
-        $this->call(CitiesSeeder::class);
+        $this->call(CitySeeder::class);
         $this->call(DistrictSeeder::class);
         $this->call(DomainSeeder::class);
         $this->call(HelpSeeder::class);