Changeset 707 for pro-violet-viettel/sourcecode/application/modules/frontend

Timestamp:

Jan 27, 2015 10:53:31 AM (10 years ago)

Author:

dungnv

Message:

 

Location:

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

Files:

• controllers/home.php (modified) (3 diffs)
• controllers/user.php (modified) (1 diff)
• models/user_model.php (modified) (5 diffs)
• views/user_profile.php (modified) (2 diffs)

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

@@ -63 +63 @@
                         parse_str ( $result['data'] );
                         $is_viettel = $this->is_viettel ( $phone );
+                        
                         if ($autologin == 1) {
                                 $cookie_name = 'siteCookie';
@@ -69 +70 @@
                                 setcookie ( $cookie_name, 'username=' . $username . '&user=' . $result['data'] . '&us_id=' . $id, time () + $cookie_time );
                         }
+
                         $userdata = array (
                                         'username' => $username,
@@ -82 +84 @@
         
         public function signout() {
-                $this->session->sess_destroy ();
+                //$this->session->sess_destroy ();
                 // unset($this->session->userdata);
+                $this->session->unset_userdata('userInfo');
                 $cookie_name = "siteCookie";
                 setcookie ( $cookie_name, 'username=' . "", time () - 3600 );

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

@@ -17 +17 @@
     public function profile() {
         $user_info = $this->session->userdata('userInfo');
+
         if ($user_info) {
             $this->load->model('User_model');

pro-violet-viettel/sourcecode/application/modules/frontend/models/user_model.php

@@ -103 +103 @@
                                 $sms = preg_replace($aryPatterns, array($trialdays. ' ngay', $username, $password), lang('_SBG_MO_USER_REGISTER_SUCCESS_MSG'));
                                 $status = 1;
-                                $aryPatterns = array('/:collaborator:/');
-                                $collaboratorMsg = $status . '|'. preg_replace($aryPatterns, array($collaborator), lang('_SBG_MO_COLLABOLATOR_REGISTER_SUCCESS_MSG'));
+                                $aryPatterns = array('/:username:/');
+                                $collaboratorMsg = $status . '|'. preg_replace($aryPatterns, array($username), lang('_SBG_MO_COLLABOLATOR_REGISTER_SUCCESS_MSG'));
                                 break;
                         case 2 :
@@ -327 +327 @@
         }
         
-        public function registerVip($username, $p_code) {
+        public function registerVip($username, $p_code, &$packageData = null) {
                 $user = array ();
                 $sms = '';
@@ -333 +333 @@
                 $result = $this->get_user_by_cellphone ( $username );
                 $package = $this->get_package ( ( int ) $p_code );
+                
                 if (!$package)
                 {
@@ -339 +340 @@
                         return $status . '|' . $sms;
                 }
+                        
+                $packageData = $package;
+
                 if ($result) {
-                        
                         if ($result ['acc_balanced'] >= $package ['p_price']) {
                                 $us_id = $result ['us_id'];
@@ -497 +500 @@
                 $this->db->query ( 'UNLOCK TABLES' );
                 $sql = 'INSERT INTO tblcardlog(sender, us_id, status, pin_code, serial_num, card_value, created_time) VALUES(?,?,?,?,?,?,?)';
-                $query = $this->db->query ($sql, $cardlog);
+                return $this->db->query ($sql, $cardlog);
         }
         

pro-violet-viettel/sourcecode/application/modules/frontend/views/user_profile.php

@@ -119 +119 @@
                                             </div>
                                                                                         <div class="col-sm-3">
-                                                                                        <h4><small><a href="#" data-toggle="modal" data-target="#changeProfile"><i>Đổi số điện thoại</i></a></small></h4>
+                                                                                        <!--<h4><small><a href="#" data-toggle="modal" data-target="#changeProfile"><i>Đổi số điện thoại</i></a></small></h4>-->
                                                                                         </div>
                                         </div>
@@ -245 +245 @@
                                         <h4 class="header blue bolder smaller">Nạp tiền bằng tà i khoản gốc</h4>
                                         <div class="alert alert-block alert-success">                                           
-                                            <p> 
-                                                <span <?php if(($is_viettel==1)) echo 'style="display: none;"'?> >Sử dụng thuê bao <strong><?php echo @$username; ?></strong> soạn tin nhắn: <strong>SBG NAP [SoTien] gửi 8062</strong>. </span><br/>
+                                            <p>
+                                                <span <?php if(($is_viettel==1)) /*echo 'style="display: none;"'*/{?> >Sử dụng thuê bao <strong><?php echo @$username; ?></strong> soạn tin nhắn: <strong>SBG NAP [SoTien] gửi 8062</strong>.<?php } ?> </span><br/>
                                                 Nếu QuÃœ vị sá»­ dụng thuê bao Viettel khác thì soạn tin nhắn: <strong>SBG NAP [SoTien] <?php  echo $username; ?> gá»­i tới 8062</strong>.