Added vouchers to order history / Now tracking order within voucher application model

oscar/checkout/core_views.py

             return order_models.ShippingAddress(**addr_data)
         addr_id = self.co_data.user_address_id()
         if addr_id:
-            return address_models.UserAddress._default_manager.get(pk=addr_id)
+            try:
+                return address_models.UserAddress._default_manager.get(pk=addr_id)
+            except address_models.UserAddress.DoesNotExist:
+                # This can happen if you reset all your tables and you still have
+                # session data that refers to addresses that no longer exist
+                pass
         return None
     
     def get_success_response(self):

oscar/offer/abstract_models.py

 
 from oscar.offer.managers import ActiveOfferManager
 
+SITE, VOUCHER, USER, SESSION = ("Site", "Voucher", "User", "Session")
 
 class AbstractConditionalOffer(models.Model):
     u"""
     #     to apply this offer needs to be coded
     # (d) Session offers - these are temporarily available to a user after some trigger 
     #     event.  Eg, users coming from some affiliate site get 10% off.     
-    SITE, VOUCHER, USER, SESSION = ("Site", "Voucher", "User", "Session")
     TYPE_CHOICES = (
         (SITE, "Site offer - available to all users"),
         (VOUCHER, "Voucher offer - only available after entering the appropriate voucher code"),
     )
     offer_type = models.CharField(_("Type"), choices=TYPE_CHOICES, default=SITE, max_length=128)
 
-    condition = models.OneToOneField('offer.Condition')
-    benefit = models.OneToOneField('offer.Benefit')
+    condition = models.ForeignKey('offer.Condition')
+    benefit = models.ForeignKey('offer.Benefit')
 
     # Range of availability.  Note that if this is a voucher offer, then these
     # dates are ignored and only the dates from the voucher are used to determine 
         help_text="""This will be shown in the checkout and basket once the voucher is entered""")
     code = models.CharField(_("Code"), max_length=128, db_index=True, unique=True,
         help_text="""Case insensitive / No spaces allowed""")
-    offers = models.ManyToManyField('offer.ConditionalOFfer', related_name='vouchers')
+    offers = models.ManyToManyField('offer.ConditionalOFfer', related_name='vouchers', 
+                                    limit_choices_to={'offer_type': VOUCHER})
 
     SINGLE_USE, MULTI_USE, ONCE_PER_CUSTOMER = ('Single use', 'Multi-use', 'Once per customer')
     USAGE_CHOICES = (
                     message = "You have already used this voucher in a previous order"
         return is_available, message
     
-    def record_usage(self, user):
+    def record_usage(self, order, user):
         u"""
         Records a usage of this voucher in an order.
         """
-        self.applications.create(voucher=self, user=user)
+        self.applications.create(voucher=self, order=order, user=user)
 
 
 class AbstractVoucherApplication(models.Model):
     # It is possible for an anonymous user to apply a voucher so we need to allow
     # the user to be nullable
     user = models.ForeignKey('auth.User', blank=True, null=True)
+    order = models.ForeignKey('order.Order')
     date_created = models.DateField(auto_now_add=True)
 
     class Meta:

oscar/offer/admin.py

             'fields': ('name', 'code', 'usage', 'start_date', 'end_date')
         }),
         ('Benefit', {
-            'fields': ('offers', 'free_shipping')
+            'fields': ('offers',)
         }),
         ('Usage', {
             'fields': ('num_basket_additions', 'num_orders', 'total_discount')
     )
     
 class VoucherApplicationAdmin(admin.ModelAdmin):
-    list_display = ('voucher', 'user', 'date_created')
-    readonly_fields = ('voucher', 'user')        
+    list_display = ('voucher', 'user', 'order', 'date_created')
+    readonly_fields = ('voucher', 'user', 'order')        
     
 class ConditionalOfferAdmin(admin.ModelAdmin):
     list_display = ('name', 'offer_type', 'start_date', 'end_date', 'condition', 'benefit', 'total_discount')

oscar/offer/fixtures/sample-voucher.json

         "pk": 1, 
         "model": "offer.voucher", 
         "fields": {
-            "free_shipping": false, 
             "code": "BOOM", 
             "name": "Oscar voucher", 
             "end_date": "2011-04-28", 

oscar/order/abstract_models.py

     
     class Meta:
         abstract = True
+        
+    def description(self):
+        if self.voucher_code:
+            return self.voucher_code
+        return self.offer.name

oscar/order/utils.py

         order_discount.save()
         
     def _record_voucher_usage(self, order, voucher, user):
-        voucher.record_usage(user)
+        u"""
+        Updates the models that care about this voucher.
+        """
+        voucher.record_usage(order, user)
         voucher.num_orders += 1
         voucher.save()

oscar/templates/customer/order.html

         <td><a href="{{ line.product.get_absolute_url }}">{{ line.description }}</a></td>
         <td>{{ line.product.stockrecord.availability }}</td>
         <td>{{ line.quantity }}</td>
-        <td>{{ line.line_price_excl_tax|currency }}</td>
-        <td>{{ line.line_price_incl_tax|currency }}</td>
+        <td>{{ line.line_price_before_discounts_excl_tax|currency }}</td>
+        <td>{{ line.line_price_before_discounts_incl_tax|currency }}</td>
         <td>{{ line.shipping_status }}</td>
     </tr>
     {% endfor %}
+    {% for discount in order.discounts.all %}
+    <tr>
+        <td colspan="4">{{ discount.description }}</td>
+        <td>-{{ discount.amount|currency }}</td>
+    </tr>
+    {% endfor %}
 </table>
 
 <table>