From 0c26ce1198a170061c6fb0248f0b34a621695174 Mon Sep 17 00:00:00 2001 From: afiq Date: Tue, 1 Jun 2021 03:29:14 +0800 Subject: [PATCH 1/6] express payment --- .../TransactionOnlineController.php | 18 ++++++++++++++---- app/TransactionOnline.php | 2 +- routes/web.php | 1 + 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/TransactionOnlineController.php b/app/Http/Controllers/TransactionOnlineController.php index a35e189..93e1d95 100644 --- a/app/Http/Controllers/TransactionOnlineController.php +++ b/app/Http/Controllers/TransactionOnlineController.php @@ -8,6 +8,11 @@ use Carbon\Carbon; class TransactionOnlineController extends Controller { + public function getTransactionOnline(Request $request){ + $transactionOnline = TransactionOnline::on('mysql7')->where('billplz_id',$request->billplz_id)->first(); + + return response()->json($transactionOnline); + } public function getLatestNosiri(){ $current = Carbon::now(); $current = new Carbon(); @@ -25,17 +30,22 @@ class TransactionOnlineController extends Controller 'nokp' => $request->nokp, 'reference_no' => $request->reference_no, 'nosiri' => $request->nosiri, + 'billplz_id' => $request->billplz_id, + 'norujukan' => $request->norujukan, + 'kodcaw' => $request->kodcaw, 'total_payment' => $request->total_payment, 'tarikh' => $current->toDateString(), - 'masa' => $current->toTimeString() + 'masa' => $current->toTimeString(), + 'customer_name' => $request->customer_name ]); return response()->json($transaction,201); } - public function updateStatus(){ - $transaction = TransactionOnline::on('mysql7')->where('reference_no','=',$request->reference_no)->update(array( - 'status' => 1 + public function updateStatus(Request $request){ + $transaction = TransactionOnline::on('mysql7')->where('billplz_id','=',$request->billplz_id)->update(array( + 'status' => $request->status, + 'paid_at' => $request->paid_at )); return response()->json($transaction,200); diff --git a/app/TransactionOnline.php b/app/TransactionOnline.php index c600c31..9d7727c 100644 --- a/app/TransactionOnline.php +++ b/app/TransactionOnline.php @@ -15,7 +15,7 @@ class TransactionOnline extends Model * @var array */ protected $fillable = [ - 'nokp','reference_no','nosiri','total_payment','tarikh','masa','status' + 'nokp','reference_no','nosiri','total_payment','tarikh','masa','status','billplz_id','kodcaw','norujukan','paid_at','customer_name' ]; /** diff --git a/routes/web.php b/routes/web.php index 56022a4..516741e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -190,6 +190,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('online/transaction',['uses'=>'TransactionOnlineController@getLatestNosiri']); $router->post('online/transaction',['uses'=>'TransactionOnlineController@create']); $router->put('online/transaction',['uses'=>'TransactionOnlineController@updateStatus']); + $router->get('transaction/online/express',['uses'=>'TransactionOnlineController@getTransactionOnline']); //ANSURAN UPAH API From 8c8b7f123a20eba83a56ca22fb1d01f530c0581f Mon Sep 17 00:00:00 2001 From: afiq Date: Thu, 3 Jun 2021 07:47:46 +0800 Subject: [PATCH 2/6] billplz --- .../Controllers/PortalBillplzController.php | 15 +++++++++++ app/PortalBillplz.php | 26 +++++++++++++++++++ routes/web.php | 3 +++ 3 files changed, 44 insertions(+) create mode 100644 app/Http/Controllers/PortalBillplzController.php create mode 100644 app/PortalBillplz.php diff --git a/app/Http/Controllers/PortalBillplzController.php b/app/Http/Controllers/PortalBillplzController.php new file mode 100644 index 0000000..7dc1f67 --- /dev/null +++ b/app/Http/Controllers/PortalBillplzController.php @@ -0,0 +1,15 @@ +select('collection_id')->where('kodcaw',$request->kodcaw)->first(); + + return response()->json($collection_id['collection_id']); + } +} \ No newline at end of file diff --git a/app/PortalBillplz.php b/app/PortalBillplz.php new file mode 100644 index 0000000..6c17e1c --- /dev/null +++ b/app/PortalBillplz.php @@ -0,0 +1,26 @@ +group(['prefix'=>'api'], function () use ($router){ $router->get('komoditi/rekod/transaksi',['uses'=>'KomuditiController@rekodTransaksiKomoditi']); $router->get('laporan/harian',['uses'=>'LaporanController@laporanHarian']); + + //Collection ID Billplz + $router->get('billplz/collectionid',['uses'=>'PortalBillplzController@getCollectionIDCawangan']); }); $router->group(['prefix'=>'e-arrahn'], function () use ($router){ From 55d494296a44b6c7fae7afb7f21ecd6a9f851e0e Mon Sep 17 00:00:00 2001 From: afiq Date: Tue, 8 Jun 2021 13:32:03 +0800 Subject: [PATCH 3/6] speed payment --- .../TacExpressPaymentController.php | 61 +++++++++++++++++++ app/TacExpressPayment.php | 26 ++++++++ routes/web.php | 5 ++ 3 files changed, 92 insertions(+) create mode 100644 app/Http/Controllers/TacExpressPaymentController.php create mode 100644 app/TacExpressPayment.php diff --git a/app/Http/Controllers/TacExpressPaymentController.php b/app/Http/Controllers/TacExpressPaymentController.php new file mode 100644 index 0000000..4e9ed98 --- /dev/null +++ b/app/Http/Controllers/TacExpressPaymentController.php @@ -0,0 +1,61 @@ +addMinutes(15); + + TacExpressPayment::on('mysql7')->create([ + 'norujukan' => $request->norujukan, + 'tac_no' => $request->otp_token, + 'expired_at' => $expired_at + ]); + + // $mobileno = '6'.$request->mobileno; + $mobileno = '60189025461'; + $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', + 'apipassword' => 'APIQ4LP5EMKXM7CQOX', + 'senderid' => 'INFO', + 'mobileno' => $mobileno, + 'message'=> $messages, + 'languagetype'=> 1 + ]); + + return response($status); + } + + public function getTacExpressPayment(Request $request){ + $currentDateTime = Carbon::now(); + $tac_data = TacExpressPayment::on('mysql7')->where([['norujukan',$request->norujukan],['expired_at','>',$currentDateTime]])->get(); + + if(sizeof($tac_data) > 0){ + return response(1); + }else{ + return response(0); + } + } + + public function verifyTacExpressPayment(Request $request){ + $currentDateTime = Carbon::now(); + $tac_data = TacExpressPayment::on('mysql7')->where([['norujukan',$request->norujukan],['tac_no',$request->tac_token],['expired_at','>',$currentDateTime]])->get(); + + if(sizeof($tac_data) > 0){ + return response(1); + }else{ + return response(0); + } + } +} diff --git a/app/TacExpressPayment.php b/app/TacExpressPayment.php new file mode 100644 index 0000000..b709357 --- /dev/null +++ b/app/TacExpressPayment.php @@ -0,0 +1,26 @@ +group(['prefix'=>'api'], function () use ($router){ //Collection ID Billplz $router->get('billplz/collectionid',['uses'=>'PortalBillplzController@getCollectionIDCawangan']); + + //Generate TAC Express Payment + $router->post('tac/generate/express_payment',['uses'=>'TacExpressPaymentController@generateTacExpressPayment']); + $router->get('tac/get/express_payment',['uses'=>'TacExpressPaymentController@getTacExpressPayment']); + $router->get('tac/verify/express_payment',['uses'=>'TacExpressPaymentController@verifyTacExpressPayment']); }); $router->group(['prefix'=>'e-arrahn'], function () use ($router){ From 37bb86c8601d3444e216a1c1a1168b76fb29a6f4 Mon Sep 17 00:00:00 2001 From: afiq Date: Thu, 10 Jun 2021 13:24:37 +0800 Subject: [PATCH 4/6] update status --- .../TacExpressPaymentController.php | 6 +- .../TransactionOnlineController.php | 153 ++++++++++++++++++ app/TransactionOnline.php | 2 +- routes/web.php | 1 + 4 files changed, 158 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/TacExpressPaymentController.php b/app/Http/Controllers/TacExpressPaymentController.php index 4e9ed98..5e5cf7d 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 = 'AR-RAHN PKB ' . $request->cawangan . ' : TAC: ' . $request->otp_token . ' ' . $currentDateTime . '. AR-RAHN CARELINE CENTRE 1300-22-4343'; + $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',[ 'apiusername' => 'APIQ4LP5EMKXM', diff --git a/app/Http/Controllers/TransactionOnlineController.php b/app/Http/Controllers/TransactionOnlineController.php index 93e1d95..088a43e 100644 --- a/app/Http/Controllers/TransactionOnlineController.php +++ b/app/Http/Controllers/TransactionOnlineController.php @@ -3,6 +3,10 @@ namespace App\Http\Controllers; use App\TransactionOnline; +use App\Advansur; +use App\Transaction; +use App\TransaksiKeuntungan; +use App\Gadai; use Illuminate\Http\Request; use Carbon\Carbon; @@ -50,4 +54,153 @@ class TransactionOnlineController extends Controller return response()->json($transaction,200); } + + public function updateTransactionOnline(){ + $transactions = TransactionOnline::on('mysql7')->where([['status','PAID'],['update_status',0]])->get(); + + foreach($transactions as $index=>$transaction){ + $cawangan = Cawangan::on('mysql7') + ->where('kodcaw','=',$transaction['kodcaw']) + ->first(); + $gadai_data = Gadai::on($cawangan['mysql'])->where([['norujukan',$transaction['norujukan']],['nokp',$transaction['nokp']]])->first(); + + if($gadai_data['hargajualan'] > 0){ + $this->updateGadaiMarhunKaunter($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at']); + }else{ + $this->createAdvansur($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at']); + } + + TransactionOnline::on('mysql7')->where('norujukan',$transaction['norujukan'])->update([ + 'update_status' => 1 + ]); + } + + return response()->json($transaction); + } + + public function kiraupahTawarruq($kodcaw,$norujukan){ + $cawangan = Cawangan::on('mysql7') + ->where('kodcaw','=',$kodcaw) + ->first(); + + $gadai_data = Gadai::on($cawangan['mysql']) + ->where('norujukan','=',$norujukan) + ->first(); + + $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; + + $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']); + + $upah_semasa_round = number_format($upahsemasa_raw,2); + $upah_semasa = (float)substr($upah_semasa_round, 0, -1); + + return $upah_semasa; + } + + public function kiraUpahRebet($kodcaw,$norujukan){ + $cawangan = Cawangan::on('mysql7') + ->where('kodcaw','=',$kodcaw) + ->first(); + + $gadai_data = Gadai::on($cawangan['mysql']) + ->where('norujukan','=',$norujukan) + ->first(); + + $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; + + $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); + + $upah_rebet_round = number_format($upahrebet_raw,2); + $upah_rebet = (float)substr($upah_rebet_round, 0, -1); + + return $upah_rebet; + } + + public function updateGadaiMarhunKaunter($kodcaw,$norujukan,$bayaran,$paid_at){ + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); + + $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan); + $upahrebet = $this->kiraUpahRebet($kodcaw,$norujukan); + + $total_bayaran_prev = Transaction::on('mysql7')->where([['norujukan','=',$norujukan],['trans_type','=','A']])->sum('duit_masuk'); + + $total_bayaran_semasa = $total_bayaran_prev + $bayaran; + + if($total_bayaran_semasa >= $gadai['bakiupah']){ + $lelong_tawarruq = 0; + }else{ + $lelong_tawarruq = 1; + } + + $baki_hargajualan = $gadai['bakihargajualan'] - $bayaran; + + $baki_bayaran = $bayaran - $upahsemasa; + + $baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran; + + $transaction = Transaction::on('mysql7')->create([ + 'trans_type' => 'A', + 'norujukan' => $norujukan, + 'nokp' => $gadai['nokp'], + 'teller' => 'Online', + 'kodcaw' => $kodcaw, + 'duit_masuk' => $bayaran, + 'created_at' => $paid_at, + 'bakiharga' => $baki_hargajualan, + ]); + + $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([ + 'norujukan' => $norujukan, + 'bayaran_keuntungan' => $upahsemasa, + 'bayaran_pembiayaan' => $baki_bayaran, + 'keuntungan_rebet'=> $upahrebet, + 'tarikh_bayaran'=> $paid_at, + 'kodcaw'=> $kodcaw + ]); + + $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( + 'bakipjm' => $baki_pinjaman, + 'jbg' => 0, + 't_update' => $paid_at->toDateString(), + 'bakihargajualan' => $baki_hargajualan, + 'tempohbayar' => $gadai['tempoh'], + 'lelong_tawarruq' => $lelong_tawarruq + )); + return response()->json($update_gadai, 200); + } + + public function createAdvansur($kodcaw,$norujukan,$bayaran,$paid_at){ + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $gadai = Gadai::on($cawangan['mysql'])->where('norujukan',$norujukan)->first(); + + $create_advansur = Advansur::on($cawangan['mysql'])->create([ + 'tarikh'=> $paid_at->toDateString(), + 'noresit'=> 0, + 'norujukan' => $norujukan, + 'nopelanggan' => $gadai['nopelanggan'], + 'nilaimarhun' => $gadai['nilaimarhun'], + 'pinjaman' => $gadai['pinjaman'], + 'kadarupah' => $gadai['kadarupah'], + 'glcode' => "1000/010", + 'upahsebenar' => $bayaran, + 'upahDibayar' => $bayaran, + 'teller' => 'Online', + 'prkod' => $gadai['prkod'], + 'jbg' => $gadai['tempoh'], + 'nowakil' => 0, + 'hubungan' => 0, + 'status' => 0, + 'historygadaian' => $norujukan + ]); + + return response()->json($create_advansur ,201); + } } diff --git a/app/TransactionOnline.php b/app/TransactionOnline.php index 9d7727c..61f3dab 100644 --- a/app/TransactionOnline.php +++ b/app/TransactionOnline.php @@ -15,7 +15,7 @@ class TransactionOnline extends Model * @var array */ protected $fillable = [ - 'nokp','reference_no','nosiri','total_payment','tarikh','masa','status','billplz_id','kodcaw','norujukan','paid_at','customer_name' + 'nokp','reference_no','nosiri','total_payment','tarikh','masa','status','billplz_id','kodcaw','norujukan','paid_at','customer_name','update_status','update_serahan' ]; /** diff --git a/routes/web.php b/routes/web.php index 663e7b6..ae1e4b3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -191,6 +191,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->post('online/transaction',['uses'=>'TransactionOnlineController@create']); $router->put('online/transaction',['uses'=>'TransactionOnlineController@updateStatus']); $router->get('transaction/online/express',['uses'=>'TransactionOnlineController@getTransactionOnline']); + $router->get('transaction/online/update',['uses'=>'TransactionOnlineController@updateTransactionOnline']); //ANSURAN UPAH API From f31eabe21b5efb4fcd50171d50e33fbcaf60928c Mon Sep 17 00:00:00 2001 From: afiq Date: Thu, 10 Jun 2021 14:46:08 +0800 Subject: [PATCH 5/6] fix --- app/Http/Controllers/TransactionOnlineController.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/TransactionOnlineController.php b/app/Http/Controllers/TransactionOnlineController.php index 088a43e..1b67d3a 100644 --- a/app/Http/Controllers/TransactionOnlineController.php +++ b/app/Http/Controllers/TransactionOnlineController.php @@ -7,6 +7,7 @@ use App\Advansur; use App\Transaction; use App\TransaksiKeuntungan; use App\Gadai; +use App\Cawangan; use Illuminate\Http\Request; use Carbon\Carbon; @@ -75,7 +76,7 @@ class TransactionOnlineController extends Controller ]); } - return response()->json($transaction); + return response()->json('success'); } public function kiraupahTawarruq($kodcaw,$norujukan){ @@ -149,7 +150,7 @@ class TransactionOnlineController extends Controller 'teller' => 'Online', 'kodcaw' => $kodcaw, 'duit_masuk' => $bayaran, - 'created_at' => $paid_at, + 'created_at' => Carbon::parse($paid_at), 'bakiharga' => $baki_hargajualan, ]); @@ -158,14 +159,14 @@ class TransactionOnlineController extends Controller 'bayaran_keuntungan' => $upahsemasa, 'bayaran_pembiayaan' => $baki_bayaran, 'keuntungan_rebet'=> $upahrebet, - 'tarikh_bayaran'=> $paid_at, + 'tarikh_bayaran'=> Carbon::parse($paid_at), 'kodcaw'=> $kodcaw ]); $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( 'bakipjm' => $baki_pinjaman, 'jbg' => 0, - 't_update' => $paid_at->toDateString(), + 't_update' => Carbon::parse($paid_at)->toDateString(), 'bakihargajualan' => $baki_hargajualan, 'tempohbayar' => $gadai['tempoh'], 'lelong_tawarruq' => $lelong_tawarruq @@ -182,7 +183,7 @@ class TransactionOnlineController extends Controller $gadai = Gadai::on($cawangan['mysql'])->where('norujukan',$norujukan)->first(); $create_advansur = Advansur::on($cawangan['mysql'])->create([ - 'tarikh'=> $paid_at->toDateString(), + 'tarikh'=> Carbon::parse($paid_at)->toDateString(), 'noresit'=> 0, 'norujukan' => $norujukan, 'nopelanggan' => $gadai['nopelanggan'], From 5c041a23cd0a9af473c0569d73c544631891680e Mon Sep 17 00:00:00 2001 From: afiq Date: Sun, 13 Jun 2021 14:38:40 +0800 Subject: [PATCH 6/6] auto serahan --- .../TransactionOnlineController.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/TransactionOnlineController.php b/app/Http/Controllers/TransactionOnlineController.php index 1b67d3a..47fd699 100644 --- a/app/Http/Controllers/TransactionOnlineController.php +++ b/app/Http/Controllers/TransactionOnlineController.php @@ -8,6 +8,7 @@ use App\Transaction; use App\TransaksiKeuntungan; use App\Gadai; use App\Cawangan; +use App\GlDetail; use Illuminate\Http\Request; use Carbon\Carbon; @@ -58,7 +59,8 @@ class TransactionOnlineController extends Controller public function updateTransactionOnline(){ $transactions = TransactionOnline::on('mysql7')->where([['status','PAID'],['update_status',0]])->get(); - + $current = Carbon::now(); + $current = new Carbon(); foreach($transactions as $index=>$transaction){ $cawangan = Cawangan::on('mysql7') ->where('kodcaw','=',$transaction['kodcaw']) @@ -71,8 +73,19 @@ class TransactionOnlineController extends Controller $this->createAdvansur($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at']); } - TransactionOnline::on('mysql7')->where('norujukan',$transaction['norujukan'])->update([ - 'update_status' => 1 + GlDetail::on($cawangan['mysql'])->create([ + 'kodcaw' => $transaction['kodcaw'], + 'tarikh' => $current->toDateString(), + 'dtacct' => '1000/010', + 'ktacct' => '1000/020', + 'descpt' => 'SERAHAN BAYAR ONLINE - ' . $transaction['norujukan'], + 'serahan' => $transaction['total_payment'], + 'teller' => 'ONLINE' + ]); + + TransactionOnline::on('mysql7')->where([['norujukan',$transaction['norujukan'],['billplz_id',$transaction['billplz_id']]]])->update([ + 'update_status' => 1, + 'update_serahan' => 1 ]); }