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

Merge branch 'main' into faiqahzaman

Browse Source
This commit is contained in:
faiqahzaman
2022-06-07 08:37:25 +08:00
parent b5a1cfa4c6 fd6be5ec8b
commit f9fe6de4f8
17 changed files with 1195 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+29 -5
View File
@@ -11,7 +11,7 @@ use PDF;
use App\Models\Cawangan;
use App\Models\JenisEmas;
use App\Models\JenisKarat;
use App\Models\Gadai;
use App\Models\Lelong;
use App\Models\CawanganLelong;
use App\Models\LelongBid;
@@ -316,6 +316,7 @@ class MarhunController extends Controller
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->where('cawangan.caw_code', $user->kodcaw)
->get()
->toArray();
array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
@@ -475,6 +476,7 @@ class MarhunController extends Controller
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->where('cawangan.caw_code', $user->kodcaw)
->get()
->toArray();
array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
@@ -530,6 +532,7 @@ class MarhunController extends Controller
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->get()
->toArray();
@@ -599,6 +602,7 @@ class MarhunController extends Controller
'lelongbid.jbg',
'lelongbid.kadarupah',
'lelongbid.upahsimpan',
'lelongbid.bakiupah',
'lelongbid.ansuran',
'lelongbid.nilaimarhun',
'lelongbid.pinjaman',
@@ -618,7 +622,10 @@ class MarhunController extends Controller
->where('id', $lelbidmarhun->lelongbidmarhun_id)
->get()->toArray();
$lelongbid = LelongBid::where('id', $lelbidmarhun->lelongbid_id)->where('lelong_id', $id)->first();
$lelongbid = LelongBid::where('lelongbid.id', $lelbidmarhun->lelongbid_id)
->where('lelongbid.lelong_id', $id)
->first();
$karat = Lelkarat::where('lelong_id', $id)->get();
// dd($lelbidmarhuns);
@@ -634,13 +641,18 @@ class MarhunController extends Controller
// ->where('norujukan', $lelongbid->norujukan)
// ->first();
if($lelongbid->baki > 0)
$lelong = Lelong::where('id',$id)->get();
$sumcajlelong = $lelongbid->hargaasas * ($lelong[0]['cajlelong']/100);
//$cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
$totalbaki = $lelongbid->hargaasas - $lelongbid->pinjaman - $lelongbid->bakiupah - bcdiv($sumcajlelong,1,1);
//dd($totalbaki);
if($totalbaki > 0)
{
$bakilelong = $bakilelong + $lelongbid->baki;
$bakilelong = $totalbaki;
}
else
{
$rugilelong = $rugilelong - $lelongbid->baki;
$rugilelong = $totalbaki;
}
// if($gadaimarhun)
@@ -664,6 +676,14 @@ class MarhunController extends Controller
// $marhuns[$index1]['rugi_lelong'] = 0;
// }
// $marhuns[$index1]['harga_gadai'] = $gadaimarhun->harga;
// $marhuns[$index1]['nmarhun_gadai'] = $gadaimarhun->n_marhun;
// $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun;
// $marhuns[$index1]['status_ubah'] = $status;
// $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman;
// $marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah;
// $marhuns[$index1]['baki_lelong'] = $bakilelong;
// $marhuns[$index1]['rugi_lelong'] = $rugilelong;
}
// dd($marhuns);
array_push($arraylelbidmarhun,$marhuns);
@@ -749,6 +769,10 @@ class MarhunController extends Controller
$tangguhlelong->ditangguh_pada = $currentdate;
$tangguhlelong->nota = $request->nota;
$tangguhlelong->save();
$updategadai = Gadai::where('norujukan','=',$request->norujukan)->first();
$updategadai->taglel = 0;
$updategadai->update();
$marhundelete = LelongBid::where('id', $request->lelongbid_id)->delete();
}