From 256d2d6c95eda9f7968145a9d0489e60b2ab8ed4 Mon Sep 17 00:00:00 2001 From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com> Date: Tue, 23 May 2023 12:44:08 +0530 Subject: [PATCH] suseendhiran --- DB/golf.sql | 52 +++++--- app/Config/Autoload.php | 1 + app/Config/CronJob.php | 9 +- app/Config/Routes.php | 4 + app/Controllers/Admin_controller.php | 63 ++++++++++ app/Controllers/Member_controller.php | 4 +- app/Controllers/Sendmail_controller.php | 2 +- app/Models/Rule_model.php | 13 ++ app/Views/admin_login.php | 2 +- app/Views/booked_slot.php | 36 ++++++ app/Views/layout/footer.php | 17 ++- app/Views/layout/header.php | 29 ++++- app/Views/manage_availability.php | 160 ++++++++++++++++++++++++ app/Views/member_dashboard.php | 1 - app/Views/member_login.php | 2 +- app/Views/profile.php | 8 +- app/Views/rule.php | 77 ++++++++++++ composer.lock | 70 +++++------ php | 0 19 files changed, 479 insertions(+), 71 deletions(-) create mode 100644 app/Models/Rule_model.php create mode 100644 app/Views/booked_slot.php create mode 100644 app/Views/manage_availability.php create mode 100644 app/Views/rule.php create mode 100644 php diff --git a/DB/golf.sql b/DB/golf.sql index fe4abd3..a60c90e 100644 --- a/DB/golf.sql +++ b/DB/golf.sql @@ -3,7 +3,7 @@ -- https://www.phpmyadmin.net/ -- -- Host: 127.0.0.1 --- Generation Time: May 16, 2023 at 02:05 PM +-- Generation Time: May 17, 2023 at 02:42 PM -- Server version: 10.4.27-MariaDB -- PHP Version: 7.4.33 @@ -86,7 +86,7 @@ CREATE TABLE `email_template` ( `type` int(10) NOT NULL, `text` mediumtext NOT NULL, `html` mediumtext NOT NULL, - `to` varchar(50) NOT NULL, + `to` varchar(255) NOT NULL, `subject` varchar(255) NOT NULL, `is_active` int(11) NOT NULL DEFAULT 1, `created_at` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), @@ -100,7 +100,10 @@ CREATE TABLE `email_template` ( -- INSERT INTO `email_template` (`id`, `name`, `type`, `text`, `html`, `to`, `subject`, `is_active`, `created_at`, `updated_at`, `created_by`, `updated_by`) VALUES -(6, 'demo', 1, '', '
Hi\n%to%\n!\n
\n\n \n \n \n \n \n \n \n \n \n \n \n Thank\n
', 'demo@g.com', 'demo', 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0); +(6, 'Member Registration Template', 1, 'Hi %name% , Please confirm your email address by clicking the link below.', '\nHi %name% , \nPlease confirm your email address by clicking the link\n below.\n
', 'gowtham.manavalan.la@gmail.com,suseendhiran1999@gmail.com', 'demo', 1, '2023-05-17 06:40:10', '0000-00-00 00:00:00', 0, 0), +(10, 'User Registration Template', 2, 'Please login by clicking the link below.', 'Please login by clicking the link below.
', 'suseendhiran1999@gmail.com', 'Demo', 1, '2023-05-17 06:55:57', '0000-00-00 00:00:00', 0, 0), +(12, 'OTP Template', 3, 'Please use the verification code below on the Golf Evolution Website.', 'Please use the verification code below on the Golf Evolution Website.
', 'suseendhiran1999@gmail.com', 'Demo', 1, '2023-05-17 11:57:55', '0000-00-00 00:00:00', 0, 0), +(14, 'Change Password Verification Template', 4, 'Hello %name% ! , Your password changed successfully...', 'Hello %name% ! , Your password changed successfully...
', 'suseendhiran1999@gmail.com', 'Demo', 1, '2023-05-17 12:02:14', '0000-00-00 00:00:00', 0, 0); -- -------------------------------------------------------- @@ -121,7 +124,10 @@ CREATE TABLE `email_template_variables` ( INSERT INTO `email_template_variables` (`id`, `type`, `name`, `variable_name`) VALUES (1, 1, 'Member Name', '%name%'), -(2, 1, 'Verify Link', '%link%'); +(3, 2, 'User Name', '%name%'), +(4, 3, 'User Name', '%name%'), +(5, 3, 'OTP', '%otp%'), +(6, 4, 'Name', '%name%'); -- -------------------------------------------------------- @@ -157,8 +163,7 @@ CREATE TABLE `member` ( INSERT INTO `member` (`id`, `name`, `email`, `is_email_verified`, `mobile`, `address`, `city`, `state`, `country`, `pincode`, `username`, `password`, `verification_code`, `is_active`, `created_by`, `updated_by`, `created_at`, `updated_at`) VALUES (4, 'Gowthaman', 'gwm@gmail.com', 1, '9894638731', '1st st', '1', '1', '1', 650001, '', '$2y$10$XJD4E81SQtf7XaHZdCVJa.VA/FL1/4OIsL7ZDR1t7M1QnzQ87jb7K', 0, 1, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (5, 'test', 'test@gmail.com', 0, '9500625731', 'Bank Suruliyappan street', '1', '1', '1', 625528, '', '$2y$10$pa8XhW/xFapidAaFA7Zd1eDZMr4SxBGpHXCaJAh0fYH7ej6Ns3UUC', 0, 1, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(6, 'Jeeva', 'gowtham.manavalan.la@gmail.com', 1, '9500625731', 'Bank Suruliyappan street', '2', '2', '1', 625528, '', '$2y$10$imlV3IVeMxcb6JiF/yIqDuTrqXq7SEO7N4G9H74xuwTxAKGFUOqt.', 787918, 1, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(69, 'suseendhiran', 'suseendhiran13@gmail.com', 0, '7777777777', '1st street', 'Chennai', 'Tamil Nadu', '1', 656789, '', '', 958737, 1, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +(6, 'Jeeva', 'gowtham.manavalan.la@gmail.com', 1, '9500625731', 'Bank Suruliyappan street', '2', '2', '1', 625528, '', '$2y$10$kOboUqGu66RUC2sfUe/1zuMP0u/6QiNieEgCCCOS08RSYhJjnPbt6', 787918, 1, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -- -------------------------------------------------------- @@ -189,9 +194,27 @@ CREATE TABLE `member_credits` ( INSERT INTO `member_credits` (`id`, `member_id`, `package_name`, `package_type`, `credit_points`, `running_balance`, `used_points`, `expired_points`, `expiring_date`, `cost`, `is_active`, `created_at`, `updated_at`) VALUES (11, 4, 'Evo Pack 2', 'Regular', 40, 0, 40, 0, '2023-06-11', 1000, 1, '2023-05-11 09:28:21', '2023-05-11 09:28:21'), (12, 4, 'Evo Pack 1', 'Presales', 24, 0, 24, 0, '2023-06-11', 550, 1, '2023-05-11 09:28:22', '2023-05-11 09:28:22'), -(13, 4, 'Evo Pack 2', 'Presales', 48, 40, 8, 0, '2023-06-11', 1000, 1, '2023-05-11 09:33:47', '2023-05-11 09:33:47'), +(13, 4, 'Evo Pack 2', 'Presales', 48, 30, 18, 0, '2023-06-11', 1000, 1, '2023-05-11 09:33:47', '2023-05-11 09:33:47'), (14, 4, 'Evo Pack 2', 'Presales', 48, 48, 0, 0, '2023-06-11', 1000, 1, '2023-05-11 09:53:51', '2023-05-11 09:53:51'), -(15, 4, 'Evo Pack 1', 'Presales', 24, 24, 0, 0, '2023-06-11', 550, 1, '2023-05-11 09:53:52', '2023-05-11 09:53:52'); +(15, 4, 'Evo Pack 1', 'Presales', 24, 24, 0, 0, '2023-06-11', 550, 1, '2023-05-11 09:53:52', '2023-05-11 09:53:52'), +(16, 4, 'Evo Pack 2', 'Presales', 48, 48, 0, 0, '2023-06-17', 1000, 1, '2023-05-17 10:38:23', '2023-05-17 10:38:23'), +(17, 4, 'Evo Pack 1', 'Presales', 24, 24, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:38:23', '2023-05-17 10:38:23'), +(18, 4, 'Evo Pack 2', 'Regular', 40, 40, 0, 0, '2023-06-17', 1000, 1, '2023-05-17 10:39:10', '2023-05-17 10:39:10'), +(19, 4, 'Evo Pack 1', 'Regular', 20, 20, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:39:17', '2023-05-17 10:39:17'), +(20, 4, 'Evo Pack 1', 'Regular', 20, 20, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:39:20', '2023-05-17 10:39:20'), +(21, 4, 'Evo Pack 1', 'Regular', 20, 20, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:39:20', '2023-05-17 10:39:20'), +(22, 4, 'Evo Pack 1', 'Regular', 20, 20, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:39:20', '2023-05-17 10:39:20'), +(23, 4, 'Evo Pack 1', 'Regular', 20, 20, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:39:20', '2023-05-17 10:39:20'), +(24, 4, 'Evo Pack 1', 'Regular', 20, 20, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:39:20', '2023-05-17 10:39:20'), +(25, 4, 'Evo Pack 1', 'Regular', 20, 20, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:39:21', '2023-05-17 10:39:21'), +(26, 4, 'Evo Pack 1', 'Regular', 20, 20, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:39:21', '2023-05-17 10:39:21'), +(27, 4, 'Evo Pack 1', 'Regular', 20, 20, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:39:21', '2023-05-17 10:39:21'), +(28, 4, 'Evo Pack 1', 'Regular', 20, 20, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:39:21', '2023-05-17 10:39:21'), +(29, 4, 'Evo Pack 1', 'Regular', 20, 20, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:39:21', '2023-05-17 10:39:21'), +(30, 4, 'Evo Pack 1', 'Regular', 20, 20, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:39:21', '2023-05-17 10:39:21'), +(31, 4, 'Evo Pack 1', 'Regular', 20, 20, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:39:22', '2023-05-17 10:39:22'), +(32, 4, 'Evo Pack 1', 'Regular', 20, 20, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:39:22', '2023-05-17 10:39:22'), +(33, 4, 'Evo Pack 1', 'Regular', 20, 20, 0, 0, '2023-06-17', 550, 1, '2023-05-17 10:39:22', '2023-05-17 10:39:22'); -- -------------------------------------------------------- @@ -309,9 +332,8 @@ CREATE TABLE `users` ( -- INSERT INTO `users` (`id`, `role`, `name`, `profile`, `email`, `address`, `city`, `state`, `country`, `pincode`, `mobile`, `is_active`, `user_name`, `password`, `created_by`, `updated_by`, `created_at`, `updated_at`) VALUES -(1, 'Admin', 'Admin', 'profile.jpg', 'admin@gmail.com', '1st street', '1', '1', '1', 656787, '986668877', 1, 'admin@gmail.com', '$2y$10$XJD4E81SQtf7XaHZdCVJa.VA/FL1/4OIsL7ZDR1t7M1QnzQ87jb7K', 0, NULL, '2023-05-03 16:30:22', '2023-05-03 16:30:22'), +(1, 'Admin', 'Admin', 'profile.jpg', 'admin@gmail.com', '1st street', '1', '1', '1', 656787, '986668877', 1, 'admin@gmail.com', '$2y$10$IEWpmjmJFPrI4ww/vcqeHeu5uVyChqmA333iiK0glDjZAvV34gjWa', 0, NULL, '2023-05-03 16:30:22', '2023-05-03 16:30:22'), (2, 'Admin', 'Gowtham', '', 'gwm@gmail.com', '131 ', '1', '1', '1', 652500, '6565656565', 0, NULL, NULL, NULL, NULL, '2023-05-06 12:06:31', '2023-05-06 12:06:31'), -(3, 'Coach', 'Jeeva', '', 'suseendhiran13@gmail.com', '', '2', '2', '1', 0, '986532365', 1, NULL, '$2y$10$U8q1UrDyFf30vpeWlymhf.ViELXqahqfG5JPKPdEQ4hdF8zSzdpbe', NULL, NULL, '2023-05-06 15:16:29', '2023-05-06 15:16:29'), (4, 'Admin', 'Gowtham 0045', '', 'gowtham.manavalan.la@gmail.com', '', '1', '1', '1', 0, '09500625731', 1, NULL, '$2y$10$UHEtYAei5PoAteL6b0Fm/e7x94Kr8QmQyFHFcW6wq35juNqKvhyN2', NULL, NULL, '2023-05-06 16:24:23', '2023-05-06 16:24:23'), (5, 'Coach', 'Susee', '', 'suss@gmail.com', 'Bank Suruliyappan street', '1', '1', '1', 625528, '9500625731', 1, NULL, '$2y$10$lNtNgQXFNWCYwyGwMUaYmOpE1MuLUShNvtl9hf5CAf5VEJRyDxDwa', NULL, NULL, '2023-05-08 13:02:43', '2023-05-08 13:02:43'); @@ -399,7 +421,7 @@ ALTER TABLE `users` -- AUTO_INCREMENT for table `cart` -- ALTER TABLE `cart` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=11; + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=13; -- -- AUTO_INCREMENT for table `city` @@ -417,25 +439,25 @@ ALTER TABLE `country` -- AUTO_INCREMENT for table `email_template` -- ALTER TABLE `email_template` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=9; + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=15; -- -- AUTO_INCREMENT for table `email_template_variables` -- ALTER TABLE `email_template_variables` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=3; + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7; -- -- AUTO_INCREMENT for table `member` -- ALTER TABLE `member` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=70; + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=92; -- -- AUTO_INCREMENT for table `member_credits` -- ALTER TABLE `member_credits` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=16; + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=34; -- -- AUTO_INCREMENT for table `packages_and_pricing` diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php index f8a6b3c..3f3bc31 100644 --- a/app/Config/Autoload.php +++ b/app/Config/Autoload.php @@ -42,6 +42,7 @@ class Autoload extends AutoloadConfig public $psr4 = [ APP_NAMESPACE => APPPATH, // For custom app namespace 'Config' => APPPATH . 'Config', + 'App' => APPPATH, 'Daycry\CronJob' => APPPATH .'ThirdParty/cronjob/src', ]; diff --git a/app/Config/CronJob.php b/app/Config/CronJob.php index d821a95..d4c399c 100644 --- a/app/Config/CronJob.php +++ b/app/Config/CronJob.php @@ -4,7 +4,6 @@ namespace Config; use CodeIgniter\Config\BaseConfig; use Daycry\CronJob\Scheduler; -use App\Controllers\Member_controller; class CronJob extends \Daycry\CronJob\Config\CronJob { @@ -119,14 +118,8 @@ class CronJob extends \Daycry\CronJob\Config\CronJob */ public function init(Scheduler $schedule) { - - $Member_controller = new Member_controller(); - - //$schedule->call( function() { $Member_controller->shedule(); } )->everyMinute(); - $schedule->url('http://localhost/golf_backend/scheduler')->everyFiveMinutes(); - // $schedule->command('foo:bar')->everyMinute(); - + $schedule->url('http://localhost/golf_backend/scheduler')->everyFiveMinutes(); // $schedule->shell('cp foo bar')->daily( '11:00 pm' ); // $schedule->call( function() { do something.... } )->everyMonday()->named( 'foo' ) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 9556364..c467c42 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -79,8 +79,12 @@ $routes->match(['get','post'],'/email_temp','Admin_controller::email_temp'); $routes->match(['get','post'],'/edit_email_temp/(:any)','Admin_controller::edit_email_temp/$1'); $routes->match(['get','post'],'/mail_temp_deactivate/(:any)','Admin_controller::mail_temp_deactivate/$1'); $routes->match(['get','post'],'/mail_temp_activate/(:any)','Admin_controller::mail_temp_activate/$1'); +$routes->match(['get','post'],'/rule','Admin_controller::rule'); +$routes->match(['get','post'],'/booked_slot','Admin_controller::booked_slot'); +$routes->match(['get','post'],'/manage_availability','Admin_controller::manage_availability'); +$routes->match(['get'],'/credits_pack','Admin_controller::credits_pack'); $routes->match(['get'],'/admin_home','Dashboard::admin_home'); diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php index 145cdcb..a21aca5 100644 --- a/app/Controllers/Admin_controller.php +++ b/app/Controllers/Admin_controller.php @@ -9,6 +9,7 @@ use App\Models\Packages_and_pricing_model; use App\Models\Credits_usage_tracking_model; use App\Models\Email_template_model; use App\Models\Variable_model; +use App\Models\Rule_model; class Admin_controller extends BaseController { public $session; @@ -23,6 +24,7 @@ class Admin_controller extends BaseController $this->CreditsUsageTrackingModel = new Credits_usage_tracking_model(); $this->MailModel = new Email_template_model(); $this->VariableModel = new Variable_model(); + $this->RuleModel = new Rule_model(); helper(['form', 'url']); } public function index() @@ -228,6 +230,12 @@ class Admin_controller extends BaseController echo view('layout/footer'); } + public function credits_pack() + { + $data = $this->PackagesModel->where('package_type', 'Presales' )->findAll(); + return json_encode($data); + } + public function credits_pack_edit($pack_id = null) { @@ -452,5 +460,60 @@ class Admin_controller extends BaseController return redirect()->to(base_url()."template_list"); } + public function rule() + { + if($this->request->getmethod() == 'get') + { + $userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_user')); + $ruledata['rule_data'] = $this->RuleModel->findAll(); + echo view('layout/header',$userdata); + echo view('rule.php',$ruledata); + echo view('layout/footer'); + } + else if($this->request->getmethod() == 'post') + { + $id = $this->request->getVar('id'); + $data['data'] = $this->request->getVar('rule_name'); + $data['value'] = $this->request->getVar('value'); + $updatedata = $this->RuleModel->where('id', $id )->set($data)->update(); + if($updatedata) + echo true; + else + echo false; + } + } + + public function booked_slot() + { + if($this->request->getmethod() == 'get') + { + $userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_user')); + // $ruledata['rule_data'] = $this->RuleModel->findAll(); + echo view('layout/header',$userdata); + echo view('booked_slot.php'); + echo view('layout/footer'); + } + else if($this->request->getmethod() == 'post') + { + echo 'hi'; + } + } + + public function manage_availability() + { + if($this->request->getmethod() == 'get') + { + $userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_user')); + // $ruledata['rule_data'] = $this->RuleModel->findAll(); + echo view('layout/header',$userdata); + echo view('manage_availability.php'); + echo view('layout/footer'); + } + else if($this->request->getmethod() == 'post') + { + echo 'hi'; + } + } + // ----------------------------------------------- } diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php index 80b8393..58fe55b 100644 --- a/app/Controllers/Member_controller.php +++ b/app/Controllers/Member_controller.php @@ -25,8 +25,7 @@ class Member_controller extends BaseController $this->cartModel = new Cart_model(); $this->CreditsUsageTrackingModel = new Credits_usage_tracking_model(); helper('form'); - - + $this->scheduler(); } public function index() { @@ -428,7 +427,6 @@ class Member_controller extends BaseController public function scheduler() { - $Data = $this->creditsModel->select('member_credits.* , member.name as member_name , member.email as member_email ') ->join('member', 'member_credits.member_id = member.id', 'left') ->findAll(); diff --git a/app/Controllers/Sendmail_controller.php b/app/Controllers/Sendmail_controller.php index 44f00be..01f8a45 100644 --- a/app/Controllers/Sendmail_controller.php +++ b/app/Controllers/Sendmail_controller.php @@ -145,7 +145,7 @@ class Sendmail_controller extends BaseController else $email->setSubject('Verify your email address'); } - $email->setMessage($message); + // $email->setMessage($message); if ($email->send()) { if ($return == 1) diff --git a/app/Models/Rule_model.php b/app/Models/Rule_model.php new file mode 100644 index 0000000..0a008ec --- /dev/null +++ b/app/Models/Rule_model.php @@ -0,0 +1,13 @@ +| Name | +Mobile | +Role | +Address | +Status | +Action | +
|---|