Enhanced the messages dispatching

oscar/apps/checkout/calculators.py

@@ -1,7 +1,7 @@
-
-
 class OrderTotalCalculator(object):
-    u"""Calculator class for calculating the order total."""
+    """
+    Calculator class for calculating the order total.
+    """
     
     def __init__(self, request):
         # We store a reference to the request as the total may 
@@ -11,7 +11,9 @@ class OrderTotalCalculator(object):
         self.request = request
     
     def order_total_incl_tax(self, basket, shipping_method=None, **kwargs):
-        u"""Return order total including tax"""
+        """
+        Return order total including tax
+        """
         # Default to returning the total including tax - use
         # the request.user object if you want to not charge tax
         # to particular customers.  
@@ -21,7 +23,9 @@ class OrderTotalCalculator(object):
         return total
     
     def order_total_excl_tax(self, basket, shipping_method=None, **kwargs):
-        u"""Return order total excluding tax"""
+        """
+        Return order total excluding tax
+        """
         total = basket.total_excl_tax
         if shipping_method:
             total += shipping_method.basket_charge_excl_tax()

oscar/apps/checkout/views.py

@@ -511,7 +511,7 @@ class OrderPlacementMixin(CheckoutSessionMixin):
         if messages:      
             logger.info("Order #%s - sending %s messages", order.number, code)  
             dispatcher = Dispatcher(logger)
-            dispatcher.dispatch_messages(order.user, messages)
+            dispatcher.dispatch_order_messages(order, messages, event_type)
         else:
             logger.warning("Order #%s - no %s communication event type", order.number, code)
 

oscar/apps/customer/utils.py

@@ -10,6 +10,11 @@ class Dispatcher(object):
     def __init__(self, logger):
         self.logger = logger
     
+    def dispatch_order_messages(self, order, messages, event_type):
+        self.dispatch_messages(order.user, messages)
+        # Create order comms event for audit
+        CommunicationEvent._default_manager.create(order=order, type=event_type)
+    
     def dispatch_messages(self, user, messages):
         """
         Send messages
@@ -18,7 +23,7 @@ class Dispatcher(object):
             self.send_email_messages(user, messages)
         if messages['sms']:
             self.send_text_message(user, messages['sms'])
-
+                                   
     def send_email_messages(self, user, messages):
         if not user.email:
             self.logger.warning("Unable to send email messages as user #%d has no email address", user.id)
@@ -44,6 +49,6 @@ class Dispatcher(object):
                                           body_text=email.body,
                                           body_html=messages['html'])
         
-    def send_order_sms(self, user, order, event_type):
+    def send_text_message(self, user, event_type):
         raise NotImplementedError
         

oscar/apps/order/abstract_models.py

@@ -160,7 +160,8 @@ class AbstractOrderNote(models.Model):
 class AbstractCommunicationEvent(models.Model):
     """
     An order-level event involving a communication to the customer, such
-    as an confirmation email being sent."""
+    as an confirmation email being sent.
+    """
     order = models.ForeignKey('order.Order', related_name="communication_events")
     type = models.ForeignKey('customer.CommunicationEventType')
     date = models.DateTimeField(auto_now_add=True)