diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue index bd7d89ca..caba3fee 100644 --- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue +++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue @@ -289,7 +289,7 @@ -
+
diff --git a/resources/assets/vue/components/bookings/elements/RefundVerificationComponent.vue b/resources/assets/vue/components/bookings/elements/RefundVerificationComponent.vue index a1f6c7f4..9f817b7c 100644 --- a/resources/assets/vue/components/bookings/elements/RefundVerificationComponent.vue +++ b/resources/assets/vue/components/bookings/elements/RefundVerificationComponent.vue @@ -25,6 +25,14 @@ {{data.booking.company.reference}}
+
+ + + + + + +
Amount
diff --git a/routes/web.php b/routes/web.php index 6d92fce9..bc0235d7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -475,6 +475,7 @@ Route::get('/approve_refunds', function(Request $request){ echo 'Last Updated At'; echo 'Bank Type'; echo 'Bank Holder Name'; + echo 'Note Remark'; echo ''; foreach ($payments->orderBy('updated_at', 'DESC')->get() as $index => $payment){ $booking = $payment->owner; @@ -499,6 +500,14 @@ Route::get('/approve_refunds', function(Request $request){ $remark = 'Pre ' . $remark; } + $refundTransactions = $payment->transactions()->refunds()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get(); + + $noteRemark = ''; + + foreach ($refundTransactions as $refund) { + $noteRemark .= implode(', ', $refund->remarks->pluck('content')->toArray()) . ' '; + } + echo ''; echo ''.($index + 1).'.'; echo ''.$payment->updated_at->format('d-M-y').''; @@ -516,6 +525,7 @@ Route::get('/approve_refunds', function(Request $request){ echo ''.$payment->updated_at->diffForHumans().''; echo ''.$bankType.''; echo ''.$booking->bank->holder_name.''; + echo ''.$noteRemark.''; echo ''; } echo '';