Merge branch 'master' into 'fiza'
# Conflicts: # routes/web.php
This commit is contained in:
+4
-1
@@ -64,7 +64,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
||||
$router->get('gadaiansemasa/belum_serah/{kodcaw}',['uses'=>'GadaiController@getGadaianBelumSerah']);
|
||||
$router->get('gadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanGadai']);
|
||||
|
||||
$router->get('gadai/customers/{ic}/outstandingsemasa',['uses'=>'GadaiController@outstandingSemasa']);
|
||||
$router->get('gadai/customers/{ic}/outstandingsemasa',['uses'=>'GadaiController@outstandingSemasaCustomer']);
|
||||
|
||||
|
||||
//Tebus API
|
||||
@@ -242,4 +242,7 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){
|
||||
$router->get('jumlahUpah',['uses'=>'GadaiController@showAllUpahToday']);
|
||||
$router->get('jumlahVariasi',['uses'=>'GadaiController@showAllVariasiToday']);
|
||||
$router->get('gadaiTerkumpul',['uses'=>'GadaiController@showAllGadaiTerkumpul']);
|
||||
|
||||
$router->get('tebus/terkumpul',['uses'=>'GadaiController@showTebusTerkumpul']);
|
||||
$router->get('upah/terkumpul',['uses'=>'GadaiController@showUpahTerkumpul']);
|
||||
});
|
||||
Reference in New Issue
Block a user