From 617b0711ee26a0487b93517b0d05d09f7ed56ff9 Mon Sep 17 00:00:00 2001
From: Jay_Makwana <jaimakwana786@gmail.com>
Date: Mon, 11 Nov 2019 20:24:15 +0530
Subject: [PATCH] refactor templates and reports

---
 .../js/views/reports/ExpensesReport.vue       |  7 ++++-
 .../js/views/reports/ProfitLossReport.vue     |  7 ++++-
 .../assets/js/views/reports/SalesReports.vue  |  7 ++++-
 .../assets/js/views/reports/TaxReport.vue     |  7 ++++-
 resources/assets/sass/pages/reports.scss      |  6 ++++
 .../app/pdf/estimate/estimate1.blade.php      | 27 +++++++++++++++++
 .../app/pdf/estimate/estimate2.blade.php      | 27 +++++++++++++++++
 .../app/pdf/estimate/estimate3.blade.php      | 27 +++++++++++++++++
 .../app/pdf/estimate/partials/notes.blade.php |  6 ++++
 .../views/app/pdf/invoice/invoice1.blade.php  | 29 ++++++++++++++++++-
 .../views/app/pdf/invoice/invoice2.blade.php  | 27 +++++++++++++++++
 .../views/app/pdf/invoice/invoice3.blade.php  | 27 +++++++++++++++++
 .../app/pdf/invoice/partials/notes.blade.php  |  6 ++++
 13 files changed, 205 insertions(+), 5 deletions(-)
 create mode 100644 resources/views/app/pdf/estimate/partials/notes.blade.php
 create mode 100644 resources/views/app/pdf/invoice/partials/notes.blade.php

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 @@
     </div>
     <div class="col-sm-8 reports-tab-container">
       <iframe :src="getReportUrl" class="reports-frame-style"/>
-      <a :href="getReportUrl" class="base-button btn btn-primary btn-lg report-view-button" target="_blank">
+      <a class="base-button btn btn-primary btn-lg report-view-button" @click="viewReportsPDF">
         <font-awesome-icon icon="file-pdf" class="vue-icon icon-left svg-inline--fa fa-download fa-w-16 mr-2" /> <span>{{ $t('reports.view_pdf') }}</span>
       </a>
     </div>
@@ -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 @@
     </div>
     <div class="col-sm-8 reports-tab-container">
       <iframe :src="getReportUrl" class="reports-frame-style"/>
-      <a :href="getReportUrl" class="base-button btn btn-primary btn-lg report-view-button" target="_blank">
+      <a class="base-button btn btn-primary btn-lg report-view-button" @click="viewReportsPDF">
         <font-awesome-icon icon="file-pdf" class="vue-icon icon-left svg-inline--fa fa-download fa-w-16 mr-2" /> <span>{{ $t('reports.view_pdf') }}</span>
       </a>
     </div>
@@ -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 @@
     </div>
     <div class="col-sm-8 reports-tab-container">
       <iframe :src="getReportUrl" class="reports-frame-style"/>
-      <a :href="getReportUrl" class="base-button btn btn-primary btn-lg report-view-button" target="_blank">
+      <a class="base-button btn btn-primary btn-lg report-view-button" @click="viewReportsPDF">
         <font-awesome-icon icon="file-pdf" class="vue-icon icon-left svg-inline--fa fa-download fa-w-16 mr-2" /> <span>{{ $t('reports.view_pdf') }}</span>
       </a>
     </div>
@@ -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 @@
     </div>
     <div class="col-sm-8 reports-tab-container">
       <iframe :src="getReportUrl" class="reports-frame-style"/>
-      <a :href="getReportUrl" class="base-button btn btn-primary btn-lg report-view-button" target="_blank">
+      <a class="base-button btn btn-primary btn-lg report-view-button" @click="viewReportsPDF">
         <font-awesome-icon icon="file-pdf" class="vue-icon icon-left svg-inline--fa fa-download fa-w-16 mr-2" /> <span>{{ $t('reports.view_pdf') }}</span>
       </a>
     </div>
@@ -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;
+        }
+
     </style>
 </head>
 <body>
@@ -386,6 +412,7 @@
             <div style="clear: both;"></div>
         </div>
         @include('app.pdf.estimate.partials.table')
+        @include('app.pdf.estimate.partials.notes')
     </div>
 </body>
 </html>
diff --git a/resources/views/app/pdf/estimate/estimate2.blade.php b/resources/views/app/pdf/estimate/estimate2.blade.php
index 905f044d..63c9266e 100644
--- a/resources/views/app/pdf/estimate/estimate2.blade.php
+++ b/resources/views/app/pdf/estimate/estimate2.blade.php
@@ -358,6 +358,32 @@
              margin-bottom:1px;
              margin-top:0;
         }
+
+        .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;
+        }
+
     </style>
 </head>
 <body>
@@ -399,6 +425,7 @@
             </div>
         </div>
         @include('app.pdf.estimate.partials.table')
+        @include('app.pdf.estimate.partials.notes')
     </div>
 </body>
 </html>
diff --git a/resources/views/app/pdf/estimate/estimate3.blade.php b/resources/views/app/pdf/estimate/estimate3.blade.php
index f2f02d93..dc02eb7e 100644
--- a/resources/views/app/pdf/estimate/estimate3.blade.php
+++ b/resources/views/app/pdf/estimate/estimate3.blade.php
@@ -366,6 +366,32 @@
             border-bottom:1px solid #E8E8E8;
             border-top:1px solid #E8E8E8;
         }
+
+        .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;
+        }
+
     </style>
 </head>
 <body>
@@ -423,6 +449,7 @@
             </div>
         </div>
         @include('app.pdf.estimate.partials.table')
+        @include('app.pdf.estimate.partials.notes')
     </div>
 </body>
 </html>
diff --git a/resources/views/app/pdf/estimate/partials/notes.blade.php b/resources/views/app/pdf/estimate/partials/notes.blade.php
new file mode 100644
index 00000000..ccde1ae9
--- /dev/null
+++ b/resources/views/app/pdf/estimate/partials/notes.blade.php
@@ -0,0 +1,6 @@
+<div class="notes">
+    <div class="notes-label">
+        Notes
+    </div>
+    {{$estimate->notes}}
+</div>
diff --git a/resources/views/app/pdf/invoice/invoice1.blade.php b/resources/views/app/pdf/invoice/invoice1.blade.php
index 854d5368..c8e1668e 100644
--- a/resources/views/app/pdf/invoice/invoice1.blade.php
+++ b/resources/views/app/pdf/invoice/invoice1.blade.php
@@ -336,6 +336,30 @@
             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;
+        }
 
     </style>
 </head>
@@ -393,7 +417,10 @@
             </div>
             <div style="clear: both;"></div>
         </div>
-        @include('app.pdf.invoice.partials.table')
+        <div style="position:relative">
+            @include('app.pdf.invoice.partials.table')
+        </div>
+        @include('app.pdf.invoice.partials.notes')
     </div>
 </body>
 </html>
diff --git a/resources/views/app/pdf/invoice/invoice2.blade.php b/resources/views/app/pdf/invoice/invoice2.blade.php
index 7a2f9fba..9bb4c04f 100644
--- a/resources/views/app/pdf/invoice/invoice2.blade.php
+++ b/resources/views/app/pdf/invoice/invoice2.blade.php
@@ -368,6 +368,32 @@
              margin-bottom:1px;
              margin-top:0;
         }
+
+        .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;
+        }
+
     </style>
 </head>
 <body>
@@ -410,6 +436,7 @@
             </div>
         </div>
         @include('app.pdf.invoice.partials.table')
+        @include('app.pdf.invoice.partials.notes')
     </div>
 </body>
 </html>
diff --git a/resources/views/app/pdf/invoice/invoice3.blade.php b/resources/views/app/pdf/invoice/invoice3.blade.php
index 4c6c6b9b..95d69718 100644
--- a/resources/views/app/pdf/invoice/invoice3.blade.php
+++ b/resources/views/app/pdf/invoice/invoice3.blade.php
@@ -377,6 +377,32 @@
             border-bottom:1px solid #E8E8E8;
             border-top:1px solid #E8E8E8;
         }
+
+        .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;
+        }
+
     </style>
 </head>
 <body>
@@ -434,6 +460,7 @@
             </div>
         </div>
         @include('app.pdf.invoice.partials.table')
+        @include('app.pdf.invoice.partials.notes')
     </div>
 </body>
 </html>
diff --git a/resources/views/app/pdf/invoice/partials/notes.blade.php b/resources/views/app/pdf/invoice/partials/notes.blade.php
new file mode 100644
index 00000000..cb1c8062
--- /dev/null
+++ b/resources/views/app/pdf/invoice/partials/notes.blade.php
@@ -0,0 +1,6 @@
+<div class="notes">
+    <div class="notes-label">
+        Notes
+    </div>
+    {{$invoice->notes}}
+</div>