diff --git a/resources/assets/images/alipay_logo.png b/resources/assets/images/alipay_logo.png new file mode 100644 index 00000000..a2949aef Binary files /dev/null and b/resources/assets/images/alipay_logo.png differ diff --git a/resources/assets/vue/components/bookings/elements/DownloadTransactionsReportComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadTransactionsReportComponent.vue index a5b78afe..c808dae9 100644 --- a/resources/assets/vue/components/bookings/elements/DownloadTransactionsReportComponent.vue +++ b/resources/assets/vue/components/bookings/elements/DownloadTransactionsReportComponent.vue @@ -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; diff --git a/resources/assets/vue/components/bookings/elements/ShowWhiteFormTransactionsComponent.vue b/resources/assets/vue/components/bookings/elements/ShowWhiteFormTransactionsComponent.vue index a163dab1..3eb29a1d 100644 --- a/resources/assets/vue/components/bookings/elements/ShowWhiteFormTransactionsComponent.vue +++ b/resources/assets/vue/components/bookings/elements/ShowWhiteFormTransactionsComponent.vue @@ -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; diff --git a/resources/assets/vue/components/general/forms/FileUploadComponent.vue b/resources/assets/vue/components/general/forms/FileUploadComponent.vue index c1cc118c..6a78d97e 100644 --- a/resources/assets/vue/components/general/forms/FileUploadComponent.vue +++ b/resources/assets/vue/components/general/forms/FileUploadComponent.vue @@ -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){