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

// Small fixes on AdminProduct tab

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12711 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-01-26 12:50:41 +00:00
parent 1aea427aaa
commit 735b3c07c0
6 changed files with 176 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/prices.tpl
+10 -10
View File
@@ -25,7 +25,7 @@
*}
{* BEGIN CUSTOMER AUTO-COMPLETE / TO REFACTO *}
{literal}
<script type="text/javascript">
var Customer = {
"hiddenField": jQuery('#id_customer'),
@@ -41,13 +41,13 @@ var Customer = {
}).focus(Customer.placeholderIn).blur(Customer.placeholderOut);
},
"placeholderIn": function() {
if (this.value == '{/literal}{l s='All customers'}{literal}') {
if (this.value == '{l s='All customers'}') {
this.value = '';
}
},
"placeholderOut": function() {
if (this.value == '') {
this.value = '{/literal}{l s='All customers'}{literal}';
this.value = '{l s='All customers'}';
}
},
"search": function()
@@ -55,13 +55,13 @@ var Customer = {
Customer.showLoader();
jQuery.ajax({
"type": "POST",
"url": "{/literal}{$link->getAdminLink('AdminProducts')}{literal}",
"url": "{$link->getAdminLink('AdminCustomers')}",
"async": true,
"dataType": "json",
"data": {
"ajax": "1",
"token": "{/literal}{$token}{literal}",
"tab": "AdminProducts",
"token": "{getAdminToken tab='AdminCustomers'}",
"tab": "AdminCustomers",
"action": "searchCustomers",
"customer_search": Customer.field.val()
},
@@ -73,14 +73,14 @@ var Customer = {
if(result.found) {
var html = '<ul class="clearfix">';
jQuery.each(result.customers, function() {
html += '<li><a class="fancybox" href="{/literal}{$link->getAdminLink('AdminCustomers')}{literal}&id_customer='+this.id_customer+'&viewcustomer&liteDisplaying=1">'+this.firstname+' '+this.lastname+'</a>'+(this.birthday ? ' - '+this.birthday:'')+'<br/>';
html += '<li><a class="fancybox" href="{$link->getAdminLink('AdminCustomers')}&id_customer='+this.id_customer+'&viewcustomer&liteDisplaying=1">'+this.firstname+' '+this.lastname+'</a>'+(this.birthday ? ' - '+this.birthday:'')+'<br/>';
html += '<a href="mailto:'+this.email+'">'+this.email+'</a><br />';
html += '<a onclick="Customer.select('+this.id_customer+', \''+this.firstname+' '+this.lastname+'\'); return false;" href="#" class="button">{/literal}{l s='Choose'}{literal}</a></li>';
html += '<a onclick="Customer.select('+this.id_customer+', \''+this.firstname+' '+this.lastname+'\'); return false;" href="#" class="button">{l s='Choose'}</a></li>';
});
html += '</ul>';
}
else
html = '<div class="warn">{/literal}{l s='No customers found'}{literal}</div>';
html = '<div class="warn">{l s='No customers found'}</div>';
Customer.hideLoader();
Customer.container.html(html);
jQuery('.fancybox', Customer.container).fancybox();
@@ -101,7 +101,7 @@ var Customer = {
};
jQuery(document).ready(Customer.init);
</script>
{/literal}
{* END CUSTOMER AUTO-COMPLETE / TO REFACTO *}
<h4>{l s='Product price'}</h4>
admin-dev/themes/default/template/form_submit_ajax.tpl
+3 -3
View File
@@ -26,12 +26,12 @@
<script type="text/javascript">
$(document).ready(function() {
$('#formAdd{$table}').submit(function(e) {
$('#{$table}_form').submit(function(e) {
e.preventDefault();
var form_datas = new Object;
form_datas['liteDisplaying'] = 1;
var form_inputs = $('#formAdd{$table} input, #formAdd{$table} textarea, #formAdd{$table} button');
var form_selects = $('#formAdd{$table} select');
var form_inputs = $('#{$table}_form input, #{$table}_form textarea, #{$table}_form button');
var form_selects = $('#{$table}_form select');
$.each(form_inputs, function() {
if (this.type == 'radio' || this.type == 'checkbox')
if (!this.checked)