Merge branch 'pending-order-export-fomart-rearrangement' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development

This commit is contained in:
Aqqil Azman
2024-08-06 19:42:46 +08:00
+3 -2
View File
@@ -405,6 +405,7 @@ Route::get('/pending_orders', function(){
->whereDoesntHave('transactions', function ($query) {
return $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION]);
})
->orderBy('updated_at', 'desc')
->get();
echo '<table>';
@@ -425,11 +426,11 @@ Route::get('/pending_orders', function(){
echo '<tr>';
echo '<td>'.$payment->updated_at->format('d-M-y').'</td>';
echo '<td>'.$booking->marking.'</td>';
echo '<td>'.\App\Classes\ValueObjects\Constants\PaymentMethodType::PAYMENT_METHODS_ID[$payment->payment_method].'</td>';
echo '<td>'.$booking->company->reference.'</td>';
echo '<td>'.$payment->currency->short_code.'</td>';
echo '<td>'.number_format(bcsub($payment->amount, $refunds, 7), 5, '.', '').'</td>';
echo '<td>'.$booking->company->reference.'</td>';
echo '<td>'.$booking->marking.'</td>';
echo '<td></td>';
echo '<td>'.$payment->original_currency->short_code.'</td>';
echo '<td>'.number_format(bcsub($payment->original_amount, $original_refunds, 7), 5, '.', '').'</td>';