diff --git a/setup.py b/setup.py index 2ef0bd1..366d648 100644 --- 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 index 1de8bea..2cf8e03 100644 --- a/templates/webshop/checkout/payment_method.jinja +++ b/templates/webshop/checkout/payment_method.jinja @@ -86,7 +86,7 @@ @@ -100,7 +100,7 @@

{{ _('More Payment methods') }}

{% for method_id, method_name in payment_form.alternate_payment_method.choices %} -
+
{% set method = PaymentMethod(method_id) %}

{{ method.instructions|safe }}

diff --git a/templates/webshop/search-results.jinja b/templates/webshop/search-results.jinja index be1c096..6c8ce90 100644 --- a/templates/webshop/search-results.jinja +++ b/templates/webshop/search-results.jinja @@ -30,6 +30,7 @@ {% endfor %} {% endfor %} + {% trans %}Clear Filters{% endtrans %}
@@ -87,8 +88,13 @@
-
- {% trans %}Oops! No Products found for your search criteria. Try with something else.{% endtrans %} +
+ {% trans %}Oops! No Products found for your search criteria.{% endtrans %} + {% if facets %} +
+ {% trans %} Try a search without filters, click{% endtrans %} + {% trans %}here{% endtrans %} + {% endif %}
diff --git a/tryton.cfg b/tryton.cfg index 668f87c..fe9d295 100644 --- 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