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

Timestamp:

Nov 17, 2014 5:52:47 PM (11 years ago)

Author:

namnd

Message:

 

Location:

pro-violet-viettel/sourcecode/application/modules

Files:

• admin/controllers/cardlog.php (modified) (2 diffs)
• admin/controllers/smslog.php (modified) (2 diffs)
• admin/views/cardlog/listview.php (modified) (3 diffs)
• admin/views/smslog/listview.php (modified) (4 diffs)
• frontend/controllers/home.php (modified) (3 diffs)
• frontend/views/user_profile.php (modified) (2 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']);
                         $cl['username'] = $username;
+                        $cl['servicename'] = $servicename;
                         array_push($cardlogs, $cl);
                 endforeach;
@@ -88 +90 @@
         }
         
+        private function get_servicename($service_id)
+        {
+                $this->load->model('webservice_model');
+                $service = $this->webservice_model->search_by_id($service_id);
+                return $service['service_name'];
+        }
+        
 }

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

@@ -57 +57 @@
                         $id = $smsl['us_id'];
                         $username = $this->get_username($id);
+                        $servicename = $this->get_servicename($smsl['service_id']);
                         $smsl['username'] = $username;
+                        $smsl['servicename'] = $servicename;
                         array_push($smslogs, $smsl);
                 endforeach;
@@ -88 +90 @@
 
         }
+        
+        private function get_servicename($service_id)
+        {
+                $this->load->model('webservice_model');
+                $service = $this->webservice_model->search_by_id($service_id);
+                return $service['service_name'];
+        }
 }

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

@@ -25 +25 @@
             <!-- PAGE CONTENT BEGINS -->
             <div style="padding-bottom:4px" class="table-header">
-                Danh sách log
+                Danh sách Card Log
             </div>
                         <!-- PAGE CONTENT BEGINS -->
@@ -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 == 'us_id') {echo $sorting_order;} else {echo "sorting";} ?>" id="us_id" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Tà i khoản: activate to sort column ascending">Tà i khoản</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 == '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>
@@ -85 +85 @@
 
                                                         <td>
-                                                                <a href="#"><?php echo $cardlog['sender']; ?></a>
+                                                                <?php echo $cardlog['sender']; ?>
                                                         </td>
-                                                        <td><?php echo $cardlog['username']; ?></td>
+                                                        <td><?php echo $cardlog['servicename']; ?></td>
                                                         <td><?php echo $cardlog['pin_code']; ?></td>
                                                         <td><?php echo $cardlog['serial_number']; ?></td>

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

@@ -25 +25 @@
             <!-- PAGE CONTENT BEGINS -->
             <div style="padding-bottom:4px" class="table-header">
-                Danh sách log
+                Danh sách SMS Log
             </div>
                         <!-- PAGE CONTENT BEGINS -->
@@ -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 == 'us_id') {echo $sorting_order;} else {echo "sorting";} ?>" id="us_id" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Tà i khoản: activate to sort column ascending">Tà i khoản</th>
-                                                        <th class="<?php if ($sorting_field == 'mobody') {echo $sorting_order;} else {echo "sorting";} ?>" id="mobody" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="MO: activate to sort column ascending">MO</th>
-                                                        <th class="<?php if ($sorting_field == 'mtbody') {echo $sorting_order;} else {echo "sorting";} ?>" id="mtbody" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="MT: activate to sort column ascending">MT</th>
+                                                        <th class="<?php if ($sorting_field == 'service_id') {echo $sorting_order;} else {echo "sorting";} ?>" id="service_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 == 'commandcode') {echo $sorting_order;} else {echo "sorting";} ?>" id="commandcode" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Mã lệnh: activate to sort column ascending">Mã lệnh</th>
+                                                        <th class="<?php if ($sorting_field == 'info') {echo $sorting_order;} else {echo "sorting";} ?>" id="info" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="ThÃŽng tin: activate to sort column ascending">ThÃŽng tin</th>
                                                         <th class="<?php if ($sorting_field == 'created_time') {echo $sorting_order;} else {echo "sorting";} ?>" id="created_time" class="hidden-480" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Thời gian: activate to sort column ascending">
                                                                 <i class="icon-time bigger-110 hidden-480"></i>
@@ -84 +84 @@
 
                                                         <td>
-                                                                <a href="#"><?php echo $smslog['sender']; ?></a>
+                                                                <?php echo $smslog['sender']; ?>
                                                         </td>
-                                                        <td><?php echo $smslog['username']; ?></td>
-                                                        <td><?php echo $smslog['mobody']; ?></td>
-                                                        <td><?php echo $smslog['mtbody']; ?></td>
+                                                        <td><?php echo $smslog['servicename']; ?></td>
+                                                        <td><?php echo $smslog['commandcode']; ?></td>
+                                                        <td><?php echo $smslog['info']; ?></td>
                                                         <td><?php echo $smslog['created_time']; ?></td>
                                                 </tr>
@@ -117 +117 @@
         init_page();
     }
-
-
 </script>

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

@@ -39 +39 @@
         $password = $this->input->post('password', TRUE);
         $autologin = ($this->input->post('remember_me') == 'on') ? 1 : 0;
+                $src = 'SBG';
         $token = md5($username . self::TOKENPW);
-
         $this->load->model(array('user_model'));
-        $data = $this->user_model->checkLogin('violet', $token, $username, $password);
-
+        $data = $this->user_model->checkLogin($src, $token, $username, $password);
         if ($data == null) {
             $this->session->set_flashdata('login_error', TRUE);
@@ -107 +106 @@
     public function change_profile() {
         $this->load->model('user_model');
-        $sentNumber = '01662860000';
+        $sentNumber = '0979947802';
         $serviceID = 1;
         $password = '123456';
         $commandcode = "SBG";
-        $receiveID = '0979947802';
+        $receiveID = '01662860000';
         $info = "SBG TD";
         $receiveTime = date("Y-m-d H:i:s");
         $status = 0;
-        $data = $this->user_model->changeProfile($sentNumber, $receiveID, $password, $serviceID, $commandcode, $info, $receiveTime, $status);
+        $data = $this->user_model->changeProfile($sentNumber, $receiveID, $password, $status);
         echo $data;
     }
@@ -134 +133 @@
     }
 
+        
+        public function register_vip()
+        {
+                $this->load->model('user_model');
+                $sentNumber = '01662860000';
+                $serviceID = 1;
+                $commandcode = "SBG";
+                $vipNum = 1;
+                $mainAccBalanced = 15000;
+                $info = "SBG DK VIP1";
+                $receiveTime = date("Y-m-d H:i:s");
+                $status = 0;
+                $data = $this->user_model->registerVip($sentNumber, $vipNum, $serviceID, $commandcode, $info, $status);
+                echo $data;
+        }
+        
+        public function recharge_account()
+        {
+                $this->load->model('user_model');
+                $sentNumber = '0979947802';
+                $receiveID = '01662860000';
+                $serviceID = 1;
+                $commandcode = "SBG";
+                $vipNum = 1;
+                $mainAccBalanced = 15000;
+                $amount = 10000;
+                $info = "SBG NAP 01662860000 10000";
+                $status = 0;
+                $data = $this->user_model->rechargeAccount($sentNumber, $receiveID, $mainAccBalanced, $amount, $serviceID, $commandcode, $info, $status);
+                echo $data;
+        }
 }
 

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

@@ -222 +222 @@
                                         </div>
                                         <div class="col-sm-4">
-                                            <button type="button" id="btn-charge" onclick="return chargeCard(<?php echo @$us_id; ?>);" class="btn btn-success">
+                                            <button type="button"        onclick="return chargeCard(<?php echo @$us_id; ?>);" class="btn btn-success">
                                                 <i class="icon-ok bigger-110"></i>
                                                 Tiếp tục
@@ -363 +363 @@
                 <div class="alert alert-block alert-success">                                           
                     <p>
-                        Quí vị đã nạp thà nh cÃŽng <b>10.000 </b>VND và o tà i khoản <b>0168942155</b>, tà i khoản hiện tại của quí vị là  <b>20.000 </b>VND.
+                        Quí vị đã nạp thà nh cÃŽng <b>10.000 </b>VNĐ và o tà i khoản <b>0168942155</b>, tà i khoản hiện tại của quí vị là  <b>20.000 </b>VNĐ.
                     </p>
                 </div>