Merged in feature/aiman/laporan-aliran-tunai-teller (pull request #365)
Feature/aiman/laporan aliran tunai teller Approved-by: Muhd hafifie
This commit is contained in:
@@ -1972,4 +1972,30 @@ class LelongController extends Controller
|
||||
return response()->json($arrayblm);
|
||||
}
|
||||
|
||||
public function getBakiLelongByTeller($kodcaw, Request $request)
|
||||
{
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw', $kodcaw)->first();
|
||||
|
||||
$date = $request->tarikh;
|
||||
|
||||
$rugiLelong = TuntutBaki::on($cawangan['mysql'])
|
||||
->whereDate('tarikh', $date)
|
||||
->where('jumlah', '<', 0)
|
||||
->where('teller','=', $request->kodlaluan)
|
||||
->sum('jumlah');
|
||||
|
||||
$bakiLelong = TuntutBaki::on($cawangan['mysql'])
|
||||
->whereDate('tarikh', $date)
|
||||
->where('jumlah', '>', 0)
|
||||
->where('teller','=', $request->kodlaluan)
|
||||
->sum('jumlah');
|
||||
|
||||
return response()->json([
|
||||
'tarikh' => $date,
|
||||
'cawangan' => $kodcaw,
|
||||
'rugi_lelong' => $rugiLelong,
|
||||
'baki_lelong' => $bakiLelong
|
||||
], 200);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -165,6 +165,21 @@ class TunaiController extends Controller
|
||||
|
||||
}
|
||||
|
||||
public function getTunaiByTarikh(Request $request)
|
||||
{
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
|
||||
|
||||
$tunai = Tunai::on($cawangan['mysql'])
|
||||
->where([['kodcaw','=',$request->kodcaw],
|
||||
['tarikh','=',$request->tarikh],
|
||||
['kodlaluan','=',$request->kodlaluan]
|
||||
])
|
||||
->orderBy('tarikh','desc')
|
||||
->first();
|
||||
|
||||
return response()->json($tunai);
|
||||
}
|
||||
|
||||
public function getTunaiPast($kodcaw,Request $request)
|
||||
{
|
||||
|
||||
|
||||
@@ -194,6 +194,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
||||
|
||||
$router->get('keluar/lelong',['uses'=>'LelongController@keluarLelong']);
|
||||
|
||||
$router->get('lelong/bakilelongbyteller/{kodcaw}',['uses' => 'LelongController@getBakiLelongByTeller']);
|
||||
|
||||
|
||||
|
||||
//Marhun API
|
||||
@@ -374,6 +376,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
||||
$router->get('laporanpetibesirange/{kodcaw}',['uses'=> 'VaultController@laporanPetiBesiRange']);
|
||||
$router->get('laporanAuditTrail',['uses'=> 'LaporanController@LaporanAuditTrail']);
|
||||
|
||||
//Get Tunai By tarikh for Laporan Aliran Tunai Teller
|
||||
$router->get('getTunaiByTarikh', ['uses' => 'TunaiController@getTunaiByTarikh']);
|
||||
|
||||
//API PANJAR KHAZANAH
|
||||
$router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']);
|
||||
|
||||
Reference in New Issue
Block a user