Compare commits

...

10 Commits

Author SHA1 Message Date
Mekan1206
6093a45761 WIP 2026-05-04 17:00:01 +05:00
Mekan1206
7f0b92a7ff WIP 2026-05-04 16:56:17 +05:00
Mekan1206
715acc4e97 WIP 2026-05-04 16:47:49 +05:00
Mekan1206
859e4ebbe8 tr in category 2026-05-04 16:44:41 +05:00
Mekan1206
24b85763e5 fix tr 2026-05-04 16:34:33 +05:00
Mekan1206
a6cf6410b2 WIP 2026-05-04 16:33:56 +05:00
Mekan1206
8c4e214e7b WIP 2026-05-04 16:31:51 +05:00
Mekan1206
e227b24de5 WIP 2026-05-04 13:42:09 +05:00
Mekan1206
79b10b20ea WIP 2026-05-04 13:41:21 +05:00
Mekan1206
fa9d9b68b5 WIP 2026-05-04 13:39:45 +05:00
8 changed files with 99 additions and 45 deletions

View File

@@ -32,6 +32,20 @@ if (! function_exists('translatable')) {
}
}
/**
* Translate
*/
function tr(string $text, string $locale = 'tk'): string
{
$text = json_decode($text);
if ($text) {
return $text->{$locale} ?? '';
}
return '';
}
if (! function_exists('removeWhiteSpace')) {
/**
* Remove white sapce from string

View File

@@ -27,11 +27,7 @@ class FilterController extends Controller
public function index(FilterIndexRequest $request): JsonResponse
{
return response()->rest([
'categories' => $this->categories()->map(fn ($category) => [
'id' => $category->id,
'parent_id' => $category->parent_id,
'name' => $category->name,
]),
'categories' => $this->categories(),
'brands' => $this->brands(),
]);
}
@@ -42,7 +38,17 @@ class FilterController extends Controller
private function categories()
{
if ($this->shouldFilterByCategory()) {
return Category::find($this->request->category_id, ['id', 'parent_id'])->children()->get(['id', 'parent_id', 'name']);
return Category::query()
->find($this->request->category_id, ['id', 'parent_id'])
->children()
->where('is_visible', true)
->ordered()
->get(['id', 'parent_id', 'name'])
->map(fn ($category) => [
'id' => $category->id,
'parent_id' => $category->parent_id,
'name' => $category->name,
]);
}
if ($this->shouldFilterByCollection()) {
@@ -50,11 +56,11 @@ class FilterController extends Controller
}
if ($this->shouldFilterByBrand()) {
return $this->filterByCategoryResource(Brand::find($this->request->brand_id));
return $this->categoriesForBrand($this->request->brand_id);
}
if ($this->shouldFilterByChannel()) {
return $this->filterByCategoryResource($this->request->channel_id, 'category');
return $this->categoriesFor($this->request->channel_id, 'channel');
}
return Category::query()->where('is_visible', true)->ordered()->get(['id', 'parent_id', 'name']);
@@ -63,55 +69,63 @@ class FilterController extends Controller
private function brands()
{
if ($this->shouldFilterByBrand()) {
return Brand::where('id', $this->request->brand_id)->get(['id', 'name']);
return Brand::query()->where('id', $this->request->brand_id)->get(['id', 'name']);
}
if ($this->shouldFilterByCategory()) {
$brands = Category::find($this->request->category_id)->products()
->where('products.is_visible', true)
->where('products.parent_id', null)
->where('products.stock', '>', 0)
->distinct('products.brand_id')
->pluck('products.brand_id');
$categoryId = (int) $this->request->category_id;
return Brand::whereIntegerInRaw('id', $brands)->get(['id', 'name']);
return DB::table('brands')
->select('brands.id', 'brands.name')
->join('products', 'products.brand_id', '=', 'brands.id')
->join('product_has_relations', 'products.id', '=', 'product_has_relations.product_id')
->where('product_has_relations.productable_type', 'category')
->where('product_has_relations.productable_id', $categoryId)
->where('products.is_visible', true)
->whereNull('products.parent_id')
->where('products.stock', '>', 0)
->groupBy('brands.id', 'brands.name', 'brands.sort_order')
->orderBy('brands.sort_order')
->get();
}
if ($this->shouldFilterByCollection()) {
$brands = Collection::find($this->request->collection_id)->products()
->where('products.is_visible', true)
->where('products.parent_id', null)
->where('products.stock', '>', 0)
->distinct('products.brand_id')
->pluck('products.brand_id');
$collectionId = (int) $this->request->collection_id;
return Brand::whereIntegerInRaw('id', $brands)->get(['id', 'name']);
return DB::table('brands')
->select('brands.id', 'brands.name')
->join('products', 'products.brand_id', '=', 'brands.id')
->join('product_has_relations', 'products.id', '=', 'product_has_relations.product_id')
->where('product_has_relations.productable_type', 'collection')
->where('product_has_relations.productable_id', $collectionId)
->where('products.is_visible', true)
->whereNull('products.parent_id')
->where('products.stock', '>', 0)
->groupBy('brands.id', 'brands.name', 'brands.sort_order')
->orderBy('brands.sort_order')
->get();
}
if ($this->shouldFilterByChannel()) {
$channelId = (int) $this->request->channel_id;
return DB::table('brands')
->select('brands.id', 'brands.name')
->join('products', 'products.brand_id', '=', 'brands.id')
->join('product_has_relations', 'products.id', '=', 'product_has_relations.product_id')
->where('product_has_relations.productable_type', 'channel')
->where('product_has_relations.productable_id', $channelId)
->where('products.is_visible', true)
->whereNull('products.parent_id')
->where('products.stock', '>', 0)
->groupBy('brands.id', 'brands.name', 'brands.sort_order')
->orderBy('brands.sort_order')
->get();
}
return Brand::query()->where('is_visible', true)->ordered()->get(['id', 'name']);
}
/**
* Filter by category
*/
private function filterByCategoryResource($resource)
{
$products = $resource->products()
->where('products.is_visible', true)
->where('products.parent_id', null)
->where('products.stock', '>', 0)
->distinct('products.id')
->pluck('products.id');
return Category::where('is_visible', true)
->ordered()
->join('product_has_relations', 'categories.id', '=', 'product_has_relations.productable_id')
->where('product_has_relations.productable_type', '=', 'category')
->whereIntegerInRaw('product_has_relations.product_id', $products)
->get(['categories.id', 'categories.parent_id', 'categories.name'])
->unique('categories.id');
}
/**
* Categories for a resource
*/
@@ -137,7 +151,33 @@ class FilterController extends Controller
->map(fn ($category) => [
'id' => $category->id,
'parent_id' => $category->parent_id,
'name' => $category->name,
'name' => tr($category->name),
]);
}
/**
* Brands
*/
private function categoriesForBrand(int $id)
{
return DB::table('categories')
->select('categories.id', 'categories.parent_id', 'categories.name')
->join('product_has_relations', function ($join) {
$join->on('categories.id', '=', 'product_has_relations.productable_id')
->where('product_has_relations.productable_type', 'category');
})
->join('products', 'product_has_relations.product_id', '=', 'products.id')
->where('products.brand_id', $id)
->where('products.is_visible', true)
->whereNull('products.parent_id')
->where('products.stock', '>', 0)
->where('categories.is_visible', true)
->distinct()
->get()
->map(fn ($category) => [
'id' => $category->id,
'parent_id' => $category->parent_id,
'name' => tr($category->name),
]);
}

Binary file not shown.

Binary file not shown.