diff --git a/app/Helpers/Invoice/InvoiceItemSum.php b/app/Helpers/Invoice/InvoiceItemSum.php
index 59da4f698944..8a297000238e 100644
--- a/app/Helpers/Invoice/InvoiceItemSum.php
+++ b/app/Helpers/Invoice/InvoiceItemSum.php
@@ -94,11 +94,8 @@ class InvoiceItemSum
         return $this;
     }
 
-    /* Don't round the cost x qty - will allow us to use higher precision costs */
     private function sumLineItem()
-    {   //todo need to support quantities less than the precision amount
-        // $this->setLineTotal($this->formatValue($this->item->cost, $this->currency->precision) * $this->formatValue($this->item->quantity, $this->currency->precision));
-        
+    {   
         $this->setLineTotal($this->item->cost * $this->item->quantity);
 
         return $this;
diff --git a/app/Helpers/Invoice/InvoiceItemSumInclusive.php b/app/Helpers/Invoice/InvoiceItemSumInclusive.php
index a9d67b76b03c..134ebe774bdd 100644
--- a/app/Helpers/Invoice/InvoiceItemSumInclusive.php
+++ b/app/Helpers/Invoice/InvoiceItemSumInclusive.php
@@ -87,7 +87,10 @@ class InvoiceItemSumInclusive
 
     private function sumLineItem()
     {
-        $this->setLineTotal($this->formatValue($this->item->cost, $this->currency->precision) * $this->formatValue($this->item->quantity, $this->currency->precision));
+        $this->setLineTotal($this->item->cost * $this->item->quantity);
+
+        //11-02-2022
+        // $this->setLineTotal($this->formatValue($this->item->cost, $this->currency->precision) * $this->formatValue($this->item->quantity, $this->currency->precision));
 
         return $this;
     }
diff --git a/resources/views/portal/ninja2020/gateways/wepay/includes/credit_card.blade.php b/resources/views/portal/ninja2020/gateways/wepay/includes/credit_card.blade.php
index 94c621a6f4f3..7932472382c1 100644
--- a/resources/views/portal/ninja2020/gateways/wepay/includes/credit_card.blade.php
+++ b/resources/views/portal/ninja2020/gateways/wepay/includes/credit_card.blade.php
@@ -3,8 +3,8 @@
     <div class="card-js" id="my-card" data-capture-name="true">
         <input class="name" id="cardholder_name" name="card-holders-name" placeholder="{{ ctrans('texts.name')}}" required>
         <input class="card-number my-custom-class" id="card_number" name="card-number" required>
-        <input class="expiry-month" name="expiry-month" id="expiration_month" required>
-        <input class="expiry-year" name="expiry-year" id="expiration_year" required>
+        <input class="expiry-month" name="expiry-month" id="expiration_month" role="presentation" autocomplete="off" required>
+        <input class="expiry-year" name="expiry-year" id="expiration_year" role="presentation" autocomplete="off" required>
         <input class="cvc" name="cvc" id="cvv" required>
     </div>
 
diff --git a/tests/Unit/InvoiceTest.php b/tests/Unit/InvoiceTest.php
index 233403634f28..1b857be6f6c9 100644
--- a/tests/Unit/InvoiceTest.php
+++ b/tests/Unit/InvoiceTest.php
@@ -86,7 +86,7 @@ class InvoiceTest extends TestCase
     public function testInvoiceTotalsWithDiscountWithSurcharge()
     {
         $this->invoice->discount = 5;
-        $this->invoice->custom_value1 = 5;
+        $this->invoice->custom_surcharge1 = 5;
 
         $this->invoice_calc->build();
 
@@ -98,21 +98,21 @@ class InvoiceTest extends TestCase
     public function testInvoiceTotalsWithDiscountWithSurchargeWithInclusiveTax()
     {
         $this->invoice->discount = 5;
-        $this->invoice->custom_value1 = 5;
+        $this->invoice->custom_surcharge1 = 5;
         $this->invoice->tax_name1 = 'GST';
         $this->invoice->tax_rate1 = 10;
 
         $this->invoice_calc->build();
 
         $this->assertEquals($this->invoice_calc->getSubTotal(), 20);
-        //$this->assertEquals($this->invoice_calc->getTotal(), 20);
+        // $this->assertEquals($this->invoice_calc->getTotal(), 21.5);
         //$this->assertEquals($this->invoice_calc->getBalance(), 20);
     }
 
     public function testInvoiceTotalsWithDiscountWithSurchargeWithExclusiveTax()
     {
         $this->invoice->discount = 5;
-        $this->invoice->custom_value1 = 5;
+        $this->invoice->custom_surcharge1 = 5;
         $this->invoice->tax_name1 = 'GST';
         $this->invoice->tax_rate1 = 10;
         $this->invoice->uses_inclusive_taxes = false;
@@ -124,7 +124,7 @@ class InvoiceTest extends TestCase
 
         $this->assertEquals($this->invoice_calc->getSubTotal(), 20);
         // $this->assertEquals($this->invoice_calc->getGrossSubTotal(), 22);
-        //$this->assertEquals($this->invoice_calc->getTotal(), 21.5);
+        $this->assertEquals($this->invoice_calc->getTotal(), 21.5);
         //$this->assertEquals($this->invoice_calc->getBalance(), 21.5);
         //$this->assertEquals($this->invoice_calc->getTotalTaxes(), 1.5);
     }
@@ -134,7 +134,7 @@ class InvoiceTest extends TestCase
         $this->invoice_calc = new InvoiceSum($this->invoice);
 
         $this->invoice->discount = 5;
-        $this->invoice->custom_value1 = 5;
+        $this->invoice->custom_surcharge1 = 5;
         $this->invoice->tax_name1 = 'GST';
         $this->invoice->tax_rate1 = 10;
         $this->invoice->tax_name2 = 'GST';
@@ -144,7 +144,7 @@ class InvoiceTest extends TestCase
         $this->invoice_calc->build();
 
         $this->assertEquals($this->invoice_calc->getSubTotal(), 20);
-        //$this->assertEquals($this->invoice_calc->getTotal(), 23);
+        $this->assertEquals($this->invoice_calc->getTotal(), 23);
         //$this->assertEquals($this->invoice_calc->getBalance(), 23);
         //$this->assertEquals($this->invoice_calc->getTotalTaxes(), 3);
     }
@@ -217,8 +217,8 @@ class InvoiceTest extends TestCase
         $this->invoice_calc->build();
 
         $this->assertEquals($this->invoice_calc->getSubTotal(), 20);
-        $this->assertEquals($this->invoice_calc->getGrossSubTotal(), 22);
-        //$this->assertEquals($this->invoice_calc->getTotal(), 26);
+        // $this->assertEquals($this->invoice_calc->getGrossSubTotal(), 22);
+        $this->assertEquals($this->invoice_calc->getTotal(), 26);
         //$this->assertEquals($this->invoice_calc->getBalance(), 26);
         //$this->assertEquals($this->invoice_calc->getTotalTaxes(), 4);
         //$this->assertEquals(count($this->invoice_calc->getTaxMap()), 1);