diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php index cbc0e3b..aaa4bf5 100644 --- a/app/Controllers/Admin_controller.php +++ b/app/Controllers/Admin_controller.php @@ -499,12 +499,14 @@ class Admin_controller extends BaseController { if($this->request->getmethod() == 'get') { - $data = $this->PackagesModel->findAll(); + $data['data'] = $this->PackagesModel->findAll(); + $data['OnePackValue'] = $this->RuleModel->where('rule_key',14)->find(); echo json_encode($data); } else { - $data = $this->PackagesModel->where('id',$this->request->getVar('id'))->find(); + $data['data'] = $this->PackagesModel->where('id',$this->request->getVar('id'))->find(); + $data['OnePackValue'] = $this->RuleModel->where('rule_key',14)->find(); echo json_encode($data); } } @@ -1112,14 +1114,44 @@ class Admin_controller extends BaseController 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); - } + $requet_data = $this->request->getVar(); + $temp_data = $this->PackagesModel->where('id' , $requet_data['package_name'])->find(); + $credit_pack_expiry_duration = $this->RuleModel->select('value')->where('rule_key', 1 )->get()->getRow()->value; + $today = date("Y-m-d"); + $days = "+".$credit_pack_expiry_duration." days"; + $count = $this->request->getVar('count'); + + if(isset($count)) + { + + for ($i=0; $i < $count ; $i++) + { + $data['running_balance'] = $temp_data[0]['credit'];; + $data['updated_by'] = session()->get('logged_admin_user'); + $data['credit_points'] = $temp_data[0]['credit']; + $data['package_name'] = $temp_data[0]['package_name']; + $data['package_type'] = $temp_data[0]['package_type']; + $data['expiring_date'] = date('Y-m-d', strtotime($days, strtotime($today))); + $data['cost'] = $temp_data[0]['cost']; + $data['member_id'] = $requet_data['member_id']; + $data['method'] = $requet_data['method']; + $data['remark'] = $requet_data['remarks']; + $this->creditsModel->save($data); + } + + } + else + { + $data2 = $this->request->getVar(); + $data2['running_balance'] = $this->request->getVar('credit_points'); + $data2['expiring_date'] = date('Y-m-d', strtotime($days, strtotime($today))); + $data2['updated_by'] = session()->get('logged_admin_user'); + $this->creditsModel->save($data2); + + } + + + return redirect()->to(base_url()."members_list"); } @@ -1150,7 +1182,7 @@ class Admin_controller extends BaseController } } - $output = '
'; + $output = '

Member Name : '.$fname.' '.$lname.'

Order IdOrder DateExpiry DateCredit TransactionsCredit BalanceAction
'; 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']); @@ -1160,7 +1192,7 @@ class Admin_controller extends BaseController if($data['credit_data'][$i]['is_active'] == 1) $output .=''; else - $output .=''; + $output .=''; } echo $output .= '
Order IdOrder DateExpiry DateCredit TransactionsCredit BalanceAction
'.$data['credit_data'][$i]['order_id'].''.$date->format('M d , Y').''.$expirydate->format('M d , Y').''.$balance.''.$data['credit_data'][$i]['avaiable_credit'].'
'.$data['credit_data'][$i]['order_id'].''.$date->format('M d , Y').''.$expirydate->format('M d , Y').''.$balance.''.$data['credit_data'][$i]['avaiable_credit'].'
'.$data['credit_data'][$i]['order_id'].''.$date->format('M d , Y').''.$expirydate->format('M d , Y').''.$balance.''.$data['credit_data'][$i]['avaiable_credit'].'
'; diff --git a/app/Models/Member_credits_model.php b/app/Models/Member_credits_model.php index 438ecd4..bb42512 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','method','created_by']; + 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', 'remark' ]; } \ No newline at end of file diff --git a/app/Views/members_list.php b/app/Views/members_list.php index b636b3f..0ebc1cb 100644 --- a/app/Views/members_list.php +++ b/app/Views/members_list.php @@ -126,12 +126,14 @@