Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into releases/1.1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jrief committed Jan 10, 2020
2 parents 59f4c89 + 3da4c10 commit d0504e9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion shop/models/order.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ def populate_from_cart(self, cart, request):
For each cart item a corresponding order item is created populating its fields and removing
that cart item.
Override this method, in case a customized cart has some fields which have to be transfered
Override this method, in case a customized cart has some fields which have to be transferred
to the cart.
"""
assert hasattr(cart, 'subtotal') and hasattr(cart, 'total'), \
Expand Down

0 comments on commit d0504e9

Please sign in to comment.