Skip to content
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

Updated Tag and User Page #1294

Merged
merged 10 commits into from
Jul 26, 2024
Merged

Updated Tag and User Page #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6cf7262
updated colors
shivendra-webkul Jul 24, 2024
7202a6f
update tag datagrid
shivendra-webkul Jul 24, 2024
8ab16ab
Updated tag page
shivendra-webkul Jul 25, 2024
b517902
Merge remote-tracking branch 'origin/2.x' into krayin-update
shivendra-webkul Jul 25, 2024
a96d7cb
fixed user datagrid and controller
shivendra-webkul Jul 25, 2024
4d3223c
refactor users routes
shivendra-webkul Jul 25, 2024
fc1c5ae
Update organization page
shivendra-webkul Jul 26, 2024
15bea68
update preson page
shivendra-webkul Jul 26, 2024
ab0dfc1
Update headers and breadcrumps in roles
shivendra-webkul Jul 26, 2024
3eb2dcd
update pipeline data grid
shivendra-webkul Jul 26, 2024
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
59 changes: 29 additions & 30 deletions packages/Webkul/Admin/src/DataGrids/Settings/PipelineDataGrid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,17 @@

namespace Webkul\Admin\DataGrids\Settings;

use Illuminate\Database\Query\Builder;
use Illuminate\Support\Facades\DB;
use Webkul\Admin\Traits\ProvideDropdownOptions;
use Webkul\UI\DataGrid\DataGrid;
use Webkul\DataGrid\DataGrid;

class PipelineDataGrid extends DataGrid
{
use ProvideDropdownOptions;

/**
* Prepare query builder.
*
* @return void
*/
public function prepareQueryBuilder()
public function prepareQueryBuilder(): Builder
{
$queryBuilder = DB::table('lead_pipelines')
->addSelect(
Expand All @@ -27,47 +24,44 @@ public function prepareQueryBuilder()

$this->addFilter('id', 'lead_pipelines.id');

$this->setQueryBuilder($queryBuilder);
return $queryBuilder;
}

/**
* Add columns.
*
* @return void
*/
public function addColumns()
public function prepareColumns(): void
{
$this->addColumn([
'index' => 'id',
'label' => trans('admin::app.datagrid.id'),
'label' => trans('admin::app.settings.pipelines.index.datagrid.id'),
'type' => 'string',
'sortable' => true,
]);

$this->addColumn([
'index' => 'name',
'label' => trans('admin::app.datagrid.name'),
'label' => trans('admin::app.settings.pipelines.index.datagrid.name'),
'type' => 'string',
'sortable' => true,
]);

$this->addColumn([
'index' => 'rotten_days',
'label' => trans('admin::app.datagrid.rotten-days'),
'label' => trans('admin::app.settings.pipelines.index.datagrid.rotten-days'),
'type' => 'string',
'sortable' => true,
]);

$this->addColumn([
'index' => 'is_default',
'label' => trans('admin::app.datagrid.is-default'),
'type' => 'dropdown',
'dropdown_options' => $this->getBooleanDropdownOptions('yes_no'),
'sortable' => false,
'closure' => function ($row) {
return (bool) $row->is_default
? __('admin::app.common.yes')
: __('admin::app.common.no');
'index' => 'is_default',
'label' => trans('admin::app.settings.pipelines.index.datagrid.is-default'),
'type' => 'boolean',
'searchable' => true,
'filterable' => true,
'sortable' => true,
'closure' => function ($value) {
return trans('admin::app.settings.pipelines.index.datagrid.'.($value->is_default ? 'yes' : 'no'));
},
]);
}
Expand All @@ -80,18 +74,23 @@ public function addColumns()
public function prepareActions()
{
$this->addAction([
'title' => trans('ui::app.datagrid.edit'),
'index' => 'edit',
'icon' => 'icon-edit',
'title' => trans('admin::app.settings.pipelines.index.datagrid.edit'),
'method' => 'GET',
'route' => 'admin.settings.pipelines.edit',
'icon' => 'pencil-icon',
'url' => function ($row) {
return route('admin.settings.pipelines.edit', $row->id);
},
]);

$this->addAction([
'title' => trans('ui::app.datagrid.delete'),
'method' => 'DELETE',
'route' => 'admin.settings.pipelines.delete',
'confirm_text' => trans('ui::app.datagrid.mass-action.delete', ['resource' => 'pipeline']),
'icon' => 'trash-icon',
'index' => 'delete',
'icon' => 'icon-delete',
'title' => trans('admin::app.settings.pipelines.index.datagrid.delete'),
'method' => 'DELETE',
'url' => function ($row) {
return route('admin.settings.pipelines.delete', $row->id);
},
]);
}
}
89 changes: 44 additions & 45 deletions packages/Webkul/Admin/src/DataGrids/Settings/TagDataGrid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,26 @@

namespace Webkul\Admin\DataGrids\Settings;

use Illuminate\Database\Query\Builder;
use Illuminate\Support\Facades\DB;
use Webkul\Admin\Traits\ProvideDropdownOptions;
use Webkul\UI\DataGrid\DataGrid;
use Webkul\DataGrid\DataGrid;
use Webkul\User\Repositories\UserRepository;

class TagDataGrid extends DataGrid
{
use ProvideDropdownOptions;

/**
* Create data grid instance.
* Constructor for the class.
*
* @return void
*/
public function __construct(protected UserRepository $userRepository)
{
parent::__construct();
}
public function __construct(protected UserRepository $userRepository) {}

/**
* Prepare query builder.
*
* @return void
*/
public function prepareQueryBuilder()
public function prepareQueryBuilder(): Builder
{
$queryBuilder = DB::table('tags')
->addSelect(
Expand All @@ -53,93 +48,97 @@ public function prepareQueryBuilder()
$this->addFilter('created_at', 'tags.created_at');
$this->addFilter('user_name', 'users.id');

$this->setQueryBuilder($queryBuilder);
return $queryBuilder;
}

/**
* Add columns.
*
* @return void
*/
public function addColumns()
public function prepareColumns(): void
{
$this->addColumn([
'index' => 'id',
'label' => trans('admin::app.datagrid.id'),
'label' => trans('admin::app.settings.tags.index.datagrid.id'),
'type' => 'string',
'searchable' => false,
'sortable' => true,
]);

$this->addColumn([
'index' => 'name',
'label' => trans('admin::app.datagrid.name'),
'label' => trans('admin::app.settings.tags.index.datagrid.name'),
'type' => 'string',
'searchable' => true,
'sortable' => false,
'closure' => function ($row) {
$html = '<span style="background: '.($row->color ?? '#546E7A').';width: 15px;height: 15px;margin-top: 3px;border-radius: 50%;float: left;margin-right: 10px;box-shadow: 0px 4px 15.36px 0.75px rgb(0 0 0 / 10%), 0px 2px 6px 0px rgb(0 0 0 / 15%);"></span>';
$color = $row->color ?? 'gray-500';
$html = "<div class=\"flex items-center gap-2\">
<span class='inline-block h-4 w-4 cursor-pointer rounded-full bg-{$color } shadow-md'></span>
<span>{$row->name}</span>
</div>";

return $html.htmlspecialchars($row->name);
return $html;
},
]);

$this->addColumn([
'index' => 'user_name',
'label' => trans('admin::app.datagrid.user'),
'type' => 'dropdown',
'dropdown_options' => $this->getUserDropdownOptions(),
'label' => trans('admin::app.settings.tags.index.datagrid.users'),
'type' => 'string',
'searchable' => false,
'sortable' => true,
]);

$this->addColumn([
'index' => 'created_at',
'label' => trans('admin::app.datagrid.created_at'),
'type' => 'date_range',
'searchable' => false,
'sortable' => true,
'closure' => function ($row) {
'index' => 'created_at',
'label' => trans('admin::app.settings.tags.index.datagrid.created-at'),
'type' => 'date',
'searchable' => true,
'filterable' => true,
'filterable_type' => 'date_range',
'sortable' => true,
'closure' => function ($row) {
return core()->formatDate($row->created_at);
},
]);
}

/**
* Prepare actions.
*
* @return void
*/
public function prepareActions()
public function prepareActions(): void
{
$this->addAction([
'title' => trans('ui::app.datagrid.edit'),
'index' => 'edit',
'icon' => 'icon-edit',
'title' => trans('admin::app.settings.tags.index.datagrid.edit'),
'method' => 'GET',
'route' => 'admin.settings.tags.edit',
'icon' => 'pencil-icon',
'url' => function ($row) {
return route('admin.settings.tags.edit', $row->id);
},
]);

$this->addAction([
'title' => trans('ui::app.datagrid.delete'),
'method' => 'DELETE',
'route' => 'admin.settings.tags.delete',
'confirm_text' => trans('ui::app.datagrid.mass-action.delete', ['resource' => 'source']),
'icon' => 'trash-icon',
'index' => 'delete',
'icon' => 'icon-delete',
'title' => trans('admin::app.settings.tags.index.datagrid.delete'),
'method' => 'DELETE',
'url' => function ($row) {
return route('admin.settings.tags.delete', $row->id);
},
]);
}

/**
* Prepare mass actions.
*
* @return void
*/
public function prepareMassActions()
public function prepareMassActions(): void
{
$this->addMassAction([
'type' => 'delete',
'label' => trans('ui::app.datagrid.delete'),
'action' => route('admin.settings.tags.mass_delete'),
'method' => 'PUT',
'icon' => 'icon-delete',
'title' => trans('admin::app.settings.tags.index.datagrid.delete'),
'method' => 'POST',
'url' => route('admin.settings.tags.mass_delete'),
]);
}
}
Loading
Loading