Converted order management app to new structure

oscar/app.py

@@ -6,6 +6,7 @@ from oscar.apps.customer.app import application as customer_app
 from oscar.apps.basket.app import application as basket_app
 from oscar.apps.checkout.app import application as checkout_app
 from oscar.apps.promotions.app import application as promotions_app
+from oscar.apps.order_management.app import application as order_management_app
 
 
 class Shop(Application):
@@ -15,13 +16,14 @@ class Shop(Application):
     basket_app = basket_app
     checkout_app = checkout_app
     promotions_app = promotions_app
+    order_management_app = order_management_app
     
     def get_urls(self):
         urlpatterns = patterns('',
             (r'products/', include(self.product_app.urls)),
             (r'basket/', include(self.basket_app.urls)),
             (r'checkout/', include(self.checkout_app.urls)),
-            (r'order-management/', include('oscar.apps.order_management.urls')),
+            (r'order-management/', include(self.order_management_app.urls)),
             (r'accounts/', include(self.customer_app.urls)),
             (r'reports/', include('oscar.apps.reports.urls')),
             (r'search/', include('oscar.apps.search.urls')),

oscar/apps/checkout/forms.py

@@ -1,6 +1,7 @@
 from django.forms import ModelForm
 from django.db.models import get_model
 
+
 class ShippingAddressForm(ModelForm):
     
     def __init__(self, *args, **kwargs):

oscar/apps/checkout/utils.py

@@ -17,12 +17,12 @@ class CheckoutSessionData(object):
         if namespace not in self.request.session[self.SESSION_KEY]:
             self.request.session[self.SESSION_KEY][namespace] = {}
           
-    def _get(self, namespace, key):
+    def _get(self, namespace, key, default=None):
         u"""Return session value or None"""
         self._check_namespace(namespace)
         if key in self.request.session[self.SESSION_KEY][namespace]:
             return self.request.session[self.SESSION_KEY][namespace][key]
-        return None
+        return default
             
     def _set(self, namespace, key, value):
         u"""Set session value"""
@@ -89,6 +89,12 @@ class CheckoutSessionData(object):
     def payment_method(self):
         return self._get('payment', 'method')
     
+    def billing_address_same_as_shipping(self):
+        self._set('payment', 'billing_address_same_as_shipping', True)
+        
+    def is_billing_address_same_as_shipping(self):
+        return self._get('payment', 'billing_address_same_as_shipping', False)
+    
     # Submission methods
     
     def set_submitted_basket(self, basket):

oscar/apps/order_management/app.py

@@ -0,0 +1,21 @@
+from django.conf.urls.defaults import patterns, url
+from django.contrib.admin.views.decorators import staff_member_required
+
+from oscar.core.application import Application
+from oscar.apps.order_management.views import OrderListView, OrderDetailView
+
+
+class OrderManagementApplication(Application):
+    name = 'order-management'
+    
+    list_view = OrderListView
+    detail_view = OrderDetailView
+
+    def get_urls(self):
+        urlpatterns = patterns('oscar.order_management.views',
+            url(r'^$', staff_member_required(self.list_view.as_view()), name='list'),
+            url(r'^order/(?P<order_number>[\w-]*)/$', staff_member_required(self.detail_view.as_view()), name='detail'),
+        )
+        return urlpatterns
+
+application = OrderManagementApplication()

oscar/apps/order_management/templates/order_management/browse.html

@@ -6,7 +6,7 @@
 <h2>Order management</h2>
 {% endblock header %}
 {% block content %}
-<form method="get" action="{% url oscar-order-management-list %}">
+<form method="get" action="{% url order-management:list %}">
     {{ order_simple_search_form.as_p }}
     <input type="submit" nane="simple_search" value="Search" />
 </form>
@@ -33,7 +33,7 @@
         <td>{{ order.billing_address }}</td>
         <td>{{ order.date_placed }}</td>
         <td>
-            <a href="{% url oscar-order-management-order order.number %}">View</a>
+            <a href="{% url order-management:detail order.number %}">View</a>
         </td>
     </tr>
     {% endfor %}

oscar/apps/order_management/templates/order_management/order.html

@@ -38,7 +38,7 @@
 
 <h3>Order contents</h3>
 
-<form action="{% url oscar-order-management-order order.number %}" method="post">
+<form action="{% url order-management:detail order.number %}" method="post">
 {% csrf_token %}
 <input type="hidden" name="action" value="create_line_event" />
 <table>
@@ -86,7 +86,7 @@
 </table>
 </form>
 
-<form action="{% url oscar-order-management-order order.number %}" method="post">
+<form action="{% url order-management:detail order.number %}" method="post">
     {% csrf_token %}
     <input type="hidden" name="action" value="create_order_event" />
     Set entire order to:
@@ -159,7 +159,7 @@
 </table>
 {% endif %}
 
-<form method="post" action="{%url oscar-order-management-order order.number %}"/>
+<form method="post" action="{%url order-management:detail order.number %}"/>
     {% csrf_token %}
     <input type="hidden" name="action" value="add_note" />
     <label for="message">Message:</label>

oscar/apps/order_management/urls.py

@@ -1,11 +0,0 @@
-from django.conf.urls.defaults import *
-from django.contrib.admin.views.decorators import staff_member_required
-
-from oscar.core.loading import import_module
-import_module('order_management.views', ['OrderListView', 'OrderView'], locals())
-
-urlpatterns = patterns('oscar.order_management.views',
-    url(r'^$', staff_member_required(OrderListView.as_view()), name='oscar-order-management-list'),
-    url(r'^order/(?P<order_number>[\w-]*)/$', staff_member_required(OrderView.as_view()), name='oscar-order-management-order'),
-)
-

oscar/apps/order_management/views.py

@@ -60,7 +60,7 @@ class OrderListView(ListView):
         return response
         
         
-class OrderView(DetailView, PostActionMixin):
+class OrderDetailView(DetailView, PostActionMixin):
     u"""A detail view of an order"""
     template_name = "order_management/order.html"
     context_object_name = 'order'
@@ -70,7 +70,7 @@ class OrderView(DetailView, PostActionMixin):
         return get_object_or_404(Order, number=self.kwargs['order_number'])
     
     def get_context_data(self, **kwargs):
-        context = super(OrderView, self).get_context_data(**kwargs)
+        context = super(OrderDetailView, self).get_context_data(**kwargs)
         context['shipping_options'] = ShippingEventType._default_manager.all()
         context['payment_options'] = PaymentEventType._default_manager.all()
         return context
@@ -78,7 +78,7 @@ class OrderView(DetailView, PostActionMixin):
     def post(self, request, *args, **kwargs):
         order = self.get_object()
         self.response = HttpResponseRedirect(reverse('oscar-order-management-order', kwargs={'order_number': order.number}))
-        return super(OrderView, self).post(request, *args, **kwargs)
+        return super(OrderDetailView, self).post(request, *args, **kwargs)
    
     def do_create_order_event(self, order):
         self.create_shipping_event(order, order.lines.all())