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 12:05:46 +05:00
parent 66e7241831 97d93c6751
commit 89e7e74475
11 changed files with 76 additions and 101 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=e7804c84a3c923405168",
"/css/admin.css": "/css/admin.css?id=03d8a469d77b6dcea295"
"/js/admin.js": "/js/admin.js?id=fabd4d31cf305b8cf817",
"/css/admin.css": "/css/admin.css?id=86d9b327bcde32d6fda5"
}

4
packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php
View File

@ -209,8 +209,8 @@ class CustomerDataGrid extends DataGrid
'action' => route('admin.customer.mass-update'),
'method' => 'POST',
'options' => [
'Active' => 1,
'Inactive' => 0,
trans('admin::app.datagrid.active') => 1,
trans('admin::app.datagrid.inactive') => 0,
],
]);
}

4
packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
View File

@ -280,8 +280,8 @@ class ProductDataGrid extends DataGrid
'action' => route('admin.catalog.products.massupdate'),
'method' => 'POST',
'options' => [
'Active' => 1,
'Inactive' => 0,
trans('admin::app.datagrid.active') => 1,
trans('admin::app.datagrid.inactive') => 0,
],
]);
}

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

@ -4,81 +4,39 @@
<span class="notification-badge" v-if="totalUnRead">{{ totalUnRead }}</span>
<i class="icon notification-icon active" style="margin-left:0px"></i>
</div>
<div class="dropdown-list bottom-right notification">
<div class="dropdown-container">
<ul class="notif">
<div id="notif-title">{{ title }}</div>
<li v-for="(notification,index) in notifications" :key="notification.id" :class="notification.read ? 'read': ' '">
<template v-if="notification.order.status == 'pending'">
<div class="notif-icon pending">
<span :class="ordertype.pending.icon"></span>
</div>
<div class="notif-content">
<a :href="`${orderViewUrl}${notification.order_id}`">
#{{ notification.order.id }} {{orderTypeMessages.pending}}
</a>
</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>
<li v-for="notification in notifications" :key="notification.id" :class="notification.read ? 'read': ' '">
<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">
#{{ notification.order.id + ' ' + orderTypeMessages[notification.order.status]}}
</div>
<div class="notif-content">
{{ moment(notification.order.created_at).fromNow() }}
</div>
</a>
</li>
<li class="bottom-li">
<a :href="viewAll">{{ viewAllTitle }}</a>
<button @click="readAll()" class="read-all" :disabled="totalUnRead == 0" :style="totalUnRead == 0 ? 'opacity: .5' : ''">{{ readAllTitle }}</button>
<button
class="read-all"
:style="totalUnRead == 0 ? 'opacity: .5' : ''"
:disabled="totalUnRead == 0"
@click="readAll()"
>
{{ readAllTitle }}
</button>
</li>
</ul>
</div>
@ -107,6 +65,7 @@ export default {
return {
notifications: [],
ordertype: {
pending: {
icon: 'pending-icon',
@ -129,7 +88,9 @@ export default {
message: 'Order Closed'
}
},
totalUnRead: 0,
orderTypeMessages: JSON.parse(this.orderStatusMessages)
}
},
@ -161,7 +122,6 @@ export default {
methods: {
getNotification: function () {
const params = {
limit: 5,
read: 0
@ -179,7 +139,6 @@ export default {
.catch(function (error) {})
},
readAll: function () {
let this_this = this;
this.$http.post(this.getReadAllUrl)

8
packages/Webkul/Admin/src/Resources/assets/sass/partials/_dashboard.scss vendored
View File

@ -287,4 +287,12 @@
#calender-destop {
display: none;
}
}
@media only screen and (max-width: 352px) {
.dashboard {
.dashboard-stats {
grid-template-columns: repeat(auto-fill, minmax(100%, 1fr));
}
}
}

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

@ -55,6 +55,13 @@
get-read-all-url="{{ route('admin.notification.read-all') }}"
order-status-messages="{{ json_encode($orderStatusMessages) }}"
read-all-title="{{ __('admin::app.notification.read-all') }}">
<div class="notifications">
<div class="dropdown-toggle">
<i class="icon notification-icon active" style="margin-left: 0px;"></i>
</div>
</div>
</notification>
<div class="profile-info">

2
packages/Webkul/Ui/publishable/assets/css/ui.css vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=a7fccfd3e08db1e66b06",
"/css/ui.css": "/css/ui.css?id=129005e28712a8e5bc2f"
"/css/ui.css": "/css/ui.css?id=d76e857f18f494ff71e0"
}

45
packages/Webkul/Ui/src/Resources/assets/sass/app.scss vendored
View File

@ -454,33 +454,35 @@ h5 {
list-style-type: none;
padding: 0px;
.read {
color: rgba(58, 58, 58, 0.5);
li {
border-bottom: 1px solid #c7c7c7;
padding: 0;
.notif-content > a {
text-decoration: none;
color: rgba(58, 58, 58, 0.5);
a {
padding: 16px 10px;
&:link,
&:active,
&:visited,
&:focus {
color: $font-color;
display: block;
}
&:hover {
color: rgba(58, 58, 58, 0.5);
color: $brand-color;
}
}
}
li {
padding: 16px 10px;
border-bottom: 1px solid #c7c7c7;
a:link,
a:active,
a:visited,
a:focus {
color: $font-color;
display: block;
}
a:hover {
color: $brand-color;
&.read {
a {
text-decoration: none;
color: rgba(58, 58, 58, 0.5);
&:hover {
color: rgba(58, 58, 58, 0.5);
}
}
}
.checkbox {
@ -612,7 +614,6 @@ h5 {
.control-group {
width: 100%;
margin-bottom: 0;
min-width: 140px;
.control {
width: 100%;