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

fix api

Browse Source
This commit is contained in:
fifi97
2021-04-10 17:04:07 +08:00
parent 7f1d47dd14
commit 02aadaec8f
4 changed files with 60 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+28 -2
View File
@@ -1937,6 +1937,10 @@ class GadaiController extends Controller
// ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman');
if($request->tarikh > '2021-02-25')
{
$request->tarikh = '2021-02-25';
}
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
@@ -1955,11 +1959,13 @@ class GadaiController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
if($request->tarikh > '2021-02-25'){
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-02-25'],['sttebus','=','']])
// ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman');
}
return response()->json($rekod_pinjamandiberi);
}
@@ -1976,7 +1982,27 @@ class GadaiController extends Controller
->whereNotNull('upah12')
->sum('upah12');
// $keuntungandibayar =
return response()->json($keuntungan,200);
}
public function CalculationBayaranPendahuluan($kodcaw,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$datetawarruq = new Carbon('2021-02-25');
$daterequest = new Carbon($request->tarikh);
$current = Carbon::now();
$current = new Carbon();
$transaksi = TransaksiKeuntungan::on('mysql7')
->where('tarikh_bayaran' ,'>=', $datetawarruq)
->whereYear('tarikh_bayaran','=',$current->year)
->sum('bayaran_pembiayaan');
return response($transaksi);
}
}