Merge pull request #4949 from devansh-webkul/invoice-datagrid-issue

Added requested customer's id in the invoice datagrid #4947
This commit is contained in:
Glenn Hermans 2021-06-21 17:15:53 +02:00 committed by GitHub
commit 6bb5a4f380
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 3 deletions

View File

@ -10,15 +10,31 @@ class CustomersInvoicesDataGrid extends DataGrid
{
use ProvideDataGridPlus;
/**
* Index column.
*
* @var int
*/
protected $index = 'id';
/**
* Default sort order of datagrid.
*
* @var string
*/
protected $sortOrder = 'desc';
/**
* Prepare query.
*
* @return void
*/
public function prepareQueryBuilder()
{
$queryBuilder = DB::table('invoices')
->leftJoin('orders as ors', 'invoices.order_id', '=', 'ors.id')
->select('invoices.id as id', 'ors.increment_id as order_id', 'invoices.state as state', 'ors.channel_name as channel_name', 'invoices.base_grand_total as base_grand_total', 'invoices.created_at as created_at');
->select('invoices.id as id', 'ors.increment_id as order_id', 'invoices.state as state', 'ors.channel_name as channel_name', 'invoices.base_grand_total as base_grand_total', 'invoices.created_at as created_at')
->where('ors.customer_id', request('id'));
$this->addFilter('id', 'invoices.id');
$this->addFilter('order_id', 'ors.increment_id');
@ -28,6 +44,11 @@ class CustomersInvoicesDataGrid extends DataGrid
$this->setQueryBuilder($queryBuilder);
}
/**
* Add columns.
*
* @return void
*/
public function addColumns()
{
$this->addColumn([
@ -66,7 +87,7 @@ class CustomersInvoicesDataGrid extends DataGrid
'closure' => true,
'filterable' => true,
'wrapper' => function ($value) {
return '<a href="'. route('admin.sales.orders.view', $value->order_id). '">' . $value->order_id . '</a>';
return '<a href="' . route('admin.sales.orders.view', $value->order_id) . '">' . $value->order_id . '</a>';
}
]);
@ -101,6 +122,11 @@ class CustomersInvoicesDataGrid extends DataGrid
]);
}
/**
* Prepare actions.
*
* @return void
*/
public function prepareActions()
{
$this->addAction([
@ -110,4 +136,4 @@ class CustomersInvoicesDataGrid extends DataGrid
'icon' => 'icon eye-icon',
]);
}
}
}