From 3e5fb5be1d7333e4101f14cdafb0e9ef678cdd2c Mon Sep 17 00:00:00 2001 From: JokoPrasetio Date: Tue, 5 Aug 2025 00:25:29 +0700 Subject: [PATCH] progress --- app/Http/Controllers/CustomerController.php | 2 +- public/js/checkout/index.js | 32 +++++++++++++-------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 29394ce..7812906 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -248,7 +248,7 @@ class CustomerController extends Controller foreach ($dataCart as $cart) { $payloadOrderDetail = [ 'order_id' => $order->order_id, - 'harga_satuan' => $jenisCustomer === "Karyawan RSAB Harapan Kita" ? $cart['harga_karyawan'] : $cart['harga_kp'], + 'harga_satuan' => $jenisCustomer === "Karyawan RSAB Harapan Kita" ? $cart['harga_karyawan'] : $cart['harga_public'], 'status_order' => "Pending" ]; foreach ($cart['pesanan'] as $value) { diff --git a/public/js/checkout/index.js b/public/js/checkout/index.js index c744b70..442c28c 100644 --- a/public/js/checkout/index.js +++ b/public/js/checkout/index.js @@ -32,7 +32,19 @@ document.addEventListener('DOMContentLoaded', () => { alert(errorMessage); return } + let checkout_biodata = JSON.parse(sessionStorage.getItem('checkout_biodata') || '{}'); + if (!checkout_biodata.nama_pemesan) { + Swal.fire({ + title: 'Biodata Belum Terisi!', + text: 'Lakukan Pengisian biodata terlebih dahulu.', + icon: 'warning', + confirmButtonText: 'oke!', + }).then(() => { + window.location.href = "/checkout"; + }); + return + } let cart = JSON.parse(sessionStorage.getItem('cart') || '[]'); for (const item of cart) { for (const p of item.pesanan) { @@ -45,12 +57,7 @@ document.addEventListener('DOMContentLoaded', () => { } } - let checkout_biodata = JSON.parse(sessionStorage.getItem('checkout_biodata') || '{}'); - - if (!checkout_biodata.nama_pemesan) { - window.location.href = "/"; - return; - } + if (!sessionStorage.getItem('order_id')) { await submitOrderToServer(); // async function simpan ke server @@ -232,7 +239,6 @@ function renderCartSummary() { const disableSiang = isToday && jam >= 10; const disableSore = isToday && jam >= 13; const countDate = pesananList.length; - console.log(item.apakah_someday); pesananHTML += `
@@ -352,11 +358,13 @@ function renderCartSummary() { : ''}
Silakan isi tanggal pemesanan dan pilih karbohidrat yang diinginkan
${pesananHTML} +
+ ' +
Total: Rp ${itemTotal.toLocaleString('id-ID')}
@@ -611,9 +619,9 @@ function initFlatpickrTersedia(item, i) { const totalMenitFlatSekarang = jamFlat * 60 + menitFlat; const menitBatasFlat = 13 * 60; - + const lewatBatasNormal = totalMenitFlatSekarang >= menitBatasFlat; - + // Ambil string tgl_tersedia dan ubah jadi array tanggal lengkap const dayNumbers = (item.tgl_tersedia || "") .split(',') @@ -642,8 +650,8 @@ function initFlatpickrTersedia(item, i) { availableDates.push(fullDateStr); } else { const selisihHari = Math.floor((fullDate - now) / (1000 * 60 * 60 * 24)); - - if (selisihHari >= 1 || (selisihHari === 1 && !lewatBatasNormal)) { + + if (selisihHari >= 1 || (selisihHari === 1 && !lewatBatasNormal)) { availableDates.push(fullDateStr); } }