dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// update my account page for w3c

Browse Source
This commit is contained in:
sLorenzini committed 2013-12-06 15:57:38 +01:00
1 parent da3ca98dfd
commit ff08c1311b
7 files changed
+1586 -1449
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

themes/default-bootstrap/css/global.css
+1279 -1363
View File
File diff suppressed because it is too large. Load diff
themes/default-bootstrap/discount.tpl
+22 -6
View File
@@ -24,7 +24,9 @@
*} *}
{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} {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} {if isset($cart_rules) && count($cart_rules) && $nb_cart_rules}
<table class="discount table table-bordered footab"> <table class="discount table table-bordered footab">
@@ -44,7 +46,7 @@
<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}"> <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_code">{$discountDetail.code}</td>
<td class="discount_description">{$discountDetail.name}</td> <td class="discount_description">{$discountDetail.name}</td>
<td date-value="{$discountDetail.quantity_for_user}" class="discount_quantity">{$discountDetail.quantity_for_user}</td> <td data-value="{$discountDetail.quantity_for_user}" class="discount_quantity">{$discountDetail.quantity_for_user}</td>
<td class="discount_value"> <td class="discount_value">
{if $discountDetail.id_discount_type == 1} {if $discountDetail.id_discount_type == 1}
{$discountDetail.value|escape:'html':'UTF-8'}% {$discountDetail.value|escape:'html':'UTF-8'}%
@@ -56,7 +58,7 @@
- -
{/if} {/if}
</td> </td>
<td class="discount_minimum" date-value="{if $discountDetail.minimal == 0}0{else}{$discountDetail.minimal}{/if}"> <td class="discount_minimum" data-value="{if $discountDetail.minimal == 0}0{else}{$discountDetail.minimal}{/if}">
{if $discountDetail.minimal == 0} {if $discountDetail.minimal == 0}
{l s='None'} {l s='None'}
{else} {else}
@@ -70,7 +72,9 @@
<i class="icon-remove icon"></i> {l s='No'} <i class="icon-remove icon"></i> {l s='No'}
{/if} {/if}
</td> </td>
<td class="discount_expiration_date" date-value="{$discountDetail.date_to|regex_replace:"/[\-\:\ ]/":""}">{dateFormat date=$discountDetail.date_to}</td> <td class="discount_expiration_date" data-value="{$discountDetail.date_to|regex_replace:"/[\-\:\ ]/":""}">
{dateFormat date=$discountDetail.date_to}
</td>
</tr> </tr>
{/foreach} {/foreach}
</tbody> </tbody>
@@ -80,6 +84,18 @@
{/if} {/if}
<ul class="footer_links clearfix"> <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>
<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> <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> </ul>
themes/default-bootstrap/history.tpl
+82 -16
View File
@@ -23,13 +23,27 @@
* International Registered Trademark & Property of PrestaShop SA * 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"} {include file="$tpl_dir./errors.tpl"}
<h1 class="page-heading bottom-indent">{l s='Order history'}</h1> <h1 class="page-heading bottom-indent">
<p class="info-title">{l s='Here are the orders you\'ve placed since your account was created.'}</p> {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"> <div class="block-center" id="block-history">
{if $orders && count($orders)} {if $orders && count($orders)}
@@ -49,24 +63,66 @@
{foreach from=$orders item=order name=myLoop} {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}"> <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"> <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} {if isset($order.invoice) && $order.invoice && isset($order.virtual) && $order.virtual}
<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> <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>
<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 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 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"> <td class="history_invoice">
{if (isset($order.invoice) && $order.invoice && isset($order.invoice_number) && $order.invoice_number) && isset($invoiceAllowed) && $invoiceAllowed == true} {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> <a
{else}-{/if} 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>
<td class="history_detail"> <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> <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} {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'}"> <a
class="link-button"
href="{$link->getPageLink('order-opc', true, NULL, "submitReorder&id_order={$order.id_order}")|escape:'html'}"
title="{l s='Reorder'}">
{else} {else}
<a class="link-button" href="{$link->getPageLink('order', true, NULL, "submitReorder&id_order={$order.id_order}")|escape:'html'}" title="{l s='Reorder'}"> <a
class="link-button"
href="{$link->getPageLink('order', true, NULL, "submitReorder&id_order={$order.id_order}")|escape:'html'}"
title="{l s='Reorder'}">
{/if} {/if}
<i class="icon-refresh"></i>{l s='Reorder'} <i class="icon-refresh"></i>{l s='Reorder'}
</a> </a>
@@ -97,6 +153,16 @@
</div> </div>
<ul class="footer_links clearfix"> <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>
<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> <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> </ul>
themes/default-bootstrap/identity.tpl
+66 -33
View File
@@ -23,9 +23,21 @@
* International Registered Trademark & Property of PrestaShop SA * 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"> <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"} {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} {if isset($pwd_changed)}<br />{l s='Your password has been sent to your email:'} {$email}{/if}
</p> </p>
{else} {else}
<p class="info-title">{l s='Please be sure to update your personal information if it has changed.'}</p> <p class="info-title">
<p class="required"><sup>*</sup>{l s='Required field'}</p> {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"> <form action="{$link->getPageLink('identity', true)|escape:'html'}" method="post" class="std">
<fieldset> <fieldset>
<div class="clearfix"> <div class="clearfix">
@@ -51,19 +67,27 @@
{/foreach} {/foreach}
</div> </div>
<div class="required form-group"> <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}" /> <input class="is_required validate form-control" data-validate="isName" type="text" id="firstname" name="firstname" value="{$smarty.post.firstname}" />
</div> </div>
<div class="required form-group"> <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}" /> <input class="is_required validate form-control" data-validate="isName" type="text" name="lastname" id="lastname" value="{$smarty.post.lastname}" />
</div> </div>
<div class="required form-group"> <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}" /> <input class="is_required validate form-control" data-validate="isEmail" type="email" name="email" id="email" value="{$smarty.post.email}" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label>{l s='Date of Birth'}</label> <label>
{l s='Date of Birth'}
</label>
<div class="row"> <div class="row">
<div class="col-xs-4"> <div class="col-xs-4">
<select name="days" id="days" class="form-control"> <select name="days" id="days" class="form-control">
@@ -72,20 +96,7 @@
<option value="{$v}" {if ($sl_day == $v)}selected="selected"{/if}>{$v}&nbsp;&nbsp;</option> <option value="{$v}" {if ($sl_day == $v)}selected="selected"{/if}>{$v}&nbsp;&nbsp;</option>
{/foreach} {/foreach}
</select> </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> </div>
<div class="col-xs-4"> <div class="col-xs-4">
<select id="months" name="months" class="form-control"> <select id="months" name="months" class="form-control">
@@ -106,40 +117,62 @@
</div> </div>
</div> </div>
<div class="required form-group"> <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" /> <input class="is_required validate form-control" type="password" data-validate="isPasswd" name="old_passwd" id="old_passwd" />
</div> </div>
<div class="password form-group"> <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" /> <input class="is_required validate form-control" type="password" data-validate="isPasswd" name="passwd" id="passwd" />
</div> </div>
<div class="password form-group"> <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" /> <input class="is_required validate form-control" type="password" data-validate="isPasswd" name="confirmation" id="confirmation" />
</div> </div>
{if $newsletter} {if $newsletter}
<div class="checkbox"> <div class="checkbox">
<label for="newsletter"> <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"/> <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> {l s='Sign up for our newsletter!'}
</label>
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label for="optin"> <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"/> <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> {l s='Receive special offers from our partners!'}
</label>
</div> </div>
{/if} {/if}
<div class="form-group"> <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> </div>
<p id="security_informations" class="text-right"> <p id="security_informations" class="text-right">
<i>{l s='[Insert customer data privacy clause here, if applicable]'}</i> <i>{l s='[Insert customer data privacy clause here, if applicable]'}</i>
</p> </p>
</fieldset> </fieldset>
</form> </form> <!-- .std -->
{/if} {/if}
</div> </div>
<ul class="footer_links clearfix"> <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>
<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> <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> </ul>
themes/default-bootstrap/order-follow.tpl
+86 -16
View File
@@ -23,15 +23,30 @@
* International Registered Trademark & Property of PrestaShop SA * 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> <h1 class="page-heading bottom-indent">
{if isset($errorQuantity) && $errorQuantity}<p class="error">{l s='You do not have enough products to request an additional merchandise return.'}</p>{/if} {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} {if isset($errorMsg) && $errorMsg}
<p class="alert alert-danger"> <p class="alert alert-danger">
{l s='Please provide an explanation for your RMA.'} {l s='Please provide an explanation for your RMA.'}
</p> </p>
<p>
<form method="POST" id="returnOrderMessage"> <form method="POST" id="returnOrderMessage">
<p class="textarea form-group"> <p class="textarea form-group">
<label>{l s='Please provide an explanation for your RMA:'}</label> <label>{l s='Please provide an explanation for your RMA:'}</label>
@@ -45,15 +60,35 @@
{/foreach} {/foreach}
<input type="hidden" name="id_order" value="{$id_order}"/> <input type="hidden" name="id_order" value="{$id_order}"/>
<input class="unvisible" type="submit" name="submitReturnMerchandise" value="{l s='Make an RMA slip'}"/> <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> <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> </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> </p>
{/if} {/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"> <div class="block-center" id="block-history">
{if $ordersReturn && count($ordersReturn)} {if $ordersReturn && count($ordersReturn)}
<table id="order-list" class="table table-bordered footab"> <table id="order-list" class="table table-bordered footab">
@@ -69,13 +104,36 @@
<tbody> <tbody>
{foreach from=$ordersReturn item=return name=myLoop} {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}"> <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="bold">
<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> <a
<td class="history_method" data-value="{$return.state}"><span class="label label-info">{$return.state_name|escape:'html':'UTF-8'}</span></td> class="color-myaccount"
<td class="bold" data-value="{$return.date_add|regex_replace:"/[\-\:\ ]/":""}">{dateFormat date=$return.date_add full=0}</td> 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"> <td class="history_invoice">
{if $return.state == 2} {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> <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} {else}
-- --
{/if} {/if}
@@ -91,6 +149,18 @@
</div> </div>
<ul class="footer_links clearfix"> <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>
<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> <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> </ul>
themes/default-bootstrap/order-slip.tpl
+38 -9
View File
@@ -25,8 +25,12 @@
{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} {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> <h1 class="page-heading bottom-indent">
<p class="info-title">{l s='Credit slips you have received after cancelled orders'}.</p> {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"> <div class="block-center" id="block-history">
{if $ordersSlip && count($ordersSlip)} {if $ordersSlip && count($ordersSlip)}
<table id="order-list" class="table table-bordered footab"> <table id="order-list" class="table table-bordered footab">
@@ -41,11 +45,23 @@
<tbody> <tbody>
{foreach from=$ordersSlip item=slip name=myLoop} {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}"> <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="bold">
<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> <span class="color-myaccount">
<td class="bold" date-value="{$slip.date_add|regex_replace:"/[\-\:\ ]/":""}">{dateFormat date=$slip.date_add full=0}</td> {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"> <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> <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> </td>
</tr> </tr>
{/foreach} {/foreach}
@@ -55,8 +71,21 @@
{else} {else}
<p class="alert alert-warning">{l s='You have not received any credit slips.'}</p> <p class="alert alert-warning">{l s='You have not received any credit slips.'}</p>
{/if} {/if}
</div> </div><!-- #block-history -->
<ul class="footer_links clearfix"> <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>
<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> <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> </ul>
themes/default-bootstrap/sass/global.scss
+13 -6
View File
@@ -120,15 +120,20 @@ p.info-account {
} }
} }
.label {white-space:normal; display:inline-block; padding:6px 10px;} .label {white-space:normal; display:inline-block; padding:6px 10px;}
.required {
sup { label{
color:#f13340; &.required {
font-size:13px; &:before {
font-weight:bold; content: "*";
top:0; color: red;
font-size: 14px;
position: relative;
line-height: 12px;
} }
} }
}
.unvisible { display:none;} .unvisible { display:none;}
label {color:$base-title-color;} label {color:$base-title-color;}
.checkbox { .checkbox {
@@ -724,6 +729,8 @@ table.table_block td {
top:-1px; top:-1px;
} }
} }
/************************************* BOXES *****************************************************/ /************************************* BOXES *****************************************************/
.box { .box {
background:$base-box-bg; background:$base-box-bg;