Skip to content

Commit

Permalink
Merge branch 'release/3.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@nurul-umbhiya
nurul-umbhiya committed Aug 18, 2023
2 parents 9b38c76 + 1e105ff commit 0a856d6
Show file tree
Hide file tree
Showing 53 changed files with 5,611 additions and 4,262 deletions.
15 changes: 11 additions & 4 deletions README.md
View file
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.2
**Tested up to:** 6.3.0
**WC requires at least:** 5.0.0
**WC tested up to:** 7.9.0
**Requires PHP:** 7.2
**Stable tag:** 3.7.24
**WC tested up to:** 8.0.2
**Requires PHP:** 7.3
**Stable tag:** 3.8.0
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

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

## Changelog ##

### v3.8.0 ( Aug 18, 2023 ) ###

- **update:** Added HPOS (High-Performance Order Storage) support for Dokan Lite.
- **fix:** Resolved an issue where traces of order data were left on the Dokan end even after the order had been deleted from the WordPress admin panel.
Previously, deleted orders were still visible under the Dashboard Overview menu, Reports menu, and under Withdraw menu. This issue has been fixed in the current release.
- **fix:** Multiple issues have been fixed after a product of an order has been deleted.

### v3.7.24 ( Jul 25, 2023 ) ###

- **update:** Restrictions added for vendors to review and purchase their own products.
Expand Down
5 changes: 5 additions & 0 deletions assets/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2730,6 +2730,11 @@ div.media-sidebar a.edit-attachment {
vertical-align: middle;
background: none;
}
.dokan-dashboard div.chart-container > div.chart-legend-container > table td {
padding: 0;
padding-left: 5px;
padding-right: 5px;
}
.dokan-column-name-with-avatar {
position: relative;
padding-left: 46px !important;
Expand Down
100 changes: 49 additions & 51 deletions assets/css/vue-admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2063,42 +2063,42 @@ ul[data-v-525b077c] {
border-radius: 50%;
}

.secret-box-wraper[data-v-38c7e6d8] {
.secret-box-wraper[data-v-d315bc24] {
display: flex;
flex-direction: row-reverse;
}
.secret-box-wraper .secret-input-box[data-v-38c7e6d8] {
.secret-box-wraper .secret-input-box[data-v-d315bc24] {
position: relative;
display: flex;
width: 25em;
}
.secret-box-wraper .secret-input-box div button[data-v-38c7e6d8] {
.secret-box-wraper .secret-input-box div button[data-v-d315bc24] {
cursor: pointer;
height: 20px;
min-height: 32px;
min-width: 32px;
border: 0.957434px solid #686666;
border: 1px solid #f3f4f6;
box-shadow: 0px 3.82974px 3.82974px rgba(0, 0, 0, 0.1);
border-radius: 5px;
background: white;
color: #686666;
}
.secret-box-wraper .secret-input-box .secret-input[data-v-38c7e6d8] {
.secret-box-wraper .secret-input-box .secret-input[data-v-d315bc24] {
width: 100%;
}
.secret-box-wraper .secret-input-box .secret-input.blurry-input[data-v-38c7e6d8] {
.secret-box-wraper .secret-input-box .secret-input.blurry-input[data-v-d315bc24] {
color: transparent;
text-shadow: 0 0 7px #333;
}
.secret-box-wraper .secret-input-box .secret-input-placeholder[data-v-38c7e6d8] {
.secret-box-wraper .secret-input-box .secret-input-placeholder[data-v-d315bc24] {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
color: #686666;
}
@media only screen and (max-width: 768px) {
.secret-box-wraper .secret-input-box[data-v-38c7e6d8] {
.secret-box-wraper .secret-input-box[data-v-d315bc24] {
max-width: 125px !important;
}
}
Expand Down Expand Up @@ -2175,22 +2175,26 @@ ul.dokan-settings-repeatable-list li span.remove-item {
margin-left: 10px;
}
.dokan-settings-sub-section {
margin-bottom: 30px;
padding: 20px;
border: 1px solid #f3f4f6;
border-bottom: 0;
background: #f9fafb;
}
.dokan-settings-sub-section .sub-section-title {
margin: 0;
font-size: 22px;
font-size: 14px;
font-family: Roboto, sans-serif;
font-weight: 600;
line-height: 26px;
line-height: 1.2;
margin-bottom: 8px;
}
.dokan-settings-sub-section .sub-section-description {
margin: 0;
font-size: 15px;
font-size: 13px;
font-weight: 300;
line-height: 21px;
font-family: Roboto, sans-serif;
color: #6B7280;
}
.dokan-settings-sub-section .sub-section-description .learn-more-btn {
cursor: pointer;
Expand All @@ -2204,10 +2208,10 @@ ul.dokan-settings-repeatable-list li span.remove-item {
color: #E67E22 !important;
}
.field_contents {
border: 1px solid #B0A7A7;
padding: 14px 30px 18px 27px;
border: 1px solid #f3f4f6;
padding: 15px 20px 15px 20px;
border-top: 0;
background: rgba(244, 246, 250, 0.17);
background: #fff;
}
.field_contents fieldset {
display: flex;
Expand All @@ -2217,27 +2221,28 @@ ul.dokan-settings-repeatable-list li span.remove-item {
flex: 2;
}
.field_contents fieldset .field_data .field_heading {
color: #000000;
color: #111827;
margin: 0;
font-size: 17px;
font-size: 14px;
font-style: normal;
font-weight: 600;
line-height: 35px;
line-height: 1.25;
font-family: 'Roboto', sans-serif;
}
.field_contents fieldset .field_data .field_heading span i {
margin: 5px 0 0 5px;
margin: -3px 0 0 5px;
}
.field_contents fieldset .field_data .field_heading span .tooltip {
font-size: 14px;
}
.field_contents fieldset .field_data .field_desc {
color: #000;
color: #6B7280;
margin: 0;
margin-top: 5px;
font-size: 13px;
font-style: normal;
font-weight: 300;
line-height: 17px;
line-height: 1.2;
font-family: 'Roboto', sans-serif;
}
.field_contents fieldset .field_data .field_desc a {
Expand Down Expand Up @@ -2289,7 +2294,7 @@ ul.dokan-settings-repeatable-list li span.remove-item {
margin-top: 20px;
}
.field_contents .radio_fields label {
border: 0.882967px solid #B0A7A7;
border: 0.882967px solid #f3f4f6;
padding: 10px 15px;
display: inline-block;
overflow: hidden;
Expand All @@ -2305,7 +2310,7 @@ ul.dokan-settings-repeatable-list li span.remove-item {
border-bottom-left-radius: 5px;
}
.field_contents .radio_fields label:last-child {
border-right: 0.882967px solid #B0A7A7;
border-right: 0.882967px solid #f3f4f6;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
}
Expand All @@ -2314,11 +2319,11 @@ ul.dokan-settings-repeatable-list li span.remove-item {
background: rgba(182, 206, 254, 0.38);
box-sizing: border-box;
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.1);
border-color: rgba(3, 58, 163, 0.81);
border-color: rgba(3, 58, 163, 0.41);
}
.field_contents .radio_fields .checked {
color: rgba(3, 58, 163, 0.85);
border: 1px solid rgba(3, 58, 163, 0.81);
border: 1px solid rgba(3, 58, 163, 0.21);
background: rgba(182, 206, 254, 0.38);
box-sizing: border-box;
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.1);
Expand Down Expand Up @@ -2383,7 +2388,7 @@ ul.dokan-settings-repeatable-list li span.remove-item {
.field_contents .field input[type='text'],
.field_contents .field input[type='number'],
.field_contents .field input[type='button'] {
border: 0.957434px solid #686666;
border: 0.957434px solid #E9E9E9;
min-height: 32px;
box-shadow: 0px 3.82974px 3.82974px rgba(0, 0, 0, 0.1);
border-radius: 5px;
Expand All @@ -2403,7 +2408,7 @@ ul.dokan-settings-repeatable-list li span.remove-item {
}
.field_contents .field label.checked {
color: rgba(3, 58, 163, 0.85);
border: 1px solid rgba(3, 58, 163, 0.81);
border: 1px solid rgba(3, 58, 163, 0.41);
background: rgba(182, 206, 254, 0.38);
box-sizing: border-box;
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.1);
Expand Down Expand Up @@ -2431,7 +2436,6 @@ ul.dokan-settings-repeatable-list li span.remove-item {
border: 0.82px solid #E5E5E5;
padding: 10px 25px;
background: rgba(220, 232, 254, 0.38);
box-shadow: 0px 3.28px 3.28px rgba(0, 0, 0, 0.1);
border-radius: 6.56px;
}
.field_contents .scl_fields .scl_header {
Expand Down Expand Up @@ -2496,7 +2500,7 @@ ul.dokan-settings-repeatable-list li span.remove-item {
}
.field_contents .scl_fields .scl_info .scl_text,
.field_contents .scl_fields .scl_info .scl_html {
border: 1px solid #b0a7a7;
border: 1px solid #f3f4f6;
display: flex;
padding: 10px 30px 15px 27px;
border-top: 0;
Expand Down Expand Up @@ -2560,7 +2564,7 @@ ul.dokan-settings-repeatable-list li span.remove-item {
}
.field_contents .scl_fields .scl_info:nth-child(2) {
margin-top: 15px;
border-top: 1px solid #b0a7a7;
border-top: 1px solid #f3f4f6;
}
.field_contents .scl_fields .scl_info:last-child {
margin-bottom: 10px;
Expand Down Expand Up @@ -2756,11 +2760,9 @@ ul.dokan-settings-repeatable-list li span.remove-item {
}
.dokan-settings-wrap div.nav-tab-wrapper {
width: 340px;
border: 1px solid #c8d7e1;
padding: 14px 16px 30px 24px;
overflow: hidden;
background: #FAFBFF;
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
background: #F9FAFB;
box-sizing: border-box;
margin-right: 12px;
border-bottom: none;
Expand All @@ -2781,7 +2783,7 @@ ul.dokan-settings-repeatable-list li span.remove-item {
transition: none;
background: transparent;
font-weight: bold;
border-bottom: 1px solid #cecaca;
border-bottom: 1px solid #e9e9ea;
transition-property: none;
}
.dokan-settings-wrap div.nav-tab-wrapper .nav-tab img {
Expand Down Expand Up @@ -2811,7 +2813,6 @@ ul.dokan-settings-repeatable-list li span.remove-item {
position: relative;
transition: 0.3s linear;
background: #fff !important;
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
transition-property: none;
}
.dokan-settings-wrap div.nav-tab-wrapper .nav-tab.nav-tab-active:before {
Expand All @@ -2823,15 +2824,6 @@ ul.dokan-settings-repeatable-list li span.remove-item {
height: 100%;
top: 0;
}
.dokan-settings-wrap div.nav-tab-wrapper .nav-tab.nav-tab-active::after {
content: '';
position: absolute;
width: 100%;
height: 1px;
background: #cecaca;
left: 0;
top: -1px;
}
.dokan-settings-wrap div.nav-tab-wrapper .nav-tab:last-child {
border-bottom: 0;
}
Expand Down Expand Up @@ -2870,31 +2862,37 @@ ul.dokan-settings-repeatable-list li span.remove-item {
}
.dokan-settings-wrap .metabox-holder .settings-header .settings-document-button a.doc-link {
color: #033AA3D9;
border: 0.82px solid #033AA3;
border: 1px solid #f3f4f6;
padding: 10px 15px;
font-size: 12px;
background: #FFF;
box-sizing: border-box;
box-shadow: 0px 3.28px 3.28px rgba(0, 0, 0, 0.25);
box-shadow: 2px 2px 3px 0px rgba(0, 0, 0, 0.1);
font-family: Roboto, sans-serif;
line-height: 15px;
border-radius: 6.56px;
text-decoration: none;
}
.dokan-settings-wrap .metabox-holder .settings-header .settings-document-button a.doc-link:hover {
background: #033aa30f;
}
.dokan-settings-wrap .metabox-holder .group .form-table .dokan-settings-fields .dokan-settings-field-type-sub_section,
.dokan-settings-wrap .metabox-holder .group .form-table .dokan-settings-fields .dokan-settings-field-type-disbursement_sub_section {
border-bottom: 1px solid #b0a7a7;
border-bottom: 1px solid #f3f4f6;
}
.dokan-settings-wrap .metabox-holder .group .form-table .dokan-settings-fields .dokan-settings-field-type-sub_section .sub-section-styles,
.dokan-settings-wrap .metabox-holder .group .form-table .dokan-settings-fields .dokan-settings-field-type-disbursement_sub_section .sub-section-styles {
margin-top: 50px;
margin-top: 20px;
margin-bottom: 0;
padding: 20px;
background: #f9fafb;
}
.dokan-settings-wrap .metabox-holder .group .form-table .dokan-settings-fields div:not(.dokan-settings-field-type-sub_section) .field_contents {
border: 1px solid #b0a7a7;
border: 1px solid #f3f4f6;
border-top: none;
}
.dokan-settings-wrap .metabox-holder .group .form-table .dokan-settings-fields > div:not(.dokan-settings-field-type-sub_section):first-child {
border-top: 1px solid #b0a7a7;
border-top: 1px solid #f3f4f6;
}
.dokan-settings-wrap .metabox-holder .back-to-top {
width: 44px;
Expand Down Expand Up @@ -2925,7 +2923,7 @@ ul.dokan-settings-repeatable-list li span.remove-item {
height: 100%;
content: "";
position: absolute;
background: #E5E5E5;
background: #fff;
}
.dokan-settings-wrap .radio-image-container {
padding: 20px 0;
Expand Down
2 changes: 1 addition & 1 deletion assets/js/vue-admin.js
View file

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions assets/src/less/dashboard.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,14 @@ div.media-sidebar a.edit-attachment{
}
}
}

div.chart-container > div.chart-legend-container > table {
td {
padding: 0;
padding-left: 5px;
padding-right: 5px;
}
}
}

.dokan-column-name-with-avatar {
Expand Down
9 changes: 6 additions & 3 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
],
"minimum-stability": "dev",
"require": {
"php": ">=7.2",
"php": ">=7.3",
"appsero/client": "dev-develop",
"jakeasmith/http_build_url": "^1"
},
Expand All @@ -26,7 +26,7 @@
},
"config": {
"platform": {
"php": "7.2"
"php": "7.3"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
Expand All @@ -35,7 +35,10 @@
"autoload": {
"psr-4": {
"WeDevs\\Dokan\\": "includes/"
}
},
"files": [
"includes/functions-rest-api.php"
]
},
"scripts": {
"phpcs": [
Expand Down
Loading

0 comments on commit 0a856d6

Please sign in to comment.