Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add total_duties to customer account order page #1368

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion locales/bg-BG.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "Връзка за проследяване",
"tracking_company": "Превозвач",
"tracking_number": "Номер за проследяване",
"subtotal": "Междинна сума"
"subtotal": "Междинна сума",
"total_duties": "Мито"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,8 @@
"tracking_url": "Odkaz pro sledování",
"tracking_company": "Dopravce",
"tracking_number": "Číslo pro sledování",
"subtotal": "Mezisoučet"
"subtotal": "Mezisoučet",
"total_duties": "Cla"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "Sporingslink",
"tracking_company": "Fragtfirma",
"tracking_number": "Trackingnummer",
"subtotal": "Subtotal"
"subtotal": "Subtotal",
"total_duties": "Told"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "Tracking-Link",
"tracking_company": "Versanddienstleister",
"tracking_number": "Trackingnummer",
"subtotal": "Zwischensumme"
"subtotal": "Zwischensumme",
"total_duties": "Zollgebühren"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/el.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "Σύνδεσμος παρακολούθησης",
"tracking_company": "Εταιρεία ταχυμεταφοράς",
"tracking_number": "Αριθμός παρακολούθησης",
"subtotal": "Υποσύνολο"
"subtotal": "Υποσύνολο",
"total_duties": "Δασμοί"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/en.default.json
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,8 @@
"tracking_url": "Tracking link",
"tracking_company": "Carrier",
"tracking_number": "Tracking number",
"subtotal": "Subtotal"
"subtotal": "Subtotal",
"total_duties": "Duties"
},
"orders": {
"title": "Order history",
Expand Down
3 changes: 2 additions & 1 deletion locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "Enlace de seguimiento",
"tracking_company": "Empresa de transporte",
"tracking_number": "Número de seguimiento",
"subtotal": "Subtotal"
"subtotal": "Subtotal",
"total_duties": "Aranceles"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "Seurantalinkki",
"tracking_company": "Kuljetusliike",
"tracking_number": "Seurantanumero",
"subtotal": "Välisumma"
"subtotal": "Välisumma",
"total_duties": "Tullit"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "Lien de suivi",
"tracking_company": "Transporteur",
"tracking_number": "Numéro de suivi",
"subtotal": "Sous-total"
"subtotal": "Sous-total",
"total_duties": "Frais de douane"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/hr-HR.json
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,8 @@
"tracking_url": "Poveznica za praćenje",
"tracking_company": "Dostavna služba",
"tracking_number": "Broj za praćenje",
"subtotal": "Podzbroj"
"subtotal": "Podzbroj",
"total_duties": "Carina"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "Hivatkozás a csomagkövetéshez",
"tracking_company": "Futárszolgálat",
"tracking_number": "Fuvarlevélszám",
"subtotal": "Részösszeg"
"subtotal": "Részösszeg",
"total_duties": "Vámok"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/id.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "Tautan pelacakan",
"tracking_company": "Kurir",
"tracking_number": "Nomor pelacakan",
"subtotal": "Subtotal"
"subtotal": "Subtotal",
"total_duties": "Bea cukai"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,8 @@
"tracking_url": "Link di monitoraggio",
"tracking_company": "Corriere",
"tracking_number": "Numero di tracking",
"subtotal": "Subtotale"
"subtotal": "Subtotale",
"total_duties": "Dazi"
},
"orders": {
"title": "Cronologia degli ordini",
Expand Down
3 changes: 2 additions & 1 deletion locales/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "追跡リンク",
"tracking_company": "配送業者",
"tracking_number": "追跡番号",
"subtotal": "小計"
"subtotal": "小計",
"total_duties": "関税"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "추적 링크",
"tracking_company": "배송업체",
"tracking_number": "추적 번호",
"subtotal": "소계"
"subtotal": "소계",
"total_duties": "관세"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/lt-LT.json
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,8 @@
"tracking_url": "Sekimo nuoroda",
"tracking_company": "Vežėjas",
"tracking_number": "Sekimo numeris",
"subtotal": "Tarpinė suma"
"subtotal": "Tarpinė suma",
"total_duties": "Muito mokesčiai"
},
"orders": {
"title": "Užsakymų istorija",
Expand Down
3 changes: 2 additions & 1 deletion locales/nb.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,8 @@
"tracking_url": "Sporingskobling",
"tracking_company": "Transportør",
"tracking_number": "Sporingsnummer",
"subtotal": "Delsum"
"subtotal": "Delsum",
"total_duties": "Tollplikter"
},
"orders": {
"title": "Bestillingshistorikk",
Expand Down
3 changes: 2 additions & 1 deletion locales/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "Volglink",
"tracking_company": "Vervoerder",
"tracking_number": "Trackingnummer",
"subtotal": "Subtotaal"
"subtotal": "Subtotaal",
"total_duties": "Douanerechten"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,8 @@
"tracking_url": "Link do śledzenia",
"tracking_company": "Przewoźnik",
"tracking_number": "Numer śledzenia",
"subtotal": "Suma częściowa"
"subtotal": "Suma częściowa",
"total_duties": "Cła"
},
"orders": {
"title": "Historia zamówień",
Expand Down
3 changes: 2 additions & 1 deletion locales/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "Link de rastreamento",
"tracking_company": "Transportadora",
"tracking_number": "Número de rastreamento",
"subtotal": "Subtotal"
"subtotal": "Subtotal",
"total_duties": "Tributos de importação"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/pt-PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,8 @@
"tracking_url": "Ligação de rastreio",
"tracking_company": "Transportadora",
"tracking_number": "Número de rastreio",
"subtotal": "Subtotal"
"subtotal": "Subtotal",
"total_duties": "Encargos"
},
"orders": {
"title": "Histórico de encomendas",
Expand Down
3 changes: 2 additions & 1 deletion locales/ro-RO.json
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,8 @@
"tracking_url": "Link de urmărire",
"tracking_company": "Serviciu de curierat",
"tracking_number": "Număr de urmărire",
"subtotal": "Subtotal"
"subtotal": "Subtotal",
"total_duties": "Taxe vamale"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,8 @@
"tracking_url": "Ссылка для отслеживания",
"tracking_company": "Перевозчик",
"tracking_number": "Номер для отслеживания",
"subtotal": "Промежуточный итог"
"subtotal": "Промежуточный итог",
"total_duties": "Пошлины"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/sk-SK.json
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,8 @@
"tracking_url": "Prepojenie na sledovanie",
"tracking_company": "Dopravca",
"tracking_number": "Sledovacie číslo",
"subtotal": "Medzisúčet"
"subtotal": "Medzisúčet",
"total_duties": "Clá"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/sl-SI.json
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,8 @@
"tracking_url": "Povezava za sledenje",
"tracking_company": "Dostavno podjetje",
"tracking_number": "Številka za sledenje",
"subtotal": "Vmesna vsota"
"subtotal": "Vmesna vsota",
"total_duties": "Carinske dajatve"
},
"orders": {
"title": "Zgodovina naročil",
Expand Down
3 changes: 2 additions & 1 deletion locales/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "Spårningslänk",
"tracking_company": "Transportör",
"tracking_number": "Spårningsnummer",
"subtotal": "Delsumma"
"subtotal": "Delsumma",
"total_duties": "Tullavgifter"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/th.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "ลิงก์ติดตาม",
"tracking_company": "ผู้ให้บริการขนส่ง",
"tracking_number": "หมายเลขติดตามพัสดุ",
"subtotal": "ยอดรวม"
"subtotal": "ยอดรวม",
"total_duties": "อากร"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "Takip bağlantısı",
"tracking_company": "Kargo Şirketi",
"tracking_number": "Takip numarası",
"subtotal": "Alt toplam"
"subtotal": "Alt toplam",
"total_duties": "Gümrük vergileri"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/vi.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "Liên kết theo dõi",
"tracking_company": "Hãng vận chuyển",
"tracking_number": "Mã theo dõi",
"subtotal": "Tổng phụ"
"subtotal": "Tổng phụ",
"total_duties": "Thuế"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "跟踪链接",
"tracking_company": "承运商",
"tracking_number": "跟踪编号",
"subtotal": "小计"
"subtotal": "小计",
"total_duties": "关税"
}
},
"gift_cards": {
Expand Down
3 changes: 2 additions & 1 deletion locales/zh-TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@
"tracking_url": "追蹤連結",
"tracking_company": "貨運業者",
"tracking_number": "追蹤編號",
"subtotal": "小計"
"subtotal": "小計",
"total_duties": "關稅"
}
},
"gift_cards": {
Expand Down
6 changes: 6 additions & 0 deletions templates/customers/order.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,12 @@
<td headers="RowTax" role="cell" data-label="{{ 'customer.order.tax' | t }} ({{ tax_line.title }} {{ tax_line.rate | times: 100 }}%)">{{ tax_line.price | money }}</td>
</tr>
{%- endfor -%}
{%- if order.total_duties -%}
<tr role="row">
<td id="RowDuties" role="rowheader" scope="row" colspan="4">{{ 'customer.order.total_duties' | t }}</td>
<td headers="RowDuties" role="cell" data-label="{{ 'customer.order.total_duties' | t }}">{{ order.total_duties | money }}</td>
</tr>
{%- endif -%}
<tr role="row">
<td id="RowTotal" role="rowheader" scope="row" colspan="3">{{ 'customer.order.total' | t }}</td>
<td headers="RowTotal" role="cell" colspan="2" data-label="{{ 'customer.order.total' | t }}">{{ order.total_price | money_with_currency }}</td>
Expand Down