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

// #PSTEST-1229 - make sure you cannot select virtual product if you have combinations

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14857 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2012-04-24 16:45:00 +00:00
parent 26520b40a7
commit 2a97927eba
4 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/admin-products.js
+23 -15
View File
@@ -832,25 +832,33 @@ product_tabs['Informations'] = new function(){
}
else if (product_type == product_type_virtual)
{
$('li.tab-row a[id*="VirtualProduct"]').show().click();
if (has_combinations)
{
$('#simple_product').attr('checked', 'checked');
$('#warn_virtual_combinations').show();
}
else
{
$('li.tab-row a[id*="VirtualProduct"]').show().click();
tabs_manager.onLoad('VirtualProduct', function(){
$('#is_virtual_good').attr('checked', true);
$('#virtual_good').show();
$('#is_virtual').val(1);
});
tabs_manager.onLoad('VirtualProduct', function(){
$('#is_virtual_good').attr('checked', true);
$('#virtual_good').show();
$('#is_virtual').val(1);
});
tabs_manager.onLoad('Quantities', function(){
$('.stockForVirtualProduct').hide();
});
tabs_manager.onLoad('Quantities', function(){
$('.stockForVirtualProduct').hide();
});
$('li.tab-row a[id*="Shipping"]').hide();
$('li.tab-row a[id*="Shipping"]').hide();
tabs_manager.onLoad('Informations', function(){
$('#condition').attr('disabled', 'disabled');
$('#condition option[value=refurbished]').removeAttr('selected');
$('#condition option[value=used]').removeAttr('selected');
});
tabs_manager.onLoad('Informations', function(){
$('#condition').attr('disabled', 'disabled');
$('#condition option[value=refurbished]').removeAttr('selected');
$('#condition option[value=used]').removeAttr('selected');
});
}
}
else
{