cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-27 08:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development

Browse Source 
# Conflicts:
#	resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
This commit is contained in:
edmondlang
2023-06-27 18:36:55 +08:00
parent 357d030adf 4d71abd8be
commit 240a15378e
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php
+4 -2
View File
@@ -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'
];
}
}
}
resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+6 -1
View File
@@ -248,7 +248,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>
@@ -686,6 +686,11 @@
updatedBankDetails(bank){
this.item.bank = bank;
},
removeVoucher(){
this.voucherCodeFailedReason = '';
this.voucherCode = '';
this.showApplyVoucher = false;
},
applyVoucherCode(){
this.voucherIsChecking = true;
this.voucherCodeFailedReason = '';