From 5c522fdc2ea9880ee4176d4a5fe2ece02247babe Mon Sep 17 00:00:00 2001 From: pand03 Date: Fri, 27 Feb 2026 08:15:38 +0700 Subject: [PATCH] Sorting laporan member dan perbaikan minor --- app/Http/Controllers/Report/LaporanStiker.php | 3 +- app/Http/Controllers/StikerController.php | 7 +- public/js/member/index.js | 29 +- resources/views/apps/modified-trans.blade.php | 23 +- .../layouts/partial/horizontal-menu.blade.php | 6 +- resources/views/member/member.blade.php | 12 +- .../report/stiker/stiker-harian.blade.php | 15 +- resources/views/{ => stiker}/stiker.blade.php | 274 +++++++++++++++--- .../views/stiker/tambah-stiker.blade.php | 196 +++++++++++++ resources/views/stiker/ubah-stiker.blade.php | 188 ++++++++++++ 10 files changed, 688 insertions(+), 65 deletions(-) rename resources/views/{ => stiker}/stiker.blade.php (51%) create mode 100644 resources/views/stiker/tambah-stiker.blade.php create mode 100644 resources/views/stiker/ubah-stiker.blade.php diff --git a/app/Http/Controllers/Report/LaporanStiker.php b/app/Http/Controllers/Report/LaporanStiker.php index 90ec830..bea3931 100644 --- a/app/Http/Controllers/Report/LaporanStiker.php +++ b/app/Http/Controllers/Report/LaporanStiker.php @@ -53,7 +53,8 @@ public function dataStiker(Request $request) ) ->when($request->jenis_stiker, fn ($q, $v) => $q->whereIn('a.unit_kerja', $v) - ); + ) + ->orderBy('a.nama'); // 🪵 Debug (aktifkan hanya saat local) if (app()->isLocal()) { diff --git a/app/Http/Controllers/StikerController.php b/app/Http/Controllers/StikerController.php index ed7ea51..7b4cc0d 100644 --- a/app/Http/Controllers/StikerController.php +++ b/app/Http/Controllers/StikerController.php @@ -4,6 +4,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Log; class StikerController extends Controller { @@ -14,12 +15,12 @@ class StikerController extends Controller */ public function index() { - $vehicleSelect = DB::table('jenis_mobil')->get(); + $vehicleSelect = DB::table('jenis_mobil')->orderBy('id')->get(); $departmentSelect = DB::table('stasiunkerja')->get(); $memberSelect = DB::table('jenis_langganan')->get(); $jenisStiker = DB::table('tarif_stiker')->get(); - return view('stiker', compact([ + return view('stiker.stiker', compact([ // return view('member.member', compact([ 'vehicleSelect', 'departmentSelect', @@ -58,7 +59,7 @@ public function store(Request $request) */ public function show($id) { - // + Log::info($id); } /** diff --git a/public/js/member/index.js b/public/js/member/index.js index f7742e8..eb80901 100644 --- a/public/js/member/index.js +++ b/public/js/member/index.js @@ -1,6 +1,6 @@ $(document).ready(function () { - $(document).on('change', '.select-option', function () { + $(document).on('change', '.form-select', function () { if ($('option:selected', this).val() == '') { $(".nama").css('display', 'none'); $(".nopol").css('display', 'none'); @@ -56,6 +56,7 @@ $(document).ready(function () { return; // Hentikan proses jika input kosong } } + console.log(option); var formData = $('#search-form .input-default:visible').val(); console.log(formData); @@ -63,7 +64,6 @@ $(document).ready(function () { $.ajax({ url: url, type: "POST", - // data: $('#search-form .input-default:visible').serialize(), data: $('#search-form').serialize(), headers: {'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')}, dataType: 'json', @@ -88,7 +88,16 @@ $(document).ready(function () { rows.forEach((element, rowIndex) => { var rowHtml = ` - + ${rowIndex === 0 ? `${index + 1}` : ''} ${rowIndex === 0 ? `${element.notrans}` : ''} ${rowIndex === 0 ? `${element.nama}` : ''} @@ -99,13 +108,13 @@ $(document).ready(function () { ${rowIndex === 0 ? `${element.awal}
${element.akhir}` : ''} ${rowIndex === 0 ? ` ${[...new Set(rows.map(r => `${r.nopol || 'No. Polisi tidak ada'} (${r.vehicle || ''})`))].join('
')} ` : ''} ${rowIndex === 0 ? `${[...new Set(rows.map(r => r.no_card || 'Tidak ada kartu'))].join('
')}` : ''} - ${rowIndex === 0 ? ` - - - - ` : ''} - - `; + + `; + // ${rowIndex === 0 ? ` + // + // + // + // ` : ''} tbody.append(rowHtml); }); }); diff --git a/resources/views/apps/modified-trans.blade.php b/resources/views/apps/modified-trans.blade.php index 72dc583..cdf3443 100644 --- a/resources/views/apps/modified-trans.blade.php +++ b/resources/views/apps/modified-trans.blade.php @@ -34,6 +34,17 @@ 12% { transform: rotate(-5deg); } 100% { transform: rotate(-270deg); } } + .logo-img { + max-height: 70px; + width: auto; + object-fit: contain; + } + + @media (max-width: 576px) { + .logo-img { + max-height: 55px; + } + } @endsection @@ -48,8 +59,8 @@
Logo Perusahaan + alt="Logo parkq-systems" + class="img-fluid logo-img">
@if(session('status_update')) @@ -97,7 +108,7 @@ {{ $data->no_pol }} @else -
+
{{-- --}} @@ -172,14 +183,14 @@
{{-- Tombol --}} -
+
+ class="btn btn-outline-secondary w-100 w-md-auto"> Batal
diff --git a/resources/views/layouts/partial/horizontal-menu.blade.php b/resources/views/layouts/partial/horizontal-menu.blade.php index cfbdef2..f83278a 100644 --- a/resources/views/layouts/partial/horizontal-menu.blade.php +++ b/resources/views/layouts/partial/horizontal-menu.blade.php @@ -12,13 +12,13 @@
  • - Operasional + Transaksi
    diff --git a/resources/views/member/member.blade.php b/resources/views/member/member.blade.php index 85b8230..b449d89 100644 --- a/resources/views/member/member.blade.php +++ b/resources/views/member/member.blade.php @@ -22,12 +22,12 @@
    + + + + + +
    {{--
    diff --git a/resources/views/report/stiker/stiker-harian.blade.php b/resources/views/report/stiker/stiker-harian.blade.php index 780a961..12ed781 100644 --- a/resources/views/report/stiker/stiker-harian.blade.php +++ b/resources/views/report/stiker/stiker-harian.blade.php @@ -85,7 +85,7 @@ class="btn btn-light btn-lg w-100">

    Jumlah Pendapatan :


    -

    Jumlah Transaksi :

    +

    Jumlah Transaksi :

    @@ -146,6 +146,7 @@ class="btn btn-light btn-lg w-100"> let awal = ''; let akhir = ''; let pendapatan = 0; + let jmlTrans = 0; let pdfData = []; $('#btnProses').on('click', function () { @@ -234,6 +235,7 @@ class="btn btn-light btn-lg w-100"> $.each(response.data, function (i, row) { pendapatan += parseInt(row.harga || 0, 10); + jmlTrans += 1; awalDate = row.awal.toString('YYYY-MM-DD'); tbody.append(` @@ -259,6 +261,8 @@ class="btn btn-light btn-lg w-100"> }); $('#pendapatan').text('Rp. ' + rupiah(pendapatan)); + $('#jmlTrans').text('Rp. ' + rupiah(jmlTrans)); + // console.log(jmlTrans); btn.prop('disabled', false).text('Proses'); @@ -329,6 +333,7 @@ function rupiah(angka) { ); doc.text(`Jumlah Pendapatan : ${rupiah(pendapatan)}`, marginLeft, 38); + doc.text(`Jumlah Transaksi : ${rupiah(jmlTrans)}`, marginLeft, 38); // garis pemisah doc.line(marginLeft, 40, pageWidth - marginRight, 40); @@ -395,7 +400,7 @@ function rupiah(angka) { }, columnStyles: { - 0: { halign: 'center', cellWidth: 8 }, + 0: { halign: 'center', cellWidth: 10 }, 7: { halign: 'right' } }, @@ -421,6 +426,12 @@ function rupiah(angka) { ); doc.text(`Jumlah Pendapatan : ${rupiah(pendapatan)}`, marginLeft, 38); + doc.text( + `Jumlah Transaksi : ${rupiah(jmlTrans)}`, + pageWidth - marginRight, + 38, + { align: 'right'} + ); doc.line(marginLeft, 40, pageWidth - marginRight, 40); } diff --git a/resources/views/stiker.blade.php b/resources/views/stiker/stiker.blade.php similarity index 51% rename from resources/views/stiker.blade.php rename to resources/views/stiker/stiker.blade.php index 10e3885..f49fcf9 100644 --- a/resources/views/stiker.blade.php +++ b/resources/views/stiker/stiker.blade.php @@ -1,5 +1,42 @@ @extends('layouts.master') +@section('styles') + +@endsection + @section('content')
    @@ -7,51 +44,103 @@
    -
    +
    -

    Daftar Transaksi Langganan

    -
    - -
    -
    - -
    -
    - -
    -
    + +
    Metode Pencarian Transaksi
    + + +
    + + + + +
    - -
    - - + +
    + + +
    + +
    -
    - - + + +
    + +
    -
    - - + + +
    + +
    -
    - - -
    -
    - + + + {{--
    + + +
    --}} + + +
    +
    +
    -

    Bordered table

    +

    Transaksi Stiker / Langganan

    +
    +
    + +
    +
    + + + +
    +
    - +
    @@ -63,14 +152,18 @@ - - + + {{-- --}}
    No.Departement Periode Details KendaraanNo. KartuActionNo. KartuAction
    + + @include('stiker.tambah-stiker') + @include('stiker.ubah-stiker') +
    @@ -102,6 +195,30 @@ $(document).ready(function () { var vehicle = @json($vehicleSelect); + let selectedRowData = null; + + $('#example tbody').on('click', 'tr', function () { + + const notrans = $(this).data('notrans'); + + // hapus semua highlight + $('#example tbody tr').removeClass('selected'); + + // highlight semua row dalam 1 grup + $(`#example tbody tr[data-notrans="${notrans}"]`).addClass('selected'); + + // ambil data dari row pertama grup + const firstRow = $(`#example tbody tr[data-notrans="${notrans}"]`).first(); + + selectedRowData = { + notrans : firstRow.data('notrans') + }; + + console.log('Selected transaksi:', selectedRowData); + + $('#rowActions').removeClass('d-none'); + }); + $(document).on('click', '.extend-button', function () { var rawId = $(this).data('id'); let id = rawId.substring(0, rawId.indexOf('/')); @@ -259,6 +376,95 @@ }, }); }); + + $(document).on('click', '.edit-button', function () { + let id = selectedRowData; + $('#edit-member').attr('action', '/transaksi/member/' + id); + $('#ubah-member').modal('show'); + // console.log(selectedRowData); + // console.log(id); + $.get(`/transaksi/member/${selectedRowData}`, function(res){ + + fillMemberModal(res); + + $('#modal-member').modal('show'); + + }); + }); + // $('#btnEdit').on('click', function(){ + + // if(!selectedRowData) { + // alert('Pilih data dulu'); + // return; + // } + // console.log(selectedRowData); + + // $.get(`/member/${selectedRowData.notrans}`, function(res){ + + // fillMemberModal(res); + + // $('#modal-member').modal('show'); + + // }); + // }); + + function fillMemberModal(res){ + + let m = res.member; + + // TAB 1 - DATA PENGUNJUNG + $('[name="nama"]').val(m.nama); + $('[name="address"]').val(m.alamat); + $('[name="daterange"]').val(m.awal + ' - ' + m.akhir); + $('[name="member"]').val(m.jenis_langganan).trigger('change'); + $('[name="depart"]').val(m.dept).trigger('change'); + $('[name="note"]').val(m.note); + $('[name="harga"]').val(m.harga); + + // ========================= + // TAB 2 - KENDARAAN + // ========================= + $('#list-nopol').empty(); + + res.kendaraan.forEach(v => { + $('#list-nopol').append(` + + ${v.nopol} + ${v.jenis} + ${v.merk} + ${v.member} + + + + + `); + }); + + // ========================= + // TAB 3 - KARTU + // ========================= + $('#list-card').empty(); + + res.kartu.forEach(k => { + $('#list-card').append(` + + ${k.kartu} + ${k.nourut} + + + + + `); + }); + + } + + $('#modal-member').on('hidden.bs.modal', function () { + $(this).find('form')[0].reset(); + $('#list-nopol').empty(); + $('#list-card').empty(); + }); }); + @endsection \ No newline at end of file diff --git a/resources/views/stiker/tambah-stiker.blade.php b/resources/views/stiker/tambah-stiker.blade.php new file mode 100644 index 0000000..340f555 --- /dev/null +++ b/resources/views/stiker/tambah-stiker.blade.php @@ -0,0 +1,196 @@ + \ No newline at end of file diff --git a/resources/views/stiker/ubah-stiker.blade.php b/resources/views/stiker/ubah-stiker.blade.php new file mode 100644 index 0000000..67db6b9 --- /dev/null +++ b/resources/views/stiker/ubah-stiker.blade.php @@ -0,0 +1,188 @@ + \ No newline at end of file