// id_warehouse is now on the order details and not on orders table

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10831 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2011-12-01 14:31:26 +00:00
parent b2f33740fe
commit 394206e9ef
9 changed files with 49 additions and 25 deletions
+3 -1
View File
@@ -639,4 +639,6 @@ $(document).ready(function() {
}
});
});
});
$('#gift').checkboxChange(function() { $('#gift_div').show('slow'); }, function() { $('#gift_div').hide('slow'); });
});
+1 -2
View File
@@ -740,5 +740,4 @@ $(document).ready(function() {
// If the multishipping mode is on, check the box "I want to specify a delivery address for each products I order.".
if (typeof(multishipping_mode) != 'undefined' && multishipping_mode)
$('#multishipping_mode_checkbox').click()
});
});
+16
View File
@@ -224,3 +224,19 @@ function resizeAddressesBox(nameBox)
});
$(nameBox).height(maxHeight);
}
$(document).ready(function() {
$.fn.checkboxChange = function(fnChecked, fnUnchecked) {
if ($(this).attr('checked') && fnChecked)
fnChecked.call(this);
else if(fnUnchecked)
fnUnchecked.call(this);
console.log('fff');
if (!$(this).attr('eventCheckboxChange'))
{
$(this).live('change', function() { $(this).checkboxChange(fnChecked, fnUnchecked) });
$(this).attr('eventCheckboxChange', true);
}
}
});
+1 -1
View File
@@ -196,7 +196,7 @@
{if $giftAllowed}
<h3 class="gift_title">{l s='Gift'}</h3>
<p class="checkbox">
<input type="checkbox" name="gift" id="gift" value="1" {if $cart->gift == 1}checked="checked"{/if} onclick="$('#gift_div').toggle('slow');" />
<input type="checkbox" name="gift" id="gift" value="1" {if $cart->gift == 1}checked="checked"{/if} />
<label for="gift">{l s='I would like the order to be gift-wrapped.'}</label>
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;