"Tambah fitur approval pembayaran dan pembaruan konvensi data"
- Implementasi fitur approval untuk pembayaran dengan tampilan antarmuka baru. - Penyesuaian teks konfirmasi pada proses persetujuan pembayaran. - Penambahan relasi `approveBayar` pada model `Permohonan`. - Perbaikan logika status pada proses pembaruan permohonan dan penawaran. - Penyesuaian data output pada JSON respons untuk otorisasi pembayaran.
This commit is contained in:
@@ -27,9 +27,83 @@
|
||||
return view('lpj::pembayaran.index');
|
||||
}
|
||||
|
||||
public function approval() {}
|
||||
public function approval() {
|
||||
return view('lpj::pembayaran.approval');
|
||||
}
|
||||
|
||||
public function dataApprovalForDatatables(Request $request) {}
|
||||
public function dataApprovalForDatatables(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();
|
||||
|
||||
// Apply search filter if provided
|
||||
if ($request->has('search') && !empty($request->get('search'))) {
|
||||
$search = $request->get('search');
|
||||
$query->where(function ($q) use ($search) {
|
||||
$q->where('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
|
||||
->with(
|
||||
[
|
||||
'penawaran.permohonan.user',
|
||||
'penawaran.permohonan.debiture',
|
||||
'penawaran.permohonan.branch',
|
||||
'permohonan.debiture',
|
||||
'permohonan.branch',
|
||||
'permohonan.user',
|
||||
'permohonan.approveBayar',
|
||||
'penawaran.permohonan.approveBayar',
|
||||
'penawaran.detail',
|
||||
'penawaran.persetujuan',
|
||||
],
|
||||
)->get();
|
||||
|
||||
|
||||
// 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,
|
||||
]);
|
||||
}
|
||||
|
||||
function edit($id)
|
||||
{
|
||||
@@ -66,7 +140,6 @@
|
||||
$permohonan = Permohonan::find(request()->get('permohonan_id'));
|
||||
if ($permohonan) {
|
||||
$permohonan->status_bayar = request()->get('status_bayar');
|
||||
$permohonan->status = 'noc';
|
||||
$permohonan->save();
|
||||
|
||||
// andy add, update status penawaran.status='spk'
|
||||
@@ -88,32 +161,32 @@
|
||||
: JsonResponse {
|
||||
// init
|
||||
$data = [];
|
||||
$dataku = [];
|
||||
$output = [];
|
||||
$tindakan = null;
|
||||
if (request()->ajax()) {
|
||||
try {
|
||||
$dataku = [
|
||||
$data = [
|
||||
'approve_bayar_by' => Auth::id(),
|
||||
'approve_bayar_at' => now(),
|
||||
];
|
||||
|
||||
if ($request->keterangan) {
|
||||
$dataku['approve_keterangan_bayar'] = $request->keterangan;
|
||||
$data['approve_keterangan_bayar'] = $request->keterangan;
|
||||
}
|
||||
|
||||
$data['dataku'] = $dataku;
|
||||
$output['data'] = $data;
|
||||
|
||||
$modal = Permohonan::find($id);
|
||||
$modal->update($dataku);
|
||||
$modal->update($data);
|
||||
//
|
||||
$data['status'] = 'success';
|
||||
$data['message'] = ['Otorisasi' . $modal->nomor_registrasi . 'berhasil di lakukan'];
|
||||
$output['status'] = 'success';
|
||||
$output['message'] = ['Otorisasi' . $modal->nomor_registrasi . 'berhasil di lakukan'];
|
||||
} catch (Exception $e) {
|
||||
$data['status'] = 'error';
|
||||
$data['message'] = ['Otorisasi gagal di lakukan.'];
|
||||
$output['status'] = 'error';
|
||||
$output['message'] = ['Otorisasi gagal di lakukan.'];
|
||||
}
|
||||
}
|
||||
return response()->json($data);
|
||||
return response()->json($output);
|
||||
}
|
||||
|
||||
public function dataForDatatables(Request $request)
|
||||
|
||||
Reference in New Issue
Block a user