Merge branch 'release/3.10.3' into develop

shashwatahalder01 · Apr 17, 2024 · bf43e48 · bf43e48
2 parents a45b81c + 0abae61
commit bf43e48
Show file tree

Hide file tree

Showing 21 changed files with 428 additions and 323 deletions.
diff --git a/README.md b/README.md
@@ -3,11 +3,11 @@
 **Donate Link:** http://tareq.co/donate/  
 **Tags:** WooCommerce multivendor marketplace, multi vendor marketplace, multi seller store, multi-vendor, multi seller, commissions, multivendor, marketplace, product vendors, woocommerce vendor, commission rate, e-commerce, woocommerce, ebay, ecommerce.  
 **Requires at least:** 5.6  
-**Tested up to:** 6.5  
+**Tested up to:** 6.5.2  
 **WC requires at least:** 5.0.0  
 **WC tested up to:** 8.7.0  
 **Requires PHP:** 7.4  
-**Stable tag:** 3.10.2  
+**Stable tag:** 3.10.3  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -338,6 +338,21 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 ## Changelog ##
 
+### v3.10.3 ( Apr 17, 2024 ) ###
+
+- **update:** Notification count support added for vendor dashboard
+- **update:** added a new filter to set a default value for I am a customer / I am a vendor radio button
+- **update:** Processing Order count added for vendor dashboard orders menu
+- **update:** Performance improvements for vendor dashboard -> order details page -> downloadable product permission section
+- **update:** Admin can change product author from REST API
+    Previously, product_author was read-only property, now admin can change product_author for an existing product or create a new product for another author.
+- **update:** Warning message styling for selecting fixed cart discount on admin coupon add edit page
+- **fix:** Advertisement product not purchasable for own product purchasing restriction
+- **fix:** Header Template number one breaks without background image
+- **fix:** html entity showing in product tag selection in vendor dashboard.
+- **fix:** Vendor add notification switch in admin dashboard
+- **fix:** Under wooCommerce my-account registration section, `I am a customer` was forced to be set as the default value. With this PR this problem has been fixed.
+
 ### v3.10.2 ( Apr 01, 2024 ) ###
 
 - **update:** Email placeholder, additional content support and formatting added

diff --git a/assets/css/global-admin.css b/assets/css/global-admin.css
@@ -262,4 +262,9 @@
 .dokan-admin-notices-wrap .slide-prev-leave-to {
   transform: translate(100%);
 }
+#woocommerce-coupon-data #coupon_options #general_coupon_data #fixed-cart-discount-warning {
+  display: block;
+  padding: 0;
+  color: #cc0000;
+}
 
diff --git a/assets/css/style.css b/assets/css/style.css
@@ -4644,6 +4644,16 @@ div.media-sidebar a.edit-attachment {
   background-size: 100% 100%;
   background-repeat: no-repeat;
 }
+.dokan-single-store .profile-frame .profile-info-box.profile-layout-default .profile-info-img {
+  height: 100% !important;
+  object-fit: cover;
+}
+.dokan-single-store .profile-frame .profile-info-box.profile-layout-default .profile-info-img.dummy-image {
+  position: absolute;
+  left: 0;
+  top: 0;
+  background-size: cover;
+}
 .dokan-single-store .profile-frame .profile-info-box .profile-info-summery-wrapper {
   position: absolute;
   top: 0;

diff --git a/assets/js/dokan.js b/assets/js/dokan.js
diff --git a/assets/js/vendor-registration.js b/assets/js/vendor-registration.js
diff --git a/assets/js/vue-admin.js b/assets/js/vue-admin.js
diff --git a/assets/js/vue-bootstrap.js b/assets/js/vue-bootstrap.js
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.10.2
+ * Version: 3.10.3
  * Author: weDevs
  * Author URI: https://dokan.co/
  * Text Domain: dokan-lite
@@ -66,7 +66,7 @@ final class WeDevs_Dokan {
      *
      * @var string
      */
-    public $version = '3.10.2';
+    public $version = '3.10.3';
 
     /**
      * Instance of self

diff --git a/includes/Abstracts/DokanRESTController.php b/includes/Abstracts/DokanRESTController.php
@@ -454,7 +454,7 @@ public function format_collection_response( $response, $request, $total_items )
     /**
      * Update post author if requested.
      *
-     * @since DOKAN_SINCE
+     * @since 3.10.3
      *
      * @param WP_REST_Request $request Request object.
      * @param int $object_id Object ID.

diff --git a/includes/Dashboard/Templates/Main.php b/includes/Dashboard/Templates/Main.php
@@ -45,7 +45,7 @@ public static function dashboard_side_navigation() {
     /**
      * Adds notification count to menu and submenu of vendor dashboard
      *
-     * @since DOKAN_SINCE
+     * @since 3.10.3
      *
      * @param string $menu_title Menu title
      * @param array $menu_details Menu details array
@@ -58,7 +58,7 @@ public function add_notification_count( string $menu_title, array $menu_details
             /**
              * Notification count filter
              *
-             * @since DOKAN_SINCE
+             * @since 3.10.3
              *
              * @param int $notification_counts Number of notifications for menu & submenu
              * @param array $menu_details Details for menu and submenu

diff --git a/includes/Dashboard/Templates/Orders.php b/includes/Dashboard/Templates/Orders.php
@@ -347,7 +347,7 @@ private function add_pagination_info( $limit, $page, $order_count ) {
     /**
      * Add pending order count to dashboard menu.
      *
-     * @since DOKAN_SINCE
+     * @since 3.10.3
      *
      * @param array $menu Menu Array.
      *

diff --git a/includes/Order/Ajax.php b/includes/Order/Ajax.php
@@ -10,15 +10,15 @@
 /**
  * Class Ajax
  *
- * @since DOKAN_SINCE
+ * @since 3.10.3
  *
  * @package WeDevs\Dokan\Order
  */
 class Ajax {
     /**
      * Class constructor
      *
-     * @since DOKAN_SINCE
+     * @since 3.10.3
      *
      * @return void
      */
@@ -29,7 +29,7 @@ public function __construct() {
     /**
      * Search downloadable products
      *
-     * @since DOKAN_SINCE
+     * @since 3.10.3
      *
      * @return void
      */

diff --git a/includes/REST/ProductController.php b/includes/REST/ProductController.php
@@ -599,7 +599,7 @@ public function get_latest_product( $request ) {
     /**
      * Validate post author overrides.
      *
-     * @since DOKAN_SINCE
+     * @since 3.10.3
      *
      * @param WP_REST_Request $request Request object.
      * @param int $store_id fallback Store or author id.

diff --git a/includes/functions-dashboard-navigation.php b/includes/functions-dashboard-navigation.php
@@ -242,7 +242,7 @@ function dokan_dashboard_nav( $active_menu = '' ) {
                 /**
                  * Filters a menu key according to slug if needed.
                  *
-                 * @since DOKAN_SINCE
+                 * @since 3.10.3
                  *
                  * @param string $submenu_key
                  * @param string $menu_key

diff --git a/includes/template-tags.php b/includes/template-tags.php
@@ -685,7 +685,7 @@ function dokan_store_contact_widget() {
 /**
  * Get seller registration form default role
  *
- * @since DOKAN_SINCE
+ * @since 3.10.3
  *
  * @return string values can be 'customer' or 'seller'
  */

diff --git a/includes/wc-functions.php b/includes/wc-functions.php
@@ -1019,7 +1019,7 @@ function dokan_vendor_own_product_purchase_restriction( bool $is_purchasable, $p
      * the vendor is attempting to purchase their own product. It can be used to restrict
      * or allow such purchases according to business rules.
      *
-     * @since DOKAN_SINCE
+     * @since 3.10.3
      *
      * @param bool    $is_purchasable Indicates if the product is purchasable. True by default.
      * @param WP_Post $product        The product object being evaluated for purchasability.