Remove comments and change exception names

src/oscar/apps/basket/abstract_models.py

@@ -727,9 +727,6 @@ class AbstractLine(models.Model):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        # Instance variables used to persist discount information
-        # self._discount_excl_tax = D("0.00")
-        # self._discount_incl_tax = D("0.00")
         self.discounts = LineDiscountRegistry(self)
 
     class Meta:
@@ -789,8 +786,6 @@ class AbstractLine(models.Model):
                     "when tax-inclusive discounts are already applied"
                 )
         self.discounts.discount(discount_value, affected_quantity, incl_tax, offer)
-        # self.discounts.append((discount_value, affected_quantity, incl_tax, offer))
-        # self.consume(affected_quantity, offer=offer)
 
     def consume(self, quantity, offer=None):
         """
@@ -883,7 +878,7 @@ class AbstractLine(models.Model):
 
     @_discount_incl_tax.setter
     def _discount_incl_tax(self, value):
-        raise Exception("_discount_incl_tax kan je niet setten")
+        raise Exception("You can not set _discount_incl_tax")
 
     @property
     @deprecated
@@ -892,7 +887,7 @@ class AbstractLine(models.Model):
 
     @_discount_excl_tax.setter
     def _discount_excl_tax(self, value):
-        raise Exception("_discount_excl_tax kan je niet setten")
+        raise Exception("You can not set _discount_excl_tax")
 
     @property
     def has_discount(self):
@@ -909,9 +904,6 @@ class AbstractLine(models.Model):
     @property
     def discount_value(self):
         return self.discounts.total
-        # return sum([discount[0] for discount in self.discounts], 0)
-        # Only one of the incl- and excl- discounts should be non-zero
-        # return max(self._discount_incl_tax, self._discount_excl_tax)
 
     # pylint: disable=W0201
     @property
@@ -986,14 +978,6 @@ class AbstractLine(models.Model):
             return round_half_up(
                 self.line_price_excl_tax_incl_discounts / self._tax_ratio
             )
-            # return max(0, self.line_price_incl_tax - (excl_tax_discounts / self._tax_ratio).quantize(D("0.01"), ROUND_HALF_DOWN))
-            # return max(0, self.line_price_incl_tax - round_half_up(excl_tax_discounts / self._tax_ratio))
-            # return max(
-            #     0,
-            #     round_half_up(
-            #         (self.line_price_excl_tax - excl_tax_discounts) / self._tax_ratio
-            #     ),
-            # )
 
         return self.line_price_incl_tax
 

src/oscar/apps/basket/utils.py

@@ -9,6 +9,10 @@ from oscar.core.decorators import deprecated
 Applicator = get_class("offer.applicator", "Applicator")
 ConditionalOffer = get_model("offer", "ConditionalOffer")
 
+DiscountApplication = namedtuple(
+    "DiscountApplication", ["amount", "quantity", "incl_tax", "offer"]
+)
+
 
 class BasketMessageGenerator(object):
     new_total_template_name = "oscar/basket/messages/new_total.html"
@@ -116,7 +120,6 @@ class LineOfferConsumer(object):
         basket line is consumed for *any* offer, else only for the
         specified offer.
         """
-        # raise Exception("viggo is henk")
         if offer:
             self._cache(offer)
             available = self.available(offer)
@@ -202,11 +205,6 @@ class LineOfferConsumer(object):
         return max_affected_items - self.num_consumed(offer)
 
 
-DiscountApplication = namedtuple(
-    "DiscountApplication", ["amount", "quantity", "incl_tax", "offer"]
-)
-
-
 class LineDiscountRegistry(LineOfferConsumer):
     def __init__(self, line):
         super().__init__(line)

src/oscar/apps/order/utils.py

@@ -248,6 +248,8 @@ class OrderCreator(object):
     def create_line_discount_models(self, order, order_line, basket_line):
         for discount in basket_line.discounts:
             order_discount = order.discounts.filter(offer_id=discount.offer.id).first()
+            # If we are unable to find the discount we do not care, the total amount is still saved on the discount model,
+            # these models are only created so we know how much discount was given per line for each offer
             if order_discount:
                 order_line.discounts.create(
                     order_discount=order_discount,