Compare commits
2 Commits
0908576ef2
...
cd944403bd
| Author | SHA1 | Date | |
|---|---|---|---|
|
cd944403bd | ||
|
|
631330d3b4 |
@ -27,6 +27,7 @@ public function paginated(int $perPage = 25, string $search = '', string $sort =
|
||||
{
|
||||
$itemCountQuery = '(SELECT COUNT(*) FROM purchase_items WHERE purchase_items.purchase_id = purchases.id AND purchase_items.deleted_at IS NULL)';
|
||||
$totalQtyQuery = '(SELECT IFNULL(SUM(quantity), 0) FROM purchase_items WHERE purchase_items.purchase_id = purchases.id AND purchase_items.deleted_at IS NULL)';
|
||||
$materialsCountQuery = '(SELECT COUNT(DISTINCT raw_materials.id) FROM purchase_items JOIN raw_material_prices ON raw_material_prices.id = purchase_items.raw_material_price_id JOIN raw_materials ON raw_materials.id = raw_material_prices.raw_material_id WHERE purchase_items.purchase_id = purchases.id AND purchase_items.deleted_at IS NULL)';
|
||||
$materialNameQuery = '(SELECT raw_materials.name FROM purchase_items JOIN raw_material_prices ON raw_material_prices.id = purchase_items.raw_material_price_id JOIN raw_materials ON raw_materials.id = raw_material_prices.raw_material_id WHERE purchase_items.purchase_id = purchases.id AND purchase_items.deleted_at IS NULL LIMIT 1)';
|
||||
$unitQuery = '(SELECT raw_materials.unit FROM purchase_items JOIN raw_material_prices ON raw_material_prices.id = purchase_items.raw_material_price_id JOIN raw_materials ON raw_materials.id = raw_material_prices.raw_material_id WHERE purchase_items.purchase_id = purchases.id AND purchase_items.deleted_at IS NULL LIMIT 1)';
|
||||
|
||||
@ -39,6 +40,7 @@ public function paginated(int $perPage = 25, string $search = '', string $sort =
|
||||
])
|
||||
->selectRaw("{$itemCountQuery} as variants_count")
|
||||
->selectRaw("{$totalQtyQuery} as total_qty")
|
||||
->selectRaw("{$materialsCountQuery} as materials_count")
|
||||
->selectRaw("{$materialNameQuery} as material_name")
|
||||
->selectRaw("{$unitQuery} as unit")
|
||||
->when($highlight, fn ($q) => $q->where('id', $highlight))
|
||||
@ -152,6 +154,10 @@ public function getForEdit(Purchase $purchase): array
|
||||
fn ($media) => $this->s3Service->getTemporaryUrl($media->getPath())
|
||||
)->toArray();
|
||||
|
||||
$existingQuantities = $items->mapWithKeys(fn (PurchaseItem $item) => [
|
||||
(int) $item->raw_material_price_id => (int) $item->quantity,
|
||||
])->all();
|
||||
|
||||
return [
|
||||
'id' => $purchase->id,
|
||||
'name' => $rawMaterial?->name ?? '',
|
||||
@ -164,12 +170,8 @@ public function getForEdit(Purchase $purchase): array
|
||||
'photo_urls' => $purchasePhotoUrls,
|
||||
'variants' => $variants,
|
||||
'default_mode' => $singleMaterial && ! $sharedWithOther ? 'new' : 'existing',
|
||||
'existing_material_name' => $singleMaterial ? $materials->first()->name : null,
|
||||
'existing_quantities' => $singleMaterial
|
||||
? $items->mapWithKeys(fn (PurchaseItem $item) => [
|
||||
(int) $item->raw_material_price_id => (int) $item->quantity,
|
||||
])->all()
|
||||
: [],
|
||||
'existing_material_name' => $materials->first()->name ?? null,
|
||||
'existing_quantities' => $existingQuantities,
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
@ -20,6 +20,7 @@ export type Purchase = {
|
||||
photo_conversion_urls: string[];
|
||||
created_at: string;
|
||||
variants_count: number;
|
||||
materials_count: number;
|
||||
total_qty: number;
|
||||
material_name: string | null;
|
||||
unit: string | null;
|
||||
|
||||
@ -84,9 +84,6 @@ export default function PurchaseEdit({
|
||||
});
|
||||
const [uploading, setUploading] = useState(false);
|
||||
|
||||
const [selectedMaterialName, setSelectedMaterialName] = useState(
|
||||
purchase.existing_material_name ?? '',
|
||||
);
|
||||
const [quantities, setQuantities] = useState<Record<number, number>>(() =>
|
||||
Object.fromEntries(
|
||||
Object.entries(purchase.existing_quantities).map(([id, qty]) => [
|
||||
@ -132,10 +129,34 @@ export default function PurchaseEdit({
|
||||
);
|
||||
const total = subtotal - discount + shippingCost;
|
||||
|
||||
const selectedMaterial = useMemo(
|
||||
() => rawMaterials.find((m) => m.name === selectedMaterialName) ?? null,
|
||||
[rawMaterials, selectedMaterialName],
|
||||
);
|
||||
const purchasedVariantsByMaterial = useMemo(() => {
|
||||
const map = new Map<string, { name: string; unit: string; items: { id: number; variant: string; price: number; stock: number; photo_url: string | null; photo_conversion_url: string | null }[] }>();
|
||||
|
||||
for (const [priceId, quantity] of Object.entries(quantities)) {
|
||||
const id = Number(priceId);
|
||||
const price = priceMap.get(id);
|
||||
const material = materialByPriceId.get(id);
|
||||
|
||||
if (!price || !material) continue;
|
||||
|
||||
if (!map.has(material.name)) {
|
||||
map.set(material.name, { name: material.name, unit: material.unit, items: [] });
|
||||
}
|
||||
|
||||
map.get(material.name)!.items.push({
|
||||
id: price.id,
|
||||
variant: price.variant,
|
||||
price: price.price,
|
||||
stock: price.stock,
|
||||
photo_url: price.photo_url,
|
||||
photo_conversion_url: price.photo_conversion_url,
|
||||
});
|
||||
}
|
||||
|
||||
return map;
|
||||
}, [quantities, priceMap, materialByPriceId]);
|
||||
|
||||
const isMultiMaterial = purchasedVariantsByMaterial.size > 1;
|
||||
|
||||
const updateQuantity = useCallback((priceId: number, value: number) => {
|
||||
setQuantities((prev) => ({
|
||||
@ -241,182 +262,77 @@ export default function PurchaseEdit({
|
||||
</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-4">
|
||||
<div className="grid gap-2">
|
||||
<Label>
|
||||
Nama Bahan Baku{' '}
|
||||
<span className="text-destructive">
|
||||
*
|
||||
</span>
|
||||
</Label>
|
||||
<Combobox
|
||||
items={rawMaterials}
|
||||
itemToStringLabel={(
|
||||
m,
|
||||
) => m.name}
|
||||
value={selectedMaterial}
|
||||
onValueChange={(
|
||||
value,
|
||||
) =>
|
||||
setSelectedMaterialName(
|
||||
value?.name ??
|
||||
'',
|
||||
)
|
||||
}
|
||||
>
|
||||
<ComboboxInput
|
||||
placeholder="Cari bahan baku..."
|
||||
className="w-full"
|
||||
disabled
|
||||
/>
|
||||
<ComboboxContent>
|
||||
<ComboboxEmpty>
|
||||
Tidak ada bahan
|
||||
baku ditemukan.
|
||||
</ComboboxEmpty>
|
||||
<ComboboxList>
|
||||
{(m) => (
|
||||
<ComboboxItem
|
||||
key={
|
||||
m.id
|
||||
}
|
||||
value={
|
||||
m
|
||||
}
|
||||
>
|
||||
{m.name}{' '}
|
||||
(
|
||||
{m.unit}
|
||||
)
|
||||
</ComboboxItem>
|
||||
)}
|
||||
</ComboboxList>
|
||||
</ComboboxContent>
|
||||
</Combobox>
|
||||
<InputError
|
||||
message={
|
||||
errors.existing_items
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{selectedMaterial && (
|
||||
<div className="space-y-2">
|
||||
{selectedMaterial.raw_material_prices.map(
|
||||
(price) => (
|
||||
<div
|
||||
key={
|
||||
price.id
|
||||
}
|
||||
className={
|
||||
(quantities[
|
||||
price
|
||||
.id
|
||||
] ??
|
||||
0) >
|
||||
0
|
||||
? 'flex flex-wrap items-center justify-between gap-2 rounded-lg border border-primary p-3'
|
||||
: 'flex flex-wrap items-center justify-between gap-2 rounded-lg border p-3'
|
||||
}
|
||||
>
|
||||
<div className="flex min-w-0 items-center gap-3">
|
||||
{price.photo_conversion_url ?? price.photo_url ? (
|
||||
<img
|
||||
src={
|
||||
price.photo_conversion_url ?? price.photo_url
|
||||
}
|
||||
alt={
|
||||
price.variant
|
||||
}
|
||||
className="h-10 w-10 shrink-0 rounded-md object-cover"
|
||||
/>
|
||||
) : (
|
||||
<div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-md bg-muted text-xs text-muted-foreground">
|
||||
N/A
|
||||
</div>
|
||||
)}
|
||||
<div className="min-w-0">
|
||||
<p className="truncate font-medium">
|
||||
{
|
||||
price.variant
|
||||
}
|
||||
</p>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Stok:{' '}
|
||||
{formatQuantity(
|
||||
Number(
|
||||
price.stock,
|
||||
),
|
||||
)}{' '}
|
||||
{
|
||||
selectedMaterial.unit
|
||||
}{' '}
|
||||
·{' '}
|
||||
{formatCurrency(
|
||||
price.price,
|
||||
)}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex items-center gap-2">
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
size="icon"
|
||||
disabled={
|
||||
!(
|
||||
quantities[
|
||||
price
|
||||
.id
|
||||
] ??
|
||||
0
|
||||
)
|
||||
}
|
||||
onClick={() =>
|
||||
incrementQuantity(
|
||||
price.id,
|
||||
-1,
|
||||
)
|
||||
}
|
||||
>
|
||||
<Minus className="h-4 w-4" />
|
||||
</Button>
|
||||
<NumberInput
|
||||
className="w-24 text-center"
|
||||
value={
|
||||
quantities[
|
||||
price
|
||||
.id
|
||||
] ??
|
||||
0
|
||||
}
|
||||
onValueChange={(
|
||||
val,
|
||||
) =>
|
||||
updateQuantity(
|
||||
price.id,
|
||||
val,
|
||||
)
|
||||
}
|
||||
{Array.from(purchasedVariantsByMaterial.entries()).map(([materialName, group]) => (
|
||||
<div key={materialName} className="space-y-2">
|
||||
{isMultiMaterial && (
|
||||
<p className="text-sm font-medium text-muted-foreground">
|
||||
{group.name} ({group.unit})
|
||||
</p>
|
||||
)}
|
||||
{group.items.map((price) => (
|
||||
<div
|
||||
key={price.id}
|
||||
className="flex flex-wrap items-center justify-between gap-2 rounded-lg border border-primary p-3"
|
||||
>
|
||||
<div className="flex min-w-0 items-center gap-3">
|
||||
{price.photo_conversion_url ?? price.photo_url ? (
|
||||
<img
|
||||
src={price.photo_conversion_url ?? price.photo_url!}
|
||||
alt={price.variant}
|
||||
className="h-10 w-10 shrink-0 rounded-md object-cover"
|
||||
/>
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
size="icon"
|
||||
onClick={() =>
|
||||
incrementQuantity(
|
||||
price.id,
|
||||
1,
|
||||
)
|
||||
}
|
||||
>
|
||||
<Plus className="h-4 w-4" />
|
||||
</Button>
|
||||
) : (
|
||||
<div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-md bg-muted text-xs text-muted-foreground">
|
||||
N/A
|
||||
</div>
|
||||
)}
|
||||
<div className="min-w-0">
|
||||
<p className="truncate font-medium">
|
||||
{price.variant}
|
||||
</p>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Stok:{' '}
|
||||
{formatQuantity(Number(price.stock))}{' '}
|
||||
{group.unit} · {formatCurrency(price.price)}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
),
|
||||
)}
|
||||
<div className="flex items-center gap-2">
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
size="icon"
|
||||
disabled={
|
||||
(quantities[price.id] ?? 0) <= 0
|
||||
}
|
||||
onClick={() =>
|
||||
incrementQuantity(price.id, -1)
|
||||
}
|
||||
>
|
||||
<Minus className="h-4 w-4" />
|
||||
</Button>
|
||||
<NumberInput
|
||||
className="w-24 text-center"
|
||||
value={quantities[price.id] ?? 0}
|
||||
onValueChange={(val) =>
|
||||
updateQuantity(price.id, val)
|
||||
}
|
||||
/>
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
size="icon"
|
||||
onClick={() =>
|
||||
incrementQuantity(price.id, 1)
|
||||
}
|
||||
>
|
||||
<Plus className="h-4 w-4" />
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
))}
|
||||
</CardContent>
|
||||
</Card>
|
||||
</div>
|
||||
|
||||
@ -28,6 +28,7 @@ export function PurchaseCardRow({
|
||||
const { can } = useCan();
|
||||
const variantCount = purchase.variants_count ?? 0;
|
||||
const totalQty = purchase.total_qty ?? 0;
|
||||
const materialsCount = purchase.materials_count ?? 0;
|
||||
const rawMaterialName = purchase.material_name ?? '-';
|
||||
const unit = purchase.unit ?? '';
|
||||
|
||||
@ -58,7 +59,11 @@ export function PurchaseCardRow({
|
||||
</div>
|
||||
|
||||
<div className="mt-1 text-xs text-muted-foreground">
|
||||
{rawMaterialName}
|
||||
{materialsCount > 1 ? (
|
||||
<span>{materialsCount} bahan baku</span>
|
||||
) : (
|
||||
<span>{rawMaterialName}</span>
|
||||
)}
|
||||
{variantCount > 0 && (
|
||||
<span className="ml-1">
|
||||
({variantCount} varian)
|
||||
|
||||
@ -9,6 +9,7 @@ import {
|
||||
} from '@/components/ui/table';
|
||||
import { formatNumber } from '@/lib/format';
|
||||
import { formatCurrency } from '@/lib/utils';
|
||||
import { Fragment } from 'react';
|
||||
import type { Purchase, PurchaseItemDetail } from './columns';
|
||||
|
||||
export function PurchaseItemSubRow({
|
||||
@ -20,10 +21,31 @@ export function PurchaseItemSubRow({
|
||||
items: PurchaseItemDetail[];
|
||||
isLoading: boolean;
|
||||
}) {
|
||||
const unit = purchase.unit ?? '';
|
||||
const items = loadedItems ?? [];
|
||||
|
||||
const groupedByMaterial = items.reduce(
|
||||
(acc, item) => {
|
||||
const materialName = item.raw_material_price?.raw_material?.name ?? '-';
|
||||
const unit = item.raw_material_price?.raw_material?.unit ?? '';
|
||||
|
||||
if (!acc[materialName]) {
|
||||
acc[materialName] = { unit, items: [] };
|
||||
}
|
||||
|
||||
acc[materialName].items.push(item);
|
||||
|
||||
return acc;
|
||||
},
|
||||
{} as Record<string, { unit: string; items: PurchaseItemDetail[] }>,
|
||||
);
|
||||
|
||||
const materialEntries = Object.entries(groupedByMaterial);
|
||||
const isMultiMaterial = materialEntries.length > 1;
|
||||
|
||||
let counter = 0;
|
||||
|
||||
return (
|
||||
<div className="space-y-4 overflow-x-auto">
|
||||
<div className="overflow-x-auto rounded-md border">
|
||||
<Table>
|
||||
<TableHeader>
|
||||
<TableRow>
|
||||
@ -47,7 +69,7 @@ export function PurchaseItemSubRow({
|
||||
Memuat item...
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
) : loadedItems.length === 0 ? (
|
||||
) : items.length === 0 ? (
|
||||
<TableRow>
|
||||
<TableCell
|
||||
colSpan={6}
|
||||
@ -57,42 +79,81 @@ export function PurchaseItemSubRow({
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
) : (
|
||||
loadedItems.map((item, index) => (
|
||||
<TableRow key={item.id}>
|
||||
<TableCell className="text-center">
|
||||
{index + 1}
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
{item.raw_material_price?.photo_url ? (
|
||||
<ImagePreviewButton
|
||||
srcs={[
|
||||
item.raw_material_price.photo_conversion_url ?? item.raw_material_price.photo_url,
|
||||
]}
|
||||
modalSrc={item.raw_material_price.photo_url}
|
||||
title={
|
||||
item.raw_material_price.variant
|
||||
}
|
||||
/>
|
||||
) : (
|
||||
<div className="flex h-10 w-10 items-center justify-center rounded-md bg-muted text-xs text-muted-foreground">
|
||||
N/A
|
||||
</div>
|
||||
)}
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
{item.raw_material_price?.variant ?? '-'}
|
||||
</TableCell>
|
||||
<TableCell className="text-right">
|
||||
{formatCurrency(item.unit_price)}
|
||||
</TableCell>
|
||||
<TableCell className="text-center">
|
||||
{formatNumber(item.quantity)} {unit}
|
||||
</TableCell>
|
||||
<TableCell className="text-right font-medium">
|
||||
{formatCurrency(item.subtotal)}
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
))
|
||||
<>
|
||||
{materialEntries.map(([materialName, group]) => {
|
||||
const totalQty = group.items.reduce(
|
||||
(sum, item) => sum + item.quantity,
|
||||
0,
|
||||
);
|
||||
const totalSubtotal = group.items.reduce(
|
||||
(sum, item) => sum + item.subtotal,
|
||||
0,
|
||||
);
|
||||
|
||||
return (
|
||||
<Fragment key={materialName}>
|
||||
{isMultiMaterial && (
|
||||
<TableRow>
|
||||
<TableCell
|
||||
colSpan={4}
|
||||
className="text-center font-medium text-muted-foreground bg-muted/20"
|
||||
>
|
||||
{materialName}
|
||||
</TableCell>
|
||||
<TableCell className="text-center font-medium text-muted-foreground bg-muted/20">
|
||||
{formatNumber(totalQty)}{' '}
|
||||
{group.unit}
|
||||
</TableCell>
|
||||
<TableCell className="text-right font-medium text-muted-foreground bg-muted/20">
|
||||
{formatCurrency(totalSubtotal)}
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
)}
|
||||
{group.items.map((item) => {
|
||||
counter++;
|
||||
|
||||
return (
|
||||
<TableRow key={item.id}>
|
||||
<TableCell className="text-center">
|
||||
{counter}
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
{item.raw_material_price?.photo_url ? (
|
||||
<ImagePreviewButton
|
||||
srcs={[
|
||||
item.raw_material_price.photo_conversion_url ?? item.raw_material_price.photo_url,
|
||||
]}
|
||||
modalSrc={item.raw_material_price.photo_url}
|
||||
title={
|
||||
item.raw_material_price.variant
|
||||
}
|
||||
/>
|
||||
) : (
|
||||
<div className="flex h-10 w-10 items-center justify-center rounded-md bg-muted text-xs text-muted-foreground">
|
||||
N/A
|
||||
</div>
|
||||
)}
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
{item.raw_material_price?.variant ?? '-'}
|
||||
</TableCell>
|
||||
<TableCell className="text-right">
|
||||
{formatCurrency(item.unit_price)}
|
||||
</TableCell>
|
||||
<TableCell className="text-center">
|
||||
{formatNumber(item.quantity)}{' '}
|
||||
{group.unit}
|
||||
</TableCell>
|
||||
<TableCell className="text-right font-medium">
|
||||
{formatCurrency(item.subtotal)}
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
);
|
||||
})}
|
||||
</Fragment>
|
||||
);
|
||||
})}
|
||||
</>
|
||||
)}
|
||||
</TableBody>
|
||||
</Table>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user