diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php
index aaa4bf5..e56a956 100644
--- a/app/Controllers/Admin_controller.php
+++ b/app/Controllers/Admin_controller.php
@@ -290,7 +290,7 @@ class Admin_controller extends BaseController
$check_if_email_exist = $this->UserModel->where('email',$this->request->getVar('email'))->find();
if($check_if_email_exist)
{
- return redirect()->to(base_url()."members_list");
+ return redirect()->to(base_url()."users_list");
}else{
@@ -312,9 +312,9 @@ class Admin_controller extends BaseController
unset($UserData['state_canada']);
$UserData['state'] = $state;
- $userData['password'] = $password;
+ $UserData['password'] = $password;
- $userdata = $this->UserModel->save($userData);
+ $userdata = $this->UserModel->save($UserData);
if ($userdata)
@@ -1104,11 +1104,12 @@ class Admin_controller extends BaseController
public function update_creditsModel($con)
{
$data['total'] = $this->request->getVar('total');
+ $reason = $this->request->getVar('reason');
$id = $this->request->getVar('id');
if($con == 'del')
- $upt_data = $this->creditsModel->where('id', $id )->set(array( 'is_active' => 0 ))->update();
+ $upt_data = $this->creditsModel->where('id', $id )->set(array( 'is_active' => 0, 'reason'=> $reason ))->update();
else
- $upt_data = $this->creditsModel->where('id', $id )->set(array( 'is_active' => 1 ))->update();
+ $upt_data = $this->creditsModel->where('id', $id )->set(array( 'is_active' => 1, 'reason'=> $reason ))->update();
echo $upt_data ? true : false;
}
@@ -1126,7 +1127,8 @@ class Admin_controller extends BaseController
for ($i=0; $i < $count ; $i++)
{
- $data['running_balance'] = $temp_data[0]['credit'];;
+ $data['order_id'] = $orderId = 'EGF'.rand(10,100).rand(10,100).rand(10,100) . 'A';
+ $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'];
@@ -1143,7 +1145,10 @@ class Admin_controller extends BaseController
else
{
$data2 = $this->request->getVar();
+ // print_r($data2); die();
+ $data2['order_id'] = $orderId = 'EGF'.rand(10,100).rand(10,100).rand(10,100) . 'A';
$data2['running_balance'] = $this->request->getVar('credit_points');
+ $data2['remark'] = $this->request->getVar('remarks');
$data2['expiring_date'] = date('Y-m-d', strtotime($days, strtotime($today)));
$data2['updated_by'] = session()->get('logged_admin_user');
$this->creditsModel->save($data2);
@@ -1182,7 +1187,15 @@ class Admin_controller extends BaseController
}
}
- $output = '
Member Name : '.$fname.' '.$lname.'
| Order Id | Order Date | Expiry Date | Credit Transactions | Credit Balance | Action |
';
+ $output = 'Member Name : '.$fname.' '.$lname.'
+
+ | 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']);
@@ -1190,11 +1203,25 @@ class Admin_controller extends BaseController
{$balance = "+ ".$data['credit_data'][$i]['running_balance'];}else{$balance = "- ".$data['credit_data'][$i]['used_points'];}
// 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'].' | |
';
+ $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'].' | |
';
+ $output .='
+ | '.$data['credit_data'][$i]['order_id'].' |
+ '.$date->format('M d , Y').' |
+ '.$expirydate->format('M d , Y').' |
+ '.$balance.' |
+ '.$data['credit_data'][$i]['reason'].
+ ' |
+
+ |
';
}
- echo $output .= '
';
+ echo $output .= '
';
}
diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index c8d786f..3548c4c 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -1252,27 +1252,31 @@ class Member_controller extends BaseController
$credit_data = $this->creditsModel->where('member_id', session()->get('logged_user'))
- ->select('package_name')
+ ->select('package_name')
- ->select('cost')
+ ->select('cost')
- ->select('credit_points')
+ ->select('credit_points')
- ->select('expiring_date')
+ ->select('expiring_date')
- ->selectSum('credit_points', 'creditPointsSum')
+ ->select('remark')
+
+ ->select('method')
- ->selectSum('cost', 'costSum')
+ ->selectSum('credit_points', 'creditPointsSum')
- ->selectCount('package_name', 'pack_count')
+ ->selectSum('cost', 'costSum')
- ->groupBy('package_name')
+ ->selectCount('package_name', 'pack_count')
- ->where('order_id',$TransactionDatavalue['order_id'])
+ ->groupBy('package_name')
- ->where('is_active',1)
+ ->where('order_id',$TransactionDatavalue['order_id'])
- ->findAll();
+ ->where('is_active',1)
+
+ ->findAll();
$TransactionDatavalue['credit_data'] = $credit_data;
diff --git a/app/Models/Member_credits_model.php b/app/Models/Member_credits_model.php
index bb42512..ef57bcc 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', 'remark' ];
+ 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', 'reason' ];
}
\ No newline at end of file
diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php
index 2122ee0..ee84194 100644
--- a/app/Views/memberaccess.php
+++ b/app/Views/memberaccess.php
@@ -110,12 +110,27 @@
if($credit_data[$i]['expiring_date'] < date('m-d-Y', time()))
echo 'Credit Expiry
';
else
- echo ''.$credit_data[$i]['package_name'].'
';
+ echo ''.$credit_data[$i]['package_name'].'
' ;
+ if(empty($credit_data[$i]['remark']))
+ echo " ";
+ else
+ echo '' ;
?>
-
- Validity : One year from the date of opening
- Order Id :
+
+ Validity : One year from the date of opening
+
+ Order Id :
+
0)
echo ' '.$credit_data[$i]['running_balance'].' | ';
@@ -123,6 +138,7 @@
echo ''.$credit_data[$i]['used_points'].' | ';
?>
= $credit_data[$i]['avaiable_credit'] ?> |
+
diff --git a/app/Views/members_list.php b/app/Views/members_list.php
index a5f4b0a..bae8893 100644
--- a/app/Views/members_list.php
+++ b/app/Views/members_list.php
@@ -1,129 +1,145 @@
-
-
-
-
+.buttons-csv{
+background-color: white;
+color: #002B60;
+border-color: #000;
+}
+.test {
+box-shadow: 0 2px 6px 0 rgba(0,86,193,.5);
+cursor: pointer;
+color: #fff;
+font-size: 15px;
+padding: 10px;
+width: 55px;
+height: 25px;
+line-height: 8px;
+background: #00B4D5;
+border-radius: 5px;
+font-weight: 500;
+display: block;
+}
+/* th{
+text-align: center;
+} */
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/assets/member_css/front-style.css b/public/assets/member_css/front-style.css
index 91a4df6..4366717 100644
--- a/public/assets/member_css/front-style.css
+++ b/public/assets/member_css/front-style.css
@@ -1589,6 +1589,13 @@ body.checkout .select2-container--default .select2-selection--single .select2-s
font-size: 15px;
color: #475569;
}
+.table-design p.remark, .table-design p.validity{
+ color: #475569;
+ margin-bottom:0;
+}
+.table-design p.payment, .table-design p.validity{
+ margin-bottom:0;
+}
.table-white .order-total div{
line-height: 40px;
}