Skip to content

Commit

Permalink
Merge branch 'release/3.12.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
shohag121 committed Sep 23, 2024
2 parents cbd4683 + 5c20890 commit dca3c6b
Show file tree
Hide file tree
Showing 71 changed files with 1,199 additions and 757 deletions.
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
**Donate Link:** http://tareq.co/donate/
**Tags:** WooCommerce multivendor marketplace, multivendor marketplace, multivendor, multi seller, multi vendor, WooCommerce marketplace, WooCommerce product vendors
**Requires at least:** 6.4
**Tested up to:** 6.6.1
**Tested up to:** 6.6.2
**WC requires at least:** 8.0.0
**WC tested up to:** 9.2.3
**WC tested up to:** 9.3.2
**Requires PHP:** 7.4
**Stable tag:** 3.12.1
**Stable tag:** 3.12.2
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

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


## Changelog ##

### v3.12.2 ( Sep 23, 2024 ) ###

- **fix:** Product gallery image uploader close button style fix.
- **fix:** Fix incorrect sub-order status updates when the main order status changed specifically for cancelled sub-orders.
- **fix:** Fixed vendor coupon validation for various discount item types.

### v3.12.1 ( Aug 30, 2024 ) ###
- **fix:** Resolve fatal error when updating Dokan Lite to 3.12.0 with Dokan Pro 3.9.7.

Expand Down
8 changes: 3 additions & 5 deletions assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3405,12 +3405,11 @@ div.media-sidebar a.edit-attachment {
color: red;
background: rgba(0, 0, 0, 0.6);
margin: 0;
padding: 0 3px;
font-size: 50px;
font-size: 35px;
width: 100%;
text-align: center;
height: 100%;
padding-top: 25%;
padding: 25% 3px 0;
font-weight: bold;
display: none;
}
Expand Down Expand Up @@ -3970,11 +3969,10 @@ div.media-sidebar a.edit-attachment {
background: rgba(0, 0, 0, 0.6);
margin: 0;
padding: 0 3px;
font-size: 50px;
font-size: 35px;
width: 100%;
text-align: center;
height: 100%;
padding-top: 25%;
font-weight: bold;
display: none;
}
Expand Down
8 changes: 3 additions & 5 deletions assets/src/less/products.less
Original file line number Diff line number Diff line change
Expand Up @@ -544,12 +544,11 @@
color: red;
background: rgba(0, 0, 0, 0.6);
margin: 0;
padding: 0 3px;
font-size: 50px;
font-size: 35px;
width: 100%;
text-align: center;
height: 100%;
padding-top: 25%;
padding: 25% 3px 0;
font-weight: bold;
display: none;
}
Expand Down Expand Up @@ -1267,11 +1266,10 @@
background: rgba(0, 0, 0, 0.6);
margin: 0;
padding: 0 3px;
font-size: 50px;
font-size: 35px;
width: 100%;
text-align: center;
height: 100%;
padding-top: 25%;
font-weight: bold;
display: none;
}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"php": ">=7.4",
"appsero/client": "^v2.0.2",
"jakeasmith/http_build_url": "^1",
"appsero/updater": "^v2.2.0"
"appsero/updater": "^v2.3.0"
},
"require-dev": {
"wp-coding-standards/wpcs": "dev-develop",
Expand Down
90 changes: 45 additions & 45 deletions composer.lock

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

10 changes: 5 additions & 5 deletions deprecated/deprecated-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
*
* @since 3.0.0
*
* @param string $function Function used.
* @param string $function_name Function used.
* @param string $message Message to log.
* @param string $version Version the message was added in.
*
* @return void
*/
function dokan_doing_it_wrong( $function, $message, $version ) {
function dokan_doing_it_wrong( $function_name, $message, $version ) {
$message .= ' Backtrace: ' . wp_debug_backtrace_summary();

if ( wp_doing_ajax() || WC()->is_rest_api_request() ) {
do_action( 'doing_it_wrong_run', $function, $message, $version );
error_log( "{$function} was called incorrectly. {$message}. This message was added in version {$version}." );
do_action( 'doing_it_wrong_run', $function_name, $message, $version );
error_log( "{$function_name} was called incorrectly. {$message}. This message was added in version {$version}." );
} else {
_doing_it_wrong( $function, $message, $version );
_doing_it_wrong( $function_name, $message, $version ); // phpcs:ignore
}
}

Expand Down
Loading

0 comments on commit dca3c6b

Please sign in to comment.