Merge branch 'master' into releases/1.2

# Conflicts:
#	shop/__init__.py

docs/changelog.rst

@@ -4,6 +4,23 @@
 Changelog for django-SHOP
 =========================
 
+1.1.4
+=====
+* Fix rendering bug in Product Gallery plugin.
+
+
+1.1.3
+=====
+* Add South African Rand to currencies.
+
+
+1.1.2
+=====
+* Fix #802: ``CartItemSerializer`` raised an exception if field ``CartItem.extra`` was handled by
+  Django's internal Postgres ``JSONField``.
+* Fix: In Django>2, rendering of OrderItem in Inline Admin did not work anymore.
+
+
 1.1.1
 =====
 * Fix: Rendering text for full text index raised an exception.

shop/__init__.py

@@ -2,18 +2,16 @@
 See PEP 386 (http://www.python.org/dev/peps/pep-0386/)
 
 Release logic:
- 1. Remove ".dev" from __version__ (below)
- 2. git add shop/__init__.py
- 3. git commit -m 'Bump to <version>'
- 4. git tag <version>
+ 1. Increase version number in __version__ (below)
+ 2. Check that all changes have been documented in docs/changelog.rst
+ 3. git add shop/__init__.py docs/changelog.rst
+ 4. git commit -m 'Bump to {new version}'
  5. git push
  6. assure that all tests pass on https://travis-ci.org/awesto/django-shop
- 7. git push --tags
- 8. python setup.py sdist upload
- 9. bump the version, append ".dev" to __version__
-10. git add shop/__init__.py
-11. git commit -m 'Start with <version>'
-12. git push
+ 7. git tag {new version}
+ 8. git push --tags
+ 8. python setup.py sdist
+10. twine upload dist/django-shop-{new version}.tar.gz
 """
 __version__ = '1.2.dev'
 

shop/deferred.py

@@ -70,12 +70,11 @@ class ForeignKeyBuilder(ModelBase):
     """
     In Django we can not point a ``OneToOneField``, ``ForeignKey`` or ``ManyToManyField`` onto
     an abstract Model class. In Django-SHOP this limitation is circumvented by creating deferred
-    foreign keys, which are mapped to their correct model's counterpart during the model materialization
-    step.
+    foreign keys, which are mapped to their correct model's counterpart during the model
+    materialization step.
 
     If the main application stores its models in its own directory, add to settings.py:
-    SHOP_APP_LABEL = 'myshop'
-    so that the models are created inside your own shop instantiation.
+    SHOP_APP_LABEL = 'myshop', so that the models are created inside your own shop instantiation.
     """
     _model_allocation = {}
     _pending_mappings = []

shop/money/iso4217.py

@@ -34,5 +34,6 @@
     'UAH': ('980', 2, '₴', _("Ukrainian Hryvnia")),
     'USD': ('840', 2, '$', _("US Dollar")),
     'SEK': ('752', 2, 'kr', _("Swedish Kronor")),
+    'ZAR': ('710', 2, 'R', _("South African Rand")),
     # feel free to add more currencies, alphabetically ordered
 }

shop/templates/shop/admin/edit_inline/stacked-order.html

@@ -1,30 +1,25 @@
-{% load i18n admin_urls admin_static %}
-<div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
+{% load i18n admin_urls static %}
+<div class="js-inline-admin-formset inline-group"
+     id="{{ inline_admin_formset.formset.prefix }}-group"
+     data-inline-type="stacked"
+     data-inline-formset="{{ inline_admin_formset.inline_formset_data }}">
+<fieldset class="module {{ inline_admin_formset.classes }}">
   <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
 {{ inline_admin_formset.formset.management_form }}
 {{ inline_admin_formset.formset.non_form_errors }}
 
-{% for inline_admin_form in inline_admin_formset %}<div class="inline-related{% if inline_admin_form.original or inline_admin_form.show_url %} has_original{% endif %}{% if forloop.last %} empty-form last-related{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}">
-  <h3><b>{{ inline_admin_formset.opts.verbose_name|capfirst }}:</b>&nbsp;<span class="inline_label">{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% if inline_admin_form.model_admin.show_change_link and inline_admin_form.model_admin.has_registered_model %} <a href="{% url inline_admin_form.model_admin.opts|admin_urlname:'change' inline_admin_form.original.pk|admin_urlquote %}" class="inlinechangelink">{% trans "Change" %}</a>{% endif %}
+{% for inline_admin_form in inline_admin_formset %}<div class="inline-related{% if inline_admin_form.original or inline_admin_form.show_url %} has_original{% endif %}{% if forloop.last and inline_admin_formset.has_add_permission %} empty-form last-related{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}">
+  <h3><b>{{ inline_admin_formset.opts.verbose_name|capfirst }}:</b>&nbsp;<span class="inline_label">{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% if inline_admin_form.model_admin.show_change_link and inline_admin_form.model_admin.has_registered_model %} <a href="{% url inline_admin_form.model_admin.opts|admin_urlname:'change' inline_admin_form.original.pk|admin_urlquote %}" class="{% if inline_admin_formset.has_change_permission %}inlinechangelink{% else %}inlineviewlink{% endif %}">{% if inline_admin_formset.has_change_permission %}{% trans "Change" %}{% else %}{% trans "View" %}{% endif %}</a>{% endif %}
 {% else %}#{{ forloop.counter }}{% endif %}</span>
       {% if inline_admin_form.show_url %}<a href="{{ inline_admin_form.absolute_url }}">{% trans "View on site" %}</a>{% endif %}
-    {% if inline_admin_formset.formset.can_delete and inline_admin_form.original %}<span class="delete">{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}</span>{% endif %}
+    {% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission and inline_admin_form.original %}<span class="delete">{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}</span>{% endif %}
   </h3>
   {% if inline_admin_form.form.non_field_errors %}{{ inline_admin_form.form.non_field_errors }}{% endif %}
   {% for fieldset in inline_admin_form %}
     {% include "shop/admin/includes/fieldset.html" %}
   {% endfor %}
   {% if inline_admin_form.needs_explicit_pk_field %}{{ inline_admin_form.pk_field.field }}{% endif %}
-  {{ inline_admin_form.fk_field.field }}
+  {% if inline_admin_form.fk_field %}{{ inline_admin_form.fk_field.field }}{% endif %}
 </div>{% endfor %}
+</fieldset>
 </div>
-
-<script type="text/javascript">
-(function($) {
-  $("#{{ inline_admin_formset.formset.prefix|escapejs }}-group .inline-related").stackedFormset({
-    prefix: "{{ inline_admin_formset.formset.prefix|escapejs }}",
-    deleteText: "{% filter escapejs %}{% trans "Remove" %}{% endfilter %}",
-    addText: "{% filter escapejs %}{% blocktrans with verbose_name=inline_admin_formset.opts.verbose_name|capfirst %}Add another {{ verbose_name }}{% endblocktrans %}{% endfilter %}"
-  });
-})(django.jQuery);
-</script>

shop/templates/shop/admin/includes/fieldset.html

@@ -7,30 +7,28 @@
         <div class="form-row{% if line.fields|length_is:'1' and line.errors %} errors{% endif %}{% if not line.has_visible_field %} hidden{% endif %}{% for field in line %}{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% endfor %}">
             {% if line.fields|length_is:'1' %}{{ line.errors }}{% endif %}
             {% for field in line %}
-                <div{% if not line.fields|length_is:'1' %} class="field-box{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %}"{% elif field.is_checkbox %} class="checkbox-row"{% endif %}>
+                <div{% if not line.fields|length_is:'1' %} class="fieldBox{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %}"{% elif field.is_checkbox %} class="checkbox-row"{% endif %}>
                     {% if not line.fields|length_is:'1' and not field.is_readonly %}{{ field.errors }}{% endif %}
                     {% if field.is_checkbox %}
                         {{ field.field }}{{ field.label_tag }}
                     {% elif field.field.name|truncatechars:18 == 'render_as_html_...' %}
                         {{ field.label_tag }}
-                        {% with field.contents as contents %}
-                        {% if contents %}
+                        {% with field.contents as contents %}{% if contents %}
                             <p>&nbsp;</p>
                             {{ contents }}
                         {% else %}
                             <p>–</p>
-                        {% endif %}
-                        {% endwith %}
+                        {% endif %}{% endwith %}
                     {% else %}
                         {{ field.label_tag }}
                         {% if field.is_readonly %}
-                            <p>{{ field.contents }}</p>
+                            <div class="readonly">{{ field.contents }}</div>
                         {% else %}
                             {{ field.field }}
                         {% endif %}
                     {% endif %}
                     {% if field.field.help_text %}
-                        <p class="help">{{ field.field.help_text|safe }}</p>
+                        <div class="help">{{ field.field.help_text|safe }}</div>
                     {% endif %}
                 </div>
             {% endfor %}