Merge pull request #1522 from tulimaki/various-fixes

 Hotfix: fix cache signal handler when called through m2m

shuup/core/signal_handers.py

@@ -10,7 +10,9 @@
 from django.db.backends.signals import connection_created
 from django.db.models.signals import m2m_changed, post_save
 
-from shuup.core.models import Product, ShopProduct, Tax, TaxClass
+from shuup.core.models import (
+    Category, Product, ShopProduct, Tax, TaxClass
+)
 from shuup.core.utils.context_cache import (
     bump_product_signal_handler, bump_shop_product_signal_handler
 )
@@ -33,8 +35,13 @@ def handle_product_post_save(sender, instance, **kwargs):
 
 
 def handle_shop_product_post_save(sender, instance, **kwargs):
-    bump_shop_product_signal_handler(sender, instance, **kwargs)
-    bump_prices_for_shop_product(instance)
+    if isinstance(instance, Category):
+        for shop_product in instance.shop_products.all():
+            bump_shop_product_signal_handler(sender, shop_product, **kwargs)
+            bump_prices_for_shop_product(shop_product)
+    else:
+        bump_shop_product_signal_handler(sender, instance, **kwargs)
+        bump_prices_for_shop_product(instance)
 
 
 # connect signals to bump caches on Product and ShopProduct change

shuup/front/templates/shuup/front/checkout/checkout_method.jinja

@@ -1,4 +1,5 @@
 {% extends "shuup/front/checkout/_base.jinja" %}
+{% from "shuup/front/macros/general.jinja" import render_field with context %}
 
 {% block checkout_phase_content %}
     <div class="row">
@@ -11,8 +12,7 @@
                     {{ macros.alert(error, mode="danger") }}
                 {% endfor %}
                 {% for f in login_form.hidden_fields() %}{{ f }}{% endfor %}
-                {{ macros.render_field(login_form.username) }}
-                {{ macros.render_field(login_form.password) }}
+                {% for f in login_form.visible_fields() %}{{ render_field(f) }}{% endfor %}
                 <button type="submit" class="btn btn-primary btn-block" name="login">
                     <i class="fa fa-sign-in"></i> {% trans %}Log in{% endtrans %}
                 </button>