Merge remote-tracking branch 'origin/staging' into origin/production

This commit is contained in:
Linksehat Staging Server
2024-02-01 10:37:56 +07:00
4 changed files with 34 additions and 3 deletions

View File

@@ -154,7 +154,8 @@ class ReportLogController extends Controller
$writer->openToFile(public_path('files/Report-Request-Final-LOG.xlsx'));
$headerArray = [
'Code',
'Member',
'Member Name',
'Member Code',
'GL Create Time',
'GL Submit Time',
'GL Create By',
@@ -223,6 +224,7 @@ class ReportLogController extends Controller
$rowData = [
$row['code'], // code
$row['member'] ? $row['member']['name'] : '', // name
$row['member'] ? $row['member']['member_id'] : '', // member id
$formattedDateTime ? $formattedDateTime : "-" , // created at
$row['approved_at'] ? $row['approved_at'] : '-', // submission date
$row['approved_by'] ? Helper::userName($row['approved_by']) : '-', // created by