From e964b2892c50e68840c5b4af3276c4cfb8fa3428 Mon Sep 17 00:00:00 2001 From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com> Date: Mon, 5 Jun 2023 14:36:46 +0530 Subject: [PATCH] suseendhiran --- app/Controllers/Admin_controller.php | 3 +- app/Controllers/Sendmail_controller.php | 19 +++ app/Views/credits_pack_form.php | 2 +- app/Views/credits_pack_list.php | 2 +- app/Views/dashboard.php | 169 +++--------------------- app/Views/member_form.php | 2 +- app/Views/set_password.php | 2 +- app/Views/users_password.php | 2 +- app/Views/verification_mail_temp.php | 16 +++ 9 files changed, 59 insertions(+), 158 deletions(-) diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php index 377c22c..bbe5538 100644 --- a/app/Controllers/Admin_controller.php +++ b/app/Controllers/Admin_controller.php @@ -120,7 +120,7 @@ class Admin_controller extends BaseController if ($check != null) { $data['check'] = 'profile_edit'; } - + $data['check'] = 'profile_edit'; //print_r($data);die(); echo view('layout/header',$userdata); echo view('user_form',$data); @@ -152,6 +152,7 @@ class Admin_controller extends BaseController $userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user')); $data['country']=$this->cModel->fetch_country(); + $data['check']= null; echo view('layout/header',$userdata); echo view('user_form',$data); echo view('layout/footer'); diff --git a/app/Controllers/Sendmail_controller.php b/app/Controllers/Sendmail_controller.php index fe348b2..e0745f9 100644 --- a/app/Controllers/Sendmail_controller.php +++ b/app/Controllers/Sendmail_controller.php @@ -144,6 +144,25 @@ class Sendmail_controller extends BaseController else $email->setSubject('Verify your email address'); } + // payment => type 5 + else if($return == 5) + { + $user_data = $this->UserModel->where('email', $to)->find(); + $data['id'] = '3'; + $data['username'] = $to; + $data['password'] = $code; + $data['url'] = base_url()."admin"; + $temp_data = $this->MailModel->where('type' , 2)->where('is_active' , 1)->find(); + if ($temp_data[0]['to']) + $email->setCC($temp_data[0]['to']); + if ($temp_data) + $data['html'] = str_replace("%name%",$user_data[0]['name'],$temp_data[0]['html']); + $message = view('verification_mail_temp',$data); + if ($temp_data[0]['is_active'] == 1) + $email->setSubject($temp_data[0]['subject']); + else + $email->setSubject('Username Password'); + } $email->setMessage($message); if ($email->send()) { diff --git a/app/Views/credits_pack_form.php b/app/Views/credits_pack_form.php index 021146f..11a8096 100644 --- a/app/Views/credits_pack_form.php +++ b/app/Views/credits_pack_form.php @@ -71,7 +71,7 @@ - diff --git a/app/Views/credits_pack_list.php b/app/Views/credits_pack_list.php index 48fc27a..5603ee3 100644 --- a/app/Views/credits_pack_list.php +++ b/app/Views/credits_pack_list.php @@ -52,7 +52,7 @@ - Edit + diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php index a586805..bec25f3 100644 --- a/app/Views/dashboard.php +++ b/app/Views/dashboard.php @@ -6,17 +6,17 @@

-
+
-
Campaign Sent
-

865

+
Admin Count
+

- +
@@ -24,17 +24,17 @@
-
+
-
New Leads
-

384

+
Member Count
+

- +
@@ -42,17 +42,17 @@
-
+
-
Deals
-

34,521

+
Coach Count
+

- +
@@ -60,17 +60,17 @@
-
+
-
Booked Revenue
-

$89,357

+
Frontdesk Count
+

- +
@@ -81,142 +81,7 @@ -
-
-
-
- Export -

Channels

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ChannelVisits
Direct2,050 -
-
-
-
Organic Search1,405 -
-
-
-
Refferal750 -
-
-
-
Social540 -
-
-
-
-
-
-
-
- -
-
-
- Export -

Social Media Traffic

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NetworkVisits
Facebook2,250 -
-
-
-
Instagram1,501 -
-
-
-
Twitter750 -
-
-
-
LinkedIn540 -
-
-
-
-
-
-
-
- -
+ diff --git a/app/Views/member_form.php b/app/Views/member_form.php index 0374036..80cb465 100644 --- a/app/Views/member_form.php +++ b/app/Views/member_form.php @@ -119,7 +119,7 @@ - diff --git a/app/Views/set_password.php b/app/Views/set_password.php index e4a8b31..a3435ba 100644 --- a/app/Views/set_password.php +++ b/app/Views/set_password.php @@ -92,7 +92,7 @@ - diff --git a/app/Views/users_password.php b/app/Views/users_password.php index e42661c..6e85dda 100644 --- a/app/Views/users_password.php +++ b/app/Views/users_password.php @@ -57,7 +57,7 @@ - diff --git a/app/Views/verification_mail_temp.php b/app/Views/verification_mail_temp.php index c52a2a8..93e9868 100644 --- a/app/Views/verification_mail_temp.php +++ b/app/Views/verification_mail_temp.php @@ -112,6 +112,22 @@ bgcolor="#f6f6f6"> + + + + + + Your password changed successfully... + + + +