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

daripada server

Browse Source
This commit is contained in:
e.arrahn
2021-05-19 16:39:23 +08:00
parent c16c006cbd
commit 82708b046c
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+9 -8
View File
@@ -926,10 +926,6 @@ class GadaiController extends Controller
$array_kawalanstok = []; $array_kawalanstok = [];
$kawalanstoklama = KawalanStokLama::on($cawangan['mysql'])
->get();
//////////// ////////////
///GADAI//// ///GADAI////
/////////// ///////////
@@ -1083,6 +1079,10 @@ class GadaiController extends Controller
if($kodcaw == 'KB2') if($kodcaw == 'KB2')
{ {
$kawalanstoklama = KawalanStokLama::on($cawangan['mysql'])
->get();
foreach($kawalanstoklama as $indexgad => $gadaikawalanstok) foreach($kawalanstoklama as $indexgad => $gadaikawalanstok)
{ {
//Gadai //Gadai
@@ -2181,6 +2181,9 @@ class GadaiController extends Controller
case '1STOP': case '1STOP':
$tarikhtawarruq = '2021-05-09'; $tarikhtawarruq = '2021-05-09';
break; break;
case '020301';
$tarikhtawarruq = '2021-05-19';
break;
} }
$rekod_emaspalsu = Gadai::on($cawangan['mysql']) $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
@@ -2277,10 +2280,8 @@ class GadaiController extends Controller
$transaksi = TransaksiKeuntungan::on('mysql7') $transaksi = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->where('db2.sttebus','=','') ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]])
// ->where('tarikh_bayaran' ,'>=', $datetawarruq) ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]])
->where('db2.hargajualan','<>','null')
->where('tarikh_bayaran' ,'<=', $daterequest)
->sum('bayaran_pembiayaan'); ->sum('bayaran_pembiayaan');
return response($transaksi); return response($transaksi);
app/Http/Controllers/TebusController.php
+2 -2
View File
@@ -155,7 +155,7 @@ class TebusController extends Controller
$rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal; $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
$upah_sebenar = $upah_asal - $rebet; $upah_sebenar = $upah_asal - $rebet;
$upahsemasa = $upah_sebenar * $gadai_data['jbg']; $upahsemasa = $upah_sebenar * $gadai_data['tempoh'];
$upah_semasa = bcdiv(round($upahsemasa,2),1,1); $upah_semasa = bcdiv(round($upahsemasa,2),1,1);
$upah_semasa = number_format($upah_semasa,2); $upah_semasa = number_format($upah_semasa,2);
if(strpos($upah_semasa,',')){ if(strpos($upah_semasa,',')){
@@ -185,7 +185,7 @@ class TebusController extends Controller
$rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal; $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
$upah_sebenar = $upah_asal - $rebet; $upah_sebenar = $upah_asal - $rebet;
$upahsemasa = $upah_sebenar * $gadai_data['jbg']; $upahsemasa = $upah_sebenar * $gadai_data['tempoh'];
$upah_semasa = bcdiv(round($upahsemasa,2),1,1); $upah_semasa = bcdiv(round($upahsemasa,2),1,1);
$upah_semasa = number_format($upah_semasa,2); $upah_semasa = number_format($upah_semasa,2);
if(strpos($upah_semasa,',')){ if(strpos($upah_semasa,',')){