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 '<>', $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 +} diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue index 3ec635e8..766b718d 100644 --- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue +++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue @@ -248,7 +248,7 @@
-
+
@@ -686,6 +686,11 @@ updatedBankDetails(bank){ this.item.bank = bank; }, + removeVoucher(){ + this.voucherCodeFailedReason = ''; + this.voucherCode = ''; + this.showApplyVoucher = false; + }, applyVoucherCode(){ this.voucherIsChecking = true; this.voucherCodeFailedReason = '';