Merge branch 'master' of libregit.spks.xyz:heckyel/librecart

9 files changed, 62 insertions, 62 deletions

diff --git a/install.txt b/install.txt
index 76831dd..8062323 100644
--- a/install.txt
+++ b/install.txt
@@ -14,15 +14,15 @@ INSTALL
 -------
 These instructions are for a manual installation using FTP, cPanel or other web hosting Control Panel.
 
-- Linux Install -
+- GNU_Linux Install -
 
-1. Upload all of the files and folders to your server from the "Upload" folder, place them in your web root. The web root is different on some servers, cPanel it should be public_html/ and on Plesk it should be httpdocs/.
+1. Upload all of the files and folders to your server from the "public" folder, place them in your web root. The web root is different on some servers, cPanel it should be public_html/ and on Plesk it should be httpdocs/.
 
 2. Make sure your web user has the permission to read, write and execute all directories under the web root.
 
 3. Rename config-dist.php to config.php and admin/config-dist.php to admin/config.php
 
-4. For Linux/Unix make sure the following folders and files are writable.
+4. For GNU_Linux/Unix make sure the following folders and files are writable.
 
 		chmod 0755 or 0777 config.php
 		chmod 0755 or 0777 admin/config.php
@@ -43,7 +43,7 @@ These instructions are for a manual installation using FTP, cPanel or other web
 
 - Windows Install -
 
-1. Upload all the files and folders to your server from the "Upload" folder. This can be to anywhere of your choice. e.g. /wwwroot/store or /wwwroot
+1. Upload all the files and folders to your server from the "public" folder. This can be to anywhere of your choice. e.g. /wwwroot/store or /wwwroot
 
 2. Rename config-dist.php to config.php and admin/config-dist.php to admin/config.php
 
@@ -84,4 +84,4 @@ will become available, one compiled and one non-compiled (composer.json only - n
 
 We STRONGLY advise leaving the vendor folder outside of the webroot - so files cannot be accessed directly.
 
-Composer installing is extremely simple - https://getcomposer.org
\ No newline at end of file
+Composer installing is extremely simple - https://getcomposer.org
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
+";
diff --git a/upgrade.txt b/upgrade.txt
index 1b2ebfa..99d5456 100644
--- a/upgrade.txt
+++ b/upgrade.txt
@@ -80,4 +80,4 @@ http://www.opencart.com/index.php?route=documentation/documentation&path=98
 
 
 That's It!
-OpenCart Dev Team
\ No newline at end of file
+OpenCart Dev Team