diff --git a/www/application/controllers/Member.php b/www/application/controllers/Member.php index 866d8402..acad6dbd 100644 --- a/www/application/controllers/Member.php +++ b/www/application/controllers/Member.php @@ -662,10 +662,6 @@ class Member extends Users_Controller { public function balance() { $data = $this->getSessionArray(); - - - - $data['add_error'] = ''; $data['amount'] = 0; $this->load->model('combo_model'); @@ -692,8 +688,9 @@ class Member extends Users_Controller { $this->table->set_heading('Date', 'Amount','Fee','Recipient','Confirmation', 'Status'); $data['sendmoney_table'] = $this->table->generate($query); $data['sendmoney_table_result'] = $query->result(); - $data['card_payment_data_result'] = $this->report_model->getCardPurchase(6)['card_payment_data_result']; + $data['card_coupon_data_result'] = $this->report_model->getRedeemCouponsList(6)['card_coupon_data_result']; + $data['wallet'] = $this->account_model->getUserWallet( $_SESSION['member_id']); diff --git a/www/application/models/Report_model.php b/www/application/models/Report_model.php index 71d61425..95afd5e2 100644 --- a/www/application/models/Report_model.php +++ b/www/application/models/Report_model.php @@ -21,4 +21,16 @@ class Report_model extends CI_Model { return $data; } + public function getRedeemCouponsList($limit){ + $data = array(); + $mysql = "SELECT id,code,amount,active::date ,added::date + FROM coupons_allocation + WHERE member_id =" . $_SESSION['member_id'] . " AND + active IS NOT NULL ORDER BY active DESC LIMIT ". $limit; + + $query = $this->db->query($mysql); + $data['card_coupon_data_result'] = $query->result(); + return $data; + } + } diff --git a/www/application/views/users/view_balance.php b/www/application/views/users/view_balance.php index 7196a2dd..51fbcaef 100644 --- a/www/application/views/users/view_balance.php +++ b/www/application/views/users/view_balance.php @@ -15,13 +15,9 @@ function getAddWithdrawButtons(){ } ?> -
| Currency | @@ -51,8 +41,6 @@ function getAddWithdrawButtons(){|
|---|---|
| Date | @@ -250,13 +197,8 @@ function getAddWithdrawButtons(){
|---|
| Date | +Description | +Amount | +Active | ++ |
|---|---|---|---|---|
| + =$row->added?> + | ++ =$row->code?> + | ++ =$row->amount*0.01?> + | ++ =$row->active?> + | + ++ + + + | +