KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/auditTrail (pull request #245)

Browse Source 
Bugfix/auditTrail
This commit is contained in:
Ain Izazi Aziz
2024-12-31 05:09:16 +00:00
parent 56669b8abd 038ece5425
commit f1140f36b0
11 changed files with 523 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+27 -15
View File
@@ -138,7 +138,7 @@ class GadaiController extends Controller
}
public function create($kodcaw,Request $request){
$master = new MasterServices($kodcaw);
$response = $master->createGadai($request);
@@ -362,8 +362,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();
@@ -398,6 +398,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)
@@ -406,6 +408,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);
}
@@ -588,7 +600,7 @@ class GadaiController extends Controller
"ujrah"=> $gadaiData['ujrah'],
"onepercent"=> $gadaiData['onepercent'],
"tagbaru"=> $gadaiData['tagbaru']
]);
}
}
@@ -1079,14 +1091,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
@@ -1138,14 +1150,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,
@@ -3070,7 +3082,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){
@@ -3386,7 +3398,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');
@@ -3755,7 +3767,7 @@ class GadaiController extends Controller
public function getKadarUjrah(Request $request){
$onePercentServices = new Onepercent($request->kodcaw);
$kadarujrah = $onePercentServices->getKadarUjrah($request);
return $kadarujrah;
}