Merge pull request #1290 from shivendra-webkul/krayin-update

Fix settings route and datagrid namespacing and fix groups and role pages
krayin · Jul 24, 2024 · 3491f26 · 3491f26
2 parents db87a27 + e900102
commit 3491f26
Show file tree

Hide file tree

Showing 42 changed files with 794 additions and 441 deletions.
diff --git a/packages/Webkul/Admin/src/DataGrids/Product/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Product/ProductDataGrid.php
@@ -95,6 +95,7 @@ public function prepareColumns(): void
     public function prepareActions(): void
     {
         $this->addAction([
+            'index'  => 'view',
             'icon'   => 'icon-dark',
             'title'  => trans('admin::app.products.index.datagrid.view'),
             'method' => 'GET',
@@ -104,6 +105,7 @@ public function prepareActions(): void
         ]);
 
         $this->addAction([
+            'index'  => 'edit',
             'icon'   => 'icon-edit',
             'title'  => trans('admin::app.products.index.datagrid.edit'),
             'method' => 'GET',
@@ -113,6 +115,7 @@ public function prepareActions(): void
         ]);
 
         $this->addAction([
+            'index'  => 'delete',
             'icon'   => 'icon-delete',
             'title'  => trans('admin::app.products.index.datagrid.delete'),
             'method' => 'DELETE',

diff --git a/packages/Webkul/Admin/src/DataGrids/Setting/SourceDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Setting/SourceDataGrid.php
diff --git a/...c/DataGrids/Setting/AttributeDataGrid.php → .../DataGrids/Settings/AttributeDataGrid.php b/...c/DataGrids/Setting/AttributeDataGrid.php → .../DataGrids/Settings/AttributeDataGrid.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\Admin\DataGrids\Setting;
+namespace Webkul\Admin\DataGrids\Settings;
 
 use Illuminate\Support\Facades\DB;
 use Webkul\Admin\Traits\ProvideDropdownOptions;

diff --git a/...taGrids/Setting/EmailTemplateDataGrid.php → ...aGrids/Settings/EmailTemplateDataGrid.php b/...taGrids/Setting/EmailTemplateDataGrid.php → ...aGrids/Settings/EmailTemplateDataGrid.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\Admin\DataGrids\Setting;
+namespace Webkul\Admin\DataGrids\Settings;
 
 use Illuminate\Support\Facades\DB;
 use Webkul\DataGrid\DataGrid;

diff --git a/...n/src/DataGrids/Setting/GroupDataGrid.php → .../src/DataGrids/Settings/GroupDataGrid.php b/...n/src/DataGrids/Setting/GroupDataGrid.php → .../src/DataGrids/Settings/GroupDataGrid.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\Admin\DataGrids\Setting;
+namespace Webkul\Admin\DataGrids\Settings;
 
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Facades\DB;

diff --git a/...rc/DataGrids/Setting/PipelineDataGrid.php → ...c/DataGrids/Settings/PipelineDataGrid.php b/...rc/DataGrids/Setting/PipelineDataGrid.php → ...c/DataGrids/Settings/PipelineDataGrid.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\Admin\DataGrids\Setting;
+namespace Webkul\Admin\DataGrids\Settings;
 
 use Illuminate\Support\Facades\DB;
 use Webkul\Admin\Traits\ProvideDropdownOptions;

diff --git a/...in/src/DataGrids/Setting/RoleDataGrid.php → ...n/src/DataGrids/Settings/RoleDataGrid.php b/...in/src/DataGrids/Setting/RoleDataGrid.php → ...n/src/DataGrids/Settings/RoleDataGrid.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\Admin\DataGrids\Setting;
+namespace Webkul\Admin\DataGrids\Settings;
 
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Facades\DB;

diff --git a/packages/Webkul/Admin/src/DataGrids/Settings/SourceDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Settings/SourceDataGrid.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Webkul\Admin\DataGrids\Settings;
+
+use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Facades\DB;
+use Webkul\DataGrid\DataGrid;
+
+class SourceDataGrid extends DataGrid
+{
+    /**
+     * Prepare query builder.
+     */
+    public function prepareQueryBuilder(): Builder
+    {
+        $queryBuilder = DB::table('lead_sources')
+            ->addSelect(
+                'lead_sources.id',
+                'lead_sources.name'
+            );
+
+        $this->addFilter('id', 'lead_sources.id');
+
+        return $queryBuilder;
+    }
+
+    /**
+     * Add columns.
+     */
+    public function prepareColumns(): void
+    {
+        $this->addColumn([
+            'index'    => 'id',
+            'label'    => trans('admin::app.settings.sources.index.datagrid.id'),
+            'type'     => 'string',
+            'sortable' => true,
+        ]);
+
+        $this->addColumn([
+            'index'    => 'name',
+            'label'    => trans('admin::app.settings.sources.index.datagrid.name'),
+            'type'     => 'string',
+            'sortable' => true,
+        ]);
+    }
+
+    /**
+     * Prepare actions.
+     */
+    public function prepareActions(): void
+    {
+        $this->addAction([
+            'index'  => 'edit',
+            'icon'   => 'icon-edit',
+            'title'  => trans('admin::app.settings.sources.index.datagrid.edit'),
+            'method' => 'GET',
+            'url'    => function ($row) {
+                return route('admin.settings.sources.edit', $row->id);
+            },
+        ]);
+
+        $this->addAction([
+            'index'  => 'delete',
+            'icon'   => 'icon-delete',
+            'title'  => trans('admin::app.settings.sources.index.datagrid.delete'),
+            'method' => 'DELETE',
+            'url'    => function ($row) {
+                return route('admin.settings.sources.delete', $row->id);
+            },
+        ]);
+    }
+}
diff --git a/...min/src/DataGrids/Setting/TagDataGrid.php → ...in/src/DataGrids/Settings/TagDataGrid.php b/...min/src/DataGrids/Setting/TagDataGrid.php → ...in/src/DataGrids/Settings/TagDataGrid.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\Admin\DataGrids\Setting;
+namespace Webkul\Admin\DataGrids\Settings;
 
 use Illuminate\Support\Facades\DB;
 use Webkul\Admin\Traits\ProvideDropdownOptions;

diff --git a/...in/src/DataGrids/Setting/TypeDataGrid.php → ...n/src/DataGrids/Settings/TypeDataGrid.php b/...in/src/DataGrids/Setting/TypeDataGrid.php → ...n/src/DataGrids/Settings/TypeDataGrid.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\Admin\DataGrids\Setting;
+namespace Webkul\Admin\DataGrids\Settings;
 
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Facades\DB;
@@ -31,7 +31,7 @@ public function prepareColumns(): void
     {
         $this->addColumn([
             'index'      => 'id',
-            'label'      => trans('admin::app.datagrid.id'),
+            'label'      => trans('admin::app.settings.types.index.datagrid.id'),
             'type'       => 'string',
             'filterable' => true,
             'sortable'   => true,

diff --git a/...in/src/DataGrids/Setting/UserDataGrid.php → ...n/src/DataGrids/Settings/UserDataGrid.php b/...in/src/DataGrids/Setting/UserDataGrid.php → ...n/src/DataGrids/Settings/UserDataGrid.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\Admin\DataGrids\Setting;
+namespace Webkul\Admin\DataGrids\Settings;
 
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;

diff --git a/...c/DataGrids/Setting/WarehouseDataGrid.php → .../DataGrids/Settings/WarehouseDataGrid.php b/...c/DataGrids/Setting/WarehouseDataGrid.php → .../DataGrids/Settings/WarehouseDataGrid.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\Admin\DataGrids\Setting;
+namespace Webkul\Admin\DataGrids\Settings;
 
 use Illuminate\Support\Facades\DB;
 use Webkul\UI\DataGrid\DataGrid;

diff --git a/...rc/DataGrids/Setting/WorkflowDataGrid.php → ...c/DataGrids/Settings/WorkflowDataGrid.php b/...rc/DataGrids/Setting/WorkflowDataGrid.php → ...c/DataGrids/Settings/WorkflowDataGrid.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\Admin\DataGrids\Setting;
+namespace Webkul\Admin\DataGrids\Settings;
 
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Facades\DB;

diff --git a/...ntrollers/Setting/AttributeController.php → ...trollers/Settings/AttributeController.php b/...ntrollers/Setting/AttributeController.php → ...trollers/Settings/AttributeController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\Admin\Http\Controllers\Setting;
+namespace Webkul\Admin\Http\Controllers\Settings;
 
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Storage;
@@ -25,7 +25,7 @@ public function __construct(protected AttributeRepository $attributeRepository)
     public function index()
     {
         if (request()->ajax()) {
-            return app(\Webkul\Admin\DataGrids\Setting\AttributeDataGrid::class)->toJson();
+            return app(\Webkul\Admin\DataGrids\Settings\AttributeDataGrid::class)->toJson();
         }
 
         return view('admin::settings.attributes.index');

diff --git a/...llers/Setting/EmailTemplateController.php → ...lers/Settings/EmailTemplateController.php b/...llers/Setting/EmailTemplateController.php → ...lers/Settings/EmailTemplateController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Webkul\Admin\Http\Controllers\Setting;
+namespace Webkul\Admin\Http\Controllers\Settings;
 
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Event;
 use Illuminate\View\View;
-use Webkul\Admin\DataGrids\Setting\EmailTemplateDataGrid;
+use Webkul\Admin\DataGrids\Settings\EmailTemplateDataGrid;
 use Webkul\Admin\Http\Controllers\Controller;
 use Webkul\EmailTemplate\Repositories\EmailTemplateRepository;
 use Webkul\Workflow\Helpers\Entity;