Merge branch 'release/3.0.15'

getdokan · Nov 21, 2020 · 3f95554 · 3f95554
2 parents 7f7eec4 + 98033b4
commit 3f95554
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [3.0.15](https://github.com/weDevsOfficial/dokan/compare/v3.0.14...v3.0.15) (2020-11-21)
+
+
+### Bug Fixes
+
+* timezone mismatch ([6d14173](https://github.com/weDevsOfficial/dokan/commit/6d1417311e7efab85b0a3bc4d80d1614cf8835f5))
+
+
+
 ## [3.0.14](https://github.com/weDevsOfficial/dokan/compare/v3.0.13...v3.0.14) (2020-11-20)
 
 

diff --git a/README.md b/README.md
@@ -5,9 +5,9 @@
 **Requires at least:** 4.4  
 **Tested up to:** 5.5.3  
 **WC requires at least:** 3.0  
-**WC tested up to:** 4.6  
+**WC tested up to:** 4.7.0  
 **Requires PHP:** 5.6  
-**Stable tag:** 3.0.14  
+**Stable tag:** 3.0.15  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -291,6 +291,10 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 ## Changelog ##
 
+## v3.0.15 (November 21, 2020) ##
+
+- **fix** updated codebase to fix timezone mismatch
+
 ## v3.0.14 (November 20, 2020) ##
 
 - **fix** Vendor edit admin commission on decimal separator as comma

diff --git a/dokan.php b/dokan.php
@@ -3,12 +3,12 @@
  * Plugin Name: Dokan
  * Plugin URI: https://wordpress.org/plugins/dokan-lite/
  * Description: An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs.
- * Version: 3.0.14
+ * Version: 3.0.15
  * Author: weDevs
  * Author URI: https://wedevs.com/
  * Text Domain: dokan-lite
  * WC requires at least: 3.0
- * WC tested up to: 4.4.1
+ * WC tested up to: 4.7.0
  * Domain Path: /languages/
  * License: GPL2
  */
@@ -56,7 +56,7 @@ final class WeDevs_Dokan {
      *
      * @var string
      */
-    public $version = '3.0.14';
+    public $version = '3.0.15';
 
     /**
      * Instance of self

diff --git a/includes/Admin/LimitedTimePromotion.php b/includes/Admin/LimitedTimePromotion.php
@@ -199,7 +199,7 @@ public function dismiss_limited_time_promo() {
      * @return string
      */
     private function get_current_time_est() {
-        $dt = new \DateTime( current_time( 'mysql' ), new \DateTimeZone( 'UTC' ) );
+        $dt = new \DateTime( 'now', new \DateTimeZone( 'UTC' ) );
         $dt->setTimezone( new \DateTimeZone( 'EST' ) );
 
         return $dt->format( 'Y-m-d H:i:s T' );

diff --git a/languages/dokan-lite.pot b/languages/dokan-lite.pot
@@ -2,9 +2,9 @@
 # This file is distributed under the GPL2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Dokan 3.0.14\n"
+"Project-Id-Version: Dokan 3.0.15\n"
 "Report-Msgid-Bugs-To: https://wedevs.com/contact/\n"
-"POT-Creation-Date: 2020-11-20 14:54:50+00:00\n"
+"POT-Creation-Date: 2020-11-21 16:13:13+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dokan",
-  "version": "3.0.14",
+  "version": "3.0.15",
   "description": "A WordPress marketplace plugin",
   "author": "weDevs",
   "license": "GPL",

diff --git a/readme.txt b/readme.txt
@@ -5,9 +5,9 @@ Tags: WooCommerce multivendor marketplace, multi vendor marketplace, multi selle
 Requires at least: 4.4
 Tested up to: 5.5.3
 WC requires at least: 3.0
-WC tested up to: 4.6
+WC tested up to: 4.7.0
 Requires PHP: 5.6
-Stable tag: 3.0.14
+Stable tag: 3.0.15
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -291,6 +291,10 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 == Changelog ==
 
+== v3.0.15 (November 21, 2020) ==
+
+- **fix** updated codebase to fix timezone mismatch
+
 == v3.0.14 (November 20, 2020) ==
 
 - **fix** Vendor edit admin commission on decimal separator as comma