diff --git a/.env b/.env index e8ba976..f92c9c6 100644 --- a/.env +++ b/.env @@ -74,3 +74,10 @@ database.default.port = 3306 WAAI_INSTANCE = '666FEE6738696' WAAI_TOKEN = '666fd862df687' + + + +API_KEY = 'HgvlULWCIrs'; // Your API key +DLT_Template_ID = '1105171896608602869'; // DLT Template ID +SENDER_ID = 'LDRCHN'; // Sender ID +SERVICE_NAME = 'TEMPLATE_BASED'; // Service name diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index 018cb75..d3e4a6d 100644 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -204,7 +204,7 @@ class ClientController extends BaseController if($client_branch_data['sms'] == 1){ try { - $notificationHelper->sendSms(); + $notificationHelper->sendSms('91'. $client_branch_data['mobile_no'], $client_branch_data['name'], $otp, '', 'login_otp',''); // return $this->respond(['success' => true, 'otp' => $otp]); } catch (\Exception $e) { return $this->respond(['Error' => $e->getMessage()]); diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index 1aa03eb..600f0c0 100644 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -845,7 +845,9 @@ class MasterController extends BaseController ->where('client_docs.id', $doc_id)->get()->getRow(); $documentUrl = base_url(); - $url = 'Preview and Approve Document'; + helper('url'); + $url ='Preview and Approve Document'; + // $url = 'Preview and Approve Document'; $businessData = $this->BranchModel->select('branches.* , business.business_name ') ->join('business', 'branches.business_id = business.business_id', 'left') @@ -870,7 +872,7 @@ class MasterController extends BaseController } if($clientData->sms == 1){ - $notificationHelper->sendSms(); + $notificationHelper->sendSms($number, $clientData->name . "," . $businessData->business_name, '', $url, 'change_doc_status',''); } @@ -913,7 +915,10 @@ class MasterController extends BaseController ->join('client', 'client_branch.client_id = client.client_id', 'left') ->where('client_docs.id', $doc_id)->get()->getRow(); - $url = 'Click here'; + helper('url'); + $url ='Preview and Approve Document'; + + // $url = 'Click here'; $businessData = $this->BranchModel->select('branches.* , business.business_name ') ->join('business', 'branches.business_id = business.business_id', 'left') @@ -933,7 +938,7 @@ class MasterController extends BaseController } if($clientData->sms == 1){ - $notificationHelper->sendSms(); + $notificationHelper->sendSms($number, $clientData->name . "," . $businessData->business_name, '', $url, 'rememeber_message', ''); } return $this->respond(['success' => true, 'data' => 'Remember Send Successfully']); @@ -956,6 +961,16 @@ class MasterController extends BaseController $id = $this->request->getPost('doc_id'); $otp = mt_rand(100000, 999999); $data = ['otp' => $otp]; + $clint_full_data = $this->ClientDocsModel->select('client_docs.* , services.service_name , service_group.group_name , client_branch.name as client_branch_name , client.name as client_name') + ->join('template', 'template.template_id = client_docs.template_id', 'left') + ->join('services', 'services.service_id = template.service_id', 'left') + ->join('service_group', 'service_group.service_group_id = template.service_group_id', 'left') + ->join('client_branch', 'client_branch.id = client_docs.client_branch_id', 'left') + ->join('client', 'client.client_id = client_branch.client_id', 'left') + ->where('client_docs.id', $id) + ->first(); + print_r($clint_full_data);die; + $update = $this->ClientDocsModel->update($id, $data); if($update){ @@ -969,7 +984,7 @@ class MasterController extends BaseController } if($client_data['sms'] == 1){ - $notificationHelper->sendSms(); + $notificationHelper->sendSms($number, $client_data['name'] , $otp, '', 'doc_verify',$clint_full_data); } return $this->respond(['success' => true, 'otp' => $otp]); diff --git a/app/Controllers/TestController.php b/app/Controllers/TestController.php index 2eab496..9645a32 100644 --- a/app/Controllers/TestController.php +++ b/app/Controllers/TestController.php @@ -87,8 +87,9 @@ class TestController extends Controller public function protectedPage(){ $doc_id = $this->request->getVar('doc_id'); + $data['docData'] = $this->ClientDocsModel->docPreview($doc_id); - + $data['expires'] = $this->request->getVar('expires'); $data['clientData'] = $this->ClientBranchModel->select('client.name , client.pan_no ,client_branch.gst_no , client_branch.mobile_no , client_branch.email , client_branch.address , client_branch.country , client_branch.state , client_branch.city , client_branch.pin_code ') ->join('client', 'client_branch.client_id = client.client_id', 'left') ->where('client_branch.id',$data['docData']->client_branch_id) diff --git a/app/Helpers/NotificationHelper.php b/app/Helpers/NotificationHelper.php index c65a54b..56b5c3e 100644 --- a/app/Helpers/NotificationHelper.php +++ b/app/Helpers/NotificationHelper.php @@ -81,15 +81,24 @@ class NotificationHelper return true; } - public function sendSms() + public function sendSms($number, $name= '', $otp='', $url ='', $message_type_name, $clint_full_data='') { - $apiKey = 'HgvlULWCIrs'; // Your API key + $apiKey = getenv('API_KEY'); // Your API key // $mobileNumbers = '919894638731'; // Recipient mobile numbers - $mobileNumbers = '916379103977'; // Recipient mobile numbers - $DLTTemplateID = '1105171896608602869'; // DLT Template ID - $senderId = 'LDRAJ'; // Sender ID - $message = 'Dear Gowtham, 986532 is OTP to approve Service group for service name purposes.'; - $serviceName = 'TEMPLATE_BASED'; // Service name + $mobileNumbers = $number; // Recipient mobile numbers + $DLTTemplateID = getenv('DLT_Template_ID'); // DLT Template ID + $senderId = getenv('SENDER_ID'); // Sender ID + if($message_type_name == 'login_otp'){ + $message = 'Login OTP is: ' . $otp; + }else if($message_type_name == 'change_doc_status'){ + $message = "Dear " . $name . " has requested your approval for a document. Please click the link below to preview and approve." ; + }else if($message_type_name == 'rememeber_message'){ + $message = "Dear " . $name . " has requested your approval for a document. Please click the link below to preview and approve. \n\nClick here - " . $url; ; + }else if($message_type_name == 'doc_verify'){ + $message = 'Dear'. $name .',' . $otp . 'is OTP to approve '. $clint_full_data['group_name'] .' for '. $clint_full_data['service_name'] .' purposes.'; + } + + $serviceName = getenv('SERVICE_NAME'); // Service name // URL encode the message $encodedMessage = urlencode($message); diff --git a/app/Views/branch_list.php b/app/Views/branch_list.php index a59d019..28df5ca 100644 --- a/app/Views/branch_list.php +++ b/app/Views/branch_list.php @@ -234,7 +234,9 @@ return ; } if($('#business').val() == 0){ + event.preventDefault(); toastr.warning('Select Business'); + $('#business').focus(); return; } var formData = { diff --git a/app/Views/client_docs_preview.php b/app/Views/client_docs_preview.php index 2a59d4b..2155e3e 100644 --- a/app/Views/client_docs_preview.php +++ b/app/Views/client_docs_preview.php @@ -60,8 +60,9 @@
+ Close - + is_active == 1 && $docData->is_approved == 0){ ?> Revert diff --git a/app/Views/share_docs.php b/app/Views/share_docs.php index 0cf5fc8..f7eb517 100644 --- a/app/Views/share_docs.php +++ b/app/Views/share_docs.php @@ -124,8 +124,7 @@
- - + Preview