[Customer account & order] Change order totals to account for refunds (…

…Shopify#2179)
Gravytrain-UK · Jan 30, 2023 · 8544049 · 8544049
1 parent 9517698
commit 8544049
Show file tree

Hide file tree

Showing 33 changed files with 78 additions and 32 deletions.
diff --git a/locales/bg-BG.json b/locales/bg-BG.json
@@ -436,7 +436,8 @@
       "tracking_company": "Превозвач",
       "tracking_number": "Номер за проследяване",
       "subtotal": "Междинна сума",
-      "total_duties": "Мито"
+      "total_duties": "Мито",
+      "total_refunded": "Възстановени"
     }
   },
   "gift_cards": {

diff --git a/locales/cs.json b/locales/cs.json
@@ -456,7 +456,8 @@
       "tracking_company": "Dopravce",
       "tracking_number": "Číslo pro sledování",
       "subtotal": "Mezisoučet",
-      "total_duties": "Cla"
+      "total_duties": "Cla",
+      "total_refunded": "Vrácená částka"
     }
   },
   "gift_cards": {

diff --git a/locales/da.json b/locales/da.json
@@ -436,7 +436,8 @@
       "tracking_company": "Fragtfirma",
       "tracking_number": "Trackingnummer",
       "subtotal": "Subtotal",
-      "total_duties": "Told"
+      "total_duties": "Told",
+      "total_refunded": "Refunderet"
     }
   },
   "gift_cards": {

diff --git a/locales/de.json b/locales/de.json
@@ -436,7 +436,8 @@
       "tracking_company": "Versanddienstleister",
       "tracking_number": "Trackingnummer",
       "subtotal": "Zwischensumme",
-      "total_duties": "Zollgebühren"
+      "total_duties": "Zollgebühren",
+      "total_refunded": "Zurückerstattet"
     }
   },
   "gift_cards": {

diff --git a/locales/el.json b/locales/el.json
@@ -436,7 +436,8 @@
       "tracking_company": "Εταιρεία ταχυμεταφοράς",
       "tracking_number": "Αριθμός παρακολούθησης",
       "subtotal": "Υποσύνολο",
-      "total_duties": "Δασμοί"
+      "total_duties": "Δασμοί",
+      "total_refunded": "Τα χρήματα επιστράφηκαν"
     }
   },
   "gift_cards": {

diff --git a/locales/en.default.json b/locales/en.default.json
@@ -400,6 +400,7 @@
       "price": "Price",
       "quantity": "Quantity",
       "total": "Total",
+      "total_refunded": "Refunded",
       "fulfilled_at_html": "Fulfilled {{ date }}",
       "track_shipment": "Track shipment",
       "tracking_url": "Tracking link",

diff --git a/locales/es.json b/locales/es.json
@@ -446,7 +446,8 @@
       "tracking_company": "Empresa de transporte",
       "tracking_number": "Número de seguimiento",
       "subtotal": "Subtotal",
-      "total_duties": "Aranceles"
+      "total_duties": "Aranceles",
+      "total_refunded": "Reembolsado"
     }
   },
   "gift_cards": {

diff --git a/locales/fi.json b/locales/fi.json
@@ -436,7 +436,8 @@
       "tracking_company": "Kuljetuspalvelu",
       "tracking_number": "Seurantanumero",
       "subtotal": "Välisumma",
-      "total_duties": "Tullit"
+      "total_duties": "Tullit",
+      "total_refunded": "Maksu palautettu"
     }
   },
   "gift_cards": {

diff --git a/locales/fr.json b/locales/fr.json
@@ -446,7 +446,8 @@
       "tracking_company": "Transporteur",
       "tracking_number": "Numéro de suivi",
       "subtotal": "Sous-total",
-      "total_duties": "Frais de douane"
+      "total_duties": "Frais de douane",
+      "total_refunded": "Remboursé"
     }
   },
   "gift_cards": {

diff --git a/locales/hr-HR.json b/locales/hr-HR.json
@@ -446,7 +446,8 @@
       "tracking_company": "Dostavna služba",
       "tracking_number": "Broj za praćenje",
       "subtotal": "Podzbroj",
-      "total_duties": "Carina"
+      "total_duties": "Carina",
+      "total_refunded": "Povrat je izvršen"
     }
   },
   "gift_cards": {

diff --git a/locales/hu.json b/locales/hu.json
@@ -436,7 +436,8 @@
       "tracking_company": "Futárszolgálat",
       "tracking_number": "Fuvarlevélszám",
       "subtotal": "Részösszeg",
-      "total_duties": "Vámok"
+      "total_duties": "Vámok",
+      "total_refunded": "Visszatérítve"
     }
   },
   "gift_cards": {

diff --git a/locales/id.json b/locales/id.json
@@ -436,7 +436,8 @@
       "tracking_company": "Kurir",
       "tracking_number": "Nomor pelacakan",
       "subtotal": "Subtotal",
-      "total_duties": "Bea cukai"
+      "total_duties": "Bea cukai",
+      "total_refunded": "Dana dikembalikan"
     }
   },
   "gift_cards": {

diff --git a/locales/it.json b/locales/it.json
@@ -416,7 +416,8 @@
       "tracking_company": "Corriere",
       "tracking_number": "Numero di tracking",
       "subtotal": "Subtotale",
-      "total_duties": "Dazi"
+      "total_duties": "Dazi",
+      "total_refunded": "Rimborsato"
     },
     "orders": {
       "title": "Cronologia ordini",

diff --git a/locales/ja.json b/locales/ja.json
@@ -436,7 +436,8 @@
       "tracking_company": "配送業者",
       "tracking_number": "追跡番号",
       "subtotal": "小計",
-      "total_duties": "関税"
+      "total_duties": "関税",
+      "total_refunded": "返金済"
     }
   },
   "gift_cards": {

diff --git a/locales/ko.json b/locales/ko.json
@@ -436,7 +436,8 @@
       "tracking_company": "배송업체",
       "tracking_number": "추적 번호",
       "subtotal": "소계",
-      "total_duties": "관세"
+      "total_duties": "관세",
+      "total_refunded": "환불됨"
     }
   },
   "gift_cards": {

diff --git a/locales/lt-LT.json b/locales/lt-LT.json
@@ -426,7 +426,8 @@
       "tracking_company": "Vežėjas",
       "tracking_number": "Sekimo numeris",
       "subtotal": "Tarpinė suma",
-      "total_duties": "Muito mokesčiai"
+      "total_duties": "Muito mokesčiai",
+      "total_refunded": "Kompensuota"
     },
     "orders": {
       "title": "Užsakymų istorija",

diff --git a/locales/nb.json b/locales/nb.json
@@ -406,7 +406,8 @@
       "tracking_company": "Transportør",
       "tracking_number": "Sporingsnummer",
       "subtotal": "Delsum",
-      "total_duties": "Tollplikter"
+      "total_duties": "Tollplikter",
+      "total_refunded": "Refundert"
     },
     "orders": {
       "title": "Bestillingshistorikk",

diff --git a/locales/nl.json b/locales/nl.json
@@ -436,7 +436,8 @@
       "tracking_company": "Vervoerder",
       "tracking_number": "Trackingnummer",
       "subtotal": "Subtotaal",
-      "total_duties": "Douanerechten"
+      "total_duties": "Douanerechten",
+      "total_refunded": "Terugbetaald"
     }
   },
   "gift_cards": {

diff --git a/locales/pl.json b/locales/pl.json
@@ -426,7 +426,8 @@
       "tracking_company": "Przewoźnik",
       "tracking_number": "Numer śledzenia",
       "subtotal": "Suma częściowa",
-      "total_duties": "Cła"
+      "total_duties": "Cła",
+      "total_refunded": "Zwrócono koszty"
     },
     "orders": {
       "title": "Historia zamówień",

diff --git a/locales/pt-BR.json b/locales/pt-BR.json
@@ -446,7 +446,8 @@
       "tracking_company": "Transportadora",
       "tracking_number": "Número de rastreamento",
       "subtotal": "Subtotal",
-      "total_duties": "Tributos de importação"
+      "total_duties": "Tributos de importação",
+      "total_refunded": "Reembolsado"
     }
   },
   "gift_cards": {

diff --git a/locales/pt-PT.json b/locales/pt-PT.json
@@ -416,7 +416,8 @@
       "tracking_company": "Transportadora",
       "tracking_number": "Número de rastreio",
       "subtotal": "Subtotal",
-      "total_duties": "Encargos"
+      "total_duties": "Encargos",
+      "total_refunded": "Reembolsado"
     },
     "orders": {
       "title": "Histórico de encomendas",

diff --git a/locales/ro-RO.json b/locales/ro-RO.json
@@ -446,7 +446,8 @@
       "tracking_company": "Serviciu de curierat",
       "tracking_number": "Număr de urmărire",
       "subtotal": "Subtotal",
-      "total_duties": "Taxe vamale"
+      "total_duties": "Taxe vamale",
+      "total_refunded": "Rambursată"
     }
   },
   "gift_cards": {

diff --git a/locales/ru.json b/locales/ru.json
@@ -456,7 +456,8 @@
       "tracking_company": "Перевозчик",
       "tracking_number": "Номер для отслеживания",
       "subtotal": "Промежуточный итог",
-      "total_duties": "Пошлины"
+      "total_duties": "Пошлины",
+      "total_refunded": "Средства возвращены"
     }
   },
   "gift_cards": {

diff --git a/locales/sk-SK.json b/locales/sk-SK.json
@@ -456,7 +456,8 @@
       "tracking_company": "Dopravca",
       "tracking_number": "Sledovacie číslo",
       "subtotal": "Medzisúčet",
-      "total_duties": "Clá"
+      "total_duties": "Clá",
+      "total_refunded": "Refundovaná suma"
     }
   },
   "gift_cards": {

diff --git a/locales/sl-SI.json b/locales/sl-SI.json
@@ -426,7 +426,8 @@
       "tracking_company": "Dostavno podjetje",
       "tracking_number": "Številka za sledenje",
       "subtotal": "Vmesna vsota",
-      "total_duties": "Carinske dajatve"
+      "total_duties": "Carinske dajatve",
+      "total_refunded": "Povrnjeno"
     },
     "orders": {
       "title": "Zgodovina naročil",

diff --git a/locales/sv.json b/locales/sv.json
@@ -436,7 +436,8 @@
       "tracking_company": "Transportör",
       "tracking_number": "Spårningsnummer",
       "subtotal": "Delsumma",
-      "total_duties": "Tullavgifter"
+      "total_duties": "Tullavgifter",
+      "total_refunded": "Återbetald"
     }
   },
   "gift_cards": {

diff --git a/locales/th.json b/locales/th.json
@@ -436,7 +436,8 @@
       "tracking_company": "ผู้ให้บริการขนส่ง",
       "tracking_number": "หมายเลขติดตามพัสดุ",
       "subtotal": "ยอดรวม",
-      "total_duties": "อากร"
+      "total_duties": "อากร",
+      "total_refunded": "คืนเงินแล้ว"
     }
   },
   "gift_cards": {

diff --git a/locales/tr.json b/locales/tr.json
@@ -436,7 +436,8 @@
       "tracking_company": "Kargo Şirketi",
       "tracking_number": "Takip numarası",
       "subtotal": "Alt toplam",
-      "total_duties": "Gümrük vergileri"
+      "total_duties": "Gümrük vergileri",
+      "total_refunded": "Para iadesi yapıldı"
     }
   },
   "gift_cards": {

diff --git a/locales/vi.json b/locales/vi.json
@@ -436,7 +436,8 @@
       "tracking_company": "Hãng vận chuyển",
       "tracking_number": "Mã theo dõi",
       "subtotal": "Tổng phụ",
-      "total_duties": "Thuế hải quan"
+      "total_duties": "Thuế hải quan",
+      "total_refunded": "Đã hoàn tiền"
     }
   },
   "gift_cards": {

diff --git a/locales/zh-CN.json b/locales/zh-CN.json
@@ -436,7 +436,8 @@
       "tracking_company": "承运商",
       "tracking_number": "跟踪编号",
       "subtotal": "小计",
-      "total_duties": "关税"
+      "total_duties": "关税",
+      "total_refunded": "已退款"
     }
   },
   "gift_cards": {

diff --git a/locales/zh-TW.json b/locales/zh-TW.json
@@ -436,7 +436,8 @@
       "tracking_company": "貨運業者",
       "tracking_number": "追蹤編號",
       "subtotal": "小計",
-      "total_duties": "關稅"
+      "total_duties": "關稅",
+      "total_refunded": "已退款"
     }
   },
   "gift_cards": {

diff --git a/sections/main-account.liquid b/sections/main-account.liquid
@@ -80,7 +80,7 @@
                     {{ order.fulfillment_status_label }}
                   </td>
                   <td headers="RowOrder ColumnTotal" role="cell" data-label="{{ 'customer.orders.total' | t }}">
-                    {{ order.total_price | money_with_currency }}
+                    {{ order.total_net_amount | money_with_currency }}
                   </td>
                 </tr>
               {%- endfor -%}

diff --git a/sections/main-order.liquid b/sections/main-order.liquid
@@ -299,10 +299,25 @@
               </td>
             </tr>
           {%- endif -%}
+          {%- if order.total_refunded_amount > 0 -%}
+            <tr role="row">
+              <td id="RowTotalRefund" role="rowheader" scope="row" colspan="3">
+                {{ 'customer.order.total_refunded' | t }}
+              </td>
+              <td
+                headers="RowTotalRefund"
+                role="cell"
+                colspan="2"
+                data-label="{{ 'customer.order.total_refunded' | t }}"
+              >
+                -{{ order.total_refunded_amount | money_with_currency }}
+              </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 }}
+              {{ order.total_net_amount | money_with_currency }}
             </td>
           </tr>
         </tfoot>