Merge pull request #279 from jitendra-webkul/master

For new version
krayin · Sep 23, 2021 · abd4fac · abd4fac
2 parents 66c9919 + 84c1445
commit abd4fac
Show file tree

Hide file tree

Showing 15 changed files with 95 additions and 8 deletions.
diff --git a/.env.example b/.env.example
@@ -1,6 +1,6 @@
 APP_NAME='Krayin CRM'
 APP_ENV=local
-APP_VERSION=1.1.2
+APP_VERSION=1.1.3
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost

diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md
@@ -1,3 +1,30 @@
+## **v1.1.3 (23rd of September 2021)**
+
+* [feature] Refactored data grid code
+
+* [feature] Add app version in admin ui
+
+
+* #244 [fixed] - The modal box should be open if we click on add lead button of the leads page.
+
+* #251 [fixed] - While Adding a new attribute Entity Type field should be come only one time.
+
+* #255 [fixed] - When we creating Activity. then there should be a suggestion in placeholder of Participants input field for search Participants.
+
+* #257 [fixed] - [BUG] SKU Validation Bug
+
+* #260 [fixed] - When we changing the lead stage to Won/Lost. then date icon should be visible in Closed Date input field.
+
+* #263 [fixed] - When we are creating a activity and selecting persons for participants. then persons name should be visible below Participants input box.
+
+* #269 [fixed] - [BUG] Add Lead Buttons Do Nothing
+
+* #270 [fixed] - When we are creating multiple group with the same details. then there should be a warning message
+
+* #272 [fixed] - When we are creating multiple Organizations with the same details. then there should be a warning message
+
+
+
 ## **v1.1.2 (17th of September 2021)**
 
 

diff --git a/packages/Webkul/Admin/publishable/assets/css/admin.css b/packages/Webkul/Admin/publishable/assets/css/admin.css
diff --git a/packages/Webkul/Admin/publishable/assets/mix-manifest.json b/packages/Webkul/Admin/publishable/assets/mix-manifest.json
@@ -1,6 +1,6 @@
 {
     "/js/admin.js": "/js/admin.js?id=171e3e15e5938d102a71",
-    "/css/admin.css": "/css/admin.css?id=4b174e9aaba2eb225906",
+    "/css/admin.css": "/css/admin.css?id=0bc066190988f0a58797",
     "/images/activities-active-icon.svg": "/images/activities-active-icon.svg?id=f7887e3fdcddf68567ce",
     "/images/activities-icon.svg": "/images/activities-icon.svg?id=0755224d86e0281d031f",
     "/images/avatar-dark-icon.svg": "/images/avatar-dark-icon.svg?id=abefe06bd1ce2bfe7029",

diff --git a/packages/Webkul/Admin/src/Database/Seeders/LeadTypeSeeder.php b/packages/Webkul/Admin/src/Database/Seeders/LeadTypeSeeder.php
@@ -18,7 +18,12 @@ public function run()
         DB::table('lead_types')->insert([
             [
                 'id'              => 1,
-                'name'            => 'Email',
+                'name'            => 'New Business',
+                'created_at'      => $now,
+                'updated_at'      => $now,
+            ], [
+                'id'              => 2,
+                'name'            => 'Existing Business',
                 'created_at'      => $now,
                 'updated_at'      => $now,
             ]

diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss
@@ -76,6 +76,15 @@ body {
                 top: 50px;
                 right: 0px;
                 bottom: inherit !important;
+
+                .app-version {
+                    padding: 8px 12px;
+                    display: block;
+                    cursor: default;
+                    color: #a2a2a2;
+                    font-size: $font-size-lg;
+                    border-bottom: 1px solid $border-color;
+                }
             }
         }
     }

diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -24,6 +24,7 @@
         ],
 
         'layouts' => [
+            'app-version'     => 'Version : :version',
             'dashboard'       => 'Dashboard',
             'leads'           => 'Leads',
             'quotes'          => 'Quotes',

diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
@@ -14,6 +14,8 @@
             </div>
 
             <div class="dropdown-list bottom-right">
+                <span class="app-version">{{ __('admin::app.layouts.app-version', ['version' => 'v' . config('app.version')]) }}</span>
+
                 <div class="dropdown-container">
                     <ul>
                         <li>

diff --git a/...c/Database/Migrations/2021_09_23_221138_add_column_expected_close_date_in_leads_table.php b/...c/Database/Migrations/2021_09_23_221138_add_column_expected_close_date_in_leads_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddColumnExpectedCloseDateInLeadsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('leads', function (Blueprint $table) {
+            $table->date('expected_close_date')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('leads', function (Blueprint $table) {
+            $table->dropColumn('expected_close_date');
+        });
+    }
+}
diff --git a/packages/Webkul/Lead/src/Models/Lead.php b/packages/Webkul/Lead/src/Models/Lead.php
@@ -27,6 +27,7 @@ class Lead extends Model implements LeadContract
         'lead_value',
         'status',
         'lost_reason',
+        'expected_close_date',
         'closed_at',
         'user_id',
         'person_id',

diff --git a/packages/Webkul/UI/publishable/assets/css/ui.css b/packages/Webkul/UI/publishable/assets/css/ui.css
diff --git a/packages/Webkul/UI/publishable/assets/js/ui.js b/packages/Webkul/UI/publishable/assets/js/ui.js
diff --git a/packages/Webkul/UI/publishable/assets/mix-manifest.json b/packages/Webkul/UI/publishable/assets/mix-manifest.json
@@ -1,6 +1,6 @@
 {
-    "/js/ui.js": "/js/ui.js?id=8b01185c6bd8e84ad8f6",
-    "/css/ui.css": "/css/ui.css?id=2fd41f1a3fb9e3e2a043",
+    "/js/ui.js": "/js/ui.js?id=1997fbe53c9fa1fa644b",
+    "/css/ui.css": "/css/ui.css?id=a86fe6fd721910983b0e",
     "/images/add-icon.svg": "/images/add-icon.svg?id=9135b4e0e1c239c36981",
     "/images/align-justify-icon.svg": "/images/align-justify-icon.svg?id=ee8d48e636b80417a884",
     "/images/arrow-down-icon.svg": "/images/arrow-down-icon.svg?id=7b5c03f96be72c9a0bef",

diff --git a/packages/Webkul/UI/src/Resources/assets/js/components/datagrid/filters.vue b/packages/Webkul/UI/src/Resources/assets/js/components/datagrid/filters.vue
@@ -713,6 +713,12 @@ export default {
         onSubmit: function(event) {
             this.toggleButtonDisable(true);
 
+            if (! confirm('Do you really want to perform this action?')) {
+                this.toggleButtonDisable(false);
+                
+                return;
+            }
+
             this.$validator.validateAll().then(result => {
                 if (result) {
                     this.$http[this.massActionValue.method.toLowerCase()](

diff --git a/packages/Webkul/UI/src/Resources/assets/sass/app.scss b/packages/Webkul/UI/src/Resources/assets/sass/app.scss
@@ -414,6 +414,10 @@ h5 {
                     text-overflow: unset;
                 }
 
+                &.id {
+                    width: 80px;
+                }
+
                 &.actions {
                     width: 100px;
                     text-align: right;