diff --git a/routes/web.php b/routes/web.php index d6798271..06e0dc67 100644 --- a/routes/web.php +++ b/routes/web.php @@ -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 '
| Booking | '; + echo 'Amount | '; echo 'Payment Date | '; + echo 'Status | '; echo '|||||
|---|---|---|---|---|---|---|---|---|
| ' . $approvedTransaction->owner->marking . ' | '; + echo '' . $approvedTransaction->amount . ' | '; echo '' . $approvedTransaction->created_at . ' | '; + echo '' . ApprovalStatus::APPROVAL_STATUS_ID[$approvedTransaction->status] . ' | '; echo '
| Status | '; - echo 'Bills Created At | '; echo 'Booking | '; - echo 'Payment Date | '; + echo 'Customer payment date | '; + echo 'White form date | '; + echo 'Upload bank slip Date | '; + echo 'PO submit date | '; + echo 'PO approve date | '; echo '
|---|---|---|---|---|---|---|---|---|
| ' . $approvalSatatusArray[$data['status']] . ' | '; - echo '' . $data->created_at . ' | '; - echo '' . $data->owner->owner->marking . ' | '; + $payment = $bill->owner; + $po = $payment->owner->transaction()->where('type', TransactionType::PURCHASE_ORDER)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->first(); + echo '' . $payment->owner->marking . ' | '; echo '' . $payment->created_at . ' | '; + echo '' . $bill->created_at . ' | '; + echo '' . $bill->status === ApprovalStatus::APPROVED ? $bill->updated_at : 'Pending Upload' . ' | '; + echo '' . $po ? $po->updated_at : 'Pending Submission' . ' | '; + echo '' . $po ? ($po->status === ApprovalStatus::APPROVED ? $po->updated_at : '' ) : '' . ' | '; echo '