Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
ce9d06e
refactor: Dokan REST base controllers and docs
mrabbani Jan 29, 2025
47ed7e2
Add VendorAuthorizable trait for the REST controllers to centralize t…
mrabbani Jan 29, 2025
b7e740d
update: feature map
shashwatahalder01 Feb 5, 2025
88264ce
test(visual): add visual tests for vendor dashboard
shashwatahalder01 Feb 7, 2025
47badce
fix: class naming issue & add default namespace with in api docs.
MdAsifHossainNadim Feb 11, 2025
b924fb6
(tests): Add vendor dashboard visual tests
shashwatahalder01 Feb 12, 2025
9d0dd09
Merge branch 'develop' into project_refactor
shashwatahalder01 Feb 13, 2025
719ae99
test(update): refactor tests based on latest changes
shashwatahalder01 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
3709f64
refactor: `str_replace` warning fix for `OrderController`
shohag121 Feb 24, 2025
eb7ce58
🪓 fix: Prevented store URL generation for staff managers on admin das…
devAsadNur Feb 27, 2025
d9ab0bb
update: `[dokan-customer-migration]` shortcode migrated from pro. (#2…
shohag121 Feb 27, 2025
86e5788
Restoring parent order with restore related child orders (#2557)
kzamanbd Feb 27, 2025
ef6ee48
fix: Store settings api stores inconsistent data for switcher fields.…
MdAsifHossainNadim Feb 27, 2025
1025a8d
update: Extendability support on dokan post count and stock count add…
shohag121 Feb 28, 2025
885bf86
chore: Release version 3.14.10
Aunshon Feb 28, 2025
7ba660a
Merge branch 'develop' into release/3.14.10
Aunshon Feb 28, 2025
2e4432f
chore: Release version 3.14.10
Aunshon Feb 28, 2025
1d3ffc4
Merge branch 'release/3.14.10' into develop
shohag121 Feb 28, 2025
0f875de
test(refactor): update tests for store api changes (#2582)
shashwatahalder01 Mar 1, 2025
2560103
fix: `DokanBaseController` triggers error for rest_base missing on `f…
MdAsifHossainNadim Mar 3, 2025
cb3b695
Update api.md
mrabbani Mar 3, 2025
9bc15c4
Update DokanBaseController.php
mrabbani Mar 3, 2025
332a0e4
Merge branch 'develop' into refactor/rest-api
MdAsifHossainNadim Mar 3, 2025
64e2a8d
Merge pull request #2544 from getdokan/refactor/rest-api
mrabbani Mar 4, 2025
c97b813
Merge pull request #2579 from getdokan/refactor/fix-depricated-message
mrabbani Mar 4, 2025
f88e479
Update/handle deprecated code from dokan (#2564)
osmansufy Mar 6, 2025
ee29a18
fix: unsupported operand types: string in calculation (#2534)
mralaminahamed Mar 12, 2025
eea97c3
update: Sync Decimal Points with WooCommerce (#2569)
osmansufy Mar 12, 2025
0b75162
fix: Elementor my account widget assets not loading in dokan register…
MdAsifHossainNadim Mar 12, 2025
630c56c
fix: Seller revoking access not proceed for Digital product. (#2574)
MdAsifHossainNadim Mar 12, 2025
d1fad27
Withdraw charge and receivable amount added in email template (#2575)
Aunshon Mar 12, 2025
8ab21fa
fix: setup store country state validation (#2550)
osmansufy Mar 12, 2025
92cbf67
Merge branch 'develop' into project_refactor
shashwatahalder01 Mar 14, 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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### v3.14.10 ( Feb 28, 2025 ) ###

- **fix:** Prevented wrong store URL generation for staff managers on admin dashboard.
- **fix:** Restoring parent order with restore related child orders.
- **fix:** Store settings API data storing inconsistencies.

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

- **fix:** Fix earning suggestion in vendor dashboard when product edit page loads initially.
Expand Down
16 changes: 9 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
**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
**Tested up to:** 6.7.2
**WC requires at least:** 8.5.0
**WC tested up to:** 9.6.1
**WC tested up to:** 9.7.0
**Requires PHP:** 7.4
**Stable tag:** 3.14.9
**Stable tag:** 3.14.10
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

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

## Changelog ##

### v3.14.10 ( Feb 28, 2025 ) ###

- **fix:** Prevented wrong store URL generation for staff managers on admin dashboard.
- **fix:** Restoring parent order with restore related child orders.
- **fix:** Store settings API data storing inconsistencies.

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

- **fix:** Fix earning suggestion in vendor dashboard when product edit page loads initially.
Expand Down Expand Up @@ -371,10 +377,6 @@ A. Just install and activate the PRO version without deleting the free plugin. A
- **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.

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

## Upgrade Notice ##
Expand Down
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 assets/src/js/product-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@
symbol: dokan.currency_format_symbol,
decimal: dokan.currency_format_decimal_sep,
thousand: dokan.currency_format_thousand_sep,
precision: 4,
precision: dokan.currency_format_num_decimals,
format: dokan.currency_format,
} );
},
Expand Down
6 changes: 5 additions & 1 deletion assets/src/less/login-form-popup.less
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,8 @@ p.vendor-customer-registration {
cursor: pointer;
color: #526b6f;
}
}
}

.woocommerce-form-register:has(.vendor-customer-registration) {
height: fit-content !important;
}
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,
} );
54 changes: 31 additions & 23 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions deprecated/Singleton.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@
* Singleton Trait
*
* @since 1.0.0
*
* @deprecated 2.9.30 Use `WeDevs\Dokan\Traits\Singleton` instead of this.
*/
trait Singleton {
trait Singleton
{

Check failure on line 13 in deprecated/Singleton.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Opening brace should be on the same line as the declaration for trait Singleton

/**
* Singleton class instance holder
Expand All @@ -25,11 +28,12 @@
*
* @return object
*/
public static function instance() {
if ( ! isset( static::$instance ) && ! ( static::$instance instanceof static ) ) {
public static function instance()
{

Check failure on line 32 in deprecated/Singleton.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Opening brace should be on the same line as the declaration
if (! isset(static::$instance) && ! (static::$instance instanceof static)) {

Check failure on line 33 in deprecated/Singleton.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

No space after opening parenthesis is prohibited

Check failure on line 33 in deprecated/Singleton.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Expected 1 space before "!"; 0 found

Check failure on line 33 in deprecated/Singleton.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Expected 1 spaces after opening parenthesis; 0 found

Check failure on line 33 in deprecated/Singleton.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Expected 1 spaces before closing parenthesis; 0 found

Check failure on line 33 in deprecated/Singleton.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Expected 1 space after open parenthesis; 0 found

Check failure on line 33 in deprecated/Singleton.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

Expected 1 space before close parenthesis; 0 found

Check failure on line 33 in deprecated/Singleton.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

No space before closing parenthesis is prohibited
static::$instance = new static();

if ( method_exists( static::$instance, 'boot' ) ) {
if (method_exists(static::$instance, 'boot')) {

Check failure on line 36 in deprecated/Singleton.php

View workflow job for this annotation

GitHub Actions / Run PHPCS inspection

No space after opening parenthesis is prohibited
static::$instance->boot();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@

/**
* Abstract Dokan_Background_Processes class
* @deprecated 2.9.30 Use `WeDevs\Dokan\Abstracts\DokanBackgroundProcesses` instead of `WeDevs\Dokan\Abstracts\Abstract_Dokan_Background_Processes`
*/
abstract class Abstract_Dokan_Background_Processes extends DokanBackgroundProcesses {}
6 changes: 6 additions & 0 deletions deprecated/class-abstrct-dokan-rest-store-controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,10 @@

use WeDevs\Dokan\Abstracts\DokanRESTAdminController;

/**
* Dokan REST Admin Controller
*
* @deprecated 2.9.30 Use `WeDevs\Dokan\Abstracts\DokanRESTAdminController` instead of `WeDevs\Dokan\Abstracts\Dokan_REST_Admin_Controller`
*/

abstract class Dokan_REST_Admin_Controller extends DokanRESTAdminController {}
4 changes: 3 additions & 1 deletion deprecated/class-dokan-email.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<?php

/**
* Fallback for depricated
* Fallback for deprecated
* Dokan Email Class
*
* @deprecated 3.0.0 use dokan()->email instead of Dokan_Email
*/
class Dokan_Email {

Expand Down
5 changes: 5 additions & 0 deletions deprecated/class-dokan-rest-controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,9 @@

use WeDevs\Dokan\Abstracts\DokanRESTController;

/**
* Dokan REST Admin Controller
*
* @deprecated 2.9.30 Use `WeDevs\Dokan\REST\DokanBaseController` instead of `WeDevs\Dokan\Abstracts\Dokan_REST_Controller`
*/
class Dokan_REST_Controller extends DokanRESTController {}
6 changes: 5 additions & 1 deletion deprecated/class-dokan-rest-product-controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

use WeDevs\Dokan\REST\ProductController;

/**
* Dokan REST Product Controller
*
* @deprecated 2.9.30 Use `WeDevs\Dokan\REST\ProductController` instead of `Dokan_REST_Product_Controller`
*/
class Dokan_REST_Product_Controller extends ProductController {

public function __construct() {}
}
7 changes: 7 additions & 0 deletions deprecated/class-dokan-rest-store-controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,11 @@

use WeDevs\Dokan\REST\StoreController;

/**
* Dokan REST Store Controller
*
* @deprecated 2.9.30 Use `WeDevs\Dokan\REST\StoreController` instead of `Dokan_REST_Store_Controller`
*/


class Dokan_REST_Store_Controller extends StoreController {}
6 changes: 6 additions & 0 deletions deprecated/class-dokan-seller-setup-wizard.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<?php
use WeDevs\Dokan\Vendor\SetupWizard;

/**
* Class Dokan_Seller_Setup_Wizard
*
* @deprecated 3.0.0 Use `WeDevs\Dokan\Vendor\SetupWizard` instead of `Dokan_Seller_Setup_Wizard`
*/

class Dokan_Seller_Setup_Wizard extends SetupWizard {}
6 changes: 6 additions & 0 deletions deprecated/class-dokan-store-category-walker.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,10 @@

use WeDevs\Dokan\Walkers\Category;

/**
* Dokan Store Category Walker Class
*
* @deprecated 3.0.0 Use `WeDevs\Dokan\Walkers\Category` instead of `Dokan_Store_Category_Walker`
*/

class Dokan_Store_Category_Walker extends Category {}
6 changes: 6 additions & 0 deletions deprecated/class-dokan-store-location-widget.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<?php

/**
* Store Location
*
* @deprecated 3.0.0 Use `WeDevs\Dokan\StoreLocation` instead of `Dokan_Store_Location`
*/

class Dokan_Store_Location {}
Loading
Loading