diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 3c23f3c..0f5cc64 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -173,6 +173,8 @@ class LelongController extends Controller + // dd($bakilelong->toSql()); + $ansrugi = AnsRugi::on($cawangan['mysql']) ->sum('bayaran'); diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php index 7a6ed68..5bc29d9 100644 --- a/app/Http/Controllers/TunaiController.php +++ b/app/Http/Controllers/TunaiController.php @@ -261,6 +261,16 @@ class TunaiController extends Controller return response()->json($requestteller); } + public function getRequestTellerByDate($kodcaw,Request $request) + { + + $current = Carbon::now(); + $current = new Carbon(); + + $requestteller=RequestTeller::on('mysql7')->where([['kodcaw','=',$kodcaw],['update','=',0],['tarikh','<=',$request->hingga],['tarikh','>=',$request->mula]])->get(); + return response()->json($requestteller); + } + public function updateRequestTeller($kodcaw,Request $request) { $requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$request->kodlaluan],['update','=',0]])->update(array( @@ -280,9 +290,14 @@ class TunaiController extends Controller public function createRequestTeller($kodcaw,Request $request) { + $current = Carbon::now(); $current = new Carbon(); + // dd($current->toTimeString()); + + // strtotime($current->toTimeString()); + $reqteller=RequestTeller::on('mysql7')->create([ 'tarikh' => $current->toDateString(), diff --git a/app/RequestTeller.php b/app/RequestTeller.php index d38a7e9..b5f9e67 100644 --- a/app/RequestTeller.php +++ b/app/RequestTeller.php @@ -13,7 +13,7 @@ class RequestTeller extends Model * * @var array */ - protected $fillable = ['no','kodlaluan','modal','serahan','tarikh','update','kodcaw','bd1','bd5','bd10','bd20','bd50','bd100','txtring1','txtring5','txtring10','txtring20', + protected $fillable = ['no','kodlaluan','modal','serahan','tarikh','masa','update','kodcaw','bd1','bd5','bd10','bd20','bd50','bd100','txtring1','txtring5','txtring10','txtring20', 'txtring50','txtring100','txtring1000','txtsen1','txtsen5','txtsen10','txtsen20','txtsen50']; /** diff --git a/routes/web.php b/routes/web.php index c5b04e7..1fd7fea 100644 --- a/routes/web.php +++ b/routes/web.php @@ -220,7 +220,6 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('listgldetail/{kodcaw}',['uses'=> 'VaultController@listgldetail']); //Gldetail List Kaunter $router->get('laporanpetibesi/{kodcaw}/{tarikh}',['uses'=> 'VaultController@laporanPetiBesi']); //Gldetail List Kaunter - //API PANJAR KHAZANAH $router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']); $router->get('SenaraiPanjar/list/{kodcaw}',['uses'=>'PanjarController@listpanjar']); @@ -228,7 +227,6 @@ $router->group(['prefix'=>'api'], function () use ($router){ // $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'PanjarController@update']); $router->post('CreatePanjar/{kodcaw}',['uses'=>'PanjarController@create']); - //API KELULUSAN $router->get('SenaraiKelulusan/{kodcaw}',['uses'=>'KelulusanController@list']); $router->get('RekodDahLepas/{kodcaw}',['uses'=>'KelulusanController@rekodlepas']); @@ -247,6 +245,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ //API REQUEST TELLER $router->post('requestTeller/{kodcaw}',['uses' => 'TunaiController@createRequestTeller']); $router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']); + $router->get('requestTeller/get/{kodcaw}/date',['uses' => 'TunaiController@getRequestTellerByDate']); $router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']); $router->put('requestTeller/batal/{kodcaw}',['uses' => 'TunaiController@batalRequestTeller']);