diff --git a/app/Http/Controllers/ProsesPenawaranController.php b/app/Http/Controllers/ProsesPenawaranController.php index a0d313a..7eae44a 100644 --- a/app/Http/Controllers/ProsesPenawaranController.php +++ b/app/Http/Controllers/ProsesPenawaranController.php @@ -22,7 +22,7 @@ use Modules\Lpj\Models\PenawaranTender; use Modules\Lpj\Models\Permohonan; use Modules\Lpj\Models\StatusPermohonan; -use Modules\Lpj\Models\TujuanPenilaianKJPP; +use Modules\Lpj\Models\TujuanPenilaian; class ProsesPenawaranController extends Controller { @@ -49,17 +49,17 @@ class ProsesPenawaranController extends Controller // penawaran need union with permohonan $query = PenawaranTender::query()->whereIn('penawaran.status', ['tender', 'proposal-tender']) ->select('penawaran.id', - 'penawaran.nomor_registrasi', - 'penawaran.code as penawaran_code', - 'penawaran.start_date', - 'penawaran.end_date', + 'penawaran.nomor_registrasi', + 'penawaran.code as penawaran_code', + 'penawaran.start_date', + 'penawaran.end_date', 'penawaran.status as statusnya', - 'debitures.name as debitures_name', + 'debitures.name as debitures_name', 'permohonan.tanggal_permohonan', 'users.name as user_pemohon', - 'branches.name as branches_name', + 'branches.name as branches_name', 'tujuan_penilaian.name as tujuan_penilaian_name', - 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name' + 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name' ) ->withCount('penawarandetails') ->leftJoin('permohonan', 'permohonan.nomor_registrasi', '=', 'penawaran.nomor_registrasi') @@ -71,22 +71,22 @@ class ProsesPenawaranController extends Controller $permohonanQuery = Permohonan::whereIn('permohonan.status', ['registered'])->where('permohonan.jenis_penilaian_id', '=', 2) ->select('permohonan.id', - 'permohonan.nomor_registrasi', - DB::raw('"" as penawaran_code'), - DB::raw('"" as start_date'), - DB::raw('"" as end_date'), + 'permohonan.nomor_registrasi', + DB::raw('"" as penawaran_code'), + DB::raw('"" as start_date'), + DB::raw('"" as end_date'), 'permohonan.status as statusnya', - 'debitures.name as debitures_name', + 'debitures.name as debitures_name', 'permohonan.tanggal_permohonan', 'users.name as user_pemohon', - 'branches.name as branches_name', + 'branches.name as branches_name', 'tujuan_penilaian.name as tujuan_penilaian_name', - DB::raw('"" as tujuan_penilaian_kjpp_name'), + DB::raw('"" as tujuan_penilaian_kjpp_name'), DB::raw('"-" as penawarandetails_count')) ->leftJoin('users', 'users.id', '=', 'permohonan.user_id') ->leftJoin('branches', 'branches.id', '=', 'permohonan.branch_id') ->leftJoin('debitures', 'debitures.id', '=', 'permohonan.debiture_id') - ->leftJoin('tujuan_penilaian', 'tujuan_penilaian.id','=','permohonan.tujuan_penilaian_id'); + ->leftJoin('tujuan_penilaian', 'tujuan_penilaian.id','=','permohonan.tujuan_penilaian_id'); $query->union($permohonanQuery); // penawaran need union with permohonan @@ -130,7 +130,7 @@ class ProsesPenawaranController extends Controller // format date $i = 0; foreach ($data as $obj) { - + // tanggal_permohonan if ($obj->tanggal_permohonan) { $data[$i]->tanggal_permohonan = Carbon::parse($obj->tanggal_permohonan)->format('d M Y'); @@ -138,9 +138,9 @@ class ProsesPenawaranController extends Controller // date_range $data[$i]->date_range = "-"; - if ($obj->start_date && $obj->end_date) + if ($obj->start_date && $obj->end_date) { - $data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y') . ' - ' . + $data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y') . ' - ' . Carbon::parse($obj->end_date)->format('d M Y'); } @@ -208,8 +208,8 @@ class ProsesPenawaranController extends Controller ->select('id', 'name', 'code') // Pilih beberapa kolom sekaligus ->get(); $sql=DB::getQueryLog(); - $data['sql'] = $sql; - $data['kjpps'] = $kjpps; + $data['sql'] = $sql; + $data['kjpps'] = $kjpps; $data['penawaran'] = $penawaran; $data['penawrandetails'] = $penawrandetails; $data['status'] = 'success'; @@ -238,7 +238,7 @@ class ProsesPenawaranController extends Controller $data = array(); $dataPenawaranDetail = array(); if (request()->ajax()) { - + $penawarandetail = PenawaranDetailTender::find($id); // cek masa aktif penawaran $checkActiveDateRange = checkActiveDateRangePenawaran($penawarandetail->penawaran_id); @@ -290,13 +290,13 @@ class ProsesPenawaranController extends Controller $data['status'] = 'error'; $data['message'] ['message_error_try_catch'] = array('Proses Penawarn KJPP failed.'); - } + } } else { $data['status'] = 'error'; $data['message']['active_date_range'] = array("Penawaran sudah di tutup"); - } + } } else { $data['status'] = 'error'; @@ -339,7 +339,7 @@ class ProsesPenawaranController extends Controller $data = array(); $dataPermohonan = array(); $dataPenawaran = array(); - + // cek masa aktif penawaran $checkActiveDateRange = checkActiveDateRangePenawaran($id); // cek status (penawaran.status = tender) @@ -406,7 +406,7 @@ class ProsesPenawaranController extends Controller if($checkActiveDateRange && ('tender'==$penawaran->status)) { try { - + // $data['id']=$id; $dataDetailPenawaran = ['status' => '0', @@ -446,7 +446,7 @@ class ProsesPenawaranController extends Controller $data = array(); $dataPenawaranDetail = array(); $failed = 0; - + // cek masa aktif penawaran $checkActiveDateRange = checkActiveDateRangePenawaran($id); // cek status (penawaran.status = tender) @@ -454,9 +454,9 @@ class ProsesPenawaranController extends Controller if($checkActiveDateRange && ('tender'==$penawaran->status)) { DB::beginTransaction(); - try + try { - // update detail_penawaran + // update detail_penawaran $detail_penawaran_ids = $request->input('prosespenawaran_penawarandetail_id', []); $no_proposals = $request->input('prosespenawaran_no_proposal', []); $tgl_proposals = $request->input('prosespenawaran_tgl_proposal', []); @@ -469,23 +469,23 @@ class ProsesPenawaranController extends Controller // loop for($i=0;$i<$tot_kjpp;$i++) { - $detail_penawaran_id= $detail_penawaran_ids[$i]; + $detail_penawaran_id= $detail_penawaran_ids[$i]; $dataPenawaranDetail = [ 'no_proposal' => $no_proposals[$i], - 'tgl_proposal' => $tgl_proposals[$i], + 'tgl_proposal' => $tgl_proposals[$i], 'biaya_penawaran' => str_replace(".","",$biaya_penawarans[$i]), // 'biaya_penawaran' => str_replace(".","",$request->biaya_penawaran) 'updated_by' => Auth::id(), 'updated_at' => now(), ]; - + $penawarandetail = PenawaranDetailTender::find($detail_penawaran_id); - if ($dokumen_penawarans) + if ($dokumen_penawarans) { - if (is_array($dokumen_penawarans) && array_key_exists($i, $dokumen_penawarans)) + if (is_array($dokumen_penawarans) && array_key_exists($i, $dokumen_penawarans)) { $file_tmp = $dokumen_penawarans[$i]; if($file_tmp->isValid()) - { + { $folderPath = 'uploads/penawaran/'; $myFile=$file_tmp->getClientOriginalName(); // nama file with extension @@ -500,16 +500,16 @@ class ProsesPenawaranController extends Controller $dataPenawaranDetail['attachment'] = $myFile; $dataPenawaranDetail['dokumen_persetujuan'] = $newFileNameWithPath; } - + } - + } - - $checkStatus = $penawarandetail->update($dataPenawaranDetail); + + $checkStatus = $penawarandetail->update($dataPenawaranDetail); if(!$checkStatus) $failed++; } - + if($failed>0) { DB::rollBack(); @@ -522,16 +522,16 @@ class ProsesPenawaranController extends Controller $data['status'] = 'success'; $data['message'] ['message_success'] = array('Proses Draft Penawaran KJPP successfully'); } - + } else { $data['status'] = 'error'; $data['message'] ['message_error'] = array('Data inti tidak ada.'); } - - } - catch (Exception $e) + + } + catch (Exception $e) { // dd($e); DB::rollBack(); @@ -560,7 +560,7 @@ class ProsesPenawaranController extends Controller $penawaran = PenawaranTender::find($request->penawaran_id); if($checkActiveDateRange && ('tender'==$penawaran->status)) { - try + try { $dataPenawaranDetail = [ 'penawaran_id' => $request->penawaran_id, @@ -570,22 +570,22 @@ class ProsesPenawaranController extends Controller ]; PenawaranDetailTender::create($dataPenawaranDetail); - + $data['status'] = 'success'; $data['message'] ['message_success'] = array('Proses Tambah KJPP successfully'); } - catch (Exception $e) + catch (Exception $e) { // dd($e); $data['status'] = 'error'; $data['message'] ['message_error_try_catch'] = array('Proses Tambah KJPP failed.'); - } + } } else { $data['status'] = 'error'; $data['message']['active_date_range'] = array("Penawaran sudah di tutup"); - } + } return response()->json($data); } @@ -639,7 +639,7 @@ class ProsesPenawaranController extends Controller }) ->select('id', 'name', 'code') // Pilih beberapa kolom sekaligus ->get(); - + $data['kjpps'] = $kjpps; $data['penawaran'] = $penawaran; $data['penawrandetails'] = $penawrandetails; @@ -676,7 +676,7 @@ class ProsesPenawaranController extends Controller if($checkActiveDateRange && ('proposal-tender'==$penawaran->status)) { try { - + $data['id']=$id; $dataDetailPenawaran = ['status' => '0', @@ -700,7 +700,7 @@ class ProsesPenawaranController extends Controller $data['status'] = 'error'; $data['message']['active_date_range'] = array("Penawaran sudah di tutup"); // $data['message']['message_error'] = array("Penawaran sudah di tutup"); - } + } return response()->json($data); } @@ -714,7 +714,7 @@ class ProsesPenawaranController extends Controller $dataDetailPenawaran = array(); $pleaseCommit= true; if (request()->ajax()) { - + $validator = ProsesPenawaranController::rulesEditUlangnya($request, $id); if ($validator['fails']) { @@ -884,7 +884,7 @@ class ProsesPenawaranController extends Controller // cek apakah blm di approve (penawaran.status = proposal-tender) if($checkActiveDateRange && ('proposal-tender'==$penawaran->status)) { - try + try { $biaya_penawaran=""; if($request->biaya_penawaran) @@ -931,16 +931,16 @@ class ProsesPenawaranController extends Controller } PenawaranDetailTender::create($dataDetailPenawaran); - + $data['status'] = 'success'; $data['message'] ['message_success'] = array('Proses Tambah KJPP Ulang successfully'); } - catch (Exception $e) + catch (Exception $e) { dd($e); $data['status'] = 'error'; $data['message'] ['message_error_try_catch'] = array('Proses Tambah KJPP Ulang failed.'); - } + } } else { @@ -961,7 +961,7 @@ class ProsesPenawaranController extends Controller $permohonan = Permohonan::find($id); // dd($permohonan); $status = StatusPermohonan::all(); - $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all(); + $tujuan_penilaian_kjpp = TujuanPenilaian::all(); $jenis_laporan = JenisLaporan::all(); $kjpp = KJPP::all(); diff --git a/resources/views/prosespenawaran/createPenawaran.blade.php b/resources/views/prosespenawaran/createPenawaran.blade.php index df7b497..12507a9 100644 --- a/resources/views/prosespenawaran/createPenawaran.blade.php +++ b/resources/views/prosespenawaran/createPenawaran.blade.php @@ -10,7 +10,7 @@ @section('content')
- +

@@ -78,7 +78,7 @@ @if (isset($kjpp)) @endif @endforeach @@ -197,8 +197,8 @@

- -
+ + @endsection @push('styles') @@ -219,4 +219,4 @@ display: none } -@endpush \ No newline at end of file +@endpush