mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git
synced 2026-08-19 04:23:55 +00:00
tidy up whiteform report
This commit is contained in:
+21
-12
@@ -882,14 +882,17 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
|
||||
|
||||
|
||||
Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}', function ($from_date, $to_date) {
|
||||
$approvedTransactions = Transaction::where('type', TransactionType::PAYMENT)->where('status', ApprovalStatus::APPROVED)->where('owner_type', '!=', Wallet::class)->get();
|
||||
|
||||
echo '<h1>Approved Payments</h1>';
|
||||
$approvedTransactions = Transaction::where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->where('owner_type', '!=', Wallet::class)->orderBy('status')->get();
|
||||
|
||||
echo '<h1>Pending Orders Payments</h1>';
|
||||
echo '<table style="border-collapse: collapse;">';
|
||||
echo '<thead>';
|
||||
echo '<tr>';
|
||||
echo '<th style="border: 1px solid black;">Booking</th>';
|
||||
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 '</tr>';
|
||||
echo '</thead>';
|
||||
echo '<tbody>';
|
||||
@@ -897,7 +900,9 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
|
||||
foreach ($approvedTransactions as $approvedTransaction) {
|
||||
echo '<tr>';
|
||||
echo '<td style="border: 1px solid black;"><a href="' . \route('booking.details', $approvedTransaction->owner->marking) . '" target="_blank">' . $approvedTransaction->owner->marking . '</a></td>';
|
||||
echo '<td style="border: 1px solid black;">' . $approvedTransaction->amount . '</td>';
|
||||
echo '<td style="border: 1px solid black;">' . $approvedTransaction->created_at . '</td>';
|
||||
echo '<td style="border: 1px solid black;">' . ApprovalStatus::APPROVAL_STATUS_ID[$approvedTransaction->status] . '</td>';
|
||||
echo '</tr>';
|
||||
}
|
||||
|
||||
@@ -907,30 +912,34 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
|
||||
$startDate = Carbon::createFromFormat('d-m-Y', $from_date)->startOfDay();
|
||||
$endDate = Carbon::createFromFormat('d-m-Y', $to_date)->endOfDay();
|
||||
|
||||
$approvalSatatusArray = ApprovalStatus::APPROVAL_STATUS_ID;
|
||||
|
||||
echo '<h1>Bills in the date range</h1>';
|
||||
echo '<table style="border-collapse: collapse; width: 100%;">';
|
||||
echo '<thead>';
|
||||
echo '<tr>';
|
||||
echo '<th style="border: 1px solid black;">Status</th>';
|
||||
echo '<th style="border: 1px solid black;">Bills Created At</th>';
|
||||
echo '<th style="border: 1px solid black;">Booking</th>';
|
||||
echo '<th style="border: 1px solid black;">Payment Date</th>';
|
||||
echo '<th style="border: 1px solid black;">Customer payment date</th>';
|
||||
echo '<th style="border: 1px solid black;">White form date</th>';
|
||||
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 '</tr>';
|
||||
echo '</thead>';
|
||||
echo '<tbody>';
|
||||
|
||||
|
||||
$datas = Transaction::where('type', TransactionType::BILL)->whereBetween('created_at', [$startDate, $endDate])->get();
|
||||
$bills = Transaction::where('type', TransactionType::BILL)->whereBetween('created_at', [$startDate, $endDate])->get();
|
||||
|
||||
foreach ($datas as $data) {
|
||||
foreach ($bills as $bill) {
|
||||
echo '<tr>';
|
||||
$payment = $data->owner;
|
||||
echo '<td style="border: 1px solid black;">' . $approvalSatatusArray[$data['status']] . '</td>';
|
||||
echo '<td style="border: 1px solid black;">' . $data->created_at . '</td>';
|
||||
echo '<td style="border: 1px solid black;"><a href="' . \route('booking.details', $data->owner->owner->marking) . '" target="_blank">' . $data->owner->owner->marking . '</a></td>';
|
||||
$payment = $bill->owner;
|
||||
$po = $payment->owner->transaction()->where('type', TransactionType::PURCHASE_ORDER)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->first();
|
||||
echo '<td style="border: 1px solid black;"><a href="' . \route('booking.details', $bill->owner->owner->marking) . '" target="_blank">' . $payment->owner->marking . '</a></td>';
|
||||
echo '<td style="border: 1px solid black;">' . $payment->created_at . '</td>';
|
||||
echo '<td style="border: 1px solid black;">' . $bill->created_at . '</td>';
|
||||
echo '<td style="border: 1px solid black;">' . $bill->status === ApprovalStatus::APPROVED ? $bill->updated_at : 'Pending Upload' . '</td>';
|
||||
echo '<td style="border: 1px solid black;">' . $po ? $po->updated_at : 'Pending Submission' . '</td>';
|
||||
echo '<td style="border: 1px solid black;">' . $po ? ($po->status === ApprovalStatus::APPROVED ? $po->updated_at : '' ) : '' . '</td>';
|
||||
echo '</tr>';
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user