Merge branch 'ticket-12574-RemoveProductFromBlockcart' into develop

This commit is contained in:
Marion Muszynski 2017-03-27 12:42:36 +02:00
commit e7d37116b3
5 changed files with 11 additions and 11 deletions

View File

@ -3351,7 +3351,7 @@ table.std tbody td.cart_quantity div, .rte table tbody td.cart_quantity div {
} }
table.std tbody td.cart_quantity div#cart_quantity_button, .rte table tbody td.cart_quantity div#cart_quantity_button { table.std tbody td.cart_quantity div#cart_quantity_button, .rte table tbody td.cart_quantity div#cart_quantity_button {
margin-right: 10px; margin-right: 10px;
padding-top: 4px; padding-top: 2px;
} }
table.std tbody td.cart_quantity input.cart_quantity_input, .rte table tbody td.cart_quantity input.cart_quantity_input { table.std tbody td.cart_quantity input.cart_quantity_input, .rte table tbody td.cart_quantity input.cart_quantity_input {
float: right; float: right;
@ -7306,12 +7306,12 @@ table#carrierTable tbody td {
position: relative; position: relative;
} }
#cart_block_list .remove_link{ #cart_block_list .remove_link{
display: block; display: inline-block;
position: absolute; position: absolute;
height: 13px; height: 13px;
width: 13px; width: 13px;
top:10px; /*top:10px;*/
right:5px; right:0px;
cursor: pointer; cursor: pointer;
background: url("../img/icon/delete.gif") no-repeat center center #fff; background: url("../img/icon/delete.gif") no-repeat center center #fff;
} }

BIN
themes/site/img/moins.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

BIN
themes/site/img/plus.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -89,18 +89,18 @@ $(document).ready(function() {
{if isset($page_name) && $page_name != 'order'} {if isset($page_name) && $page_name != 'order'}
{if $product.minimal_quantity < ($customization.quantity - $quantityDisplayed) OR $product.minimal_quantity <= 1} {if $product.minimal_quantity < ($customization.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}" onclick="updateQuantity({$product.id_product|intval},{$product.id_product_attribute|intval},'down');" title="{l s='Subtract' mod='blockcartex'}"> <a rel="nofollow" class="cart_quantity_down" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}" onclick="updateQuantity({$product.id_product|intval},{$product.id_product_attribute|intval},'down');" title="{l s='Subtract' mod='blockcartex'}">
<img src="{$img_dir}icon/quantity_down.gif" alt="{l s='Subtract'}" width="14" height="9" /> <img src="{$img_dir}moins.png" alt="{l s='Subtract'}" width="13" height="13" />
</a> </a>
{else} {else}
<a class="cart_quantity_down" style="opacity: 0.3;" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}" href="#" title="{l s='Subtract' mod='blockcartex'}"> <a class="cart_quantity_down" style="opacity: 0.3;" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}" href="#" title="{l s='Subtract' mod='blockcartex'}">
<img src="{$img_dir}icon/quantity_down.gif" alt="{l s='Subtract'}" width="14" height="9" /> <img src="{$img_dir}moins.png" alt="{l s='Subtract'}" width="13" height="13" />
</a> </a>
{/if} {/if}
<a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}" onclick="updateQuantity({$product.id_product|intval},{$product.id_product_attribute|intval},'up');" title="{l s='Add' mod='blockcartex'}"><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}" onclick="updateQuantity({$product.id_product|intval},{$product.id_product_attribute|intval},'up');" title="{l s='Add' mod='blockcartex'}"><img src="{$img_dir}plus.png" alt="{l s='Add'}" width="13" height="13" /></a>
<span class="remove_link">{if !isset($customizedDatas.$productId.$productAttributeId)}<a rel="nofollow" class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart.php')}?delete&amp;id_product={$product.id_product}&amp;ipa={$product.id_product_attribute}&amp;token={$static_token}" title="{l s='remove this product from my cart' mod='blockcartex'}">&nbsp;</a>{/if}</span>
{/if} {/if}
</p> </p>
<span class="remove_link">{if !isset($customizedDatas.$productId.$productAttributeId)}<a rel="nofollow" class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart.php')}?delete&amp;id_product={$product.id_product}&amp;ipa={$product.id_product_attribute}&amp;token={$static_token}" title="{l s='remove this product from my cart' mod='blockcartex'}">&nbsp;</a>{/if}</span>
<p><span class="label_price">{l s='Prix unitaire :' mod='blockcartex'}</span> <span class="green price">{if $priceDisplay == $smarty.const.PS_TAX_EXC}{displayWtPrice p="`$product.total`"}{else}{displayWtPrice p="`$product.price_wt`"}{/if}</span> <p><span class="label_price">{l s='Prix unitaire :' mod='blockcartex'}</span> <span class="green price">{if $priceDisplay == $smarty.const.PS_TAX_EXC}{displayWtPrice p="`$product.total`"}{else}{displayWtPrice p="`$product.price_wt`"}{/if}</span>
</p> </p>
</dt> </dt>

View File

@ -52,14 +52,14 @@
<a rel="nofollow" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}" href="{$link->getPageLink('cart.php', true)}?delete&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;token={$token_cart}" title="{l s='Delete'}"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" class="icon" width="13" height="13" /></a> <a rel="nofollow" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}" href="{$link->getPageLink('cart.php', true)}?delete&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;token={$token_cart}" title="{l s='Delete'}"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" class="icon" width="13" height="13" /></a>
</div> </div>
<div id="cart_quantity_button"> <div id="cart_quantity_button">
<a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}" href="{$link->getPageLink('cart.php', true)}?add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;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}" href="{$link->getPageLink('cart.php', true)}?add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;token={$token_cart}" title="{l s='Add'}"><img src="{$img_dir}plus.png" alt="{l s='Add'}" width="14" height="14" /></a><br />
{if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1} {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}" href="{$link->getPageLink('cart.php', true)}?add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;op=down&amp;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}" href="{$link->getPageLink('cart.php', true)}?add&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;op=down&amp;token={$token_cart}" title="{l s='Subtract'}">
<img src="{$img_dir}icon/quantity_down.gif" alt="{l s='Subtract'}" width="14" height="9" /> <img src="{$img_dir}moins.png" alt="{l s='Subtract'}" width="14" height="14" />
</a> </a>
{else} {else}
<a class="cart_quantity_down" style="opacity: 0.3;" href="#" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}" title="{l s='You must purchase a minimum of '}{$product.minimal_quantity}{l s=' of this product.'}"> <a class="cart_quantity_down" style="opacity: 0.3;" href="#" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}" title="{l s='You must purchase a minimum of '}{$product.minimal_quantity}{l s=' of this product.'}">
<img src="{$img_dir}icon/quantity_down.gif" width="14" height="9" alt="{l s='Subtract'}" /> <img src="{$img_dir}moins.png" width="14" height="14" alt="{l s='Subtract'}" />
</a> </a>
{/if} {/if}
</div> </div>