Eoxia / wpshop

wpshop.php

Spacing +30 added lines, -30 removed lines

@@ -20,18 +20,18 @@ 
 ini_set('memory_limit', '512M');
 
 /**	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'ABSPATH' ) ) {
-	die( 'Access is not allowed by this way' );
+if (!defined('ABSPATH')) {
+	die('Access is not allowed by this way');
 }
 
 /**	Allows to refresh css and js file in final user browser	*/
 DEFINE('WPSHOP_VERSION', '1.4.3.3');
 
 /**	Allows to avoid problem with theme not supporting thumbnail for post	*/
-add_theme_support( 'post-thumbnails' );
-add_image_size( 'wpshop-product-galery', 270, 270, true );
-add_image_size( 'wps-categorie-mini-display', 80, 80, true );
-add_image_size( 'wps-categorie-display', 480, 340, true );
+add_theme_support('post-thumbnails');
+add_image_size('wpshop-product-galery', 270, 270, true);
+add_image_size('wps-categorie-mini-display', 80, 80, true);
+add_image_size('wps-categorie-display', 480, 340, true);
 
 /**	First thing we define the main directory for our plugin in a super global var	*/
 DEFINE('WPSHOP_PLUGIN_DIR', basename(dirname(__FILE__)));
@@ -39,26 +39,26 @@ 
 /**	Get the current language to translate the different text in plugin	*/
 $locale = get_locale();
 global $wpdb;
-if ( defined("ICL_LANGUAGE_CODE") ) {
+if (defined("ICL_LANGUAGE_CODE")) {
 	$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", ICL_LANGUAGE_CODE);
 	$local = $wpdb->get_var($query);
 	$locale = !empty($local) ? $local : $locale;
 }
 DEFINE('WPSHOP_CURRENT_LOCALE', $locale);
 /**	Load plugin translation	*/
-load_plugin_textdomain( 'wpshop', false,  dirname( plugin_basename( __FILE__ ) ) . '/languages/');
+load_plugin_textdomain('wpshop', false, dirname(plugin_basename(__FILE__)) . '/languages/');
 
 /**	Include the config file	*/
 require(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/includes/config.php');
 
 /** Allow to get errors back when debug mode is set to true	*/
-if ( WPSHOP_DEBUG_MODE && (in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP)) ) ) {
+if (WPSHOP_DEBUG_MODE && (in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP)))) {
 	ini_set('display_errors', true);
 	error_reporting(E_ALL);
 }
 
 include_once(WPSHOP_LIBRAIRIES_DIR . 'init.class.php');
-$current_installation_step = get_option( 'wps-installation-current-step', 1 );
+$current_installation_step = get_option('wps-installation-current-step', 1);
 
 /**	Get current plugin version	*/
 $current_db_version = get_option('wpshop_db_options', 0);
@@ -76,32 +76,32 @@ 
 
 /**	Call function to create the main left menu	*/
 //if ( ( WPSINSTALLER_STEPS_COUNT <= $current_installation_step ) || ( !empty( $current_db_version ) && !empty( $current_db_version[ 'db_version' ] ) && ( 51 < $current_db_version[ 'db_version' ] ) ) || ( !empty( $_GET ) && !empty( $_GET[ 'installation_state' ] ) && ( "ignored" == $_GET[ 'installation_state' ] ) ) ) {
-	add_action('admin_menu', array( 'wpshop_init', 'admin_menu' ) );
-	add_action( 'menu_order', array( 'wpshop_init', 'admin_menu_order' ) );
-	add_action( 'custom_menu_order', array( 'wpshop_init', 'admin_custom_menu_order' ) );
+	add_action('admin_menu', array('wpshop_init', 'admin_menu'));
+	add_action('menu_order', array('wpshop_init', 'admin_menu_order'));
+	add_action('custom_menu_order', array('wpshop_init', 'admin_custom_menu_order'));
 
 	/*	Call function for new wordpress element creating [term (product_category) / post (product)]	*/
-	add_action( 'init', array( 'wpshop_init', 'add_new_wp_type' ) );
+	add_action('init', array('wpshop_init', 'add_new_wp_type'));
 
 	/*	Call function allowing to change element front output	*/
-	add_action( 'the_content', array( 'wpshop_display', 'products_page' ), 1 );
+	add_action('the_content', array('wpshop_display', 'products_page'), 1);
 	// add_action('archive_template', array('wpshop_categories', 'category_template_switcher'));
 //}
 
 /**	On plugin activation create the default parameters to use the ecommerce	*/
-register_activation_hook( __FILE__ , array('wpshop_install', 'install_on_activation') );
+register_activation_hook(__FILE__, array('wpshop_install', 'install_on_activation'));
 
 /**	On plugin deactivation call the function to clean the wordpress installation	*/
-register_deactivation_hook( __FILE__ , array('wpshop_install', 'uninstall_wpshop') );
+register_deactivation_hook(__FILE__, array('wpshop_install', 'uninstall_wpshop'));
 
 /**	Get current plugin version	*/
 $current_db_version = get_option('wpshop_db_options', 0);
 
 /**	Add the database content	*/
 add_action('admin_init', array('wpshop_install', 'update_wpshop'));
-if ( ( defined( 'WPSINSTALLER_STEPS_COUNT' ) && ( WPSINSTALLER_STEPS_COUNT <= $current_installation_step ) ) || ( !empty( $current_db_version ) && !empty( $current_db_version[ 'db_version' ] ) && ( 51 < $current_db_version[ 'db_version' ] ) ) || ( !empty( $current_db_version ) && !empty( $current_db_version[ 'installation_state' ] ) && ( "ignore" == $current_db_version[ 'installation_state' ] ) ) ) {
-	if ( in_array( long2ip( ip2long($_SERVER['REMOTE_ADDR'] ) ), unserialize( WPSHOP_DEBUG_MODE_ALLOWED_IP ) ) ) {
-		add_action( 'admin_init', array( 'wpshop_install', 'update_wpshop_dev' ) );
+if ((defined('WPSINSTALLER_STEPS_COUNT') && (WPSINSTALLER_STEPS_COUNT <= $current_installation_step)) || (!empty($current_db_version) && !empty($current_db_version['db_version']) && (51 < $current_db_version['db_version'])) || (!empty($current_db_version) && !empty($current_db_version['installation_state']) && ("ignore" == $current_db_version['installation_state']))) {
+	if (in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP))) {
+		add_action('admin_init', array('wpshop_install', 'update_wpshop_dev'));
 	}
 }
 // Start session
@@ -138,24 +138,24 @@ 
 /** Add specific messages for wpshop elements management	*/
 // add_filter('post_updated_messages', array('wpshop_messages', 'update_wp_message_list'));
 
-$file   = basename( __FILE__ );
-$folder = basename( dirname( __FILE__ ) );
+$file   = basename(__FILE__);
+$folder = basename(dirname(__FILE__));
 $hook = "in_plugin_update_message-{$folder}/{$file}";
-add_action( $hook, 'wps_update_message', 10, 2 ); // 10:priority, 2:arguments #
-function wps_update_message( $currentPluginMetadata, $newPluginMetadata){
+add_action($hook, 'wps_update_message', 10, 2); // 10:priority, 2:arguments #
+function wps_update_message($currentPluginMetadata, $newPluginMetadata) {
 	$message = '';
 
-	if ( '1.4.1.6' == $currentPluginMetadata[ 'Version' ] ) {
-		$message = sprintf( __( 'For security reason %splease read this post%s', 'wpshop' ), '<a href="" >', '</a>');
+	if ('1.4.1.6' == $currentPluginMetadata['Version']) {
+		$message = sprintf(__('For security reason %splease read this post%s', 'wpshop'), '<a href="" >', '</a>');
 	}
 
 	// check "upgrade_notice"
-  if (isset( $newPluginMetadata->upgrade_notice) && strlen(trim($newPluginMetadata->upgrade_notice)) > 0 ) {
-  	$message = esc_html( $newPluginMetadata->upgrade_notice );
+  if (isset($newPluginMetadata->upgrade_notice) && strlen(trim($newPluginMetadata->upgrade_notice)) > 0) {
+  	$message = esc_html($newPluginMetadata->upgrade_notice);
 	}
 
-	if ( !empty( $message ) ) {
-  	echo '<p style="background-color: #d54e21; padding: 10px; color: #f9f9f9; margin-top: 10px"><strong>' . __( 'Important upgrade notice', 'wpshop' ) . ': </strong>' . $message . '</p>';
+	if (!empty($message)) {
+  	echo '<p style="background-color: #d54e21; padding: 10px; color: #f9f9f9; margin-top: 10px"><strong>' . __('Important upgrade notice', 'wpshop') . ': </strong>' . $message . '</p>';
 	}
 }
 

includes/modules/billing/billing.php

Spacing +328 added lines, -328 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Billing module bootstrap file
  *
@@ -9,7 +9,7 @@ 
  */
 
 /**	Check if billing class does not exist before creating the class	*/
-if ( !class_exists("wpshop_modules_billing") ) {
+if (!class_exists("wpshop_modules_billing")) {
 	/**
 	 * Billing module utilities definition
 	 *
@@ -24,15 +24,15 @@ 
 		 */
 		function __construct() {
 			/**	Add custom template for current module	*/
-			add_filter( 'wpshop_custom_template', array( &$this, 'custom_template_load' ) );
+			add_filter('wpshop_custom_template', array(&$this, 'custom_template_load'));
 
 			/**	In case wpshop is set on sale mode and not on view catalog only, Ad billign options	*/
-			if ( WPSHOP_DEFINED_SHOP_TYPE == 'sale' ) {
-				$wpshop_shop_type = !empty( $_POST['wpshop_shop_type'] ) ? sanitize_text_field( $_POST['wpshop_shop_type'] ) : '';
-				$old_wpshop_shop_type = !empty( $_POST['old_wpshop_shop_type'] ) ? sanitize_text_field( $_POST['old_wpshop_shop_type'] ) : '';
+			if (WPSHOP_DEFINED_SHOP_TYPE == 'sale') {
+				$wpshop_shop_type = !empty($_POST['wpshop_shop_type']) ? sanitize_text_field($_POST['wpshop_shop_type']) : '';
+				$old_wpshop_shop_type = !empty($_POST['old_wpshop_shop_type']) ? sanitize_text_field($_POST['old_wpshop_shop_type']) : '';
 
-				if ( ( $wpshop_shop_type == '' || $wpshop_shop_type != 'presentation' )
-					&& ( $old_wpshop_shop_type == '' || $old_wpshop_shop_type != 'presentation' ) ) {
+				if (($wpshop_shop_type == '' || $wpshop_shop_type != 'presentation')
+					&& ($old_wpshop_shop_type == '' || $old_wpshop_shop_type != 'presentation')) {
 						/**	Add module option to wpshop general options	*/
 						add_filter('wpshop_options', array(&$this, 'add_options'), 9);
 						add_action('wsphop_options', array(&$this, 'declare_options'), 8);
@@ -40,7 +40,7 @@ 
 			}
 
 			// Filter
-			add_filter( 'wps_order_saving_admin_extra_action', array( $this, 'force_invoice_generation_on_order'), 50, 2 );
+			add_filter('wps_order_saving_admin_extra_action', array($this, 'force_invoice_generation_on_order'), 50, 2);
 		}
 
 		/**
@@ -50,17 +50,17 @@ 
 		 *
 		 * @return array The template with new elements
 		 */
-		function custom_template_load( $templates ) {
+		function custom_template_load($templates) {
 			include('templates/common/main_elements.tpl.php');
 			$wpshop_template = $tpl_element;
 			/*	Get custom frontend template	*/
-			if ( is_file(get_stylesheet_directory() . '/wpshop/common/main_elements.tpl.php') ) {
+			if (is_file(get_stylesheet_directory() . '/wpshop/common/main_elements.tpl.php')) {
 				require_once(get_stylesheet_directory() . '/wpshop/common/main_elements.tpl.php');
 				if (!empty($tpl_element))
-					$wpshop_template['common']['custom'] = ($tpl_element);unset($tpl_element);
+					$wpshop_template['common']['custom'] = ($tpl_element); unset($tpl_element);
 			}
 			$wpshop_display = new wpshop_display();
-			$templates = $wpshop_display->add_modules_template_to_internal( $wpshop_template, $templates );
+			$templates = $wpshop_display->add_modules_template_to_internal($wpshop_template, $templates);
 
 			unset($tpl_element);
 
@@ -70,9 +70,9 @@ 
 		/**
 		 * Declare option groups for the module
 		 */
-		function add_options( $option_group ) {
+		function add_options($option_group) {
 			$option_group['wpshop_billing_info'] =
-				array(	'label' => __('Billing', 'wpshop'),
+				array('label' => __('Billing', 'wpshop'),
 						'subgroups' => array(
 							'wpshop_billing_info' => array('class' => ' wpshop_admin_box_options_billing'),
 						),
@@ -85,7 +85,7 @@ 
 		 * Declare the different options in groups for the module
 		 */
 		function declare_options() {
-			add_settings_section('wpshop_billing_info','<span class="dashicons dashicons-admin-generic"></span>'. __('Billing settings', 'wpshop'), array(&$this, 'billing_options_main_explanation'), 'wpshop_billing_info');
+			add_settings_section('wpshop_billing_info', '<span class="dashicons dashicons-admin-generic"></span>' . __('Billing settings', 'wpshop'), array(&$this, 'billing_options_main_explanation'), 'wpshop_billing_info');
 
 			register_setting('wpshop_options', 'wpshop_billing_number_figures', array(&$this, 'wpshop_options_validate_billing_number_figures'));
 			add_settings_field('wpshop_billing_number_figures', __('Number of figures', 'wpshop'), array(&$this, 'wpshop_billing_number_figures_field'), 'wpshop_billing_info', 'wpshop_billing_info');
@@ -94,30 +94,30 @@ 
 			add_settings_field('wpshop_billing_address_choice', __('Billing address choice', 'wpshop'), array(&$this, 'wpshop_billing_address_choice_field'), 'wpshop_billing_info', 'wpshop_billing_info');
 			add_settings_field('wpshop_billing_address_include_into_register', '', array(&$this, 'wpshop_billing_address_include_into_register_field'), 'wpshop_billing_info', 'wpshop_billing_info');
 
-			$quotation_option = get_option( 'wpshop_addons' );
-			if ( !empty($quotation_option) && !empty($quotation_option['WPSHOP_ADDONS_QUOTATION']) && !empty($quotation_option['WPSHOP_ADDONS_QUOTATION']['activate']) ) {
-				add_settings_section('wpshop_quotation_info', '<span class="dashicons dashicons-clipboard"></span>' .__('Quotation settings', 'wpshop'), array(&$this, 'quotation_options_main_explanation'), 'wpshop_billing_info');
+			$quotation_option = get_option('wpshop_addons');
+			if (!empty($quotation_option) && !empty($quotation_option['WPSHOP_ADDONS_QUOTATION']) && !empty($quotation_option['WPSHOP_ADDONS_QUOTATION']['activate'])) {
+				add_settings_section('wpshop_quotation_info', '<span class="dashicons dashicons-clipboard"></span>' . __('Quotation settings', 'wpshop'), array(&$this, 'quotation_options_main_explanation'), 'wpshop_billing_info');
 
 				register_setting('wpshop_options', 'wpshop_quotation_validate_time', array(&$this, 'wpshop_options_validate_quotation_validate_time'));
 				add_settings_field('wpshop_quotation_validate_time', __('Quotation validate time', 'wpshop'), array(&$this, 'wpshop_quotation_validate_time_field'), 'wpshop_billing_info', 'wpshop_quotation_info');
 				$payment_option = get_option('wps_payment_mode');
-				if ( !empty($payment_option) && !empty($payment_option['mode']) && !empty($payment_option['mode']['banktransfer']) && !empty($payment_option['mode']['banktransfer']['active']) ) {
+				if (!empty($payment_option) && !empty($payment_option['mode']) && !empty($payment_option['mode']['banktransfer']) && !empty($payment_option['mode']['banktransfer']['active'])) {
 					register_setting('wpshop_options', 'wpshop_paymentMethod_options[banktransfer][add_in_quotation]', array(&$this, 'wpshop_options_validate_wpshop_bic_to_quotation'));
 					add_settings_field('wpshop_paymentMethod_options[banktransfer][add_in_quotation]', __('Add your BIC to your quotations', 'wpshop'), array(&$this, 'wpshop_bic_to_quotation_field'), 'wpshop_billing_info', 'wpshop_quotation_info');
 				}
 				register_setting('wpshop_options', 'wpshop_payment_partial', array(&$this, 'wpshop_quotation_payment_partial_validation'));
-				add_settings_field('wpshop_payment_partial', __( 'Quotation partial payment'), array(&$this, 'wpshop_quotation_payment_partial'), 'wpshop_billing_info', 'wpshop_quotation_info');
+				add_settings_field('wpshop_payment_partial', __('Quotation partial payment'), array(&$this, 'wpshop_quotation_payment_partial'), 'wpshop_billing_info', 'wpshop_quotation_info');
 			}
 
 		}
 
-		function wpshop_options_validate_wpshop_bic_to_quotation ($input) {
+		function wpshop_options_validate_wpshop_bic_to_quotation($input) {
 			return $input;
 		}
 
-		function wpshop_bic_to_quotation_field () {
+		function wpshop_bic_to_quotation_field() {
 			$add_quotation_option = get_option('wpshop_paymentMethod_options');
-			$output = '<input type="checkbox" name="wpshop_paymentMethod_options[banktransfer][add_in_quotation]" id="wpshop_paymentMethod_options[banktransfer][add_in_quotation]"  ' .( ( !empty($add_quotation_option) && !empty($add_quotation_option['banktransfer']) && !empty($add_quotation_option['banktransfer']['add_in_quotation']) ) ? 'checked="checked"' : ''). ' />';
+			$output = '<input type="checkbox" name="wpshop_paymentMethod_options[banktransfer][add_in_quotation]" id="wpshop_paymentMethod_options[banktransfer][add_in_quotation]"  ' . ((!empty($add_quotation_option) && !empty($add_quotation_option['banktransfer']) && !empty($add_quotation_option['banktransfer']['add_in_quotation'])) ? 'checked="checked"' : '') . ' />';
 			echo $output;
 		}
 
@@ -128,44 +128,44 @@ 
 
 		}
 
-		function wpshop_options_validate_quotation_validate_time ($input) {
+		function wpshop_options_validate_quotation_validate_time($input) {
 			return $input;
 		}
 
 		function wpshop_billing_number_figures_field() {
 			$wpshop_billing_number_figures = get_option('wpshop_billing_number_figures');
-			$readonly = !empty($wpshop_billing_number_figures) ? 'readonly="readonly"': null;
-			if(empty($wpshop_billing_number_figures)) $wpshop_billing_number_figures=5;
+			$readonly = !empty($wpshop_billing_number_figures) ? 'readonly="readonly"' : null;
+			if (empty($wpshop_billing_number_figures)) $wpshop_billing_number_figures = 5;
 
-			echo '<input name="wpshop_billing_number_figures" type="text" value="'.$wpshop_billing_number_figures.'" '.$readonly.' />
-		<a href="#" title="'.__('Number of figures to make appear on invoices','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+			echo '<input name="wpshop_billing_number_figures" type="text" value="' . $wpshop_billing_number_figures . '" ' . $readonly . ' />
+		<a href="#" title="'.__('Number of figures to make appear on invoices', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 		}
 
-		function wpshop_options_validate_billing_number_figures( $input ) {
+		function wpshop_options_validate_billing_number_figures($input) {
 			return $input;
 		}
 
-		function wpshop_billing_address_validator( $input ){
+		function wpshop_billing_address_validator($input) {
 			global $wpdb;
-			$t = wps_address::get_addresss_form_fields_by_type ( $input['choice'] );
+			$t = wps_address::get_addresss_form_fields_by_type($input['choice']);
 
 			$the_code = '';
-			foreach( $t[$input['choice']] as $group_id => $group_def ) {
-				if ( !empty($input['integrate_into_register_form_matching_field']) && !empty($input['integrate_into_register_form_matching_field']['user_email']) && array_key_exists( $input['integrate_into_register_form_matching_field']['user_email'], $group_def['content']) ) {
+			foreach ($t[$input['choice']] as $group_id => $group_def) {
+				if (!empty($input['integrate_into_register_form_matching_field']) && !empty($input['integrate_into_register_form_matching_field']['user_email']) && array_key_exists($input['integrate_into_register_form_matching_field']['user_email'], $group_def['content'])) {
 					$the_code = $group_def['content'][$input['integrate_into_register_form_matching_field']['user_email']]['name'];
 					continue;
 				}
 			}
 			$the_code;
 
-			if ( !empty($input['integrate_into_register_form']) && $input['integrate_into_register_form'] == 'yes' ) {
-				if ( !empty($input['integrate_into_register_form_matching_field']) && !empty($input['integrate_into_register_form_matching_field']['user_email']) && $the_code == 'address_user_email') {
+			if (!empty($input['integrate_into_register_form']) && $input['integrate_into_register_form'] == 'yes') {
+				if (!empty($input['integrate_into_register_form_matching_field']) && !empty($input['integrate_into_register_form_matching_field']['user_email']) && $the_code == 'address_user_email') {
 					$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('_need_verification' => 'no'), array('code' => $the_code));
 				}
 			}
 
-			$billing_option = get_option( 'wpshop_billing_address' );
-			if( !empty($billing_option) && !empty( $billing_option['display_model'] ) ) {
+			$billing_option = get_option('wpshop_billing_address');
+			if (!empty($billing_option) && !empty($billing_option['display_model'])) {
 				$input['display_model'] = $billing_option['display_model'];
 			}
 
@@ -178,10 +178,10 @@ 
 
 			$wpshop_billing_address = get_option('wpshop_billing_address');
 
-			$query = $wpdb->prepare('SELECT ID FROM ' .$wpdb->posts. ' WHERE post_name = "%s" AND post_type = "%s"', WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES);
+			$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_name = "%s" AND post_type = "%s"', WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES);
 			$entity_id = $wpdb->get_var($query);
 
-			$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d', $entity_id);
+			$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
 			$content = $wpdb->get_results($query);
 
 			/*	Field for billing address type choice	*/
@@ -190,21 +190,21 @@ 
 			$input_def['possible_value'] = $content;
 			$input_def['type'] = 'select';
 			$input_def['value'] = $wpshop_billing_address['choice'];
-			$output .= '<div>' .wpshop_form::check_input_type($input_def). '</div>';
+			$output .= '<div>' . wpshop_form::check_input_type($input_def) . '</div>';
 
 			/*	Field for integrate billign form into register form	*/
 			$input_def = array();
 			$input_def['name'] = 'wpshop_billing_address[integrate_into_register_form]';
 			$input_def['id'] = 'wpshop_billing_address_integrate_into_register_form';
-			$input_def['possible_value'] = array( 'yes' => __('Integrate billing form into register form', 'wpshop') );
+			$input_def['possible_value'] = array('yes' => __('Integrate billing form into register form', 'wpshop'));
 			$input_def['valueToPut'] = 'index';
 			$input_def['options_label']['original'] = true;
 			$input_def['option'] = ' class="wpshop_billing_address_integrate_into_register_form" ';
 			$input_def['type'] = 'checkbox';
-			$input_def['value'] = array( !empty($wpshop_billing_address['integrate_into_register_form']) ? $wpshop_billing_address['integrate_into_register_form'] : '' );
+			$input_def['value'] = array(!empty($wpshop_billing_address['integrate_into_register_form']) ? $wpshop_billing_address['integrate_into_register_form'] : '');
 			$output .= '
 <div class="wpshop_include_billing_form_into_register_container" >
-	' .wpshop_form::check_input_type($input_def). '
+	' .wpshop_form::check_input_type($input_def) . '
 	<input type="hidden" name="wpshop_ajax_integrate_billin_into_register" id="wpshop_ajax_integrate_billin_into_register" value="' . wp_create_nonce('wpshop_ajax_integrate_billin_into_register') . '" />
 	<input type="hidden" name="wpshop_include_billing_form_into_register_where_value" id="wpshop_include_billing_form_into_register_where_value" value="' . (!empty($wpshop_billing_address['integrate_into_register_form_after_field']) ? $wpshop_billing_address['integrate_into_register_form_after_field'] : '') . '" />
 	<div class="wpshop_include_billing_form_into_register_where" ></div>
@@ -217,13 +217,13 @@ 
 
 		}
 
-		function wpshop_quotation_validate_time_field () {
+		function wpshop_quotation_validate_time_field() {
 			$quotation_option = get_option('wpshop_quotation_validate_time');
-			$output  = '<input type="text" name="wpshop_quotation_validate_time[number]" id="wpshop_quotation_validate_time[number]" style="width:50px;" value="' .( ( !empty($quotation_option) && !empty($quotation_option['number']) ) ? $quotation_option['number'] : null ). '" />';
+			$output  = '<input type="text" name="wpshop_quotation_validate_time[number]" id="wpshop_quotation_validate_time[number]" style="width:50px;" value="' . ((!empty($quotation_option) && !empty($quotation_option['number'])) ? $quotation_option['number'] : null) . '" />';
 			$output .= '<select name="wpshop_quotation_validate_time[time_type]" id="wpshop_quotation_validate_time[time_type]">';
-			$output .= '<option value="day" ' .( (  !empty($quotation_option) && !empty($quotation_option['time_type']) &&  $quotation_option['time_type'] == 'day') ? 'selected="selected"' : ''). '>' .__('Days', 'wpshop'). '</option>';
-			$output .= '<option value="month" ' .( (  !empty($quotation_option) && !empty($quotation_option['time_type']) &&  $quotation_option['time_type'] == 'month') ? 'selected="selected"' : ''). '>' .__('Months', 'wpshop'). '</option>';
-			$output .= '<option value="year" ' .( (  !empty($quotation_option) && !empty($quotation_option['time_type']) &&  $quotation_option['time_type'] == 'year') ? 'selected="selected"' : ''). '>' .__('Years', 'wpshop'). '</option>';
+			$output .= '<option value="day" ' . ((!empty($quotation_option) && !empty($quotation_option['time_type']) && $quotation_option['time_type'] == 'day') ? 'selected="selected"' : '') . '>' . __('Days', 'wpshop') . '</option>';
+			$output .= '<option value="month" ' . ((!empty($quotation_option) && !empty($quotation_option['time_type']) && $quotation_option['time_type'] == 'month') ? 'selected="selected"' : '') . '>' . __('Months', 'wpshop') . '</option>';
+			$output .= '<option value="year" ' . ((!empty($quotation_option) && !empty($quotation_option['time_type']) && $quotation_option['time_type'] == 'year') ? 'selected="selected"' : '') . '>' . __('Years', 'wpshop') . '</option>';
 			$output .= '</select>';
 
 			echo $output;
@@ -236,19 +236,19 @@ 
 		 *
 		 * @return string The new invoice number
 		 */
-		public static function generate_invoice_number( $order_id ) {
+		public static function generate_invoice_number($order_id) {
 			/**	Get configuration about the number of figure dor invoice number	*/
 
 			$number_figures = get_option('wpshop_billing_number_figures', false);
 
 			/** If the number doesn't exist, we create a default one */
-			if(!$number_figures) {
+			if (!$number_figures) {
 				update_option('wpshop_billing_number_figures', 5);
 			}
 
 			/** sleep my script, SLEEP I SAY ! **/
-			$rand_time = rand( 1000, 200000 );
-			usleep( $rand_time );
+			$rand_time = rand(1000, 200000);
+			usleep($rand_time);
 			/** GET UP !! **/
 
 			/**	Get last invoice number	*/
@@ -264,14 +264,14 @@ 
 
 			/** Check if number exists **/
 			$billing_current_number_checking = get_option('wpshop_billing_current_number', false);
-			if ( $billing_current_number_checking == $billing_current_number ) {
+			if ($billing_current_number_checking == $billing_current_number) {
 				$billing_current_number++;
 			}
 
 			update_option('wpshop_billing_current_number', $billing_current_number);
 
 			/**	Create the new invoice number with all parameters viewed above	*/
-			$invoice_ref = WPSHOP_BILLING_REFERENCE_PREFIX . ((string)sprintf('%0'.$number_figures.'d', $billing_current_number));
+			$invoice_ref = WPSHOP_BILLING_REFERENCE_PREFIX . ((string)sprintf('%0' . $number_figures . 'd', $billing_current_number));
 
 			return $invoice_ref;
 		}
@@ -285,67 +285,67 @@ 
 		 *
 		 * @return string The invoice output in case no error is found. The error in other case
 		 */
-		public static function generate_html_invoice( $order_id, $invoice_ref ) {
+		public static function generate_html_invoice($order_id, $invoice_ref) {
 			global $wpdb;
 
-			$date_output_format = get_option( 'date_format' ) . ' ' . get_option( 'time_format' );
+			$date_output_format = get_option('date_format') . ' ' . get_option('time_format');
 			$count_products = 0;
 
-			if ( !empty($order_id) ) {
+			if (!empty($order_id)) {
 				$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 
 				$discounts_exists = false;
 
-				$is_quotation = ( empty($order_postmeta['order_key']) && !empty($order_postmeta['order_temporary_key']) && $invoice_ref == null ) ? true : false;
+				$is_quotation = (empty($order_postmeta['order_key']) && !empty($order_postmeta['order_temporary_key']) && $invoice_ref == null) ? true : false;
 				/** Check if it's a partial payment bill **/
 				$is_partial_payment = false;
-				if( isset( $order_postmeta['order_payment']['received'] ) && !empty($invoice_ref) && $order_postmeta['order_status'] == 'partially_paid' ) {
-					foreach( $order_postmeta['order_payment']['received'] as $key => $payment ) {
-						if( isset( $payment['invoice_ref'] ) && $payment['invoice_ref'] == $invoice_ref ) {
+				if (isset($order_postmeta['order_payment']['received']) && !empty($invoice_ref) && $order_postmeta['order_status'] == 'partially_paid') {
+					foreach ($order_postmeta['order_payment']['received'] as $key => $payment) {
+						if (isset($payment['invoice_ref']) && $payment['invoice_ref'] == $invoice_ref) {
 							$is_partial_payment = true;
 							break;
 						}
 					}
-				} elseif( !empty($invoice_ref) && !empty($order_postmeta['order_invoice_ref'])  && $order_postmeta['order_invoice_ref'] != $invoice_ref ) {
+				} elseif (!empty($invoice_ref) && !empty($order_postmeta['order_invoice_ref']) && $order_postmeta['order_invoice_ref'] != $invoice_ref) {
 					$is_partial_payment = true;
-				} elseif( empty($invoice_ref) && $order_postmeta['order_status'] == 'partially_paid' ) {
+				} elseif (empty($invoice_ref) && $order_postmeta['order_status'] == 'partially_paid') {
 					$is_partial_payment = true;
 				}
 
 				/** Check it is a shipping slip **/
-				$bon_colisage = !empty( $_GET['bon_colisage'] ) ? sanitize_key( $_GET['bon_colisage'] ) : false;
-				if ( $bon_colisage ) $bon_colisage = true;
+				$bon_colisage = !empty($_GET['bon_colisage']) ? sanitize_key($_GET['bon_colisage']) : false;
+				if ($bon_colisage) $bon_colisage = true;
 
-				if ( !empty($order_postmeta) ) {
+				if (!empty($order_postmeta)) {
 					$tpl_component = array();
 
 					/** Billing Header **/
 					//Logo
 					$logo_options = get_option('wpshop_logo');
-					$tpl_component['INVOICE_LOGO'] = ( !empty($logo_options) ) ? '<img src="' .str_replace( 'https', 'http', $logo_options ) .'" alt="" />' : '';
+					$tpl_component['INVOICE_LOGO'] = (!empty($logo_options)) ? '<img src="' . str_replace('https', 'http', $logo_options) . '" alt="" />' : '';
 
 					// Title
-					$tpl_component['INVOICE_TITLE'] = ($is_partial_payment) ? __('Bill payment', 'wpshop') : ( ( $is_quotation ) ?  __('Quotation', 'wpshop') : __('Invoice', 'wpshop') );
+					$tpl_component['INVOICE_TITLE'] = ($is_partial_payment) ? __('Bill payment', 'wpshop') : (($is_quotation) ? __('Quotation', 'wpshop') : __('Invoice', 'wpshop'));
 
 // 					if ( empty($order_postmeta['order_invoice_ref']) ) {
 // 						$tpl_component['INVOICE_TITLE'] = __('Bill payment', 'wpshop');
 // 						$is_partial_payment = true;
 // 					}
 
-					if ( $bon_colisage ) {
-						$tpl_component['INVOICE_TITLE'] = __( 'Products List', 'wpshop' );
+					if ($bon_colisage) {
+						$tpl_component['INVOICE_TITLE'] = __('Products List', 'wpshop');
 					}
 
-					$tpl_component['INVOICE_ORDER_INVOICE_REF'] = ( !empty($invoice_ref) ) ? $invoice_ref : (!empty($order_postmeta['order_invoice_ref']) ? $order_postmeta['order_invoice_ref'] : null);
-					if ( $bon_colisage ) {
+					$tpl_component['INVOICE_ORDER_INVOICE_REF'] = (!empty($invoice_ref)) ? $invoice_ref : (!empty($order_postmeta['order_invoice_ref']) ? $order_postmeta['order_invoice_ref'] : null);
+					if ($bon_colisage) {
 						$tpl_component['INVOICE_ORDER_INVOICE_REF'] = '';
 					}
-					$tpl_component['INVOICE_ORDER_KEY_INDICATION'] = ( $is_quotation ) ? sprintf( __('Ref. %s', 'wpshop'),$order_postmeta['order_temporary_key']) : sprintf( __('Order n. %s', 'wpshop'), $order_postmeta['order_key'] );
-					$tpl_component['INVOICE_ORDER_DATE_INDICATION'] = ( $is_quotation ) ? sprintf( __('Quotation date %s', 'wpshop'), mysql2date($date_output_format ,$order_postmeta['order_date'], true) ) : sprintf( __('Order date %s', 'wpshop'), mysql2date($date_output_format ,$order_postmeta['order_date'], true) );
+					$tpl_component['INVOICE_ORDER_KEY_INDICATION'] = ($is_quotation) ? sprintf(__('Ref. %s', 'wpshop'), $order_postmeta['order_temporary_key']) : sprintf(__('Order n. %s', 'wpshop'), $order_postmeta['order_key']);
+					$tpl_component['INVOICE_ORDER_DATE_INDICATION'] = ($is_quotation) ? sprintf(__('Quotation date %s', 'wpshop'), mysql2date($date_output_format, $order_postmeta['order_date'], true)) : sprintf(__('Order date %s', 'wpshop'), mysql2date($date_output_format, $order_postmeta['order_date'], true));
 
 					/** Validate period for Quotation **/
-					if ( $is_quotation ) {
-						$quotation_validate_period = self::quotation_validate_period( $order_postmeta['order_date'] );
+					if ($is_quotation) {
+						$quotation_validate_period = self::quotation_validate_period($order_postmeta['order_date']);
 					}
 					else {
 						$tpl_component['INVOICE_VALIDATE_TIME'] = '';
@@ -353,22 +353,22 @@ 
 
 					$tpl_component['INVOICE_VALIDATE_TIME'] = empty($tpl_component['INVOICE_VALIDATE_TIME']) ? '' : $tpl_component['INVOICE_VALIDATE_TIME'];
 
-					$tpl_component['AMOUNT_INFORMATION'] = ( !$bon_colisage ) ? sprintf( __('Amount are shown in %s', 'wpshop'), wpshop_tools::wpshop_get_currency( true ) ) : '';
+					$tpl_component['AMOUNT_INFORMATION'] = (!$bon_colisage) ? sprintf(__('Amount are shown in %s', 'wpshop'), wpshop_tools::wpshop_get_currency(true)) : '';
 
 
 
 					// Sender & receiver addresses
 					$tpl_component['INVOICE_SENDER'] = self::generate_invoice_sender_part( );
-					$tpl_component['INVOICE_RECEIVER'] = self::generate_receiver_part( $order_id, $bon_colisage );
+					$tpl_component['INVOICE_RECEIVER'] = self::generate_receiver_part($order_id, $bon_colisage);
 
 					$tpl_component['INVOICE_TRACKING'] = '';
 					$first = false;
-					if( !empty($order_postmeta['order_trackingNumber']) ) {
+					if (!empty($order_postmeta['order_trackingNumber'])) {
 						$tpl_component['INVOICE_TRACKING'] = __('Tracking : ', 'wpshop') . $order_postmeta['order_trackingNumber'];
 						$first = true;
 					}
-					if( !empty($order_postmeta['order_trackingLink']) ) {
-						if( !$first ) {
+					if (!empty($order_postmeta['order_trackingLink'])) {
+						if (!$first) {
 							$tpl_component['INVOICE_TRACKING'] = __('Tracking : ', 'wpshop') . $order_postmeta['order_trackingLink'];
 						} else {
 							$tpl_component['INVOICE_TRACKING'] .= ' - ' . $order_postmeta['order_trackingLink'];
@@ -378,22 +378,22 @@ 
 
 					/** Items Tab **/
 					$order_tva = array();
-					if ( $bon_colisage ) {
+					if ($bon_colisage) {
 						$tpl_component['INVOICE_HEADER'] = wpshop_display::display_template_element('bon_colisage_row_header', array(), array(), 'common');
 					}
 					else {
 						$tpl_component['INVOICE_HEADER'] = wpshop_display::display_template_element('invoice_row_header', array(), array(), 'common');
 						//if ( !$is_quotation ) {
 							/** Check if products have discounts **/
-							if ( !empty($order_postmeta['order_items']) && !$is_partial_payment ) {
-								foreach( $order_postmeta['order_items'] as $item_id => $item ) {
-									if ( !empty($item['item_global_discount_value']) || !empty($item['item_unit_discount_value']) ) {
+							if (!empty($order_postmeta['order_items']) && !$is_partial_payment) {
+								foreach ($order_postmeta['order_items'] as $item_id => $item) {
+									if (!empty($item['item_global_discount_value']) || !empty($item['item_unit_discount_value'])) {
 										$discounts_exists = true;
 									}
 								}
 							}
 
-							if ( $discounts_exists ) {
+							if ($discounts_exists) {
 								$tpl_component['INVOICE_HEADER'] = wpshop_display::display_template_element('invoice_row_header_with_discount', array(), array(), 'common');
 							}
 
@@ -403,119 +403,119 @@ 
 					$total_discounted = 0;
 					$tpl_component['INVOICE_ROWS'] = '';
 
-					if( !$is_partial_payment ) {
-						if ( !empty($order_postmeta['order_items']) ) {
-							foreach( $order_postmeta['order_items'] as $item_id => $item ) {
+					if (!$is_partial_payment) {
+						if (!empty($order_postmeta['order_items'])) {
+							foreach ($order_postmeta['order_items'] as $item_id => $item) {
 								$sub_tpl_component = array();
 								$count_products += $item['item_qty'];
-								$barcode = get_post_meta( $item['item_id'], '_barcode', true );
-								if ( empty($barcode) ) {
-									$product_metadata = get_post_meta( $item['item_id'], '_wpshop_product_metadata', true );
-									$barcode = ( !empty($product_metadata) && !empty($product_metadata['barcode']) ) ? $product_metadata['barcode'] : '';
-
-									if( empty($barcode) ) {
-										$product_entity = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
-										$att_def = wpshop_attributes::getElement( 'barcode', '"valid"', 'code' );
-										$query = $wpdb->prepare( 'SELECT value FROM ' .$wpdb->prefix. 'wpshop__attribute_value_'.$att_def->data_type. ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d AND value != ""', $product_entity, $att_def->id, $item['item_id'] );
-										$barcode = $wpdb->get_var( $query );
+								$barcode = get_post_meta($item['item_id'], '_barcode', true);
+								if (empty($barcode)) {
+									$product_metadata = get_post_meta($item['item_id'], '_wpshop_product_metadata', true);
+									$barcode = (!empty($product_metadata) && !empty($product_metadata['barcode'])) ? $product_metadata['barcode'] : '';
+
+									if (empty($barcode)) {
+										$product_entity = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+										$att_def = wpshop_attributes::getElement('barcode', '"valid"', 'code');
+										$query = $wpdb->prepare('SELECT value FROM ' . $wpdb->prefix . 'wpshop__attribute_value_' . $att_def->data_type . ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d AND value != ""', $product_entity, $att_def->id, $item['item_id']);
+										$barcode = $wpdb->get_var($query);
 									}
 								}
-								$sub_tpl_component['INVOICE_ROW_ITEM_BARCODE'] = ( !empty($barcode) ) ? $barcode : '-';
+								$sub_tpl_component['INVOICE_ROW_ITEM_BARCODE'] = (!empty($barcode)) ? $barcode : '-';
 
-								$sub_tpl_component['INVOICE_ROW_ITEM_REF'] = ( !empty($barcode) ) ? $barcode : $item['item_ref'];
+								$sub_tpl_component['INVOICE_ROW_ITEM_REF'] = (!empty($barcode)) ? $barcode : $item['item_ref'];
 
 								/** Item name **/
 								$is_variation = false;
-								if( get_post_type( $item['item_id'] ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
+								if (get_post_type($item['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
 									$is_variation = true;
-									$parent_def = wpshop_products::get_parent_variation( $item['item_id'] );
-									if( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
+									$parent_def = wpshop_products::get_parent_variation($item['item_id']);
+									if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
 										$parent_post = $parent_def['parent_post'];
 										$item_parent_id = $parent_post->ID;
-										$item_title =  $parent_post->post_title;
+										$item_title = $parent_post->post_title;
 									}
 								} else {
 									$item_title = $item['item_name'];
 								}
 								$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = $item_title;
 								/**	Get attribute order for current product	*/
-								$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails( get_post_meta($item['item_id'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true)  ) ;
+								$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($item['item_id'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
 								$output_order = array();
-								if ( count($product_attribute_order_detail) > 0 && is_array($product_attribute_order_detail) ) {
-									foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
-										foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-											if ( !empty($attribute_def->code) )
+								if (count($product_attribute_order_detail) > 0 && is_array($product_attribute_order_detail)) {
+									foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
+										foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
+											if (!empty($attribute_def->code))
 												$output_order[$attribute_def->code] = $position;
 										}
 									}
 								}
-								$variation_attribute_ordered = wpshop_products::get_selected_variation_display( $item['item_meta'], $output_order, 'invoice_print', 'common');
+								$variation_attribute_ordered = wpshop_products::get_selected_variation_display($item['item_meta'], $output_order, 'invoice_print', 'common');
 								ksort($variation_attribute_ordered['attribute_list']);
 								$detail_tpl_component['CART_PRODUCT_MORE_INFO'] = '';
-								foreach ( $variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output ) {
+								foreach ($variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output) {
 									$detail_tpl_component['CART_PRODUCT_MORE_INFO'] .= $attribute_variation_to_output;
 								}
-								if( /*get_post_status( $item['item_id'] ) == 'free_product' &&*/ ! empty( get_post_field( 'post_content', $item['item_id'] ) ) && false ) {
-									if ( ! empty( $detail_tpl_component['CART_PRODUCT_MORE_INFO'] ) ) {
+								if ( /*get_post_status( $item['item_id'] ) == 'free_product' &&*/ !empty(get_post_field('post_content', $item['item_id'])) && false ) {
+									if (!empty($detail_tpl_component['CART_PRODUCT_MORE_INFO'])) {
 										//$detail_tpl_component['CART_PRODUCT_MORE_INFO'] .= '<br>';
 									}
-									$detail_tpl_component['CART_PRODUCT_MORE_INFO'] .= '<span id="wpshop_cart_description_line">' . nl2br( get_post_field( 'post_content', $item['item_id'] ) ) . '</span>';
+									$detail_tpl_component['CART_PRODUCT_MORE_INFO'] .= '<span id="wpshop_cart_description_line">' . nl2br(get_post_field('post_content', $item['item_id'])) . '</span>';
 								}
 								$sub_tpl_component['INVOICE_ROW_ITEM_DETAIL'] = !empty($detail_tpl_component['CART_PRODUCT_MORE_INFO']) ? wpshop_display::display_template_element('invoice_row_item_detail', $detail_tpl_component, array(), 'common') : '';
-								unset( $detail_tpl_component );
+								unset($detail_tpl_component);
 
 								$sub_tpl_component['INVOICE_ROW_ITEM_QTY'] = $item['item_qty'];
-								$sub_tpl_component['INVOICE_ROW_ITEM_PU_TTC'] = ( ( !empty($item['item_pu_ttc_before_discount']) ) ? number_format( $item['item_pu_ttc_before_discount'], 2, '.', '' ) : number_format( $item['item_pu_ttc'], 2, '.', '' ) );
-								$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = ( ( !empty($item['item_pu_ht_before_discount']) ) ? number_format( $item['item_pu_ht_before_discount'], 2, '.', '' ) : number_format( $item['item_pu_ht'], 2, '.', '' ) );
-								$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] =  ( !empty($item['item_discount_value']) )  ?  number_format($item['item_discount_value'], 2, '.', '') : number_format(0, 2, '.', '' );
-								$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] =  number_format( ($item['item_pu_ht'] * $item['item_qty']), 2, '.', '' );
+								$sub_tpl_component['INVOICE_ROW_ITEM_PU_TTC'] = ((!empty($item['item_pu_ttc_before_discount'])) ? number_format($item['item_pu_ttc_before_discount'], 2, '.', '') : number_format($item['item_pu_ttc'], 2, '.', ''));
+								$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = ((!empty($item['item_pu_ht_before_discount'])) ? number_format($item['item_pu_ht_before_discount'], 2, '.', '') : number_format($item['item_pu_ht'], 2, '.', ''));
+								$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] = (!empty($item['item_discount_value'])) ? number_format($item['item_discount_value'], 2, '.', '') : number_format(0, 2, '.', '');
+								$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] = number_format(($item['item_pu_ht'] * $item['item_qty']), 2, '.', '');
 								/** TVA **/
-								$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format($item['item_tva_total_amount'], 2, '.', '' );
+								$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format($item['item_tva_total_amount'], 2, '.', '');
 								$sub_tpl_component['INVOICE_ROW_ITEM_TVA_RATE'] = $item['item_tva_rate'];
 
 
-								$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = number_format( $item['item_total_ttc'], 2, '.', '' );
+								$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = number_format($item['item_total_ttc'], 2, '.', '');
 
 
 								/** Checking Rate amount **/
-								if ( !$bon_colisage ) {
-								 $checking = self::check_product_price( $item['item_total_ht'],  $item['item_total_ttc'], $item['item_tva_total_amount'], $item['item_tva_rate'], $item['item_id'], $invoice_ref, $order_id );
-								 if( !$checking ) {
+								if (!$bon_colisage) {
+								 $checking = self::check_product_price($item['item_total_ht'], $item['item_total_ttc'], $item['item_tva_total_amount'], $item['item_tva_rate'], $item['item_id'], $invoice_ref, $order_id);
+								 if (!$checking) {
 								 	return __('Invoice cannot be generate because an error was found. The website administrator has been warned.', 'wpshop');
 								 }
 								}
 
-								if ( $bon_colisage ) {
+								if ($bon_colisage) {
 									$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('bon_colisage_row', $sub_tpl_component, array(), 'common');
 								}
 								else {
-									if ( $discounts_exists ) {
+									if ($discounts_exists) {
 										$discounted_total_per_item = $item['item_total_ht'];
 										/** Unit Discount **/
-										if ( !empty($item['item_unit_discount_amount']) && !empty($item['item_unit_discount_value']) ) {
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format( $item['item_unit_discount_amount'], 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format( $item['item_unit_discount_value'], 2, '.', '');
+										if (!empty($item['item_unit_discount_amount']) && !empty($item['item_unit_discount_value'])) {
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format($item['item_unit_discount_amount'], 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format($item['item_unit_discount_value'], 2, '.', '');
 											$discounted_total_per_item = $discounted_total_per_item - $item['item_unit_discount_amount'];
 										}
 										else {
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format( 0, 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format( 0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format(0, 2, '.', '');
 										}
 
 										/** Global Discount **/
-										if ( !empty($item['item_global_discount_amount']) && !empty($item['item_global_discount_value']) ) {
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format( $item['item_global_discount_amount'], 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format( $item['item_global_discount_value'], 2, '.', '');
+										if (!empty($item['item_global_discount_amount']) && !empty($item['item_global_discount_value'])) {
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format($item['item_global_discount_amount'], 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format($item['item_global_discount_value'], 2, '.', '');
 											$discounted_total_per_item = $discounted_total_per_item - $item['item_global_discount_amount'];
 										}
 										else {
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format( 0, 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format( 0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format(0, 2, '.', '');
 										}
 
 										$total_discounted += $discounted_total_per_item;
 										/** Total HT Discounted **/
-										$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNTED_HT_TOTAL'] = number_format( $discounted_total_per_item, 2, '.', '');
+										$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNTED_HT_TOTAL'] = number_format($discounted_total_per_item, 2, '.', '');
 
 										$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row_with_discount', $sub_tpl_component, array(), 'common');
 									}
@@ -523,14 +523,14 @@ 
 										$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row', $sub_tpl_component, array(), 'common');
 									}
 								}
-								unset( $sub_tpl_component );
+								unset($sub_tpl_component);
 
 								/** Check TVA **/
-								if ( empty($order_tva[ $item['item_tva_rate'] ]) ) {
-									$order_tva[ $item['item_tva_rate'] ] = $item['item_tva_total_amount'];
+								if (empty($order_tva[$item['item_tva_rate']])) {
+									$order_tva[$item['item_tva_rate']] = $item['item_tva_total_amount'];
 								}
 								else {
-									$order_tva[ $item['item_tva_rate'] ] += $item['item_tva_total_amount'];
+									$order_tva[$item['item_tva_rate']] += $item['item_tva_total_amount'];
 								}
 
 							}
@@ -541,33 +541,33 @@ 
 
 						/** Display Partials payments **/
 						$total_partial_payment = 0; $last_payment = 0;
-						$order_invoice_ref = ( !empty($order_postmeta['order_invoice_ref']) ) ? $order_postmeta['order_invoice_ref'] : '';
-						if ( !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) && !$bon_colisage ) {
-							foreach( $order_postmeta['order_payment']['received'] as $received_payment ) {
-								if ( !empty($received_payment['invoice_ref']) && $received_payment['invoice_ref'] != $order_invoice_ref ) {
-									if ( intval( substr($received_payment['invoice_ref'], 2) ) == intval( substr($tpl_component['INVOICE_ORDER_INVOICE_REF'], 2) )) {
+						$order_invoice_ref = (!empty($order_postmeta['order_invoice_ref'])) ? $order_postmeta['order_invoice_ref'] : '';
+						if (!empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) && !$bon_colisage) {
+							foreach ($order_postmeta['order_payment']['received'] as $received_payment) {
+								if (!empty($received_payment['invoice_ref']) && $received_payment['invoice_ref'] != $order_invoice_ref) {
+									if (intval(substr($received_payment['invoice_ref'], 2)) == intval(substr($tpl_component['INVOICE_ORDER_INVOICE_REF'], 2))) {
 										$sub_tpl_component = array();
 										$sub_tpl_component['INVOICE_ROW_ITEM_REF'] = $received_payment['invoice_ref'];
 
 										/** Item name **/
-										$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = sprintf( __('Partial payment on order %1$s', 'wpshop'), $order_postmeta['order_key'], __( $received_payment['method'], 'wpshop'), $received_payment['payment_reference']);
+										$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = sprintf(__('Partial payment on order %1$s', 'wpshop'), $order_postmeta['order_key'], __($received_payment['method'], 'wpshop'), $received_payment['payment_reference']);
 										$sub_tpl_component['INVOICE_ROW_ITEM_DETAIL'] = '';
 										$sub_tpl_component['INVOICE_ROW_ITEM_QTY'] = 1;
-										$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = '-' . number_format( $received_payment['received_amount'], 2, '.', '' );
-										$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] =  number_format(0, 2, '.', '' );
-										$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] = '-' . number_format( $received_payment['received_amount'], 2, '.', '' );
+										$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = '-' . number_format($received_payment['received_amount'], 2, '.', '');
+										$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+										$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] = '-' . number_format($received_payment['received_amount'], 2, '.', '');
 
 										/** TVA **/
-										$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format(0, 2, '.', '' );
+										$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format(0, 2, '.', '');
 										$sub_tpl_component['INVOICE_ROW_ITEM_TVA_RATE'] = 0;
-										$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = '-' . number_format( $received_payment['received_amount'], 2, '.', '' );
+										$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = '-' . number_format($received_payment['received_amount'], 2, '.', '');
 
-										if ( $discounts_exists ) {
-											$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNTED_HT_TOTAL'] = '-'.number_format( $received_payment['received_amount'], 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format( 0, 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format( 0, 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format( 0, 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format( 0, 2, '.', '');
+										if ($discounts_exists) {
+											$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNTED_HT_TOTAL'] = '-' . number_format($received_payment['received_amount'], 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format(0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format(0, 2, '.', '');
 
 											$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row_with_discount', $sub_tpl_component, array(), 'common');
 										}
@@ -576,11 +576,11 @@ 
 										}
 									}
 
-									unset( $sub_tpl_component );
-									$total_partial_payment += ( !empty($received_payment['received_amount']) ) ? $received_payment['received_amount'] : 0;
+									unset($sub_tpl_component);
+									$total_partial_payment += (!empty($received_payment['received_amount'])) ? $received_payment['received_amount'] : 0;
 								}
-								else if( 'payment_received' == $received_payment[ 'status' ] ) {
-									$last_payment += ( !empty($received_payment['received_amount']) ) ? $received_payment['received_amount'] : 0;
+								else if ('payment_received' == $received_payment['status']) {
+									$last_payment += (!empty($received_payment['received_amount'])) ? $received_payment['received_amount'] : 0;
 								}
 
 							}
@@ -589,24 +589,24 @@ 
 					else {
 						/** Display Partials payments **/
 						$total_partial_payment = 0; $last_payment = 0;
-						if ( !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) && !$bon_colisage ) {
-							foreach( $order_postmeta['order_payment']['received'] as $key => $received_payment ) {
-								if ( !empty($received_payment['invoice_ref']) && !empty($invoice_ref) && $received_payment['invoice_ref'] == $invoice_ref ) {
+						if (!empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) && !$bon_colisage) {
+							foreach ($order_postmeta['order_payment']['received'] as $key => $received_payment) {
+								if (!empty($received_payment['invoice_ref']) && !empty($invoice_ref) && $received_payment['invoice_ref'] == $invoice_ref) {
 									$sub_tpl_component = array();
 									$sub_tpl_component['INVOICE_ROW_ITEM_REF'] = $received_payment['invoice_ref'];
 									/** Item name **/
-									$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = sprintf( __('Partial payment %4$d on order %1$s', 'wpshop'), $order_postmeta['order_key'], __( $received_payment['method'], 'wpshop'), $received_payment['payment_reference'], $key+1);
+									$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = sprintf(__('Partial payment %4$d on order %1$s', 'wpshop'), $order_postmeta['order_key'], __($received_payment['method'], 'wpshop'), $received_payment['payment_reference'], $key + 1);
 									$sub_tpl_component['INVOICE_ROW_ITEM_DETAIL'] = '';
 									$sub_tpl_component['INVOICE_ROW_ITEM_QTY'] = 1;
-									$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = number_format( $received_payment['received_amount'], 2, '.', '' );
-									$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '' );
-									$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] = number_format( $received_payment['received_amount'], 2, '.', '' );
+									$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = number_format($received_payment['received_amount'], 2, '.', '');
+									$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+									$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] = number_format($received_payment['received_amount'], 2, '.', '');
 									/** TVA **/
-									$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format(0, 2, '.', '' );
+									$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format(0, 2, '.', '');
 									$sub_tpl_component['INVOICE_ROW_ITEM_TVA_RATE'] = 0;
-									$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = number_format( $received_payment['received_amount'], 2, '.', '' );
+									$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = number_format($received_payment['received_amount'], 2, '.', '');
 									$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row', $sub_tpl_component, array(), 'common');
-									unset( $sub_tpl_component );
+									unset($sub_tpl_component);
 									$total_partial_payment += $received_payment['received_amount'];
 								}
 							}
@@ -619,126 +619,126 @@ 
 					/** Summary of order **/
 					$summary_tpl_component = array();
 					$tpl_component['INVOICE_SUMMARY_PART'] = $summary_tpl_component['INVOICE_SUMMARY_TAXES'] = '';
-					if ( !$bon_colisage ) {
-						if ( !empty( $order_tva ) ) {
-							foreach( $order_tva as $tax_rate => $tax_amount ) {
-								if ( $tax_amount > 0 ) {
-									$tax_rate = ( !empty($tax_rate) && $tax_rate == 'VAT_shipping_cost' ) ?  __('on Shipping cost', 'wpshop').' '.WPSHOP_VAT_ON_SHIPPING_COST : $tax_rate;
-									$sub_tpl_component['SUMMARY_ROW_TITLE'] = sprintf( __('Total taxes amount %1$s', 'wpshop'), $tax_rate . '%' );
+					if (!$bon_colisage) {
+						if (!empty($order_tva)) {
+							foreach ($order_tva as $tax_rate => $tax_amount) {
+								if ($tax_amount > 0) {
+									$tax_rate = (!empty($tax_rate) && $tax_rate == 'VAT_shipping_cost') ? __('on Shipping cost', 'wpshop') . ' ' . WPSHOP_VAT_ON_SHIPPING_COST : $tax_rate;
+									$sub_tpl_component['SUMMARY_ROW_TITLE'] = sprintf(__('Total taxes amount %1$s', 'wpshop'), $tax_rate . '%');
 									$sub_tpl_component['SUMMARY_ROW_VALUE'] = wpshop_display::format_field_output('wpshop_product_price', $tax_amount) . ' ' . wpshop_tools::wpshop_get_currency();
 									$summary_tpl_component['INVOICE_SUMMARY_TAXES'] .= wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
-									unset( $sub_tpl_component );
+									unset($sub_tpl_component);
 								}
-								elseif( $is_partial_payment ) {
+								elseif ($is_partial_payment) {
 									$tax_rate = 0;
-									$tax_amount = number_format( 0, 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency();
-									$sub_tpl_component['SUMMARY_ROW_TITLE'] = sprintf( __('Total taxes amount %1$s', 'wpshop'), $tax_rate . '%' );
+									$tax_amount = number_format(0, 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency();
+									$sub_tpl_component['SUMMARY_ROW_TITLE'] = sprintf(__('Total taxes amount %1$s', 'wpshop'), $tax_rate . '%');
 									$sub_tpl_component['SUMMARY_ROW_VALUE'] = wpshop_display::format_field_output('wpshop_product_price', $tax_amount) . ' ' . wpshop_tools::wpshop_get_currency();
 									$summary_tpl_component['INVOICE_SUMMARY_TAXES'] .= wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
-									unset( $sub_tpl_component );
+									unset($sub_tpl_component);
 								}
 							}
 						}
 
 						/** If Discount Exist **/
 						// Checking Discounts on order
-						if( !empty($order_postmeta['order_discount_type']) && $order_postmeta['order_discount_value'] ) {
+						if (!empty($order_postmeta['order_discount_type']) && $order_postmeta['order_discount_value']) {
 							$discounts_exists = true;
 							// Calcul discount on Order
-							switch( $order_postmeta['order_discount_type'] ) {
+							switch ($order_postmeta['order_discount_type']) {
 								case 'amount':
-									$total_discounted += number_format( str_replace( ',', '.', $order_postmeta['order_discount_value'] ), 2, '.', '' );
+									$total_discounted += number_format(str_replace(',', '.', $order_postmeta['order_discount_value']), 2, '.', '');
 									break;
 								case 'percent':
-									$total_discounted += number_format( $order_postmeta['order_grand_total_before_discount'], 2, '.', '') * ( number_format( str_replace( ',', '.', $order_postmeta['order_discount_value']), 2, '.', '') / 100 );
+									$total_discounted += number_format($order_postmeta['order_grand_total_before_discount'], 2, '.', '') * (number_format(str_replace(',', '.', $order_postmeta['order_discount_value']), 2, '.', '') / 100);
 									break;
 							}
 						}
-						if ( !empty($total_discounted) && $discounts_exists ) {
+						if (!empty($total_discounted) && $discounts_exists) {
 							$sub_tpl_component['SUMMARY_ROW_TITLE'] = __('Discounted Total', 'wpshop');
-							$sub_tpl_component['SUMMARY_ROW_VALUE'] = number_format( $total_discounted, 2, '.', '') . ' ' . wpshop_tools::wpshop_get_currency();
+							$sub_tpl_component['SUMMARY_ROW_VALUE'] = number_format($total_discounted, 2, '.', '') . ' ' . wpshop_tools::wpshop_get_currency();
 							$summary_tpl_component['INVOICE_SUMMARY_TOTAL_DISCOUNTED'] = wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
-							unset( $sub_tpl_component );
+							unset($sub_tpl_component);
 						}
 						else {
 							$summary_tpl_component['INVOICE_SUMMARY_TOTAL_DISCOUNTED'] = '';
 						}
 
 						$shipping_cost = 0;
-						if ( !$is_partial_payment ) {
-							if( !empty($order_postmeta['order_shipping_cost']) ) {
+						if (!$is_partial_payment) {
+							if (!empty($order_postmeta['order_shipping_cost'])) {
 								$shipping_cost = $order_postmeta['order_shipping_cost'];
 							}
 						}
-						$price_piloting = get_option( 'wpshop_shop_price_piloting', 'TTC' );
-						$shipping_taxes = 'HT' == $price_piloting ? ( WPSHOP_VAT_ON_SHIPPING_COST / 100 ) * $shipping_cost : $shipping_cost - ( $shipping_cost / ( 1 + WPSHOP_VAT_ON_SHIPPING_COST / 100 ) );
-						$summary_tpl_component['INVOICE_ORDER_SHIPPING_COST'] = number_format( $shipping_cost, 2, ',', '' );
-						$summary_tpl_component['INVOICE_ORDER_SHIPPING_COST_TAXES'] = number_format( $shipping_taxes, 2, ',', '' );
+						$price_piloting = get_option('wpshop_shop_price_piloting', 'TTC');
+						$shipping_taxes = 'HT' == $price_piloting ? (WPSHOP_VAT_ON_SHIPPING_COST / 100) * $shipping_cost : $shipping_cost - ($shipping_cost / (1 + WPSHOP_VAT_ON_SHIPPING_COST / 100));
+						$summary_tpl_component['INVOICE_ORDER_SHIPPING_COST'] = number_format($shipping_cost, 2, ',', '');
+						$summary_tpl_component['INVOICE_ORDER_SHIPPING_COST_TAXES'] = number_format($shipping_taxes, 2, ',', '');
 						//$summary_tpl_component['INVOICE_ORDER_SHIPPING_COST'] = ( $is_partial_payment ) ? number_format( 0, 2, ',', '') : number_format( ( (!empty($order_postmeta['order_shipping_cost']) ) ? $order_postmeta['order_shipping_cost'] : 0 ), 2, ',', '' );
 
-						$summary_tpl_component['INVOICE_ORDER_GRAND_TOTAL'] = ( $is_partial_payment ) ?  number_format(0, 2, ',', '' ) : number_format( $order_postmeta['order_grand_total'], 2, ',', ''); // - $total_partial_payment , 2, ',', '' );
-						$summary_tpl_component['INVOICE_ORDER_TOTAL_HT'] = ( $is_partial_payment ) ?  number_format(0, 2, ',', '' ) : number_format( $order_postmeta['order_total_ht'], 2, ',', '' );
+						$summary_tpl_component['INVOICE_ORDER_GRAND_TOTAL'] = ($is_partial_payment) ? number_format(0, 2, ',', '') : number_format($order_postmeta['order_grand_total'], 2, ',', ''); // - $total_partial_payment , 2, ',', '' );
+						$summary_tpl_component['INVOICE_ORDER_TOTAL_HT'] = ($is_partial_payment) ? number_format(0, 2, ',', '') : number_format($order_postmeta['order_total_ht'], 2, ',', '');
 
 						$summary_tpl_component['TOTAL_BEFORE_DISCOUNT'] = number_format($order_postmeta['order_grand_total_before_discount'], 2, ',', '');
 
 						$total_payment = 0;
 
 						/** Amount paid **/
-						if ( empty($order_postmeta['order_invoice_ref']) ) {
+						if (empty($order_postmeta['order_invoice_ref'])) {
 							foreach ($order_postmeta['order_payment']['received'] as $key => $value) {
-								if ( !empty($value['invoice_ref']) && $value['invoice_ref'] === $tpl_component['INVOICE_ORDER_INVOICE_REF'] ) {
+								if (!empty($value['invoice_ref']) && $value['invoice_ref'] === $tpl_component['INVOICE_ORDER_INVOICE_REF']) {
 									$total_payment = number_format($value['received_amount'], 2, ',', '');
 								}
 							}
 						}
 						else {
-							$total_payment = ( ($total_partial_payment+$last_payment) !== $order_postmeta['order_grand_total'] ) ? number_format($total_partial_payment+$last_payment, 2, ',', '') : $order_postmeta['order_grand_total'];
+							$total_payment = (($total_partial_payment + $last_payment) !== $order_postmeta['order_grand_total']) ? number_format($total_partial_payment + $last_payment, 2, ',', '') : $order_postmeta['order_grand_total'];
 						}
 
 						$sub_tpl_component['SUMMARY_ROW_TITLE'] = __('Amount already paid', 'wpshop');
-						$sub_tpl_component['SUMMARY_ROW_VALUE'] = ( !$is_partial_payment ) ? number_format( $last_payment, 2, ',', '') .' ' . wpshop_tools::wpshop_get_currency() : $total_payment .' ' . wpshop_tools::wpshop_get_currency();
+						$sub_tpl_component['SUMMARY_ROW_VALUE'] = (!$is_partial_payment) ? number_format($last_payment, 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency() : $total_payment . ' ' . wpshop_tools::wpshop_get_currency();
 						//$sub_tpl_component['SUMMARY_ROW_VALUE'] = ( $is_partial_payment ) ?  number_format($total_partial_payment, 2, ',', '' ). ' ' . wpshop_tools::wpshop_get_currency() : number_format($order_postmeta['order_grand_total'], 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency();
 						$summary_tpl_component['INVOICE_SUMMARY_MORE'] = wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
-						unset( $sub_tpl_component );
+						unset($sub_tpl_component);
 
 						$sub_tpl_component['SUMMARY_ROW_TITLE'] = __('Number of products', 'wpshop');
 						$sub_tpl_component['SUMMARY_ROW_VALUE'] = $count_products;
 						$summary_tpl_component['INVOICE_SUMMARY_MORE'] .= wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
-						unset( $sub_tpl_component );
+						unset($sub_tpl_component);
 
 
 						/** If Discount Exist **/
-						if ( !empty($order_postmeta['coupon_id']) && !empty($order_postmeta['order_discount_value']) ) {
+						if (!empty($order_postmeta['coupon_id']) && !empty($order_postmeta['order_discount_value'])) {
 							$tpl_discount_component = array();
 							$tpl_discount_component['DISCOUNT_VALUE'] = ($order_postmeta['order_discount_type'] == 'percent') ? number_format($order_postmeta['order_discount_amount_total_cart'], 2, ',', '') : number_format($order_postmeta['order_discount_value'], 2, ',', '');
 
 							$tpl_discount_component['TOTAL_BEFORE_DISCOUNT'] = number_format($order_postmeta['order_grand_total_before_discount'], 2, ',', '');
 							$summary_tpl_component['INVOICE_ORDER_DISCOUNT'] = wpshop_display::display_template_element('invoice_discount_part', $tpl_discount_component, array(), 'common');
-							unset( $tpl_discount_component );
+							unset($tpl_discount_component);
 						}
 						else {
 							$summary_tpl_component['INVOICE_ORDER_DISCOUNT'] = '';
 						}
 
-						$summary_tpl_component[ 'PRICE_PILOTING' ] = 'HT' == $price_piloting ? __( 'ET', 'wpshop' ) : __( 'ATI', 'wpshop' );
+						$summary_tpl_component['PRICE_PILOTING'] = 'HT' == $price_piloting ? __('ET', 'wpshop') : __('ATI', 'wpshop');
 
 						$tpl_component['INVOICE_SUMMARY_PART'] = wpshop_display::display_template_element('invoice_summary_part', $summary_tpl_component, array(), 'common');
-						unset( $summary_tpl_component );
+						unset($summary_tpl_component);
 					}
 
 
 					/** IBAN Include on quotation **/
-					if ( $is_quotation ) {
+					if ($is_quotation) {
 						/** If admin want to include his IBAN to quotation */
 						$iban_options = get_option('wpshop_paymentMethod_options');
 						$payment_options = get_option('wps_payment_mode');
-						if ( !empty($payment_options) && !empty($payment_options['mode']) && !empty($payment_options['mode']['banktransfer']) && !empty($payment_options['mode']['banktransfer']['active']) && $payment_options['mode']['banktransfer']['active'] == 'on' ) {
-							if ( !empty($iban_options) && !empty($iban_options['banktransfer']) /*&& !empty($iban_options['banktransfer']['add_in_quotation'])*/ ) {
-								$tpl_component['IBAN_INFOS']  = __('Payment by Bank Transfer on this bank account', 'wpshop'). ' : <br/>';
-								$tpl_component['IBAN_INFOS'] .= __('Bank name', 'wpshop'). ' : '.( (!empty($iban_options['banktransfer']['bank_name']) ) ? $iban_options['banktransfer']['bank_name'] : ''). '<br/>';
-								$tpl_component['IBAN_INFOS'] .= __('IBAN', 'wpshop'). ' : '.( (!empty($iban_options['banktransfer']['iban']) ) ? $iban_options['banktransfer']['iban'] : ''). '<br/>';
-								$tpl_component['IBAN_INFOS'] .= __('BIC/SWIFT', 'wpshop'). ' : '.( (!empty($iban_options['banktransfer']['bic']) ) ? $iban_options['banktransfer']['bic'] : ''). '<br/>';
-								$tpl_component['IBAN_INFOS'] .= __('Account owner name', 'wpshop'). ' : '.( (!empty($iban_options['banktransfer']['accountowner']) ) ? $iban_options['banktransfer']['accountowner'] : ''). '<br/>';
+						if (!empty($payment_options) && !empty($payment_options['mode']) && !empty($payment_options['mode']['banktransfer']) && !empty($payment_options['mode']['banktransfer']['active']) && $payment_options['mode']['banktransfer']['active'] == 'on') {
+							if (!empty($iban_options) && !empty($iban_options['banktransfer']) /*&& !empty($iban_options['banktransfer']['add_in_quotation'])*/) {
+								$tpl_component['IBAN_INFOS']  = __('Payment by Bank Transfer on this bank account', 'wpshop') . ' : <br/>';
+								$tpl_component['IBAN_INFOS'] .= __('Bank name', 'wpshop') . ' : ' . ((!empty($iban_options['banktransfer']['bank_name'])) ? $iban_options['banktransfer']['bank_name'] : '') . '<br/>';
+								$tpl_component['IBAN_INFOS'] .= __('IBAN', 'wpshop') . ' : ' . ((!empty($iban_options['banktransfer']['iban'])) ? $iban_options['banktransfer']['iban'] : '') . '<br/>';
+								$tpl_component['IBAN_INFOS'] .= __('BIC/SWIFT', 'wpshop') . ' : ' . ((!empty($iban_options['banktransfer']['bic'])) ? $iban_options['banktransfer']['bic'] : '') . '<br/>';
+								$tpl_component['IBAN_INFOS'] .= __('Account owner name', 'wpshop') . ' : ' . ((!empty($iban_options['banktransfer']['accountowner'])) ? $iban_options['banktransfer']['accountowner'] : '') . '<br/>';
 							}
 						}
 						else {
@@ -751,8 +751,8 @@ 
 
 
 					/** Received payements **/
-					if ( !$is_partial_payment && !$bon_colisage  && !empty($order_postmeta['order_invoice_ref']) ) {
-						$tpl_component['RECEIVED_PAYMENT'] = self::generate_received_payment_part( $order_id );
+					if (!$is_partial_payment && !$bon_colisage && !empty($order_postmeta['order_invoice_ref'])) {
+						$tpl_component['RECEIVED_PAYMENT'] = self::generate_received_payment_part($order_id);
 					}
 					else {
 						$tpl_component['RECEIVED_PAYMENT'] = '';
@@ -765,11 +765,11 @@ 
 					$output = wpshop_display::display_template_element('invoice_page_content', $tpl_component, array(), 'common');
 				}
 				else {
-					$output =  __('No order information has been found', 'wpshop');
+					$output = __('No order information has been found', 'wpshop');
 				}
 			}
 			else {
-				$output =  __('You requested a page that does not exist anymore. Please verify your request or ask the site administrator', 'wpshop');
+				$output = __('You requested a page that does not exist anymore. Please verify your request or ask the site administrator', 'wpshop');
 			}
 			return $output;
 		}
@@ -780,61 +780,61 @@ 
 		 * @param integer $order_id
 		 * @return string
 		 */
-		public static function generate_received_payment_part( $order_id ) {
-			$date_ouput_format = get_option( 'date_format' ) . ' ' . get_option( 'time_format' );
+		public static function generate_received_payment_part($order_id) {
+			$date_ouput_format = get_option('date_format') . ' ' . get_option('time_format');
 			$output = '';
 			$tpl_component = array();
 			$tpl_component['ORDER_RECEIVED_PAYMENT_ROWS'] = '';
-			if ( !empty($order_id) ) {
+			if (!empty($order_id)) {
 				$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
-				if ( !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) ) {
-					$wps_payment_option = get_option( 'wps_payment_mode' );
-					foreach( $order_postmeta['order_payment']['received'] as $payment ) {
-						if ( ! empty( $payment ) && ! in_array( $payment['method'], array( 'quotation' ), true ) && ! empty( $payment['received_amount'] ) ) {
+				if (!empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received'])) {
+					$wps_payment_option = get_option('wps_payment_mode');
+					foreach ($order_postmeta['order_payment']['received'] as $payment) {
+						if (!empty($payment) && !in_array($payment['method'], array('quotation'), true) && !empty($payment['received_amount'])) {
 							$sub_tpl_component = array();
-							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_RECEIVED_AMOUNT'] = ( !empty($payment['received_amount']) ) ? number_format( $payment['received_amount'], 2, ',', '' ).' '.wpshop_tools::wpshop_get_currency() : 0;
-							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_DATE'] = (!empty($payment['date']) ) ? mysql2date($date_ouput_format, $payment['date'], true) : '';
-							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_METHOD'] = ( ( !empty( $payment[ 'method' ] ) && is_array( $wps_payment_option ) && array_key_exists( strtolower( $payment['method'] ), $wps_payment_option[ 'mode' ] ) && !empty( $wps_payment_option[ 'mode' ][ strtolower( $payment['method'] ) ][ 'name' ] ) ) ? $wps_payment_option[ 'mode' ][ strtolower( $payment['method'] ) ][ 'name' ] : ( !empty( $payment[ 'method' ] ) ? __( $payment[ 'method' ], 'wpshop' ) : '' ) );
-							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_PAYMENT_REFERENCE'] = ( !empty($payment['payment_reference']) ) ? $payment['payment_reference'] : '';
-							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_INVOICE_REF'] = ( !empty($payment['invoice_ref']) ) ? $payment['invoice_ref'] : '';
+							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_RECEIVED_AMOUNT'] = (!empty($payment['received_amount'])) ? number_format($payment['received_amount'], 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency() : 0;
+							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_DATE'] = (!empty($payment['date'])) ? mysql2date($date_ouput_format, $payment['date'], true) : '';
+							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_METHOD'] = ((!empty($payment['method']) && is_array($wps_payment_option) && array_key_exists(strtolower($payment['method']), $wps_payment_option['mode']) && !empty($wps_payment_option['mode'][strtolower($payment['method'])]['name'])) ? $wps_payment_option['mode'][strtolower($payment['method'])]['name'] : (!empty($payment['method']) ? __($payment['method'], 'wpshop') : ''));
+							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_PAYMENT_REFERENCE'] = (!empty($payment['payment_reference'])) ? $payment['payment_reference'] : '';
+							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_INVOICE_REF'] = (!empty($payment['invoice_ref'])) ? $payment['invoice_ref'] : '';
 							$tpl_component['ORDER_RECEIVED_PAYMENT_ROWS'] .= wpshop_display::display_template_element('received_payment_row', $sub_tpl_component, array('type' => 'invoice_line', 'id' => 'partial_payment'), 'common');
 						}
 					}
 				}
 				$output = wpshop_display::display_template_element('received_payment', $tpl_component, array('type' => 'invoice_line', 'id' => 'partial_payment'), 'common');
-				unset( $tpl_component );
+				unset($tpl_component);
 			}
 			return $output;
 		}
 
 
 		/** Return the validity period of a quotation **/
-		public static function quotation_validate_period( $quotation_date ) {
+		public static function quotation_validate_period($quotation_date) {
 			$quotation_options = get_option('wpshop_quotation_validate_time');
-			if ( !empty($quotation_options) && !empty($quotation_options['number']) && !empty($quotation_options['time_type']) ) {
+			if (!empty($quotation_options) && !empty($quotation_options['number']) && !empty($quotation_options['time_type'])) {
 				$timestamp_quotation = strtotime($quotation_date);
 				$timestamp_validity_date_quotation = 0;
 				$query = '';
 				$date = '';
 				global $wpdb;
-				switch ( $quotation_options['time_type'] ) {
+				switch ($quotation_options['time_type']) {
 					case 'day' :
-						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " .$quotation_options['number']. " DAY) ");
+						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " . $quotation_options['number'] . " DAY) ");
 						break;
 					case 'month' :
-						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " .$quotation_options['number']. " MONTH) ");
+						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " . $quotation_options['number'] . " MONTH) ");
 						break;
 					case 'year' :
-						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " .$quotation_options['number']. " YEAR) ");
+						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " . $quotation_options['number'] . " YEAR) ");
 						break;
 					default :
 						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL 15 DAY) ");
 						break;
 				}
-				if ( $query != null) {
+				if ($query != null) {
 					$date = mysql2date('d F Y', $wpdb->get_var($query), true);
 				}
-				return  sprintf( __('Quotation validity date %s', 'wpshop'), $date ) ;
+				return  sprintf(__('Quotation validity date %s', 'wpshop'), $date);
 			}
 		}
 
@@ -844,19 +844,19 @@ 
 		 * @param string $invoice_ref
 		 * @return string
 		 */
-		public static function generate_invoice_for_email ( $order_id, $invoice_ref = '' ) {
+		public static function generate_invoice_for_email($order_id, $invoice_ref = '') {
 			/** Generate the PDF file for the invoice **/
 			$is_ok = false;
-			if ( !empty($invoice_ref) ) {
-				require_once(WPSHOP_LIBRAIRIES_DIR.'HTML2PDF/html2pdf.class.php');
+			if (!empty($invoice_ref)) {
+				require_once(WPSHOP_LIBRAIRIES_DIR . 'HTML2PDF/html2pdf.class.php');
 				try {
-					$html_content =  wpshop_modules_billing::generate_html_invoice( $order_id, $invoice_ref );
+					$html_content = wpshop_modules_billing::generate_html_invoice($order_id, $invoice_ref);
 					$html_content = wpshop_display::display_template_element('invoice_page_content_css', array(), array(), 'common') . '<page>' . $html_content . '</page>';
 					$html2pdf = new HTML2PDF('P', 'A4', 'fr');
 
 					$html2pdf->setDefaultFont('Arial');
 					$html2pdf->writeHTML($html_content);
-					$html2pdf->Output(WPSHOP_UPLOAD_DIR.$invoice_ref.'.pdf', 'F');
+					$html2pdf->Output(WPSHOP_UPLOAD_DIR . $invoice_ref . '.pdf', 'F');
 					$is_ok = true;
 				}
 				catch (HTML2PDF_exception $e) {
@@ -864,7 +864,7 @@ 
 					exit;
 				}
 			}
-			return ( $is_ok ) ? WPSHOP_UPLOAD_DIR.$invoice_ref.'.pdf' : '';
+			return ($is_ok) ? WPSHOP_UPLOAD_DIR . $invoice_ref . '.pdf' : '';
 		}
 
 		/**
@@ -872,38 +872,38 @@ 
 		 * @return Ambigous <string, string>
 		 */
 		public static function generate_invoice_sender_part() {
-			$output ='';
+			$output = '';
 			$company = get_option('wpshop_company_info', array());
 			$emails = get_option('wpshop_emails', array());
-			if ( !empty($company) ) {
-				$tpl_component['COMPANY_EMAIL'] = ( !empty($emails) && !empty($emails['contact_email']) ) ? $emails['contact_email'] : '';
+			if (!empty($company)) {
+				$tpl_component['COMPANY_EMAIL'] = (!empty($emails) && !empty($emails['contact_email'])) ? $emails['contact_email'] : '';
 				$tpl_component['COMPANY_WEBSITE'] = get_option('siteurl');
-				foreach ( $company as $company_info_key => $company_info_value ) {
+				foreach ($company as $company_info_key => $company_info_value) {
 					switch ($company_info_key) {
 						case 'company_rcs' :
-							$data = ( !empty($company_info_value) ) ? __('RCS', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('RCS', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_capital' :
-							$data = ( !empty($company_info_value) ) ? __('Capital', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('Capital', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_siren' :
-							$data = ( !empty($company_info_value) ) ? __('SIREN', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('SIREN', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_siret' :
-							$data = ( !empty($company_info_value) ) ? __('SIRET', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('SIRET', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_tva_intra' :
-							$data = ( !empty($company_info_value) ) ? __('TVA Intracommunautaire', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('TVA Intracommunautaire', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_legal_statut' :
 							$array_state_compagny = wpshop_company_options::get_legal_status();
-							$data = ( !empty( $array_state_compagny ) && !empty( $array_state_compagny[$company_info_value] ) ) ? $array_state_compagny[$company_info_value] : __( 'Auto-Entrepreneur', 'wpshop' ) ;
+							$data = (!empty($array_state_compagny) && !empty($array_state_compagny[$company_info_value])) ? $array_state_compagny[$company_info_value] : __('Auto-Entrepreneur', 'wpshop');
 							break;
 						default :
 							$data = $company_info_value;
 							break;
 					}
-					$tpl_component[ strtoupper( $company_info_key) ] = $data;
+					$tpl_component[strtoupper($company_info_key)] = $data;
 				}
 				$output = wpshop_display::display_template_element('invoice_sender_formatted_address', $tpl_component, array(), 'common');
 			}
@@ -916,57 +916,57 @@ 
 		 * @param unknown_type $bon_colisage
 		 * @return Ambigous <string, string>
 		 */
-		public static function generate_receiver_part( $order_id, $bon_colisage = false ) {
+		public static function generate_receiver_part($order_id, $bon_colisage = false) {
 			$output = '';
 			$order_customer_postmeta = get_post_meta($order_id, '_order_info', true);
-			$order_postmeta = get_post_meta( $order_id, '_order_postmeta', true );
+			$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 
-			if( $bon_colisage && !empty($order_customer_postmeta['shipping']) && !empty($order_customer_postmeta['shipping']['address']) && is_array($order_customer_postmeta['shipping']['address']) ) {
+			if ($bon_colisage && !empty($order_customer_postmeta['shipping']) && !empty($order_customer_postmeta['shipping']['address']) && is_array($order_customer_postmeta['shipping']['address'])) {
 				$address_info = $order_customer_postmeta['shipping']['address'];
 			} else {
-				if( !empty($order_customer_postmeta['billing']) && !empty($order_customer_postmeta['billing']['address']) && is_array($order_customer_postmeta['billing']['address']) ) {
+				if (!empty($order_customer_postmeta['billing']) && !empty($order_customer_postmeta['billing']['address']) && is_array($order_customer_postmeta['billing']['address'])) {
 					$address_info = $order_customer_postmeta['billing']['address'];
 				} else {
 					$address_info = array();
 				}
 			}
 
-			if ( !empty($order_customer_postmeta) && !empty($address_info) ) {
+			if (!empty($order_customer_postmeta) && !empty($address_info)) {
 				$default_address_attributes = array('CIVILITY', 'ADDRESS_LAST_NAME', 'ADDRESS_FIRST_NAME', 'ADDRESS', 'POSTCODE', 'CITY', 'STATE', 'COUNTRY', 'PHONE', 'ADDRESS_USER_EMAIL', 'COMPANY');
-				foreach ( $default_address_attributes as $default_address_attribute ) {
+				foreach ($default_address_attributes as $default_address_attribute) {
 					$tpl_component[$default_address_attribute] = '';
 				}
 
-				foreach ( $address_info as $order_customer_info_key => $order_customer_info_value ) {
+				foreach ($address_info as $order_customer_info_key => $order_customer_info_value) {
 					$tpl_component[strtoupper($order_customer_info_key)] = '';
-					if ( $order_customer_info_key == 'civility') {
+					if ($order_customer_info_key == 'civility') {
 						global $wpdb;
-						$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id= %d', $order_customer_info_value);
+						$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id= %d', $order_customer_info_value);
 						$civility = $wpdb->get_row($query);
-						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($civility) ) ? (!empty($civility->label)) ? $civility->label : __($civility->value, 'wpshop') : '';
+						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($civility)) ? (!empty($civility->label)) ? $civility->label : __($civility->value, 'wpshop') : '';
 					}
-					else if( $order_customer_info_key == 'country') {
+					else if ($order_customer_info_key == 'country') {
 						foreach (unserialize(WPSHOP_COUNTRY_LIST) as $key=>$value) {
-							if ( $order_customer_info_value == $key) {
+							if ($order_customer_info_value == $key) {
 								$tpl_component[strtoupper($order_customer_info_key)] = $value;
 							}
 						}
 					}
-					elseif( $order_customer_info_key == 'phone' ){
-						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($order_customer_info_value) ) ? __('Phone', 'wpshop').' : '.$order_customer_info_value : '';
+					elseif ($order_customer_info_key == 'phone') {
+						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($order_customer_info_value)) ? __('Phone', 'wpshop') . ' : ' . $order_customer_info_value : '';
 					}
 					else {
-						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($order_customer_info_value) ) ? $order_customer_info_value : '';
+						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($order_customer_info_value)) ? $order_customer_info_value : '';
 					}
 				}
 
-				if ( empty($tpl_component['PHONE']) ) {
-					$tpl_component['PHONE'] = ( !empty( $order_customer_postmeta['billing']['address']['phone']) ) ? __('Phone', 'wpshop').' : '.$order_customer_postmeta['billing']['address']['phone'] : '';
+				if (empty($tpl_component['PHONE'])) {
+					$tpl_component['PHONE'] = (!empty($order_customer_postmeta['billing']['address']['phone'])) ? __('Phone', 'wpshop') . ' : ' . $order_customer_postmeta['billing']['address']['phone'] : '';
 				}
 
-				if ( empty($tpl_component['ADDRESS_USER_EMAIL']) || ( empty($tpl_component['ADDRESS_USER_EMAIL']) && $bon_colisage ) ){
-					$user_info = get_userdata( $order_postmeta['customer_id'] );
-					$tpl_component['ADDRESS_USER_EMAIL'] = ( !empty($user_info) && !empty($user_info->user_email) ) ? $user_info->user_email : '';
+				if (empty($tpl_component['ADDRESS_USER_EMAIL']) || (empty($tpl_component['ADDRESS_USER_EMAIL']) && $bon_colisage)) {
+					$user_info = get_userdata($order_postmeta['customer_id']);
+					$tpl_component['ADDRESS_USER_EMAIL'] = (!empty($user_info) && !empty($user_info->user_email)) ? $user_info->user_email : '';
 				}
 
 
@@ -980,36 +980,36 @@ 
 		 * Genrate Footer invoice
 		 * @return Ambigous <string, string>
 		 */
-		public static function generate_footer_invoice(){
-			$output ='';
+		public static function generate_footer_invoice() {
+			$output = '';
 			$company = get_option('wpshop_company_info', array());
 			$emails = get_option('wpshop_emails', array());
-			if ( !empty($company) ) {
-				$tpl_component['COMPANY_EMAIL'] = ( !empty($emails) && !empty($emails['contact_email']) ) ? $emails['contact_email'] : '';
+			if (!empty($company)) {
+				$tpl_component['COMPANY_EMAIL'] = (!empty($emails) && !empty($emails['contact_email'])) ? $emails['contact_email'] : '';
 				$tpl_component['COMPANY_WEBSITE'] = site_url();
-				foreach ( $company as $company_info_key => $company_info_value ) {
+				foreach ($company as $company_info_key => $company_info_value) {
 
 					switch ($company_info_key) {
 						case 'company_rcs' :
-							$data = ( !empty($company_info_value) ) ? __('RCS', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('RCS', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_capital' :
-							$data = ( !empty($company_info_value) ) ? __('Capital', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('Capital', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_siren' :
-							$data = ( !empty($company_info_value) ) ? __('SIREN', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('SIREN', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_siret' :
-							$data = ( !empty($company_info_value) ) ? __('SIRET', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('SIRET', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_tva_intra' :
-							$data = ( !empty($company_info_value) ) ? __('TVA Intracommunautaire', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('TVA Intracommunautaire', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						default :
 							$data = $company_info_value;
 							break;
 					}
-					$tpl_component[ strtoupper( $company_info_key) ] = $data;
+					$tpl_component[strtoupper($company_info_key)] = $data;
 				}
 				$output = wpshop_display::display_template_element('invoice_footer', $tpl_component, array(), 'common');
 			}
@@ -1025,33 +1025,33 @@ 
 		 * @param id $product_id
 		 * @param string $invoice_ref
 		 */
-		public static function check_product_price( $price_ht, $price_ati, $tva_amount, $tva_rate, $product_id, $invoice_ref, $order_id ) {
+		public static function check_product_price($price_ht, $price_ati, $tva_amount, $tva_rate, $product_id, $invoice_ref, $order_id) {
 			$checking = true;
-			$error_percent =  1;
+			$error_percent = 1;
 
 			/** Check VAT Amount **/
-			$formatted_tva_amount = number_format( $tva_amount, 2, '.', '' );
-			$formatted_price_ht = number_format( $price_ht, 2, '.', '' );
-			$formatted_price_ati = number_format( $price_ati, 2, '.', '' );
-			$calculated_price_excluding_tax = $price_ati / ( 1 + ($tva_rate / 100) );
+			$formatted_tva_amount = number_format($tva_amount, 2, '.', '');
+			$formatted_price_ht = number_format($price_ht, 2, '.', '');
+			$formatted_price_ati = number_format($price_ati, 2, '.', '');
+			$calculated_price_excluding_tax = $price_ati / (1 + ($tva_rate / 100));
 			$unformatted = $formatted_price_ati - $calculated_price_excluding_tax;
-			$checked_tva_amount = number_format( $unformatted, 2, '.', '' );
+			$checked_tva_amount = number_format($unformatted, 2, '.', '');
 
-			if ( ( $checked_tva_amount < ($formatted_tva_amount / ( 1 + ($error_percent / 100) ) ) ) || ( $checked_tva_amount > ($formatted_tva_amount * (1 + ($error_percent / 100) ) ) )  ) {
+			if (($checked_tva_amount < ($formatted_tva_amount / (1 + ($error_percent / 100)))) || ($checked_tva_amount > ($formatted_tva_amount * (1 + ($error_percent / 100))))) {
 				$error_infos = array();
-				$error_infos['real_datas']['price_ati'] =  $formatted_price_ati;
-				$error_infos['real_datas']['price_ht'] =  $formatted_price_ht;
-				$error_infos['real_datas']['tva_amount'] =  $formatted_tva_amount;
+				$error_infos['real_datas']['price_ati'] = $formatted_price_ati;
+				$error_infos['real_datas']['price_ht'] = $formatted_price_ht;
+				$error_infos['real_datas']['tva_amount'] = $formatted_tva_amount;
 
 				$error_infos['corrected_data'] = $checked_tva_amount;
-				self::invoice_error_check_administrator( $invoice_ref, __('VAT error', 'wpshop'), $product_id, $order_id, $error_infos );
+				self::invoice_error_check_administrator($invoice_ref, __('VAT error', 'wpshop'), $product_id, $order_id, $error_infos);
 				$checking = false;
 			}
 
 			/** Check price ati **/
-			$checked_price_ati =  $formatted_price_ht * ( 1 + ( $tva_rate / 100) );
-			if ( ( $checked_price_ati < ($formatted_price_ati /( 1 + ($error_percent / 100) ) ) ) || ( $checked_price_ati > ($formatted_price_ati * (1 + ($error_percent / 100)) ) )  ) {
-				self::invoice_error_check_administrator( $invoice_ref, __('ATI Price error', 'wpshop'), $product_id, $order_id );
+			$checked_price_ati = $formatted_price_ht * (1 + ($tva_rate / 100));
+			if (($checked_price_ati < ($formatted_price_ati / (1 + ($error_percent / 100)))) || ($checked_price_ati > ($formatted_price_ati * (1 + ($error_percent / 100))))) {
+				self::invoice_error_check_administrator($invoice_ref, __('ATI Price error', 'wpshop'), $product_id, $order_id);
 				$checking = false;
 			}
 
@@ -1064,29 +1064,29 @@ 
 		 * @param string $object
 		 * @param unknown_type $product_id
 		 */
-		function invoice_error_check_administrator( $invoice_ref, $object, $product_id, $order_id, $errors_infos = array() ) {
-			$wpshop_email_option = get_option( 'wpshop_emails');
-			if ( !empty($wpshop_email_option) && !empty($wpshop_email_option['contact_email']) ) {
+		function invoice_error_check_administrator($invoice_ref, $object, $product_id, $order_id, $errors_infos = array()) {
+			$wpshop_email_option = get_option('wpshop_emails');
+			if (!empty($wpshop_email_option) && !empty($wpshop_email_option['contact_email'])) {
 				$headers = "MIME-Version: 1.0\r\n";
 				$headers .= "Content-type: text/html; charset=UTF-8\r\n";
-				$headers .= 'From: '.get_bloginfo('name').' <'.$wpshop_email_option['noreply_email'].'>' . "\r\n";
-				$message  = '<b>'.__('Error type', 'wpshop').' : </b>'.$object.'<br/>';
-				$message .= '<b>'.__( 'Product', 'wpshop').' : </b>'.get_the_title(  $product_id ).'<br/>';
-				$message .= '<b>'.__( 'Invoice ref', 'wpshop').' : </b>'.$invoice_ref.'<br/>';
-				$message .= '<b>'.__( 'Order ID', 'wpshop').' : </b>'.$order_id.'<br/>';
-
-				if ( !empty($errors_infos) && !empty($errors_infos['real_datas']) ) {
-					$message .='<b>' .__( 'Bad datas', 'wpshop').' :</b> <ul>';
-					foreach( $errors_infos['real_datas'] as $k => $errors_info ) {
-						$message .= '<li><b>'.$k.' : </b>'.$errors_info.'</li>';
+				$headers .= 'From: ' . get_bloginfo('name') . ' <' . $wpshop_email_option['noreply_email'] . '>' . "\r\n";
+				$message  = '<b>' . __('Error type', 'wpshop') . ' : </b>' . $object . '<br/>';
+				$message .= '<b>' . __('Product', 'wpshop') . ' : </b>' . get_the_title($product_id) . '<br/>';
+				$message .= '<b>' . __('Invoice ref', 'wpshop') . ' : </b>' . $invoice_ref . '<br/>';
+				$message .= '<b>' . __('Order ID', 'wpshop') . ' : </b>' . $order_id . '<br/>';
+
+				if (!empty($errors_infos) && !empty($errors_infos['real_datas'])) {
+					$message .= '<b>' . __('Bad datas', 'wpshop') . ' :</b> <ul>';
+					foreach ($errors_infos['real_datas'] as $k => $errors_info) {
+						$message .= '<li><b>' . $k . ' : </b>' . $errors_info . '</li>';
 					}
 					$message .= '</ul>';
-					if ( !empty($errors_infos['corrected_data']) ) {
-						$message .= '<b>' . __( 'Good value', 'wpshop' ) . ' : </b>' . $errors_infos['corrected_data'];
+					if (!empty($errors_infos['corrected_data'])) {
+						$message .= '<b>' . __('Good value', 'wpshop') . ' : </b>' . $errors_infos['corrected_data'];
 					}
 				}
 
-				wp_mail( $wpshop_email_option['contact_email'], __('Error on invoice generation', 'wpshop') , $message, $headers);
+				wp_mail($wpshop_email_option['contact_email'], __('Error on invoice generation', 'wpshop'), $message, $headers);
 			}
 		}
 
@@ -1096,9 +1096,9 @@ 
 		 * @param array $posted_datas
 		 * @return string
 		 */
-		function force_invoice_generation_on_order( $order_metadata, $posted_datas ) {
-			if ( !empty ($posted_datas['action_triggered_from']) && $posted_datas['action_triggered_from'] == 'generate_invoice') {
-				$order_metadata['order_invoice_ref'] = $this->generate_invoice_number( $posted_datas['post_ID'] );
+		function force_invoice_generation_on_order($order_metadata, $posted_datas) {
+			if (!empty ($posted_datas['action_triggered_from']) && $posted_datas['action_triggered_from'] == 'generate_invoice') {
+				$order_metadata['order_invoice_ref'] = $this->generate_invoice_number($posted_datas['post_ID']);
 			}
 			return $order_metadata;
 		}
@@ -1113,12 +1113,12 @@ 
 		$partial_payment_current_config = get_option('wpshop_payment_partial', array('for_quotation' => array()));
 
 		$partial_for_quotation_is_activate = false;
-		if ( !empty($partial_payment_current_config) && !empty($partial_payment_current_config['for_quotation']) && !empty($partial_payment_current_config['for_quotation']['activate']) ) {
+		if (!empty($partial_payment_current_config) && !empty($partial_payment_current_config['for_quotation']) && !empty($partial_payment_current_config['for_quotation']['activate'])) {
 			$partial_for_quotation_is_activate = true;
 		}
 
 		$output .= '
-			<input type="checkbox" name="wpshop_payment_partial[for_quotation][activate]"' . ($partial_for_quotation_is_activate ? ' checked="checked"' : '') . ' id="wpshop_payment_partial_on_quotation_activation_state" /> <label for="wpshop_payment_partial_on_quotation_activation_state" >' . __('Activate partial command for quotations', 'wpshop') . '</label><a href="#" title="'.__('If you want that customer pay a part o f total amount of there order, check this box then fill fields below','wpshop').'" class="wpshop_infobulle_marker">?</a>
+			<input type="checkbox" name="wpshop_payment_partial[for_quotation][activate]"' . ($partial_for_quotation_is_activate ? ' checked="checked"' : '') . ' id="wpshop_payment_partial_on_quotation_activation_state" /> <label for="wpshop_payment_partial_on_quotation_activation_state" >' . __('Activate partial command for quotations', 'wpshop') . '</label><a href="#" title="' . __('If you want that customer pay a part o f total amount of there order, check this box then fill fields below', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>
 			<div class="wpshop_partial_payment_quotation_config_container' . ($partial_for_quotation_is_activate ? '' : ' wpshopHide') . '" id="wpshop_partial_payment_quotation_config_container" >
 				<div class="alignleft" >
 					' . __('Value of partial payment', 'wpshop') . '<br/>
@@ -1140,6 +1140,6 @@ 
 }
 
 /**	Instanciate the module utilities if not	*/
-if ( class_exists("wpshop_modules_billing") ) {
+if (class_exists("wpshop_modules_billing")) {
 	$wpshop_modules_billing = new wpshop_modules_billing();
 }