Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Exports/DonationDataReportExport.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ public function map($row): array
$row->process_history_id,
$row->process_history->status,
$row->process_history->end_at,
$row->process_history->created_by->name,
$row->process_history->created_by ? $row->process_history->created_by->name : '',
$row->created_at,
$row->process_history->updated_by->name,
$row->process_history->updated_by ? $row->process_history->updated_by->name : '',
$row->updated_at
];
}
Expand Down
2 changes: 1 addition & 1 deletion app/Imports/DonationsImportBCP.php
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public function customValidationMessages()
'1.max' => 'The 1 field must be 6 characters.',
'2.numeric' => 'The 2 field must be a number',
'3.date' => 'The 3 field is not a valid date',
'4.in' => 'The 4 field is invalid frequency (either Biweekly or One-Time Deduction)',
'4.in' => 'The 4 field is invalid frequency (either "Bi-Weekly" or "One-Time")',
'5.numeric' => 'The 5 field must be a number',

'pledge.exists' => 'No pledge was setup for this pecsf_id.',
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 18 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions tests/Feature/ChallengePageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,8 @@ public function test_authorized_user_download_daily_campaign_by_bu_report_succes
$this->actingAs($this->user);
$response = $this->get('/challenge/download?sort=region');

$filename = 'Daily_Campaign_Update_Region_' . today()->format('Y-m-d') . '.xlsx';

$setting = Setting::first();

if (today() > $setting->campaign_start_date && today() <= $setting->campaign_final_date) {
Expand Down