diff --git a/app/Blacklist.php b/app/Blacklist.php index 704db95..a788c12 100644 --- a/app/Blacklist.php +++ b/app/Blacklist.php @@ -8,15 +8,33 @@ class Blacklist extends Model { protected $table = 'senhitam'; protected $connection = 'mysql7'; + public $timestamps = false; /** * The attributes that are mass assignable. * * @var array */ - // protected $fillable = [ - - // ]; + + protected $fillable = [ + 'nosiri', + 'kodcaw', + 'tarikhdaftar', + 'kplama', + 'kpbaru', + 'nokp', + 'nama', + 't_lahir', + 'jantina', + 'alamat1', + 'alamat2', + 'alamat3', + 'alamat4', + 'telefon', + 'nota', + 'teller', + 'pelulus', + ]; /** * The attributes excluded from the model's JSON form. @@ -24,4 +42,4 @@ class Blacklist extends Model * @var array */ // protected $hidden = []; -} \ No newline at end of file +} diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index c6bd86b..76604ae 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -1656,6 +1656,7 @@ class AdminPageController extends Controller ->first(); $blacklist = Blacklist::on('mysql7')->create([ + 'nosiri' => $customer['nosiri'], 'kodcaw' => $customer['kodcaw'], 'tarikhdaftar' => $customer['tarikhdaftar'], 'kplama' => $customer['kplama'], diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 018b1dc..6da65f0 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -785,7 +785,7 @@ class LaporanController extends Controller $tebus = Tebus::on($cawangan['mysql']) ->join('gadai as gad','gad.norujukan','=','tebus.norujukan') - ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]]); + ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir],['jenistebus','=','T']]); $ansuran = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]]); $bayaranonlinequery = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where('teller','=','Online')->where('kodcaw',$request->kodcaw); diff --git a/app/Http/Controllers/PoskodController.php b/app/Http/Controllers/PoskodController.php index 7b23713..bd43040 100644 --- a/app/Http/Controllers/PoskodController.php +++ b/app/Http/Controllers/PoskodController.php @@ -56,7 +56,7 @@ class PoskodController extends Controller return response()->json($e, 403); } - $created_poskod = Poskod::create([ + $created_poskod = Poskod::on('mysql7')->create([ 'poskod' => $validated['poskod'], 'koddaerah' => $validated['koddaerah'], 'kodnegeri' => $validated['kodnegeri'], @@ -67,7 +67,7 @@ class PoskodController extends Controller public function update(Request $request) { - $poskod = Poskod::find($request->recno); + $poskod = Poskod::on('mysql7')->find($request->recno); try { $validated = $this->validate($request, [ diff --git a/app/Http/Controllers/TransactionOnlineController.php b/app/Http/Controllers/TransactionOnlineController.php index c999ef5..7bfd1ef 100644 --- a/app/Http/Controllers/TransactionOnlineController.php +++ b/app/Http/Controllers/TransactionOnlineController.php @@ -246,9 +246,21 @@ class TransactionOnlineController extends Controller $current = Carbon::now(); $current = new Carbon(); - + $boolmasa = false; $transaction_online = TransactionOnline::on('mysql7')->where([['norujukan',$request->norujukan],['status','PAID'],['update_status',0],['tarikh',$current->toDateString()]])->first(); - if($transaction_online){ + + $transaction_masa = TransactionOnline::on('mysql7')->where([['norujukan',$request->norujukan],['status','NOT PAID'],['tarikh',$current->toDateString()]]) + ->orderBy('masa', 'desc')->first(); + + if($transaction_masa){ + $carbonmasa = new Carbon($transaction_masa['masa']); + $carbonmasaexpired = new Carbon($transaction_masa['masa']); + $carbonmasaexpired->addMinutes(10); + + $boolmasa = ($carbonmasaexpired->greaterThanOrEqualTo($current) && $carbonmasa->lessThanOrEqualTo($current)) ? true : false; + } + + if($transaction_online || $boolmasa){ return response()->json(true); }else{ return response()->json(false); diff --git a/database/migrations/2023_11_14_121109_add_columns_to_komuditi_transaksi.php b/database/migrations/2023_11_14_121109_add_columns_to_komuditi_transaksi.php new file mode 100644 index 0000000..971cbfc --- /dev/null +++ b/database/migrations/2023_11_14_121109_add_columns_to_komuditi_transaksi.php @@ -0,0 +1,62 @@ +getOnlineArrahnConnection())->table('komuditi_transaksi', function (Blueprint $table){ + $table->string('customer_id', 10, 2)->after('nosijil'); + $table->float('harga', 10, 2)->after('nosijil'); + $table->float('tan', 10, 2)->after('nosijil'); + $table->string('no_sijil_pelanggan')->after('nosijil')->comment('format: no sijil bursa + no siri PKB'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::connection($this->getOnlineArrahConnection())->table('komuditi_transaksi', function (Blueprint $table){ + $table->dropColumn('no_sijil_pelanggan'); + $table->dropColumn('tan'); + $table->dropColumn('harga'); + $table->dropColumn('customer_id'); + }); + } + + private function getOnlineArrahnConnection() + { + $online_arrahn_connection_array = array_filter(config('database.connections'), function($connection) { + + if($connection['database'] === 'online_arrahn'){ + return true; + } + + + return false; + + }); + + + if(empty($online_arrahn_connection_array)){ + throw new Exception("online_arrahn doesn't exist in config.database.connections array"); + } + + return array_keys($online_arrahn_connection_array)[0]; + + } +}