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

Timestamp:

Jan 15, 2015 12:08:25 PM (10 years ago)

Author:

dungnv

Message:

 

Location:

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

Files:

• models/user_model.php (modified) (5 diffs)
• views/user_profile.php (modified) (1 diff)

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

@@ -100 +100 @@
                                 $aryPatterns = array ('/:trialdays:/', '/:username:/', '/:password:/');
                                 $trialdays = $this->config->item('trial_period');
-                                $sms = preg_replace($aryPatterns, array($trialdays, $username, $password), lang('_SBG_MO_USER_REGISTER_SUCCESS_MSG'));
+                                $trialdays = strlen($trialdays) < 2 ? '0'. $trialdays : $trialdays;
+                                $sms = preg_replace($aryPatterns, array($trialdays. ' ngay', $username, $password), lang('_SBG_MO_USER_REGISTER_SUCCESS_MSG'));
                                 $status = 1;
                                 $aryPatterns = array('/:collaborator:/');
@@ -410 +411 @@
         
         public function updateUser($us_id, $data) {
-                $this->db->query ( 'UNLOCK TABLES' );
+                //$this->db->query ( 'UNLOCK TABLES' );
                 $this->db->where ( 'us_id', $us_id );
-                $this->db->update ( 'tbluser', $data );
+                return $this->db->update ( 'tbluser', $data );
         }
         
@@ -458 +459 @@
                 $paidlog = array ();
                 $paidlog ['us_id'] = isset ( $user ['us_id'] ) ? $user ['us_id'] : NULL;
-                $paidlog ['paidType'] = $paidType;
+                $paidlog ['paid_type'] = $paidType;
                 $paidlog ['amount'] = $amount;
                 $paidlog['source'] = "";
@@ -464 +465 @@
                 {
                         $paidlog['source'] = $sentNumber;
-                        
-                }else
+                }
+                elseif ($paidType == 2)
                 {
-                        $paidlog['source'] = null;
-                }
-                $paidlog ['paidTime'] = $paidTime;
-                $this->db->query ( 'UNLOCK TABLES' );
+                        $paidlog['source'] = 'Thẻ cào';
+                }
+                else
+                {
+                        $paidlog['source'] = '';
+                }
+                $paidlog ['paid_time'] = $paidTime;
                 $sql = 'INSERT INTO tblpaidlog(us_id, paid_type, amount, source, paid_time) VALUES (?,?,?,?,?)';
-                $query = $this->db->query ( $sql, $paidlog );
-        }
-        
-        public function insertCardlog($username, $pinCode, $serialNum, $cardValue, $receiveTime)
+
+                return $this->db->query ( $sql, $paidlog );
+        }
+        
+        public function insertCardlog($username, $us_id, $status, $pinCode, $serialNum, $cardValue, $receiveTime)
         {
                 try {
@@ -484 +489 @@
                 $cardlog = array();
                 $cardlog['sender'] = $username;
-                $cardlog['us_id'] = isset ( $user ['us_id'] ) ? $user ['us_id'] : NULL;
+                $cardlog['us_id'] = $us_id;
+                $cardlog['status'] = $status;
                 $cardlog['pin_code'] = $pinCode;
                 $cardlog['serial_num'] = $serialNum;

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

@@ -78 +78 @@
                                                                                                                 
                                                                                                                 <div class="col-sm-8">
-                                                                                                                        <input type="text" name="fullname" value="<?php echo @$fullname; ?>" placeholder="Họ và tên" id="form-field-first" class="col-xs-12 col-sm-10" <?php if ($p_id) echo 'disabled'; ?>>
+                                                                                                                        <input type="text" name="fullname" value="<?php echo @$fullname; ?>" placeholder="Họ và tên" id="form-field-first" class="col-xs-12 col-sm-10" <?php if (isset($p_id)) echo 'disabled'; ?>>
 
                                                                                                                 </div>