Skip to content

acl added for warehouses #2450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VikassWebkul214254 wants to merge 1 commit into
base: 2.1
Choose a base branch
from
+111 −73
Open

acl added for warehouses #2450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 60 additions & 37 deletions packages/Webkul/Admin/src/Config/acl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
'name' => 'admin::app.acl.delete',
'route' => ['admin.contacts.persons.delete', 'admin.contacts.persons.mass_delete'],
'sort' => 4,
], [
], [
'key' => 'contacts.persons.view',
'name' => 'admin::app.acl.view',
'route' => 'admin.contacts.persons.view',
Expand Down Expand Up @@ -251,7 +251,7 @@
'name' => 'admin::app.acl.delete',
'route' => 'admin.settings.roles.delete',
'sort' => 3,
], [
], [
'key' => 'settings.user.users',
'name' => 'admin::app.acl.users',
'route' => 'admin.settings.users.index',
Expand Down Expand Up @@ -336,11 +336,36 @@
'name' => 'admin::app.acl.delete',
'route' => 'admin.settings.types.delete',
'sort' => 3,
], [
'key' => 'settings.warehouse',
'name' => 'admin::app.acl.warehouses',
'route' => ['admin.settings.warehouses.index'],
'sort' => 3,
], [
'key' => 'settings.warehouse.view',
'name' => 'admin::app.acl.view',
'route' => ['admin.settings.warehouses.index', 'admin.settings.warehouses.view'],
'sort' => 1,
], [
'key' => 'settings.warehouse.create',
'name' => 'admin::app.acl.create',
'route' => ['admin.settings.warehouses.create', 'admin.settings.warehouses.store'],
'sort' => 1,
], [
'key' => 'settings.warehouse.edit',
'name' => 'admin::app.acl.edit',
'route' => ['admin.settings.warehouses.edit', 'admin.settings.warehouses.update'],
'sort' => 2,
], [
'key' => 'settings.warehouse.delete',
'name' => 'admin::app.acl.delete',
'route' => 'admin.settings.warehouses.delete',
'sort' => 3,
], [
'key' => 'settings.automation',
'name' => 'admin::app.acl.automation',
'route' => ['admin.settings.attributes.index', 'admin.settings.email_templates.index', 'admin.settings.workflows.index'],
'sort' => 3,
'sort' => 4,
], [
'key' => 'settings.automation.attributes',
'name' => 'admin::app.acl.attributes',
Expand All @@ -365,7 +390,7 @@
'key' => 'settings.automation.email_templates',
'name' => 'admin::app.acl.email-templates',
'route' => 'admin.settings.email_templates.index',
'sort' => 7,
'sort' => 2,
], [
'key' => 'settings.automation.email_templates.create',
'name' => 'admin::app.acl.create',
Expand All @@ -385,7 +410,7 @@
'key' => 'settings.automation.workflows',
'name' => 'admin::app.acl.workflows',
'route' => 'admin.settings.workflows.index',
'sort' => 2,
'sort' => 3,
], [
'key' => 'settings.automation.workflows.create',
'name' => 'admin::app.acl.create',
Expand All @@ -405,7 +430,7 @@
'key' => 'settings.automation.events',
'name' => 'admin::app.acl.event',
'route' => 'admin.settings.marketing.events.index',
'sort' => 2,
'sort' => 4,
], [
'key' => 'settings.automation.events.create',
'name' => 'admin::app.acl.create',
Expand All @@ -425,7 +450,7 @@
'key' => 'settings.automation.campaigns',
'name' => 'admin::app.acl.campaigns',
'route' => 'admin.settings.marketing.campaigns.index',
'sort' => 2,
'sort' => 5,
], [
'key' => 'settings.automation.campaigns.create',
'name' => 'admin::app.acl.create',
Expand All @@ -445,7 +470,7 @@
'key' => 'settings.automation.webhooks',
'name' => 'admin::app.acl.webhook',
'route' => 'admin.settings.webhooks.index',
'sort' => 1,
'sort' => 6,
], [
'key' => 'settings.automation.webhooks.create',
'name' => 'admin::app.acl.create',
Expand All @@ -462,36 +487,10 @@
'route' => 'admin.settings.webhooks.delete',
'sort' => 3,
], [
'key' => 'settings.other_settings',
'name' => 'admin::app.acl.other-settings',
'route' => 'admin.settings.tags.index',
'sort' => 4,
], [
'key' => 'settings.other_settings.tags',
'name' => 'admin::app.acl.tags',
'route' => 'admin.settings.tags.index',
'sort' => 1,
], [
'key' => 'settings.other_settings.tags.create',
'name' => 'admin::app.acl.create',
'route' => ['admin.settings.tags.create', 'admin.settings.tags.store', 'admin.leads.tags.attach'],
'sort' => 1,
], [
'key' => 'settings.other_settings.tags.edit',
'name' => 'admin::app.acl.edit',
'route' => ['admin.settings.tags.edit', 'admin.settings.tags.update'],
'sort' => 1,
], [
'key' => 'settings.other_settings.tags.delete',
'name' => 'admin::app.acl.delete',
'route' => ['admin.settings.tags.delete', 'admin.settings.tags.mass_delete', 'admin.leads.tags.detach'],
'sort' => 2,
],
[
'key' => 'settings.automation.data_transfer',
'name' => 'admin::app.acl.data-transfer',
'route' => 'admin.settings.data_transfer.imports.index',
'sort' => 10,
'sort' => 7,
], [
'key' => 'settings.automation.data_transfer.imports',
'name' => 'admin::app.acl.imports',
Expand All @@ -517,8 +516,32 @@
'name' => 'admin::app.acl.import',
'route' => 'admin.settings.data_transfer.imports.imports',
'sort' => 4,
],
[
], [
'key' => 'settings.other_settings',
'name' => 'admin::app.acl.other-settings',
'route' => 'admin.settings.tags.index',
'sort' => 5,
], [
'key' => 'settings.other_settings.tags',
'name' => 'admin::app.acl.tags',
'route' => 'admin.settings.tags.index',
'sort' => 1,
], [
'key' => 'settings.other_settings.tags.create',
'name' => 'admin::app.acl.create',
'route' => ['admin.settings.tags.create', 'admin.settings.tags.store', 'admin.leads.tags.attach'],
'sort' => 1,
], [
'key' => 'settings.other_settings.tags.edit',
'name' => 'admin::app.acl.edit',
'route' => ['admin.settings.tags.edit', 'admin.settings.tags.update'],
'sort' => 1,
], [
'key' => 'settings.other_settings.tags.delete',
'name' => 'admin::app.acl.delete',
'route' => ['admin.settings.tags.delete', 'admin.settings.tags.mass_delete', 'admin.leads.tags.detach'],
'sort' => 2,
], [
'key' => 'configuration',
'name' => 'admin::app.acl.configuration',
'route' => 'admin.configuration.index',
Expand Down
58 changes: 32 additions & 26 deletions packages/Webkul/Admin/src/DataGrids/Settings/WarehouseDataGrid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,31 +123,37 @@ public function prepareColumns(): void
*/
public function prepareActions()
{
$this->addAction([
'icon' => 'icon-eye',
'title' => trans('admin::app.settings.warehouses.index.datagrid.view'),
'method' => 'GET',
'url' => function ($row) {
return route('admin.settings.warehouses.view', $row->id);
},
]);

$this->addAction([
'icon' => 'icon-edit',
'title' => trans('admin::app.settings.warehouses.index.datagrid.edit'),
'method' => 'GET',
'url' => function ($row) {
return route('admin.settings.warehouses.edit', $row->id);
},
]);

$this->addAction([
'icon' => 'icon-delete',
'title' => trans('admin::app.settings.warehouses.index.datagrid.delete'),
'method' => 'DELETE',
'url' => function ($row) {
return route('admin.settings.warehouses.delete', $row->id);
},
]);
if (bouncer()->hasPermission('settings.warehouse.view')) {
$this->addAction([
'icon' => 'icon-eye',
'title' => trans('admin::app.settings.warehouses.index.datagrid.view'),
'method' => 'GET',
'url' => function ($row) {
return route('admin.settings.warehouses.view', $row->id);
},
]);
}

if (bouncer()->hasPermission('settings.warehouse.edit')) {
$this->addAction([
'icon' => 'icon-edit',
'title' => trans('admin::app.settings.warehouses.index.datagrid.edit'),
'method' => 'GET',
'url' => function ($row) {
return route('admin.settings.warehouses.edit', $row->id);
},
]);
}

if (bouncer()->hasPermission('settings.warehouse.delete')) {
$this->addAction([
'icon' => 'icon-delete',
'title' => trans('admin::app.settings.warehouses.index.datagrid.delete'),
'method' => 'DELETE',
'url' => function ($row) {
return route('admin.settings.warehouses.delete', $row->id);
},
]);
}
}
}
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/ar/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
'import' => 'استيراد',
'event' => 'حدث',
'campaigns' => 'الحملات',
'warehouses' => 'المستودعات',
],
'users' => [
'activate-warning' => 'حسابك لم يتم تفعيله بعد. يرجى الاتصال بالمسؤول.',
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/en/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
'import' => 'Import',
'event' => 'Event',
'campaigns' => 'Campaigns',
'warehouses' => 'Warehouses',
],

'users' => [
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/es/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
'import' => 'Importar',
'event' => 'Evento',
'campaigns' => 'Campañas',
'warehouses' => 'Almacenes',
],
'users' => [
'activate-warning' => 'Tu cuenta aún no está activada. Por favor, contacta al administrador.',
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/fa/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
'import' => 'وارد کردن',
'event' => 'رویداد',
'campaigns' => 'کمپین‌ها',
'warehouses' => 'انبارها',
],
'users' => [
'activate-warning' => 'حساب شما هنوز فعال نشده است. لطفاً با مدیر سیستم تماس بگیرید.',
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
'import' => 'Import',
'event' => 'Evento',
'campaigns' => 'Campanhas',
'warehouses' => 'Armazéns',
],
'users' => [
'activate-warning' => 'Sua conta ainda não foi ativada. Por favor, entre em contato com o administrador.',
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/tr/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
'import' => 'İthalat',
'event' => 'Etkinlik',
'campaigns' => 'Kampanyalar',
'warehouses' => 'Depolar',
],
'users' => [
'activate-warning' => 'Hesabınız henüz etkinleştirilmedi. Lütfen yönetici ile iletişime geçin.',
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Admin/src/Resources/lang/vi/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
'import' => 'Import',
'event' => 'Sự kiện',
'campaigns' => 'Chiến dịch',
'warehouses' => 'Kho',
],
'users' => [
'activate-warning' => 'Tài khoản của bạn chưa được kích hoạt. Vui lòng liên hệ quản trị viên.',
Expand Down
17 changes: 9 additions & 8 deletions packages/Webkul/Admin/src/Resources/views/settings/warehouses/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@
<div class="flex items-center gap-x-2.5">
<div class="flex items-center gap-x-2.5">
{!! view_render_event('admin.settings.warehouses.create.save_button.before') !!}

<!-- Create button for person -->
<button
type="submit"
class="primary-button"
>
@lang('admin::app.settings.warehouses.create.save-btn')
</button>
@if (bouncer()->hasPermission('settings.warehouse.create'))
<!-- Create button for person -->
<button
type="submit"
class="primary-button"
>
@lang('admin::app.settings.warehouses.create.save-btn')
</button>
@endif

{!! view_render_event('admin.settings.warehouses.create.save_button.after') !!}
</div>
Expand Down
3 changes: 2 additions & 1 deletion packages/Webkul/Admin/src/Resources/views/settings/warehouses/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,15 @@
<div class="flex items-center gap-x-2.5">
<div class="flex items-center gap-x-2.5">
{!! view_render_event('admin.settings.warehouses.edit.save_button.after') !!}

@if (bouncer()->hasPermission('settings.warehouse.edit'))
<!-- Create button for person -->
<button
type="submit"
class="primary-button"
>
@lang('admin::app.settings.warehouses.edit.save-btn')
</button>
@endif

{!! view_render_event('admin.settings.warehouses.edit.save_button.before') !!}
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/views/settings/warehouses/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="flex items-center gap-x-2.5">
{!! view_render_event('admin.settings.warehouses.index.create_button.before') !!}

@if (bouncer()->hasPermission('settings.automation.warehouses.create'))
@if (bouncer()->hasPermission('settings.warehouse.create'))
<a
href="{{ route('admin.settings.warehouses.create') }}"
class="primary-button"
Expand Down
Loading