diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 8aef1a7..5a8ec4f 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -36,6 +36,10 @@ $routes->match(['get'],'/members_list','Member_controller::members_list'); $routes->match(['get'],'/member_edit/(:any)','Member_controller::member_edit/$1'); $routes->match(['post'],'/member_edit','Member_controller::member_edit'); $routes->match(['get','post'],'/member_add','Member_controller::member_add'); + +$routes->match(['post'],'/buy_pack','Member_controller::buy_pack'); +$routes->match(['post'],'/use_points','Member_controller::use_points'); + $routes->match(['get','post'],'/set_password/(:any)','Member_controller::set_password/$1'); $routes->match(['get','post'],'/update_password','Member_controller::update_password'); $routes->match(['get','post'],'/change_password','Member_controller::change_password'); @@ -53,6 +57,10 @@ $routes->match(['get','post'],'/user_add','Admin_controller::user_add'); $routes->match(['get'],'/admin_profile/(:any)','Admin_controller::admin_profile/$1'); $routes->match(['post'],'/admin_profile','Admin_controller::admin_profile'); $routes->match(['post'],'/profilepic','Admin_controller::profilepic_insert'); +$routes->match(['get'],'/credits_pack_list','Admin_controller::credits_pack_list'); +$routes->match(['get'],'/credits_pack_edit/(:any)','Admin_controller::credits_pack_edit/$1'); +$routes->match(['post'],'/credits_pack_edit','Admin_controller::credits_pack_edit'); +$routes->match(['get','post'],'/credits_pack_add','Admin_controller::credits_pack_add'); $routes->match(['get'],'/admin_home','Dashboard::admin_home'); $routes->match(['get'],'/member_home','Dashboard::member_home'); diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php index 453912b..c30bac0 100644 --- a/app/Controllers/Admin_controller.php +++ b/app/Controllers/Admin_controller.php @@ -4,6 +4,8 @@ namespace App\Controllers; use App\Models\User_model; use App\Models\Dashboard_model; use App\Models\Common_model; +use App\Models\Member_credits_model; +use App\Models\Packages_and_pricing_model; class Admin_controller extends BaseController { public $session; @@ -13,6 +15,8 @@ class Admin_controller extends BaseController $this->UserModel = new User_model(); $this->dModel = new Dashboard_model(); $this->cModel = new Common_model(); + $this->creditsModel = new Member_credits_model(); + $this->PackagesModel = new Packages_and_pricing_model(); helper(['form', 'url']); } public function index() @@ -176,5 +180,64 @@ class Admin_controller extends BaseController } } + + + + + public function credits_pack_list() + { + + $userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user')); + $data['PackageData'] = $this->PackagesModel->findAll(); + echo view('layout/header',$userdata); + echo view('credits_pack_list',$data); + echo view('layout/footer'); + } + + + public function credits_pack_edit($pack_id = null) + { + + if($this->request->getmethod() == 'post') + { + //update member details + + $PackData = $this->request->getVar(); + $pack_id = $this->request->getVar('id'); + $this->PackagesModel->where('id', $pack_id )->set($PackData)->update(); + return redirect()->to(base_url()."credits_pack_list"); + + } + + + $userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user')); + + $data['PackageData'] = $this->PackagesModel->where('md5(id)', $pack_id )->find(); + + //print_r($data);die(); + echo view('layout/header',$userdata); + echo view('credits_pack_form',$data); + echo view('layout/footer'); + + } + + public function credits_pack_add() + { + + if($this->request->getmethod() == 'post') + { + //insert member details + $PackData = $this->request->getVar(); + $this->UserModel->save($PackData); + return redirect()->to(base_url()."credits_pack_list"); + + } + + $userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user')); + echo view('layout/header',$userdata); + echo view('credits_pack_form'); + echo view('layout/footer'); + + } // ----------------------------------------------- } diff --git a/app/Controllers/Dashboard.php b/app/Controllers/Dashboard.php index 9cbb7a0..9733697 100644 --- a/app/Controllers/Dashboard.php +++ b/app/Controllers/Dashboard.php @@ -1,7 +1,8 @@ dModel = new Dashboard_model(); - + $this->PackagesModel = new Packages_and_pricing_model(); + $this->creditsModel = new Member_credits_model(); } public function index() { @@ -43,8 +45,11 @@ class Dashboard extends BaseController $id = session()->get('logged_user'); $data['userdata']=$this->dModel->getLoggedInMemberData($id); + $data['packageData']=$this->PackagesModel->findAll(); + $data['creditsData']=$this->creditsModel->findAll(); + //print_r($data);die(); //echo view('layout/header',$data); - echo view('dashboard',$data); + echo view('member_dashboard',$data); //echo view('layout/footer'); //return view('dashboard'); } diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php index 8c03bc6..3db8a60 100644 --- a/app/Controllers/Member_controller.php +++ b/app/Controllers/Member_controller.php @@ -4,6 +4,8 @@ namespace App\Controllers; use App\Models\Member_model; use App\Models\Dashboard_model; use App\Models\Common_model; +use App\Models\Member_credits_model; +use App\Models\Packages_and_pricing_model; class Member_controller extends BaseController { public $session; @@ -14,6 +16,8 @@ class Member_controller extends BaseController $this->MemberModel = new Member_model(); $this->dModel = new Dashboard_model(); $this->cModel = new Common_model(); + $this->creditsModel = new Member_credits_model(); + $this->PackagesModel = new Packages_and_pricing_model(); helper('form'); } public function index() @@ -253,5 +257,91 @@ class Member_controller extends BaseController + + public function buy_pack() + { + //insert member details + $array = $this->request->getVar(); + //print_r($array);die(); + $newArray = array(); + foreach ($array as $key => $value) { + $newKey = substr($key, 0, -2); + $newArray[$newKey] = $value; + } + //print_r($newArray);die(); + $packageData = $this->PackagesModel->where('id',$newArray['pack_id'])->find(); + //print_r($packageData);die(); + $today = date("Y-m-d"); + + $credits_data['member_id'] = $newArray['member_id']; + $credits_data['package_name'] = $packageData[0]['package_name']; + $credits_data['package_type'] = $packageData[0]['package_type']; + $credits_data['credit_points'] = $packageData[0]['credit'] * $newArray['pack_count']; + $credits_data['running_balance'] = $packageData[0]['credit'] * $newArray['pack_count']; + $credits_data['expired_points'] = 0; + $credits_data['expiring_date'] = date('Y-m-d', strtotime('+1 month', strtotime($today))); + $credits_data['cost'] = $packageData[0]['cost']; + //print_r($credits_data);die(); + $insert_data = $this->creditsModel->save($credits_data); + if($insert_data) + { + echo true; + }else{ + echo false; + } + + + } + + + + public function use_points() + { + //insert member details + $FormData = $this->request->getVar(); + + + //print_r($FormData);die(); + $needed_points = $FormData['points']; + $creditsData = $this->creditsModel->where('member_id',$FormData['member_id'])->findAll(); + $newArray = array(); + foreach ($creditsData as $creditsDataindex => $creditsDataValue) { + echo $needed_points; + echo "--"; + + if($creditsDataValue['expiring_date'] > date("Y-m-d")) + { + if($creditsDataValue['running_balance'] != 0) + { + + + $needed_points = ($needed_points - $creditsDataValue['running_balance']); + + $newArray[$creditsDataValue['running_balance']] = $needed_points; + }else{ + + } + + }else{ + + } + + } + print_r($newArray);die(); + + $packageData = $this->PackagesModel->where('id',$newArray['pack_id'])->find(); + + // $insert_data = $this->creditsModel->save($credits_data); + // if($insert_data) + // { + // echo true; + // }else{ + // echo false; + // } + + + } + + // ----------------------------------------------- } diff --git a/app/Models/Member_credits_model.php b/app/Models/Member_credits_model.php new file mode 100644 index 0000000..7d9b619 --- /dev/null +++ b/app/Models/Member_credits_model.php @@ -0,0 +1,13 @@ + +
+
+
+

Edit Add Credit Package

+
+ +
+
+
+
+ + + + + +
+
+
+
+ +
+ action="" + action="" + /> + + + + + + + + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + + +
+
+ + +
+
+
+
+
+ +
+
+ + + + \ No newline at end of file diff --git a/app/Views/credits_pack_list.php b/app/Views/credits_pack_list.php new file mode 100644 index 0000000..48fc27a --- /dev/null +++ b/app/Views/credits_pack_list.php @@ -0,0 +1,68 @@ + +
+
+
+

Credits Package

+
+ +
+
+
+
+ + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Pack NamePack TypePointsCostStatusAction
Edit
+ +
+
+
+
+ \ No newline at end of file diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 107a53b..d18fb22 100644 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -165,6 +165,25 @@ $(document).ready(function(){ +
  • + + + Credit Pack + + +
    + +
    +
  • + + role == 'Coach' ) { ?> @@ -186,7 +205,28 @@ $(document).ready(function(){ --> - +role == 'Fronddesk' ) { ?> + + + + + diff --git a/app/Views/member_dashboard.php b/app/Views/member_dashboard.php new file mode 100644 index 0000000..328e569 --- /dev/null +++ b/app/Views/member_dashboard.php @@ -0,0 +1,180 @@ + + + + + + + + + + +
    +
    + +
    +
    +
    +
    +
    +

    My Profile

    +
    +
    +
    +
    +
    + +
    + +
    +

    name; ?>

    +
    +
    + + +
    +
    + + +
    + $row) { ?> +
    +
    +
    +
      +
    • + +
    • +
    • + +
    • +
    • + - $ +
    • +
    + +
    +
    +
    + + +
    + + + + + + + + + + + + + + + + + $row) { ?> + + + + + + + + + + + +
    Pack typePack nameCreditsCostUsed creditsExpired creditsExpiring date
    + +
    + +
    + + Book slot With Credit points + + + + +
    +
    +
    +
    +
    + + + +