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

Merge branch 'release/1.0.3'

Browse Source
This commit is contained in:
Nathan Chapman 2022-04-24 14:55:02 -06:00
commit e919a3cc1b
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/static/styles/main.css
View File

@ -456,7 +456,7 @@ section:not(:last-child) {
background-position: center; background-position: center;
color: white; color: white;
text-align: center; text-align: center;
padding: 8rem 1rem; padding: 4rem 1rem;
font-family: 'Vollkorn', serif; font-family: 'Vollkorn', serif;
} }
.site__banner h1 { .site__banner h1 {
@ -568,7 +568,7 @@ article + article {
/* Products /* Products
========================================================================== */ ========================================================================== */
.product__list { .product__list {
margin-top: 8rem; margin-top: 4rem;
display: grid; display: grid;
grid-template-columns: repeat(2, 1fr); grid-template-columns: repeat(2, 1fr);
gap: 8rem; gap: 8rem;

26
src/storefront/cart.py
View File

@ -3,6 +3,8 @@ import logging
from decimal import Decimal from decimal import Decimal
from django.conf import settings from django.conf import settings
from django.contrib import messages from django.contrib import messages
from django.shortcuts import redirect, reverse
from django.urls import reverse_lazy
from core.models import Product, OrderLine, Coupon from core.models import Product, OrderLine, Coupon
from core.usps import USPSApiWithRate from core.usps import USPSApiWithRate
@ -22,6 +24,7 @@ logger = logging.getLogger(__name__)
class Cart: class Cart:
def __init__(self, request): def __init__(self, request):
self.request = request
self.session = request.session self.session = request.session
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)
@ -73,10 +76,12 @@ class Cart:
return sum(item['quantity'] for item in self.cart.values()) return sum(item['quantity'] for item in self.cart.values())
def get_total_weight(self): def get_total_weight(self):
return sum([item['product'].weight.value * item['quantity'] for item in self]) if len(self) > 0:
return sum([item['product'].weight.value * item['quantity'] for item in self])
else:
return 0
def get_shipping_box(self): def get_shipping_box(self):
logger.info(len(self))
if len(self) > 6 and len(self) <= 10: if len(self) > 6 and len(self) <= 10:
return ShippingContainer.LG_FLAT_RATE_BOX return ShippingContainer.LG_FLAT_RATE_BOX
elif len(self) > 2 and len(self) <= 6: elif len(self) > 2 and len(self) <= 6:
@ -87,10 +92,19 @@ class Cart:
return ShippingContainer.VARIABLE return ShippingContainer.VARIABLE
def get_shipping_cost(self): def get_shipping_cost(self):
usps_rate_request = self.build_usps_rate_request() if len(self) > 0:
usps = USPSApiWithRate(settings.USPS_USER_ID, test=True) usps_rate_request = self.build_usps_rate_request()
validation = usps.get_rate(usps_rate_request) usps = USPSApiWithRate(settings.USPS_USER_ID, test=True)
return Decimal(validation.result['RateV4Response']['Package']['Postage']['CommercialRate']) validation = usps.get_rate(usps_rate_request)
logger.info(validation.result)
try:
rate = Decimal(validation.result['RateV4Response']['Package']['Postage']['CommercialRate'])
return rate
except KeyError as e:
raise e("USPS Result has no 'Postage'")
return Decimal('0.00')
else:
return Decimal('0.00')
def get_total_price(self): def get_total_price(self):
return sum(Decimal(item['price']) * item['quantity'] for item in self.cart.values()) return sum(Decimal(item['price']) * item['quantity'] for item in self.cart.values())