From 84dc500162e2c860331104623d376594a8d08735 Mon Sep 17 00:00:00 2001 From: Ain Izazi Date: Mon, 30 Dec 2024 23:33:20 +0800 Subject: [PATCH] add insert record cetaksag dan add norujukan di cetaksuratwakil --- app/Http/Controllers/GadaiController.php | 42 +++++++++++++++--------- app/Http/Controllers/WakilController.php | 1 + 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index eeff97f..d061baf 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -132,7 +132,7 @@ class GadaiController extends Controller } public function create($kodcaw,Request $request){ - + $master = new MasterServices($kodcaw); $response = $master->createGadai($request); @@ -356,8 +356,8 @@ class GadaiController extends Controller // $old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); $old_data = Gadai::on($cawangan['mysql'])->where([['norujukan','=',$norujukan],['pinjaman','=','NULL']])->orWhere([['norujukan','=',$norujukan],['pinjaman','=',0.00]])->first(); - - + + if($old_data){ Gadai::on($cawangan['mysql'])->where([['norujukan','=',$norujukan],['pinjaman','=','NULL']])->delete(); Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); @@ -392,6 +392,8 @@ class GadaiController extends Controller } public function cetakSAG($kodcaw,$norujukan,Request $request){ + $harini = Carbon::now(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $gadai = Gadai::on($cawangan['mysql']) ->where('norujukan','=',$norujukan) @@ -400,6 +402,16 @@ class GadaiController extends Controller 'penilai' => $request->penilai )); + $audit = new Audit(); + $audit->users = isset($request->penilai) ? $request->penilai : ''; + $audit->actions = "Cetak SAG"; + $audit->norujukan = $request->norujukan; + // $audit->new_data = $request->norujukan; + $audit->kodcaw = $kodcaw; + $audit->created_at = $harini; + $audit->updated_at = $harini; + $audit->save(); + return response()->json($gadai,200); } @@ -582,7 +594,7 @@ class GadaiController extends Controller "ujrah"=> $gadaiData['ujrah'], "onepercent"=> $gadaiData['onepercent'], "tagbaru"=> $gadaiData['tagbaru'] - + ]); } } @@ -1073,14 +1085,14 @@ class GadaiController extends Controller $onepercentonline = $ansuransonline->sum('trans.onepercent'); $arrayansuran = [ - 'totalpendahuluankaunter' => $pendahuluankaunter, - 'totalkeuntungankaunter' => $keuntungankaunter, + 'totalpendahuluankaunter' => $pendahuluankaunter, + 'totalkeuntungankaunter' => $keuntungankaunter, 'bilangankaunter' => $bilangankaunter, 'totalujrahkaunter' => $ujrahkaunter, 'totalonepercentkaunter' => $onepercentkaunter, - 'totalpendahuluanonline' => $pendahuluanonline, - 'totalkeuntunganonline' => $keuntunganonline, + 'totalpendahuluanonline' => $pendahuluanonline, + 'totalkeuntunganonline' => $keuntunganonline, 'bilanganonline' => $bilanganonline, 'totalujrahonline' => $ujrahonline, 'totalonepercentonline' => $onepercentonline @@ -1132,14 +1144,14 @@ class GadaiController extends Controller $onepercentonline = $ansuransonline->sum('trans.onepercent'); $arrayansuran = [ - 'totalpendahuluankaunter' => $pendahuluankaunter, - 'totalkeuntungankaunter' => $keuntungankaunter, + 'totalpendahuluankaunter' => $pendahuluankaunter, + 'totalkeuntungankaunter' => $keuntungankaunter, 'bilangankaunter' => $bilangankaunter, 'totalujrahkaunter' => $ujrahkaunter, 'totalonepercentkaunter' => $onepercentkaunter, - 'totalpendahuluanonline' => $pendahuluanonline, - 'totalkeuntunganonline' => $keuntunganonline, + 'totalpendahuluanonline' => $pendahuluanonline, + 'totalkeuntunganonline' => $keuntunganonline, 'bilanganonline' => $bilanganonline, 'totalujrahonline' => $ujrahonline, 'totalonepercentonline' => $onepercentonline, @@ -3007,7 +3019,7 @@ class GadaiController extends Controller ->where('trans.trans_type','=','A') ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) ->get(); - + $transaksi = 0; if($transaksi_data){ foreach($transaksi_data as $index=>$transaksiData){ @@ -3278,7 +3290,7 @@ class GadaiController extends Controller $audit = Gadai::on($cawangan['mysql']) ->where([['tagpalsu','=',1],['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['tagpalsu','=',1],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + ->orWhere([['tagpalsu','=',1],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) ->orderBy('t_gadai', 'ASC') ->orderBy('sirig', 'ASC'); @@ -3647,7 +3659,7 @@ class GadaiController extends Controller public function getKadarUjrah(Request $request){ $onePercentServices = new Onepercent($request->kodcaw); $kadarujrah = $onePercentServices->getKadarUjrah($request); - + return $kadarujrah; } diff --git a/app/Http/Controllers/WakilController.php b/app/Http/Controllers/WakilController.php index 0374a5b..878ab06 100644 --- a/app/Http/Controllers/WakilController.php +++ b/app/Http/Controllers/WakilController.php @@ -60,6 +60,7 @@ class WakilController extends Controller $audit = new Audit(); $audit->users = $request->nama; $audit->actions = "Cetak Surat Wakil"; + $audit->norujukan = $request->norujukan; $audit->new_data = $wakil; $audit->kodcaw = $kodcaw; $audit->created_at = $harini;