Remove deprecated use of basket_charge_(in|ex)cl_tax in demo site

sites/demo/apps/shipping/methods.py

@@ -32,7 +32,7 @@ class Standard(base.Base):
     @property
     def charge_excl_tax(self):
         # Assume no tax
-        return self.basket_charge_incl_tax()
+        return self.charge_incl_tax
 
 
 class Express(base.Base):
@@ -55,4 +55,4 @@ class Express(base.Base):
     @property
     def charge_excl_tax(self):
         # Assume no tax
-        return self.basket_charge_incl_tax()
+        return self.charge_incl_tax

sites/demo/templates/basket/partials/basket_totals.html

@@ -80,7 +80,7 @@
                 <td>
                     {% trans "Shipping" %} - {{ shipping_method.name }}
                 </td>
-                <td class="align-right">{{ shipping_method.basket_charge_incl_tax|currency }}</td>
+                <td class="align-right">{{ shipping_method.charge_incl_tax|currency }}</td>
             </tr>
         {% else %}
             {# As shipping is discounted, we break it down into its original charge and a discount #}
@@ -90,7 +90,7 @@
             </tr>
             <tr>
                 <td>{% trans "Shipping total (before discounts)" %}</td>
-                <td class="align-right">{{ shipping_method.basket_charge_incl_tax_before_discount|currency }}</td>
+                <td class="align-right">{{ shipping_method.charge_incl_tax_before_discount|currency }}</td>
             </tr>
             <tr>
                 {% with discount=shipping_method.get_discount %}
@@ -102,7 +102,7 @@
                 <td>
                     {% trans "Shipping total (after discounts)" %}
                 </td>
-                <td class="align-right">{{ shipping_method.basket_charge_incl_tax|currency }}</td>
+                <td class="align-right">{{ shipping_method.charge_incl_tax|currency }}</td>
             </tr>
         {% endif %}
 

sites/demo/templates/checkout/shipping_methods.html

@@ -34,7 +34,7 @@
                     {% endif %}
                 </div>
                 <div class="span1">
-                    {{ method.basket_charge_incl_tax|currency }}
+                    {{ method.charge_incl_tax|currency }}
                 </div>
                 <div class="span2">
                     <form method="post" action="{% url 'checkout:shipping-method' %}">