diff --git a/www/TEST/config.php b/www/TEST/config.php index b5365490..950ca26f 100644 --- a/www/TEST/config.php +++ b/www/TEST/config.php @@ -3,6 +3,9 @@ include '../backend.php'; $base_url = 'https://fluxtra:fl0xtra!@oameye.works.wrenchboard.com/svs/user'; $local_url = 'https://fluxtra:fl0xtra!@oameye.works.wrenchboard.com/svs/user'; +$base_url = 'http://fluxtra:fl0xtra!@oameye.works.wrenchboard.com/svs/user'; +$local_url = 'http://fluxtra:fl0xtra!@oameye.works.wrenchboard.com/svs/user'; + //$base_url = 'https://www.wrenchboard.com/svs/user'; //$local_url = 'https://www.wrenchboard.com/svs/user'; diff --git a/www/application/controllers/Bko.php b/www/application/controllers/Bko.php index f8a1c433..45795fe5 100644 --- a/www/application/controllers/Bko.php +++ b/www/application/controllers/Bko.php @@ -62,7 +62,7 @@ class Bko extends CI_Controller { $_SESSION['bko_sessionid'] = $out["sessionid"]; $_SESSION['bko_username'] = $out["username"]; $_SESSION['bko_selected_memberd_id'] = 0; - $_SESSION['bko_group'] = $out['group_id']; + $_SESSION['bko_group'] = $out['group_id']; $_SESSION['bkodata'] = $out; redirect('bkouser/dash'); } diff --git a/www/application/controllers/Bkotransaction.php b/www/application/controllers/Bkotransaction.php index 76d579f1..51792f0a 100644 --- a/www/application/controllers/Bkotransaction.php +++ b/www/application/controllers/Bkotransaction.php @@ -42,9 +42,7 @@ class Bkotransaction extends Bko_Controller { case 'TRANSDETAIL': $mysql = "SELECT m.id,mp.confirmation, m.added,me.firstname||' '||me.lastname||'
'||me.email AS Sender," - . "sr.firstname||' '||sr.lastname||'
ACC:'||sr.account_no||'-'||be.name AS recipient, m.initiatingamount*0.01 AS Amount,m.fee*0.01 AS Fee, " - . "'' As Detail, " - . "'' As Process " + . "sr.firstname||' '||sr.lastname||'
ACC:'||sr.account_no||'-'||be.name AS recipient, m.initiatingamount*0.01 AS Amount,m.fee*0.01 AS Fee " . "FROM money_transfer m " . "LEFT JOIN members me ON me.id=m.member_id " . "LEFT JOIN sendmoney_recipient sr ON sr.id=m.recipientid " @@ -145,8 +143,8 @@ class Bkotransaction extends Bko_Controller { $myTable .="Amount" . $out['amount'] . ""; $myTable .="Fee" . $out['fee'] . ""; - $myTable .="
"; - $myTable .=" [another tabble]"; + $myTable .=""; + $myTable .=" "; return $myTable; } @@ -171,25 +169,68 @@ class Bkotransaction extends Bko_Controller { public function moneytransfer() { // $this->load->view('bko/view_bko_header', $data); $data = array(); - + + $this->load->library('pagination'); + $config = array(); + $this->load->library('table'); $this->table->set_template($this->template); - $mysql = "SELECT * FROM money_transfer LIMIT 100"; + $mysql = "SELECT m.* FROM money_transfer m LEFT JOIN members_payments mp ON mp.what_sendmoney = m.id WHERE m.status =1 AND m.completed IS NULL AND mp.confirmation IS NOT NULL"; + $query = $this->db->query($mysql); + $config["total_rows"] = $query->num_rows(); + $config["base_url"] = base_url() . "/bkotransaction/moneytransfer"; + $config["per_page"] = 15; + $config["uri_segment"] = 3; + $config["num_links"] = 5; + + $config['full_tag_open'] = ""; + $config['num_tag_open'] = '
  • '; + $config['num_tag_close'] = '
    • '; + $config['cur_tag_open'] = "
  • "; + $config['cur_tag_close'] = "
    • "; + $config['next_tag_open'] = "
  • "; + $config['next_tagl_close'] = "
    • "; + $config['prev_tag_open'] = "
  • "; + $config['prev_tagl_close'] = "
    • "; + $config['first_tag_open'] = "
  • "; + $config['first_tagl_close'] = "
    • "; + $config['last_tag_open'] = "
  • "; + $config['last_tagl_close'] = "
    • "; + + $this->pagination->initialize($config); + + $page = ($this->uri->segment(3)) ? $this->uri->segment(3) : 0; + + $page = is_numeric($page) ? $page : 0; + $sdate = '2016-01-01'; $edate = '2018-01-01'; $mysql = "SELECT m.added,mp.confirmation,me.firstname||' '||me.lastname||'
    '||me.email AS Sender," . "sr.firstname||' '||sr.lastname||'
    ACC:'||sr.account_no||'-'||be.name AS recipient, m.initiatingamount*0.01 AS Amount,m.fee*0.01 AS Fee, " - . "'' As Detail, " - . "'' As Process " + . "'' As Detail, " + . "'' As Process " . "FROM money_transfer m " . "LEFT JOIN members me ON me.id=m.member_id " . "LEFT JOIN members_payments mp ON mp.what_sendmoney = m.id " . "LEFT JOIN sendmoney_recipient sr ON sr.id=m.recipientid " . "LEFT JOIN bank_entity_codes be ON be.code=sr.bank_code " - . "WHERE m.status =1 AND m.completed IS NULL ORDER BY m.added DESC "; + . "WHERE m.status =1 AND m.completed IS NULL AND mp.confirmation IS NOT NULL ORDER BY m.added DESC LIMIT " . $config["per_page"] . " OFFSET " . $page; + $this->table->set_heading( + array('data' => 'Added', 'style' => 'width:120px'), + array('data' => 'Confirmation', 'style' => 'width:120px'), + 'Sender', + 'Recipient', + array('data' => 'Amount', 'style' => 'width:10px'), + array('data' => 'Fee', 'style' => 'width:50px'), + array('data' => 'Details', 'style' => 'width:100px'), + array('data' => 'Process', 'style' => 'width:10px') + ); + $data["links"] = $this->pagination->create_links(); + $query = $this->db->query($mysql); $data['sendmoney_dash_table'] = $this->table->generate($query); diff --git a/www/application/views/bko/view_bko_pendingsm.php b/www/application/views/bko/view_bko_pendingsm.php index 8c2df7f7..525088cf 100644 --- a/www/application/views/bko/view_bko_pendingsm.php +++ b/www/application/views/bko/view_bko_pendingsm.php @@ -1,128 +1,127 @@ - -
    - - -
    -
    - - -
    -
    -
    Pending Withdraw(s)
    -
    -
    - -
    -
    -
    - -
    -
    - -
    -
    - - -
    - - -
    - -
    - - -
    - -
    -
    -
    .
    -
    - -
    -
    - -
    - -
    - -
    -
    - -
    -
    - -
    - -
    - - -
    -
    - - - - -
    - - + +
    + +
    +
    + + +
    +
    +
    Pending Withdraw(s)
    +
    +
    + +
    +
    +
    + +
    +
    + +
    +
    + + +
    + + +
    + +
    + + +
    + +
    +
    +
    .
    +
    + +
    +
    + +
    + +
    + +
    +
    + +
    +
    + +
    + +
    + + +
    +
    + + + + +
    + + diff --git a/www/backend.php b/www/backend.php index 814677f4..a5bd42aa 100644 --- a/www/backend.php +++ b/www/backend.php @@ -5,7 +5,7 @@ if (!array_key_exists('wrenchboard', $GLOBALS)) { $USER = strtok($USER, '/'); if ($USER=='opt') $USER = 'root'; // Load API class - // $USER = 'root'; + $USER = 'oameye'; $wrenchboard_class = 'wrenchboard_api_' . $USER . '\\WrenchBoard'; $wrenchboard = new $wrenchboard_class(); }