Compare commits
4 Commits
112262d7d6
...
04ee3a0c48
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
04ee3a0c48 | ||
|
|
10b5a6c96c | ||
|
|
3aca1d46c2 | ||
|
|
db55471111 |
@@ -346,12 +346,12 @@ class PembayaranController extends Controller
|
||||
} else {
|
||||
$data['status_bayar'] = 'sudah_bayar';
|
||||
$data['status'] = 'proses-laporan';
|
||||
}
|
||||
|
||||
if ($permohonan->jenis_penilaian_id == 2) {
|
||||
$data['status_bayar'] = 'sudah_bayar';
|
||||
$data['status'] = 'spk';
|
||||
}
|
||||
}
|
||||
|
||||
if ($permohonan->jenis_penilaian_id == 1) {
|
||||
unset(
|
||||
|
||||
@@ -360,6 +360,7 @@
|
||||
$permohonan->keterangan = $request->keterangan;
|
||||
$permohonan->save();
|
||||
|
||||
if ($permohonan->status_bayar == 'belum_bayar') {
|
||||
$persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $id)->first();
|
||||
if(!$persetujuanPenawaran){
|
||||
$persetujuanPenawaran = PersetujuanPenawaran::create([
|
||||
@@ -367,6 +368,7 @@
|
||||
'created_by' => Auth::id(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
} catch (Exception $e) {
|
||||
return redirect()->route('authorization.show', $id)->with('error', 'Failed to update permohonan');
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
$validated = $request->validated();
|
||||
$validated['created_by'] = Auth::id();
|
||||
$validated['status'] = '0';
|
||||
$validated['nominal_bayar'] = $validated['biaya_final'];
|
||||
|
||||
$persetujuanPenawaran = PersetujuanPenawaran::updateOrCreate(
|
||||
['penawaran_id' => $validated['penawaran_id']],
|
||||
@@ -71,7 +72,7 @@
|
||||
|
||||
// Save NOC
|
||||
try {
|
||||
$noc = Noc::updateOrCreate([
|
||||
Noc::updateOrCreate([
|
||||
'permohonan_id' => $persetujuanPenawaran->permohonan_id,
|
||||
'persetujuan_penawaran_id' => $persetujuanPenawaran->id
|
||||
],[
|
||||
@@ -179,8 +180,8 @@
|
||||
public function edit($id)
|
||||
{
|
||||
$permohonan = Permohonan::with(['debiture', 'penawaranTender.detail'])->find($id);
|
||||
|
||||
return view('lpj::persetujuan_penawaran.form', compact('permohonan'));
|
||||
$persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $id)->first();
|
||||
return view('lpj::persetujuan_penawaran.form', compact('permohonan', 'persetujuanPenawaran'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -201,8 +202,12 @@
|
||||
}
|
||||
|
||||
// Retrieve data from the database
|
||||
$query = Permohonan::query()->where(['status' => 'persetujuan-penawaran']);
|
||||
|
||||
//$query = Permohonan::query()->where(['status' => 'persetujuan-penawaran']);
|
||||
$query = Permohonan::query()
|
||||
->where(['status' => 'persetujuan-penawaran'])
|
||||
->whereHas('penawaranTender', function ($q) {
|
||||
$q->where('status', 'persetujuan-penawaran');
|
||||
});
|
||||
// Apply search filter if provided
|
||||
if ($request->has('search') && !empty($request->get('search'))) {
|
||||
$search = $request->get('search');
|
||||
|
||||
@@ -3,25 +3,19 @@
|
||||
namespace Modules\Lpj\Http\Controllers;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Maatwebsite\Excel\Facades\Excel;
|
||||
use Modules\Lpj\Exports\BasicDataSurveyorExport;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Str;
|
||||
use Barryvdh\DomPDF\Facade\Pdf;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Illuminate\Support\Carbon;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Http\Response;
|
||||
use Modules\Lpj\Models\Debiture;
|
||||
use Modules\Lpj\Models\LaporanExternal;
|
||||
use Modules\Lpj\Models\Permohonan;
|
||||
use Modules\Lpj\Models\Branch;
|
||||
use Modules\Lpj\Models\Surveyor;
|
||||
use Modules\Lpj\Models\BentukTanah;
|
||||
use Modules\Lpj\Models\KonturTanah;
|
||||
use Modules\Location\Models\Province;
|
||||
@@ -41,17 +35,8 @@ use Modules\Lpj\Models\SpekBangunan;
|
||||
use Modules\Lpj\Models\SpekKategoritBangunan;
|
||||
use Modules\Lpj\Models\SaranaPelengkap;
|
||||
use Modules\Lpj\Models\ArahMataAngin;
|
||||
use Modules\Lpj\Models\Analisa;
|
||||
use Modules\Lpj\Models\Penilaian;
|
||||
use Modules\Lpj\Models\PerkerasanJalan;
|
||||
use Modules\Lpj\Models\AnalisaFakta;
|
||||
use Modules\Lpj\Models\AnalisaLingkungan;
|
||||
use Modules\Lpj\Models\AnalisaTanahBagunan;
|
||||
use Modules\Lpj\Models\SpekBangunanAnalisa;
|
||||
use Modules\Lpj\Models\Denah;
|
||||
use Modules\Lpj\Models\FotoJaminan;
|
||||
use Modules\Lpj\Models\Lingkungan;
|
||||
use Modules\Lpj\Models\LantaiUnit;
|
||||
use Modules\Lpj\Models\Teams;
|
||||
use Modules\Lpj\Models\Lantai;
|
||||
use Modules\Lpj\Models\Inspeksi;
|
||||
@@ -62,29 +47,24 @@ use Modules\Lpj\Models\PosisiUnit;
|
||||
use Modules\Lpj\Models\TerletakArea;
|
||||
use Modules\Lpj\Models\FasilitasObjek;
|
||||
use Modules\Lpj\Models\MerupakanDaerah;
|
||||
use Modules\Lpj\Models\ObjekJaminan;
|
||||
use Modules\Lpj\Models\ModelAlatBerat;
|
||||
use Modules\Lpj\Models\JenisPesawat;
|
||||
use Modules\Lpj\Models\DokumenJaminan;
|
||||
use Modules\Lpj\Models\DetailDokumenJaminan;
|
||||
use Modules\Lpj\Models\JenisKapal;
|
||||
use Modules\Lpj\Models\JenisKendaraan;
|
||||
use Modules\Lpj\Models\RuteJaminan;
|
||||
use Modules\Lpj\Models\HubunganPemilikJaminan;
|
||||
use Modules\Lpj\Models\HubunganPenghuniJaminan;
|
||||
use Modules\Lpj\Models\AnalisaUnit;
|
||||
use Modules\Lpj\Models\GolonganMasySekitar;
|
||||
use Modules\Lpj\Models\TingkatKeramaian;
|
||||
use Modules\Lpj\Models\TujuanPenilaian;
|
||||
use Modules\Lpj\Models\LaluLintasLokasi;
|
||||
use Modules\Lpj\Models\SpekBagunanAnalisaDetail;
|
||||
use Modules\Lpj\Http\Requests\SurveyorRequest;
|
||||
use Modules\Lpj\Http\Requests\FormSurveyorRequest;
|
||||
use Modules\Lpj\Jobs\SendJadwalKunjunganEmailJob;
|
||||
use App\Helpers\Lpj;
|
||||
use Modules\Lpj\Models\Authorization;
|
||||
use Modules\Lpj\Services\SurveyorValidateService;
|
||||
use Modules\Lpj\Services\SaveFormInspesksiService;
|
||||
use Modules\Lpj\Models\PermohonanHistory;
|
||||
|
||||
class SurveyorController extends Controller
|
||||
{
|
||||
@@ -151,13 +131,17 @@ class SurveyorController extends Controller
|
||||
});
|
||||
}
|
||||
|
||||
$catatan_revisi_survey = PermohonanHistory::where('permohonan_id', $id)
|
||||
->where('status', 'revisi-survey')->latest()->first();
|
||||
|
||||
return view('lpj::surveyor.detail', compact(
|
||||
'permohonan',
|
||||
'surveyor',
|
||||
'branches',
|
||||
'provinces',
|
||||
'bentukTanah',
|
||||
'inspeksiData'
|
||||
'inspeksiData',
|
||||
'catatan_revisi_survey',
|
||||
));
|
||||
}
|
||||
|
||||
|
||||
@@ -300,7 +300,7 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"title": "Data Debitur",
|
||||
"title": "Data Permohonan",
|
||||
"path": "debitur",
|
||||
"icon": "ki-filled ki-people text-lg text-primary",
|
||||
"classes": "",
|
||||
|
||||
@@ -6,9 +6,10 @@
|
||||
|
||||
@section('content')
|
||||
<div class="grid">
|
||||
<div class="card border border-agi-100 card-grid min-w-full" data-datatable="false" data-datatable-page-size="10" data-datatable-state-save="false"
|
||||
id="pembayaran-table" data-api-url="{{ route('pembayaran.approval.datatables') }}">
|
||||
<div class="card-header light:bg-agi-50 py-5 flex-wrap">
|
||||
<div class="min-w-full border card border-agi-100 card-grid" data-datatable="false" data-datatable-page-size="10"
|
||||
data-datatable-state-save="false" id="pembayaran-table"
|
||||
data-api-url="{{ route('pembayaran.approval.datatables') }}">
|
||||
<div class="flex-wrap py-5 card-header light:bg-agi-50">
|
||||
<h3 class="card-title">
|
||||
Daftar Pembayaran
|
||||
</h3>
|
||||
@@ -26,7 +27,7 @@
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="scrollable-x-auto">
|
||||
<table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm"
|
||||
<table class="table text-sm font-medium text-gray-700 align-middle table-auto table-border"
|
||||
data-datatable-table="true">
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -87,13 +88,13 @@
|
||||
</table>
|
||||
</div>
|
||||
<div
|
||||
class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
|
||||
<div class="flex items-center gap-2">
|
||||
class="flex-col gap-3 justify-center font-medium text-gray-600 card-footer md:justify-between md:flex-row text-2sm">
|
||||
<div class="flex gap-2 items-center">
|
||||
Show
|
||||
<select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per
|
||||
<select class="w-16 select select-sm" data-datatable-size="true" name="perpage"> </select> per
|
||||
page
|
||||
</div>
|
||||
<div class="flex items-center gap-4">
|
||||
<div class="flex gap-4 items-center">
|
||||
<span data-datatable-info="true"> </span>
|
||||
<div class="pagination" data-datatable-pagination="true">
|
||||
</div>
|
||||
@@ -218,8 +219,7 @@
|
||||
render: (item, data) => {
|
||||
if (data.permohonan) {
|
||||
return `${data.permohonan.user.name}`;
|
||||
}
|
||||
else if(data.penawaran) {
|
||||
} else if (data.penawaran) {
|
||||
return `${data.penawaran.permohonan.user.name}`;
|
||||
}
|
||||
return "";
|
||||
@@ -231,8 +231,7 @@
|
||||
render: (item, data) => {
|
||||
if (data.permohonan) {
|
||||
return `${data.permohonan.branch.name}`;
|
||||
}
|
||||
else if(data.penawaran) {
|
||||
} else if (data.penawaran) {
|
||||
return `${data.penawaran.permohonan.branch.name}`;
|
||||
}
|
||||
return "";
|
||||
@@ -244,8 +243,7 @@
|
||||
render: (item, data) => {
|
||||
if (data.permohonan) {
|
||||
return `${data.permohonan.debiture.name}`;
|
||||
}
|
||||
else if(data.penawaran) {
|
||||
} else if (data.penawaran) {
|
||||
return `${data.penawaran.permohonan.debiture.name}`;
|
||||
}
|
||||
return "";
|
||||
@@ -284,7 +282,8 @@
|
||||
nominal_bayar: {
|
||||
title: 'Nominal Bayar',
|
||||
render: (item, data) => {
|
||||
return `${window.formatRupiah(data.nominal_bayar)}`;
|
||||
return data.nominal_bayar ? `${window.formatRupiah(data.nominal_bayar)}` : `${window.formatRu
|
||||
piah(data.biaya_final)}`;
|
||||
},
|
||||
},
|
||||
bukti_bayar: {
|
||||
@@ -345,7 +344,7 @@
|
||||
|
||||
var iconPembayaranOtorisator = '';
|
||||
if (permohonan) {
|
||||
if (!permohonan.approve_bayar_by) {
|
||||
if (permohonan.status_bayar !== 'sudah_bayar') {
|
||||
iconPembayaranOtorisator = `<a class="btn btn-sm btn-icon btn-clear btn-primary" onclick="handlePembayaran(${permohonan.id},'otorisator')">
|
||||
<i class="ki-filled ki-double-check"></i>
|
||||
</a>
|
||||
@@ -356,7 +355,8 @@
|
||||
`;
|
||||
}
|
||||
|
||||
return `<div class="flex flex-nowrap justify-center">` + iconPembayaranOtorisator + `</div>`;
|
||||
return `<div class="flex flex-nowrap justify-center">` + iconPembayaranOtorisator +
|
||||
`</div>`;
|
||||
}
|
||||
|
||||
return "";
|
||||
@@ -375,4 +375,3 @@
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
|
||||
|
||||
@@ -60,6 +60,17 @@
|
||||
<input type="file" name="file_persetujuan_penawaran" id="file_persetujuan_penawaran"
|
||||
class="file-input w-full @error('file_persetujuan_penawaran') border-danger bg-danger-light @enderror"
|
||||
accept=".pdf,.doc,.docx">
|
||||
|
||||
@if (isset($persetujuanPenawaran->file_persetujuan_penawaran) &&
|
||||
!empty($persetujuanPenawaran->file_persetujuan_penawaran))
|
||||
<div class="flex items-center mt-2">
|
||||
<a href="{{ Storage::url($persetujuanPenawaran->file_persetujuan_penawaran) }}"
|
||||
target="_blank" class="badge badge-sm badge-outline badge-warning">
|
||||
<i class="mr-2 ki-filled ki-eye"></i> Lihat File
|
||||
</a>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@error('file_persetujuan_penawaran')
|
||||
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||
@enderror
|
||||
@@ -74,6 +85,16 @@
|
||||
<input type="file" name="surat_representasi" id="surat_representasi"
|
||||
class="file-input w-full @error('surat_representasi') border-danger bg-danger-light @enderror"
|
||||
accept=".pdf,.doc,.docx">
|
||||
|
||||
@if (isset($persetujuanPenawaran->surat_representasi) && !empty($persetujuanPenawaran->surat_representasi))
|
||||
<div class="flex items-center mt-2">
|
||||
<a href="{{ Storage::url($persetujuanPenawaran->surat_representasi) }}" target="_blank"
|
||||
class="badge badge-sm badge-outline badge-warning">
|
||||
<i class="mr-2 ki-filled ki-eye"></i> Lihat File
|
||||
</a>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@error('surat_representasi')
|
||||
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||
@enderror
|
||||
@@ -87,7 +108,7 @@
|
||||
<div class="flex flex-wrap items-baseline w-full">
|
||||
<input type="number" name="nominal_bayar" id="nominal_bayar"
|
||||
class="input w-full @error('nominal_bayar') border-danger bg-danger-light @enderror"
|
||||
value="{{ old('nominal_bayar', $persetujuanPenawaran->nominal_bayar ?? '') }}"
|
||||
value="{{ old('nominal_bayar', $persetujuanPenawaran->nominal_bayar ?? ($persetujuanPenawaran->biaya_final ?? '')) }}"
|
||||
placeholder="Masukkan nominal bayar">
|
||||
@error('nominal_bayar')
|
||||
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||
@@ -103,6 +124,16 @@
|
||||
<input type="file" name="bukti_bayar" id="bukti_bayar"
|
||||
class="file-input w-full @error('bukti_bayar') border-danger bg-danger-light @enderror"
|
||||
accept=".pdf,.jpg,.jpeg,.png">
|
||||
|
||||
@if (isset($persetujuanPenawaran->bukti_bayar) && !empty($persetujuanPenawaran->bukti_bayar))
|
||||
<div class="flex items-center mt-2">
|
||||
<a href="{{ Storage::url($persetujuanPenawaran->bukti_bayar) }}" target="_blank"
|
||||
class="badge badge-sm badge-outline badge-warning">
|
||||
<i class="mr-2 ki-filled ki-eye"></i> Lihat File
|
||||
</a>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@error('bukti_bayar')
|
||||
<em class="text-sm alert text-danger">{{ $message }}</em>
|
||||
@enderror
|
||||
|
||||
@@ -5,9 +5,11 @@
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
|
||||
<div class="card border border-agi-100 card-grid min-w-full" data-datatable="false" data-datatable-page-size="10" data-datatable-state-save="false" id="persetujuan-penawaran-table" data-api-url="{{ route('persetujuan-penawaran.datatables') }}">
|
||||
<div class="card-header bg-agi-50 py-5 flex-wrap">
|
||||
<div class="grid gap-5 mx-auto w-full lg:gap-7.5">
|
||||
<div class="min-w-full border card border-agi-100 card-grid" data-datatable="false" data-datatable-page-size="10"
|
||||
data-datatable-state-save="false" id="persetujuan-penawaran-table"
|
||||
data-api-url="{{ route('persetujuan-penawaran.datatables') }}">
|
||||
<div class="flex-wrap py-5 card-header bg-agi-50">
|
||||
<h3 class="card-title">
|
||||
Daftar Persetujuan Penawaran KJPP
|
||||
</h3>
|
||||
@@ -27,7 +29,8 @@
|
||||
|
||||
<div class="card-body">
|
||||
<div class="scrollable-x-auto">
|
||||
<table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm" data-datatable-table="true">
|
||||
<table class="table text-sm font-medium text-gray-700 align-middle table-auto table-border"
|
||||
data-datatable-table="true">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="w-14">
|
||||
@@ -71,13 +74,13 @@
|
||||
</table>
|
||||
</div>
|
||||
<div
|
||||
class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
|
||||
<div class="flex items-center gap-2">
|
||||
class="flex-col gap-3 justify-center font-medium text-gray-600 card-footer md:justify-between md:flex-row text-2sm">
|
||||
<div class="flex gap-2 items-center">
|
||||
Show
|
||||
<select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per
|
||||
<select class="w-16 select select-sm" data-datatable-size="true" name="perpage"> </select> per
|
||||
page
|
||||
</div>
|
||||
<div class="flex items-center gap-4">
|
||||
<div class="flex gap-4 items-center">
|
||||
<span data-datatable-info="true"> </span>
|
||||
<div class="pagination" data-datatable-pagination="true">
|
||||
</div>
|
||||
@@ -111,9 +114,12 @@
|
||||
|
||||
$.ajax(`persetujuan-penawaran/${data}`, {
|
||||
type: 'GET',
|
||||
data: {'status': 'tender'}
|
||||
data: {
|
||||
'status': 'tender'
|
||||
}
|
||||
}).then((response) => {
|
||||
swal.fire('Success!', 'Data Persetujuan telah dikembalikan untuk di kaji ulang', 'success').then(() => {
|
||||
swal.fire('Success!', 'Data Persetujuan telah dikembalikan untuk di kaji ulang',
|
||||
'success').then(() => {
|
||||
window.location.reload();
|
||||
});
|
||||
}).catch((error) => {
|
||||
@@ -185,13 +191,18 @@
|
||||
},
|
||||
},
|
||||
nominal_bayar: {
|
||||
title: 'Nominal Bayar'
|
||||
title: 'Nominal Bayar',
|
||||
render: (item, data) => {
|
||||
return data.penawaran_tender.persetujuan.nominal_bayar ?
|
||||
`${window.formatRupiah(data.penawaran_tender.persetujuan.nominal_bayar)}` :
|
||||
`${window.formatRupiah(data.penawaran_tender.persetujuan.biaya_final)}`;
|
||||
},
|
||||
},
|
||||
catatan: {
|
||||
title: 'Catatan',
|
||||
render: (item, data) => {
|
||||
if (data.penawaran_tender.persetujuan) {
|
||||
return data.penawaran_tender.persetujuan.catatan;
|
||||
return data.penawaran_tender.persetujuan.catatan ?? data.approve_keterangan_bayar;
|
||||
}
|
||||
return '-';
|
||||
},
|
||||
|
||||
@@ -17,15 +17,13 @@
|
||||
</style>
|
||||
@endpush
|
||||
@include('lpj::assetsku.includenya')
|
||||
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
|
||||
|
||||
|
||||
<div class="grid gap-5 mx-auto w-full lg:gap-7.5">
|
||||
@include('lpj::component.detail-jaminan', ['backLink' => 'surveyor.index'])
|
||||
|
||||
@if ($permohonan->status == 'revisi-survey')
|
||||
<div class="card border border-agi-100 min-w-full">
|
||||
<div class="min-w-full border card border-agi-100">
|
||||
<div class="card-header light:bg-agi-50" id="basic_settings">
|
||||
<div class="card-title flex flex-row gap-1.5">
|
||||
<div class="flex flex-row gap-1.5 card-title">
|
||||
Catatan Revisi
|
||||
</div>
|
||||
</div>
|
||||
@@ -37,9 +35,9 @@
|
||||
@endif
|
||||
|
||||
|
||||
<div class="card border border-agi-100 min-w-full">
|
||||
<div class="min-w-full border card border-agi-100">
|
||||
<div class="card-header light:bg-agi-50" id="basic_settings">
|
||||
<div class="card-title flex flex-row gap-1.5">
|
||||
<div class="flex flex-row gap-1.5 card-title">
|
||||
Form Jaminan
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user