Merge branch 'production' of https://git.abbauf.com/Magang-2025/Kasir into production

This commit is contained in:
timotiabbauftech 2025-09-12 16:59:47 +07:00
commit 6204acc6aa
11 changed files with 493 additions and 391 deletions

View File

@ -10,8 +10,12 @@ class FotoSementaraController extends Controller
{
public function upload(Request $request)
{
$user = $request->user();
if (!$user) {
return response()->json(['message' => 'Unauthorized'], 401);
}
$request->validate([
'id_user' => 'required|exists:users,id',
'foto' => 'required|image|mimes:jpg,jpeg,png|max:2048',
]);
@ -19,15 +23,20 @@ class FotoSementaraController extends Controller
$url = asset('storage/' . $path);
$foto = FotoSementara::create([
'id_user' => $request->id_user,
'id_user' => $user->id,
'url' => $url,
]);
return response()->json($foto, 201);
}
public function hapus($id)
public function hapus(Request $request, int $id)
{
$user = $request->user();
if (!$user) {
return response()->json(['message' => 'Unauthorized'], 401);
}
$foto = FotoSementara::findOrFail($id);
// Extract the relative path from the URL
@ -42,18 +51,25 @@ class FotoSementaraController extends Controller
return response()->json(['message' => 'Foto berhasil dihapus']);
}
public function getAll($user_id)
public function getAll(Request $request)
{
$data = FotoSementara::where('id_user', $user_id);
if (!$data->exists()) {
return response()->json(['message' => 'Tidak ada foto ditemukan'], 404);
$user = $request->user();
if (!$user) {
return response()->json(['message' => 'Unauthorized'], 401);
}
$data = FotoSementara::where('id_user', $user->id)->get();
return response()->json($data);
}
public function reset($user_id)
public function reset(Request $request)
{
FotoSementara::where('id_user', $user_id)->delete();
$user = $request->user();
if (!$user) {
return response()->json(['message' => 'Unauthorized'], 401);
}
FotoSementara::where('id_user', $user->id)->delete();
return response()->json(['message' => 'Foto sementara berhasil direset']);
}
}

View File

@ -31,6 +31,8 @@ class ItemController extends Controller
$item = Item::create($validated);
$item->load('nampan');
return response()->json([
'message' => 'Item berhasil dibuat',
'data' => $item

View File

@ -26,63 +26,56 @@ class ProdukController extends Controller
*/
public function store(Request $request)
{
$validated = $request->validate([
'nama' => 'required|string|max:100',
'id_kategori' => 'required|exists:kategoris,id',
'berat' => 'required|numeric',
'kadar' => 'required|integer',
'harga_per_gram' => 'required|numeric',
'harga_jual' => 'required|numeric',
'id_user' => 'nullable|exists:users,id',
],
[
'nama.required' => 'Nama produk harus diisi.',
'id_kategori' => 'Kategori tidak valid.',
'berat.required' => 'Berat harus diisi.',
'kadar.required' => 'Kadar harus diisi',
'harga_per_gram.required' => 'Harga per gram harus diisi',
'harga_jual.required' => 'Harga jual harus diisi'
]);
$user = $request->user();
if (!$user) {
return response()->json(['message' => 'Unauthorized'], 401);
}
$validated = $request->validate(
[
'nama' => 'required|string|max:100',
'id_kategori' => 'required|exists:kategoris,id',
'berat' => 'required|numeric',
'kadar' => 'required|integer',
'harga_per_gram' => 'required|numeric',
'harga_jual' => 'required|numeric',
],
[
'nama.required' => 'Nama produk harus diisi.',
'id_kategori' => 'Kategori tidak valid.',
'berat.required' => 'Berat harus diisi.',
'kadar.required' => 'Kadar harus diisi.',
'harga_per_gram.required' => 'Harga per gram harus diisi.',
'harga_jual.required' => 'Harga jual harus diisi.'
]
);
DB::beginTransaction();
try {
// Create produk
$produk = Produk::create([
'nama' => $validated['nama'],
'id_kategori' => $validated['id_kategori'],
'berat' => $validated['berat'],
'kadar' => $validated['kadar'],
'harga_per_gram' => $validated['harga_per_gram'],
'harga_jual' => $validated['harga_jual'],
]);
$produk = Produk::create($validated);
// Pindahkan foto sementara ke foto permanen jika ada
if (isset($validated['id_user'])) {
$fotoSementara = FotoSementara::where('id_user', $validated['id_user'])->get();
$fotoSementara = FotoSementara::where('id_user', $user->id)->get();
foreach ($fotoSementara as $fs) {
Foto::create([
'id_produk' => $produk->id,
'url' => $fs->url
]);
foreach ($fotoSementara as $fs) {
Foto::create([
'id_produk' => $produk->id,
'url' => $fs->url
]);
// Hapus foto sementara setelah dipindah
$fs->delete();
}
$fs->delete();
}
DB::commit();
return response()->json([
'message' => 'Produk berhasil dibuat',
'data' => $produk->load('foto')
'data' => $produk->load('foto')
], 201);
} catch (\Exception $e) {
DB::rollback();
return response()->json([
'message' => 'Gagal membuat produk',
'error' => $e->getMessage()
'error' => $e->getMessage()
], 500);
}
}
@ -96,29 +89,55 @@ class ProdukController extends Controller
return response()->json($produk);
}
/**
* Get the specified resource to edit.
*/
public function edit(Request $request, int $id)
{
$user = $request->user();
if (!$user) {
return response()->json(['message' => 'Unauthorized'], 401);
}
$produk = Produk::with('foto', 'kategori')->findOrFail($id);
$foto_sementara = [];
foreach ($produk->foto as $foto) {
$foto_sementara[] = FotoSementara::create([
'id_user' => $user->id,
'url' => $foto->url
]);
}
return response()->json($produk);
}
/**
* Update the specified resource in storage.
*/
public function update(Request $request, int $id)
{
$validated = $request->validate([
'nama' => 'required|string|max:100',
'id_kategori' => 'required|exists:kategoris,id',
'berat' => 'required|numeric',
'kadar' => 'required|integer',
'harga_per_gram' => 'required|numeric',
'harga_jual' => 'required|numeric',
'id_user' => 'nullable|exists:users,id', // untuk mengambil foto sementara baru
'hapus_foto_lama' => 'nullable|boolean', // flag untuk menghapus foto lama
],
[
'nama.required' => 'Nama produk harus diisi.',
'id_kategori' => 'Kategori tidak valid.',
'berat.required' => 'Berat harus diisi.',
'kadar.required' => 'Kadar harus diisi',
'harga_per_gram.required' => 'Harga per gram harus diisi',
'harga_jual.required' => 'Harga jual harus diisi'
]);
$user = $request->user();
if (!$user) {
return response()->json(['message' => 'Unauthorized'], 401);
}
$validated = $request->validate(
[
'nama' => 'required|string|max:100',
'id_kategori' => 'required|exists:kategoris,id',
'berat' => 'required|numeric',
'kadar' => 'required|integer',
'harga_per_gram' => 'required|numeric',
'harga_jual' => 'required|numeric',
],
[
'nama.required' => 'Nama produk harus diisi.',
'id_kategori' => 'Kategori tidak valid.',
'berat.required' => 'Berat harus diisi.',
'kadar.required' => 'Kadar harus diisi',
'harga_per_gram.required' => 'Harga per gram harus diisi',
'harga_jual.required' => 'Harga jual harus diisi',
]
);
DB::beginTransaction();
try {
@ -134,31 +153,29 @@ class ProdukController extends Controller
'harga_jual' => $validated['harga_jual'],
]);
// Hapus foto lama jika diminta
if (isset($validated['hapus_foto_lama']) && $validated['hapus_foto_lama']) {
foreach ($produk->foto as $foto) {
// Hapus file fisik
// Hapus foto lama
foreach ($produk->foto as $foto) {
// Hapus file fisik jika memungkinkan
try {
$relativePath = str_replace(asset('storage') . '/', '', $foto->url);
if (Storage::disk('public')->exists($relativePath)) {
Storage::disk('public')->delete($relativePath);
}
$foto->delete();
} catch (\Exception $e) {
// Maklum Pak, soalnya kadang url aja, ga ada file fisiknya #Bagas
}
$foto->delete();
}
// Tambahkan foto baru dari foto sementara jika ada
if (isset($validated['id_user'])) {
$fotoSementara = FotoSementara::where('id_user', $validated['id_user'])->get();
$fotoSementara = FotoSementara::where('id_user', $user->id)->get();
foreach ($fotoSementara as $fs) {
Foto::create([
'id_produk' => $produk->id,
'url' => $fs->url
]);
foreach ($fotoSementara as $fs) {
Foto::create([
'id_produk' => $produk->id,
'url' => $fs->url
]);
// Hapus foto sementara setelah dipindah
$fs->delete();
}
$fs->delete();
}
DB::commit();
@ -167,7 +184,6 @@ class ProdukController extends Controller
'message' => 'Produk berhasil diubah',
'data' => $produk->load('foto')
], 200);
} catch (\Exception $e) {
DB::rollback();
return response()->json([
@ -203,7 +219,6 @@ class ProdukController extends Controller
return response()->json([
'message' => 'Produk berhasil dihapus.'
], 200);
} catch (\Exception $e) {
DB::rollback();
return response()->json([

View File

@ -1,4 +1,3 @@
// brankas list
<template>
<div v-if="loading" class="flex justify-center items-center h-screen">
<div class="animate-spin rounded-full h-8 w-8 border-b-2 border-C"></div>

View File

@ -1,9 +1,9 @@
<template>
<Modal :active="isOpen" size="md" @close="handleClose" clickOutside="false">
<div class="p-6">
<h3 class="text-lg font-semibold text-gray-900 mb-4">Item {{ product?.nama }}</h3>
<div v-if="!success">
<h3 class="text-lg font-semibold text-gray-900 mb-4">Item {{ product?.nama }}</h3>
<div class="mb-4">
<label class="block text-gray-700 mb-2">Pilih Nampan</label>
<InputSelect v-model="selectedNampan" :options="positionListOptions" :disabled="loading" />
@ -31,21 +31,22 @@
<!-- Success State -->
<div v-else>
<div class="text-center">
<div class="w-16 h-16 bg-green-100 rounded-full flex items-center justify-center mx-auto mb-4">
<svg class="w-8 h-8 text-green-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7">
</path>
</svg>
<h4 class="text-lg font-semibold text-gray-900 mb-2">Item Berhasil Dibuat!</h4>
<!-- QR Code -->
<div class="flex justify-center mb-4">
<div class="p-2 border border-gray-300 rounded-lg">
<img :src="qrCodeUrl" alt="QR Code" class="w-36 h-36" />
</div>
</div>
<h4 class="text-lg font-semibold text-gray-900 mb-2">Item Berhasil Dibuat!</h4>
<p class="text-gray-600 mb-2">
Item dari produk "<strong>{{ product?.nama }}</strong>" telah ditambahkan ke {{
selectedNampanName }}.
</p>
<p class="text-sm text-gray-500 mb-6">
ID Item: <strong>{{ createdItem.id }}</strong>
</p>
<!-- Item Info -->
<div class="text-center text-gray-700 font-medium mb-1">
{{ createdItem?.kode_item }}
</div>
<div class="text-center text-gray-500 text-sm mb-6">
{{ product?.nama }} - {{ createdItem?.nampan?.nama || 'Brankas' }}
</div>
<div class="flex flex-row justify-between gap-3">
<button @click="handleClose"
@ -53,9 +54,8 @@
Selesai
</button>
<button @click="printItem"
class="flex-1 px-6 py-2 bg-C hover:bg-B text-D rounded-lg transition-colors opacity-50 cursor-not-allowed"
disabled>
Print
class="flex-1 px-6 py-2 bg-C hover:bg-B text-D rounded-lg transition-colors">
<i class="fas fa-print mr-1"></i>Print
</button>
<button @click="addNewItem"
class="flex-1 px-6 py-2 bg-C hover:bg-B text-D rounded-lg transition-colors">
@ -99,15 +99,15 @@ const success = ref(false);
const loading = ref(false);
const createdItem = ref(null);
// Computed
const selectedNampanName = computed(() => {
if (!selectedNampan.value) return 'Brankas';
console.log("Selected nampan ID:", selectedNampan.value);
const nampan = nampanList.value.find(n => n.id === Number(selectedNampan.value));
console.log("All nampan:", nampanList.value);
console.log("Selected nampan:", nampan);
return nampan ? nampan.nama : 'Brankas';
// QR Code generator - berdasarkan logika dari brankas list
const qrCodeUrl = computed(() => {
if (createdItem.value && props.product) {
const itemId = createdItem.value.id || createdItem.value.kode_item;
const productName = props.product.nama.replace(/\s/g, "");
const data = `ITM-${itemId}-${productName}`;
return `https://api.qrserver.com/v1/create-qr-code/?size=150x150&data=${encodeURIComponent(data)}`;
}
return "";
});
// Methods
@ -156,6 +156,7 @@ const createItem = async () => {
createdItem.value = response.data.data
console.log('Item created:', createdItem);
loadNampanList();
} catch (error) {
console.error('Error creating item:', error);
alert('Gagal membuat item: ' + (error.response?.data?.message || error.message));
@ -167,10 +168,52 @@ const createItem = async () => {
const addNewItem = () => {
success.value = false;
selectedNampan.value = '';
createdItem.value = null;
};
// Fungsi print berdasarkan logika dari brankas list
const printItem = () => {
alert('Wak waw');
if (qrCodeUrl.value && createdItem.value && props.product) {
const printWindow = window.open('', '_blank');
const itemCode = createdItem.value.kode_item || createdItem.value.id;
printWindow.document.write(`
<html>
<head>
<title>Print QR Code - ${itemCode}</title>
<style>
body {
font-family: Arial, sans-serif;
text-align: center;
padding: 20px;
}
.qr-container {
border: 2px solid #ccc;
padding: 20px;
display: inline-block;
margin: 20px;
}
.item-info {
margin-top: 10px;
font-size: 14px;
}
</style>
</head>
<body>
<div class="qr-container">
<img src="${qrCodeUrl.value}" alt="QR Code" style="width: 200px; height: 200px;" />
<div class="item-info">
<div style="font-weight: bold; margin-bottom: 5px;">${itemCode}</div>
<div>${props.product.nama}</div>
<div style="color: #666; margin-top: 5px;">${props.product.berat}g</div>
</div>
</div>
</body>
</html>
`);
printWindow.document.close();
printWindow.print();
}
};
const handleClose = () => {
@ -178,6 +221,7 @@ const handleClose = () => {
selectedNampan.value = '';
success.value = false;
loading.value = false;
createdItem.value = null;
emit('close');
};
@ -188,6 +232,7 @@ watch(() => props.isOpen, (newValue) => {
selectedNampan.value = '';
success.value = false;
loading.value = false;
createdItem.value = null;
loadNampanList();
}

View File

@ -194,6 +194,15 @@ const tambahItem = () => {
return;
}
if (pesanan.value.length >= 2) {
error.value = "Maksimal hanya bisa memesan 2 item.";
clearTimeout(errorTimeout);
errorTimeout = setTimeout(() => {
error.value = "";
}, 3000);
return;
}
// harga deal
item.value.kode_item = kodeItem.value;
item.value.harga_deal = Number(hargaJual.value);

View File

@ -1,181 +1,163 @@
<template>
<div
v-if="isOpen"
class="text-D pt-serif-regular-italic fixed inset-0 bg-black/75 flex items-center justify-center z-[9999]"
>
<div
class="bg-white w-[1224px] h-[528px] rounded-md shadow-lg relative overflow-hidden"
>
<div v-if="isOpen"
class="text-D pt-serif-regular-italic fixed inset-0 bg-black/75 flex items-center justify-center z-[9999]">
<div class="bg-white w-[1224px] h-[528px] rounded-md shadow-lg relative overflow-hidden">
<div class="bg-D h-8 w-full"></div>
<div class="p-6 text-sm flex flex-col h-full relative">
<!-- Header -->
<div class="relative flex items-center justify-between pb-2 mb-2">
<!-- Sosmed -->
<div class="flex flex-col gap-4">
<p class="flex items-center gap-2">
<i class="fab fa-instagram text-red-500 text-xl"></i> tokomas_Jakartacitayam
<i class="fab fa-instagram text-D text-xl"></i> tokomas_Jakartacitayam
</p>
<p class="flex items-center gap-2">
<i class="fab fa-tiktok text-black text-xl"></i> tokomas_Jakartacitayam
<i class="fab fa-tiktok text-D text-xl"></i> tokomas_Jakartacitayam
</p>
<p class="flex items-center gap-2">
<i class="fab fa-whatsapp text-green-500 text-xl"></i> 08158851178
<i class="fab fa-whatsapp text-D text-xl"></i> 08158851178
</p>
</div>
<!-- Logo & tanggal (absolute di tengah) -->
<div class="absolute inset-x-0 top-0 flex flex-col items-center">
<img :src="logo" alt="Logo" class="h-15" />
<!-- ==== MODIFIKASI: Tanggal sekarang dinamis ==== -->
<p class="mt-1 text-center">{{ getCurrentDate() }}</p>
<!-- ==== END MODIFIKASI ==== -->
</div>
<!-- Data Pembeli -->
<div
class="grid grid-cols-[130px_1fr] gap-y-2 items-center relative z-10"
>
<div class="grid grid-cols-[130px_1fr] gap-y-2 items-center relative z-10">
<div class="text-right font-semibold pr-3">Nama Pembeli</div>
<!-- ==== MODIFIKASI: Input field sekarang v-model ==== -->
<inputField
v-model="namaPembeli"
class="h-7 px-2 text-sm rounded bg-blue-200 w-full"
/>
<!-- ==== END MODIFIKASI ==== -->
<inputField v-model="namaPembeli" class="h-7 px-2 text-sm rounded bg-blue-200 w-full" />
<div class="text-right font-semibold pr-3">Nomor Telepon</div>
<!-- ==== MODIFIKASI: Input field sekarang v-model ==== -->
<inputField
v-model="nomorTelepon"
class="h-7 px-2 text-sm rounded bg-blue-200 w-full"
/>
<!-- ==== END MODIFIKASI ==== -->
<inputField v-model="nomorTelepon" class="h-7 px-2 text-sm rounded bg-blue-200 w-full" />
<div class="text-right font-semibold pr-3">Alamat</div>
<!-- ==== MODIFIKASI: Input field sekarang v-model ==== -->
<inputField
v-model="alamat"
class="h-7 px-2 text-sm rounded bg-blue-200 w-full"
/>
<!-- ==== END MODIFIKASI ==== -->
<inputField v-model="alamat" class="h-7 px-2 text-sm rounded bg-blue-200 w-full" />
</div>
</div>
<!-- Nomor Transaksi -->
<!-- ==== MODIFIKASI: Kode transaksi dinamis ==== -->
<p class="mt-1 text-sm">{{ generateTransactionCode() }}</p>
<!-- ==== END MODIFIKASI ==== -->
<table class="w-full border-D mt-0 text-sm table-fixed">
<thead>
<tr class="border-b border-D">
<th class="w-[260px] py-2 border-r border-D">Item</th>
<th class="w-[70px] border-r border-D">Posisi</th>
<th class="w-[60px] border-r border-D">Berat</th>
<th class="w-[60px] border-r border-D">Kadar</th>
<th class="w-[140px] border-r border-D">Harga Satuan</th>
<th class="w-[60px] border-r border-D">Jumlah</th>
<th class="w-[140px]">Total Harga</th>
</tr>
</thead>
<tbody>
<!-- ==== MODIFIKASI: Loop pesanan dari props ==== -->
<tr v-for="(item, index) in pesanan" :key="index" class="text-center">
<td class="flex items-center gap-2 p-2 border-r border-D">
<img :src="item.produk.foto?.[0]?.url || ''" class="w-12 h-12 object-cover" />
{{ item.produk.nama }}
</td>
<td class="border-r border-D">{{ item.posisi || 'Brankas' }}</td>
<td class="border-r border-D">{{ item.produk.berat || '-' }}</td>
<td class="border-r border-D">{{ item.produk.kadar || '-' }}</td>
<td class="border-r border-D">Rp{{ item.harga_deal.toLocaleString() }}</td>
<td class="border-r border-D">1</td>
<td>Rp{{ item.harga_deal.toLocaleString() }}</td>
</tr>
<!-- ==== END MODIFIKASI ==== -->
<!-- Baris Ongkos + Total -->
<tr class="align-top">
<td colspan="2" rowspan="2" class="p-2 text-left align-top">
<p class="font-semibold">PERHATIAN</p>
<ol class="list-decimal ml-4 text-xs space-y-1">
<li>Berat barang telah ditimbang dan disaksikan oleh pembeli.</li>
<li>Barang yang dikembalikan menurut harga pasaran dan <br> dipotong ongkos bikin, barang rusak lain harga.</li>
<li>Barang yang sudah dibeli berarti sudah diperiksa dan disetujui.</li>
<li>Surat ini harap dibawa pada saat menjual kembali.</li>
</ol>
</td>
<table class="w-full border-D mt-0 text-sm table-fixed">
<thead>
<tr class="border-b border-D">
<th class="w-[260px] py-2 border-r border-D">Item</th>
<th class="w-[70px] border-r border-D">Posisi</th>
<th class="w-[60px] border-r border-D">Berat</th>
<th class="w-[60px] border-r border-D">Kadar</th>
<th class="w-[140px] border-r border-D">Harga Satuan</th>
<th class="w-[60px] border-r border-D">Jumlah</th>
<th class="w-[140px]">Total Harga</th>
</tr>
</thead>
<td colspan="2" rowspan="2" class="p-2 text-center align-top">
<div class="flex flex-col items-center justify-center h-full">
<p><strong>Sales</strong></p>
<!-- ==== MODIFIKASI: Sales dropdown dinamis ==== -->
<inputSelect
v-model="selectedSales"
:options="salesOptions"
class="mt-16 text-sm rounded bg-B cursor-pointer !w-[160px] text-center [option]:text-left"
/>
<!-- ==== END MODIFIKASI ==== -->
</div>
</td>
<tbody>
<tr v-for="(item, index) in pesananMinimal" :key="index" class="text-center">
<td class="flex items-center gap-2 p-2 border-r border-D">
<template v-if="item.produk?.foto?.[0]?.url">
<img :src="item.produk.foto[0].url" class="w-12 h-12 object-cover" />
</template>
<template v-else>
<div class="w-12 h-12"></div>
</template>
{{ item.produk?.nama || '' }}
</td>
<td class="border-r border-D">{{ item.posisi || '' }}</td>
<td class="border-r border-D">
<span v-if="item.produk?.berat">{{ item.produk.berat }}g</span>
</td>
<td class="border-r border-D">
<span v-if="item.produk?.kadar">{{ item.produk.kadar }}k</span>
</td>
<td class="border-r border-D">
<span v-if="item.harga_deal">Rp{{ item.harga_deal.toLocaleString() }}</span>
</td>
<td class="border-r border-D">
<span v-if="item.harga_deal">1</span>
</td>
<td>
<span v-if="item.harga_deal">Rp{{ item.harga_deal.toLocaleString() }}</span>
</td>
</tr>
</tbody>
<td colspan="2" class="p-2 text-right text-sm font-semibold align-top border-r">
<div class="space-y-2">
<p>Ongkos bikin</p>
<p class="text-red-500 text-xs">diluar harga jual</p>
<p>Total</p>
</div>
</td>
<td class="p-2 text-sm align-top">
<div class="space-y-2">
<div class="flex items-center">
<p>Rp</p>
<!-- ==== MODIFIKASI: Ongkos bikin input ==== -->
<inputField
v-model.number="ongkosBikin"
type="number"
class="h-7 px-2 text-sm rounded bg-blue-200 text-left w-full"
/>
<!-- ==== END MODIFIKASI ==== -->
</div>
<div class="flex items-center">
<p>Rp</p>
<!-- ==== MODIFIKASI: Total dinamis ==== -->
<p class="px-3 py-1 text-left text-sm w-full">{{ grandTotal.toLocaleString() }}</p>
<!-- ==== END MODIFIKASI ==== -->
</div>
</div>
</td>
</tr>
<!-- Baris Tombol -->
<tr>
<td></td>
<td></td>
<td class="p-2 text-center">
<div class="flex gap-2">
<!-- ==== MODIFIKASI: Tombol Batal dengan emit close ==== -->
<button @click="$emit('close')" class="bg-gray-400 text-white px-6 py-2 rounded w-full">
Batal
</button>
<!-- ==== END MODIFIKASI ==== -->
<!-- ==== MODIFIKASI: Tombol Simpan dengan validasi ==== -->
<button @click="handleSimpan" class="bg-C text-white px-6 py-2 rounded w-full">
Simpan
</button>
<!-- ==== END MODIFIKASI ==== -->
</div>
</td>
</tr>
</tbody>
</table>
<tfoot>
<tr class="align-top border-t">
<td colspan="2" rowspan="2" class="p-2 text-left align-top">
<p class="font-semibold">PERHATIAN</p>
<ol class="list-decimal ml-4 text-xs space-y-1">
<li>Berat barang telah ditimbang dan disaksikan oleh pembeli.</li>
<li>Barang yang dikembalikan menurut harga pasaran dan <br> dipotong ongkos bikin,
barang rusak lain
harga.</li>
<li>Barang yang sudah dibeli berarti sudah diperiksa dan disetujui.</li>
<li>Surat ini harap dibawa pada saat menjual kembali.</li>
</ol>
</td>
<td colspan="2" rowspan="2" class="p-2 text-center align-top">
<div class="flex flex-col items-center justify-center h-full">
<p><strong>Sales</strong></p>
<inputSelect v-model="selectedSales" :options="salesOptions"
class="mt-16 text-sm rounded bg-B cursor-pointer !w-[160px] text-center [option]:text-left" />
</div>
</td>
<td colspan="2" class="p-2 text-right text-sm font-semibold align-top border-r">
<div class="space-y-2">
<p>Ongkos bikin</p>
<p class="text-red-500 text-xs">diluar harga jual</p>
<p>Total</p>
</div>
</td>
<td class="p-2 text-sm align-top">
<div class="space-y-2">
<div class="flex items-center">
<p>Rp</p>
<inputField v-model.number="ongkosBikin" type="number"
class="h-7 px-2 text-sm rounded bg-blue-200 text-left w-full" />
</div>
<div class="flex items-center">
<p>Rp</p>
<p class="px-3 py-1 text-left text-sm w-full">{{ grandTotal.toLocaleString() }}
</p>
</div>
</div>
</td>
</tr>
<tr>
<td></td>
<td></td>
<td class="p-2 text-center">
<div class="flex gap-2">
<button @click="$emit('close')" class="bg-gray-400 text-white px-6 py-2 rounded w-full">Batal</button>
<button @click="handleSimpan" class="bg-C text-white px-6 py-2 rounded w-full">Simpan</button>
</div>
</td>
</tr>
</tfoot>
</table>
</div>
<!-- Pesan bawah -->
<p
class="absolute bottom-0 left-0 text-xs bg-D text-white px-2 py-1 rounded-tr-md"
>
<p class="absolute bottom-0 left-0 text-xs bg-D text-white px-2 py-1 rounded-tr-md">
Terima kasih sudah berbelanja dengan kami
</p>
</div>
@ -187,11 +169,9 @@ import { ref, computed, onMounted } from 'vue'
import logo from '@/../images/logo.png'
import inputField from '@/components/inputField.vue'
import inputSelect from '@/components/inputSelect.vue'
// ==== TAMBAHAN: Import axios ====
import axios from 'axios'
// ==== END TAMBAHAN ====
// ==== MODIFIKASI: Props sekarang menerima pesanan dan total ====
import axios from 'axios'
const props = defineProps({
isOpen: {
type: Boolean,
@ -206,28 +186,21 @@ const props = defineProps({
default: 0
}
})
// ==== END MODIFIKASI ====
// ==== TAMBAHAN: Define emits ====
const emit = defineEmits(['close', 'confirm'])
// ==== END TAMBAHAN ====
// ==== TAMBAHAN: Reactive variables untuk form ====
const namaPembeli = ref('')
const nomorTelepon = ref('')
const alamat = ref('')
const ongkosBikin = ref(0)
const selectedSales = ref(null)
const salesOptions = ref([])
// ==== END TAMBAHAN ====
// ==== TAMBAHAN: Computed untuk grand total ====
const grandTotal = computed(() => {
return props.total + (ongkosBikin.value || 0)
})
// ==== END TAMBAHAN ====
// ==== TAMBAHAN: Fungsi untuk generate tanggal ====
const getCurrentDate = () => {
const days = ['Minggu', 'Senin', 'Selasa', 'Rabu', 'Kamis', 'Jumat', 'Sabtu']
const months = ['01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12']
@ -240,17 +213,13 @@ const getCurrentDate = () => {
return `${dayName}/${day}-${month}-${year}`
}
// ==== END TAMBAHAN ====
// ==== TAMBAHAN: Fungsi untuk generate kode transaksi ====
const generateTransactionCode = () => {
const now = new Date()
const timestamp = now.getTime().toString().slice(-6)
return `TRS-${timestamp}`
}
// ==== END TAMBAHAN ====
// ==== TAMBAHAN: Fetch sales data ====
const fetchSales = async () => {
try {
const response = await axios.get('/api/sales', {
@ -264,7 +233,7 @@ const fetchSales = async () => {
label: sales.nama
}))
// Set default sales jika ada
if (salesOptions.value.length > 0) {
selectedSales.value = salesOptions.value[0].value
}
@ -272,11 +241,9 @@ const fetchSales = async () => {
console.error('Error fetching sales:', error)
}
}
// ==== END TAMBAHAN ====
// ==== TAMBAHAN: Handle simpan dengan validasi ====
const handleSimpan = () => {
// Validasi input wajib
if (!namaPembeli.value.trim()) {
alert('Nama pembeli harus diisi!')
return
@ -297,7 +264,7 @@ const handleSimpan = () => {
return
}
// Emit data ke parent
simpanTransaksi({
id_sales: selectedSales.value,
nama_pembeli: namaPembeli.value,
@ -309,7 +276,7 @@ const handleSimpan = () => {
})
}
// ==== TAMBAHAN: Fungsi untuk menyimpan transaksi ====
const simpanTransaksi = async (dataTransaksi) => {
console.log('Data transaksi yang akan disimpan:', dataTransaksi);
@ -320,7 +287,7 @@ const simpanTransaksi = async (dataTransaksi) => {
},
});
// Reset form setelah berhasil
props.pesanan.value = [];
props.isOpen = false;
@ -332,23 +299,28 @@ const simpanTransaksi = async (dataTransaksi) => {
alert('Error menyimpan transaksi: ' + (error.response?.data?.message || error.message));
}
};
// ==== END TAMBAHAN ====
// ==== END TAMBAHAN ====
// ==== TAMBAHAN: Fetch sales saat component mounted ====
onMounted(() => {
if (props.isOpen) {
fetchSales()
}
})
// ==== END TAMBAHAN ====
const pesananMinimal = computed(() => {
const arr = [...props.pesanan]
while (arr.length < 2) {
arr.push({ produk: {}, harga_deal: 0, posisi: '' })
}
return arr
})
</script>
<style scoped>
@import url('https://fonts.googleapis.com/css2?family=PT+Serif:ital,wght@0,400;0,700;1,400;1,700&display=swap');
.pt-serif-regular-italic {
font-family: "PT Serif", serif;
font-weight: 400;
}
</style>

View File

@ -49,23 +49,33 @@
</div>
<!-- Isi Card (Max tinggi 3 item + scroll kalau lebih) -->
<div v-if="tray.items && tray.items.length" class="space-y-2 flex-1 overflow-y-auto h-[160px] pr-1">
<div v-for="item in tray.items" :key="item.id"
class="flex justify-between items-center border border-C rounded-lg p-2 cursor-pointer hover:bg-gray-50"
@click="openMovePopup(item)">
<div class="flex items-center gap-3">
<img v-if="item.produk.foto && item.produk.foto.length > 0" :src="item.produk.foto[0].url"
alt="foto produk" class="size-12 object-cover rounded" />
<div class="text-D">
<p class="text-sm">{{ item.produk.nama }}</p>
<p class="text-sm font-medium">{{ item.kode_item }}</p>
</div>
</div>
<div class="flex items-center gap-2">
<span class="font-medium">{{ item.produk.berat }}g</span>
</div>
</div>
</div>
<div
v-if="tray.items && tray.items.length"
class="space-y-2 flex-1 overflow-y-auto max-h-[168px] pr-1"
>
<div
v-for="item in tray.items"
:key="item.id"
class="flex justify-between items-center border border-C rounded-lg p-2 cursor-pointer hover:bg-gray-50"
@click="openMovePopup(item)"
>
<div class="flex items-center gap-3">
<img
v-if="item.produk.foto && item.produk.foto.length > 0"
:src="item.produk.foto[0].url"
alt="foto produk"
class="size-12 object-cover rounded"
/>
<div class="text-D">
<p class="text-sm">{{ item.produk.nama }}</p>
<p class="text-sm font-medium">{{ item.kode_item }}</p>
</div>
</div>
<div class="flex items-center gap-2">
<span class="font-medium">{{ item.produk.berat }}g</span>
</div>
</div>
</div>
<!-- Kalau kosong -->
<div v-else class="text-gray-400 text-center py-4 flex-1">

View File

@ -225,6 +225,7 @@ import mainLayout from "../layouts/mainLayout.vue";
import InputField from "../components/InputField.vue";
import InputSelect from "../components/InputSelect.vue";
import CreateItemModal from "../components/CreateItemModal.vue";
import { errorMessages } from "@vue/compiler-core";
const route = useRoute();
const router = useRouter();
@ -250,7 +251,6 @@ const fileInput = ref(null);
const openItemModal = ref(false);
const editedProduct = ref(null);
const userId = ref(1); // TODO: ambil dari auth
const isFormValid = computed(() => {
return (
@ -281,12 +281,14 @@ const loadKategori = async () => {
};
const loadProduk = async () => {
const response = await axios.get(`/api/produk/${productId}`, {
const response = await axios.get(`/api/produk/edit/${productId}`, {
headers: {
Authorization: `Bearer ${localStorage.getItem("token")}`,
},
});
const produk = response.data;
console.log(produk);
form.value = {
nama: produk.nama,
id_kategori: produk.id_kategori,
@ -295,7 +297,22 @@ const loadProduk = async () => {
harga_per_gram: produk.harga_per_gram,
harga_jual: produk.harga_jual,
};
uploadedImages.value = produk.foto || [];
};
const loadFoto = async () => {
try {
const response = await axios.get(`/api/foto`, {
headers: {
Authorization: `Bearer ${localStorage.getItem("token")}`,
},
});
uploadedImages.value = response.data;
console.log(uploadedImages.value);
} catch (e) {
console.error(e);
uploadError.value = "Gagal memuat foto";
}
};
const triggerFileInput = () => {
@ -318,35 +335,65 @@ const handleDrop = (e) => {
};
const uploadFiles = async (files) => {
uploadError.value = "";
const validFiles = files.filter(
(file) =>
["image/jpeg", "image/jpg", "image/png"].includes(file.type) &&
file.size <= 2 * 1024 * 1024
);
if (!validFiles.length) return;
uploadLoading.value = true;
try {
for (const file of validFiles) {
const formData = new FormData();
formData.append("foto", file);
formData.append("id_user", userId.value);
const res = await axios.post("/api/foto/upload", formData, {
headers: {
Authorization: `Bearer ${localStorage.getItem("token")}`,
"Content-Type": "multipart/form-data",
},
});
uploadedImages.value.push(res.data);
}
} finally {
uploadLoading.value = false;
uploadError.value = '';
if (uploadedImages.value.length + files.length > 6) {
uploadError.value = 'Maksimal 6 foto yang dapat diupload';
return;
}
const validFiles = files.filter(file => {
const isValidType = ['image/jpeg', 'image/jpg', 'image/png'].includes(file.type);
const isValidSize = file.size <= 2 * 1024 * 1024;
if (!isValidType) {
uploadError.value = 'Format file harus JPG, JPEG, atau PNG';
return false;
}
if (!isValidSize) {
uploadError.value = 'Ukuran file maksimal 2MB';
return false;
}
return true;
});
if (validFiles.length === 0) return;
uploadLoading.value = true;
try {
for (const file of validFiles) {
const formData = new FormData();
formData.append('foto', file);
const response = await axios.post('/api/foto', formData, {
headers: {
Authorization: `Bearer ${localStorage.getItem("token")}`,
'Content-Type': 'multipart/form-data',
},
});
uploadedImages.value.push(response.data);
}
if (fileInput.value) {
fileInput.value.value = '';
}
} catch (error) {
console.error('Upload error:', error);
uploadError.value = error.response?.data?.message || 'Gagal mengupload foto';
} finally {
uploadLoading.value = false;
}
};
const removeImage = async (id) => {
try {
await axios.delete(`http://127.0.0.1:8000/api/foto/hapus/${id}`, {
await axios.delete(`/api/foto/${id}`, {
headers: {
Authorization: `Bearer ${localStorage.getItem("token")}`,
},
@ -361,21 +408,16 @@ const submitForm = async () => {
loading.value = true;
try {
await axios.put(
`/api/produk/${productId}`,
{
...form.value,
id_user: userId.value,
},
`/api/produk/${productId}`,form.value,
{
headers: {
Authorization: `Bearer ${localStorage.getItem("token")}`,
},
}
);
alert("Produk berhasil diupdate!");
router.push("/produk");
} catch (err) {
alert("Gagal update produk!");
errorMessages.value = err.response?.data?.message || "Gagal menyimpan produk";
console.error(err);
} finally {
loading.value = false;
@ -390,8 +432,10 @@ const back = () => {
router.push("/produk");
};
onMounted(() => {
loadKategori();
loadProduk();
onMounted(async () => {
await loadKategori();
await loadProduk();
loadFoto();
});
</script>

View File

@ -1,11 +1,7 @@
<template>
<mainLayout>
<!-- Modal Buat Item - Sekarang menggunakan komponen terpisah -->
<CreateItemModal
:isOpen="openItemModal"
:product="createdProduct"
@close="closeItemModal"
/>
<CreateItemModal :isOpen="openItemModal" :product="createdProduct" @close="closeItemModal" />
<div class="p-6">
<p class="font-serif italic text-[25px] text-D">Produk Baru</p>
@ -168,8 +164,6 @@ const uploadedImages = ref([]);
const isDragging = ref(false);
const uploadError = ref('');
const fileInput = ref(null);
// TODO: Logika autentikasi user
const userId = ref(1);
const openItemModal = ref(false);
const createdProduct = ref(null);
@ -192,22 +186,24 @@ const calculateHargaJual = () => {
}
};
const loadExistingPhotos = async () => {
const loadFoto = async () => {
loading.value = true;
try {
const response = await axios.get(`/api/foto/${userId.value}`, {
const response = await axios.get(`/api/foto`, {
headers: {
Authorization: `Bearer ${localStorage.getItem("token")}`,
},
});
if (response.data && Array.isArray(response.data)) {
uploadedImages.value = response.data;
}
} catch (error) {
if (error.response?.status !== 404) {
console.error('Error loading existing photos:', error);
}
uploadedImages.value = response.data;
console.log(uploadedImages.value);
} catch (e) {
console.error(e);
uploadError.value = "Gagal memuat foto";
}
};
loading.value = false;
}
const openCreateItemModal = (product) => {
createdProduct.value = product;
@ -275,12 +271,11 @@ const uploadFiles = async (files) => {
for (const file of validFiles) {
const formData = new FormData();
formData.append('foto', file);
formData.append('id_user', userId.value);
const response = await axios.post('/api/foto/upload', formData, {
const response = await axios.post('/api/foto', formData, {
headers: {
Authorization: `Bearer ${localStorage.getItem("token")}`,
'Content-Type': 'multipart/form-data',
Authorization: `Bearer ${localStorage.getItem("token")}`,
'Content-Type': 'multipart/form-data',
},
});
@ -300,20 +295,17 @@ const uploadFiles = async (files) => {
}
};
const removeImage = async (imageId) => {
try {
await axios.delete(`/api/foto/hapus/${imageId}`, {
headers: {
Authorization: `Bearer ${localStorage.getItem("token")}`,
},
})
;
uploadedImages.value = uploadedImages.value.filter(img => img.id !== imageId);
uploadError.value = '';
} catch (error) {
console.error('Delete error:', error);
uploadError.value = 'Gagal menghapus foto';
}
const removeImage = async (id) => {
try {
await axios.delete(`/api/foto/${id}`, {
headers: {
Authorization: `Bearer ${localStorage.getItem("token")}`,
},
});
uploadedImages.value = uploadedImages.value.filter((i) => i.id !== id);
} catch {
uploadError.value = "Gagal menghapus foto";
}
};
const submitForm = async (addItem) => {
@ -325,16 +317,13 @@ const submitForm = async (addItem) => {
loading.value = true;
try {
const response = await axios.post('/api/produk', {
...form.value,
id_user: userId.value,
},
{
headers: {
Authorization: `Bearer ${localStorage.getItem("token")}`,
},
}
);
const response = await axios.post('/api/produk', form.value,
{
headers: {
Authorization: `Bearer ${localStorage.getItem("token")}`,
},
}
);
const createdProductData = response.data.data;
@ -405,7 +394,7 @@ const back = () => {
};
onMounted(() => {
loadExistingPhotos();
loadFoto();
loadKategori();
});
</script>

View File

@ -32,10 +32,11 @@ Route::prefix('api')->group(function () {
Route::delete('kosongkan-nampan', [NampanController::class, 'kosongkan']);
// Foto Sementara
Route::post('foto/upload', [FotoSementaraController::class, 'upload']);
Route::delete('foto/hapus/{id}', [FotoSementaraController::class, 'hapus']);
Route::get('foto/{user_id}', [FotoSementaraController::class, 'getAll']);
Route::delete('foto/reset/{user_id}', [FotoSementaraController::class, 'reset']);
Route::get('foto', [FotoSementaraController::class, 'getAll']);
Route::post('foto', [FotoSementaraController::class, 'upload']);
Route::delete('foto/{id}', [FotoSementaraController::class, 'hapus']);
Route::get('produk/edit/{id}', [ProdukController::class, 'edit']);
Route::delete('foto/all', [FotoSementaraController::class, 'reset']);
// Laporan
Route::prefix('laporan')->group(function () {