Skip to content

Commit e49d823

Browse files
shohag121shohag121
committed
Merge branch 'release/3.14.3'
2 parents 7a35e11 + 99dd9af commit e49d823

31 files changed

+949
-166
lines changed

Diff for: ‎CHANGELOG.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1+
### v3.13.1 ( Nov 11, 2024 ) ###
2+
3+
- **update:** Compatibility with the Printful Integration Module added.
4+
- **fix:** Improved logic to ensure the `add new category` button only appears when appropriate conditions are met, enhancing user experience.
5+
6+
17
### v3.13.0 ( Nov 06, 2024 ) ###
28

39
- **feat:** Replaced the Dokan array container with the League Container, ensuring backward compatibility for seamless performance and enhanced flexibility.
410
- **feat:** Updated Dokan to be fully compatible with WooCommerce Analytics Reports
5-
-
11+
612
### v3.12.6 ( Oct 24, 2024 ) ###
713

814
- **fix:** Fixed js error on frontend pages.
915

1016
### v3.12.5 ( Oct 16, 2024 ) ###
1117

1218
- **fix:** Implement order trash and untrash handling for Dokan
13-
- **fix:** Added wordpress native i18n support
19+
- **fix:** Added WordPress native i18n support
1420

1521
### v3.12.4 ( Oct 03, 2024 ) ###
1622

Diff for: ‎README.md

+4-8
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
**Requires at least:** 6.5
66
**Tested up to:** 6.7.1
77
**WC requires at least:** 8.0.0
8-
**WC tested up to:** 9.4.2
8+
**WC tested up to:** 9.4.3
99
**Requires PHP:** 7.4
10-
**Stable tag:** 3.14.2
10+
**Stable tag:** 3.14.3
1111
**License:** GPLv2 or later
1212
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html
1313

@@ -346,6 +346,8 @@ A. Just install and activate the PRO version without deleting the free plugin. A
346346

347347

348348
## Changelog ##
349+
### v3.14.3 ( Dec 11, 2024 ) ###
350+
- **update:** Updated Dokan admin header to display current pro plan and version with upgrading option.
349351

350352
### v3.14.2 ( Dec 06, 2024 ) ###
351353

@@ -372,12 +374,6 @@ A. Just install and activate the PRO version without deleting the free plugin. A
372374
- **fix:** Moved the vendor edit page from Dokan Pro to Dokan Lite and eliminated the commission setting from the WordPress default user profile page.
373375
- **fix:** Removed the commission from every category, introducing category-based commission in global settings, vendor settings, Dokan subscription products, and the admin setup wizard.
374376

375-
### v3.13.1 ( Nov 11, 2024 ) ###
376-
377-
- **update:** Compatibility with the Printful Integration Module added.
378-
- **fix:** Improved logic to ensure the `add new category` button only appears when appropriate conditions are met, enhancing user experience.
379-
380-
381377
[CHECK THE FULL CHANGELOG](https://github.com/getdokan/dokan/blob/develop/CHANGELOG.md).
382378

383379
## Upgrade Notice ##

Diff for: ‎assets/css/admin.css

+88-14
Original file line numberDiff line numberDiff line change
@@ -106,31 +106,85 @@
106106
}
107107
.dokan-admin-header {
108108
background: #fff;
109-
padding: 15px 15px 15px 22px;
110-
margin: 0 0 0 -20px;
111-
box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.1);
109+
padding: 16px 24px;
110+
margin: 20px 20px 0 2px;
111+
border-radius: 8px;
112+
box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.06);
113+
}
114+
.dokan-admin-header .dokan-admin-header-content {
112115
display: flex;
113116
align-items: center;
114117
justify-content: space-between;
118+
width: 100%;
115119
}
116-
.dokan-admin-header .dokan-admin-header-logo {
120+
.dokan-admin-header .dokan-admin-logo-wrap {
121+
display: flex;
122+
flex: 1;
123+
}
124+
.dokan-admin-header .dokan-admin-logo-wrap .dokan-admin-header-logo {
117125
display: flex;
118126
align-items: center;
119127
}
120-
.dokan-admin-header .dokan-admin-header-logo img {
121-
height: 25px;
128+
.dokan-admin-header .dokan-admin-logo-wrap .dokan-admin-header-logo img {
129+
height: 32px;
122130
width: auto;
123131
margin-right: 12px;
124132
}
125-
.dokan-admin-header .dokan-admin-header-logo span {
126-
color: #F1634C;
127-
background: #FFF4F2;
128-
padding: 4px 12px;
129-
font-size: 12px;
133+
.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags {
134+
display: flex;
135+
align-items: center;
136+
gap: 12px;
137+
margin-right: 24px;
138+
flex: 1;
139+
}
140+
.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag {
141+
border-radius: 20px;
142+
font-size: 1rem;
143+
line-height: 20px;
144+
font-weight: 400;
145+
padding: 0.5rem 1rem;
146+
max-height: 2rem;
147+
}
148+
.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.lite {
149+
background: #FF9B5366;
150+
color: #7B4E2E;
151+
display: flex;
152+
align-items: center;
153+
}
154+
.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.pro {
155+
background: #D8D8FE;
156+
color: #7047EB;
157+
display: flex;
158+
align-items: center;
159+
gap: 8px;
160+
text-transform: capitalize;
161+
font-weight: 450;
162+
}
163+
.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.pro .version-tag-pro-badge {
164+
background: #7047EB;
165+
color: white;
166+
border-radius: 28px;
167+
display: inline-flex;
168+
align-items: center;
169+
padding: 3px 9px;
170+
font-size: 16px;
171+
margin: -10px 0 -10px -10px;
172+
}
173+
.dokan-admin-header .upgrade-button {
174+
display: flex;
175+
align-items: center;
176+
gap: 8px;
177+
background: #7047EB;
178+
color: white;
179+
padding: 10px 20px;
180+
border-radius: 6px;
181+
text-decoration: none;
130182
font-weight: 500;
131-
font-family: "SF Pro Text", sans-serif;
132-
border: 1px solid rgba(241, 99, 76, 0.2);
133-
border-radius: 93px;
183+
transition: background-color 0.2s;
184+
margin-left: auto;
185+
}
186+
.dokan-admin-header .upgrade-button:hover {
187+
background: #A244FF;
134188
}
135189
.dokan-admin-header .dokan-admin-header-menu {
136190
padding-right: 6px;
@@ -289,6 +343,26 @@
289343
.dokan-admin-header .dokan-admin-header-menu .menu-item .menu-icon .dropdown .list-item a:focus {
290344
box-shadow: none;
291345
}
346+
@media screen and (max-width: 782px) {
347+
.dokan-admin-logo-wrap {
348+
flex-direction: column;
349+
}
350+
.dokan-admin-header {
351+
margin: 10px 10px 0 2px;
352+
padding: 12px 16px;
353+
}
354+
.dokan-admin-header .dokan-admin-header-content {
355+
gap: 16px;
356+
align-items: start;
357+
}
358+
.dokan-admin-header .dokan-version-tags {
359+
margin: 12px 0;
360+
flex-wrap: wrap;
361+
}
362+
.dokan-admin-header .upgrade-button {
363+
margin: 0;
364+
}
365+
}
292366
.dokan-dashboard .post-box-container {
293367
width: 49%;
294368
float: left;

Diff for: ‎assets/css/vue-admin.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -4659,7 +4659,7 @@ to {
46594659
opacity: 1;
46604660
}
46614661
#dokan-vendor-capabilities .capability-card .capability-image .zoom {
4662-
background-color: #FFB24B;
4662+
background-color: #7047EB;
46634663
border-radius: 9px;
46644664
color: white;
46654665
font-size: 24px;

Diff for: ‎assets/js/admin-rtl.css

+88-14
Original file line numberDiff line numberDiff line change
@@ -106,31 +106,85 @@
106106
}
107107
.dokan-admin-header {
108108
background: #fff;
109-
padding: 15px 22px 15px 15px;
110-
margin: 0 -20px 0 0;
111-
box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.1);
109+
padding: 16px 24px;
110+
margin: 20px 2px 0 20px;
111+
border-radius: 8px;
112+
box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.06);
113+
}
114+
.dokan-admin-header .dokan-admin-header-content {
112115
display: flex;
113116
align-items: center;
114117
justify-content: space-between;
118+
width: 100%;
115119
}
116-
.dokan-admin-header .dokan-admin-header-logo {
120+
.dokan-admin-header .dokan-admin-logo-wrap {
121+
display: flex;
122+
flex: 1;
123+
}
124+
.dokan-admin-header .dokan-admin-logo-wrap .dokan-admin-header-logo {
117125
display: flex;
118126
align-items: center;
119127
}
120-
.dokan-admin-header .dokan-admin-header-logo img {
121-
height: 25px;
128+
.dokan-admin-header .dokan-admin-logo-wrap .dokan-admin-header-logo img {
129+
height: 32px;
122130
width: auto;
123131
margin-left: 12px;
124132
}
125-
.dokan-admin-header .dokan-admin-header-logo span {
126-
color: #F1634C;
127-
background: #FFF4F2;
128-
padding: 4px 12px;
129-
font-size: 12px;
133+
.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags {
134+
display: flex;
135+
align-items: center;
136+
gap: 12px;
137+
margin-left: 24px;
138+
flex: 1;
139+
}
140+
.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag {
141+
border-radius: 20px;
142+
font-size: 1rem;
143+
line-height: 20px;
144+
font-weight: 400;
145+
padding: 0.5rem 1rem;
146+
max-height: 2rem;
147+
}
148+
.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.lite {
149+
background: #FF9B5366;
150+
color: #7B4E2E;
151+
display: flex;
152+
align-items: center;
153+
}
154+
.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.pro {
155+
background: #D8D8FE;
156+
color: #7047EB;
157+
display: flex;
158+
align-items: center;
159+
gap: 8px;
160+
text-transform: capitalize;
161+
font-weight: 450;
162+
}
163+
.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.pro .version-tag-pro-badge {
164+
background: #7047EB;
165+
color: white;
166+
border-radius: 28px;
167+
display: inline-flex;
168+
align-items: center;
169+
padding: 3px 9px;
170+
font-size: 16px;
171+
margin: -10px -10px -10px 0;
172+
}
173+
.dokan-admin-header .upgrade-button {
174+
display: flex;
175+
align-items: center;
176+
gap: 8px;
177+
background: #7047EB;
178+
color: white;
179+
padding: 10px 20px;
180+
border-radius: 6px;
181+
text-decoration: none;
130182
font-weight: 500;
131-
font-family: "SF Pro Text", sans-serif;
132-
border: 1px solid rgba(241, 99, 76, 0.2);
133-
border-radius: 93px;
183+
transition: background-color 0.2s;
184+
margin-right: auto;
185+
}
186+
.dokan-admin-header .upgrade-button:hover {
187+
background: #A244FF;
134188
}
135189
.dokan-admin-header .dokan-admin-header-menu {
136190
padding-left: 6px;
@@ -289,6 +343,26 @@
289343
.dokan-admin-header .dokan-admin-header-menu .menu-item .menu-icon .dropdown .list-item a:focus {
290344
box-shadow: none;
291345
}
346+
@media screen and (max-width: 782px) {
347+
.dokan-admin-logo-wrap {
348+
flex-direction: column;
349+
}
350+
.dokan-admin-header {
351+
margin: 10px 2px 0 10px;
352+
padding: 12px 16px;
353+
}
354+
.dokan-admin-header .dokan-admin-header-content {
355+
gap: 16px;
356+
align-items: start;
357+
}
358+
.dokan-admin-header .dokan-version-tags {
359+
margin: 12px 0;
360+
flex-wrap: wrap;
361+
}
362+
.dokan-admin-header .upgrade-button {
363+
margin: 0;
364+
}
365+
}
292366
.dokan-dashboard .post-box-container {
293367
width: 49%;
294368
float: right;

Diff for: ‎assets/js/admin.asset.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php return array('dependencies' => array(), 'version' => 'c3d32b38d516ff742fe3');
1+
<?php return array('dependencies' => array(), 'version' => 'ddf6144763ba70ef3897');

0 commit comments

Comments
 (0)