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:
Gregory Roussac
2013-06-15 01:57:46 +02:00
parent ce9f262feb 319413ca25
commit 3a5a9dea14
302 changed files with 1850 additions and 1160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/get-file-admin.php
+1 -1
View File
@@ -25,5 +25,5 @@
*/
define('_PS_ADMIN_DIR_', getcwd());
require(_PS_ADMIN_DIR_.'/config/config.inc.php');
require(_PS_ADMIN_DIR_.'/../config/config.inc.php');
Controller::getController('GetFileController')->run();
admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
+9 -10
View File
@@ -49,10 +49,12 @@
if (perm == 'all' && $(this).parent().parent().hasClass('parent'))
{
checked = enabled ? 'checked': '';
$(this).parent().parent().parent().find('.child-'+id_tab+' input[type=checkbox]').attr('checked', checked);
if (enabled)
$(this).parent().parent().parent().find('.child-'+id_tab+' input[type=checkbox]').attr('checked', 'checked');
else
$(this).parent().parent().parent().find('.child-'+id_tab+' input[type=checkbox]').removeAttr('checked');
$.ajax({
url: "{$link->getAdminLink('AdminAccess')}",
url: "{$link->getAdminLink('AdminAccess')|addslashes}",
cache: false,
data : {
ajaxMode : '1',
@@ -68,15 +70,12 @@
},
success : function(res,textStatus,jqXHR)
{
try
{
try {
if (res == 'ok')
showSuccessMessage("{l s='Update successful'}");
else
showErrorMessage("{l s='Update error'}");
}
catch(e)
{
} catch(e) {
jAlert('Technical error');
}
}
@@ -85,7 +84,7 @@
perfect_access_js_gestion(this, perm, id_tab, tabsize, tabnumber, table);
$.ajax({
url: "{$link->getAdminLink('AdminAccess')}",
url: "{$link->getAdminLink('AdminAccess')|addslashes}",
cache: false,
data : {
ajaxMode : '1',
@@ -134,7 +133,7 @@
});
$.ajax({
url: "{$link->getAdminLink('AdminAccess')}",
url: "{$link->getAdminLink('AdminAccess')|addslashes}",
cache: false,
data : {
ajaxMode: '1',
admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
+20 -1
View File
@@ -48,6 +48,21 @@
</div>
{else}
{$smarty.block.parent}
{/if}
{/block}
{block name="label"}
{if $input.name == 'standardization'}
<div id="TAASC" style="display: none;">{$smarty.block.parent}
{else}
{$smarty.block.parent}
{/if}
{/block}
{block name="input"}
{if $input.name == 'standardization'}
{$smarty.block.parent}</div>
{else}
{$smarty.block.parent}
{/if}
{/block}
@@ -85,7 +100,11 @@
$('#need_zip_code_on, #need_zip_code_off').change(function() {
disableZipFormat();
});
$('#iso_code').change(function() {
disableTAASC();
});
disableTAASC();
});
function switchExplanationText(text) {
admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
+1 -1
View File
@@ -60,7 +60,7 @@
ifSuperAdmin($(this));
$.ajax({
url: "{$link->getAdminLink('AdminEmployees')}",
url: "{$link->getAdminLink('AdminEmployees')|addslashes}",
cache: false,
data : {
ajax : '1',
admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
+1 -1
View File
@@ -32,7 +32,7 @@
{
$.ajax({
type: 'GET',
url: '{$link->getAdminLink('AdminInformation')}',
url: '{$link->getAdminLink('AdminInformation')|addslashes}',
data: {
'action': 'checkFiles',
'ajax': 1
admin-dev/themes/default/template/controllers/not_found/content.tpl
+2
View File
@@ -22,7 +22,9 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{if isset($controller) && !empty($controller) && $controller != 'adminnotfound'}
<h1>{l s='The controller %s is missing or invalid.' sprintf=$controller}</h1>
{/if}
<ul>
<li><a href="index.php">{l s='Go to the dashboard.'}</a></li>
<li><a href="#" onclick="window.history.back();">{l s='Back to the previous page.'}</a></li>
admin-dev/themes/default/template/controllers/orders/_shipping.tpl
+1 -1
View File
@@ -55,7 +55,7 @@
{/if}
</td>
<td>
<span id="shipping_number_show">{if $line.url && $line.tracking_number}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span>
<span id="shipping_number_show">{if $line.url && $line.tracking_number}<a target="_blank" href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span>
{if $line.can_edit}
<form style="display: inline;" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id|escape:'htmlall':'UTF-8'}">
<span class="shipping_number_edit" style="display:none;">
admin-dev/themes/default/template/controllers/orders/form.tpl
+19 -19
View File
@@ -28,7 +28,7 @@
var changed_shipping_price = false;
var shipping_price_selected_carrier = '';
var current_index = '{$current}&token={$token}';
var admin_cart_link = '{$link->getAdminLink('AdminCarts')}';
var admin_cart_link = '{$link->getAdminLink('AdminCarts')|escape:'html'}';
var cart_quantity = new Array();
var currencies = new Array();
var id_currency = '';
@@ -100,7 +100,7 @@
$('#show_old_carts').click();
$('#payment_module_name').change();
$.ajaxSetup({ type:"post" });
$("#voucher").autocomplete('{$link->getAdminLink('AdminCartRules')}', {
$("#voucher").autocomplete('{$link->getAdminLink('AdminCartRules')|escape:'html'}', {
minChars: 3,
max: 15,
width: 250,
@@ -157,7 +157,7 @@
free_shipping = 1;
$.ajax({
type:"POST",
url: "{$link->getAdminLink('AdminCarts')}",
url: "{$link->getAdminLink('AdminCarts')|addslashes}",
async: true,
dataType: "json",
data : {
@@ -217,7 +217,7 @@
e.preventDefault();
$.ajax({
type:"POST",
url: "{$link->getAdminLink('AdminCarts')}",
url: "{$link->getAdminLink('AdminCarts')|addslashes}",
async: true,
dataType: "json",
data : {
@@ -254,7 +254,7 @@
{
$.ajax({
type:"POST",
url: "{$link->getAdminLink('AdminCarts')}",
url: "{$link->getAdminLink('AdminCarts')|addslashes}",
async: true,
dataType: "json",
data : {
@@ -288,7 +288,7 @@
{
$.ajax({
type:"POST",
url: "{$link->getAdminLink('AdminCarts')}",
url: "{$link->getAdminLink('AdminCarts')|addslashes}",
async: true,
dataType: "json",
data : {
@@ -324,7 +324,7 @@
{
$.ajax({
type:"POST",
url: "{$link->getAdminLink('AdminCarts')}",
url: "{$link->getAdminLink('AdminCarts')|addslashes}",
async: true,
dataType: "json",
data : {
@@ -351,7 +351,7 @@
$('#id_cart').val(id_cart);
$.ajax({
type:"POST",
url: "{$link->getAdminLink('AdminCarts')}",
url: "{$link->getAdminLink('AdminCarts')|addslashes}",
async: false,
dataType: "json",
data : {
@@ -378,7 +378,7 @@
{
$.ajax({
type:"POST",
url: "{$link->getAdminLink('AdminCarts')}",
url: "{$link->getAdminLink('AdminCarts')|addslashes}",
async: true,
dataType: "json",
data : {
@@ -401,7 +401,7 @@
{
$.ajax({
type:"POST",
url: "{$link->getAdminLink('AdminCarts')}",
url: "{$link->getAdminLink('AdminCarts')|addslashes}",
async: true,
dataType: "json",
data : {
@@ -426,7 +426,7 @@
{
$.ajax({
type:"POST",
url : "{$link->getAdminLink('AdminOrders')}",
url : "{$link->getAdminLink('AdminOrders')|escape:'html'}",
async: true,
dataType: "json",
data : {
@@ -468,7 +468,7 @@
$('#new_address').attr('href', address_link.replace(/id_customer=[0-9]+/, 'id_customer='+id_customer));
$.ajax({
type:"POST",
url : "{$link->getAdminLink('AdminCarts')}",
url : "{$link->getAdminLink('AdminCarts')|escape:'html'}",
async: false,
dataType: "json",
data : {
@@ -534,7 +534,7 @@
$('#products_part').show();
$.ajax({
type:"POST",
url: "{$link->getAdminLink('AdminOrders')}",
url: "{$link->getAdminLink('AdminOrders')|addslashes}",
async: true,
dataType: "json",
data : {
@@ -766,7 +766,7 @@
{
$.ajax({
type:"POST",
url: "{$link->getAdminLink('AdminCarts')}",
url: "{$link->getAdminLink('AdminCarts')|addslashes}",
async: true,
dataType: "json",
data : {
@@ -822,7 +822,7 @@
{
$.ajax({
type:"POST",
url: "{$link->getAdminLink('AdminCarts')}",
url: "{$link->getAdminLink('AdminCarts')|addslashes}",
async: true,
dataType: "json",
data : {
@@ -845,7 +845,7 @@
{
$.ajax({
type:"POST",
url: "{$link->getAdminLink('AdminCarts')}",
url: "{$link->getAdminLink('AdminCarts')|addslashes}",
async: true,
dataType: "json",
data : {
@@ -868,7 +868,7 @@
{
$.ajax({
type:"POST",
url: "{$link->getAdminLink('AdminCarts')}",
url: "{$link->getAdminLink('AdminCarts')|addslashes}",
async: true,
dataType: "json",
data : {
@@ -899,7 +899,7 @@
{
$.ajax({
type:"POST",
url: "{$link->getAdminLink('AdminOrders')}",
url: "{$link->getAdminLink('AdminOrders')|addslashes}",
async: true,
dataType: "json",
data : {
@@ -957,7 +957,7 @@
{
$.ajax({
type:"POST",
url: "{$link->getAdminLink('AdminCarts')}",
url: "{$link->getAdminLink('AdminCarts')|addslashes}",
async: true,
dataType: "json",
data : {
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+2 -2
View File
@@ -27,7 +27,7 @@
{block name="override_tpl"}
<script type="text/javascript">
var admin_order_tab_link = "{$link->getAdminLink('AdminOrders')}";
var admin_order_tab_link = "{$link->getAdminLink('AdminOrders')|escape:'html'}";
var id_order = {$order->id};
var id_lang = {$current_id_lang};
var id_currency = {$order->id_currency};
@@ -59,7 +59,7 @@
{assign var="hook_invoice" value={hook h="displayInvoice" id_order=$order->id}}
{if ($hook_invoice)}
<div style="float: right; margin: -40px 40px 10px 0;">{$hook_invoice}</div><br class="clear" />';
<div style="float: right; margin: -40px 40px 10px 0;">{$hook_invoice}</div><br class="clear" />
{/if}
<div class="bloc-command">
admin-dev/themes/default/template/controllers/products/informations.tpl
+1 -1
View File
@@ -43,7 +43,7 @@
$('document').ready( function() {
$(".check_product_name")
.autocomplete(
'{$link->getAdminLink('AdminProducts', true)}', {
'{$link->getAdminLink('AdminProducts', true)|escape:'html'}', {
minChars: 3,
max: 10,
width: $(".check_product_name").width(),
admin-dev/themes/default/template/controllers/products/prices.tpl
+2 -2
View File
@@ -25,7 +25,7 @@
<script type="text/javascript">
var Customer = new Object();
var product_url = '{$link->getAdminLink('AdminProducts', true)}';
var product_url = '{$link->getAdminLink('AdminProducts', true)|addslashes}';
var ecotax_tax_excl = parseFloat({$ecotax_tax_excl});
$(document).ready(function () {
Customer = {
@@ -56,7 +56,7 @@ $(document).ready(function () {
Customer.showLoader();
jQuery.ajax({
"type": "POST",
"url": "{$link->getAdminLink('AdminCustomers')}",
"url": "{$link->getAdminLink('AdminCustomers')|addslashes}",
"async": true,
"dataType": "json",
"data": {
admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+5 -2
View File
@@ -159,7 +159,10 @@
<input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="{$up_filename}" />
{/if}
<div class="conf">
<a class="delete_virtual_product" id="delete_downloadable_product" onclick="return confirm('{l s='Delete this file'}')" href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}" class="red">
<script>
delete_this_file = '{l s='Delete this file'}';
</script>
<a class="delete_virtual_product" id="delete_downloadable_product" href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}" class="red">
<img src="../img/admin/delete.gif" alt="{l s='Delete this file'}"/>
</a>
</div>
@@ -173,7 +176,7 @@
</td>
<td class="col-right">
{$product->productDownload->getHtmlLink(false, true)}
<a onclick="return confirm('{l s='Delete this file'})')" href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}" class="red delete_virtual_product">
<a href="{$currentIndex}&deleteVirtualProduct=true&token={$token}&id_product={$product->id}" class="red delete_virtual_product">
<img src="../img/admin/delete.gif" alt="{l s='Delete this file'}"/>
</a>
</td>
admin-dev/themes/default/template/controllers/shop/tree.tpl
+1 -1
View File
@@ -186,7 +186,7 @@ $("#multishop-tree").jstree({
'plugins': ["themes","json_data","cookies","contextmenu"],
'json_data': {
'ajax': {
'url': "{$link->getAdminLink('AdminShop')}",
'url': "{$link->getAdminLink('AdminShop')|addslashes}",
'data': function(n)
{
return {