Merge branches 'feature/senior-officer' and 'staging' of https://git.putrakuningan.com/daengdeni/lpj into staging
This commit is contained in:
70
app/Exports/LaporanAdminKreditExport.php
Normal file
70
app/Exports/LaporanAdminKreditExport.php
Normal file
@@ -0,0 +1,70 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Lpj\Exports;
|
||||
|
||||
use Maatwebsite\Excel\Concerns\FromCollection;
|
||||
use Maatwebsite\Excel\Concerns\WithColumnFormatting;
|
||||
use Maatwebsite\Excel\Concerns\WithHeadings;
|
||||
use Maatwebsite\Excel\Concerns\WithMapping;
|
||||
use Modules\Lpj\Models\LaporanAdminKredit;
|
||||
use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
|
||||
|
||||
class LaporanAdminKreditExport implements WithColumnFormatting, WithHeadings, FromCollection, WithMapping
|
||||
{
|
||||
public function collection()
|
||||
{
|
||||
return LaporanAdminKredit::with('debiture')->get();
|
||||
}
|
||||
|
||||
public function map($row): array
|
||||
{
|
||||
return [
|
||||
$row->id,
|
||||
$row->debiture->cif,
|
||||
$row->debiture->name,
|
||||
$row->debiture->branch->name,
|
||||
$row->kode_register_t24,
|
||||
$row->jenis_agunan,
|
||||
$row->bukti_kepemilikan,
|
||||
$row->alamat_agunan,
|
||||
$row->nama_pemilik,
|
||||
$row->tanggal_kunjungan,
|
||||
$row->nilai_pasar_wajar,
|
||||
$row->nilai_likuidasi,
|
||||
$row->nama_penilai,
|
||||
$row->created_at
|
||||
];
|
||||
}
|
||||
|
||||
public function headings(): array
|
||||
{
|
||||
return [
|
||||
'ID',
|
||||
'CIF',
|
||||
'Nama Debitur',
|
||||
'Cabang',
|
||||
'Kode Register T24',
|
||||
'Jenis Agunan',
|
||||
'Bukti Kepemilikan',
|
||||
'Alamat Agunan',
|
||||
'Nama Pemilik',
|
||||
'Tanggal Kunjungan',
|
||||
'Nilai Pasar Wajar',
|
||||
'Nilai Likuidasi',
|
||||
'Nama Penilai',
|
||||
'Created At'
|
||||
];
|
||||
}
|
||||
|
||||
public function columnFormats(): array
|
||||
{
|
||||
return [
|
||||
'A' => NumberFormat::FORMAT_NUMBER,
|
||||
'B' => NumberFormat::FORMAT_NUMBER,
|
||||
'J' => NumberFormat::FORMAT_DATE_DDMMYYYY,
|
||||
'K' => NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
|
||||
'L' => NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
|
||||
'M' => NumberFormat::FORMAT_DATE_DATETIME,
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -32,10 +32,10 @@ function formatTanggalIndonesia($date, $time = false)
|
||||
}
|
||||
|
||||
|
||||
function formatRupiah($number)
|
||||
function formatRupiah($number,$decimals = 0)
|
||||
{
|
||||
$number = (float) $number;
|
||||
return 'Rp ' . number_format($number, 0, ',', '.');
|
||||
return 'Rp ' . number_format($number, $decimals, ',', '.');
|
||||
}
|
||||
|
||||
|
||||
|
||||
137
app/Http/Controllers/LaporanAdminKreditController.php
Normal file
137
app/Http/Controllers/LaporanAdminKreditController.php
Normal file
@@ -0,0 +1,137 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Lpj\Http\Controllers;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Modules\Lpj\Exports\LaporanAdminKreditExport;
|
||||
use Modules\Lpj\Models\LaporanAdminKredit;
|
||||
use Maatwebsite\Excel\Facades\Excel;
|
||||
use Modules\Lpj\Models\Permohonan;
|
||||
|
||||
class LaporanAdminKreditController extends Controller
|
||||
{
|
||||
public $user;
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
$permohonan = Permohonan::with(['documents.jenisJaminan','penilaian._user_penilai','penilai','documents.detail.jenisLegalitasJaminan'])->where(['status'=>'done'])->get();
|
||||
foreach($permohonan as $_permohonan){
|
||||
if(isset($_permohonan->penilai->lpj)){
|
||||
$npw = json_decode($_permohonan->penilai->lpj, true);
|
||||
$npw = $npw['total_nilai_pasar_wajar'] ?? 0;
|
||||
}
|
||||
|
||||
$dataAdk = [
|
||||
'jenis_agunan' => $_permohonan->documents->pluck('jenisJaminan.name')->unique()->implode(', '),
|
||||
'alamat_agunan' => $_permohonan->documents->map(function ($document) {
|
||||
return formatAlamat($document);
|
||||
})->unique()->implode(', '),
|
||||
'nama_pemilik' => $_permohonan->documents->pluck('pemilik.name')->unique()->implode(', '),
|
||||
'tanggal_kunjungan' => $_permohonan->penilaian->tanggal_kunjungan,
|
||||
'nama_penilai' => $_permohonan->penilaian->_user_penilai->userPenilaiTeam->name,
|
||||
'nilai_likuidasi' => $_permohonan->nilai_liquidasi,
|
||||
'nilai_pasar_wajar' => str_replace('.', '', $npw),
|
||||
'bukti_kepemilikan' => $_permohonan->documents->flatMap(function ($document) {
|
||||
return $document->detail->map(function ($detail) {
|
||||
return $detail->jenisLegalitasJaminan->name ?? null;
|
||||
});
|
||||
})->filter()->unique()->implode(', '),
|
||||
];
|
||||
|
||||
LaporanAdminKredit::updateOrCreate([
|
||||
'debiture_id' => $_permohonan->debiture_id,
|
||||
],$dataAdk);
|
||||
}
|
||||
|
||||
|
||||
$laporans = LaporanAdminKredit::with('debiture')->paginate(10);
|
||||
return view('lpj::laporan_admin_kredit.index', compact('laporans'));
|
||||
}
|
||||
|
||||
public function dataForDatatables(Request $request)
|
||||
{
|
||||
if (is_null($this->user) || !$this->user->can('laporan-admin-kredit.view')) {
|
||||
//abort(403, 'Sorry! You are not allowed to view laporan admin kredit.');
|
||||
}
|
||||
|
||||
// Retrieve data from the database
|
||||
$query = LaporanAdminKredit::query();
|
||||
|
||||
if ($request->has('tanggal_awal') && $request->has('tanggal_akhir')) {
|
||||
$query->whereBetween('tanggal_kunjungan', [$request->tanggal_awal, $request->tanggal_akhir]);
|
||||
}
|
||||
|
||||
// Apply search filter if provided
|
||||
if ($request->has('search') && !empty($request->get('search'))) {
|
||||
$search = $request->get('search');
|
||||
$search_ = json_decode($search);
|
||||
|
||||
if (isset($search_->search)) {
|
||||
$query->where(function ($q) use ($search_) {
|
||||
$q->where('kode_register_t24', 'LIKE', '%' . $search_->search . '%')
|
||||
->orWhere('jenis_agunan', 'LIKE', '%' . $search_->search . '%')
|
||||
->orWhere('nama_pemilik', 'LIKE', '%' . $search_->search . '%')
|
||||
->orWhereHas('debiture', function ($query) use ($search_) {
|
||||
$query->where('name', 'LIKE', '%' . $search_->search . '%');
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
if (isset($search_->tanggal_awal) && isset($search_->tanggal_akhir)) {
|
||||
$query->whereBetween('tanggal_kunjungan', [$search_->tanggal_awal, $search_->tanggal_akhir]);
|
||||
}
|
||||
}
|
||||
|
||||
// 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(['debiture.branch'])->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,
|
||||
]);
|
||||
}
|
||||
|
||||
public function export()
|
||||
{
|
||||
return Excel::download(new LaporanAdminKreditExport, 'laporan_admin_kredit.xlsx');
|
||||
}
|
||||
}
|
||||
@@ -61,12 +61,18 @@
|
||||
// Update Permohonan Pembatalan
|
||||
if($request->status=='approved'){
|
||||
$pembatalan->status = 'approved';
|
||||
$pembatalan->authorized_at = now();
|
||||
$pembatalan->authorized_by = auth()->user()->id;
|
||||
$pembatalan->authorized_status = 1;
|
||||
$pembatalan->save();
|
||||
|
||||
$permohonan->status = 'batal';
|
||||
$permohonan->save();
|
||||
} else{
|
||||
$pembatalan->status = 'rejected';
|
||||
$pembatalan->authorized_at = now();
|
||||
$pembatalan->authorized_by = auth()->user()->id;
|
||||
$pembatalan->authorized_status = 3;
|
||||
$pembatalan->save();
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ use Illuminate\Support\Facades\DB;
|
||||
use Modules\Lpj\Http\Requests\PenilaianRequest;
|
||||
use Modules\Lpj\Models\Authorization;
|
||||
use Modules\Lpj\Models\JenisPenilaian;
|
||||
use Modules\Lpj\Models\LaporanAdminKredit;
|
||||
use Modules\Lpj\Models\Penilaian;
|
||||
use Modules\Lpj\Models\PenilaianTeam;
|
||||
use Modules\Lpj\Models\Permohonan;
|
||||
@@ -473,6 +474,7 @@ class PenilaianController extends Controller
|
||||
} else {
|
||||
$permohonan = Permohonan::find($id);
|
||||
}
|
||||
|
||||
if (!$permohonan) {
|
||||
return response()->json([
|
||||
'message' => 'Data permohonan tidak ditemukan.',
|
||||
@@ -512,6 +514,35 @@ class PenilaianController extends Controller
|
||||
$status = 'done';
|
||||
}
|
||||
|
||||
if($status=='done'){
|
||||
$_permohonan = Permohonan::with(['documents.jenisJaminan','penilaian._user_penilai','penilai','documents.detail.jenisLegalitasJaminan'])->find(6);
|
||||
|
||||
if(isset($_permohonan->penilai->lpj)){
|
||||
$npw = json_decode($_permohonan->penilai->lpj, true);
|
||||
$npw = $npw['total_nilai_pasar_wajar'] ?? 0;
|
||||
}
|
||||
|
||||
$dataAdk = [
|
||||
'debiture_id' => $_permohonan->debiture_id,
|
||||
'jenis_agunan' => $_permohonan->documents->pluck('jenisJaminan.name')->unique()->implode(', '),
|
||||
'alamat_agunan' => $_permohonan->documents->map(function ($document) {
|
||||
return formatAlamat($document);
|
||||
})->unique()->implode(', '),
|
||||
'nama_pemilik' => $_permohonan->documents->pluck('pemilik.name')->unique()->implode(', '),
|
||||
'tanggal_kunjungan' => $_permohonan->penilaian->tanggal_kunjungan,
|
||||
'nama_penilai' => $_permohonan->penilaian->_user_penilai->userPenilaiTeam->name,
|
||||
'nilai_likuidasi' => $_permohonan->nilai_liquidasi,
|
||||
'nilai_pasar_wajar' => str_replace('.', '', $npw),
|
||||
'bukti_kepemilikan' => $_permohonan->documents->flatMap(function ($document) {
|
||||
return $document->detail->map(function ($detail) {
|
||||
return $detail->jenisLegalitasJaminan->name ?? null;
|
||||
});
|
||||
})->filter()->unique()->implode(', '),
|
||||
|
||||
];
|
||||
LaporanAdminKredit::create($dataAdk);
|
||||
}
|
||||
|
||||
if ($approvalField) {
|
||||
$this->updatePermohonan($permohonan, $status, $approvalField, $request->keterangan);
|
||||
}
|
||||
|
||||
@@ -64,4 +64,9 @@
|
||||
return $this->hasOne(Permohonan::class, 'debiture_id', 'id' );
|
||||
}
|
||||
|
||||
public function laporanAdminKredit(): HasMany
|
||||
{
|
||||
return $this->hasMany(LaporanAdminKredit::class);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
37
app/Models/LaporanAdminKredit.php
Normal file
37
app/Models/LaporanAdminKredit.php
Normal file
@@ -0,0 +1,37 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Lpj\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
||||
class LaporanAdminKredit extends Base
|
||||
{
|
||||
protected $table = 'laporan_admin_kredit';
|
||||
|
||||
protected $fillable = [
|
||||
'debiture_id',
|
||||
'kode_register_t24',
|
||||
'jenis_agunan',
|
||||
'bukti_kepemilikan',
|
||||
'alamat_agunan',
|
||||
'nama_pemilik',
|
||||
'tanggal_kunjungan',
|
||||
'nilai_pasar_wajar',
|
||||
'nilai_likuidasi',
|
||||
'nama_penilai'
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'tanggal_kunjungan' => 'date',
|
||||
'nilai_pasar_wajar' => 'decimal:2',
|
||||
'nilai_likuidasi' => 'decimal:2',
|
||||
];
|
||||
|
||||
/**
|
||||
* Get the debiture that owns the laporan admin kredit.
|
||||
*/
|
||||
public function debiture(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Debiture::class);
|
||||
}
|
||||
}
|
||||
@@ -37,6 +37,12 @@ class Penilaian extends Model
|
||||
return $this->hasMany(PenilaianTeam::class, 'penilaian_id', 'id');
|
||||
}
|
||||
|
||||
public function _user_penilai()
|
||||
{
|
||||
return $this->hasOne(PenilaianTeam::class, 'penilaian_id', 'id')
|
||||
->where('role', 'penilai')
|
||||
->with('userPenilaiTeam');
|
||||
}
|
||||
|
||||
public function permohonan()
|
||||
{
|
||||
|
||||
@@ -114,7 +114,15 @@
|
||||
$status = $permohonan->status;
|
||||
$beforeRequest = $action === 'updated' ? $permohonan->getOriginal() : [];
|
||||
$afterRequest = $permohonan->toArray();
|
||||
$file = $permohonan->dokumen ?? null;
|
||||
|
||||
$file = null;
|
||||
if (request()->hasFile('attachment')) {
|
||||
$file = request()->file('attachment');
|
||||
$fileName = time() . '_' . $file->getClientOriginalName();
|
||||
$filePath = $file->storeAs('permohonan_attachments', $fileName, 'public');
|
||||
|
||||
$file = $filePath;
|
||||
}
|
||||
|
||||
$historyService->createHistory(
|
||||
$permohonan,
|
||||
|
||||
Reference in New Issue
Block a user