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

tambah tagujrah,ujrah dan onepercent dlm arrahnbid

Browse Source
This commit is contained in:
Nur Izzati Zulkifli
2023-12-11 11:51:32 +08:00
parent 3aba20615c
commit e01835fb59
26 changed files with 370 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+76 -21
View File
@@ -231,6 +231,8 @@ class LelongController extends Controller
$total_cazlelong = 0;
$total_rugilelong = 0;
$total_bakilelong = 0;
$total_ujrah = 0;
$total_onepercent = 0;
$total24Kgb = 0;
$total24K = 0;
@@ -260,6 +262,8 @@ class LelongController extends Controller
$cajlelong = 0;
$rugilelong = 0;
$bakilelong = 0;
$ujrah = 0;
$onepercent = 0;
foreach ($caw['lelongBid'] as $lel_bid) {
$total_marhun += 1;
$nilai_marhun += $lel_bid->nilaimarhun;
@@ -267,6 +271,8 @@ class LelongController extends Controller
$bakiupah += $lel_bid->bakiupah;
$berat += $lel_bid->berat;
$hargaasas += $lel_bid->hargaasas;
$ujrah += $lel_bid->ujrah;
$onepercent += $lel_bid->onepercent;
//$cajlelong += $lel_bid->cajlelong;
$sumcajlelong = $lel_bid['hargaasas'] * ($lelong->cajlelong / 100);
@@ -321,6 +327,8 @@ class LelongController extends Controller
'cajlelong' => $cajlelong,
'rugilelong' => $rugilelong,
'bakilelong' => $bakilelong,
'ujrah' => $ujrah,
'onepercent' => $onepercent,
]);
$total_nilaimarhun += $nilai_marhun;
@@ -331,6 +339,8 @@ class LelongController extends Controller
$total_cazlelong += $cajlelong;
$total_berat += $berat;
$total_hargaasas += $hargaasas;
$total_ujrah += $ujrah;
$total_onepercent += $onepercent;
}
$tarikhkemaskini = $lelong->lelKarat[0];
@@ -347,6 +357,8 @@ class LelongController extends Controller
'total_cazlelong',
'total_rugilelong',
'total_bakilelong',
'total_ujrah',
'total_onepercent',
'total24Kgb',
'total24K',
'total23k',
@@ -1482,6 +1494,8 @@ class LelongController extends Controller
$keuntungan = 0;
$bakilelong = 0;
$total_cazlelong = 0;
$total_ujrah = 0;
$total_onepercent = 0;
// dd($cawid);
$lelonglel = Lelong::with('cawangan')->find($lelongid);
@@ -1508,6 +1522,8 @@ class LelongController extends Controller
$total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
$total_bakiupah = $total_bakiupah + $cal['bakiupah'];
$total_cazlelong = $total_cazlelong + $cajlelongnew;
$total_ujrah += $cal['ujrah'];
$total_onepercent += $cal['onepercent'];
array_push($arraymarhun,[
'norujukan' => $cal['norujukan'],
@@ -1519,6 +1535,8 @@ class LelongController extends Controller
'bakiupah' => $cal['bakiupah'],
'cajlelong' => $cajlelongnew,
'baki' => $cal['baki'],
'ujrah' => $cal['ujrah'],
'onepercent' => $cal['onepercent'],
]);
}
@@ -1545,6 +1563,8 @@ class LelongController extends Controller
'total_upah',
'total_hargaasas',
'total_bakiupah',
'total_ujrah',
'total_onepercent',
'total_nilaimarhun',
'lelonglel',
'cawanganDetail',
@@ -3710,7 +3730,7 @@ class LelongController extends Controller
$lelongbid_keyby_norujukan = $caw->lelongBid->keyBy('norujukan');
$gadai_all = Gadai::on($cawanganDetail->caw_code)->whereIn('norujukan', $lelongbid_data_pluck_norujukan)
->select('kadarupah','nokp','tempoh','tempohbayar','norujukan','berat','nilaimarhun','pinjaman','bakipjm','bakiupah','hargajualan','bakihargajualan')
->select('kadarupah','nokp','tempoh','tempohbayar','norujukan','berat','nilaimarhun','pinjaman','bakipjm','bakiupah','hargajualan','bakihargajualan','tagbaru')
->orderBy('norujukan','ASC')
->get();
@@ -3773,26 +3793,61 @@ class LelongController extends Controller
$beza_keuntungan = bcdiv($beza_keuntungan, 1, 2);
// dd($beza_keuntungan);
// dd(true);
$jbg = $datagadai->tempoh - $datagadai->tempohbayar;
$jbg2 = 12 - $datagadai->tempohbayar;
if($datagadai->tempoh <= '12.00'){
$keuntungan = bcdiv(($jbg)*$datagadai->kadarupah/100*$datagadai->bakipjm,1,1)-$beza_keuntungan;
}else{
$keuntungan = bcdiv(($jbg2)*$datagadai->kadarupah/100*$datagadai->bakipjm,1,1)-$beza_keuntungan;
if($datagadai->tagbaru == 0){
$jbg = $datagadai->tempoh - $datagadai->tempohbayar;
$jbg2 = 12 - $datagadai->tempohbayar;
if($datagadai->tempoh <= '12.00'){
$keuntungan = bcdiv(($jbg)*$datagadai->kadarupah/100*$datagadai->bakipjm,1,1)-$beza_keuntungan;
}else{
$keuntungan = bcdiv(($jbg2)*$datagadai->kadarupah/100*$datagadai->bakipjm,1,1)-$beza_keuntungan;
}
}elseif($datagadai->tagbaru == 1){
if($datagadai->tempohbayar == 12){
$keuntungan = 0.00;
}
elseif($datagadai->tempohbayar == $datagadai->tempoh ){
$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*100)/5,0)*5/100;
// dd($keuntungan);
}
}
}
else{
// dd(false);
$jbg = $datagadai->tempoh - $datagadai->tempohbayar;
$jbg2 = 12 - $datagadai->tempohbayar;
$beza_keuntungan = 0.00;
// dd($beza_keuntungan);
if($datagadai->tempoh <= '12.00'){
// dd($jbg,$datagadai->kadarupah, $datagadai->bakipjm);
$keuntungan = bcdiv(($jbg)*$datagadai->kadarupah/100*$datagadai->bakipjm,1,1)-$beza_keuntungan;
}else{
// dd(false);
$keuntungan = bcdiv(($jbg2)*$datagadai->kadarupah/100*$datagadai->bakipjm,1,1)-$beza_keuntungan;
if($datagadai->tagbaru == 0){
$jbg = $datagadai->tempoh - $datagadai->tempohbayar;
$jbg2 = 12 - $datagadai->tempohbayar;
$beza_keuntungan = 0.00;
// dd($beza_keuntungan);
if($datagadai->tempoh <= '12.00'){
// dd($jbg,$datagadai->kadarupah, $datagadai->bakipjm);
$keuntungan = bcdiv(($jbg)*$datagadai->kadarupah/100*$datagadai->bakipjm,1,1)-$beza_keuntungan;
}else{
// dd(false);
$keuntungan = bcdiv(($jbg2)*$datagadai->kadarupah/100*$datagadai->bakipjm,1,1)-$beza_keuntungan;
}
}elseif($datagadai->tagbaru == 1){
if($datagadai->tempohbayar == 12){
$keuntungan = 0.00;
}
elseif($datagadai->tempohbayar == $datagadai->tempoh ){
$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*100)/5,0)*5/100;
// dd($keuntungan);
}
}
}
$lelongbid_true = $lelongbid_keyby_norujukan[$datagadai->norujukan];
@@ -5697,7 +5752,7 @@ class LelongController extends Controller
$total_nilaimarhun = 0;
$keuntungan = 0;
$total_cazlelong = 0;
$lelonglel = Lelong::where('id','=',$lelongid)->first();
$marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
->where('status_jual','=',0)
@@ -5736,7 +5791,7 @@ class LelongController extends Controller
->orWhere('kplama','=',$gadai['nokp'])
->first();
// dd($customer);
$lelonglel = Lelong::where('id','=',$lelongid)->first();
$sumcajlelong = $cal['hargaasas'] * ($lelonglel->cajlelong/100);
$cajlelongnew = round($sumcajlelong,1,1);
$totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
@@ -5787,7 +5842,7 @@ class LelongController extends Controller
->toArray();
array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
}
return view('lelong.senaraimarhunpc',compact('totalbaki','arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat',
return view('lelong.senaraimarhunpc',compact('lelonglel','totalbaki','arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat',
'total_pinjaman',
'total_upah',
'total_hargaasas',