diff --git a/app/Services/System/AnalysisService.php b/app/Services/System/AnalysisService.php index 1c880e3..6263bd7 100644 --- a/app/Services/System/AnalysisService.php +++ b/app/Services/System/AnalysisService.php @@ -319,12 +319,13 @@ public function getMonthlyRevenue(?Carbon $startDate = null, ?Carbon $endDate = $revenue = $monthlyData->firstWhere('month_key', $key); $fees = $monthlyFees->get($key, 0); $discount = (int) ($revenue->total_discount ?? 0); + $hpp = (int) ($monthlyHpp->get($key, 0)); $deduction = $discount + $fees; $result[] = [ 'month' => $monthLabel, 'total' => (int) ($revenue->total_revenue ?? 0), - 'net' => (int) ($revenue->total_revenue ?? 0) - $deduction, + 'net' => (int) ($revenue->total_revenue ?? 0) - $deduction - $hpp, 'deduction' => $deduction, ]; diff --git a/resources/js/pages/admin/Analysis.vue b/resources/js/pages/admin/Analysis.vue index 8edc6f5..e018684 100644 --- a/resources/js/pages/admin/Analysis.vue +++ b/resources/js/pages/admin/Analysis.vue @@ -194,7 +194,7 @@ const revenueChartConfig = { const revenueTotals = computed(() => ({ total: props.revenueSummary.total_revenue, - net: props.revenueSummary.total_revenue - props.revenueSummary.total_deduction, + net: props.revenueSummary.total_revenue - props.revenueSummary.total_deduction - props.profitMetrics.hpp, deduction: props.revenueSummary.total_deduction, }));