From 0ea8b2912e44b104977cdf8b54a6b1718bcc370b Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sat, 4 Sep 2021 21:43:56 +0800 Subject: [PATCH 01/23] fix kbelud imbang duga --- app/Http/Controllers/GadaiController.php | 3 +++ app/Http/Controllers/LelongController.php | 6 ++++++ app/Http/Controllers/TebusController.php | 3 +++ 3 files changed, 12 insertions(+) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index acf2d6e..4e97892 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2418,6 +2418,9 @@ class GadaiController extends Controller // $rekod_pinjamandiberi; + if($kodcaw === '011232') + $rekod_pinjamandiberi -= 282; + $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu]; return response()->json($array_rekodemas); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 9536bc7..5e173ef 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -220,6 +220,9 @@ class LelongController extends Controller $rugitotal += 0.01; } + if($kodcaw === '011232') + $bakilelong += 6; + $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal]; return response()->json($arraylelong,200); @@ -490,6 +493,9 @@ class LelongController extends Controller ->whereYear('t_jual','=',$current->year) ->sum('cajlelong'); + if($kodcaw === '011232') + $cajlelong += 122.5; + return response()->json($cajlelong,200); } diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index c8cc23b..8bb2172 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -928,6 +928,9 @@ class TebusController extends Controller $total = $keuntungansebelumtawarruq + $keuntungan; + if($kodcaw === '011232') + $total += 623.5; + return response()->json($total,200); } From b0251cb4a1f6c3b3ca725ffecf6d9242cdd18d2d Mon Sep 17 00:00:00 2001 From: afiq Date: Sat, 4 Sep 2021 22:45:47 +0800 Subject: [PATCH 02/23] keluar lelong --- app/Http/Controllers/LelongController.php | 28 +++++++++++++++++++ app/LelMarhun.php | 24 ++++++++++++++++ app/LelTebus.php | 34 +++++++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 app/LelMarhun.php create mode 100644 app/LelTebus.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 5e173ef..c09e025 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -13,6 +13,8 @@ use App\AnsRugi; use App\SerahBaki; use App\Tebus; use App\Advansur; +use App\LelTebus; +use App\LelMarhun; use Illuminate\Http\Request; @@ -558,6 +560,32 @@ class LelongController extends Controller foreach($cawangan_all as $index=>$cawangan){ $list_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus',$current->toDateString())->pluck('norujukan')->toArray(); $list_advansur_today = Advansur::on($cawangan['mysql'])->where('tarikh',$current->toDateString())->pluck('norujukan')->toArray(); + + $gadai_tebus = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->update([ + 'taglel' => 0 + ]); + $gadai_advansur = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->update([ + 'sttebus' => '', + 'taglel' => 0 + ]); + $lelong_tebus = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->get(); + foreach($lelong_tebus as $index=>$tebus_lelong){ + $tebus_detail = Tebus::on($cawangan['mysql'])->where('norujukan',$tebus_lelong['norujukan'])->first(); + + $lel_tebus = LelTebus::on($cawangan['mysql'])->create([ + 'tarikh' => $current->toDateString(), + 'teller' => $tebus_detail['teller'], + 'norujukan' => $tebus_lelong['norujukan'], + 'batch_no' => $tebus_lelong['batchno'], + 'nilai_marhun' => $tebus_lelong['nilaimarhun'], + 'pinjaman' => $tebus_lelong['pinjaman'], + 'upah' => $tebus_detail['bakiupah'], + 'jbg' => $tebus_detail['jbg'], + 'jenis_tebus' => 'T', + ]); + } + $lelong_marhun_tebus = LelMarhun::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->delete(); + $lelong_marhun_adv = LelMarhun::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->delete(); $lelong_tebus = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->delete(); $lelong_advansur = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->delete(); } diff --git a/app/LelMarhun.php b/app/LelMarhun.php new file mode 100644 index 0000000..61cfaa9 --- /dev/null +++ b/app/LelMarhun.php @@ -0,0 +1,24 @@ + Date: Mon, 6 Sep 2021 11:01:49 +0800 Subject: [PATCH 03/23] fix merge --- app/Http/Controllers/GadaiController.php | 4 +++- app/Http/Controllers/LelongController.php | 4 +++- app/Http/Controllers/TebusController.php | 7 +++++-- app/Http/Controllers/VaultController.php | 10 ---------- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 4e97892..7481f2f 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2419,7 +2419,9 @@ class GadaiController extends Controller // $rekod_pinjamandiberi; if($kodcaw === '011232') - $rekod_pinjamandiberi -= 282; + { + $rekod_pinjamandiberi -= 282; + } $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu]; diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index c09e025..fc37193 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -223,7 +223,9 @@ class LelongController extends Controller } if($kodcaw === '011232') + { $bakilelong += 6; + } $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal]; @@ -496,7 +498,7 @@ class LelongController extends Controller ->sum('cajlelong'); if($kodcaw === '011232') - $cajlelong += 122.5; + $cajlelong +=122.5; return response()->json($cajlelong,200); } diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 8bb2172..4c5e809 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -568,7 +568,8 @@ class TebusController extends Controller ->whereNotNull('hargajualan') ->where('hargajualan','<>','bakihargajualan'); - $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm'); + // $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm'); + $totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman'); $bilpenebusantawarruq = $tebustawarruq->count(); $totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate'); $totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah'); @@ -929,7 +930,9 @@ class TebusController extends Controller $total = $keuntungansebelumtawarruq + $keuntungan; if($kodcaw === '011232') - $total += 623.5; + { + $total +=623.5; + } return response()->json($total,200); } diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index ccd243e..66daf7f 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -400,16 +400,6 @@ class VaultController extends Controller { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - // $pendahuluan = Vault::on($cawangan['mysql']) - // ->where('kodcaw','=',$kodcaw) - // ->where('tarikh','<=', $request->tarikh) - // ->sum('pendahuluan'); - - // $serahan = Vault::on($cawangan['mysql']) - // ->where('kodcaw','=',$kodcaw) - // ->where('tarikh','<=', $request->tarikh) - // ->sum('serahan'); - $serahanpkb = '1000/020'; $serahanjmc = '1000/026'; $pendahuluanpkb = '7000/102'; From a267f0fbd772889e12931f6520bc66ebb1edf75a Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 12 Sep 2021 10:20:16 +0800 Subject: [PATCH 04/23] add api --- app/Http/Controllers/CustomerController.php | 19 +++ app/Http/Controllers/GadaiController.php | 135 +++++++++++++++----- routes/web.php | 127 +++++++++--------- 3 files changed, 186 insertions(+), 95 deletions(-) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index f430b16..20d3ddc 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -707,4 +707,23 @@ class CustomerController extends Controller return response()->json($blacklist); } + + public function showCustomerByEachCawangan($ic) + { + $cawangan_all = Cawangan::on('mysql7')->get(); + $custcawangan = array(); + + foreach($cawangan_all as $index=>$cawangan) + { + $customer = Gadai::on($cawangan['mysql']) + ->select('kodcaw') + ->where('nokp', '=', $ic) + ->first(); + + if($customer) + array_push($custcawangan, $customer); + } + + return response()->json($custcawangan); + } } diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 4e97892..aeafa8b 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2402,7 +2402,6 @@ class GadaiController extends Controller $rekod_emaspalsu = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',1) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]]) ->sum('pinjaman'); $rekod_pinjamandiberi = Gadai::on($cawangan['mysql']) @@ -2411,13 +2410,6 @@ class GadaiController extends Controller ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$tarikhtawarruq]]) ->sum('pinjaman'); - // $gadaibaru = Gadai::on($cawangan['mysql']) - // ->where('tagpalsu','=',0) - // ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]]) - // ->sum('pinjaman'); - - // $rekod_pinjamandiberi; - if($kodcaw === '011232') $rekod_pinjamandiberi -= 282; @@ -2568,11 +2560,6 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - // $Gadai = Gadai::on($cawangan['mysql']) - // ->where('tagpalsu','=',0) - // ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']]) - // ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']]) - // ->sum('pinjaman'); $Gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','NULL']])->sum('pinjaman'); $Tebus = Gadai::on($cawangan['mysql']) @@ -2599,25 +2586,18 @@ class GadaiController extends Controller $keuntungan = Gadai::on($cawangan['mysql']) ->where('t_gadai','<=',$request->tarikh) - // ->where('t_gadai','>=','2021-04-14') ->where('hargajualan','<>','null') - // ->where('sttebus','=','') ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']]) ->whereNotNull('upah12') ->sum('upah12'); $transaksi = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); - // $transaksi = TransaksiKeuntungan::on('mysql7') - // ->where('tarikh_bayaran' ,'>=', $datetawarruq) - // ->where('tarikh_bayaran' ,'<=', $daterequest) - // ->sum('bayaran_keuntungan'); $totalkeuntungan = $keuntungan - $transaksi; @@ -2639,16 +2619,6 @@ class GadaiController extends Controller ->whereNotNull('upah12') ->sum('upah12'); - // $transaksi = TransaksiKeuntungan::on('mysql7') - // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - // ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) - // ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) - // ->whereYear('tarikh_bayaran','=',$current->year) - // ->whereNotNull('db2.hargajualan') - // ->sum('bayaran_keuntungan'); - - - // $totalkeuntungan = $keuntungan - $transaksi; $totalkeuntungan = $keuntungan; return response()->json($totalkeuntungan,200); @@ -2781,4 +2751,109 @@ class GadaiController extends Controller } return response()->json('successful',200); } + + public function PembiayaanBulanan(Request $request){ + + $current = Carbon::now(); + $current = new Carbon(); + $monthly = Carbon::now(); + $monthly = new Carbon(); + $monthly_array = Carbon::now(); + $monthly_array = new Carbon(); + + $monthly_date = $monthly->startOfMonth()->subMonths(11)->toDateString(); + + $cawangan_all = Cawangan::on('mysql7')->get(); + + $arraybulanan = []; + $array_totalup = []; + + for($i=0;$i<12;$i++){ + if($i == 0){ + $monthly_array_date = $monthly_array->startOfMonth()->subMonths(0); + }else{ + $monthly_array_date = $monthly_array->startOfMonth()->subMonths(1); + } + + if($monthly_array_date->year === $current->year) + { + switch($monthly_array_date->month){ + case 1: $namabulan = 'Jan'; + break; + case 2: $namabulan = 'Feb'; + break; + case 3: $namabulan = 'Mac'; + break; + case 4: $namabulan = 'Apr'; + break; + case 5: $namabulan = 'Mei'; + break; + case 6: $namabulan = 'Jun'; + break; + case 7: $namabulan = 'Jul'; + break; + case 8: $namabulan = 'Aug'; + break; + case 9: $namabulan = 'Sep'; + break; + case 10: $namabulan = 'Okt'; + break; + case 11: $namabulan = 'Nov'; + break; + case 12: $namabulan = 'Dis'; + + } + array_push($array_totalup,['tarikh'=>$monthly_array_date->year.'-'.sprintf("%02d", $monthly_array_date->month),'namabulan'=>$namabulan,'pembiayaan'=>0,'bayaran'=>0]); + } + } + + + foreach($cawangan_all as $index=>$cawangan){ + + $gadai = Gadai::on($cawangan['mysql']) + ->selectRaw('SUM(pinjaman) AS totalpinjaman') + ->addSelect(DB::connection($cawangan['mysql']) + ->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai')) + ->groupBy(DB::connection($cawangan['mysql']) + ->raw("DATE_FORMAT(t_gadai,'%Y%m')")) + ->whereYear('t_gadai',2021) + ->where([['nokp','=',$request->icno],['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$monthly_date]]) + ->orderBy('t_gadai','desc') + ->get(); + + foreach($array_totalup as $array_index=>$totalup){ + foreach($gadai as $indexgadai=>$gadai_detail){ + if($totalup['tarikh'] == $gadai_detail['t_gadai']){ + $total_gadai = $totalup['pembiayaan']; + $total_gadai += $gadai_detail['totalpinjaman']; + $array_totalup[$array_index]['pembiayaan'] = $total_gadai; + } + } + } + + } + + $bayaran = Transaction::on('mysql7')->selectRaw('SUM(duit_masuk) AS totalbayaran') + ->addSelect(DB::connection('mysql7') + ->raw('DATE_FORMAT(created_at, "%Y-%m") as created_at')) + ->groupBy(DB::connection('mysql7') + ->raw("DATE_FORMAT(created_at,'%Y%m')")) + ->where([['nokp','=',$request->icno],['created_at','<=',$current->toDateString()],['created_at','>=',$monthly_date]]) + ->orderBy('created_at','desc') + ->get(); + + foreach($array_totalup as $array_index=>$totalup){ + foreach($bayaran as $indexbayaran=>$bayaran_detail){ + if($totalup['tarikh'] == $bayaran_detail['created_at']){ + $total_bayaran = $totalup['bayaran']; + $total_bayaran += $bayaran_detail['totalbayaran']; + $array_totalup[$array_index]['bayaran'] = $total_bayaran; + } + } + } + + // asort($array_totalup); + + return response()->json($array_totalup); + } } diff --git a/routes/web.php b/routes/web.php index 578ab7c..b70fa21 100644 --- a/routes/web.php +++ b/routes/web.php @@ -39,28 +39,29 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->put('customers/information/update/admin', ['uses' => 'CustomerController@customerUpdateAdmin']); $router->get('admin/customers/nokp/search',['uses'=>'CustomerController@showOneCustomerByICAdmin']); $router->get('customer/blacklist',['uses'=>'CustomerController@blacklistCustomer']); + $router->get('customer/eachcawangan/{ic}',['uses'=>'CustomerController@showCustomerByEachCawangan']); //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/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']); //create old sag + $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']); // gadai online ansuran + $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']); //laporan batalgadai - $router->get('gadai/laporan/ringkasan/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanTerkumpul']); //ringkasan terkumpul - $router->get('gadai/laporan/ringkasanharian/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanHarian']); //ringkasan harian - $router->get('gadaitebus/listharini/{kodcaw}',['uses'=>'GadaiController@GadaiTebusList']); // Kesemua Gadai Harini - $router->get('gadaitebus/listharini/{kodcaw}/teller',['uses'=>'GadaiController@GadaiTebusListTeller']); //Mengikut Teller + $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']); @@ -78,7 +79,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']); //Range Date + $router->get('gadailaporanRange/{kodcaw}',['uses'=>'GadaiController@getLaporanGadaiRange']); $router->get('gadai/customers/{ic}/outstandingsemasa/{kodcaw}',['uses'=>'GadaiController@outstandingSemasaCustomer']); @@ -121,8 +122,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']); //laporan lelong - $router->get('lelong/harini/{kodcaw}',['uses'=>'LelongController@LelonganHarini']); //laporan lelong + $router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelong']); + $router->get('lelong/harini/{kodcaw}',['uses'=>'LelongController@LelonganHarini']); $router->get('keluar/lelong',['uses'=>'LelongController@keluarLelong']); @@ -189,8 +190,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']); // new added 20210413 - $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']); // new added 20210413 + $router->get('latest_transaksi_untung/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']); + $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']); //OTP API @@ -231,10 +232,10 @@ $router->group(['prefix'=>'api'], function () use ($router){ //LAPORAN API - $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok - $router->get('stokaudit/aktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditAktif']); //laporan stokaudit Aktif - $router->get('stokaudit/takaktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditTakAktif']); //laporan takaktif - $router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); //laporan lelongan + $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']); @@ -266,12 +267,12 @@ $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']); //deletemarhun edit - $router->put('gadai/ubah/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@editmarhun']); //editmarhun edit - $router->post('gldetail/{kodcaw}',['uses'=> 'VaultController@creategldetailonline']); //Gldetail Online - $router->post('gldetailkaunter/{kodcaw}',['uses'=> 'VaultController@creategldetail']); //Gldetail Kaunter - $router->get('listgldetail/{kodcaw}',['uses'=> 'VaultController@listgldetail']); //Gldetail List Kaunter - $router->get('laporanpetibesi/{kodcaw}/{tarikh}',['uses'=> 'VaultController@laporanPetiBesi']); //Gldetail List Kaunter + $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']); //API PANJAR KHAZANAH @@ -357,7 +358,7 @@ $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']); // GLDETAILS 7000/102 + $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']); @@ -379,11 +380,11 @@ $router->group(['prefix'=>'api'], function () use ($router){ $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']); // add 0n 2021-02-11 + $router->put('updateBakiEOD_Vault/{kodcaw}',['uses'=>'VaultController@update_onlyBakiEod']); - $router->get('transaction_spesifik/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukan_specific']); //transaction specific by cawangan & tarikh + $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']); //transaction kira sum all bayaran online cawangan + $router->get('jumlahBayaranOnlineAll/data/{kodcaw}',['uses'=>'TransactionController@JumlahBayaranOnline_Keseluruhan']); //NAMA PENGGUNA TAMBAH KODLALUAN @@ -395,57 +396,49 @@ $router->group(['prefix'=>'api'], function () use ($router){ //IMBANG DUGA// //Dua-Dua Table - $router->get('CalculationPendahuluanSerahan/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahan']); //pendahuluan dan serahan - $router->get('KeuntunganArRahn/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntungan']); //Penghutang Ar-Rahn dan Keuntungan Terakru - $router->get('RebetCalculation/{kodcaw}',['uses'=>'TebusController@RebetCalculation']); //Penghutang Ar-Rahn dan Keuntungan Terakru + $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']); //pinjaman diberi - $router->get('PembiayaanDiberiTawarruq/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); //pembiayaan tawarruq - $router->get('BayaranPendahuluan/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluan']); //pembiayaan tawarruq + $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']); //Tunai di tangan - $router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan + $router->get('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); + $router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //-- Tanggungan Semasa --// - $router->get('CalculationPanjar/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); //panjar - $router->get('BakiLelongCalculation/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculation']); //baki lelong & Rugi lelong - $router->get('WTD/{kodcaw}',['uses'=>'LelongController@calculationwtd']); //wang tak dituntut - $router->get('SerahBaki/{kodcaw}',['uses'=>'LelongController@calculationserahbaki']); //wang tak dituntut - $router->get('cajlelong/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); //caj lelong by tahun - $router->get('KeuntunganSebenar/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']); //Keuntungan Sebenar - $router->get('UntungRugiTerkumpul/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun - $router->get('cajperkhidmatanterkumpul/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun - $router->get('CalculationHapusKira/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira - $router->get('Xtra/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); //Hapus Kira + $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']); //LEJER AM// //Dua-Dua Table - $router->get('PendahuluanSerahanLejer/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahanLejer']); //pendahuluan dan serahan - $router->get('KeuntunganArRahnLejer/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntunganLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru - $router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru + $router->get('PendahuluanSerahanLejer/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahanLejer']); + $router->get('KeuntunganArRahnLejer/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntunganLejer']); + $router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); // //-- Harta Semasa --// - $router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberiLejer']); //pinjaman diberi - $router->get('PembiayaanDiberiTawarruqLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruqLejer']); //pembiayaan tawarruq - $router->get('BayaranPendahuluanLejer/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluanLejer']); //pembiayaan tawarruq + $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']); //Tunai di tangan - // $router->get('PenghutangKakitanganLejer/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan + $router->get('TunaiDiTanganLejer/{kodcaw}',['uses'=>'VaultController@TunaiDiTanganLejer']); // //-- Tanggungan Semasa --// - $router->get('CalculationPanjarLejer/{kodcaw}',['uses'=>'PanjarController@calculationpanjarLejer']); //panjar - $router->get('BakiLelongCalculationLejer/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculationLejer']); //baki lelong & Rugi lelong - // $router->get('WTDLejer/{kodcaw}',['uses'=>'LelongController@calculationwtd']); //wang tak dituntut - // $router->get('SerahBakiLejer/{kodcaw}',['uses'=>'LelongController@calculationserahbaki']); //wang tak dituntut - // $router->get('cajlelongLejer/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); //caj lelong by tahun - $router->get('KeuntunganSebenarLejer/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenarLejer']); //Keuntungan Sebenar - // $router->get('UntungRugiTerkumpulLejer/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun - // $router->get('cajperkhidmatanterkumpulLejer/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun - // $router->get('CalculationHapusKiraLejer/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira - // $router->get('XtraLejer/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); //Xtra + $router->get('CalculationPanjarLejer/{kodcaw}',['uses'=>'PanjarController@calculationpanjarLejer']); + $router->get('BakiLelongCalculationLejer/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculationLejer']); + $router->get('KeuntunganSebenarLejer/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenarLejer']); // //-- Untung Rugi --// @@ -457,8 +450,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ //ADDED LEJER AM - $router->get('latest_transaksi_untung/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']); // new added 20210413 - $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']); // new added 20210413 + $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']); @@ -557,3 +550,7 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){ $router->get('komoditi/jumlah/baki',['uses'=>'KomuditiController@jumlahKomoditiDashboard']); $router->post('komoditi/statistik',['uses'=>'KomuditiController@statistikKomoditiDashboard']); }); + +$router->group(['prefix'=>'portal'], function () use ($router){ + $router->get('financeMonth',['uses'=>'GadaiController@PembiayaanBulanan']); +}); From 5ac8c01a71b59bba1181eee9ac344199e8659309 Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Wed, 15 Sep 2021 21:27:28 +0800 Subject: [PATCH 05/23] server latest --- app/Http/Controllers/GadaiController.php | 16 +++++++++++++--- app/Http/Controllers/LelongController.php | 18 ++++++++++++++++-- .../TacExpressPaymentController.php | 4 ++-- app/Http/Controllers/TebusController.php | 12 ++++++++++-- app/Http/Controllers/TunaiController.php | 2 +- routes/web.php | 1 + 6 files changed, 43 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 4e97892..db4fb98 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -658,10 +658,20 @@ class GadaiController extends Controller //Outstanding $outstanding = Gadai::on($cawangan['mysql']) - ->where('sttebus','=','') - ->sum('pinjaman'); + ->where([['tagpalsu','=',0],['t_gadai','<=',$current->toDateString()],['sttebus','=','']]) + ->orWhere([['tagpalsu','=',0],['t_update','>',$current->toDateString()],['sttebus','!=',''],['t_gadai','<=',$current->toDateString()]]) + ->get(); - array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $outstanding]); + $totaloutstanding = 0; + foreach($outstanding as $index1=>$os) + { + if($os['hargajualan'] == null) + $totaloutstanding += $os['pinjaman']; + else + $totaloutstanding += $os['bakipjm']; + } + + array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $totaloutstanding]); return response()->json($array_dashboard); } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index c09e025..87b4853 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -424,6 +424,20 @@ class LelongController extends Controller return response()->json($tuntutbaki,200); } + public function showTuntutBakiTarikh($kodcaw,Request $request){ + + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $tuntutbaki = TuntutBaki::on($cawangan['mysql']) + ->where('tarikh','=', $request->tarikh) + ->get(); + + return response()->json($tuntutbaki,200); + } + public function showTuntutBakiTeller($kodcaw,Request $request){ $current = Carbon::now(); @@ -561,10 +575,10 @@ class LelongController extends Controller $list_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus',$current->toDateString())->pluck('norujukan')->toArray(); $list_advansur_today = Advansur::on($cawangan['mysql'])->where('tarikh',$current->toDateString())->pluck('norujukan')->toArray(); - $gadai_tebus = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->update([ + $gadai_tebus = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->update([ 'taglel' => 0 ]); - $gadai_advansur = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->update([ + $gadai_advansur = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->update([ 'sttebus' => '', 'taglel' => 0 ]); diff --git a/app/Http/Controllers/TacExpressPaymentController.php b/app/Http/Controllers/TacExpressPaymentController.php index 5e5cf7d..feb455a 100644 --- a/app/Http/Controllers/TacExpressPaymentController.php +++ b/app/Http/Controllers/TacExpressPaymentController.php @@ -26,8 +26,8 @@ class TacExpressPaymentController extends Controller $messages = 'SPARE : SMS-OTP '. $request->otp_token . ' for one time usage on ' . $expired_at . '. Call AR-RAHN CARELINE CENTRE 1300-22-4343 if not request'; $status = Http::get('http://gateway.onewaysms.com.au:10001/api.aspx',[ - 'apiusername' => 'APIQ4LP5EMKXM', - 'apipassword' => 'APIQ4LP5EMKXM7CQOX', + 'apiusername' => 'APIUK330HDAFO', + 'apipassword' => 'APIUK330HDAFOUK330', 'senderid' => 'INFO', 'mobileno' => $mobileno, 'message'=> $messages, diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 8bb2172..71dc89b 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -203,6 +203,10 @@ class TebusController extends Controller } $upah_semasa = (float)$upah_semasa - $upahtelahbayar; + if($upah_semasa <= 0){ + $upah_semasa = 0; + } + return $upah_semasa; } @@ -238,6 +242,10 @@ class TebusController extends Controller $upah_semasa = str_replace(',','',$upah_semasa); } $upah_semasa = (float)$upah_semasa - $upahtelahbayar; + + if($upah_semasa <= 0){ + $upah_semasa = 0; + } return response()->json($upah_semasa); } @@ -568,8 +576,8 @@ class TebusController extends Controller ->whereNotNull('hargajualan') ->where('hargajualan','<>','bakihargajualan'); - $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm'); - $bilpenebusantawarruq = $tebustawarruq->count(); + $totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman'); + $bilpenebusantawarruq = $tebustawarruq->count(); $totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate'); $totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah'); diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php index 0cd76a5..f64ff7f 100644 --- a/app/Http/Controllers/TunaiController.php +++ b/app/Http/Controllers/TunaiController.php @@ -393,7 +393,7 @@ class TunaiController extends Controller $teller = Tunai::on($cawangan['mysql']) ->select('kodlaluan') - ->whereRaw('LENGTH(kodlaluan) > 14') + ->whereRaw('LENGTH(kodlaluan) > 10') ->distinct() ->get(); diff --git a/routes/web.php b/routes/web.php index 578ab7c..6b83392 100644 --- a/routes/web.php +++ b/routes/web.php @@ -340,6 +340,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ //Tuntut Baki $router->get('TuntutBaki/{kodcaw}',['uses'=>'LelongController@showTuntutBaki']); + $router->get('TuntutBakiTarikh/{kodcaw}',['uses'=>'LelongController@showTuntutBakiTarikh']); $router->get('TuntutBaki/{kodcaw}/teller',['uses'=>'LelongController@showTuntutBakiTeller']); $router->get('TuntutBaki/resit/{kodcaw}/{norujukan}',['uses'=>'LelongController@resitLelong']); $router->post('Tuntutbakisimpan/{kodcaw}',['uses'=>'LelongController@simpantuntutbaki']); From 6bb56b94e1fc41ad277459301515da6901c13719 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 19 Sep 2021 08:09:49 +0800 Subject: [PATCH 06/23] add each cawangan nama cawangan --- app/Http/Controllers/CustomerController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 20d3ddc..905b3d3 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -719,9 +719,9 @@ class CustomerController extends Controller ->select('kodcaw') ->where('nokp', '=', $ic) ->first(); - + if($customer) - array_push($custcawangan, $customer); + array_push($custcawangan,['kodcaw' => $customer['kodcaw'], 'namacawangan' => $cawangan['details_caw']]); } return response()->json($custcawangan); From 95ff170d1296a42c5ac55eb630fc1f019ffee5c7 Mon Sep 17 00:00:00 2001 From: Afiq Zakwan Hamdan Date: Sun, 19 Sep 2021 16:15:28 +0800 Subject: [PATCH 07/23] fix lelong --- app/Http/Controllers/LelongController.php | 54 ++++------------------- 1 file changed, 8 insertions(+), 46 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 87b4853..8035f8c 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -171,7 +171,7 @@ class LelongController extends Controller ->where('t_jual','<=',$request->tarikh) ->where(function($query) use ($tarikhbaru){ $query->whereNull('trkhtuntut') - ->orWhere('trkhtuntut','>','2021-02-25'); + ->orWhere('trkhtuntut','>',$tarikhbaru); }) ->where('baki','>=',0) ->sum('baki'); @@ -236,57 +236,19 @@ class LelongController extends Controller $tarikhbaru = $request->mula; $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - if($kodcaw == 'KB2') - { - if($request->tarikh <= '2021-02-25') - { - $bakilelong = Lelong::on($cawangan['mysql']) - ->where('t_jual','>=',$request->mula) - ->where('t_jual','<=',$request->hingga) - ->where(function($query) use ($tarikhbaru){ - $query->whereNull('trkhtuntut') - ->orWhere('trkhtuntut','>',$tarikhbaru); - }) - ->where('baki','>=',0) - ->sum('baki'); - }else{ - $bakilelong = Lelong::on($cawangan['mysql']) - ->where('t_jual','>=',$request->mula) - ->where('t_jual','<=',$request->hingga) - ->where(function($query) use ($tarikhbaru){ - $query->whereNull('trkhtuntut') - ->orWhere('trkhtuntut','>','2021-02-25'); - }) - ->where('baki','>=',0) - ->sum('baki'); - } - }else{ - $bakilelong = Lelong::on($cawangan['mysql']) - ->where('trkhtuntut','>=',$request->mula) - ->where('trkhtuntut','<=',$request->hingga) - // ->where(function($query) use ($tarikhbaru){ - // $query->whereNull('trkhtuntut') - // ->orWhere('trkhtuntut','>',$tarikhbaru); - // }) - ->where('baki','>=',0) - ->sum('baki'); - } - - $ansrugi = AnsRugi::on($cawangan['mysql']) - ->sum('bayaran'); + + $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) - //->where(function($query) use ($tarikhbaru) - //{ - // $query->whereNull('t_jual') - // ->orWhere('t_jual','>',$tarikhbaru); - //}) ->where('baki','<',0) ->sum('baki'); - - // $rugitotal = $rugilelong + $ansrugi; + $rugitotal = $rugilelong; $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal]; From 3174cddc7af9ac65dbbb354940f2f2561a341b0b Mon Sep 17 00:00:00 2001 From: Afiq Zakwan Hamdan Date: Wed, 22 Sep 2021 00:54:01 +0800 Subject: [PATCH 08/23] bayaran lelong --- app/Http/Controllers/TebusController.php | 2 ++ routes/web.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 71dc89b..9f0f36d 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -164,6 +164,8 @@ class TebusController extends Controller public function getMoratorium(){ $bln_mora = Moratorium::first(); + + return response()->json($bln_mora); } public function updateMoratorium(Request $request){ diff --git a/routes/web.php b/routes/web.php index 6b83392..285a2fa 100644 --- a/routes/web.php +++ b/routes/web.php @@ -101,6 +101,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('tebus/laporan/{kodcaw}/{tarikh}',['uses'=>'TebusController@getLaporanTebus']); $router->get('tebus/laporanjenistawarruq/{kodcaw}',['uses'=>'TebusController@getLaporanTebusPengasingan']); + $router->get('moratorium/details',['uses'=>'TebusController@getMoratorium']); + //Maintenance API TEBUS // $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']); $router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']); From b3c6362cb0b057b5facf0ed74ac69f02b8dad14e Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Thu, 23 Sep 2021 10:35:56 +0800 Subject: [PATCH 09/23] fix api --- app/Http/Controllers/TransactionController.php | 15 +++++++++++++++ routes/web.php | 3 +++ 2 files changed, 18 insertions(+) diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index d29f2dc..6167d8a 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Transaction; +use App\TransaksiKeuntungan; use App\Pengguna; use App\Cawangan; @@ -103,4 +104,18 @@ class TransactionController extends Controller return response()->json($transaction); } + + public function TransaksiPelanggan(Request $request){ + + $transaction = TransaksiKeuntungan::on('mysql7') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->where('trans.norujukan','=',$request->norujukan) + ->get(); + + return response()->json($transaction); + } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index b70fa21..8b97767 100644 --- a/routes/web.php +++ b/routes/web.php @@ -553,4 +553,7 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){ $router->group(['prefix'=>'portal'], function () use ($router){ $router->get('financeMonth',['uses'=>'GadaiController@PembiayaanBulanan']); + $router->get('transaksipelanggan',['uses'=>'TransactionController@TransaksiPelanggan']); }); + + From ff69cf769eb2d50e17b2a4c04412fedfbd78c8ad Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Fri, 24 Sep 2021 00:05:32 +0800 Subject: [PATCH 10/23] fix skit2 --- app/Http/Controllers/LaporanController.php | 77 +++++++++++++++++++--- 1 file changed, 67 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 9381385..fe99a89 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -41,6 +41,7 @@ class LaporanController extends Controller $total_keuntungantebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('bakiupah'); $total_keuntunganansuran = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->leftJoin('transaction as trans', function($join) { $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); @@ -49,12 +50,65 @@ class LaporanController extends Controller ->whereDate('trans.created_at','=',$request->tarikh) ->where('trans.kodcaw','=',$request->kodcaw) ->where('trans.trans_type','=','A') - // ->groupBy('trans.id') + ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); + $total_keuntunganbukanansuran = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->where('trans.trans_type','!=','A') + ->whereDate('trans.created_at','=',$request->tarikh) + ->where('trans.kodcaw','=',$request->kodcaw) + ->whereNotNull('db2.hargajualan') + ->sum('keuntungan_rebet'); - // $total_ansuran = number_format($total_ansuran,2); - $total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus); + $keuntungan = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh) + ->whereNull('db2.hargajualan') + ->sum('bayaran_keuntungan'); + + $upahtebus = Tebus::on($cawangan['mysql']) + ->where('t_tebus','=',$request->tarikh) + ->sum('upahdibayar'); + + $upahlelong = Lelong::on($cawangan['mysql']) + ->where('t_jual','=',$request->tarikh) + ->sum('bakiupah'); + + $upahansur = Advansur::on($cawangan['mysql']) + ->where('tarikh','=',$request->tarikh) + ->sum('upahdibayar'); + + + $upahsimpan = $keuntungan + $upahtebus + $upahlelong + $upahansur; + $keuntungansebenar = $total_keuntunganansuran + $total_keuntunganbukanansuran; + + + $total_keuntungan = floatval($upahsimpan) + floatval($keuntungansebenar); + + + $tebus = Tebus::on($cawangan['mysql']) + ->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg') + ->join('gadai as gad','gad.norujukan','=','tebus.norujukan') + ->where('tebus.t_tebus','=',$request->tarikh) + ->get(); + + $totalpenebusan = 0; + + foreach($tebus as $index1=>$teb) + { + if($teb['gad.hargajualan'] != $teb['bakihargajualan']) + { + $totalpenebusan += $teb['gadaibakipjm']; + }else{ + $totalpenebusan += $teb['pinjaman']; + } + } //b @@ -183,10 +237,12 @@ class LaporanController extends Controller } //g - $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh); + $tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->where('jumlah','<',0); + $tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->where('jumlah','>',0); + + $bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah'); + $bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah'); - $bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah'); - $bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah'); //h $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('pinjaman'); @@ -209,7 +265,7 @@ class LaporanController extends Controller array_push($laporan_harian,[ 'total_gadai'=>$total_gadai, - 'total_tebus'=>$total_tebus, + 'total_tebus'=>$totalpenebusan, 'total_ansuran'=>$total_ansuran, 'bilangan_gadai'=>$bilangan_gadai, 'bilangan_tebus'=>$bilangan_tebus, @@ -316,10 +372,11 @@ class LaporanController extends Controller } //g - $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]]); + $tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','<',0); + $tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','>',0); - $bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah'); - $bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah'); + $bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah'); + $bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah'); //h $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('pinjaman'); From 25d3da66adf92a272b52ee30463ce7fe4f5f2353 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Fri, 24 Sep 2021 06:11:08 +0800 Subject: [PATCH 11/23] untuk laporan harian --- app/Http/Controllers/LaporanController.php | 77 +++++++++++++++++++--- 1 file changed, 67 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 9381385..fe99a89 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -41,6 +41,7 @@ class LaporanController extends Controller $total_keuntungantebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('bakiupah'); $total_keuntunganansuran = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->leftJoin('transaction as trans', function($join) { $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); @@ -49,12 +50,65 @@ class LaporanController extends Controller ->whereDate('trans.created_at','=',$request->tarikh) ->where('trans.kodcaw','=',$request->kodcaw) ->where('trans.trans_type','=','A') - // ->groupBy('trans.id') + ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); + $total_keuntunganbukanansuran = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->where('trans.trans_type','!=','A') + ->whereDate('trans.created_at','=',$request->tarikh) + ->where('trans.kodcaw','=',$request->kodcaw) + ->whereNotNull('db2.hargajualan') + ->sum('keuntungan_rebet'); - // $total_ansuran = number_format($total_ansuran,2); - $total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus); + $keuntungan = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh) + ->whereNull('db2.hargajualan') + ->sum('bayaran_keuntungan'); + + $upahtebus = Tebus::on($cawangan['mysql']) + ->where('t_tebus','=',$request->tarikh) + ->sum('upahdibayar'); + + $upahlelong = Lelong::on($cawangan['mysql']) + ->where('t_jual','=',$request->tarikh) + ->sum('bakiupah'); + + $upahansur = Advansur::on($cawangan['mysql']) + ->where('tarikh','=',$request->tarikh) + ->sum('upahdibayar'); + + + $upahsimpan = $keuntungan + $upahtebus + $upahlelong + $upahansur; + $keuntungansebenar = $total_keuntunganansuran + $total_keuntunganbukanansuran; + + + $total_keuntungan = floatval($upahsimpan) + floatval($keuntungansebenar); + + + $tebus = Tebus::on($cawangan['mysql']) + ->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg') + ->join('gadai as gad','gad.norujukan','=','tebus.norujukan') + ->where('tebus.t_tebus','=',$request->tarikh) + ->get(); + + $totalpenebusan = 0; + + foreach($tebus as $index1=>$teb) + { + if($teb['gad.hargajualan'] != $teb['bakihargajualan']) + { + $totalpenebusan += $teb['gadaibakipjm']; + }else{ + $totalpenebusan += $teb['pinjaman']; + } + } //b @@ -183,10 +237,12 @@ class LaporanController extends Controller } //g - $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh); + $tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->where('jumlah','<',0); + $tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->where('jumlah','>',0); + + $bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah'); + $bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah'); - $bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah'); - $bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah'); //h $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('pinjaman'); @@ -209,7 +265,7 @@ class LaporanController extends Controller array_push($laporan_harian,[ 'total_gadai'=>$total_gadai, - 'total_tebus'=>$total_tebus, + 'total_tebus'=>$totalpenebusan, 'total_ansuran'=>$total_ansuran, 'bilangan_gadai'=>$bilangan_gadai, 'bilangan_tebus'=>$bilangan_tebus, @@ -316,10 +372,11 @@ class LaporanController extends Controller } //g - $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]]); + $tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','<',0); + $tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','>',0); - $bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah'); - $bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah'); + $bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah'); + $bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah'); //h $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('pinjaman'); From fa7649d9d9e1d06d0ba98423f7f6b3a4c31749ae Mon Sep 17 00:00:00 2001 From: afiq Date: Tue, 28 Sep 2021 10:03:01 +0800 Subject: [PATCH 12/23] first --- app/Audit.php | 11 + app/Http/Controllers/GadaiController.php | 292 ++++++++++++++---- app/Http/Controllers/LaporanController.php | 23 +- app/Http/Controllers/MarhunController.php | 38 +++ .../TacExpressPaymentController.php | 4 +- app/Http/Controllers/TebusController.php | 41 ++- 6 files changed, 335 insertions(+), 74 deletions(-) create mode 100644 app/Audit.php diff --git a/app/Audit.php b/app/Audit.php new file mode 100644 index 0000000..a0055bd --- /dev/null +++ b/app/Audit.php @@ -0,0 +1,11 @@ +where('kodcaw','=',$request->kodcaw) ->first(); + if($request->transaction == 'Ubah Gadai'){ + $old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); + } $gadai = Gadai::on($cawangan['mysql']) ->where('norujukan','=',$norujukan) ->update(array( @@ -244,6 +249,22 @@ class GadaiController extends Controller 'tempohbayar' => 0.00, 'lelong_tawarruq' => 1 )); + + $new_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); + + $audit = new Audit(); + $audit->users = $request->teller; + $audit->actions = $request->transaction; + $audit->norujukan = $norujukan; + $audit->new_data = $new_data; + if($request->transaction == 'Ubah Gadai'){ + $audit->old_data = $old_data; + } + $audit->kodcaw = $request->kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); + return response()->json($gadai, 200); } @@ -384,6 +405,8 @@ class GadaiController extends Controller $lelong_tawarruq = 1; } + $old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); + $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran; $baki_bayaran = $request->bayaran - $upahsemasa; @@ -418,6 +441,20 @@ class GadaiController extends Controller 'tempohbayar' => $gadai['tempoh'], 'lelong_tawarruq' => $lelong_tawarruq )); + + $new_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); + + $audit = new Audit(); + $audit->users = $request->teller; + $audit->actions = 'Bayaran Ansuran'; + $audit->norujukan = $norujukan; + $audit->new_data = $new_data; + $audit->old_data = $old_data; + $audit->kodcaw = $kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); + return response()->json($update_gadai, 200); } @@ -456,9 +493,21 @@ class GadaiController extends Controller public function batalGadai($kodcaw, $norujukan){ $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); + Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); + $audit = new Audit(); + $audit->users = $request->teller; + $audit->actions = $request->transaction; + $audit->norujukan = $norujukan; + $audit->old_data = $old_data; + $audit->kodcaw = $request->kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); + return response('Batal Berjaya', 200); } @@ -575,17 +624,34 @@ class GadaiController extends Controller public function getLaporanGadai($kodcaw,$tarikh){ $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $gadai = Gadai::on($cawangan['mysql']) - ->select('gadai.t_gadai','gadai.norujukan','cust.nama','gadai.nokp','gadai.semakbarcode','gadai.masa','gadai.berat','gadai.nilaimarhun','gadai.pinjaman','gadai.upah12','gadai.percentpinj','cust.alamat1','gadai.teller') - ->join('online_arrahn.customer as cust', function($join) - { - $join->on('gadai.nokp', '=', 'cust.kpbaru'); - $join->orOn('gadai.nokp', '=', 'cust.kplama'); - }) - ->where('gadai.t_gadai','=',$tarikh) - ->orderBy('gadai.teller') - ->orderBy('gadai.sirig') - ->get(); + $gadai_data = Gadai::on($cawangan['mysql'])->select('t_gadai','norujukan','nokp','semakbarcode','masa','berat','nilaimarhun','pinjaman','upah12','percentpinj','teller','nokp') + ->where('t_gadai','=',$tarikh) + ->orderBy('teller') + ->orderBy('sirig') + ->get(); + + $gadai = []; + + if($gadai_data){ + foreach($gadai_data as $index=>$gadaiData){ + $customer_info = Customer::on('mysql7')->where('kplama','=',$gadaiData['nokp'])->orWhere('kpbaru','=',$gadaiData['nokp'])->first(); + array_push($gadai,[ + "t_gadai"=> $gadaiData['t_gadai'], + "norujukan"=> $gadaiData['norujukan'], + "nama"=> $customer_info['nama'], + "nokp"=> $gadaiData['nokp'], + "semakbarcode"=> $gadaiData['semakbarcode'], + "masa"=> $gadaiData['masa'], + "berat"=> $gadaiData['berat'], + "nilaimarhun"=> $gadaiData['nilaimarhun'], + "pinjaman"=> $gadaiData['pinjaman'], + "upah12"=> $gadaiData['upah12'], + "percentpinj"=> $gadaiData['percentpinj'], + "alamat1"=> $customer_info['alamat1'], + "teller"=> $gadaiData['teller'] + ]); + } + } return response()->json($gadai); } @@ -935,8 +1001,8 @@ class GadaiController extends Controller $dateans = new Carbon($request->tarikh); - $ansuran = Transaction::on('mysql7') - ->select('transaction.norujukan','trans.tarikh_bayaran','transaction.nokp','transaction.kodcaw','transaction.trans_type','cust.nama','db2.tempoh','db2.bakipjm','trans.bayaran_pembiayaan','transaction.duit_masuk','trans.bayaran_keuntungan','transaction.teller') + $ansuran_data = Transaction::on('mysql7') + ->select('transaction.norujukan','trans.tarikh_bayaran','transaction.nokp','transaction.kodcaw','transaction.trans_type','cust.nama','trans.bayaran_pembiayaan','transaction.duit_masuk','trans.bayaran_keuntungan','transaction.teller') ->leftJoin('transaksi_keuntungan as trans', function($join) { $join->on('transaction.norujukan', '=', 'trans.norujukan'); @@ -947,13 +1013,35 @@ class GadaiController extends Controller $join->on('transaction.nokp', '=', 'cust.kpbaru'); $join->orOn('transaction.nokp', '=', 'cust.kplama'); }) - ->leftJoin($cawangan['db_name'].'.gadai as db2','transaction.norujukan','=','db2.norujukan') ->where('transaction.kodcaw','=',$kodcaw) ->where('transaction.trans_type','=','A') ->whereDate('transaction.created_at','=',$dateans) ->orderBy('transaction.teller') ->get(); + $ansuran = []; + + if($ansuran_data){ + foreach($ansuran_data as $index=>$ansuranData){ + $gadai = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranData['norujukan'])->first(); + + array_push($ansuran,[ + "norujukan" => $ansuranData['norujukan'], + "tarikh_bayaran" => $ansuranData['tarikh_bayaran'], + "nokp" => $ansuranData['nokp'], + "kodcaw" => $ansuranData['kodcaw'], + "trans_type" => $ansuranData['trans_type'], + "nama" => $ansuranData['nama'], + "tempoh" => $gadai['tempoh'], + "bakipjm" => $gadai['bakipjm'], + "bayaran_pembiayaan" => $ansuranData['bayaran_pembiayaan'], + "duit_masuk" => $ansuranData['duit_masuk'], + "bayaran_keuntungan" => $ansuranData['bayaran_keuntungan'], + "teller" => $ansuranData['teller'] + ]); + } + } + return response()->json($ansuran); } @@ -1271,91 +1359,150 @@ class GadaiController extends Controller $daterequest = new Carbon($tarikh); - $ansuran1 = TransaksiKeuntungan::on('mysql7') + $ansuran1_data = TransaksiKeuntungan::on('mysql7') ->leftJoin('transaction as trans', function($join) { $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) - ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan') ->where('trans.created_at','<',$daterequest) ->where('trans.trans_type','=','A') - ->where('db2.sttebus','=','') - ->whereBetween('nilaimarhun', [1, 400.99]) ->groupBy('trans.id') ->get(); - $ansuranharini1 = TransaksiKeuntungan::on('mysql7') + $ansuran1 = []; + + if($ansuran1_data){ + foreach($ansuran1_data as $index=>$ansuran1Data){ + $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran1Data['norujukan'])->first(); + if($gadaiData){ + if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 1 && $gadaiData['nilaimarhun'] <= 400.99){ + array_push($ansuran1,['bayaran_pembiayaan'=>$ansuran1Data['bayaran_pembiayaan']]); + } + } + } + } + + $ansuranharini1_data = TransaksiKeuntungan::on('mysql7') ->leftJoin('transaction as trans', function($join) { $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) - ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan') - // ->where('trans.created_at','=',$daterequest) ->whereDate('trans.created_at','=',$tarikh) ->where('trans.trans_type','=','A') - ->where('db2.sttebus','=','') - ->whereBetween('nilaimarhun', [1, 400.99]) ->groupBy('trans.id') ->get(); - $ansuran2 = TransaksiKeuntungan::on('mysql7') + $ansuranharini1 = []; + + if($ansuranharini1_data){ + foreach($ansuranharini1_data as $index=>$ansuranharini1Data){ + $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini1Data['norujukan'])->first(); + if($gadaiData){ + if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 1 && $gadaiData['nilaimarhun'] <= 400.99){ + array_push($ansuranharini1,['bayaran_pembiayaan'=>$ansuranharini1Data['bayaran_pembiayaan']]); + } + } + } + } + + $ansuran2_data = TransaksiKeuntungan::on('mysql7') ->leftJoin('transaction as trans', function($join) { $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) - ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan') ->where('trans.created_at','<',$daterequest) ->where('trans.trans_type','=','A') - ->where('db2.sttebus','=','') - ->whereBetween('nilaimarhun', [401, 2000.99]) ->groupBy('trans.id') ->get(); - $ansuranharini2 = TransaksiKeuntungan::on('mysql7') + $ansuran2 = []; + + if($ansuran2_data){ + foreach($ansuran2_data as $index=>$ansuran2Data){ + $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran2Data['norujukan'])->first(); + if($gadaiData){ + if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 401 && $gadaiData['nilaimarhun'] <= 2000.99){ + array_push($ansuran2,['bayaran_pembiayaan'=>$ansuran2Data['bayaran_pembiayaan']]); + } + } + } + } + + $ansuranharini2_data = TransaksiKeuntungan::on('mysql7') ->leftJoin('transaction as trans', function($join) { $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) - ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan') ->whereDate('trans.created_at','=',$tarikh) ->where('trans.trans_type','=','A') - ->where('db2.sttebus','=','') - ->whereBetween('nilaimarhun', [401, 2000.99]) ->groupBy('trans.id') ->get(); - $ansuran3 = TransaksiKeuntungan::on('mysql7') + $ansuranharini2 = []; + + if($ansuranharini2_data){ + foreach($ansuranharini2_data as $index=>$ansuranharini2Data){ + $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini2Data['norujukan'])->first(); + if($gadaiData){ + if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 401 && $gadaiData['nilaimarhun'] <= 2000.99){ + array_push($ansuranharini2,['bayaran_pembiayaan'=>$ansuranharini2Data['bayaran_pembiayaan']]); + } + } + } + } + + $ansuran3_data = TransaksiKeuntungan::on('mysql7') ->leftJoin('transaction as trans', function($join) { $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) - ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan') ->where('trans.created_at','<',$daterequest) ->where('trans.trans_type','=','A') - ->where('db2.sttebus','=','') - ->whereBetween('nilaimarhun', [2001, 100000]) ->groupBy('trans.id') ->get(); + + $ansuran3 = []; + + if($ansuran3_data){ + foreach($ansuran3_data as $index=>$ansuran3Data){ + $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuran3Data['norujukan'])->first(); + if($gadaiData){ + if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 2001 && $gadaiData['nilaimarhun'] <= 100000){ + array_push($ansuran3,['bayaran_pembiayaan'=>$ansuran3Data['bayaran_pembiayaan']]); + } + } + } + } - $ansuranharini3 = TransaksiKeuntungan::on('mysql7') + $ansuranharini3_data = TransaksiKeuntungan::on('mysql7') ->leftJoin('transaction as trans', function($join) { $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) - ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan') ->whereDate('trans.created_at','=',$tarikh) ->where('trans.trans_type','=','A') - ->where('db2.sttebus','=','') - ->whereBetween('nilaimarhun', [2001, 100000]) ->groupBy('trans.id') ->get(); + $ansuranharini3 = []; + + if($ansuranharini3_data){ + foreach($ansuranharini3_data as $index=>$ansuranharini3Data){ + $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$ansuranharini3Data['norujukan'])->first(); + if($gadaiData){ + if($gadaiData['sttebus'] == '' && $gadaiData['nilaimarhun']>= 2001 && $gadaiData['nilaimarhun'] <= 100000){ + array_push($ansuranharini3,['bayaran_pembiayaan'=>$ansuranharini3Data['bayaran_pembiayaan']]); + } + } + } + } + //Calculation Ansuran guna foreach $totalans1 = 0;$totalharinians1 = 0; @@ -2609,25 +2756,25 @@ class GadaiController extends Controller $keuntungan = Gadai::on($cawangan['mysql']) ->where('t_gadai','<=',$request->tarikh) - // ->where('t_gadai','>=','2021-04-14') ->where('hargajualan','<>','null') - // ->where('sttebus','=','') ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']]) ->whereNotNull('upah12') ->sum('upah12'); - $transaksi = TransaksiKeuntungan::on('mysql7') - ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) + $transaksi_data = TransaksiKeuntungan::on('mysql7') ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) ->whereYear('tarikh_bayaran','=',$current->year) - ->whereNotNull('db2.hargajualan') - ->sum('bayaran_keuntungan'); + ->get(); - // $transaksi = TransaksiKeuntungan::on('mysql7') - // ->where('tarikh_bayaran' ,'>=', $datetawarruq) - // ->where('tarikh_bayaran' ,'<=', $daterequest) - // ->sum('bayaran_keuntungan'); + $transaksi = 0; + if($transaksi_data){ + foreach($transaksi_data as $index=>$transaksiData){ + $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$transaksiData['norujukan'])->whereNotNull('hargajualan')->first(); + if($gadaiData){ + $transaksi += $transaksiData['bayaran_keuntungan']; + } + } + } $totalkeuntungan = $keuntungan - $transaksi; @@ -2675,11 +2822,24 @@ class GadaiController extends Controller $current = Carbon::now(); $current = new Carbon(); - $transaksi = TransaksiKeuntungan::on('mysql7') - ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]]) - ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]]) - ->sum('bayaran_pembiayaan'); + $transaksi_data = TransaksiKeuntungan::on('mysql7') + ->where('tarikh_bayaran' ,'<=', $daterequest) + // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + // ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]]) + // ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]]) + // ->sum('bayaran_pembiayaan'); + ->get(); + + $transaksi = 0; + + if($transaksi_data){ + foreach($transaksi_data as $index=>$transaksiData){ + $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$transaksiData['norujukan'])->first(); + if($gadaiData && (($gadaiData['sttebus'] == '' && $gadaiData['hargajualan'] != null) || ($gadaiData['sttebus'] != '' && $gadaiData['t_update'] > $request->tarikh && $gadaiData['hargajualan'] != null))){ + $transaksi += $transaksiData['bayaran_pembiayaan']; + } + } + } return response($transaksi); } @@ -2698,11 +2858,23 @@ class GadaiController extends Controller $current = Carbon::now(); $current = new Carbon(); - $transaksi = TransaksiKeuntungan::on('mysql7') - ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) - ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) - ->sum('bayaran_pembiayaan'); + $transaksi_data = TransaksiKeuntungan::on('mysql7') + ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) + // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + // ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) + // ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) + // ->sum('bayaran_pembiayaan'); + ->get(); + + $transaksi = 0; + if($transaksi_data){ + foreach($transaksi_data as $index=>$transaksiData){ + $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$transaksiData['norujukan'])->first(); + if($gadaiData && (($gadaiData['sttebus'] == '' && $gadaiData['hargajualan'] != null) || ($gadaiData['sttebus'] != '' && $gadaiData['t_update'] > $request->mula && $gadaiData['hargajualan'] != null))){ + $transaksi += $transaksiData['bayaran_pembiayaan']; + } + } + } return response($transaksi); } diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 9381385..4d8bf82 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -124,12 +124,25 @@ class LaporanController extends Controller $daterequest = new Carbon($request->tarikh); $daterequest->addDays(1); - $bayaranpendahuluan = TransaksiKeuntungan::on('mysql7') - ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->where('db2.sttebus','=','') - ->where('db2.hargajualan','<>','null') + $bayaranpendahuluan_data = TransaksiKeuntungan::on('mysql7') + // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + // ->where('db2.sttebus','=','') + // ->where('db2.hargajualan','<>','null') ->where('tarikh_bayaran' ,'<=', $daterequest) - ->sum('bayaran_pembiayaan'); + // ->sum('bayaran_pembiayaan'); + ->get(); + + $bayaranpendahuluan = 0; + + if($bayaranpendahuluan_data){ + foreach($bayaranpendahuluan_data as $index=>$bayaranpendahuluanData){ + $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$bayaranpendahuluanData['norujukan']],['sttebus',''],['hargajualan','<>','null']])->first(); + if($gadaiData){ + $bayaranpendahuluan += $bayaranpendahuluanData['bayaran_pembiayaan']; + } + } + } + $outstandingimbangduga = floatval($rekodkoop) + floatval($rekodtawarruq) - floatval($bayaranpendahuluan); diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index c8d1339..3d48c3f 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -6,6 +6,7 @@ use App\Marhun; use App\Jemas; use App\Cawangan; use Illuminate\Http\Request; +use App\Audit; use Carbon\Carbon; @@ -62,6 +63,16 @@ class MarhunController extends Controller 'n_marhun' => $request->nilai_marhun ]); + $audit = new Audit(); + $audit->users = $request->teller; + $audit->actions = 'Daftar Marhun'; + $audit->norujukan = $request->norujukan; + $audit->new_data = $marhun; + $audit->kodcaw = $kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); + return response()->json($marhun, 201); } @@ -83,8 +94,20 @@ class MarhunController extends Controller { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $old_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first(); + $jemas = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->delete(); + $audit = new Audit(); + $audit->users = $request->teller; + $audit->actions = 'Hapus Marhun'; + $audit->norujukan = $norujukan; + $audit->old_data = $old_data; + $audit->kodcaw = $kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); + return response('Deleted Successfully', 200); } @@ -92,6 +115,8 @@ class MarhunController extends Controller { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $old_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first(); + $jemas = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->update( [ 'karat' => $request->karat, @@ -102,6 +127,19 @@ class MarhunController extends Controller 'n_marhun' => $request->n_marhun ]); + $new_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first(); + + $audit = new Audit(); + $audit->users = $request->teller; + $audit->actions = 'Ubah Marhun'; + $audit->norujukan = $norujukan; + $audit->old_data = $old_data; + $audit->new_data = $new_data; + $audit->kodcaw = $kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); + return response('Edit Successfully', 200); } diff --git a/app/Http/Controllers/TacExpressPaymentController.php b/app/Http/Controllers/TacExpressPaymentController.php index feb455a..0a91874 100644 --- a/app/Http/Controllers/TacExpressPaymentController.php +++ b/app/Http/Controllers/TacExpressPaymentController.php @@ -21,8 +21,8 @@ class TacExpressPaymentController extends Controller 'expired_at' => $expired_at ]); - $mobileno = '6'.$request->mobileno; - // $mobileno = '60189025461'; + // $mobileno = '6'.$request->mobileno; + $mobileno = '60189025461'; $messages = 'SPARE : SMS-OTP '. $request->otp_token . ' for one time usage on ' . $expired_at . '. Call AR-RAHN CARELINE CENTRE 1300-22-4343 if not request'; $status = Http::get('http://gateway.onewaysms.com.au:10001/api.aspx',[ diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 71dc89b..f4d0db8 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -19,6 +19,7 @@ use App\Parameter; use App\Panjar; use App\HargaEmas; use App\Moratorium; +use App\Audit; use Illuminate\Http\Request; @@ -62,11 +63,11 @@ class TebusController extends Controller $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']); $upah_semasa_round = number_format($upahsemasa_raw,2); - if(strpos($upah_semasa_round,',')){ + if(strpos($upah_semasa_round,',')){ $upah_semasa_round = str_replace(',','',$upah_semasa_round); } $upah_semasa = (float)substr($upah_semasa_round, 0, -1); - if(strpos($upah_semasa,',')){ + if(strpos($upah_semasa,',')){ $upah_semasa = str_replace(',','',$upah_semasa); } @@ -87,11 +88,11 @@ class TebusController extends Controller $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); $upah_rebet_round = number_format($upahrebet_raw,2); - if(strpos($upah_rebet_round,',')){ + if(strpos($upah_rebet_round,',')){ $upah_rebet_round = str_replace(',','',$upah_rebet_round); } $upah_rebet = (float)substr($upah_rebet_round, 0, -1); - if(strpos($upah_rebet,',')){ + if(strpos($upah_rebet,',')){ $upah_rebet = str_replace(',','',$upah_rebet); } @@ -203,7 +204,7 @@ class TebusController extends Controller } $upah_semasa = (float)$upah_semasa - $upahtelahbayar; - if($upah_semasa <= 0){ + if($upah_semasa <= 0){ $upah_semasa = 0; } @@ -243,7 +244,7 @@ class TebusController extends Controller } $upah_semasa = (float)$upah_semasa - $upahtelahbayar; - if($upah_semasa <= 0){ + if($upah_semasa <= 0){ $upah_semasa = 0; } @@ -435,6 +436,22 @@ class TebusController extends Controller 'bakiharga' => $baki_hargajualan, ]); } + + $audit = new Audit(); + $audit->users = $request->teller; + if($request->jenistebus == 'P'){ + $audit->actions = "Tambah Pembiayaan"; + }else if($request->jenistebus == 'S'){ + $audit->actions = "Tebus Separuh"; + }else if($request->jenistebus == 'T'){ + $audit->actions = "Tebus Penuh"; + } + $audit->norujukan = $norujukan; + $audit->new_data = $create_tebus; + $audit->kodcaw = $kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); return response()->json($update_gadai, 201); } @@ -527,6 +544,16 @@ class TebusController extends Controller 'created_at' => $current, 'bakiharga' => 0, ]); + + $audit = new Audit(); + $audit->users = $request->teller; + $audit->actions = "Auto Tawarruq"; + $audit->norujukan = $norujukan; + $audit->new_data = $create_tebus; + $audit->kodcaw = $kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); return response()->json($update_gadai, 201); } @@ -1227,7 +1254,7 @@ class TebusController extends Controller ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); - $total = ($ansuran + $bukanansuran); + $total = ($ansuran + $bukanansuran); return response($total); } From 466f41ae50b4cfc6589a0854891a298b6b80f8ab Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sat, 2 Oct 2021 09:55:22 +0800 Subject: [PATCH 13/23] fix mohon and pendser --- app/DenoPendSer.php | 28 ++++++ app/Http/Controllers/KelulusanController.php | 19 +++- .../PendahuluanSerahanController.php | 96 +++++++++++++++++++ app/Http/Controllers/TunaiController.php | 1 + app/Http/Controllers/VaultController.php | 33 +++++++ app/Mohon.php | 9 +- app/Mohonid.php | 4 + app/Polis.php | 4 +- routes/web.php | 10 ++ 9 files changed, 197 insertions(+), 7 deletions(-) create mode 100644 app/DenoPendSer.php create mode 100644 app/Http/Controllers/PendahuluanSerahanController.php diff --git a/app/DenoPendSer.php b/app/DenoPendSer.php new file mode 100644 index 0000000..8a23a20 --- /dev/null +++ b/app/DenoPendSer.php @@ -0,0 +1,28 @@ + $norujukan, 'siri' => $request->siri, 'komen' => $request->komen, - 'lastdategadai' => $request->dategadai, + 'margin' => $request->margin, + 'nilaimarhun' => $request->nilaimarhun, + 'berat' => $request->berat, + 'status' => $request->status, 'bilgad' => $request->bilgadai, 'jumpinj' => $request->jumpinjam, 'jenistebus' => $request->jenistebus, 'teller' => $request->teller, 'pelulus' => ($request->pelulus) ? $request->pelulus : '' + + ]); } else if($roles == "operasi") @@ -226,7 +231,10 @@ class KelulusanController extends Controller 'norujukan'=> $norujukan, 'siri' => $request->siri, 'komen' => $request->komen, - 'lastdategadai' => $request->dategadai, + 'margin' => $request->margin, + 'nilaimarhun' => $request->nilaimarhun, + 'berat' => $request->berat, + 'status' => $request->status, 'bilgad' => $request->bilgadai, 'jumpinj' => $request->jumpinjam, 'jenistebus' => $request->jenistebus, @@ -255,7 +263,11 @@ class KelulusanController extends Controller 'tarikh'=> $harini->toDateString(), 'mohon' => $request->mohon, 'norujukan' => $norujukan, - 'katalaluan' => $request->message, + 'katalaluan' => '', + 'pinjaman' => $request->pinjaman, + 'nilaimarhun' => $request->nilaimarhun, + 'berat' => $request->berat, + 'margin' => $request->margin, 'benar' => '0', 'teller' => $request->teller ]); @@ -276,6 +288,7 @@ class KelulusanController extends Controller ->where('tarikh','=',$harini->toDateString()) ->where('norujukan','=',$norujukan) ->update(array( + 'katalaluan' => $request->komen, 'benar' => '2', 'id' => $request->khazanah )); diff --git a/app/Http/Controllers/PendahuluanSerahanController.php b/app/Http/Controllers/PendahuluanSerahanController.php new file mode 100644 index 0000000..983b7d3 --- /dev/null +++ b/app/Http/Controllers/PendahuluanSerahanController.php @@ -0,0 +1,96 @@ +create([ + + 'tarikh' => $current->toDateString(), + 'masa' => $current->toTimeString(), + 'kodcaw' => $kodcaw, + 'kodlaluan' => $request->kodlaluan, + 'amaun' => $request->amaun, + 'bd1' => $request->bd1, + 'bd5' => $request->bd5, + 'bd10' => $request->bd10, + 'bd20' => $request->bd20, + 'bd50' => $request->bd50, + 'bd100' => $request->bd100, + 'txtring1' => $request->txtring1, + 'txtring5' => $request->txtring5, + 'txtring10' => $request->txtring10, + 'txtring20' => $request->txtring20, + 'txtring50' => $request->txtring50, + 'txtring100' => $request->txtring100, + 'txtring1000' => $request->txtring1000, + 'txtsen1' => $request->txtsen1, + 'txtsen5' => $request->txtsen5, + 'txtsen10' => $request->txtsen10, + 'txtsen20' => $request->txtsen20, + 'txtsen50' => $request->txtsen50, + 'jenis' =>$request->jenis, + 'recno' =>$request->recno, + 'update' => '0' + ]); + + return response()->json($denopendser,200); + } + + public function getDenoPendSer($kodcaw,Request $request) + { + + $current = Carbon::now(); + $current = new Carbon(); + + + $denopendser = DenoPendSer::on('mysql7')->where('kodcaw','=', $kodcaw)->where('recno','=', $request->recno)->get(); + + return response()->json($denopendser,200); + } + + public function updateDenoPendSer($kodcaw,Request $request) + { + + $current = Carbon::now(); + $current = new Carbon(); + + + $denopendser = DenoPendSer::on('mysql7') + ->where('recno','=', $request->recno) + ->update(array( + 'pelulus' => $request->pelulus, + 'masalulus'=> $harini->toTimeString() + )); + + return response()->json($denopendser,200); + } + + public function delete(REQUEST $request,$kodcaw) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + GlDetail::on($cawangan['mysql'])->where('recno','=',$request->recno)->delete(); + + return response('Batal Berjaya', 200); + } + + +} diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php index 0cd76a5..7054128 100644 --- a/app/Http/Controllers/TunaiController.php +++ b/app/Http/Controllers/TunaiController.php @@ -394,6 +394,7 @@ class TunaiController extends Controller $teller = Tunai::on($cawangan['mysql']) ->select('kodlaluan') ->whereRaw('LENGTH(kodlaluan) > 14') + ->orWhere('kodlaluan','=','LELONG') ->distinct() ->get(); diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index 66daf7f..c30a119 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -8,6 +8,7 @@ use App\AddTunai; use App\GlDetail; use App\imbangdugalama; use App\GlCode; +use App\Panjar; use Illuminate\Http\Request; use Carbon\Carbon; @@ -163,6 +164,38 @@ class VaultController extends Controller return response()->json($updateVault, 200); } + public function updateVaultDeletePendahuluanSerahan($kodcaw, Request $request) + { + $current = Carbon::now(); + $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $vault=Vault::on($cawangan['mysql'])->where('kodcaw','=',$kodcaw)->where('tarikh','=',$current->toDateString())->orderby('tarikh','desc')->first(); + + $bakiawal = $vault['bakiawal']; + $keluar = $vault['keluar']; + $masuk = $vault['masuk']; + $bakiakhir = $vault['bakiakhir']; + $bakieod = $vault['bakieod']; + $pendahuluan = $vault['pendahuluan']; + $serahan = $vault['serahan']; + $totpanjaran = $vault['totpanjar']; + + $glpend = GlDetail::on($cawangan['mysql'])->where('tarikh','=', $current->toDateString())->sum('pendahuluan'); + $glser = GlDetail::on($cawangan['mysql'])->where('tarikh','=', $current->toDateString())->sum('serahan'); + + $bakiakhir = $bakiawal - $keluar + $masuk + $glpend - $glser - $totpanjaran; + + $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array( + 'pendahuluan' => $glpend, + 'serahan' => $glser, + 'bakiakhir'=>$bakiakhir, + 'bakieod'=>$bakiakhir + )); + + return response()->json($updateVault, 200); + } + public function create($kodcaw,Request $request) { $current = Carbon::now(); diff --git a/app/Mohon.php b/app/Mohon.php index 291f5a3..06a9b16 100644 --- a/app/Mohon.php +++ b/app/Mohon.php @@ -19,14 +19,17 @@ class Mohon extends Model 'norujukan', 'siri', 'komen', - 'lastdategadai', - 'bildad', + 'bilgad', 'jumpinj', 'jenistebus', 'teller', 'pelulus', 'peloperasi', - 'masalulus' + 'masalulus', + 'margin', + 'nilaimarhun', + 'berat', + 'status' ]; /** diff --git a/app/Mohonid.php b/app/Mohonid.php index 75a5f61..c474be9 100644 --- a/app/Mohonid.php +++ b/app/Mohonid.php @@ -23,6 +23,10 @@ class Mohonid extends Model 'id', 'katalaluan', 'benar', + 'pinjaman', + 'nilaimarhun', + 'berat', + 'margin', 'teller' ]; diff --git a/app/Polis.php b/app/Polis.php index c705d76..5222f27 100644 --- a/app/Polis.php +++ b/app/Polis.php @@ -23,7 +23,9 @@ class Polis extends Model 'tebus', 'recno', 'teller', - 'caj' + 'caj', + 'koddaerah', + 'kodnegeri' ]; diff --git a/routes/web.php b/routes/web.php index 0804f6f..eb09cf5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -317,6 +317,16 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->post('requestdenopanjar/update/{kodcaw}',['uses' => 'PanjarController@updateDenoPanjar']); $router->post('requestdenopanjar/batal/{kodcaw}',['uses' => 'PanjarController@batalDenoPanjar']); + $router->post('requestdenopendser/{kodcaw}',['uses' => 'PendahuluanSerahanController@createDenoPendSer']); + $router->get('getdenopendser/{kodcaw}',['uses' => 'PendahuluanSerahanController@getDenoPendSer']); + $router->post('requestdenopendser/update/{kodcaw}',['uses' => 'PendahuluanSerahanController@updateDenoPendSer']); + $router->get('SenaraiPendSer/listeach/{kodcaw}',['uses'=>'PendahuluanSerahanController@listeachpendser']); + $router->post('DeletePendSer/{kodcaw}',['uses'=>'PendahuluanSerahanController@delete']); + + // $router->put('UpdateVault/PendahuluanSerahan/{kodcaw}', ['uses'=>'VaultController@updateVaultPanjar']); + $router->put('UpdateVault/PendahuluanSerahan/{kodcaw}', ['uses'=>'VaultController@updateVaultDeletePendahuluanSerahan']); + // $router->post('requestdenopendser/batal/{kodcaw}',['uses' => 'PendahuluanSerahanController@batalDenoPanjar']); + //API WAKIL From 0c7a17056a4fc6ba1c2ffe7c6c50a39a81b4c431 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sat, 2 Oct 2021 23:48:59 +0800 Subject: [PATCH 14/23] fix kelulusan operasi --- app/Http/Controllers/KelulusanController.php | 22 ++++++++++++++++++++ routes/web.php | 2 ++ 2 files changed, 24 insertions(+) diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php index 9cde6bb..8dbadaf 100644 --- a/app/Http/Controllers/KelulusanController.php +++ b/app/Http/Controllers/KelulusanController.php @@ -360,4 +360,26 @@ class KelulusanController extends Controller return response()->json($arraykelulusan,200); } + public function listoperasikelulusan() + { + $harini = Carbon::now(); + $harini = new Carbon; + + $cawangan_all = Cawangan::on('mysql7')->get(); + $arraykelulusan = []; + + foreach($cawangan_all as $index=>$cawangan){ + $kelulusan=Mohon::on($cawangan['mysql']) + ->where('peloperasi','=','operasi') + ->where('operasi','!=','') + ->get(); + + if(sizeof($kelulusan) != 0){ + array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]); + } + } + + return response()->json($arraykelulusan,200); + } + } diff --git a/routes/web.php b/routes/web.php index eb09cf5..769f5c2 100644 --- a/routes/web.php +++ b/routes/web.php @@ -301,6 +301,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->put('UpdateKelulusan/kepohonan/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@updatekepohonankhazanah']); $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']); From e73506e5d48fe1784a9d20dd953e867b4a4a81ac Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 3 Oct 2021 00:08:43 +0800 Subject: [PATCH 15/23] fix poliscontroller --- app/Http/Controllers/PolisController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/PolisController.php b/app/Http/Controllers/PolisController.php index 17d5228..3087f7c 100644 --- a/app/Http/Controllers/PolisController.php +++ b/app/Http/Controllers/PolisController.php @@ -48,7 +48,9 @@ class PolisController extends Controller 'komen2' => $request->komen2, 'tebus' => 0, 'teller' => $request->teller, - 'caj' => 0.00 + 'caj' => 0.00, + 'kodnegeri' => $request->kodnegeri, + 'koddaerah' => $request->koddaerah ]); return response()->json($polis); @@ -67,7 +69,9 @@ class PolisController extends Controller ->update([ 'komen1' => $request->komen1, 'komen2' => $request->komen2, - 'teller' => $request->teller + 'teller' => $request->teller, + 'kodnegeri' => $request->kodnegeri, + 'koddaerah' => $request->koddaerah ]); return response()->json($polis); From e5b6b4bb3ca41b7c23e8321e7e57b5d5be3b6086 Mon Sep 17 00:00:00 2001 From: afiq Date: Sun, 3 Oct 2021 03:19:52 +0800 Subject: [PATCH 16/23] update --- app/Http/Controllers/CustomerController.php | 156 ++++++------------ app/Http/Controllers/DenominasiController.php | 2 - app/Http/Controllers/GadaiController.php | 140 +++++++++------- app/Http/Controllers/GlejerController.php | 151 ++++------------- .../Controllers/ImbangDugaLamaController.php | 23 +-- app/Http/Controllers/LaporanController.php | 5 - app/Http/Controllers/PanjarController.php | 35 +++- .../PendahuluanSerahanController.php | 34 ++-- .../TacExpressPaymentController.php | 4 +- app/Http/Controllers/TebusController.php | 15 +- .../Controllers/TunaiGadTebController.php | 38 ----- 11 files changed, 226 insertions(+), 377 deletions(-) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 905b3d3..ed41b4f 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -17,66 +17,38 @@ use Carbon\Carbon; class CustomerController extends Controller { - public function showAllCustomers() - { - // $cawangan_all = Cawangan::on('mysql7')->get(); - // $customer_all = []; - // foreach($cawangan_all as $index=>$cawangan){ - $customer = Customer::on('mysql7')->get(); - // if($customer != null){ - // array_push($customer_all,$customer); - // } - // } + public function showAllCustomers(){ + $customer = Customer::on('mysql7')->get(); return response()->json($customer); } public function getLatestCustomer($kodcaw){ - // $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $customer = Customer::on('mysql7')->orderBy('tarikhdaftar','desc')->orderBy('nosiri','desc')->first(); return response()->json($customer); } - public function showAllCustomersByCawangan($kodcaw) - { - // $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - + public function showAllCustomersByCawangan($kodcaw){ $customer = Customer::on('mysql7')->get(); return response()->json($customer); } public function showOneCustomerByIC($ic){ - - // $cawangan_all = Cawangan::on('mysql7')->get(); - // $customer_all = []; - // foreach($cawangan_all as $index=>$cawangan){ - $customer = Customer::on('mysql7') - ->where('kplama','=',$ic) - ->orWhere('kpbaru','=',$ic) - ->first(); - // if($customer != null){ - // array_push($customer_all,$customer); - // } - // } + $customer = Customer::on('mysql7') + ->where('kplama','=',$ic) + ->orWhere('kpbaru','=',$ic) + ->first(); return response()->json($customer); } public function showOneCustomerByICAdmin(Request $request){ - - // $cawangan_all = Cawangan::on('mysql7')->get(); - // $customer_all = []; - // foreach($cawangan_all as $index=>$cawangan){ - $customer = Customer::on('mysql7') - ->where('kplama','=',$request->ic) - ->orWhere('kpbaru','=',$request->ic) - ->first(); - // if($customer != null){ - // array_push($customer_all,$customer); - // } - // } + + $customer = Customer::on('mysql7') + ->where('kplama','=',$request->ic) + ->orWhere('kpbaru','=',$request->ic) + ->first(); return response()->json($customer); } @@ -315,8 +287,6 @@ class CustomerController extends Controller public function getLaporanCustomers($kodcaw, $tarikh) { - // $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $gadai = Customer::on('mysql7') ->where([['tarikhdaftar','=',$tarikh],['kodcaw',$kodcaw]]) ->orderBy('tarikhdaftar', 'desc') @@ -364,28 +334,19 @@ class CustomerController extends Controller } public function customerUpdate($nokp,Request $request){ - // $cawangan_all = Cawangan::on('mysql7')->get(); - // foreach($cawangan_all as $index=>$cawangan){ - // $customer = Customer::on($cawangan['mysql']) - // ->where('kplama','=',$nokp) - // ->orWhere('kpbaru','=',$nokp) - // ->first(); - // if($customer != null){ - $poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first(); - $customer_update = Customer::on('mysql7') - ->where('kplama','=',$nokp) - ->orWhere('kpbaru','=',$nokp) - ->update(array( - 'alamat1' => $request->alamat, - 'alamat2' => '', - 'poskod' => $request->poskod, - 'koddaerah' => $poskod['koddaerah'], - 'kodnegeri' => $poskod['kodnegeri'], - 'telefon' => $request->telefon1, - 'telefon2' => $request->telefon2 - )); - // } - // } + $poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first(); + $customer_update = Customer::on('mysql7') + ->where('kplama','=',$nokp) + ->orWhere('kpbaru','=',$nokp) + ->update(array( + 'alamat1' => $request->alamat, + 'alamat2' => '', + 'poskod' => $request->poskod, + 'koddaerah' => $poskod['koddaerah'], + 'kodnegeri' => $poskod['kodnegeri'], + 'telefon' => $request->telefon1, + 'telefon2' => $request->telefon2 + )); return response()->json($customer_update, 200); } @@ -412,32 +373,24 @@ class CustomerController extends Controller } public function customerUpdateKhazanah($nokp,Request $request){ - // $cawangan_all = Cawangan::on('mysql7')->get(); - // foreach($cawangan_all as $index=>$cawangan){ - // $customer = Customer::on($cawangan['mysql']) - // ->where('kplama','=',$nokp) - // ->orWhere('kpbaru','=',$nokp) - // ->first(); - // if($customer != null){ - $poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first(); + + $poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first(); - $customer_update = Customer::on('mysql7') - ->where('kplama','=',$nokp) - ->orWhere('kpbaru','=',$nokp) - ->update(array( - 'telefon' => $request->telefon1, - 'telefon2' => $request->telefon2, - 'kodbank' => $request->kodbank, - 'noakaun' => $request->noakaun, - 'nota' => $request->nota, - 'nama' => $request->nama, - 'alamat1' => $request->alamat, - 'poskod' => $request->poskod, - 'koddaerah' => $poskod['koddaerah'], - 'kodnegeri' => $poskod['kodnegeri'] - )); - // } - // } + $customer_update = Customer::on('mysql7') + ->where('kplama','=',$nokp) + ->orWhere('kpbaru','=',$nokp) + ->update(array( + 'telefon' => $request->telefon1, + 'telefon2' => $request->telefon2, + 'kodbank' => $request->kodbank, + 'noakaun' => $request->noakaun, + 'nota' => $request->nota, + 'nama' => $request->nama, + 'alamat1' => $request->alamat, + 'poskod' => $request->poskod, + 'koddaerah' => $poskod['koddaerah'], + 'kodnegeri' => $poskod['kodnegeri'] + )); return response()->json($customer_update, 200); } @@ -654,21 +607,18 @@ class CustomerController extends Controller public function insertAkaunBankMobile(Request $request) { - // $cawangan_all = Cawangan::on('mysql7')->get(); - // foreach($cawangan_all as $index=>$cawangan) - // { - $customer = Customer::on('mysql7') - ->where('kplama','=',$request->nokp) - ->orWhere('kpbaru','=',$request->nokp) - ->first(); + $customer = Customer::on('mysql7') + ->where('kplama','=',$request->nokp) + ->orWhere('kpbaru','=',$request->nokp) + ->first(); - if(!empty($customer)) - { - $customer->kodbank = $request->kodbank; - $customer->noakaun = $request->noakaun; - $customer->save(); - } - // } + if(!empty($customer)) + { + $customer->kodbank = $request->kodbank; + $customer->noakaun = $request->noakaun; + $customer->save(); + } + return response()->json($customer, 200); } diff --git a/app/Http/Controllers/DenominasiController.php b/app/Http/Controllers/DenominasiController.php index 183a5db..721ccb4 100644 --- a/app/Http/Controllers/DenominasiController.php +++ b/app/Http/Controllers/DenominasiController.php @@ -11,8 +11,6 @@ use Carbon\Carbon; class DenominasiController extends Controller { - - public function listdenominasi($kodcaw) { $current = Carbon::now(); diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 8142e4e..21ba3bf 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -911,13 +911,6 @@ class GadaiController extends Controller ->orderBy('t_gadai') ->get(); - // $tebus = Gadai::on($cawangan['mysql']) - // ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman, SUM(bakiupah) as upahsimpan') - // ->where('t_gadai','=',$request->tarikh) - // ->where('sttebus','=','T') - // ->orderBy('t_gadai') - // ->get(); - $tebus = Tebus::on($cawangan['mysql']) ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman, SUM(bakiupah) as upahsimpan') ->where('t_tebus','=',$request->tarikh) @@ -1884,6 +1877,16 @@ class GadaiController extends Controller $bakiakhir = 0; $totalkeluar = 0; + $audit = new Audit(); + $audit->users = $request->kodlaluan; + $audit->actions = 'Hapus Gadai'; + $audit->norujukan = $norujukan; + $audit->old_data = $gadai; + $audit->kodcaw = $kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); + if($gadai[0]['historygadaian'] != "0" && $gadai[0]['historygadaian'] != '') { @@ -2009,8 +2012,8 @@ class GadaiController extends Controller Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); - // TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete(); - // Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete(); + TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete(); + Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete(); return response('Deleted Successfully', 200); } @@ -2026,6 +2029,8 @@ class GadaiController extends Controller $tebus = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->get(); + $gadai = Gadai::on($cawangan['mysql'])->where('historygadaian',$norujukan)->first(); + $tunai=Tunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$request->kodlaluan]]) ->orderBy('tarikh','desc') ->first(); @@ -2040,62 +2045,77 @@ class GadaiController extends Controller $bakiakhir = $baki; $totalkeluar = 0; - if($tebus[0]['tagterima'] == 1) - { - if($tebus[0]['jenistebus'] == 'T') - { - $totalmasuk = $masuk - $tebus[0]['bakipjm']; - - // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan; - $bakiakhir = $baki - $tebus[0]['bakipjm']; - - $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])-> - update(array( - 'keluar' => $keluar, - 'masuk' => $totalmasuk, - 'baki' => $bakiakhir - )); - - - Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']); - - Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); - - TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete(); - - Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete(); - - return response('Deleted Successfully', 200); - } - else - return response('Bukan-Tebus', 200); + if($gadai){ + return response('Bukan-Tebus', 200); }else{ + + $audit = new Audit(); + $audit->users = $request->kodlaluan; + $audit->actions = 'Hapus Gadai'; + $audit->norujukan = $norujukan; + $audit->old_data = $gadai; + $audit->kodcaw = $kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); - if($tebus[0]['jenistebus'] == 'T') + if($tebus[0]['tagterima'] == 1) { - - $bakiakhir = $bakiakhir - $tebus[0]['bakipjm']; - - $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])-> - update(array( - 'keluar' => $keluar, - 'masuk' => $masuk, - 'baki' => $bakiakhir - )); - - Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']); - - Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); - - TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete(); + if($tebus[0]['jenistebus'] == 'T') + { + $totalmasuk = $masuk - $tebus[0]['bakipjm']; + + // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan; + $bakiakhir = $baki - $tebus[0]['bakipjm']; + + $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])-> + update(array( + 'keluar' => $keluar, + 'masuk' => $totalmasuk, + 'baki' => $bakiakhir + )); + + + Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']); + + Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); + + TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete(); + + Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete(); - Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete(); - - return response('Deleted Successfully', 200); + return response('Deleted Successfully', 200); + } + else + return response('Bukan-Tebus', 200); + }else{ + + if($tebus[0]['jenistebus'] == 'T') + { + + $bakiakhir = $bakiakhir - $tebus[0]['bakipjm']; + + $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])-> + update(array( + 'keluar' => $keluar, + 'masuk' => $masuk, + 'baki' => $bakiakhir + )); + + Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']); + + Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); + + TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete(); + + Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete(); + + return response('Deleted Successfully', 200); + } + else + return response('Bukan-Tebus', 200); } - else - return response('Bukan-Tebus', 200); - } + } } public function senaraiLelong($kodcaw,Request $request){ diff --git a/app/Http/Controllers/GlejerController.php b/app/Http/Controllers/GlejerController.php index 2505a32..43b6545 100644 --- a/app/Http/Controllers/GlejerController.php +++ b/app/Http/Controllers/GlejerController.php @@ -12,10 +12,6 @@ use Illuminate\Support\Facades\DB; use Carbon\Carbon; class GlejerController extends Controller { - - - - public function getGlejer($kodcaw, Request $request) { $current = Carbon::now(); @@ -27,13 +23,6 @@ class GlejerController extends Controller } - - - - - - - public function Getglejer_Data($tarikh1,$tarikh2,$kodcaw) { @@ -68,122 +57,55 @@ class GlejerController extends Controller } - - - - - - - - - - - - - - - - public function getSemalam_Glejer($kodcaw, Request $request) - { - - + public function getSemalam_Glejer($kodcaw, Request $request){ - $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $glejer=Glejer::on($cawangan['mysql'])->where('glcode','=',$request->glcode)->orderBy('tarikh','DESC')->limit(1)->get(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $glejer=Glejer::on($cawangan['mysql'])->where('glcode','=',$request->glcode)->orderBy('tarikh','DESC')->limit(1)->get(); - return response()->json($glejer); + return response()->json($glejer); + } + public function Create_Glejer($kodcaw,Request $request){ - } - - - - - - - - - - - - public function Create_Glejer($kodcaw,Request $request) - { - - - - - $current = Carbon::now(); - $current = new Carbon(); + $current = Carbon::now(); + $current = new Carbon(); - + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $glejer=Glejer::on($cawangan['mysql'])->create([ + // 'tarikh' => $current->toDateString(), + 'kodcaw'=> $request->kodcaw, + 'tarikh'=>$current->toDateString(), + 'glcode'=>$request->glcode, + 'descpt'=>$request->descpt, + 'debit'=>$request->debit, + 'kredit'=>$request->kredit, + 'hariini'=>$request->hariini, + 'kelmarin'=>$request->kelmarin, + 'jumlah'=>$request->jumlah, + 'bulanini'=>$request->bulanini, + 'tahunini'=>$request->tahunini, + 'acttype'=>$request->acttype + ]); - $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $glejer=Glejer::on($cawangan['mysql'])->create([ - - // 'tarikh' => $current->toDateString(), - 'kodcaw'=> $request->kodcaw, - 'tarikh'=>$current->toDateString(), - 'glcode'=>$request->glcode, - 'descpt'=>$request->descpt, - 'debit'=>$request->debit, - 'kredit'=>$request->kredit, - 'hariini'=>$request->hariini, - 'kelmarin'=>$request->kelmarin, - 'jumlah'=>$request->jumlah, - 'bulanini'=>$request->bulanini, - 'tahunini'=>$request->tahunini, - 'acttype'=>$request->acttype - - ]); - - return response()->json($glejer,201); + return response()->json($glejer,201); - } + } public function carianBulananTahun_glejer($kodcaw,Request $request) { - $current = Carbon::now(); $current = new Carbon(); $yr = Carbon::now()->format('Y'); $month= Carbon::now()->format('m'); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $glejerMy=Glejer::on ($cawangan['mysql'])->whereYear('tarikh','=',$yr)->whereMonth('tarikh', '=',$month)->where('glcode', '=',$request->glcode)-> - orderBy('tarikh','ASC')->get(); - return response()->json($glejerMy); - + $glejerMy=Glejer::on ($cawangan['mysql'])->whereYear('tarikh','=',$yr)->whereMonth('tarikh', '=',$month)->where('glcode', '=',$request->glcode)-> + orderBy('tarikh','ASC')->get(); + return response()->json($glejerMy); } - - - - - - - - - /*public function updateRequestTeller($kodcaw,Request $request) - { - $requestteller = RequestTeller::on('mysql7')-> - where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$request->kodlaluan],['update','=',0]]) - ->update(array( - - 'update' => 1 - - ) ); - } -*/ - - - - - - - - public function Kemaskini_Glejer($kodcaw, Request $request) { @@ -199,30 +121,21 @@ class GlejerController extends Controller 'hariini'=>$request->hariini, 'kelmarin'=>$request->kelmarin - ) ); + )); - return response()->json($updateGLejer,200); - - + return response()->json($updateGLejer,200); } public function carianTahun_glejer($kodcaw,Request $request) { - - - $current = Carbon::now(); $current = new Carbon(); $yr = Carbon::now()->format('Y'); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $db=$cawangan['mysql']; + $db=$cawangan['mysql']; $gelejerYear=Glejer::on($cawangan['mysql'])->whereYear('tarikh','=',$yr)->where('glcode', '=',$request->glcode)-> orderBy('tarikh','ASC')->get(); return response()->json($gelejerYear); } - - - - } diff --git a/app/Http/Controllers/ImbangDugaLamaController.php b/app/Http/Controllers/ImbangDugaLamaController.php index 3d96246..207d1be 100644 --- a/app/Http/Controllers/ImbangDugaLamaController.php +++ b/app/Http/Controllers/ImbangDugaLamaController.php @@ -10,23 +10,12 @@ use Illuminate\Http\Request; class ImbangDugaLamaController extends Controller { + public function GetImbangDuga_Lama($kodcaw) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $getImbangDugaLama=imbangdugalama::on($cawangan['mysql'])->get(); - - -public function GetImbangDuga_Lama($kodcaw) -{ - - $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - - $getImbangDugaLama=imbangdugalama::on($cawangan['mysql'])->get(); - - return response()->json($getImbangDugaLama); - -} - - - - - + return response()->json($getImbangDugaLama); + } } \ No newline at end of file diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 63aba3c..5f69b30 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -258,11 +258,6 @@ class LaporanController extends Controller /* Kawalan Stok */ - - - - - //f $data_lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$request->tarikh)->get(); $bilangan_lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$request->tarikh)->count(); diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php index e127649..e6c5374 100644 --- a/app/Http/Controllers/PanjarController.php +++ b/app/Http/Controllers/PanjarController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use App\Panjar; use App\Cawangan; use App\DenoPanjar; +use App\Audit; use Carbon\Carbon; @@ -75,8 +76,6 @@ class PanjarController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - - $kelulusan=Panjar::on($cawangan['mysql']) ->where('tarikh','=',$harini->toDateString()) ->where('norujukan','=',$norujukan) @@ -110,16 +109,38 @@ class PanjarController extends Controller 'tuntutoleh' => $request->tuntutoleh ]); + + $audit = new Audit(); + $audit->users = $request->tuntutoleh; + $audit->actions = "Daftar Perbelanjaan"; + $audit->new_data = $panjar; + $audit->kodcaw = $kodcaw; + $audit->created_at = $harini; + $audit->updated_at = $harini; + $audit->save(); + return response()->json($panjar); } public function delete(REQUEST $request,$kodcaw) { - $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - - Panjar::on($cawangan['mysql'])->where('recno','=',$request->recno)->delete(); - - return response('Batal Berjaya', 200); + $harini = Carbon::now(); + $harini = new Carbon; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $panjar = Panjar::on($cawangan['mysql'])->where('recno','=',$request->recno)->first(); + Panjar::on($cawangan['mysql'])->where('recno','=',$request->recno)->delete(); + + $audit = new Audit(); + $audit->users = $request->users; + $audit->actions = "Hapus Perbelanjaan"; + $audit->old_data = $panjar; + $audit->kodcaw = $kodcaw; + $audit->created_at = $harini; + $audit->updated_at = $harini; + $audit->save(); + + return response('Batal Berjaya', 200); } public function calculationpanjar(Request $request,$kodcaw) diff --git a/app/Http/Controllers/PendahuluanSerahanController.php b/app/Http/Controllers/PendahuluanSerahanController.php index 983b7d3..62d484a 100644 --- a/app/Http/Controllers/PendahuluanSerahanController.php +++ b/app/Http/Controllers/PendahuluanSerahanController.php @@ -13,16 +13,11 @@ use Illuminate\Http\Request; class PendahuluanSerahanController extends Controller { - public function createDenoPendSer($kodcaw,Request $request) - { - - + public function createDenoPendSer($kodcaw,Request $request){ $current = Carbon::now(); $current = new Carbon(); - - $denopendser = DenoPendSer::on('mysql7')->create([ - + $denopendser = DenoPendSer::on('mysql7')->create([ 'tarikh' => $current->toDateString(), 'masa' => $current->toTimeString(), 'kodcaw' => $kodcaw, @@ -54,9 +49,7 @@ class PendahuluanSerahanController extends Controller return response()->json($denopendser,200); } - public function getDenoPendSer($kodcaw,Request $request) - { - + public function getDenoPendSer($kodcaw,Request $request){ $current = Carbon::now(); $current = new Carbon(); @@ -66,9 +59,7 @@ class PendahuluanSerahanController extends Controller return response()->json($denopendser,200); } - public function updateDenoPendSer($kodcaw,Request $request) - { - + public function updateDenoPendSer($kodcaw,Request $request){ $current = Carbon::now(); $current = new Carbon(); @@ -81,16 +72,13 @@ class PendahuluanSerahanController extends Controller )); return response()->json($denopendser,200); - } + } - public function delete(REQUEST $request,$kodcaw) - { - $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - - GlDetail::on($cawangan['mysql'])->where('recno','=',$request->recno)->delete(); - - return response('Batal Berjaya', 200); - } + public function delete(REQUEST $request,$kodcaw){ + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - + GlDetail::on($cawangan['mysql'])->where('recno','=',$request->recno)->delete(); + + return response('Batal Berjaya', 200); + } } diff --git a/app/Http/Controllers/TacExpressPaymentController.php b/app/Http/Controllers/TacExpressPaymentController.php index 5e82f87..5e5cf7d 100644 --- a/app/Http/Controllers/TacExpressPaymentController.php +++ b/app/Http/Controllers/TacExpressPaymentController.php @@ -21,8 +21,8 @@ class TacExpressPaymentController extends Controller 'expired_at' => $expired_at ]); - // $mobileno = '6'.$request->mobileno; - $mobileno = '60189025461'; + $mobileno = '6'.$request->mobileno; + // $mobileno = '60189025461'; $messages = 'SPARE : SMS-OTP '. $request->otp_token . ' for one time usage on ' . $expired_at . '. Call AR-RAHN CARELINE CENTRE 1300-22-4343 if not request'; $status = Http::get('http://gateway.onewaysms.com.au:10001/api.aspx',[ diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 79c853a..e8be579 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -1425,10 +1425,23 @@ class TebusController extends Controller public function removeUpahLamaToday($kodcaw,$norujukan) { - $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $current = Carbon::now(); + $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $data_ansuran = Advansur::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); $removed = Advansur::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); + $audit = new Audit(); + $audit->users = $request->teller; + $audit->actions = "Hapus Upah"; + $audit->norujukan = $norujukan; + $audit->old_data = $data_ansuran; + $audit->kodcaw = $kodcaw; + $audit->created_at = $current; + $audit->updated_at = $current; + $audit->save(); + if($removed) return response(1); else diff --git a/app/Http/Controllers/TunaiGadTebController.php b/app/Http/Controllers/TunaiGadTebController.php index 63df2c6..4d7bdbf 100644 --- a/app/Http/Controllers/TunaiGadTebController.php +++ b/app/Http/Controllers/TunaiGadTebController.php @@ -13,14 +13,8 @@ use Carbon\Carbon; class TunaiGadTebController extends Controller { - - - - - public function getCurrentTunaiGadTeb($kodcaw,Request $request) { - $current = Carbon::now(); $current = new Carbon(); @@ -31,18 +25,10 @@ class TunaiGadTebController extends Controller ->orderBy('tarikh','desc') ->first(); return response()->json($tunaiGadteb); - } - - - - - - public function UpdateTunaiGadTeb($kodcaw, Request $request) { - $current = Carbon::now(); $current = new Carbon(); @@ -56,26 +42,10 @@ class TunaiGadTebController extends Controller )); return response()->json($updatetunaiGD, 200); - - } - - - - - - - - - - - - - public function createTunaiGadTeb($kodcaw, Request $request) { - $current = Carbon::now(); $current = new Carbon(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); @@ -94,14 +64,6 @@ class TunaiGadTebController extends Controller ]); - - return response()->json($tunaigadteb,201); - - - } - - - } \ No newline at end of file From 8b80093bee8d83e17f65c1e856997727d2c1f1ae Mon Sep 17 00:00:00 2001 From: afiq Date: Sun, 3 Oct 2021 10:40:03 +0800 Subject: [PATCH 17/23] latest --- app/Http/Controllers/GadaiController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 21ba3bf..9618474 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2029,7 +2029,7 @@ class GadaiController extends Controller $tebus = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->get(); - $gadai = Gadai::on($cawangan['mysql'])->where('historygadaian',$norujukan)->first(); + $gadai = Gadai::on($cawangan['mysql'])->where([['sttebus',''],['historygadaian',$norujukan]])->first(); $tunai=Tunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$request->kodlaluan]]) ->orderBy('tarikh','desc') From 1108d190dee4e1d5a7e3ef2f32e96e0d58da5edd Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Sun, 3 Oct 2021 15:22:06 +0800 Subject: [PATCH 18/23] server --- app/Http/Controllers/GadaiController.php | 6 ++- app/Http/Controllers/MarhunController.php | 10 ++++- app/Http/Controllers/TebusController.php | 45 +++++++++++++++++++---- 3 files changed, 51 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 9618474..d5d9fbc 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -490,7 +490,11 @@ class GadaiController extends Controller return response()->json($gadai); } - public function batalGadai($kodcaw, $norujukan){ + public function batalGadai($kodcaw, $norujukan,Request $request){ + + $current = Carbon::now(); + $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 3d48c3f..c780c63 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -92,6 +92,10 @@ class MarhunController extends Controller public function deletemarhun($kodcaw,$norujukan,Request $request) { + + $current = Carbon::now(); + $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $old_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first(); @@ -113,6 +117,10 @@ class MarhunController extends Controller public function editmarhun($kodcaw,$norujukan,Request $request) { + + $current = Carbon::now(); + $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $old_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first(); @@ -176,4 +184,4 @@ class MarhunController extends Controller return response()->json($marhun); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index e8be579..275b6fd 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -563,20 +563,49 @@ class TebusController extends Controller public function getLaporanTebus($kodcaw,$tarikh){ $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $tebus = Tebus::on($cawangan['mysql']) - ->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','trans.tarikh_bayaran','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg') + $tebus_data = Tebus::on($cawangan['mysql']) + ->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg') ->join('gadai as gad','gad.norujukan','=','tebus.norujukan') - ->join('online_arrahn.customer as cust', function($join) - { - $join->on('gad.nokp', '=', 'cust.kpbaru'); - $join->orOn('gad.nokp', '=', 'cust.kplama'); - }) - ->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan') + // ->join('online_arrahn.customer as cust', function($join) + // { + // $join->on('gad.nokp', '=', 'cust.kpbaru'); + // $join->orOn('gad.nokp', '=', 'cust.kplama'); + // }) + // ->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan') ->where('tebus.t_tebus','=',$tarikh) ->groupBy('tebus.norujukan') ->orderBy('tebus.teller') ->orderBy('tebus.sirit') ->get(); + + $tebus = []; + if($tebus_data){ + foreach($tebus_data as $index=>$tebusData){ + $customer_info = Customer::on('mysql7')->where('kplama','=',$tebusData['nokp'])->orWhere('kpbaru','=',$tebusData['nokp'])->first(); + + $trans = TransaksiKeuntungan::on('mysql7')->where('norujukan',$tebusData['norujukan'])->orderBy('tarikh_bayaran','desc')->first(); + + array_push($tebus,[ + "t_tebus"=>$tebusData['t_tebus'], + "t_gadai"=>$tebusData['t_gadai'], + "hargajualan"=>$tebusData['hargajualan'], + "bakihargajualan"=>$tebusData['bakihargajualan'], + "gadaibakipjm"=>$tebusData['gadaibakipjm'], + "tarikh_bayaran"=>$trans['tarikh_bayaran'], + "nilaimarhun"=>$tebusData['nilaimarhun'], + "tagterima"=>$tebusData['tagterima'], + "teller"=>$tebusData['teller'], + "jenistebus"=>$tebusData['jenistebus'], + "pinjaman"=>$tebusData['pinjaman'], + "bakiupah"=>$tebusData['bakiupah'], + "bakipjm"=>$tebusData['bakipjm'], + "norujukan"=>$tebusData['norujukan'], + "nama"=>$customer_info['nama'], + "nokp"=>$tebusData['nokp'], + "jbg"=>$tebusData['jbg'] + ]); + } + } return response()->json($tebus); } From 646ffe99b9957db5316a6456b97048c9c7630b22 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Mon, 4 Oct 2021 16:25:07 +0800 Subject: [PATCH 19/23] fix keuntungan sebenar --- app/Http/Controllers/TebusController.php | 41 +++++++++++++++--------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 275b6fd..5d42df7 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -949,24 +949,33 @@ class TebusController extends Controller $daterequest = new Carbon($request->tarikh); $daterequest->addDays(1); - //Keuntungan Selepas Tawarruq $keuntungan_data = TransaksiKeuntungan::on('mysql7') - // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) - ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year) - // ->whereNull('db2.hargajualan') - // ->sum('bayaran_keuntungan'); - ->get(); + ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) + ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year) + ->pluck('norujukan'); - $keuntungan = 0; - if($keuntungan_data){ - foreach($keuntungan_data as $index=>$keuntunganData){ - $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan',null]])->first(); - if($gadaiData){ - $keuntungan += $keuntunganData['bayaran_keuntungan']; - } - } - } + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $keuntungan_data)->whereNull('hargajualan')->pluck('norujukan'); + + $keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan'); + + // //Keuntungan Selepas Tawarruq + // $keuntungan_data = TransaksiKeuntungan::on('mysql7') + // // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + // ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) + // ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year) + // // ->whereNull('db2.hargajualan') + // // ->sum('bayaran_keuntungan'); + // ->get(); + + // $keuntungan = 0; + // if($keuntungan_data){ + // foreach($keuntungan_data as $index=>$keuntunganData){ + // $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan',null]])->first(); + // if($gadaiData){ + // $keuntungan += $keuntunganData['bayaran_keuntungan']; + // } + // } + // } // $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql']) // ->where('t_tebus','<=',$request->tarikh) From f3458b9ffc2c8196c95e7103e31a0901cf4d1507 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 5 Oct 2021 00:33:29 +0800 Subject: [PATCH 20/23] fix gadaicontroller,laporancontroller,tebuscontroller --- app/Http/Controllers/GadaiController.php | 93 +++++--- app/Http/Controllers/LaporanController.php | 120 ++++++---- app/Http/Controllers/TebusController.php | 246 +++++++++++++-------- 3 files changed, 298 insertions(+), 161 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index d5d9fbc..8e5d58d 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2816,23 +2816,40 @@ class GadaiController extends Controller $current = new Carbon(); $transaksi_data = TransaksiKeuntungan::on('mysql7') - ->where('tarikh_bayaran' ,'<=', $daterequest) - // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - // ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]]) - // ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]]) - // ->sum('bayaran_pembiayaan'); - ->get(); + ->where('tarikh_bayaran' ,'<=', $daterequest) + ->pluck('norujukan'); - $transaksi = 0; + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data) + ->where([['sttebus',''],['hargajualan','<>','null']]) + ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['hargajualan','<>','null']]) + ->pluck('norujukan'); - if($transaksi_data){ - foreach($transaksi_data as $index=>$transaksiData){ - $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$transaksiData['norujukan'])->first(); - if($gadaiData && (($gadaiData['sttebus'] == '' && $gadaiData['hargajualan'] != null) || ($gadaiData['sttebus'] != '' && $gadaiData['t_update'] > $request->tarikh && $gadaiData['hargajualan'] != null))){ - $transaksi += $transaksiData['bayaran_pembiayaan']; - } - } - } + + $transaksi = TransaksiKeuntungan::on('mysql7') + ->whereIn('norujukan',$gadaiData) + ->where('tarikh_bayaran' ,'<=', $daterequest) + ->sum('bayaran_pembiayaan'); + + // $transaksi_data = TransaksiKeuntungan::on('mysql7') + // // ->select('norujukan','tarikh_bayaran') + // ->where('tarikh_bayaran' ,'<=', $daterequest) + // // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + // // ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]]) + // // ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]]) + // // ->sum('bayaran_pembiayaan'); + // ->pluck('norujukan'); + // // ->get(); + + // $transaksi = 0; + + // if($transaksi_data){ + // foreach($transaksi_data as $index=>$transaksiData){ + // $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$transaksiData['norujukan'])->first(); + // if($gadaiData && (($gadaiData['sttebus'] == '' && $gadaiData['hargajualan'] != null) || ($gadaiData['sttebus'] != '' && $gadaiData['t_update'] > $request->tarikh && $gadaiData['hargajualan'] != null))){ + // $transaksi += $transaksiData['bayaran_pembiayaan']; + // } + // } + // } return response($transaksi); } @@ -2851,23 +2868,39 @@ class GadaiController extends Controller $current = Carbon::now(); $current = new Carbon(); + $transaksi_data = TransaksiKeuntungan::on('mysql7') - ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) - // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - // ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) - // ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) - // ->sum('bayaran_pembiayaan'); - ->get(); + ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) + ->pluck('norujukan'); - $transaksi = 0; - if($transaksi_data){ - foreach($transaksi_data as $index=>$transaksiData){ - $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$transaksiData['norujukan'])->first(); - if($gadaiData && (($gadaiData['sttebus'] == '' && $gadaiData['hargajualan'] != null) || ($gadaiData['sttebus'] != '' && $gadaiData['t_update'] > $request->mula && $gadaiData['hargajualan'] != null))){ - $transaksi += $transaksiData['bayaran_pembiayaan']; - } - } - } + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data) + ->where([['sttebus',''],['hargajualan','<>','null']]) + ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['hargajualan','<>','null']]) + ->pluck('norujukan'); + + + $transaksi = TransaksiKeuntungan::on('mysql7') + ->whereIn('norujukan',$gadaiData) + ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) + ->sum('bayaran_pembiayaan'); + + // $transaksi_data = TransaksiKeuntungan::on('mysql7') + // ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) + // // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + // // ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) + // // ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) + // // ->sum('bayaran_pembiayaan'); + // ->get(); + + // $transaksi = 0; + // if($transaksi_data){ + // foreach($transaksi_data as $index=>$transaksiData){ + // $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$transaksiData['norujukan'])->first(); + // if($gadaiData && (($gadaiData['sttebus'] == '' && $gadaiData['hargajualan'] != null) || ($gadaiData['sttebus'] != '' && $gadaiData['t_update'] > $request->mula && $gadaiData['hargajualan'] != null))){ + // $transaksi += $transaksiData['bayaran_pembiayaan']; + // } + // } + // } return response($transaksi); } diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 5f69b30..edd0e0d 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -52,17 +52,22 @@ class LaporanController extends Controller ->where('trans.trans_type','=','A') // ->whereNotNull('db2.hargajualan') // ->sum('bayaran_keuntungan'); - ->get(); - - $total_keuntunganansuran = 0; - if($total_keuntunganansuran_data){ - foreach($total_keuntunganansuran_data as $index=>$total_keuntunganansuranData){ - $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$total_keuntunganansuranData['norujukan']],['hargajualan','<>',null]])->first(); - if($gadaiData){ - $total_keuntunganansuran += $total_keuntunganansuranData['bayaran_keuntungan']; - } - } - } + // ->get(); + ->pluck('transaksi_keuntungan.norujukan'); + + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data)->whereNotNull('hargajualan')->pluck('norujukan'); + + $total_keuntunganansuran = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan'); + + // $total_keuntunganansuran = 0; + // if($total_keuntunganansuran_data){ + // foreach($total_keuntunganansuran_data as $index=>$total_keuntunganansuranData){ + // $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$total_keuntunganansuranData['norujukan']],['hargajualan','<>',null]])->first(); + // if($gadaiData){ + // $total_keuntunganansuran += $total_keuntunganansuranData['bayaran_keuntungan']; + // } + // } + // } $total_keuntunganbukanansuran_data = TransaksiKeuntungan::on('mysql7') // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') @@ -76,36 +81,54 @@ class LaporanController extends Controller ->where('trans.kodcaw','=',$request->kodcaw) // ->whereNotNull('db2.hargajualan') // ->sum('keuntungan_rebet'); - ->get(); - - $total_keuntunganbukanansuran = 0; + // ->get(); + ->pluck('transaksi_keuntungan.norujukan'); - if($total_keuntunganbukanansuran_data){ - foreach($total_keuntunganbukanansuran_data as $index=>$total_keuntunganbukanansuranData){ - $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$total_keuntunganbukanansuranData['norujukan']],['hargajualan','<>',null]])->first(); - if($gadaiData){ - $total_keuntunganbukanansuran += $total_keuntunganbukanansuranData['keuntungan_rebet']; - } - } - } + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganbukanansuran_data)->whereNotNull('hargajualan')->pluck('norujukan'); + + $total_keuntunganbukanansuran = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('keuntungan_rebet'); + + $total_keuntunganbukanansuran = TransaksiKeuntungan::on('mysql7') + ->whereIn('norujukan',$gadaiData) + ->whereDate('tarikh_bayaran','=',$request->tarikh) + ->sum('keuntungan_rebet'); + + // $total_keuntunganbukanansuran = 0; + + // if($total_keuntunganbukanansuran_data){ + // foreach($total_keuntunganbukanansuran_data as $index=>$total_keuntunganbukanansuranData){ + // $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$total_keuntunganbukanansuranData['norujukan']],['hargajualan','<>',null]])->first(); + // if($gadaiData){ + // $total_keuntunganbukanansuran += $total_keuntunganbukanansuranData['keuntungan_rebet']; + // } + // } + // } + + // dd($total_keuntunganbukanansuran); $keuntungan_data = TransaksiKeuntungan::on('mysql7') // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh) // ->whereNull('db2.hargajualan') // ->sum('bayaran_keuntungan'); - ->get(); + // ->get(); + ->pluck('norujukan'); - $keuntungan = 0; - if($keuntungan_data){ - foreach($keuntungan_data as $index=>$keuntunganData){ - $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan',null]])->first(); - if($gadaiData){ - $keuntungan += $keuntunganData['bayaran_keuntungan']; - } - } - } + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan'); + + $keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan'); + + // $keuntungan = 0; + + // if($keuntungan_data){ + // foreach($keuntungan_data as $index=>$keuntunganData){ + // $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan',null]])->first(); + // if($gadaiData){ + // $keuntungan += $keuntunganData['bayaran_keuntungan']; + // } + // } + // } $upahtebus = Tebus::on($cawangan['mysql']) ->where('t_tebus','=',$request->tarikh) @@ -219,18 +242,31 @@ class LaporanController extends Controller // ->where('db2.hargajualan','<>','null') ->where('tarikh_bayaran' ,'<=', $daterequest) // ->sum('bayaran_pembiayaan'); - ->get(); + // ->get(); + ->pluck('norujukan'); - $bayaranpendahuluan = 0; + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$bayaranpendahuluan_data) + ->where('sttebus' , '') + ->whereNotNull('hargajualan') + ->pluck('norujukan'); + + $bayaranpendahuluan = TransaksiKeuntungan::on('mysql7') + ->whereIn('norujukan',$gadaiData) + ->where('tarikh_bayaran' ,'<=', $daterequest) + ->sum('bayaran_pembiayaan'); + + // $bayaranpendahuluan = 0; - if($bayaranpendahuluan_data){ - foreach($bayaranpendahuluan_data as $index=>$bayaranpendahuluanData){ - $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$bayaranpendahuluanData['norujukan']],['sttebus',''],['hargajualan','<>','null']])->first(); - if($gadaiData){ - $bayaranpendahuluan += $bayaranpendahuluanData['bayaran_pembiayaan']; - } - } - } + // if($bayaranpendahuluan_data){ + // foreach($bayaranpendahuluan_data as $index=>$bayaranpendahuluanData){ + // $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$bayaranpendahuluanData['norujukan']],['sttebus',''],['hargajualan','<>','null']])->first(); + // if($gadaiData){ + // $bayaranpendahuluan += $bayaranpendahuluanData['bayaran_pembiayaan']; + // } + // } + // } + + // dd($bayaranpendahuluan); $outstandingimbangduga = floatval($rekodkoop) + floatval($rekodtawarruq) - floatval($bayaranpendahuluan); diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 5d42df7..3991b1f 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -977,19 +977,6 @@ class TebusController extends Controller // } // } - // $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql']) - // ->where('t_tebus','<=',$request->tarikh) - // ->where('t_tebus','>=','2021-03-14') - // ->whereYear('t_tebus','=',$current->year) - // ->whereNotNull('rebate') - // ->sum('rebate'); - - // $keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql']) - // ->where('t_tebus','<=',$request->tarikh) - // ->where('t_tebus','>','2021-04-13') - // ->whereYear('t_tebus','=',$current->year) - // ->whereNotNull('bakiupah') - // ->sum('bakiupah'); $upahtebus = Tebus::on($cawangan['mysql']) ->where([['t_tebus','<=',$request->tarikh],['t_tebus','>','2013-12-31']]) @@ -1009,10 +996,6 @@ class TebusController extends Controller $keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur; - // $keuntunganselepastawarruq = $keuntunganselepastawarruqupah; - - // $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq; - $total = $keuntungansebelumtawarruq + $keuntungan; if($kodcaw === '011232') @@ -1044,17 +1027,22 @@ class TebusController extends Controller ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year) // ->whereNull('db2.hargajualan') // ->sum('bayaran_keuntungan'); - ->get(); + // ->get(); + ->pluck('norujukan'); - $keuntungan = 0; - if($keuntungan_data){ - foreach($keuntungan_data as $index=>$keuntunganData){ - $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan',null]])->first(); - if($gadaiData){ - $keuntungan += $keuntunganData['bayaran_keuntungan']; - } - } - } + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $keuntungan_data)->whereNull('hargajualan')->pluck('norujukan'); + + $keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan'); + + // $keuntungan = 0; + // if($keuntungan_data){ + // foreach($keuntungan_data as $index=>$keuntunganData){ + // $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan',null]])->first(); + // if($gadaiData){ + // $keuntungan += $keuntunganData['bayaran_keuntungan']; + // } + // } + // } $upahtebus = Tebus::on($cawangan['mysql']) ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga],['t_tebus','>','2013-12-31']]) @@ -1210,17 +1198,26 @@ class TebusController extends Controller ->whereYear('tarikh_bayaran','=',$current->year) // ->whereNotNull('db2.hargajualan') // ->sum('bayaran_keuntungan'); - ->get(); + ->pluck('norujukan'); - $keuntungan = 0; - if($keuntungan_data){ - foreach($keuntungan_data as $index=>$keuntunganData){ - $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan','<>',null]])->first(); - if($gadaiData){ - $keuntungan += $keuntunganData['bayaran_keuntungan']; - } - } - } + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan'); + + $keuntungan = TransaksiKeuntungan::on('mysql7') + ->whereIn('norujukan',$gadaiData) + ->whereDate('tarikh_bayaran', '<=', $request->tarikh) + ->whereDate('tarikh_bayaran' ,'<', $dateSM) + ->whereYear('tarikh_bayaran','=',$current->year) + ->sum('bayaran_keuntungan'); + + // $keuntungan = 0; + // if($keuntungan_data){ + // foreach($keuntungan_data as $index=>$keuntunganData){ + // $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan','<>',null]])->first(); + // if($gadaiData){ + // $keuntungan += $keuntunganData['bayaran_keuntungan']; + // } + // } + // } $keuntunganreducing_data = TransaksiKeuntungan::on('mysql7') // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') @@ -1229,17 +1226,27 @@ class TebusController extends Controller ->whereYear('tarikh_bayaran','=',$current->year) // ->whereNotNull('db2.hargajualan') // ->sum('keuntungan_rebet'); - ->get(); + // ->get(); + ->pluck('norujukan'); + + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan'); + + $keuntungan = TransaksiKeuntungan::on('mysql7') + ->whereIn('norujukan',$gadaiData) + ->whereDate('tarikh_bayaran' ,'<=', $request->tarikh) + ->whereDate('tarikh_bayaran','>=', $dateSM) + ->whereYear('tarikh_bayaran','=',$current->year) + ->sum('keuntungan_rebet'); - $keuntunganreducing = 0; - if($keuntunganreducing_data){ - foreach($keuntunganreducing_data as $index=>$keuntunganreducingData){ - $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganreducingData['norujukan']],['hargajualan','<>',null]])->first(); - if($gadaiData){ - $keuntunganreducing += $keuntunganreducingData['keuntungan_rebet']; - } - } - } + // $keuntunganreducing = 0; + // if($keuntunganreducing_data){ + // foreach($keuntunganreducing_data as $index=>$keuntunganreducingData){ + // $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganreducingData['norujukan']],['hargajualan','<>',null]])->first(); + // if($gadaiData){ + // $keuntunganreducing += $keuntunganreducingData['keuntungan_rebet']; + // } + // } + // } $total = ($keuntungan + $keuntunganreducing); @@ -1253,17 +1260,25 @@ class TebusController extends Controller ->whereYear('tarikh_bayaran','=',$current->year) // ->whereNotNull('db2.hargajualan') // ->sum('bayaran_keuntungan'); - ->get(); + // ->get(); + ->pluck('norujukan'); + + + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan'); + + $keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan'); - $keuntungan = 0; - if($keuntungan_data){ - foreach($keuntungan_data as $index=>$keuntunganData){ - $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan','<>',null]])->first(); - if($gadaiData){ - $keuntungan += $keuntunganData['bayaran_keuntungan']; - } - } - } + // $keuntungan = 0; + // if($keuntungan_data){ + // foreach($keuntungan_data as $index=>$keuntunganData){ + // $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganData['norujukan']],['hargajualan','<>',null]])->first(); + // if($gadaiData){ + // $keuntungan += $keuntunganData['bayaran_keuntungan']; + // } + // } + // } + + // dd($keuntungan); $keuntunganreducing_data = TransaksiKeuntungan::on('mysql7') @@ -1273,17 +1288,28 @@ class TebusController extends Controller ->whereYear('tarikh_bayaran','=',$current->year) // ->whereNotNull('db2.hargajualan') // ->sum('keuntungan_rebet'); - ->get(); - - $keuntunganreducing = 0; - if($keuntunganreducing_data){ - foreach($keuntunganreducing_data as $index=>$keuntunganreducingData){ - $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganreducingData['norujukan']],['hargajualan','<>',null]])->first(); - if($gadaiData){ - $keuntunganreducing += $keuntunganreducingData['keuntungan_rebet']; - } - } - } + // ->get(); + ->pluck('norujukan'); + + $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntunganreducing_data)->whereNotNull('hargajualan')->pluck('norujukan'); + + $keuntunganreducing = TransaksiKeuntungan::on('mysql7') + ->whereIn('norujukan',$gadaiData) + ->whereDate('tarikh_bayaran' ,'<', '2021-06-09') + ->whereDate('tarikh_bayaran','>=', $dateSM) + ->sum('keuntungan_rebet'); + + // $keuntunganreducing = 0; + // if($keuntunganreducing_data){ + // foreach($keuntunganreducing_data as $index=>$keuntunganreducingData){ + // $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$keuntunganreducingData['norujukan']],['hargajualan','<>',null]])->first(); + // if($gadaiData){ + // $keuntunganreducing += $keuntunganreducingData['keuntungan_rebet']; + // } + // } + // } + + // dd($keuntunganreducing); $bukanansuran_data = TransaksiKeuntungan::on('mysql7') // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') @@ -1299,17 +1325,38 @@ class TebusController extends Controller ->whereYear('tarikh_bayaran','=',$current->year) // ->whereNotNull('db2.hargajualan') // ->sum('keuntungan_rebet'); - ->get(); - - $bukanansuran = 0; - if($bukanansuran_data){ - foreach($bukanansuran_data as $index=>$bukanansuranData){ - $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$bukanansuranData['norujukan']],['hargajualan','<>',null]])->first(); - if($gadaiData){ - $bukanansuran += $bukanansuranData['keuntungan_rebet']; - } - } - } + // ->get(); + ->pluck('transaksi_keuntungan.norujukan'); + + $gadaiData = Gadai::on($cawangan['mysql']) + ->whereIn('norujukan',$bukanansuran_data) + ->whereNotNull('hargajualan') + ->pluck('norujukan'); + + $bukanansuran = TransaksiKeuntungan::on('mysql7') + ->whereIn('transaksi_keuntungan.norujukan',$gadaiData) + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->where('trans.trans_type','!=','A') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09') + ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year) + ->sum('transaksi_keuntungan.keuntungan_rebet'); + + // $bukanansuran = 0; + // if($bukanansuran_data){ + // foreach($bukanansuran_data as $index=>$bukanansuranData){ + // $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$bukanansuranData['norujukan']],['hargajualan','<>',null]])->first(); + // if($gadaiData){ + // $bukanansuran += $bukanansuranData['keuntungan_rebet']; + // } + // } + // } + + // dd($bukanansuran); $ansuran_data = TransaksiKeuntungan::on('mysql7') // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') @@ -1325,17 +1372,38 @@ class TebusController extends Controller ->whereYear('tarikh_bayaran','=',$current->year) // ->whereNotNull('db2.hargajualan') // ->sum('bayaran_keuntungan'); - ->get(); + // ->get(); + ->pluck('transaksi_keuntungan.norujukan'); + + $gadaiData = Gadai::on($cawangan['mysql']) + ->whereIn('norujukan',$ansuran_data) + ->whereNotNull('hargajualan') + ->pluck('norujukan'); + + $ansuran = TransaksiKeuntungan::on('mysql7') + ->whereIn('transaksi_keuntungan.norujukan',$gadaiData) + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->where('trans.trans_type','=','A') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09') + ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year) + ->sum('transaksi_keuntungan.bayaran_keuntungan'); - $ansuran = 0; - if($ansuran_data){ - foreach($ansuran_data as $index=>$ansuranData){ - $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$ansuranData['norujukan']],['hargajualan','<>',null]])->first(); - if($gadaiData){ - $ansuran += $ansuranData['bayaran_keuntungan']; - } - } - } + // $ansuran = 0; + // if($ansuran_data){ + // foreach($ansuran_data as $index=>$ansuranData){ + // $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$ansuranData['norujukan']],['hargajualan','<>',null]])->first(); + // if($gadaiData){ + // $ansuran += $ansuranData['bayaran_keuntungan']; + // } + // } + // } + + // dd($ansuran); $total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran); From 5b7c0fa3bf51f7b6131c695219391d325b44fa2f Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Tue, 5 Oct 2021 01:07:35 +0800 Subject: [PATCH 21/23] server --- .env.tukar | 244 +++++++++++++++++++++++ app/Http/Controllers/TunaiController.php | 2 +- routes/web.php | 1 + 3 files changed, 246 insertions(+), 1 deletion(-) create mode 100644 .env.tukar diff --git a/.env.tukar b/.env.tukar new file mode 100644 index 0000000..e2fe920 --- /dev/null +++ b/.env.tukar @@ -0,0 +1,244 @@ +APP_NAME=Lumen +APP_ENV=local +APP_KEY=WbPGkYNmXZ6ZQplGlvl0iZ7zyW1b09xa +APP_DEBUG=false +APP_URL=https://api.arrahn.com.my +APP_TIMEZONE=Asia/Kuala_Lumpur + + +LOG_CHANNEL=stack +LOG_SLACK_WEBHOOK_URL= + +DB_CONNECTION=mysql +DB_HOST=172.16.4.102 +DB_PORT=3306 +DB_DATABASE=arrahn_kb2 +DB_USERNAME=zone2 +DB_PASSWORD=G0dz!ll4@2020 + +DB_CONNECTION_2=mysql +DB_HOST_2=172.16.4.102 +DB_PORT_2=3306 +DB_DATABASE_2=arrahn_wcy +DB_USERNAME_2=zone2 +DB_PASSWORD_2=G0dz!ll4@2020 + +DB_CONNECTION_3=mysql +DB_HOST_3=172.16.4.102 +DB_PORT_3=3306 +DB_DATABASE_3=arrahn_1stop +DB_USERNAME_3=zone2 +DB_PASSWORD_3=G0dz!ll4@2020 + +DB_CONNECTION_4=mysql +DB_HOST_4=172.16.4.102 +DB_PORT_4=3306 +DB_DATABASE_4=arrahn_jlwt +DB_USERNAME_4=zone2 +DB_PASSWORD_4=G0dz!ll4@2020 + +DB_CONNECTION_5=mysql +DB_HOST_5=172.16.4.102 +DB_PORT_5=3306 +DB_DATABASE_5=arrahn_wb +DB_USERNAME_5=zone2 +DB_PASSWORD_5=G0dz!ll4@2020 + +DB_CONNECTION_6=mysql +DB_HOST_6=172.16.4.102 +DB_PORT_6=3306 +DB_DATABASE_6=arrahn_kls +DB_USERNAME_6=zone2 +DB_PASSWORD_6=G0dz!ll4@2020 + +DB_CONNECTION_7=mysql +DB_HOST_7=172.16.4.102 +DB_PORT_7=3306 +DB_DATABASE_7=online_arrahn +DB_USERNAME_7=zone2 +DB_PASSWORD_7=G0dz!ll4@2020 + +DB_CONNECTION_8=mysql +DB_HOST_8=172.16.4.102 +DB_PORT_8=3306 +DB_DATABASE_8=arrahn_pp +DB_USERNAME_8=zone2 +DB_PASSWORD_8=G0dz!ll4@2020 + +DB_CONNECTION_9=mysql +DB_HOST_9=172.16.4.102 +DB_PORT_9=3306 +DB_DATABASE_9=arrahn_mace +DB_USERNAME_9=zone2 +DB_PASSWORD_9=G0dz!ll4@2020 + +DB_CONNECTION_10=mysql +DB_HOST_10=172.16.4.102 +DB_PORT_10=3306 +DB_DATABASE_10=arrahn_pm +DB_USERNAME_10=zone2 +DB_PASSWORD_10=G0dz!ll4@2020 + +DB_CONNECTION_11=mysql +DB_HOST_11=172.16.4.102 +DB_PORT_11=3306 +DB_DATABASE_11=arrahn_gm +DB_USERNAME_11=zone2 +DB_PASSWORD_11=G0dz!ll4@2020 + +DB_CONNECTION_12=mysql +DB_HOST_12172.16.4.102 +DB_PORT_12=3306 +DB_DATABASE_12=arrahn_gcl +DB_USERNAME_12=zone2 +DB_PASSWORD_12=G0dz!ll4@2020 + +DB_CONNECTION_13=mysql +DB_HOST_13=172.16.4.102 +DB_PORT_13=3306 +DB_DATABASE_13=arrahn_jli +DB_USERNAME_13=zone2 +DB_PASSWORD_13=G0dz!ll4@2020 + +DB_CONNECTION_14=mysql +DB_HOST_14=172.16.4.102 +DB_PORT_14=3306 +DB_DATABASE_14=arrahn_rp +DB_USERNAME_14=zone2 +DB_PASSWORD_14=G0dz!ll4@2020 + +DB_CONNECTION_15=mysql +DB_HOST_15=172.16.4.102 +DB_PORT_15=3306 +DB_DATABASE_15=arrahn_ktn +DB_USERNAME_15=zone2 +DB_PASSWORD_15=G0dz!ll4@2020 + +DB_CONNECTION_16=mysql +DB_HOST_16=172.16.4.102 +DB_PORT_16=3306 +DB_DATABASE_16=arrahn_pg +DB_USERNAME_16=zone2 +DB_PASSWORD_16=G0dz!ll4@2020 + +DB_CONNECTION_17=mysql +DB_HOST_17=172.16.4.102 +DB_PORT_17=3306 +DB_DATABASE_17=arrahn_skudai +DB_USERNAME_17=zone2 +DB_PASSWORD_17=G0dz!ll4@2020 + +DB_CONNECTION_18=mysql +DB_HOST_18=172.16.4.102 +DB_PORT_18=3306 +DB_DATABASE_18=arrahn_pttn +DB_USERNAME_18=zone2 +DB_PASSWORD_18=G0dz!ll4@2020 + +DB_CONNECTION_19=mysql +DB_HOST_19=172.16.4.102 +DB_PORT_19=3306 +DB_DATABASE_19=arrahn_btg +DB_USERNAME_19=zone2 +DB_PASSWORD_19=G0dz!ll4@2020 + +DB_CONNECTION_20=mysql +DB_HOST_20=172.16.4.102 +DB_PORT_20=3306 +DB_DATABASE_20=arrahn_raub +DB_USERNAME_20=zone2 +DB_PASSWORD_20=G0dz!ll4@2020 + +DB_CONNECTION_21=mysql +DB_HOST_21=172.16.4.102 +DB_PORT_21=3306 +DB_DATABASE_21=arrahn_kgr +DB_USERNAME_21=zone2 +DB_PASSWORD_21=G0dz!ll4@2020 + +DB_CONNECTION_22=mysql +DB_HOST_22=172.16.4.102 +DB_PORT_22=3306 +DB_DATABASE_22=arrahn_sdk +DB_USERNAME_22=zone2 +DB_PASSWORD_22=G0dz!ll4@2020 + +DB_CONNECTION_23=mysql +DB_HOST_23=172.16.4.102 +DB_PORT_23=3306 +DB_DATABASE_23=arrahn_sp +DB_USERNAME_23=zone2 +DB_PASSWORD_23=G0dz!ll4@2020 + +DB_CONNECTION_24=mysql +DB_HOST_24=172.16.4.102 +DB_PORT_24=3306 +DB_DATABASE_24=arrahn_twu +DB_USERNAME_24=zone2 +DB_PASSWORD_24=G0dz!ll4@2020 + +DB_CONNECTION_25=mysql +DB_HOST_25=172.16.4.102 +DB_PORT_25=3306 +DB_DATABASE_25=arrahn_api2 +DB_USERNAME_25=zone2 +DB_PASSWORD_25=G0dz!ll4@2020 + +DB_CONNECTION_26=mysql +DB_HOST_26=172.16.4.102 +DB_PORT_26=3306 +DB_DATABASE_26=arrahn_kjg +DB_USERNAME_26=zone2 +DB_PASSWORD_26=G0dz!ll4@2020 + +DB_CONNECTION_27=mysql +DB_HOST_27=172.16.4.102 +DB_PORT_27=3306 +DB_DATABASE_27=arrahn_rl +DB_USERNAME_27=zone2 +DB_PASSWORD_27=G0dz!ll4@2020 + +DB_CONNECTION_28=mysql +DB_HOST_28=172.16.4.102 +DB_PORT_28=3306 +DB_DATABASE_28=arrahn_bfort +DB_USERNAME_28=zone2 +DB_PASSWORD_28=G0dz!ll4@2020 + +DB_CONNECTION_29=mysql +DB_HOST_29=172.16.4.102 +DB_PORT_29=3306 +DB_DATABASE_29=arrahn_kbelud +DB_USERNAME_29=zone2 +DB_PASSWORD_29=G0dz!ll4@2020 + +DB_CONNECTION_30=mysql +DB_HOST_30=172.16.4.102 +DB_PORT_30=3306 +DB_DATABASE_30=arrahn_tuaran +DB_USERNAME_30=zone2 +DB_PASSWORD_30=G0dz!ll4@2020 + +DB_CONNECTION_31=mysql +DB_HOST_31=172.16.4.102 +DB_PORT_31=3306 +DB_DATABASE_31=arrahn_kngau +DB_USERNAME_31=zone2 +DB_PASSWORD_31=G0dz!ll4@2020 + +DB_CONNECTION_32=mysql +DB_HOST_32=172.16.4.102 +DB_PORT_32=3306 +DB_DATABASE_32=arrahn_tm +DB_USERNAME_32=zone2 +DB_PASSWORD_32=G0dz!ll4@2020 + +DB_CONNECTION_33=mysql +DB_HOST_33=172.16.4.102 +DB_PORT_33=3306 +DB_DATABASE_33=arrahn_tmlh +DB_USERNAME_33=zone2 +DB_PASSWORD_33=G0dz!ll4@2020 + +CACHE_DRIVER=file +QUEUE_CONNECTION=sync diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php index 08da160..1934978 100644 --- a/app/Http/Controllers/TunaiController.php +++ b/app/Http/Controllers/TunaiController.php @@ -395,7 +395,7 @@ class TunaiController extends Controller $teller = Tunai::on($cawangan['mysql']) ->select('kodlaluan') - ->whereRaw('LENGTH(kodlaluan) > 14') + ->whereRaw('LENGTH(kodlaluan) > 10') ->orWhere('kodlaluan','=','LELONG') ->distinct() ->get(); diff --git a/routes/web.php b/routes/web.php index 769f5c2..1f4fbc3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -355,6 +355,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ //Tuntut Baki $router->get('TuntutBaki/{kodcaw}',['uses'=>'LelongController@showTuntutBaki']); +$router->get('TuntutBakiTarikh/{kodcaw}',['uses'=>'LelongController@showTuntutBakiTarikh']); $router->get('TuntutBaki/{kodcaw}/teller',['uses'=>'LelongController@showTuntutBakiTeller']); $router->get('TuntutBaki/resit/{kodcaw}/{norujukan}',['uses'=>'LelongController@resitLelong']); $router->post('Tuntutbakisimpan/{kodcaw}',['uses'=>'LelongController@simpantuntutbaki']); From de3024fd68d599a7055fb9e8ef953e7aa8b370be Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 5 Oct 2021 10:49:05 +0800 Subject: [PATCH 22/23] masukkan kodcaw --- app/Http/Controllers/GadaiController.php | 2 ++ app/Http/Controllers/LaporanController.php | 2 ++ app/Http/Controllers/TebusController.php | 8 ++++++++ 3 files changed, 12 insertions(+) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 8e5d58d..265be34 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2817,6 +2817,7 @@ class GadaiController extends Controller $transaksi_data = TransaksiKeuntungan::on('mysql7') ->where('tarikh_bayaran' ,'<=', $daterequest) + ->where('kodcaw',$request->kodcaw) ->pluck('norujukan'); $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data) @@ -2871,6 +2872,7 @@ class GadaiController extends Controller $transaksi_data = TransaksiKeuntungan::on('mysql7') ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) + ->where('kodcaw',$request->kodcaw) ->pluck('norujukan'); $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index edd0e0d..8fc8512 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -50,6 +50,7 @@ class LaporanController extends Controller ->whereDate('trans.created_at','=',$request->tarikh) ->where('trans.kodcaw','=',$request->kodcaw) ->where('trans.trans_type','=','A') + ->where('trans.kodcaw',$request->kodcaw) // ->whereNotNull('db2.hargajualan') // ->sum('bayaran_keuntungan'); // ->get(); @@ -241,6 +242,7 @@ class LaporanController extends Controller // ->where('db2.sttebus','=','') // ->where('db2.hargajualan','<>','null') ->where('tarikh_bayaran' ,'<=', $daterequest) + ->where('kodcaw',$request->kodcaw) // ->sum('bayaran_pembiayaan'); // ->get(); ->pluck('norujukan'); diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 3991b1f..5e46613 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -1196,6 +1196,7 @@ class TebusController extends Controller ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) + ->where('kodcaw',$request->kodcaw) // ->whereNotNull('db2.hargajualan') // ->sum('bayaran_keuntungan'); ->pluck('norujukan'); @@ -1224,6 +1225,7 @@ class TebusController extends Controller ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) + ->where('kodcaw',$request->kodcaw) // ->whereNotNull('db2.hargajualan') // ->sum('keuntungan_rebet'); // ->get(); @@ -1258,6 +1260,7 @@ class TebusController extends Controller ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) + ->where('kodcaw',$request->kodcaw) // ->whereNotNull('db2.hargajualan') // ->sum('bayaran_keuntungan'); // ->get(); @@ -1286,6 +1289,7 @@ class TebusController extends Controller ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', '2021-06-09') ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) + ->where('kodcaw',$request->kodcaw) // ->whereNotNull('db2.hargajualan') // ->sum('keuntungan_rebet'); // ->get(); @@ -1323,6 +1327,7 @@ class TebusController extends Controller ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09') // ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) + ->where('trans.kodcaw',$request->kodcaw) // ->whereNotNull('db2.hargajualan') // ->sum('keuntungan_rebet'); // ->get(); @@ -1370,6 +1375,7 @@ class TebusController extends Controller ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09') // ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) + ->where('trans.kodcaw',$request->kodcaw) // ->whereNotNull('db2.hargajualan') // ->sum('bayaran_keuntungan'); // ->get(); @@ -1436,6 +1442,7 @@ class TebusController extends Controller ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) ->whereYear('tarikh_bayaran','=',$current->year) + ->where('trans.kodcaw',$request->kodcaw) // ->whereNotNull('db2.hargajualan') // ->sum('keuntungan_rebet'); ->get(); @@ -1461,6 +1468,7 @@ class TebusController extends Controller ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) ->whereYear('tarikh_bayaran','=',$current->year) + ->where('trans.kodcaw',$request->kodcaw) // ->whereNotNull('db2.hargajualan') // ->sum('bayaran_keuntungan'); ->get(); From 90f0c74598ca435d442d3b357d6c3c7ed9734548 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 5 Oct 2021 12:45:15 +0800 Subject: [PATCH 23/23] kodcaw --- app/Http/Controllers/TebusController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 5e46613..639d45e 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -952,11 +952,16 @@ class TebusController extends Controller $keuntungan_data = TransaksiKeuntungan::on('mysql7') ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year) + ->where('kodcaw',$kodcaw) ->pluck('norujukan'); $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $keuntungan_data)->whereNull('hargajualan')->pluck('norujukan'); - $keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan'); + $keuntungan = TransaksiKeuntungan::on('mysql7') + ->where('tarikh_bayaran' ,'<=', $daterequest) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereIn('norujukan',$gadaiData) + ->sum('bayaran_keuntungan'); // //Keuntungan Selepas Tawarruq // $keuntungan_data = TransaksiKeuntungan::on('mysql7')