Allow custom tax naming. Update examples

README.md

@@ -16,6 +16,11 @@ are:
  * Everything on the bill is the same currency
  * Filenames will be output in a standard way
 
+Current limitations:
+
+ * Has tax support with one rate for all entries. May eventually support
+   different rates for different line items.
+
 The Problem This Solves
 ------------------------
 

billing.example.yaml

@@ -33,9 +33,11 @@ billables:
     unit_price:  10.23
     currency:    €
 
-# You may enter tax as a percentage here (from 0 to 1.0).
+# You may enter tax as a percentage here (from 0 to 1.0). This will
+# be applied to all items on the invoice.
 tax:
-  percentage: 0.1
+  default_percentage: 0.1
+  tax_name: "GST" # Default "Tax". Some countries use GST, some VAT, etc
 
 # Where to send the money!
 bank:

invoice/bill.go

@@ -261,7 +261,10 @@ func (b *Bill) drawBillablesTable(headers []string, billables []BillableItem, ta
 	}
 
 	// Calculate tax
-	tax := subTotal * taxDetails.Percentage
+	var tax float64
+	if taxDetails != nil {
+		tax = subTotal * taxDetails.DefaultPercentage
+	}
 	total := subTotal + tax
 
 	// Draw the Sub-Total
@@ -273,11 +276,17 @@ func (b *Bill) drawBillablesTable(headers []string, billables []BillableItem, ta
 	b.textFormat(widths[len(widths)-2], 4, "Subtotal", "1", 0, "R", true, 0, "")
 	b.textFormat(widths[len(widths)-1], 4, subTotalText, "1", 0, "R", true, 0, "")
 
+	// Handle configurable tax name
+	taxName := "Tax"
+	if taxDetails != nil && taxDetails.TaxName != "" {
+		taxName = taxDetails.TaxName
+	}
+
 	// Draw Tax
 	b.pdf.Ln(4)
 	b.drawBlanks(billables, widths)
 	taxText := billables[0].Currency + " " + niceFloatStr(tax)
-	b.textFormat(widths[len(widths)-2], 4, "GST", "1", 0, "R", true, 0, "")
+	b.textFormat(widths[len(widths)-2], 4, taxName, "1", 0, "R", true, 0, "")
 	b.textFormat(widths[len(widths)-1], 4, taxText, "1", 0, "R", true, 0, "")
 
 	// Draw Total

invoice/config.go

@@ -66,7 +66,8 @@ func (b *BillableItem) Strings() []string {
 }
 
 type TaxDetails struct {
-	Percentage float64
+	DefaultPercentage float64 `yaml:"default_percentage"`
+	TaxName           string  `yaml:"tax_name"`
 }
 
 type BankDetails struct {
@@ -97,7 +98,7 @@ type BillColor struct {
 }
 
 type AppConfig struct {
-	OutputDir string           `yaml:"output_dir"`
+	OutputDir string `yaml:"output_dir"`
 }
 
 type BillingConfig struct {