Skip to content

Commit

Permalink
Merge branch 'develop' into update/vendor-dashboard-structure
Browse files Browse the repository at this point in the history
  • Loading branch information
shohag121 committed Jan 14, 2025
2 parents 2efd5ef + 00d3c5d commit bd36d1b
Show file tree
Hide file tree
Showing 94 changed files with 4,790 additions and 1,752 deletions.
316 changes: 269 additions & 47 deletions .github/workflows/e2e_api_tests.yml

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
### 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.
Expand All @@ -14,7 +22,7 @@
- **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.
Expand Down
26 changes: 16 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.1
**WC tested up to:** 9.5.2
**Requires PHP:** 7.4
**Stable tag:** 3.14.4
**Stable tag:** 3.14.6
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -346,19 +347,24 @@ A. Just install and activate the PRO version without deleting the free plugin. A


## Changelog ##
### v3.14.4 ( Dec 27, 2024 ) ###
- **fix:** Added tweaks to improve system stability and smoothness

### v3.14.3 ( Dec 11, 2024 ) ###
- **update:** Updated Dokan admin header to display current pro plan and version with upgrading option.
### v3.14.6 ( Jan 09, 2025 ) ###

### v3.14.2 ( Dec 06, 2024 ) ###
- **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.

- **update:** Added commission setting option in product bulk edit for Admin.
### v3.14.5 ( Jan 06, 2025 ) ###

### v3.14.1 ( Dec 04, 2024 ) ###
- **update:** Improvement vendor setup wizard ui.
- **update:** Improvement withdraw approved email template.
- **update:** Dokan admin settings page responsive & update ui design.

### v3.14.4 ( Dec 27, 2024 ) ###

- **fix:** Fixed a issue in the commission upgrader to deal with empty values for product and vendor.
- **fix:** Added tweaks to improve system stability and smoothness.

### v3.14.3 ( Dec 11, 2024 ) ###

- **update:** Updated Dokan admin header to display current pro plan and version with upgrading option.

[CHECK THE FULL CHANGELOG](https://github.com/getdokan/dokan/blob/develop/CHANGELOG.md).

Expand Down
2 changes: 1 addition & 1 deletion assets/css/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
cursor: context-menu;
top: 80px;
right: -10px;
z-index: 1;
z-index: 99999;
background-color: #fff;
padding: 20px;
border-radius: 3px;
Expand Down
Loading

0 comments on commit bd36d1b

Please sign in to comment.