From 181278f5e16f963826b0b469a5d8807ee1e22049 Mon Sep 17 00:00:00 2001
From: Mohd Arief <ariefsohaimi@gmail.com>
Date: Mon, 27 Aug 2018 13:58:51 +0800
Subject: [PATCH 1/4] fixed the download button for supplier report on admin
 side

---
 resources/assets/js/pages/admin/booking/completed.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/resources/assets/js/pages/admin/booking/completed.vue b/resources/assets/js/pages/admin/booking/completed.vue
index 2b2ab439..9e0776cd 100644
--- a/resources/assets/js/pages/admin/booking/completed.vue
+++ b/resources/assets/js/pages/admin/booking/completed.vue
@@ -331,6 +331,8 @@
     box-shadow: 0 0 2px 1px rgba(0, 140, 186, 0.5);
   }
 </style>
+<script src="https://rawgit.com/eligrey/FileSaver.js/master/FileSaver.js"></script>
+<script src ="https://rawgit.com/eligrey/canvas-toBlob.js/master/canvas-toBlob.js"></script>
 <script>
   import ProgressTrack from '~/components/AdminProgressTrack'
   import X2ProgressTrack from '~/components/X2AdminProgressTrack'
@@ -402,6 +404,14 @@
         var getUrl = window.location;
         var baseUrl = getUrl.protocol + "//" + getUrl.host;
         return baseUrl + path;
+      },
+      downloadReport(){
+        let canvas = document.getElementById('myCanvas')
+        var dataString = canvas.toDataURL("image/png");
+        var link = document.createElement("a");
+        link.download = 'image';
+        link.href = dataString;
+        link.click();
       }
     },
     directives: {

From 16bb5cd7bc61c5f8d744d9d79bfda9a5ca907c21 Mon Sep 17 00:00:00 2001
From: Mohd Arief <ariefsohaimi@gmail.com>
Date: Tue, 28 Aug 2018 13:13:16 +0800
Subject: [PATCH 2/4] solved the discussion

---
 resources/assets/js/pages/admin/booking/completed.vue     | 2 --
 .../assets/js/pages/admin/booking/uploadChinaBankslip.vue | 8 ++++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/pages/admin/booking/completed.vue b/resources/assets/js/pages/admin/booking/completed.vue
index 9e0776cd..c5976df1 100644
--- a/resources/assets/js/pages/admin/booking/completed.vue
+++ b/resources/assets/js/pages/admin/booking/completed.vue
@@ -331,8 +331,6 @@
     box-shadow: 0 0 2px 1px rgba(0, 140, 186, 0.5);
   }
 </style>
-<script src="https://rawgit.com/eligrey/FileSaver.js/master/FileSaver.js"></script>
-<script src ="https://rawgit.com/eligrey/canvas-toBlob.js/master/canvas-toBlob.js"></script>
 <script>
   import ProgressTrack from '~/components/AdminProgressTrack'
   import X2ProgressTrack from '~/components/X2AdminProgressTrack'
diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
index 20754df2..ed7f1d6c 100644
--- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
+++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
@@ -438,6 +438,14 @@
         var getUrl = window.location;
         var baseUrl = getUrl.protocol + "//" + getUrl.host;
         return baseUrl + path;
+      },
+      downloadReport(){
+        let canvas = document.getElementById('myCanvas')
+        var dataString = canvas.toDataURL("image/png");
+        var link = document.createElement("a");
+        link.download = 'image';
+        link.href = dataString;
+        link.click();
       }
     },
     directives: {

From cb19c7735d26d88d753deb34c2dc3e0b0666c2f0 Mon Sep 17 00:00:00 2001
From: Mohd Arief <ariefsohaimi@gmail.com>
Date: Wed, 29 Aug 2018 11:16:43 +0800
Subject: [PATCH 3/4] update the download function

---
 resources/assets/js/pages/admin/booking/uploadInvoice.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/assets/js/pages/admin/booking/uploadInvoice.vue b/resources/assets/js/pages/admin/booking/uploadInvoice.vue
index 6d69b7e1..411a2aad 100644
--- a/resources/assets/js/pages/admin/booking/uploadInvoice.vue
+++ b/resources/assets/js/pages/admin/booking/uploadInvoice.vue
@@ -390,6 +390,14 @@
         })
     },
     methods: {
+      downloadReport(){
+        let canvas = document.getElementById('myCanvas')
+        var dataString = canvas.toDataURL("image/png");
+        var link = document.createElement("a");
+        link.download = 'image';
+        link.href = dataString;
+        link.click();
+      },
       confirmInvoice () {
       this.loading_btn = true
       axios

From 5c8263861e48687a69f182f113906d13b53c2af8 Mon Sep 17 00:00:00 2001
From: Mohd Arief <ariefsohaimi@gmail.com>
Date: Wed, 29 Aug 2018 11:49:28 +0800
Subject: [PATCH 4/4] update the download report in x2 completed page

---
 resources/assets/js/pages/admin/booking/x2Completed.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/assets/js/pages/admin/booking/x2Completed.vue b/resources/assets/js/pages/admin/booking/x2Completed.vue
index 556765e9..bcd9b4b3 100644
--- a/resources/assets/js/pages/admin/booking/x2Completed.vue
+++ b/resources/assets/js/pages/admin/booking/x2Completed.vue
@@ -355,6 +355,14 @@
       })
   },
   methods: {
+    downloadReport(){
+        let canvas = document.getElementById('myCanvas')
+        var dataString = canvas.toDataURL("image/png");
+        var link = document.createElement("a");
+        link.download = 'image';
+        link.href = dataString;
+        link.click();
+      },
     getExtension(path){
       return path.slice(-3);
     },