diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index adaec92..f06e2d7 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -100,6 +100,9 @@ $routes->match(['get','post'],'/manage_availability','Admin_controller::manage_a
$routes->match(['get','post'],'/add_to_cart_package','Admin_controller::add_to_cart_package');
$routes->match(['post'],'/order_details','Admin_controller::order_details');
$routes->match(['get'],'/view_credit_details/(:any)','Admin_controller::view_credit_details/$1');
+$routes->match(['post'],'/update_creditsModel/(:any)','Admin_controller::update_creditsModel/$1');
+$routes->match(['get','post'],'/get_pack_list','Admin_controller::get_pack_list');
+$routes->match(['get','post'],'/add_creditsModel','Admin_controller::add_creditsModel');
$routes->match(['get'],'/product_list','Admin_controller::product_list');
$routes->match(['get'],'/product_edit/(:any)','Admin_controller::product_edit/$1');
diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php
index cf029e3..cbc0e3b 100644
--- a/app/Controllers/Admin_controller.php
+++ b/app/Controllers/Admin_controller.php
@@ -495,7 +495,19 @@ class Admin_controller extends BaseController
-
+ public function get_pack_list()
+ {
+ if($this->request->getmethod() == 'get')
+ {
+ $data = $this->PackagesModel->findAll();
+ echo json_encode($data);
+ }
+ else
+ {
+ $data = $this->PackagesModel->where('id',$this->request->getVar('id'))->find();
+ echo json_encode($data);
+ }
+ }
@@ -1087,30 +1099,68 @@ class Admin_controller extends BaseController
}
+ public function update_creditsModel($con)
+ {
+ $data['total'] = $this->request->getVar('total');
+ $id = $this->request->getVar('id');
+ if($con == 'del')
+ $upt_data = $this->creditsModel->where('id', $id )->set(array( 'is_active' => 0 ))->update();
+ else
+ $upt_data = $this->creditsModel->where('id', $id )->set(array( 'is_active' => 1 ))->update();
+ echo $upt_data ? true : false;
+ }
+
+ public function add_creditsModel()
+ {
+ $data = $this->request->getVar();
+ $count = $this->request->getVar('count') ?? 1;
+ for ($i=0; $i < $count ; $i++)
+ {
+ $data['running_balance'] = $this->request->getVar('credit_points');
+ $data['updated_by'] = session()->get('logged_admin_user');
+ $this->creditsModel->save($data);
+ }
+ return redirect()->to(base_url()."members_list");
+ }
+
public function view_credit_details($member_id)
{
-
- $creditsData = $this->creditsModel->where('md5(member_id)',$member_id)->where('is_active',1)->orderBy('id' , 'ASC')->findAll();
+ $fname = $this->MemberModel->select('name')->where('md5(id)', $member_id )->get()->getRow()->name;
+ $lname = $this->MemberModel->select('last_name')->where('md5(id)', $member_id )->get()->getRow()->last_name;
+ $id = $this->MemberModel->select('id')->where('md5(id)', $member_id )->get()->getRow()->id;
+ $creditsData = $this->creditsModel->where('md5(member_id)',$member_id)->orderBy('id' , 'ASC')->findAll();
$data['credit_data'] = [];
$data['avaiable_credit'] = 0;
$data['country'] = $this->CountryModel->findAll();
foreach ($creditsData as $creditsDataindex => $creditsDataValue)
{
-
- $data['avaiable_credit'] = $data['avaiable_credit'] + $creditsDataValue['running_balance'];
- $creditsDataValue['avaiable_credit'] = $data['avaiable_credit'];
- array_push($data['credit_data'] , $creditsDataValue);
+ if($creditsDataValue['is_active'] == 1)
+ {
+ $data['avaiable_credit'] = $data['avaiable_credit'] + $creditsDataValue['running_balance'];
+ $creditsDataValue['avaiable_credit'] = $data['avaiable_credit'];
+ array_push($data['credit_data'] , $creditsDataValue);
+ }
+ else
+ {
+ $data['avaiable_credit'] = $data['avaiable_credit'];
+ $creditsDataValue['avaiable_credit'] = 0;
+ array_push($data['credit_data'] , $creditsDataValue);
+ }
}
- $output = '
| Order Id | Order Date | Expiry Date | Credit Transactions | Credit Balance |
';
+ $output = ' | Order Id | Order Date | Expiry Date | Credit Transactions | Credit Balance | Action |
';
for( $i = count($data['credit_data']) - 1; $i >= 0 ; $i--) {
$date = new DateTime($data['credit_data'][$i]['created_at']);
$expirydate = new DateTime($data['credit_data'][$i]['expiring_date']);
if($data['credit_data'][$i]['running_balance'] > 0)
{$balance = "+ ".$data['credit_data'][$i]['running_balance'];}else{$balance = "- ".$data['credit_data'][$i]['used_points'];}
- $output .='| '.$data['credit_data'][$i]['order_id'].' | '.$date->format('M d , Y').' | '.$expirydate->format('M d , Y').' | '.$balance.' | '.$data['credit_data'][$i]['avaiable_credit'].' |
';
+ // if($data['credit_data'][$i]['is_active'] == 0) $balance = 0;
+ if($data['credit_data'][$i]['is_active'] == 1)
+ $output .='| '.$data['credit_data'][$i]['order_id'].' | '.$date->format('M d , Y').' | '.$expirydate->format('M d , Y').' | '.$balance.' | '.$data['credit_data'][$i]['avaiable_credit'].' | |
';
+ else
+ $output .='| '.$data['credit_data'][$i]['order_id'].' | '.$date->format('M d , Y').' | '.$expirydate->format('M d , Y').' | '.$balance.' | '.$data['credit_data'][$i]['avaiable_credit'].' | |
';
}
echo $output .= '
';
diff --git a/app/Models/Member_credits_model.php b/app/Models/Member_credits_model.php
index c289679..438ecd4 100644
--- a/app/Models/Member_credits_model.php
+++ b/app/Models/Member_credits_model.php
@@ -7,7 +7,7 @@ class Member_credits_model extends Model
protected $table = 'member_credits';
protected $primaryKey = 'id';
- protected $allowedFields = ['member_id','pack_id','package_name','package_type','credit_points','running_balance','used_points', 'expired_points','expiring_date', 'cost' ,'is_active', 'order_id','transaction_id' ,'cost_with_tax'];
+ protected $allowedFields = ['member_id','pack_id','package_name','package_type','credit_points','running_balance','used_points', 'expired_points','expiring_date', 'cost' ,'is_active', 'order_id','transaction_id' ,'cost_with_tax','method','created_by'];
}
\ No newline at end of file
diff --git a/app/Views/members_list.php b/app/Views/members_list.php
index e308e4f..b636b3f 100644
--- a/app/Views/members_list.php
+++ b/app/Views/members_list.php
@@ -107,17 +107,15 @@
-
@@ -126,6 +124,102 @@
+
+
+
+
+
+
+
+
\ No newline at end of file