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

Merge branch 'faiqahzaman'

Browse Source
This commit is contained in:
Azfar Arsyad
2022-03-01 12:56:43 +08:00
parent 5a44139242 a4799d8c60
commit 287bc7d0f4
10 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
-2
View File
@@ -296,8 +296,6 @@ class LelongController extends Controller
$lelongbid->baki =$simulasibid->baki;
$lelongbid->berat =$simulasibid->berat;
$lelongbid->marhun =$simulasibid->marhun;
$lelongbid->gst_hj =$simulasibid->gst_hj;
$lelongbid->gst_cl =$simulasibid->gst_cl;
$lelongbid->percent =$simulasibid->percent;
$lelongbid->status_jual =$simulasibid->status_jual;
$lelongbid->status_payment =$simulasibid->status_payment;
app/Http/Controllers/SimulasiController.php
+7 -11
View File
@@ -123,19 +123,17 @@ class SimulasiController extends Controller
$simulasibid->hargajual = 0.00;
$simulasibid->jbg = $data->jbg;
$simulasibid->kadarupah = $data->kadarupah;
$simulasibid->upahsimpan = $data->upahsimpan;
$simulasibid->upahsimpan = $data->upahSim;
$simulasibid->ansuran = $data->ansuran;
$simulasibid->nilaimarhun = $data->nilaimarhun;
$simulasibid->pinjaman = $data->pinjaman;
$simulasibid->bakiupah = $data->bakiupah;
$simulasibid->cajlain = $data->cajlain;
$simulasibid->cajlelong = 0.00;
$simulasibid->baki = $data->baki;
$simulasibid->baki = 0.00;
$simulasibid->berat = $data->berat;
$simulasibid->marhun = $data->marhun;
$simulasibid->gst_hj = $data->gst_hj;
$simulasibid->gst_cl = $data->gst_cl;
$simulasibid->percent = $data->percent;
$simulasibid->percent = $data->percentpinj;
$simulasibid->status_jual = 0;
$simulasibid->status_payment = 0;
$simulasibid->mora_upah = 0;
@@ -143,7 +141,7 @@ class SimulasiController extends Controller
$sumhargaasas = 0;
$berat = 0;
$gadaimarhun = GadaiMarhun::where('gadai_id','=',$data->id)->get();
$gadaimarhun = GadaiMarhun::where('norujukan','=',$data->norujukan)->get();
foreach($gadaimarhun as $marhun)
{
$simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get();
@@ -209,7 +207,7 @@ class SimulasiController extends Controller
$simulasibid->hargajual = 0.00;
$simulasibid->jbg = $data->jbg;
$simulasibid->kadarupah = $data->kadarupah;
$simulasibid->upahsimpan = $data->upahsimpan;
$simulasibid->upahsimpan = $data->upahSim;
$simulasibid->ansuran = $data->ansuran;
$simulasibid->nilaimarhun = $data->nilaimarhun;
$simulasibid->pinjaman = $data->pinjaman;
@@ -219,9 +217,7 @@ class SimulasiController extends Controller
$simulasibid->baki = $data->baki;
$simulasibid->berat = $data->berat;
$simulasibid->marhun = $data->marhun;
$simulasibid->gst_hj = $data->gst_hj;
$simulasibid->gst_cl = $data->gst_cl;
$simulasibid->percent = $data->percent;
$simulasibid->percent = $data->percentpinj;
$simulasibid->status_jual = 0;
$simulasibid->status_payment = 0;
$simulasibid->mora_upah = 0;
@@ -229,7 +225,7 @@ class SimulasiController extends Controller
$sumhargaasas = 0;
$berat = 0;
$gadaimarhun = GadaiMarhun::where('gadai_id','=',$data->id)->get();
$gadaimarhun = GadaiMarhun::where('norujukan','=',$data->norujukan)->get();
foreach($gadaimarhun as $marhun)
{
$simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get();