chore: bump version to v3.14.2

getdokan · Dec 6, 2024 · e7c16b9 · e7c16b9
1 parent 608d126
commit e7c16b9
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### v3.13.0 ( Nov 06, 2024 ) ###
+
+- **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.

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.1  
+**Stable tag:** 3.14.2  
 **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.2 ( Dec 06, 2024 ) ###
+
+- **update:** Added commission setting option in product bulk edit for Admin.
+
 ### v3.14.1 ( Dec 04, 2024 ) ###
 
 - **fix:** Fixed a issue in the commission upgrader to deal with empty values for product and vendor.
@@ -373,11 +377,6 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 - **update:** Compatibility with the Printful Integration Module added.
 - **fix:** Improved logic to ensure the `add new category` button only appears when appropriate conditions are met, enhancing user experience.
 
-### v3.13.0 ( Nov 06, 2024 ) ###
-
-- **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
-
 
 [CHECK THE FULL CHANGELOG](https://github.com/getdokan/dokan/blob/develop/CHANGELOG.md).
 

diff --git a/dokan-class.php b/dokan-class.php
@@ -23,7 +23,7 @@ final class WeDevs_Dokan {
      *
      * @var string
      */
-    public $version = '3.14.1';
+    public $version = '3.14.2';
 
     /**
      * 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.1
+ * Version: 3.14.2
  * Author: weDevs
  * Author URI: https://dokan.co/
  * Text Domain: dokan-lite

diff --git a/includes/Admin/Hooks.php b/includes/Admin/Hooks.php
@@ -231,7 +231,7 @@ public function update_pages( $value, $name ) {
     /**
      * Add commission settings in bulk product edit.
      *
-     * @since DOKAN_SINCE
+     * @since 3.14.2
      *
      * @return void
      */
@@ -242,7 +242,7 @@ public function add_product_commission_bulk_edit_field() {
     /**
      * Save commission settings from bulk product edit
      *
-     * @since DOKAN_SINCE
+     * @since 3.14.2
      *
      * @param \WC_Product $product
      *

diff --git a/includes/Product/Hooks.php b/includes/Product/Hooks.php
@@ -551,6 +551,11 @@ public static function save_per_product_commission_options( $post_id, $data = []
 
         if ( isset( $data['_per_product_admin_additional_fee'] ) ) {
             $additional_fee = ( '' === $data['_per_product_admin_additional_fee'] ) ? '' : sanitize_text_field( $data['_per_product_admin_additional_fee'] );
+
+            if ( 0 > $additional_fee ) {
+                $additional_fee = '';
+            }
+
             $additional_fee = wc_format_decimal( $additional_fee );
         }
 

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.1\n"
+"Project-Id-Version: Dokan 3.14.2\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-12-04T09:23:45+00:00\n"
+"POT-Creation-Date: 2024-12-06T12:33:06+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"
@@ -195,7 +195,7 @@ msgstr ""
 msgid "Commision: "
 msgstr ""
 
-#: includes/Admin/Hooks.php:66
+#: includes/Admin/Hooks.php:70
 #: includes/Admin/Settings.php:590
 #: includes/Admin/Settings.php:601
 #: includes/Admin/Settings.php:612
@@ -212,16 +212,16 @@ msgstr ""
 msgid "Vendor"
 msgstr ""
 
-#: includes/Admin/Hooks.php:93
+#: includes/Admin/Hooks.php:97
 #: assets/js/vue-admin.js:2
 msgid "Select vendor"
 msgstr ""
 
-#: includes/Admin/Hooks.php:99
+#: includes/Admin/Hooks.php:103
 msgid "You can search vendors and assign them."
 msgstr ""
 
-#: includes/Admin/Hooks.php:112
+#: includes/Admin/Hooks.php:116
 msgid "Unauthorized operation"
 msgstr ""
 
@@ -698,6 +698,7 @@ msgstr ""
 #: includes/Order/Admin/Hooks.php:95
 #: includes/ReverseWithdrawal/Helper.php:65
 #: templates/orders/commission-meta-box-html.php:66
+#: templates/products/dokan-products-edit-bulk-commission.php:17
 msgid "Commission"
 msgstr ""
 
@@ -719,7 +720,7 @@ msgstr ""
 
 #: includes/Admin/Settings.php:523
 #: includes/Admin/Settings.php:563
-#: includes/Product/Hooks.php:483
+#: includes/Product/Hooks.php:484
 #: assets/js/vue-admin.js:2
 msgid "Admin Commission"
 msgstr ""
@@ -1840,7 +1841,7 @@ msgid "Delete"
 msgstr ""
 
 #: includes/Ajax.php:529
-#: includes/Product/Hooks.php:58
+#: includes/Product/Hooks.php:59
 msgid "Error: Nonce verification failed"
 msgstr ""
 
@@ -3899,6 +3900,7 @@ msgid "privacy policy"
 msgstr ""
 
 #: includes/functions.php:3256
+#: templates/products/dokan-products-edit-bulk-commission.php:28
 msgid "Fixed"
 msgstr ""
 
@@ -4556,7 +4558,7 @@ msgid "Catalog"
 msgstr ""
 
 #: includes/Product/functions.php:363
-#: includes/Product/Hooks.php:195
+#: includes/Product/Hooks.php:196
 #: templates/products/listing-filter.php:85
 msgid "Search"
 msgstr ""
@@ -4606,29 +4608,29 @@ msgstr ""
 msgid "Relevance"
 msgstr ""
 
-#: includes/Product/Hooks.php:65
+#: includes/Product/Hooks.php:66
 msgid "Products not found with this search"
 msgstr ""
 
-#: includes/Product/Hooks.php:154
+#: includes/Product/Hooks.php:155
 #: templates/orders/commission-meta-box-html.php:111
 msgid "SKU:"
 msgstr ""
 
-#: includes/Product/Hooks.php:191
+#: includes/Product/Hooks.php:192
 msgid "Enter product name"
 msgstr ""
 
-#: includes/Product/Hooks.php:199
+#: includes/Product/Hooks.php:200
 msgid "Shop order"
 msgstr ""
 
-#: includes/Product/Hooks.php:417
+#: includes/Product/Hooks.php:418
 msgid "As this is your own product, the \"Add to Cart\" button has been removed. Please visit as a guest to view it."
 msgstr ""
 
-#: includes/Product/Hooks.php:487
 #: includes/Product/Hooks.php:488
+#: includes/Product/Hooks.php:489
 #: assets/js/vue-admin.js:2
 msgid "When the value is 0, no commissions will be deducted from this vendor."
 msgstr ""
@@ -7465,6 +7467,7 @@ msgid "Reviews cannot be posted for products that you own."
 msgstr ""
 
 #: includes/wc-template.php:171
+#: templates/products/dokan-products-edit-bulk-commission.php:20
 msgid "— No change —"
 msgstr ""
 
@@ -9065,6 +9068,10 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
+#: templates/products/dokan-products-edit-bulk-commission.php:21
+msgid "Change to:"
+msgstr ""
+
 #: templates/products/download-virtual.php:4
 #: templates/products/products-listing-row.php:245
 msgid "Downloadable"

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.1",
+  "version": "3.14.2",
   "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.1
+Stable tag: 3.14.2
 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.2 ( Dec 06, 2024 ) =
+
+- **update:** Added commission setting option in product bulk edit for Admin.
+
 = v3.14.1 ( Dec 04, 2024 ) =
 
 - **fix:** Fixed a issue in the commission upgrader to deal with empty values for product and vendor.
@@ -373,11 +377,6 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 - **update:** Compatibility with the Printful Integration Module added.
 - **fix:** Improved logic to ensure the `add new category` button only appears when appropriate conditions are met, enhancing user experience.
 
-= v3.13.0 ( Nov 06, 2024 ) =
-
-- **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
-
 
 [CHECK THE FULL CHANGELOG](https://github.com/getdokan/dokan/blob/develop/CHANGELOG.md).
 

diff --git a/templates/products/dokan-products-edit-bulk-commission.php b/templates/products/dokan-products-edit-bulk-commission.php
@@ -3,16 +3,15 @@
 /**
  * Template Name: Dokan commission setting bulk product edit
  *
- * @since DOKAN_SINCE
+ * @since 3.14.2
  *
  * @package Dokan
  */
 
 use WeDevs\Dokan\Commission\Formula\Fixed;
 ?>
 
-<div class="inline-edit-col" style="float: left">
-    <h4><?php esc_html_e( 'Commission settings', 'dokan-lite' ); ?></h4>
+<div class="inline-edit-col">
     <div class="inline-edit-group">
         <label class="alignleft">
             <span class="title"><?php esc_html_e( 'Commission', 'dokan-lite' ); ?></span>

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.2',
+        'released' => '2024-12-06',
+        'changes'  => [
+            'Fix'  => [
+                [
+                    'title'       => 'Added commission setting option in product bulk edit for Admin.',
+                    'description' => '',
+                ],
+            ],
+        ],
+    ],
     [
         'version'  => 'Version 3.14.1',
         'released' => '2024-12-04',