diff --git a/app/Config/Constants.php b/app/Config/Constants.php index deb54d6a..c95970b7 100644 --- a/app/Config/Constants.php +++ b/app/Config/Constants.php @@ -114,6 +114,9 @@ define('order_column', ["invoice_id","wp_api_order_id","invoice_child_id"]); define('order_child','invoiceitems'); define('order_child_column', ["invoice_id","wp_api_line_items_id","customer_id"]); - + +define('WAAI_TOKEN', '650be030cedb3'); +define('WAAI_INSTANCE', '650C383B67BC7'); +define('SEND_WAAI_URL', 'https://waai.in/api/send'); diff --git a/app/Config/Routes.php b/app/Config/Routes.php index fda467f0..07751740 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -104,11 +104,10 @@ $routes->add('approve_invoice/(:num)', 'Invoice::approve_invoice/$1'); $routes->get('generate_invoice_pdf/(:num)', 'Invoice::generate_invoice_pdf/$1'); -# Api integration Routes +# Notifications Routes $routes->get('send_whatsapp_message/', 'Notifications::send_whatsapp_message'); -$routes->post('whatsapp_notifications/', 'Notifications::whatsapp_notifications'); - -$routes->match(['post', 'get'], 'custom_notifications', 'Notifications::mail_notifications'); +$routes->post('whatsapp_custom_notifications/', 'Notifications::whatsapp_custom_notifications'); +$routes->match(['post', 'get'], 'mail_custom_notifications', 'Notifications::mail_custom_notifications'); # Api integration Routes $routes->post('api/(:any)', 'ApiIntegration::api_integration/$1'); diff --git a/app/Controllers/Notifications.php b/app/Controllers/Notifications.php index 39ea8f96..de62d695 100755 --- a/app/Controllers/Notifications.php +++ b/app/Controllers/Notifications.php @@ -45,20 +45,23 @@ class Notifications extends BaseController public function send_whatsapp_message() { helper('apiIntegration'); $params = (object) Null; - $this->access_token = "650be030cedb3"; - // $this->instance_id = $this->get_whatsapp_instance(); - $this->instance_id = "650C383B67BC7"; + + + + + + try { $this->logger->info("Whatsapp : sending message instance id = ".$this->instance_id); $params->number = 916369084112; $params->type = "text"; $params->message = "TestingFromVBPYUIO"; - $params->instance_id = $this->instance_id; - $params->access_token = $this->access_token; + $params->instance_id = WAAI_TOKEN; + $params->access_token = WAAI_INSTANCE; $this->logger->info("Whatsapp : sending message request type b4 = ".gettype($params)); //$url = "https://waai.in/api/send?number=916369084112&type=text&message=helper&instance_id=650C383B67BC7&access_token=650be030cedb3"; $url = "https://waai.in/api/send"; - $message = perform_whatsapp_request($url,"POST",$params); + $message = perform_whatsapp_request($url,"POST",$params); // https://waai.in/api/send?number=91639084112&type=text&message=helper&instance_id=650C383B67BC7&access_token=650be030cedb3/r/n{"status":"success","message":{"key":{"remoteJid":"91639084112@c.us","fromMe":true,"id":"BAE540383CE30F06"},"message":{"extendedTextMessage":{"text":"helper"}},"messageTimestamp":"1695362314"}} // {"status":"success","message":{"key":{"remoteJid":"916369084112@c.us","fromMe":true,"id":"BAE500BBE10A0AC0"},"message":{"extendedTextMessage":{"text":"TestingFromVBP"}},"messageTimestamp":"1695362020"}} // {"status":"error","message":"Access token is required"} @@ -72,7 +75,7 @@ class Notifications extends BaseController ## Email Section : - public function mail_notifications() + public function mail_custom_notifications() { $successMessage = session()->getFlashdata('success'); $validationErrors = session()->getFlashdata('error'); $data['page_name'] = 'Custom Notifications'; @@ -106,22 +109,21 @@ class Notifications extends BaseController if ($email->send()) { $this->logger->info('Email sent successfully'); $successMessage = 'Email sent successfully'; + $data['successMessage'] = $successMessage; } else { throw new \Exception('Email not sent. Please try again.'); } } catch (\Exception $e) { $this->logger->error('Error sending email: ' . $e->getMessage()); $validationErrors = 'Error sending email: ' . $e->getMessage(); + $data['validationErrors'] = $validationErrors; } } - $data['successMessage'] = $successMessage; - $data['validationErrors'] = $validationErrors; - $this->render_page('notifications_form', $data); } - public function whatsapp_notifications(){ + public function whatsapp_custom_notifications(){ $successMessage = session()->getFlashdata('success'); $validationErrors = session()->getFlashdata('error'); $data['page_name'] = 'Custom Notifications'; @@ -136,29 +138,21 @@ class Notifications extends BaseController try { $this->logger->info("Whatsapp : sending message instance id = ".$this->instance_id); $params->number = (int)'91'.$records['mobile']; - $params->type = "text"; + $params->type = $records['type'] == "" ? "text" : $records['type']; + $params->instance_id = WAAI_INSTANCE; + $params->access_token = WAAI_TOKEN; $params->message = $records['description']; - $params->instance_id = $this->instance_id; - $params->access_token = $this->access_token; + if($records['type'] == 'media'){ $params->media_url = $records['media_url'];} $this->logger->info("Whatsapp : sending message request type b4 = ".gettype($params)); - //$url = "https://waai.in/api/send?number=916369084112&type=text&message=helper&instance_id=650C383B67BC7&access_token=650be030cedb3"; - $url = "https://waai.in/api/send"; - $successMessage = perform_whatsapp_request($url,"POST",$params); - // https://waai.in/api/send?number=91639084112&type=text&message=helper&instance_id=650C383B67BC7&access_token=650be030cedb3/r/n{"status":"success","message":{"key":{"remoteJid":"91639084112@c.us","fromMe":true,"id":"BAE540383CE30F06"},"message":{"extendedTextMessage":{"text":"helper"}},"messageTimestamp":"1695362314"}} - // {"status":"success","message":{"key":{"remoteJid":"916369084112@c.us","fromMe":true,"id":"BAE500BBE10A0AC0"},"message":{"extendedTextMessage":{"text":"TestingFromVBP"}},"messageTimestamp":"1695362020"}} - // {"status":"error","message":"Access token is required"} - + $successMessage = perform_whatsapp_request(SEND_WAAI_URL,"POST",$params); + $this->logger->info("Whatsapp : Reponse = ".$successMessage); + $data['successMessage'] = $successMessage; } catch (\Exception $e) { $this->logger->error("An error occurred: " . $e->getMessage()); $validationErrors = "An error occurred: " . $e->getMessage(); + $data['validationErrors'] = $validationErrors; } - - } - - - $data['successMessage'] = $successMessage; - $data['validationErrors'] = $validationErrors; - + } $this->render_page('notifications_form', $data); } diff --git a/app/Helpers/apiIntegration_helper.php b/app/Helpers/apiIntegration_helper.php index 731b723c..2456deea 100644 --- a/app/Helpers/apiIntegration_helper.php +++ b/app/Helpers/apiIntegration_helper.php @@ -1,9 +1,9 @@ status === "error") { - log_message('ERROR',"PerformWhatsappRequest : error = ".$result->message); + // log_message('ERROR',"PerformWhatsappRequest : error = ".$result->message); throw new Exception($result->message); }else{ $final_result = "Success"; } }else{ $curl_errno= curl_errno($curl); - log_message('ERROR',"PerformWhatsappRequest : curl error = ".$curl_errno); + // log_message('ERROR',"PerformWhatsappRequest : curl error = ".$curl_errno); throw new Error("Errno returned ".$curl_errno); } curl_close($curl); diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php index ea29ff20..157cc6c0 100644 --- a/app/Views/dashboard.php +++ b/app/Views/dashboard.php @@ -1,6 +1,5 @@
- " class="btn btn-success waves-effect"> Whatsapp Api integration
diff --git a/app/Views/notifications_form.php b/app/Views/notifications_form.php index a8723f84..79eae16b 100644 --- a/app/Views/notifications_form.php +++ b/app/Views/notifications_form.php @@ -1,165 +1,190 @@ -
-
-
-
-
-
-
- " alt="logo" class="avatar-sm rounded-circle"> -
-
-
-

Mail Custom Notification

-
-
-
-
-
-
-
-
-
-
-
- " alt="logo" class="avatar-sm rounded-circle"> -
-
-
-

Whatsapp Custom Notification

-
-
-
-
-
+ +
+
+
+
+ + " alt="mail"> + Mail Custom Notification + +
+
+ + " alt="whatsapp"> + Whatsapp Custom Notification + +
+ +
+
-
+
-

- - -
-

-
- - +

+
+
+ +
+ +

+ +

+ +

+ -
"> -
- -
-
-
-
- -
- + +
+
+ "> +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
- -
- -
- +
-
- +
-
- -
-
-
-
- -
-
-
-
-

- - -
-

-
- - - -
"> -
- -
- + +
+
+
"> +
+ +
+ +
-
-
- -
- +
+ +
+ +
+
+ +
+ +
+ +
-
- +
-
- + +
\ No newline at end of file diff --git a/app/Views/template/header.php b/app/Views/template/header.php index 619f56c3..71c83159 100644 --- a/app/Views/template/header.php +++ b/app/Views/template/header.php @@ -188,7 +188,7 @@
  • - "> + "> Custom Notifications