Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
nurul-umbhiya committed Oct 25, 2023
2 parents ca39764 + f784b98 commit 1043fed
Show file tree
Hide file tree
Showing 15 changed files with 3,096 additions and 1,105 deletions.
16 changes: 13 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.1
**Tested up to:** 6.3.2
**WC requires at least:** 5.0.0
**WC tested up to:** 8.1.1
**WC tested up to:** 8.2.1
**Requires PHP:** 7.3
**Stable tag:** 3.9.0
**Stable tag:** 3.9.1
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

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

## Changelog ##

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

- **update:** Removed flaticon packages and replace used icons with fontAwesome icons. This will reduce the plugin zip size.
- **update:** Added a new settings to disable fontAwesome library
- **update:** Changed all the single date picker fields with daterange picker. This updates will keep the design consistent throughout the plugin.
- **fix:** [StoreOpenCloseTime] An issue where invalid store opening or closing times generate warning and fatal error on single store page.
- **fix:** [Email] Fixed an issue where the product edit link on email template redirects to the products listing instead of single product edit page
- **fix:** Fixed some responsive issue under vendor dashboard product edit page.
- **fix:** Fixed some responsive issue under vendor dashboard withdraw page.

### v3.9.0 ( Oct 06, 2023 ) ###

- **new:** Added two new hooks named `dokan_get_admin_report_data` and `dokan_get_overview_data` to extend Dokan reports functionality.
Expand Down
50 changes: 44 additions & 6 deletions assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -5643,6 +5643,30 @@ div.media-sidebar a.edit-attachment {
text-align: right;
border-top: 1px solid #eee;
}
@media only screen and (max-width: 500px) {
.dokan-withdraw-content .dokan-withdraw-area .entry-content .dokan-panel .dokan-panel-body .dokan-panel-inner-container {
display: flex;
flex-direction: column;
}
.dokan-withdraw-content .dokan-withdraw-area .entry-content .dokan-panel .dokan-panel-body .dokan-panel-inner-container .dokan-w5 {
position: relative;
left: 0;
right: 100%;
top: 100%;
transform: none;
margin-top: 20px;
}
.dokan-withdraw-content .dokan-withdraw-area .entry-content .dokan-withdraw-status-filter-container .dokan-add-product-link a {
margin: 15px 0;
}
.dokan-withdraw-content .dokan-withdraw-area table.dokan-table-striped {
overflow: auto;
display: block;
}
.dokan-withdraw-content .dokan-withdraw-area table.dokan-table-striped tbody tr th {
width: 150px;
}
}
.dokan-login-form-popup-wrapper {
width: 430px !important;
padding: 16px !important;
Expand Down Expand Up @@ -6410,7 +6434,7 @@ p.vendor-customer-registration .radio:hover {
.dokan-dashboard .dokan-dashboard-content {
float: none;
width: 100%;
padding: 20px;
padding: 20px 0;
}
.dokan-dashboard .dokan-dash-sidebar .dokan-table,
.dokan-dashboard .dokan-dashboard-content .dokan-table {
Expand Down Expand Up @@ -6471,21 +6495,35 @@ p.vendor-customer-registration .radio:hover {
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area .dokan-product-date-filter {
display: flex;
flex-flow: column wrap;
justify-content: space-between;
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area .dokan-product-date-filter .dokan-form-group {
margin-bottom: 0;
margin-bottom: 10px;
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area .dokan-product-search-form {
margin-top: 15px;
width: 100%;
display: flex;
justify-content: space-between;
flex-flow: row-reverse nowrap;
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area .dokan-product-search-form .dokan-form-group {
margin-bottom: 0;
margin-right: 0;
width: 73%;
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area #product-filter .dokan-form-group {
margin-top: 15px;
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area .dokan-product-search-form .dokan-btn {
width: 25%;
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area #dokan-bulk-action-selector {
width: 73%;
margin-right: 2%;
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area #dokan-bulk-action-submit {
width: 25%;
margin-right: 0;
}
.dokan-dashboard .dokan-product-listing .dokan-product-listing-area #product-filter .dokan-btn {
width: 100%;
}
.dokan-dashboard .dokan-right,
.dokan-dashboard .dokan-left {
Expand Down
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/helper.js

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

2 changes: 1 addition & 1 deletion assets/js/reverse-withdrawal.js

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

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.

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.0
* Version: 3.9.1
* Author: weDevs
* Author URI: https://dokan.co/
* Text Domain: dokan-lite
* WC requires at least: 5.0.0
* WC tested up to: 8.1.1
* WC tested up to: 8.2.1
* Domain Path: /languages/
* License: GPL2
*/
Expand Down Expand Up @@ -63,7 +63,7 @@ final class WeDevs_Dokan {
*
* @var string
*/
public $version = '3.9.0';
public $version = '3.9.1';

/**
* Instance of self
Expand Down
2 changes: 1 addition & 1 deletion includes/Dashboard/Templates/Products.php
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public function load_product_edit_template() {
/**
* Render Product Edit Page for Email.
*
* @since DOKAN_SINCE
* @since 3.9.1
*
* @return void
*/
Expand Down
2 changes: 1 addition & 1 deletion includes/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,7 @@ function dokan_get_store_url( $user_id ) {
/**
* Get current page URL.
*
* @since DOKAN_SINCE
* @since 3.9.1
*
* @return string
*/
Expand Down
Loading

0 comments on commit 1043fed

Please sign in to comment.