Skip to content

Commit

Permalink
Merge branch 'develop' into feat/withdraw-charges
Browse files Browse the repository at this point in the history
  • Loading branch information
Aunshon committed Nov 20, 2023
2 parents 9225ec1 + 0989aef commit 9cfa4d4
Show file tree
Hide file tree
Showing 23 changed files with 2,228 additions and 1,534 deletions.
14 changes: 11 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.6
**Tested up to:** 6.3.2
**Tested up to:** 6.4.1
**WC requires at least:** 5.0.0
**WC tested up to:** 8.2.1
**WC tested up to:** 8.2.2
**Requires PHP:** 7.3
**Stable tag:** 3.9.1
**Stable tag:** 3.9.2
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

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

## Changelog ##

### v3.9.2 ( Nov 10, 2023 ) ###

- **new:** A new email template has been introduced named Dokan Vendor Product Review. After a product has been reviewed, an email containing information about the review is sent to the vendor. The email includes details such as the reviewer’s name, product name, review rating, and text. The email also contains a link to the review page where the vendor can view the review and respond if necessary.
- **update:** Display a non-purchasable notice for the vendor’s own products.
- **fix:** [RestAPI] Fixed an issue where getting a single order via API gives an 'invalid ID' error If the compatibility mode isn't enabled for the HPOS feature on WooCOmmerce Order data storage settings
- **fix:** [ProductReview] Previously the email notification sent by WordPress when a review was added to a product, was sent to the product owner. This was wrong in the context of a marketplace. Because the email sent by WordPress includes some sensitive information, like the admin dashboard URL, customer email address, etc. With these changes, we are making sure that only the marketplace admin gets the new review emails sent by WordPress.
- **fix:** Previously, there was an issue where selecting “All,” then “None,” and subsequently “All” again didn’t function as expected. This occurred on the vendor product edit page for simple products, specifically within the Attributes section. However, following this update, all special cases of the “Select All” feature now work flawlessly.

### v3.9.1 ( Oct 17, 2023 ) ###

- **update:** Removed flaticon packages and replace used icons with fontAwesome icons. This will reduce the plugin zip size.
Expand Down
2 changes: 1 addition & 1 deletion assets/js/dokan-promo-notice.js

Large diffs are not rendered by default.

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.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/vue-bootstrap.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/vue-frontend.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/src/js/product-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -476,14 +476,14 @@

selectAllAttr: function(e) {
e.preventDefault();
$( this ).closest( 'li.product-attribute-list' ).find( 'select.dokan_attribute_values option' ).attr( 'selected', 'selected' );
$( this ).closest( 'li.product-attribute-list' ).find( 'select.dokan_attribute_values option' ).attr( 'selected', true );
$( this ).closest( 'li.product-attribute-list' ).find( 'select.dokan_attribute_values' ).trigger( 'change' );
return false;
},

selectNoneAttr: function(e) {
e.preventDefault();
$( this ).closest( 'li.product-attribute-list' ).find( 'select.dokan_attribute_values option' ).removeAttr( 'selected' );
$( this ).closest( 'li.product-attribute-list' ).find( 'select.dokan_attribute_values option' ).attr( 'selected', false );
$( this ).closest( 'li.product-attribute-list' ).find( 'select.dokan_attribute_values' ).trigger( 'change' );
return false;
},
Expand Down
82 changes: 44 additions & 38 deletions composer.lock

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

6 changes: 3 additions & 3 deletions dokan.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
* Plugin Name: Dokan
* Plugin URI: https://dokan.co/wordpress/
* Description: An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs.
* Version: 3.9.1
* Version: 3.9.2
* Author: weDevs
* Author URI: https://dokan.co/
* Text Domain: dokan-lite
* WC requires at least: 5.0.0
* WC tested up to: 8.2.1
* WC tested up to: 8.2.2
* Domain Path: /languages/
* License: GPL2
*/
Expand Down Expand Up @@ -64,7 +64,7 @@ final class WeDevs_Dokan {
*
* @var string
*/
public $version = '3.9.1';
public $version = '3.9.2';

/**
* Instance of self
Expand Down
3 changes: 3 additions & 0 deletions includes/Emails/Manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ public function load_dokan_emails( $wc_emails ) {
$wc_emails['Dokan_Email_New_Order'] = new VendorNewOrder();
$wc_emails['Dokan_Email_Completed_Order'] = new VendorCompletedOrder();
$wc_emails['Dokan_Email_Reverse_Withdrawal_Invoice'] = new ReverseWithdrawalInvoice();
$wc_emails['Dokan_Email_Vendor_Product_Review'] = new VendorProductReview();

return apply_filters( 'dokan_email_classes', $wc_emails );
}
Expand Down Expand Up @@ -153,6 +154,8 @@ public function register_email_actions( $actions ) {
'dokan_withdraw_request_cancelled',
'dokan_pending_product_published_notification',
'dokan_trigger_contact_seller_mail',
'wp_set_comment_status',
'comment_post',
)
);

Expand Down
Loading

0 comments on commit 9cfa4d4

Please sign in to comment.