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/PriorYearBalanceCarryforwardService.php
+23 -53
View File
@@ -20,20 +20,16 @@ class PriorYearBalanceCarryforwardService
$refunds = $this->refundTotals();
$q = DB::table('invoices')->where('school_year', $from);
if ($parentId) {
$q->where('parent_id', $parentId);
}
if ($parentId) $q->where('parent_id', $parentId);
$invoices = $q->get();
$byParent = [];
foreach ($invoices as $invoice) {
$invoiceId = (int) $invoice->id;
$balance = max(0, (float) ($invoice->total_amount ?? 0) - (float) ($payments[$invoiceId] ?? 0) - (float) ($discounts[$invoiceId] ?? 0) - (float) ($refunds[$invoiceId] ?? 0));
if ($balance <= 0) {
continue;
}
if ($balance <= 0) continue;
$pid = (int) $invoice->parent_id;
if (! isset($byParent[$pid])) {
if (!isset($byParent[$pid])) {
$existing = FinanceBalanceCarryforward::query()->where('parent_id', $pid)->where('from_school_year', $from)->where('to_school_year', $to)->first();
$byParent[$pid] = [
'parent_id' => $pid,
@@ -45,17 +41,15 @@ class PriorYearBalanceCarryforwardService
'existing_carryforward_id' => $existing?->id,
'warnings' => [],
];
if ($existing) {
$byParent[$pid]['warnings'][] = 'source invoice already carried forward';
}
if ($existing) $byParent[$pid]['warnings'][] = 'source invoice already carried forward';
}
$byParent[$pid]['source_invoice_ids'][] = $invoiceId;
$byParent[$pid]['source_balance_amount'] += $balance;
$byParent[$pid]['proposed_carryforward_amount'] += $balance;
}
$rows = array_values(array_filter($byParent, fn ($r) => $r['source_balance_amount'] >= $minimum));
usort($rows, fn ($a, $b) => $b['source_balance_amount'] <=> $a['source_balance_amount']);
$rows = array_values(array_filter($byParent, fn($r) => $r['source_balance_amount'] >= $minimum));
usort($rows, fn($a, $b) => $b['source_balance_amount'] <=> $a['source_balance_amount']);
return ['fromSchoolYear' => $from, 'toSchoolYear' => $to, 'generatedAt' => now()->toISOString(), 'rows' => $rows];
}
@@ -65,9 +59,7 @@ class PriorYearBalanceCarryforwardService
$preview = $this->preview($filters);
$created = [];
foreach ($preview['rows'] as $row) {
if (! empty($row['existing_carryforward_id'])) {
continue;
}
if (!empty($row['existing_carryforward_id'])) continue;
$created[] = FinanceBalanceCarryforward::query()->create([
'parent_id' => $row['parent_id'],
'from_school_year' => $row['from_school_year'],
@@ -82,7 +74,6 @@ class PriorYearBalanceCarryforwardService
'metadata_json' => ['warnings' => $row['warnings']],
])->toArray();
}
return ['created' => $created, 'skipped' => count($preview['rows']) - count($created)];
}
@@ -90,7 +81,6 @@ class PriorYearBalanceCarryforwardService
{
$cf = FinanceBalanceCarryforward::query()->findOrFail($id);
$cf->fill(['status' => 'approved', 'approved_by' => $actorId, 'approved_at' => now()])->save();
return $cf->fresh()->toArray();
}
@@ -104,7 +94,6 @@ class PriorYearBalanceCarryforwardService
$cf->reason = $reason ?: $cf->reason;
$cf->approved_by = $cf->approved_by ?: $actorId;
$cf->save();
return $cf->fresh()->toArray();
}
@@ -115,7 +104,6 @@ class PriorYearBalanceCarryforwardService
$cf->remaining_amount = max(0, (float) $cf->carryforward_amount - (float) $cf->waived_amount + $amount);
$cf->reason = $reason ?: $cf->reason;
$cf->save();
return $cf->fresh()->toArray();
}
@@ -123,7 +111,7 @@ class PriorYearBalanceCarryforwardService
{
return DB::transaction(function () use ($id, $actorId) {
$cf = FinanceBalanceCarryforward::query()->lockForUpdate()->findOrFail($id);
if (! in_array($cf->status, ['approved', 'draft', 'pending_review'], true)) {
if (!in_array($cf->status, ['approved','draft','pending_review'], true)) {
return $cf->toArray() + ['warning' => 'Carryforward is not in a postable status.'];
}
@@ -132,14 +120,14 @@ class PriorYearBalanceCarryforwardService
if (Schema::hasTable('invoices')) {
$invoiceId = DB::table('invoices')->insertGetId([
'parent_id' => $cf->parent_id,
'invoice_number' => 'CF-'.$cf->to_school_year.'-'.$cf->id,
'invoice_number' => 'CF-' . $cf->to_school_year . '-' . $cf->id,
'total_amount' => $amount,
'balance' => $amount,
'paid_amount' => 0,
'school_year' => $cf->to_school_year,
'issue_date' => now()->toDateString(),
'status' => $amount > 0 ? 'unpaid' : 'paid',
'description' => 'Previous year balance from '.$cf->from_school_year,
'description' => 'Previous year balance from ' . $cf->from_school_year,
'created_at' => now(),
'updated_at' => now(),
'updated_by' => $actorId,
@@ -149,7 +137,6 @@ class PriorYearBalanceCarryforwardService
$cf->status = 'posted_to_new_year';
$cf->remaining_amount = $amount;
$cf->save();
return $cf->fresh()->toArray();
});
}
@@ -157,54 +144,37 @@ class PriorYearBalanceCarryforwardService
public function report(array $filters): array
{
$q = FinanceBalanceCarryforward::query();
foreach (['from_school_year', 'to_school_year', 'parent_id', 'status'] as $field) {
if (! empty($filters[$field])) {
$q->where($field, $filters[$field]);
}
foreach (['from_school_year','to_school_year','parent_id','status'] as $field) {
if (!empty($filters[$field])) $q->where($field, $filters[$field]);
}
return ['generatedAt' => now()->toISOString(), 'rows' => $q->orderByDesc('remaining_amount')->get()->toArray()];
}
public function csvRows(array $report): array
{
$rows = [['ID', 'Parent ID', 'From Year', 'To Year', 'Source Invoices', 'Source Balance', 'Carryforward', 'Waived', 'Adjusted', 'Remaining', 'Status', 'Posted Invoice']];
$rows = [['ID','Parent ID','From Year','To Year','Source Invoices','Source Balance','Carryforward','Waived','Adjusted','Remaining','Status','Posted Invoice']];
foreach ($report['rows'] as $r) {
$rows[] = [$r['id'], $r['parent_id'], $r['from_school_year'], $r['to_school_year'], json_encode($r['source_invoice_ids_json'] ?? []), $r['source_balance_amount'], $r['carryforward_amount'], $r['waived_amount'], $r['adjusted_amount'], $r['remaining_amount'], $r['status'], $r['posted_invoice_id'] ?? null];
$rows[] = [$r['id'],$r['parent_id'],$r['from_school_year'],$r['to_school_year'],json_encode($r['source_invoice_ids_json'] ?? []),$r['source_balance_amount'],$r['carryforward_amount'],$r['waived_amount'],$r['adjusted_amount'],$r['remaining_amount'],$r['status'],$r['posted_invoice_id'] ?? null];
}
return $rows;
}
private function paymentTotals(string $schoolYear): array
{
if (! Schema::hasTable('payments')) {
return [];
}
return DB::table('payments')->where('school_year', $schoolYear)->whereNotIn('status', ['void', 'voided', 'failed', 'cancelled', 'canceled', 'reversed'])->select('invoice_id', DB::raw('COALESCE(SUM(paid_amount),0) total'))->groupBy('invoice_id')->pluck('total', 'invoice_id')->map(fn ($v) => (float) $v)->all();
if (!Schema::hasTable('payments')) return [];
return DB::table('payments')->where('school_year', $schoolYear)->whereNotIn('status', ['void','voided','failed','cancelled','canceled','reversed'])->select('invoice_id', DB::raw('COALESCE(SUM(paid_amount),0) total'))->groupBy('invoice_id')->pluck('total','invoice_id')->map(fn($v)=>(float)$v)->all();
}
private function discountTotals(): array
{
if (! Schema::hasTable('discount_usages')) {
return [];
}
$col = Schema::hasColumn('discount_usages', 'discount_amount') ? 'discount_amount' : 'amount';
return DB::table('discount_usages')->select('invoice_id', DB::raw('COALESCE(SUM('.$col.'),0) total'))->groupBy('invoice_id')->pluck('total', 'invoice_id')->map(fn ($v) => (float) $v)->all();
if (!Schema::hasTable('discount_usages')) return [];
$col = Schema::hasColumn('discount_usages','discount_amount') ? 'discount_amount' : 'amount';
return DB::table('discount_usages')->select('invoice_id', DB::raw('COALESCE(SUM('.$col.'),0) total'))->groupBy('invoice_id')->pluck('total','invoice_id')->map(fn($v)=>(float)$v)->all();
}
private function refundTotals(): array
{
if (! Schema::hasTable('refunds')) {
return [];
}
$col = Schema::hasColumn('refunds', 'refund_amount') ? 'refund_amount' : (Schema::hasColumn('refunds', 'amount') ? 'amount' : null);
if (! $col) {
return [];
}
return DB::table('refunds')->whereNotIn('status', ['void', 'voided', 'cancelled', 'canceled'])->select('invoice_id', DB::raw('COALESCE(SUM('.$col.'),0) total'))->groupBy('invoice_id')->pluck('total', 'invoice_id')->map(fn ($v) => (float) $v)->all();
if (!Schema::hasTable('refunds')) return [];
$col = Schema::hasColumn('refunds','refund_amount') ? 'refund_amount' : (Schema::hasColumn('refunds','amount') ? 'amount' : null);
if (!$col) return [];
return DB::table('refunds')->whereNotIn('status', ['void','voided','cancelled','canceled'])->select('invoice_id', DB::raw('COALESCE(SUM('.$col.'),0) total'))->groupBy('invoice_id')->pluck('total','invoice_id')->map(fn($v)=>(float)$v)->all();
}
}