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

ACL Added For Addresses, Notes, Promotions And Copy Product

This commit is contained in:
devansh bawari 2021-01-14 20:06:12 +05:30
parent af78612c54
commit 88ac63470e
2 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
packages/Webkul/Admin/src/Config/acl.php
View File

@ -40,6 +40,11 @@ return [
'name' => 'admin::app.acl.view',
'route' => 'admin.sales.orders.view',
'sort' => 1,
], [
'key' => 'sales.orders.cancel',
'name' => 'admin::app.acl.cancel',
'route' => 'admin.sales.orders.cancel',
'sort' => 2,
], [
'key' => 'sales.invoices',
'name' => 'admin::app.acl.invoices',
@ -110,26 +115,31 @@ return [
'name' => 'admin::app.acl.create',
'route' => 'admin.catalog.products.create',
'sort' => 1,
], [
'key' => 'catalog.products.copy',
'name' => 'admin::app.acl.copy',
'route' => 'admin.catalog.products.copy',
'sort' => 2,
], [
'key' => 'catalog.products.edit',
'name' => 'admin::app.acl.edit',
'route' => 'admin.catalog.products.edit',
'sort' => 2,
'sort' => 3,
], [
'key' => 'catalog.products.delete',
'name' => 'admin::app.acl.delete',
'route' => 'admin.catalog.products.delete',
'sort' => 3,
'sort' => 4,
], [
'key' => 'catalog.products.mass-update',
'name' => 'admin::app.acl.mass-update',
'route' => 'admin.catalog.products.massupdate',
'sort' => 4,
'sort' => 5,
], [
'key' => 'catalog.products.mass-delete',
'name' => 'admin::app.acl.mass-delete',
'route' => 'admin.catalog.products.massdelete',
'sort' => 5,
'sort' => 6,
], [
'key' => 'catalog.categories',
'name' => 'admin::app.acl.categories',
@ -245,11 +255,36 @@ return [
'name' => 'admin::app.acl.mass-delete',
'route' => 'admin.customer.mass-delete',
'sort' => 5,
], [
'key' => 'customers.addresses',
'name' => 'admin::app.acl.addresses',
'route' => 'admin.customer.addresses.index',
'sort' => 2,
], [
'key' => 'customers.addresses.create',
'name' => 'admin::app.acl.create',
'route' => 'admin.customer.addresses.create',
'sort' => 1,
], [
'key' => 'customers.addresses.edit',
'name' => 'admin::app.acl.edit',
'route' => 'admin.customer.addresses.edit',
'sort' => 2,
], [
'key' => 'customers.addresses.delete',
'name' => 'admin::app.acl.delete',
'route' => 'admin.customer.addresses.delete',
'sort' => 3,
], [
'key' => 'customers.note',
'name' => 'admin::app.acl.note',
'route' => 'admin.customer.note.create',
'sort' => 3,
], [
'key' => 'customers.groups',
'name' => 'admin::app.acl.groups',
'route' => 'admin.groups.index',
'sort' => 2,
'sort' => 4,
], [
'key' => 'customers.groups.create',
'name' => 'admin::app.acl.create',
@ -269,7 +304,7 @@ return [
'key' => 'customers.reviews',
'name' => 'admin::app.acl.reviews',
'route' => 'admin.customer.review.index',
'sort' => 3,
'sort' => 5,
], [
'key' => 'customers.reviews.edit',
'name' => 'admin::app.acl.edit',
@ -320,6 +355,11 @@ return [
'name' => 'admin::app.acl.create',
'route' => 'admin.cart-rules.create',
'sort' => 1,
], [
'key' => 'marketing.promotions.cart-rules.copy',
'name' => 'admin::app.acl.copy',
'route' => 'admin.cart-rules.copy',
'sort' => 1,
], [
'key' => 'marketing.promotions.cart-rules.edit',
'name' => 'admin::app.acl.edit',
@ -525,11 +565,6 @@ return [
'name' => 'admin::app.acl.delete',
'route' => 'admin.currencies.delete',
'sort' => 3,
], [
'key' => 'settings.currencies.mass-delete',
'name' => 'admin::app.acl.mass-delete',
'route' => 'admin.currencies.massdelete',
'sort' => 4,
], [
'key' => 'settings.exchange_rates',
'name' => 'admin::app.acl.exchange-rates',

2
packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
View File

@ -25,7 +25,7 @@
<div class="page-action">
{!! view_render_event('sales.order.page_action.before', ['order' => $order]) !!}
@if ($order->canCancel())
@if ($order->canCancel() && bouncer()->hasPermission('sales.orders.cancel'))
<a href="{{ route('admin.sales.orders.cancel', $order->id) }}" class="btn btn-lg btn-primary" v-alert:message="'{{ __('admin::app.sales.orders.cancel-confirm-msg') }}'">
{{ __('admin::app.sales.orders.cancel-btn-title') }}
</a>