From e8dd08f1255a44f7e9d699ee1cdf5f7b7595617c Mon Sep 17 00:00:00 2001 From: Henri Hulski Date: Fri, 8 Apr 2022 16:33:28 +0200 Subject: [PATCH] fix: revert invoice links fix (11da737) --- cartridge/shop/models.py | 2 +- cartridge/shop/templates/admin/shop/order/change_form.html | 2 +- cartridge/shop/templates/shop/complete.html | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cartridge/shop/models.py b/cartridge/shop/models.py index 8d3ed57f9..5fb7c4d91 100644 --- a/cartridge/shop/models.py +++ b/cartridge/shop/models.py @@ -587,7 +587,7 @@ def invoice(self): Returns the HTML for a link to the PDF invoice for use in the order listing view of the admin. """ - url = reverse("shop:shop_invoice", args=(self.id,)) + url = reverse("shop_invoice", args=(self.id,)) text = gettext("Download PDF invoice") return mark_safe(f"{text}") diff --git a/cartridge/shop/templates/admin/shop/order/change_form.html b/cartridge/shop/templates/admin/shop/order/change_form.html index aa2465c41..f66cff33c 100644 --- a/cartridge/shop/templates/admin/shop/order/change_form.html +++ b/cartridge/shop/templates/admin/shop/order/change_form.html @@ -12,7 +12,7 @@ {% block object-tools-items %} {% if change and has_pdf %} -
  • {% trans "Download PDF invoice" %}
  • +
  • {% trans "Download PDF invoice" %}
  • {% endif %}
  • {% trans "Re-send order email" %}
  • {{ block.super }} diff --git a/cartridge/shop/templates/shop/complete.html b/cartridge/shop/templates/shop/complete.html index bb45d89b1..8f343a591 100644 --- a/cartridge/shop/templates/shop/complete.html +++ b/cartridge/shop/templates/shop/complete.html @@ -58,7 +58,6 @@
  • {% trans "Complete" %}
  • {% endblock %} - {% block main %}

    {% trans "Thank you for shopping with us! Your order is complete." %}

    {% trans "We've sent you a receipt via email." %}

    @@ -67,7 +66,7 @@
    {% csrf_token %} {% if has_pdf %} - {% trans "Download PDF invoice" %} + {% trans "Download PDF invoice" %} {% endif %} {% trans "View invoice in your browser" %}