From f0cece46c7e3681c6af96ca35fadf7d278c3cdac Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Sun, 7 Jan 2024 15:32:48 +0800 Subject: [PATCH 1/3] Improve output commands cawangan debug connections --- .../Commands/CawanganDebugConnections.php | 18 +++++++++++-- config/database.php | 26 +++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/app/Console/Commands/CawanganDebugConnections.php b/app/Console/Commands/CawanganDebugConnections.php index ecf0466..c7cd7be 100644 --- a/app/Console/Commands/CawanganDebugConnections.php +++ b/app/Console/Commands/CawanganDebugConnections.php @@ -82,23 +82,37 @@ class CawanganDebugConnections extends Command $filteredConnections = filterArraysByDatabaseNames($all_cawangan, $all_cawangan_in_config); + $isOK = true; + // checks if there is connection errors - if (Helper::getInactiveCawanganDbConnection() > 0) { + if (sizeof(Helper::getInactiveCawanganDbConnection()) > 0) { dump('Inactive cawangan connection detected : '); + dump('1. Check DB_HOST in .env status is alive and available'); + dump('2. Check database in .env exist in DB_HOST'); + dump(''); dump(Helper::getInactiveCawanganDbConnection()); + $isOK = false; } // checks if config connection do not exist referring to arrahn_master_db if (count($all_cawangan) !== count($all_cawangan_in_config)) { $db_not_config = array_diff(array_column($all_cawangan, 'db_name'), array_column($all_cawangan_in_config, 'database')); - dump(implode(', ', $db_not_config) . ' not configured in database config'); + dump(implode(', ', $db_not_config) . ' exist in arrahn_master_db but not configured in config/database.php'); + $isOK = false; } // checks if config connection databases are not tally fwith arrahn master db if (count($filteredConnections) !== 0) { dump('Database config names are not tally arrahn_master_db : '); dump($filteredConnections); + $isOK = false; } + + if($isOK == true){ + dump('Cawangan database configuration is OK'); + } + + } } diff --git a/config/database.php b/config/database.php index f464311..f00cfca 100644 --- a/config/database.php +++ b/config/database.php @@ -17,6 +17,7 @@ return [ 'prefix' => '', 'strict' => false, ], +<<<<<<< Updated upstream 'mysql37' => [ 'driver' => 'mysql', 'host' => env('DB_HOST_37'), @@ -29,6 +30,8 @@ return [ 'prefix' => '', 'strict' => false, ], +======= +>>>>>>> Stashed changes 'mysql2' => [ 'driver' => 'mysql', 'host' => env('DB_HOST_2'), @@ -425,7 +428,23 @@ return [ 'prefix' => '', 'strict' => false, ], +<<<<<<< Updated upstream 'mysql34' => [ +======= + 'mysql36' => [ + 'driver' => 'mysql', + 'host' => env('DB_HOST_36'), + 'port' => env('DB_PORT_36'), + 'database' => env('DB_DATABASE_36'), + 'username' => env('DB_USERNAME_36'), + 'password' => env('DB_PASSWORD_36'), + 'charset' => 'utf8', + 'collation' => 'utf8_unicode_ci', + 'prefix' => '', + 'strict' => false, + ], + 'mysql34' => [ +>>>>>>> Stashed changes 'driver' => 'mysql', 'host' => env('DB_HOST_34'), 'port' => env('DB_PORT_34'), @@ -437,7 +456,11 @@ return [ 'prefix' => '', 'strict' => false, ], +<<<<<<< Updated upstream 'mysql35' => [ +======= + 'mysql35' => [ +>>>>>>> Stashed changes 'driver' => 'mysql', 'host' => env('DB_HOST_35'), 'port' => env('DB_PORT_35'), @@ -448,6 +471,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, +<<<<<<< Updated upstream ], 'mysql36' => [ 'driver' => 'mysql', @@ -472,6 +496,8 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, +======= +>>>>>>> Stashed changes ], ], ]; From 6b7ffba7cbe2329d4f328c0ae315efbf6ced282a Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Sun, 7 Jan 2024 15:37:13 +0800 Subject: [PATCH 2/3] Reset back config/database to default ujrah_master branch --- config/database.php | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/config/database.php b/config/database.php index f00cfca..f464311 100644 --- a/config/database.php +++ b/config/database.php @@ -17,7 +17,6 @@ return [ 'prefix' => '', 'strict' => false, ], -<<<<<<< Updated upstream 'mysql37' => [ 'driver' => 'mysql', 'host' => env('DB_HOST_37'), @@ -30,8 +29,6 @@ return [ 'prefix' => '', 'strict' => false, ], -======= ->>>>>>> Stashed changes 'mysql2' => [ 'driver' => 'mysql', 'host' => env('DB_HOST_2'), @@ -428,23 +425,7 @@ return [ 'prefix' => '', 'strict' => false, ], -<<<<<<< Updated upstream 'mysql34' => [ -======= - 'mysql36' => [ - 'driver' => 'mysql', - 'host' => env('DB_HOST_36'), - 'port' => env('DB_PORT_36'), - 'database' => env('DB_DATABASE_36'), - 'username' => env('DB_USERNAME_36'), - 'password' => env('DB_PASSWORD_36'), - 'charset' => 'utf8', - 'collation' => 'utf8_unicode_ci', - 'prefix' => '', - 'strict' => false, - ], - 'mysql34' => [ ->>>>>>> Stashed changes 'driver' => 'mysql', 'host' => env('DB_HOST_34'), 'port' => env('DB_PORT_34'), @@ -456,11 +437,7 @@ return [ 'prefix' => '', 'strict' => false, ], -<<<<<<< Updated upstream 'mysql35' => [ -======= - 'mysql35' => [ ->>>>>>> Stashed changes 'driver' => 'mysql', 'host' => env('DB_HOST_35'), 'port' => env('DB_PORT_35'), @@ -471,7 +448,6 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, -<<<<<<< Updated upstream ], 'mysql36' => [ 'driver' => 'mysql', @@ -496,8 +472,6 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, -======= ->>>>>>> Stashed changes ], ], ]; From 5ae0e98cb249e376b88a0e7409035b1008677a76 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Sun, 7 Jan 2024 16:56:00 +0800 Subject: [PATCH 3/3] update if else dlm function blastwasapbysagkedua --- app/Http/Controllers/CallCenterController.php | 52 ++++++++++++------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/app/Http/Controllers/CallCenterController.php b/app/Http/Controllers/CallCenterController.php index 6c31cd6..1ba737c 100644 --- a/app/Http/Controllers/CallCenterController.php +++ b/app/Http/Controllers/CallCenterController.php @@ -254,7 +254,9 @@ class CallCenterController extends Controller // dd($cawangan['kodcaw']); // dd($cawangan); $notisbycaw = NotisPeringatan::on('mysql7') - ->where('notisperingatan.notis_id',$notisid)->where('notisperingatan.kodcaw',$cawangan['kodcaw']) + ->where('notisperingatan.notis_id',$notisid) + ->where('notisperingatan.kodcaw',$cawangan['kodcaw']) + ->where('notisperingatan.tarikhnotis1','=', NULL) ->distinct() ->get(); // dd($notisbycaw); @@ -274,7 +276,9 @@ class CallCenterController extends Controller $cawnotis_all = []; $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $notisbycaw = NotisPeringatan::on('mysql7') - ->where('notisperingatan.notis_id',$notisid)->where('notisperingatan.kodcaw',$kodcaw) + ->where('notisperingatan.notis_id',$notisid) + ->where('notisperingatan.kodcaw',$kodcaw) + ->where('notisperingatan.tarikhnotis1', '=', NULL) ->distinct() ->get(); @@ -567,6 +571,7 @@ class CallCenterController extends Controller public function kemaskininotisperingatan(Request $request) { + // dd($request->all()); $notisid = $request->notisid; $current = Carbon::now(); $current = new Carbon(); @@ -591,6 +596,7 @@ class CallCenterController extends Controller $checkgadai = Gadai::on($cawangan['mysql']) ->where([['norujukan','=',$notis['norujukan']]]) ->first(); + if($checkgadai->sttebus == 'T' || $checkgadai->sttebus == 'L'){ $updatelistnotis=NotisPeringatan::on('mysql7') ->where('norujukan','=', $notis['norujukan']) @@ -599,6 +605,22 @@ class CallCenterController extends Controller ->delete(); }elseif($checkgadai->sttebus == ''){ + + + if($checkgadai->tagbaru == '0'){ + // dd($notis['norujukan']); + $keuntungan = 'asal'; + $jeniskeuntungan = ($keuntungan == 'onepercent') ? 'onepercent' : 'asal'; + $master = new MasterServices($kodcaw); + $response = $master->kiraUpahTawarruq($kodcaw,$notis['norujukan'],$jeniskeuntungan); + }elseif($checkgadai->tagbaru == '1'){ + $keuntungan = 'onepercent'; + $jeniskeuntungan = ($keuntungan == 'onepercent') ? 'onepercent' : 'asal'; + $master = new MasterServices($kodcaw); + $response = $master->kiraupahUjrahOnePercent($kodcaw,$notis['norujukan']); + } + // dd($response); + $updatedata = NotisPeringatan::on('mysql7') ->where('norujukan',$notis['norujukan']) ->where('notis_id','=', $notisid) @@ -606,6 +628,7 @@ class CallCenterController extends Controller ->update([ 'jbg'=> $checkgadai->tempoh, 'pinjaman'=> $checkgadai->bakipjm, + 'bakiupah'=> $response ]); } } @@ -891,10 +914,13 @@ class CallCenterController extends Controller ->where('notisperingatan.peringatan',2) ->where('notisperingatan.tarikhnotis2','=', NULL) ->distinct() - ->get(); + ->get()->toArray(); // dd($notisbycaw); - - + if(empty($notisbycaw)){ + // dd(false); + return response()->json('failed'); + }else{ + // dd(true); $arraynorujukan = $notisbycaw->pluck('norujukan')->toArray(); $gadainokp = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $arraynorujukan) @@ -937,22 +963,8 @@ class CallCenterController extends Controller dispatch(new ARCCSMSPelangganSAGLAMAbysag($nokp,$customer->telefon,$caw_name,$nofoncaw,$kodcaw,$cal->norujukan,$cal->tempoh,$cal->t_matang,$cal->t_matang1,$cal->lelong_tawarruq,$namapengguna)); } } - - // $updatestatusnotis=CawanganNotis::on('mysql7') - // ->where('notis_id','=', $notisid) - // ->where('kodcaw','=', $kodcaw) - // ->update( - // array('status'=> 2)); - return response()->json('success'); } - - //} - // else{ - // return response()->json('failed'); - // } - - // } - + } }