KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ujrah_master' of https://bitbucket.org/arrahn-pkb/api_arrahn into ainiedev

Browse Source
This commit is contained in:
Azfar Arsyad
2023-12-06 17:10:45 +08:00
parent 50562435eb 4da2f78a22
commit 1be90289ff
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+4 -2
View File
@@ -813,7 +813,7 @@ class GadaiController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai_data = Gadai::on($cawangan['mysql'])->select('t_gadai','norujukan','nokp','semakbarcode','masa','berat','nilaimarhun','pinjaman','upah12','percentpinj','teller','nokp','ujrah','onepercent') $gadai_data = Gadai::on($cawangan['mysql'])->select('t_gadai','norujukan','nokp','semakbarcode','masa','berat','nilaimarhun','pinjaman','upah12','percentpinj','teller','nokp','ujrah','onepercent','tagbaru')
->where('t_gadai','>=',$request->mula) ->where('t_gadai','>=',$request->mula)
->where('t_gadai','<=',$request->akhir) ->where('t_gadai','<=',$request->akhir)
->orderBy('t_gadai') ->orderBy('t_gadai')
@@ -841,7 +841,9 @@ class GadaiController extends Controller
"alamat1"=> $customer_info['alamat1'], "alamat1"=> $customer_info['alamat1'],
"teller"=> $gadaiData['teller'], "teller"=> $gadaiData['teller'],
"ujrah"=> $gadaiData['ujrah'], "ujrah"=> $gadaiData['ujrah'],
"onepercent"=> $gadaiData['onepercent'] "onepercent"=> $gadaiData['onepercent'],
"tagbaru"=> $gadaiData['tagbaru']
]); ]);
} }
} }
app/Jobs/SMSPelangganSAGLAMAbysag.php
+9 -9
View File
@@ -50,22 +50,22 @@ class SMSPelangganSAGLAMAbysag extends Job
$mobile_no = ltrim($this->telefon, '+6'); $mobile_no = ltrim($this->telefon, '+6');
// $mobile_no = '60178916936'; // $mobile_no = '60178916936';
// $message = 'test'; // $message = 'test';
$tarikhmatang = date('d-m-Y',strtotime($this->tmatang)); $tarikhmatang = $this->tmatang;
$tarikhmatang = date('d-m-Y',strtotime($this->tmatang)); $tarikhmatangnew = date('d-m-Y',strtotime($tarikhmatang));
$tarikhmatang1 = date('d-m-Y',strtotime($this->tmatang1)); $tarikhmatang1 = $this->tmatang1;
$date = $current->toDateString(); $tarikhmatang1new = date('d-m-Y',strtotime($tarikhmatang1));
$today = date('d-m-Y',strtotime($date)); $today = $current->toDateString();
// $current_date = new Carbon($current->toDateString()); // $current_date = new Carbon($current->toDateString());
if($this->lelong_tawarruq == '1'){ if($this->lelong_tawarruq == '1'){
if($tarikhmatang > $today){ if($tarikhmatang > $today){
$message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, '.$this->norujukan.' telah hampir tamat tempoh untuk tukar ke SAG baru, Sila perbaharui SAG anda di cawangan sebelum '.$tarikhmatang.'.'; $message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, '.$this->norujukan.' telah hampir tamat tempoh untuk tukar ke SAG baru, Sila perbaharui SAG anda di cawangan sebelum '.$tarikhmatangnew.'.';
}elseif($tarikhmatang < $today){ }elseif($tarikhmatang < $today){
$message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, '.$this->norujukan.' telah tamat tempoh pada '.$tarikhmatang.', Sila perbaharui SAG anda di cawangan Ar-Rahn.';} $message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, '.$this->norujukan.' telah tamat tempoh pada '.$tarikhmatangnew.', Sila perbaharui SAG anda di cawangan Ar-Rahn.';}
}else }else
if($tarikhmatang1 < $today){ if($tarikhmatang1 < $today){
$message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, '.$this->norujukan.' telah hampir tamat tempoh untuk tukar ke SAG baru, Sila perbaharui SAG anda di cawangan sebelum '.$tarikhmatang1.'.'; $message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, '.$this->norujukan.' telah hampir tamat tempoh untuk tukar ke SAG baru, Sila perbaharui SAG anda di cawangan sebelum '.$tarikhmatang1new.'.';
}elseif($tarikhmatang1 > $today){ }elseif($tarikhmatang1 > $today){
$message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, '.$this->norujukan.' telah tamat tempoh pada '.$tarikhmatang1.', Sila perbaharui SAG anda di cawangan Ar-Rahn.';} $message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, '.$this->norujukan.' telah tamat tempoh pada '.$tarikhmatang1new.', Sila perbaharui SAG anda di cawangan Ar-Rahn.';}
if(env('APP_ENV') != 'production'){ if(env('APP_ENV') != 'production'){
$mobile_no = env('ADMIN_PHONE_NUMBER'); $mobile_no = env('ADMIN_PHONE_NUMBER');
app/Jobs/WhatsappPelangganSAGLAMAbysag.php
+10 -10
View File
@@ -51,21 +51,21 @@ class WhatsappPelangganSAGLAMAbysag extends Job
$current = new Carbon(); $current = new Carbon();
$mobile_no = ltrim($this->telefon, '+6'); $mobile_no = ltrim($this->telefon, '+6');
// $mobile_no = '60178916936'; // $mobile_no = '60178916936';
$tarikhmatang = date('d-m-Y',strtotime($this->tmatang)); $tarikhmatang = $this->tmatang;
$tarikhmatang1 = date('d-m-Y',strtotime($this->tmatang1)); $tarikhmatangnew = date('d-m-Y',strtotime($tarikhmatang));
$date = $current->toDateString(); $tarikhmatang1 = $this->tmatang1;
$today = date('d-m-Y',strtotime($date)); $tarikhmatang1new = date('d-m-Y',strtotime($tarikhmatang1));
// $current_date = new Carbon($current->toDateString()); $today = $current->toDateString();
if($this->lelong_tawarruq == '1'){ if($this->lelong_tawarruq == '1'){
if($tarikhmatang > $today){ if($tarikhmatang > $today){
$message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, *'.$this->norujukan.'* telah hampir tamat tempoh untuk tukar ke SAG baru, Sila perbaharui SAG anda di cawangan sebelum *'.$tarikhmatang.'*.'; $message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, *'.$this->norujukan.'* telah hampir tamat tempoh untuk tukar ke SAG baru, Sila perbaharui SAG anda di cawangan sebelum *'.$tarikhmatangnew.'*.';
}elseif($tarikhmatang < $today){ }elseif($tarikhmatang < $today){
$message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, *'.$this->norujukan.'* telah tamat tempoh pada *'.$tarikhmatang.'*, Sila perbaharui SAG anda di cawangan Ar-Rahn.';} $message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, *'.$this->norujukan.'* telah tamat tempoh pada *'.$tarikhmatangnew.'*, Sila perbaharui SAG anda di cawangan Ar-Rahn.';}
}else }else
if($tarikhmatang1 < $today){ if($tarikhmatang1 < $today){
$message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, *'.$this->norujukan.'* telah hampir tamat tempoh untuk tukar ke SAG baru, Sila perbaharui SAG anda di cawangan sebelum *'.$tarikhmatang1.'*.'; $message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, *'.$this->norujukan.'* telah hampir tamat tempoh untuk tukar ke SAG baru, Sila perbaharui SAG anda di cawangan sebelum *'.$tarikhmatang1new.'*.';
}elseif($tarikhmatang1 > $today){ }elseif($tarikhmatang1 > $today){
$message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, *'.$this->norujukan.'* telah tamat tempoh pada *'.$tarikhmatang1.'*, Sila perbaharui SAG anda di cawangan Ar-Rahn.';} $message = 'AR-RAHN '.$this->caw_name.': MAKLUMAN, *'.$this->norujukan.'* telah tamat tempoh pada *'.$tarikhmatang1new.'*, Sila perbaharui SAG anda di cawangan Ar-Rahn.';}
if(env('APP_ENV') != 'production'){ if(env('APP_ENV') != 'production'){
$mobile_no = env('ADMIN_PHONE_NUMBER'); $mobile_no = env('ADMIN_PHONE_NUMBER');