浏览代码

Assert tax must be set before submission (not in dispatch)

master
David Winterbottom 12 年前
父节点
当前提交
1dfbade229
共有 1 个文件被更改,包括 6 次插入5 次删除
  1. 6
    5
      oscar/apps/checkout/views.py

+ 6
- 5
oscar/apps/checkout/views.py 查看文件

361
     preview = False
361
     preview = False
362
 
362
 
363
     def dispatch(self, request, *args, **kwargs):
363
     def dispatch(self, request, *args, **kwargs):
364
-        # Taxes must be known at this point
365
-        assert request.basket.is_tax_known, (
366
-            "Tax must be set before a user can place an order")
367
-
368
         error_response = self.get_error_response()
364
         error_response = self.get_error_response()
369
         if error_response:
365
         if error_response:
370
             return error_response
366
             return error_response
486
         if order_kwargs is None:
482
         if order_kwargs is None:
487
             order_kwargs = {}
483
             order_kwargs = {}
488
 
484
 
485
+        # Taxes must be known at this point
486
+        assert basket.is_tax_known, (
487
+            "Tax must be set before a user can place an order")
488
+
489
         # Domain-specific checks on the basket
489
         # Domain-specific checks on the basket
490
         is_valid, reason, url = self.can_basket_be_submitted(basket)
490
         is_valid, reason, url = self.can_basket_be_submitted(basket)
491
         if not is_valid:
491
         if not is_valid:
499
         # the order on a different request).
499
         # the order on a different request).
500
         order_number = self.generate_order_number(basket)
500
         order_number = self.generate_order_number(basket)
501
         self.checkout_session.set_order_number(order_number)
501
         self.checkout_session.set_order_number(order_number)
502
-        logger.info("Order #%s: beginning submission process for basket #%d", order_number, basket.id)
502
+        logger.info("Order #%s: beginning submission process for basket #%d",
503
+                    order_number, basket.id)
503
 
504
 
504
         # Freeze the basket so it cannot be manipulated while the customer is
505
         # Freeze the basket so it cannot be manipulated while the customer is
505
         # completing payment on a 3rd party site.  Also, store a reference to
506
         # completing payment on a 3rd party site.  Also, store a reference to

正在加载...
取消
保存