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

[-] BO : fix bug #PSCFV-2522 - Unable to switch a product from virtual to normal

Browse Source
This commit is contained in:
tDidierjean
2012-05-22 13:23:35 +00:00
parent 10292451ec
commit 565ce7a2c1
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+1
View File
@@ -234,6 +234,7 @@
<form id="product_form" action="{$form_action}" method="post" enctype="multipart/form-data" name="product" style="display:none;"> <form id="product_form" action="{$form_action}" method="post" enctype="multipart/form-data" name="product" style="display:none;">
<input type="hidden" name="id_product" value="{$id_product}" /> <input type="hidden" name="id_product" value="{$id_product}" />
<input type="hidden" id="is_virtual" name="is_virtual" value="{$product->is_virtual}" />
<div class="tab-pane" id="tabPane1"> <div class="tab-pane" id="tabPane1">
{if !$product->active && $product->isAssociatedToShop()} {if !$product->active && $product->isAssociatedToShop()}
<div class="warn draft" > <div class="warn draft" >
admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
-1
View File
@@ -116,7 +116,6 @@
</div> </div>
{* [begin] virtual product *} {* [begin] virtual product *}
<div id="virtual_good" {if !$product->productDownload->id || $product->productDownload->active}style="display:none"{/if} > <div id="virtual_good" {if !$product->productDownload->id || $product->productDownload->active}style="display:none"{/if} >
<input type="hidden" id="is_virtual" name="is_virtual" value="{$product->is_virtual}" />
<div> <div>
<label>{l s='Does this product has an associated file?'}</label> <label>{l s='Does this product has an associated file?'}</label>
<label style="width:50px"><input type="radio" value="1" name="is_virtual_file" {if $product_downloaded}checked="checked"{/if} />{l s='Yes'}</label> <label style="width:50px"><input type="radio" value="1" name="is_virtual_file" {if $product_downloaded}checked="checked"{/if} />{l s='Yes'}</label>
js/admin-products.js
+4 -2
View File
@@ -816,9 +816,11 @@ product_tabs['Informations'] = new function(){
$('li.tab-row a[id*="Pack"]').hide(); $('li.tab-row a[id*="Pack"]').hide();
$('li.tab-row a[id*="VirtualProduct"]').hide(); $('li.tab-row a[id*="VirtualProduct"]').hide();
$('div.ppack').hide(); $('div.ppack').hide();
$('#is_virtual_good').removeAttr('checked');
$('div.is_virtual_good').hide(); $('div.is_virtual_good').hide();
$('#is_virtual').val(0); $('#is_virtual').val(0);
tabs_manager.onLoad('VirtualProduct', function(){
$('#is_virtual_good').removeAttr('checked');
});
product_type = $(this).val(); product_type = $(this).val();
@@ -855,11 +857,11 @@ product_tabs['Informations'] = new function(){
else else
{ {
$('li.tab-row a[id*="VirtualProduct"]').show().click(); $('li.tab-row a[id*="VirtualProduct"]').show().click();
$('#is_virtual').val(1);
tabs_manager.onLoad('VirtualProduct', function(){ tabs_manager.onLoad('VirtualProduct', function(){
$('#is_virtual_good').attr('checked', true); $('#is_virtual_good').attr('checked', true);
$('#virtual_good').show(); $('#virtual_good').show();
$('#is_virtual').val(1);
}); });
tabs_manager.onLoad('Quantities', function(){ tabs_manager.onLoad('Quantities', function(){