Merge pull request #2209 from suraj-webkul/issue#2146

issue #2146 has been fixed.

Author: VikassWebkul214254

packages/Webkul/Admin/src/DataGrids/Product/ProductDataGrid.php

@@ -5,6 +5,7 @@
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Facades\DB;
 use Webkul\DataGrid\DataGrid;
+use Webkul\Tag\Repositories\TagRepository;
 
 class ProductDataGrid extends DataGrid
 {
@@ -17,15 +18,18 @@ public function prepareQueryBuilder(): Builder
 
         $queryBuilder = DB::table('products')
             ->leftJoin('product_inventories', 'products.id', '=', 'product_inventories.product_id')
+            ->leftJoin('product_tags', 'products.id', '=', 'product_tags.product_id')
+            ->leftJoin('tags', 'tags.id', '=', 'product_tags.tag_id')
             ->select(
                 'products.id',
                 'products.sku',
                 'products.name',
                 'products.price',
+                'tags.name as tag_name',
             )
-            ->addSelect(DB::raw('SUM('.$tablePrefix.'product_inventories.in_stock) as total_in_stock'))
-            ->addSelect(DB::raw('SUM('.$tablePrefix.'product_inventories.allocated) as total_allocated'))
-            ->addSelect(DB::raw('SUM('.$tablePrefix.'product_inventories.in_stock - '.$tablePrefix.'product_inventories.allocated) as total_on_hand'))
+            ->addSelect(DB::raw('SUM(product_inventories.in_stock) as total_in_stock'))
+            ->addSelect(DB::raw('SUM(product_inventories.allocated) as total_allocated'))
+            ->addSelect(DB::raw('SUM(product_inventories.in_stock - product_inventories.allocated) as total_on_hand'))
             ->groupBy('products.id');
 
         if (request()->route('id')) {
@@ -36,6 +40,7 @@ public function prepareQueryBuilder(): Builder
         $this->addFilter('total_in_stock', DB::raw('SUM('.$tablePrefix.'product_inventories.in_stock'));
         $this->addFilter('total_allocated', DB::raw('SUM('.$tablePrefix.'product_inventories.allocated'));
         $this->addFilter('total_on_hand', DB::raw('SUM('.$tablePrefix.'product_inventories.in_stock - '.$tablePrefix.'product_inventories.allocated'));
+        $this->addFilter('tag_name', 'tags.name');
 
         return $queryBuilder;
     }
@@ -93,6 +98,24 @@ public function prepareColumns(): void
             'type'     => 'string',
             'sortable' => true,
         ]);
+
+        $this->addColumn([
+            'index'              => 'tag_name',
+            'label'              => trans('admin::app.products.index.datagrid.tag-name'),
+            'type'               => 'string',
+            'searchable'         => false,
+            'sortable'           => true,
+            'filterable'         => true,
+            'filterable_type'    => 'searchable_dropdown',
+            'closure'            => fn ($row) => $row->tag_name ?? '--',
+            'filterable_options' => [
+                'repository' => TagRepository::class,
+                'column'     => [
+                    'label' => 'name',
+                    'value' => 'name',
+                ],
+            ],
+        ]);
     }
 
     /**

packages/Webkul/Admin/src/Resources/lang/ar/app.php

@@ -690,6 +690,7 @@
                 'edit'      => 'تعديل',
                 'id'        => 'المعرف',
                 'in-stock'  => 'في المخزون',
+                'tag-name'  => 'اسم الوسم',
                 'name'      => 'الاسم',
                 'on-hand'   => 'متوفر',
                 'price'     => 'السعر',

packages/Webkul/Admin/src/Resources/lang/en/app.php

@@ -694,6 +694,7 @@
                 'in-stock'  => 'In Stock',
                 'name'      => 'Name',
                 'on-hand'   => 'On Hand',
+                'tag-name'  => 'Tag Name',
                 'price'     => 'Price',
                 'sku'       => 'SKU',
                 'view'      => 'View',

packages/Webkul/Admin/src/Resources/lang/es/app.php

@@ -694,6 +694,7 @@
                 'edit'      => 'Editar',
                 'id'        => 'ID',
                 'in-stock'  => 'En Stock',
+                'tag-name'  => 'Nombre de etiqueta',
                 'name'      => 'Nombre',
                 'on-hand'   => 'Disponible',
                 'price'     => 'Precio',

packages/Webkul/Admin/src/Resources/lang/fa/app.php

@@ -694,6 +694,7 @@
                 'edit'      => 'ویرایش',
                 'id'        => 'شناسه',
                 'in-stock'  => 'در انبار',
+                'tag-name'  => 'نام برچسب',
                 'name'      => 'نام',
                 'on-hand'   => 'موجودی',
                 'price'     => 'قیمت',

packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php

@@ -688,6 +688,7 @@
                 'edit'      => 'Editar',
                 'id'        => 'ID',
                 'in-stock'  => 'Em Estoque',
+                'tag-name'  => 'Nome da Tag',
                 'name'      => 'Nome',
                 'on-hand'   => 'Disponível',
                 'price'     => 'Preço',

packages/Webkul/Admin/src/Resources/lang/tr/app.php

@@ -694,6 +694,7 @@
                 'edit'      => 'Düzenle',
                 'id'        => 'ID',
                 'in-stock'  => 'Stokta',
+                'tag-name'  => 'Etiket Adı',
                 'name'      => 'Ad',
                 'on-hand'   => 'Elinde',
                 'price'     => 'Fiyat',

packages/Webkul/Admin/src/Resources/lang/vi/app.php

@@ -691,6 +691,7 @@
                 'edit'      => 'Chỉnh sửa',
                 'id'        => 'ID',
                 'in-stock'  => 'Có sẵn',
+                'tag-name'  => 'Tên thẻ',
                 'name'      => 'Tên',
                 'on-hand'   => 'Sẵn có',
                 'price'     => 'Giá',