diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index bffe3a2..b6318f3 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -3,8 +3,34 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; class AuthController extends Controller { - // + public function index(){ + $data = [ + 'title' => 'Login Admin | Order Gizi' + ]; + return view('auth.index', $data); + } + + public function authanticate(){ + $credentials = request()->validate([ + 'username' => 'required', + 'password' => 'required' + ]); + if(Auth::attempt($credentials)){ + request()->session()->regenerate(); + return redirect()->intended('/dashboard'); + } + return back()->with(['alertError' => 'Terdapat kesalahan disini!']); + } + + public function logout() + { + Auth::logout(); + request()->session()->invalidate(); + request()->session()->regenerateToken(); + return redirect('/login'); + } } diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index a188877..2d11a99 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -185,16 +185,16 @@ class CustomerController extends Controller $today = now()->toDateString(); $jumlahHariIni = Order::whereDate('entry_at', $today)->count(); $urutan = $jumlahHariIni + 1; - $noOrder = 'TX/CT/GIZI/' . now()->year .'/'. now()->month .'/' . str_pad($urutan, 4, '0', STR_PAD_LEFT); + $noOrder = 'TX/CT/GIZI/' . now()->year .'/'. now()->month .'/' . now()->day .'/' . str_pad($urutan, 4, '0', STR_PAD_LEFT); $payloadOrder = [ 'no_order' => $noOrder, 'jenis_customer' => $jenisCustomer, 'nama_pemesan' => $biodataResult['nama_pemesan'], 'jenis_kelamin' => $biodataResult['jenis_kelamin'], - 'tanggal_lahir' => $biodataResult['tanggal_lahir'], + // 'tanggal_lahir' => $biodataResult['tanggal_lahir'], 'no_wa' => $biodataResult['no_whatsapp'], - 'tinggi_badan' => $biodataResult['tinggi_badan'], - 'berat_badan' => $biodataResult['berat_badan'], + // 'tinggi_badan' => $biodataResult['tinggi_badan'], + // 'berat_badan' => $biodataResult['berat_badan'], 'nama_pasien' => $biodataResult['nama_pasien'], 'ruang_perawatan' => $biodataResult['ruang_perawatan'], 'no_kamar_perawatan' => $biodataResult['no_kamar'], @@ -209,19 +209,19 @@ class CustomerController extends Controller $payloadOrderDetail = [ 'order_id' => $order->order_id, 'harga_satuan' => $jenisCustomer === "Karyawan RSAB Harapan Kita" ? $cart['harga_karyawan'] : $cart['harga_kp'], + 'status_order' => "Pending" ]; foreach ($cart['pesanan'] as $value) { $payloadOrderDetail['jumlah'] = $value['jumlah']; $payloadOrderDetail['tgl_antar'] = $value['tgl']; $payloadOrderDetail['type'] = $value['kategoriPemesanan']; + if($cart['jenis_menu'] === "paket"){ + $payloadOrderDetail['master_paket_menu_id'] = $cart['id_menu']; + }else{ + $payloadOrderDetail['master_menu_id'] = $cart['id_menu']; + } + OrderDetail::create($payloadOrderDetail); } - if($cart['jenis_menu'] === "paket"){ - $payloadOrderDetail['master_paket_menu_id'] = $cart['id_menu']; - }else{ - $payloadOrderDetail['master_menu_id'] = $cart['id_menu']; - } - - OrderDetail::create($payloadOrderDetail); } //code... DB::commit(); @@ -283,4 +283,80 @@ class CustomerController extends Controller ]; return view('guest.success_page', $payload); } + + public function checkOrder(){ + $payload = [ + 'title' => 'Check Order' + ]; + return view('guest.check_order.index', $payload); + } + + public function searchOrder(){ + $noOrder = request('no_order'); + $order = DB::connection('dbOrderGizi') + ->table('public.order as o') + ->leftJoin('public.order_detail as od', 'od.order_id', '=', 'o.order_id') + ->leftJoin('public.master_menu as mm', 'mm.master_menu_id', '=', 'od.master_menu_id') + ->leftJoin('public.master_paket_menu as mpm', 'mpm.master_paket_menu_id', '=', 'od.master_paket_menu_id') + ->where('o.no_order', 'ILIKE', '%' . $noOrder . '%') + ->select( + 'o.*', + 'od.order_detail_id', + 'od.jumlah', + 'od.tgl_antar', + 'od.harga_satuan', + DB::raw("COALESCE(mm.nama_menu, mpm.nama_paket) as nama_item"), + DB::raw("COALESCE(mm.foto, mpm.foto) as foto"), + ) + ->get(); + + if ($order->isEmpty()) { + return response()->json([ + 'status' => false, + 'message' => 'Pesanan tidak ditemukan' + ], 404); + } + + + $data = $order->first(); + $result = [ + 'order_id' => $data->order_id, + 'nama_pemesan' => $data->nama_pemesan, + 'jenis_kelamin' => $data->jenis_kelamin, + 'tgl_pesanan' => $data->entry_at, + 'tgl_pembayaran' => $data->tgl_pembayaran, + 'bukti_bayar' => $data->bukti_pembayaran, + 'cara_pembayaran' => $data->cara_pembayaran, + 'status_order' => $data->status_order, + 'total_harga' => $data->total_harga, + 'no_order' => $data->no_order, + 'jenis_customer' => $data->jenis_customer, + 'no_wa' => $data->no_wa, + // pasien + 'nama_pasien' => $data->nama_pasien, + 'kelas_perawatan' => $data->kelas_perawatan, + 'no_kamar_perawatan' => $data->no_kamar_perawatan, + 'ruang_perawatan' => $data->ruang_perawatan, + // karyawan + 'no_ekstensien' => $data->no_ekstensien, + 'bagian_instalasi' => $data->bagian_instalasi, + 'items' => $order->map(function ($item) { + return [ + 'order_detail_id' => $item->order_detail_id, + 'nama_item' => $item->nama_item, + 'tgl_antar' => $item->tgl_antar, + 'foto' => $item->foto, + 'jumlah' => $item->jumlah, + 'harga_satuan' => $item->harga_satuan, + // tambahkan field tambahan jika diperlukan + ]; + })->values(), + ]; + + + return response()->json([ + 'status' => true, + 'data' => $result, + ], 200); + } } diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php new file mode 100644 index 0000000..3dfcee5 --- /dev/null +++ b/app/Http/Controllers/DashboardController.php @@ -0,0 +1,15 @@ + 'Dashboard' + ]; + return view('dashboard.index', $data); + } +} diff --git a/app/Http/Controllers/MenuController.php b/app/Http/Controllers/MenuController.php index df4da82..2239ec5 100644 --- a/app/Http/Controllers/MenuController.php +++ b/app/Http/Controllers/MenuController.php @@ -15,7 +15,7 @@ class MenuController extends Controller $payload = [ 'title' => 'Master Menu || Order Gizi', ]; - return view('master.menu.index', $payload); + return view('dashboard.master.menu.index', $payload); } /** diff --git a/app/Http/Controllers/PesananController.php b/app/Http/Controllers/PesananController.php new file mode 100644 index 0000000..613b0a5 --- /dev/null +++ b/app/Http/Controllers/PesananController.php @@ -0,0 +1,67 @@ + 'Pesanan Pending' + ]; + return view('dashboard.pesanan.pending.index', $payload); + } + + /** + * Show the form for creating a new resource. + */ + public function create() + { + // + } + + /** + * Store a newly created resource in storage. + */ + public function store(Request $request) + { + // + } + + /** + * Display the specified resource. + */ + public function show(string $id) + { + // + } + + /** + * Show the form for editing the specified resource. + */ + public function edit(string $id) + { + // + } + + /** + * Update the specified resource in storage. + */ + public function update(Request $request, string $id) + { + // + } + + /** + * Remove the specified resource from storage. + */ + public function destroy(string $id) + { + // + } +} diff --git a/app/Models/OrderDetail.php b/app/Models/OrderDetail.php index f2e50fc..750d861 100644 --- a/app/Models/OrderDetail.php +++ b/app/Models/OrderDetail.php @@ -20,6 +20,7 @@ class OrderDetail extends Model 'jumlah', 'tgl_antar', 'type', - 'order_id' + 'order_id', + 'status_order' ]; } diff --git a/app/Models/User.php b/app/Models/User.php index 749c7b7..1d658f9 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -12,6 +12,11 @@ class User extends Authenticatable /** @use HasFactory<\Database\Factories\UserFactory> */ use HasFactory, Notifiable; + + protected $connection = 'dbAuth'; + protected $table = 'public.users'; + public $timestamps = false; + protected $primaryKey = "id"; /** * The attributes that are mass assignable. * @@ -19,6 +24,7 @@ class User extends Authenticatable */ protected $fillable = [ 'name', + 'username', 'email', 'password', ]; diff --git a/public/asset_guests/vendor/js/checkOrderHref.js b/public/asset_guests/vendor/js/checkOrderHref.js new file mode 100644 index 0000000..24f0faa --- /dev/null +++ b/public/asset_guests/vendor/js/checkOrderHref.js @@ -0,0 +1,3 @@ +function checkOrderHref(){ + window.location.href = '/check-order' +} diff --git a/public/gambar/PAKET 1 (KENTANG GORENG, STEAK DAGING, MIX VEGETABLES, SAUS).jpg b/public/gambar/PAKET 1 (KENTANG GORENG, STEAK DAGING, MIX VEGETABLES, SAUS).jpg new file mode 100644 index 0000000..1fe92ed Binary files /dev/null and b/public/gambar/PAKET 1 (KENTANG GORENG, STEAK DAGING, MIX VEGETABLES, SAUS).jpg differ diff --git a/public/gambar/PAKET 1 (NASI PUTIH, STEAK DAGING, MIX VEGETABLES, SAUS).jpg b/public/gambar/PAKET 1 (NASI PUTIH, STEAK DAGING, MIX VEGETABLES, SAUS).jpg new file mode 100644 index 0000000..9ace676 Binary files /dev/null and b/public/gambar/PAKET 1 (NASI PUTIH, STEAK DAGING, MIX VEGETABLES, SAUS).jpg differ diff --git a/public/js/checkout/index.js b/public/js/checkout/index.js index d73d23e..49d6ac0 100644 --- a/public/js/checkout/index.js +++ b/public/js/checkout/index.js @@ -18,6 +18,8 @@ document.addEventListener('DOMContentLoaded', () => { return; } + + // Setup button step document.querySelectorAll('.next-step').forEach(btn => { btn.addEventListener('click', async () => { @@ -58,7 +60,6 @@ document.addEventListener('DOMContentLoaded', () => { document.getElementById('no_order_display').textContent = order_id }); - // ======================= // FUNGSI STEP // ======================= @@ -105,11 +106,13 @@ if (typeof checkout_biodata === 'object') { if (checkout_biodata.jenis_customer) { $(`input[name="jenis_customer"][value="${checkout_biodata.jenis_customer}"]`).prop('checked', true); } + if(checkout_biodata.jenis_kelamin){ + $(`input[name="jenis_kelamin"][value="${checkout_biodata.jenis_kelamin}"]`).prop('checked', true); + } $('#nama_pemesan').val(checkout_biodata.nama_pemesan); - $('#jenis_kelamin').val(checkout_biodata.jenis_kelamin); - $('#tanggal_lahir').val(checkout_biodata.tanggal_lahir); - $('#tinggi_badan').val(checkout_biodata.tinggi_badan); - $('#berat_badan').val(checkout_biodata.berat_badan); + // $('#tanggal_lahir').val(checkout_biodata.tanggal_lahir); + // $('#tinggi_badan').val(checkout_biodata.tinggi_badan); + // $('#berat_badan').val(checkout_biodata.berat_badan); $('#no_whatsapp').val(checkout_biodata.no_whatsapp); $('#nama_pasien').val(checkout_biodata.nama_pasien); $('#ruang_perawatan').val(checkout_biodata.ruang_perawatan); @@ -123,10 +126,10 @@ function isiKonfirmasi() { const biodata = { jenis_customer: $('input[name="jenis_customer"]:checked').val(), nama_pemesan: $('#nama_pemesan').val(), - jenis_kelamin: $('#jenis_kelamin').val(), - tanggal_lahir: $('#tanggal_lahir').val(), - tinggi_badan: $('#tinggi_badan').val(), - berat_badan: $('#berat_badan').val(), + jenis_kelamin: $('input[name="jenis_kelamin"]:checked').val(), + // tanggal_lahir: $('#tanggal_lahir').val(), + // tinggi_badan: $('#tinggi_badan').val(), + // berat_badan: $('#berat_badan').val(), no_whatsapp: $('#no_whatsapp').val(), nama_pasien: $('#nama_pasien').val(), ruang_perawatan: $('#ruang_perawatan').val(), @@ -194,13 +197,17 @@ function renderCartSummary() { const itemTotal = pesananList.reduce((sum, p) => sum + (p.jumlah * harga), 0); totalKeseluruhan += itemTotal const itemHTML = ` -
+
${item.nama_menu} + style="max-height: 180px; width:auto; object-fit: cover;">
+
${item.nama_menu}
Rp ${parseInt(harga).toLocaleString('id-ID')}
@@ -211,10 +218,7 @@ function renderCartSummary() { onclick="addOrderDate(${item.id})">+ Tambah Tanggal
Total: Rp ${itemTotal.toLocaleString('id-ID')}
- +
@@ -298,8 +302,8 @@ function removeCartItem(itemId){ // validasi step one dan sebelum submit function validateStepOne() { const jenisCustomer = document.querySelector('input[name="jenis_customer"]:checked'); + const jenisKelamin = document.querySelector('input[name="jenis_kelamin"]:checked'); const namaPemesan = document.getElementById('nama_pemesan').value.trim(); - const jenisKelamin = document.getElementById('jenis_kelamin').value; const noWA = document.getElementById('no_whatsapp').value.trim(); if (!jenisCustomer) { diff --git a/public/js/order_guest/index.js b/public/js/order_guest/index.js index 61ee6fb..99bc3c3 100644 --- a/public/js/order_guest/index.js +++ b/public/js/order_guest/index.js @@ -163,7 +163,6 @@ if (count > 0) { $cartCount.text(count).show(); let cart = JSON.parse(sessionStorage.getItem('cart') || '[]'); - console.log(cart); let menuNames = cart.map(item => item.nama_menu).join(', '); const maxLength = 50; @@ -181,6 +180,11 @@ } } + function parseRupiahToNumber(rpText) { + return parseInt(rpText.replace(/[^\d]/g, ''), 10) || 0; + } + + $("#checkoutForm").on('submit', function(e){ e.preventDefault(); @@ -193,18 +197,13 @@ jumlah: 1, kategoriPemesanan: '' }]; - // Dikomen dulu - // $("#order_input_wrapper .row").each(function(){ - // const tgl = $(this).find('input[type="date"]').val(); - // const jumlah = $(this).find('input[type="number"]').val(); - // const kategoriPemesanan = $(this).find('select').val(); - // if(tgl && kategoriPemesanan && jumlah > 0){ - // orders.push({ tgl, kategoriPemesanan, jumlah}) - // } - // }) - let idMenu = $("#cathering_order_menu_id").text().trim(); - let namaMenu = $("#cathering_order_name").text().trim(); + let idText = $("#cathering_order_menu_id").text().trim(); + let idMenu = parseInt(idText.replace(/[^\d]/g, ''), 10); + + let namaMenu = $("#cathering_order_name").text(); + let existingItem = cart.find(item => item.id_menu === idMenu && item.nama_menu === namaMenu); + if(existingItem){ orders.forEach(newOrder => { const existingOrder =existingItem.pesanan.find(p => p.tgl === newOrder.tgl) @@ -219,8 +218,8 @@ id:Date.now(), id_menu : $("#cathering_order_menu_id").text(), nama_menu : $("#cathering_order_name").text(), - harga_karyawan : $("#cathering_order_price_karyawan").text(), - harga_kp : $("#cathering_order_price_keluarga_pasien").text(), + harga_karyawan : parseRupiahToNumber($("#cathering_order_price_karyawan").text()), + harga_kp : parseRupiahToNumber($("#cathering_order_price_keluarga_pasien").text()), foto: $('#cathering_order_photo').attr('src'), jenis_menu: $('#cathering_order_jenis_menu').text(), deskripsi:$("#cathering_order_deskripsi").text(), diff --git a/public/js/pesanan_pending/_init.js b/public/js/pesanan_pending/_init.js new file mode 100644 index 0000000..33fbb83 --- /dev/null +++ b/public/js/pesanan_pending/_init.js @@ -0,0 +1 @@ +const datatablePending = $("#datatablePesananPending") diff --git a/public/js/pesanan_pending/dt.js b/public/js/pesanan_pending/dt.js new file mode 100644 index 0000000..fb990a9 --- /dev/null +++ b/public/js/pesanan_pending/dt.js @@ -0,0 +1,40 @@ + + datatablePending.bootstrapTable({ + url: "/", + showColumns: true, + showColumnsToggleAll: true, + showRefresh: true, + sortable: true, + search: true, + searchOnEnterKey: false, + searchHighlight: true, + pagination: true, + serverSide:true, + pageSize: 10, + pageList: [10, 20, 30, 40, 50, 100, 200], + cookie: true, + cookieIdTable: "table_rma_ssc_id", + icons: { + refresh: "fas fa-sync-alt", // atau ganti ke icon lain + columns: "fas fa-th-large" + }, + + columns: [ + { + title: "Action", + }, + { + title: "Nama Menu", + }, + { + title: "Jenis Menu", + }, + { + title: "Harga", + }, + { + title: "Deskripsi", + }, + + ], + }); diff --git a/resources/views/auth/index.blade.php b/resources/views/auth/index.blade.php new file mode 100644 index 0000000..d64d63d --- /dev/null +++ b/resources/views/auth/index.blade.php @@ -0,0 +1,125 @@ + + + + + + + {{ $title }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+
+

Please sign-in to your account

+ @if (session()->has('alertError')) + + @endif +
+ @csrf +
+ + +
+
+
+ +
+
+ + +
+
+
+ +
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/views/index.blade.php b/resources/views/dashboard/index.blade.php similarity index 99% rename from resources/views/index.blade.php rename to resources/views/dashboard/index.blade.php index 4825d90..ece38a8 100644 --- a/resources/views/index.blade.php +++ b/resources/views/dashboard/index.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.main') +@extends('dashboard.layouts.main') @section('body_main')
diff --git a/resources/views/layouts/blank.blade.php b/resources/views/dashboard/layouts/blank.blade.php similarity index 100% rename from resources/views/layouts/blank.blade.php rename to resources/views/dashboard/layouts/blank.blade.php diff --git a/resources/views/layouts/main.blade.php b/resources/views/dashboard/layouts/main.blade.php similarity index 96% rename from resources/views/layouts/main.blade.php rename to resources/views/dashboard/layouts/main.blade.php index 1715ed5..0316bd2 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/dashboard/layouts/main.blade.php @@ -67,13 +67,13 @@
- @include('partials.sidenav') + @include('dashboard.partials.sidenav')
- @include('partials.topnav') + @include('dashboard.partials.topnav') @@ -82,7 +82,7 @@ @yield('body_main') - @include('partials.footer') + @include('dashboard.partials.footer')
@@ -114,7 +114,7 @@ - + diff --git a/resources/views/master/menu/index.blade.php b/resources/views/dashboard/master/menu/index.blade.php similarity index 91% rename from resources/views/master/menu/index.blade.php rename to resources/views/dashboard/master/menu/index.blade.php index e405b1b..d5f018f 100644 --- a/resources/views/master/menu/index.blade.php +++ b/resources/views/dashboard/master/menu/index.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.main') +@extends('dashboard.layouts.main') @section('body_main')
@@ -21,7 +21,7 @@
-@include('master.menu.modal.add') +@include('dashboard.master.menu.modal.add') diff --git a/resources/views/master/menu/modal/add.blade.php b/resources/views/dashboard/master/menu/modal/add.blade.php similarity index 100% rename from resources/views/master/menu/modal/add.blade.php rename to resources/views/dashboard/master/menu/modal/add.blade.php diff --git a/resources/views/partials/footer.blade.php b/resources/views/dashboard/partials/footer.blade.php similarity index 100% rename from resources/views/partials/footer.blade.php rename to resources/views/dashboard/partials/footer.blade.php diff --git a/resources/views/partials/sidenav.blade.php b/resources/views/dashboard/partials/sidenav.blade.php similarity index 93% rename from resources/views/partials/sidenav.blade.php rename to resources/views/dashboard/partials/sidenav.blade.php index 730be28..27002a6 100644 --- a/resources/views/partials/sidenav.blade.php +++ b/resources/views/dashboard/partials/sidenav.blade.php @@ -50,16 +50,16 @@
  • Order
  • - + -
    Pending Pesanan
    +
    Pesanan Pending
  • -
    Pesanana Selesai
    +
    Pesanan Selesai
    • diff --git a/resources/views/partials/topnav.blade.php b/resources/views/dashboard/partials/topnav.blade.php similarity index 87% rename from resources/views/partials/topnav.blade.php rename to resources/views/dashboard/partials/topnav.blade.php index 6775dee..8ad0f9d 100644 --- a/resources/views/partials/topnav.blade.php +++ b/resources/views/dashboard/partials/topnav.blade.php @@ -53,10 +53,13 @@
  • - - - Log Out - +
    + +
    • @@ -64,3 +67,4 @@
    + diff --git a/resources/views/dashboard/pesanan/pending/index.blade.php b/resources/views/dashboard/pesanan/pending/index.blade.php new file mode 100644 index 0000000..32c643a --- /dev/null +++ b/resources/views/dashboard/pesanan/pending/index.blade.php @@ -0,0 +1,23 @@ +@extends('dashboard.layouts.main') + +@section('body_main') +
    + +

    + Dashboard / Pesanan Pending +

    + + +
    +
    +
    Pesanan Pending
    +
    +
    +
    +
    +
    +
    + + + +@endsection diff --git a/resources/views/guest/check_order/index.blade.php b/resources/views/guest/check_order/index.blade.php new file mode 100644 index 0000000..4796824 --- /dev/null +++ b/resources/views/guest/check_order/index.blade.php @@ -0,0 +1,223 @@ +@extends('guest.layout.main') +@section('body_main_guests') + +
    + +
    +
    + +
    + +
    +
    + + Kembali ke Menu + +
    +
    + +

    Cek Status Pesanan Anda

    +

    Masukkan No Order yang Anda terima setelah pemesanan untuk melihat status.

    + +
    +
    + + +
    +
    +
    + {{-- Isi javascript --}} +
    +
    +
    + +
    +
    +
    +
    + + + +@endsection diff --git a/resources/views/guest/checkout/step/step1.blade.php b/resources/views/guest/checkout/step/step1.blade.php index 3239cef..aefdbde 100644 --- a/resources/views/guest/checkout/step/step1.blade.php +++ b/resources/views/guest/checkout/step/step1.blade.php @@ -1,7 +1,7 @@
    -
    +
    @@ -22,30 +22,37 @@
    +
    + +
    + + +
    +
    + + +
    +
    -
    - - -
    -
    + {{--
    -
    -
    +
    --}} + {{--
    -
    +
    --}}
    diff --git a/resources/views/guest/index.blade.php b/resources/views/guest/index.blade.php index b09af39..fee8c38 100644 --- a/resources/views/guest/index.blade.php +++ b/resources/views/guest/index.blade.php @@ -42,9 +42,7 @@
    -@include('guest.register') @include('guest.checkout_order') -@include('guest.keranjang') diff --git a/resources/views/guest/layout/main.blade.php b/resources/views/guest/layout/main.blade.php index a1b47ae..908de97 100644 --- a/resources/views/guest/layout/main.blade.php +++ b/resources/views/guest/layout/main.blade.php @@ -9,10 +9,6 @@ - - - - @@ -29,9 +25,13 @@ + + + {{-- Jquery --}} + @@ -48,6 +48,7 @@
    + diff --git a/resources/views/guest/layout/partials/header.blade.php b/resources/views/guest/layout/partials/header.blade.php index 7bef4dc..66af89c 100644 --- a/resources/views/guest/layout/partials/header.blade.php +++ b/resources/views/guest/layout/partials/header.blade.php @@ -14,7 +14,7 @@ {{-- --}}
    - diff --git a/resources/views/guest/keranjang.blade.php b/resources/views/guest/tidak_terpakai/keranjang.blade.php similarity index 100% rename from resources/views/guest/keranjang.blade.php rename to resources/views/guest/tidak_terpakai/keranjang.blade.php diff --git a/resources/views/guest/register.blade.php b/resources/views/guest/tidak_terpakai/register.blade.php similarity index 100% rename from resources/views/guest/register.blade.php rename to resources/views/guest/tidak_terpakai/register.blade.php diff --git a/resources/views/master/index.blade.php b/resources/views/master/index.blade.php deleted file mode 100644 index e69de29..0000000 diff --git a/routes/web.php b/routes/web.php index 561533a..a8013b9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,22 +1,31 @@ name('login'); +Route::post('/login', [AuthController::class, 'authanticate']); Route::resource('/dashboard/menu', MenuController::class); -Route::get('datatable/menu', [MenuController::class, 'datatable']); -Route::resource('/dashboard/klasifikasi-menu', KlasifikasiMenuController::class); + +Route::group(['middleware' => ['auth']], function(){ + Route::get('/dashboard', [DashboardController::class, 'index']); + Route::group(['prefix' => 'dashboard'], function(){ + Route::get('/', [DashboardController::class, 'index']); + Route::resource('/klasifikasi-menu', KlasifikasiMenuController::class); + Route::get('/pending', [PesananController::class, 'index']); + }); + Route::post('/logout', [AuthController::class, 'logout']); +}); Route::get('/', [CustomerController::class, 'index']); Route::get('/checkout', [CustomerController::class, 'checkout']); @@ -24,3 +33,6 @@ Route::get('/datamenu', [CustomerController::class, 'dataOrder']); Route::post('/submit-checkout', [CustomerController::class, 'submitCheckout']); Route::post('/finish-checkout', [CustomerController::class, 'finishCheckout']); Route::get('/success-page', [CustomerController::class, 'success']); +Route::get('/check-order', [CustomerController::class, 'checkOrder']); +Route::get('/check-order/search', [CustomerController::class, 'searchOrder']); +