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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
Rémi Gaillard
2013-06-26 18:13:38 +02:00
parent e33e5229b4 2b94a338b8
commit 3524ccc99b
18 changed files with 112 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
View File

@@ -106,63 +106,61 @@
if ($(this).attr('name') == 'category_reduction['+$('[name="id_category"]:checked').val()+']') if ($(this).attr('name') == 'category_reduction['+$('[name="id_category"]:checked').val()+']')
{ {
exist = true; exist = true;
jAlert('{l s='This category already exists for this group.'}'); jAlert('{l s='This category already exists for this group.' js='1'}');
return false; return false;
} }
}); });
if (exist) if (exist)
return; return;
$.ajax({ $.ajax({
type:"POST", type:"POST",
url: "ajax-tab.php", url: "ajax-tab.php",
async: true, async: true,
dataType: "json", dataType: "json",
data : { data : {
ajax: "1", ajax: "1",
token: "{getAdminToken tab='AdminGroups'}", token: "{getAdminToken tab='AdminGroups'}",
controller: "AdminGroups", controller: "AdminGroups",
action: "addCategoryReduction", action: "addCategoryReduction",
category_reduction: $('#category_reduction_fancybox').val() , category_reduction: $('#category_reduction_fancybox').val() ,
id_category: $('[name="id_category"]:checked').val() id_category: $('[name="id_category"]:checked').val()
}, },
success : function(jsonData) success : function(jsonData) {
if (jsonData.hasError)
{ {
if (jsonData.hasError) var errors = '';
{ for (error in jsonData.errors)
var errors = ''; //IE6 bug fix
for(error in jsonData.errors) if (error != 'indexOf')
//IE6 bug fix errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
if(error != 'indexOf') jAlert(errors);
errors += jsonData.errors[error] + "\n";
jAlert(errors);
}
else
{
$('#group_discount_category_table').append('<tr class="alt_row" id="'+jsonData.id_category+'"><td>'+jsonData.catPath+'</td><td>{l s='Discount:'}'+jsonData.discount+'{l s='%'}</td><td><a href="#" onclick="deleteCategoryReduction('+jsonData.id_category+');"><img src="../img/admin/delete.gif"></a></td></tr>');
var input_hidden = document.createElement("input");
input_hidden.setAttribute('type', 'hidden');
input_hidden.setAttribute('value', jsonData.discount);
input_hidden.setAttribute('name', 'category_reduction['+jsonData.id_category+']');
input_hidden.setAttribute('class', 'category_reduction');
$('#group_discount_category_table tr#'+jsonData.id_category+' > td:last').append(input_hidden);
$.fancybox.close();
}
} }
}); else
{
$('#group_discount_category_table').append('<tr class="alt_row" id="'+jsonData.id_category+'"><td>'+jsonData.catPath+'</td><td>{l s='Discount:'}'+jsonData.discount+'{l s='%'}</td><td><a href="#" onclick="deleteCategoryReduction('+jsonData.id_category+');"><img src="../img/admin/delete.gif"></a></td></tr>');
var input_hidden = document.createElement("input");
input_hidden.setAttribute('type', 'hidden');
input_hidden.setAttribute('value', jsonData.discount);
input_hidden.setAttribute('name', 'category_reduction['+jsonData.id_category+']');
input_hidden.setAttribute('class', 'category_reduction');
$('#group_discount_category_table tr#'+jsonData.id_category+' > td:last').append(input_hidden);
$.fancybox.close();
}
}
});
return false; return false;
} }
function initFancyBox() function initFancyBox()
{ {
$('[name="id_category"]:checked').removeAttr('checked'); $('[name="id_category"]:checked').removeAttr('checked');
collapseAllCategories(); collapseAllCategories();
$('#category_reduction_fancybox').val('0.00'); $('#category_reduction_fancybox').val('0.00');
} }
</script> </script>
<div class="margin-form"> <div class="margin-form">
<a class="button" href="#group_discount_category_fancybox" id="group_discount_category">{l s='Add a category discount'}</a> <a class="button" href="#group_discount_category_fancybox" id="group_discount_category">{l s='Add a category discount'}</a>

4
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
View File

@@ -50,14 +50,14 @@
console.log(truncateAuthorized); console.log(truncateAuthorized);
if (truncateAuthorized) if (truncateAuthorized)
{ {
if (!confirm('{l s='Are you sure that you would like to delete this' js=1}' + ' ' + $.trim($('#entity > option:selected').text().toLowerCase()) + '{l s='?' js=1}')) if (!confirm('{l s='Are you sure that you would like to delete this' js=1}' + ' ' + $.trim($('#entity > option:selected').text().toLowerCase()) + '?'))
{ {
e.preventDefault(); e.preventDefault();
} }
} }
else else
{ {
jAlert('{l s='You do not have permission to delete here. When the multistore is enabled, only a SuperAdmin can delete all items before an import.'}'); jAlert('{l s='You do not have permission to delete here. When the multistore is enabled, only a SuperAdmin can delete all items before an import.' js='1'}');
return false; return false;
} }
} }

2
admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl
View File

@@ -90,7 +90,7 @@
var table = $('#selectTables select').val(); var table = $('#selectTables select').val();
if (!table) if (!table)
jAlert("{l s='Please choose a table.'}"); jAlert("{l s='Please choose a table.' js='1'}");
else else
AddRequestSql(table); AddRequestSql(table);
}); });

4
admin-dev/themes/default/template/controllers/shop/helpers/list/list_action_delete.tpl
View File

@@ -24,9 +24,9 @@
*} *}
<a href="{$href}" class="delete" <a href="{$href}" class="delete"
{if in_array($id_shop, $shops_having_dependencies)} {if in_array($id_shop, $shops_having_dependencies)}
onclick="jAlert('{l s='You cannot delete this shop\'s (customer and/or order dependency)'}'); return false;" onclick="jAlert('{l s='You cannot delete this shop\'s (customer and/or order dependency)' js='1'}'); return false;"
{elseif isset($confirm)} {elseif isset($confirm)}
onclick="if (confirm('{$confirm}')){ return true; }else{ event.stopPropagation(); event.preventDefault();};" onclick="if (confirm('{$confirm}')){ return true; } else { event.stopPropagation(); event.preventDefault();};"
{/if} title="{$action}"> {/if} title="{$action}">
<img src="../img/admin/delete.gif" alt="{$action}" /> <img src="../img/admin/delete.gif" alt="{$action}" />
</a> </a>

2
admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl
View File

@@ -138,7 +138,7 @@
// check if it's possible to add the product // check if it's possible to add the product
if (product_infos == null || $('#cur_product_name').val() == '') if (product_infos == null || $('#cur_product_name').val() == '')
{ {
jAlert('{l s='Please select at least one product.'}'); jAlert('{l s='Please select at least one product.' js='1'}');
return false; return false;
} }

4
classes/db/DbMySQLi.php
View File

@@ -181,7 +181,7 @@ class DbMySQLiCore extends Db
$value = 'InnoDB'; $value = 'InnoDB';
$sql = 'SHOW VARIABLES WHERE Variable_name = \'have_innodb\''; $sql = 'SHOW VARIABLES WHERE Variable_name = \'have_innodb\'';
$result = $link->query($sql); $result = $this->link->query($sql);
if (!$result) if (!$result)
$value = 'MyISAM'; $value = 'MyISAM';
$row = $result->fetch_assoc(); $row = $result->fetch_assoc();
@@ -190,7 +190,7 @@ class DbMySQLiCore extends Db
/* MySQL >= 5.6 */ /* MySQL >= 5.6 */
$sql = 'SHOW ENGINES'; $sql = 'SHOW ENGINES';
$result = $link->query($sql); $result = $this->link->query($sql);
while ($row = $result->fetch_assoc()) while ($row = $result->fetch_assoc())
if ($row['Engine'] == 'InnoDB') if ($row['Engine'] == 'InnoDB')
{ {

4
classes/db/DbPDO.php
View File

@@ -215,7 +215,7 @@ class DbPDOCore extends Db
$value = 'InnoDB'; $value = 'InnoDB';
$sql = 'SHOW VARIABLES WHERE Variable_name = \'have_innodb\''; $sql = 'SHOW VARIABLES WHERE Variable_name = \'have_innodb\'';
$result = $link->query($sql); $result = $this->link->query($sql);
if (!$result) if (!$result)
$value = 'MyISAM'; $value = 'MyISAM';
$row = $result->fetch(); $row = $result->fetch();
@@ -224,7 +224,7 @@ class DbPDOCore extends Db
/* MySQL >= 5.6 */ /* MySQL >= 5.6 */
$sql = 'SHOW ENGINES'; $sql = 'SHOW ENGINES';
$result = $link->query($sql); $result = $this->link->query($sql);
while ($row = $result->fetch()) while ($row = $result->fetch())
if ($row['Engine'] == 'InnoDB') if ($row['Engine'] == 'InnoDB')
{ {

10
controllers/front/ContactController.php
View File

@@ -170,6 +170,7 @@ class ContactControllerCore extends FrontController
'{attached_file}' => '-', '{attached_file}' => '-',
'{message}' => Tools::nl2br(stripslashes($message)), '{message}' => Tools::nl2br(stripslashes($message)),
'{email}' => $from, '{email}' => $from,
'{product_name}' => '',
); );
if (isset($filename)) if (isset($filename))
@@ -177,6 +178,8 @@ class ContactControllerCore extends FrontController
$id_order = (int)Tools::getValue('id_order'); $id_order = (int)Tools::getValue('id_order');
$id_product = (int)Tools::getValue('id_product');
if (isset($ct) && Validate::isLoadedObject($ct)) if (isset($ct) && Validate::isLoadedObject($ct))
{ {
if ($ct->id_order) if ($ct->id_order)
@@ -193,6 +196,13 @@ class ContactControllerCore extends FrontController
$var_list['{id_order}'] = $id_order; $var_list['{id_order}'] = $id_order;
} }
if ($id_product)
{
$product = new Product((int)$id_product);
if (Validate::isLoadedObject($product) && isset($product->name[Context::getContext()->language->id]))
$var_list['{product_name}'] = $product->name[Context::getContext()->language->id];
}
if (empty($contact->email)) if (empty($contact->email))
Mail::Send($this->context->language->id, 'contact_form', $subject, $var_list, $from, null, null, null, $fileAttachment); Mail::Send($this->context->language->id, 'contact_form', $subject, $var_list, $from, null, null, null, $fileAttachment);
else else

1
install-dev/upgrade/sql/1.5.0.0.sql
View File

@@ -92,7 +92,6 @@ UPDATE PREFIX_stock_mvt sm SET sm.id_stock = IFNULL((
WHERE s.id_product = sm.id_product WHERE s.id_product = sm.id_product
AND s.id_product_attribute = sm.id_product_attribute AND s.id_product_attribute = sm.id_product_attribute
ORDER BY s.id_shop ORDER BY s.id_shop
LIMIT 1
), 0); ), 0);
DELETE FROM PREFIX_stock_mvt WHERE id_stock = 0; DELETE FROM PREFIX_stock_mvt WHERE id_stock = 0;
ALTER TABLE PREFIX_stock_mvt DROP id_product, DROP id_product_attribute; ALTER TABLE PREFIX_stock_mvt DROP id_product, DROP id_product_attribute;

6
js/admin_order.js
View File

@@ -470,8 +470,7 @@ function init()
cache: false, cache: false,
dataType: 'json', dataType: 'json',
data : query, data : query,
success : function(data) success : function(data) {
{
if (data.result) if (data.result)
{ {
go = false; go = false;
@@ -491,8 +490,7 @@ function init()
else else
jAlert(data.error); jAlert(data.error);
}, },
error : function(XMLHttpRequest, textStatus, errorThrown) error : function(XMLHttpRequest, textStatus, errorThrown) {
{
jAlert("Impossible to add the product to the cart.\n\ntextStatus: '" + textStatus + "'\nerrorThrown: '" + errorThrown + "'\nresponseText:\n" + XMLHttpRequest.responseText); jAlert("Impossible to add the product to the cart.\n\ntextStatus: '" + textStatus + "'\nerrorThrown: '" + errorThrown + "'\nresponseText:\n" + XMLHttpRequest.responseText);
} }
}); });

2
js/hookLiveEdit.js
View File

@@ -161,7 +161,7 @@ function getHookableList() {
var errors = ''; var errors = '';
for (error in jsonData.errors) //IE6 bug fix for (error in jsonData.errors) //IE6 bug fix
if (error != 'indexOf') if (error != 'indexOf')
errors += jsonData.errors[error] + "\n"; errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
alert(errors); alert(errors);
} }
else else

2
mails/en/contact_form.html
View File

@@ -20,7 +20,7 @@
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td align="left">Your message has been sent successfully.<br /><br /> Message: {message}<br /><br /> Order ID : {order_name}<br /><br /> Attached file : {attached_file}</td> <td align="left">Your message has been sent successfully.<br /><br /> Message: {message}<br /><br /> Order ID : {order_name}<br /><br /> Product : {product_name}<br /><br /> Attached file : {attached_file}</td>
</tr> </tr>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>

8
modules/blockcart/ajax-cart.js
View File

@@ -446,7 +446,7 @@ var ajaxCart = {
var name = (this.name.length > 12 ? this.name.substring(0, 10) + '...' : this.name); var name = (this.name.length > 12 ? this.name.substring(0, 10) + '...' : this.name);
content += '<a href="' + this.link + '" title="' + this.name + '" class="cart_block_product_name">' + name + '</a>'; content += '<a href="' + this.link + '" title="' + this.name + '" class="cart_block_product_name">' + name + '</a>';
if (parseFloat(this.price_float) > 0) if (this.is_gift != undefined && this.is_gift == 1)
content += '<span class="remove_link"><a rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseUri + '?controller=cart&amp;delete=1&amp;id_product=' + productId + '&amp;token=' + static_token + (this.hasAttributes ? '&amp;ipa=' + parseInt(this.idCombination) : '') + '"> </a></span>'; content += '<span class="remove_link"><a rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseUri + '?controller=cart&amp;delete=1&amp;id_product=' + productId + '&amp;token=' + static_token + (this.hasAttributes ? '&amp;ipa=' + parseInt(this.idCombination) : '') + '"> </a></span>';
else else
content += '<span class="remove_link"></span>'; content += '<span class="remove_link"></span>';
@@ -568,10 +568,10 @@ var ajaxCart = {
if (jsonData.hasError) if (jsonData.hasError)
{ {
var errors = ''; var errors = '';
for(error in jsonData.errors) for (error in jsonData.errors)
//IE6 bug fix //IE6 bug fix
if(error != 'indexOf') if (error != 'indexOf')
errors += jsonData.errors[error] + "\n"; errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
alert(errors); alert(errors);
} }
else else

38
modules/blockcms/blockcms.php
View File

@@ -740,10 +740,38 @@ class BlockCms extends Module
public function hookActionShopDataDuplication($params) public function hookActionShopDataDuplication($params)
{ {
Db::getInstance()->execute(' //get all cmd block to duplicate in new shop
INSERT IGNORE INTO '._DB_PREFIX_.'cms_block_shop (id_cms_block, id_shop) $cms_blocks = Db::getInstance()->executeS('
SELECT id_cms_block, '.(int)$params['new_id_shop'].' SELECT * FROM `'._DB_PREFIX_.'cms_block` cb
FROM '._DB_PREFIX_.'cms_block_shop LEFT JOIN `'._DB_PREFIX_.'cms_block_shop` cbf
WHERE id_shop = '.(int)$params['old_id_shop']); ON (cb.`id_cms_block` = cbf.`id_cms_block` AND cbf.`id_shop` = '.(int)$params['old_id_shop'].') ');
if (count($cms_blocks))
{
foreach ($cms_blocks as $cms_block)
{
Db::getInstance()->execute('
INSERT IGNORE INTO '._DB_PREFIX_.'cms_block (`id_cms_block`, `id_cms_category`, `location`, `position`, `display_store`)
VALUES (NULL, '.(int)$cms_block['id_cms_category'].', '.(int)$cms_block['location'].', '.(int)$cms_block['position'].', '.(int)$cms_block['display_store'].');');
$id_block_cms = Db::getInstance()->Insert_ID();
Db::getInstance()->execute('INSERT IGNORE INTO '._DB_PREFIX_.'cms_block_shop (`id_cms_block`, `id_shop`) VALUES ('.(int)$id_block_cms.', '.(int)$params['new_id_shop'].');');
$langs = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'cms_block_lang` WHERE `id_cms_block` = '.(int)$cms_block['id_cms_block']);
foreach($langs as $lang)
Db::getInstance()->execute('
INSERT IGNORE INTO `'._DB_PREFIX_.'cms_block_lang` (`id_cms_block`, `id_lang`, `name`)
VALUES ('.(int)$id_block_cms.', '.(int)$lang['id_lang'].', \''.pSQL($lang['name']).'\');');
$pages = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'cms_block_page` WHERE `id_cms_block` = '.(int)$cms_block['id_cms_block']);
foreach($pages as $page)
Db::getInstance()->execute('
INSERT IGNORE INTO `'._DB_PREFIX_.'cms_block_page` (`id_cms_block_page`, `id_cms_block`, `id_cms`, `is_category`)
VALUES (NULL, '.(int)$id_block_cms.', '.(int)$page['id_cms'].', '.(int)$page['is_category'].');');
}
}
} }
} }

4
themes/default/js/cart-summary.js
View File

@@ -454,7 +454,7 @@ function upQuantity(id, qty)
for(var error in jsonData.errors) for(var error in jsonData.errors)
//IE6 bug fix //IE6 bug fix
if(error !== 'indexOf') if(error !== 'indexOf')
errors += jsonData.errors[error] + "\n"; errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
alert(errors); alert(errors);
$('input[name=quantity_'+ id +']').val($('input[name=quantity_'+ id +'_hidden]').val()); $('input[name=quantity_'+ id +']').val($('input[name=quantity_'+ id +'_hidden]').val());
} }
@@ -539,7 +539,7 @@ function downQuantity(id, qty)
for(var error in jsonData.errors) for(var error in jsonData.errors)
//IE6 bug fix //IE6 bug fix
if(error !== 'indexOf') if(error !== 'indexOf')
errors += jsonData.errors[error] + "\n"; errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
alert(errors); alert(errors);
$('input[name=quantity_'+ id +']').val($('input[name=quantity_'+ id +'_hidden]').val()); $('input[name=quantity_'+ id +']').val($('input[name=quantity_'+ id +'_hidden]').val());
} }

2
themes/default/js/order-address.js
View File

@@ -121,7 +121,7 @@ function updateAddresses()
for(var error in jsonData.errors) for(var error in jsonData.errors)
//IE6 bug fix //IE6 bug fix
if(error !== 'indexOf') if(error !== 'indexOf')
errors += jsonData.errors[error] + "\n"; errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
alert(errors); alert(errors);
} }
}, },

8
themes/default/js/order-opc.js
View File

@@ -93,7 +93,7 @@ function updateAddressSelection()
for(var error in jsonData.errors) for(var error in jsonData.errors)
//IE6 bug fix //IE6 bug fix
if(error !== 'indexOf') if(error !== 'indexOf')
errors += jsonData.errors[error] + "\n"; errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
alert(errors); alert(errors);
} }
else else
@@ -186,7 +186,7 @@ function getCarrierListAndUpdate()
for(var error in jsonData.errors) for(var error in jsonData.errors)
//IE6 bug fix //IE6 bug fix
if(error !== 'indexOf') if(error !== 'indexOf')
errors += jsonData.errors[error] + "\n"; errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
alert(errors); alert(errors);
} }
else else
@@ -236,7 +236,7 @@ function updateCarrierSelectionAndGift()
for(var error in jsonData.errors) for(var error in jsonData.errors)
//IE6 bug fix //IE6 bug fix
if(error !== 'indexOf') if(error !== 'indexOf')
errors += jsonData.errors[error] + "\n"; errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
alert(errors); alert(errors);
} }
else else
@@ -703,7 +703,7 @@ function bindInputs()
for(var error in jsonData.errors) for(var error in jsonData.errors)
//IE6 bug fix //IE6 bug fix
if(error !== 'indexOf') if(error !== 'indexOf')
errors += jsonData.errors[error] + "\n"; errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
alert(errors); alert(errors);
} }
else else

4
themes/default/mobile/js/opc.js
View File

@@ -170,7 +170,7 @@ function bindInputs()
for(var error in jsonData.errors) for(var error in jsonData.errors)
//IE6 bug fix //IE6 bug fix
if(error !== 'indexOf') if(error !== 'indexOf')
errors += jsonData.errors[error] + "\n"; errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
alert(errors); alert(errors);
} }
else else
@@ -254,7 +254,7 @@ function updateCarrierSelectionAndGift()
for(var error in jsonData.errors) for(var error in jsonData.errors)
//IE6 bug fix //IE6 bug fix
if(error !== 'indexOf') if(error !== 'indexOf')
errors += jsonData.errors[error] + "\n"; errors += $('<div />').html(jsonData.errors[error]).text() + "\n";
alert(errors); alert(errors);
} }
else else