Adjust signature of get_order_totals

This allows taxes to be added to the shipping charge and passed around. Before this, tax info would be lost when regenerating order totals.
django-oscar · May 28, 2014 · 4dcfcc1 · 4dcfcc1
1 parent 8bcee10
commit 4dcfcc1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/oscar/apps/checkout/session.py b/oscar/apps/checkout/session.py
@@ -190,7 +190,7 @@ def build_submission(self, **kwargs):
         else:
             shipping_charge = shipping_method.calculate(basket)
             total = self.get_order_totals(
-                basket, shipping_method=shipping_method)
+                basket, shipping_charge=shipping_charge)
         submission = {
             'user': self.request.user,
             'basket': basket,
@@ -302,10 +302,9 @@ def get_billing_address(self, shipping_address):
                 user_address.populate_alternative_model(billing_address)
                 return billing_address
 
-    def get_order_totals(self, basket, shipping_method, **kwargs):
+    def get_order_totals(self, basket, shipping_charge, **kwargs):
         """
         Returns the total for the order with and without tax (as a tuple)
         """
-        shipping_charge = shipping_method.calculate(basket)
         return OrderTotalCalculator(self.request).calculate(
             basket, shipping_charge, **kwargs)
diff --git a/oscar/templates/oscar/basket/partials/basket_totals.html b/oscar/templates/oscar/basket/partials/basket_totals.html
@@ -169,7 +169,7 @@ <h4>{% trans "Tax" %}</h4>
                     <tr>
                         <th class="total">{% trans "Shipping" %}</th>
                         <th class="total align-right">
-                            {{ shipping_method.tax|currency:basket.currency }}
+                            {{ shipping_charge.tax|currency:basket.currency }}
                         </th>
                     </tr>
                 {% endif %}