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

Timestamp:

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

Author:

dungnv

Message:

 

Location:

pro-violet-viettel/sourcecode/application/modules/services/controllers

Files:

• recharge.php (modified) (3 diffs)
• sendmessage.php (modified) (4 diffs)

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]);
+        }