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

apply the school year concept
Tests / PHPUnit (push) Failing after 1m19s
Details

Browse Source
This commit is contained in:
root
2026-07-14 00:59:00 -04:00
parent 504c3bc9f9
commit feb1b29a32
73 changed files with 4288 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/ExpenseModel.php
+46 -10
View File
@@ -39,23 +39,59 @@ class ExpenseModel extends Model
{
$db = \Config\Database::connect();
$builder = $db->table('expenses');
$builder->select('expenses.*,
r.id AS reimb_id,
r.amount AS reimb_amount, r.reimbursement_method, r.check_number,
r.receipt_path AS reimb_receipt, r.status AS reimb_status,
r.school_year, r.semester, r.created_at AS reimb_created_at,
r.reimbursed_to AS reimb_recipient_id,
reimb.firstname AS reimb_firstname, reimb.lastname AS reimb_lastname,
approver.firstname AS approver_firstname, approver.lastname AS approver_lastname');
$hasReimbursementSchoolYear = $db->fieldExists('school_year', 'reimbursements');
$hasReimbursementSemester = $db->fieldExists('semester', 'reimbursements');
$hasExpenseSchoolYear = $db->fieldExists('school_year', 'expenses');
$hasExpenseSemester = $db->fieldExists('semester', 'expenses');
$select = [
'expenses.*',
'r.id AS reimb_id',
'r.amount AS reimb_amount',
'r.reimbursement_method',
'r.check_number',
'r.receipt_path AS reimb_receipt',
'r.status AS reimb_status',
'r.created_at AS reimb_created_at',
'r.reimbursed_to AS reimb_recipient_id',
'reimb.firstname AS reimb_firstname',
'reimb.lastname AS reimb_lastname',
'approver.firstname AS approver_firstname',
'approver.lastname AS approver_lastname',
];
if ($hasReimbursementSchoolYear) {
$select[] = 'r.school_year';
} elseif ($hasExpenseSchoolYear) {
$select[] = 'expenses.school_year AS school_year';
}
if ($hasReimbursementSemester) {
$select[] = 'r.semester';
} elseif ($hasExpenseSemester) {
$select[] = 'expenses.semester AS semester';
} else {
$select[] = 'NULL AS semester';
}
$builder->select(implode(",\n", $select), false);
$builder->join('reimbursements r', 'r.expense_id = expenses.id', 'inner');
$builder->join('users reimb', 'reimb.id = r.reimbursed_to', 'left');
$builder->join('users approver', 'approver.id = r.approved_by', 'left');
if (!empty($filters['school_year'])) {
$builder->where('r.school_year', $filters['school_year']);
if ($hasReimbursementSchoolYear) {
$builder->where('r.school_year', $filters['school_year']);
} elseif ($hasExpenseSchoolYear) {
$builder->where('expenses.school_year', $filters['school_year']);
}
}
if (!empty($filters['semester'])) {
$builder->where('r.semester', $filters['semester']);
if ($hasReimbursementSemester) {
$builder->where('r.semester', $filters['semester']);
} elseif ($hasExpenseSemester) {
$builder->where('expenses.semester', $filters['semester']);
}
}
if (!empty($filters['status'])) {
$builder->where('r.status', $filters['status']);