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

production

Browse Source
This commit is contained in:
e.arrahn
2021-05-07 16:59:48 +08:00
parent 1921006635
commit 9601a2c500
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+3 -2
View File
@@ -2337,6 +2337,7 @@ class GadaiController extends Controller
public function updateJBGsemasa(){ public function updateJBGsemasa(){
$cawangan = Cawangan::on('mysql7')->get(); $cawangan = Cawangan::on('mysql7')->get();
$current = Carbon::now(); $current = Carbon::now();
foreach($cawangan as $cawangan_mysql){ foreach($cawangan as $cawangan_mysql){
$all_gadai = Gadai::on($cawangan_mysql['mysql'])->whereNotIn('sttebus',['L','T'])->get(); $all_gadai = Gadai::on($cawangan_mysql['mysql'])->whereNotIn('sttebus',['L','T'])->get();
foreach($all_gadai as $gadai){ foreach($all_gadai as $gadai){
@@ -2345,7 +2346,7 @@ class GadaiController extends Controller
}else{ }else{
$tarikh_update = Carbon::parse($gadai['t_update'].' 00:00:00' ); $tarikh_update = Carbon::parse($gadai['t_update'].' 00:00:00' );
} }
$tarikh_gadai = Carbon::parse($gadai['t_gadai'].' '. $gadai['masa']); $tarikh_gadai = Carbon::parse($gadai['t_gadai']. ' 00:00:00');
$diff_gadai = date_diff($tarikh_gadai,$current); $diff_gadai = date_diff($tarikh_gadai,$current);
$year_gadai = $diff_gadai->format("%y") * 12; $year_gadai = $diff_gadai->format("%y") * 12;
@@ -2381,4 +2382,4 @@ class GadaiController extends Controller
} }
return response()->json('successful',200); return response()->json('successful',200);
} }
} }
app/Http/Controllers/TebusController.php
+3 -1
View File
@@ -831,7 +831,7 @@ class TebusController extends Controller
$daterequest = new Carbon($request->tarikh); $daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1); $daterequest->addDays(1);
$dateSM = new Carbon('2021-04-21'); $dateSM = new Carbon('2021-04-24');
$dateSM->addDays(1); $dateSM->addDays(1);
$current = Carbon::now(); $current = Carbon::now();
@@ -840,6 +840,7 @@ class TebusController extends Controller
$keuntungan = TransaksiKeuntungan::on('mysql7') $keuntungan = 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('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
->where('transaksi_keuntungan.tarikh_bayaran', '<=', $daterequest)
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM) ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan') ->whereNotNull('db2.hargajualan')
@@ -849,6 +850,7 @@ class TebusController extends Controller
->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('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan') ->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet'); ->sum('keuntungan_rebet');