Merge tag 'v1.2.1' into develop
1.2.1 v1.2.1
This commit is contained in:
commit
53a407c588
@ -268,10 +268,13 @@ class OrderCreateView(CreateView):
|
|||||||
shipping_address = self.request.session.get('shipping_address')
|
shipping_address = self.request.session.get('shipping_address')
|
||||||
form.instance.customer, form.instance.shipping_address = get_or_create_customer(self.request, form, shipping_address)
|
form.instance.customer, form.instance.shipping_address = get_or_create_customer(self.request, form, shipping_address)
|
||||||
form.instance.status = OrderStatus.DRAFT
|
form.instance.status = OrderStatus.DRAFT
|
||||||
coupon = get_object_or_404(
|
try:
|
||||||
Coupon,
|
coupon = Coupon.objects.get(
|
||||||
code=self.request.session.get('coupon_code')
|
code=self.request.session.get('coupon_code')
|
||||||
)
|
)
|
||||||
|
except ObjectDoesNotExist:
|
||||||
|
coupon = None
|
||||||
|
|
||||||
if coupon:
|
if coupon:
|
||||||
form.instance.coupon = coupon
|
form.instance.coupon = coupon
|
||||||
coupon.users.add(form.instance.customer)
|
coupon.users.add(form.instance.customer)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user