melabidi/alrahma_sunday_school_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix gitlab tests

Browse Source
This commit is contained in:
root
2026-06-09 02:32:58 -04:00
parent 20a0b6c4e5
commit 6def9993da
1489 changed files with 10449 additions and 11356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Finance/FinancialReportService.php
+5 -4
View File
@@ -9,7 +9,8 @@ class FinancialReportService
public function __construct(
private FinancialPaymentService $payments,
private FinancialSchoolYearService $schoolYears
) {}
) {
}
public function getReport(?string $dateFrom, ?string $dateTo, ?string $schoolYear): array
{
@@ -22,7 +23,7 @@ class FinancialReportService
$expenseQuery = DB::table('expenses');
$reimbQuery = DB::table('reimbursements');
if (! empty($schoolYear)) {
if (!empty($schoolYear)) {
$invoiceQuery->where('invoices.school_year', $schoolYear);
$refundQuery->where('school_year', $schoolYear);
$discountQuery->where('school_year', $schoolYear);
@@ -30,7 +31,7 @@ class FinancialReportService
$reimbQuery->where('school_year', $schoolYear);
}
if (! empty($dateFrom)) {
if (!empty($dateFrom)) {
$invoiceQuery->whereRaw('DATE(COALESCE(invoices.issue_date, invoices.created_at)) >= ?', [$dateFrom]);
$refundQuery->whereRaw('DATE(COALESCE(refunded_at, created_at)) >= ?', [$dateFrom]);
$discountQuery->whereRaw('DATE(COALESCE(used_at, created_at)) >= ?', [$dateFrom]);
@@ -38,7 +39,7 @@ class FinancialReportService
$reimbQuery->whereRaw('DATE(created_at) >= ?', [$dateFrom]);
}
if (! empty($dateTo)) {
if (!empty($dateTo)) {
$invoiceQuery->whereRaw('DATE(COALESCE(invoices.issue_date, invoices.created_at)) <= ?', [$dateTo]);
$refundQuery->whereRaw('DATE(COALESCE(refunded_at, created_at)) <= ?', [$dateTo]);
$discountQuery->whereRaw('DATE(COALESCE(used_at, created_at)) <= ?', [$dateTo]);