From a51f381ec7d2593f407ea72b1d9266341ba6669d Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Thu, 15 Jul 2021 18:03:43 +0800 Subject: [PATCH 1/2] 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 205710054f2514577c7a7e411cf2017e147d8aa5 Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Tue, 9 Nov 2021 10:31:08 +0800 Subject: [PATCH 2/2] 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];