Changeset 690 for pro-violet-viettel/sourcecode/application/modules/frontend/controllers

Timestamp:

Jan 9, 2015 10:35:30 AM (11 years ago)

Author:

namnd

Message:

 

File:

• pro-violet-viettel/sourcecode/application/modules/frontend/controllers/user.php (modified) (2 diffs)

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

@@ -29 +29 @@
             $data['packages'] = $this->servicepackage_model->getAllPackages();
             $data['is_viettel'] = $user_info['is_viettel'];
-            
-            $data = array_merge($data, $u);
+                        $data = array_merge($data, $u);
             $data = array_merge($data, $user_info);
                         
@@ -358 +357 @@
                         foreach ($result as $paidlog):
                                 $paidlog['amount'] = number_format($paidlog['amount'], 0);
-                                $paidlog['paid_time'] = date('d-m-Y H:i:s', strtotime($paidlog['paid_time']));
+                                $paidlog['paid_time'] = date('d/m/Y H:i:s', strtotime($paidlog['paid_time']));
                                 array_push($paidlogs, $paidlog);
                         endforeach;