Merge branch 'develop' into chore/add-deploy-action

CHANGELOG.md

@@ -1,3 +1,52 @@
+### 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.
+
+### v3.14.0 ( Dec 02, 2024 ) ###
+
+- **new:** Commission amount now displayed in the product list within the admin dashboard.
+- **new:** Vendor earning amount displayed in the product list within the vendor dashboard.
+- **new:** Vendor earning suggestions on the product add and edit pages in the vendor dashboard for simple and variable products.
+- **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.
+- **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.
+- **update:** Enhanced responsiveness of the UI for Dokan admin dashboard settings menus.
+- **update:** Product is rebranded with new branding.
+- **update:** As per new branding of Dokan Multivendor Plugin, full product is rebranded with new theme color.
+- **fix:** Moved the vendor edit page from Dokan Pro to Dokan Lite and eliminated the commission setting from the WordPress default user profile page.
+- **fix:** Removed the commission from every category, introducing category-based commission in global settings, vendor settings, Dokan subscription products, and the admin setup wizard.
+
+### v3.13.1 ( Nov 11, 2024 ) ###
+
+- **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
+
+### 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.

README.md

@@ -5,9 +5,9 @@
 **Requires at least:** 6.5  
 **Tested up to:** 6.7.1  
 **WC requires at least:** 8.0.0  
-**WC tested up to:** 9.4.2  
+**WC tested up to:** 9.5.2  
 **Requires PHP:** 7.4  
-**Stable tag:** 3.14.0  
+**Stable tag:** 3.14.6  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -228,6 +228,7 @@ Never get bored with the old-fashioned appearance of your store. Have full contr
 Dokan comes with a number of advanced features & modules that boost your WooCommerce marketplace position, always keeping you one step ahead of the competition. Continuous innovations and features are brought with regular and timely releases. Check out the changelog [here](https://wedevs.com/docs/dokan/changelog/)
 
 * [Stripe Express](https://dokan.co/wordpress/modules/stripe-express/?utm_medium=dokan-lite&utm_source=wordpress.org&utm_campaign=module)(Pro)
+* [Print on Demand Marketplace](https://dokan.co/wordpress/modules/printful-integration/?utm_medium=dokan-lite&utm_source=wordpress.org&utm_campaign=module)(Pro)
 * [Minimum Maximum Order](https://dokan.co/wordpress/modules/minimum-maximum-order/?utm_medium=dokan-lite&utm_source=wordpress.org&utm_campaign=modules) (Pro)
 * [Product Advertising](https://dokan.co/wordpress/modules/product-advertising/?utm_medium=dokan-lite&utm_source=wordpress.org&utm_campaign=modules) (Pro)
 * [Product Subscription](https://dokan.co/wordpress/modules/product-subscription/?utm_medium=dokan-lite&utm_source=wordpress.org&utm_campaign=modules) (Pro)
@@ -347,48 +348,25 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 ## Changelog ##
 
-### v3.14.0 ( Dec 02, 2024 ) ###
+### v3.14.6 ( Jan 09, 2025 ) ###
 
-- **new:** Commission amount now displayed in the product list within the admin dashboard.
-- **new:** Vendor earning amount displayed in the product list within the vendor dashboard.
-- **new:** Vendor earning suggestions on the product add and edit pages in the vendor dashboard for simple and variable products.
-- **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.
-- **update:** Enhanced responsiveness of the UI for Dokan admin dashboard settings menus.
-- **update:** Product is rebranded with new branding.
-- **update:** As per new branding of Dokan Multivendor Plugin, full product is rebranded with new theme color.
-- **fix:** Moved the vendor edit page from Dokan Pro to Dokan Lite and eliminated the commission setting from the WordPress default user profile page.
-- **fix:** Removed the commission from every category, introducing category-based commission in global settings, vendor settings, Dokan subscription products, and the admin setup wizard.
+- **fix:** Translations on Admin Commission Setup Wizard, Withdraw, Withdraw Log, Add Reverse Withdraw, Dummy Data, and Vendor Single pages were not working due to wrong text-domains.
 
-### v3.13.1 ( Nov 11, 2024 ) ###
+### v3.14.5 ( Jan 06, 2025 ) ###
 
-- **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.
+- **update:** Improvement vendor setup wizard ui.
+- **update:** Improvement withdraw approved email template.
+- **update:** Dokan admin settings page responsive & update ui design.
 
-### v3.13.0 ( Nov 06, 2024 ) ###
+### v3.14.4 ( Dec 27, 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
+- **fix:** Added tweaks to improve system stability and smoothness.
 
-### v3.12.6 ( Oct 24, 2024 ) ###
+### v3.14.3 ( Dec 11, 2024 ) ###
 
-- **fix:** Fixed js error on frontend pages.
+- **update:** Updated Dokan admin header to display current pro plan and version with upgrading option.
 
-### 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 ##
 

assets/css/admin.css

@@ -106,31 +106,85 @@
 }
 .dokan-admin-header {
   background: #fff;
-  padding: 15px 15px 15px 22px;
-  margin: 0 0 0 -20px;
-  box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.1);
+  padding: 16px 24px;
+  margin: 20px 20px 0 2px;
+  border-radius: 8px;
+  box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.06);
+}
+.dokan-admin-header .dokan-admin-header-content {
   display: flex;
   align-items: center;
   justify-content: space-between;
+  width: 100%;
 }
-.dokan-admin-header .dokan-admin-header-logo {
+.dokan-admin-header .dokan-admin-logo-wrap {
+  display: flex;
+  flex: 1;
+}
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-admin-header-logo {
   display: flex;
   align-items: center;
 }
-.dokan-admin-header .dokan-admin-header-logo img {
-  height: 25px;
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-admin-header-logo img {
+  height: 32px;
   width: auto;
   margin-right: 12px;
 }
-.dokan-admin-header .dokan-admin-header-logo span {
-  color: #F1634C;
-  background: #FFF4F2;
-  padding: 4px 12px;
-  font-size: 12px;
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin-right: 24px;
+  flex: 1;
+}
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag {
+  border-radius: 20px;
+  font-size: 1rem;
+  line-height: 20px;
+  font-weight: 400;
+  padding: 0.5rem 1rem;
+  max-height: 2rem;
+}
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.lite {
+  background: #FF9B5366;
+  color: #7B4E2E;
+  display: flex;
+  align-items: center;
+}
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.pro {
+  background: #D8D8FE;
+  color: #7047EB;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  text-transform: capitalize;
+  font-weight: 450;
+}
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.pro .version-tag-pro-badge {
+  background: #7047EB;
+  color: white;
+  border-radius: 28px;
+  display: inline-flex;
+  align-items: center;
+  padding: 3px 9px;
+  font-size: 16px;
+  margin: -10px 0 -10px -10px;
+}
+.dokan-admin-header .upgrade-button {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  background: #7047EB;
+  color: white;
+  padding: 10px 20px;
+  border-radius: 6px;
+  text-decoration: none;
   font-weight: 500;
-  font-family: "SF Pro Text", sans-serif;
-  border: 1px solid rgba(241, 99, 76, 0.2);
-  border-radius: 93px;
+  transition: background-color 0.2s;
+  margin-left: auto;
+}
+.dokan-admin-header .upgrade-button:hover {
+  background: #A244FF;
 }
 .dokan-admin-header .dokan-admin-header-menu {
   padding-right: 6px;
@@ -196,7 +250,7 @@
   cursor: context-menu;
   top: 80px;
   right: -10px;
-  z-index: 1;
+  z-index: 99999;
   background-color: #fff;
   padding: 20px;
   border-radius: 3px;
@@ -289,6 +343,26 @@
 .dokan-admin-header .dokan-admin-header-menu .menu-item .menu-icon .dropdown .list-item a:focus {
   box-shadow: none;
 }
+@media screen and (max-width: 782px) {
+  .dokan-admin-logo-wrap {
+    flex-direction: column;
+  }
+  .dokan-admin-header {
+    margin: 10px 10px 0 2px;
+    padding: 12px 16px;
+  }
+  .dokan-admin-header .dokan-admin-header-content {
+    gap: 16px;
+    align-items: start;
+  }
+  .dokan-admin-header .dokan-version-tags {
+    margin: 12px 0;
+    flex-wrap: wrap;
+  }
+  .dokan-admin-header .upgrade-button {
+    margin: 0;
+  }
+}
 .dokan-dashboard .post-box-container {
   width: 49%;
   float: left;