Enable datepicker, new route for laporan aliran tunai teller
This commit is contained in:
@@ -1976,29 +1976,21 @@ class LelongController extends Controller
|
|||||||
{
|
{
|
||||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw', $kodcaw)->first();
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw', $kodcaw)->first();
|
||||||
|
|
||||||
$date = $request->query('date', Carbon::now()->toDateString());
|
$date = $request->tarikh;
|
||||||
|
|
||||||
try {
|
|
||||||
$parsedDate = Carbon::parse($date)->toDateString();
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
return response()->json(['error' => 'Invalid date format. Use YYYY-MM-DD.'], 400);
|
|
||||||
}
|
|
||||||
|
|
||||||
$rugiLelong = TuntutBaki::on($cawangan['mysql'])
|
$rugiLelong = TuntutBaki::on($cawangan['mysql'])
|
||||||
->whereDate('tarikh', $parsedDate)
|
->whereDate('tarikh', $date)
|
||||||
->where('jumlah', '<', 0)
|
->where('jumlah', '<', 0)
|
||||||
->sum('jumlah');
|
->sum('jumlah');
|
||||||
|
|
||||||
$bakiLelong = TuntutBaki::on($cawangan['mysql'])
|
$bakiLelong = TuntutBaki::on($cawangan['mysql'])
|
||||||
->whereDate('tarikh', $parsedDate)
|
->whereDate('tarikh', $date)
|
||||||
->where('jumlah', '>', 0)
|
->where('jumlah', '>', 0)
|
||||||
->sum('jumlah');
|
->sum('jumlah');
|
||||||
|
|
||||||
// dd($parsedDate, $rugiLelong, $bakiLelong);
|
|
||||||
|
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'tarikh' => $parsedDate,
|
'tarikh' => $date,
|
||||||
'kod_cawangan' => $kodcaw,
|
'cawangan' => $kodcaw,
|
||||||
'rugi_lelong' => $rugiLelong,
|
'rugi_lelong' => $rugiLelong,
|
||||||
'baki_lelong' => $bakiLelong
|
'baki_lelong' => $bakiLelong
|
||||||
], 200);
|
], 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)
|
public function getTunaiPast($kodcaw,Request $request)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -376,6 +376,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
|||||||
$router->get('laporanpetibesirange/{kodcaw}',['uses'=> 'VaultController@laporanPetiBesiRange']);
|
$router->get('laporanpetibesirange/{kodcaw}',['uses'=> 'VaultController@laporanPetiBesiRange']);
|
||||||
$router->get('laporanAuditTrail',['uses'=> 'LaporanController@LaporanAuditTrail']);
|
$router->get('laporanAuditTrail',['uses'=> 'LaporanController@LaporanAuditTrail']);
|
||||||
|
|
||||||
|
//Get Tunai By tarikh for Laporan Aliran Tunai Teller
|
||||||
|
$router->get('getTunaiByTarikh', ['uses' => 'TunaiController@getTunaiByTarikh']);
|
||||||
|
|
||||||
//API PANJAR KHAZANAH
|
//API PANJAR KHAZANAH
|
||||||
$router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']);
|
$router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']);
|
||||||
|
|||||||
Reference in New Issue
Block a user