diff --git a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php index 33c9db3d7f5..e6c7032c3ed 100644 --- a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php @@ -187,7 +187,7 @@ public function prepareMassActions() { $this->addMassAction([ 'title' => trans('admin::app.customers.addresses.delete'), - 'action' => route('admin.customer.addresses.mass_delete', request('id')), + 'url' => route('admin.customer.addresses.mass_delete', request('id')), 'method' => 'POST', ]); } diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index fc5a777fd9a..5b64ca19109 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -26,25 +26,25 @@ public function prepareQueryBuilder() $join->on('customers.id', '=', 'addresses.customer_id') ->where('addresses.address_type', '=', 'customer'); }) - ->addSelect('customers.id as customer_id') + ->addSelect('customers.id as customer_id') ->addSelect(DB::raw('COUNT(DISTINCT addresses.id) as address_count')) - ->groupBy('customers.id') + ->groupBy('customers.id') ->leftJoin('orders', function ($join) { $join->on('customers.id', '=', 'orders.customer_id'); }) - ->addSelect('customers.id as customer_id') + ->addSelect('customers.id as customer_id') ->addSelect(DB::raw('COUNT(DISTINCT orders.id) as order_count')) - + // ->whereNotIn("orders.status", ['closed', 'canceled']) ->addSelect( - DB::raw("( + DB::raw('( SUM(DISTINCT base_grand_total) - SUM(IFNULL((SELECT SUM(base_grand_total) FROM refunds WHERE refunds.order_id = orders.id),0)) - ) as total_base_grand_total"), - ) - ->groupBy('customers.id') - + ) as total_base_grand_total'), + ) + ->groupBy('customers.id') + ->leftJoin('customer_groups', 'customers.customer_group_id', '=', 'customer_groups.id') ->addSelect( 'customers.id as customer_id', @@ -139,7 +139,7 @@ public function prepareColumns() 'filterable' => true, 'sortable' => true, ]); - + $this->addColumn([ 'index' => 'is_suspended', 'label' => trans('admin::app.customers.index.datagrid.suspended'), @@ -224,13 +224,13 @@ public function prepareMassActions() $this->addMassAction([ 'title' => trans('admin::app.customers.index.datagrid.delete'), 'method' => 'POST', - 'action' => route('admin.customer.mass_delete'), + 'url' => route('admin.customer.mass_delete'), ]); $this->addMassAction([ 'title' => trans('admin::app.customers.index.datagrid.update-status'), 'method' => 'POST', - 'action' => route('admin.customer.mass_update'), + 'url' => route('admin.customer.mass_update'), 'options' => [ trans('admin::app.datagrid.active') => 1, trans('admin::app.datagrid.inactive') => 0, diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php index c2ab695a5e0..fda283a4158 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php @@ -80,7 +80,6 @@ public function prepareColumns() 'sortable' => true, ]); - $this->addColumn([ 'index' => 'rating', 'label' => trans('admin::app.customers.reviews.index.datagrid.rating'), @@ -162,14 +161,14 @@ public function prepareMassActions() { $this->addMassAction([ 'title' => trans('admin::app.customers.reviews.index.datagrid.delete'), - 'action' => route('admin.customer.review.mass_delete'), + 'url' => route('admin.customer.review.mass_delete'), 'method' => 'POST', ]); $this->addMassAction([ 'title' => trans('admin::app.customers.reviews.index.datagrid.update-status'), 'method' => 'POST', - 'action' => route('admin.customer.review.mass_update'), + 'url' => route('admin.customer.review.mass_update'), 'options' => [ trans('admin::app.customers.reviews.index.datagrid.pending') => 0, trans('admin::app.customers.reviews.index.datagrid.approved') => 1, diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index db0fac7f70e..5b9fa0f773e 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -6,12 +6,11 @@ use Webkul\Core\Models\Channel; use Webkul\Core\Models\Locale; use Webkul\DataGrid\DataGrid; -use Webkul\Product\Repositories\ProductRepository; use Webkul\Inventory\Repositories\InventorySourceRepository; +use Webkul\Product\Repositories\ProductRepository; class ProductDataGrid extends DataGrid { - /** * Constructor for the class * @@ -240,13 +239,13 @@ public function prepareMassActions() { $this->addMassAction([ 'title' => trans('admin::app.datagrid.delete'), - 'action' => route('admin.catalog.products.mass_delete'), + 'url' => route('admin.catalog.products.mass_delete'), 'method' => 'POST', ]); $this->addMassAction([ 'title' => trans('admin::app.datagrid.update-status'), - 'action' => route('admin.catalog.products.mass_update'), + 'url' => route('admin.catalog.products.mass_update'), 'method' => 'POST', 'options' => [ trans('admin::app.datagrid.active') => 1, @@ -254,21 +253,4 @@ public function prepareMassActions() ], ]); } - - /** - * Render quantity view. - * - * @param object $row - * @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory - */ - private function renderQuantityView($row) - { - $product = $this->productRepository->find($row->product_id); - - $inventorySources = $this->inventorySourceRepository->findWhere(['status' => 1]); - - $totalQuantity = $row->quantity; - - return view('admin::catalog.products.datagrid.quantity', compact('product', 'inventorySources', 'totalQuantity'))->render(); - } -} \ No newline at end of file +}