diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 0471fda..c3ccc90 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -22,6 +22,7 @@ use App\Tebus; use App\Advansur; use App\LelTebus; use App\LelMarhun; +use App\Audit; use Illuminate\Http\Request; use DB; @@ -78,7 +79,7 @@ class LelongController extends Controller if($bakilelong != 0){ $bakilelongtotal += $bakilelong; - } + } } return response()->json($bakilelongtotal, 200); @@ -93,10 +94,10 @@ class LelongController extends Controller ->whereNull('lelong.trkhtuntut') ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan') ->sum('baki'); - + if($rugilelong != 0){ $rugilelongtotal += $rugilelong; - } + } } return response()->json($rugilelongtotal, 200); @@ -122,8 +123,8 @@ class LelongController extends Controller if($bakilelong != 0){ $bakilelongtotal += $bakilelong; - } - + } + return response()->json($bakilelongtotal, 200); @@ -136,11 +137,11 @@ class LelongController extends Controller ->whereNull('lelong.trkhtuntut') ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan') ->sum('baki'); - + if($rugilelong != 0){ $rugilelongtotal += $rugilelong; - } - + } + return response()->json($rugilelongtotal, 200); } @@ -182,7 +183,7 @@ class LelongController extends Controller }) ->where('baki','>=',0) ->sum('baki'); - } + } }else{ $bakilelong = Lelong::on($cawangan['mysql']) ->where('t_jual','<=',$request->tarikh) @@ -196,7 +197,7 @@ class LelongController extends Controller $ansrugi = AnsRugi::on($cawangan['mysql']) ->sum('bayaran'); - + $rugilelong = Lelong::on($cawangan['mysql']) ->where('t_jual','<=',$request->tarikh) ->where(function($query) use ($tarikhbaru) @@ -207,8 +208,8 @@ class LelongController extends Controller ->where('baki','<',0) ->sum('baki'); - $rugitotal=$rugilelong + $ansrugi; - + $rugitotal=$rugilelong + $ansrugi; + if($kodcaw == 'APM') $bakilelong += 4498.1; @@ -249,13 +250,13 @@ class LelongController extends Controller $tarikhbaru = $request->mula; $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - + $bakilelong = Lelong::on($cawangan['mysql']) ->where('trkhtuntut','>=',$request->mula) ->where('trkhtuntut','<=',$request->hingga) ->where('baki','>=',0) ->sum('baki'); - + $rugilelong = Lelong::on($cawangan['mysql']) ->where('trkhtuntut','>=',$request->mula) ->where('trkhtuntut','<=',$request->hingga) @@ -263,7 +264,7 @@ class LelongController extends Controller ->sum('baki'); $data_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga]])->get(); - + foreach($data_lelong as $index=>$lelong){ if($lelong['baki'] >= 0){ $cas_lelong += $lelong['cajlelong']; @@ -275,7 +276,7 @@ class LelongController extends Controller $rugi_lelong += abs($lelong['baki']); } } - + $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugilelong, 'baki' => $baki_lelong, 'rugi' => $rugi_lelong, 'jumlahlelong' => $jumlah_lelong, 'caslelong' => $cas_lelong]; return response()->json($arraylelong,200); @@ -295,7 +296,7 @@ class LelongController extends Controller if(sizeof($akanlelong) != 0){ array_push($akanlelongarray,$akanlelong); - } + } } return response()->json($akanlelongarray); @@ -394,7 +395,7 @@ class LelongController extends Controller }else{ return response('Gagal', 200); } - + } public function showTuntutBaki($kodcaw){ @@ -504,7 +505,7 @@ class LelongController extends Controller public function cajlelongcalculationLejer($kodcaw,Request $request) { - + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cajlelong = Lelong::on($cawangan['mysql']) @@ -522,7 +523,7 @@ class LelongController extends Controller $cajperkhidmatan = GlCode::on($cawangan['mysql']) ->where('glcode','=','7000/500') ->sum('amaun'); - + return response()->json($cajperkhidmatan,200); } @@ -667,7 +668,7 @@ class LelongController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $lelong = Lelong::on($cawangan['mysql']) + $lelong = Lelong::on($cawangan['mysql']) ->select('lelong.t_lelong','lelong.norujukan','gadai.jbg','gadai.nokp','gadai.pinjaman','gadai.bakiupah') ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan') // ->leftJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp') @@ -680,7 +681,7 @@ class LelongController extends Controller ->first(); $lelonglist = $lelong->get(); - + foreach($lelonglist as $index=>$lel) { $ansuran = Transaction::on('mysql7') @@ -693,11 +694,11 @@ class LelongController extends Controller ->where('kpbaru','=',$lel['nokp']) ->orWhere('kplama','=',$lel['nokp']) ->first(); - + $poskod = Poskod::on('mysql7') ->where('poskod','=',$customer['poskod']) ->first(); - + $daerah = Daerah::on('mysql7') ->where('koddaerah','=',$poskod['koddaerah']) ->first(); @@ -711,7 +712,7 @@ class LelongController extends Controller return response()->json($arraylelong); } - + public function DetailsNotisLelong($kodcaw){ $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); @@ -721,4 +722,18 @@ class LelongController extends Controller return response()->json($detailslelong); } + public function keluarLelongTawarruq(){ + $cawangan_all = Cawangan::on('mysql7')->get(); + + foreach($cawangan_all as $index=>$cawangan){ + $list_lelong = Lelong::on($cawangan['mysql'])->where('t_jual',null)->pluck('norujukan')->toArray(); + + $gadai_lelong = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_lelong)->where('lelong_tawarruq',0)->pluck('norujukan')->toArray(); + + $delete_lelong = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$gadai_lelong)->delete(); + + $update_gadai = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$gadai_lelong)->update(['taglel'=>0]); + } + } + } diff --git a/routes/web.php b/routes/web.php index 7ec81f7..30ccbd7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -52,24 +52,24 @@ $router->group(['prefix'=>'api'], function () use ($router){ //Gadai API $router->get('gadai',['uses'=>'GadaiController@showAllGadais']); $router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadai']); - $router->get('gadai/cawangan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@showOneGadaiByCawanganOnly']); + $router->get('gadai/cawangan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@showOneGadaiByCawanganOnly']); $router->get('gadai/norujukan/{norujukan}',['uses'=>'GadaiController@showOneGadaiByNorujukan']); $router->get('gadai/norujukan/{kodcaw}/{norujukan}',['uses'=>'GadaiController@showOneGadaibyRujukanAndCawangan']); $router->post('gadai/{kodcaw}',['uses'=>'GadaiController@create']); - $router->post('gadaiold/{kodcaw}',['uses'=>'GadaiController@createold']); + $router->post('gadaiold/{kodcaw}',['uses'=>'GadaiController@createold']); $router->get('gadai/{cawangan_code}/{date}',['uses'=>'GadaiController@gadaiTransactionByCawanganAndDay']); $router->put('gadai/norujukan/{norujukan}',['uses'=>'GadaiController@updateOneGadaiByNorujukan']); - $router->put('gadai/{kodcaw}/norujukan/{norujukan}',['uses'=>'GadaiController@updateGadaiMarhunOnline']); - $router->put('gadaikaunter/{kodcaw}/norujukan/{norujukan}',['uses'=>'GadaiController@updateGadaiMarhunKaunter']); + $router->put('gadai/{kodcaw}/norujukan/{norujukan}',['uses'=>'GadaiController@updateGadaiMarhunOnline']); + $router->put('gadaikaunter/{kodcaw}/norujukan/{norujukan}',['uses'=>'GadaiController@updateGadaiMarhunKaunter']); $router->put('gadai/norujukan/{kodcaw}/{norujukan}',['uses'=>'GadaiController@daftarGadaiMarhun']); $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']); - $router->get('gadai/laporan/ringkasan/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanTerkumpul']); - $router->get('gadai/laporan/ringkasanharian/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanHarian']); - $router->get('gadaitebus/listharini/{kodcaw}',['uses'=>'GadaiController@GadaiTebusList']); - $router->get('gadaitebus/listharini/{kodcaw}/teller',['uses'=>'GadaiController@GadaiTebusListTeller']); + $router->get('batalgadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanBatalGadai']); + $router->get('gadai/laporan/ringkasan/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanTerkumpul']); + $router->get('gadai/laporan/ringkasanharian/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanHarian']); + $router->get('gadaitebus/listharini/{kodcaw}',['uses'=>'GadaiController@GadaiTebusList']); + $router->get('gadaitebus/listharini/{kodcaw}/teller',['uses'=>'GadaiController@GadaiTebusListTeller']); $router->get('gadai/list/rekod/old',['uses'=>'GadaiController@rekodGadaian']); $router->get('gadai/online/search/detail',['uses'=>'GadaiController@searchGadaiOnline']); @@ -87,7 +87,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('gadaiansemasa/{kodcaw}',['uses'=>'GadaiController@getGadaianSemasa']); $router->get('gadaiansemasa/belum_serah/{kodcaw}',['uses'=>'GadaiController@getGadaianBelumSerah']); $router->get('gadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanGadai']); - $router->get('gadailaporanRange/{kodcaw}',['uses'=>'GadaiController@getLaporanGadaiRange']); + $router->get('gadailaporanRange/{kodcaw}',['uses'=>'GadaiController@getLaporanGadaiRange']); $router->get('gadai/customers/{ic}/outstandingsemasa/{kodcaw}',['uses'=>'GadaiController@outstandingSemasaCustomer']); @@ -135,8 +135,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('bakilelong/{noic}/{jenislelong}',['uses'=>'LelongController@showBakiLelong']); $router->get('bakilelong/cawangan/{kodcaw}/{noic}/{jenislelong}',['uses'=>'LelongController@showBakiLelongEachCawangan']); $router->get('bilangandilelong/{noic}',['uses'=>'LelongController@BilAkanDilelong']); - $router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelong']); - $router->get('lelong/harini/{kodcaw}',['uses'=>'LelongController@LelonganHarini']); + $router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelong']); + $router->get('lelong/harini/{kodcaw}',['uses'=>'LelongController@LelonganHarini']); $router->get('keluar/lelong',['uses'=>'LelongController@keluarLelong']); @@ -149,12 +149,12 @@ $router->group(['prefix'=>'api'], function () use ($router){ $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']); $router->get('jemas/nama_marhun',['uses'=>'MarhunController@getMarhunName']); - + //Harga Emas API $router->get('harga_emas',['uses'=>'HargaEmasController@showAllHargaEmas']); @@ -198,7 +198,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('transaction/norujukan/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukanAll']); $router->get('transaction/norujukan/total/ansuran',['uses'=>'TransactionController@getTotalBayaranAnsuran']); - + $router->get('maxpinjaman',['uses'=>'MaxPinjamanController@getAllMaxPinjaman']); $router->get('transaksi_keuntungan/{norujukan}',['uses'=>'TransaksiKeuntunganController@getTransaksiKeuntunganByRujukan']); @@ -206,8 +206,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->post('transaksi_keuntungan',['uses'=>'TransaksiKeuntunganController@createTransaksiKeuntungan']); - $router->get('latest_transaksi_untung/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']); - $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']); + $router->get('latest_transaksi_untung/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']); + $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']); //OTP API @@ -225,11 +225,11 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('transaction/online/update',['uses'=>'TransactionOnlineController@updateTransactionOnline']); $router->get('transaction/online/login',['uses'=>'TransactionOnlineController@getTransactionOnlineLogin']); - + //ANSURAN UPAH API - $router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']); - $router->get('ansuransummary/{kodcaw}',['uses'=>'GadaiController@getAnsuranSummary']); + $router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']); + $router->get('ansuransummary/{kodcaw}',['uses'=>'GadaiController@getAnsuranSummary']); $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']); $router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']); $router->get('AnsuranByRangeTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansurRangeDate']); @@ -243,25 +243,25 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->post('removeupahlamatoday/{kodcaw}/{norujukan}',['uses'=>'TebusController@removeUpahLamaToday']); //POLIS API - $router->get('polis/get/',['uses'=>'PolisController@getPolis']); - $router->put('polis/put/',['uses'=>'PolisController@PolischangeTebus']); + $router->get('polis/get/',['uses'=>'PolisController@getPolis']); + $router->put('polis/put/',['uses'=>'PolisController@PolischangeTebus']); $router->post('polis/create/',['uses'=>'PolisController@createPolis']); $router->put('polis/edit/',['uses'=>'PolisController@editPolis']); //LAPORAN API - $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); - $router->get('stokaudit/aktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditAktif']); - $router->get('stokaudit/takaktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditTakAktif']); - $router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); + $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); + $router->get('stokaudit/aktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditAktif']); + $router->get('stokaudit/takaktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditTakAktif']); + $router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); $router->get('gadai/aging/test/{kodcaw}/{tarikh}/{num}',['uses'=>'GadaiController@carian_AgingBulanan']); $router->get('gadai/aging/lebih12bulan/{kodcaw}/{tarikh}', ['uses'=>'GadaiController@carian_agingLebih12_Bulan']); $router->get('gadai/JumlahagingBulanan/test/{kodcaw}/{tarikh}',['uses'=>'GadaiController@carian_Seluruh_AgingBulanan']); //LELONG API - $router->get('senaraibatch/aktif/{kodcaw}',['uses'=>'LelongController@getSenaraiLelongAktif']); - $router->get('senaraibatch/laporan/{kodcaw}',['uses'=>'LelongController@getSenaraiBatchNoAktif']); - $router->get('details/notislelong/{kodcaw}',['uses'=>'LelongController@DetailsNotisLelong']); + $router->get('senaraibatch/aktif/{kodcaw}',['uses'=>'LelongController@getSenaraiLelongAktif']); + $router->get('senaraibatch/laporan/{kodcaw}',['uses'=>'LelongController@getSenaraiBatchNoAktif']); + $router->get('details/notislelong/{kodcaw}',['uses'=>'LelongController@DetailsNotisLelong']); //API BARU @@ -291,15 +291,15 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('getAddTunaiLatest/{kodcaw}',['uses' =>'TunaiController@getAddTunaibyKodlaluanLatest']); $router->put('gadai/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@GadaiHapus']); $router->put('tebus/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@TebusHapus']); - $router->put('gadai/edit/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@deletemarhun']); - $router->put('gadai/ubah/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@editmarhun']); - $router->post('gldetail/{kodcaw}',['uses'=> 'VaultController@creategldetailonline']); - $router->post('gldetailkaunter/{kodcaw}',['uses'=> 'VaultController@creategldetail']); - $router->get('listgldetail/{kodcaw}',['uses'=> 'VaultController@listgldetail']); - $router->get('laporanpetibesi/{kodcaw}/{tarikh}',['uses'=> 'VaultController@laporanPetiBesi']); + $router->put('gadai/edit/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@deletemarhun']); + $router->put('gadai/ubah/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@editmarhun']); + $router->post('gldetail/{kodcaw}',['uses'=> 'VaultController@creategldetailonline']); + $router->post('gldetailkaunter/{kodcaw}',['uses'=> 'VaultController@creategldetail']); + $router->get('listgldetail/{kodcaw}',['uses'=> 'VaultController@listgldetail']); + $router->get('laporanpetibesi/{kodcaw}/{tarikh}',['uses'=> 'VaultController@laporanPetiBesi']); $router->get('GetTunaiSemalam/{kodcaw}',['uses' =>'TunaiController@getTunaiSemalam']); - $router->get('laporanpetibesirange/{kodcaw}',['uses'=> 'VaultController@laporanPetiBesiRange']); - $router->get('laporanAuditTrail',['uses'=> 'LaporanController@LaporanAuditTrail']); + $router->get('laporanpetibesirange/{kodcaw}',['uses'=> 'VaultController@laporanPetiBesiRange']); + $router->get('laporanAuditTrail',['uses'=> 'LaporanController@LaporanAuditTrail']); //API PANJAR KHAZANAH @@ -319,7 +319,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('ListLatestLulus/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@listlatestlulus']); $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@update']); $router->put('UpdateKelulusanKomen/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@updatekomen']); - + $router->post('CreateKelulusan/{kodcaw}/{norujukan}/roles/{roles}',['uses'=>'KelulusanController@create']); $router->post('CreateLulus/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@kepohonancreate']); $router->get('GetLulus/{kodcaw}/',['uses'=>'KelulusanController@kepohonangetteller']); @@ -327,8 +327,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('GetLulusAll/{kodcaw}/',['uses'=>'KelulusanController@listkepohonan']); $router->get('ListOperasi/',['uses'=>'KelulusanController@listoperasi']); $router->get('ListOperasiKelulusan/',['uses'=>'KelulusanController@listoperasikelulusan']); - - + + //API REQUEST TELLER $router->post('requestTeller/{kodcaw}',['uses' => 'TunaiController@createRequestTeller']); $router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']); @@ -371,7 +371,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('lookupalasan',['uses' => 'PolisController@LookupAlasan']); $router->get('polis/laporan',['uses' => 'PolisController@LaporanPolis']); - + //update tagterima Tebus @@ -382,8 +382,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ //Tujuan Gadai $router->get('tujuangadai',['uses'=>'TujuanGadaiController@showAllTujuanGadai']); - - //DENOMINASI + + //DENOMINASI $router->get('DenominasiController/{kodcaw}',['uses'=>'DenominasiController@listdenominasi']); $router->put('DenominasiUpdate/{kodcaw}',['uses'=>'DenominasiController@updatedenominasi']); $router->post('DenominasiCreate/{kodcaw}',['uses'=>'DenominasiController@createdenominasi']); @@ -396,7 +396,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('TuntutBaki/resit/{kodcaw}/{norujukan}',['uses'=>'LelongController@resitLelong']); $router->post('Tuntutbakisimpan/{kodcaw}',['uses'=>'LelongController@simpantuntutbaki']); $router->put('tuntutbakiupdate/{kodcaw}/{norujukan}',['uses'=>'LelongController@updatetagtbaki']); - + //API KOD PRODUK $router->get('getProduct/{kodcaw}',['uses'=>'ProductController@getProduct']); //add 2021-02-11 @@ -409,8 +409,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ //API GLDETAILS $router->get('jumlahTerkumpulBayaranUpah/{kodcaw}', ['uses'=>'TebusController@JumUpahDibayar_keseluruhan']); - $router->get('gldetailkira_pendahuluan_2013/data/{kodcaw}',['uses'=>'GlDetailsController@sum_gldetails']); - $router->get('gldetailkira_pendahuluan_2014/data/{kodcaw}',['uses'=>'GlDetailsController@sum_advance_2014']); + $router->get('gldetailkira_pendahuluan_2013/data/{kodcaw}',['uses'=>'GlDetailsController@sum_gldetails']); + $router->get('gldetailkira_pendahuluan_2014/data/{kodcaw}',['uses'=>'GlDetailsController@sum_advance_2014']); $router->get('gldetailkira_pendahuluanJMC_2015/data/{kodcaw}', ['uses' =>'GlDetailsController@sumJMC_2015']); $router->get('gldetailkira_pendahuluanJMC_2014/data/{kodcaw}', ['uses' =>'GlDetailsController@sumJMC_2014']); $router->get('gldetailKira_SerahanHQ/data/{kodcaw}', ['uses'=>'GlDetailsController@JumlahSerahanHQ']); @@ -430,13 +430,13 @@ $router->group(['prefix'=>'api'], function () use ($router){ //TUNAI GADAITEBUS $router->get('getTunaiGadTeb/{kodcaw}',['uses'=>'TunaiGadTebController@getCurrentTunaiGadTeb']); $router->post('daftarTunaiGadteb/{kodcaw}',['uses'=>'TunaiGadTebController@createTunaiGadTeb']); - $router->put('updateTunaiGadteb/{kodcaw}',['uses'=>'TunaiGadTebController@UpdateTunaiGadTeb']); - $router->put('updateBakiEOD_Vault/{kodcaw}',['uses'=>'VaultController@update_onlyBakiEod']); + $router->put('updateTunaiGadteb/{kodcaw}',['uses'=>'TunaiGadTebController@UpdateTunaiGadTeb']); + $router->put('updateBakiEOD_Vault/{kodcaw}',['uses'=>'VaultController@update_onlyBakiEod']); - $router->get('transaction_spesifik/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukan_specific']); + $router->get('transaction_spesifik/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukan_specific']); $router->get('transaction_spesifik_tarikh/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukan_specific_tarikh']); - $router->get('jumlahBayaranOnlineAll/data/{kodcaw}',['uses'=>'TransactionController@JumlahBayaranOnline_Keseluruhan']); - + $router->get('jumlahBayaranOnlineAll/data/{kodcaw}',['uses'=>'TransactionController@JumlahBayaranOnline_Keseluruhan']); + //NAMA PENGGUNA TAMBAH KODLALUAN $router->get('get/pengguna/{kodcaw}',['uses'=>'TransactionController@GetPengguna']); @@ -447,67 +447,67 @@ $router->group(['prefix'=>'api'], function () use ($router){ //IMBANG DUGA// //Dua-Dua Table - $router->get('CalculationPendahuluanSerahan/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahan']); - $router->get('KeuntunganArRahn/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntungan']); - $router->get('RebetCalculation/{kodcaw}',['uses'=>'TebusController@RebetCalculation']); + $router->get('CalculationPendahuluanSerahan/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahan']); + $router->get('KeuntunganArRahn/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntungan']); + $router->get('RebetCalculation/{kodcaw}',['uses'=>'TebusController@RebetCalculation']); //-- Harta Semasa --// - $router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); - $router->get('PembiayaanDiberiTawarruq/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); - $router->get('BayaranPendahuluan/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluan']); + $router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); + $router->get('PembiayaanDiberiTawarruq/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); + $router->get('BayaranPendahuluan/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluan']); - $router->get('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); - $router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); + $router->get('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); + $router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //-- Tanggungan Semasa --// - $router->get('CalculationPanjar/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); - $router->get('BakiLelongCalculation/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculation']); - $router->get('WTD/{kodcaw}',['uses'=>'LelongController@calculationwtd']); - $router->get('SerahBaki/{kodcaw}',['uses'=>'LelongController@calculationserahbaki']); - $router->get('cajlelong/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); + $router->get('CalculationPanjar/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); + $router->get('BakiLelongCalculation/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculation']); + $router->get('WTD/{kodcaw}',['uses'=>'LelongController@calculationwtd']); + $router->get('SerahBaki/{kodcaw}',['uses'=>'LelongController@calculationserahbaki']); + $router->get('cajlelong/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); $router->get('KeuntunganSebenar/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']); - $router->get('UntungRugiTerkumpul/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); - $router->get('cajperkhidmatanterkumpul/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); - $router->get('CalculationHapusKira/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); - $router->get('Xtra/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); + $router->get('UntungRugiTerkumpul/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); + $router->get('cajperkhidmatanterkumpul/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); + $router->get('CalculationHapusKira/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); + $router->get('Xtra/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); //LEJER AM// //Dua-Dua Table - $router->get('PendahuluanSerahanLejer/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahanLejer']); - $router->get('KeuntunganArRahnLejer/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntunganLejer']); - $router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); + $router->get('PendahuluanSerahanLejer/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahanLejer']); + $router->get('KeuntunganArRahnLejer/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntunganLejer']); + $router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); $router->get('cajlelongLejer/{kodcaw}',['uses'=>'LelongController@cajlelongcalculationLejer']); // //-- Harta Semasa --// - $router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberiLejer']); - $router->get('PembiayaanDiberiTawarruqLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruqLejer']); - $router->get('BayaranPendahuluanLejer/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluanLejer']); + $router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberiLejer']); + $router->get('PembiayaanDiberiTawarruqLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruqLejer']); + $router->get('BayaranPendahuluanLejer/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluanLejer']); - $router->get('TunaiDiTanganLejer/{kodcaw}',['uses'=>'VaultController@TunaiDiTanganLejer']); + $router->get('TunaiDiTanganLejer/{kodcaw}',['uses'=>'VaultController@TunaiDiTanganLejer']); // //-- Tanggungan Semasa --// - $router->get('CalculationPanjarLejer/{kodcaw}',['uses'=>'PanjarController@calculationpanjarLejer']); + $router->get('CalculationPanjarLejer/{kodcaw}',['uses'=>'PanjarController@calculationpanjarLejer']); $router->get('BakiLelongCalculationLejer/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculationLejer']); - $router->get('KeuntunganSebenarLejer/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenarLejer']); + $router->get('KeuntunganSebenarLejer/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenarLejer']); // //-- Untung Rugi --// - $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); - $router->get('UntungRugiCalculationLejer/{kodcaw}',['uses'=>'TebusController@untungrugicalculationLejer']); - + $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); + $router->get('UntungRugiCalculationLejer/{kodcaw}',['uses'=>'TebusController@untungrugicalculationLejer']); + //END IMBANG DUGA & LEJER AM// //ADDED LEJER AM - $router->get('latest_transaksi_untung/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']); - $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']); + $router->get('latest_transaksi_untung/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']); + $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']); //-- Ansuran GLEJER --// $router->get('ansuranByrKaunter/{kodcaw}/{norujukan}',['uses'=>'TransactionController@getSumBayaran_Ansuran']); - + //Komuditi Pukal $router->get('komuditi/check',['uses'=>'KomuditiController@checkKomuditi']); @@ -547,15 +547,17 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('check/upah12/kosong',['uses'=>'GadaiController@upah12kosong']); $router->get('calculate/akru/bycawangan',['uses'=>'GadaiController@calculateAkru']); + + $router->get('keluar/lelong/tawarruq',['uses'=>'LelongController@keluarLelongTawarruq']); }); $router->group(['prefix'=>'e-arrahn'], function () use ($router){ }); $router->group(['prefix'=>'mobile'], function () use ($router){ - + $router->get('customers/{ic}',['uses'=>'CustomerController@showOneCustomerByICMobile']); - + //utama $router->get('customers/{ic}/gadai/amaran/lelong',['uses'=>'CustomerController@show6BlnGadai']); $router->get('harga_emas',['uses'=>'HargaEmasController@showAllHargaEmasMobile']); @@ -567,27 +569,27 @@ $router->group(['prefix'=>'mobile'], function () use ($router){ $router->get('gadai/norujukan/jumlahPembiayaan/{nokp}',['uses'=>'CustomerController@jumlahPembiayaanMobile']); $router->get('gadai/norujukan/jumlahBakiLelong/{nokp}',['uses'=>'CustomerController@jumlahBakiLelongMobile']); $router->post('gadai/detail/norujukan',['uses'=>'CustomerController@getGadaiDetailMobile']); - + //gadaian $router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadaiMobile']); $router->get('customers/{ic}/gadaitebuslelong/{kodcaw}',['uses'=>'CustomerController@gadaiTebusLelongByCawanganMobile']); //profile $router->post('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']); - + //register $router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']); $router->get('otp/check/{otp_token}',['uses'=>'OtpController@checkToken']); $router->put('otp/update_otp',['uses'=>'OtpController@usedOTP']); - + $router->post('send-email', ['uses' => 'CustomerController@sendEmail']); - + }); $router->group(['prefix'=>'dashboard'], function () use ($router){ $router->get('jumlahGadai',['uses'=>'GadaiController@showAllGadaiToday']); $router->get('jumlahTebus',['uses'=>'GadaiController@showAllTebusToday']); - $router->get('jumlahUpah',['uses'=>'GadaiController@showAllUpahToday']); + $router->get('jumlahUpah',['uses'=>'GadaiController@showAllUpahToday']); $router->get('jumlahVariasi',['uses'=>'GadaiController@showAllVariasiToday']); $router->get('gadaiTerkumpul',['uses'=>'GadaiController@showAllGadaiTerkumpul']); @@ -635,8 +637,8 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('getAddTunaiDateKodlaluan/{kodcaw}/',['uses' =>'AdminPageController@getAddTunaiDateKodlaluan']); $router->get('AdvansurSearchByTarikh/{kodcaw}',['uses'=>'AdminPageController@SenaraiAdvansurTarikh']); $router->get('TuntutBakiTarikhTeller/{kodcaw}',['uses'=>'AdminPageController@showTuntutBakiTarikhTeller']); - $router->get('lelong/tarikh/{kodcaw}',['uses'=>'AdminPageController@LelonganTarikh']); - $router->post('updateTunaiGTByTarikh/{kodcaw}',['uses'=>'AdminPageController@UpdateTunaiByTarikh']); + $router->get('lelong/tarikh/{kodcaw}',['uses'=>'AdminPageController@LelonganTarikh']); + $router->post('updateTunaiGTByTarikh/{kodcaw}',['uses'=>'AdminPageController@UpdateTunaiByTarikh']); $router->get('searchByName',['uses'=>'CustomerController@AdminsearchCustomerByName']); $router->get('searchByIC',['uses'=>'CustomerController@AdminsearchCustomerByIC']); @@ -671,7 +673,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('SenaraiBlacklist/{kodcaw}',['uses'=>'AdminPageController@SenaraiBlacklist']); $router->post('DeleteBlacklist',['uses'=>'AdminPageController@DeleteBlackList']); $router->post('AddSenaraiHitam',['uses'=>'AdminPageController@AddSenaraiHitam']); - $router->put('notislelong/update/{kodcaw}',['uses'=>'AdminPageController@UpdateNotisLelong']); + $router->put('notislelong/update/{kodcaw}',['uses'=>'AdminPageController@UpdateNotisLelong']); $router->get('ListOperasi/Paginate',['uses'=>'AdminPageController@listoperasi']); $router->get('ListOperasiKelulusan/Paginate',['uses'=>'AdminPageController@listoperasikelulusan']);