mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git
synced 2026-08-24 15:04:19 +00:00
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
This commit is contained in:
+20
-10
@@ -408,19 +408,27 @@ Route::get('/pending_orders', function(){
|
||||
->orderBy('updated_at', 'desc')
|
||||
->get();
|
||||
|
||||
echo '<table border="1">';
|
||||
echo '
|
||||
<style>
|
||||
table { border-collapse: collapse; }
|
||||
td, th { border-left: 1px solid black;}
|
||||
td:first-child, th:first-child { border-left: none; }
|
||||
</style>';
|
||||
echo '<table class="pending_orders">';
|
||||
echo '<thead>';
|
||||
echo '<tr>';
|
||||
echo '<th>Client Booking Date</th>';
|
||||
echo '<th>Booking Updated Date</th>';
|
||||
echo '<th>Booking</th>';
|
||||
echo '<th>Payment Type</th>';
|
||||
echo '<th>Marking</th>';
|
||||
echo '<th>Customer Payment Currency</th>';
|
||||
echo '<th>Customer Payment Amount</th>';
|
||||
echo '<th>Reference No.</th>';
|
||||
echo '<th>Booking Amount Currency</th>';
|
||||
echo '<th>CNY</th>';
|
||||
echo '<th>Payment Currency</th>';
|
||||
echo '<th>Payment Amount</th>';
|
||||
echo '<th>Customer</th>';
|
||||
echo '<th></th>';
|
||||
echo '<th>Booking Currency</th>';
|
||||
echo '<th>Booking Amount</th>';
|
||||
echo '<th></th>';
|
||||
echo '<th>Service</th>';
|
||||
echo '<th>Days</th>';
|
||||
echo '<th>Payment Updated</th>';
|
||||
echo '<th>Cust Supplier Acc Type</th>';
|
||||
echo '<th>Cust Supplier Acc Name</th>';
|
||||
echo '</tr>';
|
||||
@@ -445,13 +453,15 @@ Route::get('/pending_orders', function(){
|
||||
|
||||
echo '<tr>';
|
||||
echo '<td>'.$payment->updated_at->format('d-M-y').'</td>';
|
||||
echo '<td>'.\App\Classes\ValueObjects\Constants\PaymentMethodType::PAYMENT_METHODS_ID[$payment->payment_method].'</td>';
|
||||
echo '<td>'.$booking->marking.'</td>';
|
||||
echo '<td>'.\App\Classes\ValueObjects\Constants\PaymentMethodType::PAYMENT_METHODS_ID[$payment->payment_method].'</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></td>';
|
||||
echo '<td>'.$payment->original_currency->short_code.'</td>';
|
||||
echo '<td>'.number_format(bcsub($payment->original_amount, $original_refunds, 7), 5, '.', '').'</td>';
|
||||
echo '<td></td>';
|
||||
echo '<td>'.$booking->service->name.'</td>';
|
||||
echo '<td>'.$payment->updated_at->diffForHumans().'</td>';
|
||||
echo '<td>'.$bankType.'</td>';
|
||||
|
||||
Reference in New Issue
Block a user