Rename template references to variants

Where I previously thought that renaming HTML/CSS is more hassle than
it's worth, @mbertheau convinced me that to update a codebase, a general
search-and-replace is the best approach already and will catch any
HTML/CSS changes.

I also missed to deprecate the min_variant_price properties.

Makefile

@@ -15,7 +15,7 @@ sandbox: install
 	sites/sandbox/manage.py syncdb --noinput
 	sites/sandbox/manage.py migrate
 	# Import some fixtures. Order is important as JSON fixtures include primary keys
-	sites/sandbox/manage.py loaddata sites/sandbox/fixtures/variants.json
+	sites/sandbox/manage.py loaddata sites/sandbox/fixtures/child_products.json
 	sites/sandbox/manage.py oscar_import_catalogue sites/sandbox/fixtures/*.csv
 	sites/sandbox/manage.py oscar_import_catalogue_images sites/sandbox/fixtures/images.tar.gz
 	sites/sandbox/manage.py oscar_populate_countries

docs/source/releases/v0.8.rst

@@ -214,7 +214,7 @@ Backwards incompatible changes in 0.8
 Product structure
 ~~~~~~~~~~~~~~~~~
 
-Generally, backwards compatibility has been preserved. Two changes are
+Generally, backwards compatibility has been preserved. Those changes are
 unavoidable:
 
 * You now need to explicitly set product structure when creating a product;
@@ -224,6 +224,7 @@ unavoidable:
   deprecation warning), but if you used the old related name in a query lookup
   (e.g. ``products.filter(variants__title='foo')``, you will have to change it
   to ``children``.
+* Template blocks and CSS classes have been renamed.
 
 The following methods and properties have been deprecated:
 
@@ -236,6 +237,13 @@ The following methods and properties have been deprecated:
 * ``Strategy.select_variant_stockrecords`` - Use
   ``select_children_stockrecords`` instead.
 
+Furthermore, CSS classes and template blocks have been updated. Please follow
+the following renaming pattern:
+* ``variant-product`` becomes ``child-product``
+* ``product_variants`` becomes ``child_products``
+* ``variants`` becomes ``children``
+* ``variant`` becomes ``child``
+
 Shipping
 ~~~~~~~~
 

oscar/apps/catalogue/abstract_models.py

@@ -418,33 +418,33 @@ class AbstractProduct(models.Model):
         return ", ".join(pairs)
 
     @property
-    def min_variant_price_incl_tax(self):
+    def min_child_price_incl_tax(self):
         """
-        Return minimum variant price including tax
+        Return minimum child product price including tax
         """
-        return self._min_variant_price('price_incl_tax')
+        return self._min_child_price('price_incl_tax')
 
     @property
-    def min_variant_price_excl_tax(self):
+    def min_child_price_excl_tax(self):
         """
-        Return minimum variant price excluding tax
+        Return minimum child product price excluding tax
         """
-        return self._min_variant_price('price_excl_tax')
+        return self._min_child_price('price_excl_tax')
 
-    def _min_variant_price(self, property):
+    def _min_child_price(self, property):
         """
-        Return minimum variant price
+        Return minimum child product price
         """
         prices = []
-        for variant in self.variants.all():
-            if variant.has_stockrecords:
-                prices.append(getattr(variant.stockrecord, property))
+        for child in self.children.all():
+            if child.has_stockrecords:
+                prices.append(getattr(child.stockrecord, property))
         if not prices:
             return None
         prices.sort()
         return prices[0]
 
-    # Deprecated properties
+    # The properties below are based on deprecated naming conventions
 
     @property
     @deprecated
@@ -466,15 +466,32 @@ class AbstractProduct(models.Model):
     @deprecated
     def is_group(self):
         """
-        Test if this is a top level product and has more than 0 variants
+        Test if this is a parent product
         """
         return self.is_parent
 
     @property
+    @deprecated
     def is_variant(self):
         """Return True if a product is not a top level product"""
         return self.is_child
 
+    @property
+    @deprecated
+    def min_variant_price_incl_tax(self):
+        """
+        Return minimum variant price including tax
+        """
+        return self._min_child_price('price_incl_tax')
+
+    @property
+    @deprecated
+    def min_variant_price_excl_tax(self):
+        """
+        Return minimum variant price excluding tax
+        """
+        return self._min_child_price('price_excl_tax')
+
     # Wrappers
 
     def get_title(self):

oscar/apps/partner/importers.py

@@ -184,7 +184,7 @@ class DemoSiteImporter(object):
 
         if is_child:
             product.structure = Product.CHILD
-            # Assign parent for variants
+            # Assign parent for children
             product.parent = self.parent
         elif is_parent:
             product.structure = Product.PARENT

oscar/static/oscar/css/responsive.css

@@ -1080,7 +1080,7 @@
     padding-right: 10px;
   }
 }
-@media (min-width: 767px + 1) {
+@media (min-width: 768px) {
   .nav-collapse.collapse {
     height: auto !important;
     overflow: visible !important;

oscar/templates/oscar/dashboard/catalogue/product_delete.html

@@ -47,10 +47,10 @@
         {% endblocktrans %}
 
         {% if product.is_parent %}
-            <p> {% trans "This will also delete the following variant products:" %}
+            <p> {% trans "This will also delete the following child products:" %}
                 <ul>
-                    {% for variant in product.children.all %}
-                        <li><strong>{{ variant.title }}</strong></li>
+                    {% for child in product.children.all %}
+                        <li><strong>{{ child.title }}</strong></li>
                     {% endfor %}
                 </ul>
             </p>

oscar/templates/oscar/dashboard/catalogue/product_update.html

@@ -46,7 +46,7 @@
                             <li{% if not product %} class="active"{% endif %}><a href="#product_details" data-toggle="tab">{% trans 'Product details' %}</a></li>
                             <li><a href="#product_recommended" data-toggle="tab">{% trans 'Recommended Products' %}</a></li>
                             {% if product.children.exists %}
-                                <li><a href="#product_variants" data-toggle="tab">{% trans 'Product variants' %}</a></li>
+                                <li><a href="#child_products" data-toggle="tab">{% trans 'Child products' %}</a></li>
                             {% endif %}
                             <li><a href="#product_attributes" data-toggle="tab">{% trans 'Product attributes' %}</a></li>
                             <li><a href="#product_category" data-toggle="tab">{% trans 'Product category' %}</a></li>
@@ -177,11 +177,11 @@
                         </div>
                     {% endblock product_details %}
 
-                    {% block product_variants %}
-                        {% with variants=product.children.all %}
-                            {% if variants %}
-                                <div class="tab-pane" id="product_variants">
-                                    {% block product_variants_content %}
+                    {% block child_products %}
+                        {% with children=product.children.all %}
+                            {% if children %}
+                                <div class="tab-pane" id="child_products">
+                                    {% block child_products_content %}
                                         <table class='table table-striped table-bordered'>
                                             <caption>{% trans "Variants" %}</caption>
                                             {% with parent=product.parent %}
@@ -200,19 +200,19 @@
                                                 <th colspan="3">{% trans "Children" %}</th>
                                             </tr>
 
-                                            {% for variant in variants %}
+                                            {% for child in children %}
                                                 <tr>
-                                                    <td>{{ variant.get_title }}</td>
-                                                    <td>{{ variant.attribute_summary }}</td>
-                                                    <td><a href="{% url 'dashboard:catalogue-product' pk=variant.id %}" class="btn btn-primary">{% trans "Edit" %}</a></td>
+                                                    <td>{{ child.get_title }}</td>
+                                                    <td>{{ child.attribute_summary }}</td>
+                                                    <td><a href="{% url 'dashboard:catalogue-product' pk=child.id %}" class="btn btn-primary">{% trans "Edit" %}</a></td>
                                                 </tr>
                                             {% endfor %}
                                         </table>
-                                    {% endblock product_variants_content %}
+                                    {% endblock child_products_content %}
                                 </div>
                             {% endif %}
                         {% endwith %}
-                    {% endblock product_variants %}
+                    {% endblock child_products %}
 
                     {% block product_attributes %}
                         <div class="tab-pane" id="product_attributes">

sites/demo/static/demo/css/styles.css

@@ -5226,29 +5226,29 @@ you can use the generic selector below, but it's slower:
   color: #97a5a3;
   font-size: 1.1428571428571428em;
 }
-.variant-product {
+.child-product {
   *zoom: 1;
 }
-.variant-product:before,
-.variant-product:after {
+.child-product:before,
+.child-product:after {
   display: table;
   content: "";
   line-height: 0;
 }
-.variant-product:after {
+.child-product:after {
   clear: both;
 }
-.variant-product h4 {
+.child-product h4 {
   color: #024872;
 }
-.variant-product p,
-.variant-product h4 {
+.child-product p,
+.child-product h4 {
   margin-bottom: 15px;
 }
-.variant-product .price_color {
+.child-product .price_color {
   font-size: 1.7142857142857142em;
 }
-.variant-product .image_container {
+.child-product .image_container {
   background: #ffffff;
   line-height: 80px;
   min-height: 80px;
@@ -5256,14 +5256,14 @@ you can use the generic selector below, but it's slower:
   border: 1px solid #ddd;
   float: left;
 }
-.variant-product .image_container img {
+.child-product .image_container img {
   max-height: 70px;
   max-width: 98%;
 }
-.variant-product > div:first-child + div {
+.child-product > div:first-child + div {
   margin-left: 100px;
 }
-.variant-form label {
+.child-form label {
   display: block;
 }
 .form-notify .btn {

sites/demo/static/demo/less/page/product_lists.less

@@ -1,5 +1,5 @@
 // Price Color
-//Price (i = variant)
+//Price (i = child product)
 .price_color {
   display:block;
   color:@green;

sites/demo/static/demo/less/page/product_page.less

@@ -91,8 +91,8 @@
     font-size: @headingFourSize;
   }
 }
-//Variant lists
-.variant-product {
+//Child product lists
+.child-product {
   .clearfix();
   h4 {
     color:@blueDark;
@@ -119,7 +119,7 @@
     margin-left:100px;
   }
 }
-.variant-form {
+.child-form {
   label {
     display:block;
   }

sites/demo/templates/catalogue/detail.html

@@ -68,28 +68,28 @@
             {% if product.is_group %}
                 <h3>{% trans "Please select your varieties" %}</h3>
                 
-                {% with variants=product.children.all %}
-                    {% if variants|length > 0 %}
+                {% with children=product.children.all %}
+                    {% if children|length > 0 %}
                           
-                            {% for variant in variants %}
-                            <div class="variant-product well">
+                            {% for child in children %}
+                            <div class="child-product well">
 
-                                {% with image=variant.primary_image %}
+                                {% with image=child.primary_image %}
                                 {% thumbnail image.original "70x70" upscale=False as thumb %}
                                 <div class="image_container">
-                                    <img src="{{ thumb.url }}" alt="{{ variant.get_title }}" data-description="{% if image.caption %}{{ image.caption }}{% endif %}">
+                                    <img src="{{ thumb.url }}" alt="{{ child.get_title }}" data-description="{% if image.caption %}{{ image.caption }}{% endif %}">
                                 </div>
                                 {% endthumbnail %}
                                 {% endwith %}
 
                                 <div>
-                                    <h4>{{ variant.title }}</h4>
+                                    <h4>{{ child.title }}</h4>
 
-                                    {% include "catalogue/partials/variant_stock_record.html" with class="span5" product=variant %}
+                                    {% include "catalogue/partials/child_stock_record.html" with class="span5" product=child %}
                                     
-                                    <div class="variant-form">
-                                        {% if variant.is_available_to_buy %}
-                                        {% basket_form request variant as basket_form %}
+                                    <div class="child-form">
+                                        {% if child.is_available_to_buy %}
+                                        {% basket_form request child as basket_form %}
                                         <form action="{% url 'basket:add' %}" method="post" class="form-inline">
                                             {% csrf_token %}
                                             {% include "partials/form_fields_inline.html" with form=basket_form %}
@@ -97,8 +97,8 @@
                                         </form>
                                         <span itemprop="availability" content="in_stock"></span>
                                         {% else %}
-                                        <p class="variant-notice">{% trans "You can get an email alert when this product is back in stock." %}</p>
-                                        {% include "catalogue/partials/alerts_form.html" with product=variant %}
+                                        <p>{% trans "You can get an email alert when this product is back in stock." %}</p>
+                                        {% include "catalogue/partials/alerts_form.html" with product=child %}
                                         {% endif %}
                                     </div>
                                 </div>

sites/demo/templates/catalogue/partials/stock_record.html

@@ -5,7 +5,7 @@
 {% purchase_info_for_product request product as session %}
 
 {% if product.is_group %}
-    <span>{% blocktrans with product.min_variant_price_incl_tax|currency as price %} <i>From</i> {{ price }}{% endblocktrans %}</span>
+    <span>{% blocktrans with product.min_child_price_incl_tax|currency as price %} <i>From</i> {{ price }}{% endblocktrans %}</span>
 {% else %}
     <span>{% if session.price.retail > session.price.incl_tax %}<del>{{ session.price.retail|currency }}</del>{% endif %} {{ session.price.incl_tax|currency }}</span>
 {% endif %}

tests/integration/catalogue/product_tests.py

@@ -87,7 +87,7 @@ class VariantProductTests(ProductTests):
         Product.objects.create(
             parent=self.parent, structure=Product.CHILD)
 
-    def test_variant_products_inherit_parent_titles(self):
+    def test_child_products_inherit_parent_titles(self):
         p = Product.objects.create(
             parent=self.parent, product_class=self.product_class,
             structure=Product.CHILD)