Updating the latest 2.0 templates.

FoxyCart · Jan 16, 2017 · 0055db5 · 0055db5
1 parent 6151aa8
commit 0055db5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/checkout.inc.twig b/checkout.inc.twig
@@ -61,8 +61,6 @@ CONVENTIONS:
 
 
     <form method="post" class="fc-checkout__main__form" data-fc-id="checkout-form" action="https://{{ config.store_domain }}/checkout" role="form">
-        {# A trap to catch webkit's overagressive autofill. #}
-        <div style="position: absolute; top: -800px; left: -1000px; opacity: 0;"><input type="text" name="email_dummy" data-fc-dummy tabindex="-1"/><input type="password" name="password_dummy" data-fc-dummy tabindex="-1"/></div>
 
         <div data-fc-id="required-hidden-fields">
         {% block required_hidden_fields %}
@@ -97,6 +95,9 @@ CONVENTIONS:
     <fieldset id="fc-email">
         <legend><span class="fc-section-counter"></span> {{ config.lang.checkout_email|raw }}</legend>
 
+        {# A trap to catch webkit's overagressive autofill. #}
+        <div style="position:absolute; height:0px; width:0px; overflow:hidden; opacity:0; top:0px; left:0px;"><input type="text" name="email_dummy" data-fc-dummy tabindex="-1"/><input type="password" name="password_dummy" data-fc-dummy tabindex="-1"/></div>
+
         {# logic for setting the wrapper class regarding alerts, if one is needed #}
         {% if email_is_checking %}
             {% set message_class = 'fc-alert-container--info' %}

diff --git a/default_templates/email.txt.twig b/default_templates/email.txt.twig
@@ -55,6 +55,7 @@
 
 
 {% endif %} {# has downloads #}
+{% if is_subscription_dunning_reminder == false %}
 {{ config.lang.email_text_order_summary|pad(60,"-"," ")|raw }}
 
   * {{ config.lang.checkout_merchant|pad(20)|raw }} {{ config.store_name }}
@@ -78,6 +79,7 @@
 {% endif %}
 {% endfor %}
 {% endif %} {# has custom fields #}
+{% endif %} {# not dunning reminder email #}
 {% endif %} {# is not update info #}
 
 

diff --git a/default_templates/responsive.email.twig b/default_templates/responsive.email.twig
@@ -208,6 +208,7 @@
                                             {% endif %}
                                             <!-- /DOWNLOADABLES -->
 
+                                            {% if is_subscription_dunning_reminder == false %}
                                             <!-- ORDER SUMMARY -->
                                             <table cellspacing="0" cellpadding="0" id="fc-order-summary" style="margin: 0;padding: 0;font-family: Verdana, Helvetica, Arial, sans-serif;width: 100%;margin-bottom: 20px;">
                                                 <tr style="margin: 0;padding: 0;font-family: Verdana, Helvetica, Arial, sans-serif;">
@@ -281,6 +282,7 @@
                                                 </tr>
                                             </table>
                                             <!-- /ORDER SUMMARY -->
+                                            {% endif %}
 
                                             <!-- BILLING INFORMATION -->
                                             <table cellspacing="0" cellpadding="0" align="left" class="fc-column" id="fc-billing-information" style="margin: 0;padding: 0;font-family: Verdana, Helvetica, Arial, sans-serif;width: 50%;float: left;">

diff --git a/utils.inc.twig b/utils.inc.twig
@@ -34,7 +34,7 @@
                     value="{{ rate.service_id }}"
                     class="fc-form-control--shipping-rate"
                     {{ checked(rate.service_id, address.shipping_service_id) }}
-                /><div class="fc-shipping-rates__rate__name">{{ rate.method }} {{ rate.service_name }}</div>
+                /><div class="fc-shipping-rates__rate__name">{{ rate.method|raw }} {{ rate.service_name|raw }}</div>
                 <div class="fc-shipping-rates__rate__value">{{ rate.price|money_format }}</div>
             </label>
         </div>