diff --git a/app/Http/Controllers/ProsesPenawaranController.php b/app/Http/Controllers/ProsesPenawaranController.php index 89a38a6..5fd2e92 100644 --- a/app/Http/Controllers/ProsesPenawaranController.php +++ b/app/Http/Controllers/ProsesPenawaranController.php @@ -181,7 +181,7 @@ class ProsesPenawaranController extends Controller if (request()->ajax()) { $id = $request->id; - $penawaran = PenawaranTender::find($id); + $penawaran = PenawaranTender::with('permohonan.debiture')->find($id); $penawrandetails = PenawaranDetailTender::where('penawaran_id','=',$id) ->leftJoin('kjpp', 'kjpp.id', '=', 'detail_penawaran.kjpp_rekanan_id') ->select('detail_penawaran.*', 'kjpp.code AS kjpp_code', 'kjpp.name AS kjpp_name') @@ -605,7 +605,7 @@ class ProsesPenawaranController extends Controller if (request()->ajax()) { $id = $request->id; - $penawaran = PenawaranTender::where('status','=','proposal-tender')->find($id); + $penawaran = PenawaranTender::with('permohonan.debiture')->where('status','=','proposal-tender')->find($id); if ($penawaran) { $penawrandetails = PenawaranDetailTender::where('penawaran_id','=',$id) diff --git a/app/Http/Controllers/ProsesPenawaranUlangController.php b/app/Http/Controllers/ProsesPenawaranUlangController.php index c6aa41b..eb1b962 100644 --- a/app/Http/Controllers/ProsesPenawaranUlangController.php +++ b/app/Http/Controllers/ProsesPenawaranUlangController.php @@ -117,8 +117,8 @@ class ProsesPenawaranUlangController extends Controller $penawrandetails = array(); if (request()->ajax()) { - $id = $request->id; - $penawaran = PenawaranTender::where('status','=','proposal-tender')->find($id); + $id = $request->id; + $penawaran = PenawaranTender::with('permohonan.debiture')->where('status','=','proposal-tender')->find($id); if ($penawaran) { $penawrandetails = PenawaranDetailTender::where('penawaran_id','=',$id) diff --git a/resources/views/prosespenawaran/edit.blade.php b/resources/views/prosespenawaran/edit.blade.php index 59621a9..f2d3536 100644 --- a/resources/views/prosespenawaran/edit.blade.php +++ b/resources/views/prosespenawaran/edit.blade.php @@ -26,6 +26,16 @@
+
+ +
+ +
+
+
+

+ Nama Debitur: +

+ + + +

Nomor Register Permohonan: diff --git a/resources/views/prosespenawaran/js/editjs.blade.php b/resources/views/prosespenawaran/js/editjs.blade.php index de12089..4bd1fc5 100644 --- a/resources/views/prosespenawaran/js/editjs.blade.php +++ b/resources/views/prosespenawaran/js/editjs.blade.php @@ -33,14 +33,17 @@ // } }, success: function(response) { - + console.log(response); if ('success' == response.status) { + $("#namaDebitur").text(response.penawaran.permohonan.debiture.name); $("#textReg").text(response.penawaran.nomor_registrasi); $("#textCodePenawaran").text(response.penawaran.code); setTablesKJPP1(response.penawrandetails); setKJPPList(response.kjpps); } + + else if('error' == response.status) { var message = response.message; @@ -79,7 +82,7 @@ { htmlDokumenPersetujuanDownload='
'+value.attachment+'  
'; } - + var markup = ''; markup +=''+i+''; markup +=''; @@ -96,13 +99,13 @@ markup +=''; markup +=''; // Tanggal Proposal - + // Biaya Penawaran markup +=''; markup +='
Rp.
'; markup +=''; - markup +=''; - // Biaya Penawaran + markup +=''; + // Biaya Penawaran // Upload Penawaran markup +=''; markup +=''; @@ -122,11 +125,11 @@ if(biaya_penawaran) biaya_penawaran_format=tandaPemisahTitik(biaya_penawaran); $("#{{$route[1]}}_biayaPenawaran_"+value.id).val(biaya_penawaran_format); - + i++; }); } - + $(document).on("input", "input:file", function(e) { let fileName = e.target.files[0].name; let inputFile = e.target.id; @@ -189,16 +192,16 @@ }); }); - $('#form_{{$route[1]}}').submit(function(e) { + $('#form_{{$route[1]}}').submit(function(e) { e.preventDefault(); - + var formData = new FormData(this); //define variable let token = "{{ csrf_token() }}"; let useURL = "{{ route($route[0].'.'.$route[1].'.updateDraft',$id) }}"; formData.append('_token', token); formData.append('_method', 'PUT'); - + $.ajax({ url: useURL, type: "POST", @@ -208,7 +211,7 @@ contentType: false, success: function(response) { console.log(response); - + if ('success' == response.status) { // toastr.success(response.message); @@ -225,7 +228,7 @@ var message = response.message; toastrku("error", message); } - + }, error: function(response, textStatus, errorThrown) { // var errors = response.responseJSON.errors; @@ -234,8 +237,8 @@ } }); - }); - + }); + $("#{{$route[1]}}_toAddKJPP").click(function(e) { e.preventDefault(); @@ -243,7 +246,7 @@ let id = $("#id").val(); let token = "{{ csrf_token() }}"; let useURL = "{{ route($route[0].'.'.$route[1].'.store') }}"; - + var input_data = new Object(); input_data._token= token; input_data.kjpp_id= kjpp_id; @@ -257,7 +260,7 @@ cache: false, data: input_data, success:function(response){ - + if ('success' == response.status) { // toastr.success(response.message); @@ -288,13 +291,13 @@ icon: "error" }); } - - }); + + }); // update status $("#{{$route[1]}}_toProsesPenawaran").click(function(e) { e.preventDefault(); - + Swal.fire({ title: ' ', text: "Yakin akan Penawaran ulang?", @@ -304,14 +307,14 @@ cancelButtonColor: '#d33', confirmButtonText: 'Yes' }).then((result) => { - if (result.isConfirmed) + if (result.isConfirmed) { //define variable // $id ==> penawaran.id let token = "{{ csrf_token() }}"; let noReg = $("#textReg").text(); let useURL = "{{ route('otorisasitender.penawaran.penawaranulang',$id) }}"; - + var input_data = new Object(); input_data._token = token; input_data.id = "{{ $id }}"; @@ -328,7 +331,7 @@ if('success' == response.status) { swal.fire('Sukses Penawaran ulang!', response.message.message_success[0], 'success').then(() => { - var url = "{{ route('tender.prosespenawaran.index') }}"; + var url = "{{ route('tender.prosespenawaran.index') }}"; $(location).attr('href',url); }); } @@ -336,7 +339,7 @@ { Swal.fire('Error!', response.message.message_error[0], 'error'); } - + }, error: function(response, textStatus, errorThrown) { // var errors = response.responseJSON.errors; @@ -344,10 +347,10 @@ console.log(response); } - }); + }); } - }) - - }); + }) + + }); -@endpush \ No newline at end of file +@endpush diff --git a/resources/views/prosespenawaran/js/editulangjs.blade.php b/resources/views/prosespenawaran/js/editulangjs.blade.php index 7e2a705..e7c67ce 100644 --- a/resources/views/prosespenawaran/js/editulangjs.blade.php +++ b/resources/views/prosespenawaran/js/editulangjs.blade.php @@ -38,6 +38,7 @@ if("success"==response.status) { var statusText = response.penawaran.status; + $("#namaDebitur").text(response.penawaran.permohonan.debiture.name); $("#textReg").text(response.penawaran.nomor_registrasi); $("#textCodePenawaran").text(response.penawaran.code); $("#textStatusPenawaran").text(statusText); @@ -73,7 +74,7 @@ { htmlDokumenPersetujuanDownload='
'+value.attachment+'  
'; } - + var markup = ''; markup +=''+i+''; markup +=''; @@ -90,13 +91,13 @@ markup +=''; markup +=''; // Tanggal Proposal - + // Biaya Penawaran markup +=''; markup +='
Rp.
'; markup +=''; - markup +=''; - // Biaya Penawaran + markup +=''; + // Biaya Penawaran // Upload Penawaran markup +=''; markup +=''; @@ -117,7 +118,7 @@ if(biaya_penawaran) biaya_penawaran_format=tandaPemisahTitik(biaya_penawaran); $("#{{$route[1]}}_biayaPenawaran_"+value.id).val(biaya_penawaran_format); - + i++; }); } @@ -151,7 +152,7 @@ // update status $("#{{$route[1]}}_toPenawaranUlang").click(function(e) { e.preventDefault(); - + Swal.fire({ title: ' ', text: "Yakin akan Penawaran ulang?", @@ -161,14 +162,14 @@ cancelButtonColor: '#d33', confirmButtonText: 'Yes' }).then((result) => { - if (result.isConfirmed) + if (result.isConfirmed) { //define variable // $id ==> penawaran.id let token = "{{ csrf_token() }}"; let noReg = $("#textReg").text(); let useURL = "{{ route('otorisasitender.penawaran.penawaranulang',$id) }}"; - + var input_data = new Object(); input_data._token = token; input_data.id = "{{ $id }}"; @@ -185,7 +186,7 @@ if('success' == response.status) { swal.fire('Sukses Penawaran ulang!', response.message.message_success[0], 'success').then(() => { - var url = "{{ route('tender.prosespenawaran.index') }}"; + var url = "{{ route('tender.prosespenawaran.index') }}"; $(location).attr('href',url); }); } @@ -193,7 +194,7 @@ { Swal.fire('Error!', response.message.message_error[0], 'error'); } - + }, error: function(response, textStatus, errorThrown) { // var errors = response.responseJSON.errors; @@ -201,9 +202,9 @@ console.log(response); } - }); + }); } - }) - }); + }) + }); @endpush diff --git a/resources/views/prosespenawaranulang/edit.blade.php b/resources/views/prosespenawaranulang/edit.blade.php index 716e2b8..4d95fb6 100644 --- a/resources/views/prosespenawaranulang/edit.blade.php +++ b/resources/views/prosespenawaranulang/edit.blade.php @@ -23,6 +23,17 @@

+ +
+

+ Nama Debiture: +

+ + + +

Nomor Register Permohonan: diff --git a/resources/views/prosespenawaranulang/js/editjs.blade.php b/resources/views/prosespenawaranulang/js/editjs.blade.php index 0bde8e5..f49eb6c 100644 --- a/resources/views/prosespenawaranulang/js/editjs.blade.php +++ b/resources/views/prosespenawaranulang/js/editjs.blade.php @@ -38,6 +38,7 @@ if("success"==response.status) { var statusText = response.penawaran.status; + $("#namaDebitur").text(response.penawaran.permohonan.debiture.name); $("#textReg").text(response.penawaran.nomor_registrasi); $("#textCodePenawaran").text(response.penawaran.code); $("#textStatusPenawaran").text(statusText);