Merge branch 'release/3.7.3'

getdokan · Oct 27, 2022 · c0896c3 · c0896c3
2 parents ace5c09 + 90990c5
commit c0896c3
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 **WC requires at least:** 5.0.0  
 **WC tested up to:** 7.0.0  
 **Requires PHP:** 7.0  
-**Stable tag:** 3.7.2  
+**Stable tag:** 3.7.3  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -313,13 +313,17 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 ## Changelog ##
 
+### v3.7.3 ( Oct 27, 2022 ) ###
+
+- **fix:** Fixed a fatal error due to a function moved from dokan pro
+
 ### v3.7.2 ( Oct 27, 2022 ) ###
 
-**new:** Added a new filter hooked named `dokan_rest_api_store_collection_params` for StoreController request parameters
-**new:** Introduced `dokanVendorFilterSectionStart` and `DokanGetVendorArgs` js filter hooks
-**fix:** [AdminCommission] - Percentage Commission does not support "comma" as decimal separator under Dokan admin settings `Selling Options` page
-**fix:** [Products] Product author is assigned to the shop manager when the shop manager publishes a product drafted by the admin.
-**fix:** Spaces between paragraphs are too large under the store terms and condition page.
+- **new:** Added a new filter hooked named `dokan_rest_api_store_collection_params` for StoreController request parameters
+- **new:** Introduced `dokanVendorFilterSectionStart` and `DokanGetVendorArgs` js filter hooks
+- **fix:** [AdminCommission] - Percentage Commission does not support "comma" as decimal separator under Dokan admin settings `Selling Options` page
+- **fix:** [Products] Product author is assigned to the shop manager when the shop manager publishes a product drafted by the admin.
+- **fix:** Spaces between paragraphs are too large under the store terms and condition page.
 
 ### v3.7.1 ( Oct 11, 2022 ) ###
 

diff --git a/dokan.php b/dokan.php
@@ -3,7 +3,7 @@
  * 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.7.2
+ * Version: 3.7.3
  * Author: weDevs
  * Author URI: https://wedevs.com/
  * Text Domain: dokan-lite
@@ -56,7 +56,7 @@ final class WeDevs_Dokan {
      *
      * @var string
      */
-    public $version = '3.7.2';
+    public $version = '3.7.3';
 
     /**
      * Instance of self

diff --git a/includes/Admin/functions.php b/includes/Admin/functions.php
@@ -49,27 +49,29 @@ function dokan_override_product_author( $product, $seller_id ) {
     do_action( 'dokan_after_override_product_author', $product, $seller_id );
 }
 
-/**
- * Overrides author for products with variations.
- *
- * @since 3.7.1
- *
- * @param WC_Product $product
- * @param int        $seller_id
- *
- * @return void
- */
-function dokan_override_author_for_variations( $product, $seller_id ) {
-    if ( 'variable' === $product->get_type() || 'variable-subscription' === $product->get_type() ) {
-        $variations = $product->get_children();
-
-        foreach ( $variations as $variation_id ) {
-            wp_update_post(
-                [
-                    'ID'          => $variation_id,
-                    'post_author' => $seller_id,
-                ]
-            );
+if ( ! function_exists( 'dokan_override_author_for_variations' ) ) {
+    /**
+     * Overrides author for products with variations.
+     *
+     * @since 3.7.1
+     *
+     * @param WC_Product $product
+     * @param int        $seller_id
+     *
+     * @return void
+     */
+    function dokan_override_author_for_variations( $product, $seller_id ) {
+        if ( 'variable' === $product->get_type() || 'variable-subscription' === $product->get_type() ) {
+            $variations = $product->get_children();
+
+            foreach ( $variations as $variation_id ) {
+                wp_update_post(
+                    [
+                        'ID'          => $variation_id,
+                        'post_author' => $seller_id,
+                    ]
+                );
+            }
         }
     }
 }

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.7.2\n"
+"Project-Id-Version: Dokan 3.7.3\n"
 "Report-Msgid-Bugs-To: https://wedevs.com/contact/\n"
-"POT-Creation-Date: 2022-10-27 04:52:26+00:00\n"
+"POT-Creation-Date: 2022-10-27 08:37:52+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1476,30 +1476,30 @@ msgstr ""
 msgid "This vendor will be marked as a featured vendor."
 msgstr ""
 
-#: includes/Admin/functions.php:239 includes/Admin/functions.php:506
+#: includes/Admin/functions.php:241 includes/Admin/functions.php:508
 #: includes/REST/AdminReportController.php:140
 msgid "Total Sales"
 msgstr ""
 
-#: includes/Admin/functions.php:246 includes/Admin/functions.php:513
+#: includes/Admin/functions.php:248 includes/Admin/functions.php:515
 msgid "Total: "
 msgstr ""
 
-#: includes/Admin/functions.php:249 includes/Admin/functions.php:516
+#: includes/Admin/functions.php:251 includes/Admin/functions.php:518
 #: includes/REST/AdminReportController.php:148 includes/reports.php:365
 msgid "Number of orders"
 msgstr ""
 
-#: includes/Admin/functions.php:256 includes/Admin/functions.php:523
+#: includes/Admin/functions.php:258 includes/Admin/functions.php:525
 msgid "sales"
 msgstr ""
 
-#: includes/Admin/functions.php:259 includes/Admin/functions.php:526
+#: includes/Admin/functions.php:261 includes/Admin/functions.php:528
 #: includes/REST/AdminReportController.php:155
 msgid "Commision"
 msgstr ""
 
-#: includes/Admin/functions.php:266 includes/Admin/functions.php:533
+#: includes/Admin/functions.php:268 includes/Admin/functions.php:535
 msgid "Commision: "
 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.7.2",
+  "version": "3.7.3",
   "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.0.3
 WC requires at least: 5.0.0
 WC tested up to: 7.0.0
 Requires PHP: 7.0
-Stable tag: 3.7.2
+Stable tag: 3.7.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -313,13 +313,17 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 == Changelog ==
 
+= v3.7.3 ( Oct 27, 2022 ) =
+
+- **fix:** Fixed a fatal error due to a function moved from dokan pro
+
 = v3.7.2 ( Oct 27, 2022 ) =
 
-**new:** Added a new filter hooked named `dokan_rest_api_store_collection_params` for StoreController request parameters
-**new:** Introduced `dokanVendorFilterSectionStart` and `DokanGetVendorArgs` js filter hooks
-**fix:** [AdminCommission] - Percentage Commission does not support "comma" as decimal separator under Dokan admin settings `Selling Options` page
-**fix:** [Products] Product author is assigned to the shop manager when the shop manager publishes a product drafted by the admin.
-**fix:** Spaces between paragraphs are too large under the store terms and condition page.
+- **new:** Added a new filter hooked named `dokan_rest_api_store_collection_params` for StoreController request parameters
+- **new:** Introduced `dokanVendorFilterSectionStart` and `DokanGetVendorArgs` js filter hooks
+- **fix:** [AdminCommission] - Percentage Commission does not support "comma" as decimal separator under Dokan admin settings `Selling Options` page
+- **fix:** [Products] Product author is assigned to the shop manager when the shop manager publishes a product drafted by the admin.
+- **fix:** Spaces between paragraphs are too large under the store terms and condition page.
 
 = v3.7.1 ( Oct 11, 2022 ) =
 

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.7.3',
+        'released' => '2022-10-27',
+        'changes'  => [
+            'New' => [
+                [
+                    'title'       => 'Fixed a fatal error due to a function moved from dokan pro',
+                    'description' => '',
+                ],
+            ],
+        ],
+    ],
     [
         'version'  => 'Version 3.7.2',
         'released' => '2022-10-27',