fixed conflict

routes/web.php

@@ -28,12 +28,14 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('customers/{kodcaw}',['uses'=>'CustomerController@create']);
     $router->delete('customers/{kodcaw}/{nokp}', ['uses' => 'CustomerController@delete']);
     $router->put('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']);
+    $router->get('customers/laporan/{kodcaw}/{tarikh}',['uses'=>'CustomerController@getLaporanCustomers']);
 
     $router->get('customers/latest/{kodcaw}',['uses'=>'CustomerController@getLatestCustomer']);
 
     //Gadai API
     $router->get('gadai',['uses'=>'GadaiController@showAllGadais']);
     $router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadai']);
+    $router->get('gadai/cawangan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@showOneGadaiByCawanganOnly']); //stokaudit
     $router->get('gadai/norujukan/{norujukan}',['uses'=>'GadaiController@showOneGadaiByNorujukan']);
     $router->get('gadai/norujukan/{kodcaw}/{norujukan}',['uses'=>'GadaiController@showOneGadaibyRujukanAndCawangan']);
     $router->post('gadai/{kodcaw}',['uses'=>'GadaiController@create']);
@@ -44,6 +46,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->put('gadai/norujukan/komuditi/{kodcaw}/{norujukan}',['uses'=>'GadaiController@pembelianKomuditi']);
     $router->put('gadai/norujukan/cetak/{kodcaw}/{norujukan}',['uses'=>'GadaiController@cetakSAG']);
     $router->put('gadai/norujukan/serah/{kodcaw}/{norujukan}',['uses'=>'GadaiController@serahMarhun']);
+    $router->get('batalgadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanBatalGadai']); //laporan batalgadai
+    $router->get('gadai/laporan/ringkasan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@gadaiRingkasanTerkumpul']); //ringkasan terkumpul
+    $router->get('gadai/laporan/ringkasanharian/{kodcaw}/{tarikh}',['uses'=>'GadaiController@gadaiRingkasanHarian']); //ringkasan harian
 
     $router->get('gadai/serah_marhun/khazanah/{kodcaw}',['uses'=>'GadaiController@serahMarhunKhazanah']);
     $router->get('gadai/serah_marhun/khazanah/petibesi/{kodcaw}',['uses'=>'GadaiController@serahPetiBesi']);
@@ -56,6 +61,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']);
 
+
     //Tebus API
     $router->get('tebustawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusTawarruq']);
     $router->get('upahtawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@upahTawarruq']);
@@ -68,6 +74,10 @@ $router->group(['prefix'=>'api'], function () use ($router){
     // $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']);
     $router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']);
 
+    //API FARIS
+    $router->put('tebus/serah_marhun_teller/{kodcaw}/{norujukan}',['uses'=>'GadaiController@barcodescanTebus']);
+    // $router->get('tebus_serahan/{kodcaw}',['uses'=>'TebusController@SerahMarhunTeller']);
+
     //Lelong API
     $router->get('lelong',['uses'=>'LelongController@showAllLelongs']);
     $router->get('lelong/cawangan/{kodcaw}',['uses'=>'LelongController@showAllLelongByCawangan']);
@@ -76,12 +86,17 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->put('lelong/{id}', ['uses' => 'LelongController@update']);
     $router->get('bakilelong/{noic}/{jenislelong}',['uses'=>'LelongController@showBakiLelong']);
     $router->get('bilangandilelong/{noic}',['uses'=>'LelongController@BilAkanDilelong']);
+    $router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanLelong']); //laporan lelong
+
 
     //Marhun API
     $router->get('marhun',['uses'=>'MarhunController@showAllMarhuns']);
     $router->get('marhun/{norujukan}',['uses'=>'MarhunController@showOneMarhun']);
     $router->post('marhun/{kodcaw}',['uses'=>'MarhunController@create']);
     $router->put('marhun/{id}', ['uses' => 'MarhunController@update']);
+    $router->get('marhun/laporan/{kodcaw}/{tarikh}',['uses'=>'MarhunController@getLaporanMarhunHarian']);
+    $router->get('marhunterkumpul/laporan/{kodcaw}/{tarikh}',['uses'=>'MarhunController@getLaporanMarhunTerkumpul']);
+    
     
 
     $router->get('jemas',['uses'=>'MarhunController@getAllJemas']);
@@ -134,4 +149,42 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('online/transaction',['uses'=>'TransactionOnlineController@getLatestNosiri']);
     $router->post('online/transaction',['uses'=>'TransactionOnlineController@create']);
     $router->put('online/transaction',['uses'=>'TransactionOnlineController@updateStatus']);
+    
+
+    //ANSURAN API
+    $router->get('ansuran/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong
+
+    //LAPORAN API
+    $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok
+    $router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); //laporan lelongan
+
+
+    //API FARIS
+    $router->get('VaultController/{kodcaw}',['uses'=>'VaultController@list']);
+    $router->post('daftarVault/{kodcaw}',['uses'=>'VaultController@create']);
+    $router->put('UpdateVault/{kodcaw}', ['uses'=>'VaultController@updateVault']);
+    $router->get('TunaiController/{kodcaw}',['uses'=>'TunaiController@listTunai']);
+    $router->post('tunai/daftarTunai/{kodcaw}',['uses'=> 'TunaiController@DaftarTunai']);
+    $router->put('updateTunai/{kodcaw}/{kodlaluan}',['uses'=>'TunaiController@UpdateTunai']);
+    $router->get('getLatestBaki/{kodcaw}',['uses'=>'TunaiController@sumBakiTunai']);
+
+    $router->post('add/addTunai/{kodcaw}',['uses'=> 'TunaiController@create']);
+    
+
+    $router->get('listSerahMarhunController/{kodcaw}',['uses'=>'TebusController@listPenebusanBaru']);
+    $router->get('SenaraiPenebusanKhazanah/{kodcaw}',['uses'=>'TebusController@listSerahKhazanah']);
+
+    $router->get('DenominasiController/{kodcaw}',['uses'=>'DenominasiController@listdenominasi']);
+
+    $router->get('GetCurrentTunai/{kodcaw}/{kodlaluan}',['uses' =>'TunaiController@getCurrentTunai']);
+
+
+    //API REQUEST TELLER
+    $router->post('requestTeller/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@createRequestTeller']);
+    $router->get('requestTeller/get/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@getRequestTeller']);
+    // getRequestTeller
+
+    //update tag inoutmar
+    $router->put('updatetagterima/{kodcaw}/{norujukan}',['uses'=>'TebusController@tagterimaupdate']);
+    
 });