fix
This commit is contained in:
@@ -642,7 +642,7 @@ class Member extends Users_Controller {
|
||||
$data['comment'] = '';
|
||||
// $data['fee'] = 0;
|
||||
//$data['escrow_balance'] = 0;
|
||||
|
||||
$this->load->model('report_model');
|
||||
$this->load->library('table');
|
||||
$this->table->set_template($this->template);
|
||||
$mysql = "SELECT m.added::date AS date,m.terminatingamount*0.01 AS amount,m.fee*0.01 as fee, "
|
||||
@@ -659,6 +659,8 @@ class Member extends Users_Controller {
|
||||
$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'];
|
||||
|
||||
if ($_POST) {
|
||||
$data['comment'] = $this->input->post('comment');
|
||||
$data['amount'] = $this->input->post('amount') + 0; // must be number [still in full will be cents to go to backend latter]
|
||||
@@ -1004,7 +1006,11 @@ class Member extends Users_Controller {
|
||||
|
||||
$this->load->library('pagination');
|
||||
$config = array();
|
||||
|
||||
/*
|
||||
*
|
||||
* 7 | MEMBER_NEWCARD_PAYM | MNCCD | 0
|
||||
8 | MEMBER_RETCARD_PAYM | MRCCD | 0
|
||||
*/
|
||||
|
||||
$this->load->library('table');
|
||||
$this->table->set_template($this->template);
|
||||
@@ -1012,7 +1018,10 @@ class Member extends Users_Controller {
|
||||
. "WHEN code ='OFRFD' THEN 'Job Offer Refund' WHEN code='MDEPT' THEN 'Account Depoist' "
|
||||
. "WHEN code ='SMPAY' THEN 'Account Withdraw' "
|
||||
. "WHEN code ='COCNL' THEN 'Cancellation Refund' "
|
||||
. "WHEN code ='COPAY' THEN 'Completed Task Payment' ELSE '' END) AS Description,amount*0.01 AS amount,fee*0.01 as fee,confirmation "
|
||||
. "WHEN code ='COPAY' THEN 'Completed Task Payment' "
|
||||
. "WHEN code ='MNCCD' THEN 'New Card Payment' "
|
||||
. "WHEN code ='MRCCD' THEN 'Repeat Card Payment' "
|
||||
. "ELSE '' END) AS Description,amount*0.01 AS amount,fee*0.01 as fee,confirmation "
|
||||
. "FROM members_payments "
|
||||
. "WHERE member_id = " . $_SESSION['member_id'] . " AND status = 1 ORDER BY id DESC";
|
||||
$query = $this->db->query($mysql);
|
||||
@@ -1045,12 +1054,15 @@ class Member extends Users_Controller {
|
||||
$page = is_numeric($page) ? $page : 0;
|
||||
|
||||
$mysql = "SELECT added::date,(CASE WHEN code = 'OFDPS' THEN 'Job Offer Deposit' "
|
||||
. "WHEN code ='OFRFD' THEN 'Job Offer Refund' WHEN code='MDEPT' THEN 'Account Depoist' "
|
||||
. "WHEN code ='SMPAY' THEN 'Account Withdraw' "
|
||||
. "WHEN code ='COCNL' THEN 'Cancellation Refund' "
|
||||
. "WHEN code ='COPAY' THEN 'Completed Task Payment' ELSE '' END) AS Description,amount*0.01 AS amount,fee*0.01 as fee,confirmation "
|
||||
. "FROM members_payments "
|
||||
. "WHERE member_id = " . $_SESSION['member_id'] . " AND status = 1 ORDER BY id DESC LIMIT " . $config["per_page"] . " OFFSET " . $page;
|
||||
. "WHEN code ='OFRFD' THEN 'Job Offer Refund' WHEN code='MDEPT' THEN 'Account Depoist' "
|
||||
. "WHEN code ='SMPAY' THEN 'Account Withdraw' "
|
||||
. "WHEN code ='COCNL' THEN 'Cancellation Refund' "
|
||||
. "WHEN code ='COPAY' THEN 'Completed Task Payment' "
|
||||
. "WHEN code ='MNCCD' THEN 'New Card Payment' "
|
||||
. "WHEN code ='MRCCD' THEN 'Repeat Card Payment' "
|
||||
. "ELSE '' END) AS Description,amount*0.01 AS amount,fee*0.01 as fee,confirmation "
|
||||
. "FROM members_payments "
|
||||
. "WHERE member_id = " . $_SESSION['member_id'] . " AND status = 1 ORDER BY id DESC LIMIT " . $config["per_page"] . " OFFSET " . $page;
|
||||
|
||||
$query = $this->db->query($mysql);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user