nathan/ptcoffee_django
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/3.0.19'

Browse Source
This commit is contained in:
Nathan Chapman 2023-03-20 15:26:34 -06:00
commit 99b5b1a6e2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dashboard/templates/dashboard/order/detail.html
View File

@ -110,7 +110,7 @@
{% if order.coupon_amount > 0 %} {% if order.coupon_amount > 0 %}
<tr> <tr>
<th colspan="4">Discount {% if order.coupon %}<a href="{% url 'dashboard:coupon-detail' order.coupon.pk %}">{{ order.coupon }} &nearr;</a>{% endif %}:</th> <th colspan="4">Discount {% if order.coupon %}<a href="{% url 'dashboard:coupon-detail' order.coupon.pk %}">{{ order.coupon }} &nearr;</a>{% endif %}:</th>
<td>${{ order.coupon_amount }}</td> <td>-${{ order.coupon_amount }}</td>
</tr> </tr>
{% endif %} {% endif %}
<tr> <tr>

2
storefront/views.py
View File

@ -375,7 +375,7 @@ class OrderCreateView(CreateView):
def form_valid(self, form): def form_valid(self, form):
cart = Cart(self.request) cart = Cart(self.request)
form.instance.subtotal_amount = cart.subtotal_price_after_discount form.instance.subtotal_amount = cart.subtotal_price
form.instance.coupon = cart.coupon form.instance.coupon = cart.coupon
form.instance.coupon_amount = cart.discount_amount form.instance.coupon_amount = cart.discount_amount
form.instance.total_amount = cart.total_price form.instance.total_amount = cart.total_price