aboutsummaryrefslogtreecommitdiffstats
path: root/public
diff options
context:
space:
mode:
Diffstat (limited to 'public')
-rw-r--r--public/admin/language/es-es/extension/module/sagepay_direct_cards.php8
-rw-r--r--public/admin/language/es-es/extension/module/sagepay_server_cards.php8
-rw-r--r--public/catalog/view/theme/default/template/account/address_form.twig88
-rw-r--r--public/php.ini2
-rw-r--r--public/system/storage/vendor/zoujingli/wechat-php-sdk/README.md2
-rw-r--r--public/system/storage/vendor/zoujingli/wechat-php-sdk/Wechat/WechatHardware.php2
-rw-r--r--public/system/storage/vendor/zoujingli/wechat-php-sdk/test.php2
7 files changed, 56 insertions, 56 deletions
diff --git a/public/admin/language/es-es/extension/module/sagepay_direct_cards.php b/public/admin/language/es-es/extension/module/sagepay_direct_cards.php
index e6ab4d1..558e346 100644
--- a/public/admin/language/es-es/extension/module/sagepay_direct_cards.php
+++ b/public/admin/language/es-es/extension/module/sagepay_direct_cards.php
@@ -3,11 +3,11 @@
$_['heading_title'] = 'Sagepay Direct Card Management';
$_['text_extension'] = 'Extensions';
-$_['text_success'] = 'Success: You have modified Sagepay Direct Card Management module!';
-$_['text_edit'] = 'Edit Sagepay Direct Card Management Module';
+$_['text_success'] = 'Éxito: ¡Ha modificado el módulo Sagepay Direct Card Management!';
+$_['text_edit'] = 'Editar el módulo de Sagepay Direct Card Management';
// Entry
-$_['entry_status'] = 'Status';
+$_['entry_status'] = 'Estado';
// Error
-$_['error_permission'] = 'Warning: You do not have permission to modify Sagepay Direct Card Management module!'; \ No newline at end of file
+$_['error_permission'] = 'Advertencia: ¡No tiene permiso para modificar el módulo Sagepay Direct Card Management!';
diff --git a/public/admin/language/es-es/extension/module/sagepay_server_cards.php b/public/admin/language/es-es/extension/module/sagepay_server_cards.php
index 9fd5608..b387585 100644
--- a/public/admin/language/es-es/extension/module/sagepay_server_cards.php
+++ b/public/admin/language/es-es/extension/module/sagepay_server_cards.php
@@ -3,11 +3,11 @@
$_['heading_title'] = 'Sagepay Server Card Management';
$_['text_extension'] = 'Extensions';
-$_['text_success'] = 'Success: You have modified Sagepay Server Card Management module!';
-$_['text_edit'] = 'Edit Sagepay Server Card Management Module';
+$_['text_success'] = 'Éxito: ¡Ha modificado el módulo de Sagepay Server Card Management!';
+$_['text_edit'] = 'Editar el módulo Sagepay Server Card Management';
// Entry
-$_['entry_status'] = 'Status';
+$_['entry_status'] = 'Estado';
// Error
-$_['error_permission'] = 'Warning: You do not have permission to modify Sagepay Server Card Management module!'; \ No newline at end of file
+$_['error_permission'] = 'Advertencia: ¡No tiene permiso para modificar el módulo de administración de tarjetas del servidor Sagepay!';
diff --git a/public/catalog/view/theme/default/template/account/address_form.twig b/public/catalog/view/theme/default/template/account/address_form.twig
index 16d240d..17db878 100644
--- a/public/catalog/view/theme/default/template/account/address_form.twig
+++ b/public/catalog/view/theme/default/template/account/address_form.twig
@@ -74,19 +74,19 @@
<div class="col-sm-10">
<select name="country_id" id="input-country" class="form-control">
<option value="">{{ text_select }}</option>
-
+
{% for country in countries %}
{% if country.country_id == country_id %}
-
+
<option value="{{ country.country_id }}" selected="selected">{{ country.name }}</option>
-
+
{% else %}
-
+
<option value="{{ country.country_id }}">{{ country.name }}</option>
-
+
{% endif %}
{% endfor %}
-
+
</select>
{% if error_country %}
<div class="text-danger">{{ error_country }}</div>
@@ -108,29 +108,29 @@
<div class="col-sm-10">
<select name="custom_field[{{ custom_field.location }}][{{ custom_field.custom_field_id }}]" id="input-custom-field{{ custom_field.custom_field_id }}" class="form-control">
<option value="">{{ text_select }}</option>
-
-
-
+
+
+
{% for custom_field_value in custom_field.custom_field_value %}
{% if address_custom_field[custom_field.custom_field_id] and custom_field_value.custom_field_value_id == address_custom_field[custom_field.custom_field_id] %}
-
+
<option value="{{ custom_field_value.custom_field_value_id }}" selected="selected">{{ custom_field_value.name }}</option>
-
-
-
+
+
+
{% else %}
-
-
-
+
+
+
<option value="{{ custom_field_value.custom_field_value_id }}">{{ custom_field_value.name }}</option>
-
-
-
+
+
+
{% endif %}
{% endfor %}
-
-
-
+
+
+
</select>
{% if error_custom_field[custom_field.custom_field_id] %}
<div class="text-danger">{{ error_custom_field[custom_field.custom_field_id] }}</div>
@@ -286,38 +286,38 @@ $('.form-group[data-sort]').detach().each(function() {
if ($(this).attr('data-sort') >= 0 && $(this).attr('data-sort') <= $('.form-group').length-2) {
$('.form-group').eq(parseInt($(this).attr('data-sort'))+2).before(this);
}
-
+
if ($(this).attr('data-sort') > $('.form-group').length-2) {
$('.form-group:last').after(this);
}
-
+
if ($(this).attr('data-sort') == $('.form-group').length-2) {
$('.form-group:last').after(this);
}
-
+
if ($(this).attr('data-sort') < -$('.form-group').length-2) {
$('.form-group:first').before(this);
}
});
-//--></script>
+//--></script>
<script type="text/javascript"><!--
$('button[id^=\'button-custom-field\']').on('click', function() {
var element = this;
-
+
$('#form-upload').remove();
-
+
$('body').prepend('<form enctype="multipart/form-data" id="form-upload" style="display: none;"><input type="file" name="file" /></form>');
-
+
$('#form-upload input[name=\'file\']').trigger('click');
-
+
if (typeof timer != 'undefined') {
clearInterval(timer);
}
-
+
timer = setInterval(function() {
if ($('#form-upload input[name=\'file\']').val() != '') {
clearInterval(timer);
-
+
$.ajax({
url: 'index.php?route=tool/upload',
type: 'post',
@@ -334,14 +334,14 @@ $('button[id^=\'button-custom-field\']').on('click', function() {
},
success: function(json) {
$(element).parent().find('.text-danger').remove();
-
+
if (json['error']) {
$(element).parent().find('input').after('<div class="text-danger">' + json['error'] + '</div>');
}
-
+
if (json['success']) {
alert(json['success']);
-
+
$(element).parent().find('input').val(json['code']);
}
},
@@ -352,7 +352,7 @@ $('button[id^=\'button-custom-field\']').on('click', function() {
}
}, 500);
});
-//--></script>
+//--></script>
<script type="text/javascript"><!--
$('.date').datetimepicker({
language: '{{ datepicker }}',
@@ -369,7 +369,7 @@ $('.time').datetimepicker({
language: '{{ datepicker }}',
pickDate: false
});
-//--></script>
+//--></script>
<script type="text/javascript"><!--
$('select[name=\'country_id\']').on('change', function() {
$.ajax({
@@ -387,23 +387,23 @@ $('select[name=\'country_id\']').on('change', function() {
} else {
$('input[name=\'postcode\']').parent().parent().removeClass('required');
}
-
+
html = '<option value="">{{ text_select }}</option>';
-
+
if (json['zone'] && json['zone'] != '') {
for (i = 0; i < json['zone'].length; i++) {
html += '<option value="' + json['zone'][i]['zone_id'] + '"';
-
+
if (json['zone'][i]['zone_id'] == '{{ zone_id }}') {
html += ' selected="selected"';
}
-
+
html += '>' + json['zone'][i]['name'] + '</option>';
}
} else {
html += '<option value="0" selected="selected">{{ text_none }}</option>';
}
-
+
$('select[name=\'zone_id\']').html(html);
},
error: function(xhr, ajaxOptions, thrownError) {
@@ -413,5 +413,5 @@ $('select[name=\'country_id\']').on('change', function() {
});
$('select[name=\'country_id\']').trigger('change');
-//--></script>
-{{ footer }} \ No newline at end of file
+//--></script>
+{{ footer }}
diff --git a/public/php.ini b/public/php.ini
index 29b615c..a9229f3 100644
--- a/public/php.ini
+++ b/public/php.ini
@@ -14,4 +14,4 @@ session.cookie_httponly = On
session.gc_maxlifetime = 3600
allow_url_fopen = On
;display_errors = 1
-;error_reporting = E_ALL \ No newline at end of file
+;error_reporting = E_ALL
diff --git a/public/system/storage/vendor/zoujingli/wechat-php-sdk/README.md b/public/system/storage/vendor/zoujingli/wechat-php-sdk/README.md
index 3463565..127f28a 100644
--- a/public/system/storage/vendor/zoujingli/wechat-php-sdk/README.md
+++ b/public/system/storage/vendor/zoujingli/wechat-php-sdk/README.md
@@ -33,7 +33,7 @@ WeChatDeveloper:https://github.com/zoujingli/WeChatDeveloper
**官方接口文档链接**
--
-* 使用前需先打开微信帐号的开发模式,详细步骤请查看微信公众平台接口使用说明:
+* 使用前需先打开微信帐号的开发模式,详细步骤请查看微信公众平台接口使用说明:
* 微信公众平台: http://mp.weixin.qq.com/wiki/
* 微信企业平台: http://qydev.weixin.qq.com/wiki/
* 微信开放平台:https://open.weixin.qq.com/
diff --git a/public/system/storage/vendor/zoujingli/wechat-php-sdk/Wechat/WechatHardware.php b/public/system/storage/vendor/zoujingli/wechat-php-sdk/Wechat/WechatHardware.php
index c01114b..eaa4cdd 100644
--- a/public/system/storage/vendor/zoujingli/wechat-php-sdk/Wechat/WechatHardware.php
+++ b/public/system/storage/vendor/zoujingli/wechat-php-sdk/Wechat/WechatHardware.php
@@ -157,4 +157,4 @@ class WechatHardware extends Common
return false;
}
-} \ No newline at end of file
+}
diff --git a/public/system/storage/vendor/zoujingli/wechat-php-sdk/test.php b/public/system/storage/vendor/zoujingli/wechat-php-sdk/test.php
index ed4ee38..b88fe3f 100644
--- a/public/system/storage/vendor/zoujingli/wechat-php-sdk/test.php
+++ b/public/system/storage/vendor/zoujingli/wechat-php-sdk/test.php
@@ -65,4 +65,4 @@ echo "
wx.hideOptionMenu();
});
</script>
-"; \ No newline at end of file
+";