diff --git a/resources/assets/js/views/reports/ExpensesReport.vue b/resources/assets/js/views/reports/ExpensesReport.vue index 20b8612d..ea94af8b 100644 --- a/resources/assets/js/views/reports/ExpensesReport.vue +++ b/resources/assets/js/views/reports/ExpensesReport.vue @@ -48,7 +48,7 @@
@@ -179,6 +179,11 @@ export default { setRangeToCustom () { this.selectedRange = 'Custom' }, + async viewReportsPDF () { + let data = await this.getReports() + window.open(this.getReportUrl, '_blank') + return data + }, async getReports (isDownload = false) { this.$v.range.$touch() this.$v.formData.$touch() diff --git a/resources/assets/js/views/reports/ProfitLossReport.vue b/resources/assets/js/views/reports/ProfitLossReport.vue index cef0d10b..c63c6678 100644 --- a/resources/assets/js/views/reports/ProfitLossReport.vue +++ b/resources/assets/js/views/reports/ProfitLossReport.vue @@ -48,7 +48,7 @@ @@ -184,6 +184,11 @@ export default { setRangeToCustom () { this.selectedRange = 'Custom' }, + async viewReportsPDF () { + let data = await this.getReports() + window.open(this.getReportUrl, '_blank') + return data + }, async getReports (isDownload = false) { this.$v.range.$touch() this.$v.formData.$touch() diff --git a/resources/assets/js/views/reports/SalesReports.vue b/resources/assets/js/views/reports/SalesReports.vue index f3913a17..cdf8d96a 100644 --- a/resources/assets/js/views/reports/SalesReports.vue +++ b/resources/assets/js/views/reports/SalesReports.vue @@ -70,7 +70,7 @@ @@ -217,6 +217,11 @@ export default { this.url = `${this.itemsSiteURL}?from_date=${moment(this.formData.from_date).format('DD/MM/YYYY')}&to_date=${moment(this.formData.to_date).format('DD/MM/YYYY')}` return true }, + async viewReportsPDF () { + let data = await this.getReports() + window.open(this.getReportUrl, '_blank') + return data + }, async getReports (isDownload = false) { this.$v.range.$touch() this.$v.formData.$touch() diff --git a/resources/assets/js/views/reports/TaxReport.vue b/resources/assets/js/views/reports/TaxReport.vue index 8b02e403..02a2a240 100644 --- a/resources/assets/js/views/reports/TaxReport.vue +++ b/resources/assets/js/views/reports/TaxReport.vue @@ -48,7 +48,7 @@ @@ -179,6 +179,11 @@ export default { setRangeToCustom () { this.selectedRange = 'Custom' }, + async viewReportsPDF () { + let data = await this.getReports() + window.open(this.getReportUrl, '_blank') + return data + }, async getReports (isDownload = false) { this.$v.range.$touch() this.$v.formData.$touch() diff --git a/resources/assets/sass/pages/reports.scss b/resources/assets/sass/pages/reports.scss index 87e0497d..f4392f21 100644 --- a/resources/assets/sass/pages/reports.scss +++ b/resources/assets/sass/pages/reports.scss @@ -21,6 +21,7 @@ .report-view-button { display: none; + color: $btn-secondary-color; } .report-fields-container { @@ -61,8 +62,13 @@ display: none; } + .report-submit-button-container { + display: none; + } + .report-view-button { display: flex; + color: $btn-secondary-color !important; justify-content: center } diff --git a/resources/views/app/pdf/estimate/estimate1.blade.php b/resources/views/app/pdf/estimate/estimate1.blade.php index b89caf3f..96b44376 100644 --- a/resources/views/app/pdf/estimate/estimate1.blade.php +++ b/resources/views/app/pdf/estimate/estimate1.blade.php @@ -330,6 +330,32 @@ margin-top:7px; color:rgba(0, 0, 0, 0.85); } + + .notes { + font-family: 'Roboto', sans-serif; + font-style: normal; + font-weight: 300; + font-size: 12px; + color: #595959; + margin-top: 15px; + margin-left: 30px; + width: 442px; + text-align: left; + } + + .notes-label { + font-family: 'Roboto', sans-serif; + font-style: normal; + font-weight: normal; + font-size: 15px; + line-height: 22px; + letter-spacing: 0.05em; + color: #040405; + width: 108px; + height: 19.87px; + padding-bottom: 10px; + } + @@ -386,6 +412,7 @@ @include('app.pdf.estimate.partials.table') + @include('app.pdf.estimate.partials.notes')