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

Merge branch 'dillon/34.8-jenkins-vapor' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2024-10-30 12:38:29 +08:00
parent 6df31e4180 91f8081b11
commit 479bb3cb50
4 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/images/alipay_logo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

resources/assets/vue/components/bookings/elements/DownloadTransactionsReportComponent.vue
+1 -3
View File
@@ -70,10 +70,8 @@ export default {
if (this.$refs.endDatePicker) {
const startDate = new Date(date.split('-').reverse().join('-'));
const adjustedEndDate = new Date(startDate);
// adjustedEndDate.setDate(startDate.getDate() + this.maxDays);
this.$refs.endDatePicker.setStartDate(adjustedEndDate);
}
// this.endDate = '';
this.isValidRange = false;
}
},
@@ -90,7 +88,7 @@ export default {
const end = new Date(this.endDate.split('-').reverse().join('-'));
const difference = Math.floor((end - start) / (1000 * 60 * 60 * 24));
this.isValidRange = difference >= 0 && difference <= 14;
this.isValidRange = difference >= 0 && difference <= this.maxDays;
return this.isValidRange;
}
return false;
resources/assets/vue/components/bookings/elements/ShowWhiteFormTransactionsComponent.vue
+1 -3
View File
@@ -78,10 +78,8 @@ export default {
if (this.$refs.endDatePicker) {
const startDate = new Date(date.split('-').reverse().join('-'));
const adjustedEndDate = new Date(startDate);
// adjustedEndDate.setDate(startDate.getDate() + this.maxDays);
this.$refs.endDatePicker.setStartDate(adjustedEndDate);
}
// this.endDate = '';
this.isValidRange = false;
}
},
@@ -100,7 +98,7 @@ export default {
const end = new Date(this.endDate.split('-').reverse().join('-'));
const difference = Math.floor((end - start) / (1000 * 60 * 60 * 24));
this.isValidRange = difference >= 0 && difference <= 14;
this.isValidRange = difference >= 0 && difference <= this.maxDays;
return this.isValidRange;
}
return false;
resources/assets/vue/components/general/forms/FileUploadComponent.vue
+5 -9
View File
@@ -102,23 +102,19 @@
if(file.name.split('.').pop() === 'pdf'){
//$(file.previewElement).closest("img[data-dz-thumbnail]").attr("src", Vapor.asset("images/icons/pdf.png"));
//$(file.previewElement).closest("img[data-dz-thumbnail]").attr("src", pdfIconUrl);
const thumbnailElement = file.previewElement.querySelector("[data-dz-thumbnail]");
if (thumbnailElement) {
thumbnailElement.src = Vapor.asset("images/icons/pdf.png"); // Set the PDF icon as the thumbnail
thumbnailElement.src = Vapor.asset("images/icons/pdf.png");
}
console.log('pdf.png: ', $(file.previewElement).closest("img[data-dz-thumbnail]"));
console.log('pdf.png: ', Vapor.asset("images/icons/pdf.png"));
//$(file.previewElement).closest("img[data-dz-thumbnail]").attr("src", pdfIconUrl);
}
if(file.name.split('.').pop().indexOf("xls") !== -1){
// $(file.previewElement).closest("img[data-dz-thumbnail]").attr("src", Vapor.asset("images/icons/xlsx.png"));
//$(file.previewElement).closest("img[data-dz-thumbnail]").attr("src", Vapor.asset("images/icons/xlsx.png"));
//$(file.previewElement).closest("img[data-dz-thumbnail]").attr("src", xlsIconUrl);
const thumbnailElement = file.previewElement.querySelector("[data-dz-thumbnail]");
if (thumbnailElement) {
thumbnailElement.src = Vapor.asset("images/icons/xlsx.png"); // Set the PDF icon as the thumbnail
thumbnailElement.src = Vapor.asset("images/icons/xlsx.png");
}
console.log('xlsx.png: ', $(file.previewElement).closest("img[data-dz-thumbnail]"));
console.log('xlsx.png: ', Vapor.asset("images/icons/xlsx.png"));
//$(file.previewElement).closest("img[data-dz-thumbnail]").attr("src", xlsIconUrl);
}
Promise.all(dropzone.files.map(function(file){