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

Merge branch 'apiaku' into 'master'

Browse Source 
fix imbang duga

See merge request online-sistem1/api_arrahn!80
This commit is contained in:
hafifie rahman
2021-04-15 00:59:53 +00:00
parent f8079b193a 94f8e8f32d
commit 01c0348e00
3 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+23 -6
View File
@@ -1937,10 +1937,10 @@ class GadaiController extends Controller
// ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman');
if($request->tarikh > '2021-04-13')
{
$request->tarikh = '2021-04-13';
}
// if($request->tarikh > '2021-04-13')
// {
// $request->tarikh = '2021-04-13';
// }
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
@@ -1948,6 +1948,12 @@ class GadaiController extends Controller
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman');
$gadaibaru = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','>=','2021-04-14'],['sttebus','=','']])
->sum('pinjaman');
$rekod_pinjamandiberi = $rekod_pinjamandiberi - $gadaibaru;
$array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
@@ -1978,6 +1984,9 @@ class GadaiController extends Controller
$daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1);
$current = Carbon::now();
$current = new Carbon();
$keuntungan = Gadai::on($cawangan['mysql'])
->where('t_gadai','<=',$request->tarikh)
->where('t_gadai','>=','2021-04-14')
@@ -1987,10 +1996,18 @@ class GadaiController extends Controller
->sum('upah12');
$transaksi = TransaksiKeuntungan::on('mysql7')
->where('tarikh_bayaran' ,'>=', $datetawarruq)
->where('tarikh_bayaran' ,'<=', $daterequest)
->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
// $transaksi = TransaksiKeuntungan::on('mysql7')
// ->where('tarikh_bayaran' ,'>=', $datetawarruq)
// ->where('tarikh_bayaran' ,'<=', $daterequest)
// ->sum('bayaran_keuntungan');
$totalkeuntungan = $keuntungan - $transaksi;
return response()->json($totalkeuntungan,200);
app/Http/Controllers/TebusController.php
+22 -7
View File
@@ -221,7 +221,6 @@ class TebusController extends Controller
if(strpos($rebet_round,',')){
$rebet_round = str_replace(',','',$rebet_round);
}
$rebet = (float)substr($rebet_round, 0, -1);
return $rebet;
@@ -497,6 +496,16 @@ class TebusController extends Controller
$keuntunganselepastawarruq = 0;
$keuntungansebelumtawarruq = 0;
$daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1);
//Keuntungan Selepas Tawarruq
$keuntungan = TransaksiKeuntungan::on('mysql7')
->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
->whereNull('db2.hargajualan')
->sum('bayaran_keuntungan');
// $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
// ->where('t_tebus','<=',$request->tarikh)
@@ -534,7 +543,7 @@ class TebusController extends Controller
// $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
$total = $keuntungansebelumtawarruq;
$total = $keuntungansebelumtawarruq + $keuntungan;
return response()->json($total,200);
}
@@ -643,7 +652,9 @@ class TebusController extends Controller
public function untungrugicalculation($kodcaw,Request $request)
{
$datetawarruq = new Carbon('2021-02-25');
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
// $datetawarruq = new Carbon('2021-04-14');
$daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1);
@@ -651,9 +662,11 @@ class TebusController extends Controller
$current = new Carbon();
$keuntungan = TransaksiKeuntungan::on('mysql7')
->where('tarikh_bayaran' ,'>=', $datetawarruq)
->where('tarikh_bayaran' ,'<=', $daterequest)
->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
return response($keuntungan);
@@ -664,8 +677,10 @@ class TebusController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$rebet = Tebus::on($cawangan['mysql'])
->where('t_tebus','>','2021-04-13')
->where('t_tebus','<=',$request->tarikh)
->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
->where('tebus.t_tebus','>','2021-04-13')
->where('tebus.t_tebus','<=',$request->tarikh)
->whereNotNull('db2.hargajualan')
->sum('rebate');
return response($rebet);
app/Http/Controllers/VaultController.php
+11 -5
View File
@@ -255,13 +255,19 @@ class VaultController extends Controller
$tunai = Tunai::on($cawangan['mysql'])
->where('kodcaw','=',$kodcaw)
->where('tarikh','<=', $request->tarikh)
->orderby('tarikh','desc')->first();
->where('tarikh','=', $request->tarikh)
->get();
if($tunai['baki'] != 0)
$total = 0;
foreach($tunai as $index=>$money)
{
$totalbakiakhirtunai = $vault['bakiakhir'] + $tunai['baki'];
$total+=$money['baki'];
}
if($total != 0)
{
$totalbakiakhirtunai = $vault['bakiakhir'] + $total;
}else
{
$totalbakiakhirtunai = $vault['bakiakhir'];