Index: pro-violet-viettel/sourcecode/application/modules/frontend/controllers/user.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/frontend/controllers/user.php	(revision 673)
+++ pro-violet-viettel/sourcecode/application/modules/frontend/controllers/user.php	(revision 690)
@@ -29,6 +29,5 @@
             $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,5 +357,5 @@
 			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;
Index: pro-violet-viettel/sourcecode/application/modules/frontend/models/user_model.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/frontend/models/user_model.php	(revision 673)
+++ pro-violet-viettel/sourcecode/application/modules/frontend/models/user_model.php	(revision 690)
@@ -86,10 +86,11 @@
                 $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,4 +164,10 @@
 				'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;
 	}
Index: pro-violet-viettel/sourcecode/application/modules/frontend/views/user_profile.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/frontend/views/user_profile.php	(revision 673)
+++ pro-violet-viettel/sourcecode/application/modules/frontend/views/user_profile.php	(revision 690)
@@ -101,5 +101,12 @@
 
                                                     <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>
