From 5e26f4848933a438df31bc90e30af88509a9e7df Mon Sep 17 00:00:00 2001 From: JokoPrasetio Date: Mon, 1 Sep 2025 13:04:39 +0700 Subject: [PATCH] done permintaan gizi : nama karyawan bisa input, dan tidak ada add catatan pada download verfikasi pekerjaan --- app/Http/Controllers/CustomerController.php | 2 +- public/js/checkout/index.js | 38 ++++++++++++++++--- .../views/dashboard/label/index.blade.php | 9 +++-- .../dashboard/pesanan/pekerjaan/pdf.blade.php | 3 +- 4 files changed, 42 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 1c84dcf..bfb284c 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -285,7 +285,7 @@ class CustomerController extends Controller 'entry_at' => Carbon::now()->format('Y-m-d H:i:s.u'), ]; if($jenisCustomer === "Karyawan RSAB Harapan Kita"){ - $nip_pns = Karyawan::where('namalengkap',$biodataResult['nama_pemesan'])->first()->nip_pns; + $nip_pns = Karyawan::where('namalengkap',$biodataResult['nama_pemesan'])->first()?->nip_pns; $payloadOrder['nip'] = $nip_pns ?? null; $payloadOrder['bagian_instalasi'] = $biodataResult['bagian_instalasi'] ?? null; $payloadOrder['no_ekstensien'] = $biodataResult['no_ekstensien'] ?? null; diff --git a/public/js/checkout/index.js b/public/js/checkout/index.js index b0ce021..0590508 100644 --- a/public/js/checkout/index.js +++ b/public/js/checkout/index.js @@ -785,20 +785,42 @@ function hitungTotalHarga(){ function copyNoRek() { const text = document.getElementById('noRekText').innerText; navigator.clipboard.writeText(text).then(() => { - alert("Nomor rekening berhasil disalin: " + text); + Swal.fire({ + icon: 'success', + title: 'Disalin!', + text: 'Nomor rekening berhasil disalin: ' + text, + showConfirmButton: false, + timer: 1500 + }); }).catch(err => { console.error('Gagal menyalin: ', err); - alert("Gagal menyalin teks."); + Swal.fire({ + icon: 'warning', + text: 'Gagal menyalin teks: ' + text, + showConfirmButton: false, + timer: 2000 + }); }); } function copyNoOrder() { const text = document.getElementById('no_order_display').innerText; navigator.clipboard.writeText(text).then(() => { - alert("Nomor order berhasil disalin: " + text); + Swal.fire({ + icon: 'success', + title: 'Disalin!', + text: 'Nomor order berhasil disalin: ' + text, + showConfirmButton: false, + timer: 1500 + }); }).catch(err => { console.error('Gagal menyalin: ', err); - alert("Gagal menyalin teks."); + Swal.fire({ + icon: 'warning', + text: 'Gagal menyalin teks: ' + text, + showConfirmButton: false, + timer: 2000 + }); }); } @@ -985,7 +1007,13 @@ function selectKaryawan(){ valueField: 'label', // sama dengan labelField labelField: 'label', searchField: ['label'], - create: false, + create: function(input) { + return { + label: input, + value: input + }; + }, + createOnBlur: true, placeholder: "Cari nama karyawan...", maxItems: 1, load: function (query, callback) { diff --git a/resources/views/dashboard/label/index.blade.php b/resources/views/dashboard/label/index.blade.php index b26950e..50668e3 100644 --- a/resources/views/dashboard/label/index.blade.php +++ b/resources/views/dashboard/label/index.blade.php @@ -148,9 +148,12 @@ @if($label->total_kalori) Total Kalori: {{ $label->total_kalori }} @endif - @if($label->order?->jenis_customer !== 'MCU') - Harga Satuan: Rp {{ number_format($label?->harga_satuan, 0, ',', '.') }} - @endif + Catatan + : + + {{ $label?->catatan ?? '-' }} + + Tanggal Produksi: {{ $label?->tgl_antar ? \Carbon\Carbon::parse($label->tgl_antar)->translatedFormat('d F Y') : '-' }} No. Telp: {{ $label?->order?->no_wa ?? '-' }} @if ($label?->order?->alamat) diff --git a/resources/views/dashboard/pesanan/pekerjaan/pdf.blade.php b/resources/views/dashboard/pesanan/pekerjaan/pdf.blade.php index 1933291..8b51a27 100644 --- a/resources/views/dashboard/pesanan/pekerjaan/pdf.blade.php +++ b/resources/views/dashboard/pesanan/pekerjaan/pdf.blade.php @@ -75,7 +75,6 @@ } th:nth-child(6), td:nth-child(6) { - width: 110px; text-align: center; } @@ -126,6 +125,7 @@ Waktu Makan
/Jam Layanan Menu Karbohidrat + Catatan Total Kalori Keterangan Jumlah @@ -157,6 +157,7 @@ - @endif + {{ $row['catatan'] ? $row['catatan'] . ' kal' : '' }} {{ $row['total_kalori'] ? $row['total_kalori'] . ' kal' : '' }} @php