diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index f69a00d..8a938be 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -122,14 +122,14 @@ class RealisasiBelanjaController extends Controller DB::beginTransaction(); $realisasi_belanja->delete(); DB::commit(); - return redirect('/realisasi-pendapatan') - ->with('success','Data Realisasi Pendapatan berhasil dihapus!'); + return redirect('/realisasi-belanja') + ->with('success','Data Realisasi Belanja berhasil dihapus!'); }catch(Throwable $e){ DB::rollBack(); - return redirect('/realisasi-pendapatan') - ->with('error','Data Realisasi Pendapatan gagal dihapus.'); + return redirect('/realisasi-belanja') + ->with('error','Data Realisasi Belanja gagal dihapus.'); } } @@ -334,10 +334,12 @@ class RealisasiBelanjaController extends Controller $BelanjaRealisasi = BelanjaRealisasi::where("id", $id)->firstOrNew(); $req = $request->all(); $redirect = "/realisasi-belanja/".$id."/submit"; + $action = "/realisasi-belanja/".$id."/kontrak"; + // var_dump("WOY"); exit; if ($request->isMethod('post')) { try{ DB::beginTransaction(); - BelanjaRealisasiKontrak::where("belanja_realisasi_id",$id)->truncate(); + BelanjaRealisasiKontrak::where("belanja_realisasi_id",$id)->where("nomor_kontrak",$req["nomor_kontrak"])->firstOrNew()->truncate(); $data["belanja_realisasi_id"] = $id; $data["nomor_kontrak"] = $req["nomor_kontrak"]; $data["tgl_kontrak"] = ConvertIndoDate($req["tgl_kontrak"]); @@ -355,6 +357,50 @@ class RealisasiBelanjaController extends Controller } } - return view('realisasi_belanja.form_kontrak',compact("BelanjaRealisasi")); + return view('realisasi_belanja.form_kontrak',compact("BelanjaRealisasi","action")); + } + + public function kontrakUpdate(Request $request, $idKontrak) + { + $BelanjaRealisasiKontrak = BelanjaRealisasiKontrak::where("id",$idKontrak)->firstorNew(); + $BelanjaRealisasi = BelanjaRealisasi::where("id", $BelanjaRealisasiKontrak->belanja_realisasi_id)->firstOrNew(); + $req = $request->all(); + $redirect = "/realisasi-belanja/".$BelanjaRealisasiKontrak->belanja_realisasi_id."/submit"; + $action = "/realisasi-belanja/".$idKontrak."/kontrak"; + if ($request->isMethod('put')) { + try{ + DB::beginTransaction(); + $data["nomor_kontrak"] = $req["nomor_kontrak"]; + $data["tgl_kontrak"] = ConvertIndoDate($req["tgl_kontrak"]); + $data["nominal_kontrak"] = replaceMoney($req["nominal_kontrak"]); + $BelanjaRealisasiKontrak->update($data); + DB::commit(); + + return redirect($redirect)->with('success','Data Kontrak berhasil di input!'); + }catch(\Exception $e){ + throw new \Exception($e->getMessage()); + DB::rollBack(); + return redirect($redirect)->with('error',$e->getMessage()); + } + } + + return view('realisasi_belanja.form_kontrak',compact("BelanjaRealisasi","BelanjaRealisasiKontrak","action")); + } + + public function destroyKontrak($id) + { + try{ + DB::beginTransaction(); + BelanjaRealisasiKontrak::where("id",$id)->delete(); + DB::commit(); + return redirect('/realisasi-belanja/'.$id.'/kontrak') + ->with('success','Data Kontrak Realisasi Belanja berhasil dihapus!'); + + }catch(Throwable $e){ + + DB::rollBack(); + return redirect('/realisasi-belanja/'.$id.'/kontrak') + ->with('error','Data Kontrak Realisasi Belanja gagal dihapus.'); + } } } diff --git a/public/css/app.css b/public/css/app.css index d5e9fd2..a451feb 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -5,9 +5,7 @@ body{ background-size: cover; /* background: #d5dee7 !important; */ color:#333; - font-size: 12px; /* font-family: "Ubuntu", "Helvetica Neue", Roboto, Arial, "Droid Sans", sans-serif; */ - zoom: 85%; } .navy-link, .breadcrumb-item a{ diff --git a/public/js/app.js b/public/js/app.js index a281296..cc61548 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -387,18 +387,14 @@ refreshNotif = ()=>{ } refreshNotif(); -$.extend( $.fn.dataTable.ext.classes, { - sProcessing: "dataTables_processing", -}); +if($.fn.dataTable != undefined){ + $.extend( $.fn.dataTable.ext.classes, { + sProcessing: "dataTables_processing", + }); +} $(window).resize(function(){ - $($.fn.dataTable.tables(true)).DataTable().columns.adjust(); + if($.fn.dataTable != undefined){ + $($.fn.dataTable.tables(true)).DataTable().columns.adjust(); + } }); - -$(window).on("#barButton", "click",()=>{ - $(window).resize(); - $($.fn.dataTable.tables(true)).DataTable().columns.adjust(); - $.fn.dataTable - .tables( { visible: true, api: true } ) - .columns.adjust(); -}); \ No newline at end of file diff --git a/resources/views/realisasi_belanja/form_kontrak.blade.php b/resources/views/realisasi_belanja/form_kontrak.blade.php index b8d2614..4eb3430 100644 --- a/resources/views/realisasi_belanja/form_kontrak.blade.php +++ b/resources/views/realisasi_belanja/form_kontrak.blade.php @@ -1,22 +1,25 @@ -