Merge pull request bagisto#6077 from jitendra-webkul/master

Updated changelog, fixed bagisto version display issue
hariuc · Mar 17, 2022 · 6b51678 · 6b51678
2 parents eff1410 + 0080ca4
commit 6b51678
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/.env.example b/.env.example
@@ -1,5 +1,6 @@
 APP_NAME=Bagisto
 APP_ENV=local
+APP_VERSION=1.4.1
 APP_KEY=
 APP_DEBUG=true
 APP_URL=https://localhost

diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md
@@ -2,6 +2,20 @@
 
 This changelog consists of the bug & security fixes and new features being included in the releases listed below.
 
+
+## **v1.4.1 (17th of March 2022)** - *Release*
+
+* #6040 [enhancement] - The locale dropdown should be in ascending order
+
+* #6007 [enhancement] - There should be an option to export selected product
+
+* #5923 [enhancement] - There should not be option for mass delete if there is no record in table
+
+* #6039 [fixed] - The from date should be less than to date
+
+* #6038 [fixed] - The color of checkboxes should be according to the theme in the admin panel
+
+
 ## **v1.4.0 (16th of March 2022)** - *Release*
 
 * #5654 [feature] -Only unread notification should be shown in the notification modal box. 

diff --git a/config/app.php b/config/app.php
@@ -162,6 +162,11 @@
  */
  'editor' => 'vscode',
 
+ /*
+ *Application Version
+ */
+ 'version' => env('APP_VERSION', '1.x-dev'),
+
  /**
  * Blacklisting attributes while debugging
  */

diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php
@@ -149,7 +149,7 @@ public function __construct(
  */
  public function version()
  {
- return static::BAGISTO_VERSION;
+ return config('app.version');
  }
 
  /**