From 80cecabfb0aba2e956ccc2b4e10bd603149ae61e Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Mon, 5 Feb 2024 14:25:23 +0700
Subject: [PATCH] Fix Calculation

---
 system/lan/english/common.lan.php |   1 +
 ui/ui/dashboard.tpl               | 368 +++++++++++++++---------------
 version.json                      |   2 +-
 3 files changed, 186 insertions(+), 185 deletions(-)

diff --git a/system/lan/english/common.lan.php b/system/lan/english/common.lan.php
index 543740f1..66514989 100644
--- a/system/lan/english/common.lan.php
+++ b/system/lan/english/common.lan.php
@@ -427,3 +427,4 @@ $_L['Buy_this_your_active_package_will_be_overwrite'] = 'Buy this? your active p
 $_L['Monthly_Registered_Customers'] = 'Monthly Registered Customers';
 $_L['Total_Monthly_Sales'] = 'Total Monthly Sales';
 $_L['Active_Users'] = 'Active Users';
+$_L['All_Users_Insights'] = 'All Users Insights';
diff --git a/ui/ui/dashboard.tpl b/ui/ui/dashboard.tpl
index 5a39c776..c7c5ca18 100644
--- a/ui/ui/dashboard.tpl
+++ b/ui/ui/dashboard.tpl
@@ -99,34 +99,34 @@
 <div class="row">
     <div class="col-md-7">
         {if $_c['disable_voucher'] != 'yes' && $stocks['unused']>0 || $stocks['used']>0}
-        <div class="panel panel-primary mb20 panel-hovered project-stats table-responsive">
-            <div class="panel-heading">Vouchers Stock</div>
-            <div class="table-responsive">
-                <table class="table">
-                    <thead>
+            <div class="panel panel-primary mb20 panel-hovered project-stats table-responsive">
+                <div class="panel-heading">Vouchers Stock</div>
+                <div class="table-responsive">
+                    <table class="table">
+                        <thead>
+                            <tr>
+                                <th>{$_L['Plan_Name']}</th>
+                                <th>unused</th>
+                                <th>used</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {foreach $plans as $stok}
+                                <tr>
+                                    <td>{$stok['name_plan']}</td>
+                                    <td>{$stok['unused']}</td>
+                                    <td>{$stok['used']}</td>
+                                </tr>
+                            </tbody>
+                        {/foreach}
                         <tr>
-                            <th>{$_L['Plan_Name']}</th>
-                            <th>unused</th>
-                            <th>used</th>
+                            <td>Total</td>
+                            <td>{$stocks['unused']}</td>
+                            <td>{$stocks['used']}</td>
                         </tr>
-                    </thead>
-                    <tbody>
-                        {foreach $plans as $stok}
-                        <tr>
-                            <td>{$stok['name_plan']}</td>
-                            <td>{$stok['unused']}</td>
-                            <td>{$stok['used']}</td>
-                        </tr>
-                    </tbody>
-                    {/foreach}
-                    <tr>
-                        <td>Total</td>
-                        <td>{$stocks['unused']}</td>
-                        <td>{$stocks['used']}</td>
-                    </tr>
-                </table>
+                    </table>
+                </div>
             </div>
-        </div>
         {/if}
         <div class="panel panel-warning mb20 panel-hovered project-stats table-responsive">
             <div class="panel-heading">{$_L['User_Expired_Today']}</div>
@@ -143,15 +143,15 @@
                     <tbody>
                         {$no = 1}
                         {foreach $expire as $expired}
-                        <tr>
-                            <td>{$no++}</td>
-                            <td><a href="{$_url}customers/viewu/{$expired['username']}">{$expired['username']}</a></td>
-                            <td>{Lang::dateAndTimeFormat($expired['recharged_on'],$expired['recharged_time'])}
-                            </td>
-                            <td>{Lang::dateAndTimeFormat($expired['expiration'],$expired['time'])}
-                            </td>
-                        </tr>
-                    </tbody>
+                            <tr>
+                                <td>{$no++}</td>
+                                <td><a href="{$_url}customers/viewu/{$expired['username']}">{$expired['username']}</a></td>
+                                <td>{Lang::dateAndTimeFormat($expired['recharged_on'],$expired['recharged_time'])}
+                                </td>
+                                <td>{Lang::dateAndTimeFormat($expired['expiration'],$expired['time'])}
+                                </td>
+                            </tr>
+                        </tbody>
                     {/foreach}
                 </table>
             </div>
@@ -175,11 +175,11 @@
             <div class="panel-body">
                 <ul class="list-unstyled">
                     {foreach $dlog as $dlogs}
-                    <li class="primary">
-                        <span class="point"></span>
-                        <span class="time small text-muted">{time_elapsed_string($dlogs['date'],true)}</span>
-                        <p>{$dlogs['description']}</p>
-                    </li>
+                        <li class="primary">
+                            <span class="point"></span>
+                            <span class="time small text-muted">{time_elapsed_string($dlogs['date'],true)}</span>
+                            <p>{$dlogs['description']}</p>
+                        </li>
                     {/foreach}
                 </ul>
             </div>
@@ -192,171 +192,171 @@
 
 <script src="https://cdn.jsdelivr.net/npm/chart.js@3.5.1/dist/chart.min.js"></script>
 {literal}
-<script type="text/javascript">
-    document.addEventListener("DOMContentLoaded", function () {
-        var counts = JSON.parse('{/literal}{$counts|json_encode}{literal}');
+    <script type="text/javascript">
+        document.addEventListener("DOMContentLoaded", function() {
+            var counts = JSON.parse('{/literal}{$counts|json_encode}{literal}');
 
-        var monthNames = [
-            'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-            'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
-        ];
+            var monthNames = [
+                'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+                'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
+            ];
 
-        var labels = [];
-        var data = [];
+            var labels = [];
+            var data = [];
 
-        for (var i = 1; i <= 12; i++) {
-            var month = counts.find(count => count.date === i);
-            labels.push(month ? monthNames[i - 1] : monthNames[i - 1].substring(0, 3));
-            data.push(month ? month.count : 0);
+            for (var i = 1; i <= 12; i++) {
+                var month = counts.find(count => count.date === i);
+                labels.push(month ? monthNames[i - 1] : monthNames[i - 1].substring(0, 3));
+                data.push(month ? month.count : 0);
+            }
+
+            var ctx = document.getElementById('chart').getContext('2d');
+            var chart = new Chart(ctx, {
+                type: 'bar',
+                data: {
+                    labels: labels,
+                    datasets: [{
+                        label: 'Registered Members',
+                        data: data,
+                        backgroundColor: 'rgba(0, 0, 255, 0.5)',
+                        borderColor: 'rgba(0, 0, 255, 0.7)',
+                        borderWidth: 1
+                    }]
+                },
+                options: {
+                    responsive: true,
+                    scales: {
+                        x: {
+                            grid: {
+                                display: false
+                            }
+                        },
+                        y: {
+                            beginAtZero: true,
+                            grid: {
+                                color: 'rgba(0, 0, 0, 0.1)'
+                            }
+                        }
+                    }
+                }
+            });
+        });
+    </script>
+
+    <script type="text/javascript">
+        document.addEventListener("DOMContentLoaded", function() {
+            var monthlySales = JSON.parse('{/literal}{$monthlySales|json_encode}{literal}');
+
+            var monthNames = [
+                'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+                'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
+            ];
+
+            var labels = [];
+            var data = [];
+
+            for (var i = 1; i <= 12; i++) {
+                var month = findMonthData(monthlySales, i);
+                labels.push(month ? monthNames[i - 1] : monthNames[i - 1].substring(0, 3));
+                data.push(month ? month.totalSales : 0);
+            }
+
+            var ctx = document.getElementById('salesChart').getContext('2d');
+            var chart = new Chart(ctx, {
+                type: 'bar',
+                data: {
+                    labels: labels,
+                    datasets: [{
+                        label: 'Monthly Sales',
+                        data: data,
+                        backgroundColor: 'rgba(2, 10, 242)', // Customize the background color
+                        borderColor: 'rgba(255, 99, 132, 1)', // Customize the border color
+                        borderWidth: 1
+                    }]
+                },
+                options: {
+                    responsive: true,
+                    scales: {
+                        x: {
+                            grid: {
+                                display: false
+                            }
+                        },
+                        y: {
+                            beginAtZero: true,
+                            grid: {
+                                color: 'rgba(0, 0, 0, 0.1)'
+                            }
+                        }
+                    }
+                }
+            });
+        });
+
+        function findMonthData(monthlySales, month) {
+            for (var i = 0; i < monthlySales.length; i++) {
+                if (monthlySales[i].month === month) {
+                    return monthlySales[i];
+                }
+            }
+            return null;
         }
 
-        var ctx = document.getElementById('chart').getContext('2d');
-        var chart = new Chart(ctx, {
-            type: 'bar',
-            data: {
-                labels: labels,
+
+        document.addEventListener("DOMContentLoaded", function() {
+            // Get the data from PHP and assign it to JavaScript variables
+            var u_act = '{/literal}{$u_act}{literal}';
+            var c_all = '{/literal}{$c_all}{literal}';
+            var u_all = '{/literal}{$u_all}{literal}';
+            //lets calculate the inactive users as reported
+            var expired = u_all - u_act;
+            var inactive = c_all - u_all;
+            // Create the chart data
+            var data = {
+                labels: ['Active Users', 'Expired Users', 'Inactive Users'],
                 datasets: [{
-                    label: 'Registered Members',
-                    data: data,
-                    backgroundColor: 'rgba(0, 0, 255, 0.5)',
-                    borderColor: 'rgba(0, 0, 255, 0.7)',
+                    label: 'User Recharges',
+                    data: [parseInt(u_act), parseInt(expired), parseInt(inactive)],
+                    backgroundColor: ['rgba(4, 191, 13)', 'rgba(191, 35, 4)', 'rgba(0, 0, 255, 0.5'],
+                    borderColor: ['rgba(0, 255, 0, 1)', 'rgba(255, 99, 132, 1)', 'rgba(0, 0, 255, 0.7'],
                     borderWidth: 1
                 }]
-            },
-            options: {
+            };
+
+            // Create chart options
+            var options = {
                 responsive: true,
-                scales: {
-                    x: {
-                        grid: {
-                            display: false
-                        }
-                    },
-                    y: {
-                        beginAtZero: true,
-                        grid: {
-                            color: 'rgba(0, 0, 0, 0.1)'
+                aspectRatio: 1,
+                plugins: {
+                    legend: {
+                        position: 'bottom',
+                        labels: {
+                            boxWidth: 15
                         }
                     }
                 }
-            }
+            };
+
+            // Get the canvas element and create the chart
+            var ctx = document.getElementById('userRechargesChart').getContext('2d');
+            var chart = new Chart(ctx, {
+                type: 'pie',
+                data: data,
+                options: options
+            });
         });
-    });
-</script>
-
-<script type="text/javascript">
-    document.addEventListener("DOMContentLoaded", function () {
-        var monthlySales = JSON.parse('{/literal}{$monthlySales|json_encode}{literal}');
-
-        var monthNames = [
-            'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-            'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
-        ];
-
-        var labels = [];
-        var data = [];
-
-        for (var i = 1; i <= 12; i++) {
-            var month = findMonthData(monthlySales, i);
-            labels.push(month ? monthNames[i - 1] : monthNames[i - 1].substring(0, 3));
-            data.push(month ? month.totalSales : 0);
-        }
-
-        var ctx = document.getElementById('salesChart').getContext('2d');
-        var chart = new Chart(ctx, {
-            type: 'bar',
-            data: {
-                labels: labels,
-                datasets: [{
-                    label: 'Monthly Sales',
-                    data: data,
-                    backgroundColor: 'rgba(2, 10, 242)', // Customize the background color
-                    borderColor: 'rgba(255, 99, 132, 1)', // Customize the border color
-                    borderWidth: 1
-                }]
-            },
-            options: {
-                responsive: true,
-                scales: {
-                    x: {
-                        grid: {
-                            display: false
-                        }
-                    },
-                    y: {
-                        beginAtZero: true,
-                        grid: {
-                            color: 'rgba(0, 0, 0, 0.1)'
-                        }
-                    }
-                }
-            }
-        });
-    });
-
-    function findMonthData(monthlySales, month) {
-        for (var i = 0; i < monthlySales.length; i++) {
-            if (monthlySales[i].month === month) {
-                return monthlySales[i];
-            }
-        }
-        return null;
-    }
-
-
-    document.addEventListener("DOMContentLoaded", function () {
-        // Get the data from PHP and assign it to JavaScript variables
-        var u_act = '{/literal}{$u_act}{literal}';
-        var c_all = '{/literal}{$c_all}{literal}';
-        var u_all = '{/literal}{$u_all}{literal}';
-        //lets calculate the inactive users as reported
-        var inactive = u_all - u_act;
-
-        // Create the chart data
-        var data = {
-            labels: ['Active Users', 'Inactive Users', 'Total Users'],
-            datasets: [{
-                label: 'User Recharges',
-                data: [parseInt(u_act), parseInt(inactive), parseInt(c_all)],
-                backgroundColor: ['rgba(4, 191, 13)', 'rgba(191, 35, 4)', 'rgba(0, 0, 255, 0.5'],
-                borderColor: ['rgba(0, 255, 0, 1)', 'rgba(255, 99, 132, 1)', 'rgba(0, 0, 255, 0.7'],
-                borderWidth: 1
-            }]
-        };
-
-        // Create chart options
-        var options = {
-            responsive: true,
-            aspectRatio: 1,
-            plugins: {
-                legend: {
-                    position: 'bottom',
-                    labels: {
-                        boxWidth: 15
-                    }
-                }
-            }
-        };
-
-        // Get the canvas element and create the chart
-        var ctx = document.getElementById('userRechargesChart').getContext('2d');
-        var chart = new Chart(ctx, {
-            type: 'pie',
-            data: data,
-            options: options
-        });
-    });
-</script>
+    </script>
 {/literal}
 <script>
-    window.addEventListener('DOMContentLoaded', function () {
-        $.getJSON("./version.json?" + Math.random(), function (data) {
+    window.addEventListener('DOMContentLoaded', function() {
+        $.getJSON("./version.json?" + Math.random(), function(data) {
             var localVersion = data.version;
             $('#version').html('Version: ' + localVersion);
             $.getJSON(
                 "https://raw.githubusercontent.com/hotspotbilling/phpnuxbill/master/version.json?" +
                 Math
-                    .random(),
-                function (data) {
+                .random(),
+                function(data) {
                     var latestVersion = data.version;
                     if (localVersion !== latestVersion) {
                         $('#version').html('Latest Version: ' + latestVersion);
diff --git a/version.json b/version.json
index 32922994..dd3025c9 100644
--- a/version.json
+++ b/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "2024.2.5"
+    "version": "2024.2.5.1"
 }
\ No newline at end of file