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

// Fix small bugs on backoffice orders

Browse Source
This commit is contained in:
rGaillard
2012-03-09 17:19:39 +00:00
parent a949523612
commit d8db6c8ba7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/orders/form.tpl
+5 -2
View File
@@ -78,9 +78,11 @@
$(this).html(txt_show_carts); $(this).html(txt_show_carts);
$('#old_carts_orders').slideUp('slow'); $('#old_carts_orders').slideUp('slow');
} }
return false;
}); });
$('#send_email_to_customer').click(function(){ $('#send_email_to_customer').click(function(){
sendMailToCustomer(); sendMailToCustomer();
return false;
}); });
$('#show_old_carts').click(); $('#show_old_carts').click();
$.ajaxSetup({ type:"post" }); $.ajaxSetup({ type:"post" });
@@ -162,6 +164,7 @@
$('.use_cart').live('click', function(e) { $('.use_cart').live('click', function(e) {
e.preventDefault(); e.preventDefault();
useCart($(this).attr('rel')); useCart($(this).attr('rel'));
return false;
}); });
$('.duplicate_order').live('click', function(e) { $('.duplicate_order').live('click', function(e) {
@@ -400,7 +403,7 @@
$.each(res.customers, function() { $.each(res.customers, function() {
html += '<li class="customerCard"><div class="customerName"><a class="fancybox" href="{$link->getAdminLink('AdminCustomers')}&id_customer='+this.id_customer+'&viewcustomer&liteDisplaying=1">'+this.firstname+' '+this.lastname+'</a><span class="customerBirthday"> '+((this.birthday) ? this.birthday : '')+'</span></div>'; html += '<li class="customerCard"><div class="customerName"><a class="fancybox" href="{$link->getAdminLink('AdminCustomers')}&id_customer='+this.id_customer+'&viewcustomer&liteDisplaying=1">'+this.firstname+' '+this.lastname+'</a><span class="customerBirthday"> '+((this.birthday) ? this.birthday : '')+'</span></div>';
html += '<div class="customerEmail"><a href="mailto:'+this.email+'">'+this.email+'</div>'; html += '<div class="customerEmail"><a href="mailto:'+this.email+'">'+this.email+'</div>';
html += '<a onclick="setupCustomer('+ this.id_customer+');" href="#" class="id_customer button">{l s='Choose'}</a></li>'; html += '<a onclick="setupCustomer('+ this.id_customer+');return false;" href="#" class="id_customer button">{l s='Choose'}</a></li>';
}); });
html += '</ul>'; html += '</ul>';
} }
@@ -1030,7 +1033,7 @@
</p> </p>
<p> <p>
<label for="shipping_price">{l s='Shipping price:'}</label> <input type="text" id="shipping_price" name="shipping_price" size="7" />&nbsp;<span class="currency_sign"></span>&nbsp; <label for="shipping_price">{l s='Shipping price:'}</label> <input type="text" id="shipping_price" name="shipping_price" size="7" />&nbsp;<span class="currency_sign"></span>&nbsp;
<a class="button" href="#" onclick="resetShippingPrice()">{l s='Reset shipping price'}</a> <a class="button" href="#" onclick="resetShippingPrice();return false;">{l s='Reset shipping price'}</a>
</p> </p>
</div> </div>
<div id="float:left;"> <div id="float:left;">