add logic to show average revenue

ColoredCow · Feb 29, 2024 · d815670 · d815670
1 parent 1ee04ab
commit d815670
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Modules/Report/Resources/assets/js/app.js b/Modules/Report/Resources/assets/js/app.js
@@ -106,6 +106,7 @@ function clientWiseRevenueTrendsReport(reportsData) {
 	const canvasElementId = "clientWiseReportRevenueTrends";
 	const labels = reportsData.labels;
 	const currentPeriodTotalRevenue = reportsData.data.total_amount;
+	const averageRevenue = reportsData.data.average_amount;
 	const chartData = {
 		labels: labels,
 		datasets: [
@@ -129,7 +130,7 @@ function clientWiseRevenueTrendsReport(reportsData) {
 			responsive: true,
 			title: {
 				display: true,
-				text: "Total revenue: Rs. " + currentPeriodTotalRevenue
+				text: "Total Revenue: Rs. " + currentPeriodTotalRevenue + " | Average Revenue: Rs. " + averageRevenue,
 			},
 			scales: {
 				yAxes: [

diff --git a/Modules/Report/Services/Finance/RevenueReportService.php b/Modules/Report/Services/Finance/RevenueReportService.php
@@ -126,11 +126,13 @@ public static function getRevenueReportDataForClient($filters, $client)
                 $amountMonthWise = $data['amountMonthWise'];
             }
         }
+        $averageAmount = $totalAmount / count($amountMonthWise);
 
         return [
             'months' => array_keys($amountMonthWise),
             'amount' => array_values($amountMonthWise),
             'total_amount' => round($totalAmount, 2),
+            'average_amount' => round($averageAmount, 2),
         ];
     }