fix laporan
This commit is contained in:
@@ -213,4 +213,16 @@ class DenominasiController extends Controller
|
||||
|
||||
return response()->json($savedeno);
|
||||
}
|
||||
|
||||
public function listtarikhdenominasi($kodcaw,Request $request)
|
||||
{
|
||||
$current = Carbon::now();
|
||||
$current = new Carbon();
|
||||
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||
$data=Denominasi::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->orderby('tarikh','desc')->limit(1)->get();
|
||||
|
||||
return response()->json($data);
|
||||
|
||||
}
|
||||
}
|
||||
@@ -81,4 +81,31 @@ class PendahuluanSerahanController extends Controller
|
||||
|
||||
return response('Batal Berjaya', 200);
|
||||
}
|
||||
|
||||
public function listpendahuluanserahan($kodcaw,Request $request)
|
||||
{
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||
|
||||
if($request->jenis == 'pendahuluan')
|
||||
{
|
||||
$gldetail=GlDetail::on($cawangan['mysql'])
|
||||
->where('kodcaw','=',$kodcaw)
|
||||
->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])
|
||||
->where('pendahuluan','>',0)
|
||||
->orderby('tarikh','desc')
|
||||
->get();
|
||||
}else{
|
||||
|
||||
$gldetail=GlDetail::on($cawangan['mysql'])
|
||||
->where('kodcaw','=',$kodcaw)
|
||||
->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])
|
||||
->where('descpt','NOT LIKE','SERAHAN BAYAR ONLINE%')
|
||||
->where('serahan','>',0)
|
||||
->orderby('tarikh','desc')
|
||||
->get();
|
||||
}
|
||||
|
||||
|
||||
return response()->json($gldetail,200);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user