From 63823d41addec00556a93eabffa455630d169ca6 Mon Sep 17 00:00:00 2001
From: Vidhu Kant Sharma <vidhukant@vidhukant.com>
Date: Sat, 6 Apr 2024 10:26:44 +0530
Subject: added basic (and incomplete) print preview template

---
 src/assets/placeholderlogo.png                  | Bin 0 -> 10419 bytes
 src/assets/placeholderqr.png                    | Bin 0 -> 6999 bytes
 src/classes/user.ts                             |  21 +++
 src/components/InvoiceHeaderEditor.vue          | 192 ++++++++++++++++++++++++
 src/components/PrintPreview.vue                 |  31 ++++
 src/components/PrintPreviewHeader.vue           |  99 ++++++++++++
 src/components/PrintPreviewItemsList.vue        |  59 ++++++++
 src/components/PrintPreviewRecipientDetails.vue | 146 ++++++++++++++++++
 src/components/invoice_header.vue               |   1 -
 src/components/invoice_header_editor.vue        | 164 --------------------
 src/views/NewInvoice.vue                        |   4 +-
 src/views/ViewInvoice.vue                       |  40 +----
 12 files changed, 558 insertions(+), 199 deletions(-)
 create mode 100644 src/assets/placeholderlogo.png
 create mode 100644 src/assets/placeholderqr.png
 create mode 100644 src/classes/user.ts
 create mode 100644 src/components/InvoiceHeaderEditor.vue
 create mode 100644 src/components/PrintPreview.vue
 create mode 100644 src/components/PrintPreviewHeader.vue
 create mode 100644 src/components/PrintPreviewItemsList.vue
 create mode 100644 src/components/PrintPreviewRecipientDetails.vue
 delete mode 100644 src/components/invoice_header_editor.vue

(limited to 'src')

diff --git a/src/assets/placeholderlogo.png b/src/assets/placeholderlogo.png
new file mode 100644
index 0000000..6675ddd
Binary files /dev/null and b/src/assets/placeholderlogo.png differ
diff --git a/src/assets/placeholderqr.png b/src/assets/placeholderqr.png
new file mode 100644
index 0000000..634fe46
Binary files /dev/null and b/src/assets/placeholderqr.png differ
diff --git a/src/classes/user.ts b/src/classes/user.ts
new file mode 100644
index 0000000..dc18717
--- /dev/null
+++ b/src/classes/user.ts
@@ -0,0 +1,21 @@
+export default class User {
+  FullName: string
+  FirmName: string
+  Gstin: string
+  Phone: string
+  Email: string
+  Website: string
+  Username: string
+  IsVerified: bool
+
+  constructor() {
+    this.FullName = ''
+    this.FirmName = ''
+    this.Gstin = ''
+    this.Phone = ''
+    this.Email = ''
+    this.Website = ''
+    this.Username = ''
+    this.IsVerified = false
+  }
+}
diff --git a/src/components/InvoiceHeaderEditor.vue b/src/components/InvoiceHeaderEditor.vue
new file mode 100644
index 0000000..6fe8a25
--- /dev/null
+++ b/src/components/InvoiceHeaderEditor.vue
@@ -0,0 +1,192 @@
+<script setup lang="ts">
+import { ref, toRaw, onMounted } from 'vue'
+import { useRouter } from 'vue-router'
+import axios from 'axios'
+import { useToast } from 'vue-toast-notification'
+import Customer from "./../classes/customer"
+import User from "./../classes/user"
+
+const toast = useToast({
+  position: 'top-right'
+})
+
+const route = useRouter()
+
+const gettingData = ref(true) // for when getting all/one customer(s)
+const submitting = ref(false) // shows spinner on continue button
+const allCustomers = ref([])
+
+const customer = ref(new Customer())
+const user = ref(new User())
+const customerSelection = ref(null)
+const invoiceDate = ref(new Date().toISOString().substr(0, 10))
+
+const getAllCustomers = async () => {
+  allCustomers.value = []
+  gettingData.value = true
+
+  try {
+    const r = await axios.get('/customer')
+    if (r.status === 200) {
+      allCustomers.value = r.data.data
+    }
+  } catch (err) {
+    toast.error('An unhandled exception occoured. Please check logs')
+    console.error(err)
+  }
+
+  gettingData.value = false
+}
+
+const getUser = async () => {
+  user.value = new User()
+  gettingData.value = true
+
+  try {
+    const r = await axios.get('/user')
+    if (r.status === 200) {
+      user.value = r.data.data
+    }
+  } catch (err) {
+    toast.error('An unhandled exception occoured. Please check logs')
+    console.error(err)
+  }
+
+  gettingData.value = false
+  console.log(user)
+}
+
+const submit = async (e: Event) => {
+  e.preventDefault()
+  submitting.value = true
+
+  try {
+    const c = toRaw(customer.value)
+    const u = toRaw(user.value)
+
+    const res = await axios.post('/invoice', {
+      "invoicedate": new Date(toRaw(invoiceDate.value)).toISOString(),
+      "isdraft": true,
+      "BillingAddress": {
+        // NOTE: just c.BillingAddress doesn't work for some reason
+        "AddressText": c.BillingAddress.AddressText,
+        "City": c.BillingAddress.City,
+        "State": c.BillingAddress.State,
+        "PostalCode": c.BillingAddress.PostalCode,
+        "Country": c.BillingAddress.Country,
+      },
+      "ShippingAddress": {
+        // TODO: don't use the billing address!
+        "AddressText": c.BillingAddress.AddressText,
+        "City": c.BillingAddress.City,
+        "State": c.BillingAddress.State,
+        "PostalCode": c.BillingAddress.PostalCode,
+        "Country": c.BillingAddress.Country,
+      },
+      "customername": c.Name,
+      "customergstin": c.Gstin,
+      "customercontactname": c.ContactName,
+      "customerphone": c.Phone,
+      "customeremail": c.Email,
+      "customerwebsite": c.Website,
+      "issuerfirmname": u.FirmName,
+      "issuerfirmaddress": u.AddressText,
+      "issuerfirmgstin": u.Gstin,
+      "issuerfirmphone": u.Phone,
+      "issuerfirmemail": u.Email,
+      "issuerfirmwebsite": u.Website,
+    })
+
+    route.push({ name: "edit-invoice", params: { id: res.data.data.ID }})
+  } catch (err: any) {
+    const statusCode: any = err.request.status
+    const res: any = JSON.parse(err.request.response)
+
+    switch (statusCode) {
+      case 400:
+        toast.error(res.error)
+        break
+      case 409:
+        toast.error(res.error)
+        break
+      default:
+        console.error(err)
+        toast.error('An unhandled exception occoured. Please check logs')
+    }
+  }
+
+  submitting.value = false
+}
+
+// when customer is selected,
+// get the whole customer object from server
+const refreshCustomer = async () => {
+  gettingData.value = true
+
+  const c: any = toRaw(customerSelection.value)
+
+  try {
+    const r = await axios.get(`/customer/${c.ID}`)
+    customer.value = r.data.data
+  } catch (err) {
+    toast.error('An unhandled exception occoured. Please check logs')
+    console.error(err)
+  }
+
+  gettingData.value = false
+}
+
+onMounted(() => {
+  getUser()
+  getAllCustomers()
+})
+</script>
+
+<template>
+  <form class="row g-3" v-on:submit="submit">
+    <div class="col-md-3"><!-- spacer --></div>
+
+    <div class="col-md-3">
+      <label for="item-brand-input" class="form-label">Customer</label>
+      <select
+        v-model="customerSelection"
+        @change="refreshCustomer()"
+        class="form-select"
+        aria-label="Select Brand"
+        id="item-brand-input"
+      >
+        <option v-if="allCustomers.length === 0" selected disabled value="null">No customers added in OpenBills!</option>
+        <option v-else selected disabled value="null">Select Customer</option>
+        <option v-for="customer in allCustomers" :value="customer" :key="customer['id']">
+          {{ customer["Name"] }}
+        </option>
+      </select>
+    </div>
+
+    <div class="col-md-2">
+      <label for="invoice-date" class="form-label">Invoice Date</label>
+      <input
+        type="date"
+        id="invoice-date"
+        class="form-control"
+        v-model="invoiceDate"/>
+    </div>
+
+    <div class="col-md-1 d-flex align-items-end justify-content-start">
+      <button
+        type="submit"
+        class="btn btn-primary btn-block"
+        :class="{ disabled: submitting || gettingData || customerSelection === null }"
+      >
+        Continue
+        <div v-if="submitting" class="spinner-border spinner-border-sm ms-1" role="status">
+          <span class="sr-only"></span>
+        </div>
+      </button>
+    </div>
+
+    <div class="col-md-2"><!-- spacer --></div>
+    <p>TODO: add address info / shipping address selector</p>
+
+  </form>
+</template>
diff --git a/src/components/PrintPreview.vue b/src/components/PrintPreview.vue
new file mode 100644
index 0000000..ecbda88
--- /dev/null
+++ b/src/components/PrintPreview.vue
@@ -0,0 +1,31 @@
+<script setup lang="ts">
+  import PrintPreviewHeader from './PrintPreviewHeader.vue'
+  import PrintPreviewRecipientDetails from './PrintPreviewRecipientDetails.vue'
+  import PrintPreviewItemsList from './PrintPreviewItemsList.vue'
+
+  const props = defineProps(["invoice"])
+
+  setTimeout(() => {
+    console.log(props.invoice)
+  }, 1000)
+</script>
+
+<template>
+  <div class="print-preview">
+    <PrintPreviewHeader 
+      :invoice="props.invoice" />
+    <PrintPreviewRecipientDetails 
+      :invoice="props.invoice"/>
+    <PrintPreviewItemsList 
+      :items="props.invoice.Items"/>
+  </div>
+</template>
+
+<style>
+.print-preview * {
+  font-size: 9pt;
+}
+.print-preview p {
+  margin: 0;
+}
+</style>
diff --git a/src/components/PrintPreviewHeader.vue b/src/components/PrintPreviewHeader.vue
new file mode 100644
index 0000000..33f82f2
--- /dev/null
+++ b/src/components/PrintPreviewHeader.vue
@@ -0,0 +1,99 @@
+<script setup lang="ts">
+  const props = defineProps(["invoice"])
+</script>
+
+<template>
+  <div class="print-preview-header">
+    <div class="logo-container"> 
+      <img src="../assets/placeholderlogo.png"/>
+    </div>
+
+    <div> 
+      <div class="firm-name">
+        <p>{{ props.invoice.IssuerFirmName }}</p>
+      </div>
+      <div class="firm-address">
+        {{ props.invoice.IssuerFirmAddress }}
+      </div>
+    </div>
+
+    <div class="header-col3"> 
+      <div class="firm-contact">
+        <div class="label">
+          <span><strong>Phone:</strong></span>
+          <span>{{ props.invoice.IssuerFirmPhone }}</span>
+        </div>
+        <div class="label">
+          <span><strong>Email:</strong></span>
+          <span>{{ props.invoice.IssuerFirmEmail }}</span>
+        </div>
+        <div class="label">
+          <span><strong>Website:</strong></span>
+          <span>{{ props.invoice.IssuerFirmWebsite }}</span>
+        </div>
+        <div class="label">
+          <span><strong>GSTIN:</strong></span>
+          <span>{{ props.invoice.IssuerFirmGstin }}</span>
+        </div>
+      </div>
+      <div class="qr-container"> 
+        <img src="../assets/placeholderqr.png"/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style>
+.print-preview-header {
+  display: grid;
+  grid-template-columns: 1.7in 2.4in auto;
+  grid-column-gap: 1em;
+  width: 100%;
+  margin-bottom: 1em;
+}
+.logo-container {
+  display: flex;
+  justify-content: center;
+  align-items: flex-start;
+  max-width: 1.7in;
+}
+.logo-container img {
+  max-width: 100%;
+  max-height: 100%;
+}
+.firm-name {
+  height: 2em;
+}
+.firm-name p {
+  line-height: 0.8em;
+  font-size: 1.6em;
+  font-weight: bold;
+}
+.firm-address {
+  font-size: 0.9em;
+  line-height: 1.2em;
+  white-space: pre-wrap;
+}
+.header-col3 {
+  display: grid;
+  grid-template-columns: auto 0.8in;
+}
+.firm-contact {
+  display: flex;
+  flex-direction: column;
+  font-size: 0.9em;
+}
+.firm-contact .label {
+  display: grid;
+  grid-template-columns: 4.5em auto;
+}
+.qr-container {
+  display: flex;
+  justify-content: flex-end;
+  align-items: flex-start;
+  width: 100%;
+}
+.qr-container img {
+  max-width: 100%;
+}
+</style>
diff --git a/src/components/PrintPreviewItemsList.vue b/src/components/PrintPreviewItemsList.vue
new file mode 100644
index 0000000..72f0fc1
--- /dev/null
+++ b/src/components/PrintPreviewItemsList.vue
@@ -0,0 +1,59 @@
+<script setup lang="ts">
+  const props = defineProps(["items"])
+</script>
+
+<template>
+  <div class="items-list-wrapper">
+    <div class="items-list-header">
+      <div class="cell">#</div>
+      <div class="cell">Item Name</div>
+      <div class="cell">HSN</div>
+      <div class="cell">Qty</div>
+      <div class="cell">Unit Price</div>
+      <div class="cell">Discount</div>
+      <div class="cell">Taxable Value</div>
+      <div class="cell">GST</div>
+      <div class="cell">Total</div>
+    </div>
+    <div class="item-list">
+      <div v-for="(item, index) in props.items" :key="item['id']" class="item-list-row">
+        <div class="cell">{{ index + 1 }}</div>
+        <div class="cell">{{ item.Name }}</div>
+        <div class="cell">{{ item.HSN }}</div>
+        <div class="cell">1</div>
+        <div class="cell">100</div>
+        <div class="cell">0</div>
+        <div class="cell">10</div>
+        <div class="cell">18</div>
+        <div class="cell">1000</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style>
+.items-list-wrapper {
+  margin-top: 1em;
+  border-top: 1px solid gray;
+  border-left: 1px solid gray;
+}
+.cell {
+  border-right: 1px solid gray;
+  border-bottom: 1px solid gray;
+}
+.items-list-header, .item-list-row {
+  display: grid;
+  grid-template-columns: 0.3in 2in 0.5in 0.5in 0.5in 0.6in 0.77in 1.5in 0.6in;
+}
+.items-list-header .cell {
+  font-weight: bold;
+  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.item-list {
+  display: flex;
+  flex-direction: column;
+}
+</style>
diff --git a/src/components/PrintPreviewRecipientDetails.vue b/src/components/PrintPreviewRecipientDetails.vue
new file mode 100644
index 0000000..6f1f5b7
--- /dev/null
+++ b/src/components/PrintPreviewRecipientDetails.vue
@@ -0,0 +1,146 @@
+<script setup lang="ts">
+  const props = defineProps(["invoice"])
+</script>
+
+<template>
+  <div class="print-preview-recipient-info">
+    <div class="recipient-info--row1">
+      <div class="recipient-info--col1">
+      </div>
+      <div class="recipient-info--col2">
+        <span class="invoice-label">
+          <span><strong>INVOICE</strong></span>
+          <span>Original for Recipient</span>
+        </span>
+      </div>
+    </div>
+    <div class="recipient-info--row2">
+      <div class="recipient-info--col1 recipient-contact">
+        <div class="label">
+          <span><strong>Bill To</strong></span>
+          <span>{{ props.invoice.CustomerName }}</span>
+        </div>
+        <div class="label">
+          <span><strong>Address</strong></span>
+          <span>
+            {{ props.invoice.BillingAddress.AddressText }}<br>
+            {{ props.invoice.BillingAddress.City }}
+            ({{ props.invoice.BillingAddress.PostalCode }}), 
+            {{ props.invoice.BillingAddress.State }},
+            {{ props.invoice.BillingAddress.Country }}
+          </span>
+        </div>
+        <div class="label">
+          <span><strong>Contact</strong></span>
+          <span>{{ props.invoice.CustomerContactName }}</span>
+        </div>
+        <div class="label">
+          <span><strong>Phone</strong></span>
+          <span>{{ props.invoice.CustomerPhone }}</span>
+        </div>
+        <div class="label">
+          <span><strong>Email</strong></span>
+          <span>{{ props.invoice.CustomerEmail }}</span>
+        </div>
+        <div class="label">
+          <span><strong>Website</strong></span>
+          <span>{{ props.invoice.CustomerWebsite }}</span>
+        </div>
+        <div class="label">
+          <span><strong>GSTIN</strong></span>
+          <span>{{ props.invoice.CustomerGstin }}</span>
+        </div>
+      </div>
+      <div class="recipient-info--col2">
+        <div class="invoice-meta">
+          <div class="label">
+            <span><strong>Invoice Number: </strong></span>
+            <span>{{ props.invoice.InvoiceNumber }}</span>
+          </div>
+          <div class="label">
+            <span><strong>Invoice Date: </strong></span>
+            <span>{{ new Date(props.invoice.InvoiceDate).toLocaleDateString() }}</span>
+          </div>
+        </div>
+        <div class="shipping-address">
+          <div class="label">
+            <span><strong>Shipping Address</strong></span>
+            <span>
+              {{ props.invoice.ShippingAddress.AddressText }}<br>
+              {{ props.invoice.ShippingAddress.City }}
+              ({{ props.invoice.ShippingAddress.PostalCode }}), 
+              {{ props.invoice.ShippingAddress.State }},
+              {{ props.invoice.ShippingAddress.Country }}
+            </span>
+            
+            <span><strong>City</strong></span>
+            <span>{{ props.invoice.ShippingAddress.City }}</span>
+
+            <span><strong>State</strong></span>
+            <span>{{ props.invoice.ShippingAddress.State }}</span>
+
+            <span><strong>ZIP Code</strong></span>
+            <span>{{ props.invoice.ShippingAddress.PostalCode }}</span>
+
+            <span><strong>Country</strong></span>
+            <span>{{ props.invoice.ShippingAddress.Country }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style>
+.print-preview-recipient-info {
+  border: 1px solid gray;
+  display: grid;
+  grid-template-rows: 2em auto;
+  width: 100%;
+}
+.recipient-info--row1,
+.recipient-info--row2 {
+  display: grid;
+  grid-template-columns: 3fr 4fr;
+}
+.recipient-info--row1 {
+  border-bottom: 1px solid gray;
+}
+.recipient-info--col1 {
+  border-right: 1px solid gray;
+}
+.recipient-info--col1 {
+  padding: 0.1em 0.3em;
+}
+.invoice-label {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 0.3em;
+}
+.recipient-contact {
+  display: flex;
+  flex-direction: column;
+}
+.recipient-contact .label {
+  display: grid;
+  grid-template-columns: 5em auto;
+}
+.invoice-meta {
+  width: 100%;
+  border-bottom: 1px solid gray;
+  padding: 0.3em 0.3em;
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+}
+.invoice-meta .label, .shipping-address .label {
+  display: grid;
+  grid-template-columns: 9em auto;
+}
+.shipping-address {
+  width: 100%;
+  padding: 0.1em 0.3em;
+}
+</style>
diff --git a/src/components/invoice_header.vue b/src/components/invoice_header.vue
index 5a57fc8..fe35980 100644
--- a/src/components/invoice_header.vue
+++ b/src/components/invoice_header.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { defineProps } from 'vue'
 const props = defineProps(["invoice"])
 </script>
 
diff --git a/src/components/invoice_header_editor.vue b/src/components/invoice_header_editor.vue
deleted file mode 100644
index 83c5281..0000000
--- a/src/components/invoice_header_editor.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<script setup lang="ts">
-import { ref, toRaw, onMounted } from 'vue'
-import { useRouter } from 'vue-router'
-import axios from 'axios'
-import { useToast } from 'vue-toast-notification'
-import Customer from "./../classes/customer"
-
-const toast = useToast({
-  position: 'top-right'
-})
-
-const route = useRouter()
-
-const gettingData = ref(true) // for when getting all/one customer(s)
-const submitting = ref(false) // shows spinner on continue button
-const allCustomers = ref([])
-
-const customer = ref(new Customer())
-const customerSelection = ref(null)
-const invoiceDate = ref(new Date().toISOString().substr(0, 10))
-
-const getAllCustomers = async () => {
-  allCustomers.value = []
-  gettingData.value = true
-
-  try {
-    const r = await axios.get('/customer')
-    if (r.status === 200) {
-      allCustomers.value = r.data.data
-    }
-  } catch (err) {
-    toast.error('An unhandled exception occoured. Please check logs')
-    console.error(err)
-  }
-
-  gettingData.value = false
-}
-
-const submit = async (e: Event) => {
-  e.preventDefault()
-  submitting.value = true
-
-  try {
-    const c = toRaw(customer.value)
-
-    const res = await axios.post('/invoice', {
-      "invoicedate": new Date(toRaw(invoiceDate.value)).toISOString(),
-      "isdraft": true,
-      "BillingAddress": {
-        // NOTE: just c.BillingAddress doesn't work for some reason
-        "AddressText": c.BillingAddress.AddressText,
-        "City": c.BillingAddress.City,
-        "State": c.BillingAddress.State,
-        "PostalCode": c.BillingAddress.PostalCode,
-        "Country": c.BillingAddress.Country,
-      },
-      "ShippingAddress": {
-        // TODO: don't use the billing address!
-        "AddressText": c.BillingAddress.AddressText,
-        "City": c.BillingAddress.City,
-        "State": c.BillingAddress.State,
-        "PostalCode": c.BillingAddress.PostalCode,
-        "Country": c.BillingAddress.Country,
-      },
-      "customername": c.Name,
-      "customergstin": c.Gstin,
-      "customercontactname": c.ContactName,
-      "customerphone": c.Phone,
-      "customeremail": c.Email,
-      "customerwebsite": c.Website,
-    })
-
-    route.push({ name: "edit-invoice", params: { id: res.data.data.ID }})
-  } catch (err: any) {
-    const statusCode: any = err.request.status
-    const res: any = JSON.parse(err.request.response)
-
-    switch (statusCode) {
-      case 400:
-        toast.error(res.error)
-        break
-      case 409:
-        toast.error(res.error)
-        break
-      default:
-        console.error(err)
-        toast.error('An unhandled exception occoured. Please check logs')
-    }
-  }
-
-  submitting.value = false
-}
-
-// when customer is selected,
-// get the whole customer object from server
-const refreshCustomer = async () => {
-  gettingData.value = true
-
-  const c: any = toRaw(customerSelection.value)
-
-  try {
-    const r = await axios.get(`/customer/${c.ID}`)
-    customer.value = r.data.data
-  } catch (err) {
-    toast.error('An unhandled exception occoured. Please check logs')
-    console.error(err)
-  }
-
-  gettingData.value = false
-}
-
-onMounted(() => {
-  getAllCustomers()
-})
-</script>
-
-<template>
-  <form class="row g-3" v-on:submit="submit">
-    <div class="col-md-3"><!-- spacer --></div>
-
-    <div class="col-md-3">
-      <label for="item-brand-input" class="form-label">Customer</label>
-      <select
-        v-model="customerSelection"
-        @change="refreshCustomer()"
-        class="form-select"
-        aria-label="Select Brand"
-        id="item-brand-input"
-      >
-        <option v-if="allCustomers.length === 0" selected disabled value="null">No customers added in OpenBills!</option>
-        <option v-else selected disabled value="null">Select Customer</option>
-        <option v-for="customer in allCustomers" :value="customer" :key="customer['id']">
-          {{ customer["Name"] }}
-        </option>
-      </select>
-    </div>
-
-    <div class="col-md-2">
-      <label for="invoice-date" class="form-label">Invoice Date</label>
-      <input
-        type="date"
-        id="invoice-date"
-        class="form-control"
-        v-model="invoiceDate"/>
-    </div>
-
-    <div class="col-md-1 d-flex align-items-end justify-content-start">
-      <button
-        type="submit"
-        class="btn btn-primary btn-block"
-        :class="{ disabled: submitting || gettingData || customerSelection === null }"
-      >
-        Continue
-        <div v-if="submitting" class="spinner-border spinner-border-sm ms-1" role="status">
-          <span class="sr-only"></span>
-        </div>
-      </button>
-    </div>
-
-    <div class="col-md-2"><!-- spacer --></div>
-    <p>TODO: add address info / shipping address selector</p>
-
-  </form>
-</template>
diff --git a/src/views/NewInvoice.vue b/src/views/NewInvoice.vue
index 06d3ec7..2e2230c 100644
--- a/src/views/NewInvoice.vue
+++ b/src/views/NewInvoice.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import invoiceHeaderEditor from './../components/invoice_header_editor.vue'
+import InvoiceHeaderEditor from './../components/InvoiceHeaderEditor.vue'
 </script>
 
 <template>
-  <invoiceHeaderEditor />
+  <InvoiceHeaderEditor />
 </template>
diff --git a/src/views/ViewInvoice.vue b/src/views/ViewInvoice.vue
index 5f2a783..b8b7f2d 100644
--- a/src/views/ViewInvoice.vue
+++ b/src/views/ViewInvoice.vue
@@ -11,6 +11,8 @@ import invoiceHeader from './../components/invoice_header.vue'
 import invoiceItemsTable from './../components/invoice_items_table.vue'
 import invoiceSummary from './../components/invoice_summary.vue'
 
+import PrintPreview from './../components/PrintPreview.vue'
+
 const toast = useToast({
   position: 'top-right'
 })
@@ -52,50 +54,24 @@ onMounted(() => {
 
 <template>
   <div id="print-preview" class="bg-white text-black">
-    <invoiceHeader
-      :invoice="invoice" />
-    <invoiceItemsTable
-      preview=true
-      :items="items"
-      :isLoading="itemsTableIsLoading" />
-    <invoiceSummary
-      :items="items"
-      :isLoading="itemsTableIsLoading"
-    />
+    <PrintPreview :invoice="invoice"/>
   </div>
   <button id="print-button" class="btn btn-primary" @click="handlePrint">Print</button>
 </template>
 
 <style>
 #print-preview {
-  width: 670px;
-}
-#print-preview * {
-  font-size: 12pt !important;
-}
-#print-preview .sup {
-}
-#print-preview table {
-  width: 100%;
-}
-#print-preview table * {
-  font-size: 10pt !important;
-}
-#print-preview .invoice-items-table {
-  margin-bottom: auto !important;
-}
-#print-preview .invoice-summary {
-  margin-top: auto !important;
-}
-#print-preview .item-name-cell span {
-  max-width: 150pt !important;
+  max-height: 90vh;
+  /*display: none;*/
+  aspect-ratio: 1 / 1.414;
 }
 @media print {
   body {
     background-color: white;
   }
   #print-preview {
-    width: auto !important;
+    display: block;
+    width: 100% !important;
     height: 100% !important;
   }
   #sidebar, #navbar, #print-button, .btn {
-- 
cgit v1.2.3