diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index 159cd27..a73a8ec 100644
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -49,6 +49,7 @@ class MasterController extends BaseController
// $data['serviceList'] = $this->ServiceModel->findAll();
$data['serviceList'] = $this->ServiceModel->select('services.* , COUNT(template.template_id) as template_count')
->join('template', 'services.service_id = template.service_id', 'left')
+ ->groupBy('services.service_id')
->findAll();
$staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow();
@@ -268,6 +269,14 @@ class MasterController extends BaseController
$data = [
'is_active' => $is_active
];
+ if($is_active == 1){
+ $MailHelper = new MailHelper();
+ $email = $this->ClientDocsModel
+ ->join('client', 'client_docs.client_id = client.client_id', 'left')
+ ->where('id', $doc_id)->get()->getRow()->email;
+ $url = 'Click here';
+ $MailHelper->send_url_email($email , $url );
+ }
$updated = $this->ClientDocsModel->update($doc_id, $data);
@@ -308,12 +317,12 @@ class MasterController extends BaseController
}
} catch (\Exception $e) {
// Handle any exceptions that occur during execution
- return $this->respond(['status' => 'error', 'code' => 500, 'message' => $e->getMessage()], 500);
+ return $this->response->setJSON(['status' => 'error', 'code' => 500, 'message' => $e->getMessage()], 500);
}
}
- // str_replace("%name%","Gowtham",$data['templateData']->body_html);
+
@@ -343,7 +352,7 @@ class MasterController extends BaseController
}
} catch (\Exception $e) {
// Handle any exceptions that occur during execution
- return $this->respond(['status' => 'error', 'code' => 500, 'message' => $e->getMessage()], 500);
+ return $this->response->setJSON(['status' => 'error', 'code' => 500, 'message' => $e->getMessage()], 500);
}
}
diff --git a/app/Controllers/StaffController.php b/app/Controllers/StaffController.php
index f82f479..d7ce49d 100644
--- a/app/Controllers/StaffController.php
+++ b/app/Controllers/StaffController.php
@@ -57,7 +57,7 @@ class StaffController extends BaseController
$this->session->set('logged_in_staff_role',$staffdata['role']);
$this->session->set('logged_in_staff_name',$staffdata['name']);
- return redirect()->to(base_url().'staff_list');
+ return redirect()->to(base_url().'client_list');
}
else{
$this->session->setTempdata('error','Email or Password is invalid',3);
diff --git a/app/Helpers/MailHelper.php b/app/Helpers/MailHelper.php
index d18fabc..30492b2 100644
--- a/app/Helpers/MailHelper.php
+++ b/app/Helpers/MailHelper.php
@@ -16,60 +16,60 @@ use App\Models\NotesModel;
class MailHelper
{
- public static function send_email($visa_request_id)
- {
- $VisaRequestModel = new VisaRequestModel();
- $NotesModel = new NotesModel();
-
-
-
- $data['visaData'] = $VisaRequestModel->getVisaRequestList(session()->get('logged_in_staff_branch_id'), $visa_request_id);
- $data['visaNotesData'] = $NotesModel-> getVisaRequestNotes($visa_request_id);
-
- $emaill = $data['visaData']->client_email;
- $subject = 'United Visa Servises - Notification';
- $html = view('mail_template', $data);
-
- try {
-
- $email = \Config\Services::email();
- $email->setMailType('html');
- $email->setFrom('bbone@venbait.in', 'UVS');
-
- $email->setTo($emaill);
-
- $email->setSubject($subject);
- $email->setMessage($html);
-
- if ($email->send()) {
- return json_encode(['status' => 'success','code' => 200, 'message'=>'Email Sent Successfully...','data' => $emaill,],200);
- } else {
- return json_encode(['status' => 'failed','code' => 404,'message'=>'Email Sent Failed...','data' => $emaill ],404);
- }
-
- } catch (\Exception $e) {
- return json_encode(['status' => 'failed','code' => 500,'data' => $emaill],500);
- }
- }
-
+
public static function send_otp_email($email_id,$otp)
{
- $subject = 'UVS Reset Password - OTP';
+ $subject = 'BB-Sign Verify Document';
$message = "Hai ,
-
- We have received a request for account recovery associated with your account. To ensure the security of your account, we are sending you a one-time password (OTP) for verification purposes. Please use the following OTP to proceed with the account recovery process:
-
- OTP: ".$otp;
+
+ We have a requested forgot password OTP :".$otp;
+
+
try {
$email = \Config\Services::email();
$email->setMailType('html');
- $email->setFrom('bbone@venbait.in', 'UVS');
+ $email->setFrom('bbone@venbait.in', 'BB-Sign');
+
+ $email->setTo($email_id);
+
+ $email->setSubject($subject);
+ $email->setMessage($message);
+
+ if ($email->send()) {
+ return json_encode(['status' => 'success','code' => 200, 'message'=>'Email Sent Successfully...','data' => $email_id,],200);
+ } else {
+ return json_encode(['status' => 'failed','code' => 404,'message'=>'Email Sent Failed...','data' => $email_id ],404);
+ }
+
+ } catch (\Exception $e) {
+ return json_encode(['status' => 'failed','code' => 500,'data' => $email_id],500);
+ }
+ }
+
+ public static function send_url_email($email_id,$url)
+ {
+
+
+
+ $subject = 'BB-Sign Verify Document';
+ $message = "Hai ,
+
+ We have a request for document verification.
+
+
+ ".$url;
+
+ try {
+
+ $email = \Config\Services::email();
+ $email->setMailType('html');
+ $email->setFrom('bbone@venbait.in', 'BB-Sign');
$email->setTo($email_id);
diff --git a/app/Views/client_list.php b/app/Views/client_list.php
index 94952b4..e8284ba 100644
--- a/app/Views/client_list.php
+++ b/app/Views/client_list.php
@@ -106,13 +106,7 @@