diff --git a/application/controllers/Bkomember.php b/application/controllers/Bkomember.php index d9c225d..9ad57d5 100644 --- a/application/controllers/Bkomember.php +++ b/application/controllers/Bkomember.php @@ -2,7 +2,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -class Bkomember extends Bko_Controller { +class Bkomember extends Bkomember_Controller { + + public function userdash() { + // $this->load->view('bko/view_bko_header', $data); + // $data = array(); + + $data = $this->bkoUserDashData($_SESSION['bko_selected_id']); + // $this->load->view('bko/view_bko_header', $data); + // $this->load->view('bko/view_bko_userdash', $data); + // $this->load->view('bko/view_bko_footer', $data); + $this->secureBkoPage('view_bko_userdash',$data); + } public function mtransfer() { // $this->load->view('bko/view_bko_header', $data); @@ -13,6 +24,12 @@ class Bkomember extends Bko_Controller { $this->load->view('bko/view_bko_footer', $data); } + public function usercoupon(){ + $data = array(); + $data = $this->bkoUserDashData($_SESSION['bko_selected_id']); + $this->secureBkoPage('view_bko_usercoupon',$data); + } + public function mpayments() { // $this->load->view('bko/view_bko_header', $data); $data = array(); diff --git a/application/controllers/Bkosmember.php b/application/controllers/Bkosmember.php index 57ff1df..1023f59 100644 --- a/application/controllers/Bkosmember.php +++ b/application/controllers/Bkosmember.php @@ -14,6 +14,22 @@ class Bkosmember extends Bkomember_Controller { $this->load->view('bko/view_bko_footer', $data); } + public function usercoupon(){ + $data = array(); + $data = $this->bkoUserDashData($_SESSION['bko_selected_id']); + + //print_r($_SESSION); + $this->load->model('coupons_model'); + $data['active_coupons_result'] = $this->coupons_model->loadActiveMemberCoupons($_SESSION['bko_selected_id'], []); + $data['coupons_recent_alloc'] = $this->table->generate($data['active_coupons_result']); + + $data['redeem_coupons_result'] = $this->coupons_model->loadRedeemMemberCoupons($_SESSION['bko_selected_id'], []); + $data['coupons_redeem_alloc'] = $this->table->generate($data['redeem_coupons_result']); + + $this->secureBkoPage('view_bko_usercoupon',$data); + } + + public function mtransfer() { // $this->load->view('bko/view_bko_header', $data); $data = array(); diff --git a/application/controllers/Bkouser.php b/application/controllers/Bkouser.php index 66aa6f3..526bd24 100644 --- a/application/controllers/Bkouser.php +++ b/application/controllers/Bkouser.php @@ -264,6 +264,7 @@ class Bkouser extends Bko_Controller { $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 ='COUP' THEN 'Coupon Credit' " . "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['bko_selected_id'] . " AND status = 1 ORDER BY id DESC "; @@ -280,7 +281,8 @@ class Bkouser extends Bko_Controller { $data['wallet_result'] = $this->table->generate($query); - echo "User:
" . $data['user_table'] . "
Wallet
".$data['wallet_result']."
Withdraw Last 20:
" . $data['sendmoney_table'] . "
Payments:
" . $data['payment_result'].""; + echo "

Go to User Page


+ User:
" . $data['user_table'] . "
Wallet
".$data['wallet_result']."
Withdraw Last 20:
" . $data['sendmoney_table'] . "
Payments:
" . $data['payment_result'].""; } public function terms() { @@ -575,15 +577,12 @@ class Bkouser extends Bko_Controller { $data['find_txt_val'] = $data['find_txt']; $data['find_by_val'] = $data['find_by']; - if ( $data['find_by']!='' && $data['find_txt']!=''){ + if ( $data['find_by']!='' && $data['find_by']!='0' && $data['find_txt']!=''){ $extra_qr = ' WHERE lower('.$data['find_by'].") LIKE lower('%". $data['find_txt']."%') "; } - } - // echo $extra_qr; - - $config = $this->PrepPagination(10, 3, '/bkouser/locate'); + $config = $this->PrepPagination(10, 3, '/bkouser/locate'); $mysql0 = "SELECT * FROM members ".$extra_qr; $q = $this->db->query($mysql0); $config["total_rows"] = $q->num_rows(); @@ -592,7 +591,6 @@ class Bkouser extends Bko_Controller { $this->pagination->initialize($config); $data["pagination_links"] = $this->pagination->create_links(); - $this->load->library('table'); $this->table->set_template($this->template); @@ -605,10 +603,7 @@ class Bkouser extends Bko_Controller { $this->table->set_heading('Account', 'Name/Username', 'Action'); $data['member_search_table'] = $this->table->generate($query); - - $this->load->view('bko/view_bko_header', $data); - $this->load->view('bko/view_bko_findmembers', $data); - $this->load->view('bko/view_bko_footer', $data); + $this->secureBkoPage('view_bko_findmembers',$data); } public function memberdetail() { diff --git a/application/controllers/Coupons.php b/application/controllers/Coupons.php index 10aa7fc..283b3fb 100644 --- a/application/controllers/Coupons.php +++ b/application/controllers/Coupons.php @@ -16,6 +16,10 @@ public function index() { $data['active_coupons_result'] = $this->coupons_model->loadActiveCoupons([]); $data['coupons_recent_alloc'] = $this->table->generate($data['active_coupons_result']); + $data['redeem_coupons_result'] = $this->coupons_model->loadRedeemCoupons([]); + $data['coupons_redeem_alloc'] = $this->table->generate($data['redeem_coupons_result']); + + $this-> secureBkoPage('coupons/index',$data); } diff --git a/application/libraries/Bkomember_Controller.php b/application/libraries/Bkomember_Controller.php index bde548f..cdf3611 100644 --- a/application/libraries/Bkomember_Controller.php +++ b/application/libraries/Bkomember_Controller.php @@ -35,7 +35,13 @@ class Bkomember_Controller extends Bko_Controller { // protected - + protected function secureBkoPage($pageName,$data){ + + $this->load->view('bko/view_bko_header', $data); + $this->load->view('bko/'.$pageName, $data); + $this->load->view('bko/view_bko_footer', $data); + } + protected function bkoUserDashData($member_id) { $this->load->model('backend_model'); diff --git a/application/models/Coupons_model.php b/application/models/Coupons_model.php index b56b344..e153fed 100644 --- a/application/models/Coupons_model.php +++ b/application/models/Coupons_model.php @@ -7,14 +7,59 @@ class Coupons_model extends CI_Model { } public function loadCoupons($filters=[]) { - $sql = "SELECT id , code,amount *.01 AS amount, description,created::date , active::date , updated::date from coupons ORDER BY id DESC"; + $sql = "SELECT id , substring(code,0,4)||'XXXXXXXX' AS code,amount *.01 AS amount, description,created::date , updated::date + FROM coupons + WHERE active IS NULL + ORDER BY id DESC"; + $q = $this->db->query($sql); return $q; } public function loadActiveCoupons($fliters=[]){ - $sql="SELECT substring(ca.code,0,4)||'XXXXXXXX' as code, ca.amount,m.username,m.firstname,m.lastname,ca.added FROM coupons_allocation ca LEFT JOIN members m ON m.id=ca.member_id ORDER BY ca.id DESC"; + $sql="SELECT substring(ca.code,0,4)||'XXXXXXXX' as code, ca.amount,m.username,m.firstname,m.lastname,ca.added + FROM coupons_allocation ca + LEFT JOIN members m ON m.id=ca.member_id + WHERE ca.active IS NULL + ORDER BY ca.id DESC"; + $q = $this->db->query($sql); return $q; } + + public function loadRedeemCoupons($fliters=[]){ + $sql="SELECT substring(ca.code,0,4)||'XXXXXXXX' as code, ca.amount,m.username,m.firstname,m.lastname,ca.added + FROM coupons_allocation ca + LEFT JOIN members m ON m.id=ca.member_id + WHERE ca.active IS NOT NULL + ORDER BY ca.id DESC"; + + $q = $this->db->query($sql); + return $q; + } + + public function loadActiveMemberCoupons($member_id, $fliters=[]){ + $sql="SELECT substring(ca.code,0,4)||'XXXXXXXX' as code, ca.amount,ca.added + FROM coupons_allocation ca + LEFT JOIN members m ON m.id=ca.member_id + WHERE ca.active IS NULL + AND m.id = $member_id + ORDER BY ca.id DESC"; + + $q = $this->db->query($sql); + return $q; + } + + public function loadRedeemMemberCoupons($member_id, $fliters=[]){ + $sql="SELECT substring(ca.code,0,4)||'XXXXXXXX' as code, ca.amount,ca.active + FROM coupons_allocation ca + LEFT JOIN members m ON m.id=ca.member_id + WHERE ca.active IS NOT NULL + AND m.id = $member_id + ORDER BY ca.id DESC"; + + $q = $this->db->query($sql); + return $q; + } + } diff --git a/application/views/bko/common/bko_menu.php b/application/views/bko/common/bko_menu.php index 2ded793..550a2f1 100644 --- a/application/views/bko/common/bko_menu.php +++ b/application/views/bko/common/bko_menu.php @@ -45,6 +45,7 @@ Selected USER