error fixes on report screen

Author: rathorevaibhav

Modules/Report/Config/config.php

@@ -19,41 +19,6 @@
                         'name' => 'Export',
                         'head' => 'Direct Income',
                     ],
-
-                    'stripe_india' => [
-                        'name' => 'Stripe India',
-                        'head' => 'Direct Income',
-                    ],
-
-                    'stripe_international' => [
-                        'name' => 'Stripe International',
-                        'head' => 'Direct Income',
-                    ],
-
-                    'commission_received' => [
-                        'name' => 'Commission Received',
-                        'head' => 'Direct Income',
-                    ],
-
-                    'cash_back' => [
-                        'name' => 'Cash Back',
-                        'head' => 'Indirect income',
-                    ],
-
-                    'discount_received' => [
-                        'name' => 'Discount Received',
-                        'head' => 'Indirect income',
-                    ],
-
-                    'interest_on_f_d' => [
-                        'name' => 'Interest on FD',
-                        'head' => 'Indirect income',
-                    ],
-
-                    'foreign_exchange_loss' => [
-                        'name' => 'Foreign Exchange Loss',
-                        'head' => 'Bank Charges',
-                    ],
                 ],
             ],
         ],

Modules/Report/Services/Finance/RevenueReportService.php

@@ -151,6 +151,46 @@ private function getAvgCurrencyRates($startDate, $endDate)
         return $results;
     }
 
+    /**
+     * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter
+     */
+    private function getParticularAmountForDomestic(array $particular, object $startDate, object $endDate): array
+    {
+        $invoices = $this->invoiceService->getInvoicesBetweenDates($startDate, $endDate, 'indian');
+        $totalAmount = 0;
+        $results = [];
+
+        foreach ($invoices as $invoice) {
+            $dateKey = $invoice->sent_on->format($this->dataKeyFormat);
+            $totalAmount += (int) $invoice->amount;
+            $results[$dateKey] = ($results[$dateKey] ?? 0) + (int) $invoice->amount;
+        }
+
+        $results['total'] = $totalAmount;
+
+        return $results;
+    }
+    /**
+     * @phpcsSuppress SlevomatCodingStandard.Functions.UnusedParameter
+     */
+    private function getParticularAmountForExport(array $particular, object $startDate, object $endDate): array
+    {
+        $totalAmount = 0;
+        $results = [];
+        $invoices = $this->invoiceService->getInvoicesBetweenDates($startDate, $endDate, 'non-indian');
+
+        foreach ($invoices as $invoice) {
+            $dateKey = $invoice->sent_on->format($this->dataKeyFormat);
+            $exchangeRate = $this->avgCurrencyRates[$dateKey][strtolower($invoice->currency)] ?? $this->defaultCurrencyRates;
+            $amount = (float) ($invoice->amount) * (float) ($exchangeRate);
+            $results[$dateKey] = ($results[$dateKey] ?? 0) + $amount;
+            $totalAmount += $amount;
+        }
+        $results['total'] = $totalAmount;
+
+        return $results;
+    }
+
     private static function handleInvoiceDataForClient($invoice, $amountMonthWise)
     {
         $invoiceAmount = round($invoice->total_amount_in_inr, 2);