Merge branch 'vapor/production' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into vapor/staging

# Conflicts:
#	routes/web.php

resources/views/pages/pdfs/purchase_order_table.blade.php

@@ -57,7 +57,7 @@
             $serviceCharge = $transaction->service_charge;
             if (isset($current_paid_amount)) {
                 $refundedServiceCharge = $subtotal + $serviceCharge - $current_paid_amount;
-                $serviceCharge = $serviceCharge - $refundedServiceCharge;
+                $serviceCharge = $serviceCharge - $refundedServiceCharge + $voucherDiscount;
             }
         ?>
         <td class="right">{{ number_format($serviceCharge, 2) }}</td>

routes/web.php

@@ -1342,4 +1342,4 @@ Route::get('/site.webmanifest', function () {
 
 Route::get('/test-test', function () {
     dd('test-test');
-});
+});