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

update tagujrah dalam existing record lelong lama dan lain2

Browse Source
This commit is contained in:
BTMS2
2024-09-06 15:54:51 +08:00
parent 178a5a2845
commit c49d63ec7c
13 changed files with 78 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+13 -7
View File
@@ -348,6 +348,7 @@ class LelongController extends Controller
'bakilelong' => $bakilelong,
'ujrah' => $ujrah,
'onepercent' => $onepercent,
'tagujrah' => $caw->tagujrah,
]);
$total_nilaimarhun += $nilai_marhun;
@@ -3872,11 +3873,14 @@ class LelongController extends Controller
$keuntungan = 0.00;
}
else{
//kiraan keuntungan ujrah
$jeniskeuntungan = 'onepercent';
$keuntungan1 = Http::get(config('app.api_url'). 'upahtawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json();
$keuntungan = round(($keuntungan1['pendapatan']*100)/5,0)*5/100;
// dd($keuntungan);
$keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json();
$ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan)->json();
$keuntungan = $keuntungan1['pendapatan'];
$rounded_ujrah = $ujrahonepercentrebet['ujrah'];
$rounded_onepercent = $ujrahonepercentrebet['onepercent'];
}
}
@@ -3903,13 +3907,15 @@ class LelongController extends Controller
elseif($datagadai->tempohbayar == $datagadai->tempoh ){
$keuntungan = 0.00;
}
else{
else{
//kiraan keuntungan ujrah
$jeniskeuntungan = 'onepercent';
$keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahtawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json();
$keuntungan = round(($keuntungan1['pendapatan']*100)/5,0)*5/100;
// dd($keuntungan);
$keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json();
$ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan)->json();
$keuntungan = $keuntungan1['pendapatan'];
$rounded_ujrah = $ujrahonepercentrebet['ujrah'];
$rounded_onepercent = $ujrahonepercentrebet['onepercent'];
}
}
}
app/Http/Controllers/ReportController.php
+2 -2
View File
@@ -442,7 +442,7 @@ class ReportController extends Controller
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('cawangan.caw_code',$kodcaw)
->where('cawangan_lelong.lelong_id','=',$lelong_id)
->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.tagujrah')
->select('lelong_id','tarikh_lelong','lelong.fasa','cawangan_lelong.tagujrah')
->groupBy('lelong_id')
->get();
@@ -942,7 +942,7 @@ class ReportController extends Controller
$lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->where('cawangan_lelong.lelong_id','=',$lelongid)
->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.tagujrah')
->select('lelong_id','tarikh_lelong','lelong.fasa','cawangan_lelong.tagujrah')
->groupBy('lelong_id')
->get()->toArray();
app/Http/Controllers/SimulasiUjrahController.php
+10 -17
View File
@@ -1020,17 +1020,11 @@ class SimulasiUjrahController extends Controller
//kiraan keuntungan ujrah
$jeniskeuntungan = 'onepercent';
$keuntungan1 = Http::get(config('app.api_url'). 'upahtawarruq/'.$listing['kodcaw'].'/'.$listing['norujukan'].'/'.$jeniskeuntungan)->json();
if($keuntungan1 == null){
$keuntungan = 0.00;
}else{
$keuntungan = round(($keuntungan1['pendapatan'] *100)/5,0)*5/100;
}
// $ujrahonepercentrebet = Http::get(config('app.api_url'). 'lelong/kiraupahUjrahOnePercentRebate/'.$listing['kodcaw'].'/'.$listing['norujukan'])->json();
// $keuntungan = round(($keuntungan1['pendapatan']*100)/5,0)*5/100;
// $rounded_ujrah = round(($ujrahonepercentrebet['ujrah']*100)/5,0)*5/100;
// $rounded_onepercent = round(($ujrahonepercentrebet['onepercent']*100)/5,0)*5/100;
// dd($ujrahonepercent, $ujrahonepercentrebet, $rounded_ujrah, $rounded_onepercent);
$keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json();
$ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan)->json();
$keuntungan = $keuntungan1['pendapatan'];
$rounded_ujrah = $ujrahonepercentrebet['ujrah'];
$rounded_onepercent = $ujrahonepercentrebet['onepercent'];
}
@@ -1260,12 +1254,11 @@ class SimulasiUjrahController extends Controller
//kiraan keuntungan ujrah
$jeniskeuntungan = 'onepercent';
$keuntungan1 = Http::get(config('app.api_url'). 'upahtawarruq/'.$surats['kodcaw'].'/'.$surats['norujukan'].'/'.$jeniskeuntungan)->json();
if($keuntungan1 == null){
$keuntungan = 0.00;
}else{
$keuntungan = round(($keuntungan1['pendapatan'] *100)/5,0)*5/100;
}
$keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json();
$ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan)->json();
$keuntungan = $keuntungan1['pendapatan'];
$rounded_ujrah = $ujrahonepercentrebet['ujrah'];
$rounded_onepercent = $ujrahonepercentrebet['onepercent'];
// dd($surats['hargajualan']);
$ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan'];