diff --git a/app/Http/Controllers/Http/Setup/Gate/MasterGateController.php b/app/Http/Controllers/Http/Setup/Gate/MasterGateController.php new file mode 100644 index 0000000..d222ec7 --- /dev/null +++ b/app/Http/Controllers/Http/Setup/Gate/MasterGateController.php @@ -0,0 +1,88 @@ +first(); + return $gateDetails; + } + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function edit($id) + { + // + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $id) + { + Log::info($id); + Log::info($request->all()); + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + // + } +} diff --git a/app/Http/Controllers/Http/Setup/Gate/MasterGateParameterController.php b/app/Http/Controllers/Http/Setup/Gate/MasterGateParameterController.php new file mode 100644 index 0000000..b9e20d8 --- /dev/null +++ b/app/Http/Controllers/Http/Setup/Gate/MasterGateParameterController.php @@ -0,0 +1,85 @@ +leftJoin('stasiunkerja as b', 'a.unit_kerja', '=', 'b.kode') ->leftJoin('jenis_langganan as c', 'a.jenis_langganan', '=', 'c.id') ->leftJoin('pegawai as p', 'a.operator', '=', 'p.nomer') - ->select('a.*', 'c.nama as jenis_langganan','b.nama as stasiunkerja','p.nama as petugas') + // ->leftJoin('tarif_stiker as ts','ts.id_mobil','=','a.jenis_mobil') + ->leftJoin('tarif_stiker as ts', function ($join) { + $join->on('ts.id_mobil', '=', 'a.jenis_mobil') + ->on('ts.jenis_langganan', '=', 'a.jenis_member'); + }) + ->select('a.*', 'c.nama as jenis_langganan','b.nama as stasiunkerja','p.nama as petugas','ts.tarif') ->whereBetween('a.tgl_edited', [ $validated['tanggalAwal'] . ' 00:00:00', $validated['tanggalAkhir'] . ' 23:59:59' diff --git a/app/Http/Controllers/Tools/StikerExtendedController.php b/app/Http/Controllers/Tools/StikerExtendedController.php index 9eaeaa9..3f1eea4 100644 --- a/app/Http/Controllers/Tools/StikerExtendedController.php +++ b/app/Http/Controllers/Tools/StikerExtendedController.php @@ -52,10 +52,18 @@ public function store(Request $request, MakeStikerServices $makeStiker) 'tanggal_selesai' => 'required|date|after:tanggal_mulai', ]); + $blnKemarin = Carbon::now()->subMonth()->format('Y-m'); + $start = Carbon::now()->subMonth()->startOfMonth(); + $end = Carbon::now()->subMonth()->endOfMonth(); $tanggalMulai = Carbon::parse($request->tanggal_mulai); $tanggalSelesai = Carbon::parse($request->tanggal_selesai); - $sticker = TransaksiStiker::select('notrans')->whereIn('jenis_langganan', $request->jenis_langganan)->get(); + $sticker = TransaksiStiker::select('notrans') + ->whereIn('jenis_langganan', $request->jenis_langganan) + // ->whereRaw("to_char(tgl_edited, 'YYYY-MM') = ?", [$blnKemarin]) + ->whereBetween('tgl_edited', [$start, $end]) + ->get(); // $sticker = DB::table('mergetransaksistikerdetail')->whereIn('jenis_langganan', $request->jenis_langganan)->get(); + $jumlah = $sticker->count(); foreach ($sticker as $row) { // $makeStiker->stikerExtend($sticker); $makeStiker->stikerExtend( @@ -67,7 +75,8 @@ public function store(Request $request, MakeStikerServices $makeStiker) return response()->json([ 'status' => true, - 'message' => 'Stiker berhasil diproses' + 'message' => 'Stiker berhasil diproses', + 'jumlah' => $jumlah, ]); } @@ -79,10 +88,20 @@ public function store(Request $request, MakeStikerServices $makeStiker) */ public function show($id, Request $request) { - Log::info($request->pilihannya); - $selected = $request->pilihannya; + Log::info($id); + $start = Carbon::now()->subMonth()->startOfMonth(); + $end = Carbon::now()->subMonth()->endOfMonth(); + Log::info($start); + Log::info($end); + + $blnKemarin = Carbon::now()->subMonth()->format('Y-m'); + Log::info($blnKemarin); + // $selected = $request->pilihannya; + $selected = $id; $count = DB::table('transaksi_stiker') - ->whereIn('jenis_langganan', $selected) + ->where('jenis_langganan', $selected) + // ->whereRaw("to_char(tgl_edited, 'YYYY-MM') = ?", [$blnKemarin]) + ->whereBetween('tgl_edited', [$start, $end]) ->get(); $jumlah = $count->count(); diff --git a/resources/views/layouts/partial/horizontal-menu.blade.php b/resources/views/layouts/partial/horizontal-menu.blade.php index f83278a..aa26112 100644 --- a/resources/views/layouts/partial/horizontal-menu.blade.php +++ b/resources/views/layouts/partial/horizontal-menu.blade.php @@ -8,6 +8,27 @@ Dashboard + @if(app()->environment('local')) +
  • + + + Setup + + +
    + +
    +
    • + @endif @if(app()->environment('local'))
  • diff --git a/resources/views/report/stiker/stiker-harian.blade.php b/resources/views/report/stiker/stiker-harian.blade.php index 12ed781..42d1f6d 100644 --- a/resources/views/report/stiker/stiker-harian.blade.php +++ b/resources/views/report/stiker/stiker-harian.blade.php @@ -148,6 +148,11 @@ class="btn btn-light btn-lg w-100"> let pendapatan = 0; let jmlTrans = 0; let pdfData = []; + let today = new Date().toISOString().split('T')[0]; + console.log(today); + + $('#tanggalMulai').val(new Date().toISOString().split('T')[0]); + $('#tanggalSelesai').val(new Date().toISOString().split('T')[0]); $('#btnProses').on('click', function () { @@ -192,6 +197,9 @@ class="btn btn-light btn-lg w-100"> console.log(response); const tbody = $('#tbodyResult'); tbody.empty(); + pendapatan = 0; + jmlTrans = 0; + $('#jmlTrans').text(''); // $.each(response.data, function (i, row) { @@ -234,7 +242,7 @@ class="btn btn-light btn-lg w-100"> $.each(response.data, function (i, row) { - pendapatan += parseInt(row.harga || 0, 10); + pendapatan += parseInt(row.tarif || 0, 10); jmlTrans += 1; awalDate = row.awal.toString('YYYY-MM-DD'); tbody.append(` @@ -252,7 +260,7 @@ class="btn btn-light btn-lg w-100"> ${row.nopol ?? '-'} ${row.jenis_member ?? '-'} - ${row.harga ?? ''} + ${row.tarif ?? ''} ${row.tgl_edited ?? ''} ${row.petugas ?? ''} @@ -261,7 +269,7 @@ class="btn btn-light btn-lg w-100"> }); $('#pendapatan').text('Rp. ' + rupiah(pendapatan)); - $('#jmlTrans').text('Rp. ' + rupiah(jmlTrans)); + $('#jmlTrans').text(rupiah(jmlTrans)); // console.log(jmlTrans); btn.prop('disabled', false).text('Proses'); @@ -333,7 +341,7 @@ function rupiah(angka) { ); doc.text(`Jumlah Pendapatan : ${rupiah(pendapatan)}`, marginLeft, 38); - doc.text(`Jumlah Transaksi : ${rupiah(jmlTrans)}`, marginLeft, 38); + doc.text(`Jumlah Transaksi : ${jmlTrans}`, marginLeft, 38); // garis pemisah doc.line(marginLeft, 40, pageWidth - marginRight, 40); diff --git a/resources/views/setup/gate/gate.blade.php b/resources/views/setup/gate/gate.blade.php new file mode 100644 index 0000000..a1ecfeb --- /dev/null +++ b/resources/views/setup/gate/gate.blade.php @@ -0,0 +1,315 @@ +@extends('layouts.master') + +@section('styles') + +@endsection + +@section('content') + +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    Daftar Pintu/Pos

    +
    + + + + + + + + + + + + + @foreach ($Gate as $pintu) + @php + if ($pintu->jenis === 0 ) { + $jenis = 'Masuk'; + } elseif ($pintu->jenis === 1) { + $jenis = 'Keluar'; + } + + $isManless = $pintu->manless === 1 + ? '' + : ''; + @endphp + + + {{-- --}} + + + + + + + @endforeach + +
    No.Nama PintuMode PintuGrace PeriodeManless?Pengaturan
    {{ $loop->iteration }}{{ $pintu->id }}{{ $pintu->nama }} - ({{ $pintu->id }}){{ + match($pintu->jenis) { + 0 => 'Masuk', + 1 => 'Keluar', + 2 => 'Transit', + 3 => 'Emergency', + default => '-' + } + }} + + + + Pos + +
    +
    +
    +
    + + {{--
    +
    --}} + + + +
    +
    + + {{-- @include('stiker.tambah-stiker') + @include('stiker.ubah-stiker') --}} + +
    +
    +
    +
    +
    +
    +
    +
    +
    +@endsection + +@section('javascript') + + + + + + + + + + + + + + + +@endsection \ No newline at end of file diff --git a/resources/views/tools/stiker-extend.blade.php b/resources/views/tools/stiker-extend.blade.php index 655c703..9d36935 100644 --- a/resources/views/tools/stiker-extend.blade.php +++ b/resources/views/tools/stiker-extend.blade.php @@ -41,7 +41,7 @@
    - @foreach ($jenisLangganan as $jStiker ) @endforeach @@ -105,12 +105,11 @@ class="progress-bar progress-bar-striped progress-bar-animated" } $.ajax({ - url: "{{ route('stiker-extend.show', 0) }}", + url: "{{ url('tools/stiker-extend') }}/" + selected, type: 'GET', - data: { - pilihannya : selected, - _token: "{{ csrf_token() }}" - }, + // data: { + // pilihannya : selected, + // }, success: function(res) { console.log(res); }, @@ -144,6 +143,7 @@ class="progress-bar progress-bar-striped progress-bar-animated" const mulai = $('#tanggalMulai').val(); const selesai = $('#tanggalSelesai').val(); + if (!jenisLangganan || jenisLangganan.length === 0) { alert('Pilih minimal 1 jenis langganan'); return; diff --git a/routes/web.php b/routes/web.php index 1882777..48b8707 100644 --- a/routes/web.php +++ b/routes/web.php @@ -5,6 +5,9 @@ use Illuminate\Support\Facades\Auth; use App\Http\Controllers\Apps\ModifiedTransaksi; use App\Http\Controllers\DashboardController; +use App\Http\Controllers\Http\Setup\Gate\MasterGateController; +use App\Http\Controllers\Http\Setup\Gate\MasterGateHardwareController; +use App\Http\Controllers\Http\Setup\Gate\MasterGateParameterController; use App\Http\Controllers\LostiketController; use App\Http\Controllers\MemberProductController; use App\Http\Controllers\MemberStikerController; @@ -44,6 +47,14 @@ Route::group(['middleware' => 'auth'], function () { Route::get('/dashboard', [DashboardController::class, 'index'])->name('dashboard'); + Route::prefix('/setup')->group(function () { + Route::prefix('master')->group(function () { + Route::resource('gate', MasterGateController::class); + Route::resource('gate-details', MasterGateParameterController::class); + Route::resource('gate-hardware', MasterGateHardwareController::class)->names('hardware'); + }); + }); + Route::prefix('/transaksi')->group(function () { Route::resource('parkir', TransaksiParkirController::class)->names('transaksiparkir'); Route::get('stiker', [StikerController::class, 'index']);