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

Merge branch 'main' into amir_dev

Browse Source
This commit is contained in:
Amir
2022-09-05 16:22:43 +08:00
parent cf972c0d68 ea19fb834f
commit f5ae8a070e
15 changed files with 2263 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+13 -8
View File
@@ -725,7 +725,6 @@ class MarhunController extends Controller
public function mutumarhun($norujukan, $id)
{
$lelbidmarhuns = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
// ->join('gadaimarhun', 'gadaimarhun.norujukan', '=', 'lelongbid.norujukan')
->where('lelongbid.lelong_id', $id)
->where('lelongbid.norujukan', $norujukan)
->select(
@@ -756,8 +755,6 @@ class MarhunController extends Controller
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.percent'
// 'gadaimarhun.harga',
// 'gadaimarhun.id as idgadaimarhun'
)
->get();
@@ -779,8 +776,6 @@ class MarhunController extends Controller
}
$gadai[$index1]['listgadai'] = $listgadai;
// dd($gadai);
$arraylelbidmarhun = [];
$bakilelong = 0;
$rugilelong = 0;
@@ -790,6 +785,15 @@ class MarhunController extends Controller
->where('id', $lelbidmarhun->lelongbidmarhun_id)
->get()->toArray();
$marhunsdet = LelongBidMarhun::where('lelongbid_id', $lelbidmarhun->lelongbid_id)
// ->where('id', $lelbidmarhun->lelongbidmarhun_id)
->get();
$totalhargaasas = $marhunsdet->sum('n_marhun');
$tothargaasas = bcdiv($totalhargaasas,1);
// dd($totalhargaasas);
// dd($totalhargaasas);
// $marhunsgadai = GadaiMarhun::where('norujukan', $norujukan)
// // ->where('karat', $lelbidmarhun->karat)
// // ->where('id', $lelbidmarhun->idgadaimarhun)
@@ -800,6 +804,7 @@ class MarhunController extends Controller
->where('lelongbid.lelong_id', $id)
->first();
$karat = Lelkarat::where('lelong_id', $id)->get();
// dd($lelbidmarhuns);
@@ -816,10 +821,10 @@ class MarhunController extends Controller
// ->first();
$lelong = Lelong::where('id',$id)->get();
$sumcajlelong = $lelongbid->hargaasas * ($lelong[0]['cajlelong']/100);
$sumcajlelong = $totalhargaasas * ($lelong[0]['cajlelong']/100);
//$cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
$totalbaki = $lelongbid->hargaasas - $lelongbid->pinjaman - $lelongbid->bakiupah - bcdiv($sumcajlelong,1,1);
//dd($totalbaki);
$totalbaki = $totalhargaasas - $lelongbid->pinjaman - $lelongbid->bakiupah - bcdiv($sumcajlelong,1,1);
// dd($totalbaki);
if($totalbaki > 0)
{
$bakilelong = $totalbaki;