dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// changing name "available_date_combi" to "available_date" and some features

Browse Source
This commit is contained in:
vChabot
2011-09-13 14:52:42 +00:00
parent e4b39b4263
commit 95d5d50af4
11 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/prestashop/js/product.js
+10 -10
View File
@@ -50,7 +50,7 @@ function oosHookJsCode()
}
//add a combination of attributes in the global JS sytem
function addCombination(idCombination, arrayOfIdAttributes, quantity, price, ecotax, id_image, reference, unit_price, minimal_quantity, available_date_combi)
function addCombination(idCombination, arrayOfIdAttributes, quantity, price, ecotax, id_image, reference, unit_price, minimal_quantity, available_date)
{
globalQuantity += quantity;
@@ -64,7 +64,7 @@ function addCombination(idCombination, arrayOfIdAttributes, quantity, price, eco
combination['reference'] = reference;
combination['unit_price'] = unit_price;
combination['minimal_quantity'] = minimal_quantity;
combination['available_date_combi'] = available_date_combi;
combination['available_date'] = available_date;
combinations.push(combination);
}
@@ -121,7 +121,7 @@ function findCombination(firstTime)
displayImage( $('#thumb_'+combinations[combination]['image']).parent() );
//get available_date for combination product
selectedCombination['available_date_combi'] = combinations[combination]['available_date_combi'];
selectedCombination['available_date'] = combinations[combination]['available_date'];
//update the display
updateDisplay();
@@ -243,15 +243,15 @@ function updateDisplay()
$('#availability_statut:hidden').show();
//display availability date
var date_combi = selectedCombination['available_date_combi'];
tab_date = date_combi.split('-');
var time_combi = new Date(tab_date[2], tab_date[1], tab_date[0]);
time_combi.setMonth(time_combi.getMonth()-1);
var available_date = selectedCombination['available_date'];
tab_date = available_date.split('-');
var time_available = new Date(tab_date[2], tab_date[1], tab_date[0]);
time_available.setMonth(time_available.getMonth()-1);
var now = new Date();
// date displayed only if time_combi
if (now.getTime() < time_combi.getTime())
// date displayed only if time_available
if (now.getTime() < time_available.getTime())
{
$('#availability_date_value').text(selectedCombination['available_date_combi']);
$('#availability_date_value').text(selectedCombination['available_date']);
$('#availability_date_label').show();
$('#availability_date_value').show();
}
themes/prestashop/product.tpl
+1 -1
View File
@@ -108,7 +108,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{if isset($groups)}
// Combinations
{foreach from=$combinations key=idCombination item=combination}
addCombination({$idCombination|intval}, new Array({$combination.list}), {$combination.quantity}, {$combination.price}, {$combination.ecotax}, {$combination.id_image}, '{$combination.reference|addslashes}', {$combination.unit_impact}, {$combination.minimal_quantity}, '{$combination.available_date_combi}');
addCombination({$idCombination|intval}, new Array({$combination.list}), {$combination.quantity}, {$combination.price}, {$combination.ecotax}, {$combination.id_image}, '{$combination.reference|addslashes}', {$combination.unit_impact}, {$combination.minimal_quantity}, '{$combination.available_date}');
{/foreach}
// Colors
{if $colors|@count > 0}