From 165d80537e6546058265d3cf150eec51bedd2ecb Mon Sep 17 00:00:00 2001
From: fuadzaidan7 <fuadzaidan7@gmail.com>
Date: Mon, 6 Sep 2021 13:34:14 +0800
Subject: [PATCH 1/2] Signed-off-by: fuadzaidan7 <fuadzaidan7@gmail.com>

---
 .../CalculatesBookingCurrencyAverageRate.php  | 16 +++++--
 .../views/pages/pdfs/deliver_order.blade.php  | 40 +++++++++++++-----
 resources/views/pages/pdfs/invoice.blade.php  | 40 +++++++++++++-----
 .../views/pages/pdfs/purchase_order.blade.php | 42 ++++++++++++++-----
 .../pdfs/supplier_deliver_order.blade.php     | 38 +++++++++++++----
 5 files changed, 132 insertions(+), 44 deletions(-)

diff --git a/app/Classes/Modules/Bookings/Services/CalculatesBookingCurrencyAverageRate.php b/app/Classes/Modules/Bookings/Services/CalculatesBookingCurrencyAverageRate.php
index e00ab114..235d897a 100644
--- a/app/Classes/Modules/Bookings/Services/CalculatesBookingCurrencyAverageRate.php
+++ b/app/Classes/Modules/Bookings/Services/CalculatesBookingCurrencyAverageRate.php
@@ -12,16 +12,24 @@ class CalculatesBookingCurrencyAverageRate
     public function execute(Booking $booking, $type){
 
     	if ($type == TransactionType::PAYMENT) {
-            return $booking->transactions()
+            
+            $amount_without_service = $booking->transactions()
                 ->where('type', TransactionType::PAYMENT)
                 ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
-                ->avg('currency_rate');
+                ->selectRaw('ROUND(amount,2)-ROUND(service_charge,2) AS amount_without_service')
+                ->get()->sum('amount_without_service');            
+
+            return number_format($booking->fix_amount/$amount_without_service,2);
         }
         else if ($type == TransactionType::BILL) {
-        	return $booking->transactions()
+
+            $amount_without_service = $booking->transactions()
                 ->where('type', TransactionType::BILL)
                 ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
-                ->avg('currency_rate');
+                ->selectRaw('ROUND(amount,2)-ROUND(service_charge,2) AS amount_without_service')
+                ->get()->sum('amount_without_service');   
+
+            return number_format($booking->fix_amount/$amount_without_service,2);
         }
     }
 
diff --git a/resources/views/pages/pdfs/deliver_order.blade.php b/resources/views/pages/pdfs/deliver_order.blade.php
index c45d27f7..e7256b1f 100644
--- a/resources/views/pages/pdfs/deliver_order.blade.php
+++ b/resources/views/pages/pdfs/deliver_order.blade.php
@@ -77,18 +77,22 @@
                 <th class="stock-code" width="10%">Stock Code</th>
                 <th class="description">Description</th>
                 <th width="10%">Quantity</th>
-                <th width="12%">Unit Price (RM)</th>
+                <th width="15%">Unit Price (RM)</th>
                 <th width="10%">Total Amount<br>(RM)</th>
             </tr>
         </thead>
         <tbody>
+            @php
+                $subtotal = 0;
+            @endphp
+            
             @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
                 <tr>
                     <td width="5%" class="center top">{{ $key + 1 }}</td>
                     <td class="stock-code top" width="10%">{{ $transaction_detail->product_code }}</td>
                     <td class="description">{{ $transaction_detail->product_name }}</td>
                     <td width="10%" class="center top">{{ $transaction_detail->quantity }}</td>
-                    <td width="12%" class="center top">
+                    <td width="15%" class="center top">
                         @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
                             {{ number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2) }}
                         @else
@@ -97,9 +101,18 @@
                     </td>
                     <td width="20%" class="right top">
                         @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
-                            {{ number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->amount, 2) }}
-                        @else
-                            {{ number_format($transaction_detail->amount, 2) }}
+                        
+                            {{  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                            
+                            {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
+
+                            @php
+                                $subtotal += number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
+                            @endphp
                         @endif
                     </td>
                 </tr>
@@ -110,11 +123,7 @@
                 <td colspan="4"></td>
                 <td class="right middle">Subtotal</td>
                 <td class="right middle">
-                    @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
-                        {{ number_format( (1/$invoice_transaction->currency_rate) * $invoice_transaction->amount, 2) }}
-                    @else
-                        {{ number_format($invoice_transaction->amount, 2) }}
-                    @endif
+                    {{ number_format($subtotal, 2) }}
                 </td>
             </tr>
             <tr class="billingcharges">
@@ -124,6 +133,17 @@
                     {{ number_format($invoice_transaction->service_charge, 2) }}
                 </td>
             </tr>
+            <tr class="billingcharges">
+                <td colspan="4"></td>
+                <td class="right">Adjustment</td>
+                <td class="right">
+                    @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)                        
+                        {{ number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $invoice_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                    @else                        
+                        {{ number_format((float)number_format($invoice_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                    @endif
+                </td>
+            </tr>
             @if($invoice_transaction->tax > 0)
                 <tr class="billingcharges">
                     <td colspan="4"></td>
diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php
index 3bad3ac0..7d6e88ca 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -76,18 +76,22 @@
                 <th class="stock-code" width="10%">Stock Code</th>
                 <th class="description">Description</th>
                 <th width="10%">Quantity</th>
-                <th width="12%">Unit Price (RM)</th>
+                <th width="15%">Unit Price (RM)</th>
                 <th width="10%">Total Amount<br>(RM)</th>
             </tr>
         </thead>
         <tbody>
+            @php
+                $subtotal = 0;
+            @endphp
+
             @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
                 <tr>
                     <td width="5%" class="center top">{{ $key + 1 }}</td>
                     <td class="stock-code top" width="10%">{{ $transaction_detail->product_code }}</td>
                     <td class="description">{{ $transaction_detail->product_name }}</td>
                     <td width="10%" class="center top">{{ $transaction_detail->quantity }}</td>
-                    <td width="12%" class="center top">
+                    <td width="15%" class="center top">
                         @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
                             {{ number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2) }}
                         @else
@@ -96,9 +100,18 @@
                     </td>
                     <td width="20%" class="right top">
                         @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
-                            {{ number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->amount, 2) }}
-                        @else
-                            {{ number_format($transaction_detail->amount, 2) }}
+                        
+                            {{  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                            
+                            {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
+
+                            @php
+                                $subtotal += number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
+                            @endphp
                         @endif
                     </td>
                 </tr>
@@ -109,11 +122,7 @@
                 <td colspan="4"></td>
                 <td class="right middle">Subtotal</td>
                 <td class="right middle">
-                    @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
-                        {{ number_format( (1/$invoice_transaction->currency_rate) * $invoice_transaction->amount, 2) }}
-                    @else
-                        {{ number_format($invoice_transaction->amount, 2) }}
-                    @endif
+                    {{ number_format($subtotal, 2) }}
                 </td>
             </tr>
             <tr class="billingcharges">
@@ -123,6 +132,17 @@
                     {{ number_format($invoice_transaction->service_charge, 2) }}
                 </td>
             </tr>
+            <tr class="billingcharges">
+                <td colspan="4"></td>
+                <td class="right">Adjustment</td>
+                <td class="right">
+                    @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)                        
+                        {{ number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $invoice_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                    @else                        
+                        {{ number_format((float)number_format($invoice_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                    @endif
+                </td>
+            </tr>
             @if($invoice_transaction->tax > 0)
                 <tr class="billingcharges">
                     <td colspan="4"></td>
diff --git a/resources/views/pages/pdfs/purchase_order.blade.php b/resources/views/pages/pdfs/purchase_order.blade.php
index 2d1327cd..c2c17481 100644
--- a/resources/views/pages/pdfs/purchase_order.blade.php
+++ b/resources/views/pages/pdfs/purchase_order.blade.php
@@ -81,18 +81,22 @@
                 <th class="stock-code" width="10%">Stock Code</th>
                 <th class="description">Description</th>
                 <th width="10%">Quantity</th>
-                <th width="12%">Unit Price (RM)</th>
+                <th width="15%">Unit Price (RM)</th>
                 <th width="10%">Total Amount<br>(RM)</th>
             </tr>
         </thead>
         <tbody>
+            @php
+                $subtotal = 0;
+            @endphp
+            
             @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
                 <tr>
                     <td width="5%" class="center top">{{ $key + 1 }}</td>
                     <td class="stock-code top" width="10%">{{ $transaction_detail->product_code }}</td>
                     <td class="description">{{ $transaction_detail->product_name }}</td>
                     <td width="10%" class="center top">{{ $transaction_detail->quantity }}</td>
-                    <td width="12%" class="center top">
+                    <td width="15%" class="center top">
                         @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
                             {{ number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2) }}
                         @else
@@ -101,9 +105,18 @@
                     </td>
                     <td width="20%" class="right top">
                         @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
-                            {{ number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->amount, 2) }}
-                        @else
-                            {{ number_format($transaction_detail->amount, 2) }}
+                        
+                            {{  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                            
+                            {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
+
+                            @php
+                                $subtotal += number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
+                            @endphp
                         @endif
                     </td>
                 </tr>
@@ -112,13 +125,9 @@
         <tfoot>
             <tr class="subtotal">
                 <td colspan="4"></td>
-                <td class="right middle">Subtotal</td>
+                <td class="right middle">Subtotal</td>                    
                 <td class="right middle">
-                    @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
-                        {{ number_format( (1/$invoice_transaction->currency_rate) * $invoice_transaction->amount, 2) }}
-                    @else
-                        {{ number_format($invoice_transaction->amount, 2) }}
-                    @endif
+                    {{ number_format($subtotal, 2) }}
                 </td>
             </tr>
             <tr class="billingcharges">
@@ -128,6 +137,17 @@
                     {{ number_format($invoice_transaction->service_charge, 2) }}
                 </td>
             </tr>
+            <tr class="billingcharges">
+                <td colspan="4"></td>
+                <td class="right">Adjustment</td>
+                <td class="right">
+                    @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)                        
+                        {{ number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $invoice_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                    @else                        
+                        {{ number_format((float)number_format($invoice_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                    @endif
+                </td>
+            </tr>
             @if($invoice_transaction->tax > 0)
                 <tr class="billingcharges">
                     <td colspan="4"></td>
diff --git a/resources/views/pages/pdfs/supplier_deliver_order.blade.php b/resources/views/pages/pdfs/supplier_deliver_order.blade.php
index 5b736e39..57b4ed0a 100644
--- a/resources/views/pages/pdfs/supplier_deliver_order.blade.php
+++ b/resources/views/pages/pdfs/supplier_deliver_order.blade.php
@@ -66,18 +66,22 @@
                 <th class="stock-code" width="10%">Stock Code</th>
                 <th class="description">Description</th>
                 <th width="10%">Quantity</th>
-                <th width="12%">Unit Price (RM)</th>
+                <th width="15%">Unit Price (RM)</th>
                 <th width="10%">Total Amount<br>(RM)</th>
             </tr>
         </thead>
         <tbody>
+            @php
+                $subtotal = 0;
+            @endphp
+            
             @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
                 <tr>
                     <td width="5%" class="center top">{{ $key + 1 }}</td>
                     <td class="stock-code top" width="10%">{{ $transaction_detail->product_code }}</td>
                     <td class="description">{{ $transaction_detail->product_name }}</td>
                     <td width="10%" class="center top">{{ $transaction_detail->quantity }}</td>
-                    <td width="12%" class="center top">
+                    <td width="15%" class="center top">
                         @if($supplier_deliver_order_transaction->booking()->first()->fix_currency_id !== 1)
                             {{ number_format( (1/$supplier_deliver_order_transaction->currency_rate) * $transaction_detail->price, 2) }}
                         @else
@@ -86,9 +90,18 @@
                     </td>
                     <td width="20%" class="right top">
                         @if($supplier_deliver_order_transaction->booking()->first()->fix_currency_id !== 1)
-                            {{ number_format( (1/$supplier_deliver_order_transaction->currency_rate) * $transaction_detail->amount, 2) }}
-                        @else
-                            {{ number_format($transaction_detail->amount, 2) }}
+
+                            {{  number_format((float)number_format( (1/$supplier_deliver_order_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
+                            
+                            @php
+                                $subtotal += number_format((float)number_format( (1/$supplier_deliver_order_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
+                            @endphp
+                        @else                                                        
+                            {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
+
+                            @php
+                                $subtotal += number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
+                            @endphp
                         @endif
                     </td>
                 </tr>
@@ -99,10 +112,17 @@
                 <td colspan="4"></td>
                 <td class="right middle">Subtotal</td>
                 <td class="right middle">
-                    @if($supplier_deliver_order_transaction->booking()->first()->fix_currency_id !== 1)
-                        {{ number_format( (1/$supplier_deliver_order_transaction->currency_rate) * $supplier_deliver_order_transaction->amount, 2) }}
-                    @else
-                        {{ number_format($supplier_deliver_order_transaction->amount, 2) }}
+                    {{ number_format($subtotal, 2) }}
+                </td>
+            </tr>
+            <tr class="billingcharges">
+                <td colspan="4"></td>
+                <td class="right">Adjustment</td>
+                <td class="right">
+                    @if($supplier_deliver_order_transaction->booking()->first()->fix_currency_id !== 1)                        
+                        {{ number_format((float)number_format( (1/$supplier_deliver_order_transaction->currency_rate) * $supplier_deliver_order_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
+                    @else                        
+                        {{ number_format((float)number_format($supplier_deliver_order_transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
                     @endif
                 </td>
             </tr>

From f68fd19b7f1058ab1aadeb38de046d933fae1d40 Mon Sep 17 00:00:00 2001
From: glovetleong <glovetleong@gmail.com>
Date: Wed, 8 Sep 2021 17:38:24 +0800
Subject: [PATCH 2/2] -created data on OP -fix payment proof file select bug

---
 .../bookings/elements/PaymentProofComponent.vue    | 14 ++++++++++++--
 resources/views/pages/pdfs/deliver_order.blade.php |  2 +-
 resources/views/pages/pdfs/invoice.blade.php       |  2 +-
 .../pages/pdfs/supplier_deliver_order.blade.php    |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
index b684d64e..5356070b 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
@@ -39,7 +39,7 @@
                                     </div>
                                 </div>
                                 <div class="col-auto p-l-5 p-r-5 bg-success requestModal pointer" data-type="paymentProofModal">
-                                    <div class="row align-items-center h-100">
+                                    <div @click="selectedID(item.id)" class="row align-items-center h-100">
                                         <div class="col">
                                             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
                                                  width="30" height="30"
@@ -49,7 +49,7 @@
                                     </div>
                                 </div>
                                 <modal-component type="paymentProofModal">
-                                    <payment-proof-form-component section="paymentProofSection" :id="item.id" :data="item"></payment-proof-form-component>
+                                    <payment-proof-form-component  v-if="selected_id == item.id" section="paymentProofSection" :id="item.id" :data="item"></payment-proof-form-component>
                                 </modal-component>
                             </div>
                         </div>
@@ -63,6 +63,16 @@
 <script>
     import componentHandler from '../../../general/mixins/componentHandler';
     export default {
+        data(){
+            return {
+                selected_id: '',
+            }
+        },
+        methods: {
+            selectedID(id){
+                this.selected_id = id;
+            }
+        },
         mixins: [componentHandler]
     }
 </script>
diff --git a/resources/views/pages/pdfs/deliver_order.blade.php b/resources/views/pages/pdfs/deliver_order.blade.php
index e7256b1f..a2c77a66 100644
--- a/resources/views/pages/pdfs/deliver_order.blade.php
+++ b/resources/views/pages/pdfs/deliver_order.blade.php
@@ -34,7 +34,7 @@
 
 
                 <div class="ref">REF: {{ $invoice_transaction->payment_reference ?? '-' }}</div>
-                <div class="date">Date: {{ $invoice_transaction->created_at }}</div>
+                <div class="date">Date: {{ $po_order_transaction->created_at }}</div>
                 <div>&nbsp;</div>
                 </div>
             </td>
diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php
index 7d6e88ca..611d4362 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -33,7 +33,7 @@
 
 
                 <div class="ref">Ref# {{ $invoice_transaction->payment_reference ?? '-' }}</div>
-                <div class="date">Date: {{ $invoice_transaction->created_at }}</div>
+                <div class="date">Date: {{ $po_order_transaction->created_at }}</div>
                 <div>&nbsp;</div>
                 </div>
             </td>
diff --git a/resources/views/pages/pdfs/supplier_deliver_order.blade.php b/resources/views/pages/pdfs/supplier_deliver_order.blade.php
index 57b4ed0a..22de6719 100644
--- a/resources/views/pages/pdfs/supplier_deliver_order.blade.php
+++ b/resources/views/pages/pdfs/supplier_deliver_order.blade.php
@@ -20,7 +20,7 @@
             <td class="document-detail">
                 PO#: {{ $supplier_deliver_order_transaction->bill_no }} <br>
                 Ref#: {{ $supplier_deliver_order_transaction->payment_reference ?? '-' }} <br>
-                Date: {{ $supplier_deliver_order_transaction->created_at }}
+                Date: {{ $po_order_transaction->created_at }}
             </td>
         </tr>
     </table>