From a7e8335297d2bef37ff694409393b85f7c453054 Mon Sep 17 00:00:00 2001 From: Ibnu Maksum Date: Sun, 16 Oct 2022 14:48:21 +0700 Subject: [PATCH] admin change to adminlte --- README.md | 12 +- admin/index.php | 2 +- config.sample.php | 4 +- docs/diskusi.html | 14 +- docs/index.html | 10 +- index.php | 2 +- install/index.php | 10 +- install/phpmixbill.sql | 4 +- install/step2.php | 14 +- install/step3.php | 6 +- install/step4.php | 12 +- install/step5.php | 8 +- install/update.php | 6 +- system/autoload/Admin.php | 2 +- system/autoload/App.php | 2 +- system/autoload/Http.php | 2 +- system/autoload/Lang.php | 2 +- system/autoload/Package.php | 2 +- system/autoload/Paginator.php | 2 +- system/autoload/Password.php | 2 +- system/autoload/Timezone.php | 2 +- system/autoload/User.php | 2 +- system/autoload/Validator.php | 2 +- system/boot.php | 22 +- system/controllers/accounts.php | 2 +- system/controllers/admin.php | 4 +- system/controllers/autoload.php | 2 +- system/controllers/bandwidth.php | 2 +- system/controllers/callback.php | 2 +- system/controllers/community.php | 4 +- system/controllers/customers.php | 2 +- system/controllers/dashboard.php | 5 +- system/controllers/default.php | 2 +- system/controllers/export.php | 2 +- system/controllers/home.php | 2 +- system/controllers/login.php | 4 +- system/controllers/logout.php | 2 +- system/controllers/order.php | 2 +- system/controllers/page.php | 2 +- system/controllers/pages.php | 2 +- system/controllers/paymentgateway.php | 2 +- system/controllers/pool.php | 2 +- system/controllers/prepaid.php | 2 +- system/controllers/register.php | 2 +- system/controllers/reports.php | 3 +- system/controllers/routers.php | 2 +- system/controllers/services.php | 2 +- system/controllers/settings.php | 15 +- system/controllers/voucher.php | 2 +- system/cron.php | 2 +- system/lan/english/common.lan.php | 6 +- system/lan/indonesia/common.lan.php | 24 +- system/lan/spanish/common.lan.php | 4 +- system/lan/turkish/common.lan.php | 4 +- system/radius.php | 2 +- ui/ui/admin-login.tpl | 45 ++ ui/ui/admin.tpl | 71 --- ui/ui/app-settings.tpl | 47 +- ui/ui/bandwidth.tpl | 2 +- ui/ui/community.tpl | 18 +- ui/ui/customers.tpl | 2 +- ui/ui/dashboard.tpl | 341 +++++-------- ui/ui/dbstatus.tpl | 2 +- ui/ui/fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes ui/ui/fonts/glyphicons-halflings-regular.svg | 288 +++++++++++ ui/ui/fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes ui/ui/fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes ui/ui/hotspot.tpl | 2 +- ui/ui/pool.tpl | 2 +- ui/ui/pppoe.tpl | 2 +- ui/ui/prepaid.tpl | 2 +- ui/ui/print-by-date.tpl | 2 +- ui/ui/print-by-period.tpl | 2 +- ui/ui/recharge-user.tpl | 2 +- ui/ui/recharge.tpl | 2 +- ui/ui/refill.tpl | 2 +- ui/ui/reports-daily.tpl | 2 +- ui/ui/reports-period-view.tpl | 2 +- ui/ui/routers.tpl | 2 +- ui/ui/sections/footer.tpl | 70 +-- ui/ui/sections/header.tpl | 470 +++++++++--------- ui/ui/sections/user-header.tpl | 5 +- ui/ui/user-activation-list.tpl | 2 +- ui/ui/{login.tpl => user-login.tpl} | 0 ui/ui/user-orderHistory.tpl | 2 +- ui/ui/user-orderPlan.tpl | 2 +- ui/ui/user-orderView.tpl | 2 +- ui/ui/users.tpl | 2 +- ui/ui/voucher.tpl | 2 +- 90 files changed, 913 insertions(+), 745 deletions(-) create mode 100644 ui/ui/admin-login.tpl delete mode 100644 ui/ui/admin.tpl create mode 100644 ui/ui/fonts/glyphicons-halflings-regular.eot create mode 100644 ui/ui/fonts/glyphicons-halflings-regular.svg create mode 100644 ui/ui/fonts/glyphicons-halflings-regular.ttf create mode 100644 ui/ui/fonts/glyphicons-halflings-regular.woff create mode 100644 ui/ui/fonts/glyphicons-halflings-regular.woff2 rename ui/ui/{login.tpl => user-login.tpl} (100%) diff --git a/README.md b/README.md index feb9ce36..f59b003b 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,9 @@ ## Payment Gateway -- [Tripay.com](https://github.com/hotspotbilling/phpmixbill-tripay) | Indonesia -- [Xendit.com](https://github.com/hotspotbilling/phpmixbill-xendit) | Indonesia and Philippine ( Philippine not tested ) -- [Duitku.com](https://github.com/hotspotbilling/phpmixbill-duitku) | Indonesia +- [Tripay.com](https://github.com/hotspotbilling/phpnuxbill-tripay) | Indonesia +- [Xendit.com](https://github.com/hotspotbilling/phpnuxbill-xendit) | Indonesia and Philippine ( Philippine not tested ) +- [Duitku.com](https://github.com/hotspotbilling/phpnuxbill-duitku) | Indonesia Click link to download @@ -25,7 +25,7 @@ Goto Discussionif you want another Payment Gateway ## System Requirements -Most current web servers with PHP & MySQL installed will be capable of running PHPMixBill +Most current web servers with PHP & MySQL installed will be capable of running PHPNuxBill Minimum Requirements @@ -50,9 +50,9 @@ The problem with windows is hard to set cronjob, better Linux - make **config.php** unwriteable (chmod 644) -See [WIKI](https://github.com/ibnux/phpmixbill/wiki/Instalation) +See [WIKI](https://github.com/hotspotbilling/phpnuxbill/wiki/Instalation) -baca [WIKI](https://github.com/ibnux/phpmixbill/wiki/Instalation) +baca [WIKI](https://github.com/hotspotbilling/phpnuxbill/wiki/Instalation) ## UPDGRADE diff --git a/admin/index.php b/admin/index.php index f917bc87..d5d02c65 100644 --- a/admin/index.php +++ b/admin/index.php @@ -1,6 +1,6 @@ - PHPMIXBILL - Voucher management for Mikrotik Hotspot + PHPNUXBILL - Voucher management for Mikrotik Hotspot @@ -35,11 +35,11 @@
-

PHP PHPMIXBILL

+

PHP PHPNUXBILL

Aplikasi manajemen Voucher Hotspot untuk Mikrotik

- Download - Source + Download + Source
@@ -51,12 +51,12 @@
+ + + + + \ No newline at end of file diff --git a/ui/ui/admin.tpl b/ui/ui/admin.tpl deleted file mode 100644 index 55880f6d..00000000 --- a/ui/ui/admin.tpl +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - {$_title} - {$_L['Login']} - - - - - - - - - - - - - - - - - - - -
-
-
-
-
-

{$_L['Logo']}

-
{$_L['Sign_In_Admin']}
-
- {if isset($notify)} - {$notify} - {/if} -
-
-
- - -
- -
- - -
- -
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- - - \ No newline at end of file diff --git a/ui/ui/app-settings.tpl b/ui/ui/app-settings.tpl index c9ee7196..3ea3ad14 100644 --- a/ui/ui/app-settings.tpl +++ b/ui/ui/app-settings.tpl @@ -1,6 +1,6 @@ {include file="sections/header.tpl"} -
+
@@ -9,14 +9,24 @@
- + {$_L['App_Name_Help_Text']}
+
+ +
+ + {Lang::T('Will show below user pages')} +
+
- + {$_L['You_can_use_html_tag']}
@@ -34,7 +44,8 @@

Still on Testing.

-

Changing from Radius will not add existing user to Mikrotik Hotspot.

+

Changing from Radius will not add existing user to Mikrotik Hotspot. +

With Radius user can use Hotspot or PPOE.

@@ -51,13 +62,15 @@
- +
- +
@@ -66,8 +79,10 @@
- -

Must include [text] & [number], it will be replaced.

+ +

Must include [text] & [number], it will be replaced. +

@@ -76,8 +91,10 @@
- -

Must include [text] & [number], it will be replaced.

+ +

Must include [text] & [number], it will be replaced. +

@@ -86,7 +103,8 @@
- +

From Direct Chat Link.

/ip hotspot walled-garden
 add dst-host=tawk.to
@@ -105,15 +123,16 @@ add dst-host=*.tawk.to
- +
- 
/ip hotspot walled-garden
+                
/ip hotspot walled-garden
 add dst-host={$_domain}
 add dst-host=*.{$_domain}

             
         
     
 
-{include file="sections/footer.tpl"}
+{include file="sections/footer.tpl"}
\ No newline at end of file
diff --git a/ui/ui/bandwidth.tpl b/ui/ui/bandwidth.tpl
index c74ce986..f80ae766 100644
--- a/ui/ui/bandwidth.tpl
+++ b/ui/ui/bandwidth.tpl
@@ -23,7 +23,7 @@
 											  {$_L['New_Bandwidth']}
 										 
 									
-									

+									

                                         
diff --git a/ui/ui/community.tpl b/ui/ui/community.tpl
index 79347c75..364ab0eb 100644
--- a/ui/ui/community.tpl
+++ b/ui/ui/community.tpl
@@ -6,7 +6,7 @@
             
Discussions
Get help from community

-                 Chat Now
             

@@ -18,7 +18,7 @@
                 Feedback and Bug Report
             

-                 Give Feedback
             

@@ -31,7 +31,7 @@
             
Donasi
Untuk pengembangan lebih baik, donasi ke iBNuX, donasi akan membantu terus
                 pengembangan aplikasi

-            

+            

                 

                                             
                                                 

             
             
         
             
         
             

@@ -61,9 +61,9 @@
         

             
Donations

             

-                Donations will help to continue phpmixbill development
+                Donations will help to continue phpnuxbill development
             

-            

+            

                 

                     
                         

@@ -98,7 +98,7 @@
             
Paid Support?
donation confirmation?
Or ask any Donation Alternative

                 Telegram
-                Twitter
                 Facebook
                     Messenger
@@ -108,14 +108,14 @@
     

         

-            
PHPMIXBILL

+            
PHPNUXBILL

             

                 {$_L['Welcome_Text_Admin']}
             

             
             
             

-                Get Latest Version
+                Get Latest Version
             

         

     

@@ -125,7 +125,7 @@
         $.getJSON( "./version.json?"+Math.random(), function( data ) {
             $('#currentVersion').html('Current Version: '+data.version);
         });
-        $.getJSON( "https://raw.githubusercontent.com/ibnux/phpmixbill/master/version.json?"+Math.random(), function( data ) {
+        $.getJSON( "https://raw.githubusercontent.com/ibnux/phpnuxbill/master/version.json?"+Math.random(), function( data ) {
             $('#latestVersion').html('Latest Version: '+data.version);
         });
     });
diff --git a/ui/ui/customers.tpl b/ui/ui/customers.tpl
index bdefa625..595c537a 100644
--- a/ui/ui/customers.tpl
+++ b/ui/ui/customers.tpl
@@ -23,7 +23,7 @@
 											  {$_L['Add_Contact']} 
 									
-                                    

+                                    

                                         

                     
                         

             
     
 										

diff --git a/ui/ui/dashboard.tpl b/ui/ui/dashboard.tpl
index fb22207a..5ca4f1fa 100644
--- a/ui/ui/dashboard.tpl
+++ b/ui/ui/dashboard.tpl
@@ -1,237 +1,160 @@
 {include file="sections/header.tpl"}
 
-{if ($_admin['user_type']) eq 'Admin' || ($_admin['user_type']) eq 'Sales'}
-    

                                             
                                                 

-                            
-                                
-                                    
-                                    
-                                    
-                                
-                            
-                            
-                                {foreach $plans as $stok}
-                                    
-                                        
-                                        
-                                        
-                                    
-                                
-                            {/foreach}
+    

+        

+            

+                
{$u_act}

+
+                
{$_L['Users_Active']}

+            

+            

+                
+            

+            {$_L['View_All']} 
+        

+    

+    

+        

+            

+                
{$u_all}

+
+                
{$_L['Total_Users']}

+            

+            

+                
+            

+            {$_L['View_All']} 
+        

+    

+
+
+

+    

+        

+            
Vouchers Stock

+            

+                
{$_L['Plan_Name']}unusedused
{$stok['name_plan']}{$stok['unused']}{$stok['used']}

+                    
+                        
+                            
+                            
+                            
+                        
+                    
+                    
+                        {foreach $plans as $stok}
                             
-                                
-                                
-                                
+                                
+                                
+                                
-                        
{$_L['Plan_Name']}unusedused
Total{$stocks['unused']}{$stocks['used']}{$stok['name_plan']}{$stok['unused']}{$stok['used']}
                             

-                    

-                

-            
-            

-                
{$_L['User_Expired_Today']}

-                

-                    

-                        
-                            
-                                
-                                    
-                                    
-                                    
-                                    
-                                
-                            
-                            
-                                {$no = 1}
-                                {foreach $expire as $expired}
-                                    
-                                        
-                                        
-                                        
-                                        
-                                    
-                                
-                            {/foreach}
-                        
Id{$_L['Username']}{$_L['Created_On']}{$_L['Expires_On']}
{$no++}{$expired['username']}{date($_c['date_format'], strtotime($expired['recharged_on']))} {$expired['time']}
-                                        {date($_c['date_format'], strtotime($expired['expiration']))} {$expired['time']}
-                                        

-                    

-                

+                        
+                    {/foreach}
+                    
+                        Total
+                        {$stocks['unused']}
+                        {$stocks['used']}
+                    
+                
             

         
-
-        

-            

-                
{Lang::T('Payment Gateway')}: {$_c['payment_gateway']}

-            

-            

-                
{$_L['Activity_Log']}

-                

-                    
    
-                        {foreach $dlog as $dlogs}
-                            
  • 
-                                
-                                {time_elapsed_string($dlogs['date'],true)}
-                                
    {$dlogs['description']}
    
-                            
    • 
-                        {/foreach}
-                    

-                

-                
Version: 

-            

-        

-
-    
-{else}
-    

-        

-            

-                

-                    
{$_L['Welcome']}, {$_user['fullname']}

-                    
{$_L['Welcome_Text_User']}

-                    
-                

+        

+            
{$_L['User_Expired_Today']}

+            

+                
+                    
+                        
+                            
+                            
+                            
+                            
+                        
+                    
+                    
+                        {$no = 1}
+                        {foreach $expire as $expired}
+                            
+                                
+                                
+                                
+                                
+                            
+                        
+                    {/foreach}
+                
Id{$_L['Username']}{$_L['Created_On']}{$_L['Expires_On']}
{$no++}{$expired['username']}{date($_c['date_format'], strtotime($expired['recharged_on']))} {$expired['time']}
+                                {date($_c['date_format'], strtotime($expired['expiration']))} {$expired['time']}
+                                

             

         

     

-    

-        

-            

-                
{$_L['Account_Information']}

-                

-                    

-                        

-                            
{$_L['Username']}

-                            
{$_bill['username']}

-                        

-                        

-                            
{$_L['Plan_Name']}

-                            
{$_bill['namebp']}

-                        

-                        

-                            
{$_L['Created_On']}

-                            
{date($_c['date_format'], strtotime($_bill['recharged_on']))}
-                                {$_bill['time']}

-                        

-                        

-                            
{$_L['Expires_On']}

-                            
{date($_c['date_format'], strtotime($_bill['expiration']))}
-                                {$_bill['time']}

-                        

-                    

 
-                

+    

+        

+            
{Lang::T('Payment Gateway')}: {$_c['payment_gateway']}

+        

+        

+            
{$_L['Activity_Log']}

+            

+                
    
+                    {foreach $dlog as $dlogs}
+                        
  • 
+                            
+                            {time_elapsed_string($dlogs['date'],true)}
+                            
    {$dlogs['description']}
    
+                        
    • 
+                    {/foreach}
+                

             

         

     

-{/if}
+
+

 
 
+
+
 
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
+
 
 {if isset($xfooter)}
-	{$xfooter}
+    {$xfooter}
 {/if}
 
 
+
 
\ No newline at end of file
diff --git a/ui/ui/sections/header.tpl b/ui/ui/sections/header.tpl
index 415a09de..7ed7932d 100644
--- a/ui/ui/sections/header.tpl
+++ b/ui/ui/sections/header.tpl
@@ -1,254 +1,248 @@
 
 
+
 
-	
-	
-	{$_title}
-	
+    
+    
+    {$_title}
+    
 
-	
-	
-	
+    
+
+    
+    
+    
+
+    
+    
 
 
-	
-	
-	
-
-
-	
-	
-{if isset($xheader)}
-	{$xheader}
-{/if}
+    {if isset($xheader)}
+        {$xheader}
+    {/if}
 
 
 
-
+
+    

 
-	
+        

+            
+            
+        

 
-				
+            
+        
 
-			
+        

+            

+                

+                    Dashboard
+                

+            

 
-			

-				
{date('Y')} © {$_c['CompanyName']}

-			

-		
-		

-			

-
-			{if isset($notify)}
-				{$notify}
-			{/if}
\ No newline at end of file
+            

+                {if isset($notify)}{$notify}{/if}
\ No newline at end of file
diff --git a/ui/ui/sections/user-header.tpl b/ui/ui/sections/user-header.tpl
index 742d83ed..c367c63f 100644
--- a/ui/ui/sections/user-header.tpl
+++ b/ui/ui/sections/user-header.tpl
@@ -9,7 +9,6 @@
 
     
 
-    
     
     
     
@@ -18,8 +17,6 @@
     
 
 
-    
-    
     {if isset($xheader)}
         {$xheader}
     {/if}
@@ -71,7 +68,7 @@
                                 
                                 
  • 
                                     
    
-                                        {$_L['Logout']}
+                                         {$_L['Logout']}
                                     
    
                                 
    • 
                             
diff --git a/ui/ui/user-activation-list.tpl b/ui/ui/user-activation-list.tpl
index d46298ee..1d5459ed 100644
--- a/ui/ui/user-activation-list.tpl
+++ b/ui/ui/user-activation-list.tpl
@@ -6,7 +6,7 @@
         
    
             
    {$_L['List_Activated_Voucher']}
    
             
    
-                
    
+                
    
                     
diff --git a/ui/ui/login.tpl b/ui/ui/user-login.tpl
similarity index 100%
rename from ui/ui/login.tpl
rename to ui/ui/user-login.tpl
diff --git a/ui/ui/user-orderHistory.tpl b/ui/ui/user-orderHistory.tpl
index 13c7bdc6..3bf36d3d 100644
--- a/ui/ui/user-orderHistory.tpl
+++ b/ui/ui/user-orderHistory.tpl
@@ -6,7 +6,7 @@
         
    
             
    {$_L['Order_History']}
    
             
    
-                
    
+                
    
                     
    
                         
                             
    
diff --git a/ui/ui/user-orderPlan.tpl b/ui/ui/user-orderPlan.tpl
index 505b9b00..84a87d74 100644
--- a/ui/ui/user-orderPlan.tpl
+++ b/ui/ui/user-orderPlan.tpl
@@ -20,7 +20,7 @@
                             
    
                                 
    
                                     
    {$plan['name_plan']}
    
-                                    
    
+                                    
    
                                         
    
                         
                             
    
diff --git a/ui/ui/user-orderView.tpl b/ui/ui/user-orderView.tpl
index f206ccca..f630c58e 100644
--- a/ui/ui/user-orderView.tpl
+++ b/ui/ui/user-orderView.tpl
@@ -13,7 +13,7 @@
                     
-            
    
+            
    
                 
    
                                             
                                                 
    
                 
             
    
diff --git a/ui/ui/users.tpl b/ui/ui/users.tpl
index c50b140f..9a2936c5 100644
--- a/ui/ui/users.tpl
+++ b/ui/ui/users.tpl
@@ -26,7 +26,7 @@
                                 class="ion ion-android-add">  {$_L['Add_New_Administrator']} 
                 
-                
    
+                
    
                     
    
                     
                         
    
                     
    
diff --git a/ui/ui/voucher.tpl b/ui/ui/voucher.tpl
index f857baec..02a74d8f 100644
--- a/ui/ui/voucher.tpl
+++ b/ui/ui/voucher.tpl
@@ -33,7 +33,7 @@
                          
                 
-                
    
+