не критичные правки

ShopExpress · Jul 26, 2014 · 83fe505 · 83fe505
1 parent fd0ff72
commit 83fe505
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 12 deletions.
diff --git a/inc/counters.html b/inc/counters.html
@@ -4,6 +4,7 @@
 
 	ga('create', '{$GLOBS.GOOGLECOUNTER}', 'auto');
 	ga('require', 'ecommerce', 'ecommerce.js');
+	ga('require', 'displayfeatures');
 	ga('send', 'pageview');
 	ga('set', '&uid', '{$GLOBS.userdata.login}');
 
@@ -40,11 +41,11 @@
 			if( category_name.length == 0 ) name_category = 'Главная страница';
 			if( product_name.length == 0 ) name_product = $(this).attr('href');
 
-			ga('send', 'event', 'in-cart', 'click', category_name, product_name );
+			ga('send', 'event', 'В корзину', category_name, product_name );
 
 		});
 		$('form.inbasket').click( function(){
-			ga('send', 'event', 'in-cart', 'click', 'Товар', '{$name}' );
+			ga('send', 'event', 'В корзину', 'Страница товара', '{$name}' );
 		});
 	});
 </script>

diff --git a/inc/top.html b/inc/top.html
@@ -22,7 +22,7 @@
 		</div>
 	</nav>
 	{/if}
-	{if $ext_livesearch}	
+	{if $ext_livesearch}
 	<form class="form-search" method="get" action="/search/">
 		<div class="input-append">
 			<input type="text" class="input-medium search-query" name="q" value="{$searchquery}" placeholder="Поиск по сайту" />

diff --git a/inc/topbar.html b/inc/topbar.html
@@ -1,4 +1,4 @@
-{if sizeof($directories_subfolders)>0}
+{if sizeof($directories_subfolders)>0 && empty($directories_filters_query)}
 <div class="categories">
 	<div class="categories-inner">
 		<div class="row-fluid">

diff --git a/mod/basket/mail.html b/mod/basket/mail.html
@@ -137,6 +137,14 @@ <h3 style="font-size:16px;font-family: 'trebuchet ms', geneva;min-width:100px;di
 									{$order_total|price}
 								</td>
 							</tr>
+							{*<tr>
+								<td style="border-collapse: collapse;border: none; font-size:14px;font-family: 'trebuchet ms', geneva;text-align:center;" colspan="7">
+									<p style="font-size:24px;font-family: 'trebuchet ms', geneva;">
+										<a href="http://{$site_host}/basket/?action=showorder&id={$order_id}&oh={$order_hash}" style="display:inline-block;width:410px;line-height:80px;background:#23a9eb;color:white;text-decoration:none;border-radius:5px;border:1px solid #2288cc; background-image: -moz-linear-gradient(top, #27b9f4, #209ae4); background-image: -ms-linear-gradient(top, #27b9f4, #209ae4); background-image: -o-linear-gradient(top, #27b9f4, #209ae4); background-image: -webkit-gradient(linear, center top, center bottom, from(#27b9f4), to(#209ae4)); background-image: -webkit-linear-gradient(top, #27b9f4, #209ae4); background-image: linear-gradient(top, #27b9f4, #209ae4); "> Оплатить заказ</a>
+									</p>
+								</td>
+							</tr>
+							*}
 							<tr>
 								<td style="border-collapse: collapse;border: none; font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;" colspan="7">
 									<p style="font-size:14px;font-family: 'trebuchet ms', geneva;"><a href="http://{$site_host}/basket/?action=showorder&id={$order_id}&oh={$order_hash}">Постоянный адрес заказа</a></p>

diff --git a/mod/productlast.html b/mod/productlast.html
@@ -8,7 +8,7 @@ <h3>{$productlast_name}</h3>
 	{/if}
 	<div class="row-fluid">
 	{foreach from=$productlast_products item="item" key="oid" name=cat}
-		{include file="$TMPL_FOLDER/inc/product-item.html" content=$item.content oid=$oid}
+		{include file="$TMPL_FOLDER/inc/product-item.html" content=$item.content oid=$item.oid}
 		{if $smarty.foreach.cat.iteration % 4 == 0 && $smarty.foreach.cat.iteration!=$smarty.foreach.cat.last}</div><div class="row-fluid">{/if}
 	{/foreach}
 	</div>

diff --git a/mod/productsimilar.html b/mod/productsimilar.html
@@ -8,7 +8,7 @@ <h3>{$productsimilar_name}</h3>
 {/if}
 <div class="row-fluid">
 {foreach from=$productsimilar_products item="item" key="oid" name=cat}
-	{include file="$TMPL_FOLDER/inc/product-item.html" content=$item.content oid=$oid}
+	{include file="$TMPL_FOLDER/inc/product-item.html" content=$item.content oid=$item.oid}
 	{if $smarty.foreach.cat.iteration % 4 == 0 && $smarty.foreach.cat.iteration!=$smarty.foreach.cat.last}</div><div class="row-fluid">{/if}
 {/foreach}
 </div>

diff --git a/ordered.html b/ordered.html
@@ -4,11 +4,13 @@ <h3>{$order_answer|default:'Спасибо,<br /> Ваш вопрос отпра
 <script>
 $(document).ready(function()
 {
+	{if $GLOBS.YACOUNTER && $GLOBS.YACOUNTER|strpos:'Например' !== 0}
 	try { yaCounter{$GLOBS.YACOUNTER}.hit('http://{$GLOBS.SITEHOST}{$vlink}?post'); yaCounter{$GLOBS.YACOUNTER}.reachGoal('PostBackForm'); }
 	catch(e)
 	{
 		//console.log('Счетчик Яндекс.Метрика не установлен.');
 	}
+	{/if}
 });
 </script>
 {else}
@@ -100,11 +102,13 @@ <h3>{$order_answer|default:'Спасибо,<br /> Ваш вопрос отпра
 <script>
 $(document).ready(function()
 {
+	{if $GLOBS.YACOUNTER && $GLOBS.YACOUNTER|strpos:'Например' !== 0}
 	try { yaCounter{$GLOBS.YACOUNTER}.hit('http://{$GLOBS.SITEHOST}{$vlink}'); yaCounter{$GLOBS.YACOUNTER}.reachGoal('OpenBackForm'); }
 	catch(e)
 	{
 		//console.log('Счетчик Яндекс.Метрика не установлен.');
 	}
+	{/if}
 
 	$("input[name*=antispam]").val('{$antispam}');
 	{if $datepicker}

diff --git a/orders/html.html b/orders/html.html
@@ -96,7 +96,7 @@ <h3 align="center">Товарный чек №{$order.order_id} от {$order.cre
 <tr>
 	<td></td>
 	<td colspan=7>Доставка: {if $GLOBS.delivery[$order.delivery]}{$GLOBS.delivery[$order.delivery]}{else}{$order.delivery}{/if}</td>
-    <td nowrap="nowrap">{$order.delivery_price|price:false} {numeral number=$order.delivery_price ends=$GLOBS.allcurrencies[$order.currency].name}</td>
+	<td nowrap="nowrap">{if $order.delivery_price}{$order.delivery_price|price:false} {numeral number=$order.delivery_price ends=$GLOBS.allcurrencies[$order.currency].name}{else}бесплатно{/if}</td>
 </tr>
 {/if}
 </table>

diff --git a/orders/print.html b/orders/print.html
@@ -96,7 +96,7 @@ <h3 align="center">Товарный чек №{$order.order_id} от {$order.cre
 <tr>
 	<td></td>
 	<td colspan=7>Доставка: {if $GLOBS.delivery[$order.delivery]}{$GLOBS.delivery[$order.delivery]}{else}{$order.delivery}{/if}</td>
-    <td nowrap="nowrap">{$order.delivery_price|price:false} {numeral number=$order.delivery_price ends=$GLOBS.allcurrencies[$order.currency].name}</td>
+	<td nowrap="nowrap">{if $order.delivery_price}{$order.delivery_price|price:false} {numeral number=$order.delivery_price ends=$GLOBS.allcurrencies[$order.currency].name}{else}бесплатно{/if}</td>
 </tr>
 {/if}
 </table>

diff --git a/product-blocks/table.html b/product-blocks/table.html
@@ -1,10 +1,10 @@
 {if $vendor || $country || $articul}
 <table class="table table-striped table-hover">
 	<tbody>
-	{if $vendor}<tr><td>Фирма производитель</td><td>{$vendor}</td></tr>{/if}
-	{if $country}<tr><td>Страна производитель</td><td>{$country}</td></tr>{/if}
-	{if $articul}<tr><td>Артикул</td><td>{$articul}</td></tr>{/if}
-	{if $weight}<tr><td>Вес</td><td>{$weight} {numeral number=$weight|price:false ends='грамм,грамма,грамм'}</td></tr>{/if}
+	{if $vendor}<tr><td>{$GLOBS.fieldnames[7]['vendor']}</td><td>{$vendor}</td></tr>{/if}
+	{if $country}<tr><td>{$GLOBS.fieldnames[7]['country']}</td><td>{$country}</td></tr>{/if}
+	{if $articul}<tr><td>{$GLOBS.fieldnames[7]['articul']}</td><td>{$articul}</td></tr>{/if}
+	{if $weight}<tr><td>{$GLOBS.fieldnames[7]['weight']}</td><td>{$weight} {numeral number=$weight|price:false ends='грамм,грамма,грамм'}</td></tr>{/if}
 	</tbody>
 </table>
 {/if}