Version 2.1

1. Добавлен шаблон email (user_message.tpl) для отправки индивидуального сообщения пользователю. 2. Удалены шаблоны email: test.tpl и test_text.tpl. 3. Добавлен код для отображения текстур вариантов продукта.
JKassa · Aug 29, 2018 · 119caea · 119caea
1 parent 7b34a9b
commit 119caea
Show file tree

Hide file tree

Showing 19 changed files with 79 additions and 15 deletions.
diff --git a/css/style.css b/css/style.css
@@ -179,6 +179,10 @@ del { font-size: 12px; }
 	width: 20px;
     position: relative;
     vertical-align: middle;
+	overflow: hidden;
+}
+.minicolors-swatch img {
+    max-width: none;
 }
 .small > .minicolors-swatch, small > .minicolors-swatch {
 	height: 10px;

diff --git a/emails/order_buyer.tpl b/emails/order_buyer.tpl
@@ -182,7 +182,7 @@
                               <br>
                               {% for variant in product.variants %}
                                 {{ variant.name }}:
-                                {% if variant.type == 'color' %}
+                                {% if variant.type == 'color' or variant.type == 'texture' %}
                                   {{ variant.title }}
                                 {% else %}
                                   {{ variant.value }}

diff --git a/emails/test_text.tpl b/emails/test_text.tpl
diff --git a/emails/test.tpl → emails/user_message.tpl b/emails/test.tpl → emails/user_message.tpl
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
-<title>{{ shop_name }} - Тестовое сообщение</title>
+<title>{{ shop_name }} - {{ subject }}</title>
 <style>
 @media only screen and (max-width: 300px) {
 	.body {
@@ -116,7 +116,7 @@
                 <td class="titleblock" style="border-bottom: 1px solid #e2e7eb; padding: 7px 0" align="center">
                   <font size="2" face="Open-sans, sans-serif" color="#555454">
                     <span class="title" style="font-weight: 500; font-size: 28px; text-transform: uppercase; line-height: 33px">
-                      Здравствуйте, {{ admin_name }}
+                      Здравствуйте, {{ user_name }}
                     </span>
                   </font>
                 </td>
@@ -127,8 +127,7 @@
               <tr>
                 <td class="linkbelow" style="padding: 7px 0">
                   <font size="2" face="Open-sans, sans-serif" color="#555454">
-                    Это <strong>тестовый E-mail</strong> из вашего магазина "{{ shop_name }}".<br />
-                    Если вы можете прочитать его, то тестирование прошло успешно!.
+                    {{ message }}
                   </font>
                 </td>
               </tr>

diff --git a/html/alerts.tpl b/html/alerts.tpl
@@ -33,6 +33,10 @@
 					<span class="minicolors-swatch">
 						<span style="background-color: {{ variant.value }};" title="{{ variant.title }}"></span>
 					</span>
+					{% when 'texture' %}
+					<span class="minicolors-swatch">
+					    <img src="{{ variant.img }}" alt="{{ variant.alt }}" title="{{ variant.title }}">
+					</span>
 					{% when 'select' %}
 					<span>
 						{{ variant.value }}

diff --git a/html/forms/quickorder.tpl b/html/forms/quickorder.tpl
@@ -6,7 +6,7 @@
 
 <div class="row">
 	<div class="col-4 product-image">
-		<img {{ image | img_exists: '104x150' }} alt="{{ alias }}" />
+		<img {{ image | img_exists: '104x150' }} alt="{{ alias }}" class="img-fluid" />
 		{% if present %}
 		<!--Share (Product as a present)-->
 		<div class="share hasTooltip" title="{{ 'tooltipText' | jhtml: present.name, present.desc }}">
@@ -52,6 +52,10 @@
 			<span class="minicolors-swatch">
 				<span style="background-color: {{ variant.value }};" title="{{ variant.text }}"></span>
 			</span>
+			{% when 'texture' %}
+			<span class="minicolors-swatch">
+			    <img src="{{ variant.img }}" alt="{{ variant.alt }}" title="{{ variant.text }}">
+			</span>
 			{% when 'select' %}
 			<span>
 				{{ variant.text }}

diff --git a/html/forms/variants.tpl b/html/forms/variants.tpl
@@ -32,6 +32,15 @@
 			<span style="background-color: {{ attribute.value }};"></span>
 		</label>
 		{% endfor %}
+
+		{% when 'texture' %}
+		<!--Texture switches-->
+		{% for attribute in variant.attributes %}
+		<label class="minicolors-swatch{% if attribute.default %} main{% endif %}" title="{{ attribute.title }}">
+			<input type="radio" data-checked="variant-texture" data-attr-title="{{ attribute.title }}" name="variant-{{ product }}-{{ variant.id }}" value="{{ attribute.value }}"{% if attribute.default %} checked{% endif %}>
+			<img src="{{ attribute.img }}" alt="{{ attribute.alt }}">
+		</label>
+		{% endfor %}
 
 		{% endcase %}
 	</div>

diff --git a/html/forms/waitinglist.tpl b/html/forms/waitinglist.tpl
@@ -6,7 +6,7 @@
 
 <div class="row">
 	<div class="col-4 product-image">
-		<img {{ image | img_exists: '104x150' }} alt="{{ alias }}" />
+		<img {{ image | img_exists: '104x150' }} alt="{{ alias }}" class="img-fluid" />
 		{% if present %}
 		<!--Share (Product as a present)-->
 		<div class="share hasTooltip" title="{{ 'tooltipText' | jhtml: present.name, present.desc }}">
@@ -52,6 +52,10 @@
 			<span class="minicolors-swatch">
 				<span style="background-color: {{ variant.value }};" title="{{ variant.text }}"></span>
 			</span>
+			{% when 'texture' %}
+			<span class="minicolors-swatch">
+				<img src="{{ variant.img }}" alt="{{ variant.alt }}" title="{{ variant.text }}">
+			</span>
 			{% when 'select' %}
 			<span>
 				{{ variant.text }}

diff --git a/html/order/products.tpl b/html/order/products.tpl
@@ -62,6 +62,10 @@
 						<span class="minicolors-swatch">
 							<span style="background-color: {{ variant.value }};" title="{{ variant.title }}"></span>
 						</span>
+						{% when 'texture' %}
+						<span class="minicolors-swatch">
+							<img src="{{ variant.img }}" alt="{{ variant.alt }}" title="{{ variant.title }}">
+						</span>
 						{% when 'select' %}
 						<span>
 							{{ variant.value }}

diff --git a/modules/cart/horizontally.tpl b/modules/cart/horizontally.tpl
@@ -41,6 +41,10 @@
 									<span class="minicolors-swatch">
 										<span style="background-color: {{ variant.value }};" title="{{ variant.title }}"></span>
 									</span>
+								{% when 'texture' %}
+									<span class="minicolors-swatch">
+										<img src="{{ variant.img }}" alt="{{ variant.alt }}" title="{{ variant.title }}">
+									</span>
 								{% when 'select' %}
 									<span>
 										{{ variant.value }}

diff --git a/modules/cart/icon.tpl b/modules/cart/icon.tpl
@@ -46,6 +46,10 @@
 					<span class="minicolors-swatch">
 						<span style="background-color: {{ variant.value }};" title="{{ variant.title }}"></span>
 					</span>
+					{% when 'texture' %}
+					<span class="minicolors-swatch">
+						<img src="{{ variant.img }}" alt="{{ variant.alt }}" title="{{ variant.title }}">
+					</span>
 					{% when 'select' %}
 					<span>
 						{{ variant.value }}

diff --git a/modules/cart/popover.tpl b/modules/cart/popover.tpl
@@ -46,6 +46,10 @@
 					<span class="minicolors-swatch">
 						<span style="background-color: {{ variant.value }};" title="{{ variant.title }}"></span>
 					</span>
+					{% when 'texture' %}
+					<span class="minicolors-swatch">
+						<img src="{{ variant.img }}" alt="{{ variant.alt }}" title="{{ variant.title }}">
+					</span>
 					{% when 'select' %}
 					<span>
 						{{ variant.value }}

diff --git a/modules/cart/vertically.tpl b/modules/cart/vertically.tpl
@@ -73,6 +73,10 @@
 										<span class="minicolors-swatch">
 											<span style="background-color: {{ variant.value }};" title="{{ variant.title }}"></span>
 										</span>
+									{% when 'texture' %}
+										<span class="minicolors-swatch">
+											<img src="{{ variant.img }}" alt="{{ variant.alt }}" title="{{ variant.title }}">
+										</span>
 									{% when 'select' %}
 										<span>
 											{{ variant.value }}

diff --git a/modules/compare/categories.tpl b/modules/compare/categories.tpl
@@ -39,6 +39,10 @@
 									<span class="minicolors-swatch">
 										<span style="background-color: {{ variant.value }};" title="{{ variant.title }}"></span>
 									</span>
+									{% when 'texture' %}
+									<span class="minicolors-swatch">
+										<img src="{{ variant.img }}" alt="{{ variant.alt }}" title="{{ variant.title }}">
+									</span>
 									{% when 'select' %}
 									<span>
 										{{ variant.value }}

diff --git a/modules/wishlist/vertically.tpl b/modules/wishlist/vertically.tpl
@@ -75,6 +75,10 @@
 										<span class="minicolors-swatch">
 											<span style="background-color: {{ variant.value }};" title="{{ variant.title }}"></span>
 										</span>
+									{% when 'texture' %}
+										<span class="minicolors-swatch">
+											<img src="{{ variant.img }}" alt="{{ variant.alt }}" title="{{ variant.title }}">
+										</span>
 									{% when 'select' %}
 										<span>
 											{{ variant.value }}

diff --git a/views/cart/default.tpl b/views/cart/default.tpl
@@ -128,6 +128,10 @@
 			<span class="minicolors-swatch">
 				<span style="background-color: {{ variant.value }};" title="{{ variant.title }}"></span>
 			</span>
+			{% when 'texture' %}
+			<span class="minicolors-swatch">
+				<img src="{{ variant.img }}" alt="{{ variant.alt }}" title="{{ variant.title }}">
+			</span>
 			{% when 'select' %}
 			<span>
 				{{ variant.value }}

diff --git a/views/compare/default.tpl b/views/compare/default.tpl
@@ -50,6 +50,10 @@
 						<span class="minicolors-swatch">
 							<span style="background-color: {{ variant.value }};" title="{{ variant.title }}"></span>
 						</span>
+						{% when 'texture' %}
+						<span class="minicolors-swatch">
+							<img src="{{ variant.img }}" alt="{{ variant.alt }}" title="{{ variant.title }}">
+						</span>
 						{% when 'select' %}
 						<span>
 							{{ variant.value }}
@@ -181,6 +185,10 @@
 						<span class="minicolors-swatch">
 							<span style="background-color: {{ variant.value }}" title="{{ variant.title }}"></span>
 						</span>
+						{% when 'texture' %}
+						<span class="minicolors-swatch">
+							<img src="{{ variant.img }}" alt="{{ variant.alt }}" title="{{ variant.title }}">
+						</span>
 						{% when 'select' %}
 						<span>
 							{{ variant.value }}

diff --git a/views/order/order.tpl b/views/order/order.tpl
@@ -71,6 +71,10 @@
 										<span class="minicolors-swatch">
 											<span style="background-color: {{ variant.value }};" title="{{ variant.title }}"></span>
 										</span>
+									{% when 'texture' %}
+										<span class="minicolors-swatch">
+											<img src="{{ variant.img }}" alt="{{ variant.alt }}" title="{{ variant.title }}">
+										</span>
 									{% when 'select' %}
 										<span>
 											{{ variant.value }}

diff --git a/views/wishlist/default.tpl b/views/wishlist/default.tpl
@@ -194,6 +194,10 @@
 									<span class="minicolors-swatch">
 										<span style="background-color: {{ variant.value }}" title="{{ variant.title }}"></span>
 									</span>
+									{% when 'texture' %}
+									<span class="minicolors-swatch">
+										<img src="{{ variant.img }}" alt="{{ variant.alt }}" title="{{ variant.title }}">
+									</span>
 									{% when 'select' %}
 									<span>
 										{{ variant.value }}