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

Merge branch 'release/1.0.15'

Browse Source
This commit is contained in:
Nathan Chapman 2022-11-19 09:56:39 -07:00
commit ff6cf2d6af
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/storefront/cart.py
View File

@ -64,7 +64,7 @@ class Cart:
def __init__(self, request): def __init__(self, request):
self.request = request self.request = request
self.session = request.session self.session = request.session
self.site_settings = SiteSettings.load() # self.site_settings = SiteSettings.load()
self.coupon_code = self.session.get('coupon_code') self.coupon_code = self.session.get('coupon_code')
cart = self.session.get(settings.CART_SESSION_ID) cart = self.session.get(settings.CART_SESSION_ID)
if not cart: if not cart:
@ -178,11 +178,11 @@ class Cart:
return containers return containers
def get_shipping_cost(self, container=None): def get_shipping_cost(self, container=None):
free_shipping_min = self.site_settings.free_shipping_min # free_shipping_min = self.site_settings.free_shipping_min
if free_shipping_min is not None: # if free_shipping_min is not None:
category = ProductCategory.objects.get(name='Coffee') # category = ProductCategory.objects.get(name='Coffee')
if self.get_total_price_for_category(category) >= free_shipping_min: # if self.get_total_price_for_category(category) >= free_shipping_min:
return Decimal('0.00') # return Decimal('0.00')
if container is None: if container is None:
container = self.session.get('shipping_container').container container = self.session.get('shipping_container').container

4
src/storefront/templates/storefront/cart_detail.html
View File

@ -58,10 +58,6 @@
<input type="submit" value="Apply" class="action-button"> <input type="submit" value="Apply" class="action-button">
</p> </p>
</form> </form>
<h5>
Free shipping on coffee orders over ${{ site_settings.free_shipping_min|floatformat:"2" }}<br>
<small><em>Merch does not count toward total</em></small>
</h5>
<div class="cart__table-wrapper"> <div class="cart__table-wrapper">
<table class="cart__totals"> <table class="cart__totals">
<tr> <tr>

4
src/storefront/templates/storefront/order_form.html
View File

@ -65,10 +65,6 @@
{% csrf_token %} {% csrf_token %}
{{form.as_p}} {{form.as_p}}
</form> </form>
<h5>
Free shipping on coffee orders over ${{ site_settings.free_shipping_min|floatformat:"2" }}<br>
<small><em>Merchandise does not count toward total</em></small>
</h5>
<div class="cart__table-wrapper"> <div class="cart__table-wrapper">
<table class="cart__totals"> <table class="cart__totals">
<tr> <tr>