Fix issue #21

angelodlfrtr · Jan 6, 2023 · 3498a76 · 3498a76
1 parent 836cb19
commit 3498a76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.go b/build.go
@@ -376,7 +376,7 @@ func (doc *Document) appendTotal() {
 			descString.WriteString(doc.ac.FormatMoneyDecimal(discountAmount))
 			descString.WriteString(" / -")
 			descString.WriteString(
-				discountAmount.Mul(decimal.NewFromFloat(100)).Div(doc.TotalWithoutTax()).StringFixed(2),
+				discountAmount.Mul(decimal.NewFromFloat(100)).Div(doc.TotalWithoutTaxAndWithoutDocumentDiscount()).StringFixed(2),
 			)
 			descString.WriteString(" %")
 		}

diff --git a/generator_test.go b/generator_test.go
@@ -1,7 +1,7 @@
 package generator
 
 import (
-	"io/ioutil"
+	"os"
 	"testing"
 )
 
@@ -35,7 +35,7 @@ func TestNew(t *testing.T) {
 	doc.SetDate("02/03/2021")
 	doc.SetPaymentTerm("02/04/2021")
 
-	logoBytes, _ := ioutil.ReadFile("./example_logo.png")
+	logoBytes, _ := os.ReadFile("./example_logo.png")
 
 	doc.SetCompany(&Contact{
 		Name: "Test Company",

diff --git a/totals.go b/totals.go
@@ -45,7 +45,7 @@ func (doc *Document) TotalWithTax() decimal.Decimal {
 
 // Tax return the total tax with document discount
 func (doc *Document) Tax() decimal.Decimal {
-	totalWithoutTax := doc.TotalWithoutTax()
+	totalWithoutTaxAndWithoutDocDiscount := doc.TotalWithoutTaxAndWithoutDocumentDiscount()
 	totalTax := decimal.NewFromFloat(0)
 
 	if doc.Discount == nil {
@@ -57,7 +57,7 @@ func (doc *Document) Tax() decimal.Decimal {
 		discountPercent := discountAmount
 		if discountType == DiscountTypeAmount {
 			// Get percent from total discounted
-			discountPercent = discountAmount.Mul(decimal.NewFromFloat(100)).Div(totalWithoutTax)
+			discountPercent = discountAmount.Mul(decimal.NewFromFloat(100)).Div(totalWithoutTaxAndWithoutDocDiscount)
 		}
 
 		for _, item := range doc.Items {