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

Merge branch 'atie' into 'main'

Browse Source 
update harga dlm semakan marhun

See merge request online-sistem1/lelong!46
This commit is contained in:
Nur Izzati Zulkifli
2022-06-05 02:07:13 +00:00
parent 3bbb652aee f262ef055b
commit 4253af6bd8
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+2
View File
@@ -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]);
@@ -470,6 +471,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]);
resources/views/marhun/marhun.blade.php
+4 -4
View File
@@ -336,9 +336,9 @@
{
console.log(item);
var beratemas = $('#berat_emastambahan').val();
var total_tambahan = item.harga * parseFloat(beratemas);
var total_tambahan = item.harga2 * parseFloat(beratemas);
var harga_asastambahan = Math.round(total_tambahan);
$('#hargatambahan').val(parseFloat(item.harga).toFixed(2));
$('#hargatambahan').val(parseFloat(item.harga2).toFixed(2));
$('#nilai_marhuntambahan').val(parseFloat(total_tambahan).toFixed(2));
$('#harga_asastambahan').val(parseFloat(harga_asastambahan).toFixed(2));
}
@@ -388,9 +388,9 @@
karatall.forEach((item) =>{
if(item.karat == $(e).val())
{
var total = item.harga * $('#berat_emas').val();
var total = item.harga2 * $('#berat_emas').val();
var hargaasas = Math.round(total);
$('#harga').val(parseFloat(item.harga).toFixed(2));
$('#harga').val(parseFloat(item.harga2).toFixed(2));
$('#nilai_marhun').val(parseFloat(total).toFixed(2));
$('#harga_asas').val(parseFloat(hargaasas).toFixed(2));
}