Authored by Rock Zhang

Merge branch 'hotfix/yohocoinuse' into develop

Conflicts:
	static/js/cart/order-ensure.js
... ... @@ -79,14 +79,14 @@ $('.checkbox').on('touchstart', function() {
}
});
$('.invoice').on('touchend', '.checkbox', function() {
$invoice.on('touchend', '.checkbox', function() {
var $this = $(this);
if ($this.hasClass('icon-cb-checked')) {
$('.invoice').addClass('focus');
$invoice.addClass('focus');
}
if ($this.hasClass('icon-checkbox')) {
$('.invoice').removeClass('focus');
$invoice.removeClass('focus');
}
return false;
});
... ... @@ -243,10 +243,12 @@ $('.coin').on('touchend', function() {
orderCompute();
});
$invoice.on('touchend', function() {
$invoice.on('touchend', function(e) {
var $this = $(this);
orderInfo('invoice', $this.find('.checkbox').hasClass('icon-cb-checked'));
e.preventDefault();
e.stopPropagation();
});
$invoice.find('[name="invoice-title"]').on('blur', function() {
... ...