fix conflict

This commit is contained in:
LAPTOP-DGCU80CH\user1
2020-12-03 12:37:34 +08:00
parent c8cb41600e
commit 09db6dfcb0
6 changed files with 260 additions and 20 deletions
+6 -1
View File
@@ -44,6 +44,9 @@ Route::get('/gadai/batal',['as'=>'gadai.batal','uses'=>'GadaianController@batal'
//Penilai
Route::get('/gadaiansemasa',['as'=>'gadaian.semasa','uses'=>'GadaianController@gadaiansemasa'])->middleware('auth','penilai');
Route::post('/gadaiancetak',['as'=>'gadaian.cetak','uses'=>'GadaianController@cetakSAG'])->middleware('auth','penilai');
Route::post('/serahmarhun',['as'=>'marhun.serah','uses'=>'GadaianController@serahMarhun'])->middleware('auth','penilai');
//Khazanah
Route::get('/menu','KhazanahController@menu')->middleware('auth','khazanah');
@@ -51,4 +54,6 @@ Route::get('/khazanahgadaian','KhazanahController@gadaian')->middleware('auth','
Route::get('/khazanahtebus','KhazanahController@tebus')->middleware('auth','khazanah');
Route::get('/kelulusan','KhazanahController@kelulusan')->middleware('auth','khazanah');
Route::get('/pendahuluan','KhazanahController@pendahuluan')->middleware('auth','khazanah');
Route::get('/serahan','KhazanahController@serahan')->middleware('auth','khazanah');
Route::get('/serahan','KhazanahController@serahan')->middleware('auth','khazanah');