Skip to content

Commit

Permalink
Merge branch 'release/3.7.19'
Browse files Browse the repository at this point in the history
  • Loading branch information
nurul-umbhiya committed May 24, 2023
2 parents bb7d58e + 6a5eaf9 commit ac10a5b
Show file tree
Hide file tree
Showing 40 changed files with 965 additions and 313 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ config.json
/vendor/
phpcs-report.txt
/phpcs.xml
.phpunit.result.cache
20 changes: 17 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, multi vendor marketplace, multi seller store, multi-vendor, multi seller, commissions, multivendor, marketplace, product vendors, woocommerce vendor, commission rate, e-commerce, woocommerce, ebay, ecommerce.
**Requires at least:** 5.4
**Tested up to:** 6.2.0
**Tested up to:** 6.2.2
**WC requires at least:** 5.0.0
**WC tested up to:** 7.7.0
**Requires PHP:** 7.2
**Stable tag:** 3.7.18
**Stable tag:** 3.7.19
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -338,10 +338,24 @@ A. Just install and activate the PRO version without deleting the free plugin. A

## Changelog ##

### v3.7.19 ( May 24, 2023 ) ###

- **update:** Separated shipping tax fee recipient from the product tax fee recipient
- **update:** Added support for multiple shipping line items for suborders
- **update:** Moved shipping splitting functionality to Dokan Lite from Dokan Pro.Previously, this feature was only available on Dokan Pro.
- **update:** Improved the responsiveness of tables on the Vendor Dashboard by making them horizontally scrollable on smaller-sized screens.
- **fix:** Disabling product review from WooCommerce settings doesn’t remove the review section from the vendor profile.
- **fix:** Broken layout of Discounted Price section in Vendor Dashboard product edit page on full-width page layout themes.
- **fix:** Fixed some warnings and fatal errors for PHP versions 8.1 and 8.2.
- **fix:** Fixed incorrectly closed product category menu after_widget args
- **fix:** [VendorSetupWizard] Fixed an issue where the ‘Hide Email Address’ option was still displayed on the Vendor Setup wizard page even when it was enabled from Dokan Admin Settings.
- **fix:** Email notification for withdrawal approval no longer shows HTML code in its header.


### v3.7.18 ( May 10, 2023 ) ###

- **fix:** Fixed product getting published after enabling vendor selling status from admin dashboard
- **update:** [ReverseWithdrawal] Added sold individually param to true for advertisement base product when creating it, so that quantity can't be changed
- **update:** [ReverseWithdrawal] Added sold individually param to true for reverse withdrawal base product when creating it, so that quantity can't be changed
- **update:** [ColorSchemeCustomizer] Used color set by Color Scheme Customizer Module instead of hardcoded value for login form popup and withdraw schedule popup header color
- **update:** Remove expected earning calculation from product listing and editing pages
- **update:** Added a notice before deleting products via bulk action under Vendor Dashboard → Product listing page
Expand Down
7 changes: 7 additions & 0 deletions assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3256,6 +3256,9 @@ div.media-sidebar a.edit-attachment {
.product-edit-new-container .content-half-part.featured-image {
padding-left: 25px;
}
.product-edit-new-container .content-half-part.sale-price {
display: inline-block;
}
.product-edit-new-container .dokan-new-product-featured-img {
border: 4px dashed #dddddd;
height: 294px !important;
Expand Down Expand Up @@ -6134,6 +6137,10 @@ p.vendor-customer-registration .radio:hover {
.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout1 .profile-info-summery-wrapper .profile-info-summery .profile-info .dokan-store-info {
max-width: 590px;
}
.dokan-dashboard .dokan-dashboard-content .dokan-table {
display: block;
overflow: scroll;
}
}
@media (max-width: 992px) {
#dokan-seller-listing-wrap.list-view .dokan-seller-wrap .dokan-single-seller .store-wrapper {
Expand Down
19 changes: 14 additions & 5 deletions assets/js/vue-admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,8 @@ if (false) {(function () {
//
//
//
//
//
/* harmony default export */ __webpack_exports__["a"] = ({
name: 'UploadImage',
inheritAttrs: false,
Expand Down Expand Up @@ -1938,11 +1940,19 @@ var render = function() {
{ staticClass: "dokan-upload-image", on: { click: _vm.uploadImage } },
[
!_vm.showButton
? _c("img", { attrs: { src: _vm.image.src ? _vm.image.src : _vm.src } })
: _vm._e(),
_vm._v(" "),
_vm.showButton
? _c(
"div",
{ staticClass: "dokan-upload-image-container" },
[
_c("img", {
attrs: { src: _vm.image.src ? _vm.image.src : _vm.src }
}),
_vm._v(" "),
_vm._t("imagePlaceholder")
],
2
)
: _c(
"button",
{
on: {
Expand All @@ -1954,7 +1964,6 @@ var render = function() {
},
[_vm._v("\n " + _vm._s(_vm.buttonLabel) + "\n ")]
)
: _vm._e()
]
)
}
Expand Down
2 changes: 1 addition & 1 deletion assets/js/vue-admin.min.js

Large diffs are not rendered by default.

19 changes: 14 additions & 5 deletions assets/js/vue-bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,8 @@ if (false) {(function () {
//
//
//
//
//
/* harmony default export */ __webpack_exports__["a"] = ({
name: 'UploadImage',
inheritAttrs: false,
Expand Down Expand Up @@ -2081,11 +2083,19 @@ var render = function() {
{ staticClass: "dokan-upload-image", on: { click: _vm.uploadImage } },
[
!_vm.showButton
? _c("img", { attrs: { src: _vm.image.src ? _vm.image.src : _vm.src } })
: _vm._e(),
_vm._v(" "),
_vm.showButton
? _c(
"div",
{ staticClass: "dokan-upload-image-container" },
[
_c("img", {
attrs: { src: _vm.image.src ? _vm.image.src : _vm.src }
}),
_vm._v(" "),
_vm._t("imagePlaceholder")
],
2
)
: _c(
"button",
{
on: {
Expand All @@ -2097,7 +2107,6 @@ var render = function() {
},
[_vm._v("\n " + _vm._s(_vm.buttonLabel) + "\n ")]
)
: _vm._e()
]
)
}
Expand Down
2 changes: 1 addition & 1 deletion assets/js/vue-bootstrap.min.js

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions assets/src/less/products.less
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,10 @@
padding-left: 25px;
}

.content-half-part.sale-price {
display: inline-block;
}

.dokan-new-product-featured-img {
border: 4px dashed #dddddd;
height: 294px !important;
Expand Down
9 changes: 9 additions & 0 deletions assets/src/less/responsive.less
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
}
}
}

.dokan-dashboard {
.dokan-dashboard-content {
.dokan-table {
display: block;
overflow: scroll;
}
}
}
}

@media (max-width: 992px) {
Expand Down
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
"tareq1988/wp-php-cs-fixer": "dev-master",
"phpcompatibility/phpcompatibility-wp": "dev-master",
"phpunit/phpunit": "^8.5.31"
"phpunit/phpunit": "^8.5.31",
"wp-phpunit/wp-phpunit": "dev-master",
"yoast/phpunit-polyfills": "^1.0@dev"
},
"config": {
"platform": {
Expand Down
Loading

0 comments on commit ac10a5b

Please sign in to comment.