Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update: Module page refactor in react #2572

Open
wants to merge 29 commits into
base: update/vendor-dashboard-structure
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
773b6b7
feat: react admin dashboard
shohag121 Feb 6, 2025
b9fe0de
Merge branch 'refs/heads/update/vendor-dashboard-structure' into upda…
shohag121 Feb 12, 2025
fbd8909
refactor: implemented the `Hookable` Interface
shohag121 Feb 12, 2025
05945d1
refactor: implemented the `Hookable` Interface
shohag121 Feb 12, 2025
1ff2f3b
refactor: implemented the new servicefor AdminDashboardServiceProvide…
shohag121 Feb 12, 2025
933bb1c
refactor: implemented the `Hookable` to Dashboard
shohag121 Feb 12, 2025
3b7ecaf
chore: comment changed
shohag121 Feb 12, 2025
71fdf44
Merge branch 'update/vendor-dashboard-structure' into update/module-p…
shohag121 Feb 12, 2025
12643dc
chore: Released Version 3.14.9
Aunshon Feb 12, 2025
b6d2100
Merge branch 'release/3.14.9' into develop
Aunshon Feb 12, 2025
60f44e4
Remove dry run from deploy.yml
Aunshon Feb 12, 2025
6f1e378
chore: dokan ui scoped preflight added
shohag121 Feb 12, 2025
ece4762
refactor: moved mutation observer from footer to React app.
shohag121 Feb 13, 2025
234eb6a
Replace `DOKAN_PRO_SINCE` with corresponding versions. (#2566)
Aunshon Feb 13, 2025
1658a61
Replace DOKAN_LITE_SINCE with corresponding versions (#2567)
Aunshon Feb 13, 2025
0bd36d8
chore: `DOKAN_PRO_SINCE` support added (#2552)
shohag121 Feb 13, 2025
780e2b4
feat: dokan module page in React
shohag121 Feb 13, 2025
36f6770
Merge branch 'refs/heads/update/vendor-dashboard-structure' into upda…
shohag121 Feb 13, 2025
70408a0
update: Dokan lite module page with upgrade popup.
shohag121 Feb 17, 2025
f601dec
update: upgrade url from settings
shohag121 Feb 17, 2025
63a5ee7
chore: dokan ui scoped preflight added
shohag121 Feb 17, 2025
e97fe6b
update: category filter selector added
shohag121 Feb 18, 2025
d865cdd
update: Module search support added
shohag121 Feb 18, 2025
e8dc57c
update: module page video popup and all the module information
shohag121 Feb 19, 2025
546afc7
update: module required plugin added
shohag121 Feb 19, 2025
ce63e48
fix: responsive filters
shohag121 Feb 19, 2025
86033f7
update: Module page appair only when no pro exist. and related vue as…
shohag121 Feb 24, 2025
1f1c433
refactor: Modules menu removed
shohag121 Feb 24, 2025
d797e86
Merge remote-tracking branch 'upstream/develop' into update/modulepag…
shohag121 Feb 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:
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 }}
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
### v3.14.9 ( Feb 12, 2025 ) ###

- **fix:** Fix earning suggestion in vendor dashboard when product edit page loads initially.
- **fix:** Fix vendor earning suggestion currency, currency position, decimal separator in vendor dashboard product edit page.
- **fix:** Fix vendor earning suggestion for invalid product price.
- **fix:** Tax calculation for shipping based on tax status
- **feat:** Rollback support for product statues on dokan pro deactivation.
- **refactor:** Improved dokan_is_user_seller function by adding strict comparison to differentiate between vendor and staff.

### v3.14.8 ( 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.
Expand Down
57 changes: 33 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
**Tags:** WooCommerce multivendor marketplace, multi seller, multi vendor, multivendor, multivendor marketplace
**Requires at least:** 6.5
**Tested up to:** 6.7.1
**WC requires at least:** 8.0.0
**WC tested up to:** 9.5.2
**WC requires at least:** 8.5.0
**WC tested up to:** 9.6.1
**Requires PHP:** 7.4
**Stable tag:** 3.14.6
**Stable tag:** 3.14.9
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

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/getdokan/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/)

### A SCALABLE MARKET ###

Expand Down Expand Up @@ -322,28 +322,37 @@ A. Just install and activate the PRO version without deleting the free plugin. A
###
## Screenshots ##

1. Admin Dashboard
2. Withdraw requests from sellers
3. Settings → General
4. Settings → Selling Options
5. Settings → Withdraw Options
6. Settings → Page Settings
7. Settings → Appearance
8. Seller Dashboard in site frontend
9. Frontend → Products Listing
10. Frontend → Create a new Product
11. Frontend → Edit a product
12. Frontend → Orders Listing
13. Frontend → Orders → Details
14. Frontend → Submit withdraw request
15. Frontend → Store Settings
16. Frontend → Store Payment Settings
17. Frontend → Individual Seller Store-1
18. Frontend → Individual Seller Store-2
19. Frontend → Individual Seller Store-3

1. Dokan Install
2. Dokan Modules
3. Admin → Report Logs
4. Admin Settings → General
5. Admin Settings → Selling Options
6. Seller Badges
7. Admin Settings → Appearance
8. Admin Settings → Withdraw Options
9. Frontend → Vendor Dashboard
10. Frontend → Product Listing
11. Frontend → Create a new Product
12. Frontend → Orders Details
13. Frontend → Vendor Reports
14. Frontend → Vendor Badge View
15. Frontend → Vendor Verification
16. Frontend → Store Edit
17. Frontend → Vendor Payment Setting
18. Frontend → Vendor Withdraw Methods
19. Frontend → Product Delivery Schedules

## Changelog ##

### v3.14.9 ( Feb 12, 2025 ) ###

- **fix:** Fix earning suggestion in vendor dashboard when product edit page loads initially.
- **fix:** Fix vendor earning suggestion currency, currency position, decimal separator in vendor dashboard product edit page.
- **fix:** Fix vendor earning suggestion for invalid product price.
- **fix:** Tax calculation for shipping based on tax status
- **feat:** Rollback support for product statues on dokan pro deactivation.
- **refactor:** Improved dokan_is_user_seller function by adding strict comparison to differentiate between vendor and staff.

### v3.14.8 ( Jan 29, 2025 ) ###

- **update:** Missing parameters support added for the reverse-withdrawal API endpoints.
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' => 'b4efbc9678420be94d48');
<?php return array('dependencies' => array(), 'version' => 'e13568f9a560ed60d134');

Check failure on line 1 in assets/js/dokan-setup-wizard-commission.asset.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Expected 1 space after the array opener in a single line array. Found: no spaces

Check warning on line 1 in assets/js/dokan-setup-wizard-commission.asset.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

When a multi-item array uses associative keys, each value should start on a new line.

Check failure on line 1 in assets/js/dokan-setup-wizard-commission.asset.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Expected 1 space before the array closer in a single line array. Found: no spaces
2 changes: 1 addition & 1 deletion assets/js/dokan-setup-wizard-commission.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/dokan.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array(), 'version' => 'b7dae50e43db9b0fe708');
<?php return array('dependencies' => array(), 'version' => '36359349beb9a73d2be7');

Check failure on line 1 in assets/js/dokan.asset.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Expected 1 space after the array opener in a single line array. Found: no spaces

Check warning on line 1 in assets/js/dokan.asset.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

When a multi-item array uses associative keys, each value should start on a new line.

Check failure on line 1 in assets/js/dokan.asset.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Expected 1 space before the array closer in a single line array. Found: no spaces
2 changes: 1 addition & 1 deletion assets/js/dokan.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/vue-admin.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('jquery', 'moment'), 'version' => '5ee8966414e463e96d1a');
<?php return array('dependencies' => array('jquery', 'moment'), 'version' => 'eef051ddb2a66a0509f3');

Check failure on line 1 in assets/js/vue-admin.asset.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Expected 1 space after the array opener in a single line array. Found: no spaces

Check failure on line 1 in assets/js/vue-admin.asset.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Expected 1 space after the array opener in a single line array. Found: no spaces

Check failure on line 1 in assets/js/vue-admin.asset.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Expected 1 space before the array closer in a single line array. Found: no spaces

Check warning on line 1 in assets/js/vue-admin.asset.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

When a multi-item array uses associative keys, each value should start on a new line.

Check failure on line 1 in assets/js/vue-admin.asset.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Expected 1 space before the array closer in a single line array. Found: no spaces
2 changes: 1 addition & 1 deletion assets/js/vue-admin.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/vue-bootstrap.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('jquery', 'moment', 'wp-i18n'), 'version' => '2ecefa1cf0cf40f5f645');
<?php return array('dependencies' => array('jquery', 'moment', 'wp-i18n'), 'version' => 'eb9095b919843ab69cd8');

Check failure on line 1 in assets/js/vue-bootstrap.asset.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Expected 1 space after the array opener in a single line array. Found: no spaces

Check failure on line 1 in assets/js/vue-bootstrap.asset.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Expected 1 space after the array opener in a single line array. Found: no spaces

Check warning on line 1 in assets/js/vue-bootstrap.asset.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

When a multi-item array uses associative keys, each value should start on a new line.
2 changes: 1 addition & 1 deletion assets/js/vue-bootstrap.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions assets/src/js/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Gets i18n date format
*
* @since DOKAN_PRO_SINCE
* @since 3.2.7
*/
window.dokan_get_i18n_date_format = function ( format = true ) {
if( ! format ) {
Expand Down Expand Up @@ -46,7 +46,7 @@
/**
* Get i18n time format.
*
* @since DOKAN_PRO_SINCE
* @since 3.3.7
*
* @param {string|boolean} format Time format.
*
Expand Down Expand Up @@ -110,7 +110,7 @@
/**
* Get formatted time.
*
* @since DOKAN_PRO_SINCE
* @since 3.3.7
*
* @param {string} time Time.
* @param {string} format Time format type.
Expand Down
2 changes: 1 addition & 1 deletion bin/version-replace.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ const { version } = JSON.parse( fs.readFileSync( 'package.json' ) );

replace( {
files: pluginFiles,
from: /DOKAN_SINCE/g,
from: [ /DOKAN_SINCE/g, /DOKAN_PRO_SINCE/g ],
to: version,
} );
Loading