Merge pull request #111 from guillaumep/fix_meal_selection

Fix meal selection for #93

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="souschef",
-    version="1.3.8dev3",
+    version="1.3.8dev4",
     license="AGPL-3.0",
     author="Santropol Roulant and Savoir Faire Linux",
     author_email="[email protected]",

souschef/delivery/templates/ingredients.html

@@ -44,6 +44,7 @@ <h1 class="ui header">{% trans "Pick ingredients" %}</h1>
 </div>
 
 <form class="ui form" action="{% url 'delivery:meal' %}" method="post">
+    <input type="hidden" name="delivery_date" value="{{ delivery_date.isoformat }}">
     <div class="ui stackable relaxed grid container">
         <div class="six wide column">
             {{form.errors}}
@@ -80,7 +81,6 @@ <h1 class="ui header">{% trans "Pick ingredients" %}</h1>
           <a class="ui labeled icon big button" href="{% url 'delivery:order' %}?delivery_date={{ delivery_date.isoformat }}">
             <i class="chevron left icon"></i>{% trans "Back" %}
           </a>
-          <input type="hidden" name="delivery_date" value="{{ delivery_date.isoformat }}">
           <input class="ui big yellow button confirmingredients {% if not ingredients_changed %}disabled{% endif %}" type="submit" value="{% trans "Confirm all ingredients" %}" name="_update" />
           <a class="ui labeled icon yellow big button nextkitchencount {% if ingredients_changed %}disabled{% endif %}" href="{% url 'delivery:kitchen_count' %}?delivery_date={{ delivery_date.isoformat }}">
             <i class="chevron right icon"></i>{% trans "Next: Print Kitchen Count" %}

souschef/delivery/templates/kitchen_count_steps.html

@@ -3,7 +3,7 @@
 <div class="ui four ordered steps">
   <a class="{% if step == 'orders' %} active{% endif %} step" href="{% url 'delivery:order' %}?delivery_date={{ delivery_date.isoformat }}">
     <div class="content">
-      <div class="title">{% trans 'Generate orders' %}</div>
+      <div class="title">{% trans 'Review orders' %}</div>
       <div class="description">{% trans 'Generate and review orders.' %}</div>
     </div>
   </a>

souschef/delivery/templates/review_orders.html

@@ -16,7 +16,7 @@
 <div class="ui secondary pointing fluid menu">
     <h1 class="ui header">
         {% if delivery_date %}
-            {% trans "Generate and Review orders" %}
+            {% trans "Review orders" %}
         {% else %}
             {% trans "Kitchen Count" %}
         {% endif %}
@@ -95,7 +95,7 @@ <h1 class="ui header">
         <h4 class="ui horizontal divider header">
             <i class="unhide icon"></i>
             {% blocktrans trimmed %}
-                Review order for {{ delivery_date }}
+                Review orders for {{ delivery_date }}
             {% endblocktrans %}
         </h4>
 

souschef/frontend/js/delivery.js

@@ -41,7 +41,8 @@ $(function() {
 
     $('.ui.dropdown.maindish.selection').dropdown('setting', 'onChange', function(value, text, $selectedItem) {
         $url = $(".field.dish.selection").data('url');
-        window.location.replace($url+value);
+        var deliveryDate = $("input[name=delivery_date]").val();
+        window.location.replace($url+value+"?delivery_date="+deliveryDate);
     });
 
     $('.ui.dropdown.mainingredients.selection').dropdown('setting', 'onChange', function(value, text, $selectedItem) {