Changeset 883 for pro-violet-viettel/sourcecode/application/modules/frontend/controllers/user.php

Timestamp:

Apr 7, 2015 1:52:40 PM (10 years ago)

Author:

namnd

Message:

 

File:

• pro-violet-viettel/sourcecode/application/modules/frontend/controllers/user.php (modified) (3 diffs)

pro-violet-viettel/sourcecode/application/modules/frontend/controllers/user.php

@@ -449 +449 @@
         public function regis_history()
         {
+                $this->load->model('servicepackage_model');
                 $this->load->helper('pagging');
                 $us_id = $this->uri->segment(4);
@@ -466 +467 @@
                         $this->load->model('user_model');
                         $result = $this->user_model->getPackagelog($data);
-                        $data['total'] = $this->user_model->countPackagelogs($username);
+                        $results = array();
+                        foreach($result as $re){
+                                if ($re['p_code']>0){
+                                        $p_price =  $this->servicepackage_model->getPackagePriceByCode($re['p_code']);
+                                        $re['amount'] = -$p_price;
+                                }
+                                array_push($results, $re);
+                        }
+                        $data['total'] = $this->user_model->countPackagelogs($username, $us_id);
                         $data['num_links'] = 2;
                         $data['paging_url'] = base_url() . "frontend/user/regis_history/".$us_id."/page/";
                         $data['paging'] = pagging($data);
                         $packagelogs = array();
-                        foreach ($result as $packagelog):
+                        foreach ($results as $packagelog):
                                 $packagelog['created_time'] = date('d/m/Y H:i:s', strtotime($packagelog['created_time']));
                                 array_push($packagelogs, $packagelog);
@@ -487 +496 @@
                 
                 $user_info = $this->session->userdata('userInfo');
-                if ($user_info) {
+                $admin_info = $this->session->userdata('adminInfo');
+                if ($user_info || $admin_info) {
                         $result = array();
                         $provinceId = $this->uri->segment(4);