[FIX] CMS_STRICT_VARIABLES, see OFFLINE-GmbH#5 + [FIX] missing translation strings

Author: SamBrishes

components/cart/table/entry.htm

@@ -34,7 +34,7 @@
         </div>
     </td>
     <td class="text-right">
-        {% partial __SELF__ ~ '::table/quantitydropdown' product=product %}
+        {% partial 'cart::table/quantitydropdown' product=product %}
     </td>
     <td class="text-right">
         {{ product.price()|raw }}

components/product/addtocart.htm

@@ -9,7 +9,7 @@
         {% endif %}
     </div>
 {% endif %}
-{% if stock > 0 or item.allow_out_of_stock_purchases %}
+{% if stock|default(0) > 0 or item.allow_out_of_stock_purchases %}
     <div class="mall-product__add-to-cart-form">
         <div class="mall-form-control">
             <label for="quantity">{{ 'offline.mall::frontend.quantity'|trans }}</label>

components/product/customfields.htm

@@ -1,5 +1,5 @@
-{% for field in fields %}
-    <div class="mall-product__property mall-product__property--custom-field {{ field.required ? 'is-required' : '' }}">
+{% for field in fields|default([]) %}
+    <div class="mall-product__property mall-product__property--custom-field {{ field.required|default(false) ? 'is-required' : '' }}">
         {% partial __SELF__ ~ '::customfields/' ~ field.type field=field %}
     </div>
 {% endfor %}

components/product/customfields/color.htm

@@ -2,22 +2,20 @@
 <div class="mall-form-control">
     <label for="{{ fieldId }}" class="mall-label">{{ field.name }}</label>
     <div class="mall-field-color-selector">
-        {% if field.custom_field_options.count > 0 %}
+        {% if field.custom_field_options.count|default(0) > 0 %}
             <input type="hidden" id="{{ fieldId }}" name="fields[{{ field.hashId }}]"
                    data-id="{{ item.property.hashId }}"
-                   data-mall-custom-field
-            >
-            {% for option in field.custom_field_options %}
+                   data-mall-custom-field />
+            
+            {% for option in field.custom_field_options|default([]) %}
                 <a class="mall-option-selector" data-target="#{{ fieldId }}" data-value="{{ option.hashId }}">
-                <span style="background: {{ option.option_value }}; width: 20px; height: 20px; display: inline-block;
-                        "></span>
+                    <span style="background: {{ option.option_value }}; width: 20px; height: 20px; display: inline-block;"></span>
                 </a>
             {% endfor %}
         {% else %}
             <input type="color" id="{{ fieldId }}" name="fields[{{ field.hashId }}]"
                    data-id="{{ item.property.hashId }}"
-                   data-mall-custom-field
-            >
+                   data-mall-custom-field />
         {% endif %}
     </div>
     <div data-validate-for="{{ field.hashId }}"></div>

components/product/customfields/dropdown.htm

@@ -5,7 +5,7 @@
             data-id="{{ item.property.hashId }}"
             data-mall-custom-field>
         <option value="">{{ 'offline.mall::frontend.select'|trans }}</option>
-        {% for option in field.custom_field_options %}
+        {% for option in field.custom_field_options|default([]) %}
             <option value="{{ option.hashId }}">{{ option.name }}</option>
         {% endfor %}
     </select>

components/product/customfields/image.htm

@@ -4,7 +4,7 @@
     <input type="hidden" data-mall-custom-field id="{{ fieldId }}" name="fields[{{ field.hashId }}]"
            data-id="{{ item.property.hashId }}">
     <div class="mall-field-image-selector">
-        {% for option in field.custom_field_options %}
+        {% for option in field.custom_field_options|default([]) %}
             <a class="mall-option-selector" data-target="#{{ fieldId }}" data-value="{{ option.hashId }}">
                 <img src="{{ option.image.thumb(90, 90, null) }}" alt=""/>
             </a>

components/product/customfields/text.htm

@@ -3,6 +3,6 @@
     <input type="text" class="mall-input" id="field-{{ field.hashId }}"
            name="fields[{{ field.hashId }}]"
            data-id="{{ item.property.hashId }}"
-           data-mall-custom-field>
+           data-mall-custom-field />
     <div data-validate-for="{{ field.hashId }}"></div>
 </div>

components/product/default.htm

@@ -9,6 +9,6 @@
 
 {% partial __SELF__ ~ '::scripts' %}
 
-{% if __SELF__.dataLayer %}
+{% if dataLayer|default(false) %}
     {% partial __SELF__ ~ '::datalayer' %}
 {% endif %}

components/product/info.htm

@@ -1,6 +1,6 @@
 <h2 class="mall-product__name">{{ item.name }}</h2>
 
-{% if item.description_short %}
+{% if item.description_short|default(null) %}
     <h3 class="mall-product__description-short">{{ item.description_short|nl2br }}</h3>
 {% endif %}
 
@@ -12,6 +12,6 @@ <h3 class="mall-product__description-short">{{ item.description_short|nl2br }}</
 
 {% partial __SELF__ ~ '::images' images=item.all_images %}
 
-{% if __SELF__.showReviews %}
+{% if __SELF__.showReviews|default(false) %}
     {% component 'productReviews' %}
 {% endif %}

components/product/properties/default.htm

@@ -4,11 +4,7 @@
         class="js-mall-property-selector"
         data-mall-property>
     {% for value in item.values %}
-        <option value="{{ value.hashId }}"
-                {% if propertyValue.value == value.value %}
-                    selected
-                {% endif %}
-        >
+        <option value="{{ value.hashId }}" {% if propertyValue.value == value.value %}selected{% endif %}>
             {{ value.display_value|raw }} {{ item.property.unit }}
         </option>
     {% endfor %}