Merge branch 'release/3.2.2.1'

openlabs · Jan 12, 2015 · ca7ba9b · ca7ba9b
2 parents 2a3502e + c3a2c17
commit ca7ba9b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/setup.py b/setup.py
@@ -125,7 +125,8 @@ def run(self):
     test_loader='trytond.test_loader:Loader',
     tests_require=[
         'pycountry',
-        'openlabs_payment_gateway_authorize_net',
+        'openlabs_payment_gateway_authorize_net  >= %s.%s, < %s.%s' %
+            (major_version, minor_version, major_version, minor_version + 1),
         'cssutils',
     ],
     cmdclass={

diff --git a/templates/webshop/checkout/payment_method.jinja b/templates/webshop/checkout/payment_method.jinja
@@ -86,7 +86,7 @@
                 </div>
               </div>
               <button type="submit" class="btn btn-warning btn-lg btn-block" id="payment-btn">
-                <i class="fa fa-lock"> 
+                <i class="fa fa-lock"></i>
                 {{ _('Pay Now') }}
                 <i class="fa fa-spin fa-spinner hidden"></i>
               </button>
@@ -100,7 +100,7 @@
           <div class="payment-container">
             <h4><span class="underline">{{ _('More Payment methods') }}</span></h4>
             {% for method_id, method_name in payment_form.alternate_payment_method.choices %}
-            <div class="tab-pane fade center" id="method-{{ method_id }}">
+            <div class="tab-pane center" id="method-{{ method_id }}">
               {% set method = PaymentMethod(method_id) %}
               <p><strong><span class="text-success">{{ method.instructions|safe }}</strong></p>
               <form method="post" autocomplete="off">

diff --git a/templates/webshop/search-results.jinja b/templates/webshop/search-results.jinja
@@ -30,6 +30,7 @@
         {% endfor %}
         </ul>
         {% endfor %}
+        <a href="{{ url_for('nereid.website.quick_search', q=request.args.get('q', '')) }}">{% trans %}Clear Filters{% endtrans %}</a>
       </form>
     </div>
   </div>
@@ -87,8 +88,13 @@
 
     <div class="row">
       <div class="col-md-12">
-        <div class="alert alert-warning">
-          {% trans %}Oops! No Products found for your search criteria. Try with something else.{% endtrans %}
+        <div id="not-found" class="alert alert-warning">
+          {% trans %}Oops! No Products found for your search criteria.{% endtrans %}
+          {% if facets %}
+          <br>
+          {% trans %} Try a search without filters, click{% endtrans %}
+          <a href='{{ url_for('nereid.website.quick_search', q=request.args.get('q', '')) }}'>{% trans %}here{% endtrans %}</a>
+          {% endif %}
         </div>
       </div>
     </div>

diff --git a/tryton.cfg b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.2.0
+version=3.2.2.1
 depends:
     nereid
     nereid_cms