From 709679d73540b19dfd37b975cce0a108c1b0dc38 Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Mon, 26 Sep 2022 13:19:07 +0800 Subject: [PATCH] update cief address in invoice documents --- .../pages/pdfs/bulk_purchase_order.blade.php | 10 +++--- .../views/pages/pdfs/deliver_order.blade.php | 20 +++++------ resources/views/pages/pdfs/invoice.blade.php | 18 +++++----- .../pages/pdfs/proforma_invoice.blade.php | 14 ++++---- .../views/pages/pdfs/purchase_order.blade.php | 24 +++++++------ .../pdfs/supplier_deliver_order.blade.php | 36 ++++++++----------- 6 files changed, 59 insertions(+), 63 deletions(-) diff --git a/resources/views/pages/pdfs/bulk_purchase_order.blade.php b/resources/views/pages/pdfs/bulk_purchase_order.blade.php index 3abf6725..b4513850 100644 --- a/resources/views/pages/pdfs/bulk_purchase_order.blade.php +++ b/resources/views/pages/pdfs/bulk_purchase_order.blade.php @@ -40,10 +40,12 @@ CIEF Worldwide Sdn Bhd (1134596-M)
- Malaysia Global Innovation & CreativityCentre, Level 1 CWS, Block 3730, PersiaranAPEC 63000 Cyberjaya + No. 72-3, Jalan Jalil 1,
+ The Earth Bukit Jalil,
+ 57000 Kuala Lumpur
- Phone: 0182909252 + Tel: 03-8082 1252
@@ -66,7 +68,7 @@ @php $subtotal = 0; @endphp - + @foreach($group->transactions as $po_order_transaction) @foreach ($po_order_transaction->owner->owner->transactions()->where('type', \App\Classes\ValueObjects\Constants\TransactionType::PURCHASE_ORDER)->where('status', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->first()->transactionDetails as $key => $transaction_detail) @@ -91,7 +93,7 @@ - Subtotal + Subtotal {{ number_format($subtotal, 2) }} diff --git a/resources/views/pages/pdfs/deliver_order.blade.php b/resources/views/pages/pdfs/deliver_order.blade.php index d16a0060..ec1a34d7 100644 --- a/resources/views/pages/pdfs/deliver_order.blade.php +++ b/resources/views/pages/pdfs/deliver_order.blade.php @@ -18,10 +18,10 @@ (1134596-M)
- Malaysian Global Innovation & Creativity Center
- Level 1 CWS, Block 3730, Persiaran APEC,
- 63000 Cyberjaya, Malaysia.
- Tel: 018-2909252 + No. 72-3, Jalan Jalil 1,
+ The Earth Bukit Jalil,
+ 57000 Kuala Lumpur
+ Tel: 03-8082 1252
@@ -85,7 +85,7 @@ @php $subtotal = 0; @endphp - + @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail) {{ $key + 1 }} @@ -101,13 +101,13 @@ @if($transaction->booking()->first()->fix_currency_id !== 1) - + {{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }} - + @php $subtotal += number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.',''); @endphp - @else + @else {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }} @php @@ -137,9 +137,9 @@ Adjustment - @if($transaction->booking()->first()->fix_currency_id !== 1) + @if($transaction->booking()->first()->fix_currency_id !== 1) {{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }} - @else + @else {{ number_format((float)number_format($transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }} @endif diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php index a2a33daa..99785ef8 100644 --- a/resources/views/pages/pdfs/invoice.blade.php +++ b/resources/views/pages/pdfs/invoice.blade.php @@ -17,10 +17,10 @@ (1134596-M)
- Malaysian Global Innovation & Creativity Center
- Level 1 CWS, Block 3730, Persiaran APEC,
- 63000 Cyberjaya, Malaysia.
- Tel: 018-2909252 + No. 72-3, Jalan Jalil 1,
+ The Earth Bukit Jalil,
+ 57000 Kuala Lumpur
+ Tel: 03-8082 1252
@@ -100,13 +100,13 @@ @if($transaction->booking()->first()->fix_currency_id !== 1) - + {{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }} - + @php $subtotal += number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.',''); @endphp - @else + @else {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }} @php @@ -136,9 +136,9 @@ Adjustment - @if($transaction->booking()->first()->fix_currency_id !== 1) + @if($transaction->booking()->first()->fix_currency_id !== 1) {{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }} - @else + @else {{ number_format((float)number_format($transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }} @endif diff --git a/resources/views/pages/pdfs/proforma_invoice.blade.php b/resources/views/pages/pdfs/proforma_invoice.blade.php index da14e2c0..d2b3977b 100644 --- a/resources/views/pages/pdfs/proforma_invoice.blade.php +++ b/resources/views/pages/pdfs/proforma_invoice.blade.php @@ -17,10 +17,10 @@ (1134596-M)
- Malaysian Global Innovation & Creativity Center
- Level 1 CWS, Block 3730, Persiaran APEC,
- 63000 Cyberjaya, Malaysian.
- Tel: 018-2909252 + No. 72-3, Jalan Jalil 1,
+ The Earth Bukit Jalil,
+ 57000 Kuala Lumpur
+ Tel: 03-8082 1252
@@ -100,13 +100,13 @@ @if($invoice_transaction->booking()->first()->fix_currency_id !== 1) - + {{ number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }} - + @php $subtotal += number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.',''); @endphp - @else + @else {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }} @php diff --git a/resources/views/pages/pdfs/purchase_order.blade.php b/resources/views/pages/pdfs/purchase_order.blade.php index 84205178..9f72b531 100644 --- a/resources/views/pages/pdfs/purchase_order.blade.php +++ b/resources/views/pages/pdfs/purchase_order.blade.php @@ -44,8 +44,8 @@ @php $addresses = $supplier->addresses()->where('billing', '=', true)->first(); @endphp - {{ $addresses->street_one }} - {{ $addresses->street_two }} + {{ $addresses->street_one }} + {{ $addresses->street_two }} {{ $addresses->state()->first()->name }} {{ $addresses->district()->first()->name }} @@ -63,10 +63,12 @@ CIEF Worldwide Sdn Bhd (1134596-M)
- Malaysia Global Innovation & CreativityCentre, Level 1 CWS, Block 3730, PersiaranAPEC 63000 Cyberjaya + No. 72-3, Jalan Jalil 1,
+ The Earth Bukit Jalil,
+ 57000 Kuala Lumpur
- Phone: 0182909252 + Tel: 03-8082 1252
@@ -89,7 +91,7 @@ @php $subtotal = 0; @endphp - + @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail) {{ $key + 1 }} @@ -105,13 +107,13 @@ @if($transaction->booking()->first()->fix_currency_id !== 1) - + {{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }} - + @php $subtotal += number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.',''); @endphp - @else + @else {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }} @php @@ -125,7 +127,7 @@ - Subtotal + Subtotal {{ number_format($subtotal, 2) }} @@ -141,9 +143,9 @@ Adjustment - @if($transaction->booking()->first()->fix_currency_id !== 1) + @if($transaction->booking()->first()->fix_currency_id !== 1) {{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }} - @else + @else {{ number_format((float)number_format($transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }} @endif diff --git a/resources/views/pages/pdfs/supplier_deliver_order.blade.php b/resources/views/pages/pdfs/supplier_deliver_order.blade.php index 89d25cc4..66b9c687 100644 --- a/resources/views/pages/pdfs/supplier_deliver_order.blade.php +++ b/resources/views/pages/pdfs/supplier_deliver_order.blade.php @@ -34,25 +34,17 @@ Buyer
- -
- CIEF Worldwide Sdn Bhd (1134596-M) -
- - Malaysia Global Innovation & CreativityCentre, Level 1 CWS, Block 3730, PersiaranAPEC 63000 Cyberjaya - - - {{-- {{ $supplier }} --}} - -
- - {{-- {{ $buyer['address'] }} --}} - -
- - Phone: 0182909252 + CIEF Worldwide Sdn Bhd (1134596-M) +
+ No. 72-3, Jalan Jalil 1,
+ The Earth Bukit Jalil,
+ 57000 Kuala Lumpur +
+
+ Tel: 03-8082 1252 +
@@ -74,7 +66,7 @@ @php $subtotal = 0; @endphp - + @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail) {{ $key + 1 }} @@ -92,11 +84,11 @@ @if($transaction->booking()->first()->fix_currency_id !== 1) {{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }} - + @php $subtotal += number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.',''); @endphp - @else + @else {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }} @php @@ -119,9 +111,9 @@ Adjustment - @if($transaction->booking()->first()->fix_currency_id !== 1) + @if($transaction->booking()->first()->fix_currency_id !== 1) {{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }} - @else + @else {{ number_format((float)number_format($transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }} @endif