fix: change order of tax and shipping totals in order

stephenmcd · Mar 23, 2022 · 7e687d5 · 7e687d5
1 parent ab54323
commit 7e687d5
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/cartridge/shop/templates/shop/includes/order_totals.html b/cartridge/shop/templates/shop/includes/order_totals.html
@@ -14,26 +14,26 @@
         </label> <span>{{ discount_total|currency }}</span>
     </div>
     {% endif %}
-    {% if shipping_type or shipping_total %}
+    {% if tax_total %}
     <div>
         <label>
-        {% if shipping_type %}
-        {{ shipping_type }}:
+        {% if tax_type %}
+        {{ tax_type }}:
         {% else %}
-        {% trans "Shipping" %}:
+        {% trans "Tax" %}:
         {% endif %}
-        </label> <span>{{ shipping_total|currency }}</span>
+        </label> <span>{{ tax_total|currency }}</span>
     </div>
     {% endif %}
-    {% if tax_total %}
+    {% if shipping_type or shipping_total %}
     <div>
         <label>
-        {% if tax_type %}
-        {{ tax_type }}:
+        {% if shipping_type %}
+        {{ shipping_type }}:
         {% else %}
-        {% trans "Tax" %}:
+        {% trans "Shipping" %}:
         {% endif %}
-        </label> <span>{{ tax_total|currency }}</span>
+        </label> <span>{{ shipping_total|currency }}</span>
     </div>
     {% endif %}
     <div class="total"><label>{% trans "Total" %}:</label> <span>{{ order_total|currency }}</span></div>