From 8c19f51814f967babb96333e957079dd4a066e6d Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 2 May 2022 16:26:47 +0530
Subject: [PATCH] incr: get printview to display - printing still not working

---
 main.ts                                       |  2 +-
 models/baseModels/Party/Party.ts              |  2 +-
 .../Templates/{Base.vue => BaseTemplate.vue}  | 12 ++++----
 .../SalesInvoice/Templates/Basic.vue          | 28 +++++++++++++------
 .../SalesInvoice/Templates/Business.vue       |  2 +-
 .../SalesInvoice/Templates/Minimal.vue        |  2 +-
 src/pages/ListView/List.vue                   |  8 +++++-
 src/pages/PrintView/PrintView.vue             | 10 +++++--
 src/{saveHtmlAsPdf.js => saveHtmlAsPdf.ts}    | 17 ++++++-----
 9 files changed, 53 insertions(+), 30 deletions(-)
 rename src/components/SalesInvoice/Templates/{Base.vue => BaseTemplate.vue} (73%)
 rename src/{saveHtmlAsPdf.js => saveHtmlAsPdf.ts} (75%)

diff --git a/main.ts b/main.ts
index b6409afb..25b9fc9a 100644
--- a/main.ts
+++ b/main.ts
@@ -18,7 +18,7 @@ import registerProcessListeners from './main/registerProcessListeners';
 import { IPC_CHANNELS } from './utils/messages';
 
 const WIDTH = 1200;
-const HEIGHT = 907;
+const HEIGHT = 900;
 
 export class Main {
   title: string = 'Frappe Books';
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index d85cae5d..c5b96f4d 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -110,7 +110,7 @@ export class Party extends Doc {
 
   static getListViewSettings(): ListViewSettings {
     return {
-      columns: ['name', 'phone', 'outstandingAmount'],
+      columns: ['name', 'email', 'phone', 'outstandingAmount'],
     };
   }
 
diff --git a/src/components/SalesInvoice/Templates/Base.vue b/src/components/SalesInvoice/Templates/BaseTemplate.vue
similarity index 73%
rename from src/components/SalesInvoice/Templates/Base.vue
rename to src/components/SalesInvoice/Templates/BaseTemplate.vue
index 3b2ff1a3..de35d665 100644
--- a/src/components/SalesInvoice/Templates/Base.vue
+++ b/src/components/SalesInvoice/Templates/BaseTemplate.vue
@@ -2,13 +2,13 @@
 import { fyo } from 'src/initFyo';
 export default {
   name: 'Base',
-  props: ['doc', 'printSettings'],
+  props: { doc: Object, printSettings: Object },
   data: () => ({ party: null, companyAddress: null }),
   methods: {
     format(row, fieldname) {
-      let value = row.get(fieldname);
-      return fyo.format(value, row.meta.getField(fieldname));
-    }
+      const value = row.get(fieldname);
+      return fyo.format(value, fyo.getField(row.schemaName, fieldname));
+    },
   },
   async mounted() {
     await this.doc.loadLink('party');
@@ -19,7 +19,7 @@ export default {
   computed: {
     isSalesInvoice() {
       return this.doc.schemaName === 'SalesInvoice';
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/components/SalesInvoice/Templates/Basic.vue b/src/components/SalesInvoice/Templates/Basic.vue
index e8d3e093..74b9610a 100644
--- a/src/components/SalesInvoice/Templates/Basic.vue
+++ b/src/components/SalesInvoice/Templates/Basic.vue
@@ -23,7 +23,12 @@
           </div>
           <div class="w-1/3">
             <div v-if="companyAddress">{{ companyAddress.addressDisplay }}</div>
-            <div v-if="fyo.singles.AccountingSettings && fyo.singles.AccountingSettings.gstin">
+            <div
+              v-if="
+                fyo.singles.AccountingSettings &&
+                fyo.singles.AccountingSettings.gstin
+              "
+            >
               GSTIN: {{ fyo.singles.AccountingSettings.gstin }}
             </div>
           </div>
@@ -85,11 +90,7 @@
     </div>
     <div class="px-6 mt-2 flex justify-end text-base">
       <div class="w-1/2 bg-pink">
-        <div
-          class="text-sm tracking-widest text-gray-600 mt-2"
-        >
-          Notes
-        </div>
+        <div class="text-sm tracking-widest text-gray-600 mt-2">Notes</div>
         <div class="my-4 text-lg whitespace-pre-line">
           {{ doc.terms }}
         </div>
@@ -108,7 +109,16 @@
           <div>{{ fyo.format(tax.amount, 'Currency') }}</div>
         </div>
         <div
-          class="flex pl-2 justify-between py-3 border-t text-green-600 font-semibold text-base"
+          class="
+            flex
+            pl-2
+            justify-between
+            py-3
+            border-t
+            text-green-600
+            font-semibold
+            text-base
+          "
         >
           <div>{{ t`Grand Total` }}</div>
           <div>{{ fyo.format(doc.grandTotal, 'Currency') }}</div>
@@ -119,11 +129,11 @@
 </template>
 
 <script>
-import Base from './Base';
+import Base from './BaseTemplate.vue';
 
 export default {
   name: 'Default',
   extends: Base,
-  props: ['doc', 'printSettings']
+  props: ['doc', 'printSettings'],
 };
 </script>
diff --git a/src/components/SalesInvoice/Templates/Business.vue b/src/components/SalesInvoice/Templates/Business.vue
index 2775094b..9fc4661f 100644
--- a/src/components/SalesInvoice/Templates/Business.vue
+++ b/src/components/SalesInvoice/Templates/Business.vue
@@ -128,7 +128,7 @@
 </template>
 
 <script>
-import Base from './Base';
+import Base from './BaseTemplate.vue';
 
 export default {
   name: 'Business',
diff --git a/src/components/SalesInvoice/Templates/Minimal.vue b/src/components/SalesInvoice/Templates/Minimal.vue
index 52ba27c2..cc8dd323 100644
--- a/src/components/SalesInvoice/Templates/Minimal.vue
+++ b/src/components/SalesInvoice/Templates/Minimal.vue
@@ -140,7 +140,7 @@
 </template>
 
 <script>
-import Base from './Base';
+import Base from './BaseTemplate.vue';
 
 export default {
   name: 'Minimal',
diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue
index 47756eee..9868260d 100644
--- a/src/pages/ListView/List.vue
+++ b/src/pages/ListView/List.vue
@@ -101,7 +101,13 @@ export default {
       }
 
       return columns
-        .map((fieldname) => fyo.getField(this.schemaName, fieldname))
+        .map((fieldname) => {
+          if (typeof fieldname === 'object') {
+            return fieldname;
+          }
+
+          return fyo.getField(this.schemaName, fieldname);
+        })
         .filter(Boolean);
     },
     hasImage() {
diff --git a/src/pages/PrintView/PrintView.vue b/src/pages/PrintView/PrintView.vue
index 2344dda0..155a0b63 100644
--- a/src/pages/PrintView/PrintView.vue
+++ b/src/pages/PrintView/PrintView.vue
@@ -12,6 +12,8 @@
           {{ t`Save as PDF` }}
         </Button>
       </PageHeader>
+
+      <!-- Printview Preview -->
       <div
         v-if="doc && printSettings"
         class="flex justify-center flex-1 -mt-36 overflow-auto relative"
@@ -34,6 +36,8 @@
         </div>
       </div>
     </div>
+
+    <!-- Printview Customizer -->
     <div class="border-l w-80" v-if="showCustomiser">
       <div class="mt-4 px-4 flex items-center justify-between">
         <h2 class="font-semibold">{{ t`Customise` }}</h2>
@@ -52,7 +56,7 @@ import Button from 'src/components/Button.vue';
 import PageHeader from 'src/components/PageHeader.vue';
 import InvoiceTemplate from 'src/components/SalesInvoice/InvoiceTemplate.vue';
 import TwoColumnForm from 'src/components/TwoColumnForm.vue';
-import { makePDF } from 'src/utils';
+import { makePDF } from 'src/utils/ipcCalls';
 import { IPC_ACTIONS } from 'utils/messages';
 
 export default {
@@ -76,7 +80,7 @@ export default {
   },
   computed: {
     printTemplate() {
-      return InvoiceTemplate
+      return InvoiceTemplate;
     },
   },
   methods: {
@@ -86,7 +90,7 @@ export default {
 
       const html = this.$refs.printContainer.innerHTML;
       fyo.telemetry.log(Verb.Exported, 'SalesInvoice', { extension: 'pdf' });
-      makePDF(html, savePath);
+      await makePDF(html, savePath);
     },
     async getSavePath() {
       const options = {
diff --git a/src/saveHtmlAsPdf.js b/src/saveHtmlAsPdf.ts
similarity index 75%
rename from src/saveHtmlAsPdf.js
rename to src/saveHtmlAsPdf.ts
index 5ca7817d..ead6de7a 100644
--- a/src/saveHtmlAsPdf.js
+++ b/src/saveHtmlAsPdf.ts
@@ -10,7 +10,10 @@ const PRINT_OPTIONS = {
   printSelectionOnly: false,
 };
 
-export default async function makePDF(html, savePath) {
+export default async function saveHtmlAsPdf(
+  html: string,
+  savePath: string
+): Promise<void> {
   const printWindow = getInitializedPrintWindow();
 
   printWindow.webContents.executeJavaScript(`
@@ -22,9 +25,7 @@ export default async function makePDF(html, savePath) {
       await sleep(1); // Required else pdf'll be blank.
 
       const data = await printWindow.webContents.printToPDF(PRINT_OPTIONS);
-      await fs.writeFile(savePath, data, (error) => {
-        if (error) throw error;
-      });
+      await fs.writeFile(savePath, data);
 
       resolve();
     });
@@ -38,15 +39,17 @@ function getInitializedPrintWindow() {
     show: false,
     webPreferences: {
       contextIsolation: false,
-      nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION,
+      nodeIntegration: false,
     },
   });
-  printWindow.loadURL(getPrintWindowUrl());
+  const printWindowUrl = getPrintWindowUrl();
+  printWindow.loadURL(printWindowUrl);
   return printWindow;
 }
 
 function getPrintWindowUrl() {
-  let url = global.WEBPACK_DEV_SERVER_URL;
+  // @ts-ignore
+  let url = global.WEBPACK_DEV_SERVER_URL as string | undefined;
   if (url) {
     url = url + 'print';
   } else {