dst/store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: rename 'hasil_cutting_diluar_sampel' to 'original_outside_sample' across models, requests, and UI components for consistency and clarity in cutting results management

Browse Source
This commit is contained in:
Yoga Pangestu 2026-06-29 08:36:24 +07:00
parent c3c25679be
commit b4e93fa329
20 changed files with 98 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/Admin/Manage/CuttingDraftResultRequest.php
View File

@ -26,7 +26,7 @@ public function rules(): array
],
'cutting_result' => ['required', 'integer', 'min:1'],
'sampel' => ['required', 'integer', 'min:0'],
'hasil_cutting_diluar_sampel' => ['required', 'integer', 'min:0'],
'original_outside_sample' => ['required', 'integer', 'min:0'],
];
}
}

4
app/Http/Requests/Admin/Manage/CuttingRequest.php
View File

@ -50,7 +50,7 @@ public function rules(): array
];
$rules['results.*.cutting_result'] = ['required', 'integer', 'min:1'];
$rules['results.*.sampel'] = ['required', 'integer', 'min:0'];
$rules['results.*.hasil_cutting_diluar_sampel'] = ['required', 'integer', 'min:0'];
$rules['results.*.original_outside_sample'] = ['required', 'integer', 'min:0'];
}
return $rules;
@ -70,7 +70,7 @@ public function attributes(): array
'results.*.product_variant_id' => 'Varian Produk',
'results.*.cutting_result' => 'Hasil',
'results.*.sampel' => 'Sampel',
'results.*.hasil_cutting_diluar_sampel' => 'Diluar Sampel',
'results.*.original_outside_sample' => 'Diluar Sampel',
'sewing_cost' => 'Jasa Jahit',
'other_cost' => 'Biaya Lainnya',
];

4
app/Http/Requests/Admin/Manage/CuttingStatusTransitionRequest.php
View File

@ -48,7 +48,7 @@ public function rules(): array
'results' => ['nullable', 'array'],
'results.*.product_variant_id' => ['required_with:results', 'integer', 'exists:product_variants,id'],
'results.*.sampel' => ['required_with:results', 'integer', 'min:0'],
'results.*.hasil_cutting_diluar_sampel' => ['required_with:results', 'integer', 'min:0'],
'results.*.original_outside_sample' => ['required_with:results', 'integer', 'min:0'],
'result_prices' => ['nullable', 'array'],
'result_prices.*.product_variant_id' => ['required_with:result_prices', 'integer', 'exists:product_variants,id'],
'result_prices.*.prices' => ['required_with:result_prices', 'array', 'min:1'],
@ -102,7 +102,7 @@ public function withValidator(Validator $validator): void
foreach ($this->input('results', []) as $index => $item) {
$variantId = $item['product_variant_id'] ?? 0;
$sampel = (int) ($item['sampel'] ?? 0);
$hasilCuttingDiluarSampel = (int) ($item['hasil_cutting_diluar_sampel'] ?? 0);
$hasilCuttingDiluarSampel = (int) ($item['original_outside_sample'] ?? 0);
$originalResult = $cuttingResults->get($variantId);
if ($originalResult === null) {

2
app/Models/CuttingResult.php
View File

@ -20,7 +20,7 @@ protected function casts(): array
{
return [
'cutting_result' => 'integer',
'hasil_cutting_diluar_sampel' => 'integer',
'original_outside_sample' => 'integer',
'sampel' => 'integer',
];
}

24
app/Services/Manage/CuttingService.php
View File

@ -286,7 +286,7 @@ public function syncDraftResult(array $validated, User $user): array
$cuttingResult = (int) $validated['cutting_result'];
$sampel = (int) $validated['sampel'];
$hasilCuttingDiluarSampel = (int) ($validated['hasil_cutting_diluar_sampel'] ?? 0);
$hasilCuttingDiluarSampel = (int) ($validated['original_outside_sample'] ?? 0);
if ($cuttingResult < 1) {
throw ValidationException::withMessages([
@ -302,7 +302,7 @@ public function syncDraftResult(array $validated, User $user): array
if ($hasilCuttingDiluarSampel < 0) {
throw ValidationException::withMessages([
'hasil_cutting_diluar_sampel' => 'Hasil cutting diluar sampel tidak boleh negatif.',
'original_outside_sample' => 'Hasil cutting diluar sampel tidak boleh negatif.',
]);
}
@ -321,7 +321,7 @@ public function syncDraftResult(array $validated, User $user): array
[
'cutting_result' => $cuttingResult,
'sampel' => $sampel,
'hasil_cutting_diluar_sampel' => $hasilCuttingDiluarSampel,
'original_outside_sample' => $hasilCuttingDiluarSampel,
],
);
@ -574,7 +574,7 @@ public function transitionStatus(
->where('product_variant_id', $item['product_variant_id'])
->update([
'sampel' => $item['sampel'],
'hasil_cutting_diluar_sampel' => $item['hasil_cutting_diluar_sampel'],
'original_outside_sample' => $item['original_outside_sample'],
]);
}
$cutting->load('results');
@ -678,7 +678,7 @@ private function buildResults(array $results): array
$cuttingResult = (int) $itemData['cutting_result'];
$sampel = (int) $itemData['sampel'];
$hasilCuttingDiluarSampel = (int) ($itemData['hasil_cutting_diluar_sampel'] ?? 0);
$hasilCuttingDiluarSampel = (int) ($itemData['original_outside_sample'] ?? 0);
if ($cuttingResult < 1) {
throw ValidationException::withMessages([
@ -694,7 +694,7 @@ private function buildResults(array $results): array
if ($hasilCuttingDiluarSampel < 0) {
throw ValidationException::withMessages([
"results.{$index}.hasil_cutting_diluar_sampel" => 'Hasil cutting diluar sampel tidak boleh negatif.',
"results.{$index}.original_outside_sample" => 'Hasil cutting diluar sampel tidak boleh negatif.',
]);
}
@ -708,7 +708,7 @@ private function buildResults(array $results): array
'product_variant_id' => $variant->id,
'cutting_result' => $cuttingResult,
'sampel' => $sampel,
'hasil_cutting_diluar_sampel' => $hasilCuttingDiluarSampel,
'original_outside_sample' => $hasilCuttingDiluarSampel,
];
})
->all();
@ -763,10 +763,10 @@ private function applyProductStockOnVerify(Cutting $cutting): void
->increment('stock', $result->sampel);
}
if ($result->hasil_cutting_diluar_sampel > 0) {
if ($result->original_outside_sample > 0) {
ProductVariant::query()
->whereKey($result->product_variant_id)
->increment('reject_stock', $result->hasil_cutting_diluar_sampel);
->increment('reject_stock', $result->original_outside_sample);
}
}
}
@ -780,10 +780,10 @@ private function reverseProductStock(Cutting $cutting): void
->decrement('stock', $result->sampel);
}
if ($result->hasil_cutting_diluar_sampel > 0) {
if ($result->original_outside_sample > 0) {
ProductVariant::query()
->whereKey($result->product_variant_id)
->decrement('reject_stock', $result->hasil_cutting_diluar_sampel);
->decrement('reject_stock', $result->original_outside_sample);
}
}
}
@ -881,7 +881,7 @@ private function presentDraftResult(CuttingResult $item): array
'stock' => $variant?->stock ?? 0,
'cutting_result' => (string) $item->cutting_result,
'sampel' => (string) $item->sampel,
'hasil_cutting_diluar_sampel' => (string) $item->hasil_cutting_diluar_sampel,
'original_outside_sample' => (string) $item->original_outside_sample,
'images' => $variant ? MediaPresenter::collection($variant, 'images') : [],
];
}

6
app/Services/Manage/StockService.php
View File

@ -85,7 +85,7 @@ public function submitVerification(
->where('product_variant_id', $item['product_variant_id'])
->update([
'sampel' => $item['good'],
'hasil_cutting_diluar_sampel' => $item['reject'],
'original_outside_sample' => $item['reject'],
]);
}
$cutting->load('results');
@ -255,10 +255,10 @@ private function applyProductStockOnVerify(Cutting $cutting): void
->increment('stock', $result->sampel);
}
if ($result->hasil_cutting_diluar_sampel > 0) {
if ($result->original_outside_sample > 0) {
ProductVariant::query()
->whereKey($result->product_variant_id)
->increment('reject_stock', $result->hasil_cutting_diluar_sampel);
->increment('reject_stock', $result->original_outside_sample);
}
}
}

2
database/factories/CuttingResultFactory.php
View File

@ -22,7 +22,7 @@ public function definition(): array
'product_variant_id' => ProductVariant::factory(),
'cutting_result' => $cuttingResult,
'sampel' => $cuttingResult - $hasilCuttingDiluarSampel,
'hasil_cutting_diluar_sampel' => $hasilCuttingDiluarSampel,
'original_outside_sample' => $hasilCuttingDiluarSampel,
];
}
}

2
database/migrations/2026_06_12_110003_create_cutting_results_table.php
View File

@ -17,7 +17,7 @@ public function up(): void
$table->unsignedInteger('cutting_result');
$table->unsignedInteger('sampel');
$table->unsignedInteger('hasil_cutting_diluar_sampel')->default(0);
$table->unsignedInteger('original_outside_sample')->default(0);
$table->timestamp('created_at')->useCurrent();
$table->timestamp('updated_at')->useCurrent()->useCurrentOnUpdate();

18
resources/js/pages/admin/manage/cuttings/Edit.vue
View File

@ -39,19 +39,18 @@ const initialData = computed(() => ({
stock: item.product_variant?.stock ?? 0,
cutting_result: String(item.cutting_result),
sampel: String(item.sampel),
hasil_cutting_diluar_sampel: String(item.hasil_cutting_diluar_sampel),
original_outside_sample: String(item.original_outside_sample),
images: item.product_variant?.images ?? [],
})),
}));
</script>
<template>
<Head title="Ubah Cutting" />
<AdminLayout>
<div
class="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between"
>
<div class="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
<div class="space-y-1">
<h2 class="text-2xl font-bold tracking-tight">Ubah Cutting</h2>
</div>
@ -59,13 +58,8 @@ const initialData = computed(() => ({
<BackButton :href="index.url()" />
</div>
<CuttingPosForm
:raw-material-catalog="rawMaterialCatalog"
:product-catalog="productCatalog"
:initial-data="initialData"
:submit-url="update.url(props.cutting.id)"
method="put"
submit-label="Perbarui"
/>
<CuttingPosForm :raw-material-catalog="rawMaterialCatalog" :product-catalog="productCatalog"
:initial-data="initialData" :submit-url="update.url(props.cutting.id)" method="put"
submit-label="Perbarui" />
</AdminLayout>
</template>

19
resources/js/pages/admin/manage/cuttings/form/CuttingPosCartDetailDialog.vue
View File

@ -28,11 +28,8 @@ const open = defineModel<boolean>('open', { required: true });
<div v-if="materialCart.length > 0">
<p class="mb-2 text-xs font-medium text-muted-foreground">Bahan Baku</p>
<div class="space-y-2">
<div
v-for="item in materialCart"
:key="`detail-mat-${item.raw_material_price_id}`"
class="rounded-lg border p-3"
>
<div v-for="item in materialCart" :key="`detail-mat-${item.raw_material_price_id}`"
class="rounded-lg border p-3">
<div class="flex items-start justify-between gap-2">
<div class="min-w-0">
<p class="truncate text-sm font-medium">{{ item.raw_material_name }}</p>
@ -45,7 +42,8 @@ const open = defineModel<boolean>('open', { required: true });
</span>
</div>
<div class="mt-1.5 flex items-center justify-between gap-2 text-xs text-muted-foreground">
<span class="font-medium text-foreground">{{ formatRupiah(materialLineCost(item)) }}</span>
<span class="font-medium text-foreground">{{ formatRupiah(materialLineCost(item))
}}</span>
</div>
</div>
</div>
@ -53,11 +51,8 @@ const open = defineModel<boolean>('open', { required: true });
<div v-if="resultCart.length > 0">
<p class="mb-2 text-xs font-medium text-muted-foreground">Hasil Produk</p>
<div class="space-y-2">
<div
v-for="item in resultCart"
:key="`detail-res-${item.product_variant_id}`"
class="rounded-lg border p-3"
>
<div v-for="item in resultCart" :key="`detail-res-${item.product_variant_id}`"
class="rounded-lg border p-3">
<div class="flex items-start justify-between gap-2">
<div class="min-w-0">
<p class="truncate text-sm font-medium">{{ item.product_name }}</p>
@ -71,7 +66,7 @@ const open = defineModel<boolean>('open', { required: true });
<span class="text-muted-foreground">·</span>
<span>Sampel: <strong>{{ item.sampel }}</strong></span>
<span class="text-muted-foreground">·</span>
<span>Diluar Sampel: <strong>{{ item.hasil_cutting_diluar_sampel }}</strong></span>
<span>Diluar Sampel: <strong>{{ item.original_outside_sample }}</strong></span>
</div>
</div>
</div>

50
resources/js/pages/admin/manage/cuttings/form/CuttingPosForm.vue
View File

@ -100,7 +100,7 @@ function buildPayload() {
product_variant_id: item.product_variant_id,
cutting_result: item.cutting_result,
sampel: item.sampel,
hasil_cutting_diluar_sampel: item.hasil_cutting_diluar_sampel,
original_outside_sample: item.original_outside_sample,
}));
}
@ -147,44 +147,22 @@ function submit() {
<template>
<div class="grid gap-4 xl:grid-cols-[1fr_400px]">
<div class="space-y-4">
<CuttingPosMaterialCatalogPanel
v-model:material-search="materialSearch"
:filtered-raw-materials="filteredRawMaterials"
:get-material-cart-item="getMaterialCartItem"
@add-material="addMaterial"
@decrease-material-qty="decreaseMaterialQty"
/>
<CuttingPosMaterialCatalogPanel v-model:material-search="materialSearch"
:filtered-raw-materials="filteredRawMaterials" :get-material-cart-item="getMaterialCartItem"
@add-material="addMaterial" @decrease-material-qty="decreaseMaterialQty" />
<CuttingPosResultCatalogPanel
v-model:product-search="productSearch"
:filtered-products="filteredProducts"
:get-result-cart-item="getResultCartItem"
@add-result="addResult"
@decrease-result-qty="decreaseResultQty"
/>
<CuttingPosResultCatalogPanel v-model:product-search="productSearch" :filtered-products="filteredProducts"
:get-result-cart-item="getResultCartItem" @add-result="addResult"
@decrease-result-qty="decreaseResultQty" />
</div>
<CuttingPosSummaryPanel
:form="form"
:material-cart="materialCart"
:result-cart="resultCart"
:total-result-pieces="totalResultPieces"
:submit-label="submitLabel"
@submit="submit"
@open-detail="cartDetailOpen = true"
@remove-material="removeMaterial"
@sync-material-field="syncMaterialField"
@remove-result="removeResult"
@sync-result-totals="syncResultTotals"
@sync-result-field="syncResultField"
/>
<CuttingPosSummaryPanel :form="form" :material-cart="materialCart" :result-cart="resultCart"
:total-result-pieces="totalResultPieces" :submit-label="submitLabel" @submit="submit"
@open-detail="cartDetailOpen = true" @remove-material="removeMaterial"
@sync-material-field="syncMaterialField" @remove-result="removeResult"
@sync-result-totals="syncResultTotals" @sync-result-field="syncResultField" />
</div>
<CuttingPosCartDetailDialog
v-model:open="cartDetailOpen"
:material-cart="materialCart"
:result-cart="resultCart"
:material-line-cost="materialLineCost"
:total-material-cost="totalMaterialCost"
/>
<CuttingPosCartDetailDialog v-model:open="cartDetailOpen" :material-cart="materialCart" :result-cart="resultCart"
:material-line-cost="materialLineCost" :total-material-cost="totalMaterialCost" />
</template>

37
resources/js/pages/admin/manage/cuttings/form/CuttingPosResultSummaryItems.vue
View File

@ -30,19 +30,13 @@ const emit = defineEmits<{
</Badge>
</div>
<div
v-if="resultCart.length === 0"
class="rounded-lg border border-dashed px-4 py-6 text-center text-sm text-muted-foreground"
>
<div v-if="resultCart.length === 0"
class="rounded-lg border border-dashed px-4 py-6 text-center text-sm text-muted-foreground">
Belum ada produk hasil dipilih.
</div>
<div v-else class="scrollbar-thin max-h-80 space-y-3 overflow-y-auto overscroll-y-contain">
<div
v-for="(item, index) in resultCart"
:key="item.product_variant_id"
class="rounded-lg border p-3"
>
<div v-for="(item, index) in resultCart" :key="item.product_variant_id" class="rounded-lg border p-3">
<div class="mb-2 flex items-start justify-between gap-2">
<div class="min-w-0">
<p class="truncate text-sm font-medium">
@ -52,13 +46,8 @@ const emit = defineEmits<{
{{ item.variant_name }} · Stok {{ item.stock }} pcs
</p>
</div>
<Button
type="button"
variant="ghost"
size="icon"
class="size-7 shrink-0 text-destructive hover:text-destructive"
@click="emit('remove', index)"
>
<Button type="button" variant="ghost" size="icon"
class="size-7 shrink-0 text-destructive hover:text-destructive" @click="emit('remove', index)">
<Trash2 class="size-3.5" />
</Button>
</div>
@ -66,23 +55,17 @@ const emit = defineEmits<{
<div class="grid grid-cols-3 gap-2">
<Field>
<FieldLabel class="text-xs">Hasil</FieldLabel>
<NumberInput
v-model="item.cutting_result"
class="h-8"
@change="emit('sync-totals', item); emit('sync-field', index)"
/>
<NumberInput v-model="item.cutting_result" class="h-8"
@change="emit('sync-totals', item); emit('sync-field', index)" />
</Field>
<Field>
<FieldLabel class="text-xs">Sampel</FieldLabel>
<NumberInput
v-model="item.sampel"
class="h-8"
@change="emit('sync-totals', item); emit('sync-field', index)"
/>
<NumberInput v-model="item.sampel" class="h-8"
@change="emit('sync-totals', item); emit('sync-field', index)" />
</Field>
<Field>
<FieldLabel class="text-xs">Diluar Sampel</FieldLabel>
<NumberInput v-model="item.hasil_cutting_diluar_sampel" class="h-8" />
<NumberInput v-model="item.original_outside_sample" class="h-8" />
</Field>
</div>
</div>

10
resources/js/pages/admin/manage/cuttings/form/useCuttingPosCart.ts
View File

@ -187,7 +187,7 @@ export function useCuttingPosCart(options: {
product_variant_id: variant.id,
cutting_result: cuttingResult,
sampel,
hasil_cutting_diluar_sampel: hasilCuttingDiluarSampel,
original_outside_sample: hasilCuttingDiluarSampel,
}),
});
@ -206,7 +206,7 @@ export function useCuttingPosCart(options: {
product_variant_id: variantId,
cutting_result: cuttingResult,
sampel,
hasil_cutting_diluar_sampel: hasilCuttingDiluarSampel,
original_outside_sample: hasilCuttingDiluarSampel,
}),
});
@ -225,7 +225,7 @@ export function useCuttingPosCart(options: {
const total = Number(item.cutting_result) || 0;
const sampel = Number(item.sampel) || 0;
item.hasil_cutting_diluar_sampel = String(Math.max(total - sampel, 0));
item.original_outside_sample = String(Math.max(total - sampel, 0));
}
async function removeMaterial(index: number) {
@ -414,7 +414,7 @@ export function useCuttingPosCart(options: {
stock: variant.stock,
cutting_result: '1',
sampel: '1',
hasil_cutting_diluar_sampel: '0',
original_outside_sample: '0',
images: variant.images ?? [],
});
}
@ -445,7 +445,7 @@ export function useCuttingPosCart(options: {
item.product_variant_id,
item.cutting_result,
item.sampel,
item.hasil_cutting_diluar_sampel,
item.original_outside_sample,
);
} catch (error) {
toast.error(error instanceof Error ? error.message : 'Gagal memperbarui item.');

12
resources/js/pages/admin/manage/cuttings/table/CuttingGroupedTable.vue
View File

@ -133,7 +133,9 @@ function getGroupedResults(results: any[]): GroupedCuttingResults[] {
<div class="flex flex-wrap gap-x-4 gap-y-1 text-sm">
<span>Total Hasil Cutting <strong class="text-primary">{{ cutting.total_result_pieces ??
0 }} pcs</strong></span>
<span v-if="cutting.total_material_usage_summary_formatted">Total Pemakaian Bahan <strong class="text-primary">{{ cutting.total_material_usage_summary_formatted }}</strong></span>
<span v-if="cutting.total_material_usage_summary_formatted">Total Pemakaian Bahan
<strong class="text-primary">{{ cutting.total_material_usage_summary_formatted
}}</strong></span>
<span>Biaya Bahan <strong class="text-primary">{{
cutting.total_material_cost_formatted ?? 'Rp 0' }}</strong></span>
</div>
@ -223,7 +225,7 @@ function getGroupedResults(results: any[]): GroupedCuttingResults[] {
{{ result.sampel }} pcs
</TableCell>
<TableCell class="tabular-nums">
{{ result.hasil_cutting_diluar_sampel }} pcs
{{ result.original_outside_sample }} pcs
</TableCell>
</TableRow>
</template>
@ -237,10 +239,6 @@ function getGroupedResults(results: any[]): GroupedCuttingResults[] {
<DataTableEmpty v-else description="Silakan lakukan pencarian untuk menemukan data yang Anda cari." />
<GroupedTableFooter
:summary="paginationSummary"
:pagination="pagination"
:pagination-links="paginationLinks"
/>
<GroupedTableFooter :summary="paginationSummary" :pagination="pagination" :pagination-links="paginationLinks" />
</div>
</template>

26
resources/js/pages/admin/manage/cuttings/table/CuttingVerifyDialog.vue
View File

@ -50,9 +50,9 @@ const verifyForm = useForm({
name: `${res.product_variant?.product?.name || ''} (${res.product_variant?.name || ''})`,
cutting_result: res.cutting_result,
sampel: res.sampel,
hasil_cutting_diluar_sampel: res.hasil_cutting_diluar_sampel,
original_outside_sample: res.original_outside_sample,
original_sampel: res.sampel,
original_hasil_cutting_diluar_sampel: res.hasil_cutting_diluar_sampel,
original_original_outside_sample: res.original_outside_sample,
prices: buildEmptyPrices(),
})),
result_prices: [] as Array<{
@ -70,9 +70,9 @@ watch(open, (isOpen) => {
name: `${res.product_variant?.product?.name || ''} (${res.product_variant?.name || ''})`,
cutting_result: res.cutting_result,
sampel: res.sampel,
hasil_cutting_diluar_sampel: res.hasil_cutting_diluar_sampel,
original_outside_sample: res.original_outside_sample,
original_sampel: res.sampel,
original_hasil_cutting_diluar_sampel: res.hasil_cutting_diluar_sampel,
original_original_outside_sample: res.original_outside_sample,
prices: buildEmptyPrices(),
}));
verifyForm.result_prices = [];
@ -88,7 +88,7 @@ watch(allMatches, (matches) => {
verifyForm.results = verifyForm.results.map((result) => ({
...result,
sampel: result.original_sampel,
hasil_cutting_diluar_sampel: result.original_hasil_cutting_diluar_sampel,
original_outside_sample: result.original_original_outside_sample,
}));
});
@ -99,7 +99,7 @@ function setAllMatches(value: boolean) {
verifyForm.results = verifyForm.results.map((result) => ({
...result,
sampel: result.original_sampel,
hasil_cutting_diluar_sampel: result.original_hasil_cutting_diluar_sampel,
original_outside_sample: result.original_original_outside_sample,
}));
}
}
@ -132,10 +132,10 @@ function submitVerify() {
.transform((data) => ({
status: data.status,
verification_note: data.verification_note,
results: data.results.map(({ product_variant_id, sampel, hasil_cutting_diluar_sampel }) => ({
results: data.results.map(({ product_variant_id, sampel, original_outside_sample }) => ({
product_variant_id,
sampel,
hasil_cutting_diluar_sampel,
original_outside_sample,
})),
result_prices: buildResultPricesPayload(),
}))
@ -188,13 +188,13 @@ function submitVerify() {
<span class="text-muted-foreground block mb-0.5">Data cutting:</span>
<span class="font-medium tabular-nums">
{{ result.original_sampel }} sampel ·
{{ result.original_hasil_cutting_diluar_sampel }} diluar sampel
{{ result.original_original_outside_sample }} diluar sampel
</span>
</div>
<div>
<span class="text-muted-foreground block">Diluar Sampel:</span>
<Badge variant="secondary" class="font-semibold">
{{ result.hasil_cutting_diluar_sampel }} pcs
{{ result.original_outside_sample }} pcs
</Badge>
</div>
</div>
@ -205,7 +205,7 @@ function submitVerify() {
<Input :id="`sampel-${index}`" type="number" v-model.number="result.sampel" min="0"
:max="result.cutting_result" class="h-8 w-full px-2 text-xs"
:disabled="allMatches"
@input="result.hasil_cutting_diluar_sampel = result.cutting_result - result.sampel" />
@input="result.original_outside_sample = result.cutting_result - result.sampel" />
</div>
<div>
<label :for="`diluar-sampel-${index}`"
@ -213,10 +213,10 @@ function submitVerify() {
Sampel
(diterima):</label>
<Input :id="`diluar-sampel-${index}`" type="number"
v-model.number="result.hasil_cutting_diluar_sampel" min="0"
v-model.number="result.original_outside_sample" min="0"
:max="result.cutting_result" class="h-8 w-full px-2 text-xs"
:disabled="allMatches"
@input="result.sampel = result.cutting_result - result.hasil_cutting_diluar_sampel" />
@input="result.sampel = result.cutting_result - result.original_outside_sample" />
</div>
</div>

2
resources/js/pages/admin/manage/stocks/table/StockPendingApprovalSection.vue
View File

@ -75,7 +75,7 @@ defineProps<{
{{ result.sampel }} pcs
</TableCell>
<TableCell class="tabular-nums">
{{ result.hasil_cutting_diluar_sampel }} pcs
{{ result.original_outside_sample }} pcs
</TableCell>
</TableRow>
</TableBody>

2
resources/js/pages/admin/manage/stocks/table/StockPendingSection.vue
View File

@ -70,7 +70,7 @@ defineProps<{
{{ result.sampel }} pcs
</TableCell>
<TableCell class="tabular-nums">
{{ result.hasil_cutting_diluar_sampel }} pcs
{{ result.original_outside_sample }} pcs
</TableCell>
</TableRow>
</TableBody>

2
resources/js/pages/admin/manage/stocks/table/StockVerifiedSection.vue
View File

@ -128,7 +128,7 @@ const showingCount = computed(() => props.cuttings.length);
{{ result.sampel }} pcs
</TableCell>
<TableCell class="tabular-nums">
{{ result.hasil_cutting_diluar_sampel }} pcs
{{ result.original_outside_sample }} pcs
</TableCell>
</TableRow>
</template>

19
resources/js/pages/admin/manage/stocks/table/StockVerifyDialog.vue
View File

@ -54,7 +54,7 @@ const verifyForm = useForm({
name: `${res.product_variant?.product?.name || ''} (${res.product_variant?.name || ''})`,
cutting_result: res.cutting_result,
original_sampel: res.sampel,
original_outside_sample: res.hasil_cutting_diluar_sampel,
original_outside_sample: res.original_outside_sample,
good: res.cutting_result,
reject: 0,
})),
@ -71,7 +71,7 @@ watch(open, (isOpen) => {
name: `${res.product_variant?.product?.name || ''} (${res.product_variant?.name || ''})`,
cutting_result: res.cutting_result,
original_sampel: res.sampel,
original_outside_sample: res.hasil_cutting_diluar_sampel,
original_outside_sample: res.original_outside_sample,
good: res.cutting_result,
reject: 0,
}));
@ -194,17 +194,17 @@ function submitVerify() {
<div class="text-center">
<label :for="`stock-good-${index}`"
class="text-[10px] text-muted-foreground block">Bagus</label>
<Input :id="`stock-good-${index}`" type="number"
v-model.number="result.good" min="0" :max="result.cutting_result"
class="h-7 w-16 px-1.5 text-xs text-center" :disabled="allMatches"
<Input :id="`stock-good-${index}`" type="number" v-model.number="result.good"
min="0" :max="result.cutting_result" class="h-7 w-16 px-1.5 text-xs text-center"
:disabled="allMatches"
@input="result.reject = result.cutting_result - result.good" />
</div>
<div class="text-center">
<label :for="`stock-reject-${index}`"
class="text-[10px] text-muted-foreground block">Reject</label>
<Input :id="`stock-reject-${index}`" type="number"
v-model.number="result.reject" min="0" :max="result.cutting_result"
class="h-7 w-16 px-1.5 text-xs text-center" :disabled="allMatches"
<Input :id="`stock-reject-${index}`" type="number" v-model.number="result.reject"
min="0" :max="result.cutting_result" class="h-7 w-16 px-1.5 text-xs text-center"
:disabled="allMatches"
@input="result.good = result.cutting_result - result.reject" />
</div>
</div>
@ -238,8 +238,7 @@ function submitVerify() {
</div>
<DialogFooter class="mt-6">
<Button type="button" variant="outline" :disabled="verifyForm.processing"
@click="open = false">
<Button type="button" variant="outline" :disabled="verifyForm.processing" @click="open = false">
Batal
</Button>
<Button type="submit" :disabled="verifyForm.processing">

6
resources/js/types/cutting.ts
View File

@ -46,7 +46,7 @@ export type CuttingResultListItem = {
id: number;
cutting_result: number;
sampel: number;
hasil_cutting_diluar_sampel: number;
original_outside_sample: number;
product_variant?: {
id: number;
name: string;
@ -121,7 +121,7 @@ export type CuttingResultCartItem = {
stock: number;
cutting_result: string;
sampel: string;
hasil_cutting_diluar_sampel: string;
original_outside_sample: string;
images?: MediaItem[];
};
@ -149,7 +149,7 @@ export type CuttingEditItem = {
product_variant_id: number;
cutting_result: number;
sampel: number;
hasil_cutting_diluar_sampel: number;
original_outside_sample: number;
product_variant?: {
name: string;
stock: number;