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/LelongController.php
+59 -42
View File
@@ -71,11 +71,14 @@ class LelongController extends Controller
return response()->json($lelong);
}
public function showBakiLelong($noic,$jenislelong)
public function showBakiLelong($noic,$jenislelong, $kodcaw, Request $request)
{
$cawangan_all = Cawangan::on('mysql7')->get();
$bakilelongtotal = 0;
$rugilelongtotal = 0;
$current = Carbon::now();
$current = new Carbon();
if($jenislelong == 'baki')
{
@@ -91,6 +94,20 @@ class LelongController extends Controller
}
}
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = "test2";
// $audit->new_data = $bakilelongtotal;
$audit->new_data = json_encode([
'bakilelongtotal' => $bakilelongtotal,
'rugilelongtotal' => $rugilelongtotal,
]);
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
return response()->json($bakilelongtotal, 200);
}
@@ -603,7 +620,7 @@ class LelongController extends Controller
}else{
$link = 'http://adminbid.arrahn/api/portalApi';
}
$lelong = Http::withOptions(['verify' => true])->get($link,[
'norujukan' => $request->norujukan
])->json();
@@ -624,8 +641,8 @@ class LelongController extends Controller
if($lelong)
{
$date_lelong = new Carbon($lelong['t_lelong']);
$current_date = new Carbon($current->toDateString());
$current_date = new Carbon($current->toDateString());
if($lelong['t_lelong'] >= $current->toDateString())
{
$diff = $date_lelong->diffInDays($current_date);
@@ -663,7 +680,7 @@ class LelongController extends Controller
}
else{
$lelong = Lelong::on($cawangan['mysql'])
->where('norujukan', '=', $request->norujukan)
->select('norujukan', 't_lelong')
@@ -971,13 +988,13 @@ class LelongController extends Controller
if($batchnosama)
{
$dif=array_intersect($bl,$batchnosama);
if(!$dif)
{
array_push($arraybatch,['batchno' => $bl['batchno'], 'bilangantuntutbaki' => $bl['bilangan'], 'bilanganrugi' => 0,'tarikhlelong' => $bl['tarikhlelong']]);
}
}
}
foreach($batchlelrugi as $index=>$br)
@@ -986,13 +1003,13 @@ class LelongController extends Controller
if($batchnosama)
{
$dif=array_intersect($br,$batchnosama);
if(!$dif)
{
array_push($arraybatch,['batchno' => $br['batchno'], 'bilangantuntutbaki' => 0, 'bilanganrugi' => $br['bilangan'],'tarikhlelong' => $br['tarikhlelong']]);
}
}
}
}
return response()->json($arraybatch);
@@ -1032,7 +1049,7 @@ class LelongController extends Controller
->orderBy('gadai.sirig','asc')
->where('gadai.taglel','=', 1);
}
$lelonglist = $lelong->get();
foreach($lelonglist as $index=>$lel)
@@ -1107,7 +1124,7 @@ class LelongController extends Controller
'telefon' => $index['user_details']['notelbimbit'],
]);
}
$update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$index['norujukan'])->update(array(
'sttebus' => "L",
't_update' => $request->tarikh
@@ -1209,7 +1226,7 @@ class LelongController extends Controller
return response()->json("success");
}
public function getRingkasanHarian(Request $request){
public function getRingkasanHarian(Request $request){
$ringkasan = new RingkasanHarianServices;
$getData = $ringkasan->getRingkasanHarian($request->mula,$request->hingga,$request->kodcaw);
@@ -1324,7 +1341,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%');
}
}
})
->orderBy('lelong.t_lelong','asc')
->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan')
@@ -1335,7 +1352,7 @@ class LelongController extends Controller
$groupbybatch = $lelong_data->groupBy('batchno');
$lelong = [];
foreach($groupbybatch as $index=>$lelongData){
foreach($groupbybatch as $index=>$lelongData){
$total_pembiayaan = $lelongData->sum('pinjaman');
// dd($total_pembiayaan);
$total_lelong = $lelongData->count('norujukan');
@@ -1367,7 +1384,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%');
}
}
})
->orderBy('lelong.t_lelong','asc')
->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan')
@@ -1377,7 +1394,7 @@ class LelongController extends Controller
->get();
// dd($lelong_data);
$lelong = [];
foreach($lelong_data as $index=>$lelongData){
foreach($lelong_data as $index=>$lelongData){
// dd($lelongData->norujukan);
$lelmarhun = LelMarhun::on($cawangan['mysql'])
->where('norujukan',$lelongData['norujukan'])
@@ -1386,7 +1403,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('nota', 'like', '%' . $item[$i] .'%');
}
}
})
->get();
// dd($lelmarhun->norujukan);
@@ -1404,7 +1421,7 @@ class LelongController extends Controller
// dd($lelong);
}
return response()->json($lelong);
}
@@ -1422,7 +1439,7 @@ class LelongController extends Controller
->where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orWhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%');
}
}
})
->select('lelong.batchno','lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan','gadai.marhun')
->orderBy('lelong.t_lelong')
@@ -1431,8 +1448,8 @@ class LelongController extends Controller
->get();
// dd($lelong_data);
$lelong = [];
foreach($lelong_data as $index=>$lelongData){
foreach($lelong_data as $index=>$lelongData){
// dd($lelongData->norujukan);
$lelmarhun = LelMarhun::on($cawangan['mysql'])
->where('norujukan',$lelongData['norujukan'])
@@ -1442,13 +1459,13 @@ class LelongController extends Controller
->where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orWhere('nota', 'like', '%' . $item[$i] .'%');
}
}
})
->where('norujukan',$lelongData['norujukan'])
->where('batch_no',$lelongData['batchno'])
->distinct()
->get();
array_push($lelong,[
"batchno"=> $lelongData->batchno,
"norujukan"=> $lelongData->norujukan,
@@ -1465,7 +1482,7 @@ class LelongController extends Controller
// dd($lelong);
}
return response()->json($lelong);
}
@@ -1483,7 +1500,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%');
}
}
})
->select('lelong.batchno','lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan','gadai.marhun')
->orderBy('lelong.t_lelong')
@@ -1492,8 +1509,8 @@ class LelongController extends Controller
->get();
// dd($lelong_data);
$lelong = [];
foreach($lelong_data as $index=>$lelongData){
foreach($lelong_data as $index=>$lelongData){
$lelmarhun = LelMarhun::on($cawangan['mysql'])
->where('norujukan',$lelongData['norujukan'])
->where('batch_no',$lelongData['batchno'])
@@ -1503,7 +1520,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('nota', 'like', '%' . $item[$i] .'%');
}
}
})
->where('batch_no',$lelongData['batchno'])
->where('norujukan',$lelongData['norujukan'])
@@ -1526,7 +1543,7 @@ class LelongController extends Controller
// dd($lelong);
}
return response()->json($lelong);
}
@@ -1544,7 +1561,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%');
}
}
})
->orderBy('lelong.t_lelong','asc')
->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan')
@@ -1555,7 +1572,7 @@ class LelongController extends Controller
$groupbybatch = $lelong_data->groupBy('batchno');
$lelong = [];
foreach($groupbybatch as $index=>$lelongData){
foreach($groupbybatch as $index=>$lelongData){
$total_pembiayaan = $lelongData->sum('pinjaman');
// dd($total_pembiayaan);
$total_lelong = $lelongData->count('norujukan');
@@ -1587,7 +1604,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%');
}
}
})
->orderBy('lelong.t_lelong','asc')
->select('lelong.t_lelong','gadai.t_gadai','gadai.nokp','lelong.pinjaman','lelong.baki','lelong.batchno','lelong.norujukan')
@@ -1597,7 +1614,7 @@ class LelongController extends Controller
->get();
// dd($lelong_data);
$lelong = [];
foreach($lelong_data as $index=>$lelongData){
foreach($lelong_data as $index=>$lelongData){
// dd($lelongData->norujukan);
$lelmarhun = LelMarhun::on($cawangan['mysql'])
->where('norujukan',$lelongData['norujukan'])
@@ -1608,7 +1625,7 @@ class LelongController extends Controller
->Where(function ($query) use($item) {
for ($i = 0; $i < count($item); $i++){
$query->orwhere('lelmarhun.nota', 'like', '%' . $item[$i] .'%');
}
}
})
->where('batch_no',$batchno)
->where('norujukan',$lelongData['norujukan'])
@@ -1630,14 +1647,14 @@ class LelongController extends Controller
// dd($lelong);
}
return response()->json($lelong);
}
public function kiraupahUjrahOnePercent($kodcaw,$norujukan){
$onepercentservices = new OnePercentServices();
$cawangan = Cawangan::on('mysql7')
->where('kodcaw','=',$kodcaw)
->first();
@@ -1656,7 +1673,7 @@ class LelongController extends Controller
$array_upah = $onepercentservices->kiraanKeuntunganSebenar($gadai_data['pinjaman'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['percentpinj']);
$ujrah = $bilang_bln * $array_upah['ujrah'];
$onepercent = $bilang_bln * $array_upah['onepercent'];
$onepercent_semasa = $onepercent;
$onepercent_semasa = $onepercent;
$ujrah_semasa = $ujrah;
return ['ujrah' => $ujrah_semasa, 'onepercent' => $onepercent_semasa];
@@ -1665,7 +1682,7 @@ class LelongController extends Controller
// public function kiraupahUjrahOnePercentRebate($kodcaw,$norujukan){
// // $onepercentservices = new OnePercentServices();
// $onepercentservices = new Calculation();
// $cawangan = Cawangan::on('mysql7')
// ->where('kodcaw','=',$kodcaw)
// ->first();
@@ -1698,7 +1715,7 @@ class LelongController extends Controller
->first();
$onepercentservices = new Calculation();
// $cawangan = $kodcaw;
$gadai_data = Gadai::on($cawangan['mysql'])
@@ -1713,13 +1730,13 @@ class LelongController extends Controller
$bilang_bln = $tempoh - $gadai_data['tempohbayar'];
$array_upah = $onepercentservices->kiraanKeuntunganRebet($gadai_data['bakipjm'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['margin_semasa']);
// $ujrah_rounded = $onepercentservices->getRoundedMethod($array_upah['ujrah']);
// $ujrah_rounded = $onepercentservices->getRoundedMethod($array_upah['ujrah']);
// $keuntungan_rounded = $onepercentservices->getRoundedMethod($array_upah['onepercent']);
$ujrah = $bilang_bln * $array_upah['ujrah'];
$onepercent = $bilang_bln * $array_upah['onepercent'];
$ujrah = $onepercentservices->getRoundedMethod($ujrah);
$onepercent = $onepercentservices->getRoundedMethod($onepercent);
return ['ujrah' => $ujrah, 'onepercent' => $onepercent];
}