diff --git a/admin-dev/themes/template/products/combinations.tpl b/admin-dev/themes/template/products/combinations.tpl index 451e35415..4aecce82d 100644 --- a/admin-dev/themes/template/products/combinations.tpl +++ b/admin-dev/themes/template/products/combinations.tpl @@ -195,8 +195,9 @@ {if $currency->format % 2 != 0}{$currency->sign}{/if} - - {if $currency->format % 2 == 0} {$currency->sign} {/if}({l s='overrides Wholesale price on Information tab'}) + + {if $currency->format % 2 == 0} {$currency->sign} {/if}({l s='leave blank if the price does not change'}) + diff --git a/js/admin-products.js b/js/admin-products.js index d50295932..44c1e6e3a 100644 --- a/js/admin-products.js +++ b/js/admin-products.js @@ -175,7 +175,16 @@ function editProductAttribute(ids, token) var virtual_product_expiration_date_attribute = data[0]['date_expiration']; var virtual_product_nb_days = data[0]['nb_days_accessible']; var is_shareable = data[0]['is_shareable']; - + if (wholesale_price != 0 && wholesale_price > 0) + { + $("#attribute_wholesale_price_full").show(); + $("#attribute_wholesale_price_blank").hide(); + } + else + { + $("#attribute_wholesale_price_full").hide(); + $("#attribute_wholesale_price_blank").show(); + } fillCombinaison( wholesale_price, price,