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

[-] Core: Fix PSCFV-2109 specific prices when updating product

Browse Source
This commit is contained in:
rGaillard
2012-05-19 14:55:28 +00:00
parent c7df242539
commit 70fc1fdf4e
7 changed files with 62 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/prices.tpl
+13 -2
View File
@@ -324,6 +324,12 @@ jQuery(document).ready(Customer.init);
$('#id_product_attribute').change(function() {
$('#sp_current_ht_price').html(product_prices[$('#id_product_attribute option:selected').val()]);
});
$('#leave_bprice').click(function() {
if (this.checked)
$('#sp_price').attr('disabled', 'disabled');
else
$('#sp_price').removeAttr('disabled');
});
$('.datepicker').datetimepicker({
prevText: '',
@@ -355,12 +361,17 @@ jQuery(document).ready(Customer.init);
<span id="spm_currency_sign_pre_0" style="font-weight:bold; color:#000000; font-size:12px">
{$currency->prefix}
</span>
<input type="text" name="sp_price" value="{$product->price|string_format:'%.2f'}" size="11" />
<input type="text" disabled="disabled" name="sp_price" id="sp_price" value="{$product->price|string_format:'%.2f'}" size="11" />
<span id="spm_currency_sign_post_0" style="font-weight:bold; color:#000000; font-size:12px">
{$currency->suffix}
</span>
</div>
<label>
{l s='Leave base price:'}
</label>
<div class="margin-form">
<input id="leave_bprice" type="checkbox" value="1" checked="checked" name="leave_bprice" />
</div>
<label>{l s='Apply a discount of:'}</label>
<div class="margin-form">
<input type="text" name="sp_reduction" value="0.00" size="11" />
admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
+6
View File
@@ -162,6 +162,12 @@ function new_condition_group()
toggle_condition_group(last_condition_group);
}
$(document).ready(function() {
$('#leave_bprice_on').click(function() {
if (this.checked)
$('#price').attr('disabled', 'disabled');
else
$('#price').removeAttr('disabled');
});
$('#specific_price_rule_form').live('submit', function(e) {
var html = '';
$.each(conditions, function() {