From 83de1c47ee38e128d87fb05a645554efddd98330 Mon Sep 17 00:00:00 2001
From: Mohit Panjwani <mohit.panjvani@gmail.com>
Date: Fri, 22 Jan 2021 13:44:59 +0530
Subject: [PATCH] fix tax rounding errors and styling issues

---
 .../assets/js/components/theme/SwButton.js    |  6 +++
 resources/assets/js/helpers/directives.js     |  4 +-
 .../assets/js/views/estimates/Create.vue      |  2 +-
 resources/assets/js/views/estimates/Item.vue  | 31 ++++++++-------
 resources/assets/js/views/invoices/Create.vue | 38 +++++++++++--------
 resources/assets/js/views/invoices/Item.vue   | 30 ++++++++-------
 6 files changed, 67 insertions(+), 44 deletions(-)

diff --git a/resources/assets/js/components/theme/SwButton.js b/resources/assets/js/components/theme/SwButton.js
index 99f663bd..d4f28c9c 100644
--- a/resources/assets/js/components/theme/SwButton.js
+++ b/resources/assets/js/components/theme/SwButton.js
@@ -13,4 +13,10 @@ export default {
         'inline-flex items-center justify-center text-black transition px-2 duration-150 ease-in-out border border-gray-300 border-solid focus:outline-none bg-white',
     },
   },
+  sizes: {
+    discount: {
+      button: 'py-2 px-2 text-sm leading-5 rounded',
+      loadingIcon: 'w-4 h-4 -ml-2',
+    },
+  },
 }
diff --git a/resources/assets/js/helpers/directives.js b/resources/assets/js/helpers/directives.js
index 3ccb8be9..d0932e7a 100644
--- a/resources/assets/js/helpers/directives.js
+++ b/resources/assets/js/helpers/directives.js
@@ -19,7 +19,9 @@ Vue.directive('click-outside', {
 Vue.directive('autoresize', {
   inserted: function (el) {
     el.style.height = el.scrollHeight + 'px'
-    el.style.overflow.y = 'hidden'
+    if (el.style.overflow && el.style.overflow.y) {
+      el.style.overflow.y = 'hidden'
+    }
     el.style.resize = 'none'
     function OnInput() {
       this.style.height = 'auto'
diff --git a/resources/assets/js/views/estimates/Create.vue b/resources/assets/js/views/estimates/Create.vue
index 25216768..8dd40ab4 100644
--- a/resources/assets/js/views/estimates/Create.vue
+++ b/resources/assets/js/views/estimates/Create.vue
@@ -322,8 +322,8 @@
                 <sw-button
                   slot="activator"
                   type="button"
-                  class="flex items-center justify-center w-12 border border-gray-300 border-solid rounded-tl-none rounded-bl-none font-base"
                   data-toggle="dropdown"
+                  size="discount"
                   aria-haspopup="true"
                   aria-expanded="false"
                   style="height: 43px"
diff --git a/resources/assets/js/views/estimates/Item.vue b/resources/assets/js/views/estimates/Item.vue
index 43c959f4..c7e96e86 100644
--- a/resources/assets/js/views/estimates/Item.vue
+++ b/resources/assets/js/views/estimates/Item.vue
@@ -85,9 +85,10 @@
                       slot="activator"
                       type="button"
                       data-toggle="dropdown"
+                      size="discount"
                       aria-haspopup="true"
                       aria-expanded="false"
-                      style="height: 43px; padding: 6px"
+                      style="height: 43px"
                       variant="white"
                     >
                       <span class="flex">
@@ -266,22 +267,26 @@ export default {
       return this.subtotal - this.item.discount_val
     },
     totalSimpleTax() {
-      return window._.sumBy(this.item.taxes, function (tax) {
-        if (!tax.compound_tax) {
-          return tax.amount
-        }
+      return Math.round(
+        window._.sumBy(this.item.taxes, function (tax) {
+          if (!tax.compound_tax) {
+            return tax.amount
+          }
 
-        return 0
-      })
+          return 0
+        })
+      )
     },
     totalCompoundTax() {
-      return window._.sumBy(this.item.taxes, function (tax) {
-        if (tax.compound_tax) {
-          return tax.amount
-        }
+      return Math.round(
+        window._.sumBy(this.item.taxes, function (tax) {
+          if (tax.compound_tax) {
+            return tax.amount
+          }
 
-        return 0
-      })
+          return 0
+        })
+      )
     },
     totalTax() {
       return this.totalSimpleTax + this.totalCompoundTax
diff --git a/resources/assets/js/views/invoices/Create.vue b/resources/assets/js/views/invoices/Create.vue
index 1bf1f9c5..0eb23679 100644
--- a/resources/assets/js/views/invoices/Create.vue
+++ b/resources/assets/js/views/invoices/Create.vue
@@ -315,8 +315,8 @@
                 <sw-button
                   slot="activator"
                   type="button"
-                  class="flex items-center justify-center w-12 border border-gray-300 border-solid rounded-tl-none rounded-bl-none font-base"
                   data-toggle="dropdown"
+                  size="discount"
                   aria-haspopup="true"
                   aria-expanded="false"
                   style="height: 43px"
@@ -565,23 +565,27 @@ export default {
     },
 
     totalSimpleTax() {
-      return window._.sumBy(this.newInvoice.taxes, function (tax) {
-        if (!tax.compound_tax) {
-          return tax.amount
-        }
+      return Math.round(
+        window._.sumBy(this.newInvoice.taxes, function (tax) {
+          if (!tax.compound_tax) {
+            return tax.amount
+          }
 
-        return 0
-      })
+          return 0
+        })
+      )
     },
 
     totalCompoundTax() {
-      return window._.sumBy(this.newInvoice.taxes, function (tax) {
-        if (tax.compound_tax) {
-          return tax.amount
-        }
+      return Math.round(
+        window._.sumBy(this.newInvoice.taxes, function (tax) {
+          if (tax.compound_tax) {
+            return tax.amount
+          }
 
-        return 0
-      })
+          return 0
+        })
+      )
     },
 
     totalTax() {
@@ -589,9 +593,11 @@ export default {
         return this.totalSimpleTax + this.totalCompoundTax
       }
 
-      return window._.sumBy(this.newInvoice.items, function (tax) {
-        return tax.tax
-      })
+      return Math.round(
+        window._.sumBy(this.newInvoice.items, function (tax) {
+          return tax.tax
+        })
+      )
     },
 
     allTaxes() {
diff --git a/resources/assets/js/views/invoices/Item.vue b/resources/assets/js/views/invoices/Item.vue
index 163fb3d2..2a18cd87 100644
--- a/resources/assets/js/views/invoices/Item.vue
+++ b/resources/assets/js/views/invoices/Item.vue
@@ -83,8 +83,8 @@
                     <sw-button
                       slot="activator"
                       type="button"
-                      class="flex items-center px-5 py-1 text-sm font-medium leading-none text-center text-gray-500 whitespace-nowrap border border-gray-300 border-solid rounded rounded-tl-none rounded-bl-none dropdown-toggle"
                       data-toggle="dropdown"
+                      size="discount"
                       aria-haspopup="true"
                       aria-expanded="false"
                       style="height: 43px"
@@ -266,22 +266,26 @@ export default {
       return this.subtotal - this.item.discount_val
     },
     totalSimpleTax() {
-      return window._.sumBy(this.item.taxes, function (tax) {
-        if (!tax.compound_tax) {
-          return tax.amount
-        }
+      return Math.round(
+        window._.sumBy(this.item.taxes, function (tax) {
+          if (!tax.compound_tax) {
+            return tax.amount
+          }
 
-        return 0
-      })
+          return 0
+        })
+      )
     },
     totalCompoundTax() {
-      return window._.sumBy(this.item.taxes, function (tax) {
-        if (tax.compound_tax) {
-          return tax.amount
-        }
+      return Math.round(
+        window._.sumBy(this.item.taxes, function (tax) {
+          if (tax.compound_tax) {
+            return tax.amount
+          }
 
-        return 0
-      })
+          return 0
+        })
+      )
     },
     totalTax() {
       return this.totalSimpleTax + this.totalCompoundTax