[-] FO : Fix bug #PSCFV-8028 refactoring customization
This commit is contained in:
gRoussac
+6
-7
@@ -1140,8 +1140,8 @@ class CartCore extends ObjectModel
|
||||
'SELECT `quantity`
|
||||
FROM `'._DB_PREFIX_.'cart_product`
|
||||
WHERE `id_product` = '.(int)$id_product.'
|
||||
AND `id_product_attribute` = '.(int)$id_product_attribute
|
||||
);
|
||||
AND `id_cart` = '.(int)$this->id.'
|
||||
AND `id_product_attribute` = '.(int)$id_product_attribute);
|
||||
|
||||
$customization_quantity = (int)Db::getInstance()->getValue('
|
||||
SELECT `quantity`
|
||||
@@ -1151,12 +1151,12 @@ class CartCore extends ObjectModel
|
||||
AND `id_product_attribute` = '.(int)$id_product_attribute.'
|
||||
'.((int)$id_address_delivery ? 'AND `id_address_delivery` = '.(int)$id_address_delivery : ''));
|
||||
|
||||
if (!$this->_deleteCustomization((int)$id_customization, (int)$id_product, (int)$id_product_attribute, $id_address_delivery))
|
||||
if (!$this->_deleteCustomization((int)$id_customization, (int)$id_product, (int)$id_product_attribute, (int)$id_address_delivery))
|
||||
return false;
|
||||
|
||||
// refresh cache of self::_products
|
||||
$this->_products = $this->getProducts(true);
|
||||
return ($this->deleteProduct((int)$id_product, $id_product_attribute, $id_address_delivery) && $customization_quantity == $product_total_quantity);
|
||||
return ($customization_quantity == $product_total_quantity && $this->deleteProduct((int)$id_product, (int)$id_product_attribute, null, (int)$id_address_delivery));
|
||||
}
|
||||
|
||||
/* Get customization quantity */
|
||||
@@ -1165,8 +1165,7 @@ class CartCore extends ObjectModel
|
||||
FROM `'._DB_PREFIX_.'customization`
|
||||
WHERE `id_cart` = '.(int)$this->id.'
|
||||
AND `id_product` = '.(int)$id_product.'
|
||||
AND `id_product_attribute` = '.(int)$id_product_attribute
|
||||
);
|
||||
AND `id_product_attribute` = '.(int)$id_product_attribute);
|
||||
|
||||
if ($result === false)
|
||||
return false;
|
||||
@@ -1180,7 +1179,7 @@ class CartCore extends ObjectModel
|
||||
AND `id_product` = '.(int)$id_product.
|
||||
($id_product_attribute != null ? ' AND `id_product_attribute` = '.(int)$id_product_attribute : '')
|
||||
);
|
||||
|
||||
|
||||
/* Product deletion */
|
||||
$result = Db::getInstance()->execute('
|
||||
DELETE FROM `'._DB_PREFIX_.'cart_product`
|
||||
|
||||
@@ -576,16 +576,17 @@ class OrderOpcControllerCore extends ParentOrderController
|
||||
protected function getFormatedSummaryDetail()
|
||||
{
|
||||
$result = array('summary' => $this->context->cart->getSummaryDetails(),
|
||||
'customizedDatas' => Product::getAllCustomizedDatas($this->context->cart->id, null, true)
|
||||
);
|
||||
'customizedDatas' => Product::getAllCustomizedDatas($this->context->cart->id, null, true));
|
||||
|
||||
foreach ($result['summary']['products'] as $key => &$product)
|
||||
{
|
||||
$product['quantity_without_customization'] = $product['quantity'];
|
||||
if ($result['customizedDatas'])
|
||||
{
|
||||
foreach ($result['customizedDatas'][(int)$product['id_product']][(int)$product['id_product_attribute']] as $addresses)
|
||||
foreach ($addresses as $customization)
|
||||
$product['quantity_without_customization'] -= (int)$customization['quantity'];
|
||||
if (isset($result['customizedDatas'][(int)$product['id_product']][(int)$product['id_product_attribute']]))
|
||||
foreach ($result['customizedDatas'][(int)$product['id_product']][(int)$product['id_product_attribute']] as $addresses)
|
||||
foreach ($addresses as $customization)
|
||||
$product['quantity_without_customization'] -= (int)$customization['quantity'];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -427,6 +427,7 @@ var ajaxCart = {
|
||||
if (this.id != undefined)
|
||||
{
|
||||
//create a container for listing the products and hide the 'no product in the cart' message (only if the cart was empty)
|
||||
|
||||
if ($('#cart_block dl.products').length == 0)
|
||||
{
|
||||
$('#cart_block_no_products').before('<dl class="products"></dl>');
|
||||
@@ -434,9 +435,8 @@ var ajaxCart = {
|
||||
}
|
||||
//if product is not in the displayed cart, add a new product's line
|
||||
var domIdProduct = this.id + '_' + (this.idCombination ? this.idCombination : '0') + '_' + (this.idAddressDelivery ? this.idAddressDelivery : '0');
|
||||
|
||||
var domIdProductAttribute = this.id + '_' + (this.idCombination ? this.idCombination : '0');
|
||||
if ($('#cart_block_product_'+ domIdProduct ).length == 0)
|
||||
if ($('#cart_block_product_'+ domIdProduct).length == 0)
|
||||
{
|
||||
var productId = parseInt(this.id);
|
||||
var productAttributeId = (this.hasAttributes ? parseInt(this.attributes) : 0);
|
||||
@@ -463,10 +463,9 @@ var ajaxCart = {
|
||||
//else update the product's line
|
||||
else
|
||||
{
|
||||
var jsonProduct = this;
|
||||
if($.trim($('#cart_block_product_' + domIdProduct + ' .quantity').text()) != jsonProduct.quantity || $.trim($('dt#cart_block_product_' + domIdProduct + ' .price').text()) != jsonProduct.priceByLine)
|
||||
var jsonProduct = this;
|
||||
if($.trim($('#cart_block_product_' + domIdProduct + ' .quantity').html()) != jsonProduct.quantity || $.trim($('#cart_block_product_' + domIdProduct + ' .price').html()) != jsonProduct.priceByLine)
|
||||
{
|
||||
|
||||
// Usual product
|
||||
if (!this.is_gift)
|
||||
$('#cart_block_product_' + domIdProduct + ' .price').text(jsonProduct.priceByLine);
|
||||
|
||||
@@ -208,22 +208,31 @@ function changeAddressDelivery(obj)
|
||||
|
||||
function updateAddressId(id_product, id_product_attribute, old_id_address_delivery, id_address_delivery, line)
|
||||
{
|
||||
if (typeof(line) == 'undefined')
|
||||
line = $('#product_' + id_product+'_' + id_product_attribute + '_0_' + old_id_address_delivery);
|
||||
if (typeof(line) == 'undefined' || line.length == 0)
|
||||
line = $('#product_' + id_product + '_' + id_product_attribute + '_0_' + old_id_address_delivery + ', #product_' + id_product + '_' + id_product_attribute + '_nocustom_' + old_id_address_delivery);
|
||||
|
||||
$('.product_customization_for_' + id_product + '_' + id_product_attribute + '_' + old_id_address_delivery).each(function(){
|
||||
$(this).attr('id', $(this).attr('id').replace(/_\d+$/, '_' + id_address_delivery)).removeClass('product_customization_for_' + id_product + '_' + id_product_attribute + '_' + old_id_address_delivery + ' address_' + old_id_address_delivery).addClass('product_customization_for_' + id_product + '_' + id_product_attribute + '_' + id_address_delivery + ' address_' + id_address_delivery);
|
||||
$(this).find('input[name^=quantity_]').each(function(){
|
||||
if (typeof($(this).attr('name')) != 'undefined')
|
||||
$(this).attr('name', $(this).attr('name').replace(/_\d+(_hidden|)$/, '_' + id_address_delivery));
|
||||
});
|
||||
$(this).find('a').each(function(){
|
||||
if (typeof($(this).attr('href')) != 'undefined')
|
||||
$(this).attr('href', $(this).attr('href').replace(/id_address_delivery=\d+/, 'id_address_delivery=' + id_address_delivery));
|
||||
});
|
||||
});
|
||||
|
||||
line.attr('id', 'product_' + id_product+'_' + id_product_attribute + '_0_' + id_address_delivery);
|
||||
line.find('.cart_quantity_input')
|
||||
.attr('name', 'quantity_' + id_product+'_' + id_product_attribute + '_0_' + id_address_delivery);
|
||||
line.find('input[name=quantity_' + id_product+'_' + id_product_attribute + '_0_' + old_id_address_delivery + '_hidden]')
|
||||
.attr('name', 'quantity_' + id_product+'_' + id_product_attribute + '_0_' + id_address_delivery + '_hidden');
|
||||
line.find('#cart_quantity_down_' + id_product+'_' + id_product_attribute + '_0_' + old_id_address_delivery)
|
||||
.attr('id', 'cart_quantity_down_' + id_product+'_' + id_product_attribute + '_0_' + id_address_delivery);
|
||||
line.find('#cart_quantity_up_' + id_product+'_' + id_product_attribute + '_0_' + old_id_address_delivery)
|
||||
.attr('id', 'cart_quantity_up_' + id_product+'_' + id_product_attribute + '_0_' + id_address_delivery);
|
||||
line.find('#' + id_product+'_' + id_product_attribute + '_0_' + old_id_address_delivery)
|
||||
.attr('id', id_product+'_' + id_product_attribute + '_0_' + id_address_delivery);
|
||||
line.find('#select_address_delivery_' + id_product+'_' + id_product_attribute + '_' + old_id_address_delivery)
|
||||
.attr('id', 'select_address_delivery_' + id_product+'_' + id_product_attribute + '_' + id_address_delivery);
|
||||
line.attr('id', line.attr('id').replace(/_\d+$/, '_' + id_address_delivery)).removeClass('address_' + old_id_address_delivery).addClass('address_' + id_address_delivery).find('span[id^=cart_quantity_custom_], input[name^=quantity_], .cart_quantity_down, .cart_quantity_up, .cart_quantity_delete').each(function(){
|
||||
if (typeof($(this).attr('name')) != 'undefined')
|
||||
$(this).attr('name', $(this).attr('name').replace(/_\d+(_hidden|)$/, '_' + id_address_delivery));
|
||||
if (typeof($(this).attr('id')) != 'undefined')
|
||||
$(this).attr('id', $(this).attr('id').replace(/_\d+$/, '_' + id_address_delivery));
|
||||
if (typeof($(this).attr('href')) != 'undefined')
|
||||
$(this).attr('href', $(this).attr('href').replace(/id_address_delivery=\d+/, 'id_address_delivery=' + id_address_delivery));
|
||||
});
|
||||
|
||||
line.find('#select_address_delivery_' + id_product + '_' + id_product_attribute + '_' + old_id_address_delivery).attr('id', 'select_address_delivery_' + id_product + '_' + id_product_attribute + '_' + id_address_delivery);
|
||||
}
|
||||
|
||||
function updateQty(val, cart, el)
|
||||
@@ -236,6 +245,7 @@ function updateQty(val, cart, el)
|
||||
prefix = '#fancybox-content ';
|
||||
|
||||
var id = $(el).attr('name');
|
||||
|
||||
var exp = new RegExp("^[0-9]+$");
|
||||
|
||||
if (exp.test(val) == true)
|
||||
@@ -267,7 +277,7 @@ function deleteProductFromSummary(id)
|
||||
productId = parseInt(ids[0]);
|
||||
if (typeof(ids[1]) !== 'undefined')
|
||||
productAttributeId = parseInt(ids[1]);
|
||||
if (typeof(ids[2]) !== 'undefined')
|
||||
if (typeof(ids[2]) !== 'undefined' && ids[2] !== 'nocustom')
|
||||
customizationId = parseInt(ids[2]);
|
||||
if (typeof(ids[3]) !== 'undefined')
|
||||
id_address_delivery = parseInt(ids[3]);
|
||||
@@ -326,22 +336,36 @@ function deleteProductFromSummary(id)
|
||||
if (!customizationId)
|
||||
refreshOddRow();
|
||||
});
|
||||
|
||||
var exist = false;
|
||||
for (i=0;i<jsonData.summary.products.length;i++)
|
||||
{
|
||||
if (jsonData.summary.products[i].id_product == productId
|
||||
&& jsonData.summary.products[i].id_product_attribute == productAttributeId
|
||||
&& jsonData.summary.products[i].id_address_delivery == id_address_delivery)
|
||||
exist = true;
|
||||
|
||||
&& jsonData.summary.products[i].id_address_delivery == id_address_delivery
|
||||
&& (parseInt(jsonData.summary.products[i].customization_quantity) > 1))
|
||||
exist = true;
|
||||
}
|
||||
// if all customization removed => delete product line
|
||||
if (!exist && customizationId && parseInt($('#cart_quantity_custom_' + productId + (productAttributeId > 0 ? '_' + productAttributeId : '') + '_0_' + id_address_delivery).html()) == 1)
|
||||
if (!exist && customizationId)
|
||||
$('#product_' + productId + '_' + productAttributeId + '_0_' + id_address_delivery).fadeOut('slow', function() {
|
||||
$(this).remove();
|
||||
var line = $('#product_' + productId + '_' + productAttributeId + '_nocustom_' + id_address_delivery);
|
||||
if (line.length > 0)
|
||||
{
|
||||
line.find('input[name^=quantity_], .cart_quantity_down, .cart_quantity_up, .cart_quantity_delete').each(function(){
|
||||
if (typeof($(this).attr('name')) != 'undefined')
|
||||
$(this).attr('name', $(this).attr('name').replace(/nocustom/, '0'));
|
||||
if (typeof($(this).attr('id')) != 'undefined')
|
||||
$(this).attr('id', $(this).attr('id').replace(/nocustom/, '0'));
|
||||
});
|
||||
line.find('span[id^=total_product_price_]').each(function(){
|
||||
$(this).attr('id', $(this).attr('id').replace(/_nocustom/, ''));
|
||||
});
|
||||
line.attr('id', line.attr('id').replace(/nocustom/, '0'));
|
||||
}
|
||||
refreshOddRow();
|
||||
});
|
||||
}
|
||||
|
||||
updateCartSummary(jsonData.summary);
|
||||
updateCustomizedDatas(jsonData.customizedDatas);
|
||||
updateHookShoppingCart(jsonData.HOOK_SHOPPING_CART);
|
||||
@@ -393,10 +417,11 @@ function upQuantity(id, qty)
|
||||
productId = parseInt(ids[0]);
|
||||
if (typeof(ids[1]) !== 'undefined')
|
||||
productAttributeId = parseInt(ids[1]);
|
||||
if (typeof(ids[2]) !== 'undefined')
|
||||
if (typeof(ids[2]) !== 'undefined' && ids[2] !== 'nocustom')
|
||||
customizationId = parseInt(ids[2]);
|
||||
if (typeof(ids[3]) !== 'undefined')
|
||||
id_address_delivery = parseInt(ids[3]);
|
||||
|
||||
$.ajax({
|
||||
type: 'POST',
|
||||
headers: { "cache-control": "no-cache" },
|
||||
@@ -409,12 +434,12 @@ function upQuantity(id, qty)
|
||||
+'&add=true'
|
||||
+'&getproductprice=true'
|
||||
+'&summary=true'
|
||||
+'&id_product='+productId
|
||||
+'&ipa='+productAttributeId
|
||||
+'&id_address_delivery='+id_address_delivery
|
||||
+ ( (customizationId !== 0) ? '&id_customization='+customizationId : '')
|
||||
+'&qty='+qty
|
||||
+'&token='+static_token
|
||||
+'&id_product=' + productId
|
||||
+'&ipa=' + productAttributeId
|
||||
+'&id_address_delivery=' + id_address_delivery
|
||||
+ ((customizationId !== 0) ? '&id_customization=' + customizationId : '')
|
||||
+'&qty=' + qty
|
||||
+'&token=' + static_token
|
||||
+'&allow_refresh=1',
|
||||
success: function(jsonData)
|
||||
{
|
||||
@@ -433,7 +458,8 @@ function upQuantity(id, qty)
|
||||
if (jsonData.refresh)
|
||||
location.reload();
|
||||
updateCartSummary(jsonData.summary);
|
||||
updateCustomizedDatas(jsonData.customizedDatas);
|
||||
if (customizationId !== 0)
|
||||
updateCustomizedDatas(jsonData.customizedDatas);
|
||||
updateHookShoppingCart(jsonData.HOOK_SHOPPING_CART);
|
||||
updateHookShoppingCartExtra(jsonData.HOOK_SHOPPING_CART_EXTRA);
|
||||
if (typeof(getCarrierListAndUpdate) !== 'undefined')
|
||||
@@ -471,7 +497,7 @@ function downQuantity(id, qty)
|
||||
productId = parseInt(ids[0]);
|
||||
if (typeof(ids[1]) !== 'undefined')
|
||||
productAttributeId = parseInt(ids[1]);
|
||||
if (typeof(ids[2]) !== 'undefined')
|
||||
if (typeof(ids[2]) !== 'undefined' && ids[2] !== 'nocustom')
|
||||
customizationId = parseInt(ids[2]);
|
||||
if (typeof(ids[3]) !== 'undefined')
|
||||
id_address_delivery = parseInt(ids[3]);
|
||||
@@ -515,7 +541,8 @@ function downQuantity(id, qty)
|
||||
if (jsonData.refresh)
|
||||
location.reload();
|
||||
updateCartSummary(jsonData.summary);
|
||||
updateCustomizedDatas(jsonData.customizedDatas);
|
||||
if (customizationId !== 0)
|
||||
updateCustomizedDatas(jsonData.customizedDatas);
|
||||
updateHookShoppingCart(jsonData.HOOK_SHOPPING_CART);
|
||||
updateHookShoppingCartExtra(jsonData.HOOK_SHOPPING_CART_EXTRA);
|
||||
|
||||
@@ -543,37 +570,28 @@ function downQuantity(id, qty)
|
||||
|
||||
function updateCartSummary(json)
|
||||
{
|
||||
// Update products prices + discount
|
||||
var i;
|
||||
var nbrProducts = 0;
|
||||
var product_list = new Array();
|
||||
|
||||
if (typeof json == 'undefined')
|
||||
return;
|
||||
|
||||
$('div.error').fadeOut();
|
||||
|
||||
$('.cart_quantity_input').val(0);
|
||||
|
||||
product_list = {};
|
||||
for (i=0;i<json.products.length;i++)
|
||||
product_list[json.products[i].id_product+'_'+json.products[i].id_product_attribute+'_'+json.products[i].id_address_delivery] = json.products[i];
|
||||
|
||||
if (!$('.multishipping-cart:visible').length)
|
||||
{
|
||||
for (i=0;i<json.gift_products.length;i++)
|
||||
{
|
||||
if (typeof(product_list[json.gift_products[i].id_product+'_'+json.gift_products[i].id_product_attribute+'_'+json.gift_products[i].id_address_delivery]) !== 'undefined')
|
||||
product_list[json.gift_products[i].id_product+'_'+json.gift_products[i].id_product_attribute+'_'+json.gift_products[i].id_address_delivery].quantity -= json.gift_products[i].cart_quantity;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (i=0;i<json.gift_products.length;i++)
|
||||
{
|
||||
if (typeof(product_list[json.gift_products[i].id_product+'_'+json.gift_products[i].id_product_attribute+'_'+json.gift_products[i].id_address_delivery]) == 'undefined')
|
||||
product_list[json.gift_products[i].id_product+'_'+json.gift_products[i].id_product_attribute+'_'+json.gift_products[i].id_address_delivery] = json.gift_products[i];
|
||||
}
|
||||
}
|
||||
|
||||
for (i in product_list)
|
||||
{
|
||||
@@ -589,38 +607,37 @@ function updateCartSummary(json)
|
||||
else
|
||||
current_price = formatCurrency(product_list[i].price_wt, currencyFormat, currencySign, currencyBlank);
|
||||
if (reduction && typeof(initial_price) !== 'undefined')
|
||||
{
|
||||
if (initial_price !== '' && product_list[i].price_without_quantity_discount > product_list[i].price)
|
||||
initial_price_text = '<span style="text-decoration:line-through;">' + initial_price + '</span><br />';
|
||||
}
|
||||
|
||||
key_for_blockcart = product_list[i].id_product + '_' + product_list[i].id_product_attribute + '_' + product_list[i].id_address_delivery;
|
||||
|
||||
$('#cart_block_product_'+ key_for_blockcart + ' span.quantity').html(product_list[i].quantity);
|
||||
var key_for_blockcart = product_list[i].id_product + '_' + product_list[i].id_product_attribute + '_' + product_list[i].id_address_delivery;
|
||||
var key_for_blockcart_nocustom = product_list[i].id_product + '_' + product_list[i].id_product_attribute + '_' + ((product_list[i].quantity_without_customization != product_list[i].quantity)? 'nocustom' : '0') + '_' + product_list[i].id_address_delivery;
|
||||
|
||||
if (priceDisplayMethod !== 0)
|
||||
{
|
||||
$('#cart_block_product_' + key_for_blockcart + ' span.price').html(formatCurrency(product_list[i].total, currencyFormat, currencySign, currencyBlank));
|
||||
$('#product_price_' + key_for_blockcart).html(initial_price_text+current_price);
|
||||
$('#total_product_price_' + key_for_blockcart).html(formatCurrency(product_list[i].total, currencyFormat, currencySign, currencyBlank));
|
||||
$('#product_price_' + key_for_blockcart).html(initial_price_text + current_price);
|
||||
if (typeof(product_list[i].customizationQuantityTotal) !== 'undefined' && product_list[i].customizationQuantityTotal > 0)
|
||||
$('#total_product_price_' + key_for_blockcart).html(formatCurrency(product_list[i].total_customization, currencyFormat, currencySign, currencyBlank));
|
||||
else
|
||||
$('#total_product_price_' + key_for_blockcart).html(formatCurrency(product_list[i].total, currencyFormat, currencySign, currencyBlank));
|
||||
if (product_list[i].quantity_without_customization != product_list[i].quantity)
|
||||
$('#total_product_price_' + key_for_blockcart_nocustom).html(formatCurrency(product_list[i].total, currencyFormat, currencySign, currencyBlank));
|
||||
}
|
||||
else
|
||||
{
|
||||
$('#cart_block_product_' + key_for_blockcart + ' span.price').html(formatCurrency(product_list[i].total_wt, currencyFormat, currencySign, currencyBlank));
|
||||
$('#product_price_' + key_for_blockcart).html(initial_price_text+current_price);
|
||||
$('#total_product_price_' + key_for_blockcart).html(formatCurrency(product_list[i].total_wt, currencyFormat, currencySign, currencyBlank));
|
||||
}
|
||||
|
||||
nbrProducts += parseInt(product_list[i].quantity);
|
||||
$('input[name=quantity_' + product_list[i].id_product + '_' + product_list[i].id_product_attribute + '_0_' + product_list[i].id_address_delivery + ']').val(product_list[i].quantity_without_customization);
|
||||
$('input[name=quantity_' + product_list[i].id_product + '_' + product_list[i].id_product_attribute + '_0_' + product_list[i].id_address_delivery + '_hidden]').val(product_list[i].quantity_without_customization);
|
||||
|
||||
if (typeof(product_list[i].customizationQuantityTotal) !== 'undefined')
|
||||
{
|
||||
$('#cart_quantity_custom_' + key_for_blockcart)
|
||||
.html(product_list[i].customizationQuantityTotal);
|
||||
$('input[name=quantity_' + product_list[i].id_product + '_' + product_list[i].id_product_attribute + '_' + product_list[i].id_customization + '_' + product_list[i].id_address_delivery + ']').val(product_list[i].customizationQuantityTotal);
|
||||
{
|
||||
$('#product_price_' + key_for_blockcart).html(initial_price_text + current_price);
|
||||
if (typeof(product_list[i].customizationQuantityTotal) !== 'undefined' && product_list[i].customizationQuantityTotal > 0)
|
||||
$('#total_product_price_' + key_for_blockcart).html(formatCurrency(product_list[i].total_customization_wt, currencyFormat, currencySign, currencyBlank));
|
||||
else
|
||||
$('#total_product_price_' + key_for_blockcart).html(formatCurrency(product_list[i].total_wt, currencyFormat, currencySign, currencyBlank));
|
||||
if (product_list[i].quantity_without_customization != product_list[i].quantity)
|
||||
$('#total_product_price_' + key_for_blockcart_nocustom).html(formatCurrency(product_list[i].total_wt, currencyFormat, currencySign, currencyBlank));
|
||||
}
|
||||
$('input[name=quantity_' + key_for_blockcart_nocustom + ']').val(product_list[i].quantity_without_customization);
|
||||
$('input[name=quantity_' + key_for_blockcart_nocustom + '_hidden]').val(product_list[i].quantity_without_customization);
|
||||
if (typeof(product_list[i].customizationQuantityTotal) !== 'undefined' && product_list[i].customizationQuantityTotal > 0)
|
||||
$('#cart_quantity_custom_' + key_for_blockcart).html(product_list[i].customizationQuantityTotal);
|
||||
nbrProducts += parseInt(product_list[i].quantity);
|
||||
}
|
||||
|
||||
// Update discounts
|
||||
@@ -644,20 +661,15 @@ function updateCartSummary(json)
|
||||
var toDelete = true;
|
||||
|
||||
for (i=0;i<json.discounts.length;i++)
|
||||
{
|
||||
if (json.discounts[i].id_discount == idElmt)
|
||||
{
|
||||
if (json.discounts[i].value_real !== '!')
|
||||
{
|
||||
if (priceDisplayMethod !== 0)
|
||||
$('#cart_discount_' + idElmt + ' td.cart_discount_price span.price-discount').html(formatCurrency(json.discounts[i].value_tax_exc * -1, currencyFormat, currencySign, currencyBlank));
|
||||
else
|
||||
$('#cart_discount_' + idElmt + ' td.cart_discount_price span.price-discount').html(formatCurrency(json.discounts[i].value_real * -1, currencyFormat, currencySign, currencyBlank));
|
||||
|
||||
}
|
||||
toDelete = false;
|
||||
}
|
||||
}
|
||||
if (toDelete)
|
||||
$('#cart_discount_' + idElmt + ', #cart_total_voucher').fadeTo('fast', 0, function(){ $(this).remove(); });
|
||||
});
|
||||
@@ -673,7 +685,9 @@ function updateCartSummary(json)
|
||||
$('#cart_block_shipping_cost').html(formatCurrency(json.total_shipping_tax_exc, currencyFormat, currencySign, currencyBlank));
|
||||
$('#cart_block_wrapping_cost').html(formatCurrency(json.total_wrapping_tax_exc, currencyFormat, currencySign, currencyBlank));
|
||||
$('#cart_block_total').html(formatCurrency(json.total_price_without_tax, currencyFormat, currencySign, currencyBlank));
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
$('#cart_block_shipping_cost').html(formatCurrency(json.total_shipping, currencyFormat, currencySign, currencyBlank));
|
||||
$('#cart_block_wrapping_cost').html(formatCurrency(json.total_wrapping, currencyFormat, currencySign, currencyBlank));
|
||||
$('#cart_block_total').html(formatCurrency(json.total_price, currencyFormat, currencySign, currencyBlank));
|
||||
@@ -750,7 +764,6 @@ function updateCustomizedDatas(json)
|
||||
$('input[name=quantity_'+i+'_'+j+'_'+l+'_'+k+'_hidden]').val(quantity);
|
||||
$('input[name=quantity_'+i+'_'+j+'_'+l+'_'+k+']').val(quantity);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function updateHookShoppingCart(html)
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
|
||||
<tr id="product_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}" class="{if isset($productLast) && $productLast && (!isset($ignoreProductLast) || !$ignoreProductLast)}last_item{elseif isset($productFirst) && $productFirst}first_item{/if} {if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0}alternate_item{/if} cart_item address_{$product.id_address_delivery|intval} {if $odd}odd{else}even{/if}">
|
||||
<tr id="product_{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}" class="cart_item{if isset($productLast) && $productLast && (!isset($ignoreProductLast) || !$ignoreProductLast)} last_item{elseif isset($productFirst) && $productFirst} first_item{/if}{if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0} alternate_item{/if} address_{$product.id_address_delivery|intval} {if $odd}odd{else}even{/if}">
|
||||
<td class="cart_product">
|
||||
<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')}" alt="{$product.name|escape:'htmlall':'UTF-8'}" {if isset($smallSize)}width="{$smallSize.width}" height="{$smallSize.height}" {/if} /></a>
|
||||
</td>
|
||||
@@ -33,7 +33,7 @@
|
||||
</td>
|
||||
<td class="cart_ref">{if $product.reference}{$product.reference|escape:'htmlall':'UTF-8'}{else}--{/if}</td>
|
||||
<td class="cart_unit">
|
||||
<span class="price" id="product_price_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}">
|
||||
<span class="price" id="product_price_{$product.id_product}_{$product.id_product_attribute}{if $quantityDisplayed > 0}_nocustom{/if}_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}">
|
||||
{if !empty($product.gift)}
|
||||
<span class="gift-icon">{l s='Gift!'}</span>
|
||||
{else}
|
||||
@@ -62,25 +62,25 @@
|
||||
{/if}
|
||||
{if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0}
|
||||
<div class="cart_quantity_button">
|
||||
<a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&id_product={$product.id_product|intval}&ipa={$product.id_product_attribute|intval}&id_address_delivery={$product.id_address_delivery|intval}&token={$token_cart}")}" title="{l s='Add'}"><img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" /></a><br />
|
||||
<a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&id_product={$product.id_product|intval}&ipa={$product.id_product_attribute|intval}&id_address_delivery={$product.id_address_delivery|intval}&token={$token_cart}")}" title="{l s='Add'}"><img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" /></a><br />
|
||||
{if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1}
|
||||
<a rel="nofollow" class="cart_quantity_down" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&id_product={$product.id_product|intval}&ipa={$product.id_product_attribute|intval}&id_address_delivery={$product.id_address_delivery|intval}&op=down&token={$token_cart}")}" title="{l s='Subtract'}">
|
||||
<a rel="nofollow" class="cart_quantity_down" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&id_product={$product.id_product|intval}&ipa={$product.id_product_attribute|intval}&id_address_delivery={$product.id_address_delivery|intval}&op=down&token={$token_cart}")}" title="{l s='Subtract'}">
|
||||
<img src="{$img_dir}icon/quantity_down.gif" alt="{l s='Subtract'}" width="14" height="9" />
|
||||
</a>
|
||||
{else}
|
||||
<a class="cart_quantity_down" style="opacity: 0.3;" href="#" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" title="{l s='You must purchase a minimum of %d of this product.' sprintf=$product.minimal_quantity}">
|
||||
<a class="cart_quantity_down" style="opacity: 0.3;" href="#" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}" title="{l s='You must purchase a minimum of %d of this product.' sprintf=$product.minimal_quantity}">
|
||||
<img src="{$img_dir}icon/quantity_down.gif" width="14" height="9" alt="{l s='Subtract'}" />
|
||||
</a>
|
||||
{/if}
|
||||
</div>
|
||||
<input type="hidden" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}_hidden" />
|
||||
<input size="2" type="text" autocomplete="off" class="cart_quantity_input" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" />
|
||||
<input type="hidden" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}_hidden" />
|
||||
<input size="2" type="text" autocomplete="off" class="cart_quantity_input" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}" />
|
||||
|
||||
{/if}
|
||||
{/if}
|
||||
</td>
|
||||
<td class="cart_total">
|
||||
<span class="price" id="total_product_price_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}">
|
||||
<span class="price" id="total_product_price_{$product.id_product}_{$product.id_product_attribute}{if $quantityDisplayed > 0}_nocustom{/if}_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}">
|
||||
{if !empty($product.gift)}
|
||||
<span class="gift-icon">{l s='Gift!'}</span>
|
||||
{else}
|
||||
@@ -96,7 +96,7 @@
|
||||
<td class="cart_delete">
|
||||
{if (!isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed) > 0 && empty($product.gift)}
|
||||
<div>
|
||||
<a rel="nofollow" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "delete=1&id_product={$product.id_product|intval}&ipa={$product.id_product_attribute|intval}&id_address_delivery={$product.id_address_delivery|intval}&token={$token_cart}")}">{l s='Delete'}</a>
|
||||
<a rel="nofollow" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "delete=1&id_product={$product.id_product|intval}&ipa={$product.id_product_attribute|intval}&id_address_delivery={$product.id_address_delivery|intval}&token={$token_cart}")}">{l s='Delete'}</a>
|
||||
</div>
|
||||
{/if}
|
||||
</td>
|
||||
|
||||
@@ -230,7 +230,7 @@
|
||||
{* Then the customized datas ones*}
|
||||
{if isset($customizedDatas.$productId.$productAttributeId)}
|
||||
{foreach $customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] as $id_customization=>$customization}
|
||||
<tr id="product_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" class="product_customization_for_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval} {if $odd}odd{else}even{/if} customization alternate_item {if $product@last && $customization@last && !count($gift_products)}last_item{/if}">
|
||||
<tr id="product_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}" class="product_customization_for_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}{if $odd} odd{else} even{/if} customization alternate_item {if $product@last && $customization@last && !count($gift_products)}last_item{/if}">
|
||||
<td></td>
|
||||
<td colspan="3">
|
||||
{foreach $customization.datas as $type => $custom_data}
|
||||
|
||||
Reference in New Issue
Block a user