Merge branch 'release/3.7.5'

Gruntfile.js

@@ -74,6 +74,7 @@ module.exports = function(grunt) {
             '!<%= dirs.devJsSrc %>/reverse-withdrawal.js',
             '!<%= dirs.devJsSrc %>/product-category-ui.js',
             '!<%= dirs.devJsSrc %>/dokan-admin-product.js',
+            '!<%= dirs.devJsSrc %>/dokan-frontend.js',
           ],
           '<%= dirs.js %>/login-form-popup.js': [
             '<%= dirs.devJsSrc %>/login-form-popup.js'
@@ -97,6 +98,12 @@ module.exports = function(grunt) {
         files: {
           '<%= dirs.js %>/helper.js': '<%= dirs.devJsSrc %>/helper.js'
         }
+      },
+
+      dokan_frontend: {
+        files: {
+          '<%= dirs.js %>/dokan-frontend.js': '<%= dirs.devJsSrc %>/dokan-frontend.js'
+        }
       }
 
     },

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, yith, yithemes  
 **Requires at least:** 5.4  
-**Tested up to:** 6.0.3  
+**Tested up to:** 6.1  
 **WC requires at least:** 5.0.0  
-**WC tested up to:** 7.0.0  
-**Requires PHP:** 7.0  
-**Stable tag:** 3.7.4  
+**WC tested up to:** 7.0.1  
+**Requires PHP:** 7.2  
+**Stable tag:** 3.7.5  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -313,6 +313,19 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 ## Changelog ##
 
+### v3.7.5 ( Nov 03, 2022 ) ###
+
+- **new:** Added a new hook named dokan_store_product_search_results to filter out store product search results closes
+- **update:** Sort product categories under the vendor dashboard alphabetically
+- **fix:** SweetAlert library is conflicting with the WooCommerce Conversion Tracking plugin
+- **fix:** [BestSellingProductWidget] Products are being shown on the widget even when the catalog visibility is set to hidden.
+- **fix:** [VendorDashboardProducts] Products of different statuses are not displayed in the appropriate tab from the vendor dashboard.
+- **fix:** [ProductCategoryWidget] Sub Category dropdown on the Dokan Product Category widget doesn't work
+- **fix:** [AdminProduct] When editing a product in the WordPress backend, the vendor select dropdown doesn't contain any data.
+- **fix:** Fixed a fatal error on the report page if the same day is selected for both the start and end date to generate reports
+- **fix:** [VendorSoreSettings] Store settings update button wasn't working if the Dokan Pro plugin isn't activated.
+- **fix:** Store filtering using category was not working
+
 ### v3.7.4 ( Oct 27, 2022 ) ###
 
 - **fix:** Fixed a fatal error update updating to Dokan if Dokan Pro version is outdated

assets/css/style.css

@@ -1909,45 +1909,45 @@ span.error {
 .dokan-category-menu ul li {
   border-bottom: none;
 }
-.dokan-category-menu #cat-drop-stack ul .children {
+.dokan-category-menu .cat-drop-stack ul .children {
   display: none;
 }
-.dokan-category-menu #cat-drop-stack ul li:last-child a {
+.dokan-category-menu .cat-drop-stack ul li:last-child a {
   border-bottom: none !important;
 }
-.dokan-category-menu #cat-drop-stack ul li:last-child.has-children a {
+.dokan-category-menu .cat-drop-stack ul li:last-child.has-children a {
   border-bottom: 1px solid #eee !important;
 }
-.dokan-category-menu #cat-drop-stack > ul {
+.dokan-category-menu .cat-drop-stack > ul {
   padding: 0px;
   margin: 0px;
 }
-.dokan-category-menu #cat-drop-stack > ul li {
+.dokan-category-menu .cat-drop-stack > ul li {
   padding: 0;
 }
-.dokan-category-menu #cat-drop-stack > ul li.parent-cat-wrap {
+.dokan-category-menu .cat-drop-stack > ul li.parent-cat-wrap {
   background: #fff;
 }
-.dokan-category-menu #cat-drop-stack > ul li.parent-cat-wrap a {
+.dokan-category-menu .cat-drop-stack > ul li.parent-cat-wrap a {
   border-bottom: 1px solid #eee;
   margin: 0px 15px;
   text-decoration: none;
 }
-.dokan-category-menu #cat-drop-stack > ul li.parent-cat-wrap ul.level-0 {
+.dokan-category-menu .cat-drop-stack > ul li.parent-cat-wrap ul.level-0 {
   background: #fafafa;
 }
-.dokan-category-menu #cat-drop-stack > ul li.parent-cat-wrap ul.level-0 li.has-children {
+.dokan-category-menu .cat-drop-stack > ul li.parent-cat-wrap ul.level-0 li.has-children {
   border-bottom: none;
 }
-.dokan-category-menu #cat-drop-stack > ul li a {
+.dokan-category-menu .cat-drop-stack > ul li a {
   padding: 9px 0px;
   display: block;
   color: #3c3c3c;
   position: relative;
   font-size: 13px;
   text-decoration: none;
 }
-.dokan-category-menu #cat-drop-stack > ul li a .caret-icon {
+.dokan-category-menu .cat-drop-stack > ul li a .caret-icon {
   position: absolute;
   right: -2px;
   display: inline-block;

assets/js/dokan-admin-product.js

@@ -64,11 +64,11 @@ dokanWebpack([7],{
       });
     },
     init: function init() {
-      dokan_admin.vendor_selectwoo('.dokan_product_author_override');
+      this.searchVendors('.dokan_product_author_override');
     }
   };
-  $(document).ready(function () {
-    window.dokan_admin.vendor_selectwoo = DokanAdminProduct.searchVendors;
+  $(function () {
+    // DOM Ready - Let's invoke the init method
     DokanAdminProduct.init();
   });
 })(jQuery);

assets/js/dokan-frontend.js

@@ -0,0 +1,72 @@
+;(function($, document, window) {
+  // this file will load on every pages on frontend
+  const DOKAN_FRONTEND_SCRIPT = {
+    init() {
+      $('.product-cat-stack-dokan li.has-children').on( 'click', '> a span.caret-icon', this.toggle_product_widget_category_dropdown );
+      $('.store-cat-stack-dokan li.has-children').on( 'click', '> a span.caret-icon', this.toggle_store_category_widget_dropdown );
+    },
+
+    toggle_product_widget_category_dropdown( e ) {
+      e.preventDefault();
+      let self = $(this),
+        liHasChildren = self.closest('li.has-children');
+
+      if ( ! liHasChildren.find('> ul.children').is(':visible') ) {
+        self.find('i.fa').addClass('fa-rotate-90');
+        if ( liHasChildren.find('> ul.children').hasClass('level-0') ) {
+          self.closest('a').css({ borderBottom: 'none' });
+        }
+      }
+
+      liHasChildren.find('> ul.children').slideToggle('fast', function() {
+        if ( ! $(this).is(':visible') ) {
+          self.find('i.fa').removeClass('fa-rotate-90');
+
+          if ( liHasChildren.find('> ul.children').hasClass('level-0') ) {
+            self.closest('a').css({ borderBottom: '1px solid #eee' });
+          }
+        }
+      });
+    },
+
+    toggle_store_category_widget_dropdown( e ) {
+      e.preventDefault();
+      var self = $(this),
+        liHasChildren = self.closest('li.has-children');
+
+      if ( ! liHasChildren.find('> ul.children').is(':visible') ) {
+        self.find('i.fa').addClass('fa-rotate-90');
+        if ( liHasChildren.find('> ul.children').hasClass('level-0') ) {
+          self.closest('a').css({ borderBottom: 'none' });
+        }
+      }
+
+      liHasChildren.find('> ul.children').slideToggle('fast', function() {
+        if ( ! $(this).is(':visible') ) {
+          self.find('i.fa').removeClass('fa-rotate-90');
+
+          if (liHasChildren.find('> ul.children').hasClass('level-0')) {
+            self.closest('a').css({ borderBottom: '1px solid #eee' });
+          }
+        }
+      });
+    },
+
+    init_category_widget_css() {
+      let selectedLi = $('.cat-drop-stack ul').find('a.selected');
+      selectedLi.css({ fontWeight: 'bold' });
+
+      selectedLi.parents('ul.children').each(function(i, val) {
+        $(val).css({ display: 'block' });
+      });
+    }
+
+  }
+
+  $(function(){
+    // DOM Ready - Let's invoke the init method
+    DOKAN_FRONTEND_SCRIPT.init();
+    DOKAN_FRONTEND_SCRIPT.init_category_widget_css();
+  })
+
+})(jQuery, document, window);

assets/js/dokan-promo-notice.js

@@ -180,7 +180,7 @@ module.exports = jQuery;
       var _this4 = this;
 
       if (action.confirm_message) {
-        swal.fire({
+        Swal.fire({
           title: this.__('Are you sure?', 'dokan-lite'),
           icon: 'warning',
           html: action.confirm_message,