antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Marion Muszynski 2016-07-01 11:02:09 +02:00
commit 155dd48cad
11 changed files with 910 additions and 779 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
override/controllers/CategoryController.php
View File

@ -26,6 +26,7 @@ class CategoryController extends CategoryControllerCore {
'HOOK_LEFT_COLUMN_VP' => Module::hookExec('displayleftVP', array('id_category' => $id_category)),
'is_sale_home' => ($sale? $sale->id_category == $id_category: FALSE),
'other_sales' => $other_sales,
'last_qties' => (int)Configuration::get('PS_LAST_QTIES'),
'HOOK_PRIVATESALES_LISTING' => Module::hookExec('privatesales_listing', array('other_sales_category' => $other_sales, 'futuresales' => array())),
));
}

1559
themes/site/css/style.css
View File

File diff suppressed because it is too large Load Diff

12
themes/site/js/product.js
View File

@ -31,6 +31,8 @@ var selectedCombination = new Array();
var globalQuantity = new Number;
var colors = new Array();
//check if a function exists
function function_exists(function_name)
{
@ -178,12 +180,18 @@ function updateDisplay()
//hide the availability value
$('#availability_statut:visible').hide();
}
//'last quantities' message management
if (!allowBuyWhenOutOfStock)
{
if (quantityAvailable <= maxQuantityToAllowDisplayOfLastQuantityMessage)
if (quantityAvailable <= maxQuantityToAllowDisplayOfLastQuantityMessage){
if(quantityAvailable == 1){
$('#last_quantities').text(oneQuantityAvailableSentence);
}else{
var t = quantityAvailableSentence.replace('X', quantityAvailable);
$('#last_quantities').text(t);
}
$('#last_quantities').show('slow');
}
else
$('#last_quantities').hide('slow');
}

20
themes/site/modules/categoryscroll/product-list.tpl
View File

@ -33,7 +33,25 @@
{else}
<a href="{$product.link|escape:'htmlall':'UTF-8'}" class="product_img_link" title="{$product.name|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home')}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" {if isset($homeSize)} width="{$homeSize.width}" height="{$homeSize.height}"{/if} /></a>
{/if}
{if $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
<div class="productQuantityAlert">
{if $product.quantity_all_versions == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity_all_versions} {l s='items in stock'}</p>
{/if}
</div>
{else}
{if !isset($product.quantity_all_versions) && $product.quantity <= $last_qties}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{/if}
{*<p class="product_desc"><a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}">{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'}</a></p>*}
</div>
<div class="right_block">

22
themes/site/product-list.tpl
View File

@ -36,7 +36,7 @@
</div>
{/if}
<h3>{if isset($product.new) && $product.new == 1}<span class="new">{l s='New'}</span>{/if}<a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:64:'...'|escape:'htmlall':'UTF-8'}</a></h3>
{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.av3ailable_for_order) && $product.available_for_order)))}
<div>
{if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)}
<span class="price">{if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if}</span>
@ -62,7 +62,25 @@
{else}
<a href="{$product.link|escape:'htmlall':'UTF-8'}" class="product_img_link" title="{$product.name|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home')}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" {if isset($homeSize)} height="{$homeSize.height}"{/if} /></a>
{/if}
{if $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
<div class="productQuantityAlert">
{if $product.quantity_all_versions == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity_all_versions} {l s='items in stock'}</p>
{/if}
</div>
{else}
{if !isset($product.quantity_all_versions) && $product.quantity <= $last_qties}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{/if}
{*<p class="product_desc"><a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}">{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'}</a></p>*}
</div>
<div class="right_block">

6
themes/site/product.tpl
View File

@ -105,6 +105,10 @@ var doesntExistNoMoreBut = '{l s='with those attributes but is available with ot
var uploading_in_progress = '{l s='Uploading in progress, please wait...' js=1}';
var fieldRequired = '{l s='Please fill in all required fields, then save the customization.' js=1}';
var quantityAvailableSentence = '{l s='Warning: X items in stock!' js=1}';
var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
{if isset($groups)}
// Combinations
{foreach from=$combinations key=idCombination item=combination}
@ -371,7 +375,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
</p>
{/if}
<p class="warning_inline" id="last_quantities"{if ($product->quantity > $last_qties OR $product->quantity <= 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if} >{l s='Warning: Last items in stock!'}</p>
<p class="warning_inline" id="last_quantities"{if ($product->quantity > $last_qties OR $product->quantity <= 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style='display: none;'{/if} >{l s='Warning :'} {$product->quantity} {l s='items in stock'}</p>
{if $product->online_only}
<div class="coeur">

17
themes/site_mobile/css/style.css
View File

@ -4897,4 +4897,21 @@ body#product #best-sellers_block_product{
.box_add_to_cart .content .others_links .show_fdp_info {
text-align: center;
font-size: 13px;
}
/******* ticket-9890 *******/
#product_list li div.productQuantityAlert{
text-align: center;
width: 250px;
margin: 0 !important;
padding: 5px 0 !important;
background-color: #f49cc3;
box-shadow: 0px 5px 8px -3px #b5b1b1;
position: absolute;
bottom: 20px;
left: 0;
}
.productQuantityAlert p{
color: white;
font-size: 14px;
}

10
themes/site_mobile/js/product.js
View File

@ -181,8 +181,16 @@ function updateDisplay()
//'last quantities' message management
if (!allowBuyWhenOutOfStock)
{
if (quantityAvailable <= maxQuantityToAllowDisplayOfLastQuantityMessage)
if (quantityAvailable <= maxQuantityToAllowDisplayOfLastQuantityMessage){
if(quantityAvailable == 1){
$('#last_quantities').text(oneQuantityAvailableSentence);
}else{
console.log('t');
var t = quantityAvailableSentence.replace('X', quantityAvailable);
$('#last_quantities').text(t);
}
$('#last_quantities').show('slow');
}
else
$('#last_quantities').hide('slow');
}

19
themes/site_mobile/modules/categoryscroll/product-list.tpl
View File

@ -28,6 +28,25 @@
{assign var=product_reduction value=($product.reduction * (1 + $product.rate / 100) * 100 / $product.price_without_reduction)}
{if $product_reduction>0}
<span class="reduction">(-{$product_reduction|round|string_format:'%d'}%)</span>
{if $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
<div class="productQuantityAlert">
{if $product.quantity_all_versions == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity_all_versions} {l s='items in stock'}</p>
{/if}
</div>
{else}
{if !isset($product.quantity_all_versions) && $product.quantity <= $last_qties}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{/if}
{/if}
{/if}
<span class="gradient">

19
themes/site_mobile/product-list.tpl
View File

@ -56,6 +56,25 @@
{if $product_reduction>0}
<span class="reduction">(-{$product_reduction|round|string_format:'%d'}%)</span>
{/if}
{if $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
<div class="productQuantityAlert">
{if $product.quantity_all_versions == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity_all_versions} {l s='items in stock'}</p>
{/if}
</div>
{else}
{if !isset($product.quantity_all_versions) && $product.quantity <= $last_qties}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{/if}
{/if}
{/if}
<span class="gradient">

4
themes/site_mobile/product.tpl
View File

@ -104,6 +104,8 @@ var doesntExistNoMore = '{l s='This product is no longer in stock' js=1}';
var doesntExistNoMoreBut = '{l s='with those attributes but is available with others' js=1}';
var uploading_in_progress = '{l s='Uploading in progress, please wait...' js=1}';
var fieldRequired = '{l s='Please fill in all required fields, then save the customization.' js=1}';
var quantityAvailableSentence = '{l s='Warning: X items in stock!' js=1}';
var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
{if isset($groups)}
// Combinations
@ -372,7 +374,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
</p>
{/if}
<p class="warning_inline" id="last_quantities"{if ($product->quantity > $last_qties OR $product->quantity <= 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if} >{l s='Warning: Last items in stock!'}</p>
<p class="warning_inline" id="last_quantities"{if ($product->quantity > $last_qties OR $product->quantity <= 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style='display: none;'{/if} >{l s='Warning :'} {$product->quantity} {l s='items in stock'}</p>
<!-- {if $product->online_only}
<p>{l s='Online only'}</p>