mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git
synced 2026-08-19 04:23:55 +00:00
Merge branch 'pending-order-export-fomart-rearrangement' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
This commit is contained in:
+3
-2
@@ -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>';
|
||||
|
||||
Reference in New Issue
Block a user