Merge branch 'release/3.14.1'

getdokan · Dec 4, 2024 · baf4c12 · baf4c12
2 parents eaf9065 + b1dc551
commit baf4c12
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+### v3.12.6 ( Oct 24, 2024 ) ###
+
+- **fix:** Fixed js error on frontend pages.
+
+### v3.12.5 ( Oct 16, 2024 ) ###
+
+- **fix:** Implement order trash and untrash handling for Dokan
+- **fix:** Added wordpress native i18n support
+
+### v3.12.4 ( Oct 03, 2024 ) ###
+
+- **update:** Added `$data` parameter to `dokan_update_vendor` hook.
+
 ### v3.12.3 ( Sep 30, 2024 ) ###
 
 - **update:** Added compatibility with RFQ state field ui.

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 **WC requires at least:** 8.0.0  
 **WC tested up to:** 9.4.2  
 **Requires PHP:** 7.4  
-**Stable tag:** 3.14.0  
+**Stable tag:** 3.14.1  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -347,6 +347,10 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 ## Changelog ##
 
+### v3.14.1 ( Dec 04, 2024 ) ###
+
+- **fix:** Fixed a issue in the commission upgrader to deal with empty values for product and vendor.
+
 ### v3.14.0 ( Dec 02, 2024 ) ###
 
 - **new:** Commission amount now displayed in the product list within the admin dashboard.
@@ -355,7 +359,6 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 - **new:** Commission details metabox on the order details page in the admin dashboard is now visible for child orders or orders without a parent.
 - **new:** Related order metabox on the order details page in the admin dashboard, displaying sibling orders for child orders and child orders for parent orders.
 - **new:** Backward compatibility for flat, percentage, and combine commission types for older orders.
-- **new:** A new color palette is introduced for store color "Purple Pulse"
 - **update:** Updated commission types from flat, percentage, and combine to fixed and category-based commissions.
 - **update:** Overhauled the commission UI across Dokan global settings, vendor settings, product settings, Dokan subscription product settings, and the admin setup wizard.
 - **update:** Updated the commission settings in the admin setup wizard.
@@ -375,20 +378,8 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 - **feat:** Replaced the Dokan array container with the League Container, ensuring backward compatibility for seamless performance and enhanced flexibility.
 - **feat:** Updated Dokan to be fully compatible with WooCommerce Analytics Reports
 
-### v3.12.6 ( Oct 24, 2024 ) ###
-
-- **fix:** Fixed js error on frontend pages.
-
-### v3.12.5 ( Oct 16, 2024 ) ###
-
-- **fix:** Implement order trash and untrash handling for Dokan
-- **fix:** Added wordpress native i18n support
-
-### v3.12.4 ( Oct 03, 2024 ) ###
-
-- **update:** Added `$data` parameter to `dokan_update_vendor` hook.
 
-[CHECK THE FULL CHANGELOG](https://github.com/getdokan/dokan/blob/ac8cfe42ed6d13a34572571728281591ebbf706f/CHANGELOG.md).
+[CHECK THE FULL CHANGELOG](https://github.com/getdokan/dokan/blob/develop/CHANGELOG.md).
 
 ## Upgrade Notice ##
 

diff --git a/dokan-class.php b/dokan-class.php
@@ -23,7 +23,7 @@ final class WeDevs_Dokan {
      *
      * @var string
      */
-    public $version = '3.14.0';
+    public $version = '3.14.1';
 
     /**
      * Instance of self

diff --git a/dokan.php b/dokan.php
@@ -3,7 +3,7 @@
  * Plugin Name: Dokan
  * Plugin URI: https://dokan.co/wordpress/
  * Description: An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs.
- * Version: 3.14.0
+ * Version: 3.14.1
  * Author: weDevs
  * Author URI: https://dokan.co/
  * Text Domain: dokan-lite

diff --git a/includes/Commission/Upugrader/Update_Category_Commission.php b/includes/Commission/Upugrader/Update_Category_Commission.php
@@ -195,11 +195,11 @@ public function process_single_category( $term_id ) {
             ];
 
             if ( Flat::SOURCE === $commission_type ) {
-                $category_commission_item['percentage'] = 0;
+                $category_commission_item['percentage'] = '';
                 $category_commission_item['flat'] = $commission;
             } elseif ( Percentage::SOURCE === $commission_type ) {
                 $category_commission_item['percentage'] = $commission;
-                $category_commission_item['flat'] = 0;
+                $category_commission_item['flat'] = '';
             }
 
             $category_commission['items'][ $term_id ] = $category_commission_item;

diff --git a/includes/Commission/Upugrader/Update_Product_Commission.php b/includes/Commission/Upugrader/Update_Product_Commission.php
@@ -187,13 +187,14 @@ public function process_single_product( $product_id ) {
         $commission = dokan()->product->get_commission_settings( $product_id );
 
         $commission_type_old = $commission->get_type();
+
         $commission->set_type( Fixed::SOURCE );
 
         if ( Flat::SOURCE === $commission_type_old ) {
             $commission->set_flat( $commission->get_percentage() );
-            $commission->set_percentage( 0 );
+            $commission->set_percentage( '' );
         } elseif ( Percentage::SOURCE === $commission_type_old ) {
-            $commission->set_flat( 0 );
+            $commission->set_flat( '' );
         }
 
         dokan()->product->save_commission_settings(

diff --git a/includes/Commission/Upugrader/Update_Vendor_Commission.php b/includes/Commission/Upugrader/Update_Vendor_Commission.php
@@ -143,11 +143,11 @@ public function process_single_vendor( $vendor_id ) {
             $percentage = $commission->get_percentage();
 
             if ( Flat::SOURCE === $commission_type_old ) {
-                $commission->set_percentage( 0 );
+                $commission->set_percentage( '' );
                 $commission->set_flat( $percentage );
             } elseif ( Percentage::SOURCE === $commission_type_old ) {
                 $commission->set_percentage( $percentage );
-                $commission->set_flat( 0 );
+                $commission->set_flat( '' );
             }
 
             $vendor->save_commission_settings(

diff --git a/includes/Upgrade/AdminNotice.php b/includes/Upgrade/AdminNotice.php
@@ -37,7 +37,7 @@ public static function show_notice( $notices ) {
         $notices[] = [
             'type'              => 'info',
             'title'             => __( 'Dokan Data Update Required', 'dokan-lite' ),
-            'description'       => __( 'Updating your Dokan data is required to continue functional operations.', 'dokan-lite' ),
+            'description'       => __( 'Updating your Dokan data is required to continue functional operations. Kindly backup your database before running upgrade for safety.', 'dokan-lite' ),
             'priority'          => 1,
             'scope'             => 'global',
             'actions'           => [

diff --git a/languages/dokan-lite.pot b/languages/dokan-lite.pot
@@ -1,14 +1,14 @@
 # Copyright (c) 2024 weDevs Pte. Ltd. All Rights Reserved.
 msgid ""
 msgstr ""
-"Project-Id-Version: Dokan 3.14.0\n"
+"Project-Id-Version: Dokan 3.14.1\n"
 "Report-Msgid-Bugs-To: https://dokan.co/contact/\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-11-29T10:41:37+00:00\n"
+"POT-Creation-Date: 2024-12-04T09:23:45+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: dokan-lite\n"
@@ -6827,7 +6827,7 @@ msgid "Dokan Data Update Required"
 msgstr ""
 
 #: includes/Upgrade/AdminNotice.php:40
-msgid "Updating your Dokan data is required to continue functional operations."
+msgid "Updating your Dokan data is required to continue functional operations. Kindly backup your database before running upgrade for safety."
 msgstr ""
 
 #: includes/Upgrade/AdminNotice.php:46
@@ -8275,6 +8275,7 @@ msgstr ""
 msgid "Your product %s"
 msgstr ""
 
+#. translators: 1) product title
 #: templates/emails/plain/product-published.php:25
 msgid "has been approved by one of our admin, congrats!"
 msgstr ""

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.14.0",
+  "version": "3.14.1",
   "description": "A WordPress marketplace plugin",
   "author": "weDevs",
   "license": "GPL",

diff --git a/readme.txt b/readme.txt
@@ -7,7 +7,7 @@ Tested up to: 6.7.1
 WC requires at least: 8.0.0
 WC tested up to: 9.4.2
 Requires PHP: 7.4
-Stable tag: 3.14.0
+Stable tag: 3.14.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -347,6 +347,10 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 == Changelog ==
 
+= v3.14.1 ( Dec 04, 2024 ) =
+
+- **fix:** Fixed a issue in the commission upgrader to deal with empty values for product and vendor.
+
 = v3.14.0 ( Dec 02, 2024 ) =
 
 - **new:** Commission amount now displayed in the product list within the admin dashboard.
@@ -374,20 +378,8 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 - **feat:** Replaced the Dokan array container with the League Container, ensuring backward compatibility for seamless performance and enhanced flexibility.
 - **feat:** Updated Dokan to be fully compatible with WooCommerce Analytics Reports
 
-= v3.12.6 ( Oct 24, 2024 ) =
-
-- **fix:** Fixed js error on frontend pages.
-
-= v3.12.5 ( Oct 16, 2024 ) =
-
-- **fix:** Implement order trash and untrash handling for Dokan
-- **fix:** Added wordpress native i18n support
-
-= v3.12.4 ( Oct 03, 2024 ) =
-
-- **update:** Added `$data` parameter to `dokan_update_vendor` hook.
 
-[CHECK THE FULL CHANGELOG](https://github.com/getdokan/dokan/blob/ac8cfe42ed6d13a34572571728281591ebbf706f/CHANGELOG.md).
+[CHECK THE FULL CHANGELOG](https://github.com/getdokan/dokan/blob/develop/CHANGELOG.md).
 
 == Upgrade Notice ==
 

diff --git a/templates/whats-new.php b/templates/whats-new.php
@@ -3,6 +3,18 @@
  * When you are adding new version please follow this sequence for changes: New Feature, New, Improvement, Fix...
  */
 $changelog = [
+    [
+        'version'  => 'Version 3.14.1',
+        'released' => '2024-12-04',
+        'changes'  => [
+            'Fix'  => [
+                [
+                    'title'       => 'Fixed a issue in the commission upgrader to deal with empty values for product and vendor.',
+                    'description' => '',
+                ],
+            ],
+        ],
+    ],
     [
         'version'  => 'Version 3.14.0',
         'released' => '2024-12-02',