Skip to content

Commit

Permalink
Merge branch 'release/3.14.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
shohag121 committed Jan 29, 2025
2 parents 06e31af + 7f8341f commit 9793aed
Show file tree
Hide file tree
Showing 92 changed files with 2,433 additions and 1,571 deletions.
40 changes: 40 additions & 0 deletions .distignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/.wordpress-org
/.git
/.github
/node_modules
/src
/tests
/bin
/docs
/build
/.idea
/.vscode
/assets/src

.distignore
.gitignore
/**/.DS_Store
/**/*.LICENCE.txt
package.json
package-lock.json
composer.json
composer.lock
README.md
CHANGELOG.md
LICENSE
phpcs.xml.dist
phpunit.xml.dist
phpunit.xml
.editorconfig
.eslintrc
.php_cs
.phpunit.result.cache
.prettierrc.js
appsero.json
CONTRIBUTING.md
DEVELOPER.md
event.json
postcss.config.js
webpack.config.js
tailwind.config.js
/
44 changes: 44 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Deploy and Release Plugin to WP.org

on:
push:
tags:
- "*"
jobs:
releaseToWPOrg:
name: Release to WordPress.org
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup PHP 7.4
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
coverage: none
tools: composer:v2
- name: Build
run: |
composer install --no-dev
npm install
npm run build
- name: Install SVN ( Subversion )
run: |
sudo apt-get update
sudo apt-get install subversion
- name: WordPress Plugin Deploy
id: deploy
uses: 10up/action-wordpress-plugin-deploy@stable
with:
generate-zip: true
dry-run: ${{ env.DRY_RUN }}
env:
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SLUG: dokan-lite
- name: Create GitHub release
uses: softprops/action-gh-release@v2
with:
files: ${{github.workspace}}/${{ github.event.repository.name }}.zip
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .github/workflows/e2e_api_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ jobs:

# Override reports path specifically for this job
env:
SYSTEM_INFO: ./tests/pw/all-reports/test-artifact-api/playwright/systemInfo.json
API_TEST_RESULT: ./tests/pw/all-reports/test-artifact-api/playwright-report/api/summary-report/results.json
API_COVERAGE: ./tests/pw/all-reports/test-artifact-api/playwright-report/api/coverage-report/coverage.json
E2E_TEST_RESULT: ./tests/pw/all-reports/merged-summary.json
Expand Down
Binary file added .wordpress-org/banner-1544x500.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/banner-772x250.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/icon-128x128.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/icon-256x256.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-1.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-10.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-11.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-12.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-13.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-14.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-15.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-16.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-17.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-18.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-19.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-2.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-3.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-4.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-5.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-6.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-7.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-8.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-9.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
### v3.14.7 ( Jan 29, 2025 ) ###
- **update:** Missing parameters support added for the reverse-withdrawal API endpoints.
- **update:** Missing parameters support added for the Settings API endpoints.
- **fix:** Fixed an error when navigating to the product edit page with an invalid (non-numeric) product ID.
- **fix:** Fixed a misspelling typo vendor contact form input field.
- **fix:** Fixed and updated analytics cache modifier for seller analytics filter.

### 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.
- **update:** Dokan admin settings page responsive & update ui design.

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

- **update:** Added commission setting option in product bulk edit for Admin.
Expand Down
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Dokan - Powerful WooCommerce Multivendor Marketplace Solution - Build Your Own Amazon, eBay, Etsy #
**Contributors:** [tareq1988](https://profiles.wordpress.org/tareq1988/), [wedevs](https://profiles.wordpress.org/wedevs/), [nizamuddinbabu](https://profiles.wordpress.org/nizamuddinbabu/)
**Donate Link:** http://tareq.co/donate/
**Contributors:** [tareq1988](https://profiles.wordpress.org/tareq1988/), [dokaninc](https://profiles.wordpress.org/dokaninc/), [wedevs](https://profiles.wordpress.org/wedevs/), [nizamuddinbabu](https://profiles.wordpress.org/nizamuddinbabu/)
**Donate Link:** https://dokan.co/wordpress/pricing/
**Tags:** WooCommerce multivendor marketplace, multi seller, multi vendor, multivendor, multivendor marketplace
**Requires at least:** 6.5
**Tested up to:** 6.7.1
Expand Down Expand Up @@ -97,7 +97,7 @@ With Dokan, experience a smooth, fast setup process in under an hour and have yo

We continuously update Dokan with reliable services for flawless operation, staying ahead of industry trends and introducing new features with each update.

See Our Official GitHub page: [Official Dokan GitHub](https://github.com/weDevsOfficial/dokan/?utm_campaign=dokan-wordpress-org-visitor&utm_medium=learn_more_about_dokan&utm_source=WordPress.org)
See Our Official GitHub page: [Official Dokan GitHub](https://github.com/getdokan/dokan/?utm_campaign=dokan-wordpress-org-visitor&utm_medium=learn_more_about_dokan&utm_source=WordPress.org)

### A SCALABLE MARKET ###

Expand Down Expand Up @@ -179,7 +179,7 @@ Never get bored with the old-fashioned appearance of your store. Have full contr
**Simple Product Management**

* Create and manage your products from the frontend.
* [Create variable or downloadable products](https://wedevs.com/87025/types-of-products-you-can-create-using-woocommerce/?utm_campaign=dokan-wordpress-org-visitor&utm_medium=learn_more_about_dokan&utm_source=WordPress.org?utm_campaign=dokan-wordpress-org-visitor&utm_medium=learn_more_about_dokan&utm_source=WordPress.org) (Pro).
* [Create variable or downloadable products](https://wedevs.com/blog/87025/types-of-products-you-can-create-using-woocommerce/?utm_campaign=dokan-wordpress-org-visitor&utm_medium=learn_more_about_dokan&utm_source=WordPress.org) (Pro).
* Vendors have the option to [manage product attributes](https://dokan.co/docs/wordpress/vendor-dashboard/products/?utm_campaign=dokan-wordpress-org-visitor&utm_medium=learn_more_about_dokan&utm_source=WordPress.org) (Pro).
* Vendors can manage downloadable [product permission, expiry date, and download limit](https://dokan.co/docs/wordpress/tutorials/how-to-create-a-digital-product/?utm_campaign=dokan-wordpress-org-visitor&utm_medium=learn_more_about_dokan&utm_source=WordPress.org) (Pro).

Expand Down Expand Up @@ -225,7 +225,7 @@ Never get bored with the old-fashioned appearance of your store. Have full contr

### 💥💥 EXTENDED FEATURES BY SIMPLY ENABLING A TOGGLE BUTTON 💥💥 ###

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/)
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://dokan.co/wordpress/changelog/?utm_campaign=dokan-wordpress-org-visitor&utm_medium=learn_more_about_dokan&utm_source=WordPress.org)

* [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)
Expand Down Expand Up @@ -274,7 +274,7 @@ Dokan comes with a number of advanced features & modules that boost your WooComm

This could have bugs and lack some features. If you want to contribute to this project, you are more than welcome.

👨‍💻 [Please fork the repository from Github](https://github.com/weDevsOfficial/dokan) 👨‍💻
👨‍💻 [Please fork the repository from Github](https://github.com/getdokan/dokan) 👨‍💻


### Privacy Policy ###
Expand All @@ -285,10 +285,7 @@ Appsero SDK **does not gather any data by default.** The SDK only starts gatheri
Integrating Appsero SDK **DOES NOT IMMEDIATELY** start gathering data, **without confirmation from users in any case.**

### Contribute ###
This may have bugs and lack of many features. If you want to contribute on this project, you are more than welcome. Please fork the repository from [Github](https://github.com/weDevsOfficial/dokan).

### Author ###
Brought to you by [Tareq Hasan](http://tareq.co) from [weDevs](http://wedevs.com)
This may have bugs and lack of many features. If you want to contribute on this project, you are more than welcome. Please fork the repository from [Github](https://github.com/getdokan/dokan).

## Installation ##

Expand Down Expand Up @@ -347,6 +344,13 @@ A. Just install and activate the PRO version without deleting the free plugin. A


## Changelog ##
### v3.14.7 ( Jan 29, 2025 ) ###

- **update:** Missing parameters support added for the reverse-withdrawal API endpoints.
- **update:** Missing parameters support added for the Settings API endpoints.
- **fix:** Fixed an error when navigating to the product edit page with an invalid (non-numeric) product ID.
- **fix:** Fixed a misspelling typo vendor contact form input field.
- **fix:** Fixed and updated analytics cache modifier for seller analytics filter.

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

Expand All @@ -362,10 +366,6 @@ A. Just install and activate the PRO version without deleting the free plugin. A

- **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).

## Upgrade Notice ##
Expand Down
26 changes: 14 additions & 12 deletions assets/css/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -139,36 +139,37 @@
}
.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;
font-size: 12px;
line-height: 16px;
font-weight: 500;
height: 30px;
box-sizing: border-box;
}
.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.lite {
background: #FF9B5366;
color: #7B4E2E;
display: flex;
align-items: center;
padding: 0 12px;
}
.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;
padding: 5px 9px 5px 5px;
gap: 6px;
}
.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;
padding: 3px 8px;
font-size: 12px;
gap: 3px;
}
.dokan-admin-header .upgrade-button {
display: flex;
Expand Down Expand Up @@ -243,7 +244,7 @@
.dokan-admin-header .dokan-admin-header-menu .menu-item .menu-icon:hover .dropdown {
opacity: 1;
visibility: visible;
top: 42px;
top: 50px;
}
.dokan-admin-header .dokan-admin-header-menu .menu-item .menu-icon .dropdown {
position: absolute;
Expand All @@ -255,7 +256,7 @@
padding: 20px;
border-radius: 3px;
border: 1px solid #e2e2e2;
box-shadow: 0 6px 12px rgb(129 129 21.5%);
box-shadow: 0 8px 10px #ccc;
min-width: 255px;
max-width: 255px;
opacity: 0;
Expand Down Expand Up @@ -288,6 +289,7 @@
}
.dokan-admin-header .dokan-admin-header-menu .menu-item .menu-icon .dropdown .list-item {
margin-top: 13px;
list-style-type: none;
}
.dokan-admin-header .dokan-admin-header-menu .menu-item .menu-icon .dropdown .list-item a {
display: flex;
Expand Down
4 changes: 2 additions & 2 deletions assets/css/dokan-tailwind.css
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@
.z-\[1000000\] {
z-index: 1000000;
}
.z-\[500\] {
z-index: 500;
.z-\[1\] {
z-index: 1;
}
.z-\[999999\] {
z-index: 999999;
Expand Down
3 changes: 3 additions & 0 deletions assets/css/global-admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -293,4 +293,7 @@
padding: 0;
color: #cc0000;
}
#adminmenu #toplevel_page_dokan .wp-menu-image.svg {
background-size: 17px;
}

Loading

0 comments on commit 9793aed

Please sign in to comment.