Merge branch 'production' of https://git.abbauf.com/Magang-2025/Kasir into production
This commit is contained in:
commit
7ef8f79b6c
@ -33,7 +33,7 @@ class ProdukController extends Controller
|
|||||||
|
|
||||||
$validated = $request->validate(
|
$validated = $request->validate(
|
||||||
[
|
[
|
||||||
'nama' => 'required|string|max:100',
|
'nama' => 'required|string|max:100|unique:produks,nama',
|
||||||
'id_kategori' => 'required|exists:kategoris,id',
|
'id_kategori' => 'required|exists:kategoris,id',
|
||||||
'berat' => 'required|numeric',
|
'berat' => 'required|numeric',
|
||||||
'kadar' => 'required|integer',
|
'kadar' => 'required|integer',
|
||||||
@ -42,6 +42,7 @@ class ProdukController extends Controller
|
|||||||
],
|
],
|
||||||
[
|
[
|
||||||
'nama.required' => 'Nama produk harus diisi.',
|
'nama.required' => 'Nama produk harus diisi.',
|
||||||
|
'nama.unique' => 'Nama produk sudah digunakan.',
|
||||||
'id_kategori' => 'Kategori tidak valid.',
|
'id_kategori' => 'Kategori tidak valid.',
|
||||||
'berat.required' => 'Berat harus diisi.',
|
'berat.required' => 'Berat harus diisi.',
|
||||||
'kadar.required' => 'Kadar harus diisi.',
|
'kadar.required' => 'Kadar harus diisi.',
|
||||||
@ -122,7 +123,7 @@ class ProdukController extends Controller
|
|||||||
|
|
||||||
$validated = $request->validate(
|
$validated = $request->validate(
|
||||||
[
|
[
|
||||||
'nama' => 'required|string|max:100',
|
'nama' => 'required|string|max:100|unique:produks,nama,' . $id,
|
||||||
'id_kategori' => 'required|exists:kategoris,id',
|
'id_kategori' => 'required|exists:kategoris,id',
|
||||||
'berat' => 'required|numeric',
|
'berat' => 'required|numeric',
|
||||||
'kadar' => 'required|integer',
|
'kadar' => 'required|integer',
|
||||||
@ -131,6 +132,7 @@ class ProdukController extends Controller
|
|||||||
],
|
],
|
||||||
[
|
[
|
||||||
'nama.required' => 'Nama produk harus diisi.',
|
'nama.required' => 'Nama produk harus diisi.',
|
||||||
|
'nama.unique' => 'Nama produk sudah digunakan.',
|
||||||
'id_kategori' => 'Kategori tidak valid.',
|
'id_kategori' => 'Kategori tidak valid.',
|
||||||
'berat.required' => 'Berat harus diisi.',
|
'berat.required' => 'Berat harus diisi.',
|
||||||
'kadar.required' => 'Kadar harus diisi',
|
'kadar.required' => 'Kadar harus diisi',
|
||||||
|
|||||||
@ -340,40 +340,50 @@ const printQR = () => {
|
|||||||
<head>
|
<head>
|
||||||
<title>Print QR Code - ${selectedItem.value.kode_item}</title>
|
<title>Print QR Code - ${selectedItem.value.kode_item}</title>
|
||||||
<style>
|
<style>
|
||||||
|
@page {
|
||||||
|
size: 60mm 50mm;
|
||||||
|
margin: 1mm;
|
||||||
|
}
|
||||||
body {
|
body {
|
||||||
font-family: Arial, sans-serif;
|
font-family: Arial, sans-serif;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
padding: 20px;
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
height: 100vh;
|
||||||
}
|
}
|
||||||
.qr-container {
|
.qr-container {
|
||||||
border: 2px solid #ccc;
|
text-align: center;
|
||||||
padding: 20px;
|
}
|
||||||
display: inline-block;
|
.qr-img {
|
||||||
margin: 20px;
|
width: 40mm;
|
||||||
|
height: 40mm;
|
||||||
|
margin-bottom: 2mm;
|
||||||
}
|
}
|
||||||
.item-info {
|
.item-info {
|
||||||
margin-top: 10px;
|
font-size: 14pt;
|
||||||
font-size: 14px;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="qr-container">
|
<div class="qr-container">
|
||||||
<img src="${qrCodeUrl.value}" alt="QR Code" style="width: 200px; height: 200px;" />
|
<img class="qr-img" src="${qrCodeUrl.value}" alt="QR Code"
|
||||||
|
onload="window.print()" />
|
||||||
<div class="item-info">
|
<div class="item-info">
|
||||||
<div style="font-weight: bold; margin-bottom: 5px;">${selectedItem.value.kode_item}</div>
|
${selectedItem.value.kode_item}
|
||||||
<div>${selectedItem.value.produk.nama}</div>
|
|
||||||
<div style="color: #666; margin-top: 5px;">${selectedItem.value.produk.berat}g</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
`);
|
`);
|
||||||
printWindow.document.close();
|
printWindow.document.close();
|
||||||
printWindow.print();
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
const handleImageError = (event) => {
|
const handleImageError = (event) => {
|
||||||
event.target.style.display = 'none';
|
event.target.style.display = 'none';
|
||||||
};
|
};
|
||||||
|
|||||||
@ -87,7 +87,7 @@ const props = defineProps({
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Emits
|
// Emits
|
||||||
const emit = defineEmits(['close']);
|
const emit = defineEmits(['close','itemAdded']);
|
||||||
|
|
||||||
// State
|
// State
|
||||||
const selectedNampan = ref('');
|
const selectedNampan = ref('');
|
||||||
@ -147,15 +147,17 @@ const createItem = async () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const response = await axios.post('/api/item', payload, {
|
const response = await axios.post('/api/item', payload, {
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: `Bearer ${localStorage.getItem("token")}`,
|
Authorization: `Bearer ${localStorage.getItem("token")}`,
|
||||||
},
|
},
|
||||||
});;
|
});
|
||||||
|
|
||||||
success.value = true;
|
success.value = true;
|
||||||
createdItem.value = response.data.data
|
createdItem.value = response.data.data;
|
||||||
console.log('Item created:', createdItem);
|
console.log('Item created:', createdItem);
|
||||||
|
|
||||||
|
emit('itemAdded'); // 🔔 penting
|
||||||
|
|
||||||
loadNampanList();
|
loadNampanList();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error creating item:', error);
|
console.error('Error creating item:', error);
|
||||||
@ -165,6 +167,7 @@ const createItem = async () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
const addNewItem = () => {
|
const addNewItem = () => {
|
||||||
success.value = false;
|
success.value = false;
|
||||||
selectedNampan.value = '';
|
selectedNampan.value = '';
|
||||||
|
|||||||
@ -185,40 +185,57 @@ const printQR = () => {
|
|||||||
<head>
|
<head>
|
||||||
<title>Print QR Code - ${selectedItem.value.kode_item}</title>
|
<title>Print QR Code - ${selectedItem.value.kode_item}</title>
|
||||||
<style>
|
<style>
|
||||||
|
@page {
|
||||||
|
size: 60mm 50mm;
|
||||||
|
margin: 1mm;
|
||||||
|
}
|
||||||
|
* {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
body {
|
body {
|
||||||
font-family: Arial, sans-serif;
|
font-family: Arial, sans-serif;
|
||||||
text-align: center;
|
display: flex;
|
||||||
padding: 20px;
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
height: 100vh;
|
||||||
|
width: 100vw;
|
||||||
}
|
}
|
||||||
.qr-container {
|
.qr-container {
|
||||||
border: 2px solid #ccc;
|
text-align: center;
|
||||||
padding: 20px;
|
width: 100%;
|
||||||
display: inline-block;
|
|
||||||
margin: 20px;
|
|
||||||
}
|
}
|
||||||
.item-info {
|
.qr-img {
|
||||||
margin-top: 10px;
|
width: 40mm;
|
||||||
font-size: 14px;
|
height: 40mm;
|
||||||
|
margin-bottom: 2mm;
|
||||||
|
}
|
||||||
|
.kode-item {
|
||||||
|
font-weight: bold;
|
||||||
|
font-size: 14pt;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="qr-container">
|
<div class="qr-container">
|
||||||
<img src="${qrCodeUrl.value}" alt="QR Code" style="width: 200px; height: 200px;" />
|
<img id="qr-img" class="qr-img" src="${qrCodeUrl.value}" alt="QR Code" />
|
||||||
<div class="item-info">
|
<div class="kode-item">${selectedItem.value.kode_item}</div>
|
||||||
<div style="font-weight: bold; margin-bottom: 5px;">${selectedItem.value.kode_item}</div>
|
|
||||||
<div>${selectedItem.value.produk.nama}</div>
|
|
||||||
<div style="color: #666; margin-top: 5px;">${selectedItem.value.produk.berat}g</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
`);
|
`);
|
||||||
|
|
||||||
printWindow.document.close();
|
printWindow.document.close();
|
||||||
printWindow.print();
|
|
||||||
|
const img = printWindow.document.getElementById("qr-img");
|
||||||
|
img.onload = () => {
|
||||||
|
printWindow.focus();
|
||||||
|
printWindow.print();
|
||||||
|
};
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
const showDeleteConfirm = ref(false);
|
const showDeleteConfirm = ref(false);
|
||||||
|
|
||||||
const confirmDelete = async () => {
|
const confirmDelete = async () => {
|
||||||
|
|||||||
@ -10,7 +10,10 @@
|
|||||||
<div class="flex-1">
|
<div class="flex-1">
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<label class="block text-D mb-1">Nama Produk</label>
|
<label class="block text-D mb-1">Nama Produk</label>
|
||||||
<InputField v-model="form.nama" type="text" placeholder="Masukkan nama produk" />
|
<InputField v-model="form.nama" type="text" placeholder="Masukkan nama produk" @input="errors.nama = null" />
|
||||||
|
<p v-if="errors.nama" class="text-sm text-red-500 mt-1">
|
||||||
|
{{ errors.nama[0] }}
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
@ -164,7 +167,7 @@ const uploadedImages = ref([]);
|
|||||||
const isDragging = ref(false);
|
const isDragging = ref(false);
|
||||||
const uploadError = ref('');
|
const uploadError = ref('');
|
||||||
const fileInput = ref(null);
|
const fileInput = ref(null);
|
||||||
|
const errors = ref({});
|
||||||
const openItemModal = ref(false);
|
const openItemModal = ref(false);
|
||||||
const createdProduct = ref(null);
|
const createdProduct = ref(null);
|
||||||
|
|
||||||
@ -350,15 +353,16 @@ const submitForm = async (addItem) => {
|
|||||||
window.location.href = '/produk?message=Produk berhasil disimpan';
|
window.location.href = '/produk?message=Produk berhasil disimpan';
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Submit error:', error);
|
console.error('Submit error:', error);
|
||||||
|
|
||||||
if (error.response?.data?.errors) {
|
if (error.response?.status === 422 && error.response.data?.errors) {
|
||||||
const errors = Object.values(error.response.data.errors).flat();
|
// 🔥 simpan error validasi dari backend
|
||||||
alert('Error: ' + errors.join(', '));
|
errors.value = error.response.data.errors;
|
||||||
} else {
|
} else {
|
||||||
alert('Gagal menyimpan produk: ' + (error.response?.data?.message || error.message));
|
uploadError.value = error.response?.data?.message || 'Gagal menyimpan produk';
|
||||||
}
|
}
|
||||||
} finally {
|
}
|
||||||
|
finally {
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,7 +1,13 @@
|
|||||||
<template>
|
<template>
|
||||||
<mainLayout>
|
<mainLayout>
|
||||||
<!-- Modal Buat Item -->
|
<!-- Modal Buat Item -->
|
||||||
<CreateItemModal :isOpen="creatingItem" :product="detail" @close="closeItemModal" />
|
<CreateItemModal
|
||||||
|
:isOpen="creatingItem"
|
||||||
|
:product="detail"
|
||||||
|
@close="closeItemModal"
|
||||||
|
@itemAdded="handleItemAdded"
|
||||||
|
/>
|
||||||
|
|
||||||
|
|
||||||
<!-- Modal Konfirmasi Hapus Produk -->
|
<!-- Modal Konfirmasi Hapus Produk -->
|
||||||
<ConfirmDeleteModal :isOpen="deleting" @cancel="deleting = false" @confirm="deleteProduk" title="Hapus Produk"
|
<ConfirmDeleteModal :isOpen="deleting" @cancel="deleting = false" @confirm="deleteProduk" title="Hapus Produk"
|
||||||
@ -268,6 +274,15 @@ function formatNumber(num) {
|
|||||||
return new Intl.NumberFormat().format(num || 0);
|
return new Intl.NumberFormat().format(num || 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function handleItemAdded() {
|
||||||
|
if (detail.value) {
|
||||||
|
detail.value.items_count++;
|
||||||
|
}
|
||||||
|
creatingItem.value = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Hapus produk
|
// Hapus produk
|
||||||
async function deleteProduk() {
|
async function deleteProduk() {
|
||||||
try {
|
try {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user