diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index 557fcf5..ee3d81a 100644
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -839,7 +839,7 @@ class MasterController extends BaseController
$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();
@@ -855,7 +855,7 @@ class MasterController extends BaseController
->where('branches.branch_id',1)
->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);
@@ -865,8 +865,8 @@ class MasterController extends BaseController
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);
}
@@ -907,7 +907,7 @@ class MasterController extends BaseController
$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();
@@ -922,7 +922,7 @@ 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);
@@ -930,8 +930,8 @@ class MasterController extends BaseController
$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);
}
@@ -975,7 +975,7 @@ class MasterController extends BaseController
if($client_data['whatsapp'] == 1){
- $notificationHelper->sendWhatsAppMessage($number, $message);
+ // $notificationHelper->sendWhatsAppMessage($number, $message);
}
if($client_data['sms'] == 1){
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 b5d2b1b..9e190f8 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -283,7 +283,7 @@
-
/assets/images/dox.png" alt="" height="20">
+
/assets/images/Dox.png" alt="" height="20">