Changeset 643

Timestamp:

Dec 4, 2014 12:43:57 PM (10 years ago)

Author:

namnd

Message:

 

Location:

pro-violet-viettel/sourcecode

Files:

• application/modules/frontend/controllers/user.php (modified) (1 diff)
• application/modules/frontend/views/user_profile.php (modified) (1 diff)
• application/modules/services/models/services_model.php (modified) (2 diffs)
• application/views/layout/frontend/header.php (modified) (1 diff)
• assets/js/frontend/user.js (modified) (1 diff)

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

@@ -387 +387 @@
                         $packagelogs = array();
                         foreach ($result as $packagelog):
-                                $packagelog['created_time'] = date('d-m-Y H:i:s', strtotime($packagelog['created_time']));
+                                $packagelog['vip_name'] = 'VIP '.$packagelog['p_code'];
+                                $packagelog['created_time'] = date('d/m/Y H:i:s', strtotime($packagelog['created_time']));
                                 array_push($packagelogs, $packagelog);
                         endforeach;

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

@@ -244 +244 @@
                                     <!--<form action="<?php echo base_url();?>frontend/user/packageRegister"  class="form-horizontal" id="package_register"> -->
                                     <form action="<?php echo base_url();?>frontend/user/packageRegister" method="POST" class="form-horizontal" id="package_register">
-                                        <h4 class="header blue bolder smaller">ThÃŽng tin dịch vụ <a style="float:right;" onclick="regisHistory(<?php echo $us_id; ?>, 1);" data-toggle="modal"><i class="icon-archive"></i> Lịch sá»­ đăng kÃœ dịch vụ</a></h4>
+                                        <h4 class="header blue bolder smaller">ThÃŽng tin dịch vụ &nbsp;&nbsp;&nbsp;<a onclick="regisHistory(<?php echo $us_id; ?>, 1);" data-toggle="modal"><i class="icon-archive"></i> Lịch sá»­ đăng kÃœ dịch vụ</a></h4>
                                                                                 <div class="col-sm-6">
                                             <h4><b>Thời hạn sử dụng</b></h4> <h3><b><span class="blue"><?php echo isset($expire_date) && strtotime($expire_date)>0 ? date('d/m/Y', strtotime($expire_date)) : '';?> </span></b></h3>

pro-violet-viettel/sourcecode/application/modules/services/models/services_model.php

@@ -12 +12 @@
 
 if ( ! defined('_SBG_MO_SYNTAX_ERR')) define('_SBG_MO_SYNTAX_ERR', -1);
-if ( ! defined('_SBG_MO_SYNTAX_ERR_MSG')) define('_SBG_MO_SYNTAX_ERR_MSG', 'SBG Online khong co dich vu nay, ban vui long kiem tra lai. Tran trong.');
 
 if ( ! defined('_SBG_CARD_PAY_FAIL')) define('_SBG_CARD_PAY_FAIL', -1);
@@ -30 +29 @@
 if ( ! defined('_SBG_CHARGING_GENERAL_ERROR')) define('_SBG_CHARGING_GENERAL_ERROR', 440);
 if ( ! defined('_SBG_CHARGING_NUMBER_NOT_REGISTED')) define('_SBG_CHARGING_NUMBER_NOT_REGISTED', 501);
-
-if ( ! defined('_SBG_CHARGING_FAIL_NOT_ENOUGH_MSG')) define('_SBG_CHARGING_FAIL_NOT_ENOUGH_MSG', 'Tai khoan chinh cua ban khong du de thuc hien nap :amount: vao tai khoan :username: tren SBG Online.');
-if ( ! defined('_SBG_CHARGING_FAIL_MORETHAN_LIMIT_MSG')) define('_SBG_CHARGING_FAIL_MORETHAN_LIMIT_MSG', 'So tien nap lon nhat tren SBG Online la 50.000VND.');
-if ( ! defined('_SBG_CHARGING_FAIL_NOT_VIETTEL_MSG')) define('_SBG_CHARGING_FAIL_NOT_VIETTEL_MSG', 'Chuc nang nap tien qua SMS cua SBG Online chi ap dung cho thue bao Viettel');
 
 if ( ! defined('_SBG_SEND_MT_FAIL')) define('_SBG_SEND_MT_FAIL', -1);

pro-violet-viettel/sourcecode/application/views/layout/frontend/header.php

@@ -38 +38 @@
                         {
                                 cursor: pointer;
+                                font-size: 13px;
+                                font-weight: normal;
                         }
                 </style>

pro-violet-viettel/sourcecode/assets/js/frontend/user.js

@@ -226 +226 @@
                                 for (var i in result)
                                 {
-                                        content += '<tr><td class="center">'+result[i].source+'</td><td class="center">'+result[i].p_code+'</td><td>'+result[i].created_time+'</td></tr>';
+                                        content += '<tr><td class="center">'+result[i].source+'</td><td class="center">'+result[i].vip_name+'</td><td>'+result[i].created_time+'</td></tr>';
                                         
                                 }