Merge pull request #20 from invopop/hide-tax-sum

Hiding tax sum if no taxes
invopop · Oct 15, 2024 · e70b522 · e70b522
2 parents 84d3600 + 3365ba5
commit e70b522
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -13,13 +13,15 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v4
+      - name: Set up Go
+        uses: actions/setup-go@v5
         with:
           go-version-file: "go.mod"
+        id: go
 
       - name: Lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.55
+          version: v1.58
diff --git a/components/bill/invoice/totals.templ b/components/bill/invoice/totals.templ
@@ -76,7 +76,7 @@ templ totalsBaseRows(inv *bill.Invoice, totals *bill.Totals) {
 			</td>
 		</tr>
 	}
-	if totals.TaxIncluded == nil || !totals.TaxIncluded.Equals(totals.Tax) {
+	if totals.Taxes != nil && len(totals.Taxes.Categories) > 0 && (totals.TaxIncluded == nil || !totals.TaxIncluded.Equals(totals.Tax)) {
 		<tr class="tax">
 			<th>
 				@t.T(".taxes")

diff --git a/components/bill/invoice/totals_templ.go b/components/bill/invoice/totals_templ.go
diff --git a/examples/out/us-invoice.html b/examples/out/us-invoice.html
@@ -205,14 +205,6 @@ <h2>
                     $4,800.00
                   </td>
                 </tr>
-                <tr class="tax">
-                  <th>
-                    Tax
-                  </th>
-                  <td>
-                    $0.00
-                  </td>
-                </tr>
                 <tr class="payable strong">
                   <th>
                     Total to pay