Merge 773305f into abf9da2

django-oscar · Oct 27, 2014 · 1b002f6 · 1b002f6
2 parents abf9da2 + 773305f
commit 1b002f6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/paypal/express/gateway.py b/paypal/express/gateway.py
@@ -324,7 +324,12 @@ def set_txn(basket, shipping_methods, currency, return_url, cancel_url, update_u
 
     # Set shipping charge explicitly if it has been passed
     if shipping_method:
-        max_charge = charge = shipping_method.charge_incl_tax
+        if hasattr(shipping_method, 'charge_incl_tax'):
+            # Oscar < 0.8
+            max_charge = charge = shipping_method.charge_incl_tax
+        else:
+            cost = shipping_method.calculate(basket)
+            charge = cost.incl_tax
         params['PAYMENTREQUEST_0_SHIPPINGAMT'] = _format_currency(charge)
         params['PAYMENTREQUEST_0_AMT'] += charge