diff --git a/app/Http/Controllers/Admin/BerandaController.php b/app/Http/Controllers/Admin/BerandaController.php index a19ee06..bd8aae1 100755 --- a/app/Http/Controllers/Admin/BerandaController.php +++ b/app/Http/Controllers/Admin/BerandaController.php @@ -29,8 +29,8 @@ public function index() $currMasuk = TransaksiBuket::whereMonth('created_at', $now->month)->whereYear('created_at', $now->year)->count() + BookingFoto::whereMonth('created_at', $now->month)->whereYear('created_at', $now->year)->count(); - $currSelesai = TransaksiBuket::whereMonth('created_at', $now->month)->whereYear('created_at', $now->year)->where('status_transaksi', 'diterima')->count() + - BookingFoto::whereMonth('created_at', $now->month)->whereYear('created_at', $now->year)->where('status_booking', 'diterima')->count(); + $currSelesai = TransaksiBuket::whereMonth('created_at', $now->month)->whereYear('created_at', $now->year)->where('status_transaksi', 'selesai')->count() + + BookingFoto::whereMonth('created_at', $now->month)->whereYear('created_at', $now->year)->where('status_booking', 'selesai')->count(); $currBatal = TransaksiBuket::whereMonth('created_at', $now->month)->whereYear('created_at', $now->year)->where('status_transaksi', 'ditolak')->count() + BookingFoto::whereMonth('created_at', $now->month)->whereYear('created_at', $now->year)->where('status_booking', 'ditolak')->count(); @@ -42,8 +42,8 @@ public function index() $prevMasuk = TransaksiBuket::whereMonth('created_at', $lastMonth->month)->whereYear('created_at', $lastMonth->year)->count() + BookingFoto::whereMonth('created_at', $lastMonth->month)->whereYear('created_at', $lastMonth->year)->count(); - $prevSelesai = TransaksiBuket::whereMonth('created_at', $lastMonth->month)->whereYear('created_at', $lastMonth->year)->where('status_transaksi', 'diterima')->count() + - BookingFoto::whereMonth('created_at', $lastMonth->month)->whereYear('created_at', $lastMonth->year)->where('status_booking', 'diterima')->count(); + $prevSelesai = TransaksiBuket::whereMonth('created_at', $lastMonth->month)->whereYear('created_at', $lastMonth->year)->where('status_transaksi', 'selesai')->count() + + BookingFoto::whereMonth('created_at', $lastMonth->month)->whereYear('created_at', $lastMonth->year)->where('status_booking', 'selesai')->count(); $prevBatal = TransaksiBuket::whereMonth('created_at', $lastMonth->month)->whereYear('created_at', $lastMonth->year)->where('status_transaksi', 'ditolak')->count() + BookingFoto::whereMonth('created_at', $lastMonth->month)->whereYear('created_at', $lastMonth->year)->where('status_booking', 'ditolak')->count(); @@ -63,13 +63,13 @@ public function index() 'batal_grow' => $getGrowth($currBatal, $prevBatal), ]; - // --- 4. JADWAL & PENDING (Sudah Benar) --- + // --- 4. JADWAL & PENDING --- $buketToday = TransaksiBuket::with(['pelanggan', 'buket'])->whereDate('tgl_ambil', $today)->where('status_transaksi', 'diterima')->get(); $fotoToday = BookingFoto::with(['pelanggan', 'paketFoto'])->whereDate('tgl_booking', $today)->where('status_booking', 'diterima')->orderBy('jam_mulai', 'asc')->get(); - $riwayatBuket = TransaksiBuket::with(['pelanggan', 'buket'])->where('status_transaksi', 'menunggu_verifikasi')->latest()->get(); - $riwayatFoto = BookingFoto::with(['pelanggan', 'paketFoto'])->where('status_booking', 'menunggu_verifikasi')->latest()->get(); + $pesananBuket = TransaksiBuket::with(['pelanggan', 'buket'])->where('status_transaksi', 'menunggu_verifikasi')->latest()->get(); + $pesananFoto = BookingFoto::with(['pelanggan', 'paketFoto'])->where('status_booking', 'menunggu_verifikasi')->latest()->get(); - return view('admin.beranda.index', compact('stat', 'buketToday', 'fotoToday', 'riwayatBuket', 'riwayatFoto')); + return view('admin.beranda.index', compact('stat', 'buketToday', 'fotoToday', 'pesananBuket', 'pesananFoto')); } } diff --git a/resources/views/admin/beranda/admin.blade.php b/resources/views/admin/beranda/admin.blade.php deleted file mode 100755 index b1ea2d8..0000000 --- a/resources/views/admin/beranda/admin.blade.php +++ /dev/null @@ -1,203 +0,0 @@ -@extends('layouts.admin') - -@section('title', 'Beranda') - -@section('content') -
-
-
-
-
-
-

Bunga Diambil Hari Ini

-
-
-
- - - - - - - - - - - - - - - - - -
WaktuNama PelangganNama BuketAksi
Si GantengKomentar dia...cb - - - -
-
-
-
-
- -
-
-
-

Jadwal Foto Hari Ini

-
-
-
- - - - - - - - - - - - - - - - - -
WaktuNama PelangganNama PaketAksi
Si KerenKomentar dia...cb - - - -
-
-
-
-
-
-
- -
-
-
-

Pesanan Pending

-
-
- - - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - -
No.Nama PelangganNama BuketTanggal AmbilTotalStatusAksi
-

1

- 		-

Congratulations

- 		-

Congratulations

- 		-

Congratulations

- 		-

Congratulations

- 		- Selesai - - - - -
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - -
No.Nama PelangganNama PaketTanggal BookingTotalStatusAksi
-

1

- 		-

Congratulations

- 		-

Congratulations

- 		-

Congratulations

- 		-

Congratulations

- 		- Selesai - - - - -
-
-
- -
-
-
-
-
- @include('admin.beranda.partials.modal-buket') - @include('admin.beranda.partials.modal-foto') - @include('admin.beranda.partials.modal-riwayat') -@endsection diff --git a/resources/views/admin/beranda/index.blade.php b/resources/views/admin/beranda/index.blade.php index bee0fff..9e1b571 100755 --- a/resources/views/admin/beranda/index.blade.php +++ b/resources/views/admin/beranda/index.blade.php @@ -101,9 +101,9 @@ class="bi {{ $stat['selesai_grow'] >= 0 ? 'bi-arrow-up' : 'bi-arrow-down' }}">
-
Pesanan Dibatalkan
+
Pesanan Ditolak
+ title="Total pesanan buket dan foto yang ditolak dalam bulan ini">
@@ -251,36 +251,42 @@ class="bi {{ $stat['batal_grow'] >= 0 ? 'bi-arrow-up' : 'bi-arrow-down' }}"> Nama Pelanggan Nama Buket Tanggal Ambil + Jam Ambil Total Status Aksi - @forelse ($riwayatBuket as $rb) + @forelse ($pesananBuket as $p) - {{ $rb->no_invoice }} - {{ $rb->pelanggan->nama }} - {{ $rb->buket->nama }} - {{ \Carbon\Carbon::parse($rb->tgl_ambil)->translatedFormat('d M Y') }} - Rp {{ number_format($rb->total_bayar, 0, ',', '.') }} + {{ $p->no_invoice }} + {{ $p->pelanggan->nama }} + {{ $p->buket->nama }} - - {{ $rb->status_label->text }} + {{ \Carbon\Carbon::parse($p->tgl_ambil)->locale('id')->translatedFormat('d F Y') }} + + + {{ \Carbon\Carbon::parse($p->tgl_ambil)->format('H:i') }} WIB + + Rp {{ number_format($p->total_bayar, 0, ',', '.') }} + + + {{ $p->status_label->text }} - - + - @include('admin.pesanan.partials.modal-riwayat-buket') + @include('admin.pesanan.partials.modal-buket') @empty - Tidak ada riwayat buket. + Tidak ada pesanan buket yang + pending. @endforelse @@ -297,38 +303,43 @@ class="bi {{ $stat['batal_grow'] >= 0 ? 'bi-arrow-up' : 'bi-arrow-down' }}"> Nama Pelanggan Nama Paket Tanggal Booking + Waktu Total Status Aksi - @forelse ($riwayatFoto as $rf) + @forelse ($pesananFoto as $p) - {{ $rf->no_invoice }} - {{ $rf->pelanggan->nama }} - {{ $rf->paketFoto->nama }} - {{ \Carbon\Carbon::parse($rf->tgl_booking)->translatedFormat('d M Y') }} - - Rp {{ number_format($rf->total_bayar, 0, ',', '.') }} + {{ $p->no_invoice }} + {{ $p->pelanggan->nama }} + {{ $p->paketFoto->nama }} - - {{ $rf->status_label->text }} + {{ \Carbon\Carbon::parse($p->tgl_booking)->locale('id')->translatedFormat('d F Y') }} + + + {{ \Carbon\Carbon::parse($p->jam_mulai)->format('H:i') }} - + {{ \Carbon\Carbon::parse($p->jam_selesai)->format('H:i') }} + + Rp {{ number_format($p->total_bayar, 0, ',', '.') }} + + + {{ $p->status_label->text }} - - + - @include('admin.pesanan.partials.modal-riwayat-foto') + @include('admin.pesanan.partials.modal-foto') @empty - Tidak ada riwayat pesanan - foto. + Tidak ada pesanan + foto yang pending. @endforelse diff --git a/resources/views/admin/beranda/partials/modal-buket.blade.php b/resources/views/admin/beranda/partials/modal-buket.blade.php deleted file mode 100755 index 46455dd..0000000 --- a/resources/views/admin/beranda/partials/modal-buket.blade.php +++ /dev/null @@ -1,261 +0,0 @@ - - -{{-- MODAL GAMBAR --}} - - - -{{-- MODAL TOLAK --}} - - -{{-- MODAL TERIMA --}} - - diff --git a/resources/views/admin/beranda/partials/modal-foto.blade.php b/resources/views/admin/beranda/partials/modal-foto.blade.php deleted file mode 100755 index 3b23c70..0000000 --- a/resources/views/admin/beranda/partials/modal-foto.blade.php +++ /dev/null @@ -1,264 +0,0 @@ - - -{{-- MODAL GAMBAR --}} - - - -{{-- MODAL TOLAK --}} - - -{{-- MODAL TERIMA --}} - - diff --git a/resources/views/admin/beranda/partials/modal-riwayat.blade.php b/resources/views/admin/beranda/partials/modal-riwayat.blade.php deleted file mode 100755 index ab7e789..0000000 --- a/resources/views/admin/beranda/partials/modal-riwayat.blade.php +++ /dev/null @@ -1,194 +0,0 @@ -{{-- RIWAYAT BUKET --}} - - -{{-- RIWAYAT FOTO --}} - - -{{-- MODAL GAMBAR --}} - - - diff --git a/resources/views/admin/beranda/partials/modal-show.blade.php b/resources/views/admin/beranda/partials/modal-show.blade.php deleted file mode 100755 index 63d0c13..0000000 --- a/resources/views/admin/beranda/partials/modal-show.blade.php +++ /dev/null @@ -1,86 +0,0 @@ - diff --git a/resources/views/admin/beranda/pemilik.blade.php b/resources/views/admin/beranda/pemilik.blade.php deleted file mode 100755 index 053a759..0000000 --- a/resources/views/admin/beranda/pemilik.blade.php +++ /dev/null @@ -1,317 +0,0 @@ -@extends('layouts.admin') - -@section('title', 'Beranda') - -@section('content') -
-
-
-
-
-
- -
-
Pendapatan Bulan Ini
- -
- -
-
- -
-
-
Rp 1.000.000
- - 34.7% - - - dari bulan lalu -
-
-
-
-
- -
-
-
- -
-
Total Pesanan Masuk
- -
- -
-
- -
-
-
20 Pesanan
- - 34.7% - - - dari bulan lalu -
-
-
-
-
- -
-
-
- -
-
Pesanan Selesai
- -
- -
-
- -
-
-
20 Pesanan
- - 34.7% - - - dari bulan lalu -
-
-
-
-
- -
-
-
- -
-
Pesanan Dibatalkan
- -
- -
-
- -
-
-
20 Pesanan
- - 34.7% - - - dari bulan lalu -
-
-
-
-
- -
-
-
-
-
-
-
-

Bunga Diambil Hari Ini

-
-
-
- - - - - - - - - - - - - - - - - -
WaktuNama PelangganNama BuketAksi
Si GantengKomentar dia...cb - - - -
-
-
-
-
- -
-
-
-

Jadwal Foto Hari Ini

-
-
-
- - - - - - - - - - - - - - - - - -
WaktuNama PelangganNama PaketAksi
Si KerenKomentar dia...cb - - - -
-
-
-
-
-
-
- -
-
-
-

Pesanan Pending

-
-
- - - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - -
No.Nama PelangganNama BuketTanggal AmbilTotalStatusAksi
-

1

- 		-

Congratulations

- 		-

Congratulations

- 		-

Congratulations

- 		-

Congratulations

- 		- Selesai - - - - -
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - -
No.Nama PelangganNama PaketTanggal BookingTotalStatusAksi
-

1

- 		-

Congratulations

- 		-

Congratulations

- 		-

Congratulations

- 		-

Congratulations

- 		- Selesai - - - - -
-
-
- -
-
-
-
-
- @include('admin.beranda.partials.modal-buket') - @include('admin.beranda.partials.modal-foto') - @include('admin.beranda.partials.modal-riwayat') -@endsection diff --git a/vite.config.js b/vite.config.js deleted file mode 100755 index f35b4e7..0000000 --- a/vite.config.js +++ /dev/null @@ -1,18 +0,0 @@ -import { defineConfig } from 'vite'; -import laravel from 'laravel-vite-plugin'; -import tailwindcss from '@tailwindcss/vite'; - -export default defineConfig({ - plugins: [ - laravel({ - input: ['resources/css/app.css', 'resources/js/app.js'], - refresh: true, - }), - tailwindcss(), - ], - server: { - watch: { - ignored: ['**/storage/framework/views/**'], - }, - }, -});