From cad57760bdd2aaefe725eae2d1a647b0b4040920 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Thu, 24 Aug 2023 15:12:31 +0700
Subject: [PATCH] Fix expiration date at view user

---
 system/autoload/Lang.php | 5 +++++
 ui/ui/customers-view.tpl | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/system/autoload/Lang.php b/system/autoload/Lang.php
index 52abdd0f..5d9b707a 100644
--- a/system/autoload/Lang.php
+++ b/system/autoload/Lang.php
@@ -42,6 +42,11 @@ class Lang
         return date($config['date_format']. ' H:i', strtotime($date));
     }
 
+    public static function dateAndTimeFormat($date, $time){
+        global $config;
+        return date($config['date_format']. ' H:i', strtotime("$date $time"));
+    }
+
     public static function nl2br($text){
         return nl2br($text);
     }
diff --git a/ui/ui/customers-view.tpl b/ui/ui/customers-view.tpl
index 68559ccf..c990fa1f 100644
--- a/ui/ui/customers-view.tpl
+++ b/ui/ui/customers-view.tpl
@@ -77,7 +77,7 @@
                         </li>
                         <li class="list-group-item">
                             {$_L['Expires_On']} <span
-                                class="pull-right">{Lang::dateTimeFormat($package['expiration']+' '+$package['time'])}</span>
+                                class="pull-right">{Lang::dateAndTimeFormat($package['expiration'], $package['time'])}</span>
                         </li>
                         <li class="list-group-item">
                             {$package['routers']} <span class="pull-right">{$package['method']}</span>