diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index f65ac40..48974f2 100644 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -634,7 +634,9 @@ class MasterController extends BaseController $DateAndYears = $this->dateAndYearPlaceholder(); $data['place_holder_object'] = $DateAndYears; $MailHelper = new MailHelper(); - $clientData = $this->ClientDocsModel->select('client.name , client_branch.email, client_branch.*') + + + $clientData = $this->ClientDocsModel->select('client.name as client_name, client_branch.email, client_branch.*') ->join('client_branch', 'client_docs.client_branch_id = client_branch.id', 'left') ->join('client', 'client_branch.client_id = client.client_id', 'left') ->where('client_docs.id', $doc_id)->get()->getRow(); @@ -646,13 +648,17 @@ class MasterController extends BaseController ->where('branches.branch_id',$this->session->get('logged_in_staff_branch_id')) ->get()->getRow(); $subject = 'BB-Sign Verify Document'; - $message = "Dear " . $clientData->name . ",
" . $businessData->business_name . " has requested your approval for a document. Please click the link below to preview and approve.

" . $url; + + $message = "Dear " . $clientData->client_name . ",
" . $businessData->business_name . " has requested your approval for a document. Please click the link below to preview and approve.

" . $url; + $mail_send = $MailHelper->send_url_email($clientData->email , $businessData->email, $subject, $message); $notificationHelper = new NotificationHelper(); $number = '91'.$clientData->mobile_no; // Replace with dynamic recipient number if($clientData->whatsapp == 1){ - $whatsApp_message = "Dear " . $clientData->name . "," . $businessData->business_name . " has requested your approval for a document. Please click the link below to preview and approve." ; - $notificationHelper->sendWhatsAppMessage($number, $whatsApp_message, $url); + + $whatsApp_message = "Dear " . $clientData->client_name . "," . $businessData->business_name . " has requested your approval for a document. Please click the link below to preview and approve." ; + // $notificationHelper->sendWhatsAppMessage($number, $whatsApp_message, $url); + } $statusData['client_docs_id'] = $doc_id; $statusData['is_staff'] = 1; @@ -683,7 +689,9 @@ class MasterController extends BaseController try { $doc_id = $this->request->getPost('doc_id'); $MailHelper = new MailHelper(); - $clientData = $this->ClientDocsModel->select('client.name , client_branch.email, client_branch.mobile_no') + + + $clientData = $this->ClientDocsModel->select('client.name as client_name, client_branch.email, client_branch.mobile_no') ->join('client_branch', 'client_docs.client_branch_id = client_branch.id', 'left') ->join('client', 'client_branch.client_id = client.client_id', 'left') ->where('client_docs.id', $doc_id)->get()->getRow(); @@ -694,13 +702,14 @@ class MasterController extends BaseController ->where('branches.branch_id',$this->session->get('logged_in_staff_branch_id')) ->get()->getRow(); $subject = 'BB-Sign Verify Document'; - $message = "Dear " . $clientData->name . ",
" . $businessData->business_name . " has requested your approval for a document. Please click the link below to preview and approve.

" . $url; + $message = "Dear " . $clientData->client_name . ",
" . $businessData->business_name . " has requested your approval for a document. Please click the link below to preview and approve.

" . $url; + $MailHelper->send_url_email($clientData->email , $businessData->email, $subject, $message); $notificationHelper = new NotificationHelper(); $number = '91'.$clientData->mobile_no; // Replace with dynamic recipient number if($clientData->whatsapp == 1){ - $whatsApp_message = "Dear " . $clientData->name . "," . $businessData->business_name . " has requested your approval for a document. Please click the link below to preview and approve." ; - $notificationHelper->sendWhatsAppMessage($number, $whatsApp_message, $url); + $whatsApp_message = "Dear " . $clientData->client_name . "," . $businessData->business_name . " has requested your approval for a document. Please click the link below to preview and approve." ; + //$notificationHelper->sendWhatsAppMessage($number, $whatsApp_message, $url); } return $this->respond(['success' => true, 'data' => 'Remember Send Successfully']); } catch (\Exception $exception) { @@ -731,7 +740,7 @@ class MasterController extends BaseController $number = '91'.$mobile_no; // Replace with dynamic recipient number $message = 'Document Verification OTP : ' . $otp; if($client_data['whatsapp'] == 1){ - $notificationHelper->sendWhatsAppMessage($number, $message); + // $notificationHelper->sendWhatsAppMessage($number, $message); } if($client_data['sms'] == 1){ $notificationHelper->sendSms($number, $client_data['name'] , $otp, '', 'doc_verify',$clint_full_data); diff --git a/app/Helpers/NotificationHelper.php b/app/Helpers/NotificationHelper.php index 622c030..5a324e1 100644 --- a/app/Helpers/NotificationHelper.php +++ b/app/Helpers/NotificationHelper.php @@ -89,8 +89,8 @@ class NotificationHelper $senderId = getenv('SENDER_ID'); if($message_type_name == 'doc_verify') { - $message = 'Dear '. $name .', - '. $otp .' is OTP to approve '. $client_full_data['group_name'] .' for '. $client_full_data['service_name'] .' purposes. -L D RAJ AND CO'; + $message = 'Dear '. $client_full_data['client_name'] .', +'. $otp .' is OTP to approve '. $client_full_data['group_name'] .' for '. $client_full_data['service_name'] .' purposes. -L D RAJ AND CO'; } $serviceName = getenv('SERVICE_NAME'); // Service name diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 2913b90..3c12e50 100644 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -281,7 +281,7 @@ - /assets/images/dox.png" alt="" height="20"> + /assets/images/Dox.png" alt="" height="20">