From 6bfab30f14fac5c8e67b88dbdd7f81f8300fe760 Mon Sep 17 00:00:00 2001 From: Patrick Lucas Date: Wed, 21 Jul 2021 14:07:06 +0200 Subject: [PATCH 1/2] Add tax column to invoices When an invoice has tax per item enabled, include a tax column so that it's clear how much tax is being applied to each item. --- .../views/app/pdf/invoice/partials/table.blade.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/views/app/pdf/invoice/partials/table.blade.php b/resources/views/app/pdf/invoice/partials/table.blade.php index 98ee76db..14890953 100644 --- a/resources/views/app/pdf/invoice/partials/table.blade.php +++ b/resources/views/app/pdf/invoice/partials/table.blade.php @@ -7,6 +7,9 @@ @if($invoice->discount_per_item === 'YES') @lang('pdf_discount_label') @endif + @if($invoice->tax_per_item === 'YES') + @lang('pdf_tax_label') + @endif @lang('pdf_amount_label') @php @@ -54,6 +57,15 @@ @endif + @if($invoice->tax_per_item === 'YES') + + {!! format_money_pdf($item->tax, $invoice->user->currency) !!} + + @endif + Date: Wed, 21 Jul 2021 14:08:58 +0200 Subject: [PATCH 2/2] Add translation --- resources/assets/js/plugins/ar.json | 1 + resources/assets/js/plugins/de.json | 1 + resources/assets/js/plugins/en.json | 1 + resources/assets/js/plugins/es.json | 1 + resources/assets/js/plugins/fa.json | 1 + resources/assets/js/plugins/fi.json | 1 + resources/assets/js/plugins/fr.json | 1 + resources/assets/js/plugins/hi.json | 1 + resources/assets/js/plugins/it.json | 1 + resources/assets/js/plugins/ja.json | 1 + resources/assets/js/plugins/ko.json | 1 + resources/assets/js/plugins/lv.json | 1 + resources/assets/js/plugins/nl.json | 1 + resources/assets/js/plugins/pl.json | 1 + resources/assets/js/plugins/pt.json | 1 + resources/assets/js/plugins/ro.json | 1 + resources/assets/js/plugins/ru.json | 1 + resources/assets/js/plugins/sk.json | 1 + resources/assets/js/plugins/sr.json | 1 + resources/assets/js/plugins/sv.json | 1 + resources/assets/js/plugins/tr.json | 1 + resources/assets/js/plugins/vi.json | 1 + resources/assets/js/plugins/zh.json | 1 + 23 files changed, 23 insertions(+) diff --git a/resources/assets/js/plugins/ar.json b/resources/assets/js/plugins/ar.json index 77e39504..d5c72e87 100644 --- a/resources/assets/js/plugins/ar.json +++ b/resources/assets/js/plugins/ar.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "الكمية", "pdf_price_label": "السعر", "pdf_discount_label": "الخصم", + "pdf_tax_label": "ضريبة", "pdf_amount_label": "المبلغ المطلوب", "pdf_subtotal": "المجموع الفرعي", "pdf_total": "الإجمالي", diff --git a/resources/assets/js/plugins/de.json b/resources/assets/js/plugins/de.json index 8f2c5d29..a7b2f1ea 100644 --- a/resources/assets/js/plugins/de.json +++ b/resources/assets/js/plugins/de.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Menge", "pdf_price_label": "Preis", "pdf_discount_label": "Rabatt", + "pdf_tax_label": "Steuer", "pdf_amount_label": "Summe", "pdf_subtotal": "Zwischensumme", "pdf_total": "Gesamt", diff --git a/resources/assets/js/plugins/en.json b/resources/assets/js/plugins/en.json index 9b3f0efe..03947e08 100644 --- a/resources/assets/js/plugins/en.json +++ b/resources/assets/js/plugins/en.json @@ -1178,6 +1178,7 @@ "pdf_quantity_label": "Quantity", "pdf_price_label": "Price", "pdf_discount_label": "Discount", + "pdf_tax_label": "Tax", "pdf_amount_label": "Amount", "pdf_subtotal": "Subtotal", "pdf_total": "Total", diff --git a/resources/assets/js/plugins/es.json b/resources/assets/js/plugins/es.json index 2aac820b..8ea6fb1a 100644 --- a/resources/assets/js/plugins/es.json +++ b/resources/assets/js/plugins/es.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Cantidad", "pdf_price_label": "Precio", "pdf_discount_label": "Descuento", + "pdf_tax_label": "Impuesto", "pdf_amount_label": "Cantidad", "pdf_subtotal": "Subtotal", "pdf_total": "Total", diff --git a/resources/assets/js/plugins/fa.json b/resources/assets/js/plugins/fa.json index 1f3a4444..dcb4efa8 100644 --- a/resources/assets/js/plugins/fa.json +++ b/resources/assets/js/plugins/fa.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Quantity", "pdf_price_label": "Price", "pdf_discount_label": "Discount", + "pdf_tax_label": "Tax", "pdf_amount_label": "Amount", "pdf_subtotal": "Subtotal", "pdf_total": "Total", diff --git a/resources/assets/js/plugins/fi.json b/resources/assets/js/plugins/fi.json index 9662c753..3d2720d6 100644 --- a/resources/assets/js/plugins/fi.json +++ b/resources/assets/js/plugins/fi.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Määrä", "pdf_price_label": "Hinta", "pdf_discount_label": "Alennus", + "pdf_tax_label": "ALV", "pdf_amount_label": "Yhteensä veroton", "pdf_subtotal": "Välisumma", "pdf_total": "Yhteensä", diff --git a/resources/assets/js/plugins/fr.json b/resources/assets/js/plugins/fr.json index 434541c1..f20768d1 100644 --- a/resources/assets/js/plugins/fr.json +++ b/resources/assets/js/plugins/fr.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Quantité", "pdf_price_label": "Prix", "pdf_discount_label": "Remise", + "pdf_tax_label": "Taxe", "pdf_amount_label": "Montant", "pdf_subtotal": "Total HT", "pdf_total": "Total TTC", diff --git a/resources/assets/js/plugins/hi.json b/resources/assets/js/plugins/hi.json index 625071a6..b328ffa1 100644 --- a/resources/assets/js/plugins/hi.json +++ b/resources/assets/js/plugins/hi.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Quantity", "pdf_price_label": "Price", "pdf_discount_label": "Discount", + "pdf_tax_label": "कर", "pdf_amount_label": "Amount", "pdf_subtotal": "Subtotal", "pdf_total": "Total", diff --git a/resources/assets/js/plugins/it.json b/resources/assets/js/plugins/it.json index ef18fec7..3f6eb035 100644 --- a/resources/assets/js/plugins/it.json +++ b/resources/assets/js/plugins/it.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Quantità", "pdf_price_label": "Prezzo", "pdf_discount_label": "Sconto", + "pdf_tax_label": "Imposta", "pdf_amount_label": "Ammontare", "pdf_subtotal": "Parziale", "pdf_total": "Totale", diff --git a/resources/assets/js/plugins/ja.json b/resources/assets/js/plugins/ja.json index 05ee72f9..954a3967 100644 --- a/resources/assets/js/plugins/ja.json +++ b/resources/assets/js/plugins/ja.json @@ -1163,6 +1163,7 @@ "pdf_quantity_label": "量", "pdf_price_label": "価格", "pdf_discount_label": "ディスカウント", + "pdf_tax_label": "税金", "pdf_amount_label": "量", "pdf_subtotal": "小計", "pdf_total": "合計", diff --git a/resources/assets/js/plugins/ko.json b/resources/assets/js/plugins/ko.json index d8b97713..53f885e6 100644 --- a/resources/assets/js/plugins/ko.json +++ b/resources/assets/js/plugins/ko.json @@ -1163,6 +1163,7 @@ "pdf_quantity_label": "수량", "pdf_price_label": "가격", "pdf_discount_label": "할인", + "pdf_tax_label": "세", "pdf_amount_label": "양", "pdf_subtotal": "소계", "pdf_total": "합계", diff --git a/resources/assets/js/plugins/lv.json b/resources/assets/js/plugins/lv.json index f4169bb4..558cddcd 100644 --- a/resources/assets/js/plugins/lv.json +++ b/resources/assets/js/plugins/lv.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Daudzums", "pdf_price_label": "Cena", "pdf_discount_label": "Atlaide", + "pdf_tax_label": "Nodoklis", "pdf_amount_label": "Summa", "pdf_subtotal": "Starpsumma", "pdf_total": "Kopā", diff --git a/resources/assets/js/plugins/nl.json b/resources/assets/js/plugins/nl.json index 2aa979de..b1aa705d 100644 --- a/resources/assets/js/plugins/nl.json +++ b/resources/assets/js/plugins/nl.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Aantal stuks", "pdf_price_label": "Prijs", "pdf_discount_label": "Korting", + "pdf_tax_label": "Belasting", "pdf_amount_label": "Bedrag", "pdf_subtotal": "Subtotaal", "pdf_total": "Totaal", diff --git a/resources/assets/js/plugins/pl.json b/resources/assets/js/plugins/pl.json index 979ffe53..cf3619f2 100644 --- a/resources/assets/js/plugins/pl.json +++ b/resources/assets/js/plugins/pl.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Quantity", "pdf_price_label": "Price", "pdf_discount_label": "Discount", + "pdf_tax_label": "Tax", "pdf_amount_label": "Amount", "pdf_subtotal": "Subtotal", "pdf_total": "Total", diff --git a/resources/assets/js/plugins/pt.json b/resources/assets/js/plugins/pt.json index 9e2aeefc..695c072d 100644 --- a/resources/assets/js/plugins/pt.json +++ b/resources/assets/js/plugins/pt.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Quantidade", "pdf_price_label": "Preço", "pdf_discount_label": "Desconto", + "pdf_tax_label": "Imposto", "pdf_amount_label": "Valor", "pdf_subtotal": "Subtotal", "pdf_total": "Total", diff --git a/resources/assets/js/plugins/ro.json b/resources/assets/js/plugins/ro.json index cb1c9214..645f61b1 100644 --- a/resources/assets/js/plugins/ro.json +++ b/resources/assets/js/plugins/ro.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Quantity", "pdf_price_label": "Price", "pdf_discount_label": "Discount", + "pdf_tax_label": "Tax", "pdf_amount_label": "Amount", "pdf_subtotal": "Subtotal", "pdf_total": "Total", diff --git a/resources/assets/js/plugins/ru.json b/resources/assets/js/plugins/ru.json index 3fad3309..b64689b6 100644 --- a/resources/assets/js/plugins/ru.json +++ b/resources/assets/js/plugins/ru.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Кол-во", "pdf_price_label": "Цена", "pdf_discount_label": "Скидка", + "pdf_tax_label": "Налог", "pdf_amount_label": "Сумма", "pdf_subtotal": "В сумме", "pdf_total": "Итого", diff --git a/resources/assets/js/plugins/sk.json b/resources/assets/js/plugins/sk.json index 642ee3cd..361db386 100644 --- a/resources/assets/js/plugins/sk.json +++ b/resources/assets/js/plugins/sk.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Počet", "pdf_price_label": "Cena", "pdf_discount_label": "Zľava", + "pdf_tax_label": "Daň", "pdf_amount_label": "Celkom", "pdf_subtotal": "Medzisúčet", "pdf_total": "Súčet", diff --git a/resources/assets/js/plugins/sr.json b/resources/assets/js/plugins/sr.json index 6ac332dc..79b5788b 100644 --- a/resources/assets/js/plugins/sr.json +++ b/resources/assets/js/plugins/sr.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Količina", "pdf_price_label": "Cena", "pdf_discount_label": "Popust", + "pdf_tax_label": "Porez", "pdf_amount_label": "Iznos", "pdf_subtotal": "Osnovica za obračun PDV-a", "pdf_total": "Ukupan iznos", diff --git a/resources/assets/js/plugins/sv.json b/resources/assets/js/plugins/sv.json index a3a97a76..5b1536ff 100644 --- a/resources/assets/js/plugins/sv.json +++ b/resources/assets/js/plugins/sv.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Antal", "pdf_price_label": "Kostnad", "pdf_discount_label": "Rabatt", + "pdf_tax_label": "Moms", "pdf_amount_label": "Belopp", "pdf_subtotal": "Delsumma", "pdf_total": "Summa", diff --git a/resources/assets/js/plugins/tr.json b/resources/assets/js/plugins/tr.json index c1ef4fc3..ae603441 100644 --- a/resources/assets/js/plugins/tr.json +++ b/resources/assets/js/plugins/tr.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Quantity", "pdf_price_label": "Price", "pdf_discount_label": "Discount", + "pdf_tax_label": "Vergi", "pdf_amount_label": "Amount", "pdf_subtotal": "Subtotal", "pdf_total": "Total", diff --git a/resources/assets/js/plugins/vi.json b/resources/assets/js/plugins/vi.json index d6261405..14e17cd1 100644 --- a/resources/assets/js/plugins/vi.json +++ b/resources/assets/js/plugins/vi.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Định lượng", "pdf_price_label": "Giá bán", "pdf_discount_label": "Giảm giá", + "pdf_tax_label": "Thuế", "pdf_amount_label": "Số tiền", "pdf_subtotal": "Tổng phụ", "pdf_total": "Toàn bộ", diff --git a/resources/assets/js/plugins/zh.json b/resources/assets/js/plugins/zh.json index 01661c0f..93538bda 100644 --- a/resources/assets/js/plugins/zh.json +++ b/resources/assets/js/plugins/zh.json @@ -1167,6 +1167,7 @@ "pdf_quantity_label": "Quantity", "pdf_price_label": "Price", "pdf_discount_label": "Discount", + "pdf_tax_label": "Tax", "pdf_amount_label": "Amount", "pdf_subtotal": "Subtotal", "pdf_total": "Total",