Permalink
Browse files

Кнопки оплат и шаблон письма

  • Loading branch information...
1 parent fbf4063 commit 0c4bbb47317a71cd1b675b86389dd61e1f81ace5 @gz0t gz0t committed Sep 5, 2013
View
@@ -14,7 +14,7 @@
{include file="$TMPL_FOLDER/mod/anounces.html"}
{if sizeof($directories_pubs)>0}
<div class="products">
- {include file="$TMPL_FOLDER/mod/paging.html" pagekey="page" pages=$directories_paging page=$directories_current perpage=$directories_perpage}
+ {include file="$TMPL_FOLDER/mod/paging.html" pagekey="page" pages=$directories_paging page=$directories_current perpage=$directories_perpage total=$directories_total}
<div class="row-fluid">
{foreach from=$directories_pubs item="item" name="cat"}
{include file="$TMPL_FOLDER/inc/product-item.html" content=$item.content oid=$item.oid}
View
@@ -8,16 +8,19 @@
<div class="row-fluid">
<div class="span5">
<p>{$GLOBS.COPYRIGHT} &mdash; {$GLOBS.SITENAME}<br />
-
+ {if $vpath neq '/'}<!--noindex-->{/if}
{if $GLOBS.SE_COPYRIGHT eq '1'}
- <a href="http://shopexpress.difocus.ru" target="_blank">ShopExpress &mdash; cоздание интернет-магазинов</a>
+ <a href="http://shopexpress.difocus.ru" target="_blank" {if $vpath neq '/'}rel="nofollow"{/if}>ShopExpress &mdash; cоздание интернет-магазинов</a>
{else if $GLOBS.SE_COPYRIGHT eq '2'}
- <a href="http://www.difocus.ru" target="_blank">Создание сайта &mdash; Difocus</a>
+ <a href="http://www.difocus.ru" target="_blank" {if $vpath neq '/'}rel="nofollow"{/if}>Создание сайта &mdash; Difocus</a>
{else if $GLOBS.SE_COPYRIGHT eq '3'}
- <a href="http://shopexpress.difocus.ru" target="_blank">Интернет-магазин от ShopExpress</a>
+ <a href="http://shopexpress.difocus.ru" target="_blank" {if $vpath neq '/'}rel="nofollow"{/if}>Интернет-магазин от ShopExpress</a>
+ {else if $GLOBS.SE_COPYRIGHT eq '4'}
+ <a href="http://shopexpress.difocus.ru" target="_blank" {if $vpath neq '/'}rel="nofollow"{/if}>ShopExpress &mdash; cоздание интернет-магазинов</a>
{else}
- <a href="http://shopexpress.difocus.ru" target="_blank">ShopExpress &mdash; cоздание интернет-магазинов</a>
+ <a href="http://shopexpress.difocus.ru" target="_blank" {if $vpath neq '/'}rel="nofollow"{/if}>ShopExpress &mdash; аренда интернет-магазина</a>
{/if}
+ {if $vpath neq '/'}<!--/noindex-->{/if}
</p>
</div>
<div class="span3">
@@ -20,11 +20,11 @@ <h3><a href="{$item.vlink}">{$item.content.name}</a> <sup class="badge badge-suc
</p>
{/if}
</td>
- <td class="nowrap"><span class="count">{$item.count}</span> {numeral number=$item.count ends=$item.content.units|default:'шт.,шт.,шт.'}</td>
+ <td class="nowrap"><span class="count" data-ends="{$item.content.units|default:'шт.,шт.,шт.'}">{$item.count}</span> {numeral number=$item.count ends=$item.content.units|default:'шт.,шт.,шт.'}</td>
<!--td>{if $item.content.oldprice}<span class="oldprice">{$item.content.oldprice|price:false}</span>{$GLOBS.currency.shortname}{else}&mdash;{/if}</td-->
<!--td>{if $item.content.discount}{$item.content.discount}%{else}&mdash;{/if}</td-->
<td class="nowrap">
- <span class="price" data-oldprice="{$item.content.oldprice}" data-price="{$item.content.price}" data-discount="{$item.content.discount.percent|default:0}" {if $item.content.discount.type eq 'ONCE'}data-productdiscount="{$item.content.discount.percent|default:0}" {/if}>
+ <span class="price" data-oldprice="{$item.content.oldprice}" data-price="{$item.content.price}" data-discount="{$item.content.discount.percent|default:0}" {if $item.content.discount.type eq 'ONCE'}data-productdiscount="{$item.content.discount.percent|default:0}"{/if}>
{$item.content.price|price:false}
</span>{$GLOBS.currency.shortname}
</td>
View
@@ -1,14 +1,14 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>Заказ №{$onumber} в {$GLOBS.SITENAME}</title>
+<title>Заказ №{$order_id} в {$GLOBS.SITENAME}</title>
</head>
<body leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0" style="-webkit-text-size-adjust: none;margin: 0;padding: 0;background-color: #FAFAFA;width: 100% !important;">
<center>
<table border="0" cellpadding="10" cellspacing="0" height="100%" width="100%" id="backgroundTable" style="margin: 0;padding: 0;background-color: #FAFAFA;height: 100% !important;width: 100% !important;">
<tr>
<td align="center" valign="top" style="border-collapse: collapse;">
<!-- // Begin Template Preheader \\ -->
- <h1 style="font-family: 'trebuchet ms', geneva;font-size:24px;text-align:left;">Номер вашего заказа <u>№{$onumber}</u></h1>
+ <h1 style="font-family: 'trebuchet ms', geneva;font-size:24px;text-align:left;">Номер вашего заказа <u>№{$order_id}</u></h1>
<p style="font-family: 'trebuchet ms', geneva;font-size:18px;text-align:left;">Мы всегда рады ответить на ваши вопросы по телефону<b> {$GLOBS.PHONE}</b>.</p>
<table cellpadding="10" cellspacing="0" border="0" width=100% style="background-color: #FAFAFA;border: 0px solid #DDDDDD;">
@@ -40,9 +40,9 @@ <h3 style="font-size:16px;font-family: 'trebuchet ms', geneva;"><a href="http://
{/if}
<p>{$item.content.annotate}</p>
</td>
- <td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{$item.count} {$item.content.units|default:'шт.'}</td>
+ <td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{$item.count} {numeral number=$item.count ends=$item.content.units|default:'шт.,шт.,шт.'}</td>
<td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{if $item.content.oldprice} {$item.content.oldprice|price}{else}&mdash;{/if}</td>
- <td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{if $item.content.discount}{$item.content.discount}%{else}&mdash;{/if}</td>
+ <td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{if $item.content.discount}{$item.content.discount.percent}%{else}&mdash;{/if}</td>
<td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{$item.content.price|price}</td>
<td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{if $item.content.oldprice}{($item.content.oldprice*$item.count)|price}{else}&mdash;{/if}</td>
<td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{($item.content.price*$item.count)|price}</td>
@@ -56,7 +56,7 @@ <h1 style="font-family: 'trebuchet ms', geneva;font-size:24px;">Итого {$ord
{if $oldtotal!=$total}<small>Сумма без скидки: {$oldtotal|price}</small><br />{/if}
{if $order_delivery}{$order_delivery['name']}{if $order_delivery.price} : {$order_delivery.price|price}{/if}<br />{/if}
</p>
- <p style="font-size:14px;font-family: 'trebuchet ms', geneva;"><a href="http://{$site_host}/basket/?action=showorder&id={$onumber}&oh={$order_hash}">Постоянный адрес заказа</a></p>
+ <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>
</blockquote>
</td>
</tr>
@@ -1,14 +1,14 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>Заказ №{$onumber} в {$GLOBS.SITENAME}</title>
+<title>Заказ №{$order_id} в {$GLOBS.SITENAME}</title>
</head>
<body leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0" style="-webkit-text-size-adjust: none;margin: 0;padding: 0;background-color: #FAFAFA;width: 100% !important;">
<center>
<table border="0" cellpadding="10" cellspacing="0" height="100%" width="100%" id="backgroundTable" style="margin: 0;padding: 0;background-color: #FAFAFA;height: 100% !important;width: 100% !important;">
<tr>
<td align="center" valign="top" style="border-collapse: collapse;">
<!-- // Begin Template Preheader \\ -->
- <h1 style="font-family: 'trebuchet ms', geneva;font-size:24px;text-align:left;">Номер заказа №{$onumber}</h1>
+ <h1 style="font-family: 'trebuchet ms', geneva;font-size:24px;text-align:left;">Номер заказа №{$order_id}</h1>
<h3 style="font-family: 'trebuchet ms', geneva;font-size:18px;text-align:left;">Контактные данные</h3>
<p style="font-family: 'trebuchet ms', geneva;font-size:14px;text-align:left;">{if $order_content.fio}ФИО: {$order_content.fio}<br />{/if}
{*$order_content.currency*}
@@ -48,9 +48,9 @@ <h3 style="font-size:16px;font-family: 'trebuchet ms', geneva;"><a href="http://
{/if}
<p>{$item.content.annotate}</p>
</td>
- <td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{$item.count} {$item.content.units|default:'шт.'}</td>
+ <td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{$item.count} {numeral number=$item.count ends=$item.content.units|default:'шт.,шт.,шт.'}</td>
<td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{if $item.content.oldprice} {$item.content.oldprice|price}{else}&mdash;{/if}</td>
- <td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{if $item.content.discount}{$item.content.discount}%{else}&mdash;{/if}</td>
+ <td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{if $item.content.discount}{$item.content.discount.percent}%{else}&mdash;{/if}</td>
<td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{$item.content.price|price}</td>
<td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{if $item.content.oldprice}{($item.content.oldprice*$item.count)|price}{else}&mdash;{/if}</td>
<td nowrap="nowrap" style="border-collapse: collapse;border-bottom: 1px solid #DDDDDD;border-right: 1px solid #DDDDDD;font-size:14px;font-family: 'trebuchet ms', geneva;text-align:right;">{($item.content.price*$item.count)|price}</td>
@@ -64,7 +64,7 @@ <h1 style="font-family: 'trebuchet ms', geneva;font-size:24px;">Итого {$ord
{if $oldtotal!=$total}<small>Сумма без скидки: {$oldtotal|price}</small><br />{/if}
{if $order_delivery}{$order_delivery['name']}{if $order_delivery.price} : {$order_delivery.price|price}{/if}<br />{/if}
</p>
- <p style="font-size:14px;font-family: 'trebuchet ms', geneva;"><a href="http://{$site_host}/basket/?action=showorder&id={$onumber}&oh={$order_hash}">Постоянный адрес заказа</a></p>
+ <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>
{if sizeof($order_fields)>0}
<h1 style="font-family: 'trebuchet ms', geneva;font-size:24px;text-align:left;">Дополнительные данные</h1>
<p style="font-size:14px;font-family: 'trebuchet ms', geneva;">{foreach from=$order_fields item=item key=key}<b>{$item.runame}: </b> {$item.value} <br />{/foreach}</p>
View
@@ -11,7 +11,7 @@
</div>
<article style="margin-top:15px;">
<div class="hero-unit">
- <h1>Номер вашего заказа <u>{$onumber}</u></h1>
+ <h1>Номер вашего заказа <u>{$order_id}</u></h1>
<p>
{*if $order_content.pay_status eq 'FP'}<span class="badge badge-success" style="vertical-align: super;">Оплачен</span>{else if $order_content.pay_status eq 'HP'}<span class="badge badge-warning" style="vertical-align: super;">Оплачен не полностью</span>{/if*}
Сумма вашего заказа составила <b>{$order_total|price}</b>, спасибо, что выбрали наш магазин.
@@ -21,16 +21,17 @@ <h1>Номер вашего заказа <u>{$onumber}</u></h1>
Историю заказов можно посмотреть в <a href="/cabinet/history.html">личном кабинете</a>.
{/if}
</p>
- <p class="pull-right"><a href="/basket/?action=showorder&id={$onumber}&oh={$order_hash}"><small>Постоянный адрес заказа №{$onumber}</small></a></p>
+ <p class="pull-right"><a href="/basket/?action=showorder&id={$order_id}&oh={$order_hash}"><small>Постоянный адрес заказа №{$order_id}</small></a></p>
</div>
- {if $GLOBS.merchants}
- {if !$order_content.pay_status || $order_content.pay_status eq 'S'}
- <h1>Оплатите ваши покупки</h1>
- <section>{include file="$TMPL_FOLDER/mod/merchants/merchant.html" summ=$order_total order_id=$onumber currency=$GLOBS.allcurrencies[$order_content.currency]}</section>
- {else if $order_content.pay_status eq 'HP'}
- <h1>Заказ оплачен не полностью</h1>
- <section>{include file="$TMPL_FOLDER/mod/merchants/merchant.html" summ=($order_total-$order_content.paid) order_id=$onumber currency=$GLOBS.allcurrencies[$order_content.currency]}</section>
- {/if}
+
+ {if $GLOBS.merchants && $order_content.pay_status neq 'FP' && $order_content.pay_method eq 'NON'}
+ {if $order_content.pay_status eq 'HP'}
+ <h1>Заказ оплачен не полностью</h1>
+ {else}
+ <h1>Оплатите ваши покупки</h1>
+ {/if}
+
+ <section>{include file="$TMPL_FOLDER/mod/merchants/merchant.html" shipping_price=$order_content.delivery_price summ=$order_total order_id=$order_id currency=$GLOBS.allcurrencies[$order_content.currency]}</section>
{/if}
<div class="page-header">
@@ -71,12 +72,12 @@ <h5><a href="{$item.vlink}">{$item.content.name}</a></h5>
}
</script>
<form class="form-horizontal" action="/basket/?action=duplicate" method="post">
- <input name="order_id" type="hidden" value="{$onumber}" />
+ <input name="order_id" type="hidden" value="{$order_id}" />
<input name="oh" type="hidden" value="{$order_hash}" />
<fieldset>
<div class="form-actions">
<span class="help-inline">{$orderduplicate}</span>
- <button type="submit" class="btn btn-primary" onclick="duplicateOrder('{$onumber}', '{$order_hash}');return false;">Повторить заказ</button>
+ <button type="submit" class="btn btn-primary" onclick="duplicateOrder('{$order_id}', '{$order_hash}');return false;">Повторить заказ</button>
</div>
</fieldset>
</form>
@@ -14,11 +14,14 @@
return false;
}
</script>
-{foreach from=$cabinetbaskethistory_orders item=order key=order_key}
+{include file="$TMPL_FOLDER/mod/paging.html" pagekey="page" pages=$cabinetbaskethistory_paging page=$cabinetbaskethistory_current perpage=$cabinetbaskethistory_perpage total=$cabinetbaskethistory_total}
+
+{foreach from=$cabinetbaskethistory_orders item=order key=order_id}
+{assign var=order_hash value=$order.hash}
<hr />
-<a name="order_id_{$order_key}"></a>
+<a name="order_id_{$order_id}"></a>
<p>
- <big><b>Заказ №{$order_key}</b></big> от <em>{$order.content.created|date_format:"%d %B %Y"}</em>,
+ <big><b>Заказ №{$order_id}</b></big> от <em>{$order.content.created|date_format:"%d %B %Y"}</em>,
на сумму <b>{$order.content.summ|price:false} {numeral number=$order.content.summ ends=$GLOBS.allcurrencies[$order.content.currency].name}</b>
{if $GLOBS.order_status[$order.content.status]}
<span class="badge
@@ -40,16 +43,12 @@
{if $order.content.pay_status eq 'FP'}badge-success{/if}
">{$GLOBS.pay_status[$order.content.pay_status]}</span>
{/if}
- &mdash; <a onclick="duplicateOrder('{$order_key}', '{$order.hash}');return false;" href="/basket/?action=duplicate&order_id={$order_key}&oh={$order.hash}"><small>Повторить заказ</small></a>
+ &mdash; <a onclick="duplicateOrder('{$order_id}', '{$order.hash}');return false;" href="/basket/?action=duplicate&order_id={$order_id}&oh={$order.hash}"><small>Повторить заказ</small></a>
</p>
-{if $GLOBS.merchants}
-<p>
-{if $order.content.pay_status neq 'FP'}
-{include file="$TMPL_FOLDER/mod/merchants/merchant.html" summ=$order.content.summ order_id=$order_key currency=$GLOBS.allcurrencies[$order.content.currency]}
+{if $GLOBS.merchants && $order.content.pay_status neq 'FP' && $order.content.pay_method eq 'NON'}
+<p>{include file="$TMPL_FOLDER/mod/merchants/merchant.html" shipping_price=$order.content.delivery_price basketdata=$order.goods summ=$order.content.summ order_id=$order_id currency=$GLOBS.allcurrencies[$order.content.currency]}</p>
{/if}
-</p>
-{/if}
-<!--a href="/basket/?action=showorder&id={$order_key}&oh={$order.hash}"><small>Постоянный адрес заказа</small></a-->
+<!--a href="/basket/?action=showorder&id={$order_id}&oh={$order.hash}"><small>Постоянный адрес заказа</small></a-->
<table class="table table-striped">
<thead>
<tr>
@@ -74,7 +73,7 @@
<td>{$product.content.articul}</td>
<td>
<a class="thumbnail" href="{$product.content.vlink}">
- {foreach from=$product.content.images item="im"}<img src="/{image src=$im.path width=40 height=40 folder=".40x40"}" alt="{$im.name}">{break}{/foreach}
+ {foreach from=$product.content.images item="im"}<img src="/{image src=$im.path width=40 height=40 folder=".40x40"}" width=40 height=40 alt="{$im.name}">{break}{/foreach}
</a>
</td>
<td>
@@ -111,8 +110,8 @@
{/foreach}
</tbody>
</table>
-
{/foreach}
+{include file="$TMPL_FOLDER/mod/paging.html" pagekey="page" pages=$cabinetbaskethistory_paging page=$cabinetbaskethistory_current perpage=$cabinetbaskethistory_perpage total=$cabinetbaskethistory_total}
{else}
<p>Пока, вы не сделали ни одного заказа.</p>
{/if}
Oops, something went wrong.

0 comments on commit 0c4bbb4

Please sign in to comment.