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

This commit is contained in:
dhilanradya 2025-10-14 13:30:31 +07:00
commit 39879b247f
11 changed files with 201 additions and 170 deletions

View File

@ -44,9 +44,13 @@ class ItemController extends Controller
*/
public function show(string $kode_item)
{
$item = Item::with(['produk.foto', 'nampan'])
->where('kode_item', $kode_item)
->first();
$query = Item::with(['produk.foto', 'nampan']);
if (is_numeric($kode_item)) {
$item = $query->where('id', (int)$kode_item)->first();
} else {
$item = $query->where('kode_item', $kode_item)->first();
}
if (!$item) {
return response()->json(['message' => 'Item tidak ditemukan'], 404);

View File

@ -27,14 +27,13 @@ class NampanController extends Controller
'nama' => 'required|string|max:10|unique:nampans,nama',
],
[
'nama.required' => 'Nama nampan harus diisi.',
'nama.max' => 'Nama nampan maksimal 10 karakter.',
'nama.unique' => 'Nampan dengan nama yang sama sudah ada.',
'nama.max' => 'Nama nampan maksimal 10 karakter.'
'nama.required' => 'Nama nampan harus diisi.'
]);
Nampan::create($validated);
return response()->json([
'message' => 'Nampan berhasil dibuat'
],201);
@ -59,7 +58,9 @@ class NampanController extends Controller
'nama' => 'required|string|max:10|unique:nampans,nama,'.$id,
],
[
'nama' => 'Nama nampan harus diisi.'
'nama.max' => 'Nama nampan maksimal 10 karakter.',
'nama.unique' => 'Nampan dengan nama yang sama sudah ada.',
'nama.required' => 'Nama nampan harus diisi.'
]);
$nampan = Nampan::findOrFail($id);

View File

@ -13,7 +13,7 @@ return new class extends Migration
{
Schema::create('nampans', function (Blueprint $table) {
$table->id();
$table->string('nama', 100)->unique();
$table->string('nama', 10)->unique();
$table->timestamps();
});
}

View File

@ -0,0 +1,62 @@
<?php
namespace Database\Seeders;
use App\Models\Kategori;
use App\Models\Nampan;
use App\Models\Produk;
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
use Illuminate\Database\Seeder;
class DataSeeder extends Seeder
{
/**
* Run the database seeds.
*/
public function run(): void
{
// Nampan
for ($i=0; $i < 30; $i++) {
if ($i != 12) {
Nampan::factory()->create([
'nama' => 'A' . ($i + 1)
]);
}
}
// Kategori
$kategoriList = ['Cincin', 'Gelang Rantai', 'Gelang Bulat', 'Kalung', 'Liontin', 'Anting', 'Giwang'];
foreach ($kategoriList as $kategori) {
Kategori::factory()->create([
'nama' => $kategori
]);
}
// Produk
$produk1 = Produk::factory()->create([
'nama'=>'Gelang serut daun shimmer mp (mas putih)',
'id_kategori'=>Kategori::find(2),
'berat'=>1.4,
'kadar'=>8,
'harga_per_gram'=>900000,
'harga_jual'=>1260000,
]);
$produk1->foto()->create([
'id_produk'=>$produk1->id,
'url'=>'https://i.imgur.com/eGYHzvw.jpeg'
]);
$produk2 = Produk::factory()->create([
'nama'=>'Gelang rantai 5 buah clover merah',
'id_kategori'=>Kategori::find(2),
'berat'=>3.6,
'kadar'=>8,
'harga_per_gram'=>850000,
'harga_jual'=>3060000,
]);
$produk2->foto()->create([
'id_produk'=>$produk2->id,
'url'=>'https://i.imgur.com/UjQzYoE.jpeg'
]);
}
}

View File

@ -20,109 +20,23 @@ class DatabaseSeeder extends Seeder
public function run(): void
{
User::factory()->create([
'nama' => 'andre',
'nama' => 'admin',
'role' => 'owner',
'password' => bcrypt('123123'),
]);
User::factory()->create([
'nama' => 'luis',
'nama' => 'kasir',
'role' => 'kasir',
'password' => bcrypt('123123'),
]);
User::factory(2)->create();
Sales::factory(5)->create();
for ($i=0; $i < 30; $i++) {
if ($i != 12) {
Nampan::factory()->create([
'nama' => 'A' . ($i + 1)
]);
}
}
$kategoriList = ['Cincin', 'Gelang Rantai', 'Gelang Bulat', 'Kalung', 'Liontin', 'Anting', 'Giwang'];
foreach ($kategoriList as $kategori) {
Kategori::factory()->create([
'nama' => $kategori
]);
}
// Produk::factory(10)->create()->each(function ($produk) {
// // setiap produk punya 1-3 foto
// $jumlah_foto = rand(1, 3);
// $fotoData = [];
// for ($i = 0; $i < $jumlah_foto; $i++) {
// $fotoData[] = [
// // 'url' => 'https://random-image-pepebigotes.vercel.app/api/random-image'
// 'url' => 'https://static.promediateknologi.id/crop/0x0:0x0/0x0/webp/photo/p2/255/2024/12/10/Screenshot_2024-12-10-11-50-18-88_1c337646f29875672b5a61192b9010f9-1-1282380831.jpg'
// ];
// }
// $produk->foto()->createMany($fotoData);
// $jumlah_item = rand(1, 20);
// Item::factory($jumlah_item)->create([
// 'id_produk' => $produk->id,
// ]);
// });
$produk1 = Produk::factory()->create([
'nama'=>'Gelang serut daun shimmer mp (mas putih)',
'id_kategori'=>Kategori::find(2),
'berat'=>1.4,
'kadar'=>8,
'harga_per_gram'=>900000,
'harga_jual'=>1260000,
]);
$produk1->foto()->create([
'id_produk'=>$produk1->id,
'url'=>'https://i.imgur.com/eGYHzvw.jpeg'
Sales::factory()->create([
'nama' => 'Umum',
'no_hp' => '-',
'alamat' => '-',
]);
$produk2 = Produk::factory()->create([
'nama'=>'Gelang rantai 5 buah clover merah',
'id_kategori'=>Kategori::find(2),
'berat'=>3.6,
'kadar'=>8,
'harga_per_gram'=>850000,
'harga_jual'=>3060000,
]);
$produk2->foto()->create([
'id_produk'=>$produk2->id,
'url'=>'https://i.imgur.com/UjQzYoE.jpeg'
]);
Item::factory(500)->create();
// 75% peluang item masuk nampan, sisanya di brankas
$nampans = Nampan::all()->pluck('id')->toArray();
$jumlahNampan = count($nampans);
$counter = 0;
foreach (Item::all() as $item) {
if (rand(1, 100) <= 75) {
$item->update([
'id_nampan' => $nampans[$counter % $jumlahNampan],
]);
$counter++;
}
}
Transaksi::factory(250)->create()->each(function ($transaksi) {
$jumlah_item = rand(1, 2);
$items = Item::with('produk')->inRandomOrder()->limit($jumlah_item)->get();
if ($items->isEmpty()) return;
$total_harga = $transaksi->total_harga;
foreach ($items as $item) {
$transaksi->itemTransaksi()->create([
'id_produk' => $item->produk->id,
'harga_deal' => $item->produk->harga_jual,
'posisi_asal' => $item->id_nampan ? $item->nampan->nama : 'Brankas',
]);
$item->delete();
$total_harga += $item->produk->harga_jual;
}
$transaksi->update(['total_harga' => $total_harga]);
});
$this->call(DataSeeder::class);
$this->call(DummySeeder::class);
}
}

View File

@ -0,0 +1,56 @@
<?php
namespace Database\Seeders;
use App\Models\Item;
use App\Models\Nampan;
use App\Models\Sales;
use App\Models\Transaksi;
use App\Models\User;
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
use Illuminate\Database\Seeder;
class DummySeeder extends Seeder
{
/**
* Run the database seeds.
*/
public function run(): void
{
User::factory(2)->create();
Sales::factory(5)->create();
Item::factory(500)->create();
// 75% peluang item masuk nampan, sisanya di brankas
$nampans = Nampan::all()->pluck('id')->toArray();
$jumlahNampan = count($nampans);
$counter = 0;
foreach (Item::all() as $item) {
if (rand(1, 100) <= 75) {
$item->update([
'id_nampan' => $nampans[$counter % $jumlahNampan],
]);
$counter++;
}
}
Transaksi::factory(250)->create()->each(function ($transaksi) {
$jumlah_item = rand(1, 2);
$items = Item::with('produk')->inRandomOrder()->limit($jumlah_item)->get();
if ($items->isEmpty()) return;
$total_harga = $transaksi->total_harga;
foreach ($items as $item) {
$transaksi->itemTransaksi()->create([
'id_produk' => $item->produk->id,
'harga_deal' => $item->produk->harga_jual,
'posisi_asal' => $item->id_nampan ? $item->nampan->nama : 'Brankas',
]);
$item->delete();
$total_harga += $item->produk->harga_jual;
}
$transaksi->update(['total_harga' => $total_harga]);
});
}
}

View File

@ -66,10 +66,10 @@
<!-- Modal Pindah Nampan -->
<div v-if="isPopupVisible" class="fixed inset-0 bg-black/75 flex items-center justify-center p-4 z-50 backdrop-blur-sm">
<div class="bg-white rounded-xl shadow-lg max-w-sm w-full p-6 relative transform transition-all duration-300 scale-95 opacity-0 animate-fadeIn">
<!-- QR Code -->
<!-- Barcode -->
<div class="flex justify-center mb-4">
<div class="p-2 border border-C rounded-lg">
<img :src="qrCodeUrl" alt="QR Code" class="size-36" />
<img :src="barcodeUrl" alt="Barcode" class="w-64 h-24" />
</div>
</div>
@ -201,11 +201,11 @@ const confirmModalMessage = ref("");
const confirmText = ref("Ya, Konfirmasi");
const cancelText = ref("Batal");
// QR Code generator
const qrCodeUrl = computed(() => {
// Barcode generator (Code128)
const barcodeUrl = computed(() => {
if (selectedItem.value) {
const data = selectedItem.value.kode_item;
return `https://api.qrserver.com/v1/create-qr-code/?size=150x150&data=${encodeURIComponent(data)}`;
return `https://barcode.tec-it.com/barcode.ashx?data=${encodeURIComponent(data)}&code=Code128&dpi=96`;
}
return "";
});
@ -333,15 +333,15 @@ const handleConfirmAction = async () => {
// Fungsi utilitas
const printQR = () => {
if (qrCodeUrl.value) {
if (barcodeUrl.value) {
const printWindow = window.open('', '_blank');
printWindow.document.write(`
<html>
<head>
<title>Print QR Code - ${selectedItem.value.kode_item}</title>
<title>Print Barcode - ${selectedItem.value.kode_item}</title>
<style>
@page {
size: 60mm 50mm;
size: 80mm 40mm;
margin: 1mm;
}
body {
@ -354,12 +354,12 @@ const printQR = () => {
justify-content: center;
height: 100vh;
}
.qr-container {
.barcode-container {
text-align: center;
}
.qr-img {
width: 40mm;
height: 40mm;
.barcode-img {
width: 70mm;
height: 25mm;
margin-bottom: 2mm;
}
.item-info {
@ -369,8 +369,8 @@ const printQR = () => {
</style>
</head>
<body>
<div class="qr-container">
<img class="qr-img" src="${qrCodeUrl.value}" alt="QR Code"
<div class="barcode-container">
<img class="barcode-img" src="${barcodeUrl.value}" alt="Barcode"
onload="window.print()" />
<div class="item-info">
${selectedItem.value.kode_item}

View File

@ -88,7 +88,7 @@
<div class="bg-white rounded-xl shadow-lg max-w-sm w-full p-6 relative">
<div class="flex justify-center mb-2">
<div class="p-2 border rounded-lg">
<img :src="qrCodeUrl" alt="QR Code" class="size-36" />
<img :src="barcodeUrl" alt="Barcode" class="w-64 h-24" />
</div>
</div>
@ -167,25 +167,25 @@ const selectedItem = ref(null);
const selectedTrayId = ref("");
const showDeleteConfirm = ref(false);
// QR Code generator
const qrCodeUrl = computed(() => {
// Barcode generator (Code128)
const barcodeUrl = computed(() => {
if (selectedItem.value) {
const data = selectedItem.value.kode_item;
return `https://api.qrserver.com/v1/create-qr-code/?size=150x150&data=${encodeURIComponent(data)}`;
return `https://barcode.tec-it.com/barcode.ashx?data=${encodeURIComponent(data)}&code=Code128&dpi=96`;
}
return "";
});
const printQR = () => {
if (qrCodeUrl.value) {
if (barcodeUrl.value) {
const printWindow = window.open('', '_blank');
printWindow.document.write(`
<html>
<head>
<title>Print QR Code - ${selectedItem.value.kode_item}</title>
<title>Print Barcode - ${selectedItem.value.kode_item}</title>
<style>
@page {
size: 60mm 50mm;
size: 80mm 40mm;
margin: 1mm;
}
* {
@ -200,13 +200,13 @@ const printQR = () => {
height: 100vh;
width: 100vw;
}
.qr-container {
.barcode-container {
text-align: center;
width: 100%;
}
.qr-img {
width: 40mm;
height: 40mm;
.barcode-img {
width: 70mm;
height: 25mm;
margin-bottom: 2mm;
}
.kode-item {
@ -216,8 +216,8 @@ const printQR = () => {
</style>
</head>
<body>
<div class="qr-container">
<img id="qr-img" class="qr-img" src="${qrCodeUrl.value}" alt="QR Code" />
<div class="barcode-container">
<img id="barcode-img" class="barcode-img" src="${barcodeUrl.value}" alt="Barcode" />
<div class="kode-item">${selectedItem.value.kode_item}</div>
</div>
</body>
@ -226,7 +226,7 @@ const printQR = () => {
printWindow.document.close();
const img = printWindow.document.getElementById("qr-img");
const img = printWindow.document.getElementById("barcode-img");
img.onload = () => {
printWindow.focus();
printWindow.print();

View File

@ -77,7 +77,11 @@ const handleLogin = async () => {
window.location.href = data.redirect;
} catch (error) {
if (error.response?.data?.message) {
errorMessage.value = error.response.data.message;
if (error.response.data.message.includes("Nama atau password salah")) {
errorMessage.value = "Login gagal. Periksa username atau password.";
} else {
errorMessage.value = "Terjadi kesalahan pada server";
}
} else {
errorMessage.value = "Login gagal. Periksa username atau password.";
}

View File

@ -1,13 +1,7 @@
<template>
<mainLayout>
<!-- Modal Buat Item -->
<CreateItemModal
:isOpen="creatingItem"
:product="detail"
@close="closeItemModal"
@itemAdded="handleItemAdded"
/>
<CreateItemModal :isOpen="creatingItem" :product="detail" @close="closeItemModal" @itemAdded="handleItemAdded" />
<!-- Modal Konfirmasi Hapus Produk -->
<ConfirmDeleteModal :isOpen="deleting" @cancel="deleting = false" @confirm="deleteProduk" title="Hapus Produk"
@ -51,26 +45,20 @@
</div>
</div>
<!-- 🔹 Alert Message -->
<div class="my-5" v-if="alert">
<div
v-if="alert.error"
class="text-[#721c24] bg-[#f8d7da] border-l-4 border-[#dc3545] p-3 mb-5 rounded"
role="alert"
>
<strong class="font-bold">Error! </strong>
<span class="block sm:inline">{{ alert.error }}</span>
<!-- 🔹 Alert Message -->
<div class="my-5" v-if="alert">
<div v-if="alert.error" class="text-[#721c24] bg-[#f8d7da] border-l-4 border-[#dc3545] p-3 mb-5 rounded"
role="alert">
<strong class="font-bold">Error! </strong>
<span class="block sm:inline">{{ alert.error }}</span>
</div>
<div v-if="alert.success" class="text-[#155724] bg-[#d4edda] border-l-4 border-[#28a745] p-3 mb-5 rounded"
role="alert">
<strong class="font-bold">Success! </strong>
<span class="block sm:inline">{{ alert.success }}</span>
</div>
</div>
<div
v-if="alert.success"
class="text-[#155724] bg-[#d4edda] border-l-4 border-[#28a745] p-3 mb-5 rounded"
role="alert"
>
<strong class="font-bold">Success! </strong>
<span class="block sm:inline">{{ alert.success }}</span>
</div>
</div>
<!-- 🔹 End Alert -->
<!-- 🔹 End Alert -->
<!-- 🔵 Loading State (sama persis dengan kategori) -->
<div v-if="loading" class="flex justify-center items-center h-screen">
@ -189,12 +177,12 @@ const kategori = ref([]);
const loading = ref(false);
function showAlert(type, message) {
alert.value = { [type]: message };
clearTimeout(timer.value);
timer.value = setTimeout(() => {
alert.value = null;
}, 5000);
}
alert.value = { [type]: message };
clearTimeout(timer.value);
timer.value = setTimeout(() => {
alert.value = null;
}, 5000);
}
// Load kategori
const loadKategori = async () => {
@ -319,11 +307,8 @@ function handleItemAdded() {
if (detail.value) {
detail.value.items_count++;
}
creatingItem.value = false;
}
// Hapus produk
async function deleteProduk() {
try {

View File

@ -99,7 +99,10 @@ const saveTray = async () => {
}
try {
const token = localStorage.getItem("token");
const headers = { Authorization: `Bearer ${token}` };
const headers = {
Accept: 'application/json',
Authorization: `Bearer ${token}`
};
if (editingTrayId.value) {
await axios.put(`/api/nampan/${editingTrayId.value}`, { nama: trayName.value }, { headers });
alert.value = { success: "Nampan berhasil diperbarui" };
@ -110,11 +113,13 @@ const saveTray = async () => {
timer.value = setTimeout(() => { alert.value = null; }, 5000);
closeModal();
if (trayList.value) {
await trayList.value.refreshData(); // Call refreshData on TrayList
await trayList.value.refreshData();
}
} catch (error) {
console.error(error);
errorCreate.value = error.response?.data?.message || "Gagal menyimpan nampan.";
const errors = error.response?.data?.errors?.nama || [];
console.log(errors);
errorCreate.value = errors[0] || 'Gagal menyimpan nampan.';
clearTimeout(timer.value);
timer.value = setTimeout(() => { errorCreate.value = ""; }, 3000);
}