fix merges'

This commit is contained in:
hafifierahman
2022-04-14 11:29:06 +08:00
parent eda10ccfa0
commit b7bcf3cb71
+3
View File
@@ -683,6 +683,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){
$router->get('customers/{ic}/gadai/{status}',['uses'=>'AdminPageController@showOneCustomerGadai']);
<<<<<<< Updated upstream
$router->post('permohonan/add/{kodcaw}',['uses'=>'AdminPageController@TambahPermohonan']);
$router->get('permohonan/get/{kodcaw}',['uses'=>'AdminPageController@GetPermohonanCawangan']);
$router->get('permohonan/rekod/{kodcaw}',['uses'=>'AdminPageController@GetRekodPermohonanCawangan']);
@@ -699,6 +700,8 @@ $router->group(['prefix'=>'admin'], function () use ($router){
$router->get('permohonan/viewfiles',['uses'=>'AdminPageController@downloadFile']);
=======
>>>>>>> Stashed changes
});
$router->group(['prefix'=>'kelantanpay'], function () use ($router){