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

Merge branch 'master' of https://gitlab.com/online-sistem1/api_arrahn

Browse Source
This commit is contained in:
afiq
2021-09-28 10:03:11 +08:00
parent fa7649d9d9 3174cddc7a
commit e6cfbcd232
3 changed files with 12 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+6 -44
View File
@@ -171,7 +171,7 @@ class LelongController extends Controller
->where('t_jual','<=',$request->tarikh) ->where('t_jual','<=',$request->tarikh)
->where(function($query) use ($tarikhbaru){ ->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut') $query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>','2021-02-25'); ->orWhere('trkhtuntut','>',$tarikhbaru);
}) })
->where('baki','>=',0) ->where('baki','>=',0)
->sum('baki'); ->sum('baki');
@@ -236,57 +236,19 @@ class LelongController extends Controller
$tarikhbaru = $request->mula; $tarikhbaru = $request->mula;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
if($kodcaw == 'KB2')
{
if($request->tarikh <= '2021-02-25')
{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>=',$request->mula)
->where('t_jual','<=',$request->hingga)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>',$tarikhbaru);
})
->where('baki','>=',0)
->sum('baki');
}else{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('t_jual','>=',$request->mula)
->where('t_jual','<=',$request->hingga)
->where(function($query) use ($tarikhbaru){
$query->whereNull('trkhtuntut')
->orWhere('trkhtuntut','>','2021-02-25');
})
->where('baki','>=',0)
->sum('baki');
}
}else{
$bakilelong = Lelong::on($cawangan['mysql'])
->where('trkhtuntut','>=',$request->mula)
->where('trkhtuntut','<=',$request->hingga)
// ->where(function($query) use ($tarikhbaru){
// $query->whereNull('trkhtuntut')
// ->orWhere('trkhtuntut','>',$tarikhbaru);
// })
->where('baki','>=',0)
->sum('baki');
}
$ansrugi = AnsRugi::on($cawangan['mysql']) $bakilelong = Lelong::on($cawangan['mysql'])
->sum('bayaran'); ->where('trkhtuntut','>=',$request->mula)
->where('trkhtuntut','<=',$request->hingga)
->where('baki','>=',0)
->sum('baki');
$rugilelong = Lelong::on($cawangan['mysql']) $rugilelong = Lelong::on($cawangan['mysql'])
->where('trkhtuntut','>=',$request->mula) ->where('trkhtuntut','>=',$request->mula)
->where('trkhtuntut','<=',$request->hingga) ->where('trkhtuntut','<=',$request->hingga)
//->where(function($query) use ($tarikhbaru)
//{
// $query->whereNull('t_jual')
// ->orWhere('t_jual','>',$tarikhbaru);
//})
->where('baki','<',0) ->where('baki','<',0)
->sum('baki'); ->sum('baki');
// $rugitotal = $rugilelong + $ansrugi;
$rugitotal = $rugilelong; $rugitotal = $rugilelong;
$arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal]; $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
app/Http/Controllers/TebusController.php
+2
View File
@@ -165,6 +165,8 @@ class TebusController extends Controller
public function getMoratorium(){ public function getMoratorium(){
$bln_mora = Moratorium::first(); $bln_mora = Moratorium::first();
return response()->json($bln_mora);
} }
public function updateMoratorium(Request $request){ public function updateMoratorium(Request $request){
routes/web.php
+2
View File
@@ -101,6 +101,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('tebus/laporan/{kodcaw}/{tarikh}',['uses'=>'TebusController@getLaporanTebus']); $router->get('tebus/laporan/{kodcaw}/{tarikh}',['uses'=>'TebusController@getLaporanTebus']);
$router->get('tebus/laporanjenistawarruq/{kodcaw}',['uses'=>'TebusController@getLaporanTebusPengasingan']); $router->get('tebus/laporanjenistawarruq/{kodcaw}',['uses'=>'TebusController@getLaporanTebusPengasingan']);
$router->get('moratorium/details',['uses'=>'TebusController@getMoratorium']);
//Maintenance API TEBUS //Maintenance API TEBUS
// $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']); // $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']);
$router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']); $router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']);