diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index d99d18e..739c59f 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -21,7 +21,8 @@ class CustomerController extends Controller public function index(){ $payload = [ - 'title' => 'Halaman Utama' + 'title' => 'Halaman Utama', + 'mcu' => false, ]; return view('guest.index', $payload); } @@ -248,7 +249,8 @@ class CustomerController extends Controller $karbohidrat = Karbohidrat::where('statusenabled', true)->select('karbohidrat_id', 'nama_karbohidrat', 'nilai_kalori')->get(); $payload = [ 'title' => 'Checkout ', - 'karbohidrat' => $karbohidrat + 'karbohidrat' => $karbohidrat, + 'mcu' => false, ]; return view('guest.checkout.checkout_payment', $payload); } @@ -389,7 +391,8 @@ class CustomerController extends Controller } $payload = [ 'title' => 'Berhasil Melakukan Pembayaran ', - 'no_order' => session('no_order') + 'no_order' => session('no_order'), + 'mcu' => false, ]; return view('guest.success_page', $payload); } @@ -397,7 +400,8 @@ class CustomerController extends Controller public function checkOrder(){ $payload = [ - 'title' => 'Check Order' + 'title' => 'Check Order', + 'mcu' => false, ]; return view('guest.check_order.index', $payload); } @@ -481,7 +485,8 @@ class CustomerController extends Controller $paketMcu = MasterMcu::where('statusenabled', true)->get(); $data = [ 'title' => 'Order Gizi MCU', - 'paketMcu' => $paketMcu + 'paketMcu' => $paketMcu, + 'mcu' => true, ]; return view('guest.mcu.index', $data); } @@ -504,6 +509,7 @@ class CustomerController extends Controller 'no_wa' => request('no_hp') ?? null, 'tinggi_badan' => request('tinggi_badan') ?? null, 'berat_badan' => request('berat_badan') ?? null, + 'nama_institusi' => request('nama_institusi'), 'status_order' =>'Menunggu Konfirmasi Pesanan MCU', 'total_harga' => $priceMcu ? $priceMcu->harga : null, 'cara_pembayaran' =>'MCU', @@ -544,7 +550,8 @@ class CustomerController extends Controller $payload = [ 'title' => 'Berhasil Melakukan Pesanan ', 'no_order' => session('no_order'), - 'back_href' => '/order-mcu' + 'back_href' => '/order-mcu', + 'mcu' => false ]; return view('guest.success_page', $payload); } diff --git a/app/Http/Controllers/PesananController.php b/app/Http/Controllers/PesananController.php index 8a80cec..71acfa7 100644 --- a/app/Http/Controllers/PesananController.php +++ b/app/Http/Controllers/PesananController.php @@ -57,6 +57,7 @@ class PesananController extends Controller 'o.bukti_pembayaran', 'o.note_dibatalkan', 'o.medical_record', + 'o.nama_institusi', 'od.status_order as detail_status_order' )->get()->groupBy('order_id'); $grouped = $orders->map(function($items){ @@ -79,6 +80,7 @@ class PesananController extends Controller 'total_detail' => $totalDetail, 'selesai_detail' => $selesaiDetail, 'note_dibatalkan' => $first->note_dibatalkan, + 'nama_institusi' => $first->nama_institusi, ]; }) ->filter(function($item){ @@ -217,6 +219,7 @@ class PesananController extends Controller 'o.note_dibatalkan', 'o.medical_record', 'o.evidence_medical_record', + 'o.nama_institusi', 'od.status_order as detail_status_order' )->get()->groupBy('order_id'); @@ -241,6 +244,7 @@ class PesananController extends Controller 'total_detail' => $totalDetail, 'selesai_detail' => $selesaiDetail, 'note_dibatalkan' => $first->note_dibatalkan, + 'nama_institusi' => $first->nama_institusi, ]; }) ->filter(function($item){ @@ -366,7 +370,7 @@ class PesananController extends Controller $sheet->setCellValue("A{$row}", $index + 1); $sheet->setCellValue("B{$row}", $item?->order?->no_order); $sheet->setCellValue("C{$row}", $item?->order?->nama_pemesan); - $sheet->setCellValue("D{$row}", $item?->order?->jenis_customer); + $sheet->setCellValue("D{$row}", $item?->order?->jenis_customer === "MCU" ? $item?->order?->nama_institusi . '- MCU' : $item?->order?->jenis_customer); $sheet->setCellValue("E{$row}", $item?->status_order ?? "-"); $sheet->setCellValue("F{$row}", $item?->menu?->nama_menu ?? $item?->masterMcu?->nama_mcu); $karbohidratNama = $item?->karbohidrat?->nama_karbohidrat ?? '-'; @@ -480,7 +484,7 @@ class PesananController extends Controller $sheet->setCellValue("A{$row}", $index + 1); $sheet->setCellValue("B{$row}", $item->no_order); $sheet->setCellValue("C{$row}", $item->nama_pemesan); - $sheet->setCellValue("D{$row}", $item->jenis_customer); + $sheet->setCellValue("D{$row}", $item->jenis_customer === "MCU" ? $item->nama_institusi . '-' . $item->jenis_customer : $item->jenis_customer); $sheet->setCellValue("E{$row}", $item->status_order); $sheet->setCellValue("F{$row}", $item->jenis_kelamin); $sheet->setCellValue("G{$row}", $item->no_wa); @@ -601,6 +605,7 @@ class PesananController extends Controller 'total_detail' => $totalDetail, 'selesai_detail' => $selesaiDetail, 'note_dibatalkan' => $first->note_dibatalkan, + 'nama_institusi' => $first->nama_institusi, ]; }) ->values(); @@ -633,6 +638,7 @@ class PesananController extends Controller 'o.note_dibatalkan', 'o.medical_record', 'o.evidence_medical_record', + 'o.nama_institusi', 'od.status_order as detail_status_order' )->get()->groupBy('order_id'); return $data; @@ -714,7 +720,7 @@ class PesananController extends Controller $sheet->setCellValue("A{$row}", $index + 1); $sheet->setCellValue("B{$row}", $item->no_order); $sheet->setCellValue("C{$row}", $item->nama_pemesan); - $sheet->setCellValue("D{$row}", $item->jenis_customer); + $sheet->setCellValue("D{$row}", $item->jenis_customer === "MCU" ? $item->nama_institusi . '-' . $item->jenis_customer : $item->jenis_customer); $sheet->setCellValue("E{$row}", $item->jenis_kelamin); $sheet->setCellValue("F{$row}", $item->no_wa); $sheet->setCellValue("G{$row}", $item->email); @@ -849,7 +855,7 @@ class PesananController extends Controller $sheet->setCellValue("A{$row}", $index + 1); $sheet->setCellValue("B{$row}", $item->no_order); $sheet->setCellValue("C{$row}", $item->nama_pemesan); - $sheet->setCellValue("D{$row}", $item->jenis_customer); + $sheet->setCellValue("D{$row}", $item->jenis_customer === "MCU" ? $item->nama_institusi . ' - ' . $item->jenis_customer : $item->jenis_customer); $sheet->setCellValue("E{$row}", $item->cara_pembayaran); $sheet->setCellValue("F{$row}", Carbon::parse($item->entry_at)->translatedFormat('d F Y H:i')); $sheet->setCellValue("G{$row}", $item->total_harga); @@ -926,6 +932,7 @@ class PesananController extends Controller 'o.note_dibatalkan', 'o.medical_record', 'o.evidence_medical_record', + 'o.nama_institusi', 'od.status_order as detail_status_order' )->get()->groupBy('order_id'); @@ -950,6 +957,7 @@ class PesananController extends Controller 'total_detail' => $totalDetail, 'selesai_detail' => $selesaiDetail, 'note_dibatalkan' => $first->note_dibatalkan, + 'nama_institusi' => $first->nama_institusi, ]; }) ->values(); @@ -966,7 +974,7 @@ class PesananController extends Controller $dataArray = explode(',', $data); $orderDetail = OrderDetail::whereIn('order_detail_id', $dataArray)->with(['masterMcu', 'menu', 'order'])->get(); $pdf = Pdf::loadView('dashboard.label.multi', compact('orderDetail')); - + return $pdf->stream('label_.pdf'); } /** diff --git a/app/Models/Order.php b/app/Models/Order.php index a570412..1c50580 100644 --- a/app/Models/Order.php +++ b/app/Models/Order.php @@ -39,6 +39,7 @@ class Order extends Model 'alamat', 'medical_record', 'evidence_medical_record', + 'nama_institusi' ]; protected $cast = [ diff --git a/public/asset_guests/vendor/js/checkOrderHref.js b/public/asset_guests/vendor/js/checkOrderHref.js index 24f0faa..bf98f58 100644 --- a/public/asset_guests/vendor/js/checkOrderHref.js +++ b/public/asset_guests/vendor/js/checkOrderHref.js @@ -1,3 +1,6 @@ function checkOrderHref(){ window.location.href = '/check-order' } +function mcu(){ + window.location.href = '/order-mcu' +} diff --git a/public/gambar/1NLtrcy20GE5m8e.jpg b/public/gambar/1NLtrcy20GE5m8e.jpg new file mode 100644 index 0000000..1aea8f5 Binary files /dev/null and b/public/gambar/1NLtrcy20GE5m8e.jpg differ diff --git a/public/gambar/CXtFH1srSvubaRK.jpg b/public/gambar/CXtFH1srSvubaRK.jpg new file mode 100644 index 0000000..3bdccb2 Binary files /dev/null and b/public/gambar/CXtFH1srSvubaRK.jpg differ diff --git a/public/gambar/GaQjbwEteuivk8G.jpg b/public/gambar/GaQjbwEteuivk8G.jpg new file mode 100644 index 0000000..d2a5bea Binary files /dev/null and b/public/gambar/GaQjbwEteuivk8G.jpg differ diff --git a/public/gambar/Lh5maoUqSTSHPpk.jpg b/public/gambar/Lh5maoUqSTSHPpk.jpg new file mode 100644 index 0000000..ceff63d Binary files /dev/null and b/public/gambar/Lh5maoUqSTSHPpk.jpg differ diff --git a/public/gambar/MonkDUcZnb2adsT.jpg b/public/gambar/MonkDUcZnb2adsT.jpg new file mode 100644 index 0000000..19b0722 Binary files /dev/null and b/public/gambar/MonkDUcZnb2adsT.jpg differ diff --git a/public/gambar/S1D5M5yyMNxmKWO.jpg b/public/gambar/S1D5M5yyMNxmKWO.jpg new file mode 100644 index 0000000..bb0f3de Binary files /dev/null and b/public/gambar/S1D5M5yyMNxmKWO.jpg differ diff --git a/public/gambar/T3ykjc5sLJCJ3ys.jpg b/public/gambar/T3ykjc5sLJCJ3ys.jpg new file mode 100644 index 0000000..2023f0c Binary files /dev/null and b/public/gambar/T3ykjc5sLJCJ3ys.jpg differ diff --git a/public/gambar/bt6RNaVgLohDg74.jpg b/public/gambar/bt6RNaVgLohDg74.jpg new file mode 100644 index 0000000..20bfa61 Binary files /dev/null and b/public/gambar/bt6RNaVgLohDg74.jpg differ diff --git a/public/gambar/cs79vVJJbFkAV1C.jpg b/public/gambar/cs79vVJJbFkAV1C.jpg new file mode 100644 index 0000000..03dee42 Binary files /dev/null and b/public/gambar/cs79vVJJbFkAV1C.jpg differ diff --git a/public/gambar/iJCWE840NZ8CPrD.jpg b/public/gambar/iJCWE840NZ8CPrD.jpg new file mode 100644 index 0000000..126122d Binary files /dev/null and b/public/gambar/iJCWE840NZ8CPrD.jpg differ diff --git a/public/js/checkout/index.js b/public/js/checkout/index.js index ef33bc0..592e95d 100644 --- a/public/js/checkout/index.js +++ b/public/js/checkout/index.js @@ -338,7 +338,11 @@ function renderCartSummary() {