refactor: enhance stock filtering in CuttingService and OrderService, update UI components for better display of stock information

app/Services/Manage/CuttingService.php

@@ -138,7 +138,8 @@ public function rawMaterialCatalog(?Cutting $cutting = null, ?User $user = null)
             ->with([
                 'prices' => fn ($query) => $query
                     ->orderBy('created_at')
-                    ->with('media'),
+                    ->with('media')
+                    ->where(fn ($q) => $q->where('stock', '>', 0)->orWhereIn('id', $selectedPriceIds)),
             ])
             ->where(function (Builder $query) use ($selectedPriceIds): void {
                 $query->active();

app/Services/Manage/OrderService.php

@@ -158,7 +158,13 @@ public function catalogItems(?Order $order = null, ?User $user = null): Collecti
             ->with([
                 'variants' => fn ($query) => $query
                     ->with('media')
-                    ->orderBy('created_at'),
+                    ->orderBy('created_at')
+                    ->where(fn ($q) => $q
+                        ->where('stock', '>', 0)
+                        ->orWhere('reject_stock', '>', 0)
+                        ->orWhere('retail_stock', '>', 0)
+                        ->orWhereIn('id', $orderVariantIds)
+                    ),
             ])
             ->where(function (Builder $query) use ($orderVariantIds): void {
                 $query->active();
@@ -857,13 +863,13 @@ private function presentVariantPricesFromCollection(int $variantId, Collection $
         return $allPricesByVariant
             ->get($variantId, collect())
             ->map(fn ($price) => [
-                'type' => $price->price_type->value,
+                'type' => is_array($price) ? $price['price_type'] : $price->price_type->value,
-                'type_label' => $price->price_type->label(),
+                'type_label' => PriceType::from(is_array($price) ? $price['price_type'] : $price->price_type->value)->label(),
-                'price' => (int) $price->price,
+                'price' => (int) (is_array($price) ? $price['price'] : $price->price),
-                'price_formatted' => $price->price_formatted,
+                'price_formatted' => is_array($price) ? $price['price_formatted'] : $price->price_formatted,
-                'price_input' => (string) $price->price,
+                'price_input' => (string) (is_array($price) ? $price['price'] : $price->price),
-                'cost_per_unit' => (int) $price->cost_per_unit,
+                'cost_per_unit' => (int) (is_array($price) ? ($price['cost_per_unit'] ?? $price['price']) : $price->cost_per_unit),
-                'cost_per_unit_formatted' => $price->cost_per_unit_formatted,
+                'cost_per_unit_formatted' => is_array($price) ? ($price['cost_per_unit_formatted'] ?? $price['price_formatted']) : $price->cost_per_unit_formatted,
             ])
             ->values()
             ->all();

resources/js/pages/admin/manage/cuttings/form/CuttingPosMaterialCatalogPanel.vue

@@ -77,9 +77,10 @@ function openCombination(rawMaterial: CuttingRawMaterialCatalogItem, price: Cutt
                     </Empty>
                 </div>
 
-                <div v-else class="grid grid-cols-1 gap-4 sm:grid-cols-2">
+                <div v-else class="columns-1 gap-4 sm:columns-2 xl:columns-3">
-                    <PosCatalogCard v-for="rawMaterial in filteredRawMaterials" :key="rawMaterial.id"
+                    <template v-for="rawMaterial in filteredRawMaterials" :key="rawMaterial.id">
-                        :title="rawMaterial.name" :cover-image="getFirstCoverImage(rawMaterial.prices)">
+                        <PosCatalogCard v-if="rawMaterial.prices.length > 0"
+                            :title="rawMaterial.name" :cover-image="getFirstCoverImage(rawMaterial.prices)">
                         <template #header-extra>
                             <Badge variant="secondary" class="mt-1.5">
                                 {{ rawMaterial.unit_label }}
@@ -148,6 +149,7 @@ function openCombination(rawMaterial: CuttingRawMaterialCatalogItem, price: Cutt
                             </div>
                         </div>
                     </PosCatalogCard>
+                    </template>
                 </div>
             </div>
         </CardContent>

resources/js/pages/admin/manage/orders/form/OrderPosCatalogPanel.vue

@@ -85,68 +85,66 @@ const emit = defineEmits<{
             </div>
 
             <div v-else class="columns-1 gap-4 sm:columns-2 xl:columns-3">
-                <PosCatalogCard
+                <template v-for="product in filteredCatalog" :key="product.id">
-                    v-for="product in filteredCatalog"
+                    <PosCatalogCard
-                    :key="product.id"
+                        v-if="product.variants.length > 0"
-                    :title="product.name"
+                        :title="product.name"
-                    :cover-image="getFirstCoverImage(product.variants)"
+                        :cover-image="getFirstCoverImage(product.variants)"
-                >
-                    <p v-if="!product.variants.length" class="px-3 py-4 text-sm text-muted-foreground">
-                        Belum ada varian
-                    </p>
-                    <div
-                        v-for="variant in product.variants"
-                        :key="variant.id"
-                        class="flex items-center gap-2.5 px-3 py-2.5 transition-all duration-200"
-                        :class="[
-                            getVariantPrice(variant) ? 'cursor-pointer hover:bg-muted/30' : 'opacity-60',
-                            getCartItem(variant.id) ? 'border-2 border-primary bg-primary/5 rounded-md mx-1 my-0.5' : '',
-                        ]"
-                        @click="getVariantPrice(variant) && !getCartItem(variant.id) && emit('add-to-cart', product, variant)"
                     >
-                        <PosCatalogVariantThumb :items="variant.images" />
+                        <div
-                        <div class="min-w-0 flex-1">
+                            v-for="variant in product.variants"
-                            <p class="truncate text-sm font-medium">
+                            :key="variant.id"
-                                {{ variant.name }}
+                            class="flex items-center gap-2.5 px-3 py-2.5 transition-all duration-200"
-                            </p>
+                            :class="[
-                            <p class="text-xs text-muted-foreground">
+                                getVariantPrice(variant) ? 'cursor-pointer hover:bg-muted/30' : 'opacity-60',
-                                <span v-if="isCashierUser" class="tabular-nums">Ecer: {{ variant.retail_stock ?? 0 }}</span>
+                                getCartItem(variant.id) ? 'border-2 border-primary bg-primary/5 rounded-md mx-1 my-0.5' : '',
-                                <template v-else>
+                            ]"
-                                    <span class="tabular-nums">Bagus: {{ variant.stock }}</span>
+                            @click="getVariantPrice(variant) && !getCartItem(variant.id) && emit('add-to-cart', product, variant)"
+                        >
+                            <PosCatalogVariantThumb :items="variant.images" />
+                            <div class="min-w-0 flex-1">
+                                <p class="truncate text-sm font-medium">
+                                    {{ variant.name }}
+                                </p>
+                                <p class="text-xs text-muted-foreground">
+                                    <span v-if="isCashierUser" class="tabular-nums">Ecer: {{ variant.retail_stock ?? 0 }}</span>
+                                    <template v-else>
+                                        <span class="tabular-nums">Bagus: {{ variant.stock }}</span>
+                                        <span class="mx-1">·</span>
+                                        <span class="tabular-nums">Reject: {{ variant.reject_stock ?? 0 }}</span>
+                                    </template>
                                     <span class="mx-1">·</span>
-                                    <span class="tabular-nums">Reject: {{ variant.reject_stock ?? 0 }}</span>
+                                    <span v-if="getVariantPrice(variant)" class="tabular-nums">
-                                </template>
+                                        {{ getVariantPrice(variant)!.price_formatted }}
-                                <span class="mx-1">·</span>
+                                    </span>
-                                <span v-if="getVariantPrice(variant)" class="tabular-nums">
+                                    <span v-else>-</span>
-                                    {{ getVariantPrice(variant)!.price_formatted }}
+                                </p>
+                            </div>
+                            <div v-if="getCartItem(variant.id)" class="flex shrink-0 items-center gap-1.5">
+                                <Button type="button" variant="outline" size="icon-sm" @click.stop="emit('decrease-qty', variant.id)">
+                                    <Minus class="size-3.5" />
+                                </Button>
+                                <span class="min-w-[1.25rem] text-center text-xs font-semibold tabular-nums">
+                                    {{ getCartItem(variant.id)!.quantity }}
                                 </span>
-                                <span v-else>-</span>
+                                <Button type="button" variant="outline" size="icon-sm" @click.stop="emit('add-to-cart', product, variant)">
-                            </p>
+                                    <Plus class="size-3.5" />
-                        </div>
+                                </Button>
-                        <div v-if="getCartItem(variant.id)" class="flex shrink-0 items-center gap-1.5">
+                            </div>
-                            <Button type="button" variant="outline" size="icon-sm" @click.stop="emit('decrease-qty', variant.id)">
+                            <Button
-                                <Minus class="size-3.5" />
+                                v-else
-                            </Button>
+                                type="button"
-                            <span class="min-w-[1.25rem] text-center text-xs font-semibold tabular-nums">
+                                variant="outline"
-                                {{ getCartItem(variant.id)!.quantity }}
+                                size="icon-sm"
-                            </span>
+                                class="shrink-0"
-                            <Button type="button" variant="outline" size="icon-sm" @click.stop="emit('add-to-cart', product, variant)">
+                                :disabled="!getVariantPrice(variant)"
+                                @click.stop="emit('add-to-cart', product, variant)"
+                            >
                                 <Plus class="size-3.5" />
                             </Button>
                         </div>
-                        <Button
+                    </PosCatalogCard>
-                            v-else
+                </template>
-                            type="button"
-                            variant="outline"
-                            size="icon-sm"
-                            class="shrink-0"
-                            :disabled="!getVariantPrice(variant)"
-                            @click.stop="emit('add-to-cart', product, variant)"
-                        >
-                            <Plus class="size-3.5" />
-                        </Button>
-                    </div>
-                </PosCatalogCard>
             </div>
         </CardContent>
     </Card>

resources/js/pages/admin/master/products/table/ProductGroupedTable.vue

@@ -125,6 +125,7 @@ function openVerificationDetail(requestId: number | undefined) {
                 <Table>
                     <TableHeader>
                         <TableRow>
+                            <TableHead class="w-10">#</TableHead>
                             <TableHead>Varian</TableHead>
                             <TableHead>Foto</TableHead>
                             <TableHead>Stok Bagus</TableHead>
@@ -139,7 +140,10 @@ function openVerificationDetail(requestId: number | undefined) {
                                 Belum ada varian
                             </TableCell>
                         </TableRow>
-                        <TableRow v-for="variant in product.variants" :key="variant.id">
+                        <TableRow v-for="(variant, variantIndex) in product.variants" :key="variant.id">
+                            <TableCell class="text-muted-foreground tabular-nums text-center">
+                                {{ variantIndex + 1 }}
+                            </TableCell>
                             <TableCell class="font-medium">
                                 {{ variant.name }}
                             </TableCell>

resources/js/pages/admin/master/raw-materials/table/RawMaterialGroupedTable.vue

@@ -109,6 +109,7 @@ function openVerificationDetail(requestId: number | undefined) {
                 <Table>
                     <TableHeader>
                         <TableRow>
+                            <TableHead class="w-10">#</TableHead>
                             <TableHead>Varian</TableHead>
                             <TableHead>Foto</TableHead>
                             <TableHead>Stok</TableHead>
@@ -117,11 +118,14 @@ function openVerificationDetail(requestId: number | undefined) {
                     </TableHeader>
                     <TableBody>
                         <TableRow v-if="!material.prices.length" :key="`${material.id}-empty`">
-                            <TableCell colspan="4" class="text-muted-foreground">
+                            <TableCell colspan="5" class="text-muted-foreground">
                                 Belum ada varian
                             </TableCell>
                         </TableRow>
-                        <TableRow v-for="price in material.prices" :key="price.id">
+                        <TableRow v-for="(price, priceIndex) in material.prices" :key="price.id">
+                            <TableCell class="text-muted-foreground tabular-nums text-center">
+                                {{ priceIndex + 1 }}
+                            </TableCell>
                             <TableCell class="font-medium">
                                 {{ price.variant }}
                             </TableCell>

tests/Feature/Admin/Manage/CuttingTest.php

@@ -1122,3 +1122,49 @@ function setupDraftItems(User $user): array
         expect($combination->material_result)->toBe(15);
     });
 });
+
+// ─── Raw Material Catalog Stock Filter ───────────────────────
+
+describe('Raw Material Catalog Stock Filter', function () {
+    test('rawMaterialCatalog excludes variants with zero stock', function () {
+        $user = createCuttingUserWithPermission(PermissionEnum::CUTTINGS_VIEW, PermissionEnum::CUTTINGS_CREATE);
+
+        $rawMaterial = RawMaterial::factory()->create(['is_active' => true]);
+        $priceWithStock    = RawMaterialPrice::factory()->create(['raw_material_id' => $rawMaterial->id, 'stock' => 10]);
+        $priceWithoutStock = RawMaterialPrice::factory()->create(['raw_material_id' => $rawMaterial->id, 'stock' => 0]);
+
+        $this->actingAs($user)
+            ->get(route('admin.manage.cuttings.create'))
+            ->assertOk();
+
+        $service  = app(\App\Services\Manage\CuttingService::class);
+        $catalog  = $service->rawMaterialCatalog(user: $user);
+        $material = $catalog->firstWhere('id', $rawMaterial->id);
+
+        $priceIds = $material->prices->pluck('id')->all();
+
+        expect($priceIds)->toContain($priceWithStock->id);
+        expect($priceIds)->not->toContain($priceWithoutStock->id);
+    });
+
+    test('rawMaterialCatalog includes zero-stock variants already used in cutting', function () {
+        $user = createCuttingUserWithPermission(PermissionEnum::CUTTINGS_VIEW, PermissionEnum::CUTTINGS_UPDATE);
+
+        $rawMaterial = RawMaterial::factory()->create(['is_active' => true]);
+        $priceZeroStock = RawMaterialPrice::factory()->create(['raw_material_id' => $rawMaterial->id, 'stock' => 0]);
+
+        $cutting = Cutting::factory()->create(['created_by_id' => $user->id]);
+        CuttingMaterial::factory()->create([
+            'cutting_id'           => $cutting->id,
+            'raw_material_price_id' => $priceZeroStock->id,
+        ]);
+
+        $service  = app(\App\Services\Manage\CuttingService::class);
+        $catalog  = $service->rawMaterialCatalog($cutting);
+        $material = $catalog->firstWhere('id', $rawMaterial->id);
+
+        $priceIds = $material?->prices->pluck('id')->all() ?? [];
+
+        expect($priceIds)->toContain($priceZeroStock->id);
+    });
+});

tests/Feature/Admin/Manage/OrderTest.php

@@ -613,3 +613,55 @@ function setupOrderDraftItems(User $user): ProductVariant
         expect($item->trashed())->toBeTrue();
     });
 });
+
+// ─── Order Catalog Stock Filter ─────────────────────────────
+
+describe('Order Catalog Stock Filter', function () {
+    test('catalogItems excludes variants where all stock types are zero', function () {
+        $user = createOrderUserWithPermission(PermissionEnum::ORDERS_VIEW, PermissionEnum::ORDERS_CREATE);
+
+        $product = Product::factory()->create(['is_active' => true]);
+
+        $variantWithStock    = ProductVariant::factory()->create(['product_id' => $product->id, 'stock' => 10, 'reject_stock' => 0, 'retail_stock' => 0]);
+        $variantAllZero      = ProductVariant::factory()->create(['product_id' => $product->id, 'stock' => 0,  'reject_stock' => 0, 'retail_stock' => 0]);
+        $variantRejectOnly   = ProductVariant::factory()->create(['product_id' => $product->id, 'stock' => 0,  'reject_stock' => 5, 'retail_stock' => 0]);
+        $variantRetailOnly   = ProductVariant::factory()->create(['product_id' => $product->id, 'stock' => 0,  'reject_stock' => 0, 'retail_stock' => 3]);
+
+        $service = app(\App\Services\Manage\OrderService::class);
+        $catalog = $service->catalogItems(user: $user);
+        $found   = $catalog->firstWhere('id', $product->id);
+
+        $variantIds = $found?->variants->pluck('id')->all() ?? [];
+
+        expect($variantIds)->toContain($variantWithStock->id);
+        expect($variantIds)->toContain($variantRejectOnly->id);
+        expect($variantIds)->toContain($variantRetailOnly->id);
+        expect($variantIds)->not->toContain($variantAllZero->id);
+    });
+
+    test('catalogItems includes all-zero-stock variants already in order', function () {
+        $user = createOrderUserWithPermission(PermissionEnum::ORDERS_VIEW, PermissionEnum::ORDERS_UPDATE);
+
+        $product = Product::factory()->create(['is_active' => true]);
+        $variantAllZero = ProductVariant::factory()->create([
+            'product_id'   => $product->id,
+            'stock'        => 0,
+            'reject_stock' => 0,
+            'retail_stock' => 0,
+        ]);
+
+        $order = Order::factory()->create(['created_by_id' => $user->id]);
+        OrderItem::factory()->create([
+            'order_id'          => $order->id,
+            'product_variant_id' => $variantAllZero->id,
+        ]);
+
+        $service = app(\App\Services\Manage\OrderService::class);
+        $catalog = $service->catalogItems($order);
+        $found   = $catalog->firstWhere('id', $product->id);
+
+        $variantIds = $found?->variants->pluck('id')->all() ?? [];
+
+        expect($variantIds)->toContain($variantAllZero->id);
+    });
+});