From a51f381ec7d2593f407ea72b1d9266341ba6669d Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Thu, 15 Jul 2021 18:03:43 +0800 Subject: [PATCH 1/8] server --- .DS_Store | Bin 8196 -> 0 bytes .../Controllers/TacExpressPaymentController.php | 6 +++--- routes/web.php | 12 ++++++++++-- storage/app/.gitignore | 0 storage/framework/cache/.gitignore | 0 storage/framework/cache/data/.gitignore | 0 storage/framework/views/.gitignore | 0 storage/logs/.gitignore | 0 8 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 .DS_Store mode change 100644 => 100755 storage/app/.gitignore mode change 100644 => 100755 storage/framework/cache/.gitignore mode change 100644 => 100755 storage/framework/cache/data/.gitignore mode change 100644 => 100755 storage/framework/views/.gitignore mode change 100644 => 100755 storage/logs/.gitignore diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 082406abdaf869781baf6f0e0181883d3fcdad6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHM%T63e6uku)dLV=bgCR;HjWUX4$;bl77P6u!lQC8_c?iNF2Lul8?rDa$o33$p z4G$BdQKWoB9^0(4${$3^GMj9(%pyM!DazV8^%y+UV@uiCLUI+Vy0@#&sj7SWc?Tk5 zl~#R`XpV>+RB7EYG*2mVT-LraV0tED8TiBlKjuD;+&--BunJfOtO8a6tAJJDd?b__(5Msub_m_7z*istutnJcTQ;_>EqYLx zrow6}Gbsi$xdYR5jF%0*t*xdLQ!8U0vobRo3Nxt(D=Ij#vbMIh3RngD6_C06AbHfJ zW;O1~-`~Z^<;SWhnnC%8S<__szxmBL%EZFLA8cT7=)&-b~NP^Tm^;rG@$8(!%xA(}FYm_Tqchd;7U$kGGtUm1 z(8p)(5AaNQQE*_wW50C5`_pwh0TxEbUKxLN!kwJDI5|BzGjnNnZsxVA*WcK2FZy2a zppnY0-r_M&D{(8_aVIhaUk!M&nuZ4mbVGzkq82^E&{U4F7S_Lb(zSlv1ZMh4hnn=m zGz^oiMjF*uc6YN-Y;^gXaqJPCnX)q|z-#|Gul75ac`v`r7GP2bXw^fUcRztdmzFFj`C>=Jv6U19U=23ulf zR%IWtPuOQ{jcsZEKY504>17tc7bS)5MA8MQYv(_h84r77@Q!7 zm2r1t3$#YJaTP4nr?6Ksdp*aH@%A!OC@VE>LEk|7y$l&ObGo7)22P^IQ?Q7*2Rnk9 z1<>+rH}d+(NPEy1^qgpOdywb12ZfacylC1&vC_VO2T~d-e}Q_(eb^r)+FnTlAp3_#XoL QzZLBJU!4luyhIB82c$Bm&Hw-a diff --git a/app/Http/Controllers/TacExpressPaymentController.php b/app/Http/Controllers/TacExpressPaymentController.php index 5e5cf7d..a955f72 100644 --- a/app/Http/Controllers/TacExpressPaymentController.php +++ b/app/Http/Controllers/TacExpressPaymentController.php @@ -21,9 +21,9 @@ class TacExpressPaymentController extends Controller 'expired_at' => $expired_at ]); - $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'; + // $mobileno = '6'.$request->mobileno; + $mobileno = '60139321786'; + $messages = 'AR-RAHN PKB ' . $request->cawangan . ' : TAC: ' . $request->otp_token . ' ' . $currentDateTime . '. AR-RAHN CARELINE CENTRE 1300-22-4343'; $status = Http::get('http://gateway.onewaysms.com.au:10001/api.aspx',[ 'apiusername' => 'APIQ4LP5EMKXM', diff --git a/routes/web.php b/routes/web.php index ae1e4b3..e9ac1e1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -22,6 +22,14 @@ $router->group(['namespace' => '\Rap2hpoutre\LaravelLogViewer'], function() use $router->get('logs', 'LogViewerController@index'); }); +$router->get('_/phpinfo', function () { + ob_start(); + phpinfo(); + $response = ob_get_contents(); + ob_get_clean(); + return $response; + }); + $router->group(['prefix'=>'api'], function () use ($router){ //Customer API $router->get('customers',['uses'=>'CustomerController@showAllCustomers']); @@ -175,7 +183,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->post('transaksi_keuntungan',['uses'=>'TransaksiKeuntunganController@createTransaksiKeuntungan']); - $router->get('latest_transaksi_untung/data/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']); // new added 20210413 + $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 @@ -489,4 +497,4 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){ $router->get('komoditi/jumlah/baki',['uses'=>'KomuditiController@jumlahKomoditiDashboard']); $router->post('komoditi/statistik',['uses'=>'KomuditiController@statistikKomoditiDashboard']); -}); \ No newline at end of file +}); diff --git a/storage/app/.gitignore b/storage/app/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore old mode 100644 new mode 100755 diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore old mode 100644 new mode 100755 From a51f213cc621ee5846e6ccd83f0637a81d3464e2 Mon Sep 17 00:00:00 2001 From: afiq Date: Tue, 9 Nov 2021 10:27:45 +0800 Subject: [PATCH 2/8] dashboard api --- app/Http/Controllers/GadaiController.php | 201 ++++++++++++++---- .../TacExpressPaymentController.php | 6 +- routes/web.php | 2 + 3 files changed, 161 insertions(+), 48 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 007343a..0d794f8 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1639,18 +1639,24 @@ class GadaiController extends Controller $cawangan_all = Cawangan::on('mysql7')->get(); $current = Carbon::now(); $current = new Carbon(); + $harini = $current->toDateString(); + $lastweek = $current->subWeek()->toDateString(); $gadaiToday = 0; + $gadaiLastweek = 0; foreach($cawangan_all as $index=>$cawangan){ - $gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$current->toDateString())->get(); - if(sizeof($gadai) != 0){ - foreach($gadai as $gadaiall) - { - $gadaiToday += $gadaiall['pinjaman']; - } - } + $gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$harini)->sum('pinjaman'); + $gadai_last_week = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$lastweek)->sum('pinjaman'); + $gadaiLastweek += $gadai_last_week; + $gadaiToday += $gadai; } + $diffGadaiPercent = 0; + if($gadaiLastweek != 0){ + $diffGadaiPercent = (($gadaiToday - $gadaiLastweek)/$gadaiLastweek)*100; + } + $dataGadai = []; + array_push($dataGadai,['gadaiToday'=>$gadaiToday,'percentDiff'=>$diffGadaiPercent]); - return response()->json(number_format($gadaiToday,2)); + return response()->json($dataGadai); } @@ -1659,17 +1665,24 @@ class GadaiController extends Controller $cawangan_all = Cawangan::on('mysql7')->get(); $current = Carbon::now(); $current = new Carbon(); + $harini = $current->toDateString(); + $lastweek = $current->subWeek()->toDateString(); $tebusToday = 0; + $tebusLastWeek = 0; foreach($cawangan_all as $index=>$cawangan){ - $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$current->toDateString())->get(); - if(sizeof($tebus) != 0){ - foreach($tebus as $tebusall) - { - $tebusToday += $tebusall['pinjaman']; - } - } + $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakipjm'); + $tebus_last_week = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$lastweek)->sum('bakipjm'); + + $tebusToday += $tebus; + $tebusLastWeek += $tebus_last_week; } - return response()->json(number_format($tebusToday,2)); + $diffTebusPercent = 0; + if($tebusLastWeek != 0){ + $diffTebusPercent = (($tebusToday - $tebusLastWeek)/$tebusLastWeek)/100; + } + $dataTebus = []; + array_push($dataTebus,['tebusToday'=>$tebusToday,'percentDiff'=>$diffTebusPercent]); + return response()->json($dataTebus); } public function showAllVariasiToday(){ @@ -1677,46 +1690,64 @@ class GadaiController extends Controller $cawangan_all = Cawangan::on('mysql7')->get(); $current = Carbon::now(); $current = new Carbon(); - $variasiToday = 0; + $harini = $current->toDateString(); + $lastweek = $current->subWeek()->toDateString(); $tebusToday = 0; - foreach($cawangan_all as $index=>$cawangan){ - $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$current->toDateString())->get(); - if(sizeof($tebus) != 0){ - foreach($tebus as $tebusall) - { - $tebusToday += $tebusall['pinjaman']; - } - } - } $gadaiToday = 0; + $tebusLastWeek = 0; + $gadaiLastWeek = 0; foreach($cawangan_all as $index=>$cawangan){ - $gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$current->toDateString())->get(); - if(sizeof($gadai) != 0){ - foreach($gadai as $gadaiall) - { - $gadaiToday += $gadaiall['pinjaman']; - } - } + $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakipjm'); + $gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$harini)->sum('pinjaman'); + $gadai_last_week = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$lastweek)->sum('pinjaman'); + $tebus_last_week = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$lastweek)->sum('bakipjm'); + + $tebusToday += $tebus; + $gadaiToday += $gadai; + $tebusLastWeek += $tebus_last_week; + $gadaiLastWeek += $gadai_last_week; } $variasiToday = $gadaiToday - $tebusToday; - return response()->json(number_format($variasiToday,2)); + $variasiLastWeek = $gadaiLastWeek - $tebusLastWeek; + $percentDiffVariasi = 0; + if($variasiLastWeek != 0){ + $percentDiffVariasi = (($variasiToday - $variasiLastWeek)/$variasiLastWeek)*100; + } + $dataVariasi = []; + array_push($dataVariasi,['variasiToday'=>$variasiToday,'percentVariasi'=>$percentDiffVariasi]); + return response()->json($dataVariasi); } public function showAllUpahToday(){ $cawangan_all = Cawangan::on('mysql7')->get(); $current = Carbon::now(); $current = new Carbon(); + $harini = $current->toDateString(); + $lastweek = $current->subWeek()->toDateString(); $upahToday = 0; + $upahLastWeek = 0; foreach($cawangan_all as $index=>$cawangan){ - $upah = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$current->toDateString())->get(); - if(sizeof($upah) != 0){ - foreach($upah as $upahall) - { - $upahToday += $upahall['bakiupah']; - } - } + $upah_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakiupah'); + $upah_today = Advansur::on($cawangan['mysql'])->where('tarikh',$harini)->sum('upahDibayar'); + + $upah_tebus_lastweek = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$lastweek)->sum('bakiupah'); + $upah_lastweek = Advansur::on($cawangan['mysql'])->where('tarikh',$lastweek)->sum('upahDibayar'); + + $upahToday = $upahToday + $upah_tebus_today + $upah_today; + $upahLastWeek = $upahLastWeek + $upah_tebus_lastweek + $upah_lastweek; } - return response()->json(number_format($upahToday,2)); + $ansuran_today = TransaksiKeuntungan::on('mysql7')->where([['tarikh_bayaran','>=',$harini . ' 00:00:00'],['tarikh_bayaran','<=',$harini . ' 23:59:59']])->sum('bayaran_keuntungan'); + $ansuran_lastweek = TransaksiKeuntungan::on('mysql7')->where([['tarikh_bayaran','>=',$lastweek . ' 00:00:00'],['tarikh_bayaran','<=',$lastweek . ' 23:59:59']])->sum('bayaran_keuntungan'); + + $upahToday = $upahToday + $ansuran_today; + $upahLastWeek = $upahLastWeek + $ansuran_lastweek; + $diffUpah = 0; + if($upahLastWeek != 0){ + $diffUpah = (($upahToday - $upahLastWeek)/$upahLastWeek)*100; + } + $upahData = []; + array_push($upahData,['upahToday'=>$upahToday,'percentDiff'=>$diffUpah]); + return response()->json($upahData); } public function showAllGadaiTerkumpul(){ $cawangan_all = Cawangan::on('mysql7')->get(); @@ -1791,12 +1822,92 @@ class GadaiController extends Controller $cawangan_all = Cawangan::on('mysql7')->get(); $current = Carbon::now(); $current = new Carbon(); + $harini = $current->toDateString(); + $lastweek = $current->subWeek()->toDateString(); $outstandingSemasa = 0; + $outstandingLastWeek = 0; foreach($cawangan_all as $index=>$cawangan){ - $gadaiterkumpul = Gadai::on($cawangan['mysql'])->where('sttebus','=','')->sum('pinjaman'); - $outstandingSemasa += $gadaiterkumpul; + $gadaiactivetawarruq = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['hargajualan','<>',null]])->sum('bakipjm'); + $gadaiactivearrahn = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['hargajualan',null]])->sum('pinjaman'); + + $gadaiactivetawarruqLastWeek = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['hargajualan','<>',null],['t_gadai','<=',$lastweek]])->sum('bakipjm'); + $gadaiactivearrahnLastWeek = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['hargajualan',null],['t_gadai','<=',$lastweek]])->sum('pinjaman'); + + $totalgadaiactive = $gadaiactivetawarruq + $gadaiactivearrahn; + $totalgadaiactiveLastWeek = $gadaiactivetawarruqLastWeek + $gadaiactivearrahnLastWeek; + + $outstandingSemasa += $totalgadaiactive; + $outstandingLastWeek += $totalgadaiactiveLastWeek; } - return response()->json(number_format($outstandingSemasa,2)); + $percentDiffOutstanding = 0; + if($outstandingLastWeek != 0){ + $percentDiffOutstanding = (($outstandingSemasa - $outstandingLastWeek)/$outstandingLastWeek)*100; + } + $dataOutstanding = []; + array_push($dataOutstanding,['outstandingToday'=>$outstandingSemasa,'percentOutstanding'=>$percentDiffOutstanding]); + return response()->json($dataOutstanding); + } + + public function oneWeekData(){ + $weekly = Carbon::now(); + $weekly = new Carbon(); + $cawangan_all = Cawangan::on('mysql7')->get(); + $dataOneWeek = []; + for($i=0;$i<7;$i++){ + if($i == 0){ + $weekly_array_date = $weekly->subDays(0); + }else{ + $weekly_array_date = $weekly->subDays(1); + } + array_push($dataOneWeek,['tarikh'=>$weekly_array_date->toDateString(),'totalpembiayaan'=>0,'totaltebus'=>0,'totalupah'=>0, 'totalkomoditi'=>0,'totalnilaimarhun'=>0,'onlinepayment'=>0,'hargaemas'=>0]); + } + + foreach($dataOneWeek as $index=>$oneWeek){ + $totalGadai = 0; + $totalTebus = 0; + $totalUpah = 0; + $totalKomoditi = 0; + $totalNilaiMarhun = 0; + $totalOnline = 0; + $upah = 0; + + foreach($cawangan_all as $index2=>$cawangan){ + $gadaiCawangan = Gadai::on($cawangan['mysql'])->where('t_gadai',$oneWeek['tarikh'])->sum('pinjaman'); + $tebusCawangan = Tebus::on($cawangan['mysql'])->where('t_tebus',$oneWeek['tarikh'])->sum('bakipjm'); + $upahTebusCawangan = Tebus::on($cawangan['mysql'])->where('t_tebus',$oneWeek['tarikh'])->sum('bakiupah'); + $nilaiMarhunCawangan = Gadai::on($cawangan['mysql'])->where('t_gadai',$oneWeek['tarikh'])->sum('nilaimarhun'); + $upahCawangan = Advansur::on($cawangan['mysql'])->where('tarikh',$oneWeek['tarikh'])->sum('upahDibayar'); + + $totalGadai += $gadaiCawangan; + $totalTebus += $tebusCawangan; + $totalNilaiMarhun += $nilaiMarhunCawangan; + $upah_cawangan = $upahTebusCawangan + $upahCawangan; + $upah += $upah_cawangan; + } + $totalOnline = TransactionOnline::on('mysql7')->where([['tarikh',$oneWeek['tarikh']],['status','PAID']])->sum('total_payment'); + $totalKomoditi = KomuditiTransaksi::on('mysql7')->where('tarikh',$oneWeek['tarikh'])->sum('unit_komuditi'); + $ansuran = TransaksiKeuntungan::on('mysql7')->join('transaction as trans', function($join){ + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->where('trans.teller','<>','Online') + ->where([['transaksi_keuntungan.tarikh_bayaran','>=',$oneWeek['tarikh'] . ' 00:00:00'],['transaksi_keuntungan.tarikh_bayaran','<=',$oneWeek['tarikh'] . ' 23:59:59']]) + ->sum('bayaran_keuntungan'); + + $harga_emas = HistoryEmasSandaran::on('mysql7')->where([['t_efektif','<=',$oneWeek['tarikh']],['karat','22.0K']])->orderBy('t_efektif','desc')->first(); + + $totalUpah = $ansuran + $upah; + + $dataOneWeek[$index]['totalpembiayaan'] = $totalGadai; + $dataOneWeek[$index]['totaltebus'] = $totalTebus; + $dataOneWeek[$index]['totalupah'] = $totalUpah; + $dataOneWeek[$index]['totalkomoditi'] = $totalKomoditi; + $dataOneWeek[$index]['totalnilaimarhun'] = $totalNilaiMarhun; + $dataOneWeek[$index]['onlinepayment'] = $totalOnline; + $dataOneWeek[$index]['hargaemas'] = $harga_emas['harga']; + } + + return response()->json($dataOneWeek); } public function nilaiMarhunSemasa() diff --git a/app/Http/Controllers/TacExpressPaymentController.php b/app/Http/Controllers/TacExpressPaymentController.php index 5e5cf7d..b61aa17 100644 --- a/app/Http/Controllers/TacExpressPaymentController.php +++ b/app/Http/Controllers/TacExpressPaymentController.php @@ -25,9 +25,9 @@ class TacExpressPaymentController extends Controller // $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',[ - 'apiusername' => 'APIQ4LP5EMKXM', - 'apipassword' => 'APIQ4LP5EMKXM7CQOX', + $status = Http::get('http://gateway.onewaysms.com.my:10001/api.aspx',[ + 'apiusername' => 'APIUK330HDAFO', + 'apipassword' => 'APIUK330HDAFOUK330', 'senderid' => 'INFO', 'mobileno' => $mobileno, 'message'=> $messages, diff --git a/routes/web.php b/routes/web.php index 863e9ef..9286eb9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -562,6 +562,8 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){ $router->get('nilaimarhun/semasa',['uses'=>'GadaiController@nilaiMarhunSemasa']); $router->get('vault/semasa',['uses'=>'GadaiController@petiBesiSemasa']); + $router->get('oneweekdata',['uses'=>'GadaiController@oneWeekData']); + $router->post('prestasi/cawangan',['uses'=>'GadaiController@prestasiCawangan']); $router->post('peti_besi',['uses'=>'GadaiController@petiBesiCawangan']); From 205710054f2514577c7a7e411cf2017e147d8aa5 Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Tue, 9 Nov 2021 10:31:08 +0800 Subject: [PATCH 3/8] server staging --- app/Http/Controllers/GadaiController.php | 44 +++++++++++++----------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 007343a..0125752 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2725,7 +2725,7 @@ class GadaiController extends Controller ->join('tebus as teb','teb.norujukan','=','gadai.norujukan') ->where('gadai.tagpalsu','=',0) ->where([['gadai.t_gadai','<=',$tarikhtawarruq],['gadai.sttebus','=','T']]) - ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]]) + ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]]) ->sum('teb.pinjaman'); $pembiayaanlelong = Lelong::on($cawangan['mysql']) @@ -2922,29 +2922,31 @@ class GadaiController extends Controller ->pluck('norujukan'); $transaksi_kredit_gadai = Gadai::on($cawangan['mysql']) - ->whereIn('gadai.norujukan',$transaksi_data) - ->join('tebus as t','gadai.norujukan','=','t.norujukan') + ->whereIn('norujukan',$transaksi_data) + //->join('tebus as t','gadai.norujukan','=','t.norujukan') ->where([['hargajualan','<>','null']]) - ->pluck('gadai.norujukan'); + //->orWhere([['sttebus','!=',''],['hargajualan','<>','null'],['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga]]) + ->pluck('norujukan'); $transaksi_kredit = 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'); - }) - ->whereIn('transaksi_keuntungan.norujukan',$transaksi_kredit_gadai) - ->where('trans.trans_type','=','A') - ->whereDate('tarikh_bayaran','<=', $request->hingga) - ->whereDate('tarikh_bayaran','>=', $request->mula) - // ->whereBetween('tarikh_bayaran',[$from,$to]) - ->sum('bayaran_pembiayaan'); + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->whereIn('transaksi_keuntungan.norujukan',$transaksi_kredit_gadai) + ->where('trans.trans_type','=','A') + ->whereDate('tarikh_bayaran','<=', $request->hingga) + ->whereDate('tarikh_bayaran','>=', $request->mula) + // ->whereBetween('tarikh_bayaran',[$from,$to]) + ->sum('bayaran_pembiayaan'); - // $transaksi_kredit = 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]]) - // ->sum('bayaran_pembiayaan'); + //$transaksi_kredit = 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]]) + // ->sum('bayaran_pembiayaan'); + //dd($transaksi_kredit); $tebus = Gadai::on($cawangan['mysql']) ->select('gadai.norujukan','gadai.hargajualan','gadai.bakihargajualan') @@ -2964,7 +2966,7 @@ class GadaiController extends Controller } } - // dd($arraytebus); + //dd($arraytebus); $transaksi_debit = TransaksiKeuntungan::on('mysql7') ->leftJoin('transaction as trans', function($join) @@ -2973,7 +2975,7 @@ class GadaiController extends Controller $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) ->where('trans.trans_type','=','A') - ->where('trans.norujukan',$arraytebus) + ->whereIn('trans.norujukan',$arraytebus) ->sum('bayaran_pembiayaan'); $arraylejer = ["keluar" => $transaksi_debit,"masuk" => $transaksi_kredit]; From 21926522bdd5532772ef9587af3323b78086d4b4 Mon Sep 17 00:00:00 2001 From: afiq Date: Wed, 10 Nov 2021 03:59:55 +0800 Subject: [PATCH 4/8] hapus double gadaian --- app/Http/Controllers/GadaiController.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 0d794f8..7c144be 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2110,6 +2110,13 @@ class GadaiController extends Controller Tebus::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->delete(); Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); + + $gadaiDouble = Gadai::on($cawangan['mysql'])->where('historygadaian',$gadai[0]['historygadaian'])->pluck('norujukan'); + + if($gadaiDouble){ + Gadai::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete(); + Marhun::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete(); + } return response('Deleted Successfully', 200); } From f9d891335dee1eddea2c9fb3aefa3ed24c4bdafe Mon Sep 17 00:00:00 2001 From: afiq Date: Wed, 10 Nov 2021 04:23:07 +0800 Subject: [PATCH 5/8] double gadai AT --- app/Http/Controllers/GadaiController.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index c1f4c0e..d24d394 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -23,6 +23,8 @@ use App\KawalanStok; use App\Moratorium; use App\Audit; use App\Customer; +use App\KomuditiPurchase; +use App\KomuditiTransaksi; use Illuminate\Http\Request; @@ -2116,6 +2118,7 @@ class GadaiController extends Controller if($gadaiDouble){ Gadai::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete(); Marhun::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete(); + batalKomuditi($gadaiDouble); } return response('Deleted Successfully', 200); @@ -2161,6 +2164,24 @@ class GadaiController extends Controller } + public function batalKomuditi($norujukan){ + + $komuditi_current = KomuditiPurchase::on('mysql7')->orderBy('created_at','desc')->first(); + + $transaksi_asal = KomuditiTransaksi::on('mysql7')->whereIn('norujukan','=',$norujukan)->sum('unit_komuditi'); + + + $update_unit = $unit_current + $transaksi_asal['unit_komuditi']; + + $update_komuditi = KomuditiPurchase::on('mysql7')->where('id','=',$komuditi_current['id'])->update([ + 'unit_komuditi' => $update_unit + ]); + + $komuditi_transaksi = KomuditiTransaksi::on('mysql7')->whereIn('norujukan',$norujukan)->delete(); + + return 'success'; + } + public function TebusHapus($kodcaw,$norujukan,Request $request) { $current = Carbon::now(); From 563875027f96e36ff803e7f468bb9feb4263d438 Mon Sep 17 00:00:00 2001 From: afiq Date: Wed, 10 Nov 2021 14:50:51 +0800 Subject: [PATCH 6/8] fix double gadaian --- app/Http/Controllers/GadaiController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index d24d394..7848fe0 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2113,12 +2113,12 @@ class GadaiController extends Controller Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete(); - $gadaiDouble = Gadai::on($cawangan['mysql'])->where('historygadaian',$gadai[0]['historygadaian'])->pluck('norujukan'); + $gadaiDouble = Gadai::on($cawangan['mysql'])->where([['historygadaian',$gadai[0]['historygadaian']],['norujukan','<>',$gadai[0]['historygadaian']]])->pluck('norujukan'); if($gadaiDouble){ Gadai::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete(); Marhun::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete(); - batalKomuditi($gadaiDouble); + $this->batalKomuditi($gadaiDouble); } return response('Deleted Successfully', 200); From 112f0e22ce046c04d1b6322bdfa80f2f4b49973d Mon Sep 17 00:00:00 2001 From: afiq Date: Wed, 10 Nov 2021 15:01:11 +0800 Subject: [PATCH 7/8] fix --- app/Http/Controllers/GadaiController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 7848fe0..edcf021 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2118,7 +2118,7 @@ class GadaiController extends Controller if($gadaiDouble){ Gadai::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete(); Marhun::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete(); - $this->batalKomuditi($gadaiDouble); + $this->batalKomuditi($gadai[0]['historygadaian']); } return response('Deleted Successfully', 200); @@ -2166,9 +2166,11 @@ class GadaiController extends Controller public function batalKomuditi($norujukan){ + $gadaiDouble = Gadai::on($cawangan['mysql'])->where([['historygadaian',$norujukan],['norujukan','<>',$norujukan]])->pluck('norujukan'); + $komuditi_current = KomuditiPurchase::on('mysql7')->orderBy('created_at','desc')->first(); - $transaksi_asal = KomuditiTransaksi::on('mysql7')->whereIn('norujukan','=',$norujukan)->sum('unit_komuditi'); + $transaksi_asal = KomuditiTransaksi::on('mysql7')->whereIn('norujukan','=',$gadaiDouble)->sum('unit_komuditi'); $update_unit = $unit_current + $transaksi_asal['unit_komuditi']; @@ -2177,7 +2179,7 @@ class GadaiController extends Controller 'unit_komuditi' => $update_unit ]); - $komuditi_transaksi = KomuditiTransaksi::on('mysql7')->whereIn('norujukan',$norujukan)->delete(); + $komuditi_transaksi = KomuditiTransaksi::on('mysql7')->whereIn('norujukan',$gadaiDouble)->delete(); return 'success'; } From 1b94ecb23641e132a5db0bfd448010e7eb2e377a Mon Sep 17 00:00:00 2001 From: afiq Date: Wed, 10 Nov 2021 23:06:42 +0800 Subject: [PATCH 8/8] fix --- app/Http/Controllers/GadaiController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index edcf021..09f8870 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2118,7 +2118,7 @@ class GadaiController extends Controller if($gadaiDouble){ Gadai::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete(); Marhun::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete(); - $this->batalKomuditi($gadai[0]['historygadaian']); + $this->batalKomuditi($gadai[0]['historygadaian'],$cawangan['mysql']); } return response('Deleted Successfully', 200); @@ -2164,9 +2164,9 @@ class GadaiController extends Controller } - public function batalKomuditi($norujukan){ + public function batalKomuditi($norujukan,$cawangan_mysql){ - $gadaiDouble = Gadai::on($cawangan['mysql'])->where([['historygadaian',$norujukan],['norujukan','<>',$norujukan]])->pluck('norujukan'); + $gadaiDouble = Gadai::on($cawangan_mysql)->where([['historygadaian',$norujukan],['norujukan','<>',$norujukan]])->pluck('norujukan'); $komuditi_current = KomuditiPurchase::on('mysql7')->orderBy('created_at','desc')->first();