diff --git a/app/Services/Admin/Master/Product/ProductService.php b/app/Services/Admin/Master/Product/ProductService.php index 44983f5..61e78b4 100644 --- a/app/Services/Admin/Master/Product/ProductService.php +++ b/app/Services/Admin/Master/Product/ProductService.php @@ -41,7 +41,9 @@ public function paginated(int $perPage = 25, string $search = '', string $sort = 'productVariants:id,product_id,name,stock,reject_stock,retail_stock', 'productVariants.productPrices:id,variant_id,type,price', ]) - ->when($search, fn ($q) => $q->where('name', 'like', "%{$search}%")) + ->when($search, fn ($q) => $q->where('name', 'like', "%{$search}%") + ->orWhereHas('productVariants', fn ($vq) => $vq->where('name', 'like', "%{$search}%")) + ) ->when($filters['name'] ?? null, fn ($q, $name) => $q->where('name', 'like', "%{$name}%")) ->when($filters['status'] ?? null, fn ($q, $status) => $q->where('status', $status)) ->when($filters['category'] ?? null, fn ($q, $categoryId) => $q->whereHas('categories', function ($cq) use ($categoryId) { diff --git a/app/Services/Admin/Master/RawMaterial/RawMaterialService.php b/app/Services/Admin/Master/RawMaterial/RawMaterialService.php index 40f3601..5aa3b11 100644 --- a/app/Services/Admin/Master/RawMaterial/RawMaterialService.php +++ b/app/Services/Admin/Master/RawMaterial/RawMaterialService.php @@ -32,7 +32,9 @@ public function paginated(int $perPage = 25, string $search = '', string $sort = ->with([ 'rawMaterialPrices:id,raw_material_id,variant,price,stock', ]) - ->when($search, fn ($q) => $q->where('name', 'like', "%{$search}%")) + ->when($search, fn ($q) => $q->where('name', 'like', "%{$search}%") + ->orWhereHas('rawMaterialPrices', fn ($vq) => $vq->where('variant', 'like', "%{$search}%")) + ) ->when($filters['name'] ?? null, fn ($q, $name) => $q->where('name', 'like', "%{$name}%")) ->when(($filters['is_active'] ?? null) !== null && ($filters['is_active'] ?? null) !== '', function ($q) use ($filters) { $q->where('is_active', $filters['is_active'] === 'true');