package

.env.example

@@ -1,39 +0,0 @@
-APP_NAME=Laravel
-APP_ENV=local
-APP_KEY=
-APP_DEBUG=true
-APP_URL=http://localhost
-
-LOG_CHANNEL=stack
-
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_DRIVER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

composer.json

@@ -16,7 +16,8 @@
         "nuwave/lighthouse": "dev-master",
         "nwidart/laravel-modules": "^4.0",
         "wm/common": "dev-master",
-        "wm/crm": "dev-master"
+        "wm/crm": "dev-master",
+        "wm/reservation": "dev-master"
     },
     "require-dev": {
         "beyondcode/laravel-dump-server": "^1.0",
@@ -65,18 +66,21 @@
             "@php artisan key:generate --ansi"
         ]
     },
-    "repositories": [
+    "repositories": [{
-        {
             "type": "path",
             "url": "./modules/wm-crm"
         },
-	    {
+        {
             "type": "path",
             "url": "./modules/wm-common"
         },
-	    {
+        {
             "type": "path",
             "url": "./modules/wm-core"
+        },
+        {
+            "type": "path",
+            "url": "./modules/wm-reservation"
         }
     ]
-}
+}

config/lighthouse.php

@@ -98,7 +98,7 @@ return [
         'interfaces' => 'App\\GraphQL\\Interfaces',
         'unions' => 'App\\GraphQL\\Unions',
         'scalars' => 'App\\GraphQL\\Scalars',
-        'directives' => ['WM\\Core\\GraphQL\\Directives'],
+        'directives' => ['WM\\Core\\GraphQL\\Directives', 'WM\\CRM\\GraphQL\\Directives'],
     ],
 
     /*
@@ -129,7 +129,7 @@ return [
     |
     */
 
-    'paginate_max_count' => null,
+    'paginate_max_count' => 48,
 
     /*
     |--------------------------------------------------------------------------

public/mix-manifest.json

@@ -1,6 +1,6 @@
 {
     "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=3079f55bdae5772792ec",
-    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=11892427aa3ad1285857",
+    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=f677b68de118e24a08b9",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=47f2a1feed05708b57db",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=eea5742d4b9a2524ec86",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=79f2f24e882e5cfb81eb"
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=df1e15ab989be2ebac1a"
 }

resources/js/Home/views/Home.vue

@@ -19,9 +19,14 @@
                 </wm-tile>
             </router-link>
 
-            <a href="/CRM/Home" class="flex lg12 xs12">
+            <a href="/Reservation/Home" class="flex lg4 xs12">
-                <wm-tile TileClass="Inline LTR Padd10" TileHeight="180" TitleEn="CRM" TitleFa=" مدیریت ارتباط با مشتری " Desc=" کالاها، خدمات، تخفیفات، فروش وِیژه و ... "
+                <wm-tile TileClass="Padd10" TitleEn="Reservations" TitleFa=" سیستم رزرو وقت " Desc=" کالاها، خدمات، تخفیفات، فروش وِیژه و ... "
-                         GradientBegin="d6e7de"  GradientEnd="d8d8e1" ImageURL="Members.png" Quantity="1250" >
+                         GradientBegin="cecece"  GradientEnd="f7f7f7" ImageURL="Clock.png" ImageHeight="150px"  Quantity="1250" >
+                </wm-tile>
+            </a>
+            <a href="/CRM/Home" class="flex lg8 xs12">
+                <wm-tile TileClass="Inline LTR Padd10" TitleEn="CRM" TitleFa=" مدیریت ارتباط با مشتری " Desc=" کالاها، خدمات، تخفیفات، فروش وِیژه و ... "
+                         GradientBegin="d6e7de"  GradientEnd="d8d8e1" ImageURL="Members.png" ImageHeight="220px" Quantity="1250" >
                 </wm-tile>
             </a>
         </v-layout>

resources/js/User/components/Role/Add.vue

@@ -0,0 +1,90 @@
+<template>
+    <v-dialog v-model="$store.state.AddRole" width="70%" transition="slide-x-transition">
+        <v-card class="RTL">
+            <v-card-title class=" grey lighten-3" primary-title>
+                <WM-PartTitle class="WM-Margin-T-20" TitleFa=" ایجاد نقش جدید " TitleEn=" Define a new Role " color="cyan"></WM-PartTitle>
+            </v-card-title>
+
+            <v-card-text>
+                <v-layout row wrap class="WM-Section" style="border-right-color: #32c5d2;">
+                    <v-flex class="lg3 RTL text-lg-right">
+                        <div class="Step En" style="color:#32c5d2;"> 01 </div>
+                        <div class="Title">
+                            <div class="FA"> کاربران  </div>
+                            <div class="EN"> Users  </div>
+                        </div>
+                        <!-- <v-tooltip top color="black">
+                            <v-btn small slot="activator" fab color="cyan" dark style="float:left; margin-left:10px;"><v-icon dark>fas fa-plus</v-icon></v-btn>
+                            <span> افزودن نقش جدید </span>
+                        </v-tooltip> -->
+                        <!-- <v-switch style="float:left; margin-left:10px;" color="cyan" v-model="UserSwitch"></v-switch> -->
+                    </v-flex>
+                    <v-flex class="lg9">
+                        <v-layout row wrap class="WM-Margin-0">
+                            <v-flex class="lg6 WM-Flex RoleFlex">
+                                <v-card-text>
+                                    <v-text-field label=" نام نقش به فارسی " color="cyan" prepend-icon="fas fa-tag" ></v-text-field>
+                                </v-card-text>
+                            </v-flex>
+                            <v-flex class="lg6 WM-Flex RoleFlex">
+                                <v-card-text>
+                                    <v-text-field label=" Role Name - English " class="LTR" color="cyan" prepend-icon="fas fa-tag" ></v-text-field>
+                                </v-card-text>
+                            </v-flex>
+                        </v-layout>
+                        <v-layout row wrap class="WM-Margin-0">
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <v-switch color="cyan" v-model="UserAdd" label=" افزودن کاربر "></v-switch>
+                            </v-flex>
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <v-switch color="cyan" v-model="UserEdit" label=" ویرایش کاربر "></v-switch>
+                            </v-flex>
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <v-switch color="cyan" v-model="UserRemove" label=" حذف کاربر "></v-switch>
+                            </v-flex>
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <v-switch color="cyan" v-model="EditRoles" label=" ویرایش دسترسی ها "></v-switch>
+                            </v-flex>
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <v-switch color="cyan" v-model="Contact" label=" ارسال پیام کوتاه یا ایمیل "></v-switch>
+                            </v-flex>
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <v-switch color="cyan" v-model="DoTask" label=" قابلیت انجام وظیفه "></v-switch>
+                            </v-flex>
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <v-switch color="cyan" v-model="DefineTask" label=" قابلیت انجام وظیفه "></v-switch>
+                            </v-flex>
+                        </v-layout>
+                    </v-flex>
+                </v-layout>
+            </v-card-text>
+            <v-divider></v-divider>
+
+            <v-card-actions>
+                <v-spacer></v-spacer>
+                <v-btn color="cyan" depressed dark @click="$store.state.AddRole = false">
+                    <v-icon dark right>fas fa-plus</v-icon> افزودن نقش
+                </v-btn>
+            </v-card-actions>
+        </v-card>
+    </v-dialog>
+
+</template>
+
+<script>
+
+export default {
+    props: {
+    },
+    data () {
+        return {
+            status: [
+                { name: ' بسته شده ', id: 1 },
+                { name: ' ویزیت اولیه ', id: 2 },
+                { name: ' انصراف داده ', id: 3 },
+            ],
+            UserSwitch: true,
+        }
+    }
+};
+</script>

resources/js/User/components/Role/List.vue

@@ -0,0 +1,170 @@
+<template>
+    <v-dialog v-model="$store.state.UserRoles" width="70%" transition="slide-x-transition">
+        <v-card class="RTL">
+            <v-card-title class=" grey lighten-3" primary-title>
+                <WM-PartTitle class="WM-Margin-T-20" TitleFa=" دسترسی های کاربر " TitleEn=" User's Access " color="black"></WM-PartTitle>
+            </v-card-title>
+
+            <v-card-text>
+                <v-layout row wrap class="WM-Section" style="border-right-color: #32c5d2;">
+                    <v-flex class="lg3 RTL text-lg-right">
+                        <div class="Step En" style="color:#32c5d2;"> 01 </div>
+                        <div class="Title">
+                            <div class="FA"> کاربران  </div>
+                            <div class="EN"> Users  </div>
+                        </div>
+                        <v-tooltip top color="black">
+                            <v-btn small slot="activator" @click.native="$store.state.AddRole = true" fab color="cyan" dark style="float:left; margin-left:10px;"><v-icon dark>fas fa-plus</v-icon></v-btn>
+                            <span> افزودن نقش جدید در بخش مدیریت کاربران سیستم</span>
+                        </v-tooltip>
+                        <!-- <v-switch style="float:left; margin-left:10px;" color="cyan" v-model="UserSwitch"></v-switch> -->
+                    </v-flex>
+                    <v-flex class="lg9">
+                        <v-layout row wrap class="WM-Margin-0">
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <WM-Checkbox ItemText=" مدیر سطح 1 " ItemID="UserAdminL1"></WM-Checkbox>
+                                <v-tooltip bottom color="black">
+                                    <v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
+                                    <span> ویرایش نقش </span>
+                                </v-tooltip>
+                            </v-flex>
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <WM-Checkbox ItemText=" مدیر سطح 2 " ItemID="UserAdminL2"></WM-Checkbox>
+                                <v-tooltip bottom color="black">
+                                    <v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
+                                    <span> ویرایش نقش </span>
+                                </v-tooltip>
+                            </v-flex>
+                        </v-layout>
+                    </v-flex>
+                </v-layout>
+                <v-layout row wrap class="WM-Section" style="border-right-color: #ee3552;">
+                    <v-flex class="lg3 RTL text-lg-right">
+                        <div class="Step En" style="color:#ee3552;"> 02 </div>
+                        <div class="Title">
+                            <div class="FA"> مدیریت ارتباط با مشتری  </div>
+                            <div class="EN"> CRM  </div>
+                        </div>
+                        <v-tooltip top color="black">
+                            <v-btn small @click.native="$store.state.AddRole = true" slot="activator" fab color="red" dark style="float:left; margin-left:10px;"><v-icon dark>fas fa-plus</v-icon></v-btn>
+                            <span> افزودن نقش جدید در بخش مدیریت ارتباط با مشتری</span>
+                        </v-tooltip>
+                        <!-- <v-switch style="float:left; margin-left:10px;" color="red" v-model="UserSwitch"></v-switch> -->
+                    </v-flex>
+                    <v-flex class="lg9">
+                        <v-layout row wrap class="WM-Margin-0">
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <WM-Checkbox ItemText=" مدیر وظایف " ItemID="CRMTasksAdmin"></WM-Checkbox>
+                                <v-tooltip bottom color="black">
+                                    <v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
+                                    <span> ویرایش نقش </span>
+                                </v-tooltip>
+                            </v-flex>
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <WM-Checkbox ItemText=" مدیر مشتریان " ItemID="CRMClientsAdmin"></WM-Checkbox>
+                                <v-tooltip bottom color="black">
+                                    <v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
+                                    <span> ویرایش نقش </span>
+                                </v-tooltip>
+                            </v-flex>
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <WM-Checkbox ItemText=" مدیر رویدادها " ItemID="CRMClientsAdmin"></WM-Checkbox>
+                                <v-tooltip bottom color="black">
+                                    <v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
+                                    <span> ویرایش نقش </span>
+                                </v-tooltip>
+                            </v-flex>
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <WM-Checkbox ItemText=" مدیر تراکنش ها " ItemID="CRMClientsAdmin"></WM-Checkbox>
+                                <v-tooltip bottom color="black">
+                                    <v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
+                                    <span> ویرایش نقش </span>
+                                </v-tooltip>
+                            </v-flex>
+                        </v-layout>
+                    </v-flex>
+                </v-layout>
+                <v-layout row wrap class="WM-Section" style="border-right-color: #FF6B57;">
+                    <v-flex class="lg3 RTL text-lg-right">
+                        <div class="Step En" style="color:#FF6B57;"> 03 </div>
+                        <div class="Title">
+                            <div class="FA"> فروشگاه  </div>
+                            <div class="EN"> Store  </div>
+                        </div>
+                        <v-tooltip top color="black">
+                            <v-btn small slot="activator" fab color="orange" dark style="float:left; margin-left:10px;"><v-icon dark>fas fa-plus</v-icon></v-btn>
+                            <span> افزودن نقش جدید در بخش فروشگاه </span>
+                        </v-tooltip>
+                        <!-- <v-switch style="float:left; margin-left:10px;" color="orange" v-model="UserSwitch"></v-switch> -->
+                    </v-flex>
+                    <v-flex class="lg9">
+                        <v-layout row wrap class="WM-Margin-0">
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <WM-Checkbox ItemText=" مدیر محصولات " ItemID="StoreProducts"></WM-Checkbox>
+                                <v-tooltip bottom color="black">
+                                    <v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
+                                    <span> ویرایش نقش </span>
+                                </v-tooltip>
+                            </v-flex>
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <WM-Checkbox ItemText=" مدیر تخفیف ها " ItemID="StoreProducts"></WM-Checkbox>
+                                <v-tooltip bottom color="black">
+                                    <v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
+                                    <span> ویرایش نقش </span>
+                                </v-tooltip>
+                            </v-flex>
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <WM-Checkbox ItemText=" مدیر سفارشات " ItemID="StoreProducts"></WM-Checkbox>
+                                <v-tooltip bottom color="black">
+                                    <v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
+                                    <span> ویرایش نقش </span>
+                                </v-tooltip>
+                            </v-flex>
+                            <v-flex class="lg4 WM-Flex RoleFlex">
+                                <WM-Checkbox ItemText=" مدیر فروش های ویژه " ItemID="StoreProducts"></WM-Checkbox>
+                                <v-tooltip bottom color="black">
+                                    <v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
+                                    <span> ویرایش نقش </span>
+                                </v-tooltip>
+                            </v-flex>
+                        </v-layout>
+                    </v-flex>
+                </v-layout>
+            </v-card-text>
+            <v-divider></v-divider>
+
+            <v-card-actions>
+                <v-spacer></v-spacer>
+                <v-btn color="black" depressed dark @click="$store.state.UserRoles = false">
+                    <v-icon dark right>fas fa-check</v-icon> تایید دسترسی ها
+                </v-btn>
+            </v-card-actions>
+        </v-card>
+    </v-dialog>
+
+</template>
+
+<script>
+
+export default {
+    props: {
+    },
+    data () {
+        return {
+            status: [
+                { name: ' بسته شده ', id: 1 },
+                { name: ' ویزیت اولیه ', id: 2 },
+                { name: ' انصراف داده ', id: 3 },
+            ],
+            UserSwitch: true,
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+    .RoleFlex {
+        height: 45px;
+        align-items: center;
+    }
+</style>
+

resources/js/User/components/Roles.vue

@@ -13,7 +13,11 @@
                             <div class="FA"> کاربران  </div>
                             <div class="EN"> Users  </div>
                         </div>
-                        <v-switch style="float:left; margin-left:10px;" color="cyan" v-model="UserSwitch"></v-switch>
+                        <v-tooltip top color="black">
+                            <v-btn small slot="activator" fab color="cyan" dark style="float:left; margin-left:10px;"><v-icon dark>fas fa-plus</v-icon></v-btn>
+                            <span> افزودن نقش جدید </span>
+                        </v-tooltip>
+                        <!-- <v-switch style="float:left; margin-left:10px;" color="cyan" v-model="UserSwitch"></v-switch> -->
                     </v-flex>
                     <v-flex class="lg2">
                         <WM-Checkbox ItemText=" افزودن کاربر " ItemID="UserAdd"></WM-Checkbox>

resources/js/User/router/paths.js

@@ -1,12 +1,11 @@
-export default [
+export default [{
-        {
+        path: '/User/List',
-            path: '/User/List',
+        name: 'UserList',
-            name: 'UserList',
+        view: 'List'
-            view: 'UserList'
+    },
-        },
+    {
-        {
+        path: '/User/Add',
-            path: '/User/Add',
+        name: 'AddUser',
-            name: 'AddUser',
+        view: 'Add'
-            view: 'AddUser'
+    },
-        },
+];
-    ];

resources/js/User/store.js

@@ -7,6 +7,7 @@ export default new Vuex.Store({
     state: {
         UserDetails: false,
         UserRoles: false,
+        AddRole: false,
         ConfigUserDepartments: false,
         ConfigUserDepartmentAdd: false,
         TaskAdd: false,
@@ -14,4 +15,4 @@ export default new Vuex.Store({
         SendEmail: false,
         SendSMS: false
     }
-})
+})

resources/js/User/views/List.vue

@@ -20,6 +20,7 @@
             <div class="text-xs-center">
                 <wm-user-details></wm-user-details>
                 <wm-user-roles></wm-user-roles>
+                <wm-add-role></wm-add-role>
                 <wm-task-add></wm-task-add>
                 <wm-task-timeline></wm-task-timeline>
                 <wm-send-email></wm-send-email>
@@ -40,7 +41,8 @@
 import UserItems from '@User/components/Items';
 import UserFilters from '@User/components/Filters';
 import UserDetails from "@User/components/Details.vue";
-import UserRoles from "@User/components/Roles.vue";
+import UserRoles from "@User/components/Role/List.vue";
+import AddRole from "@User/components/Role/Add.vue";
 
 import TaskAdd from "@Common/components/Task/Add.vue";
 import TaskTimeline from "@Common/components/Task/Timeline/Modal-Layout.vue";
@@ -55,6 +57,7 @@ export default {
         'wm-user-filter'            :       UserFilters,
         'wm-user-details'           :       UserDetails,
         'wm-user-roles'             :       UserRoles,
+        'wm-add-role'               :       AddRole,
         'wm-task-add'               :       TaskAdd,
         'wm-task-timeline'          :       TaskTimeline,
         'wm-send-email'             :       SendEmailModal,

webpack.mix.js

@@ -23,22 +23,24 @@ mix.webpackConfig({
     },
     output: {
         chunkFilename: 'js/vue/chunks/[name].[chunkhash].js',
-     },
+    },
 });
 
 // mix.js('resources/js/Modules/Website/app.js', 'public/Modules/Website/js')
 //     .js('resources/js/Home/app.js', 'public/Home/js');
-    // .js('resources/js/Authentication/app.js', 'public/Authentication/js');
+// .js('resources/js/Authentication/app.js', 'public/Authentication/js');
 
 mix.js('resources/js/Authentication/app.js', 'public/js/vue/Authentication')
     .js('resources/js/Home/app.js', 'public/js/vue/Home')
     .js('resources/js/User/app.js', 'public/js/vue/User');
 
-    
+
 // require('./modules/wm-core/webpack.mix');
 require('./modules/wm-common/webpack.mix');
 
 require('./modules/wm-crm/webpack.mix');
 // require('./modules/wm-store/webpack.mix');
 
+// require('./modules/wm-reservation/webpack.mix');
+
 mix.version();