diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 9c53df4..dc20c34 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -2,9 +2,10 @@ namespace Modules\Lpj\Http\Controllers; -use App\Http\Controllers\Controller; use Illuminate\Http\Request; use Modules\Lpj\Models\Permohonan; +use App\Http\Controllers\Controller; +use Illuminate\Support\Facades\Auth; use Modules\Lpj\Http\Controllers\PenilaiController; class LaporanController extends Controller @@ -76,13 +77,17 @@ class LaporanController extends Controller // Retrieve data from the database $query = Permohonan::query()->whereIn('status',['proses-laporan','done', 'paparan', 'proses-paparan']) - ->whereNotNull('approval_so_at') - //->whereNotNull('approval_eo_at') + ->whereNotNull('approval_so_at'); + /*->whereNotNull('approval_eo_at') ->where(function ($q) { $q->whereIn('nilai_plafond_id', [1,4]) ->whereNotNull('approval_dd_at') ->orWhereIn('nilai_plafond_id', [2,3]); - }); + });*/ + + if (Auth::user()->hasAnyRole(['pemohon-ao','pemohon-eo'])) { + $query = $query->where('branch_id', Auth::user()->branch_id); + } $query = $query->orderBy('nomor_registrasi', 'desc'); // Apply search filter if provided diff --git a/app/Http/Controllers/NocController.php b/app/Http/Controllers/NocController.php index 1fe45d1..49a0986 100644 --- a/app/Http/Controllers/NocController.php +++ b/app/Http/Controllers/NocController.php @@ -96,11 +96,13 @@ use Modules\Lpj\Models\Noc; } $noc->save(); - $bucok = Bucok::where('nomor_tiket', $noc->nomor_tiket)->first(); - $bucok->nominal_penyelesaian = $noc->total_pembukuan ?? ''; - $bucok->tanggal_penyelesaian = $noc->tanggal_pembayaran ?? date('Y-m-d'); - $bucok->penyelesaian = 'Selesai'; - $bucok->save(); + $bucok = Bucok::where('nomor_tiket', $noc->nomor_tiket)->orWhere('permohonan_id', $noc->permohonan_id)->first(); + if($bucok){ + $bucok->nominal_penyelesaian = $noc->total_pembukuan ?? ''; + $bucok->tanggal_penyelesaian = $noc->tanggal_pembayaran ?? date('Y-m-d'); + $bucok->penyelesaian = 'Selesai'; + $bucok->save(); + } return redirect() ->route('noc.index')->with('success', 'NOC berhasil disimpan.'); @@ -316,7 +318,9 @@ use Modules\Lpj\Models\Noc; $query = PersetujuanPenawaran::query(); // Filter for penyelesaian (where memo_penyelesaian is not null) - + $query->whereDoesntHave('noc', function($q) { + $q->whereNotNull('memo_penyelesaian'); + }); // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) { @@ -357,9 +361,9 @@ use Modules\Lpj\Models\Noc; 'id' => $persetujuanPenawaran->id, '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, + '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, diff --git a/app/Http/Controllers/PembatalanController.php b/app/Http/Controllers/PembatalanController.php index 7e735df..901ec80 100644 --- a/app/Http/Controllers/PembatalanController.php +++ b/app/Http/Controllers/PembatalanController.php @@ -3,26 +3,12 @@ namespace Modules\Lpj\Http\Controllers; use App\Http\Controllers\Controller; - use Barryvdh\DomPDF\Facade\Pdf; use Exception; use Illuminate\Http\Request; - use Maatwebsite\Excel\Facades\Excel; - use Modules\Location\Models\City; - use Modules\Location\Models\District; - use Modules\Location\Models\Province; - use Modules\Location\Models\Village; - use Modules\Lpj\Exports\PermohonanExport; - use Modules\Lpj\Http\Requests\PermohonanRequest; - use Modules\Lpj\Models\Branch; - use Modules\Lpj\Models\Debiture; - use Modules\Lpj\Models\DokumenJaminan; - use Modules\Lpj\Models\JenisFasilitasKredit; - use Modules\Lpj\Models\NilaiPlafond; use Modules\Lpj\Models\Permohonan; use Modules\Lpj\Models\PermohonanPembatalan; - use Modules\Lpj\Models\StatusPermohonan; - use Modules\Lpj\Models\TujuanPenilaian; use Modules\Lpj\Services\PermohonanHistoryService; + use Illuminate\Support\Facades\Auth; class PembatalanController extends Controller { @@ -92,6 +78,10 @@ // Retrieve data from the database $query = PermohonanPembatalan::query(); + if (Auth::user()->hasAnyRole(['pemohon-ao','pemohon-eo'])) { + $query = $query->whereRelation('permohonan', 'branch_id', Auth::user()->branch_id); + } + $query = $query->orderBy('created_at', 'desc'); // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) { diff --git a/app/Http/Controllers/PembayaranController.php b/app/Http/Controllers/PembayaranController.php index 29649bf..1827f5c 100644 --- a/app/Http/Controllers/PembayaranController.php +++ b/app/Http/Controllers/PembayaranController.php @@ -44,6 +44,9 @@ class PembayaranController extends Controller // Retrieve data from the database $query = PersetujuanPenawaran::query(); + if (Auth::user()->hasAnyRole(['pemohon-ao','pemohon-eo'])) { + $query = $query->whereRelation('permohonan', 'branch_id', Auth::user()->branch_id); + } // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) { @@ -172,10 +175,10 @@ class PembayaranController extends Controller $noc = Noc::create($noc); $bucok = [ - 'tanggal_penuh' => $persetujuanPenawaran->created_at, - 'tanggal' => $persetujuanPenawaran->created_at->format('d'), - 'bulan' => $persetujuanPenawaran->created_at->format('m'), - 'tahun' => $persetujuanPenawaran->created_at->format('Y'), + 'tanggal_penuh' => $persetujuanPenawaran->created_at ?? $noc->created_at, + 'tanggal' => $persetujuanPenawaran->created_at?->format('d') ?? $noc->created_at?->format('d'), + 'bulan' => $persetujuanPenawaran->created_at?->format('m') ?? $noc->created_at?->format('m'), + 'tahun' => $persetujuanPenawaran->created_at?->format('Y') ?? $noc->created_at?->format('Y'), 'nomor_tiket' => $req['nomor_tiket'] ?? '', 'nominal' => $req['nominal_bayar'] ?? '', 'nominal_berjalan' => $req['nominal_bayar'] ?? '', @@ -225,6 +228,7 @@ class PembayaranController extends Controller $validated = $request->validated(); $validated['nominal_bayar'] = $req['nominal_bayar'] ?? 0; $validated['created_by'] = Auth::id(); + $validated['created_at'] = now(); $validated['status'] = '0'; $persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $validated['permohonan_id'] ?? null)->first(); @@ -266,10 +270,10 @@ class PembayaranController extends Controller } $bucok = [ - 'tanggal_penuh' => $persetujuanPenawaran->created_at, - 'tanggal' => $persetujuanPenawaran->created_at->format('d'), - 'bulan' => $persetujuanPenawaran->created_at->format('m'), - 'tahun' => $persetujuanPenawaran->created_at->format('Y'), + 'tanggal_penuh' => $persetujuanPenawaran->created_at ?? $validated['created_at'], + 'tanggal' => $persetujuanPenawaran->created_at?->format('d') ?? $validated['created_at']?->format('d'), + 'bulan' => $persetujuanPenawaran->created_at?->format('m') ?? $validated['created_at']?->format('m'), + 'tahun' => $persetujuanPenawaran->created_at?->format('Y') ?? $validated['created_at']?->format('Y'), 'nomor_tiket' => $req['nomor_tiket'] ?? '', 'nominal' => $req['nominal_bayar'] ?? '', 'nominal_berjalan' => $req['nominal_bayar'] ?? '', @@ -391,6 +395,10 @@ class PembayaranController extends Controller $query = PersetujuanPenawaran::query(); + if (Auth::user()->hasAnyRole(['pemohon-ao','pemohon-eo'])) { + $query = $query->whereRelation('permohonan', 'branch_id', Auth::user()->branch_id); + } + $query->where(function($q) { $q->whereRelation('permohonan', function($query) { $query->where('status_bayar', 'belum_bayar')