diff --git a/resources/views/pages/pdfs/deliver_order.blade.php b/resources/views/pages/pdfs/deliver_order.blade.php
index ba30bc68..b58fd066 100644
--- a/resources/views/pages/pdfs/deliver_order.blade.php
+++ b/resources/views/pages/pdfs/deliver_order.blade.php
@@ -69,6 +69,7 @@
| No | @@ -81,34 +82,37 @@||||||
|---|---|---|---|---|---|---|
| {{ $key + 1 }} | {{ $transaction_detail->product_code }} | {{ $transaction_detail->product_name }} | {{ $transaction_detail->quantity }} | - @php - $unitPrice = $transaction_detail->price / $currencyRate; - @endphp - {{ number_format($unitPrice, 2) }} + {{ number_format($exactUnitPrice, 2) }} | - @php - $itemTotal = $unitPrice * $transaction_detail->quantity; - $subtotal += $itemTotal; - @endphp {{ number_format($itemTotal, 2) }} | |
| Subtotal | @@ -117,27 +121,17 @@||||||
| Service Charges | -- {{ number_format($transaction->service_charge, 2) }} - | +{{ number_format($transaction->service_charge, 2) }} | ||||
| Voucher ({{ $voucher_redemption->voucher->code }}) | --{{ $voucherDiscount }} | +-{{ number_format($voucherDiscount, 2) }} | ||||
| - | Adjustment | -- @php - $adjustment = $transaction->amount - $subtotal; - @endphp - {{ number_format($adjustment, 2) }} - | -||||
| @@ -145,13 +139,21 @@ | {{ number_format($transaction->tax, 2) }} | |||||
| + | Adjustment | +{{ roundUp($discrepancy,2) }} | +||||
| Total | - @php - $total = $subtotal + $transaction->service_charge + $transaction->tax + $voucherDiscount; - @endphp {{ number_format($total, 2) }} | |||||
| No | @@ -89,34 +90,37 @@||||||
|---|---|---|---|---|---|---|
| {{ $key + 1 }} | {{ $transaction_detail->product_code }} | {{ $transaction_detail->product_name }} | {{ $transaction_detail->quantity }} | - @php - $unitPrice = $transaction_detail->price / $currencyRate; - @endphp - {{ number_format($unitPrice, 2) }} + {{ number_format($exactUnitPrice, 2) }} | - @php - $itemTotal = $unitPrice * $transaction_detail->quantity; - $subtotal += $itemTotal; - @endphp {{ number_format($itemTotal, 2) }} | |
| Subtotal | @@ -125,27 +129,17 @@||||||
| Service Charges | -- {{ number_format($transaction->service_charge, 2) }} - | +{{ number_format($transaction->service_charge, 2) }} | ||||
| Voucher ({{ $voucher_redemption->voucher->code }}) | --{{ $voucherDiscount }} | +-{{ number_format($voucherDiscount, 2) }} | ||||
| - | Adjustment | -- @php - $adjustment = $transaction->amount - $subtotal; - @endphp - {{ number_format($adjustment, 2) }} - | -||||
| @@ -153,13 +147,21 @@ | {{ number_format($transaction->tax, 2) }} | |||||
| + | Adjustment | +{{ roundUp($discrepancy,2) }} | +||||
| Total | - @php - $total = $subtotal + $transaction->service_charge + $transaction->tax + $voucherDiscount; - @endphp {{ number_format($total, 2) }} | |||||