cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

update add remark on white form transactions

Browse Source
This commit is contained in:
edmondlang
2024-04-25 16:48:39 +08:00
parent 32d8b26451
commit 20cb00ed24
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routes/web.php
+17 -17
View File
@@ -994,8 +994,6 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
echo '<th style="border: 1px solid black;">Amount</th>';
echo '<th style="border: 1px solid black;">Payment Date</th>';
echo '<th style="border: 1px solid black;">Status</th>';
echo '<th style="border: 1px solid black;">Remark</th>';
echo '<th style="border: 1px solid black;">Add Remarks</th>';
echo '</tr>';
echo '</thead>';
echo '<tbody>';
@@ -1006,21 +1004,6 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
echo '<td style="border: 1px solid black;">' . round($approvedTransaction->amount, 2) . '</td>';
echo '<td style="border: 1px solid black;">' . $approvedTransaction->created_at->format('d-m-Y h:i A') . '</td>';
echo '<td style="border: 1px solid black;">' . ApprovalStatus::APPROVAL_STATUS_ID[$approvedTransaction->status] . '</td>';
$remarks = $approvedTransaction->remarks;
echo '<td style="border: 1px solid black;">';
foreach ($remarks as $remark) {
echo $remark->created_at->format('d-m-Y | h:i A') . ' - ';
echo $remark->content;
echo '<br>';
}
echo '</td>';
echo '<td style="border: 1px solid black;">' ;
echo '<form method="post" action="' . route('transaction.create-remark', ['id' => $approvedTransaction->id]) . '">';
echo '<input type="text" name="content" placeholder="Enter remark" required>';
echo '<button type="submit">Add Remark</button>';
echo csrf_field();
echo '</form>';
echo '</td>';
echo '</tr>';
}
@@ -1043,6 +1026,8 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
echo '<th style="border: 1px solid black;">Upload bank slip Date</th>';
echo '<th style="border: 1px solid black;">PO submit date</th>';
echo '<th style="border: 1px solid black;">PO approve date</th>';
echo '<th style="border: 1px solid black;">Remark</th>';
echo '<th style="border: 1px solid black;">Add Remarks</th>';
echo '</tr>';
echo '</thead>';
echo '<tbody>';
@@ -1062,6 +1047,21 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
echo '<td style="border: 1px solid black; color: '.($bill->status === ApprovalStatus::APPROVED ? "green" : "red").';">' . ($bill->status === ApprovalStatus::APPROVED ? $bill->updated_at->format('d-m-Y h:i A') : 'Pending Upload') . '</td>';
echo '<td style="border: 1px solid black; color: '.($po ? "green" : "red").';">' . ($po ? $po->updated_at->format('d-m-Y h:i A') : 'Pending Submission') . '</td>';
echo '<td style="border: 1px solid black;">' . ($po ? ($po->status === ApprovalStatus::APPROVED ? $po->updated_at->format('d-m-Y h:i A') : '' ) : '' ). '</td>';
$remarks = $bill->remarks;
echo '<td style="border: 1px solid black;">';
foreach ($remarks as $remark) {
echo $remark->created_at->format('d-m-Y : h:i A') . ' - ';
echo $remark->content;
echo '<br>';
}
echo '</td>';
echo '<td style="border: 1px solid black;">' ;
echo '<form method="post" style="display:flex; margin: 10px" action="' . route('transaction.create-remark', ['id' => $bill->id]) . '">';
echo '<input type="text" name="content" placeholder="Enter remark" required>';
echo '<button type="submit">Add</button>';
echo csrf_field();
echo '</form>';
echo '</td>';
echo '</tr>';
}