Skip to content

Commit

Permalink
Merge branch 'release/3.14.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
Aunshon committed Jan 9, 2025
2 parents ddded83 + 0a98d9d commit 06e31af
Show file tree
Hide file tree
Showing 41 changed files with 1,657 additions and 696 deletions.
310 changes: 266 additions & 44 deletions .github/workflows/e2e_api_tests.yml

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +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 @@ -18,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
15 changes: 8 additions & 7 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.5
**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 @@ -347,7 +348,11 @@ A. Just install and activate the PRO version without deleting the free plugin. A

## Changelog ##

### v3.14.5 ( Jan 03, 2025 ) ###
### v3.14.6 ( Jan 09, 2025 ) ###

- **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.14.5 ( Jan 06, 2025 ) ###

- **update:** Improvement vendor setup wizard ui.
- **update:** Improvement withdraw approved email template.
Expand All @@ -361,10 +366,6 @@ A. Just install and activate the PRO version without deleting the free plugin. A

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

### v3.14.2 ( Dec 06, 2024 ) ###

- **update:** Added commission setting option in product bulk edit for Admin.

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

## Upgrade Notice ##
Expand Down
58 changes: 29 additions & 29 deletions assets/css/vue-admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -4425,30 +4425,30 @@ tr.data_clear_on_uninstall td fieldset label {
}
}

.dokan-importer-wrapper[data-v-c15c744e] {
.dokan-importer-wrapper[data-v-38c18719] {
text-align: center;
max-width: 700px;
margin: 40px auto;
}
.dokan-importer-wrapper .skeleton-loader[data-v-c15c744e] {
.dokan-importer-wrapper .skeleton-loader[data-v-38c18719] {
width: 100%;
display: block;
background: linear-gradient(to right, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.5) 50%, rgba(255, 255, 255, 0) 80%), lightgray;
background-repeat: repeat-y;
background-size: 50px 500px;
background-position: 0 0;
animation: shine-c15c744e 1s infinite;
animation: shine-38c18719 1s infinite;
border-radius: 5px;
}
@keyframes shine-c15c744e {
@keyframes shine-38c18719 {
to {
background-position: 100% 0, /* move highlight to right */ 0 0;
}
}
.dokan-importer-wrapper .error[data-v-c15c744e] {
.dokan-importer-wrapper .error[data-v-38c18719] {
border-radius: 5px;
}
.dokan-importer-wrapper .dokan-importer-progress-steps[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer-progress-steps[data-v-38c18719] {
padding: 0 0 24px;
margin: 0;
list-style: none outside;
Expand All @@ -4457,7 +4457,7 @@ to {
width: 100%;
display: inline-flex;
}
.dokan-importer-wrapper .dokan-importer-progress-steps li[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer-progress-steps li[data-v-38c18719] {
width: 50%;
float: left;
padding: 0 0 0.8em;
Expand All @@ -4467,7 +4467,7 @@ to {
border-bottom: 4px solid #ccc;
line-height: 1.4em;
}
.dokan-importer-wrapper .dokan-importer-progress-steps li[data-v-c15c744e]::before {
.dokan-importer-wrapper .dokan-importer-progress-steps li[data-v-38c18719]::before {
content: "";
border: 4px solid #ccc;
border-radius: 100%;
Expand All @@ -4480,89 +4480,89 @@ to {
margin-bottom: -8px;
background: #fff;
}
.dokan-importer-wrapper .dokan-importer-progress-steps li.active[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer-progress-steps li.active[data-v-38c18719] {
border-color: #1BAC9E;
color: #1BAC9E;
}
.dokan-importer-wrapper .dokan-importer-progress-steps li.active[data-v-c15c744e]::before {
.dokan-importer-wrapper .dokan-importer-progress-steps li.active[data-v-38c18719]::before {
border-color: #1BAC9E;
}
.dokan-importer-wrapper .dokan-importer[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer[data-v-38c18719] {
background: #fff;
overflow: hidden;
padding: 0;
margin: 0 0 16px;
color: #555;
text-align: left;
}
.dokan-importer-wrapper .dokan-importer header[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer header[data-v-38c18719] {
margin: 0;
padding: 24px 24px 0;
}
.dokan-importer-wrapper .dokan-importer header .loader-title[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer header .loader-title[data-v-38c18719] {
width: 50%;
height: 20px;
margin-bottom: 24px;
}
.dokan-importer-wrapper .dokan-importer header .loader-description[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer header .loader-description[data-v-38c18719] {
height: 10px;
margin-bottom: 10px;
}
.dokan-importer-wrapper .dokan-importer section[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer section[data-v-38c18719] {
padding: 10px 24px 0;
}
.dokan-importer-wrapper .dokan-importer section div[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer section div[data-v-38c18719] {
margin: 0;
position: relative;
table-layout: fixed;
border-collapse: collapse;
width: 100%;
clear: both;
}
.dokan-importer-wrapper .dokan-importer section div .dokan-dummy-data-progress-bar[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer section div .dokan-dummy-data-progress-bar[data-v-38c18719] {
width: 100%;
height: 35px;
-webkit-appearance: none;
}
.dokan-importer-wrapper .dokan-importer section div .dokan-dummy-data-progress-bar[value][data-v-c15c744e]::-webkit-progress-bar {
.dokan-importer-wrapper .dokan-importer section div .dokan-dummy-data-progress-bar[value][data-v-38c18719]::-webkit-progress-bar {
background-color: #EEEEEE;
border: 1px solid #BCBCBC;
border-radius: 5px;
}
.dokan-importer-wrapper .dokan-importer section div .dokan-dummy-data-progress-bar[value][data-v-c15c744e]::-webkit-progress-value {
.dokan-importer-wrapper .dokan-importer section div .dokan-dummy-data-progress-bar[value][data-v-38c18719]::-webkit-progress-value {
background-color: #1BAC9E;
border-radius: 5px;
transition: width 0.5s;
}
.dokan-importer-wrapper .dokan-importer section div .loader-loader[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer section div .loader-loader[data-v-38c18719] {
height: 35px;
}
.dokan-importer-wrapper .dokan-importer .import-done[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer .import-done[data-v-38c18719] {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
padding: 24px 24px 0 24px;
}
.dokan-importer-wrapper .dokan-importer .import-done p[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer .import-done p[data-v-38c18719] {
font-size: 1.2rem;
color: #1BAC9E;
}
.dokan-importer-wrapper .dokan-importer .import-done .links[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer .import-done .links[data-v-38c18719] {
text-align: center;
}
.dokan-importer-wrapper .dokan-importer .dokan-importer-action[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer .dokan-importer-action[data-v-38c18719] {
overflow: hidden;
margin: 0;
padding: 24px;
line-height: 3em;
}
.dokan-importer-wrapper .dokan-importer .dokan-importer-action .loader-btn[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer .dokan-importer-action .loader-btn[data-v-38c18719] {
height: 35px;
width: 150px;
float: right;
}
.dokan-importer-wrapper .dokan-importer .dokan-importer-action .dokan-import-continue-btn[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer .dokan-importer-action .dokan-import-continue-btn[data-v-38c18719] {
float: right;
font-size: 1.25em;
padding: 6px 12px;
Expand All @@ -4577,18 +4577,18 @@ to {
color: #FFF;
cursor: pointer;
}
.dokan-importer-wrapper .dokan-importer .dokan-importer-action .dokan-import-continue-btn.is-loading[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer .dokan-importer-action .dokan-import-continue-btn.is-loading[data-v-38c18719] {
background-color: rgba(27, 172, 158, 0.5);
border-color: rgba(27, 172, 158, 0.5);
}
.dokan-importer-wrapper .dokan-importer .dokan-importer-action .dokan-import-continue-btn.is-busy[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer .dokan-importer-action .dokan-import-continue-btn.is-busy[data-v-38c18719] {
animation: components-button__busy-animation 2500ms infinite linear;
opacity: 1;
background-size: 100px 100%;
background-image: linear-gradient(-45deg, #f7f6f6 33%, #e0e0e0 33%, #e0e0e0 70%, #f7f6f6 70%);
color: #848484;
}
.dokan-importer-wrapper .dokan-importer .dokan-importer-action .cancel-btn[data-v-c15c744e] {
.dokan-importer-wrapper .dokan-importer .dokan-importer-action .cancel-btn[data-v-38c18719] {
background-color: #FFFFFF;
border-color: #E2E2E2;
color: #72777C;
Expand Down
2 changes: 1 addition & 1 deletion assets/js/dokan-setup-wizard-commission.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array(), 'version' => 'bf06db116d0976a40ce7');
<?php return array('dependencies' => array(), 'version' => 'b4efbc9678420be94d48');
2 changes: 1 addition & 1 deletion assets/js/dokan-setup-wizard-commission.js

Large diffs are not rendered by default.

Loading

0 comments on commit 06e31af

Please sign in to comment.