Bigbamboo/bb_sign
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CHANGE_MASTER_CONTROLLER_CONFLICT_MERAGE : AADHAVAN

Browse Source
This commit is contained in:
aadhavan valli 2024-07-04 11:42:28 +05:30
commit 24ff1f0586
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/Controllers/MasterController.php
View File

@ -634,7 +634,9 @@ class MasterController extends BaseController
$DateAndYears = $this->dateAndYearPlaceholder(); $DateAndYears = $this->dateAndYearPlaceholder();
$data['place_holder_object'] = $DateAndYears; $data['place_holder_object'] = $DateAndYears;
$MailHelper = new MailHelper(); $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_branch', 'client_docs.client_branch_id = client_branch.id', 'left')
->join('client', 'client_branch.client_id = client.client_id', 'left') ->join('client', 'client_branch.client_id = client.client_id', 'left')
->where('client_docs.id', $doc_id)->get()->getRow(); ->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')) ->where('branches.branch_id',$this->session->get('logged_in_staff_branch_id'))
->get()->getRow(); ->get()->getRow();
$subject = 'BB-Sign Verify Document'; $subject = 'BB-Sign Verify Document';
$message = "Dear " . $clientData->name . ",<br>" . $businessData->business_name . " has requested your approval for a document. Please click the link below to preview and approve.<br><br>" . $url;
$message = "Dear " . $clientData->client_name . ",<br>" . $businessData->business_name . " has requested your approval for a document. Please click the link below to preview and approve.<br><br>" . $url;
$mail_send = $MailHelper->send_url_email($clientData->email , $businessData->email, $subject, $message); $mail_send = $MailHelper->send_url_email($clientData->email , $businessData->email, $subject, $message);
$notificationHelper = new NotificationHelper(); $notificationHelper = new NotificationHelper();
$number = '91'.$clientData->mobile_no; // Replace with dynamic recipient number $number = '91'.$clientData->mobile_no; // Replace with dynamic recipient number
if($clientData->whatsapp == 1){ 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['client_docs_id'] = $doc_id;
$statusData['is_staff'] = 1; $statusData['is_staff'] = 1;
@ -683,7 +689,9 @@ class MasterController extends BaseController
try { try {
$doc_id = $this->request->getPost('doc_id'); $doc_id = $this->request->getPost('doc_id');
$MailHelper = new MailHelper(); $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_branch', 'client_docs.client_branch_id = client_branch.id', 'left')
->join('client', 'client_branch.client_id = client.client_id', 'left') ->join('client', 'client_branch.client_id = client.client_id', 'left')
->where('client_docs.id', $doc_id)->get()->getRow(); ->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')) ->where('branches.branch_id',$this->session->get('logged_in_staff_branch_id'))
->get()->getRow(); ->get()->getRow();
$subject = 'BB-Sign Verify Document'; $subject = 'BB-Sign Verify Document';
$message = "Dear " . $clientData->name . ",<br>" . $businessData->business_name . " has requested your approval for a document. Please click the link below to preview and approve.<br><br>" . $url; $message = "Dear " . $clientData->client_name . ",<br>" . $businessData->business_name . " has requested your approval for a document. Please click the link below to preview and approve.<br><br>" . $url;
$MailHelper->send_url_email($clientData->email , $businessData->email, $subject, $message); $MailHelper->send_url_email($clientData->email , $businessData->email, $subject, $message);
$notificationHelper = new NotificationHelper(); $notificationHelper = new NotificationHelper();
$number = '91'.$clientData->mobile_no; // Replace with dynamic recipient number $number = '91'.$clientData->mobile_no; // Replace with dynamic recipient number
if($clientData->whatsapp == 1){ 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." ; $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); //$notificationHelper->sendWhatsAppMessage($number, $whatsApp_message, $url);
} }
return $this->respond(['success' => true, 'data' => 'Remember Send Successfully']); return $this->respond(['success' => true, 'data' => 'Remember Send Successfully']);
} catch (\Exception $exception) { } catch (\Exception $exception) {
@ -731,7 +740,7 @@ class MasterController extends BaseController
$number = '91'.$mobile_no; // Replace with dynamic recipient number $number = '91'.$mobile_no; // Replace with dynamic recipient number
$message = 'Document Verification OTP : ' . $otp; $message = 'Document Verification OTP : ' . $otp;
if($client_data['whatsapp'] == 1){ if($client_data['whatsapp'] == 1){
$notificationHelper->sendWhatsAppMessage($number, $message); // $notificationHelper->sendWhatsAppMessage($number, $message);
} }
if($client_data['sms'] == 1){ if($client_data['sms'] == 1){
$notificationHelper->sendSms($number, $client_data['name'] , $otp, '', 'doc_verify',$clint_full_data); $notificationHelper->sendSms($number, $client_data['name'] , $otp, '', 'doc_verify',$clint_full_data);

4
app/Helpers/NotificationHelper.php
View File

@ -89,8 +89,8 @@ class NotificationHelper
$senderId = getenv('SENDER_ID'); $senderId = getenv('SENDER_ID');
if($message_type_name == 'doc_verify') if($message_type_name == 'doc_verify')
{ {
$message = 'Dear '. $name .', $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'; '. $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 $serviceName = getenv('SERVICE_NAME'); // Service name

2
app/Views/layout/header.php
View File

@ -281,7 +281,7 @@
<span class="logo-lg"> <span class="logo-lg">
<!-- <h3 style="color: white;margin-top: 16px;"> Dox 2 Approve </h3> --> <!-- <h3 style="color: white;margin-top: 16px;"> Dox 2 Approve </h3> -->
<img src="<?= base_url()."public"; ?>/assets/images/dox.png" alt="" height="20"> <img src="<?= base_url()."public"; ?>/assets/images/Dox.png" alt="" height="20">
</span> </span>
</a> </a>