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

Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1

This commit is contained in:
merdan 2022-03-03 13:32:06 +05:00
parent 89e7e74475 c0066e7d9b
commit cd27bc4535
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=fabd4d31cf305b8cf817",
"/js/admin.js": "/js/admin.js?id=1b81aa5c91be13c6f809",
"/css/admin.css": "/css/admin.css?id=86d9b327bcde32d6fda5"
}

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

@ -21,6 +21,9 @@
<ul class="notif" v-if="notifications.length > 0" >
<li v-for="(notification,index) in notifications" :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>
@ -112,7 +115,8 @@
'title',
'orderStatus',
'noRecordText',
'orderStatusMessages'
'orderStatusMessages',
'localeCode'
],
data: function() {

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

@ -11,6 +11,9 @@
<div id="notif-title">{{ title }}</div>
<li v-for="notification in notifications" :key="notification.id" :class="notification.read ? 'read': ' '">
<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>
@ -58,7 +61,8 @@ export default {
'viewAllTitle',
'getReadAllUrl',
'readAllTitle',
'orderStatusMessages'
'orderStatusMessages',
'localeCode'
],
data() {

3
packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
View File

@ -54,7 +54,8 @@
view-all-title="{{ __('admin::app.notification.view-all') }}"
get-read-all-url="{{ route('admin.notification.read-all') }}"
order-status-messages="{{ json_encode($orderStatusMessages) }}"
read-all-title="{{ __('admin::app.notification.read-all') }}">
read-all-title="{{ __('admin::app.notification.read-all') }}"
locale-code={{ core()->getCurrentLocale()->code }}>
<div class="notifications">
<div class="dropdown-toggle">

3
packages/Webkul/Admin/src/Resources/views/notifications/index.blade.php
View File

@ -56,6 +56,7 @@
title=" {{ __('admin::app.notification.notification-title') }}"
order-status="{{ json_encode($orderStatus) }}"
order-status-messages="{{ json_encode($orderStatusMessages) }}"
no-record-text="{{ __('admin::app.notification.no-record') }}">
no-record-text="{{ __('admin::app.notification.no-record') }}"
locale-code={{ core()->getCurrentLocale()->code }}>
</notification-list>
@endsection