diff --git a/app/Http/Controllers/NocController.php b/app/Http/Controllers/NocController.php index 6623104..b99c7b3 100644 --- a/app/Http/Controllers/NocController.php +++ b/app/Http/Controllers/NocController.php @@ -220,9 +220,9 @@ $query = PersetujuanPenawaran::query(); // Filter for pembayaran (where memo_penyelesaian is null) - $query->whereDoesntHave('noc', function($q) { + /*$query->whereDoesntHave('noc', function($q) { $q->whereNotNull('memo_penyelesaian'); - }); + });*/ // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) { @@ -260,10 +260,11 @@ $data = $data->map(function ($persetujuanPenawaran) { return [ 'id' => $persetujuanPenawaran->id, - 'nomor_registrasi' => $persetujuanPenawaran->permohonan->nomor_registrasi ?? $persetujuanPenawaran->penawaran->nomor_registrasi, - 'nama_debitur' => $persetujuanPenawaran->permohonan->debiture->name ?? $persetujuanPenawaran->penawaran->permohonan->debiture->name, - 'kode_cabang' => $persetujuanPenawaran->permohonan->branch->code ?? $persetujuanPenawaran->penawaran->permohonan->branch->code, - 'cabang' => $persetujuanPenawaran->permohonan->branch->name ?? $persetujuanPenawaran->penawaran->permohonan->branch->name, + 'nomor_registrasi' => $persetujuanPenawaran->permohonan?->nomor_registrasi ?? $persetujuanPenawaran->penawaran?->nomor_registrasi, + 'nomor_tiket' => $persetujuanPenawaran->nomor_tiket ?? '', + 'nama_debitur' => $persetujuanPenawaran?->permohonan?->debiture->name ?? $persetujuanPenawaran->penawaran?->permohonan?->debiture->name ?? $persetujuanPenawaran->noc?->debiture->name, + 'kode_cabang' => $persetujuanPenawaran?->permohonan?->branch->code ?? $persetujuanPenawaran->penawaran?->permohonan?->branch->code ?? $persetujuanPenawaran->noc?->branch->code, + 'cabang' => $persetujuanPenawaran?->permohonan?->branch->name ?? $persetujuanPenawaran->penawaran?->permohonan?->branch->name ?? $persetujuanPenawaran->noc?->branch->name, 'tanggal_pembayaran' => dateFormat( $persetujuanPenawaran->noc->tanggal_pembayaran ?? $persetujuanPenawaran->noc?->created_at, true, @@ -347,9 +348,11 @@ $data = $data->map(function ($persetujuanPenawaran) { return [ 'id' => $persetujuanPenawaran->id, - 'nomor_registrasi' => $persetujuanPenawaran->permohonan->nomor_registrasi ?? $persetujuanPenawaran->penawaran->nomor_registrasi, - 'nama_debitur' => $persetujuanPenawaran->permohonan->debiture->name ?? $persetujuanPenawaran->penawaran->permohonan->debiture->name, - 'cabang' => $persetujuanPenawaran->permohonan->branch->name ?? $persetujuanPenawaran->penawaran->permohonan->branch->name, + 'nomor_registrasi' => $persetujuanPenawaran->permohonan?->nomor_registrasi ?? $persetujuanPenawaran->penawaran?->nomor_registrasi ?? '', + 'nomor_tiket' => $persetujuanPenawaran->nomor_tiket ?? '', + 'nama_debitur' => $persetujuanPenawaran->permohonan->debiture->name ?? $persetujuanPenawaran->penawaran->permohonan->debiture->name ?? $persetujuanPenawaran->noc->debiture->name, + 'kode_cabang' => $persetujuanPenawaran?->permohonan?->branch->code ?? $persetujuanPenawaran->penawaran?->permohonan?->branch->code ?? $persetujuanPenawaran->noc?->branch->code, + 'cabang' => $persetujuanPenawaran->permohonan->branch->name ?? $persetujuanPenawaran->penawaran->permohonan->branch->name ?? $persetujuanPenawaran->noc?->branch->name, 'tanggal_pembayaran' => dateFormat( $persetujuanPenawaran->noc->tanggal_pembayaran ?? $persetujuanPenawaran->noc?->created_at, true, @@ -371,7 +374,7 @@ true) : '-', 'updated_at' => dateFormat($persetujuanPenawaran->updated_at, true), ]; - })->sortBy('updated_at', 1); + })->sortBy('updated_at', 1)->values(); // Calculate the page count $pageCount = ceil($totalRecords / $request->get('size')); diff --git a/app/Models/Noc.php b/app/Models/Noc.php index 2cb8dbc..e4330db 100644 --- a/app/Models/Noc.php +++ b/app/Models/Noc.php @@ -8,39 +8,7 @@ class Noc extends Base { protected $table = 'noc'; - protected $fillable = [ - 'permohonan_id', - 'persetujuan_penawaran_id', - 'nomor_tiket', - 'bukti_bayar', - 'nominal_bayar', - 'total_pembukuan', - 'status_bayar', - 'status_kurang_bayar', - 'nominal_kurang_bayar', - 'status_lebih_bayar', - 'nominal_lebih_bayar', - 'bukti_pengembalian', - 'tanggal_pembayaran', - 'nominal_penyelesaian', - 'status_penyelesaiaan', - 'tanggal_penyelesaian', - 'bukti_penyelesaian', - 'bukti_ksl', - 'memo_penyelesaian', - 'memo_penyelesaian_number', - 'memo_penyelesaian_date', - 'memo_penyelesaian_payment_date', - 'memo_penyelesaian_created_at', - 'catatan_noc', - 'status', - 'authorized_status', - 'authorized_at', - 'authorized_by', - 'nomor_rekening_lebih_bayar', - 'bukti_ksl_lebih_bayar', - 'bukti_ksl_kurang_bayar' - ]; + protected $guarded = ['id']; protected $casts = [ 'nominal_bayar' => 'decimal:2', @@ -78,4 +46,12 @@ class Noc extends Base { return $this->belongsTo(User::class, 'authorized_by'); } + + public function debiture(){ + return $this->belongsTo(Debiture::class,'debiture_id'); + } + + public function branch(){ + return $this->belongsTo(Branch::class,'branch_id'); + } } diff --git a/resources/views/noc/index.blade.php b/resources/views/noc/index.blade.php index 199ee72..8291c6e 100644 --- a/resources/views/noc/index.blade.php +++ b/resources/views/noc/index.blade.php @@ -39,6 +39,10 @@ Nomor Registrasi + + Nomor Tiket + + Nama Debitur @@ -151,6 +155,9 @@ nomor_registrasi: { title: 'Nomor Registrasi' }, + nomor_tiket: { + title: 'Nomor Tiket' + }, nama_debitur: { title: 'Nama Debitur', }, diff --git a/resources/views/noc/pembayaran.blade.php b/resources/views/noc/pembayaran.blade.php index 861e0fe..7796b6a 100644 --- a/resources/views/noc/pembayaran.blade.php +++ b/resources/views/noc/pembayaran.blade.php @@ -39,6 +39,10 @@ Nomor Registrasi + + Nomor Tiket + + Nama Debitur @@ -135,6 +139,9 @@ nomor_registrasi: { title: 'Nomor Registrasi' }, + nomor_tiket: { + title: 'Nomor Tiket' + }, nama_debitur: { title: 'Nama Debitur', }, diff --git a/resources/views/noc/penyelesaian.blade.php b/resources/views/noc/penyelesaian.blade.php index 3b6b9e5..4fd7826 100644 --- a/resources/views/noc/penyelesaian.blade.php +++ b/resources/views/noc/penyelesaian.blade.php @@ -5,9 +5,10 @@ @endsection @section('content') -
-
-
+
+
+

Daftar NOC Penyelesaian

@@ -27,77 +28,82 @@
- +
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + +
- - - Nomor Registrasi - - - Nama Debitur - - - Cabang - - - Tanggal KSL - - - Nominal bayar - - - Bukti Bayar - - - Nominal Diterima - - - Bukti KSL - - - Tanggal Pembayaran - - - Memo Penyelesaian - - - Bukti Penyelesaian - - - Nominal Penyelesaian - - - Tanggal Penyelesaian - - Action
+ + + Nomor Registrasi + + + Nomor Tiket + + + Nama Debitur + + + Cabang + + + Tanggal KSL + + + Nominal bayar + + + Bukti Bayar + + + Nominal Diterima + + + Bukti KSL + + + Tanggal Pembayaran + + + Memo Penyelesaian + + + Bukti Penyelesaian + + + Nominal Penyelesaian + + + Tanggal Penyelesaian + + Action
-
+ class="flex-col gap-3 justify-center font-medium text-gray-600 card-footer md:justify-between md:flex-row text-2sm"> +
Show - per + per page
-
+
@@ -105,140 +111,146 @@
- @endsection + @endsection - @push('scripts') - + + - - + let dataTable = new KTDataTable(element, dataTableOptions); + // Custom search functionality + searchInput.addEventListener('input', function() { + const searchValue = this.value.trim(); + dataTable.search(searchValue, true); + }); + @endpush diff --git a/routes/registrasi.php b/routes/registrasi.php index 8e2f305..f5ae3ac 100644 --- a/routes/registrasi.php +++ b/routes/registrasi.php @@ -131,6 +131,7 @@ Route::middleware(['auth'])->group(function () { Route::controller(PembayaranController::class)->group(function () { Route::get('/pembayaran', 'index')->name('pembayaran.index'); + Route::get('/pembayaran/create', 'create')->name('pembayaran.create'); Route::get('/pembayaran/kurang', 'kurang')->name('pembayaran.kurang.index'); Route::get('/pembayaran/lebih', 'lebih')->name('pembayaran.lebih.index'); Route::get('/pembayaran/{pembayaran}/edit', 'edit')->name('pembayaran.edit');