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

Timestamp:

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

Author:

namnd

Message:

 

Location:

pro-violet-viettel/sourcecode/application/modules/frontend/controllers

Files:

• home.php (modified) (1 diff)
• user.php (modified) (3 diffs)

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

@@ -181 +181 @@
         
         public function test(){
-                $provinces = lang('_PROVINCES_');
-                $this->load->library("PHPExcel");
-                $file = './assets/danhsachquanhuyen.xls';
-                $objPHPExcel = PHPExcel_IOFactory::load($file);
-                $cell_collection = $objPHPExcel->getActiveSheet()->getCellCollection();
-                foreach ($cell_collection as $cell) {
-                        $column = $objPHPExcel->getActiveSheet()->getCell($cell)->getColumn();
-                        $row = $objPHPExcel->getActiveSheet()->getCell($cell)->getRow();
-                        $data_value = $objPHPExcel->getActiveSheet()->getCell($cell)->getValue();
-                        
-                        if ($row == 1) {
-                                $header[$row][$column] = $data_value;
-                        } else {
-                                $arr_data[$row][$column] = $data_value;
-                        }
+                $aryMatch = array();
+                $phoneNumber = '987133325';
+                $regex = '/^[1,9][0-9]{8,9}$/';
+                if (preg_match('/^[1,9]([0-9]{8,9})$/', $phoneNumber, $aryMatch)){
+                        $phoneNumber = "0".$phoneNumber;
+                        echo $phoneNumber;
+                }else{
+                        echo "Not match";
                 }
-                
-                $data['header'] = $header;
-                $data['values'] = $arr_data;
-                
-                foreach ($data['values'] as $index => $value){
-                        foreach ($provinces as $provinceId => $province){
-                                if ($value['C'] == $province) $data['values'][$index]['C'] = $provinceId;
-                                if ($value['B'] >= 10){
-                                        $data['values'][$index]['B'] = "0".$value['B'];
-                                }else{
-                                        $data['values'][$index]['B'] = "00".$value['B'];
-                                }
-                        }
-                        
-                }
-                
-                $dt = array();
-                foreach ($data['values'] as $index => $value){
-                        
-                        $dt[$index]['district_id'] = $value['B'];
-                        $dt[$index]['province_id'] = $value['C'];
-                        $dt[$index]['district_name'] = $value['D'];
-                        $dt[$index]['type'] = $value['E'];
-                }
-                //var_dump($dt);
-                //$this->load->model ( 'user_model' );
-                //$result = $this->user_model->insertDistrict($dt);
-                //var_dump($result);
         }
 }

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);