diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index fca6d2a6..bbce50e7 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -294,6 +294,9 @@ class AccountController extends Controller $user_notelbimbit = $request->notel_pembida; $user_namapembida = $request->nama_pembida; + $getkodcaw = Cawangan::where('caw_code', $request->kodcaw)->select('caw_name')->first(); + $user_cawname = $getkodcaw->caw_name; + if($request->jenis_button == 'tidaksah'){ //insert loguser @@ -335,7 +338,7 @@ class AccountController extends Controller $bidder->status_payment = 1; $bidder->update(); } - WhatsappPengesahanPembida::dispatch($user_notelbimbit,$user_namapembida); + WhatsappPengesahanPembida::dispatch($user_notelbimbit,$user_namapembida,$user_cawname); //insert loguser $loguser = new LogUser; diff --git a/app/Jobs/AutoTamatLelong.php b/app/Jobs/AutoTamatLelong.php index 6818c1d7..1c260da9 100644 --- a/app/Jobs/AutoTamatLelong.php +++ b/app/Jobs/AutoTamatLelong.php @@ -71,12 +71,12 @@ class AutoTamatLelong implements ShouldQueue if(config('app.env') != 'production'){ $mobile_no = config('app.admin_phone_number'); } - $response = Http::get(env('WABOT_API'), [ + $response = Http::get(config('app.wabot_api'), [ 'number' => $mobile_no, 'type' => 'text', 'message' => 'Lelongan Telah Tamat, Sila Jana Pemenang', - 'instance_id' => env('WABOT_INSTANCES_ID'), - 'access_token' => env('WABOT_TOKEN_KEYS') + 'instance_id' => config('app.wabot_instances_id'), + 'access_token' => config('app.wabot_token_keys') ]); } diff --git a/app/Jobs/WhatsappNotisLelongFasa1.php b/app/Jobs/WhatsappNotisLelongFasa1.php index 8ccb5150..b8f9d520 100644 --- a/app/Jobs/WhatsappNotisLelongFasa1.php +++ b/app/Jobs/WhatsappNotisLelongFasa1.php @@ -151,12 +151,12 @@ Terima Kasih'; if(config('app.env') != 'production'){ $mobile_no = config('app.admin_phone_number'); } - $response = Http::get(env('WABOT_API'), [ - 'number' => $mobile_no, - 'type' => 'text', - 'message' => $message, - 'instance_id' => env('WABOT_INSTANCES_ID'), - 'access_token' => env('WABOT_TOKEN_KEYS') + $response = Http::get(config('app.wabot_api'), [ + 'number' => $mobile_no, + 'type' => 'text', + 'message' => $message, + 'instance_id' => config('app.wabot_instances_id'), + 'access_token' => config('app.wabot_token_keys') ]); Log::info("WABOT - Notis Lelongan Fasa 1" . $response); diff --git a/app/Jobs/WhatsappNotisLelongFasa2.php b/app/Jobs/WhatsappNotisLelongFasa2.php index 2714b17c..b86477be 100644 --- a/app/Jobs/WhatsappNotisLelongFasa2.php +++ b/app/Jobs/WhatsappNotisLelongFasa2.php @@ -151,12 +151,12 @@ Terima Kasih'; if(config('app.env') != 'production'){ $mobile_no = config('app.admin_phone_number'); } - $response = Http::get(env('WABOT_API'), [ - 'number' => $mobile_no, - 'type' => 'text', - 'message' => $message, - 'instance_id' => env('WABOT_INSTANCES_ID'), - 'access_token' => env('WABOT_TOKEN_KEYS') + $response = Http::get(config('app.wabot_api'), [ + 'number' => $mobile_no, + 'type' => 'text', + 'message' => $message, + 'instance_id' => config('app.wabot_instances_id'), + 'access_token' => config('app.wabot_token_keys') ]); Log::info("WABOT - Notis Lelongan Fasa 2" . $response); diff --git a/app/Jobs/WhatsappNotisPeringatanKedua.php b/app/Jobs/WhatsappNotisPeringatanKedua.php index e101a33d..cbdc9c3b 100644 --- a/app/Jobs/WhatsappNotisPeringatanKedua.php +++ b/app/Jobs/WhatsappNotisPeringatanKedua.php @@ -159,12 +159,12 @@ Sekian, terima kasih.'; if(config('app.env') != 'production'){ $mobile_no = config('app.admin_phone_number'); } - $response = Http::get(env('WABOT_API'), [ - 'number' => $mobile_no, - 'type' => 'text', - 'message' => $message, - 'instance_id' => env('WABOT_INSTANCES_ID'), - 'access_token' => env('WABOT_TOKEN_KEYS') + $response = Http::get(config('app.wabot_api'), [ + 'number' => $mobile_no, + 'type' => 'text', + 'message' => $message, + 'instance_id' => config('app.wabot_instances_id'), + 'access_token' => config('app.wabot_token_keys') ]); Log::info("WABOT - notis peringatan kedua " . $response); diff --git a/app/Jobs/WhatsappNotisTuntutBaki.php b/app/Jobs/WhatsappNotisTuntutBaki.php index 3d99b387..d4119414 100644 --- a/app/Jobs/WhatsappNotisTuntutBaki.php +++ b/app/Jobs/WhatsappNotisTuntutBaki.php @@ -152,12 +152,12 @@ Terima Kasih'; if(config('app.env') != 'production'){ $mobile_no = config('app.admin_phone_number'); } - $response = Http::get(env('WABOT_API'), [ - 'number' => $mobile_no, - 'type' => 'text', - 'message' => $message, - 'instance_id' => env('WABOT_INSTANCES_ID'), - 'access_token' => env('WABOT_TOKEN_KEYS') + $response = Http::get(config('app.wabot_api'), [ + 'number' => $mobile_no, + 'type' => 'text', + 'message' => $message, + 'instance_id' => config('app.wabot_instances_id'), + 'access_token' => config('app.wabot_token_keys') ]); Log::info("WABOT - Notis Tuntutan Baki Lelong" . $response); diff --git a/app/Jobs/WhatsappPemenang.php b/app/Jobs/WhatsappPemenang.php index b87398d7..fe2f8b90 100644 --- a/app/Jobs/WhatsappPemenang.php +++ b/app/Jobs/WhatsappPemenang.php @@ -54,12 +54,12 @@ class WhatsappPemenang implements ShouldQueue if(config('app.env') != 'production'){ $mobile_no = config('app.admin_phone_number'); } - $response = Http::get(env('WABOT_API'), [ + $response = Http::get(config('app.wabot_api'), [ 'number' => $mobile_no, 'type' => 'text', 'message' => $message, - 'instance_id' => env('WABOT_INSTANCES_ID'), - 'access_token' => env('WABOT_TOKEN_KEYS') + 'instance_id' => config('app.wabot_instances_id'), + 'access_token' => config('app.wabot_token_keys') ]); Log::info("WABOT - menang bidaan " . $response); diff --git a/app/Jobs/WhatsappPengesahanPembida.php b/app/Jobs/WhatsappPengesahanPembida.php index 45338a91..3467100d 100644 --- a/app/Jobs/WhatsappPengesahanPembida.php +++ b/app/Jobs/WhatsappPengesahanPembida.php @@ -21,6 +21,7 @@ class WhatsappPengesahanPembida implements ShouldQueue public $user_notelbimbit; public $user_namapembida; + public $user_cawname; // protected $notisid; // protected $cawid; @@ -30,10 +31,11 @@ class WhatsappPengesahanPembida implements ShouldQueue * * @return void */ - public function __construct($user_notelbimbit,$user_namapembida) + public function __construct($user_notelbimbit,$user_namapembida,$user_cawname) { $this->user_notelbimbit = $user_notelbimbit; $this->user_namapembida = $user_namapembida; + $this->user_cawname = $user_cawname; } /** @@ -44,16 +46,16 @@ class WhatsappPengesahanPembida implements ShouldQueue public function handle() { $mobile_no = ltrim($this->user_notelbimbit, '+'); - $message = 'AR-RAHN PKB: Terima Kasih '.$this->user_namapembida .', Pembayaran Anda Telah Disahkan, Sila Ke Cawangan Berkenaan Untuk Tuntutan Barang Bidaan Anda Hari Ini.'; + $message = 'AR-RAHN PKB: Terima Kasih '.$this->user_namapembida .', Pembayaran Bidaan Anda Untuk Cawangan *'.$this->user_cawname.'* Telah Disahkan, Sila Ke Cawangan Berkenaan Untuk Tuntutan Barang Bidaan Anda Hari Ini.'; if(config('app.env') != 'production'){ $mobile_no = config('app.admin_phone_number'); } - $response = Http::get(env('WABOT_API'), [ + $response = Http::get(config('app.wabot_api'), [ 'number' => $mobile_no, 'type' => 'text', 'message' => $message, - 'instance_id' => env('WABOT_INSTANCES_ID'), - 'access_token' => env('WABOT_TOKEN_KEYS') + 'instance_id' => config('app.wabot_instances_id'), + 'access_token' => config('app.wabot_token_keys') ]); Log::info("WABOT - Akaun Telah Sahkan Pembayaran: ".$this->user_namapembida .'' . $response); diff --git a/app/Jobs/WhatsappTidakSahBayaran.php b/app/Jobs/WhatsappTidakSahBayaran.php index 3cf7b056..50297441 100644 --- a/app/Jobs/WhatsappTidakSahBayaran.php +++ b/app/Jobs/WhatsappTidakSahBayaran.php @@ -45,12 +45,12 @@ class WhatsappTidakSahBayaran implements ShouldQueue if(config('app.env') != 'production'){ $mobile_no = config('app.admin_phone_number'); } - $response = Http::get(env('WABOT_API'), [ + $response = Http::get(config('app.wabot_api'), [ 'number' => $mobile_no, 'type' => 'text', 'message' => 'Bayaran Pembida yang bernama *'.$this->user_namapembida.'* Adalah *Tidak Sah*, Mohon Pihak AJK Lelong Untuk Buat Semakan, Terima Kasih.' , - 'instance_id' => env('WABOT_INSTANCES_ID'), - 'access_token' => env('WABOT_TOKEN_KEYS') + 'instance_id' => config('app.wabot_instances_id'), + 'access_token' => config('app.wabot_token_keys') ]); } } diff --git a/config/app.php b/config/app.php index e0f476b6..2e30f7c2 100644 --- a/config/app.php +++ b/config/app.php @@ -247,6 +247,12 @@ return [ 'api_ujrah_url' => env('API_UJRAH_URL', 'http://localhost'), + 'wabot_api' => env('WABOT_API', 'http://localhost'), + + 'wabot_instances_id' => env('WABOT_INSTANCES_ID', 'null'), + + 'wabot_token_keys' => env('WABOT_TOKEN_KEYS', 'null'), + 'api_verify' => env('API_VERIFY', true), 'api_url_kaunter' => env('API_URL_KAUNTER', 'http://localhost'),