diff --git a/README.md b/README.md index f624abe9..8217e9d2 100644 --- a/README.md +++ b/README.md @@ -43,68 +43,17 @@ The problem with windows is hard to set cronjob, better Linux ## Installation -### Git Clone - -clone this repository or download zip or release - -1. Rename **pages_template** to **pages** -2. Rename **config.sample.php** to **config.php** and make it writeable (chmod 777) -3. make writeable folder **ui/cache/** and **ui/compiled** -4. Open web and run installation -5. set [cronjob](https://github.com/hotspotbilling/phpnuxbill/wiki/Cron-Jobs) or scheduller for **system/cron.php** -6. make **config.php** unwriteable (chmod 644) - -### Composer install - -Go to directory you want to install -Install Composer in your system - -```bash -# Debian/Ubuntu -sudo apt install composer -# Centos/Redhat -sudo yum install composer -``` - -install on curent directory - -```bash -composer create-project hotspotbilling/phpnuxbill . -``` - -install on new directory - -```bash -composer create-project hotspotbilling/phpnuxbill phpnuxbill -``` - -### Manual Installation - -1. Download project from [Master Branch](https://github.com/hotspotbilling/phpnuxbill/archive/refs/heads/master.zip) or from [Release](https://github.com/hotspotbilling/phpnuxbill/releases) -2. unzip and upload it to server -3. Rename **pages_template** to **pages** -4. Rename **config.sample.php** to **config.php** and make it writeable (chmod 777) -5. make writeable folder **ui/cache/** and **ui/compiled** -6. Open web and run installation -7. set [cronjob](https://github.com/hotspotbilling/phpnuxbill/wiki/Cron-Jobs) or scheduller for **system/cron.php** -8. make **config.php** unwriteable (chmod 644) - -### Docker installation - -[see this repo](https://github.com/animegasan/phpnuxbill) - -## UPDGRADE - -for old version, below Version 6, backup **system/config.php**, delete all file except folder **pages**, upload all new files, put **config.php** in root folder (not in system folder), got to folder **/install** and run Update. - -for version 6 above, just replace all files, using filezilla can choose overwrite if different file size or time. - -or git pull if you use git clone +[Installation instructions](https://github.com/hotspotbilling/phpnuxbill/wiki) ## RADIUS system Still on development +## Community Support + +- [Github Discussion](https://github.com/hotspotbilling/phpnuxbill/discussions) +- [Telegram Group](https://t.me/phpmixbill) + ## Technical Support Start from Rp 500.000 or $50 diff --git a/system/autoload/Package.php b/system/autoload/Package.php index 19c0b087..384140dd 100644 --- a/system/autoload/Package.php +++ b/system/autoload/Package.php @@ -211,7 +211,7 @@ class Package "$_L[Plan_Price] : *$_c[currency_code] " . number_format($in['price'], 2, $_c['dec_point'], $_c['thousands_sep']) . "*\n\n" . "$_L[Username] : *$in[username]*\n" . "$_L[Password] : **********\n\n" . - "$_L[Created_On] :\n*" . date($_c['date_format'], strtotime($in['recharged_on'])) . " $in[time]*\n" . + "$_L[Created_On] :\n*" . date($_c['date_format'], strtotime($in['recharged_on'])) . "*\n" . "$_L[Expires_On] :\n*" . date($_c['date_format'], strtotime($in['expiration'])) . " $in[time]*\n" . "\n\n" . "$_c[note]"; diff --git a/system/controllers/export.php b/system/controllers/export.php index ff175bf2..0cd60ac7 100644 --- a/system/controllers/export.php +++ b/system/controllers/export.php @@ -101,7 +101,7 @@ switch ($action) { $plan_name $type $price - $recharged_on $time + $recharged_on $expiration $time $method $routers @@ -270,7 +270,7 @@ EOF; $plan_name $type $price - $recharged_on $time + $recharged_on $expiration $time $method $routers diff --git a/system/controllers/prepaid.php b/system/controllers/prepaid.php index 6d9e39c0..0fbee57f 100644 --- a/system/controllers/prepaid.php +++ b/system/controllers/prepaid.php @@ -263,7 +263,7 @@ switch ($action) { "$_L[Plan_Price] : *$config[currency_code] ".number_format($in['price'],2,$config['dec_point'],$config['thousands_sep'])."*\n\n". "$_L[Username] : *$in[username]*\n". "$_L[Password] : **********\n\n". - "$_L[Created_On] :\n*".date($config['date_format'], strtotime($in['recharged_on']))." $in[time]*\n". + "$_L[Created_On] :\n*".date($config['date_format'], strtotime($in['recharged_on']))."*\n". "$_L[Expires_On] :\n*".date($config['date_format'], strtotime($in['expiration']))." $in[time]*\n". "\n\n". "$config[note]"; @@ -738,7 +738,7 @@ switch ($action) { "$_L[Plan_Price] : *$config[currency_code] ".number_format($in['price'],2,$config['dec_point'],$config['thousands_sep'])."*\n\n". "$_L[Username] : *$in[username]*\n". "$_L[Password] : **********\n\n". - "$_L[Created_On] :\n*".date($config['date_format'], strtotime($in['recharged_on']))." $in[time]*\n". + "$_L[Created_On] :\n*".date($config['date_format'], strtotime($in['recharged_on']))."*\n". "$_L[Expires_On] :\n*".date($config['date_format'], strtotime($in['expiration']))." $in[time]*\n". "\n\n". "$config[note]"; diff --git a/ui/ui/dashboard.tpl b/ui/ui/dashboard.tpl index 5ca4f1fa..15d56945 100644 --- a/ui/ui/dashboard.tpl +++ b/ui/ui/dashboard.tpl @@ -108,7 +108,7 @@ {$no++} {$expired['username']} - {date($_c['date_format'], strtotime($expired['recharged_on']))} {$expired['time']} + {date($_c['date_format'], strtotime($expired['recharged_on']))} {date($_c['date_format'], strtotime($expired['expiration']))} {$expired['time']} diff --git a/ui/ui/invoice-print.tpl b/ui/ui/invoice-print.tpl index c4a2cedf..2036c576 100644 --- a/ui/ui/invoice-print.tpl +++ b/ui/ui/invoice-print.tpl @@ -37,7 +37,7 @@ {$_L['Username']} : {$d['username']}
{$_L['Password']} : **********

- {$_L['Created_On']} : {date($_c['date_format'], strtotime($d['recharged_on']))} {$d['time']}
+ {$_L['Created_On']} : {date($_c['date_format'], strtotime($d['recharged_on']))}
{$_L['Expires_On']} : {date($_c['date_format'], strtotime($d['expiration']))} {$d['time']}
============================================
{$_c['note']}
diff --git a/ui/ui/invoice.tpl b/ui/ui/invoice.tpl index 9b190cc3..bcef36bf 100644 --- a/ui/ui/invoice.tpl +++ b/ui/ui/invoice.tpl @@ -23,7 +23,7 @@ {$_L['Username']} : {$in['username']}
{$_L['Password']} : **********

- {$_L['Created_On']} : {date($_c['date_format'], strtotime($in['recharged_on']))} {$in['time']}
+ {$_L['Created_On']} : {date($_c['date_format'], strtotime($in['recharged_on']))}
{$_L['Expires_On']} : {date($_c['date_format'], strtotime($in['expiration']))} {$in['time']}
=====================================================
{$_c['note']}
diff --git a/ui/ui/prepaid.tpl b/ui/ui/prepaid.tpl index e2225464..a80aabcb 100644 --- a/ui/ui/prepaid.tpl +++ b/ui/ui/prepaid.tpl @@ -43,7 +43,7 @@ {$ds['username']} {$ds['namebp']} {$ds['type']} - {$ds['recharged_on']} {$ds['time']} + {$ds['recharged_on']} {$ds['expiration']} {$ds['time']} {$ds['method']} {$ds['routers']} diff --git a/ui/ui/print-by-date.tpl b/ui/ui/print-by-date.tpl index 92f5beea..65125971 100644 --- a/ui/ui/print-by-date.tpl +++ b/ui/ui/print-by-date.tpl @@ -39,7 +39,7 @@ {$ds['plan_name']} {$ds['type']} {$_c['currency_code']} {number_format($ds['price'],2,$_c['dec_point'],$_c['thousands_sep'])} - {date($_c['date_format'], strtotime($ds['recharged_on']))} {$ds['time']} + {date($_c['date_format'], strtotime($ds['recharged_on']))} {date($_c['date_format'], strtotime($ds['expiration']))} {$ds['time']} {$ds['method']} {$ds['routers']} diff --git a/ui/ui/print-by-period.tpl b/ui/ui/print-by-period.tpl index 5384d837..f4663348 100644 --- a/ui/ui/print-by-period.tpl +++ b/ui/ui/print-by-period.tpl @@ -39,7 +39,7 @@ {$ds['plan_name']} {$ds['type']} {$_c['currency_code']} {number_format($ds['price'],2,$_c['dec_point'],$_c['thousands_sep'])} - {date($_c['date_format'], strtotime($ds['recharged_on']))} {$ds['time']} + {date($_c['date_format'], strtotime($ds['recharged_on']))} {date($_c['date_format'], strtotime($ds['expiration']))} {$ds['time']} {$ds['method']} {$ds['routers']} diff --git a/ui/ui/reports-daily.tpl b/ui/ui/reports-daily.tpl index fcab5545..5723baf5 100644 --- a/ui/ui/reports-daily.tpl +++ b/ui/ui/reports-daily.tpl @@ -43,7 +43,7 @@ {$ds['plan_name']} {$_c['currency_code']} {number_format($ds['price'],2,$_c['dec_point'],$_c['thousands_sep'])} - {date($_c['date_format'], strtotime($ds['recharged_on']))} {$ds['time']} + {date($_c['date_format'], strtotime($ds['recharged_on']))} {date($_c['date_format'], strtotime($ds['expiration']))} {$ds['time']} {$ds['method']} {$ds['routers']} diff --git a/ui/ui/reports-period-view.tpl b/ui/ui/reports-period-view.tpl index 747fbfe5..e7ac7b3c 100644 --- a/ui/ui/reports-period-view.tpl +++ b/ui/ui/reports-period-view.tpl @@ -54,7 +54,7 @@ {$ds['plan_name']} {$_c['currency_code']} {number_format($ds['price'],0,$_c['dec_point'],$_c['thousands_sep'])} - {date($_c['date_format'], strtotime($ds['recharged_on']))} {$ds['time']} + {date($_c['date_format'], strtotime($ds['recharged_on']))} {date($_c['date_format'], strtotime($ds['expiration']))} {$ds['time']} {$ds['method']} {$ds['routers']} diff --git a/ui/ui/sections/user-header.tpl b/ui/ui/sections/user-header.tpl index 4bd17d86..330c5aad 100644 --- a/ui/ui/sections/user-header.tpl +++ b/ui/ui/sections/user-header.tpl @@ -63,7 +63,8 @@

{$_user['fullname']} - Member since Nov. 2012 + {$_user['phonenumber']}
+ {$_user['email']}

  • diff --git a/ui/ui/user-activation-list.tpl b/ui/ui/user-activation-list.tpl index cbb62d88..4af579d5 100644 --- a/ui/ui/user-activation-list.tpl +++ b/ui/ui/user-activation-list.tpl @@ -26,8 +26,7 @@ {$ds['plan_name']} {number_format($ds['price'],2,$_c['dec_point'],$_c['thousands_sep'])} {$ds['type']} - {date($_c['date_format'], strtotime($ds['recharged_on']))} - {$ds['time']} + {date($_c['date_format'], strtotime($ds['recharged_on']))} {date($_c['date_format'], strtotime($ds['expiration']))} {$ds['time']} {$ds['method']} diff --git a/ui/ui/user-dashboard.tpl b/ui/ui/user-dashboard.tpl index 37a05b20..fa993322 100644 --- a/ui/ui/user-dashboard.tpl +++ b/ui/ui/user-dashboard.tpl @@ -70,7 +70,7 @@ {$_L['Created_On']} {if $_bill['time'] ne ''}{date($_c['date_format'], strtotime($_bill['recharged_on']))} - {$_bill['time']}{/if}  + {/if}  {$_L['Expires_On']}