28513100f4
- **Controller (NocController)**: - Perbaikan nama route pada **index()** dari `noc.pembayaran` menjadi `noc.pembayaran.index`. - Menghapus komentar kode tak terpakai pada logika update **status permohonan** di metode penyimpanan. - **Blade Views**: - Perbaikan konsistensi atribut HTML dan struktur elemen di berbagai template: `index.blade.php`, `pembayaran.blade.php`, dan `form.blade.php`. - Penghapusan spasi yang tidak diperlukan dan optimasi indentasi pada atribut elemen seperti `class`, `data-*`, dan lainnya. - Perbaikan label input dan placeholder untuk keterbacaan dan kesesuaian desain. - Penyelarasan nama variabel dan logika validasi berdasarkan kondisi file dan data yang ada. - **Form NOC**: - Penyesuaian form handling untuk berbagai atribut seperti `status_pembayar`, `nominal_bayar`, dan `bukti_ksl`. - Penyesuaian aksi form untuk **update** atau **store** tergantung kondisi form. - **Datatables**: - Pengoptimalan tabel untuk hierarki atribut dan nilai default seperti pagination, sorting, atau data filtering.
388 lines
16 KiB
PHP
388 lines
16 KiB
PHP
<?php
|
|
|
|
namespace Modules\Lpj\Http\Controllers;
|
|
|
|
use App\Http\Controllers\Controller;
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Support\Facades\Auth;
|
|
use Modules\Lpj\Http\Requests\NocRequest;
|
|
use Modules\Lpj\Models\Noc;
|
|
use Modules\Lpj\Models\PenawaranTender;
|
|
use Modules\Lpj\Models\Permohonan;
|
|
use Modules\Lpj\Models\PersetujuanPenawaran;
|
|
|
|
class NocController extends Controller
|
|
{
|
|
public $user;
|
|
|
|
/**
|
|
* Display a listing of the resource.
|
|
*/
|
|
public function index()
|
|
{
|
|
return redirect()->route('noc.pembayaran.index');
|
|
}
|
|
|
|
public function pembayaran()
|
|
{
|
|
$persetujuanPenawarans = PersetujuanPenawaran::all();
|
|
return view('lpj::noc.pembayaran', compact('persetujuanPenawarans'));
|
|
}
|
|
|
|
public function penyelesaian()
|
|
{
|
|
$persetujuanPenawarans = PersetujuanPenawaran::all();
|
|
return view('lpj::noc.penyelesaian', compact('persetujuanPenawarans'));
|
|
}
|
|
|
|
/**
|
|
* Store a newly created resource in storage.
|
|
*/
|
|
/**
|
|
* Store a newly created resource in storage.
|
|
*/
|
|
/**
|
|
* Store a newly created resource in storage.
|
|
*/
|
|
public function store(NocRequest $request)
|
|
{
|
|
$validated = $request->validated();
|
|
$validated['updated_by'] = Auth::id();
|
|
if (request()->get('status_bayar') == "sudah_bayar") {
|
|
$validated['status'] = '1';
|
|
$status = "spk";
|
|
} else {
|
|
$status = "persetujuan-penawaran";
|
|
}
|
|
|
|
|
|
$dataNoc = [
|
|
'nominal_bayar' => $validated['nominal_bayar'],
|
|
'tanggal_pembayaran' => $validated['tanggal_pembayaran'] ?? date('Y-m-d'),
|
|
'status_bayar' => $validated['nominal_bayar'] < $validated['total_harus_bayar'] ? false : true,
|
|
'catatan_noc' => $validated['catatan_noc'],
|
|
];
|
|
$noc = Noc::updateOrCreate(
|
|
[
|
|
'permohonan_id' => $validated['permohonan_id'],
|
|
'persetujuan_penawaran_id' => $validated['persetujuan_penawaran_id'],
|
|
],
|
|
$dataNoc,
|
|
);
|
|
|
|
$folderPath = 'noc/' . request()->get('persetujuan_penawaran_id') . '/bukti_ksl/';
|
|
|
|
if ($request->hasFile('bukti_ksl')) {
|
|
$noc->bukti_ksl = $request->file('bukti_ksl')->store(
|
|
$folderPath,
|
|
'public',
|
|
);
|
|
}
|
|
$noc->save();
|
|
|
|
/* Update the status of the related permohonan to 'spk'
|
|
$permohonan = Permohonan::find(request()->get('permohonan_id'));
|
|
if ($permohonan) {
|
|
$permohonan->status_bayar = request()->get('status_pembayar');
|
|
if ($permohonan->jenis_penilaian_id == 2) {
|
|
$permohonan->status = $status;
|
|
}
|
|
$permohonan->save();
|
|
|
|
// andy add, update status penawaran.status='spk'
|
|
// $penawaran = PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)->first();
|
|
if ($permohonan->jenis_penilaian_id == 2) {
|
|
PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->update([
|
|
'status' => $status,
|
|
'updated_by' => Auth::id(),
|
|
'updated_at' => now(),
|
|
]);
|
|
}
|
|
// andy add, update status penawaran.status='spk'
|
|
}*/
|
|
|
|
return redirect()
|
|
->route('noc.index')->with('success', 'NOC berhasil disimpan.');
|
|
}
|
|
|
|
/**
|
|
* Update the specified resource in storage.
|
|
*/
|
|
public function update(NocRequest $request, PersetujuanPenawaran $persetujuanPenawaran)
|
|
{
|
|
$validated = $request->validated();
|
|
|
|
if($request->get('is_memo')){
|
|
|
|
$memo = Noc::find($request->get('is_memo'));
|
|
|
|
$folderPath = 'noc/' . request()->get('persetujuan_penawaran_id') . '/memo_penyelesaian/';
|
|
|
|
if ($request->hasFile('memo_penyelesaian')) {
|
|
$memo->memo_penyelesaian = $request->file('memo_penyelesaian')->store(
|
|
$folderPath,
|
|
'public',
|
|
);
|
|
}
|
|
|
|
$memo->catatan_noc = $validated['catatan_noc'];
|
|
$memo->save();
|
|
|
|
|
|
return redirect()
|
|
->route('laporan.index')->with('success', 'Memo Penyelesaian updated successfully');
|
|
}
|
|
$dataNoc = [
|
|
'nominal_penyelesaian' => $validated['nominal_penyelesaian'],
|
|
'tanggal_penyelesaian' => $validated['tanggal_penyelesaian'] ?? date('Y-m-d'),
|
|
'status_pelunasan' => ((int)$validated['nominal_bayar'] + (int)$validated['nominal_penyelesaian']) === (int)$validated['total_harus_bayar'] ? true : false,
|
|
'catatan_noc' => $validated['catatan_noc'],
|
|
];
|
|
|
|
|
|
$noc = Noc::updateOrCreate(
|
|
[
|
|
'permohonan_id' => $validated['permohonan_id'],
|
|
'permohonan_id' => $validated['permohonan_id'],
|
|
'persetujuan_penawaran_id' => $validated['persetujuan_penawaran_id'],
|
|
],
|
|
$dataNoc,
|
|
);
|
|
|
|
$folderPath = 'noc/' . request()->get('persetujuan_penawaran_id') . '/bukti_penyelesaian/';
|
|
|
|
if ($request->hasFile('bukti_penyelesaian')) {
|
|
$noc->bukti_penyelesaian = $request->file('bukti_penyelesaian')->store(
|
|
$folderPath,
|
|
'public',
|
|
);
|
|
}
|
|
$noc->save();
|
|
|
|
|
|
return redirect()
|
|
->route('noc.index')->with('success', 'NOC updated successfully');
|
|
}
|
|
|
|
/**
|
|
* Show the form for creating a new resource.
|
|
*/
|
|
public function create()
|
|
{
|
|
return view('lpj::noc.create');
|
|
}
|
|
|
|
/**
|
|
* Display the specified resource.
|
|
*/
|
|
public function show(Noc $noc) {
|
|
return view('lpj::noc.memo', compact('noc'));
|
|
}
|
|
|
|
/**
|
|
* Show the form for editing the specified resource.
|
|
*/
|
|
public function edit($id)
|
|
{
|
|
$persetujuanPenawaran = PersetujuanPenawaran::where('id', $id)->first();
|
|
return view('lpj::noc.form', compact('persetujuanPenawaran'));
|
|
}
|
|
|
|
/**
|
|
* Remove the specified resource from storage.
|
|
*/
|
|
public function destroy(PersetujuanPenawaran $persetujuanPenawaran)
|
|
{
|
|
$persetujuanPenawaran->delete();
|
|
|
|
return redirect()
|
|
->route('noc.index')->with('success', 'Persetujuan Penawaran deleted successfully');
|
|
}
|
|
|
|
public function dataForDatatables(Request $request)
|
|
{
|
|
// Redirect to pembayaran datatables by default
|
|
return $this->dataForDatatablesPembayaran($request);
|
|
}
|
|
|
|
public function dataForDatatablesPembayaran(Request $request)
|
|
{
|
|
if (is_null($this->user) || !$this->user->can('noc.view')) {
|
|
//abort(403, 'Sorry! You are not allowed to view persetujuan penawaran.');
|
|
}
|
|
|
|
// Retrieve data from the database
|
|
$query = PersetujuanPenawaran::query();
|
|
|
|
// Filter for pembayaran (where memo_penyelesaian is null)
|
|
$query->whereDoesntHave('noc', function($q) {
|
|
$q->whereNotNull('memo_penyelesaian');
|
|
});
|
|
|
|
// Apply search filter if provided
|
|
if ($request->has('search') && !empty($request->get('search'))) {
|
|
$search = $request->get('search');
|
|
$query->where(function ($q) use ($search) {
|
|
$q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%');
|
|
});
|
|
}
|
|
|
|
// Apply sorting if provided
|
|
if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
|
|
$order = $request->get('sortOrder');
|
|
$column = $request->get('sortField');
|
|
$query->orderBy($column, $order);
|
|
}
|
|
|
|
// Get the total count of records
|
|
$totalRecords = $query->count();
|
|
|
|
// Apply pagination if provided
|
|
if ($request->has('page') && $request->has('size')) {
|
|
$page = $request->get('page');
|
|
$size = $request->get('size');
|
|
$offset = ($page - 1) * $size; // Calculate the offset
|
|
|
|
$query->skip($offset)->take($size);
|
|
}
|
|
|
|
// Get the filtered count of records
|
|
$filteredRecords = $query->count();
|
|
|
|
// Get the data for the current page
|
|
$data = $query->get();
|
|
|
|
$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,
|
|
'tanggal_pembayaran' => dateFormat(
|
|
$persetujuanPenawaran->noc->tanggal_pembayaran ?? $persetujuanPenawaran->noc?->created_at,
|
|
true,
|
|
),
|
|
'nominal_bayar' => currencyFormat($persetujuanPenawaran->nominal_bayar ?? 0,
|
|
),
|
|
'nominal_diterima' => currencyFormat(
|
|
$persetujuanPenawaran->noc->nominal_bayar ?? 0,
|
|
),
|
|
'bukti_ksl' => $persetujuanPenawaran->noc->bukti_ksl ?? $persetujuanPenawaran->bukti_ksl ?? null,
|
|
'bukti_bayar' => $persetujuanPenawaran->bukti_bayar ?? null,
|
|
'updated_at' => dateFormat($persetujuanPenawaran->updated_at, true),
|
|
];
|
|
})->sortBy('updated_at', 1);
|
|
|
|
// Calculate the page count
|
|
$pageCount = ceil($totalRecords / $request->get('size'));
|
|
|
|
// Calculate the current page number
|
|
$currentPage = $request->get('page', 1);
|
|
|
|
// Return the response data as a JSON object
|
|
return response()->json([
|
|
'draw' => $request->get('draw'),
|
|
'recordsTotal' => $totalRecords,
|
|
'recordsFiltered' => $filteredRecords,
|
|
'pageCount' => $pageCount,
|
|
'page' => $currentPage,
|
|
'totalCount' => $totalRecords,
|
|
'data' => $data,
|
|
]);
|
|
}
|
|
|
|
public function dataForDatatablesPenyelesaian(Request $request)
|
|
{
|
|
if (is_null($this->user) || !$this->user->can('noc.view')) {
|
|
//abort(403, 'Sorry! You are not allowed to view persetujuan penawaran.');
|
|
}
|
|
|
|
// Retrieve data from the database
|
|
$query = PersetujuanPenawaran::query();
|
|
|
|
// Filter for penyelesaian (where memo_penyelesaian is not null)
|
|
$query->whereHas('noc', function($q) {
|
|
$q->whereNotNull('memo_penyelesaian');
|
|
});
|
|
|
|
// Apply search filter if provided
|
|
if ($request->has('search') && !empty($request->get('search'))) {
|
|
$search = $request->get('search');
|
|
$query->where(function ($q) use ($search) {
|
|
$q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%');
|
|
});
|
|
}
|
|
|
|
// Apply sorting if provided
|
|
if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
|
|
$order = $request->get('sortOrder');
|
|
$column = $request->get('sortField');
|
|
$query->orderBy($column, $order);
|
|
}
|
|
|
|
// Get the total count of records
|
|
$totalRecords = $query->count();
|
|
|
|
// Apply pagination if provided
|
|
if ($request->has('page') && $request->has('size')) {
|
|
$page = $request->get('page');
|
|
$size = $request->get('size');
|
|
$offset = ($page - 1) * $size; // Calculate the offset
|
|
|
|
$query->skip($offset)->take($size);
|
|
}
|
|
|
|
// Get the filtered count of records
|
|
$filteredRecords = $query->count();
|
|
|
|
// Get the data for the current page
|
|
$data = $query->get();
|
|
|
|
$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,
|
|
'tanggal_pembayaran' => dateFormat(
|
|
$persetujuanPenawaran->noc->tanggal_pembayaran ?? $persetujuanPenawaran->noc?->created_at,
|
|
true,
|
|
),
|
|
'nominal_bayar' => currencyFormat($persetujuanPenawaran->nominal_bayar ?? 0,
|
|
),
|
|
'nominal_diterima' => currencyFormat(
|
|
$persetujuanPenawaran->noc->nominal_bayar ?? 0,
|
|
),
|
|
'bukti_ksl' => $persetujuanPenawaran->noc->bukti_ksl ?? $persetujuanPenawaran->bukti_ksl ?? null,
|
|
'bukti_bayar' => $persetujuanPenawaran->bukti_bayar ?? null,
|
|
'memo_penyelesaian' => $persetujuanPenawaran->noc->memo_penyelesaian ?? $persetujuanPenawaran->memo_penyelesaian ?? null,
|
|
'nominal_penyelesaian' => currencyFormat(
|
|
$persetujuanPenawaran->noc->nominal_penyelesaian ?? $persetujuanPenawaran->nominal_penyelesaian ?? 0,
|
|
),
|
|
'bukti_penyelesaian' => $persetujuanPenawaran->noc->bukti_penyelesaian ?? $persetujuanPenawaran->bukti_penyelesaian ?? null,
|
|
'tanggal_penyelesaian' => $persetujuanPenawaran->noc?->tanggal_penyelesaian ? dateFormat(
|
|
$persetujuanPenawaran->noc?->tanggal_penyelesaian,
|
|
true) : '-',
|
|
'updated_at' => dateFormat($persetujuanPenawaran->updated_at, true),
|
|
];
|
|
})->sortBy('updated_at', 1);
|
|
|
|
// Calculate the page count
|
|
$pageCount = ceil($totalRecords / $request->get('size'));
|
|
|
|
// Calculate the current page number
|
|
$currentPage = $request->get('page', 1);
|
|
|
|
// Return the response data as a JSON object
|
|
return response()->json([
|
|
'draw' => $request->get('draw'),
|
|
'recordsTotal' => $totalRecords,
|
|
'recordsFiltered' => $filteredRecords,
|
|
'pageCount' => $pageCount,
|
|
'page' => $currentPage,
|
|
'totalCount' => $totalRecords,
|
|
'data' => $data,
|
|
]);
|
|
}
|
|
}
|