awesto · jrief · Mar 18, 2018 · Sep 21, 2017 · Sep 25, 2017 · Sep 25, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,6 @@ python:
   - 3.6
 
 env:
-  - DJANGOVER=django19
   - DJANGOVER=django110
   - DJANGOVER=django111
   - TOX_ENV=docs

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     restart: always
     image: postgres
     env_file:
-      - example/docker-files/environ
+      - example/docker-files/databases.environ
     volumes:
       - pgdata:/var/lib/postgresql/data
     networks:
@@ -31,8 +31,6 @@ services:
         hard: -1
     volumes:
       - esdata:/usr/share/elasticsearch/data
-    ports:
-      - 9200:9200
     networks:
       - shopnet
 
@@ -45,27 +43,39 @@ services:
     environment:
       - DJANGO_SHOP_TUTORIAL
       - POSTGRES_DB=myshop_$DJANGO_SHOP_TUTORIAL
-      - DJANGO_EMAIL_HOST
-      - DJANGO_EMAIL_PORT
-      - DJANGO_EMAIL_USER
-      - DJANGO_EMAIL_PASSWORD
-      - DJANGO_EMAIL_USE_TLS
-      - DJANGO_EMAIL_FROM
-      - DJANGO_EMAIL_REPLY_TO
     env_file:
-      - example/docker-files/environ
+      - example/docker-files/databases.environ
     volumes:
       - shopmedia:/web/workdir
+    command: uwsgi --ini uwsgi.ini
     depends_on:
       - postgresdb
       - redishost
       - elasticsearch
     networks:
       - shopnet
-    command: uwsgi --ini uwsgi.ini
     ports:
       - 9009:9009
 
+  worker:
+    restart: always
+    image: demoshop
+    environment:
+      - DJANGO_SHOP_TUTORIAL
+      - POSTGRES_DB=myshop_$DJANGO_SHOP_TUTORIAL
+      - DJANGO_SETTINGS_MODULE=myshop.settings
+    env_file:
+      - example/docker-files/databases.environ
+      - example/docker-files/email.environ
+    command: su django -c /web/worker.py
+    volumes:
+      - shopmedia:/web/workdir
+    depends_on:
+      - postgresdb
+      - redishost
+    networks:
+      - shopnet
+
 networks:
   shopnet:
 

diff --git a/docs/_static/tutorial/django-cms-toolbar.png b/docs/_static/tutorial/django-cms-toolbar.png
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -4,8 +4,75 @@
 Changelog for django-SHOP
 =========================
 
+0.12
+====
+
+* Adopted for django-angular version 2.0, which breaks its API. Invalid forms rejected by the server
+  are send with a status code of 422 now. Check their changelog for details.
+* Adopted to AngularJS-1.6.6, which required to replace all ``.success()`` handlers against
+  a promise ``.then()``.
+* RESTifyed the communication with the server, by using HTTP methods ``PUT`` and ``DELETE`` where
+  appropriate.
+* Rename ``PayInAdvanceWorkflowMixin`` to ``ManualPaymentWorkflowMixin``, since its purpose is to
+  handle all incoming/outgoing payments manually.
+* Move ``LeftExtensionPlugin`` and ``RightExtensionPlugin`` into module ``shop/cascade/extensions``
+  and allow them to be used on the ``ShopOrderViewsPlugin`` as well.
+* Refactored ``ShopReorderButtonPligin`` and ``ShopOrderAddendumFormPlugin`` to use the new
+  ``djng-forms-set`` directive, as provided by **django-angular** version 2.0.
+* ``ShopOrderAddendumFormPlugin`` can optionally render historical annotations for the given order.
+* Added hook methods ``cancelable()`` and ``refund_payment()`` to ``BaseOrder`` to allow
+  a better order cancelling interface.
+* Paid but unshipped orders, now can be refunded. Possible be refactoring class
+  ``CancelOrderWorkflowMixin``, which handles payment refunds.
+* Add Order status to Order Detail View, so that the customer immediately sees what's going on.
+* Reject method POST on Order List View.
+* Fix: On re-add item to cart, use ``product_code`` to identify if that product already exists in cart.
+* Do not render buttons and links related to the watch-list, when it is not available.
+* Use Sekizai's templatetags ``{% add_data %}`` and ``{% with_data %}`` instead of Sekizai's
+  postprocessors ``djng.sekizai_processors.module_config`` and ``djng.sekizai_processors.module_list``,
+  which now are deprecated.
+* Remove HTTP-Header ``X-HTTP-Method-Override`` and use PUT and DELETE requests natively.
+* Remove django-angular dependency ``djng.url`` from project.
+* Endpoints in JavaScript are always referenced through HTML. This eliminates the need for
+  ``'djng.middleware.AngularUrlMiddleware'`` in ``MIDDLEWARE_CLASSES`` of your ``settings.py``.
+* Use Django's internal password validator configuration ``AUTH_PASSWORD_VALIDATORS`` in your
+  ``settings.py``.
+* Refactored all templates for authentication forms to simplify inheritance and to use the promise
+  chain (offered by django-angular 2.0). This allows to do fine-grained adoptions in the submit
+  buttons behaviour.
+* Decoupled all checkout forms. They don't require ``dialog.js``, ``forms-sets.js`` and ``auth.js``
+  anymore. Instead use the functionality provided by django-angular 2.0 form directives.
+* Use a REST endpoint to add, modify and delete multiple shipping and billing addresses. This
+  simplifies the address forms. Remove ``shipping-address.js`` and replace it against a more generic
+  ``address.js``.
+* Use an event broadcast ``shop.carticon.caption`` to inform the carticon about changes in the cart.
+* Add an overridable ``CartIconCaptionSerializer`` to specify what to render in the cart-icon.
+* Use event broadcasting to inform the checkout forms if configured in summary mode. This decouples
+  checkout form updates, from rendering their summary on another page or process step.
+* Add operator to test Money type against booleans.
+* Fix: Adopt polymorphic ModelAdmin-s to django-polymorphic>=1.0.
+* Add to ``ShopProceedButton``: Disable button if any form in this set is invalid.
+* Use vanilla Javascript in serverside JS-expressions.
+* Decoupled ``CheckoutViewSet`` from ``CartViewSet``, so that the checkout only handles forms
+  relevant to the checkout process.
+* Endpoint ``digest`` in ``CheckoutViewSet``, returns a full description of all forms, plus the
+  current cart's content. Fetching from there is emit a ``shop.checkout.digest`` event.
+* Added directives ``shop-payment-method`` and ``shop-shipping-method`` which update the cart and
+  emit a ``shop.checkout.digest`` event on change.
+* Fix: All form input field get their own unique HTML ``id``. Previously some ``id``'s were used
+  twice and caused collisions.
+* Fix: Do not rebuild list of cart items, on each change of quantity.
+* Separate ``CartController`` into itself and a ``CartItemControler``.
+* Consistent naming of emit and broadcast events.
+* Introduce ``CartSummarySerializer`` to retrieve a smaller checkout digest.
+* In Shipping- and Payment Method Form, optionally show additional charges below the radio fields,
+  depending on the selected method.
+* Remove ``angular-message`` from the list of npm dependencies.
+
+
 0.11.7
 ======
+
 * Fix: Python3 can not handle ``None`` type in max() function.
 * Smoother animation when showing Payment form.
 
@@ -52,14 +119,10 @@ Changelog for django-SHOP
 
 
 0.11.2
-======
+=======
 
 * Do not render buttons and links related to the watch-list, when it is not available.
 * Fix: Adopt polymorphic ModelAdmin-s to django-polymorphic>=1.0.
-* Use Sekizai's internal ``{% with_data ... %}`` to render Sekizai blocks ``ng-requires`` and
-  ``ng-config`` rather than using the deprecated postprocessors ``djng.sekizai_processors.module_list``
-  and ``djng.sekizai_processors.module_config``. Adopt your templates accordingly as explained
-  in :ref:`reference/client-framework`
 * Use Sekizai's internal templatetags ``{% with_data ... %}`` and ``{% with_data %}`` to render Sekizai
   blocks ``ng-requires`` and ``ng-config`` rather than using the deprecated postprocessors
   ``djng.sekizai_processors.module_list`` and ``djng.sekizai_processors.module_config``. Adopt your
@@ -210,7 +273,7 @@ Changelog for django-SHOP
 * Added method ``post_process_cart_item`` to the Cart Modifiers.
 * In ``CartItem`` the ``product_code`` is mandatory now. It moves from being optionally kept in dict
   ``CartItem.extra`` into the ``CartItem`` model itself. This simplifies a lot of boilerplate code,
-  otherwise required by the merchant implementation. Please read :ref:`upgrading-0.10` for details.
+  otherwise required by the merchant implementation. Please read :ref:`release-notes/0.10` for details.
 * In :class:`shop.models.product.BaseProduct` added a hook method ``get_product_variant(self, **kwargs)``
   which can be overridden by products with variations to return a product variant.
 
@@ -238,7 +301,7 @@ Changelog for django-SHOP
 * Minimum required version of djangocms-cascade is now 0.10.2.
 * Minimum required version of djangoshop-stripe is now 0.2.0.
 * Changed the default address models to be more generic. Please read the
-  :doc:`upgrade instructions <upgrading>` if you are upgrading from 0.9.0 or 0.9.1.
+  :ref:`release-notes/0.9` if you are upgrading from 0.9.0 or 0.9.1.
 * Fixed :py:meth:`shop.money.fields.decontruct` to avoid repetitive useless generation of migration
   files.
 * Using cached_property decoration for methods ``unit_price`` and ``line_total`` in

diff --git a/docs/faq.rst b/docs/faq.rst
@@ -0,0 +1,36 @@
+.. _faq:
+
+============================
+Frequently Asquest Questions
+============================
+
+
+Frontend Editing
+================
+
+Order Plugin
+------------
+
+**Editing the Order Plugin seems to be broken**
+
+This has to do with the way, **django-CMS** handles the placeholder in its templates. Here the
+problem is, that we're using the same template for both, the Order List View and their Detail
+Views. The Order Detail Views however, are not managed by the CMS, but rather by a CMSApphook.
+The latter confuses the CMS placeholder. It therefore is *strongly recommended* to edit the Order
+Page only while in List View Mode.
+
+JavaScript
+----------
+
+**Can I use django-SHOP without AngularJS?**
+
+When using REST, then client side actions have to be handles somehow using JavaScript.
+AngularJS was chosen in 2014, because it was the only MVVM-ish framework at the time. However,
+the intention always has been, that merchants implementing their e-commerce site on top of
+**django-SHOP** do not have to write a single line of code in JavaScript. The idea is, that
+everything shall be adoptable using the special HTML elements introduced by **django-SHOP**.
+
+Unless all these directives are replaced by another JavaScript framework, such as React, Ember,
+Vue.js, Angular2/4, Aurelia, etc., one can setup **django-SHOP** without any JavaScript at all.
+Then however, a lot of functionality is lost and the user experience will be modest.
+
diff --git a/docs/features.rst b/docs/features.rst
@@ -57,7 +57,7 @@ their amount with the correct currency symbol. They also offer the special amoun
 Django-SHOP directly plugs into django-CMS
 ==========================================
 
-Product detail pages may use all templatetags from djangoCMS, such as the ``{% placeholder ... %}``,
+Product detail pages may use all templatetags from **django-CMS**, such as the ``{% placeholder ... %}``,
 the ``{% static_placeholder ... %}``, or other CMS tags.
 
 **Django-SHOP** does not presuppose categories to organize product list views. Instead django-CMS

diff --git a/docs/howto/customize-snippets.rst b/docs/howto/customize-snippets.rst
@@ -4,7 +4,7 @@
 Add Customized HTML Snippets
 ============================
 
-When working in *Structure Mode* as provided by **djangoCMS**, while editing the DOM tree inside a
+When working in *Structure Mode* as provided by **django-CMS**, while editing the DOM tree inside a
 placeholder, we might want to add a HTML snippet which is not part of the **Cascade** ecosystem.
 Instead of creating an additional Django template, it often is much easier to just add a  customized
 plugin. This plugin then is available when editing a placeholder in *Structure Mode*.

diff --git a/docs/index.rst b/docs/index.rst
@@ -14,7 +14,7 @@ Django-SHOP documentation
 Upgrading
 =========
 If you are upgrading from an earlier version, please be sure to read the
-:doc:`upgrade instructions <upgrading>`.
+:ref:`release-notes`.
 
 
 Tutorial
@@ -54,6 +54,7 @@ Reference to classes and concepts used in **django-SHOP**
     reference/filters
     reference/cascade-plugins
     reference/cart-checkout
+    reference/cart-icon
     reference/payment-providers
     reference/order
     reference/delivery
@@ -64,8 +65,9 @@ Reference to classes and concepts used in **django-SHOP**
     reference/configuration
     reference/shipping-providers
     reference/special-cms-pages
-    reference/cart-icon
     reference/settings
+    reference/worker
+    reference/docker
 
 
 How To's
@@ -83,15 +85,31 @@ Some recipes on how to perform certain tasks in **django-SHOP**.
     howto/handling-discounts
     howto/handling-taxes
 
+
+Django/Python compatibility table
+=================================
+
+===========  ===  ===  ====  ====  ===  ===  ===  ===  ===
+django-SHOP  Django                     Python
+-----------  -------------------------  ------------------
+\            1.8  1.9  1.10  1.11  2.0  2.7  3.4  3.5  3.6
+===========  ===  ===  ====  ====  ===  ===  ===  ===  ===
+0.10.x        ✓    ✓    ⨯     ⨯     ⨯    ✓    ✓   ✓    ⨯
+0.11.x        ⨯    ✓    ✓     ⨯     ⨯    ✓    ✓   ✓    ✓
+0.12.x        ⨯    ⨯    ⨯     ✓     ⨯    ✓    ✓   ✓    ✓
+0.13.x        ⨯    ⨯    ⨯     ✓     ⨯    ✓    ✓   ✓    ✓
+===========  ===  ===  ====  ====  ===  ===  ===  ===  ===
+
+
 Development and Community
 =========================
 
 .. toctree::
     :maxdepth: 1
 
     changelog
-    releases/0.11
-    upgrading
+    release-notes/index
+    faq
     contributing
     authors