From a74cda1ad76d95c0f5220a75cf784ab4a3c684bd Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 23 Jun 2023 14:43:46 +0800
Subject: [PATCH 1/2] include ref column to payment export for autocount

---
 .../Modules/Exports/Services/ExportsPaymentTransactions.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php b/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php
index f9493b17..31d814a0 100644
--- a/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php
@@ -32,6 +32,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             'DocNo',
             'DocDate',
             'DebtorCode',
+            'Ref',
             'DebtorName',
             'CurrencyCode',
             'ShipInfo',
@@ -67,7 +68,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
 
         if($start_date && $end_date) {
             $query->whereBetween('created_at', [
-                Carbon::parse($start_date)->format('Y-m-d 0:00:00'), 
+                Carbon::parse($start_date)->format('Y-m-d 0:00:00'),
                 Carbon::parse($end_date)->format('Y-m-d 23:59:59')
             ]);
         }
@@ -95,6 +96,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             '<<New>>',
             $transaction->updated_at->format('m/d/Y H:m'),
             $company->debtor,
+            $booking->marking,
             '',
             'MYR',
             $booking->marking,
@@ -107,4 +109,4 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             'CIEF'
         ];
     }
-}
\ No newline at end of file
+}

From 497200404439976a5f7f6228eae7783e29b5fc55 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 27 Jun 2023 18:11:19 +0800
Subject: [PATCH 2/2] update voucher error message

---
 .../forms/BookingPaymentQuotationComponent.vue         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index caba6812..c9ababa4 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -240,7 +240,7 @@
                                                         </div>
                                                     </div>
                                                     <div class="col-auto p-r-10 p-l-10">
-                                                        <div @click="showApplyVoucher=!showApplyVoucher" class="h-100 btn btn-sm btn-secondary b-rad-none all-caps rounded d-flex justify-content-center align-items-center">
+                                                        <div @click="removeVoucher()" class="h-100 btn btn-sm btn-secondary b-rad-none all-caps rounded d-flex justify-content-center align-items-center">
                                                             <i class="fa fa-times muted"></i>
                                                         </div>
                                                     </div>
@@ -663,6 +663,14 @@
                 this.calculation = null;
                 this.expandPayment = false;
             },
+            updatedBankDetails(bank){
+                this.item.bank = bank;
+            },
+            removeVoucher(){
+                this.voucherCodeFailedReason = '';
+                this.voucherCode = '';
+                this.showApplyVoucher = false;
+            },
             applyVoucherCode(){
                 this.voucherIsChecking = true;
                 this.voucherCodeFailedReason = '';