Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development

# Conflicts:
#	config/logging.php

config/logging.php

@@ -115,6 +115,9 @@ return [
             'driver' => 'single',
             'path' => storage_path('logs/webResponseTimeLog.log'),
             'level' => 'info',
+        'guzzleShippingPortal' => [
+            'driver' => 'errorlog',
+            'level' => 'debug',
         ],
     ],
 

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

@@ -15,7 +15,7 @@
         $subtotal = "0";
         $voucherDiscount = $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 2) : "0";
         $displayedSubtotal = 0;
-        $currency_id = $transaction->currency_id;
+        $currency_id = $transaction->owner->fix_currency_id;
     @endphp
 
     @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)