diff --git a/application/controllers/Bkosmember.php b/application/controllers/Bkosmember.php index 2ad931a..cbdd73c 100644 --- a/application/controllers/Bkosmember.php +++ b/application/controllers/Bkosmember.php @@ -224,7 +224,7 @@ if (coupon_id > 0 ){ LEFT JOIN members m1 ON m1.id = mo.member_id LEFT JOIN members m2 ON m2.id = mo.client_id WHERE p.member_id = ".$_SESSION['bko_selected_id']." AND p.code ='OFDPS' AND p.confirmation IS NOT NULL - AND p.flags = 4 + AND p.flags = 4 AND mo.status = 1 ORDER BY p.id DESC LIMIT " . $config["per_page"] . " OFFSET " . $page; $query = $this->db->query($mysql); diff --git a/application/controllers/Bkouser.php b/application/controllers/Bkouser.php index 1d04a31..933c5dc 100644 --- a/application/controllers/Bkouser.php +++ b/application/controllers/Bkouser.php @@ -358,7 +358,17 @@ class Bkouser extends Bko_Controller { $data['wallet_result'] = $this->table->generate($query); - $mysql = "SELECT sum(amount*0.01) AS escrow,currency FROM members_payments WHERE code ='OFDPS' AND member_id = ".$_SESSION['bko_selected_id']." AND confirmation IS NOT NULL AND flags = 4 GROUP BY currency"; + // $mysql = "SELECT sum(amount*0.01) AS escrow,currency FROM members_payments WHERE code ='OFDPS' AND member_id = ".$_SESSION['bko_selected_id']." AND confirmation IS NOT NULL AND flags = 4 GROUP BY currency"; + + $mysql ="SELECT sum(p.amount*0.01) AS escrow,p.currency + FROM members_payments p + LEFT JOIN members_jobs_offer o ON o.payment_id = p.id + WHERE p.code ='OFDPS' AND p.member_id =".$_SESSION['bko_selected_id']." + AND p.confirmation IS NOT NULL + AND p.flags = 4 AND o.status=1 + GROUP BY p.currency"; + + $query = $this->db->query($mysql); $data['escrow_table'] = $this->table->generate($query); @@ -615,9 +625,11 @@ class Bkouser extends Bko_Controller { } public function PrepPagination($perpage, $urlSegment, $pagePath) { - +//echo base_url(); + $actual_link = (empty($_SERVER['HTTPS']) ? 'http' : 'https') . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"; + $base_url = (base_url() != '') ? base_url().$pagePath : $actual_link; $config = array(); - $config["base_url"] = base_url() . $pagePath; + $config["base_url"] = $base_url; //base_url().$pagePath; $config["per_page"] = $perpage; $config["uri_segment"] = $urlSegment; $config["num_links"] = 5;