Fix Pint formatting
This commit is contained in:
+14
-15
@@ -2,7 +2,6 @@
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use App\Models\BaseModel;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class Expense extends BaseModel
|
||||
@@ -31,14 +30,14 @@ class Expense extends BaseModel
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'amount' => 'decimal:2', // adjust precision if needed
|
||||
'date_of_purchase'=> 'date', // change to 'datetime' if stored as DATETIME
|
||||
'amount' => 'decimal:2', // adjust precision if needed
|
||||
'date_of_purchase' => 'date', // change to 'datetime' if stored as DATETIME
|
||||
|
||||
'purchased_by' => 'integer',
|
||||
'added_by' => 'integer',
|
||||
'reimbursement_id'=> 'integer',
|
||||
'approved_by' => 'integer',
|
||||
'updated_by' => 'integer',
|
||||
'purchased_by' => 'integer',
|
||||
'added_by' => 'integer',
|
||||
'reimbursement_id' => 'integer',
|
||||
'approved_by' => 'integer',
|
||||
'updated_by' => 'integer',
|
||||
];
|
||||
|
||||
/* Optional relationships */
|
||||
@@ -71,7 +70,7 @@ class Expense extends BaseModel
|
||||
public static function getReimbursedExpensesWithDetails(array $filters = [])
|
||||
{
|
||||
$q = DB::table('expenses')
|
||||
->selectRaw("
|
||||
->selectRaw('
|
||||
expenses.*,
|
||||
r.id AS reimb_id,
|
||||
r.amount AS reimb_amount, r.reimbursement_method, r.check_number,
|
||||
@@ -80,24 +79,24 @@ class Expense extends BaseModel
|
||||
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
|
||||
")
|
||||
')
|
||||
->join('reimbursements as r', 'r.expense_id', '=', 'expenses.id')
|
||||
->leftJoin('users as reimb', 'reimb.id', '=', 'r.reimbursed_to')
|
||||
->leftJoin('users as approver', 'approver.id', '=', 'r.approved_by');
|
||||
|
||||
if (!empty($filters['school_year'])) {
|
||||
if (! empty($filters['school_year'])) {
|
||||
$q->where('r.school_year', $filters['school_year']);
|
||||
}
|
||||
if (!empty($filters['semester'])) {
|
||||
if (! empty($filters['semester'])) {
|
||||
$q->where('r.semester', $filters['semester']);
|
||||
}
|
||||
if (!empty($filters['status'])) {
|
||||
if (! empty($filters['status'])) {
|
||||
$q->where('r.status', $filters['status']);
|
||||
}
|
||||
if (!empty($filters['user_id'])) {
|
||||
if (! empty($filters['user_id'])) {
|
||||
$q->where('r.reimbursed_to', $filters['user_id']);
|
||||
}
|
||||
|
||||
return $q->orderByDesc('r.created_at');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user