Skip to content

Commit 23e1b82

Browse files
AunshonAunshon
committed
Merge branch 'release/4.1.2'
2 parents ecdc8f8 + b4c8d28 commit 23e1b82

30 files changed

+667
-593
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### v4.1.2 ( Oct 16, 2025 ) ###
2+
- **enhance:** Updated the Admin Dashboard header UI for seamless visual representation with the new React-based frontend architecture.
3+
- **update:** Added support for retrieving all product types via the Products REST API, enabling more flexible product filtering.
4+
15
### v4.1.1 ( Oct 09, 2025 ) ###
26
- **update:** Added method to retrieve vendor earnings excluding admin subsidy.
37
- **update:** Admin gateway fee calculation now checks an order-level meta value before using the previous fallback logic.

‎assets/src/less/admin.less‎

Lines changed: 0 additions & 290 deletions
Original file line numberDiff line numberDiff line change
@@ -2,296 +2,6 @@
22
@import "tooltip.less";
33
@import "variables.less";
44

5-
.dokan-admin-header {
6-
background: #fff;
7-
padding: 16px 24px;
8-
box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.06);
9-
10-
.dokan-admin-header-content {
11-
display: flex;
12-
align-items: center;
13-
justify-content: space-between;
14-
width: 100%;
15-
}
16-
.dokan-admin-logo-wrap {
17-
display: flex;
18-
flex: 1;
19-
.dokan-admin-header-logo {
20-
display: flex;
21-
align-items: center;
22-
23-
img {
24-
height: 32px;
25-
width: auto;
26-
margin-right: 12px;
27-
}
28-
}
29-
30-
.dokan-version-tags {
31-
display: flex;
32-
align-items: center;
33-
gap: 12px;
34-
margin-right: 24px;
35-
flex: 1;
36-
.version-tag {
37-
border-radius: 20px;
38-
font-size: 12px;
39-
line-height: 16px;
40-
font-weight: 500;
41-
height: 30px;
42-
box-sizing: border-box;
43-
&.lite {
44-
background: #FF9B5366;
45-
color: #7B4E2E;
46-
display: flex;
47-
align-items: center;
48-
padding: 0 12px;
49-
}
50-
51-
&.pro {
52-
background: #D8D8FE;
53-
color: @dokan-color;
54-
display: flex;
55-
align-items: center;
56-
text-transform: capitalize;
57-
padding: 5px 9px 5px 5px;
58-
gap: 6px;
59-
& .version-tag-pro-badge{
60-
background: @dokan-color;
61-
color: white;
62-
border-radius: 28px;
63-
display: inline-flex;
64-
align-items: center;
65-
padding: 3px 8px;
66-
font-size: 12px;
67-
gap: 3px;
68-
}
69-
}
70-
}
71-
}
72-
}
73-
.upgrade-button {
74-
display: flex;
75-
align-items: center;
76-
gap: 8px;
77-
background: @dokan-color;
78-
color: white;
79-
padding: 10px 20px;
80-
border-radius: 6px;
81-
text-decoration: none;
82-
font-weight: 500;
83-
transition: background-color 0.2s;
84-
margin-left: auto;
85-
&:hover {
86-
background: @dokan-dark-purple;
87-
}
88-
}
89-
90-
.dokan-admin-header-menu {
91-
display: flex;
92-
93-
.menu-item {
94-
margin-right: 12px;
95-
96-
&:last-child {
97-
margin-right: 0;
98-
}
99-
100-
.menu-icon {
101-
position: relative;
102-
background: #e4e6eb;
103-
display: flex;
104-
align-items: center;
105-
justify-content: center;
106-
width: 30px;
107-
height: 30px;
108-
box-sizing: border-box;
109-
border-radius: 42px;
110-
cursor: pointer;
111-
transition: all .2s ease;
112-
.notification-count {
113-
position: absolute;
114-
top: -5px;
115-
right: -5px;
116-
width: 15px;
117-
height: 15px;
118-
padding: 1px;
119-
background-color: var(--dokan-button-background-color, #7047EB);
120-
border-radius: 53px;
121-
color: #fff;
122-
display: flex;
123-
align-items: center;
124-
justify-content: center;
125-
}
126-
.whats-new-pointer {
127-
position: absolute;
128-
top: 0;
129-
right: 0;
130-
width: 6px;
131-
height: 6px;
132-
background-color: var(--dokan-button-background-color, #7047EB);
133-
border-radius: 53px;
134-
border: 2px solid #fff;
135-
box-sizing: content-box;
136-
}
137-
138-
&:hover {
139-
background: #0C5F9A;
140-
141-
& > svg path {
142-
fill: #fff
143-
}
144-
145-
.dropdown {
146-
opacity: 1;
147-
visibility: visible;
148-
top: 50px;
149-
}
150-
}
151-
152-
.dropdown {
153-
position: absolute;
154-
cursor: context-menu;
155-
top: 80px;
156-
right: -10px;
157-
z-index: 99999;
158-
background-color: #fff;
159-
padding: 20px;
160-
border-radius: 3px;
161-
border: 1px solid #e2e2e2;
162-
box-shadow: 0 8px 10px #ccc;
163-
min-width: 255px;
164-
max-width: 255px;
165-
opacity: 0;
166-
visibility: hidden;
167-
transition: all .2s ease;
168-
169-
&:before,
170-
&:after {
171-
content: "";
172-
position: absolute;
173-
border-left: 10px solid transparent;
174-
border-right: 10px solid transparent;
175-
top: -10px;
176-
right: 14px;
177-
}
178-
179-
&:before {
180-
border-bottom: 10px solid #e2e2e2;
181-
margin-top: -1px;
182-
}
183-
184-
&:after {
185-
border-bottom: 10px solid white;
186-
margin-top: 0;
187-
z-index: 1;
188-
}
189-
190-
h3 {
191-
margin: 0;
192-
font-weight: bold;
193-
font-size: 18px;
194-
font-family: "SF Pro Text", sans-serif;
195-
}
196-
197-
.list-item {
198-
margin-top: 13px;
199-
list-style-type: none;
200-
a {
201-
display: flex;
202-
align-items: center;
203-
color: #000;
204-
font-size: 15px;
205-
font-weight: 600;
206-
font-family: "SF Pro Text", sans-serif;
207-
text-decoration: none;
208-
transition: all .2s ease;
209-
margin-bottom: 10px;
210-
211-
&:last-child {
212-
margin-bottom: 0;
213-
}
214-
215-
&.active {
216-
color: @dokan-color;
217-
218-
.dokan-icon {
219-
background-color: @dokan-light-purple;
220-
221-
svg path {
222-
fill: @dokan-color;
223-
}
224-
}
225-
226-
&:after {
227-
content: "";
228-
width: 6px;
229-
height: 6px;
230-
background-color: @dokan-color;
231-
border-radius: 53px;
232-
margin-left: 10px;
233-
}
234-
}
235-
236-
.dokan-icon {
237-
background: #e4e6eb;
238-
display: flex;
239-
align-items: center;
240-
justify-content: center;
241-
width: 38px;
242-
height: 38px;
243-
box-sizing: border-box;
244-
border-radius: 42px;
245-
margin-right: 11px;
246-
}
247-
248-
&:hover {
249-
color: @dokan-color;
250-
251-
.dokan-icon {
252-
background-color: @dokan-light-gray;
253-
254-
svg path {
255-
fill: @dokan-color;
256-
}
257-
}
258-
}
259-
260-
&:focus {
261-
box-shadow: none;
262-
}
263-
}
264-
}
265-
}
266-
}
267-
}
268-
}
269-
}
270-
271-
// Responsive styles
272-
@media screen and (max-width: 782px) {
273-
.dokan-admin-logo-wrap {
274-
flex-direction: column;
275-
}
276-
277-
.dokan-admin-header {
278-
padding: 12px 10px;
279-
280-
.dokan-admin-header-content {
281-
gap: 16px;
282-
align-items:start;
283-
}
284-
285-
.dokan-version-tags {
286-
margin: 12px 0;
287-
flex-wrap: wrap;
288-
}
289-
290-
.upgrade-button {
291-
margin: 0;
292-
}
293-
}
294-
}
2955
.dokan-dashboard {
2966
.post-box-container {
2977
width: 49%;

‎assets/src/less/global-admin.less‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -358,31 +358,40 @@
358358
}
359359
}
360360

361-
.toplevel_page_dokan #wpcontent {
361+
.toplevel_page_dokan #wpcontent,
362+
.dokan_page_dokan-dashboard #wpcontent {
362363
padding: 0;
363364
overflow-x: hidden !important;
364365
min-height: calc(100vh - 32px);
365366
}
366367

367-
.toplevel_page_dokan #wpcontent .dokan-admin-page-body {
368+
.toplevel_page_dokan #wpcontent .dokan-admin-page-body,
369+
.dokan_page_dokan-dashboard #wpcontent .dokan-admin-page-body {
368370
padding-left: 20px;
369371
}
370372

373+
#dokan-admin-panel-header {
374+
padding-bottom: 10px;
375+
}
376+
371377
@media(max-width:783px) {
372378
.toplevel_page_dokan #wpbody-content {
373379
padding-left: 0
374380
}
375-
.toplevel_page_dokan #wpcontent .dokan-admin-page-body {
381+
.toplevel_page_dokan #wpcontent .dokan-admin-page-body,
382+
.dokan_page_dokan-dashboard #wpcontent .dokan-admin-page-body {
376383
padding-left: 10px;
377384
}
378385
}
379386

380387
@media(max-width:782px) {
381388
.toplevel_page_dokan #wpbody-content,
382-
.toplevel_page_dokan #wpcontent {
389+
.toplevel_page_dokan #wpcontent,
390+
.dokan_page_dokan-dashboard #wpcontent {
383391
min-height: calc(100vh - 46px)
384392
}
385-
.toplevel_page_dokan #wpcontent .dokan-admin-page-body {
393+
.toplevel_page_dokan #wpcontent .dokan-admin-page-body,
394+
.dokan_page_dokan-dashboard #wpcontent .dokan-admin-page-body {
386395
padding-left: 10px;
387396
}
388397
}

‎composer.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dokan-class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ final class WeDevs_Dokan {
2525
*
2626
* @var string
2727
*/
28-
public $version = '4.1.1';
28+
public $version = '4.1.2';
2929

3030
/**
3131
* Instance of self

‎dokan.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Plugin Name: Dokan
44
* Plugin URI: https://dokan.co/wordpress/
55
* Description: An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs.
6-
* Version: 4.1.1
6+
* Version: 4.1.2
77
* Author: Dokan Inc.
88
* Author URI: https://dokan.co/wordpress/
99
* Text Domain: dokan-lite

0 commit comments

Comments
 (0)