Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Conflicts: themes/default-bootstrap/js/products-comparison.js
This commit is contained in:
Kevin Granger
@@ -435,6 +435,7 @@ class FrontControllerCore extends Controller
|
||||
$this->context->smarty->assign(array(
|
||||
'HOOK_HEADER' => Hook::exec('displayHeader'),
|
||||
'HOOK_TOP' => Hook::exec('displayTop'),
|
||||
'HOOK_TOP_COLUMN' => ($this->display_column_left ? Hook::exec('displayTopColumn') : ''),
|
||||
'HOOK_LEFT_COLUMN' => ($this->display_column_left ? Hook::exec('displayLeftColumn') : ''),
|
||||
'HOOK_RIGHT_COLUMN' => ($this->display_column_right ? Hook::exec('displayRightColumn', array('cart' => $this->context->cart)) : ''),
|
||||
));
|
||||
|
||||
@@ -517,6 +517,9 @@ class AdminImportControllerCore extends AdminController
|
||||
.'template'))
|
||||
$bo_theme = 'default';
|
||||
|
||||
// We need to set parent media first, so that jQuery is loaded before the dependant plugins
|
||||
parent::setMedia();
|
||||
|
||||
$this->addJs(__PS_BASE_URI__.$admin_webpath.'/themes/'.$bo_theme.'/js/vendor/jquery.ui.widget.js');
|
||||
$this->addJs(__PS_BASE_URI__.$admin_webpath.'/themes/'.$bo_theme.'/js/jquery.iframe-transport.js');
|
||||
$this->addJs(__PS_BASE_URI__.$admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload.js');
|
||||
@@ -524,8 +527,6 @@ class AdminImportControllerCore extends AdminController
|
||||
$this->addJs(__PS_BASE_URI__.$admin_webpath.'/themes/'.$bo_theme.'/js/jquery.fileupload-validate.js');
|
||||
$this->addJs(__PS_BASE_URI__.'js/vendor/spin.js');
|
||||
$this->addJs(__PS_BASE_URI__.'js/vendor/ladda.js');
|
||||
|
||||
return parent::setMedia();
|
||||
}
|
||||
|
||||
public function renderForm()
|
||||
|
||||
@@ -279,6 +279,9 @@
|
||||
</hook>
|
||||
<hook id="displayHomeTabContent" live_edit="1">
|
||||
<name>displayHomeTabContent</name><title>Home Page Tabs Content</title><description>This hook displays new elements on the homepage tabs content</description>
|
||||
</hook>
|
||||
<hook id="displayTopColumn" live_edit="1">
|
||||
<name>displayTopColumn</name><title>Top column blocks</title><description>This hook displays new elements in the top of columns</description>
|
||||
</hook>
|
||||
<hook id="displayBackOfficeCategory" live_edit="0">
|
||||
<name>displayBackOfficeCategory</name><title>Display new elements in the Back Office, tab AdminCategories</title><description>This hook launches modules when the AdminCategories tab is displayed in the Back Office</description>
|
||||
|
||||
@@ -4,13 +4,11 @@
|
||||
* To change the color scheme of slider change each
|
||||
* background property for each of the five styles below
|
||||
*/
|
||||
|
||||
.bx-window {margin-bottom:20px;}
|
||||
.bx-wrapper {
|
||||
margin-bottom:20px;
|
||||
height:300px
|
||||
}
|
||||
|
||||
/*next button*/
|
||||
.bx-next {
|
||||
display:none;
|
||||
@@ -21,11 +19,9 @@
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
text-indent: -999999px;
|
||||
background: url(gray_next.png) no-repeat 0 -30px;
|
||||
background: url(../images/gray_next.png) no-repeat 0 -30px;
|
||||
}
|
||||
|
||||
/*previous button*/
|
||||
|
||||
.bx-prev {
|
||||
display:none;
|
||||
position:absolute;
|
||||
@@ -35,9 +31,8 @@
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
text-indent: -999999px;
|
||||
background: url(gray_prev.png) no-repeat 0 -30px;
|
||||
background: url(../images/gray_prev.png) no-repeat 0 -30px;
|
||||
}
|
||||
|
||||
/*pager links*/
|
||||
.bx-pager {
|
||||
position: absolute;
|
||||
@@ -60,20 +55,17 @@
|
||||
font-size: 11px;
|
||||
color:#000;
|
||||
text-decoration:none;
|
||||
background:url(gray_pager.png) no-repeat 0 -20px;
|
||||
background:url(../images/gray_pager.png) no-repeat 0 -20px;
|
||||
}
|
||||
|
||||
/*
|
||||
* End color scheme styles
|
||||
*/
|
||||
|
||||
|
||||
/*next/prev button hover state*/
|
||||
.bx-next:hover,
|
||||
.bx-prev:hover {
|
||||
background-position: 0 0;
|
||||
}
|
||||
|
||||
/*pager links hover and active states*/
|
||||
.bx-pager .pager-active,
|
||||
.bx-pager a:hover {
|
||||
@@ -81,7 +73,6 @@
|
||||
text-decoration:none;
|
||||
background-position: 0 0;
|
||||
}
|
||||
|
||||
/*captions*/
|
||||
.bx-captions {
|
||||
text-align:center;
|
||||
@@ -89,14 +80,12 @@
|
||||
padding: 7px 0;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
/*auto controls*/
|
||||
.bx-auto {
|
||||
text-align: center;
|
||||
padding-top: 15px;
|
||||
}
|
||||
|
||||
.bx-auto a {
|
||||
color: #666;
|
||||
font-size: 12px;
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
<module>
|
||||
<name>homeslider</name>
|
||||
<displayName><![CDATA[Image slider for your homepage.]]></displayName>
|
||||
<version><![CDATA[1.2.2]]></version>
|
||||
<version><![CDATA[1.2.3]]></version>
|
||||
<description><![CDATA[Adds an image slider to your homepage.]]></description>
|
||||
<author><![CDATA[PrestaShop]]></author>
|
||||
<tab><![CDATA[front_office_features]]></tab>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
/**
|
||||
* @since 1.5.0
|
||||
* @version 1.2 (2012-03-14)
|
||||
* @version 1.3 (2012-03-14)
|
||||
*/
|
||||
|
||||
if (!defined('_PS_VERSION_'))
|
||||
@@ -42,7 +42,7 @@ class HomeSlider extends Module
|
||||
{
|
||||
$this->name = 'homeslider';
|
||||
$this->tab = 'front_office_features';
|
||||
$this->version = '1.2.2';
|
||||
$this->version = '1.2.3';
|
||||
$this->author = 'PrestaShop';
|
||||
$this->need_instance = 0;
|
||||
$this->secure_key = Tools::encrypt($this->name);
|
||||
@@ -60,7 +60,7 @@ class HomeSlider extends Module
|
||||
public function install()
|
||||
{
|
||||
/* Adds Module */
|
||||
if (parent::install() && $this->registerHook('displayTop') && $this->registerHook('actionShopDataDuplication'))
|
||||
if (parent::install() && $this->registerHook('displayTopColumn') && $this->registerHook('actionShopDataDuplication'))
|
||||
{
|
||||
/* Sets up configuration */
|
||||
$res = Configuration::updateValue('HOMESLIDER_WIDTH', '779');
|
||||
@@ -660,18 +660,17 @@ class HomeSlider extends Module
|
||||
return true;
|
||||
}
|
||||
|
||||
public function hookDisplayTop()
|
||||
public function hookdisplayTopColumn()
|
||||
{
|
||||
if(!$this->_prepareHook())
|
||||
return;
|
||||
|
||||
// Check if not a mobile theme
|
||||
if ($this->context->getMobileDevice() != false)
|
||||
if ($this->context->smarty->tpl_vars['page_name'] != 'index' || $this->context->getMobileDevice() != false)
|
||||
return false;
|
||||
|
||||
if(!$this->_prepareHook())
|
||||
return false;
|
||||
$this->context->controller->addJS($this->_path.'js/jquery.bxSlider.min.js');
|
||||
$this->context->controller->addCSS($this->_path.'bx_styles.css');
|
||||
$this->context->controller->addJS($this->_path.'js/homeslider.js');
|
||||
|
||||
return $this->display(__FILE__, 'homeslider.tpl', $this->getCacheId());
|
||||
}
|
||||
|
||||
|
||||
@@ -23,34 +23,37 @@
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
|
||||
{if $page_name =='index'}
|
||||
<!-- Module HomeSlider -->
|
||||
{if isset($homeslider_slides)}
|
||||
<div id="homepage-slider">
|
||||
<ul id="homeslider">
|
||||
{foreach from=$homeslider_slides item=slide}
|
||||
{if $slide.active}
|
||||
<li>
|
||||
<a href="{$slide.url|escape:'html':'UTF-8'}" title="{$slide.description|escape:'html':'UTF-8'}">
|
||||
<img src="{$smarty.const._MODULE_DIR_}homeslider/images/{$slide.image|escape:'html':'UTF-8'}" alt="{$slide.legend|escape:'html':'UTF-8'}" />
|
||||
</a>
|
||||
</li>
|
||||
{/if}
|
||||
{/foreach}
|
||||
</ul>
|
||||
</div>
|
||||
{if isset($homeslider)}
|
||||
<script type="text/javascript">
|
||||
{if isset($homeslider_slides) && $homeslider_slides|@count > 1}
|
||||
{if $homeslider.loop == 1}
|
||||
var homeslider_loop = true;
|
||||
{else}
|
||||
var homeslider_loop = false;
|
||||
{/if}
|
||||
{if $homeslider_slides|@count > 1}
|
||||
{if $homeslider.loop == 1}
|
||||
var homeslider_loop = true;
|
||||
{else}
|
||||
var homeslider_loop = false;
|
||||
{/if}
|
||||
var homeslider_speed = {$homeslider.speed};
|
||||
var homeslider_pause = {$homeslider.pause};
|
||||
{else}
|
||||
var homeslider_loop = false;
|
||||
{/if}
|
||||
var homeslider_speed = {$homeslider.speed};
|
||||
var homeslider_pause = {$homeslider.pause};
|
||||
</script>
|
||||
{/if}
|
||||
{if isset($homeslider_slides)}
|
||||
<ul id="homeslider">
|
||||
{foreach from=$homeslider_slides item=slide}
|
||||
{if $slide.active}
|
||||
<li>
|
||||
<a href="{$slide.url|escape:'html':'UTF-8'}" title="{$slide.description|escape:'html':'UTF-8'}">
|
||||
<img src="{$smarty.const._MODULE_DIR_}homeslider/images/{$slide.image|escape:'html':'UTF-8'}" alt="{$slide.legend|escape:'html':'UTF-8'}" height="{$homeslider.height|intval}" width="{$homeslider.width|intval}" />
|
||||
</a>
|
||||
</li>
|
||||
{/if}
|
||||
{/foreach}
|
||||
</ul>
|
||||
{/if}
|
||||
<!-- /Module HomeSlider -->
|
||||
{/if}
|
||||
Executable → Regular
|
Before Width: | Height: | Size: 869 B After Width: | Height: | Size: 869 B |
Executable → Regular
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Executable → Regular
|
Before Width: | Height: | Size: 845 B After Width: | Height: | Size: 845 B |
@@ -0,0 +1,9 @@
|
||||
<?php
|
||||
|
||||
if (!defined('_PS_VERSION_'))
|
||||
exit;
|
||||
|
||||
function upgrade_module_1_2_3($object)
|
||||
{
|
||||
return ($object->unregisterHook('displayHome') && $object->registerHook('displayTopColumn'));
|
||||
}
|
||||
@@ -73,7 +73,7 @@ class ThemeConfigurator extends Module
|
||||
!$this->installDB() ||
|
||||
!$this->installFixtures() ||
|
||||
!$this->registerHook('displayHeader') ||
|
||||
!$this->registerHook('displayTop') ||
|
||||
!$this->registerHook('displayTopColumn') ||
|
||||
!$this->registerHook('displayLeftColumn') ||
|
||||
!$this->registerHook('displayRightColumn') ||
|
||||
!$this->registerHook('displayHome') ||
|
||||
@@ -130,7 +130,7 @@ class ThemeConfigurator extends Module
|
||||
\'0\',
|
||||
\'home\',
|
||||
\'\',
|
||||
\'\',
|
||||
\'0\',
|
||||
\'banner-img'.$i.'.jpg\',
|
||||
\'\',
|
||||
\'\',
|
||||
@@ -152,7 +152,7 @@ class ThemeConfigurator extends Module
|
||||
\'0\',
|
||||
\'top\',
|
||||
\'\',
|
||||
\'\',
|
||||
\'0\',
|
||||
\'banner-img'.$i.'.jpg\',
|
||||
\'\',
|
||||
\'\',
|
||||
@@ -203,7 +203,7 @@ class ThemeConfigurator extends Module
|
||||
}
|
||||
}
|
||||
|
||||
public function hookDisplayTop()
|
||||
public function hookdisplayTopColumn()
|
||||
{
|
||||
if ((int)Tools::getValue('live_configurator', 0) == 1)
|
||||
{
|
||||
@@ -285,8 +285,8 @@ class ThemeConfigurator extends Module
|
||||
protected function deleteImage($image)
|
||||
{
|
||||
$file_name = $this->uploads_path.$image;
|
||||
if (realpath(dirname($file_name)) != $this->uploads_path)
|
||||
die;
|
||||
if (realpath(dirname($file_name)).DIRECTORY_SEPARATOR != $this->uploads_path)
|
||||
Tools::dieOrLog(sprintf('Could not find upload directory'));
|
||||
|
||||
if ($image != '' && is_file($file_name))
|
||||
unlink($file_name);
|
||||
|
||||
+2400
-2484
File diff suppressed because it is too large
Load Diff
@@ -30,11 +30,12 @@
|
||||
|
||||
/* Top hook CSS */
|
||||
#htmlcontent_top {
|
||||
float: left;
|
||||
padding-top: 40px;
|
||||
width: 33.4%;
|
||||
max-width: 391px;
|
||||
padding-left: 10px;
|
||||
float: left;
|
||||
padding-top: 40px;
|
||||
width: 33.4%;
|
||||
max-width: 391px;
|
||||
padding-left: 10px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
@media (max-width: 767px) {
|
||||
#htmlcontent_top {
|
||||
|
||||
@@ -24,62 +24,78 @@
|
||||
*}
|
||||
{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html'}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='My vouchers'}</span>{/capture}
|
||||
|
||||
<h1 class="page-heading">{l s='My vouchers'}</h1>
|
||||
<h1 class="page-heading">
|
||||
{l s='My vouchers'}
|
||||
</h1>
|
||||
|
||||
{if isset($cart_rules) && count($cart_rules) && $nb_cart_rules}
|
||||
<table class="discount table table-bordered footab">
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-sort-ignore="true" class="discount_code first_item">{l s='Code'}</th>
|
||||
<th data-sort-ignore="true" class="discount_description item">{l s='Description'}</th>
|
||||
<th class="discount_quantity item">{l s='Quantity'}</th>
|
||||
<th data-sort-ignore="true" data-hide="phone,tablet" class="discount_value item">{l s='Value'}*</th>
|
||||
<th data-hide="phone,tablet" class="discount_minimum item">{l s='Minimum'}</th>
|
||||
<th data-sort-ignore="true" data-hide="phone,tablet" class="discount_cumulative item">{l s='Cumulative'}</th>
|
||||
<th data-hide="phone" class="discount_expiration_date last_item">{l s='Expiration date'}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{foreach from=$cart_rules item=discountDetail name=myLoop}
|
||||
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
|
||||
<td class="discount_code">{$discountDetail.code}</td>
|
||||
<td class="discount_description">{$discountDetail.name}</td>
|
||||
<td date-value="{$discountDetail.quantity_for_user}" class="discount_quantity">{$discountDetail.quantity_for_user}</td>
|
||||
<td class="discount_value">
|
||||
{if $discountDetail.id_discount_type == 1}
|
||||
{$discountDetail.value|escape:'html':'UTF-8'}%
|
||||
{elseif $discountDetail.id_discount_type == 2}
|
||||
{convertPrice price=$discountDetail.value} ({if $discountDetail.reduction_tax == 1}{l s='Tax included'}{else}{l s='Tax excluded'}{/if})
|
||||
{elseif $discountDetail.id_discount_type == 3}
|
||||
{l s='Free shipping'}
|
||||
{else}
|
||||
-
|
||||
{/if}
|
||||
</td>
|
||||
<td class="discount_minimum" date-value="{if $discountDetail.minimal == 0}0{else}{$discountDetail.minimal}{/if}">
|
||||
{if $discountDetail.minimal == 0}
|
||||
{l s='None'}
|
||||
{else}
|
||||
{convertPrice price=$discountDetail.minimal}
|
||||
{/if}
|
||||
</td>
|
||||
<td class="discount_cumulative">
|
||||
{if $discountDetail.cumulable == 1}
|
||||
<i class="icon-ok icon"></i> {l s='Yes'}
|
||||
{else}
|
||||
<i class="icon-remove icon"></i> {l s='No'}
|
||||
{/if}
|
||||
</td>
|
||||
<td class="discount_expiration_date" date-value="{$discountDetail.date_to|regex_replace:"/[\-\:\ ]/":""}">{dateFormat date=$discountDetail.date_to}</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
</tbody>
|
||||
</table>
|
||||
<table class="discount table table-bordered footab">
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-sort-ignore="true" class="discount_code first_item">{l s='Code'}</th>
|
||||
<th data-sort-ignore="true" class="discount_description item">{l s='Description'}</th>
|
||||
<th class="discount_quantity item">{l s='Quantity'}</th>
|
||||
<th data-sort-ignore="true" data-hide="phone,tablet" class="discount_value item">{l s='Value'}*</th>
|
||||
<th data-hide="phone,tablet" class="discount_minimum item">{l s='Minimum'}</th>
|
||||
<th data-sort-ignore="true" data-hide="phone,tablet" class="discount_cumulative item">{l s='Cumulative'}</th>
|
||||
<th data-hide="phone" class="discount_expiration_date last_item">{l s='Expiration date'}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{foreach from=$cart_rules item=discountDetail name=myLoop}
|
||||
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
|
||||
<td class="discount_code">{$discountDetail.code}</td>
|
||||
<td class="discount_description">{$discountDetail.name}</td>
|
||||
<td data-value="{$discountDetail.quantity_for_user}" class="discount_quantity">{$discountDetail.quantity_for_user}</td>
|
||||
<td class="discount_value">
|
||||
{if $discountDetail.id_discount_type == 1}
|
||||
{$discountDetail.value|escape:'html':'UTF-8'}%
|
||||
{elseif $discountDetail.id_discount_type == 2}
|
||||
{convertPrice price=$discountDetail.value} ({if $discountDetail.reduction_tax == 1}{l s='Tax included'}{else}{l s='Tax excluded'}{/if})
|
||||
{elseif $discountDetail.id_discount_type == 3}
|
||||
{l s='Free shipping'}
|
||||
{else}
|
||||
-
|
||||
{/if}
|
||||
</td>
|
||||
<td class="discount_minimum" data-value="{if $discountDetail.minimal == 0}0{else}{$discountDetail.minimal}{/if}">
|
||||
{if $discountDetail.minimal == 0}
|
||||
{l s='None'}
|
||||
{else}
|
||||
{convertPrice price=$discountDetail.minimal}
|
||||
{/if}
|
||||
</td>
|
||||
<td class="discount_cumulative">
|
||||
{if $discountDetail.cumulable == 1}
|
||||
<i class="icon-ok icon"></i> {l s='Yes'}
|
||||
{else}
|
||||
<i class="icon-remove icon"></i> {l s='No'}
|
||||
{/if}
|
||||
</td>
|
||||
<td class="discount_expiration_date" data-value="{$discountDetail.date_to|regex_replace:"/[\-\:\ ]/":""}">
|
||||
{dateFormat date=$discountDetail.date_to}
|
||||
</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
</tbody>
|
||||
</table>
|
||||
{else}
|
||||
<p class="alert alert-warning">{l s='You do not have any vouchers.'}</p>
|
||||
{/if}
|
||||
|
||||
<ul class="footer_links clearfix">
|
||||
<li><a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}"><span><i class="icon-chevron-left"></i> {l s='Back to your account'}</span></a></li>
|
||||
<li><a class="btn btn-default button button-small" href="{$base_dir}"><span><i class="icon-chevron-left"></i> {l s='Home'}</span></a></li>
|
||||
<li>
|
||||
<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}">
|
||||
<span>
|
||||
<i class="icon-chevron-left"></i> {l s='Back to your account'}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="btn btn-default button button-small" href="{$base_dir}">
|
||||
<span>
|
||||
<i class="icon-chevron-left"></i> {l s='Home'}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@@ -116,7 +116,6 @@
|
||||
<a class="login" href="{$link->getPageLink('my-account', true)|escape:'html'}" rel="nofollow" title="{l s='Login to your customer account'}">{l s='Sign in'}</a>
|
||||
{/if}
|
||||
</div> <!-- #header_user_info -->
|
||||
|
||||
{if count($languages) > 1}
|
||||
<div id="languages-block-top">
|
||||
<div id="countries">
|
||||
@@ -136,7 +135,6 @@
|
||||
<a href="{$lang_rewrite_urls.$indice_lang|escape:htmlall}" title="{$language.name}">
|
||||
{else}
|
||||
<a href="{$link->getLanguageLink($language.id_lang)|escape:htmlall}" title="{$language.name}">
|
||||
|
||||
{/if}
|
||||
{/if}
|
||||
<span>{$language.name}</span>
|
||||
@@ -148,7 +146,6 @@
|
||||
</ul>
|
||||
</div>
|
||||
</div> <!-- #languages-block-top -->
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function(){
|
||||
$('#countries .current span, #countries .countries_ul li span').each(function() {
|
||||
@@ -162,7 +159,6 @@
|
||||
});
|
||||
</script>
|
||||
{/if}
|
||||
|
||||
{if count($currencies) > 1}
|
||||
<div id="currencies-block-top">
|
||||
<form id="setCurrency" action="{$request_uri}" method="post">
|
||||
@@ -184,20 +180,16 @@
|
||||
</form>
|
||||
</div> <!-- #currencies-block-top -->
|
||||
{/if}
|
||||
|
||||
<div id="contact-link">
|
||||
<a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='contact'}">{l s='Contact Us'}</a>
|
||||
</div> <!-- #contact-link -->
|
||||
|
||||
{if $shop_phone}
|
||||
<span class="shop-phone">
|
||||
<i class="icon-phone"></i>{l s='Call us now toll free:'} <strong>{$shop_phone}</strong>
|
||||
</span>
|
||||
{/if}
|
||||
|
||||
</nav><!-- .container-row -->
|
||||
</div> <!-- .header-row -->
|
||||
|
||||
<div class="container header-row-2">
|
||||
<a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}">
|
||||
<img class="logo img-responsive" src="{$logo_url}" alt="{$shop_name|escape:'html':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if}/>
|
||||
@@ -206,16 +198,17 @@
|
||||
{$HOOK_TOP}
|
||||
</div>
|
||||
</div> <!-- .header-row-2 -->
|
||||
|
||||
</header> <!-- #header -->
|
||||
</div> <!-- .header-container -->
|
||||
|
||||
<div class="columns-container">
|
||||
<div id="columns" class="container">
|
||||
{if $page_name !='index' && $page_name !='pagenotfound'}
|
||||
{include file="$tpl_dir./breadcrumb.tpl"}
|
||||
{/if}
|
||||
<div class="row">
|
||||
<div id="top_column" class="center_column col-xs-12 col-sm-12">
|
||||
{$HOOK_TOP_COLUMN}
|
||||
</div>
|
||||
{if isset($left_column_size) && !empty($left_column_size)}
|
||||
<!-- Left -->
|
||||
<div id="left_column" class="column col-xs-12 col-sm-3">
|
||||
|
||||
@@ -23,80 +23,146 @@
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
|
||||
{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html'}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='Order history'}</span>{/capture}
|
||||
{capture name=path}
|
||||
<a href="{$link->getPageLink('my-account', true)|escape:'html'}">
|
||||
{l s='My account'}
|
||||
</a>
|
||||
<span class="navigation-pipe">{$navigationPipe}</span>
|
||||
<span class="navigation_page">{l s='Order history'}</span>
|
||||
{/capture}
|
||||
{include file="$tpl_dir./errors.tpl"}
|
||||
|
||||
<h1 class="page-heading bottom-indent">{l s='Order history'}</h1>
|
||||
<p class="info-title">{l s='Here are the orders you\'ve placed since your account was created.'}</p>
|
||||
<h1 class="page-heading bottom-indent">
|
||||
{l s='Order history'}
|
||||
</h1>
|
||||
<p class="info-title">
|
||||
{l s='Here are the orders you\'ve placed since your account was created.'}
|
||||
</p>
|
||||
|
||||
{if $slowValidation}<p class="alert alert-warning">{l s='If you have just placed an order, it may take a few minutes for it to be validated. Please refresh this page if your order is missing.'}</p>{/if}
|
||||
{if $slowValidation}
|
||||
<p class="alert alert-warning">
|
||||
{l s='If you have just placed an order, it may take a few minutes for it to be validated. Please refresh this page if your order is missing.'}
|
||||
</p>
|
||||
{/if}
|
||||
|
||||
<div class="block-center" id="block-history">
|
||||
{if $orders && count($orders)}
|
||||
<table id="order-list" class="table table-bordered footab">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="first_item" data-sort-ignore="true">{l s='Order reference'}</th>
|
||||
<th class="item">{l s='Date'}</th>
|
||||
<th data-hide="phone" class="item">{l s='Total price'}</th>
|
||||
<th data-sort-ignore="true" data-hide="phone,tablet" class="item">{l s='Payment'}</th>
|
||||
<th class="item">{l s='Status'}</th>
|
||||
<th data-sort-ignore="true" data-hide="phone,tablet" class="item">{l s='Invoice'}</th>
|
||||
<th data-sort-ignore="true" data-hide="phone,tablet" class="last_item"> </th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{foreach from=$orders item=order name=myLoop}
|
||||
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
|
||||
<td class="history_link bold">
|
||||
{if isset($order.invoice) && $order.invoice && isset($order.virtual) && $order.virtual}<img src="{$img_dir}icon/download_product.gif" class="icon" alt="{l s='Products to download'}" title="{l s='Products to download'}" />{/if}
|
||||
<a class="color-myaccount" href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">{Order::getUniqReferenceOf($order.id_order)}</a>
|
||||
</td>
|
||||
<td data-value="{$order.date_add|regex_replace:"/[\-\:\ ]/":""}" class="history_date bold">{dateFormat date=$order.date_add full=0}</td>
|
||||
<td class="history_price" data-value="{$order.total_paid}"><span class="price">{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false}</span></td>
|
||||
<td class="history_method">{$order.payment|escape:'html':'UTF-8'}</td>
|
||||
<td data-value="{$order.id_order_state}" class="history_state">{if isset($order.order_state)}<span class="label{if $order.id_order_state == 1 || $order.id_order_state == 10 || $order.id_order_state == 11} label-info{elseif $order.id_order_state == 5 || $order.id_order_state == 2 || $order.id_order_state == 12} label-success{elseif $order.id_order_state == 6 || $order.id_order_state == 7 || $order.id_order_state == 8} label-danger{elseif $order.id_order_state == 3 || $order.id_order_state == 9 || $order.id_order_state == 4} label-warning{/if}">{$order.order_state|escape:'html':'UTF-8'}</span>{/if}</td>
|
||||
<td class="history_invoice">
|
||||
{if (isset($order.invoice) && $order.invoice && isset($order.invoice_number) && $order.invoice_number) && isset($invoiceAllowed) && $invoiceAllowed == true}
|
||||
<a class="link-button" href="{$link->getPageLink('pdf-invoice', true, NULL, "id_order={$order.id_order}")|escape:'html'}" title="{l s='Invoice'}" class="_blank"><i class="icon-file-text large"></i>{l s='PDF'}</a>
|
||||
{else}-{/if}
|
||||
</td>
|
||||
<td class="history_detail">
|
||||
<a class="btn btn-default button button-small" href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');"><span>{l s='Details'}<i class="icon-chevron-right right"></i></span></a>
|
||||
{if isset($opc) && $opc}
|
||||
<a class="link-button" href="{$link->getPageLink('order-opc', true, NULL, "submitReorder&id_order={$order.id_order}")|escape:'html'}" title="{l s='Reorder'}">
|
||||
{else}
|
||||
<a class="link-button" href="{$link->getPageLink('order', true, NULL, "submitReorder&id_order={$order.id_order}")|escape:'html'}" title="{l s='Reorder'}">
|
||||
{/if}
|
||||
<i class="icon-refresh"></i>{l s='Reorder'}
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
</tbody>
|
||||
</table>
|
||||
<script type="text/javascript">
|
||||
$(function () {
|
||||
$('.sort-column').click(function (e) {
|
||||
e.preventDefault();
|
||||
<table id="order-list" class="table table-bordered footab">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="first_item" data-sort-ignore="true">{l s='Order reference'}</th>
|
||||
<th class="item">{l s='Date'}</th>
|
||||
<th data-hide="phone" class="item">{l s='Total price'}</th>
|
||||
<th data-sort-ignore="true" data-hide="phone,tablet" class="item">{l s='Payment'}</th>
|
||||
<th class="item">{l s='Status'}</th>
|
||||
<th data-sort-ignore="true" data-hide="phone,tablet" class="item">{l s='Invoice'}</th>
|
||||
<th data-sort-ignore="true" data-hide="phone,tablet" class="last_item"> </th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{foreach from=$orders item=order name=myLoop}
|
||||
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
|
||||
<td class="history_link bold">
|
||||
{if isset($order.invoice) && $order.invoice && isset($order.virtual) && $order.virtual}
|
||||
<img
|
||||
class="icon"
|
||||
src="{$img_dir}icon/download_product.gif"
|
||||
alt="{l s='Products to download'}"
|
||||
title="{l s='Products to download'}" />
|
||||
{/if}
|
||||
<a
|
||||
class="color-myaccount"
|
||||
href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">
|
||||
{Order::getUniqReferenceOf($order.id_order)}
|
||||
</a>
|
||||
</td>
|
||||
<td data-value="{$order.date_add|regex_replace:"/[\-\:\ ]/":""}" class="history_date bold">
|
||||
{dateFormat date=$order.date_add full=0}
|
||||
</td>
|
||||
<td class="history_price" data-value="{$order.total_paid}">
|
||||
<span class="price">
|
||||
{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false}
|
||||
</span>
|
||||
</td>
|
||||
<td class="history_method">{$order.payment|escape:'html':'UTF-8'}</td>
|
||||
<td data-value="{$order.id_order_state}" class="history_state">
|
||||
{if isset($order.order_state)}
|
||||
<span class="label{if $order.id_order_state == 1 || $order.id_order_state == 10 || $order.id_order_state == 11} label-info{elseif $order.id_order_state == 5 || $order.id_order_state == 2 || $order.id_order_state == 12} label-success{elseif $order.id_order_state == 6 || $order.id_order_state == 7 || $order.id_order_state == 8} label-danger{elseif $order.id_order_state == 3 || $order.id_order_state == 9 || $order.id_order_state == 4} label-warning{/if}">
|
||||
{$order.order_state|escape:'html':'UTF-8'}
|
||||
</span>
|
||||
{/if}
|
||||
</td>
|
||||
<td class="history_invoice">
|
||||
{if (isset($order.invoice) && $order.invoice && isset($order.invoice_number) && $order.invoice_number) && isset($invoiceAllowed) && $invoiceAllowed == true}
|
||||
<a
|
||||
class="link-button"
|
||||
href="{$link->getPageLink('pdf-invoice', true, NULL, "id_order={$order.id_order}")|escape:'html'}"
|
||||
title="{l s='Invoice'}"
|
||||
target="_blank">
|
||||
<i class="icon-file-text large"></i>{l s='PDF'}
|
||||
</a>
|
||||
{else}
|
||||
-
|
||||
{/if}
|
||||
</td>
|
||||
<td class="history_detail">
|
||||
<a
|
||||
class="btn btn-default button button-small"
|
||||
href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">
|
||||
<span>
|
||||
{l s='Details'}<i class="icon-chevron-right right"></i>
|
||||
</span>
|
||||
</a>
|
||||
{if isset($opc) && $opc}
|
||||
<a
|
||||
class="link-button"
|
||||
href="{$link->getPageLink('order-opc', true, NULL, "submitReorder&id_order={$order.id_order}")|escape:'html'}"
|
||||
title="{l s='Reorder'}">
|
||||
{else}
|
||||
<a
|
||||
class="link-button"
|
||||
href="{$link->getPageLink('order', true, NULL, "submitReorder&id_order={$order.id_order}")|escape:'html'}"
|
||||
title="{l s='Reorder'}">
|
||||
{/if}
|
||||
<i class="icon-refresh"></i>{l s='Reorder'}
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
</tbody>
|
||||
</table>
|
||||
<script type="text/javascript">
|
||||
$(function () {
|
||||
$('.sort-column').click(function (e) {
|
||||
e.preventDefault();
|
||||
|
||||
//get the footable sort object
|
||||
var footableSort = $('table').data('footable-sort');
|
||||
//get the footable sort object
|
||||
var footableSort = $('table').data('footable-sort');
|
||||
|
||||
//get the index we are wanting to sort by
|
||||
var index = $(this).data('index');
|
||||
//get the index we are wanting to sort by
|
||||
var index = $(this).data('index');
|
||||
|
||||
footableSort.doSort(index, 'toggle');
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<div id="block-order-detail" class="unvisible"> </div>
|
||||
footableSort.doSort(index, 'toggle');
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<div id="block-order-detail" class="unvisible"> </div>
|
||||
{else}
|
||||
<p class="alert alert-warning">{l s='You have not placed any orders.'}</p>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<ul class="footer_links clearfix">
|
||||
<li><a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}"><span><i class="icon-chevron-left"></i> {l s='Back to Your Account'}</span></a></li>
|
||||
<li><a class="btn btn-default button button-small" href="{$base_dir}"><span><i class="icon-chevron-left"></i> {l s='Home'}</span></a></li>
|
||||
<li>
|
||||
<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}">
|
||||
<span>
|
||||
<i class="icon-chevron-left"></i> {l s='Back to Your Account'}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="btn btn-default button button-small" href="{$base_dir}">
|
||||
<span><i class="icon-chevron-left"></i> {l s='Home'}</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@@ -23,9 +23,21 @@
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
|
||||
{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html'}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='Your personal information'}</span>{/capture}
|
||||
{capture name=path}
|
||||
<a href="{$link->getPageLink('my-account', true)|escape:'html'}">
|
||||
{l s='My account'}
|
||||
</a>
|
||||
<span class="navigation-pipe">
|
||||
{$navigationPipe}
|
||||
</span>
|
||||
<span class="navigation_page">
|
||||
{l s='Your personal information'}
|
||||
</span>
|
||||
{/capture}
|
||||
<div class="box">
|
||||
<h1 class="page-subheading">{l s='Your personal information'}</h1>
|
||||
<h1 class="page-subheading">
|
||||
{l s='Your personal information'}
|
||||
</h1>
|
||||
|
||||
{include file="$tpl_dir./errors.tpl"}
|
||||
|
||||
@@ -35,8 +47,12 @@
|
||||
{if isset($pwd_changed)}<br />{l s='Your password has been sent to your email:'} {$email}{/if}
|
||||
</p>
|
||||
{else}
|
||||
<p class="info-title">{l s='Please be sure to update your personal information if it has changed.'}</p>
|
||||
<p class="required"><sup>*</sup>{l s='Required field'}</p>
|
||||
<p class="info-title">
|
||||
{l s='Please be sure to update your personal information if it has changed.'}
|
||||
</p>
|
||||
<p class="required">
|
||||
<sup>*</sup>{l s='Required field'}
|
||||
</p>
|
||||
<form action="{$link->getPageLink('identity', true)|escape:'html'}" method="post" class="std">
|
||||
<fieldset>
|
||||
<div class="clearfix">
|
||||
@@ -51,95 +67,112 @@
|
||||
{/foreach}
|
||||
</div>
|
||||
<div class="required form-group">
|
||||
<label for="firstname">{l s='First name'} <sup>*</sup></label>
|
||||
<label for="firstname" class="required">
|
||||
{l s='First name'}
|
||||
</label>
|
||||
<input class="is_required validate form-control" data-validate="isName" type="text" id="firstname" name="firstname" value="{$smarty.post.firstname}" />
|
||||
</div>
|
||||
<div class="required form-group">
|
||||
<label for="lastname">{l s='Last name'} <sup>*</sup></label>
|
||||
<label for="lastname" class="required">
|
||||
{l s='Last name'}
|
||||
</label>
|
||||
<input class="is_required validate form-control" data-validate="isName" type="text" name="lastname" id="lastname" value="{$smarty.post.lastname}" />
|
||||
</div>
|
||||
<div class="required form-group">
|
||||
<label for="email">{l s='E-mail address'} <sup>*</sup></label>
|
||||
<label for="email" class="required">
|
||||
{l s='E-mail address'}
|
||||
</label>
|
||||
<input class="is_required validate form-control" data-validate="isEmail" type="email" name="email" id="email" value="{$smarty.post.email}" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>{l s='Date of Birth'}</label>
|
||||
<label>
|
||||
{l s='Date of Birth'}
|
||||
</label>
|
||||
<div class="row">
|
||||
<div class="col-xs-4">
|
||||
<select name="days" id="days" class="form-control">
|
||||
<option value="">-</option>
|
||||
{foreach from=$days item=v}
|
||||
<option value="{$v}" {if ($sl_day == $v)}selected="selected"{/if}>{$v} </option>
|
||||
{/foreach}
|
||||
</select>
|
||||
{*
|
||||
{l s='January'}
|
||||
{l s='February'}
|
||||
{l s='March'}
|
||||
{l s='April'}
|
||||
{l s='May'}
|
||||
{l s='June'}
|
||||
{l s='July'}
|
||||
{l s='August'}
|
||||
{l s='September'}
|
||||
{l s='October'}
|
||||
{l s='November'}
|
||||
{l s='December'}
|
||||
*}
|
||||
<div class="col-xs-4">
|
||||
<select name="days" id="days" class="form-control">
|
||||
<option value="">-</option>
|
||||
{foreach from=$days item=v}
|
||||
<option value="{$v}" {if ($sl_day == $v)}selected="selected"{/if}>{$v} </option>
|
||||
{/foreach}
|
||||
</select>
|
||||
|
||||
</div>
|
||||
<div class="col-xs-4">
|
||||
<select id="months" name="months" class="form-control">
|
||||
<option value="">-</option>
|
||||
{foreach from=$months key=k item=v}
|
||||
<option value="{$k}" {if ($sl_month == $k)}selected="selected"{/if}>{l s=$v} </option>
|
||||
{/foreach}
|
||||
</select>
|
||||
<select id="months" name="months" class="form-control">
|
||||
<option value="">-</option>
|
||||
{foreach from=$months key=k item=v}
|
||||
<option value="{$k}" {if ($sl_month == $k)}selected="selected"{/if}>{l s=$v} </option>
|
||||
{/foreach}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-xs-4">
|
||||
<select id="years" name="years" class="form-control">
|
||||
<option value="">-</option>
|
||||
{foreach from=$years item=v}
|
||||
<option value="{$v}" {if ($sl_year == $v)}selected="selected"{/if}>{$v} </option>
|
||||
{/foreach}
|
||||
</select>
|
||||
<select id="years" name="years" class="form-control">
|
||||
<option value="">-</option>
|
||||
{foreach from=$years item=v}
|
||||
<option value="{$v}" {if ($sl_year == $v)}selected="selected"{/if}>{$v} </option>
|
||||
{/foreach}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="required form-group">
|
||||
<label for="old_passwd">{l s='Current Password'} <sup>*</sup></label>
|
||||
<label for="old_passwd" class="required">
|
||||
{l s='Current Password'}
|
||||
</label>
|
||||
<input class="is_required validate form-control" type="password" data-validate="isPasswd" name="old_passwd" id="old_passwd" />
|
||||
</div>
|
||||
<div class="password form-group">
|
||||
<label for="passwd">{l s='New Password'}</label>
|
||||
<label for="passwd">
|
||||
{l s='New Password'}
|
||||
</label>
|
||||
<input class="is_required validate form-control" type="password" data-validate="isPasswd" name="passwd" id="passwd" />
|
||||
</div>
|
||||
<div class="password form-group">
|
||||
<label for="confirmation">{l s='Confirmation'}</label>
|
||||
<label for="confirmation">
|
||||
{l s='Confirmation'}
|
||||
</label>
|
||||
<input class="is_required validate form-control" type="password" data-validate="isPasswd" name="confirmation" id="confirmation" />
|
||||
</div>
|
||||
{if $newsletter}
|
||||
<div class="checkbox">
|
||||
<label for="newsletter">
|
||||
<input type="checkbox" id="newsletter" name="newsletter" value="1" {if isset($smarty.post.newsletter) && $smarty.post.newsletter == 1} checked="checked"{/if} autocomplete="off"/>
|
||||
{l s='Sign up for our newsletter!'}</label>
|
||||
</div>
|
||||
<div class="checkbox">
|
||||
<label for="optin">
|
||||
<input type="checkbox" name="optin" id="optin" value="1" {if isset($smarty.post.optin) && $smarty.post.optin == 1} checked="checked"{/if} autocomplete="off"/>
|
||||
{l s='Receive special offers from our partners!'}</label>
|
||||
</div>
|
||||
<div class="checkbox">
|
||||
<label for="newsletter">
|
||||
<input type="checkbox" id="newsletter" name="newsletter" value="1" {if isset($smarty.post.newsletter) && $smarty.post.newsletter == 1} checked="checked"{/if}/>
|
||||
{l s='Sign up for our newsletter!'}
|
||||
</label>
|
||||
</div>
|
||||
<div class="checkbox">
|
||||
<label for="optin">
|
||||
<input type="checkbox" name="optin" id="optin" value="1" {if isset($smarty.post.optin) && $smarty.post.optin == 1} checked="checked"{/if}/>
|
||||
{l s='Receive special offers from our partners!'}
|
||||
</label>
|
||||
</div>
|
||||
{/if}
|
||||
<div class="form-group">
|
||||
<button type="submit" name="submitIdentity" class="btn btn-default button button-medium"><span>{l s='Save'}<i class="icon-chevron-right right"></i></span></button>
|
||||
<button type="submit" name="submitIdentity" class="btn btn-default button button-medium">
|
||||
<span>{l s='Save'}<i class="icon-chevron-right right"></i></span>
|
||||
</button>
|
||||
</div>
|
||||
<p id="security_informations" class="text-right">
|
||||
<i>{l s='[Insert customer data privacy clause here, if applicable]'}</i>
|
||||
</p>
|
||||
</fieldset>
|
||||
</form>
|
||||
</form> <!-- .std -->
|
||||
{/if}
|
||||
</div>
|
||||
<ul class="footer_links clearfix">
|
||||
<li><a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)}"><span><i class="icon-chevron-left"></i>{l s='Back to your account'}</span></a></li>
|
||||
<li><a class="btn btn-default button button-small" href="{$base_dir}"><span><i class="icon-chevron-left"></i>{l s='Home'}</span></a></li>
|
||||
<li>
|
||||
<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)}">
|
||||
<span>
|
||||
<i class="icon-chevron-left"></i>{l s='Back to your account'}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="btn btn-default button button-small" href="{$base_dir}">
|
||||
<span>
|
||||
<i class="icon-chevron-left"></i>{l s='Home'}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@@ -60,7 +60,7 @@ function addToCompare(productId) {
|
||||
});
|
||||
}
|
||||
|
||||
function compareButtonsStatusRefresh() {
|
||||
function compareButtonsStatusRefresh(){
|
||||
$('.addToCompare').each(function() {
|
||||
if ($.inArray(parseInt($(this).data('id-product')),comparedProductsIds)!== -1) {
|
||||
$(this).addClass('checked');
|
||||
|
||||
@@ -25,21 +25,6 @@
|
||||
*}
|
||||
{if $page_name =='index'}
|
||||
<!-- Module HomeSlider -->
|
||||
{if isset($homeslider)}
|
||||
<script type="text/javascript">
|
||||
{if isset($homeslider_slides) && $homeslider_slides|@count > 1}
|
||||
{if $homeslider.loop == 1}
|
||||
var homeslider_loop = true;
|
||||
{else}
|
||||
var homeslider_loop = false;
|
||||
{/if}
|
||||
{else}
|
||||
var homeslider_loop = false;
|
||||
{/if}
|
||||
var homeslider_speed = {$homeslider.speed};
|
||||
var homeslider_pause = {$homeslider.pause};
|
||||
</script>
|
||||
{/if}
|
||||
{if isset($homeslider_slides)}
|
||||
<div id="homepage-slider">
|
||||
<ul id="homeslider">
|
||||
@@ -54,6 +39,21 @@ var homeslider_pause = {$homeslider.pause};
|
||||
{/foreach}
|
||||
</ul>
|
||||
</div>
|
||||
{if isset($homeslider)}
|
||||
<script type="text/javascript">
|
||||
{if $homeslider_slides|@count > 1}
|
||||
{if $homeslider.loop == 1}
|
||||
var homeslider_loop = true;
|
||||
{else}
|
||||
var homeslider_loop = false;
|
||||
{/if}
|
||||
{else}
|
||||
var homeslider_loop = false;
|
||||
{/if}
|
||||
var homeslider_speed = {$homeslider.speed};
|
||||
var homeslider_pause = {$homeslider.pause};
|
||||
</script>
|
||||
{/if}
|
||||
{/if}
|
||||
<!-- /Module HomeSlider -->
|
||||
{/if}
|
||||
{/if}
|
||||
@@ -23,37 +23,72 @@
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
|
||||
{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html'}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='Return Merchandise Authorization (RMA)'}</span>{/capture}
|
||||
{capture name=path}
|
||||
<a href="{$link->getPageLink('my-account', true)|escape:'html'}">
|
||||
{l s='My account'}
|
||||
</a>
|
||||
<span class="navigation-pipe">
|
||||
{$navigationPipe}
|
||||
</span>
|
||||
<span class="navigation_page">
|
||||
{l s='Return Merchandise Authorization (RMA)'}
|
||||
</span>
|
||||
{/capture}
|
||||
|
||||
<h1 class="page-heading bottom-indent">{l s='Return Merchandise Authorization (RMA)'}</h1>
|
||||
{if isset($errorQuantity) && $errorQuantity}<p class="error">{l s='You do not have enough products to request an additional merchandise return.'}</p>{/if}
|
||||
<h1 class="page-heading bottom-indent">
|
||||
{l s='Return Merchandise Authorization (RMA)'}
|
||||
</h1>
|
||||
{if isset($errorQuantity) && $errorQuantity}
|
||||
<p class="error">
|
||||
{l s='You do not have enough products to request an additional merchandise return.'}
|
||||
</p>
|
||||
{/if}
|
||||
{if isset($errorMsg) && $errorMsg}
|
||||
<p class="alert alert-danger">
|
||||
{l s='Please provide an explanation for your RMA.'}
|
||||
</p>
|
||||
<p>
|
||||
<form method="POST" id="returnOrderMessage">
|
||||
<p class="textarea form-group">
|
||||
<label>{l s='Please provide an explanation for your RMA:'}</label>
|
||||
<textarea name="returnText" class="form-control"></textarea>
|
||||
</p>
|
||||
{foreach $ids_order_detail as $id_order_detail}
|
||||
<input type="hidden" name="ids_order_detail[{$id_order_detail}]" value="{$id_order_detail}"/>
|
||||
{/foreach}
|
||||
{foreach $order_qte_input as $key => $value}
|
||||
<input type="hidden" name="order_qte_input[{$key}]" value="{$value}"/>
|
||||
{/foreach}
|
||||
<input type="hidden" name="id_order" value="{$id_order}"/>
|
||||
<input class="unvisible" type="submit" name="submitReturnMerchandise" value="{l s='Make an RMA slip'}"/>
|
||||
<button type="submit" name="submitReturnMerchandise" class="btn btn-default button button-small"><span>{l s='Make an RMA slip'}<i class="icon-chevron-right right"></i></span></button>
|
||||
</form>
|
||||
<form method="POST" id="returnOrderMessage">
|
||||
<p class="textarea form-group">
|
||||
<label>{l s='Please provide an explanation for your RMA:'}</label>
|
||||
<textarea name="returnText" class="form-control"></textarea>
|
||||
</p>
|
||||
{foreach $ids_order_detail as $id_order_detail}
|
||||
<input type="hidden" name="ids_order_detail[{$id_order_detail}]" value="{$id_order_detail}"/>
|
||||
{/foreach}
|
||||
{foreach $order_qte_input as $key => $value}
|
||||
<input type="hidden" name="order_qte_input[{$key}]" value="{$value}"/>
|
||||
{/foreach}
|
||||
<input type="hidden" name="id_order" value="{$id_order}"/>
|
||||
<input class="unvisible" type="submit" name="submitReturnMerchandise" value="{l s='Make an RMA slip'}"/>
|
||||
<p>
|
||||
<button type="submit" name="submitReturnMerchandise" class="btn btn-default button button-small">
|
||||
<span>
|
||||
{l s='Make an RMA slip'}<i class="icon-chevron-right right"></i>
|
||||
</span>
|
||||
</button>
|
||||
</p>
|
||||
</form>
|
||||
|
||||
{/if}
|
||||
{if isset($errorDetail1) && $errorDetail1}
|
||||
<p class="alert alert-danger">
|
||||
{l s='Please check at least one product you would like to return.'}
|
||||
</p>
|
||||
{/if}
|
||||
{if isset($errorDetail2) && $errorDetail2}
|
||||
<p class="alert alert-danger">
|
||||
{l s='For each product you wish to add, please specify the desired quantity.'}
|
||||
</p>
|
||||
{/if}
|
||||
{if isset($errorNotReturnable) && $errorNotReturnable}
|
||||
<p class="alert alert-danger">
|
||||
{l s='This order cannot be returned.'}
|
||||
</p>
|
||||
{/if}
|
||||
{if isset($errorDetail1) && $errorDetail1}<p class="alert alert-danger">{l s='Please check at least one product you would like to return.'}</p>{/if}
|
||||
{if isset($errorDetail2) && $errorDetail2}<p class="alert alert-danger">{l s='For each product you wish to add, please specify the desired quantity.'}</p>{/if}
|
||||
{if isset($errorNotReturnable) && $errorNotReturnable}<p class="alert alert-danger">{l s='This order cannot be returned.'}</p>{/if}
|
||||
|
||||
<p class="info-title">{l s='Here is a list of pending merchandise returns'}.</p>
|
||||
<p class="info-title">
|
||||
{l s='Here is a list of pending merchandise returns'}.
|
||||
</p>
|
||||
<div class="block-center" id="block-history">
|
||||
{if $ordersReturn && count($ordersReturn)}
|
||||
<table id="order-list" class="table table-bordered footab">
|
||||
@@ -61,27 +96,50 @@
|
||||
<tr>
|
||||
<th data-sort-ignore="true" class="first_item">{l s='Return'}</th>
|
||||
<th data-sort-ignore="true" class="item">{l s='Order'}</th>
|
||||
<th data-hide="phone"class="item">{l s='Package status'}</th>
|
||||
<th data-hide="phone" class="item">{l s='Package status'}</th>
|
||||
<th data-hide="phone,tablet" class="item">{l s='Date issued'}</th>
|
||||
<th data-sort-ignore="true" data-hide="phone,tablet" class="last_item">{l s='Return slip'}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{foreach from=$ordersReturn item=return name=myLoop}
|
||||
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
|
||||
<td class="bold"><a class="color-myaccount" href="javascript:showOrder(0, {$return.id_order_return|intval}, '{$link->getPageLink('order-return', true)|escape:'html'}');">{l s='#'}{$return.id_order_return|string_format:"%06d"}</a></td>
|
||||
<td class="history_method"><a class="color-myaccount" href="javascript:showOrder(1, {$return.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">{l s='#'}{$return.id_order|string_format:"%06d"}</a></td>
|
||||
<td class="history_method" data-value="{$return.state}"><span class="label label-info">{$return.state_name|escape:'html':'UTF-8'}</span></td>
|
||||
<td class="bold" data-value="{$return.date_add|regex_replace:"/[\-\:\ ]/":""}">{dateFormat date=$return.date_add full=0}</td>
|
||||
<td class="history_invoice">
|
||||
{if $return.state == 2}
|
||||
<a class="link-button" href="{$link->getPageLink('pdf-order-return', true, NULL, "id_order_return={$return.id_order_return|intval}")|escape:'html'}" title="{l s='Order return'} {l s='#'}{$return.id_order_return|string_format:"%06d"}"><i class="icon-file-text"></i> {l s='Print out'}</a>
|
||||
{else}
|
||||
--
|
||||
{/if}
|
||||
</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
{foreach from=$ordersReturn item=return name=myLoop}
|
||||
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
|
||||
<td class="bold">
|
||||
<a
|
||||
class="color-myaccount"
|
||||
href="javascript:showOrder(0, {$return.id_order_return|intval}, '{$link->getPageLink('order-return', true)|escape:'html'}');">
|
||||
{l s='#'}{$return.id_order_return|string_format:"%06d"}
|
||||
</a>
|
||||
</td>
|
||||
<td class="history_method">
|
||||
<a
|
||||
class="color-myaccount"
|
||||
href="javascript:showOrder(1, {$return.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">
|
||||
{l s='#'}{$return.id_order|string_format:"%06d"}
|
||||
</a>
|
||||
</td>
|
||||
<td class="history_method" data-value="{$return.state}">
|
||||
<span class="label label-info">
|
||||
{$return.state_name|escape:'html':'UTF-8'}
|
||||
</span>
|
||||
</td>
|
||||
<td class="bold" data-value="{$return.date_add|regex_replace:"/[\-\:\ ]/":""}">
|
||||
{dateFormat date=$return.date_add full=0}
|
||||
</td>
|
||||
<td class="history_invoice">
|
||||
{if $return.state == 2}
|
||||
<a
|
||||
class="link-button"
|
||||
href="{$link->getPageLink('pdf-order-return', true, NULL, "id_order_return={$return.id_order_return|intval}")|escape:'html'}"
|
||||
title="{l s='Order return'} {l s='#'}{$return.id_order_return|string_format:"%06d"}">
|
||||
<i class="icon-file-text"></i> {l s='Print out'}
|
||||
</a>
|
||||
{else}
|
||||
--
|
||||
{/if}
|
||||
</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
</tbody>
|
||||
</table>
|
||||
<div id="block-order-detail" class="unvisible"> </div>
|
||||
@@ -91,6 +149,18 @@
|
||||
</div>
|
||||
|
||||
<ul class="footer_links clearfix">
|
||||
<li><a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}"><span><i class="icon-chevron-left"></i> {l s='Back to your account'}</span></a></li>
|
||||
<li><a class="btn btn-default button button-small" href="{$base_dir}"><span><i class="icon-chevron-left"></i> {l s='Home'}</span></a></li>
|
||||
<li>
|
||||
<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}">
|
||||
<span>
|
||||
<i class="icon-chevron-left"></i> {l s='Back to your account'}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="btn btn-default button button-small" href="{$base_dir}">
|
||||
<span>
|
||||
<i class="icon-chevron-left"></i> {l s='Home'}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@@ -25,38 +25,67 @@
|
||||
|
||||
{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html'}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='Credit slips'}</span>{/capture}
|
||||
|
||||
<h1 class="page-heading bottom-indent">{l s='Credit slips'}</h1>
|
||||
<p class="info-title">{l s='Credit slips you have received after cancelled orders'}.</p>
|
||||
<h1 class="page-heading bottom-indent">
|
||||
{l s='Credit slips'}
|
||||
</h1>
|
||||
<p class="info-title">
|
||||
{l s='Credit slips you have received after cancelled orders'}.
|
||||
</p>
|
||||
<div class="block-center" id="block-history">
|
||||
{if $ordersSlip && count($ordersSlip)}
|
||||
<table id="order-list" class="table table-bordered footab">
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-sort-ignore="true" class="first_item">{l s='Credit slip'}</th>
|
||||
<th data-sort-ignore="true" class="item">{l s='Order'}</th>
|
||||
<th class="item">{l s='Date issued'}</th>
|
||||
<th data-sort-ignore="true" data-hide="phone" class="last_item">{l s='View credit slip'}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{foreach from=$ordersSlip item=slip name=myLoop}
|
||||
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
|
||||
<td class="bold"><span class="color-myaccount">{l s='#%s' sprintf=$slip.id_order_slip|string_format:"%06d"}</span></td>
|
||||
<td class="history_method"><a class="color-myaccount" href="javascript:showOrder(1, {$slip.id_order|intval}, '{$link->getPageLink('order-detail')|escape:'html'}');">{l s='#%s' sprintf=$slip.id_order|string_format:"%06d"}</a></td>
|
||||
<td class="bold" date-value="{$slip.date_add|regex_replace:"/[\-\:\ ]/":""}">{dateFormat date=$slip.date_add full=0}</td>
|
||||
<td class="history_invoice">
|
||||
<a class="link-button" href="{$link->getPageLink('pdf-order-slip', true, NULL, "id_order_slip={$slip.id_order_slip|intval}")|escape:'html'}" title="{l s='Credit slip'} {l s='#%s' sprintf=$slip.id_order_slip|string_format:"%06d"}"><i class="icon-file-text large"></i>{l s='PDF'}</a>
|
||||
</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
</tbody>
|
||||
</table>
|
||||
<div id="block-order-detail" class="unvisible"> </div>
|
||||
<table id="order-list" class="table table-bordered footab">
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-sort-ignore="true" class="first_item">{l s='Credit slip'}</th>
|
||||
<th data-sort-ignore="true" class="item">{l s='Order'}</th>
|
||||
<th class="item">{l s='Date issued'}</th>
|
||||
<th data-sort-ignore="true" data-hide="phone" class="last_item">{l s='View credit slip'}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{foreach from=$ordersSlip item=slip name=myLoop}
|
||||
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
|
||||
<td class="bold">
|
||||
<span class="color-myaccount">
|
||||
{l s='#%s' sprintf=$slip.id_order_slip|string_format:"%06d"}
|
||||
</span>
|
||||
</td>
|
||||
<td class="history_method">
|
||||
<a class="color-myaccount" href="javascript:showOrder(1, {$slip.id_order|intval}, '{$link->getPageLink('order-detail')|escape:'html'}');">
|
||||
{l s='#%s' sprintf=$slip.id_order|string_format:"%06d"}
|
||||
</a>
|
||||
</td>
|
||||
<td class="bold" data-value="{$slip.date_add|regex_replace:"/[\-\:\ ]/":""}">
|
||||
{dateFormat date=$slip.date_add full=0}
|
||||
</td>
|
||||
<td class="history_invoice">
|
||||
<a class="link-button" href="{$link->getPageLink('pdf-order-slip', true, NULL, "id_order_slip={$slip.id_order_slip|intval}")|escape:'html'}" title="{l s='Credit slip'} {l s='#%s' sprintf=$slip.id_order_slip|string_format:"%06d"}">
|
||||
<i class="icon-file-text large"></i>{l s='PDF'}
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
</tbody>
|
||||
</table>
|
||||
<div id="block-order-detail" class="unvisible"> </div>
|
||||
{else}
|
||||
<p class="alert alert-warning">{l s='You have not received any credit slips.'}</p>
|
||||
{/if}
|
||||
</div>
|
||||
</div><!-- #block-history -->
|
||||
|
||||
<ul class="footer_links clearfix">
|
||||
<li><a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}"><span><i class="icon-chevron-left"></i> {l s='Back to your account'}</span></a></li>
|
||||
<li><a class="btn btn-default button button-small" href="{$base_dir}"><span><i class="icon-chevron-left"></i> {l s='Home'}</span></a></li>
|
||||
<li>
|
||||
<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}">
|
||||
<span>
|
||||
<i class="icon-chevron-left"></i> {l s='Back to your account'}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="btn btn-default button button-small" href="{$base_dir}">
|
||||
<span>
|
||||
<i class="icon-chevron-left"></i> {l s='Home'}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@@ -120,15 +120,20 @@ p.info-account {
|
||||
}
|
||||
}
|
||||
.label {white-space:normal; display:inline-block; padding:6px 10px;}
|
||||
.required {
|
||||
|
||||
sup {
|
||||
color:#f13340;
|
||||
font-size:13px;
|
||||
font-weight:bold;
|
||||
top:0;
|
||||
|
||||
label{
|
||||
&.required {
|
||||
&:before {
|
||||
content: "*";
|
||||
color: red;
|
||||
font-size: 14px;
|
||||
position: relative;
|
||||
line-height: 12px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.unvisible { display:none;}
|
||||
label {color:$base-title-color;}
|
||||
.checkbox {
|
||||
@@ -724,6 +729,8 @@ table.table_block td {
|
||||
top:-1px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/************************************* BOXES *****************************************************/
|
||||
.box {
|
||||
background:$base-box-bg;
|
||||
|
||||
Reference in New Issue
Block a user