diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 2bb83d5..e29c4c1 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -70,6 +70,9 @@ $routes->match(['get','post'],'/credits_pack_add','Admin_controller::credits_pac $routes->match(['get','post'],'/user_password_change','Admin_controller::user_password_change'); $routes->match(['get','post'],'/user_deactivate/(:any)','Admin_controller::user_deactivate/$1'); $routes->match(['get','post'],'/user_activate/(:any)','Admin_controller::user_activate/$1'); +$routes->match(['get'],'/transactions_list/(:any)','Admin_controller::transactions_list/$1'); +$routes->match(['get'],'/transactions_list','Admin_controller::transactions_list'); + $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 001a426..ede9dcd 100644 --- a/app/Controllers/Admin_controller.php +++ b/app/Controllers/Admin_controller.php @@ -6,6 +6,7 @@ use App\Models\Dashboard_model; use App\Models\Common_model; use App\Models\Member_credits_model; use App\Models\Packages_and_pricing_model; +use App\Models\Credits_usage_tracking_model; class Admin_controller extends BaseController { public $session; @@ -17,6 +18,7 @@ class Admin_controller extends BaseController $this->cModel = new Common_model(); $this->creditsModel = new Member_credits_model(); $this->PackagesModel = new Packages_and_pricing_model(); + $this->CreditsUsageTrackingModel = new Credits_usage_tracking_model(); helper(['form', 'url']); } public function index() @@ -299,6 +301,36 @@ class Admin_controller extends BaseController echo view('users_password'); echo view('layout/footer'); + } + + public function transactions_list($member_id =null) + { + if($member_id == 'null') + { + $userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_user')); + $data['creditsData'] = $this->creditsModel->select('member_credits.* , member.name as member_name ') + ->join('member', 'member_credits.member_id = member.id', 'left') + ->where('md5(member_credits.member_id)', $member_id ) + ->findAll(); + echo view('layout/header',$userdata); + echo view('transactions_list',$data); + echo view('layout/footer'); + + }else{ + + $userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_user')); + $data['creditsData'] = $this->creditsModel->select('member_credits.* , member.name as member_name ') + ->join('member', 'member_credits.member_id = member.id', 'left') + ->findAll(); + echo view('layout/header',$userdata); + echo view('transactions_list',$data); + echo view('layout/footer'); + } + + + + + } // ----------------------------------------------- } diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php index e028cf1..c2c975b 100644 --- a/app/Controllers/Member_controller.php +++ b/app/Controllers/Member_controller.php @@ -7,6 +7,7 @@ use App\Models\Common_model; use App\Models\Member_credits_model; use App\Models\Packages_and_pricing_model; use App\Models\Cart_model; +use App\Models\Credits_usage_tracking_model; class Member_controller extends BaseController { @@ -21,6 +22,7 @@ class Member_controller extends BaseController $this->creditsModel = new Member_credits_model(); $this->PackagesModel = new Packages_and_pricing_model(); $this->cartModel = new Cart_model(); + $this->CreditsUsageTrackingModel = new Credits_usage_tracking_model(); helper('form'); } public function index() @@ -328,8 +330,6 @@ class Member_controller extends BaseController $count = $this->creditsModel->selectSum($columnName)->where('member_id',$FormData['member_id'])->get()->getRow()->$columnName; if($count > $needed_points) { - - $creditsData = $this->creditsModel->where('member_id',$FormData['member_id'])->findAll(); //$newArray = array(); foreach ($creditsData as $creditsDataindex => $creditsDataValue) { @@ -343,8 +343,10 @@ class Member_controller extends BaseController if($needed_points < 0 ){ $running_balance = $creditsDataValue['running_balance'] - $temp_needed_points; $this->update_credit_package_data($creditsDataValue['id'] , array( 'running_balance'=>$running_balance , 'used_points'=> $creditsDataValue['used_points'] + $creditsDataValue['running_balance'] - $running_balance)); + $this->CreditsUsageTrackingModel->save(array('member_id'=>$FormData['member_id'],'member_credits_id'=>$creditsDataValue['id'], 'used_points'=>($creditsDataValue['running_balance'] - $running_balance),'slot_date_time'=>date("Y-m-d"))); }else { $running_balance = 0; $this->update_credit_package_data($creditsDataValue['id'] , array( 'running_balance'=>$running_balance , 'used_points'=> $creditsDataValue['used_points'] + $creditsDataValue['running_balance'] - $running_balance)); + $this->CreditsUsageTrackingModel->save(array('member_id'=>$FormData['member_id'],'member_credits_id'=>$creditsDataValue['id'], 'used_points'=>($creditsDataValue['running_balance'] - $running_balance),'slot_date_time'=>date("Y-m-d"))); } //$newArray[$creditsDataValue['running_balance']] = array('needed_points'=>$needed_points , 'running_balance'=>$running_balance , 'used_points'=> $creditsDataValue['running_balance'] - $running_balance); diff --git a/app/Models/Credits_usage_tracking_model.php b/app/Models/Credits_usage_tracking_model.php new file mode 100644 index 0000000..cd55965 --- /dev/null +++ b/app/Models/Credits_usage_tracking_model.php @@ -0,0 +1,13 @@ + Credit Packs +
  • + "> + + Transactions + +
    • role == 'Coach' ) { ?> @@ -160,6 +166,12 @@ $(document).ready(function(){ Members +
  • + "> + + Transactions + +
    • +
    +
    +
    +

    Credit points purchase and Transaction Details

    +
    +
      + + +
    +
    +
    +
    +
    + + + + + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    DatePurchased byPointsCostPack / Indidual
    + +
    +
    +
    +
    + \ No newline at end of file