Changeset 698 for pro-violet-viettel/sourcecode/application

Timestamp:

Jan 19, 2015 11:51:02 AM (10 years ago)

Author:

dungnv

Message:

 

Location:

pro-violet-viettel/sourcecode/application/modules

Files:

• admin/controllers/cardlog.php (modified) (1 diff)
• admin/views/cardlog/listview.php (modified) (2 diffs)
• frontend/controllers/user.php (modified) (2 diffs)
• frontend/models/user_model.php (modified) (1 diff)
• services/controllers/recharge.php (modified) (4 diffs)

pro-violet-viettel/sourcecode/application/modules/admin/controllers/cardlog.php

@@ -56 +56 @@
                         $id = $cl['us_id'];
                         $username = $this->get_username($id);
-                        $servicename = $this->get_servicename($cl['service_id']);
+                        //$servicename = $this->get_servicename($cl['service_id']);
                         $cl['username'] = $username;
-                        $cl['servicename'] = $servicename;
+                        //$cl['servicename'] = $servicename;
                         array_push($cardlogs, $cl);
                 endforeach;

pro-violet-viettel/sourcecode/application/modules/admin/views/cardlog/listview.php

@@ -63 +63 @@
                                                                 </th>
                                                         <th class="<?php if ($sorting_field == 'sender') {echo $sorting_order;} else {echo "sorting";} ?>" id="sender" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Người gửi: activate to sort column ascending">Người gửi</th>
-                                                        <th class="<?php if ($sorting_field == 'service_id') {echo $sorting_order;} else {echo "sorting";} ?>" id="serivice_id" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Dịch vụ: activate to sort column ascending">Dịch vụ</th>
+                                                        <th class="<?php if ($sorting_field == 'service_id') {echo $sorting_order;} else {echo "sorting";} ?>" id="serivice_id" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Dịch vụ: activate to sort column ascending">Tình trạng</th>
                                                         <th class="<?php if ($sorting_field == 'pin_code') {echo $sorting_order;} else {echo "sorting";} ?>" id="pin_code" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Mã pin: activate to sort column ascending">Mã pin</th>
                                                         <th class="<?php if ($sorting_field == 'serial_number') {echo $sorting_order;} else {echo "sorting";} ?>" id="serial_number" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Số seri: activate to sort column ascending">Số seri</th>
@@ -87 +87 @@
                                                                 <?php echo $cardlog['sender']; ?>
                                                         </td>
-                                                        <td><?php echo $cardlog['servicename']; ?></td>
+                                                        <td><?php echo $cardlog['status'] == -1 ? 'Lỗi nạp thẻ': ($cardlog['status'] == 0 ? 'Khóa tạm thời' : 'Nạp thà nh cÃŽng');?></td>
                                                         <td><?php echo $cardlog['pin_code']; ?></td>
-                                                        <td><?php echo $cardlog['serial_number']; ?></td>
+                                                        <td><?php echo $cardlog['serial_num']; ?></td>
                                                         <td><?php echo $cardlog['card_value']; ?></td>
                                                         <td><?php echo $cardlog['created_time']; ?></td>

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

@@ -341 +341 @@
                 $this->load->helper('pagging');
                 $us_id = $this->uri->segment(4);
-        $user_info = $this->session->userdata('userInfo');
-        if ($user_info) 
+
+        $user_info = $this->session->userdata('userInfo');
+                $admin_info = $this->session->userdata('adminInfo');
+
+        if ($user_info || $admin_info) 
                 {
-                        
                         $data['us_id'] = $us_id;
                         $data['perpage'] = 10;
@@ -376 +378 @@
                 $username = $user['cellphone'];
                 $user_info = $this->session->userdata('userInfo');
-                if ($user_info) 
+                $admin_info = $this->session->userdata('adminInfo');
+                if ($user_info || $admin_info) 
                 {
                         $data['username'] = $username;

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

@@ -496 +496 @@
                 $cardlog['created_time'] = $receiveTime;
                 $this->db->query ( 'UNLOCK TABLES' );
-                $sql = 'INSERT INTO tblcardlog(sender, us_id, pin_code, serial_num, card_value, created_time) VALUES(?,?,?,?,?,?)';
+                $sql = 'INSERT INTO tblcardlog(sender, us_id, status, pin_code, serial_num, card_value, created_time) VALUES(?,?,?,?,?,?,?)';
                 $query = $this->db->query ($sql, $cardlog);
         }

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

@@ -42 +42 @@
                 $errMsg = '';
                 $cardValue = 0;
+                $updatedTime = date('Y-m-d H:i:s');
+                $status = -1;
+
                 if ($isLocked == 0) {
                         $aryParams = array(
@@ -50 +53 @@
                         
                         $aryResult = array();
-                        //$aryResult['TransactionAmount'] = 10000;
+
                         $chargCard = $this->services_model->cardPaidProcess($aryParams,  $aryResult);
-                        //$chargCard = _SBG_CARD_PAY_SUCCESS;
                         $status = $chargCard;
+
                         $paidType = 2;
                         $amount = $aryResult['TransactionAmount'];
@@ -59 +62 @@
                         $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');
+                        $user['updated_time'] = $updatedTime;
                         if ($amount > 0){
                                 $updateData = array('acc_balanced' => $user['acc_balanced'], 'updated_time' => $user['updated_time'] );
@@ -78 +81 @@
                         else {
                                 $isLocked = createLockFile($lockFilePreFix, $maxReach, $timeToUnlock, $lockFilePath, FALSE);
-                                $errMsg = $isLocked == 1 ? $chargErrMsg .'<br />'.$lockedMsg : $chargErrMsg;
-                                $status = 0;
+                                $errMsg = $isLocked == 1 ? $chargErrMsg .'<br />'.$lockedMsg : $chargErrMsg;                            
                         }
                 }else if ($isLocked == 1) {
                         $errMsg = $lockedMsg; 
                         $result['success'] = _SBG_CARD_PAY_FAIL;
-                        $status = -1;
+                        $status = 0;
                 }
 
-                $this->objUserModel->insertCardlog($user['cellphone'],$userID, $status, $pinCard, $cardSerial, $cardValue, $user['updated_time']);
+                $this->objUserModel->insertCardlog($user['cellphone'],$userID, $status, $pinCard, $cardSerial, $cardValue, $updatedTime);
                 
                 $result['us_id'] = $userID;