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

Merge branch 'apiaku' into 'master'

Browse Source 
Apiaku

See merge request online-sistem1/api_arrahn!87
This commit is contained in:
hafifie rahman
2021-04-22 06:27:39 +00:00
parent 43d9206713 7bf66c7a04
commit 735094c345
3 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+18 -12
View File
@@ -2122,27 +2122,33 @@ class GadaiController extends Controller
{ {
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$rekodaudit = Gadai::on($cawangan['mysql'])
$arrayrekodemaspalsu = [];
$rekod_emaspalsu = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1) ->where('tagpalsu','=',1)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->get(); ->get();
$totalrekod = Gadai::on($cawangan['mysql'])
dd($rekod_emaspalsu);
$total = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1) ->where('tagpalsu','=',1)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
// ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]]) ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman'); ->sum('pinjaman');
array_push($arrayrekodemaspalsu,["rekod" => $rekod_emaspalsu, "total" => $total]); $totalberat = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',1)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->sum('berat');
dd($arrayrekodemaspalsu); $totalnilaimarhun = Gadai::on($cawangan['mysql'])
return response()->json(); ->where('tagpalsu','=',1)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
->sum('nilaimarhun');
$arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' => $totalnilaimarhun];
return response()->json($arrayrekod,200);
} }
} }
app/Http/Controllers/TebusController.php
+20 -2
View File
@@ -759,18 +759,36 @@ 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->addDays(1);
$dateRM = new Carbon('2021-04-22');
$dateRM->addDays(1);
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
$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)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan') ->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan'); ->sum('bayaran_keuntungan');
return response($keuntungan); $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $dateRM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
$total = $keuntungan + $keuntunganreducing;
return response($total);
} }
public function RebetCalculation($kodcaw,Request $request) public function RebetCalculation($kodcaw,Request $request)
routes/web.php
+1 -1
View File
@@ -357,7 +357,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
//-- Untung Rugi --// //-- Untung Rugi --//
$router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar