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

Timestamp:

Jan 9, 2015 10:35:30 AM (10 years ago)

Author:

namnd

Message:

 

Location:

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

Files:

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

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

@@ -29 +29 @@
             $data['packages'] = $this->servicepackage_model->getAllPackages();
             $data['is_viettel'] = $user_info['is_viettel'];
-            
-            $data = array_merge($data, $u);
+                        $data = array_merge($data, $u);
             $data = array_merge($data, $user_info);
                         
@@ -358 +357 @@
                         foreach ($result as $paidlog):
                                 $paidlog['amount'] = number_format($paidlog['amount'], 0);
-                                $paidlog['paid_time'] = date('d-m-Y H:i:s', strtotime($paidlog['paid_time']));
+                                $paidlog['paid_time'] = date('d/m/Y H:i:s', strtotime($paidlog['paid_time']));
                                 array_push($paidlogs, $paidlog);
                         endforeach;

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

@@ -86 +86 @@
                 $this->load->model('frontend/Servicepackage_model');
                                 $trialpackage=$this->Servicepackage_model->getTrialPackage();
-                                $us_id = $id;
+                                $us_id = $id;
                                 $user ['created_time'] = date ( 'Y-m-d H:i:s' );
                                 $user ['us_id'] = $us_id;
-                                $user ['p_id'] = $trialpackage['p_id']; 
-                                $user ['expire_date'] = date('Y-m-d', strtotime("+" . $this->config->item("trial_period") . " days", time()));
+                                $user ['p_id'] = $trialpackage['p_id']; 
+                                $user ['expire_date'] = date('Y-m-d', strtotime("+" . $this->config->item("trial_period") . " days", time()));
                                 $user ['cellphone'] = $username;
+                                $user['province'] = $province;
                                 if (! is_null ( $collaborator ) || $collaborator != '') {
                                         $user ['collaborator'] = $collaborator;
@@ -163 +164 @@
                                 'oldpass' => $user ['oldpass'] 
                 ), 'user' );
+                $u = array('province'=>$user['province'],
+                                'district'=>$user['district'],
+                                'updated_time'=>date('Y-m-d H:i:s')
+                                );
+                $this->db->where('us_id', $us_id);
+                $this->db->update('tbluser', $u);
                 return $data;
         }

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

@@ -101 +101 @@
 
                                                     <div class="col-sm-8">
-                                                        <input type="text" name="province" value="<?php echo @$province; ?>" placeholder="Tỉnh / Thà nh phố" id="form-field-username" class="col-xs-12 col-sm-10">
+                                                        <input type="text" name="province" value="<?php echo @$province; ?>" placeholder="Tỉnh / Thà nh phố" id="form-field-province" class="col-xs-12 col-sm-10">
+                                                    </div>
+                                                </div>
+                                                                                                <div class="form-group">
+                                                    <label for="form-field-username" class="col-sm-4 control-label no-padding-right">Quận / Huyện</label>
+
+                                                    <div class="col-sm-8">
+                                                        <input type="text" name="district" value="<?php echo @$district; ?>" placeholder="Quận / Huyện" id="form-field-district" class="col-xs-12 col-sm-10">
                                                     </div>
                                                 </div>