feat: enhance purchase and restock management with variant support
- Added existing_material_ids to PurchaseForEdit and RestockForEdit types. - Introduced RawMaterialVariant and ProductVariantForRestock types for better variant handling. - Updated PurchaseCreate and PurchaseEdit components to fetch and display raw material variants. - Enhanced RestockCreate and RestockEdit components to manage product variants dynamically. - Modified TransactionCreate and TransactionEdit components to support product variants. - Added routes for fetching active products and raw materials.
This commit is contained in:
parent
051851b90a
commit
b85bbb1ba4
@ -8,6 +8,7 @@
|
|||||||
use App\Http\Requests\PaginatedRequest;
|
use App\Http\Requests\PaginatedRequest;
|
||||||
use App\Models\Cutting;
|
use App\Models\Cutting;
|
||||||
use App\Services\Admin\Manage\CuttingService;
|
use App\Services\Admin\Manage\CuttingService;
|
||||||
|
use App\Services\Admin\Master\RawMaterial\RawMaterialService;
|
||||||
use App\Services\Admin\Master\RawMaterial\RawMaterialVariantService;
|
use App\Services\Admin\Master\RawMaterial\RawMaterialVariantService;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\RedirectResponse;
|
use Illuminate\Http\RedirectResponse;
|
||||||
@ -18,6 +19,7 @@ class CuttingController extends Controller
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private CuttingService $service,
|
private CuttingService $service,
|
||||||
|
private RawMaterialService $rawMaterialService,
|
||||||
private RawMaterialVariantService $rawMaterialVariantService,
|
private RawMaterialVariantService $rawMaterialVariantService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@ -40,7 +42,7 @@ public function index(PaginatedRequest $request): Response
|
|||||||
public function create(): Response
|
public function create(): Response
|
||||||
{
|
{
|
||||||
return Inertia::render('admin/manage/cutting/create', [
|
return Inertia::render('admin/manage/cutting/create', [
|
||||||
'rawMaterials' => $this->rawMaterialVariantService->getForCutting(),
|
'rawMaterials' => $this->rawMaterialService->getActiveMaterials(),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -72,7 +74,7 @@ public function edit(Cutting $cutting): Response
|
|||||||
{
|
{
|
||||||
return Inertia::render('admin/manage/cutting/edit', [
|
return Inertia::render('admin/manage/cutting/edit', [
|
||||||
'cutting' => $this->service->getForEdit($cutting),
|
'cutting' => $this->service->getForEdit($cutting),
|
||||||
'rawMaterials' => $this->rawMaterialVariantService->getForCutting(),
|
'rawMaterials' => $this->rawMaterialService->getActiveMaterials(),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -7,6 +7,7 @@
|
|||||||
use App\Http\Requests\PaginatedRequest;
|
use App\Http\Requests\PaginatedRequest;
|
||||||
use App\Models\Purchase;
|
use App\Models\Purchase;
|
||||||
use App\Services\Admin\Manage\PurchaseService;
|
use App\Services\Admin\Manage\PurchaseService;
|
||||||
|
use App\Services\Admin\Master\RawMaterial\RawMaterialService;
|
||||||
use App\Services\Admin\Master\RawMaterial\RawMaterialVariantService;
|
use App\Services\Admin\Master\RawMaterial\RawMaterialVariantService;
|
||||||
use App\Services\Admin\Master\SupplierService;
|
use App\Services\Admin\Master\SupplierService;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
@ -19,6 +20,7 @@ class PurchaseController extends Controller
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly PurchaseService $service,
|
private readonly PurchaseService $service,
|
||||||
private readonly SupplierService $supplierService,
|
private readonly SupplierService $supplierService,
|
||||||
|
private readonly RawMaterialService $rawMaterialService,
|
||||||
private readonly RawMaterialVariantService $rawMaterialVariantService,
|
private readonly RawMaterialVariantService $rawMaterialVariantService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@ -39,7 +41,7 @@ public function create(): Response
|
|||||||
{
|
{
|
||||||
return Inertia::render('admin/manage/purchase/create', [
|
return Inertia::render('admin/manage/purchase/create', [
|
||||||
'suppliers' => $this->supplierService->getAll(),
|
'suppliers' => $this->supplierService->getAll(),
|
||||||
'rawMaterials' => $this->rawMaterialVariantService->getForCutting(),
|
'rawMaterials' => $this->rawMaterialService->getActiveMaterials(),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -58,7 +60,7 @@ public function edit(Purchase $purchase): Response
|
|||||||
return Inertia::render('admin/manage/purchase/edit', [
|
return Inertia::render('admin/manage/purchase/edit', [
|
||||||
'purchase' => $this->service->getForEdit($purchase),
|
'purchase' => $this->service->getForEdit($purchase),
|
||||||
'suppliers' => $this->supplierService->getAll(),
|
'suppliers' => $this->supplierService->getAll(),
|
||||||
'rawMaterials' => $this->rawMaterialVariantService->getForCutting(),
|
'rawMaterials' => $this->rawMaterialService->getActiveMaterials(),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -7,6 +7,7 @@
|
|||||||
use App\Http\Requests\PaginatedRequest;
|
use App\Http\Requests\PaginatedRequest;
|
||||||
use App\Models\Restock;
|
use App\Models\Restock;
|
||||||
use App\Services\Admin\Manage\RestockService;
|
use App\Services\Admin\Manage\RestockService;
|
||||||
|
use App\Services\Admin\Master\Product\ProductService;
|
||||||
use App\Services\Admin\Master\Product\ProductVariantService;
|
use App\Services\Admin\Master\Product\ProductVariantService;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\RedirectResponse;
|
use Illuminate\Http\RedirectResponse;
|
||||||
@ -17,6 +18,7 @@ class RestockController extends Controller
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private RestockService $service,
|
private RestockService $service,
|
||||||
|
private ProductService $productService,
|
||||||
private ProductVariantService $productVariantService,
|
private ProductVariantService $productVariantService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@ -33,7 +35,7 @@ public function index(PaginatedRequest $request): Response
|
|||||||
public function create(): Response
|
public function create(): Response
|
||||||
{
|
{
|
||||||
return Inertia::render('admin/manage/restock/create', [
|
return Inertia::render('admin/manage/restock/create', [
|
||||||
'products' => $this->productVariantService->getForRestock(),
|
'products' => $this->productService->getActiveProducts(),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -51,7 +53,7 @@ public function edit(Restock $restock): Response
|
|||||||
{
|
{
|
||||||
return Inertia::render('admin/manage/restock/edit', [
|
return Inertia::render('admin/manage/restock/edit', [
|
||||||
'restock' => $this->service->getForEdit($restock),
|
'restock' => $this->service->getForEdit($restock),
|
||||||
'products' => $this->productVariantService->getForRestock(),
|
'products' => $this->productService->getActiveProducts(),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -13,6 +13,7 @@
|
|||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use App\Services\Admin\Manage\TransactionService;
|
use App\Services\Admin\Manage\TransactionService;
|
||||||
use App\Services\Admin\Master\CustomerService;
|
use App\Services\Admin\Master\CustomerService;
|
||||||
|
use App\Services\Admin\Master\Product\ProductService;
|
||||||
use App\Services\Admin\Master\Product\ProductVariantService;
|
use App\Services\Admin\Master\Product\ProductVariantService;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\RedirectResponse;
|
use Illuminate\Http\RedirectResponse;
|
||||||
@ -23,6 +24,7 @@ class TransactionController extends Controller
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private TransactionService $service,
|
private TransactionService $service,
|
||||||
|
private ProductService $productService,
|
||||||
private ProductVariantService $productVariantService,
|
private ProductVariantService $productVariantService,
|
||||||
private CustomerService $customerService,
|
private CustomerService $customerService,
|
||||||
) {}
|
) {}
|
||||||
@ -50,7 +52,7 @@ public function create(): Response
|
|||||||
$isCashier = $user->hasRole(Role::CASHIER);
|
$isCashier = $user->hasRole(Role::CASHIER);
|
||||||
|
|
||||||
return Inertia::render('admin/manage/transaction/create', [
|
return Inertia::render('admin/manage/transaction/create', [
|
||||||
'products' => $this->productVariantService->getForTransaction(),
|
'products' => $this->productService->getActiveProducts(),
|
||||||
'customers' => $this->customerService->getAll(),
|
'customers' => $this->customerService->getAll(),
|
||||||
'employees' => $this->getEmployees(),
|
'employees' => $this->getEmployees(),
|
||||||
'channelOptions' => OrderChannel::toSelect(),
|
'channelOptions' => OrderChannel::toSelect(),
|
||||||
@ -80,7 +82,7 @@ public function edit(Order $transaction): Response
|
|||||||
|
|
||||||
return Inertia::render('admin/manage/transaction/edit', [
|
return Inertia::render('admin/manage/transaction/edit', [
|
||||||
'transaction' => $this->service->getForEdit($transaction),
|
'transaction' => $this->service->getForEdit($transaction),
|
||||||
'products' => $this->productVariantService->getForTransaction(),
|
'products' => $this->productService->getActiveProducts(),
|
||||||
'customers' => $this->customerService->getAll(),
|
'customers' => $this->customerService->getAll(),
|
||||||
'employees' => $this->getEmployees(),
|
'employees' => $this->getEmployees(),
|
||||||
'channelOptions' => OrderChannel::toSelect(),
|
'channelOptions' => OrderChannel::toSelect(),
|
||||||
|
|||||||
@ -133,4 +133,11 @@ public function variants(Product $product): JsonResponse
|
|||||||
'variants' => $this->service->getVariants($product),
|
'variants' => $this->service->getVariants($product),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function activeProducts(): JsonResponse
|
||||||
|
{
|
||||||
|
return response()->json([
|
||||||
|
'products' => $this->service->getActiveProducts(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -92,4 +92,11 @@ public function variants(RawMaterial $rawMaterial): JsonResponse
|
|||||||
'variants' => $this->service->getVariants($rawMaterial),
|
'variants' => $this->service->getVariants($rawMaterial),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function activeMaterials(): JsonResponse
|
||||||
|
{
|
||||||
|
return response()->json([
|
||||||
|
'materials' => $this->service->getActiveMaterials(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -257,6 +257,12 @@ public function getForEdit(Cutting $cutting): array
|
|||||||
'combinations' => $combinations,
|
'combinations' => $combinations,
|
||||||
'photo_keys' => $photoKeys,
|
'photo_keys' => $photoKeys,
|
||||||
'photo_urls' => $photoUrls,
|
'photo_urls' => $photoUrls,
|
||||||
|
'existing_material_ids' => $cutting->cuttingMaterials
|
||||||
|
->map(fn (CuttingMaterial $m) => $m->rawMaterialPrice?->raw_material_id)
|
||||||
|
->filter()
|
||||||
|
->unique()
|
||||||
|
->values()
|
||||||
|
->all(),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -174,6 +174,7 @@ public function getForEdit(Purchase $purchase): array
|
|||||||
'default_mode' => $singleMaterial && ! $sharedWithOther ? 'new' : 'existing',
|
'default_mode' => $singleMaterial && ! $sharedWithOther ? 'new' : 'existing',
|
||||||
'existing_material_name' => $materials->first()->name ?? null,
|
'existing_material_name' => $materials->first()->name ?? null,
|
||||||
'existing_quantities' => $existingQuantities,
|
'existing_quantities' => $existingQuantities,
|
||||||
|
'existing_material_ids' => $materials->pluck('id')->values()->all(),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -66,7 +66,7 @@ public function getForEdit(Restock $restock): array
|
|||||||
$restock->load([
|
$restock->load([
|
||||||
'restockItems' => fn ($q) => $q
|
'restockItems' => fn ($q) => $q
|
||||||
->select(['id', 'restock_id', 'product_variant_id', 'quantity', 'unit_price', 'subtotal']),
|
->select(['id', 'restock_id', 'product_variant_id', 'quantity', 'unit_price', 'subtotal']),
|
||||||
'restockItems.productVariant:id,name',
|
'restockItems.productVariant:id,product_id,name',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$media = $restock->getFirstMedia('photos');
|
$media = $restock->getFirstMedia('photos');
|
||||||
@ -83,6 +83,12 @@ public function getForEdit(Restock $restock): array
|
|||||||
'quantity' => $item->quantity,
|
'quantity' => $item->quantity,
|
||||||
'unit_price' => $item->unit_price,
|
'unit_price' => $item->unit_price,
|
||||||
]),
|
]),
|
||||||
|
'existing_product_ids' => $restock->restockItems
|
||||||
|
->map(fn ($item) => $item->productVariant?->product_id)
|
||||||
|
->filter()
|
||||||
|
->unique()
|
||||||
|
->values()
|
||||||
|
->all(),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -107,6 +107,7 @@ public function getForEdit(Order $order): array
|
|||||||
{
|
{
|
||||||
$order->load([
|
$order->load([
|
||||||
'orderItems:id,order_id,product_variant_id,stock_quality,quantity,unit_price',
|
'orderItems:id,order_id,product_variant_id,stock_quality,quantity,unit_price',
|
||||||
|
'orderItems.productVariant:id,product_id,name',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$stockType = $order->orderItems->first()?->stock_quality?->value ?? 'good';
|
$stockType = $order->orderItems->first()?->stock_quality?->value ?? 'good';
|
||||||
@ -138,6 +139,12 @@ public function getForEdit(Order $order): array
|
|||||||
'quantity' => $item->quantity,
|
'quantity' => $item->quantity,
|
||||||
'unit_price' => $item->unit_price,
|
'unit_price' => $item->unit_price,
|
||||||
]),
|
]),
|
||||||
|
'existing_product_ids' => $order->orderItems
|
||||||
|
->map(fn (OrderItem $item) => $item->productVariant?->product_id)
|
||||||
|
->filter()
|
||||||
|
->unique()
|
||||||
|
->values()
|
||||||
|
->all(),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -66,6 +66,14 @@ public function paginated(int $perPage = 25, string $search = '', string $sort =
|
|||||||
->paginate($perPage);
|
->paginate($perPage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getActiveProducts(): \Illuminate\Support\Collection
|
||||||
|
{
|
||||||
|
return Product::select(['id', 'name'])
|
||||||
|
->active()
|
||||||
|
->orderBy('name')
|
||||||
|
->get();
|
||||||
|
}
|
||||||
|
|
||||||
public function getVariants(Product $product): Collection
|
public function getVariants(Product $product): Collection
|
||||||
{
|
{
|
||||||
return $product->productVariants()
|
return $product->productVariants()
|
||||||
|
|||||||
@ -60,6 +60,36 @@ public function getForStokOpname(): array
|
|||||||
})->toArray();
|
})->toArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getActiveProducts(): \Illuminate\Support\Collection
|
||||||
|
{
|
||||||
|
return Product::select(['id', 'name'])
|
||||||
|
->active()
|
||||||
|
->orderBy('name')
|
||||||
|
->get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getVariantsByProduct(Product $product): \Illuminate\Support\Collection
|
||||||
|
{
|
||||||
|
return $product->productVariants()
|
||||||
|
->select(['id', 'product_id', 'name', 'stock', 'reject_stock', 'retail_stock'])
|
||||||
|
->with(['productPrices:id,variant_id,type,price', 'media'])
|
||||||
|
->get()
|
||||||
|
->each(function (ProductVariant $variant) {
|
||||||
|
$media = $variant->getFirstMedia('images');
|
||||||
|
$variant->photo_url = $media
|
||||||
|
? $this->s3Service->getTemporaryUrl($media->getPath())
|
||||||
|
: null;
|
||||||
|
$variant->photo_conversion_url = $media
|
||||||
|
? ($media->getGeneratedConversions()->contains('thumb')
|
||||||
|
? $this->s3Service->getTemporaryUrl($media->getPath('thumb'))
|
||||||
|
: $this->s3Service->getTemporaryUrl($media->getPath()))
|
||||||
|
: null;
|
||||||
|
|
||||||
|
$prices = $variant->productPrices->mapWithKeys(fn ($p) => [$p->type->value => $p->price]);
|
||||||
|
$variant->prices = $prices;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
public function getForRestock(): array
|
public function getForRestock(): array
|
||||||
{
|
{
|
||||||
$products = Product::query()
|
$products = Product::query()
|
||||||
|
|||||||
@ -57,6 +57,14 @@ public function paginated(int $perPage = 25, string $search = '', string $sort =
|
|||||||
->paginate($perPage);
|
->paginate($perPage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getActiveMaterials(): Collection
|
||||||
|
{
|
||||||
|
return RawMaterial::select(['id', 'name', 'unit'])
|
||||||
|
->active()
|
||||||
|
->orderBy('name')
|
||||||
|
->get();
|
||||||
|
}
|
||||||
|
|
||||||
public function getVariants(RawMaterial $rawMaterial): Collection
|
public function getVariants(RawMaterial $rawMaterial): Collection
|
||||||
{
|
{
|
||||||
return $rawMaterial->rawMaterialPrices()
|
return $rawMaterial->rawMaterialPrices()
|
||||||
|
|||||||
@ -91,6 +91,7 @@ export type CuttingForEdit = {
|
|||||||
}[];
|
}[];
|
||||||
photo_keys: string[];
|
photo_keys: string[];
|
||||||
photo_urls: string[];
|
photo_urls: string[];
|
||||||
|
existing_material_ids: number[];
|
||||||
};
|
};
|
||||||
|
|
||||||
export type CuttingCreateData = {
|
export type CuttingCreateData = {
|
||||||
@ -98,14 +99,15 @@ export type CuttingCreateData = {
|
|||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
unit: string;
|
unit: string;
|
||||||
is_active: boolean;
|
}[];
|
||||||
raw_material_prices: {
|
};
|
||||||
|
|
||||||
|
export type RawMaterialVariant = {
|
||||||
id: number;
|
id: number;
|
||||||
|
raw_material_id: number;
|
||||||
variant: string;
|
variant: string;
|
||||||
price: number;
|
price: number;
|
||||||
stock: number;
|
stock: number;
|
||||||
photo_url: string | null;
|
photo_url: string | null;
|
||||||
photo_conversion_url: string | null;
|
photo_conversion_url: string | null;
|
||||||
}[];
|
|
||||||
}[];
|
|
||||||
};
|
};
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
import { Form, Head, Link, usePage } from '@inertiajs/react';
|
import { Form, Head, Link, usePage } from '@inertiajs/react';
|
||||||
import { ArrowLeft, Check, Layers, Plus, Search, ShoppingCart, Trash2 } from 'lucide-react';
|
import { ArrowLeft, Check, Layers, Plus, Search, ShoppingCart, Trash2 } from 'lucide-react';
|
||||||
import { useCallback, useMemo, useRef, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { toast } from 'sonner';
|
import { toast } from 'sonner';
|
||||||
import { ConfirmDialog } from '@/components/dialogs';
|
import { ConfirmDialog } from '@/components/dialogs';
|
||||||
import { FileUploadMultiple } from '@/components/inputs';
|
import { FileUploadMultiple } from '@/components/inputs';
|
||||||
@ -23,7 +23,7 @@ import { formatNumber } from '@/lib/format';
|
|||||||
import { getTemporaryUrl } from '@/lib/upload';
|
import { getTemporaryUrl } from '@/lib/upload';
|
||||||
import { formatCurrency } from '@/lib/utils';
|
import { formatCurrency } from '@/lib/utils';
|
||||||
import { index as cuttingIndex, store } from '@/routes/admin/manage/cuttings';
|
import { index as cuttingIndex, store } from '@/routes/admin/manage/cuttings';
|
||||||
import type { CuttingCreateData } from './columns';
|
import type { CuttingCreateData, RawMaterialVariant } from './columns';
|
||||||
|
|
||||||
type MaterialState = {
|
type MaterialState = {
|
||||||
raw_material_price_id: number;
|
raw_material_price_id: number;
|
||||||
@ -79,6 +79,8 @@ export default function CuttingCreate({ rawMaterials }: Props) {
|
|||||||
});
|
});
|
||||||
const [selectedMaterialName, setSelectedMaterialName] = useState(draft?.selectedMaterialName ?? '');
|
const [selectedMaterialName, setSelectedMaterialName] = useState(draft?.selectedMaterialName ?? '');
|
||||||
const [variantSearch, setVariantSearch] = useState('');
|
const [variantSearch, setVariantSearch] = useState('');
|
||||||
|
const [fetchedVariants, setFetchedVariants] = useState<Map<number, RawMaterialVariant[]>>(new Map());
|
||||||
|
const [loadingVariants, setLoadingVariants] = useState(false);
|
||||||
|
|
||||||
const [productName, setProductName] = useState(draft?.productName ?? '');
|
const [productName, setProductName] = useState(draft?.productName ?? '');
|
||||||
const [sample, setSample] = useState(draft?.sample ?? 0);
|
const [sample, setSample] = useState(draft?.sample ?? 0);
|
||||||
@ -148,32 +150,87 @@ export default function CuttingCreate({ rawMaterials }: Props) {
|
|||||||
const materialsRef = useRef(materials);
|
const materialsRef = useRef(materials);
|
||||||
materialsRef.current = materials;
|
materialsRef.current = materials;
|
||||||
|
|
||||||
const priceMap = useMemo(
|
const priceMap = useMemo(() => {
|
||||||
() => new Map(rawMaterials.flatMap((m) => m.raw_material_prices.map((p) => [p.id, p]))),
|
const map = new Map<number, RawMaterialVariant>();
|
||||||
[rawMaterials],
|
for (const [, variants] of fetchedVariants) {
|
||||||
);
|
for (const p of variants) {
|
||||||
|
map.set(p.id, p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
}, [fetchedVariants]);
|
||||||
|
|
||||||
const selectedMaterial = useMemo(
|
const selectedMaterial = useMemo(
|
||||||
() => rawMaterials.find((m) => m.name === selectedMaterialName) ?? null,
|
() => rawMaterials.find((m) => m.name === selectedMaterialName) ?? null,
|
||||||
[rawMaterials, selectedMaterialName],
|
[rawMaterials, selectedMaterialName],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const selectedMaterialVariants = useMemo(
|
||||||
|
() => (selectedMaterial ? fetchedVariants.get(selectedMaterial.id) ?? [] : []),
|
||||||
|
[selectedMaterial, fetchedVariants],
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!selectedMaterial) return;
|
||||||
|
if (fetchedVariants.has(selectedMaterial.id)) return;
|
||||||
|
|
||||||
|
setLoadingVariants(true);
|
||||||
|
fetch(`/admin/master/raw-materials/${selectedMaterial.id}/variants`)
|
||||||
|
.then((res) => res.json())
|
||||||
|
.then((data) => {
|
||||||
|
setFetchedVariants((prev) => {
|
||||||
|
const next = new Map(prev);
|
||||||
|
next.set(selectedMaterial.id, data.variants);
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
toast.error('Gagal memuat varian bahan baku.');
|
||||||
|
})
|
||||||
|
.finally(() => setLoadingVariants(false));
|
||||||
|
}, [selectedMaterial, fetchedVariants]);
|
||||||
|
|
||||||
|
const comboMaterialVariants = useMemo(
|
||||||
|
() => (comboMaterial ? fetchedVariants.get(comboMaterial.id) ?? [] : []),
|
||||||
|
[comboMaterial, fetchedVariants],
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!comboMaterial) return;
|
||||||
|
if (fetchedVariants.has(comboMaterial.id)) return;
|
||||||
|
|
||||||
|
setLoadingVariants(true);
|
||||||
|
fetch(`/admin/master/raw-materials/${comboMaterial.id}/variants`)
|
||||||
|
.then((res) => res.json())
|
||||||
|
.then((data) => {
|
||||||
|
setFetchedVariants((prev) => {
|
||||||
|
const next = new Map(prev);
|
||||||
|
next.set(comboMaterial.id, data.variants);
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
toast.error('Gagal memuat varian bahan baku.');
|
||||||
|
})
|
||||||
|
.finally(() => setLoadingVariants(false));
|
||||||
|
}, [comboMaterial, fetchedVariants]);
|
||||||
|
|
||||||
const groupedVariants = useMemo(() => {
|
const groupedVariants = useMemo(() => {
|
||||||
if (!variantSearch) return [];
|
if (!variantSearch) return [];
|
||||||
|
if (!selectedMaterial) return [];
|
||||||
const search = variantSearch.toLowerCase();
|
const search = variantSearch.toLowerCase();
|
||||||
return rawMaterials
|
return [{
|
||||||
.map((rm) => ({
|
...selectedMaterial,
|
||||||
...rm,
|
raw_material_prices: selectedMaterialVariants.filter(
|
||||||
raw_material_prices: rm.raw_material_prices.filter(
|
|
||||||
(p) => p.variant.toLowerCase().includes(search),
|
(p) => p.variant.toLowerCase().includes(search),
|
||||||
),
|
),
|
||||||
}))
|
}];
|
||||||
.filter((rm) => rm.raw_material_prices.length > 0);
|
}, [selectedMaterial, selectedMaterialVariants, variantSearch]);
|
||||||
}, [rawMaterials, variantSearch]);
|
|
||||||
|
|
||||||
const addVariant = useCallback(
|
const addVariant = useCallback(
|
||||||
(rawMaterial: (typeof rawMaterials)[number], priceId: number) => {
|
(rawMaterial: { id: number; name: string; unit: string }, priceId: number) => {
|
||||||
const price = rawMaterial.raw_material_prices.find((p) => p.id === priceId);
|
const variants = fetchedVariants.get(rawMaterial.id) ?? [];
|
||||||
|
const price = variants.find((p) => p.id === priceId);
|
||||||
|
|
||||||
if (!price) {
|
if (!price) {
|
||||||
return;
|
return;
|
||||||
@ -200,7 +257,7 @@ export default function CuttingCreate({ rawMaterials }: Props) {
|
|||||||
];
|
];
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
[],
|
[fetchedVariants],
|
||||||
);
|
);
|
||||||
|
|
||||||
const openComboDialog = useCallback((materialName: string, preSelectPriceId?: number) => {
|
const openComboDialog = useCallback((materialName: string, preSelectPriceId?: number) => {
|
||||||
@ -223,30 +280,22 @@ export default function CuttingCreate({ rawMaterials }: Props) {
|
|||||||
|
|
||||||
const comboIndex = combinations.length;
|
const comboIndex = combinations.length;
|
||||||
|
|
||||||
|
const comboMaterialData = rawMaterials.find((m) => m.name === comboMaterialName);
|
||||||
|
const variants = comboMaterialData ? (fetchedVariants.get(comboMaterialData.id) ?? []) : [];
|
||||||
|
|
||||||
const newMaterials: MaterialState[] = comboSelectedPriceIds.map((priceId) => {
|
const newMaterials: MaterialState[] = comboSelectedPriceIds.map((priceId) => {
|
||||||
let foundMaterial: typeof rawMaterials[number] | undefined;
|
const price = variants.find((p) => p.id === priceId);
|
||||||
let foundPrice: typeof rawMaterials[number]['raw_material_prices'][number] | undefined;
|
|
||||||
|
|
||||||
for (const rm of rawMaterials) {
|
|
||||||
const p = rm.raw_material_prices.find((pp) => pp.id === priceId);
|
|
||||||
|
|
||||||
if (p) {
|
|
||||||
foundMaterial = rm;
|
|
||||||
foundPrice = p;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
raw_material_price_id: priceId,
|
raw_material_price_id: priceId,
|
||||||
material_usage: '0',
|
material_usage: '0',
|
||||||
material_result: 0,
|
material_result: 0,
|
||||||
combination_id: comboIndex,
|
combination_id: comboIndex,
|
||||||
variant: foundPrice?.variant ?? '',
|
variant: price?.variant ?? '',
|
||||||
material_name: foundMaterial?.name ?? '',
|
material_name: comboMaterialData?.name ?? '',
|
||||||
unit: foundMaterial?.unit ?? '',
|
unit: comboMaterialData?.unit ?? '',
|
||||||
photo_url: foundPrice?.photo_url ?? null,
|
photo_url: price?.photo_url ?? null,
|
||||||
photo_conversion_url: foundPrice?.photo_conversion_url ?? null,
|
photo_conversion_url: price?.photo_conversion_url ?? null,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -262,7 +311,7 @@ export default function CuttingCreate({ rawMaterials }: Props) {
|
|||||||
setComboMaterialName('');
|
setComboMaterialName('');
|
||||||
setComboSelectedPriceIds([]);
|
setComboSelectedPriceIds([]);
|
||||||
setComboResult(0);
|
setComboResult(0);
|
||||||
}, [comboSelectedPriceIds, comboResult, rawMaterials, combinations.length]);
|
}, [comboSelectedPriceIds, comboResult, rawMaterials, fetchedVariants, comboMaterialName, combinations.length]);
|
||||||
|
|
||||||
const removeMaterial = useCallback((index: number) => {
|
const removeMaterial = useCallback((index: number) => {
|
||||||
setDeleteMaterialIndex(index);
|
setDeleteMaterialIndex(index);
|
||||||
@ -434,10 +483,19 @@ export default function CuttingCreate({ rawMaterials }: Props) {
|
|||||||
<p className="text-sm text-muted-foreground">Tidak ada varian ditemukan.</p>
|
<p className="text-sm text-muted-foreground">Tidak ada varian ditemukan.</p>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{!variantSearch && selectedMaterial && selectedMaterial.raw_material_prices.length > 0 && (
|
{!variantSearch && selectedMaterial && (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
|
{loadingVariants ? (
|
||||||
|
<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
|
||||||
|
Memuat varian...
|
||||||
|
</div>
|
||||||
|
) : selectedMaterialVariants.length === 0 ? (
|
||||||
|
<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
|
||||||
|
Tidak ada varian ditemukan.
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{selectedMaterial.raw_material_prices.map((price) => {
|
{selectedMaterialVariants.map((price) => {
|
||||||
const isAdded = materials.some((m) => m.raw_material_price_id === price.id);
|
const isAdded = materials.some((m) => m.raw_material_price_id === price.id);
|
||||||
const addedCount = materials.filter((m) => m.raw_material_price_id === price.id).length;
|
const addedCount = materials.filter((m) => m.raw_material_price_id === price.id).length;
|
||||||
|
|
||||||
@ -471,6 +529,7 @@ export default function CuttingCreate({ rawMaterials }: Props) {
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</CardContent>
|
</CardContent>
|
||||||
@ -740,18 +799,13 @@ export default function CuttingCreate({ rawMaterials }: Props) {
|
|||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
{comboSelectedPriceIds.map((priceId) => {
|
{comboSelectedPriceIds.map((priceId) => {
|
||||||
let variantName = '';
|
let variantName = '';
|
||||||
let materialName = '';
|
let materialName = comboMaterialName;
|
||||||
let photoUrl: string | null = null;
|
let photoUrl: string | null = null;
|
||||||
|
|
||||||
for (const rm of rawMaterials) {
|
const price = comboMaterialVariants.find((pp) => pp.id === priceId);
|
||||||
const p = rm.raw_material_prices.find((pp) => pp.id === priceId);
|
if (price) {
|
||||||
|
variantName = price.variant;
|
||||||
if (p) {
|
photoUrl = price.photo_conversion_url ?? price.photo_url;
|
||||||
variantName = p.variant;
|
|
||||||
materialName = rm.name;
|
|
||||||
photoUrl = p.photo_conversion_url ?? p.photo_url;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -777,11 +831,20 @@ export default function CuttingCreate({ rawMaterials }: Props) {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{comboMaterial && comboMaterial.raw_material_prices.length > 0 && (
|
{comboMaterial && (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<Label className="text-sm font-medium">Pilih Varian</Label>
|
<Label className="text-sm font-medium">Pilih Varian</Label>
|
||||||
|
{loadingVariants ? (
|
||||||
|
<div className="flex items-center justify-center py-4 text-sm text-muted-foreground">
|
||||||
|
Memuat varian...
|
||||||
|
</div>
|
||||||
|
) : comboMaterialVariants.length === 0 ? (
|
||||||
|
<div className="flex items-center justify-center py-4 text-sm text-muted-foreground">
|
||||||
|
Tidak ada varian ditemukan.
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{comboMaterial.raw_material_prices.map((price) => {
|
{comboMaterialVariants.map((price) => {
|
||||||
const isSelected = comboSelectedPriceIds.includes(price.id);
|
const isSelected = comboSelectedPriceIds.includes(price.id);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -804,6 +867,7 @@ export default function CuttingCreate({ rawMaterials }: Props) {
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
import { Form, Head, Link, usePage } from '@inertiajs/react';
|
import { Form, Head, Link, usePage } from '@inertiajs/react';
|
||||||
import { ArrowLeft, Check, Layers, Plus, Search, ShoppingCart, Trash2 } from 'lucide-react';
|
import { ArrowLeft, Check, Layers, Plus, Search, ShoppingCart, Trash2 } from 'lucide-react';
|
||||||
import { useCallback, useMemo, useRef, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { toast } from 'sonner';
|
import { toast } from 'sonner';
|
||||||
import { ConfirmDialog } from '@/components/dialogs';
|
import { ConfirmDialog } from '@/components/dialogs';
|
||||||
import { FileUploadMultiple } from '@/components/inputs';
|
import { FileUploadMultiple } from '@/components/inputs';
|
||||||
@ -21,7 +21,7 @@ import { formatNumber } from '@/lib/format';
|
|||||||
import { getTemporaryUrl } from '@/lib/upload';
|
import { getTemporaryUrl } from '@/lib/upload';
|
||||||
import { formatCurrency } from '@/lib/utils';
|
import { formatCurrency } from '@/lib/utils';
|
||||||
import { index as cuttingIndex, update } from '@/routes/admin/manage/cuttings';
|
import { index as cuttingIndex, update } from '@/routes/admin/manage/cuttings';
|
||||||
import type { CuttingCreateData, CuttingForEdit } from './columns';
|
import type { CuttingCreateData, CuttingForEdit, RawMaterialVariant } from './columns';
|
||||||
|
|
||||||
type MaterialState = {
|
type MaterialState = {
|
||||||
id?: number;
|
id?: number;
|
||||||
@ -54,13 +54,6 @@ export default function CuttingEdit({ cutting, rawMaterials }: Props) {
|
|||||||
cutting.combinations.forEach((c, i) => comboIdToIndex.set(c.id, i));
|
cutting.combinations.forEach((c, i) => comboIdToIndex.set(c.id, i));
|
||||||
|
|
||||||
return cutting.materials.map((m) => {
|
return cutting.materials.map((m) => {
|
||||||
const rawMaterial = rawMaterials.find((rm) =>
|
|
||||||
rm.raw_material_prices.some((p) => p.id === m.raw_material_price_id),
|
|
||||||
);
|
|
||||||
const price = rawMaterial?.raw_material_prices.find(
|
|
||||||
(p) => p.id === m.raw_material_price_id,
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: m.id,
|
id: m.id,
|
||||||
raw_material_price_id: m.raw_material_price_id,
|
raw_material_price_id: m.raw_material_price_id,
|
||||||
@ -70,11 +63,11 @@ export default function CuttingEdit({ cutting, rawMaterials }: Props) {
|
|||||||
m.combination_id !== null
|
m.combination_id !== null
|
||||||
? (comboIdToIndex.get(m.combination_id) ?? null)
|
? (comboIdToIndex.get(m.combination_id) ?? null)
|
||||||
: null,
|
: null,
|
||||||
variant: price?.variant ?? m.variant ?? '',
|
variant: m.variant ?? '',
|
||||||
material_name: rawMaterial?.name ?? '',
|
material_name: '',
|
||||||
unit: rawMaterial?.unit ?? '',
|
unit: '',
|
||||||
photo_url: price?.photo_url ?? m.photo_url ?? null,
|
photo_url: m.photo_url ?? null,
|
||||||
photo_conversion_url: price?.photo_conversion_url ?? m.photo_conversion_url ?? null,
|
photo_conversion_url: null,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@ -89,6 +82,8 @@ export default function CuttingEdit({ cutting, rawMaterials }: Props) {
|
|||||||
|
|
||||||
const [selectedMaterialName, setSelectedMaterialName] = useState('');
|
const [selectedMaterialName, setSelectedMaterialName] = useState('');
|
||||||
const [variantSearch, setVariantSearch] = useState('');
|
const [variantSearch, setVariantSearch] = useState('');
|
||||||
|
const [fetchedVariants, setFetchedVariants] = useState<Map<number, RawMaterialVariant[]>>(new Map());
|
||||||
|
const [loadingVariants, setLoadingVariants] = useState(false);
|
||||||
|
|
||||||
const [productName, setProductName] = useState(cutting.product_name);
|
const [productName, setProductName] = useState(cutting.product_name);
|
||||||
const [sample, setSample] = useState(cutting.sample);
|
const [sample, setSample] = useState(cutting.sample);
|
||||||
@ -127,35 +122,120 @@ export default function CuttingEdit({ cutting, rawMaterials }: Props) {
|
|||||||
[rawMaterials, comboMaterialName],
|
[rawMaterials, comboMaterialName],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const materialIds = cutting.existing_material_ids ?? [];
|
||||||
|
if (materialIds.length === 0) return;
|
||||||
|
|
||||||
|
const toFetch = materialIds.filter((id) => !fetchedVariants.has(id));
|
||||||
|
if (toFetch.length === 0) return;
|
||||||
|
|
||||||
|
setLoadingVariants(true);
|
||||||
|
Promise.all(
|
||||||
|
toFetch.map((id) =>
|
||||||
|
fetch(`/admin/master/raw-materials/${id}/variants`)
|
||||||
|
.then((res) => res.json())
|
||||||
|
.then((data) => [id, data.variants] as const)
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.then((results) => {
|
||||||
|
setFetchedVariants((prev) => {
|
||||||
|
const next = new Map(prev);
|
||||||
|
for (const [id, variants] of results) {
|
||||||
|
next.set(id, variants);
|
||||||
|
}
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
toast.error('Gagal memuat varian bahan baku.');
|
||||||
|
})
|
||||||
|
.finally(() => setLoadingVariants(false));
|
||||||
|
}, [cutting.existing_material_ids]);
|
||||||
|
|
||||||
const materialsRef = useRef(materials);
|
const materialsRef = useRef(materials);
|
||||||
materialsRef.current = materials;
|
materialsRef.current = materials;
|
||||||
|
|
||||||
const priceMap = useMemo(
|
const priceMap = useMemo(() => {
|
||||||
() => new Map(rawMaterials.flatMap((m) => m.raw_material_prices.map((p) => [p.id, p]))),
|
const map = new Map<number, RawMaterialVariant>();
|
||||||
[rawMaterials],
|
for (const [, variants] of fetchedVariants) {
|
||||||
);
|
for (const p of variants) {
|
||||||
|
map.set(p.id, p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
}, [fetchedVariants]);
|
||||||
|
|
||||||
const selectedMaterial = useMemo(
|
const selectedMaterial = useMemo(
|
||||||
() => rawMaterials.find((m) => m.name === selectedMaterialName) ?? null,
|
() => rawMaterials.find((m) => m.name === selectedMaterialName) ?? null,
|
||||||
[rawMaterials, selectedMaterialName],
|
[rawMaterials, selectedMaterialName],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const selectedMaterialVariants = useMemo(
|
||||||
|
() => (selectedMaterial ? fetchedVariants.get(selectedMaterial.id) ?? [] : []),
|
||||||
|
[selectedMaterial, fetchedVariants],
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!selectedMaterial) return;
|
||||||
|
if (fetchedVariants.has(selectedMaterial.id)) return;
|
||||||
|
|
||||||
|
setLoadingVariants(true);
|
||||||
|
fetch(`/admin/master/raw-materials/${selectedMaterial.id}/variants`)
|
||||||
|
.then((res) => res.json())
|
||||||
|
.then((data) => {
|
||||||
|
setFetchedVariants((prev) => {
|
||||||
|
const next = new Map(prev);
|
||||||
|
next.set(selectedMaterial.id, data.variants);
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
toast.error('Gagal memuat varian bahan baku.');
|
||||||
|
})
|
||||||
|
.finally(() => setLoadingVariants(false));
|
||||||
|
}, [selectedMaterial, fetchedVariants]);
|
||||||
|
|
||||||
|
const comboMaterialVariants = useMemo(
|
||||||
|
() => (comboMaterial ? fetchedVariants.get(comboMaterial.id) ?? [] : []),
|
||||||
|
[comboMaterial, fetchedVariants],
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!comboMaterial) return;
|
||||||
|
if (fetchedVariants.has(comboMaterial.id)) return;
|
||||||
|
|
||||||
|
setLoadingVariants(true);
|
||||||
|
fetch(`/admin/master/raw-materials/${comboMaterial.id}/variants`)
|
||||||
|
.then((res) => res.json())
|
||||||
|
.then((data) => {
|
||||||
|
setFetchedVariants((prev) => {
|
||||||
|
const next = new Map(prev);
|
||||||
|
next.set(comboMaterial.id, data.variants);
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
toast.error('Gagal memuat varian bahan baku.');
|
||||||
|
})
|
||||||
|
.finally(() => setLoadingVariants(false));
|
||||||
|
}, [comboMaterial, fetchedVariants]);
|
||||||
|
|
||||||
const groupedVariants = useMemo(() => {
|
const groupedVariants = useMemo(() => {
|
||||||
if (!variantSearch) return [];
|
if (!variantSearch) return [];
|
||||||
|
if (!selectedMaterial) return [];
|
||||||
const search = variantSearch.toLowerCase();
|
const search = variantSearch.toLowerCase();
|
||||||
return rawMaterials
|
return [{
|
||||||
.map((rm) => ({
|
...selectedMaterial,
|
||||||
...rm,
|
raw_material_prices: selectedMaterialVariants.filter(
|
||||||
raw_material_prices: rm.raw_material_prices.filter(
|
|
||||||
(p) => p.variant.toLowerCase().includes(search),
|
(p) => p.variant.toLowerCase().includes(search),
|
||||||
),
|
),
|
||||||
}))
|
}];
|
||||||
.filter((rm) => rm.raw_material_prices.length > 0);
|
}, [selectedMaterial, selectedMaterialVariants, variantSearch]);
|
||||||
}, [rawMaterials, variantSearch]);
|
|
||||||
|
|
||||||
const addVariant = useCallback(
|
const addVariant = useCallback(
|
||||||
(rawMaterial: (typeof rawMaterials)[number], priceId: number) => {
|
(rawMaterial: { id: number; name: string; unit: string }, priceId: number) => {
|
||||||
const price = rawMaterial.raw_material_prices.find((p) => p.id === priceId);
|
const variants = fetchedVariants.get(rawMaterial.id) ?? [];
|
||||||
|
const price = variants.find((p) => p.id === priceId);
|
||||||
|
|
||||||
if (!price) {
|
if (!price) {
|
||||||
return;
|
return;
|
||||||
@ -205,30 +285,22 @@ export default function CuttingEdit({ cutting, rawMaterials }: Props) {
|
|||||||
|
|
||||||
const comboIndex = combinations.length;
|
const comboIndex = combinations.length;
|
||||||
|
|
||||||
|
const comboMaterialData = rawMaterials.find((m) => m.name === comboMaterialName);
|
||||||
|
const variants = comboMaterialData ? (fetchedVariants.get(comboMaterialData.id) ?? []) : [];
|
||||||
|
|
||||||
const newMaterials: MaterialState[] = comboSelectedPriceIds.map((priceId) => {
|
const newMaterials: MaterialState[] = comboSelectedPriceIds.map((priceId) => {
|
||||||
let foundMaterial: (typeof rawMaterials)[number] | undefined;
|
const price = variants.find((p) => p.id === priceId);
|
||||||
let foundPrice: (typeof rawMaterials)[number]['raw_material_prices'][number] | undefined;
|
|
||||||
|
|
||||||
for (const rm of rawMaterials) {
|
|
||||||
const p = rm.raw_material_prices.find((pp) => pp.id === priceId);
|
|
||||||
|
|
||||||
if (p) {
|
|
||||||
foundMaterial = rm;
|
|
||||||
foundPrice = p;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
raw_material_price_id: priceId,
|
raw_material_price_id: priceId,
|
||||||
material_usage: '0',
|
material_usage: '0',
|
||||||
material_result: 0,
|
material_result: 0,
|
||||||
combination_id: comboIndex,
|
combination_id: comboIndex,
|
||||||
variant: foundPrice?.variant ?? '',
|
variant: price?.variant ?? '',
|
||||||
material_name: foundMaterial?.name ?? '',
|
material_name: comboMaterialData?.name ?? '',
|
||||||
unit: foundMaterial?.unit ?? '',
|
unit: comboMaterialData?.unit ?? '',
|
||||||
photo_url: foundPrice?.photo_url ?? null,
|
photo_url: price?.photo_url ?? null,
|
||||||
photo_conversion_url: foundPrice?.photo_conversion_url ?? null,
|
photo_conversion_url: price?.photo_conversion_url ?? null,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -244,7 +316,7 @@ export default function CuttingEdit({ cutting, rawMaterials }: Props) {
|
|||||||
setComboMaterialName('');
|
setComboMaterialName('');
|
||||||
setComboSelectedPriceIds([]);
|
setComboSelectedPriceIds([]);
|
||||||
setComboResult(0);
|
setComboResult(0);
|
||||||
}, [comboSelectedPriceIds, comboResult, rawMaterials, combinations.length]);
|
}, [comboSelectedPriceIds, comboResult, rawMaterials, fetchedVariants, comboMaterialName, combinations.length]);
|
||||||
|
|
||||||
const updateMaterial = useCallback(
|
const updateMaterial = useCallback(
|
||||||
(index: number, field: keyof MaterialState, value: unknown) => {
|
(index: number, field: keyof MaterialState, value: unknown) => {
|
||||||
@ -368,7 +440,7 @@ export default function CuttingEdit({ cutting, rawMaterials }: Props) {
|
|||||||
<div key={rm.id} className="space-y-2">
|
<div key={rm.id} className="space-y-2">
|
||||||
<p className="text-xs font-semibold text-muted-foreground uppercase">{rm.name} ({rm.unit})</p>
|
<p className="text-xs font-semibold text-muted-foreground uppercase">{rm.name} ({rm.unit})</p>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{rm.raw_material_prices.map((price) => {
|
{selectedMaterialVariants.filter((p) => p.variant.toLowerCase().includes(variantSearch.toLowerCase())).map((price) => {
|
||||||
const isAdded = materials.some((m) => m.raw_material_price_id === price.id);
|
const isAdded = materials.some((m) => m.raw_material_price_id === price.id);
|
||||||
const addedCount = materials.filter((m) => m.raw_material_price_id === price.id).length;
|
const addedCount = materials.filter((m) => m.raw_material_price_id === price.id).length;
|
||||||
|
|
||||||
@ -411,10 +483,19 @@ export default function CuttingEdit({ cutting, rawMaterials }: Props) {
|
|||||||
<p className="text-sm text-muted-foreground">Tidak ada varian ditemukan.</p>
|
<p className="text-sm text-muted-foreground">Tidak ada varian ditemukan.</p>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{!variantSearch && selectedMaterial && selectedMaterial.raw_material_prices.length > 0 && (
|
{!variantSearch && selectedMaterial && (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
|
{loadingVariants ? (
|
||||||
|
<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
|
||||||
|
Memuat varian...
|
||||||
|
</div>
|
||||||
|
) : selectedMaterialVariants.length === 0 ? (
|
||||||
|
<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
|
||||||
|
Tidak ada varian ditemukan.
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{selectedMaterial.raw_material_prices.map((price) => {
|
{selectedMaterialVariants.map((price) => {
|
||||||
const isAdded = materials.some((m) => m.raw_material_price_id === price.id);
|
const isAdded = materials.some((m) => m.raw_material_price_id === price.id);
|
||||||
const addedCount = materials.filter((m) => m.raw_material_price_id === price.id).length;
|
const addedCount = materials.filter((m) => m.raw_material_price_id === price.id).length;
|
||||||
|
|
||||||
@ -448,6 +529,7 @@ export default function CuttingEdit({ cutting, rawMaterials }: Props) {
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</CardContent>
|
</CardContent>
|
||||||
@ -716,20 +798,10 @@ export default function CuttingEdit({ cutting, rawMaterials }: Props) {
|
|||||||
<Label className="text-sm font-medium">Varian Dipilih</Label>
|
<Label className="text-sm font-medium">Varian Dipilih</Label>
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
{comboSelectedPriceIds.map((priceId) => {
|
{comboSelectedPriceIds.map((priceId) => {
|
||||||
let variantName = '';
|
const p = comboMaterialVariants.find((pp) => pp.id === priceId);
|
||||||
let materialName = '';
|
const variantName = p?.variant ?? '';
|
||||||
let photoUrl: string | null = null;
|
const materialName = comboMaterialName;
|
||||||
|
const photoUrl = p?.photo_conversion_url ?? p?.photo_url ?? null;
|
||||||
for (const rm of rawMaterials) {
|
|
||||||
const p = rm.raw_material_prices.find((pp) => pp.id === priceId);
|
|
||||||
|
|
||||||
if (p) {
|
|
||||||
variantName = p.variant;
|
|
||||||
materialName = rm.name;
|
|
||||||
photoUrl = p.photo_conversion_url ?? p.photo_url;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div key={priceId} className="flex items-center justify-between gap-2 rounded-md border border-primary bg-primary/5 px-3 py-2">
|
<div key={priceId} className="flex items-center justify-between gap-2 rounded-md border border-primary bg-primary/5 px-3 py-2">
|
||||||
@ -754,11 +826,11 @@ export default function CuttingEdit({ cutting, rawMaterials }: Props) {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{comboMaterial && comboMaterial.raw_material_prices.length > 0 && (
|
{comboMaterial && comboMaterialVariants.length > 0 && (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<Label className="text-sm font-medium">Pilih Varian</Label>
|
<Label className="text-sm font-medium">Pilih Varian</Label>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{comboMaterial.raw_material_prices.map((price) => {
|
{comboMaterialVariants.map((price) => {
|
||||||
const isSelected = comboSelectedPriceIds.includes(price.id);
|
const isSelected = comboSelectedPriceIds.includes(price.id);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@ -79,6 +79,7 @@ export type PurchaseForEdit = {
|
|||||||
default_mode: 'new' | 'existing';
|
default_mode: 'new' | 'existing';
|
||||||
existing_material_name: string | null;
|
existing_material_name: string | null;
|
||||||
existing_quantities: Record<string, number>;
|
existing_quantities: Record<string, number>;
|
||||||
|
existing_material_ids: number[];
|
||||||
};
|
};
|
||||||
|
|
||||||
export type Supplier = {
|
export type Supplier = {
|
||||||
@ -92,14 +93,15 @@ export type PurchaseCreateData = {
|
|||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
unit: string;
|
unit: string;
|
||||||
is_active: boolean;
|
}[];
|
||||||
raw_material_prices: {
|
};
|
||||||
|
|
||||||
|
export type RawMaterialVariant = {
|
||||||
id: number;
|
id: number;
|
||||||
|
raw_material_id: number;
|
||||||
variant: string;
|
variant: string;
|
||||||
price: number;
|
price: number;
|
||||||
stock: number;
|
stock: number;
|
||||||
photo_url: string | null;
|
photo_url: string | null;
|
||||||
photo_conversion_url: string | null;
|
photo_conversion_url: string | null;
|
||||||
}[];
|
|
||||||
}[];
|
|
||||||
};
|
};
|
||||||
|
|||||||
@ -11,7 +11,7 @@ import {
|
|||||||
ShoppingCart,
|
ShoppingCart,
|
||||||
Trash2,
|
Trash2,
|
||||||
} from 'lucide-react';
|
} from 'lucide-react';
|
||||||
import { useCallback, useMemo, useRef, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { toast } from 'sonner';
|
import { toast } from 'sonner';
|
||||||
import { ConfirmDialog } from '@/components/dialogs';
|
import { ConfirmDialog } from '@/components/dialogs';
|
||||||
import { FileUpload, FileUploadMultiple } from '@/components/inputs';
|
import { FileUpload, FileUploadMultiple } from '@/components/inputs';
|
||||||
@ -48,7 +48,7 @@ import { loadPurchaseDraft } from '@/lib/purchase-draft';
|
|||||||
import { getTemporaryUrl } from '@/lib/upload';
|
import { getTemporaryUrl } from '@/lib/upload';
|
||||||
import { formatCurrency } from '@/lib/utils';
|
import { formatCurrency } from '@/lib/utils';
|
||||||
import { index as purchaseIndex, store } from '@/routes/admin/manage/purchases';
|
import { index as purchaseIndex, store } from '@/routes/admin/manage/purchases';
|
||||||
import type { PurchaseCreateData } from './columns';
|
import type { PurchaseCreateData, RawMaterialVariant } from './columns';
|
||||||
|
|
||||||
type VariantState = {
|
type VariantState = {
|
||||||
variant: string;
|
variant: string;
|
||||||
@ -73,7 +73,7 @@ type CartLine = {
|
|||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
suppliers: PurchaseCreateData['suppliers'];
|
suppliers: PurchaseCreateData['suppliers'];
|
||||||
rawMaterials: PurchaseCreateData['rawMaterials'];
|
rawMaterials: { id: number; name: string; unit: string }[];
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function PurchaseCreate({ suppliers, rawMaterials }: Props) {
|
export default function PurchaseCreate({ suppliers, rawMaterials }: Props) {
|
||||||
@ -129,6 +129,9 @@ export default function PurchaseCreate({ suppliers, rawMaterials }: Props) {
|
|||||||
const [selectedMaterialName, setSelectedMaterialName] = useState(
|
const [selectedMaterialName, setSelectedMaterialName] = useState(
|
||||||
draft?.selectedMaterialName ?? '',
|
draft?.selectedMaterialName ?? '',
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const [fetchedVariants, setFetchedVariants] = useState<Map<number, RawMaterialVariant[]>>(new Map());
|
||||||
|
const [loadingVariants, setLoadingVariants] = useState(false);
|
||||||
const [quantities, setQuantities] = useState<Record<number, number>>(() =>
|
const [quantities, setQuantities] = useState<Record<number, number>>(() =>
|
||||||
Object.fromEntries(
|
Object.fromEntries(
|
||||||
Object.entries(draft?.quantities ?? {}).map(([id, qty]) => [
|
Object.entries(draft?.quantities ?? {}).map(([id, qty]) => [
|
||||||
@ -185,28 +188,29 @@ export default function PurchaseCreate({ suppliers, rawMaterials }: Props) {
|
|||||||
const variantsRef = useRef(variants);
|
const variantsRef = useRef(variants);
|
||||||
variantsRef.current = variants;
|
variantsRef.current = variants;
|
||||||
|
|
||||||
const priceMap = useMemo(
|
const priceMap = useMemo(() => {
|
||||||
() =>
|
const map = new Map<number, RawMaterialVariant & { materialName: string; materialUnit: string }>();
|
||||||
new Map(
|
for (const [materialId, variants] of fetchedVariants) {
|
||||||
rawMaterials.flatMap((m) =>
|
const material = rawMaterials.find((m) => m.id === materialId);
|
||||||
m.raw_material_prices.map((p) => [p.id, p]),
|
if (!material) continue;
|
||||||
),
|
for (const p of variants) {
|
||||||
),
|
map.set(p.id, { ...p, materialName: material.name, materialUnit: material.unit });
|
||||||
[rawMaterials],
|
}
|
||||||
);
|
}
|
||||||
|
return map;
|
||||||
|
}, [fetchedVariants, rawMaterials]);
|
||||||
|
|
||||||
const materialByPriceId = useMemo(
|
const materialByPriceId = useMemo(() => {
|
||||||
() =>
|
const map = new Map<number, { name: string; unit: string }>();
|
||||||
new Map(
|
for (const [materialId, variants] of fetchedVariants) {
|
||||||
rawMaterials.flatMap((m) =>
|
const material = rawMaterials.find((m) => m.id === materialId);
|
||||||
m.raw_material_prices.map((p) => [
|
if (!material) continue;
|
||||||
p.id,
|
for (const p of variants) {
|
||||||
{ name: m.name, unit: m.unit },
|
map.set(p.id, { name: material.name, unit: material.unit });
|
||||||
]),
|
}
|
||||||
),
|
}
|
||||||
),
|
return map;
|
||||||
[rawMaterials],
|
}, [fetchedVariants, rawMaterials]);
|
||||||
);
|
|
||||||
|
|
||||||
const newSubtotal = variants.reduce(
|
const newSubtotal = variants.reduce(
|
||||||
(sum, v) => sum + Number(v.price) * Number(v.stock),
|
(sum, v) => sum + Number(v.price) * Number(v.stock),
|
||||||
@ -312,6 +316,31 @@ export default function PurchaseCreate({ suppliers, rawMaterials }: Props) {
|
|||||||
[rawMaterials, selectedMaterialName],
|
[rawMaterials, selectedMaterialName],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const selectedMaterialVariants = useMemo(
|
||||||
|
() => (selectedMaterial ? fetchedVariants.get(selectedMaterial.id) ?? [] : []),
|
||||||
|
[selectedMaterial, fetchedVariants],
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!selectedMaterial || mode !== 'existing') return;
|
||||||
|
if (fetchedVariants.has(selectedMaterial.id)) return;
|
||||||
|
|
||||||
|
setLoadingVariants(true);
|
||||||
|
fetch(`/admin/master/raw-materials/${selectedMaterial.id}/variants`)
|
||||||
|
.then((res) => res.json())
|
||||||
|
.then((data) => {
|
||||||
|
setFetchedVariants((prev) => {
|
||||||
|
const next = new Map(prev);
|
||||||
|
next.set(selectedMaterial.id, data.variants);
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
toast.error('Gagal memuat varian bahan baku.');
|
||||||
|
})
|
||||||
|
.finally(() => setLoadingVariants(false));
|
||||||
|
}, [selectedMaterial, mode, fetchedVariants]);
|
||||||
|
|
||||||
const updateQuantity = useCallback((priceId: number, value: number) => {
|
const updateQuantity = useCallback((priceId: number, value: number) => {
|
||||||
setQuantities((prev) => ({
|
setQuantities((prev) => ({
|
||||||
...prev,
|
...prev,
|
||||||
@ -858,7 +887,15 @@ export default function PurchaseCreate({ suppliers, rawMaterials }: Props) {
|
|||||||
|
|
||||||
{selectedMaterial && (
|
{selectedMaterial && (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{selectedMaterial.raw_material_prices.map(
|
{loadingVariants ? (
|
||||||
|
<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
|
||||||
|
Memuat varian...
|
||||||
|
</div>
|
||||||
|
) : selectedMaterialVariants.length === 0 ? (
|
||||||
|
<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
|
||||||
|
Tidak ada varian ditemukan.
|
||||||
|
</div>
|
||||||
|
) : selectedMaterialVariants.map(
|
||||||
(price) => (
|
(price) => (
|
||||||
<div
|
<div
|
||||||
key={
|
key={
|
||||||
|
|||||||
@ -8,7 +8,7 @@ import {
|
|||||||
ShoppingCart,
|
ShoppingCart,
|
||||||
Trash2,
|
Trash2,
|
||||||
} from 'lucide-react';
|
} from 'lucide-react';
|
||||||
import { useCallback, useMemo, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useState } from 'react';
|
||||||
import { toast } from 'sonner';
|
import { toast } from 'sonner';
|
||||||
import { ConfirmDialog } from '@/components/dialogs';
|
import { ConfirmDialog } from '@/components/dialogs';
|
||||||
import { FileUploadMultiple } from '@/components/inputs';
|
import { FileUploadMultiple } from '@/components/inputs';
|
||||||
@ -36,12 +36,13 @@ import {
|
|||||||
} from '@/components/ui/sheet';
|
} from '@/components/ui/sheet';
|
||||||
import { Textarea } from '@/components/ui/textarea';
|
import { Textarea } from '@/components/ui/textarea';
|
||||||
import { formatNumber } from '@/lib/format';
|
import { formatNumber } from '@/lib/format';
|
||||||
|
import { getTemporaryUrl } from '@/lib/upload';
|
||||||
import { formatCurrency } from '@/lib/utils';
|
import { formatCurrency } from '@/lib/utils';
|
||||||
import {
|
import {
|
||||||
index as purchaseIndex,
|
index as purchaseIndex,
|
||||||
update,
|
update,
|
||||||
} from '@/routes/admin/manage/purchases';
|
} from '@/routes/admin/manage/purchases';
|
||||||
import type { PurchaseCreateData, PurchaseForEdit } from './columns';
|
import type { PurchaseCreateData, PurchaseForEdit, RawMaterialVariant } from './columns';
|
||||||
|
|
||||||
type CartLine = {
|
type CartLine = {
|
||||||
key: string;
|
key: string;
|
||||||
@ -58,7 +59,7 @@ type CartLine = {
|
|||||||
type Props = {
|
type Props = {
|
||||||
purchase: PurchaseForEdit;
|
purchase: PurchaseForEdit;
|
||||||
suppliers: PurchaseCreateData['suppliers'];
|
suppliers: PurchaseCreateData['suppliers'];
|
||||||
rawMaterials: PurchaseCreateData['rawMaterials'];
|
rawMaterials: { id: number; name: string; unit: string }[];
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function PurchaseEdit({
|
export default function PurchaseEdit({
|
||||||
@ -96,28 +97,62 @@ export default function PurchaseEdit({
|
|||||||
const [previewKey, setPreviewKey] = useState<string | null>(null);
|
const [previewKey, setPreviewKey] = useState<string | null>(null);
|
||||||
const [cartRemoveKey, setCartRemoveKey] = useState<string | null>(null);
|
const [cartRemoveKey, setCartRemoveKey] = useState<string | null>(null);
|
||||||
|
|
||||||
const priceMap = useMemo(
|
const [fetchedVariants, setFetchedVariants] = useState<Map<number, RawMaterialVariant[]>>(new Map());
|
||||||
() =>
|
const [loadingVariants, setLoadingVariants] = useState(false);
|
||||||
new Map(
|
|
||||||
rawMaterials.flatMap((m) =>
|
|
||||||
m.raw_material_prices.map((p) => [p.id, p]),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
[rawMaterials],
|
|
||||||
);
|
|
||||||
|
|
||||||
const materialByPriceId = useMemo(
|
useEffect(() => {
|
||||||
() =>
|
const materialIds = purchase.existing_material_ids ?? [];
|
||||||
new Map(
|
if (materialIds.length === 0) return;
|
||||||
rawMaterials.flatMap((m) =>
|
|
||||||
m.raw_material_prices.map((p) => [
|
const toFetch = materialIds.filter((id) => !fetchedVariants.has(id));
|
||||||
p.id,
|
if (toFetch.length === 0) return;
|
||||||
{ name: m.name, unit: m.unit },
|
|
||||||
]),
|
setLoadingVariants(true);
|
||||||
|
Promise.all(
|
||||||
|
toFetch.map((id) =>
|
||||||
|
fetch(`/admin/master/raw-materials/${id}/variants`)
|
||||||
|
.then((res) => res.json())
|
||||||
|
.then((data) => [id, data.variants] as const)
|
||||||
),
|
),
|
||||||
),
|
)
|
||||||
[rawMaterials],
|
.then((results) => {
|
||||||
);
|
setFetchedVariants((prev) => {
|
||||||
|
const next = new Map(prev);
|
||||||
|
for (const [id, variants] of results) {
|
||||||
|
next.set(id, variants);
|
||||||
|
}
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
toast.error('Gagal memuat varian bahan baku.');
|
||||||
|
})
|
||||||
|
.finally(() => setLoadingVariants(false));
|
||||||
|
}, [purchase.existing_material_ids]);
|
||||||
|
|
||||||
|
const priceMap = useMemo(() => {
|
||||||
|
const map = new Map<number, RawMaterialVariant & { materialName: string; materialUnit: string }>();
|
||||||
|
for (const [materialId, variants] of fetchedVariants) {
|
||||||
|
const material = rawMaterials.find((m) => m.id === materialId);
|
||||||
|
if (!material) continue;
|
||||||
|
for (const p of variants) {
|
||||||
|
map.set(p.id, { ...p, materialName: material.name, materialUnit: material.unit });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
}, [fetchedVariants, rawMaterials]);
|
||||||
|
|
||||||
|
const materialByPriceId = useMemo(() => {
|
||||||
|
const map = new Map<number, { name: string; unit: string }>();
|
||||||
|
for (const [materialId, variants] of fetchedVariants) {
|
||||||
|
const material = rawMaterials.find((m) => m.id === materialId);
|
||||||
|
if (!material) continue;
|
||||||
|
for (const p of variants) {
|
||||||
|
map.set(p.id, { name: material.name, unit: material.unit });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
}, [fetchedVariants, rawMaterials]);
|
||||||
|
|
||||||
const subtotal = Object.entries(quantities).reduce(
|
const subtotal = Object.entries(quantities).reduce(
|
||||||
(sum, [priceId, quantity]) => {
|
(sum, [priceId, quantity]) => {
|
||||||
|
|||||||
@ -45,6 +45,7 @@ export type RestockForEdit = {
|
|||||||
notes: string | null;
|
notes: string | null;
|
||||||
photo_key: string | null;
|
photo_key: string | null;
|
||||||
photo_url: string | null;
|
photo_url: string | null;
|
||||||
|
existing_product_ids: number[];
|
||||||
items: {
|
items: {
|
||||||
id: number;
|
id: number;
|
||||||
product_variant_id: number;
|
product_variant_id: number;
|
||||||
@ -53,11 +54,7 @@ export type RestockForEdit = {
|
|||||||
}[];
|
}[];
|
||||||
};
|
};
|
||||||
|
|
||||||
export type ProductForRestock = {
|
export type ProductVariantForRestock = {
|
||||||
id: number;
|
|
||||||
name: string;
|
|
||||||
status: string;
|
|
||||||
product_variants: {
|
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
stock: number;
|
stock: number;
|
||||||
@ -65,7 +62,11 @@ export type ProductForRestock = {
|
|||||||
photo_url: string | null;
|
photo_url: string | null;
|
||||||
capital_price: number;
|
capital_price: number;
|
||||||
reject_price: number;
|
reject_price: number;
|
||||||
}[];
|
};
|
||||||
|
|
||||||
|
export type ProductForRestock = {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type RestockCreateData = {
|
export type RestockCreateData = {
|
||||||
|
|||||||
@ -35,7 +35,7 @@ import { loadRestockDraft } from '@/lib/restock-draft';
|
|||||||
import { getTemporaryUrl } from '@/lib/upload';
|
import { getTemporaryUrl } from '@/lib/upload';
|
||||||
import { formatCurrency } from '@/lib/utils';
|
import { formatCurrency } from '@/lib/utils';
|
||||||
import { index as restockIndex, store } from '@/routes/admin/manage/restocks';
|
import { index as restockIndex, store } from '@/routes/admin/manage/restocks';
|
||||||
import type { ProductForRestock, RestockCreateData } from './columns';
|
import type { ProductForRestock, ProductVariantForRestock, RestockCreateData } from './columns';
|
||||||
|
|
||||||
type CartLine = {
|
type CartLine = {
|
||||||
key: string;
|
key: string;
|
||||||
@ -82,6 +82,8 @@ export default function RestockCreate({ products }: Props) {
|
|||||||
const [cartOpen, setCartOpen] = useState(false);
|
const [cartOpen, setCartOpen] = useState(false);
|
||||||
const [previewKey, setPreviewKey] = useState<string | null>(null);
|
const [previewKey, setPreviewKey] = useState<string | null>(null);
|
||||||
const [cartRemoveKey, setCartRemoveKey] = useState<string | null>(null);
|
const [cartRemoveKey, setCartRemoveKey] = useState<string | null>(null);
|
||||||
|
const [fetchedVariants, setFetchedVariants] = useState<Map<number, ProductVariantForRestock[]>>(new Map());
|
||||||
|
const [loadingVariants, setLoadingVariants] = useState(false);
|
||||||
|
|
||||||
const draftData = useMemo(
|
const draftData = useMemo(
|
||||||
() => ({
|
() => ({
|
||||||
@ -112,16 +114,54 @@ export default function RestockCreate({ products }: Props) {
|
|||||||
[products, selectedProductId],
|
[products, selectedProductId],
|
||||||
);
|
);
|
||||||
|
|
||||||
const variantById = useMemo(
|
const selectedProductVariants = useMemo(
|
||||||
() =>
|
() => (selectedProduct ? fetchedVariants.get(selectedProduct.id) ?? [] : []),
|
||||||
new Map(
|
[selectedProduct, fetchedVariants],
|
||||||
products.flatMap((p: ProductForRestock) =>
|
|
||||||
p.product_variants.map((v) => [v.id, v]),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
[products],
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!selectedProduct) return;
|
||||||
|
if (fetchedVariants.has(selectedProduct.id)) return;
|
||||||
|
|
||||||
|
setLoadingVariants(true);
|
||||||
|
fetch(`/admin/master/products/${selectedProduct.id}/variants`)
|
||||||
|
.then((res) => res.json())
|
||||||
|
.then((data) => {
|
||||||
|
setFetchedVariants((prev) => {
|
||||||
|
const next = new Map(prev);
|
||||||
|
next.set(selectedProduct.id, data.variants);
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
toast.error('Gagal memuat varian produk.');
|
||||||
|
})
|
||||||
|
.finally(() => setLoadingVariants(false));
|
||||||
|
}, [selectedProduct, fetchedVariants]);
|
||||||
|
|
||||||
|
const variantById = useMemo(() => {
|
||||||
|
const map = new Map<number, ProductVariantForRestock>();
|
||||||
|
for (const [, variants] of fetchedVariants) {
|
||||||
|
for (const v of variants) {
|
||||||
|
map.set(v.id, v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
}, [fetchedVariants]);
|
||||||
|
|
||||||
|
const productByVariantId = useMemo(() => {
|
||||||
|
const map = new Map<number, string>();
|
||||||
|
for (const [productId, variants] of fetchedVariants) {
|
||||||
|
const product = products.find((p) => p.id === productId);
|
||||||
|
if (product) {
|
||||||
|
for (const v of variants) {
|
||||||
|
map.set(v.id, product.name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
}, [fetchedVariants, products]);
|
||||||
|
|
||||||
const getUnitPrice = useCallback(
|
const getUnitPrice = useCallback(
|
||||||
(variantId: number) => {
|
(variantId: number) => {
|
||||||
const variant = variantById.get(variantId);
|
const variant = variantById.get(variantId);
|
||||||
@ -294,7 +334,16 @@ return 0;
|
|||||||
|
|
||||||
{selectedProduct && (
|
{selectedProduct && (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{selectedProduct.product_variants.map(
|
{loadingVariants ? (
|
||||||
|
<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
|
||||||
|
Memuat varian...
|
||||||
|
</div>
|
||||||
|
) : selectedProductVariants.length === 0 ? (
|
||||||
|
<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
|
||||||
|
Tidak ada varian ditemukan.
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
selectedProductVariants.map(
|
||||||
(variant) => {
|
(variant) => {
|
||||||
const currentStock =
|
const currentStock =
|
||||||
stockType === 'good'
|
stockType === 'good'
|
||||||
@ -410,7 +459,7 @@ return 0;
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
)}
|
))}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</CardContent>
|
</CardContent>
|
||||||
|
|||||||
@ -25,7 +25,7 @@ import { formatNumber } from '@/lib/format';
|
|||||||
import { getTemporaryUrl } from '@/lib/upload';
|
import { getTemporaryUrl } from '@/lib/upload';
|
||||||
import { formatCurrency } from '@/lib/utils';
|
import { formatCurrency } from '@/lib/utils';
|
||||||
import { index as restockIndex, update } from '@/routes/admin/manage/restocks';
|
import { index as restockIndex, update } from '@/routes/admin/manage/restocks';
|
||||||
import type { RestockCreateData, RestockForEdit } from './columns';
|
import type { RestockCreateData, RestockForEdit, ProductVariantForRestock } from './columns';
|
||||||
|
|
||||||
type CartLine = {
|
type CartLine = {
|
||||||
key: string;
|
key: string;
|
||||||
@ -49,16 +49,13 @@ export default function RestockEdit({ restock, products }: Props) {
|
|||||||
const [stockType, setStockType] = useState<'good' | 'reject'>(
|
const [stockType, setStockType] = useState<'good' | 'reject'>(
|
||||||
restock.stock_type === 'reject' ? 'reject' : 'good',
|
restock.stock_type === 'reject' ? 'reject' : 'good',
|
||||||
);
|
);
|
||||||
const selectedProductId = useMemo(() => {
|
const [selectedProductId, setSelectedProductId] = useState(() => {
|
||||||
const items = restock.items ?? [];
|
const items = restock.items ?? [];
|
||||||
const product = products.find((p) =>
|
const product = products.find((p) =>
|
||||||
p.product_variants.some((v) =>
|
restock.existing_product_ids?.includes(p.id),
|
||||||
items.some((i) => i.product_variant_id === v.id),
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
return product ? String(product.id) : '';
|
return product ? String(product.id) : '';
|
||||||
}, [products, restock.items]);
|
});
|
||||||
const [quantities, setQuantities] = useState<Record<number, number>>(() =>
|
const [quantities, setQuantities] = useState<Record<number, number>>(() =>
|
||||||
Object.fromEntries(
|
Object.fromEntries(
|
||||||
(restock.items ?? []).map((item) => [
|
(restock.items ?? []).map((item) => [
|
||||||
@ -74,6 +71,8 @@ export default function RestockEdit({ restock, products }: Props) {
|
|||||||
const [cartOpen, setCartOpen] = useState(false);
|
const [cartOpen, setCartOpen] = useState(false);
|
||||||
const [previewKey, setPreviewKey] = useState<string | null>(null);
|
const [previewKey, setPreviewKey] = useState<string | null>(null);
|
||||||
const [cartRemoveKey, setCartRemoveKey] = useState<string | null>(null);
|
const [cartRemoveKey, setCartRemoveKey] = useState<string | null>(null);
|
||||||
|
const [fetchedVariants, setFetchedVariants] = useState<Map<number, ProductVariantForRestock[]>>(() => new Map());
|
||||||
|
const [loadingVariants, setLoadingVariants] = useState(false);
|
||||||
|
|
||||||
const quantitiesRef = useRef(quantities);
|
const quantitiesRef = useRef(quantities);
|
||||||
|
|
||||||
@ -86,25 +85,84 @@ export default function RestockEdit({ restock, products }: Props) {
|
|||||||
[products, selectedProductId],
|
[products, selectedProductId],
|
||||||
);
|
);
|
||||||
|
|
||||||
const variantById = useMemo(
|
const selectedProductVariants = useMemo(
|
||||||
() =>
|
() => (selectedProduct ? fetchedVariants.get(selectedProduct.id) ?? [] : []),
|
||||||
new Map(
|
[selectedProduct, fetchedVariants],
|
||||||
products.flatMap((p) =>
|
|
||||||
p.product_variants.map((v) => [v.id, v]),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
[products],
|
|
||||||
);
|
);
|
||||||
|
|
||||||
const productByVariantId = useMemo(
|
useEffect(() => {
|
||||||
() =>
|
if (!selectedProduct) return;
|
||||||
new Map(
|
if (fetchedVariants.has(selectedProduct.id)) return;
|
||||||
products.flatMap((p) =>
|
|
||||||
p.product_variants.map((v) => [v.id, p.name]),
|
setLoadingVariants(true);
|
||||||
),
|
fetch(`/admin/master/products/${selectedProduct.id}/variants`)
|
||||||
),
|
.then((res) => res.json())
|
||||||
[products],
|
.then((data) => {
|
||||||
|
setFetchedVariants((prev) => {
|
||||||
|
const next = new Map(prev);
|
||||||
|
next.set(selectedProduct.id, data.variants);
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
toast.error('Gagal memuat varian produk.');
|
||||||
|
})
|
||||||
|
.finally(() => setLoadingVariants(false));
|
||||||
|
}, [selectedProduct, fetchedVariants]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!restock.existing_product_ids?.length) return;
|
||||||
|
|
||||||
|
const toFetch = restock.existing_product_ids.filter(
|
||||||
|
(id) => !fetchedVariants.has(id),
|
||||||
);
|
);
|
||||||
|
if (toFetch.length === 0) return;
|
||||||
|
|
||||||
|
setLoadingVariants(true);
|
||||||
|
Promise.all(
|
||||||
|
toFetch.map((id) =>
|
||||||
|
fetch(`/admin/master/products/${id}/variants`)
|
||||||
|
.then((res) => res.json())
|
||||||
|
.then((data) => ({ id, variants: data.variants })),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.then((results) => {
|
||||||
|
setFetchedVariants((prev) => {
|
||||||
|
const next = new Map(prev);
|
||||||
|
for (const { id, variants } of results) {
|
||||||
|
next.set(id, variants);
|
||||||
|
}
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
toast.error('Gagal memuat varian produk.');
|
||||||
|
})
|
||||||
|
.finally(() => setLoadingVariants(false));
|
||||||
|
}, [restock.existing_product_ids]);
|
||||||
|
|
||||||
|
const variantById = useMemo(() => {
|
||||||
|
const map = new Map<number, ProductVariantForRestock>();
|
||||||
|
for (const [, variants] of fetchedVariants) {
|
||||||
|
for (const v of variants) {
|
||||||
|
map.set(v.id, v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
}, [fetchedVariants]);
|
||||||
|
|
||||||
|
const productByVariantId = useMemo(() => {
|
||||||
|
const map = new Map<number, string>();
|
||||||
|
for (const [productId, variants] of fetchedVariants) {
|
||||||
|
const product = products.find((p) => p.id === productId);
|
||||||
|
if (product) {
|
||||||
|
for (const v of variants) {
|
||||||
|
map.set(v.id, product.name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
}, [fetchedVariants, products]);
|
||||||
|
|
||||||
const getUnitPrice = useCallback(
|
const getUnitPrice = useCallback(
|
||||||
(variantId: number) => {
|
(variantId: number) => {
|
||||||
@ -232,7 +290,16 @@ return 0;
|
|||||||
<CardContent className="space-y-4">
|
<CardContent className="space-y-4">
|
||||||
{selectedProduct ? (
|
{selectedProduct ? (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{selectedProduct.product_variants.map(
|
{loadingVariants ? (
|
||||||
|
<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
|
||||||
|
Memuat varian...
|
||||||
|
</div>
|
||||||
|
) : selectedProductVariants.length === 0 ? (
|
||||||
|
<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
|
||||||
|
Tidak ada varian ditemukan.
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
selectedProductVariants.map(
|
||||||
(variant) => {
|
(variant) => {
|
||||||
const currentStock =
|
const currentStock =
|
||||||
stockType === 'good'
|
stockType === 'good'
|
||||||
@ -348,6 +415,7 @@ return 0;
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
)
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
|
|||||||
@ -98,21 +98,24 @@ export type TransactionForEdit = {
|
|||||||
quantity: number;
|
quantity: number;
|
||||||
unit_price: number;
|
unit_price: number;
|
||||||
}[];
|
}[];
|
||||||
|
existing_product_ids: number[];
|
||||||
};
|
};
|
||||||
|
|
||||||
export type ProductForTransaction = {
|
export type ProductForTransaction = {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
status: string;
|
};
|
||||||
product_variants: {
|
|
||||||
|
export type ProductVariantForTransaction = {
|
||||||
id: number;
|
id: number;
|
||||||
|
product_id: number;
|
||||||
name: string;
|
name: string;
|
||||||
stock: number;
|
stock: number;
|
||||||
reject_stock: number;
|
reject_stock: number;
|
||||||
retail_stock: number;
|
retail_stock: number;
|
||||||
photo_url: string | null;
|
photo_url: string | null;
|
||||||
|
photo_conversion_url: string | null;
|
||||||
prices: Record<string, number>;
|
prices: Record<string, number>;
|
||||||
}[];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export type CustomerForTransaction = {
|
export type CustomerForTransaction = {
|
||||||
|
|||||||
@ -47,7 +47,7 @@ import { loadTransactionDraft } from '@/lib/transaction-draft';
|
|||||||
import { getTemporaryUrl } from '@/lib/upload';
|
import { getTemporaryUrl } from '@/lib/upload';
|
||||||
import { formatCurrency } from '@/lib/utils';
|
import { formatCurrency } from '@/lib/utils';
|
||||||
import { store, index as transactionIndex } from '@/routes/admin/manage/transactions';
|
import { store, index as transactionIndex } from '@/routes/admin/manage/transactions';
|
||||||
import type { ProductForTransaction, TransactionCreateData } from './columns';
|
import type { ProductForTransaction, ProductVariantForTransaction, TransactionCreateData } from './columns';
|
||||||
|
|
||||||
type CartLine = {
|
type CartLine = {
|
||||||
key: string;
|
key: string;
|
||||||
@ -119,6 +119,8 @@ export default function TransactionCreate({
|
|||||||
const [tiktokOrderId, setTiktokOrderId] = useState(draft?.tiktokOrderId ?? '');
|
const [tiktokOrderId, setTiktokOrderId] = useState(draft?.tiktokOrderId ?? '');
|
||||||
const [shopeeOrderId, setShopeeOrderId] = useState(draft?.shopeeOrderId ?? '');
|
const [shopeeOrderId, setShopeeOrderId] = useState(draft?.shopeeOrderId ?? '');
|
||||||
const [variantSearch, setVariantSearch] = useState('');
|
const [variantSearch, setVariantSearch] = useState('');
|
||||||
|
const [fetchedVariants, setFetchedVariants] = useState<Map<number, ProductVariantForTransaction[]>>(new Map());
|
||||||
|
const [loadingVariants, setLoadingVariants] = useState(false);
|
||||||
|
|
||||||
const quantitiesRef = useRef(quantities);
|
const quantitiesRef = useRef(quantities);
|
||||||
|
|
||||||
@ -164,38 +166,64 @@ export default function TransactionCreate({
|
|||||||
[products, selectedProductId],
|
[products, selectedProductId],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const selectedProductVariants = useMemo(
|
||||||
|
() => (selectedProduct ? fetchedVariants.get(selectedProduct.id) ?? [] : []),
|
||||||
|
[selectedProduct, fetchedVariants],
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!selectedProduct) return;
|
||||||
|
if (fetchedVariants.has(selectedProduct.id)) return;
|
||||||
|
|
||||||
|
setLoadingVariants(true);
|
||||||
|
fetch(`/admin/master/products/${selectedProduct.id}/variants`)
|
||||||
|
.then((res) => res.json())
|
||||||
|
.then((data) => {
|
||||||
|
setFetchedVariants((prev) => {
|
||||||
|
const next = new Map(prev);
|
||||||
|
next.set(selectedProduct.id, data.variants);
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
toast.error('Gagal memuat varian produk.');
|
||||||
|
})
|
||||||
|
.finally(() => setLoadingVariants(false));
|
||||||
|
}, [selectedProduct, fetchedVariants]);
|
||||||
|
|
||||||
const groupedVariants = useMemo(() => {
|
const groupedVariants = useMemo(() => {
|
||||||
if (!variantSearch) return [];
|
if (!variantSearch) return [];
|
||||||
|
if (!selectedProduct) return [];
|
||||||
const search = variantSearch.toLowerCase();
|
const search = variantSearch.toLowerCase();
|
||||||
return products
|
return [{
|
||||||
.map((p) => ({
|
...selectedProduct,
|
||||||
...p,
|
product_variants: selectedProductVariants.filter((v) =>
|
||||||
product_variants: p.product_variants.filter((v) =>
|
|
||||||
v.name.toLowerCase().includes(search),
|
v.name.toLowerCase().includes(search),
|
||||||
),
|
),
|
||||||
}))
|
}];
|
||||||
.filter((p) => p.product_variants.length > 0);
|
}, [selectedProduct, selectedProductVariants, variantSearch]);
|
||||||
}, [products, variantSearch]);
|
|
||||||
|
|
||||||
const variantById = useMemo(
|
const variantById = useMemo(() => {
|
||||||
() =>
|
const map = new Map<number, ProductVariantForTransaction>();
|
||||||
new Map(
|
for (const [, variants] of fetchedVariants) {
|
||||||
products.flatMap((p: ProductForTransaction) =>
|
for (const v of variants) {
|
||||||
p.product_variants.map((v) => [v.id, v]),
|
map.set(v.id, v);
|
||||||
),
|
}
|
||||||
),
|
}
|
||||||
[products],
|
return map;
|
||||||
);
|
}, [fetchedVariants]);
|
||||||
|
|
||||||
const productByVariantId = useMemo(
|
const productByVariantId = useMemo(() => {
|
||||||
() =>
|
const map = new Map<number, string>();
|
||||||
new Map(
|
for (const [productId, variants] of fetchedVariants) {
|
||||||
products.flatMap((p: ProductForTransaction) =>
|
const product = products.find((p) => p.id === productId);
|
||||||
p.product_variants.map((v) => [v.id, p.name]),
|
if (!product) continue;
|
||||||
),
|
for (const v of variants) {
|
||||||
),
|
map.set(v.id, product.name);
|
||||||
[products],
|
}
|
||||||
);
|
}
|
||||||
|
return map;
|
||||||
|
}, [fetchedVariants, products]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (channel === 'tiktok') {
|
if (channel === 'tiktok') {
|
||||||
@ -508,7 +536,16 @@ export default function TransactionCreate({
|
|||||||
|
|
||||||
{!variantSearch && selectedProduct && (
|
{!variantSearch && selectedProduct && (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{selectedProduct.product_variants.map(
|
{loadingVariants ? (
|
||||||
|
<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
|
||||||
|
Memuat varian...
|
||||||
|
</div>
|
||||||
|
) : selectedProductVariants.length === 0 ? (
|
||||||
|
<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
|
||||||
|
Tidak ada varian ditemukan.
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
selectedProductVariants.map(
|
||||||
(variant) => {
|
(variant) => {
|
||||||
const currentStock =
|
const currentStock =
|
||||||
stockType === 'reject'
|
stockType === 'reject'
|
||||||
@ -528,10 +565,10 @@ export default function TransactionCreate({
|
|||||||
}
|
}
|
||||||
>
|
>
|
||||||
<div className="flex min-w-0 items-center gap-3">
|
<div className="flex min-w-0 items-center gap-3">
|
||||||
{variant.photo_url ? (
|
{variant.photo_conversion_url ?? variant.photo_url ? (
|
||||||
<img
|
<img
|
||||||
src={
|
src={
|
||||||
variant.photo_url
|
variant.photo_conversion_url ?? variant.photo_url
|
||||||
}
|
}
|
||||||
alt={
|
alt={
|
||||||
variant.name
|
variant.name
|
||||||
@ -629,6 +666,7 @@ export default function TransactionCreate({
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
)
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@ -44,7 +44,7 @@ import { formatNumber } from '@/lib/format';
|
|||||||
import { getTemporaryUrl } from '@/lib/upload';
|
import { getTemporaryUrl } from '@/lib/upload';
|
||||||
import { formatCurrency } from '@/lib/utils';
|
import { formatCurrency } from '@/lib/utils';
|
||||||
import { index as transactionIndex, update } from '@/routes/admin/manage/transactions';
|
import { index as transactionIndex, update } from '@/routes/admin/manage/transactions';
|
||||||
import type { TransactionCreateData, TransactionForEdit } from './columns';
|
import type { ProductVariantForTransaction, TransactionCreateData, TransactionForEdit } from './columns';
|
||||||
|
|
||||||
type CartLine = {
|
type CartLine = {
|
||||||
key: string;
|
key: string;
|
||||||
@ -98,15 +98,11 @@ export default function TransactionEdit({
|
|||||||
const [photo, setPhoto] = useState<string | null>(transaction.photo_key);
|
const [photo, setPhoto] = useState<string | null>(transaction.photo_key);
|
||||||
const [photoUrl, setPhotoUrl] = useState<string | null>(transaction.photo_url);
|
const [photoUrl, setPhotoUrl] = useState<string | null>(transaction.photo_url);
|
||||||
const [uploading, setUploading] = useState(false);
|
const [uploading, setUploading] = useState(false);
|
||||||
|
const [fetchedVariants, setFetchedVariants] = useState<Map<number, ProductVariantForTransaction[]>>(new Map());
|
||||||
|
const [loadingVariants, setLoadingVariants] = useState(false);
|
||||||
const [selectedProductId, setSelectedProductId] = useState(() => {
|
const [selectedProductId, setSelectedProductId] = useState(() => {
|
||||||
const items = transaction.items ?? [];
|
const firstProductId = transaction.existing_product_ids?.[0];
|
||||||
const product = products.find((p) =>
|
return firstProductId ? String(firstProductId) : '';
|
||||||
p.product_variants.some((v) =>
|
|
||||||
items.some((i) => i.product_variant_id === v.id),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
return product ? String(product.id) : '';
|
|
||||||
});
|
});
|
||||||
const [quantities, setQuantities] = useState<Record<number, number>>(() =>
|
const [quantities, setQuantities] = useState<Record<number, number>>(() =>
|
||||||
Object.fromEntries(
|
Object.fromEntries(
|
||||||
@ -156,25 +152,77 @@ export default function TransactionEdit({
|
|||||||
[products, selectedProductId],
|
[products, selectedProductId],
|
||||||
);
|
);
|
||||||
|
|
||||||
const variantById = useMemo(
|
useEffect(() => {
|
||||||
() =>
|
const productIds = transaction.existing_product_ids ?? [];
|
||||||
new Map(
|
if (productIds.length === 0) return;
|
||||||
products.flatMap((p) =>
|
|
||||||
p.product_variants.map((v) => [v.id, v]),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
[products],
|
|
||||||
);
|
|
||||||
|
|
||||||
const productByVariantId = useMemo(
|
const toFetch = productIds.filter((id) => !fetchedVariants.has(id));
|
||||||
() =>
|
if (toFetch.length === 0) return;
|
||||||
new Map(
|
|
||||||
products.flatMap((p) =>
|
setLoadingVariants(true);
|
||||||
p.product_variants.map((v) => [v.id, p.name]),
|
Promise.all(
|
||||||
|
toFetch.map((id) =>
|
||||||
|
fetch(`/admin/master/products/${id}/variants`)
|
||||||
|
.then((res) => res.json())
|
||||||
|
.then((data) => [id, data.variants] as const)
|
||||||
),
|
),
|
||||||
),
|
)
|
||||||
[products],
|
.then((results) => {
|
||||||
);
|
setFetchedVariants((prev) => {
|
||||||
|
const next = new Map(prev);
|
||||||
|
for (const [id, variants] of results) {
|
||||||
|
next.set(id, variants);
|
||||||
|
}
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
toast.error('Gagal memuat varian produk.');
|
||||||
|
})
|
||||||
|
.finally(() => setLoadingVariants(false));
|
||||||
|
}, [transaction.existing_product_ids]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!selectedProduct) return;
|
||||||
|
if (fetchedVariants.has(selectedProduct.id)) return;
|
||||||
|
|
||||||
|
setLoadingVariants(true);
|
||||||
|
fetch(`/admin/master/products/${selectedProduct.id}/variants`)
|
||||||
|
.then((res) => res.json())
|
||||||
|
.then((data) => {
|
||||||
|
setFetchedVariants((prev) => {
|
||||||
|
const next = new Map(prev);
|
||||||
|
next.set(selectedProduct.id, data.variants);
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
toast.error('Gagal memuat varian produk.');
|
||||||
|
})
|
||||||
|
.finally(() => setLoadingVariants(false));
|
||||||
|
}, [selectedProduct, fetchedVariants]);
|
||||||
|
|
||||||
|
const variantById = useMemo(() => {
|
||||||
|
const map = new Map<number, ProductVariantForTransaction>();
|
||||||
|
for (const [, variants] of fetchedVariants) {
|
||||||
|
for (const v of variants) {
|
||||||
|
map.set(v.id, v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
}, [fetchedVariants]);
|
||||||
|
|
||||||
|
const productByVariantId = useMemo(() => {
|
||||||
|
const map = new Map<number, string>();
|
||||||
|
for (const [productId, variants] of fetchedVariants) {
|
||||||
|
const product = products.find((p) => p.id === productId);
|
||||||
|
if (!product) continue;
|
||||||
|
for (const v of variants) {
|
||||||
|
map.set(v.id, product.name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
}, [fetchedVariants, products]);
|
||||||
|
|
||||||
const showPhoto = paymentType === 'transfer' || paymentType === 'qris';
|
const showPhoto = paymentType === 'transfer' || paymentType === 'qris';
|
||||||
|
|
||||||
@ -397,7 +445,16 @@ export default function TransactionEdit({
|
|||||||
|
|
||||||
{selectedProduct && (
|
{selectedProduct && (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{selectedProduct.product_variants.map(
|
{loadingVariants ? (
|
||||||
|
<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
|
||||||
|
Memuat varian...
|
||||||
|
</div>
|
||||||
|
) : fetchedVariants.get(selectedProduct.id)?.length === 0 ? (
|
||||||
|
<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
|
||||||
|
Tidak ada varian ditemukan.
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
(fetchedVariants.get(selectedProduct.id) ?? []).map(
|
||||||
(variant) => {
|
(variant) => {
|
||||||
const currentStock =
|
const currentStock =
|
||||||
stockType === 'reject'
|
stockType === 'reject'
|
||||||
@ -518,6 +575,7 @@ export default function TransactionEdit({
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
)
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@ -44,6 +44,7 @@
|
|||||||
Route::resource('categories', CategoryController::class)->except(['show', 'create', 'edit'])->middleware('permission:categories.view|categories.create|categories.update|categories.delete');
|
Route::resource('categories', CategoryController::class)->except(['show', 'create', 'edit'])->middleware('permission:categories.view|categories.create|categories.update|categories.delete');
|
||||||
|
|
||||||
Route::resource('products', ProductController::class)->except(['show'])->middleware('permission:products.view|products.create|products.update|products.delete');
|
Route::resource('products', ProductController::class)->except(['show'])->middleware('permission:products.view|products.create|products.update|products.delete');
|
||||||
|
Route::get('products-active', [ProductController::class, 'activeProducts'])->name('products.active')->middleware('permission:products.view');
|
||||||
Route::post('products/{product}/toggle-status', [ProductController::class, 'toggleStatus'])->name('products.toggle-status')->middleware('permission:products.toggle_status');
|
Route::post('products/{product}/toggle-status', [ProductController::class, 'toggleStatus'])->name('products.toggle-status')->middleware('permission:products.toggle_status');
|
||||||
Route::post('products/{product}/toggle-featured', [ProductController::class, 'toggleFeatured'])->name('products.toggle-featured')->middleware('permission:products.toggle_featured');
|
Route::post('products/{product}/toggle-featured', [ProductController::class, 'toggleFeatured'])->name('products.toggle-featured')->middleware('permission:products.toggle_featured');
|
||||||
Route::post('products/{product}/approve', [ProductController::class, 'approve'])->name('products.approve')->middleware('permission:products.update');
|
Route::post('products/{product}/approve', [ProductController::class, 'approve'])->name('products.approve')->middleware('permission:products.update');
|
||||||
@ -57,6 +58,7 @@
|
|||||||
Route::get('products/{product}/variants/{variant}/stock-mutations', [StockMutationController::class, 'index'])->name('products.variants.stock-mutations')->middleware('permission:products.view_stock_mutations');
|
Route::get('products/{product}/variants/{variant}/stock-mutations', [StockMutationController::class, 'index'])->name('products.variants.stock-mutations')->middleware('permission:products.view_stock_mutations');
|
||||||
|
|
||||||
Route::resource('raw-materials', RawMaterialController::class)->except(['show'])->middleware('permission:raw_materials.view|raw_materials.create|raw_materials.update|raw_materials.delete');
|
Route::resource('raw-materials', RawMaterialController::class)->except(['show'])->middleware('permission:raw_materials.view|raw_materials.create|raw_materials.update|raw_materials.delete');
|
||||||
|
Route::get('raw-materials-active', [RawMaterialController::class, 'activeMaterials'])->name('raw-materials.active')->middleware('permission:raw_materials.view');
|
||||||
Route::post('raw-materials/{rawMaterial}/toggle-status', [RawMaterialController::class, 'toggleStatus'])->name('raw-materials.toggle-status')->middleware('permission:raw_materials.toggle_status');
|
Route::post('raw-materials/{rawMaterial}/toggle-status', [RawMaterialController::class, 'toggleStatus'])->name('raw-materials.toggle-status')->middleware('permission:raw_materials.toggle_status');
|
||||||
Route::get('raw-materials/{rawMaterial}/variants', [RawMaterialController::class, 'variants'])->name('raw-materials.variants')->middleware('permission:raw_materials.view');
|
Route::get('raw-materials/{rawMaterial}/variants', [RawMaterialController::class, 'variants'])->name('raw-materials.variants')->middleware('permission:raw_materials.view');
|
||||||
Route::get('raw-materials/{rawMaterial}/variants/{variant}/edit', [RawMaterialVariantController::class, 'edit'])->name('raw-materials.variants.edit')->middleware('permission:raw_materials.update');
|
Route::get('raw-materials/{rawMaterial}/variants/{variant}/edit', [RawMaterialVariantController::class, 'edit'])->name('raw-materials.variants.edit')->middleware('permission:raw_materials.update');
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user