merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6003 from jitendra-webkul/master 

Issue #5929 fixed
This commit is contained in:
Jitendra Singh 2022-03-14 11:50:40 +05:30 committed by GitHub
parent 5b329f2518 68ce18d327
commit 42a4ff7005
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=89166f6dfa895151edf6",
"/css/admin.css": "/css/admin.css?id=691ad88d11eeaa1a82f6"
"/js/admin.js": "/js/admin.js?id=7d73f64f6f160ecd8a23",
"/css/admin.css": "/css/admin.css?id=c541338bb74772040a29"
}

69
packages/Webkul/Admin/src/Resources/assets/js/components/navigation/notification-list.vue
View File

@ -20,75 +20,24 @@
<div class="page-content">
<ul class="notif" v-if="notifications.length > 0" >
<li v-for="(notification,index) in notifications" :class="notification.read ? 'read' : ''">
<li v-for="notification in notifications" :key="notification.id" :class="notification.read ? 'read' : ''">
<div>
<span hidden>{{ moment.locale(localeCode) }}</span>
</div>
<template v-if="notification.order.status == 'pending'">
<div class="notif-icon pending">
<span :class="ordertype.pending.icon"></span>
<a :href="`${orderViewUrl + notification.order_id}`">
<div class="notif-icon" :class="notification.order.status">
<span :class="ordertype[notification.order.status].icon"></span>
</div>
<div class="notif-content">
<a :href="`${orderViewUrl}${notification.order_id}`">
#{{ notification.order.id }} {{orderTypeMessages.pending}}
</a>
#{{ notification.order.id + ' ' + orderTypeMessages[notification.order.status]}}
</div>
<div class="notif-content">
{{ moment(notification.order.created_at).fromNow() }}
</div>
</template>
<template v-if="notification.order.status == 'canceled'">
<div class="notif-icon canceled">
<span :class="ordertype.canceled.icon"></span>
</div>
<div class="notif-content">
<a :href="`${orderViewUrl}${notification.order_id}`">
#{{ notification.order.id }} {{orderTypeMessages.canceled}}
</a>
</div>
<div class="notif-content">
{{ moment(notification.order.created_at).fromNow() }}
</div>
</template>
<template v-if="notification.order.status == 'completed'">
<div class="notif-icon completed">
<span :class="ordertype.completed.icon"></span>
</div>
<div class="notif-content">
<a :href="`${orderViewUrl}${notification.order_id}`">
#{{ notification.order.id }} {{orderTypeMessages.completed}}
</a>
</div>
<div class="notif-content">
{{ moment(notification.order.created_at).fromNow() }}
</div>
</template>
<template v-if="notification.order.status == 'processing'">
<div class="notif-icon processing">
<span :class="ordertype.processing.icon"></span>
</div>
<div class="notif-content">
<a :href="`${orderViewUrl}${notification.order_id}`">
#{{ notification.order.id }} {{orderTypeMessages.processing}}
</a>
</div>
<div class="notif-content">
{{ moment(notification.order.created_at).fromNow() }}
</div>
</template>
<template v-if="notification.order.status == 'closed'">
<div class="notif-icon closed">
<span :class="ordertype.closed.icon"></span>
</div>
<div class="notif-content">
<a :href="`${orderViewUrl}${notification.order_id}`">
#{{ notification.order.id }} {{orderTypeMessages.closed}}
</a>
</div>
<div class="notif-content">
{{ moment(notification.order.created_at).fromNow() }}
</div>
</template>
</a>
</li>
</ul>
<pagination align="center" :data="pagNotif" @pagination-change-page="getResults">

1
packages/Webkul/Admin/src/Resources/assets/js/components/navigation/notification.vue
View File

@ -14,6 +14,7 @@
<div>
<span hidden>{{ moment.locale(localeCode) }}</span>
</div>
<a :href="`${orderViewUrl + notification.order_id}`">
<div class="notif-icon" :class="notification.order.status">
<span :class="ordertype[notification.order.status].icon"></span>

19
packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss vendored
View File

@ -638,6 +638,16 @@ body {
border-bottom: 1px solid $notification-li-border-color;
position: relative;
a {
color: #3a3a3a;
}
&.read {
a {
color: rgba(58, 58, 58, 0.5);
}
}
.notif-icon {
position: absolute;
height: 40px;
@ -683,15 +693,6 @@ body {
margin-left: 50px;
}
}
.read {
color: rgba(58, 58, 58, 0.5);
.notif-content > a {
text-decoration: none;
color: rgba(58, 58, 58, 0.5);
}
}
}
.notification-badge {