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

Timestamp:

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

Author:

dungnv

Message:

 

Location:

pro-violet-viettel/sourcecode/application/modules

Files:

• frontend/models/user_model.php (modified) (5 diffs)
• frontend/views/user_profile.php (modified) (1 diff)
• services/controllers/recharge.php (modified) (3 diffs)
• services/controllers/sendmessage.php (modified) (4 diffs)

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>

pro-violet-viettel/sourcecode/application/modules/services/controllers/recharge.php

@@ -41 +41 @@
                 $chargErrMsg = lang('_SBG_CHARGING_FROM_CARD_FAIL_MSG');
                 $errMsg = '';
-                
+                $cardValue = 0;
                 if ($isLocked == 0) {
                         $aryParams = array(
@@ -50 +50 @@
                         
                         $aryResult = array();
+                        //$aryResult['TransactionAmount'] = 10000;
                         $chargCard = $this->services_model->cardPaidProcess($aryParams,  $aryResult);
-                        
+                        //$chargCard = _SBG_CARD_PAY_SUCCESS;
+                        $status = $chargCard;
                         $paidType = 2;
                         $amount = $aryResult['TransactionAmount'];
+                        $cardValue = $amount;
                         $paidTime = date('Y-m-d H:i:s');
                         $user['acc_balanced'] = $user['acc_balanced'] + $amount;
                         $user['updated_time'] = date('Y-m-d H:i:s');
-                        if ($amount>0){
-                                $this->objUserModel->updateUser($userID, $user);
+                        if ($amount > 0){
+                                $updateData = array('acc_balanced' => $user['acc_balanced'], 'updated_time' => $user['updated_time'] );
+                                $updated = $this->objUserModel->updateUser($userID, $updateData);
                         }
                         
@@ -74 +78 @@
                         else {
                                 $isLocked = createLockFile($lockFilePreFix, $maxReach, $timeToUnlock, $lockFilePath, FALSE);
-                                $errMsg = $isLocked == 1 ? $chargErrMsg .'<br />'.$lockedMsg : $chargErrMsg; 
+                                $errMsg = $isLocked == 1 ? $chargErrMsg .'<br />'.$lockedMsg : $chargErrMsg;
+                                $status = 0;
                         }
                 }else if ($isLocked == 1) {
                         $errMsg = $lockedMsg; 
                         $result['success'] = _SBG_CARD_PAY_FAIL;
+                        $status = -1;
                 }
+
+                $this->objUserModel->insertCardlog($user['cellphone'],$userID, $status, $pinCard, $cardSerial, $cardValue, $user['updated_time']);
                 
+                $result['us_id'] = $userID;
+                $result['UPDATED_DATA'] = $user;
                 $result['errMsg'] = $errMsg;
                 echo json_encode($result);

pro-violet-viettel/sourcecode/application/modules/services/controllers/sendmessage.php

@@ -215 +215 @@
         {
                 error_reporting(E_ALL);
+
                 $this->load->model('Services_model');
                 
@@ -221 +222 @@
                 // get total page
                 $totalpage = 1;
+
                 $default = $this->Services_model->getCollaborator(2,1,1);
+                
+                $data = mb_convert_encoding($default, 'UTF-8');
+
                 if($default){
-                        $xml = simplexml_load_string($default);
+                        $xml = simplexml_load_string($data);
                         $xml->registerXPathNamespace("S", "http://schemas.xmlsoap.org/soap/envelope/");
                         $xml = $xml->xpath('//S:Body')[0];
@@ -230 +235 @@
                 }
                 
-                $result = $this->Services_model->getCollaborator(2,1,$totalpage);
+                var_dump($totalpage);
+
+                /*$result = $this->Services_model->getCollaborator(2,1,$totalpage);
                 if ($result){
                         $xml = simplexml_load_string($result);
@@ -258 +265 @@
                         $logMsg = date('Y-m-d H:i:s') . " Result is null \n";
                         write_file('./log/sync_collaborator.log', $logMsg, FOPEN_WRITE_CREATE);
-                }
+                }*/
         }
 }
+
+        function fix_latin1_mangled_with_utf8_maybe_hopefully_most_of_the_time($str)
+        {
+                return preg_replace_callback('#[\\xA1-\\xFF](?![\\x80-\\xBF]{2,})#', 'utf8_encode_callback', $str);
+        }
+
+        function utf8_encode_callback($m)
+        {
+                return utf8_encode($m[0]);
+        }