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

// Fix #PSFV-323

Browse Source
This commit is contained in:
rMalie
2012-01-02 16:24:53 +00:00
parent e99a4d66f0
commit f99ef9dcfa
7 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/history.tpl
+2 -2
View File
@@ -58,7 +58,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}">
<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}, 'order-detail');">{l s='#'}{$order.id_order|string_format:"%06d"}</a>
<a class="color-myaccount" href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail')}');">{l s='#'}{$order.id_order|string_format:"%06d"}</a>
</td>
<td class="history_date bold">{dateFormat date=$order.date_add full=0}</td>
<td class="history_price"><span class="price">{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false}</span></td>
@@ -71,7 +71,7 @@
{else}-{/if}
</td>
<td class="history_detail">
<a class="color-myaccount" href="javascript:showOrder(1, {$order.id_order|intval}, 'order-detail');">{l s='details'}</a>
<a class="color-myaccount" href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail')}');">{l s='details'}</a>
{if isset($opc) && $opc}
<a href="{$link->getPageLink('order-opc', true, NULL, "submitReorder&id_order={$order.id_order}")}" title="{l s='Reorder'}">
{else}
themes/default/js/history.js
+6 -10
View File
@@ -27,14 +27,8 @@
//show the order-details with ajax
function showOrder(mode, var_content, file)
{
var url;
if (file.match(/^https?:\/\//))
url = file;
else
url = baseDir + file + '.php';
$.get(
url,
file,
((mode == 1) ? {'id_order': var_content, 'ajax': true} : {'id_order_return': var_content, 'ajax': true}),
function(data)
{
@@ -87,7 +81,8 @@ function showOrder(mode, var_content, file)
});
}
function updateOrderLineDisplay(domCheckbox){
function updateOrderLineDisplay(domCheckbox)
{
var lineQuantitySpan = $(domCheckbox).parent().parent().find('span.order_qte_span');
var lineQuantityInput = $(domCheckbox).parent().parent().find('input.order_qte_input');
if($(domCheckbox).is(':checked'))
@@ -104,14 +99,15 @@ function updateOrderLineDisplay(domCheckbox){
}
//send a message in relation to the order with ajax
function sendOrderMessage (){
function sendOrderMessage ()
{
paramString = "ajax=true";
$('form#sendOrderMessage').find('input, textarea').each(function(){
paramString += '&' + $(this).attr('name') + '=' + encodeURI($(this).val());
});
$.ajax({
type: "POST",
url: baseDir + "order-detail.php",
url: baseDir + "index.php?controller=order-detail",
data: paramString,
success: function (msg){
$('#block-order-detail').fadeOut('slow', function() {
themes/default/order-detail.tpl
+1 -1
View File
@@ -409,7 +409,7 @@
</ol>
</div>
{/if}
<form action="{$link->getPageLink('order-detail.php', true)}" method="post" class="std" id="sendOrderMessage">
<form action="{$link->getPageLink('order-detail', true)}" method="post" class="std" id="sendOrderMessage">
<h3>{l s='Add a message:'}</h3>
<p>{l s='If you would like to add a comment about your order, please write it below.'}</p>
<p>
themes/default/order-slip.tpl
+1 -1
View File
@@ -50,7 +50,7 @@
{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='#'}{$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}, 'order-detail');">{l s='#'}{$slip.id_order|string_format:"%06d"}</a></td>
<td class="history_method"><a class="color-myaccount" href="javascript:showOrder(1, {$slip.id_order|intval}, '{$link->getPageLink('order-detail')}');">{l s='#'}{$slip.id_order|string_format:"%06d"}</a></td>
<td class="bold">{dateFormat date=$slip.date_add full=0}</td>
<td class="history_invoice">
<a href="{$link->getPageLink('pdf-order-slip', true, NULL, "id_order_slip={$slip.id_order_slip|intval}")}" title="{l s='Credit slip'} {l s='#'}{$slip.id_order_slip|string_format:"%06d"}"><img src="{$img_dir}icon/pdf.gif" alt="{l s='Order slip'} {l s='#'}{$slip.id_order_slip|string_format:"%06d"}" class="icon" /></a>
themes/prestashop/history.tpl
+2 -2
View File
@@ -52,7 +52,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}">
<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}, 'order-detail');">{l s='#'}{$order.id_order|string_format:"%06d"}</a>
<a class="color-myaccount" href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail')}');">{l s='#'}{$order.id_order|string_format:"%06d"}</a>
</td>
<td class="history_date bold">{dateFormat date=$order.date_add full=0}</td>
<td class="history_price"><span class="price">{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false}</span></td>
@@ -65,7 +65,7 @@
{else}-{/if}
</td>
<td class="history_detail">
<a class="color-myaccount" href="javascript:showOrder(1, {$order.id_order|intval}, 'order-detail');">{l s='details'}</a>
<a class="color-myaccount" href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail')}');">{l s='details'}</a>
{if isset($opc) && $opc}
<a href="{$link->getPageLink('order-opc', true, NULL, "submitReorder&id_order={$order.id_order}")}" title="{l s='Reorder'}">
{else}
themes/prestashop/js/history.js
+1 -7
View File
@@ -27,14 +27,8 @@
//show the order-details with ajax
function showOrder(mode, var_content, file)
{
var url;
if (file.match(/^https?:\/\//))
url = file;
else
url = baseDir + file + '.php';
$.get(
url,
file,
((mode == 1) ? {'id_order': var_content, 'ajax': true} : {'id_order_return': var_content, 'ajax': true}),
function(data)
{
themes/prestashop/order-slip.tpl
+1 -1
View File
@@ -44,7 +44,7 @@
{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='#'}{$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}, 'order-detail');">{l s='#'}{$slip.id_order|string_format:"%06d"}</a></td>
<td class="history_method"><a class="color-myaccount" href="javascript:showOrder(1, {$slip.id_order|intval}, '{$link->getPageLink('order-detail')}');">{l s='#'}{$slip.id_order|string_format:"%06d"}</a></td>
<td class="bold">{dateFormat date=$slip.date_add full=0}</td>
<td class="history_invoice">
<a href="{$link->getPageLink('pdf-order-slip', true, NULL, "id_order_slip={$slip.id_order_slip|intval}")}" title="{l s='Credit slip'} {l s='#'}{$slip.id_order_slip|string_format:"%06d"}"><img src="{$img_dir}icon/pdf.gif" alt="{l s='Order slip'} {l s='#'}{$slip.id_order_slip|string_format:"%06d"}" class="icon" /></a>