Eoxia / wpshop

includes/wpshop_ajax.php

Spacing +981 added lines, -981 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
 * Ajax request management file
 *
@@ -9,8 +9,8 @@ 
 */
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /*	Products	*/
@@ -19,7 +19,7 @@ 
 	 */
 	function ajax_duplicate_product() {
 
-		check_ajax_referer( 'wpshop_product_duplication', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_product_duplication', 'wpshop_ajax_nonce');
 
 		$current_post_id = isset($_POST['current_post_id']) ? sanitize_key($_POST['current_post_id']) : null;
 
@@ -34,12 +34,12 @@ 
 	 * Delete an attachmant from a product
 	 */
 	function ajax_delete_product_thumbnail() {
-		check_ajax_referer( 'wpshop_delete_product_thumbnail', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_delete_product_thumbnail', 'wpshop_ajax_nonce');
 
 		$bool = false;
-		$attachement_id = isset($_POST['attachement_id']) ? (int) $_POST['attachement_id'] : null;
+		$attachement_id = isset($_POST['attachement_id']) ? (int)$_POST['attachement_id'] : null;
 
-		if ( !empty($attachement_id) ) {
+		if (!empty($attachement_id)) {
 			$deletion_result = wp_delete_attachment($attachement_id, false);
 			$bool = !empty($deletion_result);
 		}
@@ -52,12 +52,12 @@ 
 	 * Reload attachment container
 	 */
 	function ajax_reload_attachment_boxes() {
-		check_ajax_referer( 'wpshop_reload_product_attachment_part', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_reload_product_attachment_part', 'wpshop_ajax_nonce');
 
 		$bool = false;
-		$current_post_id = isset($_POST['current_post_id']) ? (int) $_POST['current_post_id'] : null;
+		$current_post_id = isset($_POST['current_post_id']) ? (int)$_POST['current_post_id'] : null;
 		$attachement_type_list = array('reload_box_document' => 'application/pdf', 'reload_box_picture' => 'image/');
-		$part_to_reload = isset($_POST['part_to_reload']) ? sanitize_text_field( $_POST['part_to_reload']) : null;
+		$part_to_reload = isset($_POST['part_to_reload']) ? sanitize_text_field($_POST['part_to_reload']) : null;
 		$attachement_type = $attachement_type_list[$part_to_reload];
 
 		echo json_encode(array(wpshop_products::product_attachement_by_type($current_post_id, $attachement_type, 'media-upload.php?post_id=' . $current_post_id . '&amp;tab=library&amp;type=image&amp;TB_iframe=1&amp;width=640&amp;height=566'), $part_to_reload));
@@ -70,25 +70,25 @@ 
 	 */
 	function ajax_product_bulk_edit_save() {
 		global $wpdb;
-		check_ajax_referer( 'product_bulk_edit_save', 'wpshop_ajax_nonce' );
+		check_ajax_referer('product_bulk_edit_save', 'wpshop_ajax_nonce');
 
-		$post_ids = ( isset( $_POST[ 'post_ids' ] ) && !empty( $_POST[ 'post_ids' ] ) ) ? (array) $_POST[ 'post_ids' ] : array();
-		$post_attributes = ( isset( $_POST[ 'attribute' ] ) && !empty( $_POST[ 'attribute' ] ) ) ? (array) $_POST[ 'attribute' ] : array();
+		$post_ids = (isset($_POST['post_ids']) && !empty($_POST['post_ids'])) ? (array)$_POST['post_ids'] : array();
+		$post_attributes = (isset($_POST['attribute']) && !empty($_POST['attribute'])) ? (array)$_POST['attribute'] : array();
 
-		if ( !empty( $post_ids ) && is_array( $post_ids ) && !empty( $post_attributes ) && is_array( $post_attributes ) ) {
+		if (!empty($post_ids) && is_array($post_ids) && !empty($post_attributes) && is_array($post_attributes)) {
 			$attribute_to_save = array();
-			foreach ( $post_attributes as $attribute ) {
+			foreach ($post_attributes as $attribute) {
 				$attribute_component = explode('_-val-_', $attribute);
 				$attribute_definition = explode('[', $attribute_component[0]);
 				$attribute_data_type = substr($attribute_definition[1], 0, -1);
 				$attribute_code = substr($attribute_definition[2], 0, -1);
 
-				if ( !empty($attribute_component[1]) ) {
+				if (!empty($attribute_component[1])) {
 					$attribute_to_save[$attribute_data_type][$attribute_code] = $attribute_component[1];
 				}
 			}
 
-			foreach ( $post_ids as $post_id ) {
+			foreach ($post_ids as $post_id) {
 				$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = (SELECT language_code FROM " . $wpdb->prefix . "icl_translations WHERE element_id = %d )", $post_id);
 				$lang_wpml = $wpdb->get_var($query);
 				$lang = !empty($lang_wpml) ? $lang_wpml : WPSHOP_CURRENT_LOCALE;
@@ -100,18 +100,18 @@ 
 
 				/*	Save the attributes values into wordpress post metadata database in order to have a backup and to make frontend search working	*/
 				$productMetaDatas = get_post_meta($post_id, '_wpshop_product_metadata', true);
-				if ( !empty($productMetaDatas) ) {
+				if (!empty($productMetaDatas)) {
 					$attributes_list = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT), $post_id);
-					if ( !empty($attributes_list)) {
+					if (!empty($attributes_list)) {
 						foreach ($attributes_list as $attribute) {
-							$value_key = 'attribute_value_'.$attribute->data_type;
+							$value_key = 'attribute_value_' . $attribute->data_type;
 							$productMetaDatas[$attribute->code] = $attribute->$value_key;
 						}
 					}
 				}
-				foreach($attribute_to_save as $attributeType => $attributeValues){
-					foreach($attributeValues as $attributeCode => $attributeValue){
-						if ( $attributeCode == 'product_attribute_set_id' ) {
+				foreach ($attribute_to_save as $attributeType => $attributeValues) {
+					foreach ($attributeValues as $attributeCode => $attributeValue) {
+						if ($attributeCode == 'product_attribute_set_id') {
 							/*	Update the attribute set id for the current product	*/
 							update_post_meta($post_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, $attributeValue);
 						}
@@ -123,18 +123,18 @@ 
 
 
 				/* If the product have some variations */
-				$query = $wpdb->prepare('SELECT * FROM ' .$wpdb->posts. ' WHERE post_parent = %d AND post_type = %s', $post_id, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION);
+				$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_parent = %d AND post_type = %s', $post_id, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION);
 				$product_variations = $wpdb->get_results($query);
-				if ( !empty($product_variations) ) {
-					foreach( $product_variations as $product_variation ) {
+				if (!empty($product_variations)) {
+					foreach ($product_variations as $product_variation) {
 						$variation_post_meta = get_post_meta($product_variation->ID, '_wpshop_product_metadata', true);
 						$common_attributes = unserialize(WPSHOP_COMMON_ATTRIBUTES_PARENT_VARIATION_PRODUCT);
-						if ( !empty($common_attributes) ) {
-							if ( !empty($parent_product_metadata) ) {
-								foreach( $parent_product_metadata as $key => $value ) {
-									if ( in_array($key, $common_attributes) ) {
+						if (!empty($common_attributes)) {
+							if (!empty($parent_product_metadata)) {
+								foreach ($parent_product_metadata as $key => $value) {
+									if (in_array($key, $common_attributes)) {
 										$variation_post_meta[$key] = $value;
-										update_post_meta($product_variation->ID, '_'.$key, $value);
+										update_post_meta($product_variation->ID, '_' . $key, $value);
 									}
 								}
 								update_post_meta($product_variation->ID, '_wpshop_product_metadata', $variation_post_meta);
@@ -150,7 +150,7 @@ 
 
 		die();
 	}
-	add_action( 'wp_ajax_product_bulk_edit_save', 'ajax_product_bulk_edit_save' );
+	add_action('wp_ajax_product_bulk_edit_save', 'ajax_product_bulk_edit_save');
 /*	Products	*/
 
 /*	Variations	*/
@@ -158,25 +158,25 @@ 
 	 * Variation list creation
 	 */
 	function ajax_add_new_variation_list() {
-		check_ajax_referer( 'wpshop_variation_management', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_variation_management', 'wpshop_ajax_nonce');
 		global $wpdb;
 
-		$attributes_for_variation = isset($_POST['wpshop_attribute_to_use_for_variation']) ? (array) $_POST['wpshop_attribute_to_use_for_variation'] : null;
+		$attributes_for_variation = isset($_POST['wpshop_attribute_to_use_for_variation']) ? (array)$_POST['wpshop_attribute_to_use_for_variation'] : null;
 		$current_post_id = isset($_POST['current_post_id']) ? sanitize_key($_POST['current_post_id']) : null;
 
 		/** Get the list of values of the attribute to affect to a variation	*/
 		$var = array();
 
-		foreach ( $attributes_for_variation as $attribute_code ) {
+		foreach ($attributes_for_variation as $attribute_code) {
 			$query = $wpdb->prepare("SELECT data_type_to_use FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s", $attribute_code);
-			$var[$attribute_code] = wpshop_attributes::get_affected_value_for_list( $attribute_code, $current_post_id, $wpdb->get_var($query));
+			$var[$attribute_code] = wpshop_attributes::get_affected_value_for_list($attribute_code, $current_post_id, $wpdb->get_var($query));
 		}
 
-		$possible_variations = wpshop_tools::search_all_possibilities( $var );
+		$possible_variations = wpshop_tools::search_all_possibilities($var);
 
-		wpshop_products::creation_variation_callback( $possible_variations, $current_post_id );
+		wpshop_products::creation_variation_callback($possible_variations, $current_post_id);
 
-		$output = wpshop_products::display_variation_admin( $current_post_id );
+		$output = wpshop_products::display_variation_admin($current_post_id);
 
 		echo $output;
 		die();
@@ -187,19 +187,19 @@ 
 	 * Variation uniq item creation
 	 */
 	function ajax_new_single_variation_definition() {
-		check_ajax_referer( 'wpshop_variation_management', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_variation_management', 'wpshop_ajax_nonce');
 		$output = '';
 
 		$current_post_id = isset($_POST['current_post_id']) ? sanitize_key($_POST['current_post_id']) : null;
 
 		/*	Get the list of values of the attribute to affect to a variation	*/
-		$attribute_for_variation = wpshop_attributes::get_variation_available_attribute_display( $current_post_id, 'single' );
+		$attribute_for_variation = wpshop_attributes::get_variation_available_attribute_display($current_post_id, 'single');
 		$output = $attribute_for_variation[0];
 
 		/**	Display specific element for variation	*/
 		$tpl_component['ADMIN_VARIATION_SPECIFIC_DEFINITION_CONTAINER_CLASS'] = '';
 		$tpl_component['VARIATION_IDENTIFIER'] = 'new';
-		$tpl_component['VARIATION_DEFINITION'] = wpshop_attributes::get_variation_attribute( array('input_class' => ' new_variation_specific_values', 'field_name' => wpshop_products::current_page_variation_code . '[' . $tpl_component['VARIATION_IDENTIFIER'] . ']','page_code' => wpshop_products::current_page_variation_code, 'field_id' => wpshop_products::current_page_variation_code . '_' . $tpl_component['VARIATION_IDENTIFIER'], 'variation_dif_values' => '') );
+		$tpl_component['VARIATION_DEFINITION'] = wpshop_attributes::get_variation_attribute(array('input_class' => ' new_variation_specific_values', 'field_name' => wpshop_products::current_page_variation_code . '[' . $tpl_component['VARIATION_IDENTIFIER'] . ']', 'page_code' => wpshop_products::current_page_variation_code, 'field_id' => wpshop_products::current_page_variation_code . '_' . $tpl_component['VARIATION_IDENTIFIER'], 'variation_dif_values' => ''));
 		$output .= wpshop_display::display_template_element('wpshop_admin_variation_item_specific_def', $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $current_post_id, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION => $tpl_component['VARIATION_IDENTIFIER']), 'admin');
 
 		$tpl_component = array();
@@ -217,11 +217,11 @@ 
 	 * Combined variation list creation
 	 */
 	function ajax_new_combined_variation_list_definition() {
-		check_ajax_referer( 'wpshop_variation_management', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_variation_management', 'wpshop_ajax_nonce');
 		$current_post_id = isset($_POST['current_post_id']) ? sanitize_key($_POST['current_post_id']) : null;
 		$output = '';
 
-		$attribute_for_variation = wpshop_attributes::get_variation_available_attribute_display( $current_post_id );
+		$attribute_for_variation = wpshop_attributes::get_variation_available_attribute_display($current_post_id);
 		$output = $attribute_for_variation[0];
 
 		echo $output;
@@ -233,43 +233,43 @@ 
 	 * Product variaitons parameters
 	 */
 	function wpshop_ajax_admin_variation_parameters() {
-		check_ajax_referer( 'wpshop_variation_management', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_variation_management', 'wpshop_ajax_nonce');
 
 		$current_post_id = isset($_POST['current_post_id']) ? sanitize_key($_POST['current_post_id']) : null;
 		$output = '';
 
 		/*	Display variation options	*/
 		$options_tpl_component = array();
-		$head_wpshop_variation_definition = get_post_meta( $current_post_id, '_wpshop_variation_defining', true );
-		$options_tpl_component['ADMIN_VARIATION_OPTIONS_SELECTED_PRIORITY_SINGLE'] = ( empty($head_wpshop_variation_definition['options']) || empty($head_wpshop_variation_definition['options']['priority'][0]) || (!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['priority'][0]) && ($head_wpshop_variation_definition['options']['priority'][0] == 'single')) ) ? ' checked="checked"' : '';
-		$options_tpl_component['ADMIN_VARIATION_OPTIONS_SELECTED_PRIORITY_COMBINED'] = ( empty($head_wpshop_variation_definition['options']) || empty($head_wpshop_variation_definition['options']['priority'][0]) || (!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['priority'][0]) && ($head_wpshop_variation_definition['options']['priority'][0] == 'combined')) ) ? ' checked="checked"' : '';
-		$options_tpl_component['ADMIN_VARIATION_OPTIONS_SELECTED_BEHAVIOUR_ADDITION'] = ( empty($head_wpshop_variation_definition['options']) || empty($head_wpshop_variation_definition['options']['price_behaviour'][0]) || (!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['price_behaviour'][0]) && ($head_wpshop_variation_definition['options']['price_behaviour'][0] == 'addition')) ) ? ' checked="checked"' : '';
-		$options_tpl_component['ADMIN_VARIATION_OPTIONS_SELECTED_BEHAVIOUR_REPLACEMENT'] = ( empty($head_wpshop_variation_definition['options']) || empty($head_wpshop_variation_definition['options']['price_behaviour'][0]) || (!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['price_behaviour'][0]) && ($head_wpshop_variation_definition['options']['price_behaviour'][0] == 'replacement')) ) ? ' checked="checked"' : '';
+		$head_wpshop_variation_definition = get_post_meta($current_post_id, '_wpshop_variation_defining', true);
+		$options_tpl_component['ADMIN_VARIATION_OPTIONS_SELECTED_PRIORITY_SINGLE'] = (empty($head_wpshop_variation_definition['options']) || empty($head_wpshop_variation_definition['options']['priority'][0]) || (!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['priority'][0]) && ($head_wpshop_variation_definition['options']['priority'][0] == 'single'))) ? ' checked="checked"' : '';
+		$options_tpl_component['ADMIN_VARIATION_OPTIONS_SELECTED_PRIORITY_COMBINED'] = (empty($head_wpshop_variation_definition['options']) || empty($head_wpshop_variation_definition['options']['priority'][0]) || (!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['priority'][0]) && ($head_wpshop_variation_definition['options']['priority'][0] == 'combined'))) ? ' checked="checked"' : '';
+		$options_tpl_component['ADMIN_VARIATION_OPTIONS_SELECTED_BEHAVIOUR_ADDITION'] = (empty($head_wpshop_variation_definition['options']) || empty($head_wpshop_variation_definition['options']['price_behaviour'][0]) || (!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['price_behaviour'][0]) && ($head_wpshop_variation_definition['options']['price_behaviour'][0] == 'addition'))) ? ' checked="checked"' : '';
+		$options_tpl_component['ADMIN_VARIATION_OPTIONS_SELECTED_BEHAVIOUR_REPLACEMENT'] = (empty($head_wpshop_variation_definition['options']) || empty($head_wpshop_variation_definition['options']['price_behaviour'][0]) || (!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['price_behaviour'][0]) && ($head_wpshop_variation_definition['options']['price_behaviour'][0] == 'replacement'))) ? ' checked="checked"' : '';
 
-		$options_tpl_component['ADMIN_VARIATION_OPTIONS_SELECTED_PRICE_DISPLAY_TEXT_FROM'] = ( ( empty($head_wpshop_variation_definition['options']) ) || ( (!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['price_display']['text_from']) && ($head_wpshop_variation_definition['options']['price_display']['text_from'] == 'on')) ) ) ? ' checked="checked"' : '';
-		$options_tpl_component['ADMIN_VARIATION_OPTIONS_SELECTED_PRICE_DISPLAY_LOWER_PRICE'] = ( (empty($head_wpshop_variation_definition['options']) ) || ((!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['price_display']['lower_price']) && ($head_wpshop_variation_definition['options']['price_display']['lower_price'] == 'on')) ) ) ? ' checked="checked"' : '';
+		$options_tpl_component['ADMIN_VARIATION_OPTIONS_SELECTED_PRICE_DISPLAY_TEXT_FROM'] = ((empty($head_wpshop_variation_definition['options'])) || ((!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['price_display']['text_from']) && ($head_wpshop_variation_definition['options']['price_display']['text_from'] == 'on')))) ? ' checked="checked"' : '';
+		$options_tpl_component['ADMIN_VARIATION_OPTIONS_SELECTED_PRICE_DISPLAY_LOWER_PRICE'] = ((empty($head_wpshop_variation_definition['options'])) || ((!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['price_display']['lower_price']) && ($head_wpshop_variation_definition['options']['price_display']['lower_price'] == 'on')))) ? ' checked="checked"' : '';
 
 		$options_tpl_component['ADMIN_VARIATION_PARAMETERS_FORM_HEAD_PRODUCT_ID'] = $current_post_id;
 		$options_tpl_component['ADMIN_VARIATION_PARAMETERS_FORM_HEAD_NOUNCE'] = wp_create_nonce("wpshop_variation_parameters");
 
 		$options_tpl_component['ADMIN_MORE_OPTIONS_FOR_VARIATIONS'] = '';
 
-		$attribute_list_for_variations = wpshop_attributes::get_variation_available_attribute( $current_post_id );
+		$attribute_list_for_variations = wpshop_attributes::get_variation_available_attribute($current_post_id);
 
 		$default_value_for_attributes = $required_attributes = '';
 
-		$attribute_user_defined = wpshop_attributes::get_attribute_user_defined( array('entity_type_id' => get_post_type($current_post_id)) );
-		if ( !empty($attribute_user_defined) ) {
-			foreach ( $attribute_user_defined as $attribute_def ) {
+		$attribute_user_defined = wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => get_post_type($current_post_id)));
+		if (!empty($attribute_user_defined)) {
+			foreach ($attribute_user_defined as $attribute_def) {
 				$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_LABEL_STATE'] = '';
 				$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_LABEL_EXPLAINATION'] = '';
 
 				$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_CODE'] = $attribute_def->code;
 				$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_NAME'] = $attribute_def->code;
-				$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_LABEL'] = __( $attribute_def->frontend_label, 'wpshop' );
+				$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_LABEL'] = __($attribute_def->frontend_label, 'wpshop');
 				$tpl_component['ADMIN_VARIATIONS_DEF_LIST_ATTRIBUTE_CONTAINER_CLASS'] = '';
 
-				$tpl_component['ADMIN_VARIATIONS_DEF_LIST_ATTRIBUTE_CHECKBOX_STATE'] = ( (!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && ( in_array( $attribute_def->code, $head_wpshop_variation_definition['options']['required_attributes']) )) ) ? ' checked="checked"' : '';
+				$tpl_component['ADMIN_VARIATIONS_DEF_LIST_ATTRIBUTE_CHECKBOX_STATE'] = ((!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && (in_array($attribute_def->code, $head_wpshop_variation_definition['options']['required_attributes'])))) ? ' checked="checked"' : '';
 
 				$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_ID'] = 'required_' . $attribute_def->code;
 
@@ -277,15 +277,15 @@ 
 			}
 		}
 
-		if ( !empty($attribute_list_for_variations['available']) ) {
-			$head_wpshop_variation_definition = get_post_meta( $current_post_id, '_wpshop_variation_defining', true );
-			foreach ( $attribute_list_for_variations['available'] as $attribute_code => $attribute_definition ) {
+		if (!empty($attribute_list_for_variations['available'])) {
+			$head_wpshop_variation_definition = get_post_meta($current_post_id, '_wpshop_variation_defining', true);
+			foreach ($attribute_list_for_variations['available'] as $attribute_code => $attribute_definition) {
 				/** Default value for attribute	*/
 				$tpl_component = array();
 				$tpl_component['ADMIN_VARIATIONS_DEF_LIST_ATTRIBUTE_CONTAINER_CLASS'] = ' variation_attribute_container_default_value_' . $attribute_code;
 
 				$attribute_for_default_value = wpshop_attributes::get_attribute_field_definition($attribute_definition['attribute_complete_def'], (is_array($head_wpshop_variation_definition) && isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code] : 'none'), array('from' => 'frontend', 'field_custom_name_prefix' => 'empty'));
-				switch ( $attribute_for_default_value['type'] ) {
+				switch ($attribute_for_default_value['type']) {
 					case 'select':
 					case 'multiple-select':
 					case 'radio':
@@ -297,17 +297,17 @@ 
 						break;
 				}
 
-				if ( !empty($attribute_for_default_value['possible_value']) ) {
+				if (!empty($attribute_for_default_value['possible_value'])) {
 					$attribute_for_default_value['possible_value']['none'] = __('No default value', 'wpshop');
-					foreach( $attribute_for_default_value['possible_value'] as $value_id => $value ){
-						if ( !empty($value_id) && ($value_id != 'none') && !in_array($value_id, $attribute_definition['values']) ) {
+					foreach ($attribute_for_default_value['possible_value'] as $value_id => $value) {
+						if (!empty($value_id) && ($value_id != 'none') && !in_array($value_id, $attribute_definition['values'])) {
 							unset($attribute_for_default_value['possible_value'][$value_id]);
 						}
 					}
 					ksort($attribute_for_default_value['possible_value']);
 
 					$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_ID'] = $attribute_for_default_value['id'];
-					$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_DEFAULT_VALUE_LABEL'] = sprintf( __('Default value for %s', 'wpshop'), $attribute_for_default_value['label'] );
+					$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_DEFAULT_VALUE_LABEL'] = sprintf(__('Default value for %s', 'wpshop'), $attribute_for_default_value['label']);
 					$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_DEFAULT_VALUE_INPUT'] = wpshop_form::check_input_type($attribute_for_default_value, 'wps_pdt_variations[options][attributes_default_value]');
 					$default_value_for_attributes .= wpshop_display::display_template_element('wpshop_admin_attribute_for_variation_item_for_default', $tpl_component, array(), 'admin');
 				}
@@ -318,10 +318,10 @@ 
 
 				$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_CODE'] = $attribute_code;
 				$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_NAME'] = $attribute_code;
-				$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_LABEL'] = __( $attribute_definition['label'], 'wpshop' );
+				$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_LABEL'] = __($attribute_definition['label'], 'wpshop');
 				$tpl_component['ADMIN_VARIATIONS_DEF_LIST_ATTRIBUTE_CONTAINER_CLASS'] = '';
 
-				$tpl_component['ADMIN_VARIATIONS_DEF_LIST_ATTRIBUTE_CHECKBOX_STATE'] = ( (!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && ( in_array( $attribute_code, $head_wpshop_variation_definition['options']['required_attributes']) )) ) ? ' checked="checked"' : '';
+				$tpl_component['ADMIN_VARIATIONS_DEF_LIST_ATTRIBUTE_CHECKBOX_STATE'] = ((!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && (in_array($attribute_code, $head_wpshop_variation_definition['options']['required_attributes'])))) ? ' checked="checked"' : '';
 
 				$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_ID'] = 'required_' . $attribute_code;
 				$required_attributes .= str_replace('wpshop_attribute_to_use_for_variation', 'wps_pdt_variations[options][required_attributes]', str_replace('variation_attribute_usable', 'variation_attribute_required', wpshop_display::display_template_element('wpshop_admin_attribute_for_variation_item', $tpl_component, array(), 'admin')));
@@ -344,13 +344,13 @@ 
 	 * Save product variation paramters
 	 */
 	function wpshop_ajax_admin_variation_parameters_save() {
-		check_ajax_referer( 'wpshop_variation_parameters', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_variation_parameters', 'wpshop_ajax_nonce');
 
 		$current_post_id = isset($_POST['current_post_id']) ? sanitize_key($_POST['current_post_id']) : null;
-		$options = !empty( $_POST[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION]['options'] ) ? (array)$_POST[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION]['options'] : array();
+		$options = !empty($_POST[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION]['options']) ? (array)$_POST[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION]['options'] : array();
 
-		if ( !empty($options) ) {
-			wpshop_products::variation_parameters_save( $post_id, $options );
+		if (!empty($options)) {
+			wpshop_products::variation_parameters_save($post_id, $options);
 		}
 
 		die();
@@ -361,41 +361,41 @@ 
 	 * Variation uniq item creation
 	 */
 	function ajax_add_new_single_variation() {
-		check_ajax_referer( 'wpshop_variation_management', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_variation_management', 'wpshop_ajax_nonce');
 		$output = '';
 
-		$attributes_for_variation = isset($_POST['variation_attr']) ? (array) $_POST['variation_attr'] : null;
-		$wpshop_admin_use_attribute_for_single_variation_checkbox = isset($_POST['wpshop_admin_use_attribute_for_single_variation_checkbox']) ? (array) $_POST['wpshop_admin_use_attribute_for_single_variation_checkbox'] : null;
-		$variation_specific_definition = isset($_POST['wps_pdt_variations']['new']['attribute']) ? (array) $_POST['wps_pdt_variations']['new']['attribute'] : null;
+		$attributes_for_variation = isset($_POST['variation_attr']) ? (array)$_POST['variation_attr'] : null;
+		$wpshop_admin_use_attribute_for_single_variation_checkbox = isset($_POST['wpshop_admin_use_attribute_for_single_variation_checkbox']) ? (array)$_POST['wpshop_admin_use_attribute_for_single_variation_checkbox'] : null;
+		$variation_specific_definition = isset($_POST['wps_pdt_variations']['new']['attribute']) ? (array)$_POST['wps_pdt_variations']['new']['attribute'] : null;
 		$current_post_id = isset($_POST['wpshop_head_product_id']) ? sanitize_key($_POST['wpshop_head_product_id']) : null;
-		$display = isset( $_POST['data'] ) ? (bool) $_POST['data'] : false;
+		$display = isset($_POST['data']) ? (bool)$_POST['data'] : false;
 
 		$attribute_to_use_for_creation = array();
-		foreach ( $attributes_for_variation as $attribute_code => $attribute_value) {
-			if ( array_key_exists($attribute_code, $wpshop_admin_use_attribute_for_single_variation_checkbox) ) {
+		foreach ($attributes_for_variation as $attribute_code => $attribute_value) {
+			if (array_key_exists($attribute_code, $wpshop_admin_use_attribute_for_single_variation_checkbox)) {
 				$attribute_to_use_for_creation[0][$attribute_code] = $attributes_for_variation[$attribute_code];
 				$attr_def = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
 				$variation_specific_definition[$attr_def->data_type][$attribute_code] = $attributes_for_variation[$attribute_code];
 			}
 		}
-		$new_variation_identifier = wpshop_products::creation_variation_callback( $attribute_to_use_for_creation, $current_post_id );
+		$new_variation_identifier = wpshop_products::creation_variation_callback($attribute_to_use_for_creation, $current_post_id);
 
 		/*	Save variation specific element	*/
-		foreach ( unserialize(WPSHOP_ATTRIBUTE_PRICES) as $price_attribute_code) {
+		foreach (unserialize(WPSHOP_ATTRIBUTE_PRICES) as $price_attribute_code) {
 			$head_product_price_attribute_value = wpshop_attributes::get_attribute_value_content($price_attribute_code, $current_post_id, wpshop_products::currentPageCode);
 			$price_attr_def = wpshop_attributes::getElement($price_attribute_code, "'valid'", 'code');
-			if ( !empty($price_attr_def) && !empty($price_attr_def->data_type) && (empty($variation_specific_definition[$price_attr_def->data_type]) || !array_key_exists($price_attribute_code, $variation_specific_definition[$price_attr_def->data_type]))) {
+			if (!empty($price_attr_def) && !empty($price_attr_def->data_type) && (empty($variation_specific_definition[$price_attr_def->data_type]) || !array_key_exists($price_attribute_code, $variation_specific_definition[$price_attr_def->data_type]))) {
 				$variation_specific_definition[$price_attr_def->data_type][$price_attribute_code] = !empty($head_product_price_attribute_value->value) ? $head_product_price_attribute_value->value : 1;
 			}
 		}
 
 		wpshop_attributes::saveAttributeForEntity($variation_specific_definition, wpshop_entities::get_entity_identifier_from_code(wpshop_products::currentPageCode), $new_variation_identifier, WPSHOP_CURRENT_LOCALE);
-		wpshop_products::calculate_price( $new_variation_identifier );
+		wpshop_products::calculate_price($new_variation_identifier);
 
-		if( $display ) {
-			$output = json_encode( array( 'ID' => $new_variation_identifier ) );
+		if ($display) {
+			$output = json_encode(array('ID' => $new_variation_identifier));
 		} else {
-			$output = wpshop_products::display_variation_admin( $current_post_id );
+			$output = wpshop_products::display_variation_admin($current_post_id);
 		}
 
 		echo $output;
@@ -407,14 +407,14 @@ 
 	 * Delete a variation
 	*/
 	function ajax_delete_variation() {
-		check_ajax_referer( 'wpshop_variation_management', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_variation_management', 'wpshop_ajax_nonce');
 		$result = false;
 		$list_to_remove = '';
 
-		$current_post_id = isset($_POST['current_post_id']) && is_array($_POST['current_post_id']) ? (array) $_POST['current_post_id'] : null;
-		foreach ( $current_post_id as $variation_id) {
+		$current_post_id = isset($_POST['current_post_id']) && is_array($_POST['current_post_id']) ? (array)$_POST['current_post_id'] : null;
+		foreach ($current_post_id as $variation_id) {
 			$result = wp_delete_post($variation_id, false);
-			if ( $result ) {
+			if ($result) {
 				$list_to_remove[] = $variation_id;
 			}
 		}
@@ -442,20 +442,20 @@ 
 /*	Orders	*/
 	/* Validate the payment transaction number */
 	function wpshop_ajax_validate_payment_method() {
-		check_ajax_referer( 'wpshop_validate_payment_method', 'wpshop_ajax_nonce' );
-		$order_id = ( isset( $_POST[ 'order_id' ] ) && !empty( $_POST[ 'order_id' ] ) ) ? (int) $_POST[ 'order_id' ] : null;
-		$payment_method = ( isset( $_POST[ 'payment_method' ] ) && !empty( $_POST[ 'payment_method' ] ) ) ? sanitize_text_field( $_POST[ 'payment_method' ] ) : null;
-		$transaction_id = ( isset( $_POST[ 'transaction_id' ] ) && !empty( $_POST[ 'transaction_id' ] ) ) ? (int) $_POST[ 'transaction_id' ] : null;
+		check_ajax_referer('wpshop_validate_payment_method', 'wpshop_ajax_nonce');
+		$order_id = (isset($_POST['order_id']) && !empty($_POST['order_id'])) ? (int)$_POST['order_id'] : null;
+		$payment_method = (isset($_POST['payment_method']) && !empty($_POST['payment_method'])) ? sanitize_text_field($_POST['payment_method']) : null;
+		$transaction_id = (isset($_POST['transaction_id']) && !empty($_POST['transaction_id'])) ? (int)$_POST['transaction_id'] : null;
 
-		if ( !empty($order_id) ) {
-			if( !empty($payment_method) && !empty($transaction_id) ) {
+		if (!empty($order_id)) {
+			if (!empty($payment_method) && !empty($transaction_id)) {
 				/* Update he payment method */
 				$order = get_post_meta($order_id, '_order_postmeta', true);
 				$order['payment_method'] = $payment_method;
 				update_post_meta($order_id, '_order_postmeta', $order);
 
 				// Update Transaction identifier regarding the payment method
-				if ( !empty($transaction_id) ) {
+				if (!empty($transaction_id)) {
 // 					$transaction_key = '';
 // 					switch($payment_method) {
 // 						case 'check':
@@ -465,28 +465,28 @@ 
 // 					if ( !empty($transaction_key) ) update_post_meta($order_id, $transaction_key, $transaction_id);
 					wpshop_payment::set_payment_transaction_number($order_id, $transaction_id);
 				}
-				$result = json_encode(array(true,''));
+				$result = json_encode(array(true, ''));
 			}
 			else {
-				$result = json_encode(array(false,__('Choose a payment method and/or type a transaction number', 'wpshop')));
+				$result = json_encode(array(false, __('Choose a payment method and/or type a transaction number', 'wpshop')));
 			}
 		}
 		else {
-			$result = json_encode(array(false,__('Bad order identifier', 'wpshop')));
+			$result = json_encode(array(false, __('Bad order identifier', 'wpshop')));
 		}
 		echo json_encode($result);
 		die();
 	}
-	add_action( 'wp_ajax_validate_payment_method', 'wpshop_ajax_validate_payment_method' );
+	add_action('wp_ajax_validate_payment_method', 'wpshop_ajax_validate_payment_method');
 
 
 	/* Display a dialog box to inform a shipping tracking number */
 	function wpshop_ajax_dialog_inform_shipping_number() {
-		check_ajax_referer( 'wpshop_dialog_inform_shipping_number', 'wpshop_ajax_nonce' );
-		$order_id = ( isset( $_POST[ 'order_id' ] ) && !empty( $_POST[ 'order_id' ] ) ) ? (int)$_POST[ 'order_id' ] : null;
+		check_ajax_referer('wpshop_dialog_inform_shipping_number', 'wpshop_ajax_nonce');
+		$order_id = (isset($_POST['order_id']) && !empty($_POST['order_id'])) ? (int)$_POST['order_id'] : null;
 
-		if ( !empty($order_id) ) {
-			$result = (array(true, '<h1>'.__('Tracking number','wpshop').'</h1><p>'.__('Enter a tracking number, or leave blank:','wpshop').'</p><input type="hidden" value="'.$order_id.'" name="oid" /><input type="text" name="trackingNumber" /><br /><br /><p>'.__('Enter a tracking link, or leave blank: (http included)','wpshop').'</p><input type="text" name="trackingLink" /><br /><br /><input type="submit" data-nonce="' . esc_attr( wp_create_nonce( 'wpshop_change_order_state' ) ) . '" class="button-primary sendTrackingNumber" value="'.__('Send','wpshop').'" /> <input type="button" class="button-secondary closeAlert" value="'.__('Cancel','wpshop').'" />'));
+		if (!empty($order_id)) {
+			$result = (array(true, '<h1>' . __('Tracking number', 'wpshop') . '</h1><p>' . __('Enter a tracking number, or leave blank:', 'wpshop') . '</p><input type="hidden" value="' . $order_id . '" name="oid" /><input type="text" name="trackingNumber" /><br /><br /><p>' . __('Enter a tracking link, or leave blank: (http included)', 'wpshop') . '</p><input type="text" name="trackingLink" /><br /><br /><input type="submit" data-nonce="' . esc_attr(wp_create_nonce('wpshop_change_order_state')) . '" class="button-primary sendTrackingNumber" value="' . __('Send', 'wpshop') . '" /> <input type="button" class="button-secondary closeAlert" value="' . __('Cancel', 'wpshop') . '" />'));
 
 		}
 		else {
@@ -495,23 +495,23 @@ 
 		echo json_encode($result);
 		die();
 	}
-	add_action( 'wp_ajax_dialog_inform_shipping_number', 'wpshop_ajax_dialog_inform_shipping_number' );
+	add_action('wp_ajax_dialog_inform_shipping_number', 'wpshop_ajax_dialog_inform_shipping_number');
 
 	function wpshop_ajax_change_order_state() {
 		global $order_status, $wps_shipping_mode_ctr;
-		check_ajax_referer( 'wpshop_change_order_state', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_change_order_state', 'wpshop_ajax_nonce');
 
-		$order_id = ( isset( $_POST[ 'order_id' ] ) && !empty( $_POST[ 'order_id' ] ) ) ? (int)$_POST[ 'order_id' ] : null;
-		$order_state = ( isset( $_POST[ 'order_state' ] ) && !empty( $_POST[ 'order_state' ] ) ) ? sanitize_text_field( $_POST[ 'order_state' ] ) : null;
-		$order_shipped_number = ( isset( $_POST[ 'order_shipped_number' ] ) && !empty( $_POST[ 'order_shipped_number' ] ) ) ? sanitize_text_field( $_POST[ 'order_shipped_number' ] ) : null;
-		$order_shipped_link = ( isset( $_POST[ 'order_shipped_link' ] ) && !empty( $_POST[ 'order_shipped_link' ] ) ) ? sanitize_text_field( $_POST[ 'order_shipped_link' ] ) : null;
+		$order_id = (isset($_POST['order_id']) && !empty($_POST['order_id'])) ? (int)$_POST['order_id'] : null;
+		$order_state = (isset($_POST['order_state']) && !empty($_POST['order_state'])) ? sanitize_text_field($_POST['order_state']) : null;
+		$order_shipped_number = (isset($_POST['order_shipped_number']) && !empty($_POST['order_shipped_number'])) ? sanitize_text_field($_POST['order_shipped_number']) : null;
+		$order_shipped_link = (isset($_POST['order_shipped_link']) && !empty($_POST['order_shipped_link'])) ? sanitize_text_field($_POST['order_shipped_link']) : null;
 
-		if ( !empty($order_id) ) {
+		if (!empty($order_id)) {
 			/* Update the oder state */
 			$order = get_post_meta($order_id, '_order_postmeta', true);
 			$order['order_status'] = $order_state;
 
-			if ( $order_state == 'shipped' ) {
+			if ($order_state == 'shipped') {
 				$order['order_shipping_date'] = current_time('mysql', 0);
 				$order['order_trackingNumber'] = $order_shipped_number;
 				$order['order_trackingLink'] = $order_shipped_link;
@@ -524,10 +524,10 @@ 
 
 				$order_postmeta = $order;
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, $wps_shipping_mode_ctr->template_dir, 'backend', 'order-shipping-informations' ) );
+				require(wpshop_tools::get_template_part(WPS_SHIPPING_MODE_DIR, $wps_shipping_mode_ctr->template_dir, 'backend', 'order-shipping-informations'));
 				$output_shipping_box = ob_get_clean();
 
-				$result = array( true, $order_state, $output_shipping_box, $output_payment_box_class, $output_payment_box_content );
+				$result = array(true, $order_state, $output_shipping_box, $output_payment_box_class, $output_payment_box_content);
 			}
 			else {
 				wpshop_payment::setOrderPaymentStatus($order_id, $order_state);
@@ -544,39 +544,39 @@ 
 		echo json_encode($result);
 		die();
 	}
-	add_action( 'wp_ajax_change_order_state', 'wpshop_ajax_change_order_state' );
+	add_action('wp_ajax_change_order_state', 'wpshop_ajax_change_order_state');
 
 
 	/* Send a confirmation e-mail to the customer */
-	function wpshop_send_confirmation_shipping_email($order_id){
+	function wpshop_send_confirmation_shipping_email($order_id) {
 		$wps_message = new wps_message_ctr();
-		if ( !empty($order_id) ) {
+		if (!empty($order_id)) {
 			$order_info = get_post_meta($order_id, '_order_info', true);
 			$order = get_post_meta($order_id, '_order_postmeta', true);
-			$email = ( !empty($order_info['billing']['address']['address_user_email']) ? $order_info['billing']['address']['address_user_email'] : '');
+			$email = (!empty($order_info['billing']['address']['address_user_email']) ? $order_info['billing']['address']['address_user_email'] : '');
 			$first_name = (!empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '');
-			$last_name = ( !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '');
+			$last_name = (!empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '');
 
-			if( empty($email) && !empty($order['customer_id']) ) {
-				$user_data = get_userdata( $order['customer_id'] );
+			if (empty($email) && !empty($order['customer_id'])) {
+				$user_data = get_userdata($order['customer_id']);
 				$email = $user_data->user_email;
 			}
 
-			$shipping_mode_option = get_option( 'wps_shipping_mode' );
-			$shipping_method = ( !empty($order['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order['order_payment']['shipping_method']]['name'] : ( (!empty($order_meta['order_payment']['shipping_method']) ) ? $order['order_payment']['shipping_method'] : '' );
+			$shipping_mode_option = get_option('wps_shipping_mode');
+			$shipping_method = (!empty($order['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order['order_payment']['shipping_method']]['name'] : ((!empty($order_meta['order_payment']['shipping_method'])) ? $order['order_payment']['shipping_method'] : '');
 
 
-			$wps_message->wpshop_prepared_email (
+			$wps_message->wpshop_prepared_email(
 				$email,
 				'WPSHOP_SHIPPING_CONFIRMATION_MESSAGE',
 				array(
 					'order_id' => $order_id,
-					'order_key' => ( !empty($order['order_key']) ? $order['order_key'] : '' ),
+					'order_key' => (!empty($order['order_key']) ? $order['order_key'] : ''),
 					'customer_first_name' => $first_name,
 					'customer_last_name' => $last_name,
-					'order_date' => ( !empty($order['order_date']) ? $order['order_date'] : '' ),
-					'order_trackingNumber' => ( !empty($order['order_trackingNumber']) ? $order['order_trackingNumber'] : '' ),
-					'order_trackingLink' => ( !empty($order['order_trackingLink']) ? $order['order_trackingLink'] : '' ),
+					'order_date' => (!empty($order['order_date']) ? $order['order_date'] : ''),
+					'order_trackingNumber' => (!empty($order['order_trackingNumber']) ? $order['order_trackingNumber'] : ''),
+					'order_trackingLink' => (!empty($order['order_trackingLink']) ? $order['order_trackingLink'] : ''),
 					'order_addresses' => '',
 					'order_billing_address' => '',
 					'order_shipping_address' => '',
@@ -595,12 +595,12 @@ 
 	 * @return string The html output for the new value
 	 */
 	function ajax_new_option_for_select_callback() {
-		check_ajax_referer( 'wpshop_new_option_for_attribute_creation', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_new_option_for_attribute_creation', 'wpshop_ajax_nonce');
 		global $wpdb;
 
-		$option_id=$option_default_value=$option_value_id=$options_value='';
-		$attribute_identifier = isset($_GET['attribute_identifier']) ? (int) $_GET['attribute_identifier'] : '0';
-		$option_name = (!empty($_REQUEST['attribute_new_label']) ? sanitize_text_field( $_REQUEST['attribute_new_label'] ) : '');
+		$option_id = $option_default_value = $option_value_id = $options_value = '';
+		$attribute_identifier = isset($_GET['attribute_identifier']) ? (int)$_GET['attribute_identifier'] : '0';
+		$option_name = (!empty($_REQUEST['attribute_new_label']) ? sanitize_text_field($_REQUEST['attribute_new_label']) : '');
 		$options_value = sanitize_title($option_name);
 
 		/*	Check if given value does not exist before continuing	*/
@@ -608,7 +608,7 @@ 
 		$existing_values = $wpdb->get_results($query);
 
 		/*	If given value does not exist: display result. If value exist alert a error message	*/
-		if( empty($existing_values) ) {
+		if (empty($existing_values)) {
 			$tpl_component = array();
 			$tpl_component['ADMIN_ATTRIBUTE_VALUES_OPTION_ID'] = $option_id;
 			$tpl_component['ADMIN_ATTRIBUTE_VALUES_OPTION_NAME'] = stripslashes($option_name);
@@ -616,7 +616,7 @@ 
 			$tpl_component['ADMIN_ATTRIBUTE_VALUES_OPTION_VALUE'] = str_replace(".", ",", stripslashes($options_value));
 			$tpl_component['ADMIN_ATTRIBUTE_VALUES_OPTION_STATE'] = '';
 			$tpl_component['ADMIN_ATTRIBUTE_VALUE_OPTIN_ACTIONS'] = '';
-			if ( current_user_can('wpshop_delete_attributes_select_values') && ($option_id >= 0) ) :
+			if (current_user_can('wpshop_delete_attributes_select_values') && ($option_id >= 0)) :
 				$tpl_component['ADMIN_ATTRIBUTE_VALUE_OPTIN_ACTIONS'] .= wpshop_display::display_template_element('wpshop_admin_attr_option_value_item_deletion', $tpl_component, array('type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $attribute_identifier), 'admin');
 			endif;
 			$output = wpshop_display::display_template_element('wpshop_admin_attr_option_value_item', $tpl_component, array('type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $attribute_identifier), 'admin');
@@ -635,7 +635,7 @@ 
 	 * Add a new value to an attribute from select type directly from an entity element edition interface
 	 */
 	function ajax_new_option_for_select_from_product_edition_callback() {
-		check_ajax_referer( 'wpshop_new_option_for_attribute_creation', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_new_option_for_attribute_creation', 'wpshop_ajax_nonce');
 
 		global $wpdb;
 		$result = '';
@@ -652,13 +652,13 @@ 
 		$attribute_options_label = isset($_POST['attribute_new_label']) ? wpshop_tools::varSanitizer($_POST['attribute_new_label']) : null;
 		$attribute_options_value = sanitize_title($attribute_options_label);
 
-		if ( $type == 'internal' ) {
+		if ($type == 'internal') {
 			/**	Check if the given value does not exist	*/
 			$query = $wpdb->prepare("SELECT * FROM " . $wpdb->posts . " WHERE post_title = %s AND post_status = 'publish'", $attribute_options_label);
 			$existing_values = $wpdb->get_results($query);
 
 			/**	If the value does not exist, we create it and output, in case it exists alert an error message	*/
-			if ( count($existing_values) <= 0 ) {
+			if (count($existing_values) <= 0) {
 				$result_status = true;
 				/**	Create the new value as an entity into post database	*/
 				$new_post = array(
@@ -681,7 +681,7 @@ 
 			$existing_values = $wpdb->get_results($query);
 
 			/**	If the value does not exist, we create it and output, in case it exists alert an error message	*/
-			if( count($existing_values) <= 0 ) {
+			if (count($existing_values) <= 0) {
 				$result_status = true;
 				$position = 1;
 				/**	Get the last value position for adding the new at the end	*/
@@ -700,15 +700,15 @@ 
 
 		if ($result_status) {
 			$tmp_selection_for_output = array();
-			foreach ( $attribute_selected_values as $value ) {
+			foreach ($attribute_selected_values as $value) {
 				$tmp_selection_for_output[]['value'] = $value;
 			}
 			$tmp_selection_for_output[]['value'] = $new_option_id;
-			foreach ( $tmp_selection_for_output as $tmp_value ) {
+			foreach ($tmp_selection_for_output as $tmp_value) {
 				$selection_for_output[] = (object)$tmp_value;
 			}
 			$attribute_selected_values[] = $new_option_id;
-			$input = wpshop_attributes::get_attribute_field_definition( $attribute, $selection_for_output, array('page_code' => $current_page_code, 'from' => $attribute_place_display) );
+			$input = wpshop_attributes::get_attribute_field_definition($attribute, $selection_for_output, array('page_code' => $current_page_code, 'from' => $attribute_place_display));
 			$result = $input['output'] . $input['options'];
 		}
 
@@ -721,7 +721,7 @@ 
 	 * Delete a value for a select list attribute
 	 */
 	function ajax_delete_option_for_select_callback() {
-		check_ajax_referer( 'wpshop_new_option_for_attribute_deletion', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_new_option_for_attribute_deletion', 'wpshop_ajax_nonce');
 
 		$attribute_value_id = isset($_POST['attribute_value_id']) ? wpshop_tools::varSanitizer($_POST['attribute_value_id']) : '0';
 
@@ -745,18 +745,18 @@ 
 	 * Display the field for the selected attribute type
 	 */
 	function ajax_attribute_output_type_callback() {
-		check_ajax_referer( 'wpshop_attribute_output_type_selection', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_attribute_output_type_selection', 'wpshop_ajax_nonce');
 
 		$data_type_to_use = isset($_POST['data_type_to_use']) ? str_replace('_data', '', wpshop_tools::varSanitizer($_POST['data_type_to_use'], '')) : 'custom';
 		$current_type = isset($_POST['current_type']) ? wpshop_tools::varSanitizer($_POST['current_type']) : 'short_text';
-		$elementIdentifier = isset($_POST['elementIdentifier']) ? intval( wpshop_tools::varSanitizer($_POST['elementIdentifier'])) : null;
+		$elementIdentifier = isset($_POST['elementIdentifier']) ? intval(wpshop_tools::varSanitizer($_POST['elementIdentifier'])) : null;
 		$the_input = __('An error occured while getting field type', 'wpshop');
 		$input_def = array();
 		$input_def['name'] = 'default_value';
 		$input_def['id'] = 'wpshop_attributes_edition_table_field_id_default_value';
 		$input_label = __('Default value', 'wpshop');
 
-		switch($current_type){
+		switch ($current_type) {
 			case 'short_text':
 			case 'float_field':
 				$input_def['type'] = 'text';
@@ -767,13 +767,13 @@ 
 			case 'multiple-select':
 			case 'radio':
 			case 'checkbox':
-				$input_label=__('Options list for attribute', 'wpshop');
+				$input_label = __('Options list for attribute', 'wpshop');
 				$the_input = wpshop_attributes::get_select_options_list($elementIdentifier, $data_type_to_use);
 				break;
 			case 'date_field':
-				$input_label=__('Date field configuration', 'wpshop');
+				$input_label = __('Date field configuration', 'wpshop');
 
-				$the_input = wpshop_attributes::attribute_type_date_config( array() );
+				$the_input = wpshop_attributes::attribute_type_date_config(array());
 				break;
 			case 'textarea':
 				$input_def['type'] = 'textarea';
@@ -791,11 +791,11 @@ 
 	 * Get the attribute set list when creating a new attribute for direct affectation
 	 */
 	function ajax_attribute_entity_set_selection_callback() {
-		check_ajax_referer( 'wpshop_attribute_entity_set_selection', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_attribute_entity_set_selection', 'wpshop_ajax_nonce');
 
 		$current_entity_id = isset($_POST['current_entity_id']) ? intval(wpshop_tools::varSanitizer($_POST['current_entity_id'])) : null;
 
-		$the_input = wpshop_attributes_set::get_attribute_set_complete_list($current_entity_id,  wpshop_attributes::getDbTable(), wpshop_attributes::currentPageCode);
+		$the_input = wpshop_attributes_set::get_attribute_set_complete_list($current_entity_id, wpshop_attributes::getDbTable(), wpshop_attributes::currentPageCode);
 
 		echo json_encode($the_input);
 		die();
@@ -805,11 +805,11 @@ 
 	 * Get the attribute set list when creating a new attribute for direct affectation
 	 */
 	function ajax_attribute_set_entity_selection_callback() {
-		check_ajax_referer( 'wpshop_attribute_set_entity_selection', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_attribute_set_entity_selection', 'wpshop_ajax_nonce');
 
 		$current_entity_id = isset($_POST['current_entity_id']) ? intval(wpshop_tools::varSanitizer($_POST['current_entity_id'])) : null;
 
-		$the_input = wpshop_attributes_set::get_attribute_set_complete_list($current_entity_id,  wpshop_attributes_set::getDbTable(), wpshop_attributes::currentPageCode, false);
+		$the_input = wpshop_attributes_set::get_attribute_set_complete_list($current_entity_id, wpshop_attributes_set::getDbTable(), wpshop_attributes::currentPageCode, false);
 
 		echo json_encode($the_input);
 		die();
@@ -820,7 +820,7 @@ 
 	 * Dialog box allowing to change attribute data type from custom to internal
 	 */
 	function ajax_attribute_select_data_type_callback() {
-		check_ajax_referer( 'wpshop_attribute_change_select_data_type', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_attribute_change_select_data_type', 'wpshop_ajax_nonce');
 		$result = '';
 
 		$current_attribute = isset($_POST['current_attribute']) ? intval(wpshop_tools::varSanitizer($_POST['current_attribute'])) : null;
@@ -828,12 +828,12 @@ 
 
 		$types_toggled = unserialize(WPSHOP_ATTR_SELECT_TYPE_TOGGLED);
 		$result .= '<p class="wpshop_change_select_data_type_change wpshop_change_select_data_type_change_current_attribute" >' . sprintf(__('Selected attribute %s', 'wpshop'), $attribute->frontend_label) . '</p>';
-		$result .= '<p class="wpshop_change_select_data_type_change wpshop_change_select_data_type_change_types" >' . sprintf(__('Actual data type is %s. After current operation: %s', 'wpshop'), __($attribute->data_type_to_use.'_data', 'wpshop'), __($types_toggled[$attribute->data_type_to_use], 'wpshop')) . '</p>';
+		$result .= '<p class="wpshop_change_select_data_type_change wpshop_change_select_data_type_change_types" >' . sprintf(__('Actual data type is %s. After current operation: %s', 'wpshop'), __($attribute->data_type_to_use . '_data', 'wpshop'), __($types_toggled[$attribute->data_type_to_use], 'wpshop')) . '</p>';
 
-		if ( $attribute->data_type_to_use == 'custom' ) {
-			$sub_output='';
+		if ($attribute->data_type_to_use == 'custom') {
+			$sub_output = '';
 			$wp_types = unserialize(WPSHOP_INTERNAL_TYPES);
-			unset($input_def);$input_def=array();
+			unset($input_def); $input_def = array();
 			$input_def['label'] = __('Type of data for list', 'wpshop');
 			$input_def['type'] = 'select';
 			$input_def['name'] = 'internal_data';
@@ -841,7 +841,7 @@ 
 			$input_def['possible_value'] = $wp_types;
 			$input_def['value'] = !empty($attribute_select_options[0]->default_value) ? $attribute_select_options[0]->default_value : null;
 			$combo_wp_type = wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE);
-			$result .= __('Choose the data type to use for this attribute', 'wpshop') . '<a href="#" title="'.sprintf(__('If the type you want to use is not in the list below. You have to create it by using %s menu', 'wpshop'), __('Entities', 'wpshop')).'" class="wpshop_infobulle_marker">?</a><div class="wpshop_cls wpshop_attribute_select_data_type_internal_list">'.$combo_wp_type.'</div>';
+			$result .= __('Choose the data type to use for this attribute', 'wpshop') . '<a href="#" title="' . sprintf(__('If the type you want to use is not in the list below. You have to create it by using %s menu', 'wpshop'), __('Entities', 'wpshop')) . '" class="wpshop_infobulle_marker">?</a><div class="wpshop_cls wpshop_attribute_select_data_type_internal_list">' . $combo_wp_type . '</div>';
 			$result .= '<input type="hidden" value="no" name="delete_items_of_entity" id="delete_items_of_entity" /><input type="hidden" value="no" name="delete_entity" id="delete_entity" />';
 		}
 		else {
@@ -874,7 +874,7 @@ 
 	 */
 	function ajax_attribute_select_data_type_change_callback() {
 		global $wpdb;
-		check_ajax_referer( 'wpshop_attribute_change_select_data_type_change', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_attribute_change_select_data_type_change', 'wpshop_ajax_nonce');
 		$result = '';
 
 		$current_attribute = isset($_POST['attribute_id']) ? intval(wpshop_tools::varSanitizer($_POST['attribute_id'])) : null;
@@ -884,10 +884,10 @@ 
 		$delete_entity = isset($_POST['delete_entity']) ? wpshop_tools::varSanitizer($_POST['delete_entity']) : false;
 
 
-		if ( $data_type == 'internal' ) {
+		if ($data_type == 'internal') {
 			$options_list = wpshop_attributes::get_select_option_list_($current_attribute);
-			if(!empty($options_list)){
-				foreach($options_list as $option){
+			if (!empty($options_list)) {
+				foreach ($options_list as $option) {
 					/*	Creat the new entity	*/
 					$new_post = array(
 							'post_title' 	=> $option->name,
@@ -896,7 +896,7 @@ 
 							'post_type' 	=> $internal_data_type
 					);
 					$new_option_id = wp_insert_post($new_post);
-					if(!empty($new_option_id)){
+					if (!empty($new_option_id)) {
 						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status'=>'deleted'), array('attribute_id'=>$current_attribute));
 					}
 				}
@@ -905,19 +905,19 @@ 
 		else {
 			$post_list = query_posts(array('post_type' => $internal_data_type));
 			if (!empty($post_list)) {
-				$p=1;
+				$p = 1;
 				$error = false;
 				foreach ($post_list as $post) {
-					$last_insert = $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status'=>'valid', 'creation_date'=>current_time('mysql',0), 'attribute_id'=>$current_attribute, 'position'=>$p, 'value'=>$post->post_name, 'label'=>$post->post_title));
-					if(is_int($last_insert) && $delete_items_of_entity){
+					$last_insert = $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status'=>'valid', 'creation_date'=>current_time('mysql', 0), 'attribute_id'=>$current_attribute, 'position'=>$p, 'value'=>$post->post_name, 'label'=>$post->post_title));
+					if (is_int($last_insert) && $delete_items_of_entity) {
 						wp_delete_post($post->ID, true);
 					}
-					else{
+					else {
 						$error = true;
 					}
 					$p++;
 				}
-				if(!$error && $delete_entity){
+				if (!$error && $delete_entity) {
 					$post = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_type=%s AND post_name=%s", WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, $internal_data_type);
 					wp_delete_post($wpdb->get_var($post), true);
 				}
@@ -937,8 +937,8 @@ 
 	/**
 	 * Duplicate an existing attribute from an entity to another
 	 */
-	function ajax_wpshop_duplicate_attribute_callback (){
-		check_ajax_referer( 'wpshop_duplicate_attribute', 'wpshop_ajax_nonce' );
+	function ajax_wpshop_duplicate_attribute_callback() {
+		check_ajax_referer('wpshop_duplicate_attribute', 'wpshop_ajax_nonce');
 		global $wpdb;
 
 		$result = '';
@@ -958,16 +958,16 @@ 
 		/*	Check if the attribute to duplicate does not exist for the selected entity	*/
 		$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s", $attribute_def['code']);
 		$check_existing_attribute = $wpdb->get_var($query);
-		if ( empty($check_existing_attribute) ) {
+		if (empty($check_existing_attribute)) {
 			/*	Save new attribut for the selected entity	*/
 			$new_attribute = $wpdb->insert(WPSHOP_DBT_ATTRIBUTE, $attribute_def);
 			$new_attribute_id = $wpdb->insert_id;
 
 			if ($new_attribute) {
-				if ( in_array($attribute_def['backend_input'], array('select', 'multiple-select', 'radio', 'checkbox')) && ($attribute_def['data_type_to_use'] == 'custom') ) {
+				if (in_array($attribute_def['backend_input'], array('select', 'multiple-select', 'radio', 'checkbox')) && ($attribute_def['data_type_to_use'] == 'custom')) {
 					$query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE attribute_id = %d", $current_attribute);
 					$attribute_options_list = $wpdb->get_results($query, ARRAY_A);
-					foreach ( $attribute_options_list as $option ) {
+					foreach ($attribute_options_list as $option) {
 						$option['id'] = '';
 						$option['creation_date'] = current_time('mysql', 0);
 						$option['attribute_id'] = $new_attribute_id;
@@ -998,27 +998,27 @@ 
 	/**
 	 * Load comboBox of unit or group of unit
 	 */
-	function wpshop_ajax_load_attribute_unit_list(){
-		check_ajax_referer( 'wpshop_load_attribute_unit_list', 'wpshop_ajax_nonce' );
+	function wpshop_ajax_load_attribute_unit_list() {
+		check_ajax_referer('wpshop_load_attribute_unit_list', 'wpshop_ajax_nonce');
 		$response = '';
 
-		$current_group = ( isset( $_POST[ 'current_group' ] ) && !empty( $_POST[ 'current_group' ] ) ) ? sanitize_text_field( $_POST[ 'current_group' ] ) : null;
-		$selected_list = ( isset( $_POST[ 'selected_list' ] ) && !empty( $_POST[ 'selected_list' ] ) ) ? sanitize_text_field( $_POST[ 'selected_list' ] ) : null;
+		$current_group = (isset($_POST['current_group']) && !empty($_POST['current_group'])) ? sanitize_text_field($_POST['current_group']) : null;
+		$selected_list = (isset($_POST['selected_list']) && !empty($_POST['selected_list'])) ? sanitize_text_field($_POST['selected_list']) : null;
 
 		$group = wpshop_tools::varSanitizer($current_group);
 		$selected_list = wpshop_tools::varSanitizer($selected_list);
 
-		if ( !empty($group) && !empty($selected_list)) {
+		if (!empty($group) && !empty($selected_list)) {
 			/* Test if we want display the group unit list OR the unit list */
-			if ( $selected_list == 'group unit' ) {
+			if ($selected_list == 'group unit') {
 				$list = wpshop_attributes_unit::get_unit_group();
 			}
 			else {
 				$list = wpshop_attributes_unit::get_unit_list_for_group($group);
 			}
 
-			foreach( $list as $unit ) {
-				$response .= '<option value="' . $unit->id . '" '. ( ($current_group == $unit->id && $selected_list == 'group unit') ? 'selected="selected"' : '' ).'>' . $unit->name . '</option>';
+			foreach ($list as $unit) {
+				$response .= '<option value="' . $unit->id . '" ' . (($current_group == $unit->id && $selected_list == 'group unit') ? 'selected="selected"' : '') . '>' . $unit->name . '</option>';
 			}
 			$result = array(true, $response);
 		}
@@ -1034,7 +1034,7 @@ 
 
 /**	Tools page	*/
 	function wpshop_ajax_db_check_tool() {
-		check_ajax_referer( 'wpshop_ajax_db_check_tool', '_wpnonce' );
+		check_ajax_referer('wpshop_ajax_db_check_tool', '_wpnonce');
 
 		global $wpdb, $wpshop_db_table_operation_list, $wpshop_db_table, $wpshop_update_way;
 		$current_db_version = get_option('wpshop_db_options', 0);
@@ -1050,22 +1050,22 @@ 
 </div>
 <div class="tools_db_modif_list_version_details" >
 	<ul>';
-			foreach($plugin_db_modification as $modif_name => $modif_list){
-				switch($modif_name){
+			foreach ($plugin_db_modification as $modif_name => $modif_list) {
+				switch ($modif_name) {
 					case 'FIELD_ADD':{
-						foreach($modif_list as $table_name => $field_list){
+						foreach ($modif_list as $table_name => $field_list) {
 							$sub_modif = '  ';
-							foreach($field_list as $column_name){
-								$query = $wpdb->prepare("SHOW COLUMNS FROM " .$table_name . " WHERE Field = %s", $column_name);
+							foreach ($field_list as $column_name) {
+								$query = $wpdb->prepare("SHOW COLUMNS FROM " . $table_name . " WHERE Field = %s", $column_name);
 								$columns = $wpdb->get_row($query);
 								$sub_modif .= $column_name;
-								if( !empty($columns->Field) && ($columns->Field == $column_name) ){
+								if (!empty($columns->Field) && ($columns->Field == $column_name)) {
 									$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Field has been created', 'wpshop') . '" title="' . __('Field has been created', 'wpshop') . '" class="db_added_field_check" />';
 								}
-								else{
+								else {
 									$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Field does not exist', 'wpshop') . '" title="' . __('Field does not exist', 'wpshop') . '" class="db_added_field_check" />';
 									$error_nb++;
-									if ( !empty($error_list[$plugin_db_version]) ) {
+									if (!empty($error_list[$plugin_db_version])) {
 										$error_list[$plugin_db_version] += 1;
 									}
 									else {
@@ -1074,56 +1074,56 @@ 
 								}
 								$sub_modif .= ' / ';
 							}
-							$plugin_db_modification_content .= '<li class="added_field" >' . sprintf(__('Added field list for %s', 'wpshop'), $table_name) . '&nbsp;:&nbsp;' .  substr($sub_modif, 0, -2) . '</li>';
+							$plugin_db_modification_content .= '<li class="added_field" >' . sprintf(__('Added field list for %s', 'wpshop'), $table_name) . '&nbsp;:&nbsp;' . substr($sub_modif, 0, -2) . '</li>';
 						}
 					}break;
 					case 'FIELD_DROP':{
-						foreach($modif_list as $table_name => $field_list){
+						foreach ($modif_list as $table_name => $field_list) {
 							$sub_modif = '  ';
-							foreach($field_list as $column_name){
-								$query = $wpdb->prepare("SHOW COLUMNS FROM " .$table_name . " WHERE Field = %s", $column_name);
+							foreach ($field_list as $column_name) {
+								$query = $wpdb->prepare("SHOW COLUMNS FROM " . $table_name . " WHERE Field = %s", $column_name);
 								$columns = $wpdb->get_row($query);
 								$sub_modif .= $column_name;
-								if(empty($columns) || ($columns->Field != $column_name)){
+								if (empty($columns) || ($columns->Field != $column_name)) {
 									$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Field has been deleted', 'wpshop') . '" title="' . __('Field has been deleted', 'wpshop') . '" class="db_deleted_field_check" />';
 								}
-								else{
+								else {
 									$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Field exists', 'wpshop') . '" title="' . __('Field exists', 'wpshop') . '" class="db_deleted_field_check" />';
 									$error_nb++;
 									$error_list[$plugin_db_version] += 1;
 								}
 								$sub_modif .= ' / ';
 							}
-							$plugin_db_modification_content .= '<li class="deleted_field" >' . sprintf(__('Fields list deleted for the %s table', 'wpshop'), $table_name) . '&nbsp;:&nbsp;' .  substr($sub_modif, 0, -2) . '</li>';
+							$plugin_db_modification_content .= '<li class="deleted_field" >' . sprintf(__('Fields list deleted for the %s table', 'wpshop'), $table_name) . '&nbsp;:&nbsp;' . substr($sub_modif, 0, -2) . '</li>';
 						}
 					}break;
 					case 'FIELD_CHANGE':{
-						foreach($modif_list as $table_name => $field_list){
+						foreach ($modif_list as $table_name => $field_list) {
 							$sub_modif = '  ';
-							foreach($field_list as $field_infos){
-								$query = $wpdb->prepare("SHOW COLUMNS FROM " .$table_name . " WHERE Field = %s", $field_infos['field']);
+							foreach ($field_list as $field_infos) {
+								$query = $wpdb->prepare("SHOW COLUMNS FROM " . $table_name . " WHERE Field = %s", $field_infos['field']);
 								$columns = $wpdb->get_row($query);
 								$what_is_changed = '';
-								if(isset($field_infos['type'])){
+								if (isset($field_infos['type'])) {
 									$what_is_changed = __('field type', 'wpshop');
 									$changed_key = 'type';
-									if($columns->Type == $field_infos['type']){
+									if ($columns->Type == $field_infos['type']) {
 										$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Field has been created', 'wpshop') . '" title="' . __('Field has been created', 'wpshop') . '" class="db_added_field_check" />';
 									}
-									else{
+									else {
 										$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Field does not exist', 'wpshop') . '" title="' . __('Field does not exist', 'wpshop') . '" class="db_added_field_check" />';
 										$error_nb++;
 										$error_list[$plugin_db_version] += 1;
 									}
 									$sub_modif .= sprintf(__('Change %s for field %s to %s', 'wpshop'), $what_is_changed, $field_infos['field'], $field_infos[$changed_key]);
 								}
-								if(isset($field_infos['original_name'])){
+								if (isset($field_infos['original_name'])) {
 									$what_is_changed = __('field name', 'wpshop');
 									$changed_key = 'original_name';
-									if($columns->Field == $field_infos['field']){
+									if ($columns->Field == $field_infos['field']) {
 										$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Field has been created', 'wpshop') . '" title="' . __('Field has been created', 'wpshop') . '" class="db_added_field_check" />';
 									}
-									else{
+									else {
 										$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Field does not exist', 'wpshop') . '" title="' . __('Field does not exist', 'wpshop') . '" class="db_added_field_check" />';
 										$error_nb++;
 										$error_list[$plugin_db_version] += 1;
@@ -1138,59 +1138,59 @@ 
 					}break;
 
 					case 'DROP_INDEX':{
-						foreach($modif_list as $table_name => $field_list){
+						foreach ($modif_list as $table_name => $field_list) {
 							$sub_modif = '   ';
-							foreach($field_list as $column_name){
-								$query = $wpdb->prepare("SHOW INDEX FROM " .$table_name . " WHERE Column_name = %s", $column_name);
+							foreach ($field_list as $column_name) {
+								$query = $wpdb->prepare("SHOW INDEX FROM " . $table_name . " WHERE Column_name = %s", $column_name);
 								$columns = $wpdb->get_row($query);
 								$sub_modif .= $column_name;
-								if((empty($columns)) || ($columns->Column_name != $column_name)){
+								if ((empty($columns)) || ($columns->Column_name != $column_name)) {
 									$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Index has been deleted', 'wpshop') . '" title="' . __('Index has been deleted', 'wpshop') . '" class="db_deleted_index_check" />';
 								}
-								else{
+								else {
 									$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Index does not exists', 'wpshop') . '" title="' . __('Index does not exists', 'wpshop') . '" class="db_deleted_index_check" />';
 									$error_nb++;
 									$error_list[$plugin_db_version] += 1;
 								}
 								$sub_modif .= ' / ';
 							}
-							$plugin_db_modification_content .= '<li class="deleted_index" >' . sprintf(__('Deleted indexes for %s table', 'wpshop'), $table_name) . '&nbsp;:&nbsp;' .  substr($sub_modif, 0, -3) . '</li>';
+							$plugin_db_modification_content .= '<li class="deleted_index" >' . sprintf(__('Deleted indexes for %s table', 'wpshop'), $table_name) . '&nbsp;:&nbsp;' . substr($sub_modif, 0, -3) . '</li>';
 						}
 					}break;
 					case 'ADD_INDEX':{
-						foreach($modif_list as $table_name => $field_list){
+						foreach ($modif_list as $table_name => $field_list) {
 							$sub_modif = '   ';
-							foreach($field_list as $column_name){
+							foreach ($field_list as $column_name) {
 								$query = $wpdb->prepare("SHOW INDEX FROM " . $table_name . " WHERE Column_name = %s OR Key_name = %s", $column_name, $column_name);
 								$columns = $wpdb->get_row($query);
 								$sub_modif .= $column_name;
-								if(($columns->Column_name == $column_name) || ($columns->Key_name == $column_name)){
+								if (($columns->Column_name == $column_name) || ($columns->Key_name == $column_name)) {
 									$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Index has been created', 'wpshop') . '" title="' . __('Index has been created', 'wpshop') . '" class="db_added_index_check" />';
 								}
-								else{
+								else {
 									$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Index does not exist', 'wpshop') . '" title="' . __('Index does not exist', 'wpshop') . '" class="db_added_index_check" />';
 									$error_nb++;
 									$error_list[$plugin_db_version] += 1;
 								}
 								$sub_modif .= ' / ';
 							}
-							$plugin_db_modification_content .= '<li class="added_index" >' . sprintf(__('Added indexes for %s table', 'wpshop'), $table_name) . '&nbsp;:&nbsp;' .  substr($sub_modif, 0, -3) . '</li>';
+							$plugin_db_modification_content .= '<li class="added_index" >' . sprintf(__('Added indexes for %s table', 'wpshop'), $table_name) . '&nbsp;:&nbsp;' . substr($sub_modif, 0, -3) . '</li>';
 						}
 					}break;
 
 					case 'ADD_TABLE':{
 						$sub_modif = '  ';
-						foreach($modif_list as $table_name){
+						foreach ($modif_list as $table_name) {
 							$sub_modif .= $table_name;
 							$query = $wpdb->prepare("SHOW TABLES FROM " . DB_NAME . " LIKE %s", $table_name);
 							$table_exists = $wpdb->query($query);
-							if($table_exists == 1){
+							if ($table_exists == 1) {
 								$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Table has been created', 'wpshop') . '" title="' . __('Table has been created', 'wpshop') . '" class="db_table_check" />';
 							}
-							else{
+							else {
 								$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Table has not been created', 'wpshop') . '" title="' . __('Table has not been created', 'wpshop') . '" class="db_table_check" />';
 								$error_nb++;
-								if ( !empty($error_list[$plugin_db_version]) ) {
+								if (!empty($error_list[$plugin_db_version])) {
 									$error_list[$plugin_db_version] += 1;
 								}
 								else {
@@ -1203,29 +1203,29 @@ 
 					}break;
 					case 'TABLE_RENAME':{
 						$sub_modif = '  ';
-						foreach($modif_list as $table){
+						foreach ($modif_list as $table) {
 							$sub_modif .= sprintf(__('%s has been renammed %', 'wpshop'), $table['old_name'], $table['name']);
 							$query = $wpdb->prepare("SHOW TABLES FROM " . DB_NAME . " LIKE %s", $table['name']);
 							$table_exists = $wpdb->query($query);
 							$query = $wpdb->prepare("SHOW TABLES FROM " . DB_NAME . " LIKE %s", $table['old_name']);
 							$old_table_exists = $wpdb->query($query);
-							if(($table_exists == 1) && ($old_table_exists == 1)){
+							if (($table_exists == 1) && ($old_table_exists == 1)) {
 								$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Both database table are still present', 'wpshop') . '" title="' . __('Both database table are still present', 'wpshop') . '" class="db_rename_table_check" />';
 								$error_nb++;
-								if ( !empty($error_list[$plugin_db_version]) ) {
+								if (!empty($error_list[$plugin_db_version])) {
 									$error_list[$plugin_db_version] += 1;
 								}
 								else {
 									$error_list[$plugin_db_version] = 1;
 								}
 							}
-							elseif($table_exists == 1){
+							elseif ($table_exists == 1) {
 								$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Table has been renamed', 'wpshop') . '" title="' . __('Table has been renamed', 'wpshop') . '" class="db_rename_table_check" />';
 							}
-							else{
+							else {
 								$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Table has not been renamed', 'wpshop') . '" title="' . __('Table has not been renamed', 'wpshop') . '" class="db_rename_table_check" />';
 								$error_nb++;
-								if ( !empty($error_list[$plugin_db_version]) ) {
+								if (!empty($error_list[$plugin_db_version])) {
 									$error_list[$plugin_db_version] += 1;
 								}
 								else {
@@ -1238,27 +1238,27 @@ 
 					}break;
 					case 'TABLE_RENAME_FOR_DELETION':{
 						$sub_modif = '  ';
-						foreach($modif_list as $table){
+						foreach ($modif_list as $table) {
 							$sub_modif .= sprintf(__('%s has been renammed %', 'wpshop'), $table['old_name'], $table['name']);
 							$query = $wpdb->prepare("SHOW TABLES FROM " . DB_NAME . " LIKE %s", $table['name']);
 							$table_delete_exists = $wpdb->query($query);
 							$query = $wpdb->prepare("SHOW TABLES FROM " . DB_NAME . " LIKE %s", $table['old_name']);
 							$old_table_exists = $wpdb->query($query);
-							if(($table_delete_exists == 1) || ($old_table_exists == 1)){
-								if($old_table_exists == 1){
+							if (($table_delete_exists == 1) || ($old_table_exists == 1)) {
+								if ($old_table_exists == 1) {
 									$deleted_table_result = '<img src="' . admin_url('images/no.png') . '" alt="' . __('Table has not been renamed', 'wpshop') . '" title="' . __('Table has not been renamed', 'wpshop') . '" class="db_deleted_table_check" />';
 									$error_nb++;
-									if ( !empty($error_list[$plugin_db_version]) ) {
+									if (!empty($error_list[$plugin_db_version])) {
 										$error_list[$plugin_db_version] += 1;
 									}
 									else {
 										$error_list[$plugin_db_version] = 1;
 									}
 								}
-								else{
+								else {
 									$deleted_table_result = '<img src="' . EVA_IMG_ICONES_PLUGIN_URL . 'warning_vs.gif" alt="' . __('Table has not been deleted', 'wpshop') . '" title="' . __('Table has not been renamed', 'wpshop') . '" class="db_deleted_table_check" />';
 									$warning_nb++;
-									if ( !empty($warning_list[$plugin_db_version]) ) {
+									if (!empty($warning_list[$plugin_db_version])) {
 										$warning_list[$plugin_db_version] += 1;
 									}
 									else {
@@ -1267,7 +1267,7 @@ 
 								}
 								$sub_modif .= $deleted_table_result;
 							}
-							else{
+							else {
 								$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Table has been deleted', 'wpshop') . '" title="' . __('Table has been deleted', 'wpshop') . '" class="db_deleted_table_check" />';
 							}
 							$sub_modif .= ' / ';
@@ -1282,57 +1282,57 @@ 
 		}
 
 		$db_table_field_error = '';
-		foreach($wpshop_db_table as $table_name => $table_definition){
-			if(!empty($table_definition)){
+		foreach ($wpshop_db_table as $table_name => $table_definition) {
+			if (!empty($table_definition)) {
 				$table_line = explode("
 ", $table_definition);
 
 				$sub_db_table_field_error = '  ';
-				foreach($table_line as $table_definition_line){
+				foreach ($table_line as $table_definition_line) {
 					$def_line = trim($table_definition_line);
-					if(substr($def_line, 0, 1) == "`"){
+					if (substr($def_line, 0, 1) == "`") {
 						$line_element = explode(" ", $def_line);
 						$field_name = str_replace("`", "", $line_element[0]);
-						$query = $wpdb->prepare("SHOW COLUMNS FROM " .$table_name . " WHERE Field = %s", $field_name);
+						$query = $wpdb->prepare("SHOW COLUMNS FROM " . $table_name . " WHERE Field = %s", $field_name);
 						$columns = $wpdb->get_row($query);
-						if ( !empty($columns->Field) && ($columns->Field != $field_name)) {
+						if (!empty($columns->Field) && ($columns->Field != $field_name)) {
 							$sub_db_table_field_error .= $field_name . ', '/*  . ' : <img src="' . admin_url('images/no.png') . '" alt="' . __('Field does not exist', 'wpshop') . '" title="' . __('Field does not exist', 'wpshop') . '" class="db_added_field_check" />' */;
 							$error_nb++;
 						}
 					}
 				}
 				$sub_db_table_field_error = trim(substr($sub_db_table_field_error, 0, -2));
-				if(!empty($sub_db_table_field_error)){
+				if (!empty($sub_db_table_field_error)) {
 					$db_table_field_error .= sprintf(__('Following fields of %s don\'t exists: %s', 'wpshop'), '<span class="bold" >' . $table_name . '</span>', $sub_db_table_field_error) . '<br/>';
 				}
 			}
 		}
-		if(!empty($db_table_field_error)){
+		if (!empty($db_table_field_error)) {
 			$db_table_field_error = '<hr class="clear" />' . $db_table_field_error . '<hr/>';
 		}
 
 		/*	Start display	*/
 		$plugin_install_error = '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Wpshop install is ok', 'wpshop') . '" title="' . __('Wpshop install is ok', 'wpshop') . '" />&nbsp;' . __('There is no error in your wpshop installation. Please find details below', 'wpshop') . '<hr/>';
-		if($error_nb > 0){
+		if ($error_nb > 0) {
 			$plugin_install_error = '<img src="' . admin_url('images/no.png') . '" alt="' . __('Error in wpshop install', 'wpshop') . '" title="' . __('Error in wpshop install', 'wpshop') . '" />&nbsp;' . __('There are ne or more errors into your wpshop installation. Please find details below', 'wpshop') . '<br/>
 							<ul>';
-			foreach($error_list as $version => $element_nb){
-				$plugin_install_error .= '<li>' . sprintf(__('There are %d errors into %s version', 'wpshop'), $element_nb, '<a href="#wpshop_plugin_v_' . $version . '" >' . $version . '</a>') . ' - <button id="wpshop_repair_db_version_' . $version  . '" data-nonce="' . wp_create_nonce( 'wpshop_ajax_db_repair_tool ' ) .'" class="wpshop_repair_db_version" >' . __('Repair', 'wpshop') . '</button></li>';
+			foreach ($error_list as $version => $element_nb) {
+				$plugin_install_error .= '<li>' . sprintf(__('There are %d errors into %s version', 'wpshop'), $element_nb, '<a href="#wpshop_plugin_v_' . $version . '" >' . $version . '</a>') . ' - <button id="wpshop_repair_db_version_' . $version . '" data-nonce="' . wp_create_nonce('wpshop_ajax_db_repair_tool ') . '" class="wpshop_repair_db_version" >' . __('Repair', 'wpshop') . '</button></li>';
 			}
 			$plugin_install_error .= '
 							</ul>';
 		}
-		if($warning_nb > 0){
+		if ($warning_nb > 0) {
 			$plugin_install_error .= '<img src="' . EVA_IMG_ICONES_PLUGIN_URL . 'warning_vs.gif" alt="' . __('Warning in wpshop install', 'wpshop') . '" title="' . __('Warning in wpshop install', 'wpshop') . '" />&nbsp;' . __('Some element need your attention. They have no consequences on wpshop operation. Please find details below', 'wpshop') . '<br/>';
-			foreach($warning_list as $version => $element_nb){
+			foreach ($warning_list as $version => $element_nb) {
 				$plugin_install_error .= '&nbsp;&nbsp;' . sprintf(__('There are %d warning into %s version', 'wpshop'), $element_nb, '<a href="#wpshop_plugin_v_' . $version . '" >' . $version . '</a>') . ' - ';
 			}
 			$plugin_install_error = substr($plugin_install_error, 0, -3) . '<hr/>';
 		}
 
 		$max_number = 0;
-		foreach($wpshop_update_way as $number => $operation){
-			if($number > $max_number){
+		foreach ($wpshop_update_way as $number => $operation) {
+			if ($number > $max_number) {
 				$max_number = $number;
 			}
 		}
@@ -1342,30 +1342,30 @@ 
 	add_action('wp_ajax_wpshop_tool_db_check', 'wpshop_ajax_db_check_tool');
 
 	function wpshop_tool_default_datas_check() {
-		check_ajax_referer( 'wpshop_tool_default_datas_check' );
+		check_ajax_referer('wpshop_tool_default_datas_check');
 
 		$output_ok = $output_error = '';
 
 		/**	Get defined default datas type	*/
-		$default_custom_post_type = unserialize( WPSHOP_DEFAULT_CUSTOM_TYPES );
+		$default_custom_post_type = unserialize(WPSHOP_DEFAULT_CUSTOM_TYPES);
 
 		/**	Read the default data saved to check	*/
-		if ( !empty($default_custom_post_type) ) {
-			foreach ( $default_custom_post_type as $type ) {
+		if (!empty($default_custom_post_type)) {
+			foreach ($default_custom_post_type as $type) {
 				$has_error = false;
 				$file_uri = WPSHOP_TEMPLATES_DIR . 'default_datas/' . $type . '.csv';
-				if ( is_file( $file_uri ) ) {
+				if (is_file($file_uri)) {
 					unset($tpl_component);
 					$tpl_component = array();
 					$tpl_component['CUSTOM_POST_TYPE_NAME'] = 'wpshop_cpt_' . $type;
 
 					/**	Launch check on custom post type	*/
-					$check_cpt = wpshop_entities::check_default_custom_post_type( $type, $tpl_component );
+					$check_cpt = wpshop_entities::check_default_custom_post_type($type, $tpl_component);
 					$has_error = $check_cpt[0];
 					$tpl_component['TOOLS_CUSTOM_POST_TYPE_CONTAINER'] = $check_cpt[1];
-					$tpl_component = array_merge( $tpl_component, $check_cpt[2] );
+					$tpl_component = array_merge($tpl_component, $check_cpt[2]);
 
-					if ( $has_error ) {
+					if ($has_error) {
 						$output_error .= wpshop_display::display_template_element('wpshop_admin_tools_default_datas_check_main_element', $tpl_component, array(), 'admin');
 					}
 					else {
@@ -1381,77 +1381,77 @@ 
 	add_action('wp_ajax_wpshop_tool_default_datas_check', 'wpshop_tool_default_datas_check');
 
 	function wpshop_ajax_repair_default_datas() {
-		check_ajax_referer( 'wpshop_ajax_repair_default_datas' );
+		check_ajax_referer('wpshop_ajax_repair_default_datas');
 
 		global $wpdb;
 		$output = '';
 		$container = '';
 		$result = '';
 
-		$selected_type = ( isset( $_POST['type'] ) && !empty( $_POST['type'] ) ) ? sanitize_text_field( $_POST['type'] ) : null;
-		$identifier = ( isset( $_POST['identifier'] ) && !empty( $_POST['identifier'] ) ) ? sanitize_text_field( $_POST['identifier'] ) : null;
+		$selected_type = (isset($_POST['type']) && !empty($_POST['type'])) ? sanitize_text_field($_POST['type']) : null;
+		$identifier = (isset($_POST['identifier']) && !empty($_POST['identifier'])) ? sanitize_text_field($_POST['identifier']) : null;
 
-		switch ( $selected_type ) {
+		switch ($selected_type) {
 			case WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES:
-				$result = wpshop_entities::create_cpt_from_csv_file( $identifier );
+				$result = wpshop_entities::create_cpt_from_csv_file($identifier);
 			break;
 			case WPSHOP_DBT_ATTRIBUTE:
-				$result = wpshop_entities::create_cpt_attributes_from_csv_file( $identifier );
+				$result = wpshop_entities::create_cpt_attributes_from_csv_file($identifier);
 			break;
 		}
 
-		echo json_encode( $result );
+		echo json_encode($result);
 		die();
 	}
 	add_action('wp_ajax_wpshop_ajax_repair_default_datas', 'wpshop_ajax_repair_default_datas');
 
 	function wpshop_ajax_translate_default_datas() {
-		check_ajax_referer( 'wpshop_ajax_translate_default_datas' );
+		check_ajax_referer('wpshop_ajax_translate_default_datas');
 		global $wpdb;
 		$result = array('status' => true);
 
-		$selected_type = ( isset( $_POST['type'] ) && !empty( $_POST['type'] ) ) ? sanitize_text_field( $_POST['type'] ) : null;
-		$identifier = ( isset( $_POST['identifier'] ) && !empty( $_POST['identifier'] ) ) ? sanitize_text_field( $_POST['identifier'] ) : null;
+		$selected_type = (isset($_POST['type']) && !empty($_POST['type'])) ? sanitize_text_field($_POST['type']) : null;
+		$identifier = (isset($_POST['identifier']) && !empty($_POST['identifier'])) ? sanitize_text_field($_POST['identifier']) : null;
 
-		$entity_id = wpshop_entities::get_entity_identifier_from_code( $identifier );
+		$entity_id = wpshop_entities::get_entity_identifier_from_code($identifier);
 		$query = $wpdb->prepare("SELECT id, frontend_label FROM " . $selected_type . " WHERE entity_id = %d", $entity_id);
-		$attribute_list = $wpdb->get_results( $query );
-		if ( !empty($attribute_list) ) {
-			foreach ( $attribute_list as $attribute) {
-				$update_result = $wpdb->update( $selected_type, array('frontend_label' => __($attribute->frontend_label, 'wpshop')), array('id' => $attribute->id) );
-				if ( $update_result === false ) {
+		$attribute_list = $wpdb->get_results($query);
+		if (!empty($attribute_list)) {
+			foreach ($attribute_list as $attribute) {
+				$update_result = $wpdb->update($selected_type, array('frontend_label' => __($attribute->frontend_label, 'wpshop')), array('id' => $attribute->id));
+				if ($update_result === false) {
 					$result['status'] = false;
 				}
 			}
 		}
 
-		echo json_encode( $result );
+		echo json_encode($result);
 		die();
 	}
 	add_action('wp_ajax_wpshop_ajax_translate_default_datas', 'wpshop_ajax_translate_default_datas');
 
 	function wpshop_ajax_db_repair_tool() {
-		check_ajax_referer( 'wpshop_ajax_db_repair_tool' );
+		check_ajax_referer('wpshop_ajax_db_repair_tool');
 
 		$version_id = isset($_POST['version_id']) ? wpshop_tools::varSanitizer($_POST['version_id']) : null;
 
-		echo wpshop_install::alter_db_structure_on_update( $version_id );
+		echo wpshop_install::alter_db_structure_on_update($version_id);
 
 		die();
 	}
 	add_action('wp_ajax_wpshop_ajax_db_repair_tool', 'wpshop_ajax_db_repair_tool');
 
 	function wps_mass_action_main_interface() {
-		check_ajax_referer( 'wps_mass_action_main_interface' );
+		check_ajax_referer('wps_mass_action_main_interface');
 		$tpl_component = array();
 
 		/**	Copy an attribute content to another	*/
-		$attribute_list = wpshop_attributes::getElement(wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ), "'valid'", 'entity_id', true);
+		$attribute_list = wpshop_attributes::getElement(wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT), "'valid'", 'entity_id', true);
 		$possible_values = array('' => __('Choose an attribute', 'wpshop'));
 		$possible_values_for_variation = array('' => __('Choose an attribute', 'wpshop'));
-		foreach ( $attribute_list as $attribute ) {
+		foreach ($attribute_list as $attribute) {
 			$possible_values[$attribute->id] = $attribute->frontend_label;
-			if ( $attribute->is_used_for_variation == 'yes' ) {
+			if ($attribute->is_used_for_variation == 'yes') {
 				$possible_values_for_variation[$attribute->id] = $attribute->frontend_label;
 			}
 		}
@@ -1482,22 +1482,22 @@ 
 	add_action('wp_ajax_wps_mass_action', 'wps_mass_action_main_interface');
 
 	function wps_mass_action_update_attribute_value() {
-		check_ajax_referer( 'wps_mass_action_update_attribute_value' );
+		check_ajax_referer('wps_mass_action_update_attribute_value');
 		global $wpdb;
 		$response = array();
 
-		$from = !empty( $_POST['wps_update_att_values']['from'] ) ? sanitize_text_field( $_POST['wps_update_att_values']['from'] ) : '';
-		$to = !empty( $_POST['wps_update_att_values']['to'] ) ? sanitize_text_field( $_POST['wps_update_att_values']['to'] ) : '';
-		$entity_to_transfert = !empty( $_POST['wps_entity_to_transfert'] ) ? sanitize_text_field( $_POST['wps_entity_to_transfert'] ) : '';
+		$from = !empty($_POST['wps_update_att_values']['from']) ? sanitize_text_field($_POST['wps_update_att_values']['from']) : '';
+		$to = !empty($_POST['wps_update_att_values']['to']) ? sanitize_text_field($_POST['wps_update_att_values']['to']) : '';
+		$entity_to_transfert = !empty($_POST['wps_entity_to_transfert']) ? sanitize_text_field($_POST['wps_entity_to_transfert']) : '';
 
-		if ( $from != $to ) {
+		if ($from != $to) {
 			$from_attribute = wpshop_attributes::getElement($from, "'valid'");
 			$to_attribute = wpshop_attributes::getElement($to, "'valid'");
-			if ( $from_attribute->data_type == $to_attribute->data_type ) {
+			if ($from_attribute->data_type == $to_attribute->data_type) {
 
 				/**	Manage specific case	*/
 				$query_more_args = array();
-				switch( $to_attribute->code ){
+				switch ($to_attribute->code) {
 					case "barcode":
 							$more_query = "
 						AND VAL.value NOT LIKE %s";
@@ -1513,22 +1513,22 @@ 
 					WHERE VAL.attribute_id = %d
 						AND P.post_type = %s
 						AND VAL.value != ''" . $more_query,
-					array_merge( array( $from, $entity_to_transfert ), $query_more_args )
+					array_merge(array($from, $entity_to_transfert), $query_more_args)
 				);
-				$element_list_to_update = $wpdb->get_results( $query );
+				$element_list_to_update = $wpdb->get_results($query);
 
-				if ( !empty($element_list_to_update) ) {
+				if (!empty($element_list_to_update)) {
 					$has_error = false;
 					$error_count = 0;
-					foreach ( $element_list_to_update as $element ) {
+					foreach ($element_list_to_update as $element) {
 
 						/**	Historicize the old value of recevier attribute	*/
-						if (  $to_attribute->is_historisable == 'yes' ) {
+						if ($to_attribute->is_historisable == 'yes') {
 							$query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $to_attribute->data_type . " WHERE attribute_id = %d AND entity_id = %d", $to_attribute->id, $element->ID);
-							$attribute_histos = $wpdb->get_results( $query );
-							if ( !empty( $attribute_histos ) ) {
-								foreach ( $attribute_histos as $attribute_histo ) {
-									if ( !empty( $attribute_histo->value ) ) {
+							$attribute_histos = $wpdb->get_results($query);
+							if (!empty($attribute_histos)) {
+								foreach ($attribute_histos as $attribute_histo) {
+									if (!empty($attribute_histo->value)) {
 										$attribute_histo_content['status'] = 'valid';
 										$attribute_histo_content['creation_date'] = current_time('mysql', 0);
 										$attribute_histo_content['creation_date_value'] = $attribute_histo->creation_date_value;
@@ -1541,12 +1541,12 @@ 
 										$attribute_histo_content['value'] = $attribute_histo->value;
 										$attribute_histo_content['value_type'] = WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType;
 										$last_histo = $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_HISTO, $attribute_histo_content);
-										if ( $last_histo === false ) {
+										if ($last_histo === false) {
 											$has_error = true;
 											$error_count++;
 										}
 										else {
-											$wpdb->delete( WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType, array( 'value_id' => $attribute_histo->value_id ) );
+											$wpdb->delete(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType, array('value_id' => $attribute_histo->value_id));
 										}
 									}
 								}
@@ -1555,36 +1555,36 @@ 
 
 						/**		*/
 						$query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $to_attribute->data_type . " WHERE attribute_id = %d AND entity_id = %d", $from_attribute->id, $element->ID);
-						$attribute_to_save = $wpdb->get_row( $query, ARRAY_A );
+						$attribute_to_save = $wpdb->get_row($query, ARRAY_A);
 						unset($attribute_to_save['value_id']);
 						$attribute_to_save['attribute_id'] = $to_attribute->id;
 						$attribute_to_save['creation_date_value'] = current_time('mysql', 0);
 						$attribute_to_save['user_id'] = get_current_user_id();
-						$new_value = $wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $to_attribute->data_type, $attribute_to_save );
-						if ( $new_value === false ) {
+						$new_value = $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $to_attribute->data_type, $attribute_to_save);
+						if ($new_value === false) {
 							$has_error = true;
 							$error_count++;
 						}
 						else {
 							/**	Save new atribute values in product metadata	*/
-							$current_product_metadata = get_post_meta( $element->ID, '_wpshop_product_metadata', true);
+							$current_product_metadata = get_post_meta($element->ID, '_wpshop_product_metadata', true);
 							$current_product_metadata[$to_attribute->code] = $element->value;
-							update_post_meta( $element->ID, '_wpshop_product_metadata', $current_product_metadata );
+							update_post_meta($element->ID, '_wpshop_product_metadata', $current_product_metadata);
 
 							/**	Save a single meta for attribute in case it will be used in specific case where meta needs to be alone	*/
-							if ( ( ($to_attribute->is_used_for_sort_by == 'yes') || ($to_attribute->is_searchable == 'yes'))  || ( $to_attribute->is_filterable == 'yes') && !empty($element->value) ) :
-								update_post_meta( $element->ID, '_' . $to_attribute->code, $element->value );
+							if ((($to_attribute->is_used_for_sort_by == 'yes') || ($to_attribute->is_searchable == 'yes')) || ($to_attribute->is_filterable == 'yes') && !empty($element->value)) :
+								update_post_meta($element->ID, '_' . $to_attribute->code, $element->value);
 							endif;
 						}
 					}
 
-					if ( !$has_error ) {
+					if (!$has_error) {
 						$response['status'] = true;
 						$response['error'] = __('Transfert between attribute is done', 'wpshop');
 					}
 					else {
 						$response['status'] = false;
-						$response['error'] = sprinttf( __('There are %d error that occured while copying value through attributes', 'wpshop'), $error_count);
+						$response['error'] = sprinttf(__('There are %d error that occured while copying value through attributes', 'wpshop'), $error_count);
 					}
 				}
 				else {
@@ -1602,20 +1602,20 @@ 
 			$response['error'] = __('You have to choose attributes in order to update values', 'wpshop');
 		}
 
-		echo json_encode( $response );
+		echo json_encode($response);
 		die();
 	}
 	add_action('wp_ajax_wps_mass_action_update_attribute', 'wps_mass_action_update_attribute_value');
 
 	function wps_tools_mass_action_load_possible_options_for_variations_attributes() {
 		// @TODO attribute_id est introuvable
-		check_ajax_referer( 'wps_tools_mass_action_load_possible_options_for_variations_attributes' );
+		check_ajax_referer('wps_tools_mass_action_load_possible_options_for_variations_attributes');
 		$output = '';
-		$attribute_id = !empty( $_POST['attribute_id'] ) ? (int) $_POST['attribute_id'] : 0;
-		$attribute = wpshop_attributes::getElement( $attribute_id, "'valid'" );
+		$attribute_id = !empty($_POST['attribute_id']) ? (int)$_POST['attribute_id'] : 0;
+		$attribute = wpshop_attributes::getElement($attribute_id, "'valid'");
 
 		/**	Define new default value	*/
-		$attribute_possible_values_output = wpshop_attributes::get_select_output( $attribute, array() );
+		$attribute_possible_values_output = wpshop_attributes::get_select_output($attribute, array());
 		$attribute_possible_values_output['possible_value']['no_changes'] = __('No changes', 'wpshop');
 		$attribute_possible_values_output['possible_value']['none'] = __('No default value', 'wpshop');
 		ksort($attribute_possible_values_output['possible_value']);
@@ -1624,7 +1624,7 @@ 
 		$input_def['valueToPut'] = 'index';
 		$input_def['name'] = 'wps_update_att_for_variation_options_values';
 		$input_def['id'] = 'wps_update_att_for_variation_options_values';
-		$output .= __( 'Default value to affect for this attribute to all products', 'wpshop' ) . ' ' . wpshop_form::check_input_type( $input_def );
+		$output .= __('Default value to affect for this attribute to all products', 'wpshop') . ' ' . wpshop_form::check_input_type($input_def);
 
 		/**	Define if attribute is required for adding product to cart	*/
 		$input_def = array();
@@ -1633,7 +1633,7 @@ 
 		$input_def['valueToPut'] = 'index';
 		$input_def['name'] = 'wps_update_att_for_variation_required_state';
 		$input_def['id'] = 'wps_update_att_for_variation_required_state';
-		$output .= '<br/>' . __( 'Put this attribute as required for all products', 'wpshop' ) . ' ' . wpshop_form::check_input_type( $input_def );
+		$output .= '<br/>' . __('Put this attribute as required for all products', 'wpshop') . ' ' . wpshop_form::check_input_type($input_def);
 
 
 		$input_def = array();
@@ -1642,7 +1642,7 @@ 
 		$input_def['valueToPut'] = 'index';
 		$input_def['name'] = 'wps_update_att_for_variation[price_display][text_from]';
 		$input_def['id'] = 'wps_update_att_for_variation_price_display_text_from';
-		$output .= '<br/>' . __( 'Display "Price from" text before price for all products', 'wpshop' ) . ' ' . wpshop_form::check_input_type( $input_def );
+		$output .= '<br/>' . __('Display "Price from" text before price for all products', 'wpshop') . ' ' . wpshop_form::check_input_type($input_def);
 
 		$input_def = array();
 		$input_def['possible_value'] = array('no_changes' => __('No changes', 'wpshop'), 'no' => __('No', 'wpshop'), 'yes' => __('Yes', 'wpshop'));
@@ -1650,7 +1650,7 @@ 
 		$input_def['valueToPut'] = 'index';
 		$input_def['name'] = 'wps_update_att_for_variation[price_display][lower_price]';
 		$input_def['id'] = 'wps_update_att_for_variation_price_display_lower_price';
-		$output .= '<br/>' . __( 'Display lower price for all products', 'wpshop' ) . ' ' . wpshop_form::check_input_type( $input_def );
+		$output .= '<br/>' . __('Display lower price for all products', 'wpshop') . ' ' . wpshop_form::check_input_type($input_def);
 
 		$input_def = array();
 		$input_def['possible_value'] = array('no_changes' => __('No changes', 'wpshop'), 'replacement' => __('Replace product price with option price', 'wpshop'), 'addition' => __('Add option price to product price', 'wpshop'));
@@ -1658,7 +1658,7 @@ 
 		$input_def['valueToPut'] = 'index';
 		$input_def['name'] = 'wps_update_att_for_variation[price_behaviour]';
 		$input_def['id'] = 'wps_update_att_for_variation_price_behaviour';
-		$output .= '<br/>' . __( 'Price calculation behaviour', 'wpshop' ) . ' ' . wpshop_form::check_input_type( $input_def );
+		$output .= '<br/>' . __('Price calculation behaviour', 'wpshop') . ' ' . wpshop_form::check_input_type($input_def);
 
 		$input_def = array();
 		$input_def['possible_value'] = array('no_changes' => __('No changes', 'wpshop'), 'single' => __('Priority to single options', 'wpshop'), 'combined' => __('Priority to combined options', 'wpshop'));
@@ -1666,7 +1666,7 @@ 
 		$input_def['valueToPut'] = 'index';
 		$input_def['name'] = 'wps_update_att_for_variation[priority]';
 		$input_def['id'] = 'wps_update_att_for_variation_priority';
-		$output .= '<br/>' . __( 'Choose priority combination for calculating options', 'wpshop' ) . ' ' . wpshop_form::check_input_type( $input_def );
+		$output .= '<br/>' . __('Choose priority combination for calculating options', 'wpshop') . ' ' . wpshop_form::check_input_type($input_def);
 
 		echo $output;
 		die();
@@ -1674,69 +1674,69 @@ 
 	add_action('wp_ajax_wps_tools_mass_action_load_possible_options_for_variations_attributes', 'wps_tools_mass_action_load_possible_options_for_variations_attributes');
 
 	function wps_mass_action_change_variation_option() {
-		check_ajax_referer( 'wps_mass_action_change_variation_option' );
+		check_ajax_referer('wps_mass_action_change_variation_option');
 		global $wpdb;
 
-		$attribute_id = !empty( $_POST['attribute_id'] ) ? (int) $_POST['attribute_id'] : 0;
-		$attribute = wpshop_attributes::getElement( $attribute_id, "'valid'" );
-		$query = $wpdb->prepare( "SELECT * FROM {$wpdb->postmeta} WHERE meta_key = %s AND meta_value LIKE ('%%%s%%')", '_wpshop_variation_defining', $attribute->code );
-		$meta_to_update = $wpdb->get_results( $query );
+		$attribute_id = !empty($_POST['attribute_id']) ? (int)$_POST['attribute_id'] : 0;
+		$attribute = wpshop_attributes::getElement($attribute_id, "'valid'");
+		$query = $wpdb->prepare("SELECT * FROM {$wpdb->postmeta} WHERE meta_key = %s AND meta_value LIKE ('%%%s%%')", '_wpshop_variation_defining', $attribute->code);
+		$meta_to_update = $wpdb->get_results($query);
 		$has_error = false;
-		if ( !empty($meta_to_update) ) {
-			foreach ( $meta_to_update as $meta_def ) {
-				$meta_value = unserialize( $meta_def->meta_value );
-				if ( !empty($meta_value) && !empty( $meta_value['attributes'] ) && in_array( $attribute->code, $meta_value['attributes']) ) {
+		if (!empty($meta_to_update)) {
+			foreach ($meta_to_update as $meta_def) {
+				$meta_value = unserialize($meta_def->meta_value);
+				if (!empty($meta_value) && !empty($meta_value['attributes']) && in_array($attribute->code, $meta_value['attributes'])) {
 
-					$update_att_for_variation_options_values = !empty( $_POST['wps_update_att_for_variation_options_values'] ) ? sanitize_text_field( $_POST['wps_update_att_for_variation_options_values'] ) : '';
-					if ( $update_att_for_variation_options_values != 'no_changes' ) {
+					$update_att_for_variation_options_values = !empty($_POST['wps_update_att_for_variation_options_values']) ? sanitize_text_field($_POST['wps_update_att_for_variation_options_values']) : '';
+					if ($update_att_for_variation_options_values != 'no_changes') {
 						$meta_value['options']['attributes_default_value'][$attribute->code] = $update_att_for_variation_options_values;
 					}
 
-					$wps_update_att_for_variation_required_state = !empty( $_POST['wps_update_att_for_variation_required_state'] ) ? sanitize_text_field( $_POST['wps_update_att_for_variation_required_state'] ) : '';
-					if ( !empty($wps_update_att_for_variation_required_state) && ($wps_update_att_for_variation_required_state != 'no_changes') ) {
-						if ( $wps_update_att_for_variation_required_state == 'yes') {
+					$wps_update_att_for_variation_required_state = !empty($_POST['wps_update_att_for_variation_required_state']) ? sanitize_text_field($_POST['wps_update_att_for_variation_required_state']) : '';
+					if (!empty($wps_update_att_for_variation_required_state) && ($wps_update_att_for_variation_required_state != 'no_changes')) {
+						if ($wps_update_att_for_variation_required_state == 'yes') {
 							$meta_value['options']['required_attributes'][$attribute->code] = $attribute->code;
 						}
-						else if ( !empty($meta_value['options']['required_attributes']) && !empty($meta_value['options']['required_attributes'][$attribute->code]) ) {
+						else if (!empty($meta_value['options']['required_attributes']) && !empty($meta_value['options']['required_attributes'][$attribute->code])) {
 							unset($meta_value['options']['required_attributes'][$attribute->code]);
 						}
 					}
 
-					$update_att_for_variation = !empty( $_POST['wps_update_att_for_variation'] ) ? (array) $_POST['wps_update_att_for_variation'] : array();
-					$text_from = !empty( $update_att_for_variation['text_from'] ) ? sanitize_text_field( $update_att_for_variation['text_from'] ) : '';
-					if ( !empty( $update_att_for_variation ) ) {
-						if ( !empty($text_from) && ($text_from != 'no_changes') ) {
-							if ( $text_from == 'yes' ) {
+					$update_att_for_variation = !empty($_POST['wps_update_att_for_variation']) ? (array)$_POST['wps_update_att_for_variation'] : array();
+					$text_from = !empty($update_att_for_variation['text_from']) ? sanitize_text_field($update_att_for_variation['text_from']) : '';
+					if (!empty($update_att_for_variation)) {
+						if (!empty($text_from) && ($text_from != 'no_changes')) {
+							if ($text_from == 'yes') {
 								$meta_value['options']['price_display']['text_from'] = 'on';
 							}
-							else if( !empty($meta_value['options']['price_display']['text_from']) ) {
+							else if (!empty($meta_value['options']['price_display']['text_from'])) {
 								unset($meta_value['options']['price_display']['text_from']);
 							}
 						}
 
-						$lower_price = !empty( $update_att_for_variation['lower_price'] ) ? sanitize_text_field( $update_att_for_variation['lower_price'] ) : '';
-						if ( !empty($lower_price) && ($lower_price != 'no_changes') ) {
-							if ( $lower_price == 'yes' ) {
+						$lower_price = !empty($update_att_for_variation['lower_price']) ? sanitize_text_field($update_att_for_variation['lower_price']) : '';
+						if (!empty($lower_price) && ($lower_price != 'no_changes')) {
+							if ($lower_price == 'yes') {
 								$meta_value['options']['price_display']['lower_price'] = 'on';
 							}
-							else if( !empty($meta_value['options']['price_display']['lower_price']) ) {
+							else if (!empty($meta_value['options']['price_display']['lower_price'])) {
 								unset($meta_value['options']['price_display']['lower_price']);
 							}
 						}
 
-						$price_behaviour = !empty( $update_att_for_variation['price_behaviour'] ) ? sanitize_text_field( $update_att_for_variation['price_behaviour'] ) : '';
-						if ( !empty($price_behaviour) && ($price_behaviour != 'no_changes') ) {
+						$price_behaviour = !empty($update_att_for_variation['price_behaviour']) ? sanitize_text_field($update_att_for_variation['price_behaviour']) : '';
+						if (!empty($price_behaviour) && ($price_behaviour != 'no_changes')) {
 							$meta_value['options']['price_behaviour'][0] = $price_behaviour;
 						}
 
-						$priority = !empty( $update_att_for_variation['priority'] ) ? sanitize_text_field( $update_att_for_variation['priority'] ) : '';
-						if ( !empty($priority) && ($priority != 'no_changes') ) {
+						$priority = !empty($update_att_for_variation['priority']) ? sanitize_text_field($update_att_for_variation['priority']) : '';
+						if (!empty($priority) && ($priority != 'no_changes')) {
 							$meta_value['options']['priority'][0] = $priority;
 						}
 					}
 
-					$meta_save = update_meta( $meta_def->meta_id, '_wpshop_variation_defining', $meta_value);
-					if ( $meta_save === false ) {
+					$meta_save = update_meta($meta_def->meta_id, '_wpshop_variation_defining', $meta_value);
+					if ($meta_save === false) {
 						$has_error = true;
 					}
 
@@ -1744,7 +1744,7 @@ 
 			}
 		}
 
-		echo json_encode( array('status' => $has_error, 'error' => (!$has_error ? __('Product variation parameters have been updated', 'wpshop') : __('An error occured while changing products variations options parameters'))) );
+		echo json_encode(array('status' => $has_error, 'error' => (!$has_error ? __('Product variation parameters have been updated', 'wpshop') : __('An error occured while changing products variations options parameters'))));
 		die();
 	}
 	add_action('wp_ajax_wps_mass_action_change_variation_option', 'wps_mass_action_change_variation_option');
@@ -1756,7 +1756,7 @@ 
 	 */
 	function ajax_activate_addons() {
 		global $wpdb;
-		check_ajax_referer( 'wpshop_ajax_activate_addons', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_ajax_activate_addons', 'wpshop_ajax_nonce');
 
 		$addon_name = isset($_POST['addon']) ? wpshop_tools::varSanitizer($_POST['addon']) : null;
 		$addon_code = isset($_POST['code']) ? wpshop_tools::varSanitizer($_POST['code']) : null;
@@ -1765,56 +1765,56 @@ 
 		if (!empty($addon_name) && !empty($addon_code)) {
 			$addons_list = (unserialize(WPSHOP_ADDONS_LIST));
 			if (in_array($addon_name, array_keys($addons_list))) {
-				$plug = get_plugin_data( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/wpshop.php' );
+				$plug = get_plugin_data(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/wpshop.php');
 				$code_part = array();
-				$code_part[] = substr(hash ( "sha256" , $addons_list[$addon_name][0] ),  $addons_list[$addon_name][1], 5);
-				$code_part[] = substr(hash ( "sha256" , $plug['Name'] ), WPSHOP_ADDONS_KEY_IS, 5);
-				$code_part[] = substr(hash ( "sha256" , 'addons' ), WPSHOP_ADDONS_KEY_IS, 5);
+				$code_part[] = substr(hash("sha256", $addons_list[$addon_name][0]), $addons_list[$addon_name][1], 5);
+				$code_part[] = substr(hash("sha256", $plug['Name']), WPSHOP_ADDONS_KEY_IS, 5);
+				$code_part[] = substr(hash("sha256", 'addons'), WPSHOP_ADDONS_KEY_IS, 5);
 				$code = $code_part[1] . '-' . $code_part[2] . '-' . $code_part[0];
 
 				$current_web_site = site_url('/');
 
-				if ( $addons_list[$addon_name][2] == 'per_site') {
-					$code .= '-' . substr(hash ( "sha256" , $current_web_site ),  $addons_list[$addon_name][1], 5);
+				if ($addons_list[$addon_name][2] == 'per_site') {
+					$code .= '-' . substr(hash("sha256", $current_web_site), $addons_list[$addon_name][1], 5);
 				}
 
-				if ( !empty($addons_list[$addon_name][4]) && $addons_list[$addon_name][4] == 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE') {
-					$admin_new_quotation_message = get_option( 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE' );
-					if ( empty($admin_new_quotation_message) ) {
-						wps_message_ctr::createMessage( 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE' );
+				if (!empty($addons_list[$addon_name][4]) && $addons_list[$addon_name][4] == 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE') {
+					$admin_new_quotation_message = get_option('WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE');
+					if (empty($admin_new_quotation_message)) {
+						wps_message_ctr::createMessage('WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE');
 					}
-					$admin_new_quotation_confirm_message = get_option( 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE' );
-					if ( empty($admin_new_quotation_confirm_message) ) {
-						wps_message_ctr::createMessage( 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE' );
+					$admin_new_quotation_confirm_message = get_option('WPSHOP_QUOTATION_CONFIRMATION_MESSAGE');
+					if (empty($admin_new_quotation_confirm_message)) {
+						wps_message_ctr::createMessage('WPSHOP_QUOTATION_CONFIRMATION_MESSAGE');
 					}
 				}
 
 				if ($code == $addon_code) {
-					$extra_options = get_option(WPSHOP_ADDONS_OPTION_NAME, array() );
+					$extra_options = get_option(WPSHOP_ADDONS_OPTION_NAME, array());
 					$extra_options[$addon_name]['activate'] = true;
 					$extra_options[$addon_name]['activation_date'] = current_time('mysql', 0);
 					$extra_options[$addon_name]['activation_code'] = $addon_code;
-					if ( update_option(WPSHOP_ADDONS_OPTION_NAME, $extra_options) ) {
-						$result = array(true, __('The addon has been activated successfully', 'wpshop'), __('Activated','wpshop'));
-						if( !empty($addons_list[$addon_name][3]) ) {
+					if (update_option(WPSHOP_ADDONS_OPTION_NAME, $extra_options)) {
+						$result = array(true, __('The addon has been activated successfully', 'wpshop'), __('Activated', 'wpshop'));
+						if (!empty($addons_list[$addon_name][3])) {
 							$activate_attribute_for_addon = $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('status' => 'valid'), array('code' => $addons_list[$addon_name][3]));
 						}
 						$state = true;
 					}
 					else {
-						$result = array(false, __('An error occured','wpshop'), __('Desactivated','wpshop'));
+						$result = array(false, __('An error occured', 'wpshop'), __('Desactivated', 'wpshop'));
 					}
 				}
 				else {
-					$result = array(false, __('The activating code is invalid', 'wpshop'), __('Desactivated','wpshop'));
+					$result = array(false, __('The activating code is invalid', 'wpshop'), __('Desactivated', 'wpshop'));
 				}
 			}
 			else {
-				$result = array(false, __('The addon to activate is invalid', 'wpshop'), __('Desactivated','wpshop'));
+				$result = array(false, __('The addon to activate is invalid', 'wpshop'), __('Desactivated', 'wpshop'));
 			}
 		}
 		else {
-			$result = array(false, __('An error occured','wpshop'), __('Desactivated','wpshop'));
+			$result = array(false, __('An error occured', 'wpshop'), __('Desactivated', 'wpshop'));
 		}
 		$activated_class = unserialize(WPSHOP_ADDONS_STATES_CLASS);
 
@@ -1827,27 +1827,27 @@ 
 	 * Addons desactivate
 	 */
 	function ajax_desactivate_wpshop_addons() {
-		check_ajax_referer( 'wpshop_ajax_activate_addons', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_ajax_activate_addons', 'wpshop_ajax_nonce');
 
 		$addon_name = isset($_POST['addon']) ? wpshop_tools::varSanitizer($_POST['addon']) : null;
 		$state = true;
 
-		if ( !empty($addon_name) ) {
+		if (!empty($addon_name)) {
 			$addons_list = array_keys(unserialize(WPSHOP_ADDONS_LIST));
 			if (in_array($addon_name, $addons_list)) {
 				$extra_options = get_option(WPSHOP_ADDONS_OPTION_NAME, array());
 				$extra_options[$addon_name]['activate'] = false;
 				$extra_options[$addon_name]['deactivation_date'] = current_time('mysql', 0);
-				if ( update_option(WPSHOP_ADDONS_OPTION_NAME, $extra_options) ) {
-					$result = array(true, __('The addon has been desactivated successfully', 'wpshop'), __('Desactivated','wpshop'));
+				if (update_option(WPSHOP_ADDONS_OPTION_NAME, $extra_options)) {
+					$result = array(true, __('The addon has been desactivated successfully', 'wpshop'), __('Desactivated', 'wpshop'));
 					$state = false;
 				}
 				else {
-					$result = array(false, __('An error occured','wpshop'), __('Activated','wpshop'));
+					$result = array(false, __('An error occured', 'wpshop'), __('Activated', 'wpshop'));
 				}
 			}
 			else {
-				$result = array(false, __('The addon to desactivate is invalid', 'wpshop'), __('Activated','wpshop'));
+				$result = array(false, __('The addon to desactivate is invalid', 'wpshop'), __('Activated', 'wpshop'));
 			}
 		}
 		$activated_class = unserialize(WPSHOP_ADDONS_STATES_CLASS);
@@ -1861,39 +1861,39 @@ 
 	 * Display opttions for including user address into account form
 	 */
 	function ajax_integrate_billing_into_register() {
-		check_ajax_referer( 'wpshop_ajax_integrate_billin_into_register', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_ajax_integrate_billin_into_register', 'wpshop_ajax_nonce');
 		global $wpshop_account;
 		$wpshop_billing_address = get_option('wpshop_billing_address');
 		$current_billing_address = isset($_POST['current_billing_address']) ? intval(wpshop_tools::varSanitizer($_POST['current_billing_address'])) : null;
 		$selected_field = isset($_POST['selected_field']) ? wpshop_tools::varSanitizer($_POST['selected_field']) : null;
-		$attribute = !empty( $_POST['attribute'] ) ? (array) $_POST['attribute'] : array();
-		$billing_form_fields = wps_address::get_addresss_form_fields_by_type ( $current_billing_address );
+		$attribute = !empty($_POST['attribute']) ? (array)$_POST['attribute'] : array();
+		$billing_form_fields = wps_address::get_addresss_form_fields_by_type($current_billing_address);
 		$possible_values_for_billing = array('' => __('No corresponding field', 'wpshop'));
-		foreach ( $billing_form_fields[$current_billing_address] as $attribute_group_id => $attribute_group_detail) {
-			foreach ( $attribute_group_detail['content'] as $attribute_build_code => $attribute_definition) {
+		foreach ($billing_form_fields[$current_billing_address] as $attribute_group_id => $attribute_group_detail) {
+			foreach ($attribute_group_detail['content'] as $attribute_build_code => $attribute_definition) {
 				$possible_values_for_billing[$attribute_build_code] = $attribute_definition['label'];
 			}
 		}
-		$attributes_set = wpshop_attributes_set::getElement( 'yes', "'valid'", 'is_default', '', wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS));
+		$attributes_set = wpshop_attributes_set::getElement('yes', "'valid'", 'is_default', '', wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS));
 		/*	Get the attribute set details in order to build the product interface	*/
-		$productAttributeSetDetails = wpshop_attributes_set::getAttributeSetDetails( ( !empty($attributes_set->id) ) ? $attributes_set->id : '', "'valid'");
-		if(!empty($productAttributeSetDetails)){
-			foreach($productAttributeSetDetails as $productAttributeSetDetail){
-				if(count($productAttributeSetDetail['attribut']) >= 1){
-					foreach($productAttributeSetDetail['attribut'] as $attribute) {
-						if(!empty($attribute->id)) {
-							$submitOrderInfos = !empty( $_POST['submitOrderInfos'] ) ? (int) $_POST['submitOrderInfos'] : 0;
-							if( !empty($submitOrderInfos) ) {
+		$productAttributeSetDetails = wpshop_attributes_set::getAttributeSetDetails((!empty($attributes_set->id)) ? $attributes_set->id : '', "'valid'");
+		if (!empty($productAttributeSetDetails)) {
+			foreach ($productAttributeSetDetails as $productAttributeSetDetail) {
+				if (count($productAttributeSetDetail['attribut']) >= 1) {
+					foreach ($productAttributeSetDetail['attribut'] as $attribute) {
+						if (!empty($attribute->id)) {
+							$submitOrderInfos = !empty($_POST['submitOrderInfos']) ? (int)$_POST['submitOrderInfos'] : 0;
+							if (!empty($submitOrderInfos)) {
 								$value = $attribute[$attribute->data_type][$attribute->code];
 							}
 							else {
 								$value = '';
-								if ( $attribute->code != 'user_pass') {
+								if ($attribute->code != 'user_pass') {
 									$code = $attribute->code;
 									$value = $user->$code;
 								}
 							}
-							$attribute_output_def = wpshop_attributes::get_attribute_field_definition( $attribute, $value, array() );
+							$attribute_output_def = wpshop_attributes::get_attribute_field_definition($attribute, $value, array());
 							$account_form_field[$attribute->code] = $attribute_output_def;
 						}
 					}
@@ -1903,7 +1903,7 @@ 
 
 		$possible_values = array();
 		$matching_field = '';
-		foreach ( $account_form_field as $attribute_code => $attribute_detail) {
+		foreach ($account_form_field as $attribute_code => $attribute_detail) {
 			$possible_values[$attribute_code] = $attribute_detail['label'];
 
 			$input_def['name'] = 'wpshop_billing_address[integrate_into_register_form_matching_field][' . $attribute_code . ']';
@@ -1935,13 +1935,13 @@ 
 	 * Search element in database for shortcode insertion interface
 	 */
 	function ajax_wpshop_element_search() {
-		check_ajax_referer( 'wpshop_element_search', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_element_search', 'wpshop_ajax_nonce');
 
 		$wpshop_element_searched = isset($_REQUEST['wpshop_element_searched']) ? wpshop_tools::varSanitizer($_REQUEST['wpshop_element_searched']) : null;
 		$wpshop_element_type = isset($_REQUEST['wpshop_element_type']) ? wpshop_tools::varSanitizer($_REQUEST['wpshop_element_type']) : null;
 		$wpshop_format_result = isset($_REQUEST['wpshop_format_result']) ? (bool)wpshop_tools::varSanitizer($_REQUEST['wpshop_format_result']) : true;
 
-		switch ( $wpshop_element_type ) {
+		switch ($wpshop_element_type) {
 			case 'product':
 			case WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT:
 				$data = wpshop_products::product_list($wpshop_format_result, $wpshop_element_searched);
@@ -1951,18 +1951,18 @@ 
 				break;
 			case WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS:
 				$wps_provider_ctr = new wps_provider_ctr();
-				$data = $wps_provider_ctr->read( array( 's' => $wpshop_element_searched ) );
+				$data = $wps_provider_ctr->read(array('s' => $wpshop_element_searched));
 				break;
 		}
 
-		if ( $wpshop_format_result ) {
+		if ($wpshop_format_result) {
 			$data = empty($data) ? __('No match', 'wpshop') : $data;
 		}
 		else {
-			if ( !empty($data) ) {
+			if (!empty($data)) {
 				$temp_data = $data;
-				unset( $data );
-				foreach ( $temp_data as $post) {
+				unset($data);
+				foreach ($temp_data as $post) {
 					$data[$post->ID] = $post->ID . ' - ' . $post->post_title;
 				}
 			}
@@ -1983,35 +1983,35 @@ 
 	 * Add product to the end user cart
 	 */
 	function ajax_wpshop_add_to_cart() {
-		check_ajax_referer( 'ajax_pos_product_variation_selection' );
+		check_ajax_referer('ajax_pos_product_variation_selection');
 
 		global $wpdb;
 		$wpshop_cart = new wps_cart();
 
 		$product_id = isset($_POST['wpshop_pdt']) ? intval(wpshop_tools::varSanitizer($_POST['wpshop_pdt'])) : null;
 		$product_qty = isset($_POST['wpshop_pdt_qty']) ? intval(wpshop_tools::varSanitizer($_POST['wpshop_pdt_qty'])) : 1;
-		$cart_option = get_option('wpshop_cart_option', array() );
+		$cart_option = get_option('wpshop_cart_option', array());
 		$wpshop_variation_selected = !empty($_POST['wps_pdt_variations']) ? (array)$_POST['wps_pdt_variations'] : array();
-		$from_administration =  ( !empty($_POST['from_admin']) ) ? (int)$_POST['from_admin'] : false;
-		$order_id =  ( !empty($_POST['wps_orders_order_id']) ) ? wpshop_tools::varSanitizer( $_POST['wps_orders_order_id'] ) : null;
+		$from_administration = (!empty($_POST['from_admin'])) ? (int)$_POST['from_admin'] : false;
+		$order_id = (!empty($_POST['wps_orders_order_id'])) ? wpshop_tools::varSanitizer($_POST['wps_orders_order_id']) : null;
 
 
 		// Check Cart Animation
-		$cart_animation_choice = ( !empty($cart_option) && !empty($cart_option['animation_cart_type']) ? $cart_option['animation_cart_type'] : null);
-		if ( !empty($cart_option['total_nb_of_item_allowed']) && ((int) $cart_option['total_nb_of_item_allowed'][0] == 1) ) {
+		$cart_animation_choice = (!empty($cart_option) && !empty($cart_option['animation_cart_type']) ? $cart_option['animation_cart_type'] : null);
+		if (!empty($cart_option['total_nb_of_item_allowed']) && ((int)$cart_option['total_nb_of_item_allowed'][0] == 1)) {
 			$wpshop_cart->empty_cart();
 		}
 
 		// Prepare Product to be added to cart
-		$formatted_product = $wpshop_cart->prepare_product_to_add_to_cart( $product_id, $product_qty, $wpshop_variation_selected );
+		$formatted_product = $wpshop_cart->prepare_product_to_add_to_cart($product_id, $product_qty, $wpshop_variation_selected);
 		$product_to_add_to_cart = $formatted_product[0];
 		$new_pid = $formatted_product[1];
 
 		// Check cart Type
 		$cart_type_for_adding = 'normal';
-		$wpshop_cart_type = !empty( $_POST['wpshop_cart_type'] ) ? sanitize_text_field( $_POST['wpshop_cart_type'] ) : '';
-		if (!empty($wpshop_cart_type) ) {
-			switch(wpshop_tools::varSanitizer($wpshop_cart_type)){
+		$wpshop_cart_type = !empty($_POST['wpshop_cart_type']) ? sanitize_text_field($_POST['wpshop_cart_type']) : '';
+		if (!empty($wpshop_cart_type)) {
+			switch (wpshop_tools::varSanitizer($wpshop_cart_type)) {
 				case 'quotation':
 					$wpshop_cart_type = 'quotation';
 					break;
@@ -2022,43 +2022,43 @@ 
 		}
 
 		// Check Product image
-		$product = get_post( $product_id );
-		$product_img = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="no picture" />';
-		if ( !empty($product_id) ) {
-			if ( $product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-				$parent_def = wpshop_products::get_parent_variation( $product_id );
-				$parent_post = ( !empty($parent_def['parent_post']) ) ? $parent_def['parent_post'] : array();
-				$product_title = ( !empty($parent_post) && !empty($parent_post->post_title) ) ? $parent_post->post_title : '';
-				$product_description = ( !empty($parent_post) && !empty($parent_post->post_content) ) ? $parent_post->post_content : '';
-				$product_img =  ( !empty($parent_post->ID) ) ? get_the_post_thumbnail( $parent_post->ID, 'thumbnail') : '';
+		$product = get_post($product_id);
+		$product_img = '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="no picture" />';
+		if (!empty($product_id)) {
+			if ($product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+				$parent_def = wpshop_products::get_parent_variation($product_id);
+				$parent_post = (!empty($parent_def['parent_post'])) ? $parent_def['parent_post'] : array();
+				$product_title = (!empty($parent_post) && !empty($parent_post->post_title)) ? $parent_post->post_title : '';
+				$product_description = (!empty($parent_post) && !empty($parent_post->post_content)) ? $parent_post->post_content : '';
+				$product_img = (!empty($parent_post->ID)) ? get_the_post_thumbnail($parent_post->ID, 'thumbnail') : '';
 			}
 			else {
 				$product_title = $product->post_title;
 				$product_description = $product->post_content;
-				$product_img =  get_the_post_thumbnail( $product_id, 'thumbnail');
+				$product_img = get_the_post_thumbnail($product_id, 'thumbnail');
 			}
 		}
 
-		$wps_orders_from_admin = !empty( $_POST['wps_orders_from_admin'] ) ? (int) $_POST['wps_orders_from_admin'] : 0;
-		if ( !empty($wps_orders_from_admin) && $wps_orders_from_admin) {
+		$wps_orders_from_admin = !empty($_POST['wps_orders_from_admin']) ? (int)$_POST['wps_orders_from_admin'] : 0;
+		if (!empty($wps_orders_from_admin) && $wps_orders_from_admin) {
 			$order_meta = get_post_meta($order_id, '_order_postmeta', true);
-			$return = $wpshop_cart->add_to_cart( $product_to_add_to_cart, array( $new_pid => $product_qty ), $wpshop_cart_type, array(), true, $order_meta, $order_id );
+			$return = $wpshop_cart->add_to_cart($product_to_add_to_cart, array($new_pid => $product_qty), $wpshop_cart_type, array(), true, $order_meta, $order_id);
 
-			echo json_encode( array(true) );
+			echo json_encode(array(true));
 			die();
 		}
 		else {
-			$return = $wpshop_cart->add_to_cart( $product_to_add_to_cart, array( $new_pid => $product_qty ), $wpshop_cart_type );
+			$return = $wpshop_cart->add_to_cart($product_to_add_to_cart, array($new_pid => $product_qty), $wpshop_cart_type);
 		}
 
-		if ( $return == 'success' ) {
-			$cart_page_url = apply_filters( 'wps_cart_page_url', get_permalink( wpshop_tools::get_page_id( get_option( 'wpshop_cart_page_id' ) ) ) );
+		if ($return == 'success') {
+			$cart_page_url = apply_filters('wps_cart_page_url', get_permalink(wpshop_tools::get_page_id(get_option('wpshop_cart_page_id'))));
 			/** Template parameters	*/
 			$template_part = 'product_added_to_cart_message';
 
 			/** Build template	*/
 			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-			if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 				/*	Include the old way template part	*/
 				ob_start();
 				require_once(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -2077,14 +2077,14 @@ 
 
 			/** Product Price **/
 			$product_price = '';
-			if ( !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) && !empty($product_to_add_to_cart) ) {
+			if (!empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) && !empty($product_to_add_to_cart)) {
 				$idp = '';
 
-				if ( !empty($product_to_add_to_cart[$new_pid]['variations']) && count($product_to_add_to_cart[$new_pid]['variations']) < 2 ) {
+				if (!empty($product_to_add_to_cart[$new_pid]['variations']) && count($product_to_add_to_cart[$new_pid]['variations']) < 2) {
 					$idp = $product_to_add_to_cart[$new_pid]['variations'][0];
 				}
 				else {
-					if( strstr( $new_pid, '__') ) {
+					if (strstr($new_pid, '__')) {
 						$idp = $new_pid;
 					}
 					else {
@@ -2092,43 +2092,43 @@ 
 					}
 				}
 
-				if( !empty($idp) ) {
-					$default_currency = wpshop_tools::wpshop_get_currency( false );
-					$price_piloting_option = get_option( 'wpshop_shop_price_piloting' );
+				if (!empty($idp)) {
+					$default_currency = wpshop_tools::wpshop_get_currency(false);
+					$price_piloting_option = get_option('wpshop_shop_price_piloting');
 
 					$real_price = null;
-					if ( !empty( $_SESSION[ 'cart' ] ) && !empty( $_SESSION[ 'cart' ][ 'order_items' ] ) && !empty( $_SESSION[ 'cart' ][ 'order_items' ][$new_pid] ) && !empty( $_SESSION[ 'cart' ][ 'order_items' ][$new_pid]['item_amount_to_pay_now'] ) ) {
-						$real_price = ( $_SESSION['cart']['order_items'][$new_pid]['item_amount_to_pay_now'] * $product_qty );
+					if (!empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) && !empty($_SESSION['cart']['order_items'][$new_pid]) && !empty($_SESSION['cart']['order_items'][$new_pid]['item_amount_to_pay_now'])) {
+						$real_price = ($_SESSION['cart']['order_items'][$new_pid]['item_amount_to_pay_now'] * $product_qty);
 					}
 
-					$pr = empty( $real_price ) ? ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? ( $_SESSION['cart']['order_items'][$new_pid]['item_pu_ht']  * $product_qty ) : ( $_SESSION['cart']['order_items'][$new_pid]['item_pu_ttc'] * $product_qty ) : $real_price;
-					$product_price = wpshop_tools::formate_number( $pr ).$default_currency;
+					$pr = empty($real_price) ? (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? ($_SESSION['cart']['order_items'][$new_pid]['item_pu_ht'] * $product_qty) : ($_SESSION['cart']['order_items'][$new_pid]['item_pu_ttc'] * $product_qty) : $real_price;
+					$product_price = wpshop_tools::formate_number($pr) . $default_currency;
 				}
 			}
 			/** Check if there are linked products **/
-			$related_products = get_post_meta( $product_id, '_wpshop_product_related_products', true);
+			$related_products = get_post_meta($product_id, '_wpshop_product_related_products', true);
 			$tpl_component = array();
 			$linked_products = '';
-			if ( !empty($related_products) ) {
+			if (!empty($related_products)) {
 				// $linked_products = '<h2>'.__('Linked products', 'wpshop').'</h2>';
-				$linked_products .= '<div class="modal_product_related">' .do_shortcode( '[wpshop_related_products pid="' .$product_id. '" sorting="no"]' ).'</div>';
+				$linked_products .= '<div class="modal_product_related">' . do_shortcode('[wpshop_related_products pid="' . $product_id . '" sorting="no"]') . '</div>';
 			}
 			else {
 				$linked_products = '';
 			}
 
-			$message_confirmation = sprintf( __('%s has been add to the cart', 'wpshop'), $product->post_title );
+			$message_confirmation = sprintf(__('%s has been add to the cart', 'wpshop'), $product->post_title);
 
-			$modal_content = wpshop_display::display_template_element('wps_new_add_to_cart_confirmation_modal', array( 'RELATED_PRODUCTS' => $linked_products , 'PRODUCT_PICTURE' => $product_img, 'PRODUCT_TITLE' => $product_title, 'PRODUCT_PRICE' => $product_price, 'PRODUCT_DESCRIPTION' => $product_description) );
-			$modal_footer_content = wpshop_display::display_template_element('wps_new_add_to_cart_confirmation_modal_footer', array( 'LINK_CART_PAGE' => wpshop_tools::get_page_id( get_permalink( get_option('wpshop_cart_page_id') ) ) ) );
+			$modal_content = wpshop_display::display_template_element('wps_new_add_to_cart_confirmation_modal', array('RELATED_PRODUCTS' => $linked_products, 'PRODUCT_PICTURE' => $product_img, 'PRODUCT_TITLE' => $product_title, 'PRODUCT_PRICE' => $product_price, 'PRODUCT_DESCRIPTION' => $product_description));
+			$modal_footer_content = wpshop_display::display_template_element('wps_new_add_to_cart_confirmation_modal_footer', array('LINK_CART_PAGE' => wpshop_tools::get_page_id(get_permalink(get_option('wpshop_cart_page_id')))));
 
-			$response = array( true, $succes_message_box, $action_after_add, $cart_page_url, $product_id, array($cart_animation_choice, $message_confirmation), array($product_img, $product_title, $linked_products, $product_price), $modal_content, $modal_footer_content );
+			$response = array(true, $succes_message_box, $action_after_add, $cart_page_url, $product_id, array($cart_animation_choice, $message_confirmation), array($product_img, $product_title, $linked_products, $product_price), $modal_content, $modal_footer_content);
 		}
 		else {
-			$response = array( false, $return );
+			$response = array(false, $return);
 		}
 
-		wp_die( json_encode( $response ) );
+		wp_die(json_encode($response));
 	}
  	add_action('wp_ajax_wpshop_add_product_to_cart', 'ajax_wpshop_add_to_cart');
 	add_action('wp_ajax_nopriv_wpshop_add_product_to_cart', 'ajax_wpshop_add_to_cart');
@@ -2138,45 +2138,45 @@ 
 	 * Set product qty into customer cart
 	 */
 	function ajax_wpshop_set_qty_for_product_into_cart() {
-		check_ajax_referer( 'ajax_wpshop_set_qty_for_product_into_cart' );
+		check_ajax_referer('ajax_wpshop_set_qty_for_product_into_cart');
 		$response = array();
 		$wpshop_cart = new wps_cart();
 		$product_id = isset($_POST['product_id']) ? wpshop_tools::varSanitizer($_POST['product_id']) : null;
 		$product_qty = isset($_POST['product_qty']) ? intval(wpshop_tools::varSanitizer($_POST['product_qty'])) : null;
 
 		$pid = $product_id;
-		if (strpos($product_id,'__') !== false) {
+		if (strpos($product_id, '__') !== false) {
 			//$pid = $_SESSION['cart']['order_items'][$product_id]['item_id'];
-			foreach( $_SESSION['cart']['order_items'][$product_id]['item_meta']['variations'] as $variation ) {
+			foreach ($_SESSION['cart']['order_items'][$product_id]['item_meta']['variations'] as $variation) {
 				$pid = $variation['product_id'];
 				break;
 			}
 		}
 
-		$global_discount = !empty( $_POST['global_discount'] ) ? (int) $_POST['global_discount'] : 0;
-		if ( !empty($global_discount) ) {
+		$global_discount = !empty($_POST['global_discount']) ? (int)$_POST['global_discount'] : 0;
+		if (!empty($global_discount)) {
 			$_SESSION['cart']['pos_global_discount'] = $global_discount;
 		}
 
 		if (!empty($product_id)) {
 			if (isset($product_qty)) {
-				if ( $product_qty == 0 ) {
-					$variation_of_product = query_posts( array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'post_parent' => $pid, 'posts_per_page' => -1) );
-					if ( !empty($variation_of_product) ) {
-						foreach ( $variation_of_product as $p_id) {
+				if ($product_qty == 0) {
+					$variation_of_product = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'post_parent' => $pid, 'posts_per_page' => -1));
+					if (!empty($variation_of_product)) {
+						foreach ($variation_of_product as $p_id) {
 							$wpshop_cart->set_product_qty($p_id->ID, $product_qty);
 						}
 					}
 				}
-				$return = $wpshop_cart->set_product_qty( $product_id, $product_qty, $pid );
+				$return = $wpshop_cart->set_product_qty($product_id, $product_qty, $pid);
 				$response[] = $return;
 			}
 			else {
 				$response[] = false;
-				$response[] = __('Parameters error.','wpshop');
+				$response[] = __('Parameters error.', 'wpshop');
 			}
 		}
-		wp_die( json_encode( $response ) );
+		wp_die(json_encode($response));
 	}
 	add_action('wp_ajax_wpshop_set_qtyfor_product_into_cart', 'ajax_wpshop_set_qty_for_product_into_cart');
 	add_action('wp_ajax_nopriv_wpshop_set_qtyfor_product_into_cart', 'ajax_wpshop_set_qty_for_product_into_cart');
@@ -2185,7 +2185,7 @@ 
 	 * Display cart after doing an action on it
 	 */
 	function ajax_wpshop_display_cart() {
-		check_ajax_referer( 'ajax_wpshop_display_cart' );
+		check_ajax_referer('ajax_wpshop_display_cart');
 		ini_set('display_errors', true);
 		error_reporting(E_ALL);
 		$wps_cart_ctr = new wps_cart();
@@ -2199,8 +2199,8 @@ 
 	/**
 	 * Display mini cart widgte after doing an action on it
 	 */
-	function ajax_wpshop_reload_mini_cart(){
-		check_ajax_referer( 'ajax_wpshop_display_cart' );
+	function ajax_wpshop_reload_mini_cart() {
+		check_ajax_referer('ajax_wpshop_display_cart');
 		echo wpshop_cart::mini_cart_content();
 		die();
 	}
@@ -2211,16 +2211,16 @@ 
 	 * Refresh Price in complete product sheet and Cart summary display
 	 */
 	function wpshop_ajax_wpshop_variation_selection() {
-		check_ajax_referer( 'wpshop_ajax_wpshop_variation_selection' );
+		check_ajax_referer('wpshop_ajax_wpshop_variation_selection');
 		$product_id = isset($_POST['wpshop_pdt']) ? intval(wpshop_tools::varSanitizer($_POST['wpshop_pdt'])) : null;
 		$wpshop_variation_selected = isset($_POST['wpshop_variation']) ? (array)$_POST['wpshop_variation'] : null;
 		$wpshop_free_variation = isset($_POST['wpshop_free_variation']) ? (array)$_POST['wpshop_free_variation'] : null;
-		$wpshop_current_for_display = isset($_POST['wpshop_current_for_display']) ? sanitize_text_field( $_POST['wpshop_current_for_display'] ) : null;
+		$wpshop_current_for_display = isset($_POST['wpshop_current_for_display']) ? sanitize_text_field($_POST['wpshop_current_for_display']) : null;
 		$product_qty = isset($_POST['product_qty']) ? (int)$_POST['product_qty'] : 1;
 
-		$product_variation_summary = wpshop_products::wpshop_ajax_wpshop_variation_selection( $product_id, $wpshop_variation_selected, $wpshop_free_variation, $wpshop_current_for_display, $product_qty );
+		$product_variation_summary = wpshop_products::wpshop_ajax_wpshop_variation_selection($product_id, $wpshop_variation_selected, $wpshop_free_variation, $wpshop_current_for_display, $product_qty);
 
-		wp_die( json_encode( $product_variation_summary ) );
+		wp_die(json_encode($product_variation_summary));
 	}
 	add_action('wp_ajax_wpshop_variation_selection', 'wpshop_ajax_wpshop_variation_selection');
 	add_action('wp_ajax_nopriv_wpshop_variation_selection', 'wpshop_ajax_wpshop_variation_selection');
@@ -2230,23 +2230,23 @@ 
 	function wpshop_ajax_variation_selection_show_detail_for_value() {
 		global $wpdb;
 
-		check_ajax_referer( 'wpshop_ajax_wpshop_variation_selection' );
+		check_ajax_referer('wpshop_ajax_wpshop_variation_selection');
 
 		$display = '';
 		$attribute_for_detail = isset($_POST['attribute_for_detail']) ? (array)$_POST['attribute_for_detail'] : array();
 
-		if ( !empty( $attribute_for_detail ) ) {
+		if (!empty($attribute_for_detail)) {
 			$selection = array();
-			foreach ( $attribute_for_detail as $selected_variation ) {
+			foreach ($attribute_for_detail as $selected_variation) {
 				$variation_definition = explode('-_variation_val_-', $selected_variation);
 				$attribute_definition = wpshop_attributes::getElement($variation_definition[0], "'valid'", 'code');
 				$post_definition = get_post($variation_definition[1]);
 
-				if ( !empty($post_definition) ) {
-					$post_content = ( !empty($post_definition) && !empty($post_definition->post_content) ) ? $post_definition->post_content : '';
-					if ( empty($post_content) && !empty($post_definition->post_parent) ) {
+				if (!empty($post_definition)) {
+					$post_content = (!empty($post_definition) && !empty($post_definition->post_content)) ? $post_definition->post_content : '';
+					if (empty($post_content) && !empty($post_definition->post_parent)) {
 						$post_parent_definition = get_post($post_definition->post_parent);
-						if ( !empty($post_parent_definition) ) {
+						if (!empty($post_parent_definition)) {
 							$post_content = $post_parent_definition->post_content;
 						}
 					}
@@ -2273,74 +2273,74 @@ 
 	 * Save customer account informations
 	 */
 	function wpshop_ajax_save_customer_account() {
-		check_ajax_referer( 'wpshop_customer_register', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_customer_register', 'wpshop_ajax_nonce');
 		global $wpshop, $wpshop_account, $wpdb;
-		$reponse='';
+		$reponse = '';
 		$status = false;
 		$validate = true;
 
-		$attribute = !empty( $_POST['attribute'] ) ? (array)$_POST['attribute'] : array();
+		$attribute = !empty($_POST['attribute']) ? (array)$_POST['attribute'] : array();
 
 		$user_id = get_current_user_id();
-		$current_connected_user = !empty( $user_id ) ? $user_id : null;
+		$current_connected_user = !empty($user_id) ? $user_id : null;
 		$wpshop_billing_address = get_option('wpshop_billing_address');
-		if ( !empty($wpshop_billing_address['integrate_into_register_form']) && ($wpshop_billing_address['integrate_into_register_form'] == 'yes') && isset($attribute[$wpshop_billing_address['choice']]) ) {
-			if ( !empty($wpshop_billing_address['integrate_into_register_form_matching_field']) ) {
-				$address_fields = wps_address::get_addresss_form_fields_by_type ( $wpshop_billing_address['choice'] );
+		if (!empty($wpshop_billing_address['integrate_into_register_form']) && ($wpshop_billing_address['integrate_into_register_form'] == 'yes') && isset($attribute[$wpshop_billing_address['choice']])) {
+			if (!empty($wpshop_billing_address['integrate_into_register_form_matching_field'])) {
+				$address_fields = wps_address::get_addresss_form_fields_by_type($wpshop_billing_address['choice']);
 				$address_field = $address_fields[$wpshop_billing_address['choice']];
 				$temp_aray_for_matching = array_flip($wpshop_billing_address['integrate_into_register_form_matching_field']);
-				foreach ( $address_field as $group_id => $group_detail) {
-					foreach ( $group_detail['content'] as $attribute_build_code => $attribute_def) {
-						if ( in_array($attribute_build_code, $wpshop_billing_address['integrate_into_register_form_matching_field']) && empty( $attribute[$wpshop_billing_address['choice']][$attribute_def['data_type']][$attribute_def['name']] ) && !empty(  $attribute[$attribute_def['data_type']][$temp_aray_for_matching[$attribute_build_code]] ) ) {
+				foreach ($address_field as $group_id => $group_detail) {
+					foreach ($group_detail['content'] as $attribute_build_code => $attribute_def) {
+						if (in_array($attribute_build_code, $wpshop_billing_address['integrate_into_register_form_matching_field']) && empty($attribute[$wpshop_billing_address['choice']][$attribute_def['data_type']][$attribute_def['name']]) && !empty($attribute[$attribute_def['data_type']][$temp_aray_for_matching[$attribute_build_code]])) {
 							$attribute[$wpshop_billing_address['choice']][$attribute_def['data_type']][$attribute_def['name']] = $attribute[$attribute_def['data_type']][$temp_aray_for_matching[$attribute_build_code]];
-							if ( $attribute_def['_need_verification'] == 'yes' && !empty($attribute[$wpshop_billing_address['choice']][$attribute_def['data_type']][$attribute_def['name'] . '2']) ) {
+							if ($attribute_def['_need_verification'] == 'yes' && !empty($attribute[$wpshop_billing_address['choice']][$attribute_def['data_type']][$attribute_def['name'] . '2'])) {
 								$attribute[$wpshop_billing_address['choice']][$attribute_def['data_type']][$attribute_def['name'] . '2'] = $attribute[$attribute_def['data_type']][$temp_aray_for_matching[$attribute_build_code] . '2'];
 							}
 						}
 					}
 				}
-				$attribute[$wpshop_billing_address['choice']]['varchar']['address_title'] = !empty( $attribute[$wpshop_billing_address['choice']]['varchar']['address_title'] ) ? $attribute[$wpshop_billing_address['choice']]['varchar']['address_title'] : __('Billing address', 'wpshop');
+				$attribute[$wpshop_billing_address['choice']]['varchar']['address_title'] = !empty($attribute[$wpshop_billing_address['choice']]['varchar']['address_title']) ? $attribute[$wpshop_billing_address['choice']]['varchar']['address_title'] : __('Billing address', 'wpshop');
 			}
 			$group = wps_address::get_addresss_form_fields_by_type($wpshop_billing_address['choice']);
 			$validate = false;
-			foreach ( $group as $attribute_sets ) {
-				foreach ( $attribute_sets as $attribute_set_field ) {
+			foreach ($group as $attribute_sets) {
+				foreach ($attribute_sets as $attribute_set_field) {
 					$validate = $wpshop->validateForm($attribute_set_field['content'], $attribute[$wpshop_billing_address['choice']], '');
 				}
 			}
 		}
-		$cart_url = !empty($_SESSION['cart']['order_items']) ? get_permalink(wpshop_tools::get_page_id( get_option('wpshop_checkout_page_id') )) : get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id')));
+		$cart_url = !empty($_SESSION['cart']['order_items']) ? get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'))) : get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id')));
 
-		$account_form_type = !empty( $_POST['account_form_type'] ) ? sanitize_text_field( $_POST['account_form_type'] ) : '';
-		$validate_personal_form_infos = ( !empty( $account_form_type ) && $account_form_type == 'partial' ) ? $wpshop->validateForm($wpshop_account->partial_personal_infos_fields, array(), '', true) : $wpshop->validateForm($wpshop_account->personal_info_fields);
-		if( $validate && $validate_personal_form_infos ) {
-			$account_creation_result = $wpshop_account->save_account_form($user_id,  ( ( !empty($account_form_type) && $account_form_type == 'partial' ) ? 'partial' : 'complete') );
+		$account_form_type = !empty($_POST['account_form_type']) ? sanitize_text_field($_POST['account_form_type']) : '';
+		$validate_personal_form_infos = (!empty($account_form_type) && $account_form_type == 'partial') ? $wpshop->validateForm($wpshop_account->partial_personal_infos_fields, array(), '', true) : $wpshop->validateForm($wpshop_account->personal_info_fields);
+		if ($validate && $validate_personal_form_infos) {
+			$account_creation_result = $wpshop_account->save_account_form($user_id, ((!empty($account_form_type) && $account_form_type == 'partial') ? 'partial' : 'complete'));
 			$status = $account_creation_result[0];
 			$user_id = $account_creation_result[1];
-			$is_partial_account_creation  = $account_creation_result[2];
-			if ( $is_partial_account_creation == 'partial' ) {
+			$is_partial_account_creation = $account_creation_result[2];
+			if ($is_partial_account_creation == 'partial') {
 				$permalink_option = get_option('permalink_structure');
-				if ( !empty($permalink_option) ) {
-					$cart_url = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_signup_page_id') ) ).'?complete_sign_up=ok';
+				if (!empty($permalink_option)) {
+					$cart_url = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_signup_page_id'))) . '?complete_sign_up=ok';
 				}
 				else {
-					$cart_url = get_permalink( wpshop_tools::get_page_id(get_option('wpshop_signup_page_id') ) ).'&complete_sign_up=ok';
+					$cart_url = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_signup_page_id'))) . '&complete_sign_up=ok';
 				}
 			}
 			else {
-				if ( !empty($_SESSION['cart']) ) {
-					$cart_url = get_permalink( wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id')) );
+				if (!empty($_SESSION['cart'])) {
+					$cart_url = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id')));
 				}
 				else {
-					$cart_url = get_permalink( wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id')) );
+					$cart_url = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id')));
 				}
 			}
 			// check if the customer have already register an address
-			$query = $wpdb->prepare('SELECT * FROM ' .$wpdb->posts. ' WHERE post_author = %d AND post_type = %s', $user_id, WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS);
+			$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s', $user_id, WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS);
 			$exist_address = $wpdb->get_results($query);
 		}
 		// If there is errors
-		if($wpshop->error_count()>0) {
+		if ($wpshop->error_count() > 0) {
 			$reponse = $wpshop->show_messages();
 		}
 
@@ -2357,24 +2357,24 @@ 
 	function wpshop_ajax_order_customer_adress_load() {
 		global $wpshop_account;
 		global $wpdb;
-		check_ajax_referer( 'wpshop_order_customer_adress_load', 'wpshop_ajax_nonce' );
-		$current_customer_id = !empty( $_REQUEST['customer_id'] ) ? (int)$_REQUEST['customer_id'] : 0;
-		$order_id = !empty( $_REQUEST['order_id'] ) ? (int)$_REQUEST['order_id'] : 0;
+		check_ajax_referer('wpshop_order_customer_adress_load', 'wpshop_ajax_nonce');
+		$current_customer_id = !empty($_REQUEST['customer_id']) ? (int)$_REQUEST['customer_id'] : 0;
+		$order_id = !empty($_REQUEST['order_id']) ? (int)$_REQUEST['order_id'] : 0;
 
-		$order_postmeta = get_post_meta ($order_id, '_order_postmeta', true);
-		$order_infos_postmeta = get_post_meta ($order_id, '_order_info', true);
+		$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
+		$order_infos_postmeta = get_post_meta($order_id, '_order_info', true);
 
-		if ( !empty($order_postmeta) && !empty($order_postmeta['order_status']) && in_array($order_postmeta['order_status'], array('completed', 'shipped', 'refunded')) ) {
+		if (!empty($order_postmeta) && !empty($order_postmeta['order_status']) && in_array($order_postmeta['order_status'], array('completed', 'shipped', 'refunded'))) {
 			/** Billing address display **/
 			$tpl_component['ADDRESS_COMBOBOX'] = '';
 			$tpl_component['ADDRESS_BUTTONS'] = '';
 			$tpl_component['CUSTOMER_ADDRESS_TYPE_TITLE'] = __('Billing address', 'wpshop');
 			$tpl_component['ADDRESS_TYPE'] = 'billing_address';
 			$address_fields = wps_address::get_addresss_form_fields_by_type($order_infos_postmeta['billing']['id']);
-			$tpl_component['CUSTOMER_ADDRESS_CONTENT'] = wpshop_account::display_an_address( $address_fields, $order_infos_postmeta['billing']['address'] );
+			$tpl_component['CUSTOMER_ADDRESS_CONTENT'] = wpshop_account::display_an_address($address_fields, $order_infos_postmeta['billing']['address']);
 			$tpl_component['CUSTOMER_CHOOSEN_ADDRESS'] = wpshop_display::display_template_element('display_address_container', $tpl_component);
-			$retour =  wpshop_display::display_template_element('display_addresses_by_type_container', $tpl_component);
-			unset( $tpl_component );
+			$retour = wpshop_display::display_template_element('display_addresses_by_type_container', $tpl_component);
+			unset($tpl_component);
 
 			/** Shipping address display **/
 			$retour .= '<div id="shipping_infos_bloc" class="wpshop_order_customer_container wpshop_order_customer_container_user_information">';
@@ -2383,67 +2383,67 @@ 
 			$tpl_component['CUSTOMER_ADDRESS_TYPE_TITLE'] = __('Shipping address', 'wpshop');
 			$tpl_component['ADDRESS_TYPE'] = 'shipping_address';
 			$address_fields = wps_address::get_addresss_form_fields_by_type($order_infos_postmeta['shipping']['id']);
-			$tpl_component['CUSTOMER_ADDRESS_CONTENT'] = wpshop_account::display_an_address( $address_fields, $order_infos_postmeta['shipping']['address']);
+			$tpl_component['CUSTOMER_ADDRESS_CONTENT'] = wpshop_account::display_an_address($address_fields, $order_infos_postmeta['shipping']['address']);
 			$tpl_component['CUSTOMER_CHOOSEN_ADDRESS'] = wpshop_display::display_template_element('display_address_container', $tpl_component);
-			$retour .=  wpshop_display::display_template_element('display_addresses_by_type_container', $tpl_component);
-			unset( $tpl_component );
+			$retour .= wpshop_display::display_template_element('display_addresses_by_type_container', $tpl_component);
+			unset($tpl_component);
 			$retour .= '</div>';
 			$retour .= '<div class="wpshop_cls"></div>';
-			$result = json_encode( array(true, $retour) );
+			$result = json_encode(array(true, $retour));
 
 		}
 
- 		elseif ( !empty($order_postmeta) && !empty($order_postmeta['order_status']) && in_array($order_postmeta['order_status'], array('awaiting_payment', 'partially_paid'))) {
-			$order_id = !empty( $_REQUEST['order_id'] ) ? (int) $_REQUEST['order_id'] : 0;
+ 		elseif (!empty($order_postmeta) && !empty($order_postmeta['order_status']) && in_array($order_postmeta['order_status'], array('awaiting_payment', 'partially_paid'))) {
+			$order_id = !empty($_REQUEST['order_id']) ? (int)$_REQUEST['order_id'] : 0;
  			$order_info_postmeta = get_post_meta($order_id, '_order_info', true);
 
  			$billing_id_attribute_set = get_option('wpshop_billing_address');
  			$shipping_id_attribute_set = get_option('wpshop_shipping_address_choice');
 
- 			$order_billing_address = ( !empty($order_info_postmeta) && !empty($order_info_postmeta['billing']) && !empty($order_info_postmeta['billing']['address']) ) ? $order_info_postmeta['billing']['address'] : array();
- 			$order_shipping_address = ( !empty($order_info_postmeta) && !empty($order_info_postmeta['shipping']) && !empty($order_info_postmeta['shipping']['address']) ) ? $order_info_postmeta['shipping']['address'] : array();
+ 			$order_billing_address = (!empty($order_info_postmeta) && !empty($order_info_postmeta['billing']) && !empty($order_info_postmeta['billing']['address'])) ? $order_info_postmeta['billing']['address'] : array();
+ 			$order_shipping_address = (!empty($order_info_postmeta) && !empty($order_info_postmeta['shipping']) && !empty($order_info_postmeta['shipping']['address'])) ? $order_info_postmeta['shipping']['address'] : array();
 
- 			$billing_form = $wpshop_account->display_form_fields( $billing_id_attribute_set['choice'], '', '', '', array(), array(), $order_billing_address );
- 			if ( !empty($shipping_id_attribute_set) && !empty($shipping_id_attribute_set['activate']) ) {
- 				$shipping_form = $wpshop_account->display_form_fields( $shipping_id_attribute_set['choice'], '', '', '', array(), array(), $order_shipping_address );
+ 			$billing_form = $wpshop_account->display_form_fields($billing_id_attribute_set['choice'], '', '', '', array(), array(), $order_billing_address);
+ 			if (!empty($shipping_id_attribute_set) && !empty($shipping_id_attribute_set['activate'])) {
+ 				$shipping_form = $wpshop_account->display_form_fields($shipping_id_attribute_set['choice'], '', '', '', array(), array(), $order_shipping_address);
  			}
 
- 			$result = json_encode( array(true, $billing_form, $shipping_form, $current_customer_id) );
+ 			$result = json_encode(array(true, $billing_form, $shipping_form, $current_customer_id));
  		}
 		else {
 				// Check the attribute set id of Billing Address
-				$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE name = "' .__('Billing address', 'wpshop'). '"', '');
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE name = "' . __('Billing address', 'wpshop') . '"', '');
 				$attribute_set_id = $wpdb->get_var($query);
 				$billing_id_attribute_set = get_option('wpshop_billing_address');
 				//Check the billing address id of the customer
-				$query = $wpdb->prepare('SELECT * FROM ' .$wpdb->posts. ' WHERE post_author = ' .$current_customer_id. ' AND post_type = "' .WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS. '"', '');
+				$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_author = ' . $current_customer_id . ' AND post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '"', '');
 				$post_addresses = $wpdb->get_results($query);
 				$address_id = '';
-				foreach ( $post_addresses as $post_address ) {
-					$address_type = get_post_meta($post_address->ID, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY,true);
-					if ( $address_type == $attribute_set_id ) {
+				foreach ($post_addresses as $post_address) {
+					$address_type = get_post_meta($post_address->ID, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
+					if ($address_type == $attribute_set_id) {
 						$address_id = $post_address->ID;
 					}
 				}
 				$shipping_id_attribute_set = get_option('wpshop_shipping_address_choice');
 				$shipping_form = '';
-				if ( !empty($shipping_id_attribute_set) && !empty($shipping_id_attribute_set['activate']) ) {
+				if (!empty($shipping_id_attribute_set) && !empty($shipping_id_attribute_set['activate'])) {
 					// Check the attribute set id of Shipping Address
-					$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE name = "' .__('Shipping address', 'wpshop'). '"', '');
+					$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE name = "' . __('Shipping address', 'wpshop') . '"', '');
 					$attribute_set_id = $wpdb->get_var($query);
 					//Check the billing address id of the customer
-					$query = $wpdb->prepare('SELECT * FROM ' .$wpdb->posts. ' WHERE post_author = ' .$current_customer_id. ' AND post_type = "' .WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS. '"', '');
+					$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_author = ' . $current_customer_id . ' AND post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '"', '');
 					$post_addresses = $wpdb->get_results($query);
 					$shipping_address_id = '';
-					foreach ( $post_addresses as $post_address ) {
-						$address_type = get_post_meta($post_address->ID, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY,true);
-						if ( $address_type == $attribute_set_id ) {
+					foreach ($post_addresses as $post_address) {
+						$address_type = get_post_meta($post_address->ID, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
+						if ($address_type == $attribute_set_id) {
 							$shipping_address_id = $post_address->ID;
 						}
 					}
-					$shipping_form = $wpshop_account->display_form_fields( $shipping_id_attribute_set['choice'], $shipping_address_id );
+					$shipping_form = $wpshop_account->display_form_fields($shipping_id_attribute_set['choice'], $shipping_address_id);
 				}
-				$result = json_encode( array(true, $wpshop_account->display_form_fields( $billing_id_attribute_set['choice'], $address_id ), $shipping_form, $current_customer_id) );
+				$result = json_encode(array(true, $wpshop_account->display_form_fields($billing_id_attribute_set['choice'], $address_id), $shipping_form, $current_customer_id));
 		}
 		echo $result;
 		die();
@@ -2455,23 +2455,23 @@ 
 	 */
 	function ajax_wpshop_add_entity() {
 		global $wpdb;
-		check_ajax_referer( 'wpshop_add_new_entity_ajax_nonce', 'wpshop_ajax_nonce' );
+		check_ajax_referer('wpshop_add_new_entity_ajax_nonce', 'wpshop_ajax_nonce');
 
-		$attribute = !empty( $_POST['attribute'] ) ? (array)$_POST['attribute'] : array();
+		$attribute = !empty($_POST['attribute']) ? (array)$_POST['attribute'] : array();
 		$attributes = array();
 		/** Get the attribute to create	*/
 		$attribute_to_reload = null;
-		if ( !empty($attribute['new_value_creation']) && is_array( $attribute['new_value_creation'] ) ) {
-			foreach ( $attribute['new_value_creation'] as $attribute_code=>$value) {
-				$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE code = %s', $attribute_code);
+		if (!empty($attribute['new_value_creation']) && is_array($attribute['new_value_creation'])) {
+			foreach ($attribute['new_value_creation'] as $attribute_code=>$value) {
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s', $attribute_code);
 				$attribute_def = $wpdb->get_row($query);
-				if ( $value != "" ) {
-					if ( $attribute_def->data_type_to_use == 'internal' ) {
+				if ($value != "") {
+					if ($attribute_def->data_type_to_use == 'internal') {
 						$attribute_default_value = unserialize($attribute_def->default_value);
-						if ( $attribute_default_value['default_value'] == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ) {
-							$user_id = wp_create_user( sanitize_user( $value ), wp_generate_password( 12, false ) );
-							$query = $wpdb->prepare( "SELECT ID FROM " . $wpdb->posts . " WHERE post_type = %s AND post_author = %d", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id );
-							$attribute_option_id = $wpdb->get_var( $query );
+						if ($attribute_default_value['default_value'] == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS) {
+							$user_id = wp_create_user(sanitize_user($value), wp_generate_password(12, false));
+							$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_type = %s AND post_author = %d", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id);
+							$attribute_option_id = $wpdb->get_var($query);
 						}
 						else {
 							$entity_args = array(
@@ -2484,13 +2484,13 @@ 
 						}
 					}
 					else {
-						$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status'=>'valid', 'creation_date'=>current_time('mysql', 0), 'position' => 1, 'attribute_id'=>$attribute_def->id, 'value'=>$value, 'label'=>$value) );
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status'=>'valid', 'creation_date'=>current_time('mysql', 0), 'position' => 1, 'attribute_id'=>$attribute_def->id, 'value'=>$value, 'label'=>$value));
 						$attribute_option_id = $wpdb->insert_id;
 					}
 
-					foreach ( $attribute as $attribute => $val) {
+					foreach ($attribute as $attribute => $val) {
 						foreach ($val as $k=>$v) {
-							if ( $k == $attribute_code) {
+							if ($k == $attribute_code) {
 								$attribute[$attribute][$k] = $attribute_option_id;
 							}
 						}
@@ -2499,82 +2499,82 @@ 
 			}
 		}
 		/** Store send attribute into a new array for save purpose	*/
-		if ( is_array( $attribute ) ) {
-			foreach ( $attribute as $attribute_type => $attribute ) {
-				foreach ( $attribute as $attribute_code => $attribute_value ) {
-					if ( !isset( $attributes[$attribute_code] ) ) {
+		if (is_array($attribute)) {
+			foreach ($attribute as $attribute_type => $attribute) {
+				foreach ($attribute as $attribute_code => $attribute_value) {
+					if (!isset($attributes[$attribute_code])) {
 						$attributes[$attribute_code] = $attribute_value;
 					}
 				}
 			}
 		}
 
-		$post_title = !empty( $_POST['wp_fields']['post_title'] ) ? sanitize_text_field( $_POST['wp_fields']['post_title'] ) : '';
-		$entity_type = !empty( $_POST['entity_type'] ) ? sanitize_text_field( $_POST['entity_type'] ) : '';
-		$attribute_set_id = !empty( $_POST['attribute_set_id'] ) ? (int) $_POST['attribute_set_id'] : 0;
-		$type_of_form = !empty( $_POST['type_of_form'] ) ? sanitize_text_field( $_POST['type_of_form'] ) : '';
+		$post_title = !empty($_POST['wp_fields']['post_title']) ? sanitize_text_field($_POST['wp_fields']['post_title']) : '';
+		$entity_type = !empty($_POST['entity_type']) ? sanitize_text_field($_POST['entity_type']) : '';
+		$attribute_set_id = !empty($_POST['attribute_set_id']) ? (int)$_POST['attribute_set_id'] : 0;
+		$type_of_form = !empty($_POST['type_of_form']) ? sanitize_text_field($_POST['type_of_form']) : '';
 
 		/** Save the new entity into database */
-		$result = wpshop_entities::create_new_entity( $entity_type, $post_title, '', $attributes, array('attribute_set_id' => $attribute_set_id) );
+		$result = wpshop_entities::create_new_entity($entity_type, $post_title, '', $attributes, array('attribute_set_id' => $attribute_set_id));
 		$new_entity_id = $result[1];
 
-		if ( !empty($new_entity_id) ) {
+		if (!empty($new_entity_id)) {
 			/**	Save address for current entity	*/
-			if ( !empty( $type_of_form ) && !empty( $attribute[$type_of_form] ) ) {
+			if (!empty($type_of_form) && !empty($attribute[$type_of_form])) {
 				global $wpshop_account;
-				$result = wps_address::wps_address( $type_of_form );
-				update_post_meta ($new_entity_id, '_wpshop_attached_address', $result['current_id']);
+				$result = wps_address::wps_address($type_of_form);
+				update_post_meta($new_entity_id, '_wpshop_attached_address', $result['current_id']);
 			}
 
 			/** Make price calculation if entity is a product	*/
-			if ( $entity_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) {
+			if ($entity_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) {
 				$wpshop_prices_attribute = unserialize(WPSHOP_ATTRIBUTE_PRICES);
 				$calculate_price = false;
-				foreach( $wpshop_prices_attribute as $attribute_price_code ){
-					if ( array_key_exists($attribute_price_code, $attributes) ) {
+				foreach ($wpshop_prices_attribute as $attribute_price_code) {
+					if (array_key_exists($attribute_price_code, $attributes)) {
 						$calculate_price = true;
 					}
 				}
-				if ( $calculate_price ) {
+				if ($calculate_price) {
 					wpshop_products::calculate_price($new_entity_id);
 				}
 			}
 
 			/** Add picture if a file has been send	*/
-			if ( !empty($_FILES) ) {
+			if (!empty($_FILES)) {
 				$wp_upload_dir = wp_upload_dir();
 				$final_dir = $wp_upload_dir['path'] . '/';
-				if ( !is_dir($final_dir) ) {
+				if (!is_dir($final_dir)) {
 					mkdir($final_dir, 0755, true);
 				}
 
-				foreach ( $_FILES as $file ) {
+				foreach ($_FILES as $file) {
 					$tmp_name = $file['tmp_name']['post_thumbnail'];
 					$name = $file['name']['post_thumbnail'];
 
 					$filename = $final_dir . $name;
 					@move_uploaded_file($tmp_name, $filename);
 
-					$wp_filetype = wp_check_filetype(basename($filename), null );
+					$wp_filetype = wp_check_filetype(basename($filename), null);
 					$attachment = array(
-						'guid' => $wp_upload_dir['baseurl'] . _wp_relative_upload_path( $filename ),
+						'guid' => $wp_upload_dir['baseurl'] . _wp_relative_upload_path($filename),
 						'post_mime_type' => $wp_filetype['type'],
-						'post_title' => preg_replace( '/\.[^.]+$/', '', basename($filename) ),
+						'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)),
 						'post_content' => '',
 						'post_status' => 'inherit'
 					);
-					$attach_id = wp_insert_attachment( $attachment, $filename, $new_entity_id );
+					$attach_id = wp_insert_attachment($attachment, $filename, $new_entity_id);
 					require_once(ABSPATH . 'wp-admin/includes/image.php');
-					$attach_data = wp_generate_attachment_metadata( $attach_id, $filename );
-					wp_update_attachment_metadata( $attach_id, $attach_data );
+					$attach_data = wp_generate_attachment_metadata($attach_id, $filename);
+					wp_update_attachment_metadata($attach_id, $attach_data);
 					add_post_meta($new_entity_id, '_thumbnail_id', $attach_id, true);
 				}
 			}
 
-			echo json_encode( array( true,  __('Element has been saved', 'wpshop'), $attribute_to_reload, $new_entity_id) );
+			echo json_encode(array(true, __('Element has been saved', 'wpshop'), $attribute_to_reload, $new_entity_id));
 		}
 		else {
-			echo json_encode( array(false, __('An error occured while adding your element', 'wpshop')) );
+			echo json_encode(array(false, __('An error occured while adding your element', 'wpshop')));
 		}
 
 		die();
@@ -2583,47 +2583,47 @@ 
 // 	add_action('wp_ajax_nopriv_wpshop_quick_add_entity', 'ajax_wpshop_add_entity');
 
 	function ajax_wpshop_reload_attribute_for_quick_add() {
-		check_ajax_referer( 'ajax_wpshop_reload_attribute_for_quick_add' );
+		check_ajax_referer('ajax_wpshop_reload_attribute_for_quick_add');
 		$output = '';
-		$attribute_to_reload = !empty( $_POST['attribute_to_reload'] ) ? (array) $_POST['attribute_to_reload'] : array();
-		if ( !empty($attribute_to_reload) ) {
-			foreach ( $attribute_to_reload as $attribute_code ) {
-				$attr_field = wpshop_attributes::display_attribute( $attribute_code, 'frontend' );
+		$attribute_to_reload = !empty($_POST['attribute_to_reload']) ? (array)$_POST['attribute_to_reload'] : array();
+		if (!empty($attribute_to_reload)) {
+			foreach ($attribute_to_reload as $attribute_code) {
+				$attr_field = wpshop_attributes::display_attribute($attribute_code, 'frontend');
 				$output[$attribute_code]['result'] = $attr_field['field_definition']['output'] . $attr_field['field_definition']['options'];
 			}
 		}
-		echo json_encode( array($output) );
+		echo json_encode(array($output));
 		die();
 	}
 	add_action('wp_ajax_reload_attribute_for_quick_add', 'ajax_wpshop_reload_attribute_for_quick_add');
 
 	function ajax_wpshop_change_address() {
-		check_ajax_referer( 'ajax_wpshop_change_address' );
-		$address_id = ( !empty($_POST['address_id']) ? (int) $_POST['address_id'] : null);
-		$address_type = ( !empty($_POST['address_type']) ? sanitize_text_field($_POST['address_type']) : null);
-		$is_allowed_destination  = true;
-		if ( !empty($address_id) && !empty($address_type) ) {
+		check_ajax_referer('ajax_wpshop_change_address');
+		$address_id = (!empty($_POST['address_id']) ? (int)$_POST['address_id'] : null);
+		$address_type = (!empty($_POST['address_type']) ? sanitize_text_field($_POST['address_type']) : null);
+		$is_allowed_destination = true;
+		if (!empty($address_id) && !empty($address_type)) {
 			//Check if it's an allowed address for shipping
 			$checkout_payment_button = '';
-			$cart_type = (!empty($_SESSION['cart']['cart_type']) && sanitize_text_field($_SESSION['cart']['cart_type'])=='quotation') ? 'quotation' : 'cart';
-			$is_allowed_destination = true;//wpshop_shipping_configuration::is_allowed_country ( $address_id );
-			if ( $is_allowed_destination ) {
+			$cart_type = (!empty($_SESSION['cart']['cart_type']) && sanitize_text_field($_SESSION['cart']['cart_type']) == 'quotation') ? 'quotation' : 'cart';
+			$is_allowed_destination = true; //wpshop_shipping_configuration::is_allowed_country ( $address_id );
+			if ($is_allowed_destination) {
 				$available_payement_method = wpshop_payment::display_payment_methods_choice_form(0, $cart_type);
 				//if(!empty($available_payement_method[1]['paypal']) || !empty($available_payement_method[1]['banktransfer']) || !empty($available_payement_method[1]['checks']) || WPSHOP_PAYMENT_METHOD_CIC || !empty($available_payement_method[1]['cic']) || ($cart_type == 'quotation')) {
-				if ( !empty($available_payement_method[0]) ) {
-					if ( $cart_type=='quotation' ) {
-						$checkout_payment_button = wpshop_display::display_template_element('wpshop_checkout_page_quotation_validation_button', array() );
+				if (!empty($available_payement_method[0])) {
+					if ($cart_type == 'quotation') {
+						$checkout_payment_button = wpshop_display::display_template_element('wpshop_checkout_page_quotation_validation_button', array());
 					}
 					else {
-						$checkout_payment_button = wpshop_display::display_template_element('wpshop_checkout_page_validation_button', array() );
+						$checkout_payment_button = wpshop_display::display_template_element('wpshop_checkout_page_validation_button', array());
 					}
 				}
 			}
 			else {
 				$checkout_payment_button = wpshop_display::display_template_element('wpshop_checkout_page_impossible_to_order', array());
 			}
-			if( $address_type == 'billing_address') {
-				$billing_option = get_option( 'wpshop_billing_address' );
+			if ($address_type == 'billing_address') {
+				$billing_option = get_option('wpshop_billing_address');
 				$address_option = $billing_option['choice'];
 			}
 			else {
@@ -2631,16 +2631,16 @@ 
 				$address_option = $shipping_address_option['choice'];
 			}
 			$add = wps_address::get_addresss_form_fields_by_type($address_option);
-			$address_infos = get_post_meta($address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
-			$retour = wpshop_account::display_an_address ( $add, $address_infos, $address_id);
+			$address_infos = get_post_meta($address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
+			$retour = wpshop_account::display_an_address($add, $address_infos, $address_id);
 
 			$_SESSION[$address_type] = $address_id;
 
-			$edit_link = '<a href="' .get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))) . (strpos(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))), '?')===false ? '?' : '&') . 'action=editAddress&amp;id='.$address_id.'" title="' .__('Edit', 'wpshop'). '">' .__('Edit', 'wpshop'). '</a>';
-			$result = json_encode( array(true, $retour, $edit_link, $is_allowed_destination, $checkout_payment_button) );
+			$edit_link = '<a href="' . get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))) . (strpos(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))), '?') === false ? '?' : '&') . 'action=editAddress&amp;id=' . $address_id . '" title="' . __('Edit', 'wpshop') . '">' . __('Edit', 'wpshop') . '</a>';
+			$result = json_encode(array(true, $retour, $edit_link, $is_allowed_destination, $checkout_payment_button));
 		}
 		else {
-			$result = json_encode( array(false, 'missing_informations') );
+			$result = json_encode(array(false, 'missing_informations'));
 		}
 		echo $result;
 
@@ -2650,26 +2650,26 @@ 
 	add_action('wp_ajax_nopriv_change_address', 'ajax_wpshop_change_address');
 
 	function ajax_wpshop_load_create_new_customer_interface() {
-		check_ajax_referer( 'ajax_wpshop_load_create_new_customer_interface' );
+		check_ajax_referer('ajax_wpshop_load_create_new_customer_interface');
 		$billing_address_option = get_option('wpshop_billing_address');
 		$shipping_address_option = get_option('wpshop_shipping_address_choice');
 
 		$tpl_component = array();
 		$tpl_component['LOADING_ICON'] = WPSHOP_LOADING_ICON;
-		if ( !empty($billing_address) ) {
-			echo wpshop_account::get_addresses_by_type( $billing_address, __('Billing address', 'wpshop'), array('only_display' => 'yes'));
+		if (!empty($billing_address)) {
+			echo wpshop_account::get_addresses_by_type($billing_address, __('Billing address', 'wpshop'), array('only_display' => 'yes'));
 		}
 		$tpl_component['CUSTOMER_ADDRESSES_FORM_CONTENT'] = wpshop_account::display_form_fields($billing_address_option['choice'], '', 'first');
 
-		if ( $shipping_address_option['activate'] ) {
-			$tpl_component['CUSTOMER_ADDRESSES_FORM_CONTENT'] .= '<p class="formField"><label><input type="checkbox" name="shiptobilling" id="shiptobilling_checkbox" checked="checked" /> '.__('Use as shipping information','wpshop').'</label></p><br/>';
+		if ($shipping_address_option['activate']) {
+			$tpl_component['CUSTOMER_ADDRESSES_FORM_CONTENT'] .= '<p class="formField"><label><input type="checkbox" name="shiptobilling" id="shiptobilling_checkbox" checked="checked" /> ' . __('Use as shipping information', 'wpshop') . '</label></p><br/>';
 			$display = 'display:none;';
-			$tpl_component['CUSTOMER_ADDRESSES_FORM_CONTENT'] .= '<div id="shipping_infos_bloc" style="'.$display.'">';
+			$tpl_component['CUSTOMER_ADDRESSES_FORM_CONTENT'] .= '<div id="shipping_infos_bloc" style="' . $display . '">';
 			$tpl_component['CUSTOMER_ADDRESSES_FORM_CONTENT'] .= wpshop_account::display_form_fields($shipping_address_option['choice'], '', 'first');
 			$tpl_component['CUSTOMER_ADDRESSES_FORM_CONTENT'] .= '</div><br/>';
 		}
 
-		$tpl_component['CUSTOMER_ADDRESSES_FORM_BUTTONS'] = '<p class="formField"><input type="submit" name="submitbillingAndShippingInfo" id="submitbillingAndShippingInfo" value="' . __('Save','wpshop') . '" /></p>';
+		$tpl_component['CUSTOMER_ADDRESSES_FORM_BUTTONS'] = '<p class="formField"><input type="submit" name="submitbillingAndShippingInfo" id="submitbillingAndShippingInfo" value="' . __('Save', 'wpshop') . '" /></p>';
 		$output = wpshop_display::display_template_element('wpshop_customer_addresses_form_admin', $tpl_component, array(), 'admin');
 		unset($tpl_component);
 		$result = json_encode(array(true, $output));
@@ -2679,18 +2679,18 @@ 
 	add_action('wp_ajax_load_create_new_customer_interface', 'ajax_wpshop_load_create_new_customer_interface');
 
 	function ajax_wpshop_create_new_customer() {
-		check_ajax_referer( 'ajax_wpshop_create_new_customer' );
+		check_ajax_referer('ajax_wpshop_create_new_customer');
 		$result = '';
 		$billing_address = !empty($_REQUEST['billing_address']) ? sanitize_key($_REQUEST['billing_address']) : '';
 		$shipping_address = !empty($_REQUEST['shipping_address']) ? sanitize_key($_REQUEST['shipping_address']) : '';
 		$shiptobilling = !empty($_REQUEST['shiptobilling']) ? sanitize_key($_REQUEST['shiptobilling']) : null;
 		$username = !empty($_POST['attribute'][$billing_address]['varchar']['address_user_email']) ? sanitize_text_field($_POST['attribute'][$billing_address]['varchar']['address_user_email']) : null;
-		if ( $username != null ) {
+		if ($username != null) {
 			/** Crerate the new customer user account */
-			$password = wp_generate_password( $length=12, $include_standard_special_chars=false );
+			$password = wp_generate_password($length = 12, $include_standard_special_chars = false);
 			$email = $username;
-			if ( !empty($username) && !username_exists($username) && !empty($email) && !email_exists($email) ) {
-				$user_id = wp_create_user( $username, $password, $email );
+			if (!empty($username) && !username_exists($username) && !empty($email) && !email_exists($email)) {
+				$user_id = wp_create_user($username, $password, $email);
 				// @TODO : REQUEST
 				// $_REQUEST['user']['customer_id'] = $user_id;
 				/** Save addresses */
@@ -2701,21 +2701,21 @@ 
 					wpshop_account::same_billing_and_shipping_address($billing_address, $shipping_address);
 				}
 
-				if ( !empty($billing_address) ) {
-					wps_address::save_address_infos( $billing_address );
+				if (!empty($billing_address)) {
+					wps_address::save_address_infos($billing_address);
 				}
-				if( !empty($shipping_address ) ) {
-					wps_address::save_address_infos( $shipping_address);
+				if (!empty($shipping_address)) {
+					wps_address::save_address_infos($shipping_address);
 				}
-				$result = json_encode( array(true, __('Customer created', 'wpshop'), $user_id) );
+				$result = json_encode(array(true, __('Customer created', 'wpshop'), $user_id));
 			}
 			else {
-				$result = json_encode( array(false, __('A customer account is already created with this email address', 'wpshop')) );
+				$result = json_encode(array(false, __('A customer account is already created with this email address', 'wpshop')));
 			}
 
 		}
 		else {
-			$result = json_encode( array(false, __('An email address is required', 'wpshop')) );
+			$result = json_encode(array(false, __('An email address is required', 'wpshop')));
 		}
 		echo $result;
 		die();
@@ -2725,26 +2725,26 @@ 
 	/**
 	 * Send a message to customer
 	 */
-	function ajax_wpshop_send_message_by_type () {
-		check_ajax_referer( 'ajax_wpshop_send_message_by_type' );
+	function ajax_wpshop_send_message_by_type() {
+		check_ajax_referer('ajax_wpshop_send_message_by_type');
 		global $wpdb;
 		$result = array();
-		$message_type_id = ( !empty( $_POST['message_type_id'])) ? (int) $_POST['message_type_id'] : null;
-		$customer_id = ( !empty( $_POST['customer_user_id'])) ? (int) $_POST['customer_user_id'] : null;
-		$model_name = ( !empty( $_POST['message_model_name'])) ? sanitize_text_field($_POST['message_model_name']) : null;
-		$order_id = ( !empty( $_POST['order_id'])) ? (int) $_POST['order_id'] : null;
-		if ( !empty($customer_id) && !empty($message_type_id) && !empty($model_name)) {
+		$message_type_id = (!empty($_POST['message_type_id'])) ? (int)$_POST['message_type_id'] : null;
+		$customer_id = (!empty($_POST['customer_user_id'])) ? (int)$_POST['customer_user_id'] : null;
+		$model_name = (!empty($_POST['message_model_name'])) ? sanitize_text_field($_POST['message_model_name']) : null;
+		$order_id = (!empty($_POST['order_id'])) ? (int)$_POST['order_id'] : null;
+		if (!empty($customer_id) && !empty($message_type_id) && !empty($model_name)) {
 			$order_post_meta = get_post_meta($order_id, '_order_postmeta', true);
-			$receiver_infos = get_userdata( $customer_id );
+			$receiver_infos = get_userdata($customer_id);
 			$email = $receiver_infos->user_email;
 			$first_name = get_user_meta($customer_id, 'first_name', true);
 			$last_name = get_user_meta($customer_id, 'last_name', true);
 			$wps_message = new wps_message_ctr();
-			$wps_message->wpshop_prepared_email( $email, $model_name, array('order_id' => $order_id, 'order_key' => ( ( !empty($order_post_meta) && !empty($order_post_meta['order_key']) ) ? $order_post_meta['order_key'] : '' ), 'order_date' => ( ( !empty($order_post_meta) && !empty($order_post_meta['order_date']) ) ? $order_post_meta['order_date'] : '' ),'customer_first_name' => $first_name, 'customer_last_name' => $last_name) );
-			$result = array('status' => true, 'response' => $wps_message->get_historic_message_by_type($message_type_id) );
+			$wps_message->wpshop_prepared_email($email, $model_name, array('order_id' => $order_id, 'order_key' => ((!empty($order_post_meta) && !empty($order_post_meta['order_key'])) ? $order_post_meta['order_key'] : ''), 'order_date' => ((!empty($order_post_meta) && !empty($order_post_meta['order_date'])) ? $order_post_meta['order_date'] : ''), 'customer_first_name' => $first_name, 'customer_last_name' => $last_name));
+			$result = array('status' => true, 'response' => $wps_message->get_historic_message_by_type($message_type_id));
 		}
 		else {
-			$result = array('status' => false, 'response' => __('An error occured', 'wpshop') );
+			$result = array('status' => false, 'response' => __('An error occured', 'wpshop'));
 		}
 		echo json_encode($result);
 		die();
@@ -2753,23 +2753,23 @@ 
 
 
 	function ajax_wpshop_upload_downloadable_file_action() {
-		check_ajax_referer( 'ajax_wpshop_upload_downloadable_file_action' );
+		check_ajax_referer('ajax_wpshop_upload_downloadable_file_action');
 		$result = '';
-		$element_identifier = ( !empty( $_POST ) && !empty( $_POST[ 'element_identifier' ] ) && is_int( (int)$_POST[ 'element_identifier' ] ) ) ? (int)$_POST[ 'element_identifier' ] : 0;
-		$wpshop_uploaded_file = ( !empty( $_FILES ) && !empty( $_FILES[ 'wpshop_file' ] ) && is_array( (array)$_FILES[ 'wpshop_file' ] ) ) ? (array)$_FILES[ 'wpshop_file' ] : array();
+		$element_identifier = (!empty($_POST) && !empty($_POST['element_identifier']) && is_int((int)$_POST['element_identifier'])) ? (int)$_POST['element_identifier'] : 0;
+		$wpshop_uploaded_file = (!empty($_FILES) && !empty($_FILES['wpshop_file']) && is_array((array)$_FILES['wpshop_file'])) ? (array)$_FILES['wpshop_file'] : array();
 
-		if ( !empty( $wpshop_uploaded_file ) && !empty( $element_identifier ) ) {
-			if(!is_dir(WPSHOP_UPLOAD_DIR)){
+		if (!empty($wpshop_uploaded_file) && !empty($element_identifier)) {
+			if (!is_dir(WPSHOP_UPLOAD_DIR)) {
 				mkdir(WPSHOP_UPLOAD_DIR, 0755, true);
 			}
 			$file = $wpshop_uploaded_file;
 			$tmp_name = $file['tmp_name'];
-			$name = sanitize_file_name( current_time( 'mysql', 0 ).'__'.$file["name"] );
-			move_uploaded_file($tmp_name, WPSHOP_UPLOAD_DIR.$name);
+			$name = sanitize_file_name(current_time('mysql', 0) . '__' . $file["name"]);
+			move_uploaded_file($tmp_name, WPSHOP_UPLOAD_DIR . $name);
 
-			$n = WPSHOP_UPLOAD_URL.'/'.$name;
-			update_post_meta( $element_identifier, 'attribute_option_is_downloadable_', array('file_url' => $n));
-			$result = '<a href="' .$n. '" target="_blank" download>' .$name. '</a>';
+			$n = WPSHOP_UPLOAD_URL . '/' . $name;
+			update_post_meta($element_identifier, 'attribute_option_is_downloadable_', array('file_url' => $n));
+			$result = '<a href="' . $n . '" target="_blank" download>' . $name . '</a>';
 		}
 		else {
 			$result = '';
@@ -2780,92 +2780,92 @@ 
 	add_action('wp_ajax_upload_downloadable_file_action', 'ajax_wpshop_upload_downloadable_file_action');
 
 	function ajax_wpshop_fill_the_downloadable_dialog() {
-		$product_id = ( !empty( $_POST ) && !empty( $_POST[ 'product_identifier' ] ) ) ? (int)$_POST[ 'product_identifier' ] : 0;
-		check_ajax_referer( "ajax_wpshop_fill_the_downloadable_dialog".$product_id );
+		$product_id = (!empty($_POST) && !empty($_POST['product_identifier'])) ? (int)$_POST['product_identifier'] : 0;
+		check_ajax_referer("ajax_wpshop_fill_the_downloadable_dialog" . $product_id);
 		ajax_wpshop_fill_the_downloadable_dialog_exec($product_id);
 	}
 	function ajax_wpshop_fill_the_downloadable_dialog_unnonced() {
-		$product_id = ( !empty( $_POST ) && !empty( $_POST[ 'product_identifier' ] ) ) ? (int)$_POST[ 'product_identifier' ] : 0;
+		$product_id = (!empty($_POST) && !empty($_POST['product_identifier'])) ? (int)$_POST['product_identifier'] : 0;
 		ajax_wpshop_fill_the_downloadable_dialog_exec($product_id);
 	}
-	function ajax_wpshop_fill_the_downloadable_dialog_exec( $product_id ) {
-		$output  = '<form method="post" action="' .admin_url('admin-ajax.php') .'" id="upload_downloadable_file" enctype="multipart/form-data" >';
-		$output .= '<p class="formField"><label for="wpshop_file">' .__('Choose your file to send', 'wpshop'). '</label><input type="file" name="wpshop_file" /></p>';
+	function ajax_wpshop_fill_the_downloadable_dialog_exec($product_id) {
+		$output  = '<form method="post" action="' . admin_url('admin-ajax.php') . '" id="upload_downloadable_file" enctype="multipart/form-data" >';
+		$output .= '<p class="formField"><label for="wpshop_file">' . __('Choose your file to send', 'wpshop') . '</label><input type="file" name="wpshop_file" /></p>';
 		$output .= '<input type="hidden" name="action" value="upload_downloadable_file_action" />';
-		$output .= '<input type="hidden" name="element_identifier" id="element_identifier" value="' .esc_attr( $product_id). '" />';
-		$output .= wp_nonce_field( 'ajax_wpshop_upload_downloadable_file_action', '_wpnonce', true, false );
-		$output .= '<p class="formField"><a id="send_downloadable_file_button" class="wps-bton-first-mini-rounded">' .__('Send your file', 'wpshop'). '</a></p>';
+		$output .= '<input type="hidden" name="element_identifier" id="element_identifier" value="' . esc_attr($product_id) . '" />';
+		$output .= wp_nonce_field('ajax_wpshop_upload_downloadable_file_action', '_wpnonce', true, false);
+		$output .= '<p class="formField"><a id="send_downloadable_file_button" class="wps-bton-first-mini-rounded">' . __('Send your file', 'wpshop') . '</a></p>';
 		$output .= '</form>';
-		$output .='<script type="text/javascript">jQuery("#upload_downloadable_file").ajaxForm({
+		$output .= '<script type="text/javascript">jQuery("#upload_downloadable_file").ajaxForm({
 		beforeSubmit : function() { },success: function(response) {
-		jQuery(".is_downloadable_statut_'.$product_id.'").html( response );
+		jQuery(".is_downloadable_statut_'.$product_id . '").html( response );
 		jQuery(".send_downloadable_file_dialog").dialog("close");
 		}});</script>';
-		$output = apply_filters( 'wpshop_download_file_dialog', $output, $product_id );
+		$output = apply_filters('wpshop_download_file_dialog', $output, $product_id);
 
-		$response = array( 'status' => true, 'response' => $output);
-		echo json_encode( $response );
+		$response = array('status' => true, 'response' => $output);
+		echo json_encode($response);
 		die();
 	}
 	add_action('wp_ajax_fill_the_downloadable_dialog', 'ajax_wpshop_fill_the_downloadable_dialog');
 	add_action('wp_ajax_fill_the_downloadable_dialog_unnonced', 'ajax_wpshop_fill_the_downloadable_dialog_unnonced');
 
 	function ajax_wpshop_show_downloadable_interface_in_admin() {
-		$post_id = !empty( $_POST ) && !empty( $_POST[ 'post_id' ] ) && is_int( (int)$_POST[ 'post_id' ] ) ? (int)$_POST[ 'post_id' ] : 0;
-		check_ajax_referer( 'ajax_wpshop_show_downloadable_interface_in_admin'.$post_id );
+		$post_id = !empty($_POST) && !empty($_POST['post_id']) && is_int((int)$_POST['post_id']) ? (int)$_POST['post_id'] : 0;
+		check_ajax_referer('ajax_wpshop_show_downloadable_interface_in_admin' . $post_id);
 		global $wpdb;
 		$status = false;
-		$selected_value = ( !empty($_POST['selected_value']) ) ? sanitize_text_field( $_POST['selected_value'] ) : '';
-		$query = $wpdb->prepare( 'SELECT label FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS.' WHERE id = %d', $selected_value);
-		$value = $wpdb->get_var( $query );
+		$selected_value = (!empty($_POST['selected_value'])) ? sanitize_text_field($_POST['selected_value']) : '';
+		$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $selected_value);
+		$value = $wpdb->get_var($query);
 
-		if ( !empty($value) && __( $value, 'wpshop') == __('Yes', 'wpshop') ) {
+		if (!empty($value) && __($value, 'wpshop') == __('Yes', 'wpshop')) {
 			$status = true;
 		}
-		$response = array( 'status' => $status );
-		echo json_encode( $response );
+		$response = array('status' => $status);
+		echo json_encode($response);
 		die();
 	}
-	add_action( 'wp_ajax_show_downloadable_interface_in_admin', 'ajax_wpshop_show_downloadable_interface_in_admin');
+	add_action('wp_ajax_show_downloadable_interface_in_admin', 'ajax_wpshop_show_downloadable_interface_in_admin');
 
 	function ajax_wpshop_restart_the_order() {
-		check_ajax_referer( 'ajax_wpshop_restart_the_order' );
+		check_ajax_referer('ajax_wpshop_restart_the_order');
 
 		global $wpshop_cart, $wpdb;
 		$status = $add_to_cart_checking = $manage_stock_checking_bool = false;
 		$add_to_cart_checking_message = '';
 		$result = __('Error, you cannot restart this order', 'wpshop');
-		$order_id = ( !empty($_POST['order_id']) ) ? (int) $_POST['order_id'] : null;
-		$is_make_order_again = ( !empty($_POST['make_order_again']) ) ? sanitize_text_field( $_POST['make_order_again'] ) : null;
-		if( !empty( $order_id ) ) {
+		$order_id = (!empty($_POST['order_id'])) ? (int)$_POST['order_id'] : null;
+		$is_make_order_again = (!empty($_POST['make_order_again'])) ? sanitize_text_field($_POST['make_order_again']) : null;
+		if (!empty($order_id)) {
 			$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 			$_SESSION['cart'] = array();
 			$_SESSION['cart']['order_items'] = array();
 			$wpshop_cart_type = $order_meta['cart_type'];
 
-			if ( !empty($order_meta) && !empty( $order_meta['order_items']) ) {
+			if (!empty($order_meta) && !empty($order_meta['order_items'])) {
 				$wpshop_cart_type = $order_meta['cart_type'];
-				foreach( $order_meta['order_items'] as $item_key => $item ) {
-					$item_meta = get_post_meta( $item['item_id'], '_wpshop_product_metadata', true );
-					$stock =  $item_meta['product_stock'];
+				foreach ($order_meta['order_items'] as $item_key => $item) {
+					$item_meta = get_post_meta($item['item_id'], '_wpshop_product_metadata', true);
+					$stock = $item_meta['product_stock'];
 					$qty = $item['item_qty'];
-					$item_option = get_post_meta( $item['item_id'], '_wpshop_product_options', true );
-					if( !empty($item_meta['manage_stock']) ) {
-						$query = $wpdb->prepare( 'SELECT label FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d', $item_meta['manage_stock']);
-						$manage_stock_checking = $wpdb->get_var( $query );
-						if( !empty($manage_stock_checking) && strtolower( __( $manage_stock_checking, 'wpshop') ) == strtolower( __( 'Yes', 'wpshop') )  ) {
+					$item_option = get_post_meta($item['item_id'], '_wpshop_product_options', true);
+					if (!empty($item_meta['manage_stock'])) {
+						$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $item_meta['manage_stock']);
+						$manage_stock_checking = $wpdb->get_var($query);
+						if (!empty($manage_stock_checking) && strtolower(__($manage_stock_checking, 'wpshop')) == strtolower(__('Yes', 'wpshop'))) {
 							$manage_stock_checking_bool = true;
 						}
 					}
 					else {
-						if( get_post_type($item['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-							$parent_product = wpshop_products::get_parent_variation( $item['item_id'] );
-							if( !empty($parent_product) && !empty($parent_product['parent_post_meta']) ) {
+						if (get_post_type($item['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+							$parent_product = wpshop_products::get_parent_variation($item['item_id']);
+							if (!empty($parent_product) && !empty($parent_product['parent_post_meta'])) {
 								$parent_metadata = $parent_product['parent_post_meta'];
-								if( !empty($parent_product['parent_post_meta']['manage_stock']) ) {
-									$query = $wpdb->prepare( 'SELECT label FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d', $parent_product['parent_post_meta']['manage_stock']);
-									$manage_stock_checking = $wpdb->get_var( $query );
-									if( !empty($manage_stock_checking) && strtolower( __( $manage_stock_checking, 'wpshop') ) == strtolower( __( 'Yes', 'wpshop') )  ) {
+								if (!empty($parent_product['parent_post_meta']['manage_stock'])) {
+									$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $parent_product['parent_post_meta']['manage_stock']);
+									$manage_stock_checking = $wpdb->get_var($query);
+									if (!empty($manage_stock_checking) && strtolower(__($manage_stock_checking, 'wpshop')) == strtolower(__('Yes', 'wpshop'))) {
 										$manage_stock_checking_bool = true;
 										$stock = $parent_product['parent_post_meta']['product_stock'];
 									}
@@ -2878,8 +2878,8 @@ 
 
 
 					/** Checking stock **/
-					if ( empty($item_meta['manage_stock']) || ( !empty($item_meta['manage_stock']) && !$manage_stock_checking_bool )|| ( !empty($item_meta['manage_stock']) && $manage_stock_checking_bool && $stock >= $qty ) ) {
-						$_SESSION['cart']['order_items'][ $item_key ] = $item;
+					if (empty($item_meta['manage_stock']) || (!empty($item_meta['manage_stock']) && !$manage_stock_checking_bool) || (!empty($item_meta['manage_stock']) && $manage_stock_checking_bool && $stock >= $qty)) {
+						$_SESSION['cart']['order_items'][$item_key] = $item;
 					}
 					else {
 						$add_to_cart_checking = true;
@@ -2888,40 +2888,40 @@ 
 				}
 
 				$wps_cart_ctr = new wps_cart();
-				$order = $wps_cart_ctr->calcul_cart_information( array() );
+				$order = $wps_cart_ctr->calcul_cart_information(array());
 				$order['cart_type'] = $wpshop_cart_type;
-				$wps_cart_ctr->store_cart_in_session( $order );
+				$wps_cart_ctr->store_cart_in_session($order);
 			}
 
-			if ( empty($is_make_order_again) ) {
+			if (empty($is_make_order_again)) {
 				$_SESSION['order_id'] = $order_id;
 			}
 			$status = true;
 
-			$result = get_permalink( get_option('wpshop_cart_page_id') );
+			$result = get_permalink(get_option('wpshop_cart_page_id'));
 		}
 
-		$response = array( 'status' => $status, 'response' => $result, 'add_to_cart_checking' => $add_to_cart_checking, 'add_to_cart_checking_message' => $add_to_cart_checking_message);
-		echo json_encode( $response );
+		$response = array('status' => $status, 'response' => $result, 'add_to_cart_checking' => $add_to_cart_checking, 'add_to_cart_checking_message' => $add_to_cart_checking_message);
+		echo json_encode($response);
 		die();
 	}
-	add_action( 'wp_ajax_restart_the_order', 'ajax_wpshop_restart_the_order');
+	add_action('wp_ajax_restart_the_order', 'ajax_wpshop_restart_the_order');
 
 
 
 	function wps_hide_notice_messages() {
-		check_ajax_referer( 'wps_hide_notice_messages' );
+		check_ajax_referer('wps_hide_notice_messages');
 
 		$status = false;
-		$indicator = !empty($_POST['indicator'] ) ? sanitize_text_field($_POST['indicator']) : null;
-		if ( !empty($indicator) ) {
+		$indicator = !empty($_POST['indicator']) ? sanitize_text_field($_POST['indicator']) : null;
+		if (!empty($indicator)) {
 			$user_id = get_current_user_id();
-			$hide_notice_meta = get_user_meta( $user_id, '_wps_hide_notice_messages_indicator', true);
+			$hide_notice_meta = get_user_meta($user_id, '_wps_hide_notice_messages_indicator', true);
 			$hide_notice_meta = !empty($hide_notice_meta) ? $hide_notice_meta : array();
 			$indicators = explode(',', $indicator);
-			if ( !empty($indicators) && is_array($indicators) ) {
-				foreach( $indicators as $i ) {
-					if ( !empty($i) ) {
+			if (!empty($indicators) && is_array($indicators)) {
+				foreach ($indicators as $i) {
+					if (!empty($i)) {
 						$hide_notice_meta[$i] = true;
 					}
 				}
@@ -2930,7 +2930,7 @@ 
 			$status = true;
 		}
 		$response = array('status' => $status);
-		echo json_encode( $response );
+		echo json_encode($response);
 		die();
 	}
 	add_action('wp_ajax_wps_hide_notice_messages', 'wps_hide_notice_messages');
@@ -2938,106 +2938,106 @@ 
 
 
 	function wps_update_products_prices() {
-		check_ajax_referer( 'wps_update_products_prices' );
+		check_ajax_referer('wps_update_products_prices');
 		$action = wpshop_prices::mass_update_prices();
-		$response = array( 'status' => $action[0], 'response' => $action[1] );
-		echo json_encode( $response );
+		$response = array('status' => $action[0], 'response' => $action[1]);
+		echo json_encode($response);
 		die();
 	}
-	add_action( 'wp_ajax_update_products_prices', 'wps_update_products_prices' );
+	add_action('wp_ajax_update_products_prices', 'wps_update_products_prices');
 
 	/** Quotation is payable by customer **/
 	function wps_quotation_is_payable_by_customer() {
-		check_ajax_referer( 'wps_quotation_is_payable_by_customer' );
+		check_ajax_referer('wps_quotation_is_payable_by_customer');
 		global $wpdb;
 		$status = false;
 		$response = '';
-		$order_id = ( !empty($_POST['order_id']) ) ? intval( $_POST['order_id'] ) : null;
-		if( isset($order_id) ) {
-			$order_metadata = get_post_meta( $order_id, '_order_postmeta', true );
-			if( isset( $order_metadata['pay_quotation'] ) ) {
-				unset( $order_metadata['pay_quotation'] );
+		$order_id = (!empty($_POST['order_id'])) ? intval($_POST['order_id']) : null;
+		if (isset($order_id)) {
+			$order_metadata = get_post_meta($order_id, '_order_postmeta', true);
+			if (isset($order_metadata['pay_quotation'])) {
+				unset($order_metadata['pay_quotation']);
 			} else {
 				$order_metadata['pay_quotation'] = 'on';
 			}
-			update_post_meta( $order_id, '_order_postmeta', $order_metadata );
+			update_post_meta($order_id, '_order_postmeta', $order_metadata);
 
-			$response = wpshop_orders::display_customer_pay_quotation( isset( $order_metadata['pay_quotation'] ), $order_id );
+			$response = wpshop_orders::display_customer_pay_quotation(isset($order_metadata['pay_quotation']), $order_id);
 			$status = true;
 		} else {
-			$response = __( 'An error was occured, no Order ID defined', 'wpshop' );
+			$response = __('An error was occured, no Order ID defined', 'wpshop');
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		die();
 	}
-	add_action( 'wp_ajax_wps_quotation_is_payable_by_customer', 'wps_quotation_is_payable_by_customer' );
+	add_action('wp_ajax_wps_quotation_is_payable_by_customer', 'wps_quotation_is_payable_by_customer');
 
 	/** Send a direct payment Link **/
 	function wps_send_direct_payment_link() {
-		check_ajax_referer( 'wps_send_direct_payment_link' );
+		check_ajax_referer('wps_send_direct_payment_link');
 		global $wpdb;
 		$status = false; $response = '';
-		$order_id = ( !empty($_POST['order_id']) ) ? (int) $_POST['order_id'] : null;
-		if( !empty($order_id) ) {
+		$order_id = (!empty($_POST['order_id'])) ? (int)$_POST['order_id'] : null;
+		if (!empty($order_id)) {
 			/** Get the customer **/
-			$order_metadata = get_post_meta( $order_id, '_order_postmeta', true );
-			if( !empty($order_metadata) && !empty($order_metadata['customer_id']) && !empty($order_metadata['order_status']) && $order_metadata['order_status'] == 'awaiting_payment' ) {
-				$user_infos = get_userdata( $order_metadata['customer_id'] );
+			$order_metadata = get_post_meta($order_id, '_order_postmeta', true);
+			if (!empty($order_metadata) && !empty($order_metadata['customer_id']) && !empty($order_metadata['order_status']) && $order_metadata['order_status'] == 'awaiting_payment') {
+				$user_infos = get_userdata($order_metadata['customer_id']);
 
-				$first_name =  get_user_meta($user_infos->ID, 'first_name', true);
-				$last_name =  get_user_meta($user_infos->ID, 'last_name', true);
+				$first_name = get_user_meta($user_infos->ID, 'first_name', true);
+				$last_name = get_user_meta($user_infos->ID, 'last_name', true);
 
 
 				/** Create an activation key **/
-				$token = wps_orders_ctr::wps_token_order_customer( $order_id );
+				$token = wps_orders_ctr::wps_token_order_customer($order_id);
 				/*$token = wp_generate_password(20, false);
 				$wpdb->update($wpdb->users, array('user_activation_key' => $token), array('user_login' => $user_infos->user_login) );*/
 
-				$permalink_option = get_option( 'permalink_structure' );
-				$link = '<a href="' . wpshop_checkout::wps_direct_payment_link_url( $order_id ) . '">' .__( 'Click here to pay your order', 'wpshop' ). '</a>';
+				$permalink_option = get_option('permalink_structure');
+				$link = '<a href="' . wpshop_checkout::wps_direct_payment_link_url($order_id) . '">' . __('Click here to pay your order', 'wpshop') . '</a>';
 
 				/** Send message **/
 				$wps_message = new wps_message_ctr();
 				$wps_message->wpshop_prepared_email($user_infos->user_email,
 				'WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE',
-				array( 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'direct_payment_link' => $link, 'order_content' => '' )
+				array('customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'direct_payment_link' => $link, 'order_content' => '')
 				);
 
-				$response = __( 'Direct payment link has been send', 'wpshop' );
+				$response = __('Direct payment link has been send', 'wpshop');
 				$status = true;
 			}
 			else {
-				$response = __( 'An error was occured', 'wpshop' );
+				$response = __('An error was occured', 'wpshop');
 			}
 		}
 		else {
-			$response = __( 'An error was occured, no Order ID defined', 'wpshop' );
+			$response = __('An error was occured, no Order ID defined', 'wpshop');
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		die();
 	}
-	add_action( 'wp_ajax_wps_send_direct_payment_link', 'wps_send_direct_payment_link' );
+	add_action('wp_ajax_wps_send_direct_payment_link', 'wps_send_direct_payment_link');
 
 	function wps_mass_action_product() {
-		check_ajax_referer( 'wps_mass_action_product' );
+		check_ajax_referer('wps_mass_action_product');
 		$mass_actions_tools_page = '';
-		$default_attributes = array( 'product_stock', 'barcode', 'product_price', 'special_price', );
+		$default_attributes = array('product_stock', 'barcode', 'product_price', 'special_price',);
 
 		/**	Copy an attribute content to another	*/
-		$attribute_list = wpshop_attributes::getElement(wpshop_entities::get_entity_identifier_from_code( WPSHOP_PRODUCT ), "'valid'", 'entity_id', true);
-		if ( !empty( $attribute_list ) ) {
+		$attribute_list = wpshop_attributes::getElement(wpshop_entities::get_entity_identifier_from_code(WPSHOP_PRODUCT), "'valid'", 'entity_id', true);
+		if (!empty($attribute_list)) {
 			$mass_actions_tools_page .= '
-			<form action="' . admin_url( "admin-ajax.php" ) . '" method="POST" id="wps_mass_action_on_entity_form" >
+			<form action="' . admin_url("admin-ajax.php") . '" method="POST" id="wps_mass_action_on_entity_form" >
 				<input type="hidden" value="wps_mass_action_on_entity_launch" name="action" />
-				<!--<div>' . __( 'Choose attribute to display into list', 'wpshop' ) . '
+				<!--<div>' . __('Choose attribute to display into list', 'wpshop') . '
 					<ul>';
-			foreach ( $attribute_list as $attribute ) {
+			foreach ($attribute_list as $attribute) {
 				$mass_actions_tools_page .= '
-						<li style="display:inline-block; width:10%;" ><input type="checkbox"' . checked( in_array( $attribute->code, $default_attributes ), true, false ) . ' name="wps_tools_mass_action_on_element[]" value="' . $attribute->id . '" />' . __( $attribute->frontend_label, 'wpshop' ) . '</li>';
+						<li style="display:inline-block; width:10%;" ><input type="checkbox"' . checked(in_array($attribute->code, $default_attributes), true, false) . ' name="wps_tools_mass_action_on_element[]" value="' . $attribute->id . '" />' . __($attribute->frontend_label, 'wpshop') . '</li>';
 			}
 			$mass_actions_tools_page .= '
 					</ul>
-					<button>' . __( 'Voir la liste des produits', 'wpshop' ) . '</button> -->
+					<button>' . __('Voir la liste des produits', 'wpshop') . '</button> -->
 				</div>
 			</form>
 			<div id="wps_entity_list" >' . wps_mass_action_on_entity_launch() . '</div>
@@ -3050,32 +3050,32 @@ 
 			</script>';
 		}
 
-		wp_die( $mass_actions_tools_page );
+		wp_die($mass_actions_tools_page);
 	}
-	add_action( 'wp_ajax_wps_mass_action_product', 'wps_mass_action_product' );
+	add_action('wp_ajax_wps_mass_action_product', 'wps_mass_action_product');
 
 	function wps_put_history_back() {
-		check_ajax_referer( 'wps_put_history_back' );
+		check_ajax_referer('wps_put_history_back');
 
 		global $wpdb;
 		$upload_dir = wp_upload_dir();
-		$log_dir = $upload_dir[ 'basedir' ] . '/wps_repair/';
-		wp_mkdir_p( $log_dir );
-		$value_to_take = !empty($_POST[ 'value_to_take' ]) ? (array) $_POST[ 'value_to_take' ] : array();
-		foreach ( $value_to_take as $product_id => $product_element ) {
-			foreach( $product_element as $attribute_id => $attribute_value_to_take ){
-				$query = $wpdb->prepare( "SELECT value, value_type FROM wp_wpshop__attribute_value__histo WHERE value_id = %d", $attribute_value_to_take );
-				$the_new_value = $wpdb->get_row( $query );
-				if ( 6 == $attribute_id ) {
-					$query = $wpdb->prepare( "SELECT OPT.value, HISTO.value AS rate_id FROM wp_wpshop__attribute_value_options AS OPT INNER JOIN wp_wpshop__attribute_value__histo AS HISTO ON ( ( HISTO.attribute_id = OPT.attribute_id ) AND ( HISTO.value = OPT.id ) ) WHERE HISTO.attribute_id = 29 AND HISTO.entity_id = %d ORDER BY HISTO.creation_date_value DESC LIMIT 1", $product_id );
-					$the_tax = $wpdb->get_row( $query );
-					$pttc = number_format( $the_new_value->value, 5, ".", " " );
-					$ht = number_format( $pttc / ( 1 + ( $the_tax->value / 100 ) ), 5, ".", " " );
-					$tax_amount = number_format( $pttc - $ht, 5, ".", " " );
-					$wpdb->delete( 'wp_wpshop__attribute_value_decimal', array( "entity_id" => $product_id, "attribute_id" => 6 ) );
-					$wpdb->delete( 'wp_wpshop__attribute_value_decimal', array( "entity_id" => $product_id, "attribute_id" => 28 ) );
-					$wpdb->delete( 'wp_wpshop__attribute_value_integer', array( "entity_id" => $product_id, "attribute_id" => 29 ) );
-					$wpdb->delete( 'wp_wpshop__attribute_value_decimal', array( "entity_id" => $product_id, "attribute_id" => 30 ) );
+		$log_dir = $upload_dir['basedir'] . '/wps_repair/';
+		wp_mkdir_p($log_dir);
+		$value_to_take = !empty($_POST['value_to_take']) ? (array)$_POST['value_to_take'] : array();
+		foreach ($value_to_take as $product_id => $product_element) {
+			foreach ($product_element as $attribute_id => $attribute_value_to_take) {
+				$query = $wpdb->prepare("SELECT value, value_type FROM wp_wpshop__attribute_value__histo WHERE value_id = %d", $attribute_value_to_take);
+				$the_new_value = $wpdb->get_row($query);
+				if (6 == $attribute_id) {
+					$query = $wpdb->prepare("SELECT OPT.value, HISTO.value AS rate_id FROM wp_wpshop__attribute_value_options AS OPT INNER JOIN wp_wpshop__attribute_value__histo AS HISTO ON ( ( HISTO.attribute_id = OPT.attribute_id ) AND ( HISTO.value = OPT.id ) ) WHERE HISTO.attribute_id = 29 AND HISTO.entity_id = %d ORDER BY HISTO.creation_date_value DESC LIMIT 1", $product_id);
+					$the_tax = $wpdb->get_row($query);
+					$pttc = number_format($the_new_value->value, 5, ".", " ");
+					$ht = number_format($pttc / (1 + ($the_tax->value / 100)), 5, ".", " ");
+					$tax_amount = number_format($pttc - $ht, 5, ".", " ");
+					$wpdb->delete('wp_wpshop__attribute_value_decimal', array("entity_id" => $product_id, "attribute_id" => 6));
+					$wpdb->delete('wp_wpshop__attribute_value_decimal', array("entity_id" => $product_id, "attribute_id" => 28));
+					$wpdb->delete('wp_wpshop__attribute_value_integer', array("entity_id" => $product_id, "attribute_id" => 29));
+					$wpdb->delete('wp_wpshop__attribute_value_decimal', array("entity_id" => $product_id, "attribute_id" => 30));
 
 					$common_datas = array(
 						'value_id' => null,
@@ -3083,20 +3083,20 @@ 
 						'entity_id' => $product_id,
 						'unit_id' => null,
 						'user_id' => 1,
-						'creation_date_value' => current_time( "mysql", 0 ),
+						'creation_date_value' => current_time("mysql", 0),
 						'language' => 'fr_FR',
 					);
 
-					$content_to_write =  "
-" . mysql2date( "d/m/Y H:i", current_time( 'mysql', 0 ), true ) . ' - ' . $product_id . ' - ' . serialize( $common_datas ) . ' - ' . serialize( array( 'ttc' => $pttc,  'ht' => $ht,  'tax_rate_id' => $the_tax->rate_id,  'tax_amount' => $tax_amount,  ) ). '';
-					$fp = fopen( $log_dir . 'correction_prix.txt', 'a' );
-					fwrite( $fp, $content_to_write );
-					fclose( $fp );
+					$content_to_write = "
+" . mysql2date("d/m/Y H:i", current_time('mysql', 0), true) . ' - ' . $product_id . ' - ' . serialize($common_datas) . ' - ' . serialize(array('ttc' => $pttc, 'ht' => $ht, 'tax_rate_id' => $the_tax->rate_id, 'tax_amount' => $tax_amount,)) . '';
+					$fp = fopen($log_dir . 'correction_prix.txt', 'a');
+					fwrite($fp, $content_to_write);
+					fclose($fp);
 
-					$wpdb->insert( 'wp_wpshop__attribute_value_decimal', array_merge( $common_datas, array( 'attribute_id' => 6, 'value' => $pttc ) ) );
-					$wpdb->insert( 'wp_wpshop__attribute_value_decimal', array_merge( $common_datas, array( 'attribute_id' => 28, 'value' => $ht ) ) );
-					$wpdb->insert( 'wp_wpshop__attribute_value_integer', array_merge( $common_datas, array( 'attribute_id' => 29, 'value' => $the_tax->rate_id ) ) );
-					$wpdb->insert( 'wp_wpshop__attribute_value_decimal', array_merge( $common_datas, array( 'attribute_id' => 30, 'value' => $tax_amount ) ) );
+					$wpdb->insert('wp_wpshop__attribute_value_decimal', array_merge($common_datas, array('attribute_id' => 6, 'value' => $pttc)));
+					$wpdb->insert('wp_wpshop__attribute_value_decimal', array_merge($common_datas, array('attribute_id' => 28, 'value' => $ht)));
+					$wpdb->insert('wp_wpshop__attribute_value_integer', array_merge($common_datas, array('attribute_id' => 29, 'value' => $the_tax->rate_id)));
+					$wpdb->insert('wp_wpshop__attribute_value_decimal', array_merge($common_datas, array('attribute_id' => 30, 'value' => $tax_amount)));
 				}
 				else {
 					$common_datas = array(
@@ -3105,33 +3105,33 @@ 
 						'entity_id' => $product_id,
 						'unit_id' => null,
 						'user_id' => 1,
-						'creation_date_value' => current_time( "mysql", 0 ),
+						'creation_date_value' => current_time("mysql", 0),
 						'language' => 'fr_FR',
 					);
-					$wpdb->delete( $the_new_value->value_type, array( "entity_id" => $product_id, "attribute_id" => $attribute_id ) );
-					$wpdb->insert( $the_new_value->value_type, array_merge( $common_datas, array( 'attribute_id' => $attribute_id, 'value' => trim( $the_new_value->value ) ) ) );
-
-					$content_to_write =  "
-" . mysql2date( "d/m/Y H:i", current_time( 'mysql', 0 ), true ) . ' - ' . $product_id . ' - ' . serialize( $common_datas ) . ' - ' . serialize( array( 'attribute_id' => $attribute_id, 'value' => trim( $the_new_value->value ),  ) ). '';
-					$fp = fopen( $log_dir . 'correction_attribut.txt', 'a' );
-					fwrite( $fp, $content_to_write );
-					fclose( $fp );
+					$wpdb->delete($the_new_value->value_type, array("entity_id" => $product_id, "attribute_id" => $attribute_id));
+					$wpdb->insert($the_new_value->value_type, array_merge($common_datas, array('attribute_id' => $attribute_id, 'value' => trim($the_new_value->value))));
+
+					$content_to_write = "
+" . mysql2date("d/m/Y H:i", current_time('mysql', 0), true) . ' - ' . $product_id . ' - ' . serialize($common_datas) . ' - ' . serialize(array('attribute_id' => $attribute_id, 'value' => trim($the_new_value->value),)) . '';
+					$fp = fopen($log_dir . 'correction_attribut.txt', 'a');
+					fwrite($fp, $content_to_write);
+					fclose($fp);
 				}
 			}
 		}
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_put_history_back', 'wps_put_history_back' );
+	add_action('wp_ajax_wps_put_history_back', 'wps_put_history_back');
 
 	function wps_mass_action_on_entity_launch() {
 		global $wpdb;
 		$response = '';
 		$element_to_output = array();
 
-		$attributes_to_test = array( 'decimal' => '6,36', 'varchar' => '12', 'integer' => '85', 'text' => '120, 118' );
+		$attributes_to_test = array('decimal' => '6,36', 'varchar' => '12', 'integer' => '85', 'text' => '120, 118');
 
 		$decimal_attribute = $attributes_to_test['decimal']; //,30,28
-		$query = $wpdb->prepare( "
+		$query = $wpdb->prepare("
 				SELECT P.ID, P.post_title,
 					D.value_id, H.value_id, D.attribute_id, D.entity_id, H.creation_date, D.creation_date_value, D.value AS current_value, H.value AS last_history_value
 				FROM {$wpdb->posts} AS P
@@ -3145,21 +3145,21 @@ 
 					AND H.value_type = 'wp_wpshop__attribute_value_decimal'
 
 				ORDER BY H.entity_id ASC, H.value_id DESC",
-			array( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, "publish", )
+			array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, "publish",)
 		);
-		 $list_of_element = $wpdb->get_results( $query );
-		 if ( !empty( $list_of_element ) ) {
-			foreach ( $list_of_element as $element ) {
-				$element_to_output[ $element->ID ][ 'title' ] = $element->post_title;
-				$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'current' ] = $element->current_value;
-			 	$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'histo' ][ 'value_id' ] = $element->value_id;
-			 	$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'histo' ][ 'value_date' ] = $element->creation_date;
-			 	$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'histo' ][ 'value' ] = $element->last_history_value;
+		 $list_of_element = $wpdb->get_results($query);
+		 if (!empty($list_of_element)) {
+			foreach ($list_of_element as $element) {
+				$element_to_output[$element->ID]['title'] = $element->post_title;
+				$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['current'] = $element->current_value;
+			 	$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['histo']['value_id'] = $element->value_id;
+			 	$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['histo']['value_date'] = $element->creation_date;
+			 	$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['histo']['value'] = $element->last_history_value;
 			}
 		}
 
 		$attribute_list = $attributes_to_test['varchar'];
-		$query = $wpdb->prepare( "
+		$query = $wpdb->prepare("
 			SELECT P.ID, P.post_title,
 				D.value_id, H.value_id, D.attribute_id, D.entity_id, H.creation_date, D.creation_date_value, D.value AS current_value, H.value AS last_history_value
 			FROM {$wpdb->posts} AS P
@@ -3172,22 +3172,22 @@ 
 				AND H.value != ''
 				AND H.value_type = 'wp_wpshop__attribute_value_varchar'
 			ORDER BY H.creation_date",
-			array( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, "publish", )
+			array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, "publish",)
 		);
-		$list_of_element = $wpdb->get_results( $query );
-		if ( !empty( $list_of_element ) ) {
-			foreach ( $list_of_element as $element ) {
-			 	$element_to_output[ $element->ID ][ 'title' ] = $element->post_title;
-			 	$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'current' ] = $element->current_value;
-			 	$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'histo' ][ 'value_id' ] = $element->value_id;
-			 	$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'histo' ][ 'value_date' ] = $element->creation_date;
-			 	$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'histo' ][ 'value' ] = $element->last_history_value;
+		$list_of_element = $wpdb->get_results($query);
+		if (!empty($list_of_element)) {
+			foreach ($list_of_element as $element) {
+			 	$element_to_output[$element->ID]['title'] = $element->post_title;
+			 	$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['current'] = $element->current_value;
+			 	$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['histo']['value_id'] = $element->value_id;
+			 	$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['histo']['value_date'] = $element->creation_date;
+			 	$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['histo']['value'] = $element->last_history_value;
 			}
 		}
 
 
 		$attribute_list = $attributes_to_test['text'];
-		$query = $wpdb->prepare( "
+		$query = $wpdb->prepare("
 				SELECT P.ID, P.post_title,
 				D.value_id, H.value_id, D.attribute_id, D.entity_id, H.creation_date, D.creation_date_value, D.value AS current_value, H.value AS last_history_value
 				FROM {$wpdb->posts} AS P
@@ -3200,21 +3200,21 @@ 
 				AND H.value != ''
 				AND H.value_type = 'wp_wpshop__attribute_value_text'
 			ORDER BY H.creation_date",
-			array( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, "publish", )
+			array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, "publish",)
 		);
-		$list_of_element = $wpdb->get_results( $query );
-		if ( !empty( $list_of_element ) ) {
-		foreach ( $list_of_element as $element ) {
-		 	$element_to_output[ $element->ID ][ 'title' ] = $element->post_title;
-		 	$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'current' ] = $element->current_value;
-		 	$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'histo' ][ 'value_id' ] = $element->value_id;
-		 	$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'histo' ][ 'value_date' ] = $element->creation_date;
-		 	$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'histo' ][ 'value' ] = $element->last_history_value;
+		$list_of_element = $wpdb->get_results($query);
+		if (!empty($list_of_element)) {
+		foreach ($list_of_element as $element) {
+		 	$element_to_output[$element->ID]['title'] = $element->post_title;
+		 	$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['current'] = $element->current_value;
+		 	$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['histo']['value_id'] = $element->value_id;
+		 	$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['histo']['value_date'] = $element->creation_date;
+		 	$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['histo']['value'] = $element->last_history_value;
 		 	}
 		}
 
 		$attribute_list = $attributes_to_test['integer'];
-		$query = $wpdb->prepare( "
+		$query = $wpdb->prepare("
 				SELECT P.ID, P.post_title,
 				D.value_id, H.value_id, D.attribute_id, D.entity_id, H.creation_date, D.creation_date_value, D.value AS current_value, H.value AS last_history_value
 				FROM {$wpdb->posts} AS P
@@ -3227,21 +3227,21 @@ 
 				AND H.value != ''
 				AND H.value_type = 'wp_wpshop__attribute_value_integer'
 			ORDER BY H.creation_date",
-			array( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, "publish", )
+			array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, "publish",)
 		);
-							$list_of_element = $wpdb->get_results( $query );
-							if ( !empty( $list_of_element ) ) {
-							foreach ( $list_of_element as $element ) {
-					 	$element_to_output[ $element->ID ][ 'title' ] = $element->post_title;
-					 	$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'current' ] = $element->current_value;
-					 	$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'histo' ][ 'value_id' ] = $element->value_id;
-					 	$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'histo' ][ 'value_date' ] = $element->creation_date;
-					 	$element_to_output[ $element->ID ][ 'content' ][ $element->attribute_id ][ $element->creation_date ][ 'histo' ][ 'value' ] = $element->last_history_value;
+							$list_of_element = $wpdb->get_results($query);
+							if (!empty($list_of_element)) {
+							foreach ($list_of_element as $element) {
+					 	$element_to_output[$element->ID]['title'] = $element->post_title;
+					 	$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['current'] = $element->current_value;
+					 	$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['histo']['value_id'] = $element->value_id;
+					 	$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['histo']['value_date'] = $element->creation_date;
+					 	$element_to_output[$element->ID]['content'][$element->attribute_id][$element->creation_date]['histo']['value'] = $element->last_history_value;
 					 	}
 							}
 
 		$array_done = array();
-		if ( !empty( $element_to_output ) ) {
+		if (!empty($element_to_output)) {
 			$lines = '';
 			$done_header = array();
 
@@ -3249,23 +3249,23 @@ 
 			/** Formate informations **/
 			$formatted_datas = array();
 			$controller_rows_array = array();
-			foreach( $attributes_to_test as $attribute_to_test ) {
-				$atts = explode( ',', $attribute_to_test );
-				foreach( $atts as $att ) {
-					$controller_rows_array[ $att ] = false;
+			foreach ($attributes_to_test as $attribute_to_test) {
+				$atts = explode(',', $attribute_to_test);
+				foreach ($atts as $att) {
+					$controller_rows_array[$att] = false;
 				}
 			}
 
-			foreach(  $element_to_output as $element_id => $element_definition ) {
+			foreach ($element_to_output as $element_id => $element_definition) {
 				$formatted_datas[$element_id]['title'] = $element_definition['title'];
 				$formatted_datas[$element_id]['content'] = array();
 
-				foreach( $attributes_to_test as $attribute_to_test ) {
-					$atts = explode( ',', $attribute_to_test );
-					foreach( $atts as $att ) {
-						if( !empty($element_definition['content'][$att]) ) {
+				foreach ($attributes_to_test as $attribute_to_test) {
+					$atts = explode(',', $attribute_to_test);
+					foreach ($atts as $att) {
+						if (!empty($element_definition['content'][$att])) {
 							$formatted_datas[$element_id]['content'][$att] = $element_definition['content'][$att];
-							$controller_rows_array[ $att ] = true;
+							$controller_rows_array[$att] = true;
 						}
 						else {
 							$formatted_datas[$element_id]['content'][$att] = array();
@@ -3274,39 +3274,39 @@ 
 				}
 			}
 
-			foreach ( $formatted_datas as $element_id => $element_definition ) {
-				if ( !in_array( $element_id, $array_done ) ) {
-					$lines .= '<tr  style="border:1px solid black;"><td  style="border:1px solid black;" >#' . $element_id . ' - ' . $element_definition[ 'title' ] . '</td>';
-					ksort( $element_definition[ 'content' ] );
-					foreach ( $element_definition[ 'content' ] as $atribute_id => $value_on_date ) {
-						if( $controller_rows_array[$atribute_id] ) {
-							$current_attribute = wpshop_attributes::getElement( $atribute_id );
-							if ( !in_array( $atribute_id, $done_header ) ) {
-								$more_header .= '<td style="border:1px solid black;" >' . __( $current_attribute->frontend_label, 'wpshop' ) . '</td>';
+			foreach ($formatted_datas as $element_id => $element_definition) {
+				if (!in_array($element_id, $array_done)) {
+					$lines .= '<tr  style="border:1px solid black;"><td  style="border:1px solid black;" >#' . $element_id . ' - ' . $element_definition['title'] . '</td>';
+					ksort($element_definition['content']);
+					foreach ($element_definition['content'] as $atribute_id => $value_on_date) {
+						if ($controller_rows_array[$atribute_id]) {
+							$current_attribute = wpshop_attributes::getElement($atribute_id);
+							if (!in_array($atribute_id, $done_header)) {
+								$more_header .= '<td style="border:1px solid black;" >' . __($current_attribute->frontend_label, 'wpshop') . '</td>';
 								$done_header[] = $atribute_id;
 							}
 							$last_value = 'XXXXX';
 							$counter_for_line = 0;
 							$content_line = '';
-							foreach ( $value_on_date as $date => $value ) {
-								if ( $value[ 'histo' ][ 'value' ] != $last_value ) {
-									$current_val = $value[ 'current' ];
-									$old_val = $value[ 'histo' ][ 'value' ];
+							foreach ($value_on_date as $date => $value) {
+								if ($value['histo']['value'] != $last_value) {
+									$current_val = $value['current'];
+									$old_val = $value['histo']['value'];
 									// Test if attribute data Type is integer
-									if ( $current_attribute->data_type == 'integer' ) {
-										if( $current_attribute->data_type_to_use == 'internal' ) {
+									if ($current_attribute->data_type == 'integer') {
+										if ($current_attribute->data_type_to_use == 'internal') {
 											$current_val = get_the_title($current_val);
 											$old_val = get_the_title($old_val);
 										}
 										else {
-											$query = $wpdb->prepare( 'SELECT label FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS.' WHERE id=%d', $old_val);
-											$old_val = $wpdb->get_var( $query );
-											$query = $wpdb->prepare( 'SELECT label FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS.' WHERE id=%d', $current_val);
-											$current_val = $wpdb->get_var( $query );
+											$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id=%d', $old_val);
+											$old_val = $wpdb->get_var($query);
+											$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id=%d', $current_val);
+											$current_val = $wpdb->get_var($query);
 										}
 									}
-									$content_line .= '<label ><input type="radio" name="value_to_take[' . $element_id . '][' . $atribute_id . ']" value="' . $value[ 'histo' ][ 'value_id' ] . '"' . checked( ( 0 == $counter_for_line ? true : false), true, false ) . '/>' . __( 'Current value', 'wpshop' ) . ' : ' .$current_val. ' / ' . __( 'Last value', 'wpshop' ) . ' : ' .$old_val. '</label><br/>';
-									$last_value = $value[ 'histo' ][ 'value' ];
+									$content_line .= '<label ><input type="radio" name="value_to_take[' . $element_id . '][' . $atribute_id . ']" value="' . $value['histo']['value_id'] . '"' . checked((0 == $counter_for_line ? true : false), true, false) . '/>' . __('Current value', 'wpshop') . ' : ' . $current_val . ' / ' . __('Last value', 'wpshop') . ' : ' . $old_val . '</label><br/>';
+									$last_value = $value['histo']['value'];
 									$counter_for_line++;
 								}
 							}
@@ -3316,16 +3316,16 @@ 
 						}
 					}
 					$lines .= '</tr>';
-					$array_done[ $element_id ];
+					$array_done[$element_id];
 				}
 			}
 
 			$response = '
-				<form action="' . admin_url( 'admin-ajax.php' ) . '" method="POST" id="wps_put_histo_back" >
+				<form action="' . admin_url('admin-ajax.php') . '" method="POST" id="wps_put_histo_back" >
 					<input type="text" name="action" value="wps_put_history_back" />
-					' . wp_nonce_field( 'wps_put_history_back' ) . '
+					' . wp_nonce_field('wps_put_history_back') . '
 					<table style="border-collapse: collapse;border:1px solid black;" cellpadding="0" cellspacing="0" >
-						<tr style="border:1px solid black;"><td style="border:1px solid black;" >' . __( 'Product', 'wpshop' ) . '</td>'.$more_header.'</tr>
+						<tr style="border:1px solid black;"><td style="border:1px solid black;" >' . __('Product', 'wpshop') . '</td>' . $more_header . '</tr>
 						' . $lines . '
 					</table>
 				</form><script type="text/javascript" >
@@ -3342,36 +3342,36 @@ 
 
 
 	function wps_delete_picture_category() {
-		check_ajax_referer( 'wps_delete_picture_category' );
+		check_ajax_referer('wps_delete_picture_category');
 		$status = false; $response = '';
-		$cat_id = ( !empty($_POST['cat_id']) ) ? (int) $_POST['cat_id'] : null;
-		if( !empty($cat_id) ) {
+		$cat_id = (!empty($_POST['cat_id'])) ? (int)$_POST['cat_id'] : null;
+		if (!empty($cat_id)) {
 			// Get Category option
-			$category_option = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $cat_id );
-			if( !empty($category_option) && !empty($category_option['wpshop_category_picture']) ) {
-				unset( $category_option['wpshop_category_picture'] );
-				update_option( WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $cat_id, $category_option );
-				$response = '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="category_thumbnail_preview"/>';
+			$category_option = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $cat_id);
+			if (!empty($category_option) && !empty($category_option['wpshop_category_picture'])) {
+				unset($category_option['wpshop_category_picture']);
+				update_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $cat_id, $category_option);
+				$response = '<img src="' . WPSHOP_DEFAULT_CATEGORY_PICTURE . '" alt="No picture" class="category_thumbnail_preview"/>';
 				$status = true;
 			}
 			else {
-				$response = __( 'Category options are not defined', 'wpshop');
+				$response = __('Category options are not defined', 'wpshop');
 			}
 		}
 		else {
-			$response = __( 'Category ID is not defined', 'wpshop');
+			$response = __('Category ID is not defined', 'wpshop');
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_delete_picture_category', 'wps_delete_picture_category' );
+	add_action('wp_ajax_wps_delete_picture_category', 'wps_delete_picture_category');
 
 	/* EAV */
 
 	/* ATTRIBUTES SET */
 
 	function saveNewAttributeSetSection() {
-		check_ajax_referer( 'saveNewAttributeSetSection' );
+		check_ajax_referer('saveNewAttributeSetSection');
 		global $wpdb;
 		$attributeSetSectionName = sanitize_text_field($_REQUEST['attributeSetSectionName']);
 		$elementIdentifier = (int)$_REQUEST['elementIdentifier'];
@@ -3379,37 +3379,37 @@ 
 		$attributeSetInfos['id'] = '';
 		$attributeSetInfos['status'] = 'valid';
 		$attributeSetInfos['attribute_set_id'] = $elementIdentifier;
-		$query = $wpdb->prepare("SELECT MAX(position) + 1 AS LAST_GROUP_POSITION FROM ". WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id = %s", $elementIdentifier);
+		$query = $wpdb->prepare("SELECT MAX(position) + 1 AS LAST_GROUP_POSITION FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id = %s", $elementIdentifier);
 		$attributeSetInfos['position'] = $wpdb->get_var($query);
 		$attributeSetInfos['creation_date'] = date('Y-m-d H:i:s');
 		$attributeSetInfos['code'] = wpshop_tools::slugify($attributeSetSectionName, array('noAccent', 'noSpaces', 'lowerCase'));
 		$attributeSetInfos['name'] = $attributeSetSectionName;
 
-		$more_script='';
+		$more_script = '';
 		$attributeSetSectionCreation = wpshop_database::save($attributeSetInfos, WPSHOP_DBT_ATTRIBUTE_GROUP);
-		if ( $attributeSetSectionCreation == 'done' ) {
+		if ($attributeSetSectionCreation == 'done') {
 			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_SUCCES_ICON . '\' alt=\'action_success\' class=\'wpshopPageMessage_Icon\' />' . __('New section has been created successfully', 'wpshop');
-			$more_script = 'wpshop_go_to("#attribute_group_'.$wpdb->insert_id.'")';
+			$more_script = 'wpshop_go_to("#attribute_group_' . $wpdb->insert_id . '")';
 		}
 		else {
 			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_ERROR_ICON . '\' alt=\'action_error\' class=\'wpshopPageMessage_Icon\' />' . __('An error occured while saving new section', 'wpshop');
 		}
 
-		$script = '<script type="text/javascript" >wpshop(document).ready(function(){	jQuery("#wpshop_new_set_section_add").dialog("close");jQuery("#wpshop_new_set_section_add").children("img").hide(); });wpshopShowMessage("' . $attributeSetSectionCreation_Result . '");hideShowMessage(5000);'.$more_script.'</script>';
-		wp_die( wpshop_attributes_set::attributeSetDetailsManagement($elementIdentifier) . $script );
+		$script = '<script type="text/javascript" >wpshop(document).ready(function(){	jQuery("#wpshop_new_set_section_add").dialog("close");jQuery("#wpshop_new_set_section_add").children("img").hide(); });wpshopShowMessage("' . $attributeSetSectionCreation_Result . '");hideShowMessage(5000);' . $more_script . '</script>';
+		wp_die(wpshop_attributes_set::attributeSetDetailsManagement($elementIdentifier) . $script);
 	}
-	add_action( 'wp_ajax_wps_attribute_set_section_new', 'saveNewAttributeSetSection' );
+	add_action('wp_ajax_wps_attribute_set_section_new', 'saveNewAttributeSetSection');
 
 	function editAttributeSetSection() {
-		check_ajax_referer( 'editAttributeSetSection' );
+		check_ajax_referer('editAttributeSetSection');
 		$attributeSetSectionName = sanitize_title($_REQUEST['attributeSetSectionName']);
 		$attributeSetSectionId = sanitize_key($_REQUEST['attributeSetSectionId']);
 		$attributeSetSectionDefault = sanitize_text_field($_REQUEST['attributeSetSectionDefault']);
 		$backend_display_type = sanitize_text_field($_REQUEST['attributeSetSectionDisplayType']);
 		$display_on_frontend = sanitize_text_field($_REQUEST['attributeSetSectionDisplayinFrontEnd']);
-		$backend_display_type = in_array($backend_display_type, array('movable-tab','fixed-tab')) ? $backend_display_type : 'fixed-tab';
+		$backend_display_type = in_array($backend_display_type, array('movable-tab', 'fixed-tab')) ? $backend_display_type : 'fixed-tab';
 
-		if($attributeSetSectionDefault == 'yes'){
+		if ($attributeSetSectionDefault == 'yes') {
 			$wpdb->update(WPSHOP_DBT_ATTRIBUTE_GROUP, array('last_update_date' => current_time('mysql', 0), 'default_group' => 'no'), array('attribute_set_id' => $elementIdentifier));
 		}
 		$attributeSetInfos = array();
@@ -3419,18 +3419,18 @@ 
 		$attributeSetInfos['backend_display_type'] = $backend_display_type;
 		$attributeSetInfos['display_on_frontend'] = $display_on_frontend;
 		$attributeSetSectionCreation = wpshop_database::update($attributeSetInfos, $attributeSetSectionId, WPSHOP_DBT_ATTRIBUTE_GROUP);
-		if ( $attributeSetSectionCreation == 'done' )
+		if ($attributeSetSectionCreation == 'done')
 			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_SUCCES_ICON . '\' alt=\'action_success\' class=\'wpshopPageMessage_Icon\' />' . __('The section has been updated successfully', 'wpshop');
 		else
 			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_ERROR_ICON . '\' alt=\'action_error\' class=\'wpshopPageMessage_Icon\' />' . __('An error occured while updating the section', 'wpshop');
 		echo wpshop_attributes_set::attributeSetDetailsManagement($elementIdentifier) . '<script type="text/javascript" >wpshopShowMessage("' . $attributeSetSectionCreation_Result . '");hideShowMessage(5000);</script>';
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_attribute_set_section_edit', 'editAttributeSetSection' );
+	add_action('wp_ajax_wps_attribute_set_section_edit', 'editAttributeSetSection');
 
 	function deleteAttributeSetSection() {
-		check_ajax_referer( 'deleteAttributeSetSection' );
-		$attributeSetSectionId = (int) $_REQUEST['attributeSetSectionId'];
+		check_ajax_referer('deleteAttributeSetSection');
+		$attributeSetSectionId = (int)$_REQUEST['attributeSetSectionId'];
 		$attributeSetInfos = array();
 		$attributeSetInfos['status'] = 'deleted';
 		$attributeSetInfos['last_update_date'] = current_time('mysql', 0);
@@ -3439,21 +3439,21 @@ 
 		$attributeSetSectionCreation = wpshop_database::update($attributeSetInfos, $attributeSetSectionId, WPSHOP_DBT_ATTRIBUTE_GROUP);
 
 		$more_script = '';
-		if ( $attributeSetSectionCreation == 'done' ) {
+		if ($attributeSetSectionCreation == 'done') {
 			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_SUCCES_ICON . '\' alt=\'action_success\' class=\'wpshopPageMessage_Icon\' />' . __('The section has been successfully been deleted', 'wpshop');
-			$more_script.='jQuery("#attribute_group_'.$attributeSetSectionId.'").remove();';
+			$more_script .= 'jQuery("#attribute_group_' . $attributeSetSectionId . '").remove();';
 		}
 		else
 			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_ERROR_ICON . '\' alt=\'action_error\' class=\'wpshopPageMessage_Icon\' />' . __('An error occured while deleting the section', 'wpshop');
-		echo '<script type="text/javascript" >wpshopShowMessage("' . $attributeSetSectionCreation_Result . '");hideShowMessage(5000);'.$more_script.'</script>';
+		echo '<script type="text/javascript" >wpshopShowMessage("' . $attributeSetSectionCreation_Result . '");hideShowMessage(5000);' . $more_script . '</script>';
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_attribute_set_section_delete', 'deleteAttributeSetSection' );
+	add_action('wp_ajax_wps_attribute_set_section_delete', 'deleteAttributeSetSection');
 
 	/* ATTRIBUTES UNIT */
 
 	function load_unit_interface() {
-		check_ajax_referer( 'load_unit_interface' );
+		check_ajax_referer('load_unit_interface');
 		?>
 		<div id="wpshop_unit_main_listing_interface">
 			<div class="wpshop_full_page_tabs">
@@ -3472,28 +3472,28 @@ 
 
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_attribute_unit_interface', 'load_unit_interface' );
+	add_action('wp_ajax_wps_attribute_unit_interface', 'load_unit_interface');
 
 	function load_attribute_units() {
-		check_ajax_referer( 'load_attribute_units' );
-		wp_die( wpshop_attributes_unit::elementList() );
+		check_ajax_referer('load_attribute_units');
+		wp_die(wpshop_attributes_unit::elementList());
 	}
-	add_action( 'wp_ajax_wps_attribute_unit_load', 'load_attribute_units' );
+	add_action('wp_ajax_wps_attribute_unit_load', 'load_attribute_units');
 
 	function add_attribute_unit() {
-		check_ajax_referer( 'add_attribute_unit' );
-		wp_die( wpshop_attributes_unit::elementEdition( '' ) );
+		check_ajax_referer('add_attribute_unit');
+		wp_die(wpshop_attributes_unit::elementEdition(''));
 	}
-	add_action( 'wp_ajax_wps_attribute_unit_add', 'add_attribute_unit' );
+	add_action('wp_ajax_wps_attribute_unit_add', 'add_attribute_unit');
 
 	function edit_attribute_unit() {
-		check_ajax_referer( 'edit_attribute_unit_' . ( isset( $_REQUEST['elementIdentifier'] ) ? (int) $_REQUEST['elementIdentifier'] : '' ) );
-		wp_die( wpshop_attributes_unit::elementEdition( isset( $_REQUEST['elementIdentifier'] ) ? (int) $_REQUEST['elementIdentifier'] : '' ) );
+		check_ajax_referer('edit_attribute_unit_' . (isset($_REQUEST['elementIdentifier']) ? (int)$_REQUEST['elementIdentifier'] : ''));
+		wp_die(wpshop_attributes_unit::elementEdition(isset($_REQUEST['elementIdentifier']) ? (int)$_REQUEST['elementIdentifier'] : ''));
 	}
-	add_action( 'wp_ajax_wps_attribute_unit_edit', 'edit_attribute_unit' );
+	add_action('wp_ajax_wps_attribute_unit_edit', 'edit_attribute_unit');
 
 	function save_new_attribute_unit() {
-		check_ajax_referer( 'save_new_attribute_unit' );
+		check_ajax_referer('save_new_attribute_unit');
 		$save_output = '';
 
 		$attribute_unit_informations['id'] = '';
@@ -3507,11 +3507,11 @@ 
 		$attribute_unit_informations['code_iso'] = sanitize_text_field($_POST[WPSHOP_DBT_ATTRIBUTE_UNIT]['code_iso']);
 
 		$save_unit_result = wpshop_database::save($attribute_unit_informations, WPSHOP_DBT_ATTRIBUTE_UNIT);
-		if($save_unit_result == 'done'){
+		if ($save_unit_result == 'done') {
 			$save_output = wpshop_attributes_unit::elementList();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action successful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The new unit has been saved succesfully', 'wpshop');
 		}
-		else{
+		else {
 			$save_output = wpshop_attributes_unit::elementEdition();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during new unit saving', 'wpshop');
 		}
@@ -3519,10 +3519,10 @@ 
 		echo '<script type="text/javascript" >wpshop(document).ready(function(){setTimeout(function(){ wpshop("#wpshopMessage_unit").removeClass("wpshopPageMessage_Updated"); wpshop("#wpshopMessage_unit").html(""); }, 5000);});</script><div class="fade below-h2 wpshopPageMessage wpshopPageMessage_Updated" id="wpshopMessage_unit">' . $save_message . '</div>' . $save_output;
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_attribute_unit_new', 'save_new_attribute_unit' );
+	add_action('wp_ajax_wps_attribute_unit_new', 'save_new_attribute_unit');
 
 	function update_attribute_unit() {
-		check_ajax_referer( 'update_attribute_unit' );
+		check_ajax_referer('update_attribute_unit');
 		$save_output = '';
 
 		$attributeUnitId = sanitize_key($_POST[WPSHOP_DBT_ATTRIBUTE_UNIT]['id']);
@@ -3535,7 +3535,7 @@ 
 		$attribute_unit_informations['change_rate'] = sanitize_text_field($_POST[WPSHOP_DBT_ATTRIBUTE_UNIT]['change_rate']);
 		$attribute_unit_informations['code_iso'] = sanitize_text_field($_POST[WPSHOP_DBT_ATTRIBUTE_UNIT]['code_iso']);
 
-		if ( $attribute_unit_informations['is_default_of_group'] == 'yes' ) {
+		if ($attribute_unit_informations['is_default_of_group'] == 'yes') {
 			$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array(
 				'is_default_of_group' => 'no'
 			), array(
@@ -3543,8 +3543,8 @@ 
 			));
 		}
 
-		$save_unit_result =  wpshop_database::update($attribute_unit_informations, $attributeUnitId, WPSHOP_DBT_ATTRIBUTE_UNIT);
-		if ( $save_unit_result == 'done' ) {
+		$save_unit_result = wpshop_database::update($attribute_unit_informations, $attributeUnitId, WPSHOP_DBT_ATTRIBUTE_UNIT);
+		if ($save_unit_result == 'done') {
 			$save_output = wpshop_attributes_unit::elementList();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action successful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The unit has been saved succesfully', 'wpshop');
 		}
@@ -3556,17 +3556,17 @@ 
 		echo '<script type="text/javascript" >wpshop(document).ready(function(){setTimeout(function(){ wpshop("#wpshopMessage_unit").removeClass("wpshopPageMessage_Updated"); wpshop("#wpshopMessage_unit").html(""); }, 5000);});</script><div class="fade below-h2 wpshopPageMessage wpshopPageMessage_Updated" id="wpshopMessage_unit">' . $save_message . '</div>' . $save_output;
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_attribute_unit_update', 'update_attribute_unit' );
+	add_action('wp_ajax_wps_attribute_unit_update', 'update_attribute_unit');
 
 	function delete_attribute_unit() {
-		check_ajax_referer( 'delete_attribute_unit_' . ( isset( $_REQUEST['elementIdentifier'] ) ? (int) $_REQUEST['elementIdentifier'] : '' ) );
+		check_ajax_referer('delete_attribute_unit_' . (isset($_REQUEST['elementIdentifier']) ? (int)$_REQUEST['elementIdentifier'] : ''));
 		$unit_id = sanitize_key($_REQUEST['elementIdentifier']);
 		$save_output = '';
 
 		$attribute_unit_informations['status'] = 'deleted';
 		$attribute_unit_informations['last_update_date'] = date('Y-m-d H:i:s');
 		$save_unit_result = wpshop_database::update($attribute_unit_informations, $unit_id, WPSHOP_DBT_ATTRIBUTE_UNIT);
-		if ( $save_unit_result == 'done' ) {
+		if ($save_unit_result == 'done') {
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action succesful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The unit has been deleted succesfully', 'wpshop');
 		}
 		else {
@@ -3576,30 +3576,30 @@ 
 		echo '<script type="text/javascript" >wpshop(document).ready(function(){setTimeout(function(){ wpshop("#wpshopMessage_unit").removeClass("wpshopPageMessage_Updated"); wpshop("#wpshopMessage_unit").html(""); }, 5000);});</script><div class="fade below-h2 wpshopPageMessage wpshopPageMessage_Updated" id="wpshopMessage_unit">' . $save_message . '</div>' . wpshop_attributes_unit::elementList();
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_attribute_unit_delete', 'delete_attribute_unit' );
+	add_action('wp_ajax_wps_attribute_unit_delete', 'delete_attribute_unit');
 
 	/* ATTRIBUTES UNIT GROUP */
 
 	function load_attribute_unit_groups() {
-		check_ajax_referer( 'load_attribute_unit_groups' );
-		wp_die( wpshop_attributes_unit::unit_group_list() );
+		check_ajax_referer('load_attribute_unit_groups');
+		wp_die(wpshop_attributes_unit::unit_group_list());
 	}
-	add_action( 'wp_ajax_wps_attribute_group_unit_load', 'load_attribute_unit_groups' );
+	add_action('wp_ajax_wps_attribute_group_unit_load', 'load_attribute_unit_groups');
 
 	function add_attribute_unit_group() {
-		check_ajax_referer( 'add_attribute_unit_group' );
-		wp_die( wpshop_attributes_unit::unit_group_edition( '' ) );
+		check_ajax_referer('add_attribute_unit_group');
+		wp_die(wpshop_attributes_unit::unit_group_edition(''));
 	}
-	add_action( 'wp_ajax_wps_attribute_group_unit_add', 'add_attribute_unit_group' );
+	add_action('wp_ajax_wps_attribute_group_unit_add', 'add_attribute_unit_group');
 
 	function edit_attribute_unit_group() {
-		check_ajax_referer( 'edit_attribute_unit_group_' . ( isset( $_REQUEST['elementIdentifier'] ) ? $_REQUEST['elementIdentifier'] : '' ) );
-		wp_die( wpshop_attributes_unit::unit_group_edition( isset( $_REQUEST['elementIdentifier'] ) ? (int) $_REQUEST['elementIdentifier'] : '' ) );
+		check_ajax_referer('edit_attribute_unit_group_' . (isset($_REQUEST['elementIdentifier']) ? $_REQUEST['elementIdentifier'] : ''));
+		wp_die(wpshop_attributes_unit::unit_group_edition(isset($_REQUEST['elementIdentifier']) ? (int)$_REQUEST['elementIdentifier'] : ''));
 	}
-	add_action( 'wp_ajax_wps_attribute_group_unit_edit', 'edit_attribute_unit_group' );
+	add_action('wp_ajax_wps_attribute_group_unit_edit', 'edit_attribute_unit_group');
 
 	function save_new_attribute_unit_group() {
-		check_ajax_referer( 'save_new_attribute_unit_group' );
+		check_ajax_referer('save_new_attribute_unit_group');
 		$save_output = '';
 
 		$attribute_unit_informations['id'] = '';
@@ -3608,11 +3608,11 @@ 
 		$attribute_unit_informations['name'] = sanitize_text_field($_POST[WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP]['name']);
 
 		$save_unit_result = wpshop_database::save($attribute_unit_informations, WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP);
-		if($save_unit_result == 'done'){
+		if ($save_unit_result == 'done') {
 			$save_output = wpshop_attributes_unit::unit_group_list();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action successful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The new unit group has been saved succesfully', 'wpshop');
 		}
-		else{
+		else {
 			$save_output = wpshop_attributes_unit::unit_group_edition();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during new unit group saving', 'wpshop');
 		}
@@ -3620,10 +3620,10 @@ 
 		echo '<script type="text/javascript" >wpshop(document).ready(function(){setTimeout(function(){ wpshop("#wpshopMessage_unit").removeClass("wpshopPageMessage_Updated"); wpshop("#wpshopMessage_unit").html(""); }, 5000);});</script><div class="fade below-h2 wpshopPageMessage wpshopPageMessage_Updated" id="wpshopMessage_unit">' . $save_message . '</div>' . $save_output;
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_attribute_group_unit_new', 'save_new_attribute_unit_group' );
+	add_action('wp_ajax_wps_attribute_group_unit_new', 'save_new_attribute_unit_group');
 
 	function update_attribute_unit_group() {
-		check_ajax_referer( 'update_attribute_unit_group' );
+		check_ajax_referer('update_attribute_unit_group');
 		$save_output = '';
 
 		$attributeUnitId = sanitize_key($_POST[WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP]['id']);
@@ -3631,12 +3631,12 @@ 
 		$attribute_unit_informations['last_update_date'] = date('Y-m-d H:i:s');
 		$attribute_unit_informations['name'] = sanitize_text_field($_POST[WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP]['name']);
 
-		$save_unit_result =  wpshop_database::update($attribute_unit_informations, $attributeUnitId, WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP);
-		if($save_unit_result == 'done'){
+		$save_unit_result = wpshop_database::update($attribute_unit_informations, $attributeUnitId, WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP);
+		if ($save_unit_result == 'done') {
 			$save_output = wpshop_attributes_unit::unit_group_list();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action successful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The unit group has been saved succesfully', 'wpshop');
 		}
-		else{
+		else {
 			$save_output = wpshop_attributes_unit::unit_group_edition($attributeUnitId);
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during unit group saving', 'wpshop');
 		}
@@ -3644,65 +3644,65 @@ 
 		echo '<script type="text/javascript" >wpshop(document).ready(function(){setTimeout(function(){ wpshop("#wpshopMessage_unit").removeClass("wpshopPageMessage_Updated"); wpshop("#wpshopMessage_unit").html(""); }, 5000);});</script><div class="fade below-h2 wpshopPageMessage wpshopPageMessage_Updated" id="wpshopMessage_unit">' . $save_message . '</div>' . $save_output;
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_attribute_group_unit_update', 'update_attribute_unit_group' );
+	add_action('wp_ajax_wps_attribute_group_unit_update', 'update_attribute_unit_group');
 
 	function delete_attribute_unit_group() {
-		check_ajax_referer( 'delete_attribute_unit_group_' . ( isset( $_REQUEST['elementIdentifier'] ) ? (int) $_REQUEST['elementIdentifier'] : '' ) );
+		check_ajax_referer('delete_attribute_unit_group_' . (isset($_REQUEST['elementIdentifier']) ? (int)$_REQUEST['elementIdentifier'] : ''));
 		$unit_id = sanitize_key($_REQUEST['elementIdentifier']);
 		$save_output = '';
 
 		$attribute_unit_informations['status'] = 'deleted';
 		$attribute_unit_informations['last_update_date'] = date('Y-m-d H:i:s');
 		$save_unit_result = wpshop_database::update($attribute_unit_informations, $unit_id, WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP);
-		if($save_unit_result == 'done'){
+		if ($save_unit_result == 'done') {
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action succesful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The unit group has been deleted succesfully', 'wpshop');
 		}
-		else{
+		else {
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during unit group deletion', 'wpshop');
 		}
 
 		echo '<script type="text/javascript" >wpshop(document).ready(function(){setTimeout(function(){ wpshop("#wpshopMessage_unit").removeClass("wpshopPageMessage_Updated"); wpshop("#wpshopMessage_unit").html(""); }, 5000);});</script><div class="fade below-h2 wpshopPageMessage wpshopPageMessage_Updated" id="wpshopMessage_unit">' . $save_message . '</div>' . wpshop_attributes_unit::unit_group_list();
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_attribute_group_unit_delete', 'delete_attribute_unit_group' );
+	add_action('wp_ajax_wps_attribute_group_unit_delete', 'delete_attribute_unit_group');
 
 	function products_by_criteria() {
-		check_ajax_referer( 'products_by_criteria' );
+		check_ajax_referer('products_by_criteria');
 		$attr = !empty($_REQUEST['attr']) ? sanitize_text_field($_REQUEST['attr']) : '';
 		// If a filter by attribute is found, recalcul the products that matching it
-		if(!empty($attr)) {
-			$att = explode(':',$attr);
-			$products_id = wpshop_products::get_products_matching_attribute($att[0],$att[1]);
+		if (!empty($attr)) {
+			$att = explode(':', $attr);
+			$products_id = wpshop_products::get_products_matching_attribute($att[0], $att[1]);
 		}
-		$products_id = !empty($products_id) ? $products_id : sanitize_text_field( $_REQUEST['pid'] );
-		$page_number = !empty( $_REQUEST ) && !empty( $_REQUEST[ 'page_number' ] ) && is_int( (int) $_REQUEST['page_number'] ) ? (int) $_REQUEST['page_number'] : 0;
+		$products_id = !empty($products_id) ? $products_id : sanitize_text_field($_REQUEST['pid']);
+		$page_number = !empty($_REQUEST) && !empty($_REQUEST['page_number']) && is_int((int)$_REQUEST['page_number']) ? (int)$_REQUEST['page_number'] : 0;
 
-		$criteria = !empty( $_REQUEST ) && !empty( $_REQUEST[ 'criteria' ] ) ? sanitize_text_field( $_REQUEST[ 'criteria' ] ) : null;
-		$cid = !empty( $_REQUEST ) && !empty( $_REQUEST[ 'cid' ] ) && is_int( (int)$_REQUEST[ 'cid' ] ) ? (int)$_REQUEST[ 'cid' ] : null;
-		$display_type = !empty( $_REQUEST ) && !empty( $_REQUEST[ 'display_type' ] ) ? sanitize_text_field( $_REQUEST[ 'display_type' ] ) : null;
-		$order = !empty( $_REQUEST ) && !empty( $_REQUEST[ 'order' ] ) ? sanitize_text_field( $_REQUEST[ 'order' ] ) : null;
-		$products_per_page = !empty( $_REQUEST ) && !empty( $_REQUEST[ 'products_per_page' ] ) && is_int( (int)$_REQUEST[ 'products_per_page' ] ) ? (int)$_REQUEST[ 'products_per_page' ] : 0;
+		$criteria = !empty($_REQUEST) && !empty($_REQUEST['criteria']) ? sanitize_text_field($_REQUEST['criteria']) : null;
+		$cid = !empty($_REQUEST) && !empty($_REQUEST['cid']) && is_int((int)$_REQUEST['cid']) ? (int)$_REQUEST['cid'] : null;
+		$display_type = !empty($_REQUEST) && !empty($_REQUEST['display_type']) ? sanitize_text_field($_REQUEST['display_type']) : null;
+		$order = !empty($_REQUEST) && !empty($_REQUEST['order']) ? sanitize_text_field($_REQUEST['order']) : null;
+		$products_per_page = !empty($_REQUEST) && !empty($_REQUEST['products_per_page']) && is_int((int)$_REQUEST['products_per_page']) ? (int)$_REQUEST['products_per_page'] : 0;
 
-		$data = wpshop_products::wpshop_get_product_by_criteria( $criteria, $cid, $products_id, $display_type, $order, $page_number, $products_per_page );
-		if($data[0]) {
+		$data = wpshop_products::wpshop_get_product_by_criteria($criteria, $cid, $products_id, $display_type, $order, $page_number, $products_per_page);
+		if ($data[0]) {
 			echo json_encode(array(true, do_shortcode($data[1])));
-		} else echo json_encode(array(false,__('No product found','wpshop')));
+		} else echo json_encode(array(false, __('No product found', 'wpshop')));
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_products_by_criteria', 'products_by_criteria' );
-	add_action( 'wp_ajax_nopriv_wps_products_by_criteria', 'products_by_criteria' );
+	add_action('wp_ajax_wps_products_by_criteria', 'products_by_criteria');
+	add_action('wp_ajax_nopriv_wps_products_by_criteria', 'products_by_criteria');
 
 	function ajax_sendMessage() {
-		check_ajax_referer( 'sendMessage' );
-		$post_id = !empty($_REQUEST['postid']) ? (int) $_REQUEST['postid'] : null;
+		check_ajax_referer('sendMessage');
+		$post_id = !empty($_REQUEST['postid']) ? (int)$_REQUEST['postid'] : null;
 		$title = !empty($_REQUEST['title']) ? sanitize_title($_REQUEST['title']) : '';
 		$message = !empty($_REQUEST['message']) ? sanitize_text_field($_REQUEST['message']) : '';
-		$recipient = !empty($_REQUEST['recipient']) ? (array) $_REQUEST['recipient'] : array();
-		if ( isset($post_id) && isset($title) && isset($message) && !empty($recipient) ) {
+		$recipient = !empty($_REQUEST['recipient']) ? (array)$_REQUEST['recipient'] : array();
+		if (isset($post_id) && isset($title) && isset($message) && !empty($recipient)) {
 			$user_info = get_userdata($recipient);
 			$first_name = $user_info->user_firstname;
 			$last_name = $user_info->user_lastname;
-			$data = array('customer_first_name'=>$first_name,'customer_last_name'=>$last_name);
+			$data = array('customer_first_name'=>$first_name, 'customer_last_name'=>$last_name);
 
 			$wps_message_ctr = new wps_message_ctr();
 
@@ -3711,73 +3711,73 @@ 
 			$message = $wps_message_ctr->customMessage($message, $data);
 
 			if (!empty($user_info->user_email)) {
-				$wps_message_ctr->wpshop_email($user_info->user_email, $title, $message, $save=true, $model_id=$post_id, $object=array());
+				$wps_message_ctr->wpshop_email($user_info->user_email, $title, $message, $save = true, $model_id = $post_id, $object = array());
 				$array = array('result' => true, 'message' => '');
 			}
-			else $array = array('result' => true, 'message' => __('An error occured','wpshop'));
+			else $array = array('result' => true, 'message' => __('An error occured', 'wpshop'));
 		}
 		else {
-			$array = array('result' => false, 'message' => __('An error occured','wpshop'));
+			$array = array('result' => false, 'message' => __('An error occured', 'wpshop'));
 		}
 
 		echo json_encode($array);
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_ajax_send_message', 'ajax_sendMessage' );
+	add_action('wp_ajax_wps_ajax_send_message', 'ajax_sendMessage');
 
 	function ajax_resendMessage() {
-		check_ajax_referer( 'resendMessage' );
-		$message_id = !empty($_REQUEST['messageid']) ? (array) $_REQUEST['messageid'] : array();
+		check_ajax_referer('resendMessage');
+		$message_id = !empty($_REQUEST['messageid']) ? (array)$_REQUEST['messageid'] : array();
 		if (isset($message_id)) {
-			$ids = explode('-',$message_id);
+			$ids = explode('-', $message_id);
 			$postid = $ids[0];
-			$date = $ids[1].'-'.$ids[2];
+			$date = $ids[1] . '-' . $ids[2];
 			$arraykey = $ids[3];
 
-			$historic = get_post_meta($postid, 'wpshop_messages_histo_'.$date, true);
+			$historic = get_post_meta($postid, 'wpshop_messages_histo_' . $date, true);
 
 			if (isset($historic[$arraykey])) {
 				$historic[$arraykey]['mess_dispatch_date'][] = current_time('mysql', 0);
-				update_post_meta($postid, 'wpshop_messages_histo_'.$date, $historic);
+				update_post_meta($postid, 'wpshop_messages_histo_' . $date, $historic);
 
 				$data = $historic[$arraykey];
 				$wps_message_ctr = new wps_message_ctr();
-				$wps_message_ctr->wpshop_email($data['mess_user_email'], $data['mess_title'], $data['mess_message'], $save=false, $object=array());
+				$wps_message_ctr->wpshop_email($data['mess_user_email'], $data['mess_title'], $data['mess_message'], $save = false, $object = array());
 
 				$array = array('result' => true, 'message' => '');
 			}
 			else {
-				$array = array('result' => false, 'message' => __('An error occured','wpshop'));
+				$array = array('result' => false, 'message' => __('An error occured', 'wpshop'));
 			}
 		}
 		else {
-			$array = array('result' => false, 'message' => __('An error occured','wpshop'));
+			$array = array('result' => false, 'message' => __('An error occured', 'wpshop'));
 		}
 
 		echo json_encode($array);
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_ajax_resend_message', 'ajax_resendMessage' );
+	add_action('wp_ajax_wps_ajax_resend_message', 'ajax_resendMessage');
 
 	function related_products() {
-		check_ajax_referer( 'related_products' );
+		check_ajax_referer('related_products');
 		$search = sanitize_text_field($_REQUEST['search']);
 		$data = wpshop_products::product_list(false, $search);
-		$array=array();
+		$array = array();
 		foreach ($data as $d) {
 			$array[] = array('id' => $d->ID, 'name' => $d->post_title);
 		}
 		echo json_encode($array);
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_related_products', 'related_products' );
+	add_action('wp_ajax_wps_related_products', 'related_products');
 
 	function applyCoupon() {
-		check_ajax_referer( 'applyCoupon' );
+		check_ajax_referer('applyCoupon');
 		$wps_coupon_ctr = new wps_coupon_ctr();
 		$coupon_code = sanitize_text_field($_REQUEST['coupon_code']);
 		$result = $wps_coupon_ctr->applyCoupon($coupon_code);
-		if ($result['status']===true) {
+		if ($result['status'] === true) {
 			$wps_cart_ctr = new wps_cart();
 			$order = $wps_cart_ctr->calcul_cart_information(array());
 			$wps_cart_ctr->store_cart_in_session($order);
@@ -3785,6 +3785,6 @@ 
 		} else echo json_encode(array(false, $result['message']));
 		wp_die();
 	}
-	add_action( 'wp_ajax_wps_cart_action_apply_coupon', 'applyCoupon' );
+	add_action('wp_ajax_wps_cart_action_apply_coupon', 'applyCoupon');
 
 ?>

Braces +113 added lines, -201 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
 * Ajax request management file
 *
@@ -466,12 +468,10 @@ 
 					wpshop_payment::set_payment_transaction_number($order_id, $transaction_id);
 				}
 				$result = json_encode(array(true,''));
-			}
-			else {
+			} else {
 				$result = json_encode(array(false,__('Choose a payment method and/or type a transaction number', 'wpshop')));
 			}
-		}
-		else {
+		} else {
 			$result = json_encode(array(false,__('Bad order identifier', 'wpshop')));
 		}
 		echo json_encode($result);
@@ -488,8 +488,7 @@ 
 		if ( !empty($order_id) ) {
 			$result = (array(true, '<h1>'.__('Tracking number','wpshop').'</h1><p>'.__('Enter a tracking number, or leave blank:','wpshop').'</p><input type="hidden" value="'.$order_id.'" name="oid" /><input type="text" name="trackingNumber" /><br /><br /><p>'.__('Enter a tracking link, or leave blank: (http included)','wpshop').'</p><input type="text" name="trackingLink" /><br /><br /><input type="submit" data-nonce="' . esc_attr( wp_create_nonce( 'wpshop_change_order_state' ) ) . '" class="button-primary sendTrackingNumber" value="'.__('Send','wpshop').'" /> <input type="button" class="button-secondary closeAlert" value="'.__('Cancel','wpshop').'" />'));
 
-		}
-		else {
+		} else {
 			$result = json_encode(array(false, __('Order reference error', 'wpshop')));
 		}
 		echo json_encode($result);
@@ -528,16 +527,14 @@ 
 				$output_shipping_box = ob_get_clean();
 
 				$result = array( true, $order_state, $output_shipping_box, $output_payment_box_class, $output_payment_box_content );
-			}
-			else {
+			} else {
 				wpshop_payment::setOrderPaymentStatus($order_id, $order_state);
 
 				$result = array(true, $order_state, __($order_status[$order_state], 'wpshop'));
 			}
 			update_post_meta($order_id, '_order_postmeta', $order);
 			update_post_meta($order_id, '_wpshop_order_status', $order_state);
-		}
-		else {
+		} else {
 			$result = array(false, __('Incorrect order request', 'wpshop'));
 		}
 
@@ -623,8 +620,7 @@ 
 			unset($tpl_component);
 
 			echo json_encode(array(true, str_replace('optionsUpdate', 'options', $output)));
-		}
-		else {
+		} else {
 			echo json_encode(array(false, __('The value you entered already exist', 'wpshop')));
 		}
 		die();
@@ -669,13 +665,11 @@ 
 				);
 				$new_option_id = wp_insert_post($new_post);
 				$input_def['valueToPut'] = 'index';
-			}
-			else {
+			} else {
 				$result_status = false;
 				$result = __('This value already exist for this attribute', 'wpshop');
 			}
-		}
-		else {
+		} else {
 			/**	Check if the given value does not exist	*/
 			$query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE (label = %s OR value = %s) AND attribute_id = %d AND status = 'valid'", str_replace(",", ".", $attribute_options_label), $attribute_options_value, $attribute->id);
 			$existing_values = $wpdb->get_results($query);
@@ -691,8 +685,7 @@ 
 				/**	Add the new value into database	*/
 				$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('creation_date' => current_time('mysql', 0), 'status' => 'valid', 'attribute_id' => $attribute->id, 'position' => $position, 'label' => str_replace(",", ".", stripslashes($attribute_options_label)), 'value' => stripslashes($attribute_options_value)));
 				$new_option_id = $wpdb->insert_id;
-			}
-			else {
+			} else {
 				$result_status = false;
 				$result = __('This value already exist for this attribute', 'wpshop');
 			}
@@ -843,8 +836,7 @@ 
 			$combo_wp_type = wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE);
 			$result .= __('Choose the data type to use for this attribute', 'wpshop') . '<a href="#" title="'.sprintf(__('If the type you want to use is not in the list below. You have to create it by using %s menu', 'wpshop'), __('Entities', 'wpshop')).'" class="wpshop_infobulle_marker">?</a><div class="wpshop_cls wpshop_attribute_select_data_type_internal_list">'.$combo_wp_type.'</div>';
 			$result .= '<input type="hidden" value="no" name="delete_items_of_entity" id="delete_items_of_entity" /><input type="hidden" value="no" name="delete_entity" id="delete_entity" />';
-		}
-		else {
+		} else {
 			$result .= '<input type="hidden" value="' . $attribute->default_value . '" name="internal_data" id="internal_data" />';
 
 			unset($input_def);
@@ -901,8 +893,7 @@ 
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			$post_list = query_posts(array('post_type' => $internal_data_type));
 			if (!empty($post_list)) {
 				$p=1;
@@ -911,8 +902,7 @@ 
 					$last_insert = $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status'=>'valid', 'creation_date'=>current_time('mysql',0), 'attribute_id'=>$current_attribute, 'position'=>$p, 'value'=>$post->post_name, 'label'=>$post->post_title));
 					if(is_int($last_insert) && $delete_items_of_entity){
 						wp_delete_post($post->ID, true);
-					}
-					else{
+					} else{
 						$error = true;
 					}
 					$p++;
@@ -976,13 +966,11 @@ 
 				}
 				$result = true;
 				$result_output = '<p class="wpshop_duplicate_attribute_result" ><a href="' . admin_url('admin.php?page=' . WPSHOP_URL_SLUG_ATTRIBUTE_LISTING . '&action=edit&id=' . $new_attribute_id) . '" >' . __('Edit the new attribute', 'wpshop') . '</a></p>';
-			}
-			else {
+			} else {
 				$result = false;
 				$result_output = __('An error occured while duplicating attribute', 'wpshop');
 			}
-		}
-		else {
+		} else {
 			$result = false;
 			$result_output = __('This attribute has already been duplicate to this entity', 'wpshop');
 		}
@@ -1012,8 +1000,7 @@ 
 			/* Test if we want display the group unit list OR the unit list */
 			if ( $selected_list == 'group unit' ) {
 				$list = wpshop_attributes_unit::get_unit_group();
-			}
-			else {
+			} else {
 				$list = wpshop_attributes_unit::get_unit_list_for_group($group);
 			}
 
@@ -1021,8 +1008,7 @@ 
 				$response .= '<option value="' . $unit->id . '" '. ( ($current_group == $unit->id && $selected_list == 'group unit') ? 'selected="selected"' : '' ).'>' . $unit->name . '</option>';
 			}
 			$result = array(true, $response);
-		}
-		else {
+		} else {
 			$result = array(false, __('Incorrect order request', 'wpshop'));
 		}
 
@@ -1061,14 +1047,12 @@ 
 								$sub_modif .= $column_name;
 								if( !empty($columns->Field) && ($columns->Field == $column_name) ){
 									$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Field has been created', 'wpshop') . '" title="' . __('Field has been created', 'wpshop') . '" class="db_added_field_check" />';
-								}
-								else{
+								} else{
 									$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Field does not exist', 'wpshop') . '" title="' . __('Field does not exist', 'wpshop') . '" class="db_added_field_check" />';
 									$error_nb++;
 									if ( !empty($error_list[$plugin_db_version]) ) {
 										$error_list[$plugin_db_version] += 1;
-									}
-									else {
+									} else {
 										$error_list[$plugin_db_version] = 1;
 									}
 								}
@@ -1086,8 +1070,7 @@ 
 								$sub_modif .= $column_name;
 								if(empty($columns) || ($columns->Field != $column_name)){
 									$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Field has been deleted', 'wpshop') . '" title="' . __('Field has been deleted', 'wpshop') . '" class="db_deleted_field_check" />';
-								}
-								else{
+								} else{
 									$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Field exists', 'wpshop') . '" title="' . __('Field exists', 'wpshop') . '" class="db_deleted_field_check" />';
 									$error_nb++;
 									$error_list[$plugin_db_version] += 1;
@@ -1109,8 +1092,7 @@ 
 									$changed_key = 'type';
 									if($columns->Type == $field_infos['type']){
 										$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Field has been created', 'wpshop') . '" title="' . __('Field has been created', 'wpshop') . '" class="db_added_field_check" />';
-									}
-									else{
+									} else{
 										$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Field does not exist', 'wpshop') . '" title="' . __('Field does not exist', 'wpshop') . '" class="db_added_field_check" />';
 										$error_nb++;
 										$error_list[$plugin_db_version] += 1;
@@ -1122,8 +1104,7 @@ 
 									$changed_key = 'original_name';
 									if($columns->Field == $field_infos['field']){
 										$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Field has been created', 'wpshop') . '" title="' . __('Field has been created', 'wpshop') . '" class="db_added_field_check" />';
-									}
-									else{
+									} else{
 										$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Field does not exist', 'wpshop') . '" title="' . __('Field does not exist', 'wpshop') . '" class="db_added_field_check" />';
 										$error_nb++;
 										$error_list[$plugin_db_version] += 1;
@@ -1146,8 +1127,7 @@ 
 								$sub_modif .= $column_name;
 								if((empty($columns)) || ($columns->Column_name != $column_name)){
 									$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Index has been deleted', 'wpshop') . '" title="' . __('Index has been deleted', 'wpshop') . '" class="db_deleted_index_check" />';
-								}
-								else{
+								} else{
 									$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Index does not exists', 'wpshop') . '" title="' . __('Index does not exists', 'wpshop') . '" class="db_deleted_index_check" />';
 									$error_nb++;
 									$error_list[$plugin_db_version] += 1;
@@ -1166,8 +1146,7 @@ 
 								$sub_modif .= $column_name;
 								if(($columns->Column_name == $column_name) || ($columns->Key_name == $column_name)){
 									$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Index has been created', 'wpshop') . '" title="' . __('Index has been created', 'wpshop') . '" class="db_added_index_check" />';
-								}
-								else{
+								} else{
 									$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Index does not exist', 'wpshop') . '" title="' . __('Index does not exist', 'wpshop') . '" class="db_added_index_check" />';
 									$error_nb++;
 									$error_list[$plugin_db_version] += 1;
@@ -1186,14 +1165,12 @@ 
 							$table_exists = $wpdb->query($query);
 							if($table_exists == 1){
 								$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Table has been created', 'wpshop') . '" title="' . __('Table has been created', 'wpshop') . '" class="db_table_check" />';
-							}
-							else{
+							} else{
 								$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Table has not been created', 'wpshop') . '" title="' . __('Table has not been created', 'wpshop') . '" class="db_table_check" />';
 								$error_nb++;
 								if ( !empty($error_list[$plugin_db_version]) ) {
 									$error_list[$plugin_db_version] += 1;
-								}
-								else {
+								} else {
 									$error_list[$plugin_db_version] = 1;
 								}
 							}
@@ -1214,21 +1191,17 @@ 
 								$error_nb++;
 								if ( !empty($error_list[$plugin_db_version]) ) {
 									$error_list[$plugin_db_version] += 1;
-								}
-								else {
+								} else {
 									$error_list[$plugin_db_version] = 1;
 								}
-							}
-							elseif($table_exists == 1){
+							} elseif($table_exists == 1){
 								$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Table has been renamed', 'wpshop') . '" title="' . __('Table has been renamed', 'wpshop') . '" class="db_rename_table_check" />';
-							}
-							else{
+							} else{
 								$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Table has not been renamed', 'wpshop') . '" title="' . __('Table has not been renamed', 'wpshop') . '" class="db_rename_table_check" />';
 								$error_nb++;
 								if ( !empty($error_list[$plugin_db_version]) ) {
 									$error_list[$plugin_db_version] += 1;
-								}
-								else {
+								} else {
 									$error_list[$plugin_db_version] = 1;
 								}
 							}
@@ -1250,24 +1223,20 @@ 
 									$error_nb++;
 									if ( !empty($error_list[$plugin_db_version]) ) {
 										$error_list[$plugin_db_version] += 1;
-									}
-									else {
+									} else {
 										$error_list[$plugin_db_version] = 1;
 									}
-								}
-								else{
+								} else{
 									$deleted_table_result = '<img src="' . EVA_IMG_ICONES_PLUGIN_URL . 'warning_vs.gif" alt="' . __('Table has not been deleted', 'wpshop') . '" title="' . __('Table has not been renamed', 'wpshop') . '" class="db_deleted_table_check" />';
 									$warning_nb++;
 									if ( !empty($warning_list[$plugin_db_version]) ) {
 										$warning_list[$plugin_db_version] += 1;
-									}
-									else {
+									} else {
 										$warning_list[$plugin_db_version] = 1;
 									}
 								}
 								$sub_modif .= $deleted_table_result;
-							}
-							else{
+							} else{
 								$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Table has been deleted', 'wpshop') . '" title="' . __('Table has been deleted', 'wpshop') . '" class="db_deleted_table_check" />';
 							}
 							$sub_modif .= ' / ';
@@ -1367,8 +1336,7 @@ 
 
 					if ( $has_error ) {
 						$output_error .= wpshop_display::display_template_element('wpshop_admin_tools_default_datas_check_main_element', $tpl_component, array(), 'admin');
-					}
-					else {
+					} else {
 						$output_ok .= wpshop_display::display_template_element('wpshop_admin_tools_default_datas_check_main_element', $tpl_component, array(), 'admin');
 					}
 				}
@@ -1544,8 +1512,7 @@ 
 										if ( $last_histo === false ) {
 											$has_error = true;
 											$error_count++;
-										}
-										else {
+										} else {
 											$wpdb->delete( WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType, array( 'value_id' => $attribute_histo->value_id ) );
 										}
 									}
@@ -1564,8 +1531,7 @@ 
 						if ( $new_value === false ) {
 							$has_error = true;
 							$error_count++;
-						}
-						else {
+						} else {
 							/**	Save new atribute values in product metadata	*/
 							$current_product_metadata = get_post_meta( $element->ID, '_wpshop_product_metadata', true);
 							$current_product_metadata[$to_attribute->code] = $element->value;
@@ -1581,23 +1547,19 @@ 
 					if ( !$has_error ) {
 						$response['status'] = true;
 						$response['error'] = __('Transfert between attribute is done', 'wpshop');
-					}
-					else {
+					} else {
 						$response['status'] = false;
 						$response['error'] = sprinttf( __('There are %d error that occured while copying value through attributes', 'wpshop'), $error_count);
 					}
-				}
-				else {
+				} else {
 					$response['status'] = false;
 					$response['error'] = __('There are no element corresponding to attribute choosen to copy from', 'wpshop');
 				}
-			}
-			else {
+			} else {
 				$response['status'] = false;
 				$response['error'] = __('Both attribute must have same data type to be updated', 'wpshop');
 			}
-		}
-		else {
+		} else {
 			$response['status'] = false;
 			$response['error'] = __('You have to choose attributes in order to update values', 'wpshop');
 		}
@@ -1696,8 +1658,7 @@ 
 					if ( !empty($wps_update_att_for_variation_required_state) && ($wps_update_att_for_variation_required_state != 'no_changes') ) {
 						if ( $wps_update_att_for_variation_required_state == 'yes') {
 							$meta_value['options']['required_attributes'][$attribute->code] = $attribute->code;
-						}
-						else if ( !empty($meta_value['options']['required_attributes']) && !empty($meta_value['options']['required_attributes'][$attribute->code]) ) {
+						} else if ( !empty($meta_value['options']['required_attributes']) && !empty($meta_value['options']['required_attributes'][$attribute->code]) ) {
 							unset($meta_value['options']['required_attributes'][$attribute->code]);
 						}
 					}
@@ -1708,8 +1669,7 @@ 
 						if ( !empty($text_from) && ($text_from != 'no_changes') ) {
 							if ( $text_from == 'yes' ) {
 								$meta_value['options']['price_display']['text_from'] = 'on';
-							}
-							else if( !empty($meta_value['options']['price_display']['text_from']) ) {
+							} else if( !empty($meta_value['options']['price_display']['text_from']) ) {
 								unset($meta_value['options']['price_display']['text_from']);
 							}
 						}
@@ -1718,8 +1678,7 @@ 
 						if ( !empty($lower_price) && ($lower_price != 'no_changes') ) {
 							if ( $lower_price == 'yes' ) {
 								$meta_value['options']['price_display']['lower_price'] = 'on';
-							}
-							else if( !empty($meta_value['options']['price_display']['lower_price']) ) {
+							} else if( !empty($meta_value['options']['price_display']['lower_price']) ) {
 								unset($meta_value['options']['price_display']['lower_price']);
 							}
 						}
@@ -1800,20 +1759,16 @@ 
 							$activate_attribute_for_addon = $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('status' => 'valid'), array('code' => $addons_list[$addon_name][3]));
 						}
 						$state = true;
-					}
-					else {
+					} else {
 						$result = array(false, __('An error occured','wpshop'), __('Desactivated','wpshop'));
 					}
-				}
-				else {
+				} else {
 					$result = array(false, __('The activating code is invalid', 'wpshop'), __('Desactivated','wpshop'));
 				}
-			}
-			else {
+			} else {
 				$result = array(false, __('The addon to activate is invalid', 'wpshop'), __('Desactivated','wpshop'));
 			}
-		}
-		else {
+		} else {
 			$result = array(false, __('An error occured','wpshop'), __('Desactivated','wpshop'));
 		}
 		$activated_class = unserialize(WPSHOP_ADDONS_STATES_CLASS);
@@ -1841,12 +1796,10 @@ 
 				if ( update_option(WPSHOP_ADDONS_OPTION_NAME, $extra_options) ) {
 					$result = array(true, __('The addon has been desactivated successfully', 'wpshop'), __('Desactivated','wpshop'));
 					$state = false;
-				}
-				else {
+				} else {
 					$result = array(false, __('An error occured','wpshop'), __('Activated','wpshop'));
 				}
-			}
-			else {
+			} else {
 				$result = array(false, __('The addon to desactivate is invalid', 'wpshop'), __('Activated','wpshop'));
 			}
 		}
@@ -1885,8 +1838,7 @@ 
 							$submitOrderInfos = !empty( $_POST['submitOrderInfos'] ) ? (int) $_POST['submitOrderInfos'] : 0;
 							if( !empty($submitOrderInfos) ) {
 								$value = $attribute[$attribute->data_type][$attribute->code];
-							}
-							else {
+							} else {
 								$value = '';
 								if ( $attribute->code != 'user_pass') {
 									$code = $attribute->code;
@@ -1957,16 +1909,14 @@ 
 
 		if ( $wpshop_format_result ) {
 			$data = empty($data) ? __('No match', 'wpshop') : $data;
-		}
-		else {
+		} else {
 			if ( !empty($data) ) {
 				$temp_data = $data;
 				unset( $data );
 				foreach ( $temp_data as $post) {
 					$data[$post->ID] = $post->ID . ' - ' . $post->post_title;
 				}
-			}
-			else {
+			} else {
 				$data = array();
 			}
 		}
@@ -2031,8 +1981,7 @@ 
 				$product_title = ( !empty($parent_post) && !empty($parent_post->post_title) ) ? $parent_post->post_title : '';
 				$product_description = ( !empty($parent_post) && !empty($parent_post->post_content) ) ? $parent_post->post_content : '';
 				$product_img =  ( !empty($parent_post->ID) ) ? get_the_post_thumbnail( $parent_post->ID, 'thumbnail') : '';
-			}
-			else {
+			} else {
 				$product_title = $product->post_title;
 				$product_description = $product->post_content;
 				$product_img =  get_the_post_thumbnail( $product_id, 'thumbnail');
@@ -2046,8 +1995,7 @@ 
 
 			echo json_encode( array(true) );
 			die();
-		}
-		else {
+		} else {
 			$return = $wpshop_cart->add_to_cart( $product_to_add_to_cart, array( $new_pid => $product_qty ), $wpshop_cart_type );
 		}
 
@@ -2064,8 +2012,7 @@ 
 				require_once(wpshop_display::get_template_file($tpl_way_to_take[1]));
 				$succes_message_box = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				$succes_message_box = wpshop_display::display_template_element($template_part, array('PRODUCT_ID' => $product_id));
 			}
 			unset($tpl_component);
@@ -2082,12 +2029,10 @@ 
 
 				if ( !empty($product_to_add_to_cart[$new_pid]['variations']) && count($product_to_add_to_cart[$new_pid]['variations']) < 2 ) {
 					$idp = $product_to_add_to_cart[$new_pid]['variations'][0];
-				}
-				else {
+				} else {
 					if( strstr( $new_pid, '__') ) {
 						$idp = $new_pid;
-					}
-					else {
+					} else {
 						$idp = $product_to_add_to_cart[$new_pid]['id'];
 					}
 				}
@@ -2112,8 +2057,7 @@ 
 			if ( !empty($related_products) ) {
 				// $linked_products = '<h2>'.__('Linked products', 'wpshop').'</h2>';
 				$linked_products .= '<div class="modal_product_related">' .do_shortcode( '[wpshop_related_products pid="' .$product_id. '" sorting="no"]' ).'</div>';
-			}
-			else {
+			} else {
 				$linked_products = '';
 			}
 
@@ -2123,8 +2067,7 @@ 
 			$modal_footer_content = wpshop_display::display_template_element('wps_new_add_to_cart_confirmation_modal_footer', array( 'LINK_CART_PAGE' => wpshop_tools::get_page_id( get_permalink( get_option('wpshop_cart_page_id') ) ) ) );
 
 			$response = array( true, $succes_message_box, $action_after_add, $cart_page_url, $product_id, array($cart_animation_choice, $message_confirmation), array($product_img, $product_title, $linked_products, $product_price), $modal_content, $modal_footer_content );
-		}
-		else {
+		} else {
 			$response = array( false, $return );
 		}
 
@@ -2170,8 +2113,7 @@ 
 				}
 				$return = $wpshop_cart->set_product_qty( $product_id, $product_qty, $pid );
 				$response[] = $return;
-			}
-			else {
+			} else {
 				$response[] = false;
 				$response[] = __('Parameters error.','wpshop');
 			}
@@ -2322,16 +2264,13 @@ 
 				$permalink_option = get_option('permalink_structure');
 				if ( !empty($permalink_option) ) {
 					$cart_url = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_signup_page_id') ) ).'?complete_sign_up=ok';
-				}
-				else {
+				} else {
 					$cart_url = get_permalink( wpshop_tools::get_page_id(get_option('wpshop_signup_page_id') ) ).'&complete_sign_up=ok';
 				}
-			}
-			else {
+			} else {
 				if ( !empty($_SESSION['cart']) ) {
 					$cart_url = get_permalink( wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id')) );
-				}
-				else {
+				} else {
 					$cart_url = get_permalink( wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id')) );
 				}
 			}
@@ -2391,9 +2330,7 @@ 
 			$retour .= '<div class="wpshop_cls"></div>';
 			$result = json_encode( array(true, $retour) );
 
-		}
-
- 		elseif ( !empty($order_postmeta) && !empty($order_postmeta['order_status']) && in_array($order_postmeta['order_status'], array('awaiting_payment', 'partially_paid'))) {
+		} elseif ( !empty($order_postmeta) && !empty($order_postmeta['order_status']) && in_array($order_postmeta['order_status'], array('awaiting_payment', 'partially_paid'))) {
 			$order_id = !empty( $_REQUEST['order_id'] ) ? (int) $_REQUEST['order_id'] : 0;
  			$order_info_postmeta = get_post_meta($order_id, '_order_info', true);
 
@@ -2409,8 +2346,7 @@ 
  			}
 
  			$result = json_encode( array(true, $billing_form, $shipping_form, $current_customer_id) );
- 		}
-		else {
+ 		} else {
 				// Check the attribute set id of Billing Address
 				$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE name = "' .__('Billing address', 'wpshop'). '"', '');
 				$attribute_set_id = $wpdb->get_var($query);
@@ -2472,8 +2408,7 @@ 
 							$user_id = wp_create_user( sanitize_user( $value ), wp_generate_password( 12, false ) );
 							$query = $wpdb->prepare( "SELECT ID FROM " . $wpdb->posts . " WHERE post_type = %s AND post_author = %d", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id );
 							$attribute_option_id = $wpdb->get_var( $query );
-						}
-						else {
+						} else {
 							$entity_args = array(
 								'post_type' 	 => $attribute_default_value['default_value'],
 								'post_title'  	 => $value,
@@ -2482,8 +2417,7 @@ 
 							);
 							$attribute_option_id = wp_insert_post($entity_args);
 						}
-					}
-					else {
+					} else {
 						$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status'=>'valid', 'creation_date'=>current_time('mysql', 0), 'position' => 1, 'attribute_id'=>$attribute_def->id, 'value'=>$value, 'label'=>$value) );
 						$attribute_option_id = $wpdb->insert_id;
 					}
@@ -2572,8 +2506,7 @@ 
 			}
 
 			echo json_encode( array( true,  __('Element has been saved', 'wpshop'), $attribute_to_reload, $new_entity_id) );
-		}
-		else {
+		} else {
 			echo json_encode( array(false, __('An error occured while adding your element', 'wpshop')) );
 		}
 
@@ -2613,20 +2546,17 @@ 
 				if ( !empty($available_payement_method[0]) ) {
 					if ( $cart_type=='quotation' ) {
 						$checkout_payment_button = wpshop_display::display_template_element('wpshop_checkout_page_quotation_validation_button', array() );
-					}
-					else {
+					} else {
 						$checkout_payment_button = wpshop_display::display_template_element('wpshop_checkout_page_validation_button', array() );
 					}
 				}
-			}
-			else {
+			} else {
 				$checkout_payment_button = wpshop_display::display_template_element('wpshop_checkout_page_impossible_to_order', array());
 			}
 			if( $address_type == 'billing_address') {
 				$billing_option = get_option( 'wpshop_billing_address' );
 				$address_option = $billing_option['choice'];
-			}
-			else {
+			} else {
 				$shipping_address_option = get_option('wpshop_shipping_address_choice');
 				$address_option = $shipping_address_option['choice'];
 			}
@@ -2638,8 +2568,7 @@ 
 
 			$edit_link = '<a href="' .get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))) . (strpos(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))), '?')===false ? '?' : '&') . 'action=editAddress&amp;id='.$address_id.'" title="' .__('Edit', 'wpshop'). '">' .__('Edit', 'wpshop'). '</a>';
 			$result = json_encode( array(true, $retour, $edit_link, $is_allowed_destination, $checkout_payment_button) );
-		}
-		else {
+		} else {
 			$result = json_encode( array(false, 'missing_informations') );
 		}
 		echo $result;
@@ -2708,13 +2637,11 @@ 
 					wps_address::save_address_infos( $shipping_address);
 				}
 				$result = json_encode( array(true, __('Customer created', 'wpshop'), $user_id) );
-			}
-			else {
+			} else {
 				$result = json_encode( array(false, __('A customer account is already created with this email address', 'wpshop')) );
 			}
 
-		}
-		else {
+		} else {
 			$result = json_encode( array(false, __('An email address is required', 'wpshop')) );
 		}
 		echo $result;
@@ -2742,8 +2669,7 @@ 
 			$wps_message = new wps_message_ctr();
 			$wps_message->wpshop_prepared_email( $email, $model_name, array('order_id' => $order_id, 'order_key' => ( ( !empty($order_post_meta) && !empty($order_post_meta['order_key']) ) ? $order_post_meta['order_key'] : '' ), 'order_date' => ( ( !empty($order_post_meta) && !empty($order_post_meta['order_date']) ) ? $order_post_meta['order_date'] : '' ),'customer_first_name' => $first_name, 'customer_last_name' => $last_name) );
 			$result = array('status' => true, 'response' => $wps_message->get_historic_message_by_type($message_type_id) );
-		}
-		else {
+		} else {
 			$result = array('status' => false, 'response' => __('An error occured', 'wpshop') );
 		}
 		echo json_encode($result);
@@ -2770,8 +2696,7 @@ 
 			$n = WPSHOP_UPLOAD_URL.'/'.$name;
 			update_post_meta( $element_identifier, 'attribute_option_is_downloadable_', array('file_url' => $n));
 			$result = '<a href="' .$n. '" target="_blank" download>' .$name. '</a>';
-		}
-		else {
+		} else {
 			$result = '';
 		}
 		echo $result;
@@ -2856,8 +2781,7 @@ 
 						if( !empty($manage_stock_checking) && strtolower( __( $manage_stock_checking, 'wpshop') ) == strtolower( __( 'Yes', 'wpshop') )  ) {
 							$manage_stock_checking_bool = true;
 						}
-					}
-					else {
+					} else {
 						if( get_post_type($item['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
 							$parent_product = wpshop_products::get_parent_variation( $item['item_id'] );
 							if( !empty($parent_product) && !empty($parent_product['parent_post_meta']) ) {
@@ -2880,8 +2804,7 @@ 
 					/** Checking stock **/
 					if ( empty($item_meta['manage_stock']) || ( !empty($item_meta['manage_stock']) && !$manage_stock_checking_bool )|| ( !empty($item_meta['manage_stock']) && $manage_stock_checking_bool && $stock >= $qty ) ) {
 						$_SESSION['cart']['order_items'][ $item_key ] = $item;
-					}
-					else {
+					} else {
 						$add_to_cart_checking = true;
 						$add_to_cart_checking_message = __('Some products cannot be added to cart because they are out of stock', 'wpshop');
 					}
@@ -3005,12 +2928,10 @@ 
 
 				$response = __( 'Direct payment link has been send', 'wpshop' );
 				$status = true;
-			}
-			else {
+			} else {
 				$response = __( 'An error was occured', 'wpshop' );
 			}
-		}
-		else {
+		} else {
 			$response = __( 'An error was occured, no Order ID defined', 'wpshop' );
 		}
 		echo json_encode( array( 'status' => $status, 'response' => $response) );
@@ -3097,8 +3018,7 @@ 
 					$wpdb->insert( 'wp_wpshop__attribute_value_decimal', array_merge( $common_datas, array( 'attribute_id' => 28, 'value' => $ht ) ) );
 					$wpdb->insert( 'wp_wpshop__attribute_value_integer', array_merge( $common_datas, array( 'attribute_id' => 29, 'value' => $the_tax->rate_id ) ) );
 					$wpdb->insert( 'wp_wpshop__attribute_value_decimal', array_merge( $common_datas, array( 'attribute_id' => 30, 'value' => $tax_amount ) ) );
-				}
-				else {
+				} else {
 					$common_datas = array(
 						'value_id' => null,
 						'entity_type_id' => 5,
@@ -3266,8 +3186,7 @@ 
 						if( !empty($element_definition['content'][$att]) ) {
 							$formatted_datas[$element_id]['content'][$att] = $element_definition['content'][$att];
 							$controller_rows_array[ $att ] = true;
-						}
-						else {
+						} else {
 							$formatted_datas[$element_id]['content'][$att] = array();
 						}
 					}
@@ -3297,8 +3216,7 @@ 
 										if( $current_attribute->data_type_to_use == 'internal' ) {
 											$current_val = get_the_title($current_val);
 											$old_val = get_the_title($old_val);
-										}
-										else {
+										} else {
 											$query = $wpdb->prepare( 'SELECT label FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS.' WHERE id=%d', $old_val);
 											$old_val = $wpdb->get_var( $query );
 											$query = $wpdb->prepare( 'SELECT label FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS.' WHERE id=%d', $current_val);
@@ -3353,12 +3271,10 @@ 
 				update_option( WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $cat_id, $category_option );
 				$response = '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="category_thumbnail_preview"/>';
 				$status = true;
-			}
-			else {
+			} else {
 				$response = __( 'Category options are not defined', 'wpshop');
 			}
-		}
-		else {
+		} else {
 			$response = __( 'Category ID is not defined', 'wpshop');
 		}
 		echo json_encode( array( 'status' => $status, 'response' => $response) );
@@ -3390,8 +3306,7 @@ 
 		if ( $attributeSetSectionCreation == 'done' ) {
 			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_SUCCES_ICON . '\' alt=\'action_success\' class=\'wpshopPageMessage_Icon\' />' . __('New section has been created successfully', 'wpshop');
 			$more_script = 'wpshop_go_to("#attribute_group_'.$wpdb->insert_id.'")';
-		}
-		else {
+		} else {
 			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_ERROR_ICON . '\' alt=\'action_error\' class=\'wpshopPageMessage_Icon\' />' . __('An error occured while saving new section', 'wpshop');
 		}
 
@@ -3419,10 +3334,11 @@ 
 		$attributeSetInfos['backend_display_type'] = $backend_display_type;
 		$attributeSetInfos['display_on_frontend'] = $display_on_frontend;
 		$attributeSetSectionCreation = wpshop_database::update($attributeSetInfos, $attributeSetSectionId, WPSHOP_DBT_ATTRIBUTE_GROUP);
-		if ( $attributeSetSectionCreation == 'done' )
-			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_SUCCES_ICON . '\' alt=\'action_success\' class=\'wpshopPageMessage_Icon\' />' . __('The section has been updated successfully', 'wpshop');
-		else
-			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_ERROR_ICON . '\' alt=\'action_error\' class=\'wpshopPageMessage_Icon\' />' . __('An error occured while updating the section', 'wpshop');
+		if ( $attributeSetSectionCreation == 'done' ) {
+					$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_SUCCES_ICON . '\' alt=\'action_success\' class=\'wpshopPageMessage_Icon\' />' . __('The section has been updated successfully', 'wpshop');
+		} else {
+					$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_ERROR_ICON . '\' alt=\'action_error\' class=\'wpshopPageMessage_Icon\' />' . __('An error occured while updating the section', 'wpshop');
+		}
 		echo wpshop_attributes_set::attributeSetDetailsManagement($elementIdentifier) . '<script type="text/javascript" >wpshopShowMessage("' . $attributeSetSectionCreation_Result . '");hideShowMessage(5000);</script>';
 		wp_die();
 	}
@@ -3442,9 +3358,9 @@ 
 		if ( $attributeSetSectionCreation == 'done' ) {
 			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_SUCCES_ICON . '\' alt=\'action_success\' class=\'wpshopPageMessage_Icon\' />' . __('The section has been successfully been deleted', 'wpshop');
 			$more_script.='jQuery("#attribute_group_'.$attributeSetSectionId.'").remove();';
+		} else {
+					$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_ERROR_ICON . '\' alt=\'action_error\' class=\'wpshopPageMessage_Icon\' />' . __('An error occured while deleting the section', 'wpshop');
 		}
-		else
-			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_ERROR_ICON . '\' alt=\'action_error\' class=\'wpshopPageMessage_Icon\' />' . __('An error occured while deleting the section', 'wpshop');
 		echo '<script type="text/javascript" >wpshopShowMessage("' . $attributeSetSectionCreation_Result . '");hideShowMessage(5000);'.$more_script.'</script>';
 		wp_die();
 	}
@@ -3510,8 +3426,7 @@ 
 		if($save_unit_result == 'done'){
 			$save_output = wpshop_attributes_unit::elementList();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action successful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The new unit has been saved succesfully', 'wpshop');
-		}
-		else{
+		} else{
 			$save_output = wpshop_attributes_unit::elementEdition();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during new unit saving', 'wpshop');
 		}
@@ -3547,8 +3462,7 @@ 
 		if ( $save_unit_result == 'done' ) {
 			$save_output = wpshop_attributes_unit::elementList();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action successful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The unit has been saved succesfully', 'wpshop');
-		}
-		else {
+		} else {
 			$save_output = wpshop_attributes_unit::elementEdition($attributeUnitId);
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during unit saving', 'wpshop');
 		}
@@ -3568,8 +3482,7 @@ 
 		$save_unit_result = wpshop_database::update($attribute_unit_informations, $unit_id, WPSHOP_DBT_ATTRIBUTE_UNIT);
 		if ( $save_unit_result == 'done' ) {
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action succesful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The unit has been deleted succesfully', 'wpshop');
-		}
-		else {
+		} else {
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during unit deletion', 'wpshop');
 		}
 
@@ -3611,8 +3524,7 @@ 
 		if($save_unit_result == 'done'){
 			$save_output = wpshop_attributes_unit::unit_group_list();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action successful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The new unit group has been saved succesfully', 'wpshop');
-		}
-		else{
+		} else{
 			$save_output = wpshop_attributes_unit::unit_group_edition();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during new unit group saving', 'wpshop');
 		}
@@ -3635,8 +3547,7 @@ 
 		if($save_unit_result == 'done'){
 			$save_output = wpshop_attributes_unit::unit_group_list();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action successful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The unit group has been saved succesfully', 'wpshop');
-		}
-		else{
+		} else{
 			$save_output = wpshop_attributes_unit::unit_group_edition($attributeUnitId);
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during unit group saving', 'wpshop');
 		}
@@ -3656,8 +3567,7 @@ 
 		$save_unit_result = wpshop_database::update($attribute_unit_informations, $unit_id, WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP);
 		if($save_unit_result == 'done'){
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action succesful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The unit group has been deleted succesfully', 'wpshop');
-		}
-		else{
+		} else{
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during unit group deletion', 'wpshop');
 		}
 
@@ -3686,7 +3596,9 @@ 
 		$data = wpshop_products::wpshop_get_product_by_criteria( $criteria, $cid, $products_id, $display_type, $order, $page_number, $products_per_page );
 		if($data[0]) {
 			echo json_encode(array(true, do_shortcode($data[1])));
-		} else echo json_encode(array(false,__('No product found','wpshop')));
+		} else {
+			echo json_encode(array(false,__('No product found','wpshop')));
+		}
 		wp_die();
 	}
 	add_action( 'wp_ajax_wps_products_by_criteria', 'products_by_criteria' );
@@ -3713,10 +3625,10 @@ 
 			if (!empty($user_info->user_email)) {
 				$wps_message_ctr->wpshop_email($user_info->user_email, $title, $message, $save=true, $model_id=$post_id, $object=array());
 				$array = array('result' => true, 'message' => '');
+			} else {
+				$array = array('result' => true, 'message' => __('An error occured','wpshop'));
 			}
-			else $array = array('result' => true, 'message' => __('An error occured','wpshop'));
-		}
-		else {
+		} else {
 			$array = array('result' => false, 'message' => __('An error occured','wpshop'));
 		}
 
@@ -3745,12 +3657,10 @@ 
 				$wps_message_ctr->wpshop_email($data['mess_user_email'], $data['mess_title'], $data['mess_message'], $save=false, $object=array());
 
 				$array = array('result' => true, 'message' => '');
-			}
-			else {
+			} else {
 				$array = array('result' => false, 'message' => __('An error occured','wpshop'));
 			}
-		}
-		else {
+		} else {
 			$array = array('result' => false, 'message' => __('An error occured','wpshop'));
 		}
 
@@ -3782,7 +3692,9 @@ 
 			$order = $wps_cart_ctr->calcul_cart_information(array());
 			$wps_cart_ctr->store_cart_in_session($order);
 			echo json_encode(array(true, ''));
-		} else echo json_encode(array(false, $result['message']));
+		} else {
+			echo json_encode(array(false, $result['message']));
+		}
 		wp_die();
 	}
 	add_action( 'wp_ajax_wps_cart_action_apply_coupon', 'applyCoupon' );

includes/librairies/payments/payment.class.php

Spacing +184 added lines, -184 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -20,29 +20,29 @@ 
 
 		$wpshop_paypal = new wpshop_paypal();
 		// If the CIC payment method is active
-		$wpshop_paymentMethod = get_option( 'wps_payment_mode' );
-		if(WPSHOP_PAYMENT_METHOD_CIC && ( !empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']) && !empty($wpshop_paymentMethod['mode']['cic']['active']) ) ) {
+		$wpshop_paymentMethod = get_option('wps_payment_mode');
+		if (WPSHOP_PAYMENT_METHOD_CIC && (!empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']) && !empty($wpshop_paymentMethod['mode']['cic']['active']))) {
 			$wpshop_cic = new wpshop_CIC();
 		}
-		wpshop_tools::create_custom_hook ('wpshop_bankserver_reponse');
+		wpshop_tools::create_custom_hook('wpshop_bankserver_reponse');
 
 	}
 
 	public static function get_success_payment_url() {
-		$url = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_payment_return_page_id') ) );
+		$url = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_payment_return_page_id')));
 		return self::construct_url_parameters($url, 'paymentResult', 'success');
 	}
 
 	public static function get_cancel_payment_url() {
-		$url = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_payment_return_nok_page_id') ) );
+		$url = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_payment_return_nok_page_id')));
 		return $url;
 	}
 
 	public static function construct_url_parameters($url, $param, $value) {
 		$interoguation_marker_pos = strpos($url, '?');
-		if($interoguation_marker_pos===false)
-			return $url.'?'.$param.'='.$value;
-		else return $url.'&'.$param.'='.$value;
+		if ($interoguation_marker_pos === false)
+			return $url . '?' . $param . '=' . $value;
+		else return $url . '&' . $param . '=' . $value;
 	}
 
 	/**
@@ -51,23 +51,23 @@ 
 	public static function wpshop_payment_result() {
 		global $wpdb;
 		$user_ID = get_current_user_id();
-		$query = $wpdb->prepare('SELECT MAX(ID) FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_ORDER, $user_ID);
-		$order_post_id = $wpdb->get_var( $query );
-		if ( !empty($order_post_id) ) {
-			$order_postmeta = get_post_meta($order_post_id , '_wpshop_order_status', true);
-			if ( !empty($order_postmeta) ) {
-				switch ( $order_postmeta ) {
+		$query = $wpdb->prepare('SELECT MAX(ID) FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_ORDER, $user_ID);
+		$order_post_id = $wpdb->get_var($query);
+		if (!empty($order_post_id)) {
+			$order_postmeta = get_post_meta($order_post_id, '_wpshop_order_status', true);
+			if (!empty($order_postmeta)) {
+				switch ($order_postmeta) {
 					case 'awaiting_payment':
-						echo __('We wait your payment.','wpshop');
+						echo __('We wait your payment.', 'wpshop');
 					break;
 					case 'completed':
-						echo __('Thank you ! Your payment has been recorded.','wpshop');
+						echo __('Thank you ! Your payment has been recorded.', 'wpshop');
 					break;
 					case 'partially_paid':
-						echo __('Thank you ! Your first payment has been recorded.','wpshop');
+						echo __('Thank you ! Your first payment has been recorded.', 'wpshop');
 					break;
 					default:
-						echo __('Your payment and your order has been cancelled.','wpshop');
+						echo __('Your payment and your order has been cancelled.', 'wpshop');
 					break;
 				}
 			}
@@ -88,56 +88,56 @@ 
 	 * @param integer $order_id The order id if existing - Useful when user does not finish its order and want to validateit later
 	 * @return string The different payment method
 	 */
-	function __display_payment_methods_choice_form($order_id=0, $cart_type = 'cart') {
+	function __display_payment_methods_choice_form($order_id = 0, $cart_type = 'cart') {
 		$output = '';
 		/**	Get available payment method	*/
 		$paymentMethod = get_option('wpshop_paymentMethod', array());
 
-		if(!empty($order_id) && is_numeric($order_id)) {
-			$output .= '<input type="hidden" name="order_id" value="'.$order_id.'" />';
+		if (!empty($order_id) && is_numeric($order_id)) {
+			$output .= '<input type="hidden" name="order_id" value="' . $order_id . '" />';
 		}
 
 		if ($cart_type == 'cart') {
 			$payment_methods = array();
-			if(!empty($paymentMethod['paypal'])) {
+			if (!empty($paymentMethod['paypal'])) {
 				$payment_methods['paypal'] = array('payment_method_name' => __('CB with Paypal', 'wpshop'),
 														'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/paypal.png',
-														'payment_method_explanation' => __('<strong>Tips</strong> : If you have a Paypal account, by choosing this payment method, you will be redirected to the secure payment site Paypal to make your payment. Debit your PayPal account, immediate booking products.','wpshop')
+														'payment_method_explanation' => __('<strong>Tips</strong> : If you have a Paypal account, by choosing this payment method, you will be redirected to the secure payment site Paypal to make your payment. Debit your PayPal account, immediate booking products.', 'wpshop')
 								 );
 			}
-			if(!empty($paymentMethod['checks'])) {
+			if (!empty($paymentMethod['checks'])) {
 				$payment_methods['check'] = array('payment_method_name' => __('Check', 'wpshop'),
 						'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/cheque.png',
-						'payment_method_explanation' => __('Reservation of products upon receipt of the check.','wpshop')
+						'payment_method_explanation' => __('Reservation of products upon receipt of the check.', 'wpshop')
 				);
 			}
-			if(!empty($paymentMethod['banktransfer'])) {
+			if (!empty($paymentMethod['banktransfer'])) {
 				$payment_methods['banktransfer'] = array('payment_method_name' => __('Bank transfer', 'wpshop'),
 						'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/cheque.png',
-						'payment_method_explanation' =>__('Reservation of product receipt of payment.','wpshop')
+						'payment_method_explanation' =>__('Reservation of product receipt of payment.', 'wpshop')
 				);
 			}
-			if(WPSHOP_PAYMENT_METHOD_CIC || !empty($paymentMethod['cic'])) {
+			if (WPSHOP_PAYMENT_METHOD_CIC || !empty($paymentMethod['cic'])) {
 				$payment_methods['cic'] = array('payment_method_name' =>__('Credit card', 'wpshop'),
 						'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/cic_payment_logo.jpg',
-						'payment_method_explanation' =>__('Reservation of products upon confirmation of payment.','wpshop')
+						'payment_method_explanation' =>__('Reservation of products upon confirmation of payment.', 'wpshop')
 				);
 			}
 			$payment_methods = apply_filters('wpshop_payment_method', $payment_methods);
 
 			$payment_method_table = array();
 
-			if ( !empty( $paymentMethod['display_position'] ) ) {
+			if (!empty($paymentMethod['display_position'])) {
 				$position_determinated = false;
-				foreach ( $paymentMethod['display_position'] as $key => $position) {
-					if ( $position != null) {
+				foreach ($paymentMethod['display_position'] as $key => $position) {
+					if ($position != null) {
 						$position_determinated = true;
 					}
 				}
-				if ( $position_determinated ) {
-					for ( $i = 1; $i < count( $paymentMethod['display_position'] ) + 1; $i++) {
-						foreach ( $paymentMethod['display_position'] as $key => $position ) {
-							if ( $position == $i  && !empty($paymentMethod[$key])) {
+				if ($position_determinated) {
+					for ($i = 1; $i < count($paymentMethod['display_position']) + 1; $i++) {
+						foreach ($paymentMethod['display_position'] as $key => $position) {
+							if ($position == $i && !empty($paymentMethod[$key])) {
 								if ($key == 'checks') {
 									$key = 'check';
 								}
@@ -148,16 +148,16 @@ 
 					$payment_methods = $payment_method_table;
 				}
 			}
-			if (!empty($payment_methods) ) {
+			if (!empty($payment_methods)) {
 
-				foreach( $payment_methods as  $payment_method_identifier =>  $payment_method_def ) {
+				foreach ($payment_methods as  $payment_method_identifier =>  $payment_method_def) {
 					$tpl_component = array();
 					$checked = $active = '';
 					$payment_identifier_for_test = $payment_method_identifier;
 					if ($payment_method_identifier == 'check') {
 						$payment_identifier_for_test = 'checks';
 					}
-					if ( !empty($paymentMethod['default_method']) && $paymentMethod['default_method'] == $payment_identifier_for_test) {
+					if (!empty($paymentMethod['default_method']) && $paymentMethod['default_method'] == $payment_identifier_for_test) {
 						$checked = ' checked="checked"';
 						$active = ' active';
 
@@ -165,11 +165,11 @@ 
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_STATE_CLASS'] = $active;
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_INPUT_STATE'] = $checked;
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_IDENTIFIER'] = $payment_method_identifier;
-					if ( !empty($payment_mode['logo']) && (int)$payment_mode['logo'] != 0 ) {
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? wp_get_attachment_image( $payment_method_def['payment_method_icon'], 'thumbnail', false, array('class' => 'wps_shipping_mode_logo') ) : '';
+					if (!empty($payment_mode['logo']) && (int)$payment_mode['logo'] != 0) {
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_method_def['payment_method_icon'])) ? wp_get_attachment_image($payment_method_def['payment_method_icon'], 'thumbnail', false, array('class' => 'wps_shipping_mode_logo')) : '';
 					}
 					else {
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? '<img src="' .$payment_method_def['payment_method_icon']. '" alt="" />' : '';
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_method_def['payment_method_icon'])) ? '<img src="' . $payment_method_def['payment_method_icon'] . '" alt="" />' : '';
 					}
 					//$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = $payment_method_def['payment_method_icon'];
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = $payment_method_def['payment_method_name'];
@@ -180,32 +180,32 @@ 
 			}
 		}
 
-		return array( $output, $paymentMethod['mode'] );
+		return array($output, $paymentMethod['mode']);
 	}
 
 
-	public static function display_payment_methods_choice_form($order_id=0, $cart_type = 'cart') {
-		$payment_option = get_option( 'wps_payment_mode' );
+	public static function display_payment_methods_choice_form($order_id = 0, $cart_type = 'cart') {
+		$payment_option = get_option('wps_payment_mode');
 		$output = '';
-		if(!empty($order_id) && is_numeric($order_id)) {
-			$output .= '<input type="hidden" name="order_id" value="'.$order_id.'" />';
+		if (!empty($order_id) && is_numeric($order_id)) {
+			$output .= '<input type="hidden" name="order_id" value="' . $order_id . '" />';
 		}
-		if( $cart_type == 'cart' ) {
-			if ( !empty($payment_option) && !empty($payment_option['mode']) ) {
-				foreach( $payment_option['mode'] as $payment_id => $payment_config ) {
-					if( !empty($payment_config['active']) ) {
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_STATE_CLASS'] = ( ( !empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id ) ? ' active' : '');
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_INPUT_STATE'] = ( ( !empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id ) ? 'checked="checked"' : '');
+		if ($cart_type == 'cart') {
+			if (!empty($payment_option) && !empty($payment_option['mode'])) {
+				foreach ($payment_option['mode'] as $payment_id => $payment_config) {
+					if (!empty($payment_config['active'])) {
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_STATE_CLASS'] = ((!empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id) ? ' active' : '');
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_INPUT_STATE'] = ((!empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id) ? 'checked="checked"' : '');
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_IDENTIFIER'] = $payment_id;
 
-						if ( !empty($payment_config['logo']) && (int)$payment_config['logo'] != 0 ) {
-							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? wp_get_attachment_image( $payment_config['logo'], 'thumbnail', false ) : '';
+						if (!empty($payment_config['logo']) && (int)$payment_config['logo'] != 0) {
+							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_config['logo'])) ? wp_get_attachment_image($payment_config['logo'], 'thumbnail', false) : '';
 						}
 						else {
-							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? '<img src="' .$payment_config['logo']. '" alt="' .$payment_config['name']. '" />' : '';
+							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_config['logo'])) ? '<img src="' . $payment_config['logo'] . '" alt="' . $payment_config['name'] . '" />' : '';
 						}
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = ( !empty($payment_config['name']) ) ? $payment_config['name'] : '';
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_EXPLANATION'] = ( !empty($payment_config['description']) ) ? $payment_config['description'] : '';
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = (!empty($payment_config['name'])) ? $payment_config['name'] : '';
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_EXPLANATION'] = (!empty($payment_config['description'])) ? $payment_config['description'] : '';
 						$output .= wpshop_display::display_template_element('wpshop_checkout_page_payment_method_bloc', $tpl_component, array('type' => 'payment_method', 'id' => $payment_id));
 						unset($tpl_component);
 					}
@@ -227,13 +227,13 @@ 
 
 		$wps_message = new wps_message_ctr();
 
-		if(!empty($order) && !empty($order_info) && empty($order['order_invoice_ref'])) {
-			$email = (!empty($order_info['billing']['address']['address_user_email']) ? $order_info['billing']['address']['address_user_email'] : '' );
-			$first_name = ( !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '' );
-			$last_name = ( !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '' );
+		if (!empty($order) && !empty($order_info) && empty($order['order_invoice_ref'])) {
+			$email = (!empty($order_info['billing']['address']['address_user_email']) ? $order_info['billing']['address']['address_user_email'] : '');
+			$first_name = (!empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '');
+			$last_name = (!empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '');
 
 			// Envoie du message de confirmation de paiement au client
-			switch($order['payment_method']) {
+			switch ($order['payment_method']) {
 				case 'check':
 					$wps_message->wpshop_prepared_email($email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order['order_date']));
 				break;
@@ -250,24 +250,24 @@ 
 	}
 
 
-	function setOrderPaymentStatus( $order_id, $payment_status ) {
+	function setOrderPaymentStatus($order_id, $payment_status) {
 		/**	Get order main information	*/
 		$order = get_post_meta($order_id, '_order_postmeta', true);
 		$send_email = false;
 
-		if ( !empty($order) ) {
+		if (!empty($order)) {
 			/**	Change order status to given status	*/
 			$order['order_status'] = strtolower($payment_status);
 			/**	Put order status into a single meta, allowing to use it easily later	*/
 			update_post_meta($order_id, '_wpshop_order_status', $order['order_status']);
 
 			/**	In case the set status is completed, make specific treatment: add the completed date	*/
-			if ( $payment_status == 'completed' ) {
+			if ($payment_status == 'completed') {
 				/**	Read order items list, if not empty and check if each item is set to manage stock or not */
 				if (!empty($order['order_items'])) {
 					foreach ($order['order_items'] as $o) {
-						$product = wpshop_products::get_product_data( $o['item_id'] );
-						if (!empty($product) && !empty($product['manage_stock']) && __($product['manage_stock'], 'wpshop') == __('Yes', 'wpshop') ) {
+						$product = wpshop_products::get_product_data($o['item_id']);
+						if (!empty($product) && !empty($product['manage_stock']) && __($product['manage_stock'], 'wpshop') == __('Yes', 'wpshop')) {
 							wpshop_products::reduce_product_stock_qty($o['item_id'], $o['item_qty']);
 						}
 					}
@@ -281,7 +281,7 @@ 
 			}
 
 			/**	Send email to customer when specific case need it	*/
-			if ( $send_email ) {
+			if ($send_email) {
 				/**	Get information about customer that make the order	*/
 				$order_info = get_post_meta($order_id, '_order_info', true);
 				$mail_tpl_component = array('order_key' => $order['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order['order_date']);
@@ -295,25 +295,25 @@ 
 	/**
 	* Get payment method
 	*/
-	function get_payment_method($post_id){
-		$pm = __('Nc','wpshop');
+	function get_payment_method($post_id) {
+		$pm = __('Nc', 'wpshop');
 		$order_postmeta = get_post_meta($post_id, '_order_postmeta', true);
-		if ( !empty($order_postmeta['payment_method']) ) {
-			switch($order_postmeta['payment_method']){
+		if (!empty($order_postmeta['payment_method'])) {
+			switch ($order_postmeta['payment_method']) {
 				case 'check':
-					$pm = __('Check','wpshop');
+					$pm = __('Check', 'wpshop');
 				break;
 				case 'paypal':
-					$pm = __('Paypal','wpshop');
+					$pm = __('Paypal', 'wpshop');
 				break;
 				case 'banktransfer':
-					$pm = __('Bank transfer','wpshop');
+					$pm = __('Bank transfer', 'wpshop');
 				break;
 				case 'cic':
-					$pm = __('Credit card','wpshop');
+					$pm = __('Credit card', 'wpshop');
 				break;
 				default:
-					$pm = __('Nc','wpshop');
+					$pm = __('Nc', 'wpshop');
 				break;
 			}
 		}
@@ -333,38 +333,38 @@ 
 
 		$paymentMethod = $paymentMethod['mode'];
 		$payment_validation .= '
-<div id="order_payment_method_'.$post_id.'" class="wpshop_cls wpshopHide" >
-	<input type="hidden" id="used_method_payment_'.$post_id.'" value="' . (!empty($order_postmeta['payment_method']) ? $order_postmeta['payment_method'] : 'no_method') . '"/>
-	<input type="hidden" id="used_method_payment_transaction_id_'.$post_id.'" value="' . (!empty($transaction_indentifier) ? $transaction_indentifier : 0) . '"/>';
+<div id="order_payment_method_'.$post_id . '" class="wpshop_cls wpshopHide" >
+	<input type="hidden" id="used_method_payment_'.$post_id . '" value="' . (!empty($order_postmeta['payment_method']) ? $order_postmeta['payment_method'] : 'no_method') . '"/>
+	<input type="hidden" id="used_method_payment_transaction_id_'.$post_id . '" value="' . (!empty($transaction_indentifier) ? $transaction_indentifier : 0) . '"/>';
 
-		if(!empty($order_postmeta['payment_method'])){
+		if (!empty($order_postmeta['payment_method'])) {
 			$payment_validation .= sprintf(__('Selected payment method: %s', 'wpshop'), __($order_postmeta['payment_method'], 'wpshop')) . '<br/>';
 		}
 
-		if(!empty($paymentMethod['paypal']) && empty($order_postmeta['payment_method'])) {
+		if (!empty($paymentMethod['paypal']) && empty($order_postmeta['payment_method'])) {
 			$payment_validation .= '<input type="radio" class="payment_method" name="payment_method" value="paypal" id="payment_method_paypal" /><label for="payment_method_paypal" >' . __('Paypal', 'wpshop') . '</label><br/>';
 			$display_button = true;
 		}
 
-		if(!empty($paymentMethod['checks']) && empty($order_postmeta['payment_method'])) {
+		if (!empty($paymentMethod['checks']) && empty($order_postmeta['payment_method'])) {
 			$payment_validation .= '<input type="radio" class="payment_method" name="payment_method" value="check" id="payment_method_check" /><label for="payment_method_check" >' . __('Check', 'wpshop') . '</label><br/>';
 			$display_button = true;
 		}
 
-		$wpshop_paymentMethod = get_option( 'wps_payment_mode' );
-		if((WPSHOP_PAYMENT_METHOD_CIC || (!empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic'])) ) && empty($order_postmeta['payment_method'])) {
+		$wpshop_paymentMethod = get_option('wps_payment_mode');
+		if ((WPSHOP_PAYMENT_METHOD_CIC || (!empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']))) && empty($order_postmeta['payment_method'])) {
 			$payment_validation .= '<input type="radio" class="payment_method" name="payment_method" value="cb" id="payment_method_cb" /><label for="payment_method_cb" >' . __('Credit card', 'wpshop') . '</label><br/>';
 			$display_button = true;
 		}
 
-		if(empty($payment_transaction)){
-			$payment_validation .= '<hr/>' . __('Transaction number', 'wpshop') . '&nbsp;:&nbsp;<input type="text" value="" name="payment_method_transaction_number" id="payment_method_transaction_number_'.$post_id.'" />';
+		if (empty($payment_transaction)) {
+			$payment_validation .= '<hr/>' . __('Transaction number', 'wpshop') . '&nbsp;:&nbsp;<input type="text" value="" name="payment_method_transaction_number" id="payment_method_transaction_number_' . $post_id . '" />';
 			$display_button = true;
 		}
 
-		if($display_button){
+		if ($display_button) {
 			$payment_validation .= '
-		<br/><br/><a class="button payment_method_validate order_'.$post_id.' wpshop_clear" >'.__('Validate payment method', 'wpshop').'</a>';
+		<br/><br/><a class="button payment_method_validate order_'.$post_id . ' wpshop_clear" >' . __('Validate payment method', 'wpshop') . '</a>';
 		}
 
 		$payment_validation .= '
@@ -379,21 +379,21 @@ 
 	 * @param float $current_order_total The current order total to pay before partial amount calcul
 	 * @return array The amount to pay / A html output with amount to pay and different information
 	 */
-	function partial_payment_calcul( $current_order_total, $for = 'for_all' ) {
+	function partial_payment_calcul($current_order_total, $for = 'for_all') {
 		$output = '';
 		$tpl_component = array();
 
 		/**	Get current configuration	*/
 		$partial_payment_configuration = get_option('wpshop_payment_partial', array($for => array(), 'for_quotation' => array()));
-		if ( !empty($partial_payment_configuration[$for]) && (!empty($partial_payment_configuration[$for]['activate'])) && ($partial_payment_configuration[$for]['activate'] == 'on') ) {
+		if (!empty($partial_payment_configuration[$for]) && (!empty($partial_payment_configuration[$for]['activate'])) && ($partial_payment_configuration[$for]['activate'] == 'on')) {
 			$amount_of_partial_payment = 0;
-			if ( !empty($partial_payment_configuration[$for]['value']) && !empty($partial_payment_configuration[$for]['activate']) ) {
+			if (!empty($partial_payment_configuration[$for]['value']) && !empty($partial_payment_configuration[$for]['activate'])) {
 				$amount_of_partial_payment = $partial_payment_configuration[$for]['value'];
 			}
 
 			$partial_amount_to_pay = 0;
 			$type_of_partial_payment = null;
-			if (!empty($partial_payment_configuration[$for]) && !empty($partial_payment_configuration[$for]['type']) ) {
+			if (!empty($partial_payment_configuration[$for]) && !empty($partial_payment_configuration[$for]['type'])) {
 				switch ($partial_payment_configuration[$for]['type']) {
 					case 'percentage':
 						$type_of_partial_payment = '%';
@@ -453,7 +453,7 @@ 
 	function set_payment_transaction_number($order_id, $transaction_number) {
 		$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 
-		if ( !empty($order_postmeta['order_payment']['received']) ) {
+		if (!empty($order_postmeta['order_payment']['received'])) {
 			if (count($order_postmeta['order_payment']['received']) == 1) {
 				$order_postmeta['order_payment']['received'][0]['payment_reference'] = $transaction_number;
 			}
@@ -467,10 +467,10 @@ 
 	 *
 	 * @param integer $order_id
 	 */
-	function save_payment_return_data( $order_id ) {
+	function save_payment_return_data($order_id) {
 		$data = wpshop_tools::getMethode();
 
-		$current_payment_return = get_post_meta( $order_id, '_wpshop_payment_return_data', true);
+		$current_payment_return = get_post_meta($order_id, '_wpshop_payment_return_data', true);
 		$current_payment_return[] = $data;
 
 		update_post_meta($order_id, '_wpshop_payment_return_data', $current_payment_return);
@@ -484,23 +484,23 @@ 
 	 * @param array $params : infos sended by the bank, array structure : ('method', 'waited amount', 'status', 'author', 'payment reference', 'date', 'received amount')
 	 * @return array The order new meta informations
 	 */
-	public static function add_new_payment_to_order( $order_id, $order_meta, $payment_index, $params, $bank_response ) {
-
-		$order_meta['order_payment']['received'][$payment_index]['method'] = ( !empty($params['method']) ) ? $params['method'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['waited_amount'] = ( !empty($params['waited_amount']) ) ? $params['waited_amount'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['status'] = ( !empty($params['status']) ) ? $params['status'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['author'] = ( !empty($params['author']) ) ? $params['author'] : get_current_user_id();
-		$order_meta['order_payment']['received'][$payment_index]['payment_reference'] =( !empty($params['payment_reference']) ) ? $params['payment_reference'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['date'] = ( !empty($params['date']) ) ? $params['date'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['received_amount'] = ( !empty($params['received_amount']) ) ? $params['received_amount'] : null;
+	public static function add_new_payment_to_order($order_id, $order_meta, $payment_index, $params, $bank_response) {
+
+		$order_meta['order_payment']['received'][$payment_index]['method'] = (!empty($params['method'])) ? $params['method'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['waited_amount'] = (!empty($params['waited_amount'])) ? $params['waited_amount'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['status'] = (!empty($params['status'])) ? $params['status'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['author'] = (!empty($params['author'])) ? $params['author'] : get_current_user_id();
+		$order_meta['order_payment']['received'][$payment_index]['payment_reference'] = (!empty($params['payment_reference'])) ? $params['payment_reference'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['date'] = (!empty($params['date'])) ? $params['date'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['received_amount'] = (!empty($params['received_amount'])) ? $params['received_amount'] : null;
 		$order_meta['order_payment']['received'][$payment_index]['comment'] = '';
 
 		$order_info = get_post_meta($order_id, '_order_info', true);
-		if(!empty($order_meta) && !empty($order_info) && ($bank_response == 'completed')) {
+		if (!empty($order_meta) && !empty($order_info) && ($bank_response == 'completed')) {
 
 			/**	Generate an invoice number for the current payment. Check if the payment is complete or not	*/
-			if ( empty($order_meta['order_invoice_ref']) ) {
-				$order_meta['order_payment']['received'][$payment_index]['invoice_ref'] = wpshop_modules_billing::generate_invoice_number( $order_id );
+			if (empty($order_meta['order_invoice_ref'])) {
+				$order_meta['order_payment']['received'][$payment_index]['invoice_ref'] = wpshop_modules_billing::generate_invoice_number($order_id);
 			}
 		}
 
@@ -513,13 +513,13 @@ 
 	 * @param string $payment_method
 	 * @return integer $key : array id of [order_payment][received] in the order postmeta
 	 */
-	public static function get_order_waiting_payment_array_id ( $oid, $payment_method ) {
+	public static function get_order_waiting_payment_array_id($oid, $payment_method) {
 		$key = 0;
-		$order_meta = get_post_meta( $oid, '_order_postmeta', true);
-		if ( !empty($order_meta) ) {
-			$key = count( $order_meta['order_payment']['received'] );
-			foreach ( $order_meta['order_payment']['received'] as $k => $payment_test) {
-				if ( !array_key_exists('received_amount', $payment_test) /* && $order_meta['order_payment']['received'][$k]['method'] == $payment_method */ ) {
+		$order_meta = get_post_meta($oid, '_order_postmeta', true);
+		if (!empty($order_meta)) {
+			$key = count($order_meta['order_payment']['received']);
+			foreach ($order_meta['order_payment']['received'] as $k => $payment_test) {
+				if (!array_key_exists('received_amount', $payment_test) /* && $order_meta['order_payment']['received'][$k]['method'] == $payment_method */) {
 					$key = $k;
 				}
 			}
@@ -534,52 +534,52 @@ 
 	 * @param array $params_array
 	 * @return string
 	 */
-	public static function check_order_payment_total_amount($order_id, $params_array, $bank_response, $order_meta = array(), $save_metadata = true ) {
+	public static function check_order_payment_total_amount($order_id, $params_array, $bank_response, $order_meta = array(), $save_metadata = true) {
 		global $wpshop_payment; global $wpdb;
-		$order_meta = ( !empty($order_meta) ) ? $order_meta : get_post_meta( $order_id, '_order_postmeta', true);
+		$order_meta = (!empty($order_meta)) ? $order_meta : get_post_meta($order_id, '_order_postmeta', true);
 
 		$wps_message = new wps_message_ctr();
-		if ( !empty($order_meta) ) {
+		if (!empty($order_meta)) {
 			$order_info = get_post_meta($order_id, '_order_info', true);
-			$user_data = get_userdata( $order_meta['customer_id'] );
-			$email = ( !empty($user_data) && !empty($user_data->user_email) ) ? $user_data->user_email : '';
+			$user_data = get_userdata($order_meta['customer_id']);
+			$email = (!empty($user_data) && !empty($user_data->user_email)) ? $user_data->user_email : '';
 // 			$email = ( !empty($order_info) &&  !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_user_email']) ) ? $order_info['billing']['address']['address_user_email'] : '' ;
-			$first_name = (!empty($order_info) && !empty($order_info['billing']) &&  !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '' );
-			$last_name = ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '' );
+			$first_name = (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '');
+			$last_name = (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '');
 
-			$key = self::get_order_waiting_payment_array_id( $order_id, $params_array['method']);
+			$key = self::get_order_waiting_payment_array_id($order_id, $params_array['method']);
 			$order_grand_total = $order_meta['order_grand_total'];
-			$total_received = ( ( !empty($params_array['status']) && ( $params_array['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($params_array['received_amount']) ) ? $params_array['received_amount'] : 0 );
-			foreach ( $order_meta['order_payment']['received'] as $received ) {
-				$total_received += ( ( !empty($received['status']) && ( $received['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($received['received_amount']) ) ? $received['received_amount'] : 0 );
+			$total_received = ((!empty($params_array['status']) && ($params_array['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($params_array['received_amount'])) ? $params_array['received_amount'] : 0);
+			foreach ($order_meta['order_payment']['received'] as $received) {
+				$total_received += ((!empty($received['status']) && ($received['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($received['received_amount'])) ? $received['received_amount'] : 0);
 			}
 			$order_meta['order_amount_to_pay_now'] = $order_grand_total - $total_received;
-			$order_meta['order_payment']['received'][$key] = self::add_new_payment_to_order( $order_id, $order_meta, $key, $params_array, $bank_response );
+			$order_meta['order_payment']['received'][$key] = self::add_new_payment_to_order($order_id, $order_meta, $key, $params_array, $bank_response);
 
 			if ($bank_response == 'completed') {
 
-				if ( number_format((float)$total_received, 2, '.', '') >= number_format((float)$order_grand_total,2, '.', '') ) {
+				if (number_format((float)$total_received, 2, '.', '') >= number_format((float)$order_grand_total, 2, '.', '')) {
 					$payment_status = 'completed';
 
-					$order_meta['order_invoice_ref'] = ( empty ($order_meta['order_invoice_ref'] ) && !empty($order_meta['order_payment']['received'][$key]) && !empty($order_meta['order_payment']['received'][$key]['invoice_ref']) ) ? $order_meta['order_payment']['received'][$key]['invoice_ref'] : ( empty($order_meta['order_invoice_ref']) ? null : $order_meta['order_invoice_ref'] ) ;
+					$order_meta['order_invoice_ref'] = (empty ($order_meta['order_invoice_ref']) && !empty($order_meta['order_payment']['received'][$key]) && !empty($order_meta['order_payment']['received'][$key]['invoice_ref'])) ? $order_meta['order_payment']['received'][$key]['invoice_ref'] : (empty($order_meta['order_invoice_ref']) ? null : $order_meta['order_invoice_ref']);
 					$order_meta['order_invoice_date'] = current_time('mysql', 0);
 
 					if (!empty($order_meta['order_items'])) {
 						foreach ($order_meta['order_items'] as $item_id => $o) {
 							$pid = $o['item_id'];
-							if (strpos($item_id,'__') !== false) {
-								$product_data_id = explode( '__', $item_id );
-								$pid = ( !empty($product_data_id) && !empty($product_data_id[1]) ) ? $product_data_id[1] : $pid;
+							if (strpos($item_id, '__') !== false) {
+								$product_data_id = explode('__', $item_id);
+								$pid = (!empty($product_data_id) && !empty($product_data_id[1])) ? $product_data_id[1] : $pid;
 							}
-							$product = wpshop_products::get_product_data( $pid );
-							if ( get_post_type( $pid ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-								$parent_def = wpshop_products::get_parent_variation ( $pid );
+							$product = wpshop_products::get_product_data($pid);
+							if (get_post_type($pid) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+								$parent_def = wpshop_products::get_parent_variation($pid);
 								$parent_post = $parent_def['parent_post'];
-								$product = wpshop_products::get_product_data( $parent_post->ID );
+								$product = wpshop_products::get_product_data($parent_post->ID);
 							}
 
-							if (!empty($product) && !empty($product['manage_stock']) && strtolower( __($product['manage_stock'], 'wpshop') ) == strtolower( __('Yes', 'wpshop') ) ) {
-								wpshop_products::reduce_product_stock_qty($product['product_id'], $o['item_qty'], $pid );
+							if (!empty($product) && !empty($product['manage_stock']) && strtolower(__($product['manage_stock'], 'wpshop')) == strtolower(__('Yes', 'wpshop'))) {
+								wpshop_products::reduce_product_stock_qty($product['product_id'], $o['item_qty'], $pid);
 							}
 						}
 					}
@@ -588,15 +588,15 @@ 
 					update_post_meta($order_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '_completed_date', current_time('mysql', 0));
 
 					// Send confirmation e-mail to administrator
-					if ( empty($_SESSION['wps-pos-addon']) ) {
+					if (empty($_SESSION['wps-pos-addon'])) {
 						$email_option = get_option('wpshop_emails');
-						if(  !empty($email_option) && !empty($email_option['send_confirmation_order_message']) ){
-							wpshop_checkout::send_order_email_to_administrator( $order_id, $user_data );
+						if (!empty($email_option) && !empty($email_option['send_confirmation_order_message'])) {
+							wpshop_checkout::send_order_email_to_administrator($order_id, $user_data);
 						}
 					}
 
 					// POS Status
-					if( !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['shipping_method']) && $order_meta['order_payment']['shipping_method'] == 'default_shipping_mode_for_pos' ) {
+					if (!empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['shipping_method']) && $order_meta['order_payment']['shipping_method'] == 'default_shipping_mode_for_pos') {
 						$payment_status = 'pos';
 					}
 				}
@@ -605,27 +605,27 @@ 
 				}
 
 				$order_meta['order_status'] = $payment_status;
-				update_post_meta( $order_id, '_order_postmeta', $order_meta);
+				update_post_meta($order_id, '_order_postmeta', $order_meta);
 				$save_metadata = false;
 
-				$allow_send_invoice = get_option( 'wpshop_send_invoice' );
-				$invoice_attachment_file = ( !empty($allow_send_invoice) ) ? wpshop_modules_billing::generate_invoice_for_email( $order_id, empty( $order_meta['order_payment']['received'][$key]['invoice_ref'] ) ? $order_meta['order_invoice_ref'] : $order_meta['order_payment']['received'][$key]['invoice_ref'] ) : '';
+				$allow_send_invoice = get_option('wpshop_send_invoice');
+				$invoice_attachment_file = (!empty($allow_send_invoice)) ? wpshop_modules_billing::generate_invoice_for_email($order_id, empty($order_meta['order_payment']['received'][$key]['invoice_ref']) ? $order_meta['order_invoice_ref'] : $order_meta['order_payment']['received'][$key]['invoice_ref']) : '';
 
-				$email_option = get_option( 'wpshop_emails' );
+				$email_option = get_option('wpshop_emails');
 
-				$shipping_mode_option = get_option( 'wps_shipping_mode' );
-				$shipping_method = ( !empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ( (!empty($order_meta['order_payment']['shipping_method']) ) ? $order_meta['order_payment']['shipping_method'] : '' );
+				$shipping_mode_option = get_option('wps_shipping_mode');
+				$shipping_method = (!empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ((!empty($order_meta['order_payment']['shipping_method'])) ? $order_meta['order_payment']['shipping_method'] : '');
 
-				$payment_method_option = get_option( 'wps_payment_mode' );
-				$order_payment_method = ( !empty($payment_method_option) && !empty($payment_method_option['mode'])  && !empty($order_meta['order_payment']['customer_choice']['method'])  && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])  ) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
+				$payment_method_option = get_option('wps_payment_mode');
+				$order_payment_method = (!empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_meta['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
 
-				if ( !empty( $email_option ) && !empty( $email_option['send_confirmation_order_message'] ) && $payment_status == 'completed'
-						&& ( !isset( $params_array[ 'send_received_payment_email' ] ) || ( true == $params_array[ 'send_received_payment_email' ] ) ) ) {
-					$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ( ( !empty($order_meta['order_key']) ) ? $order_meta['order_key'] : ''),'order_date' => current_time('mysql', 0),  'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '',  'order_shipping_method' => $shipping_method ) );
+				if (!empty($email_option) && !empty($email_option['send_confirmation_order_message']) && $payment_status == 'completed'
+						&& (!isset($params_array['send_received_payment_email']) || (true == $params_array['send_received_payment_email']))) {
+					$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ((!empty($order_meta['order_key'])) ? $order_meta['order_key'] : ''), 'order_date' => current_time('mysql', 0), 'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method));
 				}
 
-				if ( !isset( $params_array[ 'send_received_payment_email' ] ) || ( true == $params_array[ 'send_received_payment_email' ] ) ) {
-					$wps_message->wpshop_prepared_email( $email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'order_shipping_method' => $shipping_method), array(), $invoice_attachment_file);
+				if (!isset($params_array['send_received_payment_email']) || (true == $params_array['send_received_payment_email'])) {
+					$wps_message->wpshop_prepared_email($email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'order_shipping_method' => $shipping_method), array(), $invoice_attachment_file);
 				}
 			}
 			else {
@@ -634,13 +634,13 @@ 
 
 			$order_meta['order_status'] = $payment_status;
 
-			update_post_meta( $order_id, '_wpshop_order_status', $payment_status);
-			if( $save_metadata ) {
-				update_post_meta( $order_id, '_order_postmeta', $order_meta);
+			update_post_meta($order_id, '_wpshop_order_status', $payment_status);
+			if ($save_metadata) {
+				update_post_meta($order_id, '_order_postmeta', $order_meta);
 			}
 		}
-		do_action( 'wps_after_check_order_payment_total_amount', $order_id );
-		if ( ! $save_metadata ) {
+		do_action('wps_after_check_order_payment_total_amount', $order_id);
+		if (!$save_metadata) {
 			return $order_meta;
 		}
 	}
@@ -653,11 +653,11 @@ 
 	 * @param integer $order_id The order identifier we want to get the old transaction reference for
 	 * @return integer
 	 */
-	public static function get_payment_transaction_number_old_way($order_id){
+	public static function get_payment_transaction_number_old_way($order_id) {
 		$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 		$transaction_indentifier = 0;
-		if(!empty($order_postmeta['payment_method'])){
-			switch($order_postmeta['payment_method']){
+		if (!empty($order_postmeta['payment_method'])) {
+			switch ($order_postmeta['payment_method']) {
 				case 'check':
 					$transaction_indentifier = get_post_meta($order_id, '_order_check_number', true);
 					break;
@@ -676,26 +676,26 @@ 
 		return $transaction_indentifier;
 	}
 
-	public static function reverify_payment_invoice_ref( $order_id, $index_payment ) {
+	public static function reverify_payment_invoice_ref($order_id, $index_payment) {
 		$status = false;
-		$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
-		if( !empty( $order_meta ) && !empty( $order_meta['order_payment'] ) && !empty( $order_meta['order_payment']['received'] ) && !empty( $order_meta['order_payment']['received'][$index_payment] ) && empty( $order_meta['order_payment']['received'][$index_payment]['invoice_ref'] ) ) {
+		$order_meta = get_post_meta($order_id, '_order_postmeta', true);
+		if (!empty($order_meta) && !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['received']) && !empty($order_meta['order_payment']['received'][$index_payment]) && empty($order_meta['order_payment']['received'][$index_payment]['invoice_ref'])) {
 			$order_invoice = $invoice_ref = false;
 
-			end( $order_meta['order_payment']['received'] );
-			$last_payment = key( $order_meta['order_payment']['received'] );
-			if( $last_payment == $index_payment ) {
+			end($order_meta['order_payment']['received']);
+			$last_payment = key($order_meta['order_payment']['received']);
+			if ($last_payment == $index_payment) {
 				$payments = 0;
-				foreach( $order_meta['order_payment']['received'] as $payment ) {
-					$payments += ( $payment['status'] == 'payment_received' ) ? $payment['received_amount'] : 0;
+				foreach ($order_meta['order_payment']['received'] as $payment) {
+					$payments += ($payment['status'] == 'payment_received') ? $payment['received_amount'] : 0;
 				}
-				if( $order_meta['order_grand_total'] <= $payments ) {
-					if( $order_meta['order_status'] == 'partially_paid' ) {
-						$order_status_meta = get_post_meta( $order_id, '_wpshop_order_status', true );
+				if ($order_meta['order_grand_total'] <= $payments) {
+					if ($order_meta['order_status'] == 'partially_paid') {
+						$order_status_meta = get_post_meta($order_id, '_wpshop_order_status', true);
 						$order_meta['order_status'] = 'completed';
-						$status = (bool)update_post_meta( $order_id, '_wpshop_order_status', 'completed' );
+						$status = (bool)update_post_meta($order_id, '_wpshop_order_status', 'completed');
 					}
-					if( !empty( $order_meta['order_invoice_ref'] ) ) {
+					if (!empty($order_meta['order_invoice_ref'])) {
 						$invoice_ref = $order_meta['order_invoice_ref'];
 						$status = true;
 					} else {
@@ -706,16 +706,16 @@ 
 				$status = true;
 			}
 
-			if( $status ) {
-				if( empty( $invoice_ref ) ) {
-					$invoice_ref = wpshop_modules_billing::generate_invoice_number( $order_id );
-					if( $order_invoice ) {
+			if ($status) {
+				if (empty($invoice_ref)) {
+					$invoice_ref = wpshop_modules_billing::generate_invoice_number($order_id);
+					if ($order_invoice) {
 						$order_meta['order_invoice_ref'] = $invoice_ref;
 					}
 				}
 
 				$order_meta['order_payment']['received'][$index_payment]['invoice_ref'] = $invoice_ref;
-				$status = (bool)update_post_meta( $order_id, '_order_postmeta', $order_meta );
+				$status = (bool)update_post_meta($order_id, '_order_postmeta', $order_meta);
 			}
 		}
 		return $status;

Braces +12 added lines, -12 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -40,9 +42,11 @@ 
 
 	public static function construct_url_parameters($url, $param, $value) {
 		$interoguation_marker_pos = strpos($url, '?');
-		if($interoguation_marker_pos===false)
-			return $url.'?'.$param.'='.$value;
-		else return $url.'&'.$param.'='.$value;
+		if($interoguation_marker_pos===false) {
+					return $url.'?'.$param.'='.$value;
+		} else {
+			return $url.'&'.$param.'='.$value;
+		}
 	}
 
 	/**
@@ -167,8 +171,7 @@ 
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_IDENTIFIER'] = $payment_method_identifier;
 					if ( !empty($payment_mode['logo']) && (int)$payment_mode['logo'] != 0 ) {
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? wp_get_attachment_image( $payment_method_def['payment_method_icon'], 'thumbnail', false, array('class' => 'wps_shipping_mode_logo') ) : '';
-					}
-					else {
+					} else {
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? '<img src="' .$payment_method_def['payment_method_icon']. '" alt="" />' : '';
 					}
 					//$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = $payment_method_def['payment_method_icon'];
@@ -200,8 +203,7 @@ 
 
 						if ( !empty($payment_config['logo']) && (int)$payment_config['logo'] != 0 ) {
 							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? wp_get_attachment_image( $payment_config['logo'], 'thumbnail', false ) : '';
-						}
-						else {
+						} else {
 							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? '<img src="' .$payment_config['logo']. '" alt="' .$payment_config['name']. '" />' : '';
 						}
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = ( !empty($payment_config['name']) ) ? $payment_config['name'] : '';
@@ -599,8 +601,7 @@ 
 					if( !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['shipping_method']) && $order_meta['order_payment']['shipping_method'] == 'default_shipping_mode_for_pos' ) {
 						$payment_status = 'pos';
 					}
-				}
-				else {
+				} else {
 					$payment_status = 'partially_paid';
 				}
 
@@ -627,8 +628,7 @@ 
 				if ( !isset( $params_array[ 'send_received_payment_email' ] ) || ( true == $params_array[ 'send_received_payment_email' ] ) ) {
 					$wps_message->wpshop_prepared_email( $email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'order_shipping_method' => $shipping_method), array(), $invoice_attachment_file);
 				}
-			}
-			else {
+			} else {
 				$payment_status = $bank_response;
 			}
 

includes/modules/wps_orders/templates/backend/order-private-comments/wps_orders_private_comments.php

Spacing +5 added lines, -5 removed lines

@@ -1,18 +1,18 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div>
 	<div>
-		<label for="textarea_order_private_comment"><?php _e( 'Write your notification and send it to your customer', 'wpshop'); ?> :</label>
+		<label for="textarea_order_private_comment"><?php _e('Write your notification and send it to your customer', 'wpshop'); ?> :</label>
 		<div class="wps-form">
 			<textarea id="textarea_order_private_comment" name="order_private_comment"></textarea>
 		</div>
-		<a data-nonce="<?php echo wp_create_nonce( 'wpshop_add_private_comment_to_order' ); ?>" href="#" class="wps-bton-first-mini-rounded addPrivateComment order_<?php echo $post->ID; ?>"><?php _e('Add the comment','wpshop'); ?></a>
+		<a data-nonce="<?php echo wp_create_nonce('wpshop_add_private_comment_to_order'); ?>" href="#" class="wps-bton-first-mini-rounded addPrivateComment order_<?php echo $post->ID; ?>"><?php _e('Add the comment', 'wpshop'); ?></a>
 	</div>
 
 	<div id="wps_private_messages_container">
-		<?php if( !empty($post) && !empty($post->ID) ) :
+		<?php if (!empty($post) && !empty($post->ID)) :
 		$oid = $post->ID;
-		require( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "order-private-comments/wps_orders_sended_private_comments") );
+		require(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "order-private-comments/wps_orders_sended_private_comments"));
 		endif; ?>
 	</div>
 </div>

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <div>
 	<div>

includes/modules/wps_orders/controller/wps_orders_in_back_office.php

Spacing +207 added lines, -207 removed lines

@@ -1,26 +1,26 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_orders_in_back_office {
 
 	function __construct() {
 		// Template loading
 		$this->template_dir = WPS_ORDERS_PATH . WPS_ORDERS_DIR . "/templates/";
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes') );
+		add_action('add_meta_boxes', array($this, 'add_meta_boxes'));
 
 		// Ajax actions
-		add_action('wp_ajax_wpshop_add_private_comment_to_order', array( $this, 'wpshop_add_private_comment_to_order' ) );
-		add_action('wp_ajax_wps_order_refresh_product_listing', array( $this, 'refresh_product_list' ) );
-		add_action('wp_ajax_wps_add_product_to_order_admin', array( $this, 'wps_add_product_to_order_admin' ) );
-		add_action('wp_ajax_wps_refresh_cart_order', array( $this, 'refresh_cart_order' ) );
-		add_action('wp_ajax_wps_refresh_payments_order', array( $this, 'refresh_payments_order' ) );
-		add_action('wp_ajax_wps_update_product_qty_in_admin', array( $this, 'wps_update_product_qty_in_admin' ) );
-		add_action('wp_ajax_wps_order_load_product_variations', array( $this, 'wps_order_load_product_variations' ) );
-		add_action('wp_ajax_wps-orders-update-cart-informations', array( $this, 'wps_orders_update_cart_informations' ) );
-		add_action('wp_ajax_wps_reverify_payment_invoice_ref', array( $this, 'wps_reverify_payment_invoice_ref' ) );
+		add_action('wp_ajax_wpshop_add_private_comment_to_order', array($this, 'wpshop_add_private_comment_to_order'));
+		add_action('wp_ajax_wps_order_refresh_product_listing', array($this, 'refresh_product_list'));
+		add_action('wp_ajax_wps_add_product_to_order_admin', array($this, 'wps_add_product_to_order_admin'));
+		add_action('wp_ajax_wps_refresh_cart_order', array($this, 'refresh_cart_order'));
+		add_action('wp_ajax_wps_refresh_payments_order', array($this, 'refresh_payments_order'));
+		add_action('wp_ajax_wps_update_product_qty_in_admin', array($this, 'wps_update_product_qty_in_admin'));
+		add_action('wp_ajax_wps_order_load_product_variations', array($this, 'wps_order_load_product_variations'));
+		add_action('wp_ajax_wps-orders-update-cart-informations', array($this, 'wps_orders_update_cart_informations'));
+		add_action('wp_ajax_wps_reverify_payment_invoice_ref', array($this, 'wps_reverify_payment_invoice_ref'));
 
 		// WP General actions
-		add_action( 'admin_enqueue_scripts', array( $this, 'wps_orders_scripts' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'wps_orders_scripts_texts' ), 20 );
-		add_action( 'save_post', array( $this, 'save_order_custom_informations' ), 10, 2 );
+		add_action('admin_enqueue_scripts', array($this, 'wps_orders_scripts'));
+		add_action('admin_enqueue_scripts', array($this, 'wps_orders_scripts_texts'), 20);
+		add_action('save_post', array($this, 'save_order_custom_informations'), 10, 2);
 
 		// WP Filters
 		//add_filter( 'wps_order_saving_admin_extra_action', array( $this, 'wps_notif_user_on_order_saving'), 100, 2 );
@@ -31,52 +31,52 @@ 
 	 */
 	function wps_orders_scripts() {
 		global $current_screen;
-		if( ! in_array( $current_screen->post_type, array( WPSHOP_NEWTYPE_IDENTIFIER_ORDER ), true ) )
+		if (!in_array($current_screen->post_type, array(WPSHOP_NEWTYPE_IDENTIFIER_ORDER), true))
 			return;
 
-		wp_enqueue_style( 'wps_orders_backend', WPS_ORDERS_URL . WPS_ORDERS_DIR . '/assets/backend/css/wps_orders.backend.css' );
-		wp_enqueue_script( 'wps_orders_backend', WPS_ORDERS_URL . WPS_ORDERS_DIR . '/assets/backend/js/wps_orders.js' );
+		wp_enqueue_style('wps_orders_backend', WPS_ORDERS_URL . WPS_ORDERS_DIR . '/assets/backend/css/wps_orders.backend.css');
+		wp_enqueue_script('wps_orders_backend', WPS_ORDERS_URL . WPS_ORDERS_DIR . '/assets/backend/js/wps_orders.js');
 	}
 
 	function wps_orders_scripts_texts() {
-		wp_localize_script( 'wps_orders_backend', 'message_confirm_reload', __( 'Are you sure you want to refresh your browser?', 'wpshop' ) );
-		wp_localize_script( 'wps_orders_backend', 'message_error_reverify_payment_invoice_ref', __( 'Error detected.', 'wpshop' ) );
+		wp_localize_script('wps_orders_backend', 'message_confirm_reload', __('Are you sure you want to refresh your browser?', 'wpshop'));
+		wp_localize_script('wps_orders_backend', 'message_error_reverify_payment_invoice_ref', __('Error detected.', 'wpshop'));
 	}
 	/**
 	 * Add meta boxes
 	 */
 	function add_meta_boxes() {
 		global $post;
-		$order_meta = get_post_meta( $post->ID, '_order_postmeta', true );
+		$order_meta = get_post_meta($post->ID, '_order_postmeta', true);
 		/** Box  Order Payments **/
-		if( !in_array( $post->post_status, array( 'auto-draft' ) ) ) {
-			add_meta_box('wpshop_order_payment', '<span class="dashicons dashicons-money"></span> '.__('Order payment', 'wpshop'),array($this, 'display_order_payments_box'),WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'side', 'low');
+		if (!in_array($post->post_status, array('auto-draft'))) {
+			add_meta_box('wpshop_order_payment', '<span class="dashicons dashicons-money"></span> ' . __('Order payment', 'wpshop'), array($this, 'display_order_payments_box'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'side', 'low');
 		}
 		/**	Box for customer order comment */
-		if ( ! empty( $post->post_excerpt ) ) {
-			add_meta_box('wpshop_order_customer_comment', '<span class="dashicons dashicons-format-status"></span> '.__('Order customer comment', 'wpshop'),array( $this, 'order_customer_comment_box'),WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'side', 'low');
+		if (!empty($post->post_excerpt)) {
+			add_meta_box('wpshop_order_customer_comment', '<span class="dashicons dashicons-format-status"></span> ' . __('Order customer comment', 'wpshop'), array($this, 'order_customer_comment_box'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'side', 'low');
 		}
 		/** Historic sales **/
-		add_meta_box('wpshop_product_order_historic', __('Sales informations', 'wpshop'), array( $this, 'meta_box_product_sale_informations'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'low');
+		add_meta_box('wpshop_product_order_historic', __('Sales informations', 'wpshop'), array($this, 'meta_box_product_sale_informations'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'low');
 		/**	Box with the complete order content	*/
 		$payment_started = false;
-		if ( ! empty( $order_meta['order_payment'] ) && ! empty( $order_meta['order_payment']['received'] ) ) {
-			foreach ( $order_meta['order_payment']['received'] as $received ) {
-				if ( empty( $received['received_amount'] ) ) {
+		if (!empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['received'])) {
+			foreach ($order_meta['order_payment']['received'] as $received) {
+				if (empty($received['received_amount'])) {
 					continue;
 				}
 				$payment_started = true;
 				break;
 			}
 		}
-		if ( ! $payment_started ) {
-			add_meta_box( 'wpshop_product_list', '<span class="dashicons dashicons-archive"></span> ' . __( 'Product List', 'wpshop' ), array( $this, 'wps_products_listing_for_quotation' ), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'normal', 'low' );
+		if (!$payment_started) {
+			add_meta_box('wpshop_product_list', '<span class="dashicons dashicons-archive"></span> ' . __('Product List', 'wpshop'), array($this, 'wps_products_listing_for_quotation'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'normal', 'low');
 		}
 		/**	Box with the complete order content	*/
-		add_meta_box( 'wpshop_order_content', '<span class="dashicons dashicons-cart"></span> '.__('Order content', 'wpshop'), array( $this, 'meta_box_order_content'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'normal', 'low');
+		add_meta_box('wpshop_order_content', '<span class="dashicons dashicons-cart"></span> ' . __('Order content', 'wpshop'), array($this, 'meta_box_order_content'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'normal', 'low');
 		/** Box Private order comments **/
-		if( !in_array( $post->post_status, array( 'auto-draft' ) ) ) {
-			add_meta_box('wpshop_order_private_comments', '<span class="dashicons dashicons-format-chat"></span> '.__('Comments', 'wpshop'), array( $this, 'meta_box_private_comment'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'normal', 'low');
+		if (!in_array($post->post_status, array('auto-draft'))) {
+			add_meta_box('wpshop_order_private_comments', '<span class="dashicons dashicons-format-chat"></span> ' . __('Comments', 'wpshop'), array($this, 'meta_box_private_comment'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'normal', 'low');
 		}
 	}
 
@@ -84,65 +84,65 @@ 
 	 * METABOX CONTENT - Display Customer comments on order in administration panel
 	 * @param object $order
 	 */
-	function order_customer_comment_box( $order ) {
-		if ( ! empty($order) && ! empty($order->ID) ) {
-			require_once( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "customer_comment_on_order_box") );
+	function order_customer_comment_box($order) {
+		if (!empty($order) && !empty($order->ID)) {
+			require_once(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "customer_comment_on_order_box"));
 		}
 	}
 
 	/**
 	 * METABOX CONTENT - Display an order historic of product in administration product panel
 	 */
-	function meta_box_product_sale_informations () {
+	function meta_box_product_sale_informations() {
  		global $post;
  		$product_id = $post->ID;
- 		$variations = wpshop_products::get_variation( $product_id );
- 		$order_status = unserialize( WPSHOP_ORDER_STATUS );
- 		$color_label = array( 'awaiting_payment' => 'jaune', 'canceled' => 'rouge', 'partially_paid' => 'orange', 'incorrect_amount' => 'orange', 'denied' => 'rouge', 'shipped' => 'bleu', 'payment_refused' => 'rouge', 'completed' => 'vert', 'refunded' => 'rouge', 'pos' => 'bleu');
+ 		$variations = wpshop_products::get_variation($product_id);
+ 		$order_status = unserialize(WPSHOP_ORDER_STATUS);
+ 		$color_label = array('awaiting_payment' => 'jaune', 'canceled' => 'rouge', 'partially_paid' => 'orange', 'incorrect_amount' => 'orange', 'denied' => 'rouge', 'shipped' => 'bleu', 'payment_refused' => 'rouge', 'completed' => 'vert', 'refunded' => 'rouge', 'pos' => 'bleu');
  		// Get datas
  		$sales_informations = array();
  		/** Query **/
- 		$data_to_compare = '"item_id";s:' .strlen($product_id). ':"' .$product_id. '";';
- 		$query_args = array( 'posts_per_page' => 10, 'paged' => absint( isset( $_GET['paged_sales'] ) ? $_GET['paged_sales'] : 1 ), 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'meta_query' => array( array('key' => '_order_postmeta', 'value' => $data_to_compare, 'compare' => 'LIKE') ) );
- 		$orders = new WP_Query( $query_args );
- 		if ( ! empty($orders) && ! empty($orders->posts) ) {
- 			foreach( $orders->posts as $order ) {
- 				$order_meta = get_post_meta( $order->ID, '_order_postmeta', true );
- 				$order_info = get_post_meta( $order->ID, '_order_info', true );
+ 		$data_to_compare = '"item_id";s:' . strlen($product_id) . ':"' . $product_id . '";';
+ 		$query_args = array('posts_per_page' => 10, 'paged' => absint(isset($_GET['paged_sales']) ? $_GET['paged_sales'] : 1), 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'meta_query' => array(array('key' => '_order_postmeta', 'value' => $data_to_compare, 'compare' => 'LIKE')));
+ 		$orders = new WP_Query($query_args);
+ 		if (!empty($orders) && !empty($orders->posts)) {
+ 			foreach ($orders->posts as $order) {
+ 				$order_meta = get_post_meta($order->ID, '_order_postmeta', true);
+ 				$order_info = get_post_meta($order->ID, '_order_info', true);
  				$sales_informations[] = array(
- 						'order_key' => ( ! empty($order_meta) && ! empty($order_meta['order_key']) ) ? $order_meta['order_key'] : '',
- 						'order_date' => ( ! empty($order_meta) && ! empty($order_meta['order_date']) ) ? $order_meta['order_date'] : '',
- 						'customer_firstname' => ( ! empty($order_info) && ! empty($order_info['billing']) && ! empty($order_info['billing']['address']) && ! empty($order_info['billing']['address']['address_first_name']) ) ? $order_info['billing']['address']['address_first_name'] : '',
- 						'customer_name' => ( ! empty($order_info) && ! empty($order_info['billing']) && ! empty($order_info['billing']['address']) && ! empty($order_info['billing']['address']['address_last_name']) ) ? $order_info['billing']['address']['address_last_name'] : '',
- 						'customer_email' => ( ! empty($order_info) && ! empty($order_info['billing']) && ! empty($order_info['billing']['address']) && ! empty($order_info['billing']['address']['address_user_email']) ) ? $order_info['billing']['address']['address_user_email'] : '',
+ 						'order_key' => (!empty($order_meta) && !empty($order_meta['order_key'])) ? $order_meta['order_key'] : '',
+ 						'order_date' => (!empty($order_meta) && !empty($order_meta['order_date'])) ? $order_meta['order_date'] : '',
+ 						'customer_firstname' => (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_first_name'])) ? $order_info['billing']['address']['address_first_name'] : '',
+ 						'customer_name' => (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_last_name'])) ? $order_info['billing']['address']['address_last_name'] : '',
+ 						'customer_email' => (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_user_email'])) ? $order_info['billing']['address']['address_user_email'] : '',
  						'order_id' => $order->ID,
  						'order_status' => $order_meta['order_status']
  				);
  			}
  		}
  		// Display results
- 		require_once( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "product_order_historic") );
+ 		require_once(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "product_order_historic"));
  	}
 
 	/**
 	 * METABOX CONTENT - Payments Box in Orders panel
 	 * @param string $order
 	 */
-	function display_order_payments_box( $order ) {
+	function display_order_payments_box($order) {
 		$order_status = unserialize(WPSHOP_ORDER_STATUS);
 		$order_postmeta = get_post_meta($order->ID, '_order_postmeta', true);
-		require( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "wps_order_payment_box") );
+		require(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "wps_order_payment_box"));
 	}
 
 	/**
 	 * METABOX CONTENT - Display an lsiting of products to make quotation in backend
 	 */
-	function wps_products_listing_for_quotation( $post ) {
-		$letters = array( 'ALL', 'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z');
-		$current_letter = sanitize_title( $letters[0] );
+	function wps_products_listing_for_quotation($post) {
+		$letters = array('ALL', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z');
+		$current_letter = sanitize_title($letters[0]);
 		$wps_product_mdl = new wps_product_mdl();
-		$products = $wps_product_mdl->get_products_by_letter( $current_letter );
-		require( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "product-listing/wps_orders_product_listing") );
+		$products = $wps_product_mdl->get_products_by_letter($current_letter);
+		require(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "product-listing/wps_orders_product_listing"));
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 	 */
 	function meta_box_private_comment() {
 		global $post;
-		require( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "order-private-comments/wps_orders_private_comments") );
+		require(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "order-private-comments/wps_orders_private_comments"));
 	}
 
 	/**
@@ -158,8 +158,8 @@ 
 	 */
 	function meta_box_order_content() {
 		global $post_id;
-		unset( $_SESSION['cart'] );
-		echo do_shortcode( '[wps_cart oid="' .$post_id. '" cart_type="admin-panel"]');
+		unset($_SESSION['cart']);
+		echo do_shortcode('[wps_cart oid="' . $post_id . '" cart_type="admin-panel"]');
 	}
 
 
@@ -171,72 +171,72 @@ 
 	 * @param integer $post_id The current saved post id / L'identifiant post qui vient d'être sauvegardé.
 	 * @param WP_Post $post The entire post currently saved / Le post qui vient d'être sauvegardé.
 	 */
-	public function save_order_custom_informations( $post_id, $post ) {
-		if ( ( WPSHOP_NEWTYPE_IDENTIFIER_ORDER !== $post->post_type ) || ( 'auto-draft' === $post->post_status ) || wp_is_post_revision( $post_id ) ) {
+	public function save_order_custom_informations($post_id, $post) {
+		if ((WPSHOP_NEWTYPE_IDENTIFIER_ORDER !== $post->post_type) || ('auto-draft' === $post->post_status) || wp_is_post_revision($post_id)) {
 			return;
 		}
 
 		$user_id = get_current_user_id();
-		$customer_id = ( ! empty( $_REQUEST['wps_customer_id'] ) ) ? (int) $_REQUEST['wps_customer_id'] : wps_customer_ctr::get_customer_id_by_author_id( $user_id );
+		$customer_id = (!empty($_REQUEST['wps_customer_id'])) ? (int)$_REQUEST['wps_customer_id'] : wps_customer_ctr::get_customer_id_by_author_id($user_id);
 
 		// Récupération des informations actuelles de la commande / Get order's current information.
-		$order_meta = get_post_meta( $post_id, '_order_postmeta', true );
+		$order_meta = get_post_meta($post_id, '_order_postmeta', true);
 
 		// Affectation du client de la commande / Affect customer to order.
-		remove_action( 'save_post', array( $this, 'save_order_custom_informations' ) );
-		wp_update_post( array( 'ID' => $post_id, 'post_parent' => $customer_id ) );
-		if ( empty( $order_meta['customer_id'] ) ) {
-			update_post_meta( $post_id, '_wpshop_order_customer_id', $user_id );
+		remove_action('save_post', array($this, 'save_order_custom_informations'));
+		wp_update_post(array('ID' => $post_id, 'post_parent' => $customer_id));
+		if (empty($order_meta['customer_id'])) {
+			update_post_meta($post_id, '_wpshop_order_customer_id', $user_id);
 			$order_meta['customer_id'] = $user_id;
 		}
 
-		if ( empty( $order_meta['order_key'] ) ) {
-			$order_meta['order_key'] = ! empty( $order_meta['order_key'] ) ? $order_meta['order_key'] : ( ! empty( $order_meta['order_status'] ) && ( $order_meta['order_status'] != 'awaiting_payment' ) ? wpshop_orders::get_new_order_reference() : '');
-			$order_meta['order_temporary_key'] = ( isset( $order_meta['order_temporary_key'] ) && ( $order_meta['order_temporary_key'] != '') ) ? $order_meta['order_temporary_key'] : wpshop_orders::get_new_pre_order_reference();
+		if (empty($order_meta['order_key'])) {
+			$order_meta['order_key'] = !empty($order_meta['order_key']) ? $order_meta['order_key'] : (!empty($order_meta['order_status']) && ($order_meta['order_status'] != 'awaiting_payment') ? wpshop_orders::get_new_order_reference() : '');
+			$order_meta['order_temporary_key'] = (isset($order_meta['order_temporary_key']) && ($order_meta['order_temporary_key'] != '')) ? $order_meta['order_temporary_key'] : wpshop_orders::get_new_pre_order_reference();
 		}
 		$order_meta['order_status'] = (isset($order_meta['order_status']) && ($order_meta['order_status'] != '')) ? $order_meta['order_status'] : 'awaiting_payment';
 		$order_meta['order_date'] = (isset($order_meta['order_date']) && ($order_meta['order_date'] != '')) ? $order_meta['order_date'] : current_time('mysql', 0);
-		$order_meta['order_currency'] = wpshop_tools::wpshop_get_currency( true );
+		$order_meta['order_currency'] = wpshop_tools::wpshop_get_currency(true);
 
-		$billing_adress_id = ( ! empty( $_REQUEST['wps_order_selected_address'] ) && ! empty( $_REQUEST['wps_order_selected_address']['billing'] ) ) ? (int) $_REQUEST['wps_order_selected_address']['billing'] : 0;
+		$billing_adress_id = (!empty($_REQUEST['wps_order_selected_address']) && !empty($_REQUEST['wps_order_selected_address']['billing'])) ? (int)$_REQUEST['wps_order_selected_address']['billing'] : 0;
 
-		if ( ! empty( $billing_adress_id ) ) {
-			$order_informations = get_post_meta( $post_id, '_order_info', true );
-			$order_informations = ( ! empty( $order_informations ) ) ? $order_informations : array();
-			$billing_address_option = get_option( 'wpshop_billing_address' );
-			$billing_address_option = ( ! empty( $billing_address_option ) && ! empty( $billing_address_option['choice'] ) ) ? $billing_address_option['choice'] : '';
+		if (!empty($billing_adress_id)) {
+			$order_informations = get_post_meta($post_id, '_order_info', true);
+			$order_informations = (!empty($order_informations)) ? $order_informations : array();
+			$billing_address_option = get_option('wpshop_billing_address');
+			$billing_address_option = (!empty($billing_address_option) && !empty($billing_address_option['choice'])) ? $billing_address_option['choice'] : '';
 
 			// Billing datas
-			$order_informations['billing'] = array( 'id' => $billing_address_option,
+			$order_informations['billing'] = array('id' => $billing_address_option,
 				'address_id' => $billing_adress_id,
-				'address' => get_post_meta( $billing_adress_id, '_wpshop_address_metadata', true )
+				'address' => get_post_meta($billing_adress_id, '_wpshop_address_metadata', true)
 			);
 			// Shipping datas
-			$shipping_adress_id = ( ! empty( $_REQUEST['wps_order_selected_address'] ) && ! empty( $_REQUEST['wps_order_selected_address']['shipping'] ) ) ? (int) $_REQUEST['wps_order_selected_address']['shipping'] : 0;
+			$shipping_adress_id = (!empty($_REQUEST['wps_order_selected_address']) && !empty($_REQUEST['wps_order_selected_address']['shipping'])) ? (int)$_REQUEST['wps_order_selected_address']['shipping'] : 0;
 
-			if( ! empty( $shipping_adress_id ) ) {
-				$shipping_address_option = get_option( 'wpshop_shipping_address_choice' );
-				$shipping_address_option = ( ! empty($shipping_address_option) && ! empty($shipping_address_option['choice']) ) ? $shipping_address_option['choice'] : '';
-				$order_informations['shipping'] = array( 'id' => $shipping_address_option,
+			if (!empty($shipping_adress_id)) {
+				$shipping_address_option = get_option('wpshop_shipping_address_choice');
+				$shipping_address_option = (!empty($shipping_address_option) && !empty($shipping_address_option['choice'])) ? $shipping_address_option['choice'] : '';
+				$order_informations['shipping'] = array('id' => $shipping_address_option,
 					'address_id' => $shipping_adress_id,
-					'address' => get_post_meta( $shipping_adress_id, '_wpshop_address_metadata', true )
+					'address' => get_post_meta($shipping_adress_id, '_wpshop_address_metadata', true)
 				);
 			}
-			update_post_meta( $post_id, '_order_info', $order_informations );
+			update_post_meta($post_id, '_order_info', $order_informations);
 		}
 
-		$wpshop_admin_order_payment_received = ! empty( $_REQUEST['wpshop_admin_order_payment_received'] ) ? (array) $_REQUEST['wpshop_admin_order_payment_received'] : array();
-		$wpshop_admin_order_payment_received['method'] = ! empty( $wpshop_admin_order_payment_received['method'] ) ? sanitize_text_field( $wpshop_admin_order_payment_received['method'] ) : '';
-		$wpshop_admin_order_payment_received['payment_reference'] = ! empty( $wpshop_admin_order_payment_received['payment_reference'] ) ? sanitize_text_field( $wpshop_admin_order_payment_received['payment_reference'] ) : '';
-		$wpshop_admin_order_payment_received['date'] = ! empty( $wpshop_admin_order_payment_received['date'] ) ? sanitize_text_field( $wpshop_admin_order_payment_received['date'] ) : '';
-		$wpshop_admin_order_payment_received['received_amount'] = ! empty( $wpshop_admin_order_payment_received['received_amount'] ) ? sanitize_text_field( $wpshop_admin_order_payment_received['received_amount'] ) : '';
-		$action_triggered_from = ! empty( $_REQUEST['action_triggered_from'] ) ? sanitize_text_field( $_REQUEST['action_triggered_from'] ) : '';
-		$wshop_admin_order_payment_reference = ! empty( $_REQUEST['wpshop_admin_order_payment_reference'] ) ? sanitize_text_field( $_REQUEST['wpshop_admin_order_payment_reference'] ) : '';
+		$wpshop_admin_order_payment_received = !empty($_REQUEST['wpshop_admin_order_payment_received']) ? (array)$_REQUEST['wpshop_admin_order_payment_received'] : array();
+		$wpshop_admin_order_payment_received['method'] = !empty($wpshop_admin_order_payment_received['method']) ? sanitize_text_field($wpshop_admin_order_payment_received['method']) : '';
+		$wpshop_admin_order_payment_received['payment_reference'] = !empty($wpshop_admin_order_payment_received['payment_reference']) ? sanitize_text_field($wpshop_admin_order_payment_received['payment_reference']) : '';
+		$wpshop_admin_order_payment_received['date'] = !empty($wpshop_admin_order_payment_received['date']) ? sanitize_text_field($wpshop_admin_order_payment_received['date']) : '';
+		$wpshop_admin_order_payment_received['received_amount'] = !empty($wpshop_admin_order_payment_received['received_amount']) ? sanitize_text_field($wpshop_admin_order_payment_received['received_amount']) : '';
+		$action_triggered_from = !empty($_REQUEST['action_triggered_from']) ? sanitize_text_field($_REQUEST['action_triggered_from']) : '';
+		$wshop_admin_order_payment_reference = !empty($_REQUEST['wpshop_admin_order_payment_reference']) ? sanitize_text_field($_REQUEST['wpshop_admin_order_payment_reference']) : '';
 
 		// Ajout des informations de paiements / Add payment informations.
-		if ( ! empty( $wpshop_admin_order_payment_received ) && ! empty( $wpshop_admin_order_payment_received['method'] )
-				&& ! empty( $wpshop_admin_order_payment_received['date'] ) && ! empty( $wpshop_admin_order_payment_received['received_amount'] ) &&
-				( ( 'add_payment' == $action_triggered_from ) || ! empty( $wshop_admin_order_payment_reference ) ) ) {
+		if (!empty($wpshop_admin_order_payment_received) && !empty($wpshop_admin_order_payment_received['method'])
+				&& !empty($wpshop_admin_order_payment_received['date']) && !empty($wpshop_admin_order_payment_received['received_amount']) &&
+				(('add_payment' == $action_triggered_from) || !empty($wshop_admin_order_payment_reference))) {
 
 			$received_payment_amount = $wpshop_admin_order_payment_received['received_amount'];
 
@@ -247,40 +247,40 @@ 
 				'status' 						=> 'payment_received',
 				'author' 						=> $user_id,
 				'payment_reference' => $wpshop_admin_order_payment_received['payment_reference'],
-				'date' 							=> current_time( 'mysql', 0 ),
+				'date' 							=> current_time('mysql', 0),
 				'received_amount' 	=> $received_payment_amount,
 			);
-			$order_meta = wpshop_payment::check_order_payment_total_amount( $post_id, $params_array, 'completed', $order_meta, false );
+			$order_meta = wpshop_payment::check_order_payment_total_amount($post_id, $params_array, 'completed', $order_meta, false);
 		}
 
 		//Round final amount
-		$order_meta['order_grand_total'] = number_format( round($order_meta['order_grand_total'], 2), 2, '.', '');
-		$order_meta['order_total_ttc'] = number_format( round($order_meta['order_total_ttc'], 2), 2, '.', '');
-		$order_meta['order_amount_to_pay_now'] = number_format( round($order_meta['order_amount_to_pay_now'], 2), 2, '.', '');
+		$order_meta['order_grand_total'] = number_format(round($order_meta['order_grand_total'], 2), 2, '.', '');
+		$order_meta['order_total_ttc'] = number_format(round($order_meta['order_total_ttc'], 2), 2, '.', '');
+		$order_meta['order_amount_to_pay_now'] = number_format(round($order_meta['order_amount_to_pay_now'], 2), 2, '.', '');
 
 		// Payment Pre-Fill
-		if ( empty( $order_meta['order_payment'] ) ) {
+		if (empty($order_meta['order_payment'])) {
 			$order_meta['order_payment']['customer_choice']['method'] = '';
-			$order_meta['order_payment']['received'][] = array('waited_amount' => ( ! empty($order_meta) && ! empty($order_meta['order_grand_total']) ) ? number_format($order_meta['order_grand_total'],2,'.', '') : 0 );
+			$order_meta['order_payment']['received'][] = array('waited_amount' => (!empty($order_meta) && !empty($order_meta['order_grand_total'])) ? number_format($order_meta['order_grand_total'], 2, '.', '') : 0);
 		}
 
-		$data['post_ID'] = ! empty( $_REQUEST['post_ID'] ) ? (int) $_REQUEST['post_ID'] : 0;
-		$data['markascanceled_order_hidden_indicator'] = ! empty( $_REQUEST['markascanceled_order_hidden_indicator' ] ) ? sanitize_text_field( $_REQUEST['markascanceled_order_hidden_indicator'] ) : '';
-		$data['resendordertocustomer_order_hidden_indicator'] = ! empty( $_REQUEST['resendordertocustomer_order_hidden_indicator' ] ) ? sanitize_text_field( $_REQUEST['resendordertocustomer_order_hidden_indicator'] ) : '';
-		$data['action_triggered_from'] = ! empty( $_REQUEST['action_triggered_from' ] ) ? sanitize_text_field( $_REQUEST['action_triggered_from'] ) : '';
-		$data['notif_the_customer'] = ! empty( $_REQUEST['notif_the_customer' ] ) ? sanitize_text_field( $_REQUEST['notif_the_customer'] ) : '';
+		$data['post_ID'] = !empty($_REQUEST['post_ID']) ? (int)$_REQUEST['post_ID'] : 0;
+		$data['markascanceled_order_hidden_indicator'] = !empty($_REQUEST['markascanceled_order_hidden_indicator']) ? sanitize_text_field($_REQUEST['markascanceled_order_hidden_indicator']) : '';
+		$data['resendordertocustomer_order_hidden_indicator'] = !empty($_REQUEST['resendordertocustomer_order_hidden_indicator']) ? sanitize_text_field($_REQUEST['resendordertocustomer_order_hidden_indicator']) : '';
+		$data['action_triggered_from'] = !empty($_REQUEST['action_triggered_from']) ? sanitize_text_field($_REQUEST['action_triggered_from']) : '';
+		$data['notif_the_customer'] = !empty($_REQUEST['notif_the_customer']) ? sanitize_text_field($_REQUEST['notif_the_customer']) : '';
 
 		// Apply a filter to make credit, notificate the customer and generate billing actions
-		$order_meta = apply_filters( 'wps_order_saving_admin_extra_action', $order_meta, $data );
+		$order_meta = apply_filters('wps_order_saving_admin_extra_action', $order_meta, $data);
 
 		// Save Shipping informations & Order status.
-		if ( isset( $order_meta['order_shipping_date'] ) ) {
-			update_post_meta( $post_id, '_wpshop_order_shipping_date', $order_meta['order_shipping_date'] );
+		if (isset($order_meta['order_shipping_date'])) {
+			update_post_meta($post_id, '_wpshop_order_shipping_date', $order_meta['order_shipping_date']);
 		}
-		update_post_meta( $post_id, '_wpshop_order_status', $order_meta['order_status'] );
+		update_post_meta($post_id, '_wpshop_order_status', $order_meta['order_status']);
 
 		// Save Metadata
-		update_post_meta( $post_id, '_order_postmeta', $order_meta );
+		update_post_meta($post_id, '_order_postmeta', $order_meta);
 	}
 
 	/**
@@ -290,8 +290,8 @@ 
 	 * @param array $posted_datas
 	 * @return array
 	 */
-	function wps_notif_user_on_order_saving( $order_metadata, $posted_datas ) {
-		if( ! empty($posted_datas['notif_the_customer']) && $posted_datas['notif_the_customer']=='on' ) {
+	function wps_notif_user_on_order_saving($order_metadata, $posted_datas) {
+		if (!empty($posted_datas['notif_the_customer']) && $posted_datas['notif_the_customer'] == 'on') {
 			$wps_message = new wps_message_ctr();
 			/*	Get order current content	*/
 			$user = get_post_meta($posted_datas['post_ID'], '_order_info', true);
@@ -300,12 +300,12 @@ 
 			$first_name = $user['billing']['address']['address_first_name'];
 			$last_name = $user['billing']['address']['address_last_name'];
 
-			$object = array('object_type'=>'order','object_id'=>(int)$_REQUEST['post_ID']);
+			$object = array('object_type'=>'order', 'object_id'=>(int)$_REQUEST['post_ID']);
 			/* Envoie du message de confirmation de commande au client	*/
-			if ( empty( $order_metadata['order_key'] ) ) {
+			if (empty($order_metadata['order_key'])) {
 				$wps_message->wpshop_prepared_email($email,
 						'WPSHOP_QUOTATION_UPDATE_MESSAGE',
-						array(  'order_id' => $object['object_id'],
+						array('order_id' => $object['object_id'],
 							    'customer_first_name' => $first_name,
 								'customer_last_name' => $last_name,
 								'order_date' => current_time('mysql', 0),
@@ -320,7 +320,7 @@ 
 				$wps_message->wpshop_prepared_email(
 						$email,
 						'WPSHOP_ORDER_UPDATE_MESSAGE',
-						array(  'customer_first_name' => $first_name,
+						array('customer_first_name' => $first_name,
 								'customer_last_name' => $last_name,
 								'order_key' => $order_metadata['order_key'],
 								'order_billing_address' => '',
@@ -328,7 +328,7 @@ 
 								'order_addresses' => '',
 								'order_addresses' => '',
 								'order_billing_address' => '',
-								'order_shipping_address' => '' ),
+								'order_shipping_address' => ''),
 						$object);
 			}
 		}
@@ -339,25 +339,25 @@ 
 	 * AJAX - Add a private comment to order
 	 */
 	function wpshop_add_private_comment_to_order() {
-		$_wpnonce = ! empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_add_private_comment_to_order' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wpshop_add_private_comment_to_order'))
 			wp_die();
 
 		$status = false; $result = '';
-		$order_id = ( ! empty($_POST['oid']) ) ? intval($_POST['oid']) : null;
-		$comment = ( ! empty($_POST['comment']) ) ? wpshop_tools::varSanitizer($_POST['comment']) : null;
-		$send_email = ( ! empty($_POST['send_email']) ) ? wpshop_tools::varSanitizer($_POST['send_email']) : null;
-		$copy_to_administrator = ( ! empty($_POST['copy_to_administrator']) ) ? wpshop_tools::varSanitizer($_POST['copy_to_administrator']) : null;
+		$order_id = (!empty($_POST['oid'])) ? intval($_POST['oid']) : null;
+		$comment = (!empty($_POST['comment'])) ? wpshop_tools::varSanitizer($_POST['comment']) : null;
+		$send_email = (!empty($_POST['send_email'])) ? wpshop_tools::varSanitizer($_POST['send_email']) : null;
+		$copy_to_administrator = (!empty($_POST['copy_to_administrator'])) ? wpshop_tools::varSanitizer($_POST['copy_to_administrator']) : null;
 
-		if ( ! empty($comment) && ! empty($order_id) ) {
+		if (!empty($comment) && !empty($order_id)) {
 			$wps_back_office_orders_mdl = new wps_back_office_orders_mdl();
-			$new_comment = $wps_back_office_orders_mdl->add_private_comment($order_id, $comment, $send_email, false, $copy_to_administrator );
-			if($new_comment) {
-				$order_private_comment = get_post_meta( $order_id, '_order_private_comments', true );
+			$new_comment = $wps_back_office_orders_mdl->add_private_comment($order_id, $comment, $send_email, false, $copy_to_administrator);
+			if ($new_comment) {
+				$order_private_comment = get_post_meta($order_id, '_order_private_comments', true);
 				$oid = $order_id;
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "order-private-comments/wps_orders_sended_private_comments") );
+				require(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "order-private-comments/wps_orders_sended_private_comments"));
 				$result = ob_get_contents();
 				ob_end_clean();
 				$status = true;
@@ -367,8 +367,8 @@ 
 			$result = __('An error was occured', 'wpshop');
 		}
 
-		$response = array( 'status' => $status, 'response' => $result );
-		echo json_encode( $response );
+		$response = array('status' => $status, 'response' => $result);
+		echo json_encode($response);
 		wp_die();
 	}
 
@@ -376,34 +376,34 @@ 
 	 * AJAX - Refresh product listing in order back-office
 	 */
 	function refresh_product_list() {
-		$_wpnonce = ! empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
-		$letter = ( ! empty($_POST['letter']) ) ? sanitize_title( $_POST['letter'] ) : '';
-		$research = ! empty( $_POST['research'] ) ? sanitize_text_field( $_POST['research'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
+		$letter = (!empty($_POST['letter'])) ? sanitize_title($_POST['letter']) : '';
+		$research = !empty($_POST['research']) ? sanitize_text_field($_POST['research']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'refresh_product_list_'.strtolower($letter) ) )
+		if (!wp_verify_nonce($_wpnonce, 'refresh_product_list_' . strtolower($letter)))
 			wp_die();
 
 		$status = false; $response = '';
-		$oid = ! empty( $_POST['oid'] ) ? (int) $_POST['oid'] : 0;
+		$oid = !empty($_POST['oid']) ? (int)$_POST['oid'] : 0;
 
-		if( ! empty($oid) ) {
-			$post = get_post( $oid );
+		if (!empty($oid)) {
+			$post = get_post($oid);
 		}
-		if( ! empty($letter) ) {
+		if (!empty($letter)) {
 			$current_letter = $letter;
 			$wps_product_mdl = new wps_product_mdl();
-			if( ! empty( $research ) ) {
-				$products = $wps_product_mdl->get_products_by_title_or_barcode( $research, strlen( $research ) >= 8 && ctype_digit( $research ) );
+			if (!empty($research)) {
+				$products = $wps_product_mdl->get_products_by_title_or_barcode($research, strlen($research) >= 8 && ctype_digit($research));
 			} else {
-				$products = $wps_product_mdl->get_products_by_letter( $letter );
+				$products = $wps_product_mdl->get_products_by_letter($letter);
 			}
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "product-listing/wps_orders_product_listing_table") );
+			require(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "product-listing/wps_orders_product_listing_table"));
 			$response = ob_get_contents();
 			ob_end_clean();
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 
@@ -411,38 +411,38 @@ 
 	 * AJAX - Add product to order in back-office panel
 	 */
 	function wps_add_product_to_order_admin() {
-		check_ajax_referer( 'wps_add_product_to_order_admin' );
+		check_ajax_referer('wps_add_product_to_order_admin');
 
 		$status = false; $response = ''; $product_have_variations = false;
 		// Sended vars
-		$product_id = ( ! empty($_POST['pid']) ) ? intval( $_POST['pid']) : null;
-		$order_id = ( ! empty($_POST['oid']) ) ? intval( $_POST['oid']) : null;
-		$product_qty = ( ! empty($_POST['qty']) ) ? intval( $_POST['qty']) : 1;
+		$product_id = (!empty($_POST['pid'])) ? intval($_POST['pid']) : null;
+		$order_id = (!empty($_POST['oid'])) ? intval($_POST['oid']) : null;
+		$product_qty = (!empty($_POST['qty'])) ? intval($_POST['qty']) : 1;
 
-		if( ! empty($order_id) && ! empty($product_id) ) {
+		if (!empty($order_id) && !empty($product_id)) {
 			$wps_orders = new wps_orders_ctr();
 			$product_datas = wpshop_products::get_product_data($product_id, false, '"publish", "free_product"');
 			// Check if product have variations
-			$have_variations_checking = wpshop_products::get_variation( $product_id );
-			if( ! empty($have_variations_checking) ) {
+			$have_variations_checking = wpshop_products::get_variation($product_id);
+			if (!empty($have_variations_checking)) {
 				$product_have_variations = true;
 			}
 			else {
 				// Get Metadatas
-				$order_metadata = get_post_meta( $order_id, '_order_postmeta', true );
+				$order_metadata = get_post_meta($order_id, '_order_postmeta', true);
 				// Calcul cart informations
 				$wps_cart = new wps_cart();
-				$order_metadata = $wps_cart->calcul_cart_information( array( $product_id => array( 'product_id' => $product_id, 'product_qty' => $product_qty ) ), '', $order_metadata, true, false );
+				$order_metadata = $wps_cart->calcul_cart_information(array($product_id => array('product_id' => $product_id, 'product_qty' => $product_qty)), '', $order_metadata, true, false);
 				// Update Metadatas
-				update_post_meta( $order_id, '_order_postmeta', $order_metadata );
+				update_post_meta($order_id, '_order_postmeta', $order_metadata);
 				$status = true;
 			}
 			$status = true;
 		}
 
-		$_wpnonce = wp_create_nonce( 'wps_order_load_product_variations' );
+		$_wpnonce = wp_create_nonce('wps_order_load_product_variations');
 
-		echo json_encode( array( '_wpnonce' => $_wpnonce, 'status' => $status, 'response' => $response, 'variations_exist' => $product_have_variations ) );
+		echo json_encode(array('_wpnonce' => $_wpnonce, 'status' => $status, 'response' => $response, 'variations_exist' => $product_have_variations));
 		wp_die();
 	}
 
@@ -450,15 +450,15 @@ 
 	 * AJAX - Refresh cart in administration
 	 */
 	function refresh_cart_order() {
-		check_ajax_referer( 'wps_reload_cart' );
+		check_ajax_referer('wps_reload_cart');
 
 		$status = false; $response = '';
-		$order_id = ( ! empty($_POST['order_id']) ) ? intval($_POST['order_id']) : null;
-		if( ! empty($order_id) ) {
-			$response = do_shortcode( '[wps_cart oid="' .$order_id. '" cart_type="admin-panel"]');
+		$order_id = (!empty($_POST['order_id'])) ? intval($_POST['order_id']) : null;
+		if (!empty($order_id)) {
+			$response = do_shortcode('[wps_cart oid="' . $order_id . '" cart_type="admin-panel"]');
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 
@@ -466,17 +466,17 @@ 
 	 * AJAX - Refresh cart in administration
 	 */
 	function refresh_payments_order() {
-		check_ajax_referer( 'wps_reload_cart' );
+		check_ajax_referer('wps_reload_cart');
 		$status = false; $response = '';
-		$order_id = ( ! empty($_POST['order_id']) ) ? intval($_POST['order_id']) : null;
-		if( ! empty($order_id) ) {
+		$order_id = (!empty($_POST['order_id'])) ? intval($_POST['order_id']) : null;
+		if (!empty($order_id)) {
 			ob_start();
-			echo $this->display_order_payments_box( get_post( $order_id ) );
+			echo $this->display_order_payments_box(get_post($order_id));
 			$response = ob_get_contents();
 			ob_end_clean();
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 
@@ -484,25 +484,25 @@ 
 	 * AJAX - Update product Quantity in Back-office Panel
 	 */
 	function wps_update_product_qty_in_admin() {
-		check_ajax_referer( 'wps_reload_cart' );
+		check_ajax_referer('wps_reload_cart');
 
 		$status = false; $response = '';
-		$product_id = ( ! empty($_POST['product_id']) ) ? wpshop_tools::varSanitizer( $_POST['product_id'] ) : null;
-		$order_id = ( ! empty($_POST['order_id']) ) ? intval( $_POST['order_id'] ) : null;
-		$product_qty = ( ! empty($_POST['qty']) ) ? intval( $_POST['qty'] ) : 0;
+		$product_id = (!empty($_POST['product_id'])) ? wpshop_tools::varSanitizer($_POST['product_id']) : null;
+		$order_id = (!empty($_POST['order_id'])) ? intval($_POST['order_id']) : null;
+		$product_qty = (!empty($_POST['qty'])) ? intval($_POST['qty']) : 0;
 
-		if( ! empty($product_id) && ! empty($order_id) ) {
+		if (!empty($product_id) && !empty($order_id)) {
 			// Get Metadatas
-			$order_metadata = get_post_meta( $order_id, '_order_postmeta', true );
+			$order_metadata = get_post_meta($order_id, '_order_postmeta', true);
 			// Calcul cart informations
 			$wps_cart = new wps_cart();
-			$order_metadata = $wps_cart->calcul_cart_information( array( $product_id => array( 'product_id' => $product_id, 'product_qty' => $product_qty ) ), '', $order_metadata, true, false );
+			$order_metadata = $wps_cart->calcul_cart_information(array($product_id => array('product_id' => $product_id, 'product_qty' => $product_qty)), '', $order_metadata, true, false);
 			// Update Metadatas
-			update_post_meta( $order_id, '_order_postmeta', $order_metadata );
+			update_post_meta($order_id, '_order_postmeta', $order_metadata);
 			$status = true;
 		}
 
-		echo json_encode( array( 'status' => $status ) );
+		echo json_encode(array('status' => $status));
 		wp_die();
 	}
 
@@ -510,15 +510,15 @@ 
 	 * AJAX - Load Product Variations in ThickBox on Add product to order action
 	 */
 	function wps_order_load_product_variations() {
-		$_wpnonce = ! empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_order_load_product_variations' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_order_load_product_variations'))
 			wp_die();
 
-		$product_id = ( ! empty($_GET['pid']) ) ? intval( $_GET['pid']) : null;
-		$order_id = ( ! empty($_GET['oid']) ) ? intval( $_GET['oid']) : null;
-		$qty = ( ! empty($_GET['qty']) ) ? intval( $_GET['qty']) : 1;
-		echo '<div class="wps-boxed"><span class="wps-h5">'.__( 'Select your variations', 'wpshop' ).'</span>'.wpshop_products::wpshop_variation($product_id, true, $order_id, $qty ).'<a href="#" class="wps-bton-first-mini-rounded alignRight wps-orders-add_variation_product"><i class="wps-icon-basket"></i> ' .__( 'Add to cart', 'wpshop' ). '</a>'.'</div>';
+		$product_id = (!empty($_GET['pid'])) ? intval($_GET['pid']) : null;
+		$order_id = (!empty($_GET['oid'])) ? intval($_GET['oid']) : null;
+		$qty = (!empty($_GET['qty'])) ? intval($_GET['qty']) : 1;
+		echo '<div class="wps-boxed"><span class="wps-h5">' . __('Select your variations', 'wpshop') . '</span>' . wpshop_products::wpshop_variation($product_id, true, $order_id, $qty) . '<a href="#" class="wps-bton-first-mini-rounded alignRight wps-orders-add_variation_product"><i class="wps-icon-basket"></i> ' . __('Add to cart', 'wpshop') . '</a>' . '</div>';
 		wp_die();
 	}
 
@@ -526,67 +526,67 @@ 
 	 * AJAX - Update cart informations
 	 */
 	function wps_orders_update_cart_informations() {
-		$_wpnonce = ! empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_orders_update_cart_informations' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_orders_update_cart_informations'))
 			wp_die();
 
 		$status = false;
-		$order_id = ( ! empty($_POST['order_id']) ) ? intval($_POST['order_id']) : '';
+		$order_id = (!empty($_POST['order_id'])) ? intval($_POST['order_id']) : '';
 		$shipping_cost = isset($_POST['shipping_cost']) ? wpshop_tools::varSanitizer($_POST['shipping_cost']) : '';
 		$discount_value = isset($_POST['discount_amount']) ? wpshop_tools::varSanitizer($_POST['discount_amount']) : '';
 		$discount_type = isset($_POST['discount_type']) ? wpshop_tools::varSanitizer($_POST['discount_type']) : '';
 
 
-		if( ! empty($order_id) ) {
-			$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
+		if (!empty($order_id)) {
+			$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 			$order_meta['order_shipping_cost'] = $shipping_cost;
 
 			//Add discounts if exists
-			if( isset($discount_value) && ! empty($discount_type) ) {
+			if (isset($discount_value) && !empty($discount_type)) {
 				$order_meta['order_discount_type'] = $discount_type;
 				$order_meta['order_discount_value'] = $discount_value;
 			}
 			$wps_cart = new wps_cart();
-			$order_meta = $wps_cart->calcul_cart_information( array(), '', $order_meta, true );
-			update_post_meta( $order_id, '_order_postmeta', $order_meta );
+			$order_meta = $wps_cart->calcul_cart_information(array(), '', $order_meta, true);
+			update_post_meta($order_id, '_order_postmeta', $order_meta);
 			$status = true;
 		}
 
-		echo json_encode( array( 'status' => $status) );
+		echo json_encode(array('status' => $status));
 		wp_die();
 	}
 
 	function wps_reverify_payment_invoice_ref() {
-		$_wpnonce = ! empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_reverify_payment_invoice_ref' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_reverify_payment_invoice_ref'))
 			wp_die();
 
 		$status = true;
-		$inputs = ! empty( $_POST['inputs'] ) ? (array) $_POST['inputs'] : false;
+		$inputs = !empty($_POST['inputs']) ? (array)$_POST['inputs'] : false;
 
 		if (!$inputs)
 			$status = false;
 
-		if( $status ) {
+		if ($status) {
 			$inputs_clone = $inputs;
 			$inputs = array();
-			foreach( $inputs_clone as $var ) {
-				if( isset( $var['key'] ) && isset( $var['value'] ) ) {
+			foreach ($inputs_clone as $var) {
+				if (isset($var['key']) && isset($var['value'])) {
 					$inputs[$var['key']] = $var['value'];
 				}
 			}
 
-			( isset( $inputs['order_id'] ) ) ? $order_id = $inputs['order_id'] : $status = $order_id = false;
-			( isset( $inputs['index_payment'] ) ) ? $index_payment = $inputs['index_payment'] : $status = $index_payment = false;
+			(isset($inputs['order_id'])) ? $order_id = $inputs['order_id'] : $status = $order_id = false;
+			(isset($inputs['index_payment'])) ? $index_payment = $inputs['index_payment'] : $status = $index_payment = false;
 		}
 
-		if( $status ) {
-			$status = wpshop_payment::reverify_payment_invoice_ref( $order_id, $index_payment );
+		if ($status) {
+			$status = wpshop_payment::reverify_payment_invoice_ref($order_id, $index_payment);
 		}
 
-		echo json_encode( array( 'status' => $status ) );
+		echo json_encode(array('status' => $status));
 		wp_die();
 	}
 

includes/modules/wps_shipping/templates/backend/order-shipping-informations.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@
 <ul id="wps-order-shipping-informations">
-	<li><strong><?php _e('Order shipping date','wpshop') ?> :</strong><?php echo ( empty($order_postmeta['order_shipping_date']) ? __('Unknow','wpshop') : mysql2date('d F Y H:i:s', $order_postmeta['order_shipping_date'],true) ); ?></li>
-	<li><strong><?php _e('Tracking number','wpshop'); ?> :</strong> <?php echo ( !empty($order_postmeta['order_trackingNumber']) ) ? $order_postmeta['order_trackingNumber'] : __('Unknow','wpshop'); ?></li>
-	<li><strong><?php _e('Tracking link','wpshop'); ?> :</strong> <?php echo ( !empty($order_postmeta['order_trackingLink']) ) ? $order_postmeta['order_trackingLink'] : __('Unknow','wpshop'); ?></li>
+	<li><strong><?php _e('Order shipping date', 'wpshop') ?> :</strong><?php echo (empty($order_postmeta['order_shipping_date']) ? __('Unknow', 'wpshop') : mysql2date('d F Y H:i:s', $order_postmeta['order_shipping_date'], true)); ?></li>
+	<li><strong><?php _e('Tracking number', 'wpshop'); ?> :</strong> <?php echo (!empty($order_postmeta['order_trackingNumber'])) ? $order_postmeta['order_trackingNumber'] : __('Unknow', 'wpshop'); ?></li>
+	<li><strong><?php _e('Tracking link', 'wpshop'); ?> :</strong> <?php echo (!empty($order_postmeta['order_trackingLink'])) ? $order_postmeta['order_trackingLink'] : __('Unknow', 'wpshop'); ?></li>
 </ul>

includes/modules/wps_shipping/templates/backend/order-shipping-infos.php

Spacing +9 added lines, -9 removed lines

@@ -1,21 +1,21 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if( !empty($shipping_method_name) ) : ?>
-	<div class="wps-alert-info"><strong><?php _e( 'Selected shipping method', 'wpshop'); ?></strong> : <?php echo $shipping_method_name; ?></div>
+<?php if (!defined('ABSPATH')) exit;
+ if (!empty($shipping_method_name)) : ?>
+	<div class="wps-alert-info"><strong><?php _e('Selected shipping method', 'wpshop'); ?></strong> : <?php echo $shipping_method_name; ?></div>
 <?php else : ?>
-	<div class="wps-alert-info"><?php _e( 'No selected shipping method', 'wpshop'); ?></div>
+	<div class="wps-alert-info"><?php _e('No selected shipping method', 'wpshop'); ?></div>
 <?php endif; ?>
 
 <div class="wps-boxed">
-	<span class="wps-h5"><?php _e( 'Shipping informations', 'wpshop');?></span>
-	<?php if ( !empty($order_postmeta['order_status']) && $order_postmeta['order_status'] != 'shipped' ) : ?>
+	<span class="wps-h5"><?php _e('Shipping informations', 'wpshop'); ?></span>
+	<?php if (!empty($order_postmeta['order_status']) && $order_postmeta['order_status'] != 'shipped') : ?>
 			<div><a data-id="<?php echo $order->ID; ?>" class="wps-bton-first-mini-rounded markAsShipped order_<?php echo $order->ID; ?>" data-nonce="<?php echo wp_create_nonce("wpshop_dialog_inform_shipping_number"); ?>"><?php _e('Mark as shipped', 'wpshop'); ?></a></div>
 	<?php else : ?>
 		<div>
-			<?php require( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, $this->template_dir, 'backend', 'order-shipping-informations' ) ); ?>
+			<?php require(wpshop_tools::get_template_part(WPS_SHIPPING_MODE_DIR, $this->template_dir, 'backend', 'order-shipping-informations')); ?>
 		</div>
 <?php endif; ?>
 
-<?php if ( !empty($order_postmeta['order_invoice_ref']) ) : ?>
-	<div><a href="<?php echo admin_url( 'admin-post.php?action=wps_invoice&order_id='.$order->ID.'&invoice_ref='.$order_postmeta['order_invoice_ref'].'&bon_colisage=ok&mode=pdf' ); ?>" target="_blank" class="wps-bton-second-mini-rounded" ><?php _e('Download the product list', 'wpshop'); ?></a></div>
+<?php if (!empty($order_postmeta['order_invoice_ref'])) : ?>
+	<div><a href="<?php echo admin_url('admin-post.php?action=wps_invoice&order_id=' . $order->ID . '&invoice_ref=' . $order_postmeta['order_invoice_ref'] . '&bon_colisage=ok&mode=pdf'); ?>" target="_blank" class="wps-bton-second-mini-rounded" ><?php _e('Download the product list', 'wpshop'); ?></a></div>
 <?php endif; ?>
 </div>

Braces +13 added lines, -5 removed lines

@@ -1,17 +1,25 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  if( !empty($shipping_method_name) ) : ?>
 	<div class="wps-alert-info"><strong><?php _e( 'Selected shipping method', 'wpshop'); ?></strong> : <?php echo $shipping_method_name; ?></div>
-<?php else : ?>
-	<div class="wps-alert-info"><?php _e( 'No selected shipping method', 'wpshop'); ?></div>
+<?php else {
+	: ?>
+	<div class="wps-alert-info"><?php _e( 'No selected shipping method', 'wpshop');
+}
+?></div>
 <?php endif; ?>
 
 <div class="wps-boxed">
 	<span class="wps-h5"><?php _e( 'Shipping informations', 'wpshop');?></span>
 	<?php if ( !empty($order_postmeta['order_status']) && $order_postmeta['order_status'] != 'shipped' ) : ?>
 			<div><a data-id="<?php echo $order->ID; ?>" class="wps-bton-first-mini-rounded markAsShipped order_<?php echo $order->ID; ?>" data-nonce="<?php echo wp_create_nonce("wpshop_dialog_inform_shipping_number"); ?>"><?php _e('Mark as shipped', 'wpshop'); ?></a></div>
-	<?php else : ?>
+	<?php else {
+	: ?>
 		<div>
-			<?php require( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, $this->template_dir, 'backend', 'order-shipping-informations' ) ); ?>
+			<?php require( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, $this->template_dir, 'backend', 'order-shipping-informations' ) );
+}
+?>
 		</div>
 <?php endif; ?>
 

includes/modules/wps_barcode/controller/wps_barcode_metabox.ctr.php

Spacing +137 added lines, -138 removed lines

@@ -1,9 +1,9 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 class wps_barcode_metabox {
 	public function __construct() {
-		add_action( 'add_meta_boxes', array($this, 'add_meta_box'), 10, 10 );
-		add_action( 'admin_enqueue_scripts', array($this, 'add_scripts') );
+		add_action('add_meta_boxes', array($this, 'add_meta_box'), 10, 10);
+		add_action('admin_enqueue_scripts', array($this, 'add_scripts'));
 	}
 
 	/**
@@ -11,12 +11,12 @@ 
 	 */
 	public function add_scripts() {
 		global $current_screen;
-	    if ( ! in_array( $current_screen->post_type, array( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_ORDER, WPSHOP_NEWTYPE_IDENTIFIER_COUPON ), true ) )
+	    if (!in_array($current_screen->post_type, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_ORDER, WPSHOP_NEWTYPE_IDENTIFIER_COUPON), true))
 	        return;
 
-		wp_enqueue_script( 'jquery' );
-		wp_enqueue_script( 'wps_barcode_printelement',  WPS_BARCODE_JSCRIPTS.'/jquery.printElement.js' );
-		wp_enqueue_script( 'wps_barcode',  WPS_BARCODE_JSCRIPTS.'/wps.backend.wps_barcode.js' );
+		wp_enqueue_script('jquery');
+		wp_enqueue_script('wps_barcode_printelement', WPS_BARCODE_JSCRIPTS . '/jquery.printElement.js');
+		wp_enqueue_script('wps_barcode', WPS_BARCODE_JSCRIPTS . '/wps.backend.wps_barcode.js');
 	}
 
 	/**
@@ -27,9 +27,9 @@ 
 
 		$conf = get_option('wps_barcode');
 
-		$post = get_post( get_the_ID() );
-		if ( !empty($post) ) {
-			$query = $wpdb->prepare( "
+		$post = get_post(get_the_ID());
+		if (!empty($post)) {
+			$query = $wpdb->prepare("
 				SELECT *
 				FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR . "
 				WHERE entity_id = %d
@@ -37,8 +37,8 @@ 
 						SELECT id
 						FROM " . WPSHOP_DBT_ATTRIBUTE . "
 						WHERE code = %s
-					)" , $post->ID, 'barcode' );
-				$result = $wpdb->get_results( $query, ARRAY_A );
+					)" , $post->ID, 'barcode');
+				$result = $wpdb->get_results($query, ARRAY_A);
 
 				/*add_meta_box('wps_barcode_product', __('Barcode Manager', 'wps_barcode' ),
 				array( $this, 'meta_box_product' ), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
@@ -73,17 +73,17 @@ 
 
 		/*Select value of barcode*/
 		$result = $wpdb->get_results(
-				'SELECT value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR.
-				' WHERE attribute_id=(SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE.
-				' WHERE code = "barcode") AND entity_id="'.$post_ID.'"', ARRAY_A);
+				'SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR .
+				' WHERE attribute_id=(SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE .
+				' WHERE code = "barcode") AND entity_id="' . $post_ID . '"', ARRAY_A);
 		$meta = !empty($result) ? $result[0]['value'] : '';
 
 		/*Get price of product*/
-		$result = $wpdb->get_results('SELECT value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL.
-				' WHERE attribute_id=(SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE.
-				' WHERE code="'.WPSHOP_PRODUCT_PRICE_TTC.'") AND entity_id='.$post_ID, ARRAY_A);
+		$result = $wpdb->get_results('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL .
+				' WHERE attribute_id=(SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE .
+				' WHERE code="' . WPSHOP_PRODUCT_PRICE_TTC . '") AND entity_id=' . $post_ID, ARRAY_A);
 
-		if ( !empty($result) && $result[0]['value'] >= 0) {
+		if (!empty($result) && $result[0]['value'] >= 0) {
 			$price = $result[0]['value'];
 
 			/*Get title of product*/
@@ -91,28 +91,28 @@ 
 			$ref = substr($post['post_title'], 0, 10);
 
 			chdir('..');
-			chdir( plugin_dir_path(__FILE__) );
+			chdir(plugin_dir_path(__FILE__));
 			chdir('..');
 
 			$conf = get_option('wps_barcode');
 
-			if ( isset($conf['generate_barcode']) && $conf['generate_barcode'] === 'on' ) {
+			if (isset($conf['generate_barcode']) && $conf['generate_barcode'] === 'on') {
 				echo $ajax->generate_image($barcode, $meta, __('product', 'wps_barcode'),
 						$price, $ref);
 			}
 			else {
-				echo '<p style="text-align: center"><button class="button '.
-					'button-primary button-large" type="button"'.
-					'id="display_barcode" data-nonce=' . wp_create_nonce( 'imgProduct' ) . '>'.
-					__('Display', 'wps_barcode').'</button></p>';
+				echo '<p style="text-align: center"><button class="button ' .
+					'button-primary button-large" type="button"' .
+					'id="display_barcode" data-nonce=' . wp_create_nonce('imgProduct') . '>' .
+					__('Display', 'wps_barcode') . '</button></p>';
 			}
 		}
 		else {
 			$conf = get_option('wps_barcode');
 
-			if ( $conf['generate_barcode'] === 'true' ) {
-				echo '<p>'.sprintf( __('None bardcode generated as you did create %s.',
-					'wps_barcode'), __('product', 'wps_barcode')).'</p>';
+			if ($conf['generate_barcode'] === 'true') {
+				echo '<p>' . sprintf(__('None bardcode generated as you did create %s.',
+					'wps_barcode'), __('product', 'wps_barcode')) . '</p>';
 			}
 		}
 	}
@@ -132,21 +132,20 @@ 
 		$country = '000';
 		$result = get_post_meta($post_ID);
 
-		if ( !empty($result) ) {
-			$order_postmeta = isset( $result['_order_postmeta'] ) ? unserialize($result['_order_postmeta'][0]) : array();
+		if (!empty($result)) {
+			$order_postmeta = isset($result['_order_postmeta']) ? unserialize($result['_order_postmeta'][0]) : array();
 
-			if ( !empty($order_postmeta['order_invoice_date']) ) {
+			if (!empty($order_postmeta['order_invoice_date'])) {
 				$conf = get_option('wps_barcode');
 				if ($conf['type'] === 'internal') {
 					$type = $conf['internal_invoice_client'];
 
 					$order_date = isset($order_postmeta['order_invoice_date']) ?
-						$order_postmeta['order_invoice_date'] :
-						$order_postmeta['order_date'];
+						$order_postmeta['order_invoice_date'] : $order_postmeta['order_date'];
 					$pDate = new DateTime($order_date);
 					$date = $pDate->format('my');
 
-					if ( empty($order_postmeta['order_invoice_ref']) ) {
+					if (empty($order_postmeta['order_invoice_ref'])) {
 						$continue = false;
 					}
 					else {
@@ -155,9 +154,9 @@ 
 					}
 				}
 				if ($continue === true) {
-					$code = $type.$date.$id;
+					$code = $type . $date . $id;
 
-					if ( empty($result['_order_barcode']) ) {
+					if (empty($result['_order_barcode'])) {
 						$meta = $barcode->checksum($code);
 						add_post_meta($post_ID, '_order_barcode', $meta);
 					}
@@ -166,32 +165,32 @@ 
 					}
 
 					chdir('..');
-					chdir( plugin_dir_path(__FILE__) );
+					chdir(plugin_dir_path(__FILE__));
 					chdir('..');
 					$order_meta = unserialize($result['_order_postmeta'][0]);
-					$title = ( !empty($order_meta['order_invoice_ref']) ) ? $order_meta['order_invoice_ref'] : $order_meta['order_key'];
+					$title = (!empty($order_meta['order_invoice_ref'])) ? $order_meta['order_invoice_ref'] : $order_meta['order_key'];
 					$price = $order_meta['order_grand_total'];
 
 
-					if ( isset($conf['generate_barcode']) && $conf['generate_barcode'] === 'on' ) {
+					if (isset($conf['generate_barcode']) && $conf['generate_barcode'] === 'on') {
 						$this->generate_image($barcode, $meta[0], __('order client', 'wps_barcode'),
-							$price, $title );
+							$price, $title);
 					}
 				}
 				else {
-					echo '<p>'.__('None bardcode generated as customer can not get his bill.',
-							'wps_barcode').'</p>';
+					echo '<p>' . __('None bardcode generated as customer can not get his bill.',
+							'wps_barcode') . '</p>';
 				}
 
 			}
 			else {
-				echo '<p>'.__('None bardcode generated as customer can not get his bill.',
-						'wps_barcode').'</p>';
+				echo '<p>' . __('None bardcode generated as customer can not get his bill.',
+						'wps_barcode') . '</p>';
 			}
 		}
 		else {
-			echo '<p>'.sprintf( __('None bardcode generated as you did create %s.',
-					'wps_barcode'), 'order client').'</p>';
+			echo '<p>' . sprintf(__('None bardcode generated as you did create %s.',
+					'wps_barcode'), 'order client') . '</p>';
 		}
 	}
 
@@ -210,14 +209,14 @@ 
 		$country = '000';
 		$result = get_post_meta($post_ID);
 
-		if ( !empty($result) ) {
-			if ( empty($result['wpshop_coupon_barcode']) ) {
+		if (!empty($result)) {
+			if (empty($result['wpshop_coupon_barcode'])) {
 				$conf = get_option('wps_barcode');
 				if ($conf['type'] === 'internal') {
 					$type = $conf['internal_coupons'];
 
-					$query = $wpdb->get_results('SELECT post_date FROM '.
-							$table_prefix.'posts WHERE ID='.$post_ID, ARRAY_A);
+					$query = $wpdb->get_results('SELECT post_date FROM ' .
+							$table_prefix . 'posts WHERE ID=' . $post_ID, ARRAY_A);
 
 					$pDate = new DateTime($query[0]['post_date']);
 					$date = $pDate->format('my');
@@ -225,13 +224,13 @@ 
 
 				$len = strlen($post_ID);
 				$ref = '';
-				if ( $len < 5 ) {
-					for ($i=0; $i <= $len; $i++) {
+				if ($len < 5) {
+					for ($i = 0; $i <= $len; $i++) {
 						$ref .= '0';
 					}
 				}
-				$id = $ref.$post_ID;
-				$code = $type.$date.$id;
+				$id = $ref . $post_ID;
+				$code = $type . $date . $id;
 				$meta = $barcode->checksum($code);
 				add_post_meta($post_ID, 'wpshop_coupon_barcode', $meta);
 			}
@@ -239,24 +238,24 @@ 
 				$meta = $result['wpshop_coupon_barcode'][0];
 			}
 
-			$query = $wpdb->get_results('SELECT post_title FROM '.
-					$table_prefix.'posts WHERE ID='.$post_ID, ARRAY_A);
+			$query = $wpdb->get_results('SELECT post_title FROM ' .
+					$table_prefix . 'posts WHERE ID=' . $post_ID, ARRAY_A);
 
 			$post = get_post($post_ID, ARRAY_A);
-			if ( isset($conf['generate_barcode']) && $conf['generate_barcode'] === 'on' ) {
+			if (isset($conf['generate_barcode']) && $conf['generate_barcode'] === 'on') {
 				$ajax->generate_image($barcode, $meta, __('coupon', 'wps_barcode'),
 					$result['wpshop_coupon_discount_value'][0], $query[0]['post_title'], $post_ID);
 			}
 			else {
-				echo '<p style="text-align: center"><button class="button '.
-					'button-primary button-large" type="button"'.
-					'id="display_barcode">'.
-					__('Display', 'wps_barcode').'</button></p>';
+				echo '<p style="text-align: center"><button class="button ' .
+					'button-primary button-large" type="button"' .
+					'id="display_barcode">' .
+					__('Display', 'wps_barcode') . '</button></p>';
 			}
 		}
 		else {
-			echo '<p>'.__('None bardcode generated as coupon has not created.',
-					'wps_barcode').'</p>';
+			echo '<p>' . __('None bardcode generated as coupon has not created.',
+					'wps_barcode') . '</p>';
 		}
 	}
 
@@ -269,44 +268,44 @@ 
 	 * @param string $title Title of product
 	 */
 	public function generate_image(&$barcode, $meta, $type, $price, $title, $post_ID = 0) {
-		if ( !extension_loaded('gd') ) {
-			return '<p>'.__('Library GD is requiered.', 'wps_barcode').'</p>';
+		if (!extension_loaded('gd')) {
+			return '<p>' . __('Library GD is requiered.', 'wps_barcode') . '</p>';
 		}
-		if ( !empty($meta) ) {
+		if (!empty($meta)) {
 			$barcode->setGenerateCode($meta);
 			$binCode = $barcode->getBinCode();
 
 			$px = 3.779528;
-			$x = round(66*$px); //249.449 px
-			$y = round(50*$px); //188.976 px
-			$bar_size = round(63.393/72); //0.880 px
+			$x = round(66 * $px); //249.449 px
+			$y = round(50 * $px); //188.976 px
+			$bar_size = round(63.393 / 72); //0.880 px
 
 			$len = 0;
 			$test = '';
 
-			while ($len !== strlen($binCode) ) {
-				$test .= substr($binCode, $len, 7).' ';
-				$len = $len+7;
+			while ($len !== strlen($binCode)) {
+				$test .= substr($binCode, $len, 7) . ' ';
+				$len = $len + 7;
 			}
 
 			$im = imagecreate($x, $y);
 			$background_color = imagecolorallocate($im, 255, 255, 255);
-			$start = round(5.79*$px); //21.883
+			$start = round(5.79 * $px); //21.883
 
 			/*Write First left guard*/
-			$this->imgNormalGuard($im, $start, $start+$bar_size,
+			$this->imgNormalGuard($im, $start, $start + $bar_size,
 					imagecolorallocate($im, 0, 0, 0));
-			$this->imgNormalGuard($im, $start+($bar_size*2),
-					$start+($bar_size*3), imagecolorallocate($im, 255, 255, 255));
-			$this->imgNormalGuard($im, $start+($bar_size*4),
-					$start+($bar_size*5), imagecolorallocate($im, 0, 0, 0));
+			$this->imgNormalGuard($im, $start + ($bar_size * 2),
+					$start + ($bar_size * 3), imagecolorallocate($im, 255, 255, 255));
+			$this->imgNormalGuard($im, $start + ($bar_size * 4),
+					$start + ($bar_size * 5), imagecolorallocate($im, 0, 0, 0));
 
-			$pos = $start+($bar_size*7);
-			$newPos = $pos+$bar_size;
+			$pos = $start + ($bar_size * 7);
+			$newPos = $pos + $bar_size;
 
 			/*Write left barcode*/
-			for ($i=0; $i<42 ; $i++) {
-				if( substr($binCode, $i, 1) === '0' ) {
+			for ($i = 0; $i < 42; $i++) {
+				if (substr($binCode, $i, 1) === '0') {
 					$color = imagecolorallocate($im, 255, 255, 255);
 				}
 				else {
@@ -314,128 +313,128 @@ 
 				}
 
 				$this->imgSymbole($im, $pos, $newPos, $color);
-				$newPos = $pos+$bar_size;
-				$pos = $newPos+$bar_size;
+				$newPos = $pos + $bar_size;
+				$pos = $newPos + $bar_size;
 			}
 
 			/*Writer center guard*/
 			$pos = $newPos;
-			$this->imgNormalGuard($im, $pos, $newPos+$bar_size,
+			$this->imgNormalGuard($im, $pos, $newPos + $bar_size,
 					imagecolorallocate($im, 255, 255, 255));
-			$this->imgNormalGuard($im, $pos+($bar_size*2),
-					$newPos+($bar_size*3), imagecolorallocate($im, 0, 0, 0));
-			$this->imgNormalGuard($im, $pos+($bar_size*4),
-					$newPos+($bar_size*5), imagecolorallocate($im, 255, 255, 255));
-			$this->imgNormalGuard($im, $pos+($bar_size*6),
-					$newPos+($bar_size*7), imagecolorallocate($im, 0, 0, 0));
-			$this->imgNormalGuard($im, $pos+($bar_size*8),
-					$newPos+($bar_size*9), imagecolorallocate($im, 255, 255, 255));
+			$this->imgNormalGuard($im, $pos + ($bar_size * 2),
+					$newPos + ($bar_size * 3), imagecolorallocate($im, 0, 0, 0));
+			$this->imgNormalGuard($im, $pos + ($bar_size * 4),
+					$newPos + ($bar_size * 5), imagecolorallocate($im, 255, 255, 255));
+			$this->imgNormalGuard($im, $pos + ($bar_size * 6),
+					$newPos + ($bar_size * 7), imagecolorallocate($im, 0, 0, 0));
+			$this->imgNormalGuard($im, $pos + ($bar_size * 8),
+					$newPos + ($bar_size * 9), imagecolorallocate($im, 255, 255, 255));
 
-			$pos = $newPos+($bar_size*10);
+			$pos = $newPos + ($bar_size * 10);
 
 			/*Write right barcode*/
-			for ($i=42; $i<84 ; $i++) {
-				if( substr($binCode, $i, 1) === '0' ) {
+			for ($i = 42; $i < 84; $i++) {
+				if (substr($binCode, $i, 1) === '0') {
 					$color = imagecolorallocate($im, 255, 255, 255);
 				}
 				else {
 					$color = imagecolorallocate($im, 0, 0, 0);
 				}
 
-				$newPos = $pos+$bar_size;
+				$newPos = $pos + $bar_size;
 
 				$this->imgSymbole($im, $pos, $newPos, $color);
-				$pos = $newPos+$bar_size;
+				$pos = $newPos + $bar_size;
 			}
 
 			/*Write right guard*/
-			$pos = $newPos+$bar_size;
-			$this->imgNormalGuard($im, $pos, $pos+$bar_size,
+			$pos = $newPos + $bar_size;
+			$this->imgNormalGuard($im, $pos, $pos + $bar_size,
 					imagecolorallocate($im, 0, 0, 0));
-			$this->imgNormalGuard($im, $pos+($bar_size*2),
-					$pos+($bar_size*3), imagecolorallocate($im, 255, 255, 255));
-			$this->imgNormalGuard($im, $pos+($bar_size*4),
-					$pos+($bar_size*5), imagecolorallocate($im, 0, 0, 0));
+			$this->imgNormalGuard($im, $pos + ($bar_size * 2),
+					$pos + ($bar_size * 3), imagecolorallocate($im, 255, 255, 255));
+			$this->imgNormalGuard($im, $pos + ($bar_size * 4),
+					$pos + ($bar_size * 5), imagecolorallocate($im, 0, 0, 0));
 
 			$textSize = 16;
 			$font = 'assets/fonts/arialbd.ttf';
-			imagettftext($im, $textSize, 0, 8, $y-$start-5,
+			imagettftext($im, $textSize, 0, 8, $y - $start - 5,
 			imagecolorallocate($im, 0, 0, 0), $font, substr($meta, 0, 1));
 
 			$continue = true;
 			$i = 28; $j = 0;
 
 			/*Write left number code*/
-			while ($j<5) {
-				$j=$j+1;
-				imagettftext($im, $textSize, 0, $i, $y-$start-5,
+			while ($j < 5) {
+				$j = $j + 1;
+				imagettftext($im, $textSize, 0, $i, $y - $start - 5,
 				imagecolorallocate($im, 0, 0, 0), $font, substr($meta, $j, 1));
-				$i = $i+14;
+				$i = $i + 14;
 			}
 
 			/*Write right number code*/
-			while ($j<11) {
-				$j=$j+1;
-				imagettftext($im, $textSize, 0, $i+6, $y-$start-5,
+			while ($j < 11) {
+				$j = $j + 1;
+				imagettftext($im, $textSize, 0, $i + 6, $y - $start - 5,
 					imagecolorallocate($im, 0, 0, 0), $font, substr($meta, $j, 1));
-				$i = $i+15;
+				$i = $i + 15;
 			}
-			imagettftext($im, $textSize, 0, $i+4, $y-$start-5,
-				imagecolorallocate($im, 0, 0, 0), $font, substr($meta, $j+1, 1));
+			imagettftext($im, $textSize, 0, $i + 4, $y - $start - 5,
+				imagecolorallocate($im, 0, 0, 0), $font, substr($meta, $j + 1, 1));
 
 			/*Write ref product and price*/
 			$textSize = 12;
 			$currency = (wpshop_tools::wpshop_get_currency() === '&euro;') ? "€" : wpshop_tools::wpshop_get_currency();
 
-			if ( $type === __('coupon', 'wps_barcode') ) {
+			if ($type === __('coupon', 'wps_barcode')) {
 				$coupon_postmeta = get_post_meta($post_ID, 'wpshop_coupon_discount_type');
-				if ( $coupon_postmeta[0] === 'percent' ) {
-					$price = $price.' %';
+				if ($coupon_postmeta[0] === 'percent') {
+					$price = $price . ' %';
 				}
 				else {
-					$price = sprintf( number_format( $price, 2 ). ' '.$currency);
+					$price = sprintf(number_format($price, 2) . ' ' . $currency);
 				}
 			}
 			else {
-				$price = sprintf( number_format( $price, 2 ). ' '.$currency);
+				$price = sprintf(number_format($price, 2) . ' ' . $currency);
 			}
 
-			imagettftext($im, $textSize, 0, 20, round(6*$px),
+			imagettftext($im, $textSize, 0, 20, round(6 * $px),
 				imagecolorallocate($im, 0, 0, 0), $font, $title);
-			imagettftext($im, $textSize, 0, ($x/2)+40, round(6*$px),
+			imagettftext($im, $textSize, 0, ($x / 2) + 40, round(6 * $px),
 				imagecolorallocate($im, 0, 0, 0), $font, $price);
 
 			ob_start();
 			imagepng($im);
 			$img = ob_get_clean();
 
-			echo '<p><img src="data:image/png;base64,'.base64_encode($img).
+			echo '<p><img src="data:image/png;base64,' . base64_encode($img) .
 				'" id="barcode" width="160" height="90" /></p>';
 
-			echo '<p style="text-align: right"><button class="button '.
-					'button-primary button-large" type="button"'.
-					'id="print_barcode">'.
-					__('Print', 'wps_barcode').'</button></p>';
+			echo '<p style="text-align: right"><button class="button ' .
+					'button-primary button-large" type="button"' .
+					'id="print_barcode">' .
+					__('Print', 'wps_barcode') . '</button></p>';
 
-			wp_mkdir_p( WPS_BARCODE_UPLOAD );
+			wp_mkdir_p(WPS_BARCODE_UPLOAD);
 
-			file_put_contents(WPS_BARCODE_UPLOAD.$meta.'.png', $img);
+			file_put_contents(WPS_BARCODE_UPLOAD . $meta . '.png', $img);
 
 			/*Generate ODT File*/
 			try {
-				if( !class_exists('Odf') ) {
-					require_once(WPS_BARCODE_PATH.'/librairies/odtphp/odf.php');
+				if (!class_exists('Odf')) {
+					require_once(WPS_BARCODE_PATH . '/librairies/odtphp/odf.php');
 				}
-				$odf = new Odf(WPS_BARCODE_PATH.'assets/medias/avery_a4_991_677.ott');
-				$odf->setImage('barcode', WPS_BARCODE_UPLOAD.$meta.'.png');
-				$odf->saveToDisk(WPS_BARCODE_UPLOAD.$meta.'.odt');
+				$odf = new Odf(WPS_BARCODE_PATH . 'assets/medias/avery_a4_991_677.ott');
+				$odf->setImage('barcode', WPS_BARCODE_UPLOAD . $meta . '.png');
+				$odf->saveToDisk(WPS_BARCODE_UPLOAD . $meta . '.odt');
 			} catch (Exception $e) {
 				echo __('Generation problem', 'wps_barcode');
 			}
 		}
 		else {
-			echo '<p>'.sprintf( __('None bardcode generated as you did create %s.',
-					'wps_barcode'), $type).'</p>';
+			echo '<p>' . sprintf(__('None bardcode generated as you did create %s.',
+					'wps_barcode'), $type) . '</p>';
 		}
 	}
 
@@ -451,7 +450,7 @@ 
 	 * @param integer $color Color of rectangle
 	 */
 	private function imgNormalGuard(&$image, $pos, $size, $color) {
-		imagefilledrectangle($image, $pos, 180*0.25,$size, 180-10, $color );
+		imagefilledrectangle($image, $pos, 180 * 0.25, $size, 180 - 10, $color);
 	}
 
 	/**
@@ -462,7 +461,7 @@ 
 	 * @param integer $color Color of rectangle
 	 */
 	private function imgSymbole(&$image, $pos, $size, $color) {
-		imagefilledrectangle($image, $pos, 180*0.25,$size, 180-40, $color );
+		imagefilledrectangle($image, $pos, 180 * 0.25, $size, 180 - 40, $color);
 	}
 
 }

includes/modules/wps_download_file/controller/wps_download_file_ctr.php

Spacing +73 added lines, -73 removed lines

@@ -1,24 +1,24 @@ 
-<?php if ( ! defined( 'ABSPATH' ) ) {
+<?php if (!defined('ABSPATH')) {
 	exit;
 }
 
 class wps_download_file_ctr {
 
 	public function __construct() {
-		add_action( 'admin_post_wps_download_file', array( $this, 'wps_download_file' ) );
-		add_action( 'admin_post_nopriv_wps_download_file', array( $this, 'wps_download_file' ) );
-		add_action( 'wps_after_check_order_payment_total_amount', array( $this, 'wps_after_check_order_payment_total_amount' ) );
+		add_action('admin_post_wps_download_file', array($this, 'wps_download_file'));
+		add_action('admin_post_nopriv_wps_download_file', array($this, 'wps_download_file'));
+		add_action('wps_after_check_order_payment_total_amount', array($this, 'wps_after_check_order_payment_total_amount'));
 	}
 
-	public static function get_product_download_link( $oid, $item ) {
+	public static function get_product_download_link($oid, $item) {
 		global $wpdb;
 
 		$parent_def = array();
 		$item_id = $item['item_id'];
-		$item_post_type = get_post_type( $item['item_id'] );
-		if ( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION === $item_post_type ) {
-			$parent_def = wpshop_products::get_parent_variation( $item['item_id'] );
-			if ( ! empty( $parent_def ) && ! empty( $parent_def['parent_post'] ) ) {
+		$item_post_type = get_post_type($item['item_id']);
+		if (WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION === $item_post_type) {
+			$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_id = $parent_post->ID;
 				$item_title = $parent_post->post_title;
@@ -28,53 +28,53 @@ 
 		$download_link = false;
 		$item_id_for_download = null;
 		/** Check if the product or the head product is a download product  */
-		if ( ! empty( $parent_def ) ) {
+		if (!empty($parent_def)) {
 			$parent_meta = $parent_def['parent_post_meta'];
-			if ( ! empty( $parent_meta['is_downloadable_'] ) ) {
-				$query = $wpdb->prepare( 'SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $parent_meta['is_downloadable_'] );
-				$downloadable_option_value = $wpdb->get_var( $query );
-				if ( empty( $downloadable_option_value ) ) {
+			if (!empty($parent_meta['is_downloadable_'])) {
+				$query = $wpdb->prepare('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $parent_meta['is_downloadable_']);
+				$downloadable_option_value = $wpdb->get_var($query);
+				if (empty($downloadable_option_value)) {
 					$item['item_is_downloadable_'] = 'No';
 				} else {
 					$item['item_is_downloadable_'] = $downloadable_option_value;
 				}
 			}
 		}
-		if ( empty( $item['item_is_downloadable_'] ) ) {
-			$product_data = wpshop_products::get_product_data( $item['item_id'] );
-			if ( empty( $product_data['is_downloadable_'] ) ) {
+		if (empty($item['item_is_downloadable_'])) {
+			$product_data = wpshop_products::get_product_data($item['item_id']);
+			if (empty($product_data['is_downloadable_'])) {
 				$item['item_is_downloadable_'] = 'No';
 			} else {
 				$item['item_is_downloadable_'] = $product_data['is_downloadable_'];
 			}
 		}
-		if ( strtolower( __( $item['item_is_downloadable_'], 'wpshop' ) ) === strtolower( __( 'Yes', 'wpshop' ) ) ) {
+		if (strtolower(__($item['item_is_downloadable_'], 'wpshop')) === strtolower(__('Yes', 'wpshop'))) {
 			$item_id_for_download = $item_id;
 		}
-		if ( isset( $item['item_meta']['variations'] ) ) {
-			foreach ( $item['item_meta']['variations'] as $variation_id => $variation ) {
-				if ( isset( $variation['item_meta']['is_downloadable_'] ) ) {
+		if (isset($item['item_meta']['variations'])) {
+			foreach ($item['item_meta']['variations'] as $variation_id => $variation) {
+				if (isset($variation['item_meta']['is_downloadable_'])) {
 					$item_id_for_download = $item_id . '__' . $variation_id;
 				}
 			}
 		}
 		/** In case there is a item identifier defined for download */
-		if ( null !== $item_id_for_download ) {
-			$cid = (int) get_post_meta( $oid, '_wpshop_order_customer_id', true );
-			$cid = ! empty( $cid ) ? $cid : get_current_user_id();
-			$download_codes = get_user_meta( $cid, '_order_download_codes_' . $oid, true );
+		if (null !== $item_id_for_download) {
+			$cid = (int)get_post_meta($oid, '_wpshop_order_customer_id', true);
+			$cid = !empty($cid) ? $cid : get_current_user_id();
+			$download_codes = get_user_meta($cid, '_order_download_codes_' . $oid, true);
 			/** Check if the current product exist into download code list, if not check if there is a composition between parent product and children product  */
-			if ( empty( $download_codes[ $item_id_for_download ] ) ) {
-				$item_id_component = explode( '__', $item_id_for_download );
-				if ( ! empty( $item_id_component ) && ( $item_id_component[0] !== $item_id_for_download ) ) {
+			if (empty($download_codes[$item_id_for_download])) {
+				$item_id_component = explode('__', $item_id_for_download);
+				if (!empty($item_id_component) && ($item_id_component[0] !== $item_id_for_download)) {
 					$item_id_for_download = $item_id_component[0];
-				} elseif ( ! empty( $download_codes[ $item['item_id'] ] ) ) {
+				} elseif (!empty($download_codes[$item['item_id']])) {
 					$item_id_for_download = $item['item_id'];
 				}
 			}
 			//var_dump($download_codes);
-			if ( ! empty( $download_codes ) && ! empty( $download_codes[ $item_id_for_download ] ) && ! empty( $download_codes[ $item_id_for_download ]['download_code'] ) ) {
-				$download_link = admin_url( 'admin-post.php?action=wps_download_file&amp;oid=' . $oid . '&amp;download=' . $download_codes[ $item_id_for_download ]['download_code'] );
+			if (!empty($download_codes) && !empty($download_codes[$item_id_for_download]) && !empty($download_codes[$item_id_for_download]['download_code'])) {
+				$download_link = admin_url('admin-post.php?action=wps_download_file&amp;oid=' . $oid . '&amp;download=' . $download_codes[$item_id_for_download]['download_code']);
 			}
 		}
 		//exit();
@@ -83,34 +83,34 @@ 
 	}
 
 	public function wps_download_file() {
-		$download = ! empty( $_GET['download'] ) ? sanitize_text_field( $_GET['download'] ) : '';
-		$oid = ! empty( $_GET['oid'] ) ? (int) $_GET['oid'] : 0;
+		$download = !empty($_GET['download']) ? sanitize_text_field($_GET['download']) : '';
+		$oid = !empty($_GET['oid']) ? (int)$_GET['oid'] : 0;
 
-		if ( ! empty( $download ) && ! empty( $oid ) ) {
+		if (!empty($download) && !empty($oid)) {
 			$variation_id = '';
-			$order = get_post_meta( $oid, '_order_postmeta', true );
-			if ( ! empty( $order ) && ! empty( $order['customer_id'] ) ) {
-				$download_codes = get_user_meta( $order['customer_id'], '_order_download_codes_' . $oid, true );
-				if ( ! empty( $download_codes ) && is_array( $download_codes ) ) {
-					foreach ( $download_codes as $downloadable_product_id => $d ) {
+			$order = get_post_meta($oid, '_order_postmeta', true);
+			if (!empty($order) && !empty($order['customer_id'])) {
+				$download_codes = get_user_meta($order['customer_id'], '_order_download_codes_' . $oid, true);
+				if (!empty($download_codes) && is_array($download_codes)) {
+					foreach ($download_codes as $downloadable_product_id => $d) {
 						$is_encrypted = false;
-						if ( $d['download_code'] === $download ) {
+						if ($d['download_code'] === $download) {
 							 wpshop_tools::create_custom_hook('encrypt_actions_for_downloadable_product', array(
 								 'order_id' => $oid,
 								 'download_product_id' => $downloadable_product_id,
 
-							 ) );
+							 ));
 
-							if ( get_post_type( $downloadable_product_id ) === WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-								$parent_def = wpshop_products::get_parent_variation( $downloadable_product_id );
-								if ( ! empty( $parent_def ) && ! empty( $parent_def['parent_post'] ) ) {
+							if (get_post_type($downloadable_product_id) === WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+								$parent_def = wpshop_products::get_parent_variation($downloadable_product_id);
+								if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
 									$parent_post = $parent_def['parent_post'];
 									$variation_id = $downloadable_product_id;
 									$downloadable_product_id = $parent_post->ID;
 								}
 							} else {
-								  $downloadable_product_id = explode( '__', $downloadable_product_id );
-								 $downloadable_product_id = isset( $downloadable_product_id[1] ) ? $downloadable_product_id[1] : $downloadable_product_id[0];
+								  $downloadable_product_id = explode('__', $downloadable_product_id);
+								 $downloadable_product_id = isset($downloadable_product_id[1]) ? $downloadable_product_id[1] : $downloadable_product_id[0];
 							}
 
 							$link = wpshop_attributes::get_attribute_option_output(
@@ -121,50 +121,50 @@ 
 								'is_downloadable_', 'file_url', $order
 							);
 
-							if ( false !== $link ) {
+							if (false !== $link) {
 								$uploads = wp_upload_dir();
 								$basedir = $uploads['basedir'];
-								$pos = strpos( $link, 'uploads' );
-								$link = $basedir . substr( $link,$pos + 7 );
+								$pos = strpos($link, 'uploads');
+								$link = $basedir . substr($link, $pos + 7);
 								/** If plugin is encrypted */
-								$encrypted_plugin_path = get_post_meta( $oid, '_download_file_path_' . $oid . '_' . ( ( ! empty( $variation_id ) && get_post_type( $variation_id ) === WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) ? $variation_id : $downloadable_product_id ), true );
-								if ( ! empty( $encrypted_plugin_path ) ) {
+								$encrypted_plugin_path = get_post_meta($oid, '_download_file_path_' . $oid . '_' . ((!empty($variation_id) && get_post_type($variation_id) === WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) ? $variation_id : $downloadable_product_id), true);
+								if (!empty($encrypted_plugin_path)) {
 									$link = WPSHOP_UPLOAD_DIR . $encrypted_plugin_path;
 									$is_encrypted = true;
 								}
 
-								$overload_force_download = apply_filters( 'wps_download_file_overload_force_download', false );
-								if ( ! $overload_force_download ) {
-									wpshop_tools::forceDownload( $link, $is_encrypted );
+								$overload_force_download = apply_filters('wps_download_file_overload_force_download', false);
+								if (!$overload_force_download) {
+									wpshop_tools::forceDownload($link, $is_encrypted);
 								} else {
-									wpshop_tools::wpshop_safe_redirect( str_replace( WP_CONTENT_DIR, WP_CONTENT_URL, $link ) );
+									wpshop_tools::wpshop_safe_redirect(str_replace(WP_CONTENT_DIR, WP_CONTENT_URL, $link));
 								}
 							}
 						}// End if().
 					}// End foreach().
 				}// End if().
 			} else {
-				wp_redirect( get_permalink( wpshop_tools::get_page_id( get_option( 'wpshop_myaccount_page_id' ) ) ) );
+				wp_redirect(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))));
 			}// End if().
 		}// End if().
-		esc_html_e( 'Impossible to download the file you requested', 'wpshop' );
+		esc_html_e('Impossible to download the file you requested', 'wpshop');
 	}
 
-	public function wps_after_check_order_payment_total_amount( $order_id ) {
-		$order_meta = ( ! empty( $order_meta ) ) ? false : get_post_meta( $order_id, '_order_postmeta', true );
+	public function wps_after_check_order_payment_total_amount($order_id) {
+		$order_meta = (!empty($order_meta)) ? false : get_post_meta($order_id, '_order_postmeta', true);
 		/** Check if the order content a downloadable product **/
-		if ( ! empty( $order_meta ) && ! empty( $order_meta['order_items'] ) && ! empty( $order_meta['order_status'] ) && 'completed' === $order_meta['order_status'] ) {
-			foreach ( $order_meta['order_items'] as $key_value => $item ) {
-				$link = self::get_product_download_link( $order_id, $item );
-				if ( false === $link ) {
+		if (!empty($order_meta) && !empty($order_meta['order_items']) && !empty($order_meta['order_status']) && 'completed' === $order_meta['order_status']) {
+			foreach ($order_meta['order_items'] as $key_value => $item) {
+				$link = self::get_product_download_link($order_id, $item);
+				if (false === $link) {
 					\eoxia\log_class::exec(
 						get_class(),
 						get_class(),
 						sprintf(
-							__( 'Failure returned at order link generation. UserID : <b>%1$d</b>, ProductID : <b>%2$d</d>, UserMeta : <pre>%3$s</pre>', 'wpshop' ),
-							(int) get_current_user_id(),
-							(int) $item['item_id'],
-							get_user_meta( (int) $order_meta['customer_id'], '_order_download_codes_' . $order_id, true )
+							__('Failure returned at order link generation. UserID : <b>%1$d</b>, ProductID : <b>%2$d</d>, UserMeta : <pre>%3$s</pre>', 'wpshop'),
+							(int)get_current_user_id(),
+							(int)$item['item_id'],
+							get_user_meta((int)$order_meta['customer_id'], '_order_download_codes_' . $order_id, true)
 						),
 						array(
 							'object_id' => $order_id,
@@ -172,12 +172,12 @@ 
 						0
 					);
 				} else {
-					$user_data = get_userdata( $order_meta['customer_id'] );
-					$order_info = get_post_meta( $order_id, '_order_info', true );
-					$email = ( ! empty( $user_data ) && ! empty( $user_data->user_email ) ) ? $user_data->user_email : '';
-					$first_name = ( ! empty( $order_info ) && ! empty( $order_info['billing'] ) && ! empty( $order_info['billing']['address']['address_first_name'] ) ? $order_info['billing']['address']['address_first_name'] : '' );
-					$last_name = ( ! empty( $order_info ) && ! empty( $order_info['billing'] ) && ! empty( $order_info['billing']['address']['address_last_name'] ) ? $order_info['billing']['address']['address_last_name'] : '' );
-					$link = '<a href="' . esc_url( $link ) . '" target="_blank">' . __( 'Download the product', 'wpshop' ) . '</a>';
+					$user_data = get_userdata($order_meta['customer_id']);
+					$order_info = get_post_meta($order_id, '_order_info', true);
+					$email = (!empty($user_data) && !empty($user_data->user_email)) ? $user_data->user_email : '';
+					$first_name = (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '');
+					$last_name = (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '');
+					$link = '<a href="' . esc_url($link) . '" target="_blank">' . __('Download the product', 'wpshop') . '</a>';
 					$wps_message = new wps_message_ctr();
 					$wps_message->wpshop_prepared_email(
 						$email,

includes/modules/wps_product/modules/wps-mass-interface3/include/class-mass-interface3.php

Spacing +82 added lines, -82 removed lines

@@ -5,7 +5,7 @@ 
  * @package wps-mass-interface3
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 /**
@@ -62,10 +62,10 @@ 
 	 * @method __construct
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'mass_init' ), 350 );
-		add_action( 'wp_ajax_wps_mass_3_new', array( $this, 'ajax_new' ) );
-		add_action( 'wp_ajax_wps_mass_3_save', array( $this, 'ajax_save' ) );
-		add_filter( 'set-screen-option', array( $this, 'set_screen_option' ), 10, 3 );
+		add_action('admin_menu', array($this, 'mass_init'), 350);
+		add_action('wp_ajax_wps_mass_3_new', array($this, 'ajax_new'));
+		add_action('wp_ajax_wps_mass_3_save', array($this, 'ajax_save'));
+		add_filter('set-screen-option', array($this, 'set_screen_option'), 10, 3);
 	}
 	/**
 	 * Page Initialisation
@@ -74,18 +74,18 @@ 
 	 * @return void
 	 */
 	public function mass_init() {
-		$page = ( isset( $_GET['page'] ) && strpos( $_GET['page'] , 'mass_edit_interface3_att_set_' ) !== false ) ? $_GET['page'] : 'mass_edit_interface3_att_set_1';
+		$page = (isset($_GET['page']) && strpos($_GET['page'], 'mass_edit_interface3_att_set_') !== false) ? $_GET['page'] : 'mass_edit_interface3_att_set_1';
 		$this->hook = add_submenu_page(
 			'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
-			__( 'Mass product edit', 'wpshop' ),
-			__( 'Mass product edit', 'wpshop' ),
+			__('Mass product edit', 'wpshop'),
+			__('Mass product edit', 'wpshop'),
 			'manage_options',
 			$page,
-			array( $this, 'mass_interface' )
+			array($this, 'mass_interface')
 		);
-		add_action( "load-{$this->hook}", array( $this, 'mass_interface_screen_option' ) );
-		add_action( "admin_print_scripts-{$this->hook}", array( $this, 'scripts' ) );
-		add_action( "admin_print_styles-{$this->hook}", array( $this, 'styles' ) );
+		add_action("load-{$this->hook}", array($this, 'mass_interface_screen_option'));
+		add_action("admin_print_scripts-{$this->hook}", array($this, 'scripts'));
+		add_action("admin_print_styles-{$this->hook}", array($this, 'styles'));
 	}
 	/**
 	 * Page content.
@@ -94,48 +94,48 @@ 
 	 * @return void Direct display.
 	 */
 	public function mass_interface() {
-		$wp_list_table = $this->wp_list_table( $this->hook );
+		$wp_list_table = $this->wp_list_table($this->hook);
 		$wp_list_table->prepare_items(); ?>
 		<div class="wrap">
 		<h1 class="wp-heading-inline"><?php
-		echo esc_html( $this->post_type_object->labels->name );
+		echo esc_html($this->post_type_object->labels->name);
 		?></h1>
 		<?php
-		if ( current_user_can( $this->post_type_object->cap->create_posts ) ) {
-			echo ' <a href="#addPost" class="page-title-action" data-nonce="' . esc_attr( wp_create_nonce( 'add_post-' . sanitize_title( get_class() ) ) ) . '">';
-			echo esc_html( $this->post_type_object->labels->add_new ) . '</a>';
+		if (current_user_can($this->post_type_object->cap->create_posts)) {
+			echo ' <a href="#addPost" class="page-title-action" data-nonce="' . esc_attr(wp_create_nonce('add_post-' . sanitize_title(get_class()))) . '">';
+			echo esc_html($this->post_type_object->labels->add_new) . '</a>';
 		}
 		?>
 		<hr class="wp-header-end">
-		<?php echo '<input type="hidden" id="hook" value="' . esc_attr( $this->hook ) . '">'; ?>
+		<?php echo '<input type="hidden" id="hook" value="' . esc_attr($this->hook) . '">'; ?>
 		<form id="posts-filter" method="get">
 		<?php $wp_list_table->views(); ?>
-		<?php $wp_list_table->search_box( $this->post_type_object->labels->search_items, 'post' ); ?>
+		<?php $wp_list_table->search_box($this->post_type_object->labels->search_items, 'post'); ?>
 		<input type="hidden" name="page" value="<?php
-		echo esc_attr( str_replace(
+		echo esc_attr(str_replace(
 			"{$wp_list_table->screen->post_type}_page_",
 			'',
 			$wp_list_table->screen->id
-		) ); ?>">
-		<input type="hidden" name="post_type" value="<?php echo esc_attr( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ); ?>">
+		)); ?>">
+		<input type="hidden" name="post_type" value="<?php echo esc_attr(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT); ?>">
 		</form>
 		<?php $wp_list_table->display(); ?>
 		<table style="display:none;">
 		 <tbody id="posts-add">
-		  <tr id="inline-edit" class="inline-edit-row inline-edit-row-post <?php echo esc_attr( "inline-edit-{$this->post_type_object->name} quick-edit-row quick-edit-row-post inline-edit-{$this->post_type_object->name}" ); ?>" style="display: none">
-		   <td colspan="<?php echo esc_attr( $wp_list_table->get_column_count() ); ?>" class="colspanchange">
+		  <tr id="inline-edit" class="inline-edit-row inline-edit-row-post <?php echo esc_attr("inline-edit-{$this->post_type_object->name} quick-edit-row quick-edit-row-post inline-edit-{$this->post_type_object->name}"); ?>" style="display: none">
+		   <td colspan="<?php echo esc_attr($wp_list_table->get_column_count()); ?>" class="colspanchange">
 			<fieldset class="inline-edit-col">
-			 <legend class="inline-edit-legend"><?php echo esc_html( $this->post_type_object->labels->add_new ) ?></legend>
+			 <legend class="inline-edit-legend"><?php echo esc_html($this->post_type_object->labels->add_new) ?></legend>
 			 <div class="inline-edit-col">
 		   <label>
-			<span class="title"><?php esc_html_e( 'Title' ); ?></span>
+			<span class="title"><?php esc_html_e('Title'); ?></span>
 			<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
 		   </label>
 			 </div>
 			</fieldset>
 			<p class="submit inline-edit-save">
-			 <button type="button" class="button cancel alignleft"><?php esc_html_e( 'Cancel' ); ?></button>
-			 <button type="button" class="button button-primary save alignright"><?php echo esc_html( $this->post_type_object->labels->add_new ); ?></button>
+			 <button type="button" class="button cancel alignleft"><?php esc_html_e('Cancel'); ?></button>
+			 <button type="button" class="button button-primary save alignright"><?php echo esc_html($this->post_type_object->labels->add_new); ?></button>
 			 <span class="spinner"></span>
 			 <span class="error" style="display:none"></span>
 			 <br class="clear" />
@@ -154,9 +154,9 @@ 
 	 * @return void
 	 */
 	public function mass_interface_screen_option() {
-		add_action( 'admin_notices', array( $this, 'ajax_admin_notice' ) );
-		add_filter( 'default_hidden_columns', array( $this, 'hidden_columns' ), 10, 2 );
-		$this->wp_list_table( $this->hook );
+		add_action('admin_notices', array($this, 'ajax_admin_notice'));
+		add_filter('default_hidden_columns', array($this, 'hidden_columns'), 10, 2);
+		$this->wp_list_table($this->hook);
 	}
 	/**
 	 * Instance WPS_Mass_List_Table.
@@ -165,10 +165,10 @@ 
 	 * @param  string $screen Current screen.
 	 * @return WPS_Mass_List_Table Table class.
 	 */
-	public function wp_list_table( $screen ) {
-		if ( is_null( $this->wp_list_table ) ) {
-			$this->post_type_object = get_post_type_object( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
-			include_once( WPS_PDCT_MASS_INCLUDE_PATH . 'class-wps-mass-list-table.php' );
+	public function wp_list_table($screen) {
+		if (is_null($this->wp_list_table)) {
+			$this->post_type_object = get_post_type_object(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			include_once(WPS_PDCT_MASS_INCLUDE_PATH . 'class-wps-mass-list-table.php');
 			$this->wp_list_table = new WPS_Mass_List_Table(
 				array(
 					'screen' => $screen,
@@ -182,7 +182,7 @@ 
 					'heading_list'       => $this->post_type_object->labels->items_list,
 				)
 			);
-			$class = sanitize_title( get_class() );
+			$class = sanitize_title(get_class());
 			$this->wp_list_table->screen->add_option(
 				'per_page', array(
 					'default' => 20,
@@ -200,10 +200,10 @@ 
 	 * @param  WP_Screen $screen Current screen.
 	 * @return array Return of filter.
 	 */
-	public function hidden_columns( $hidden, $screen ) {
-		$wp_list_table = $this->wp_list_table( $this->hook );
-		if ( $screen === $wp_list_table->screen ) {
-			$hidden = array_diff( array_flip( $wp_list_table->get_columns() ), $this->default_show_columns );
+	public function hidden_columns($hidden, $screen) {
+		$wp_list_table = $this->wp_list_table($this->hook);
+		if ($screen === $wp_list_table->screen) {
+			$hidden = array_diff(array_flip($wp_list_table->get_columns()), $this->default_show_columns);
 			$hidden[] = 'thumbnail';
 		}
 		return $hidden;
@@ -216,11 +216,11 @@ 
 	 * @param  string $option Actual option to save.
 	 * @param  mixed  $value  Actual value to save.
 	 */
-	public function set_screen_option( $string, $option, $value ) {
-		$class = sanitize_title( get_class() );
-		if ( "{$class}_per_page" === $option ) {
-			$value = (int) $value;
-			if ( $value < 1 || $value > 999 ) {
+	public function set_screen_option($string, $option, $value) {
+		$class = sanitize_title(get_class());
+		if ("{$class}_per_page" === $option) {
+			$value = (int)$value;
+			if ($value < 1 || $value > 999) {
 				$string = false;
 			}
 			return $value;
@@ -234,7 +234,7 @@ 
 	 * @return void Direct display.
 	 */
 	public function ajax_admin_notice() {
-		printf( '<div class="%1$s"><p></p></div>', esc_attr( 'hidden is-dismissible notice' ) );
+		printf('<div class="%1$s"><p></p></div>', esc_attr('hidden is-dismissible notice'));
 	}
 	/**
 	 * Enqueue scripts.
@@ -243,17 +243,17 @@ 
 	 * @return void
 	 */
 	public function scripts() {
-		wp_deregister_script( 'wpes_chosen_js' );
+		wp_deregister_script('wpes_chosen_js');
 		wp_enqueue_script(
 			'jquery_chosen_js',
 			WPS_PDCT_MASS_CHOSEN_JS . 'chosen.jquery.min.js',
-			array( 'jquery' ),
+			array('jquery'),
 			true
 		);
 		wp_enqueue_script(
 			'mass_interface3-ajax',
 			WPS_PDCT_MASS_JS . 'wps-mass-interface3.js',
-			array( 'jquery', 'jquery-form' ),
+			array('jquery', 'jquery-form'),
 			true
 		);
 		wp_enqueue_media();
@@ -265,11 +265,11 @@ 
 	 * @return void
 	 */
 	public function styles() {
-		wp_register_style( 'jquery_chosen_css', WPS_PDCT_MASS_CHOSEN_CSS . 'chosen.min.css' );
-		wp_register_style( 'mass_interface3_css', WPS_PDCT_MASS_CSS . 'wps-mass-interface3.css' );
-		wp_enqueue_style( 'jquery_chosen_css' );
-		wp_enqueue_style( 'mass_interface3_css' );
-		wp_dequeue_style( 'wpshop_main_css' );
+		wp_register_style('jquery_chosen_css', WPS_PDCT_MASS_CHOSEN_CSS . 'chosen.min.css');
+		wp_register_style('mass_interface3_css', WPS_PDCT_MASS_CSS . 'wps-mass-interface3.css');
+		wp_enqueue_style('jquery_chosen_css');
+		wp_enqueue_style('mass_interface3_css');
+		wp_dequeue_style('wpshop_main_css');
 	}
 	/**
 	 * Change default url for set_url_scheme(). See pagination & get_views. Impossible to re-use set_url_sheme inner.
@@ -278,7 +278,7 @@ 
 	 * @param  string        $url    Given url.
 	 * @param  string | null $scheme Scheme to give $url. Currently 'http', 'https', 'login', 'login_post', 'admin', 'relative', 'rest', 'rpc', or null.
 	 */
-	public function set_current_url( $url, $scheme ) {
+	public function set_current_url($url, $scheme) {
 		/*
 		Remove_filter( 'set_url_scheme', array( $this, 'set_current_url' ), 10 );
 		$url = set_url_sheme( esc_url( $_POST['current_url'] ) );
@@ -293,23 +293,23 @@ 
 	 * @return void JSON with all elements to update.
 	 */
 	public function ajax_new() {
-		check_ajax_referer( 'add_post-' . sanitize_title( get_class() ) );
-		add_filter( 'default_hidden_columns', array( $this, 'hidden_columns' ), 10, 2 );
-		add_filter( 'set_url_scheme', array( $this, 'set_current_url' ), 10, 2 );
-		$wp_list_table = $this->wp_list_table( sanitize_title( $_POST['hook'] ) );
+		check_ajax_referer('add_post-' . sanitize_title(get_class()));
+		add_filter('default_hidden_columns', array($this, 'hidden_columns'), 10, 2);
+		add_filter('set_url_scheme', array($this, 'set_current_url'), 10, 2);
+		$wp_list_table = $this->wp_list_table(sanitize_title($_POST['hook']));
 		$wpshop_product_attribute = array();
-		foreach ( $wp_list_table->request_items_columns() as $key_var => $var ) {
-			$wpshop_product_attribute[ $var['data'] ][ $key_var ] = null;
+		foreach ($wp_list_table->request_items_columns() as $key_var => $var) {
+			$wpshop_product_attribute[$var['data']][$key_var] = null;
 		}
 		$new_product_id = wp_insert_post(
 			array(
 				'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
 				'post_status' => 'publish',
-				'post_title' => sanitize_text_field( $_POST['title'] ),
+				'post_title' => sanitize_text_field($_POST['title']),
 			)
 		);
-		if ( ! empty( $new_product_id ) ) {
-			update_post_meta( $new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $wp_list_table->current_view );
+		if (!empty($new_product_id)) {
+			update_post_meta($new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $wp_list_table->current_view);
 			$product_class = new wpshop_products();
 			$product_class->save_product_custom_informations(
 				$new_product_id, array(
@@ -321,30 +321,30 @@ 
 				)
 			);
 		} else {
-			wp_die( 1 );
+			wp_die(1);
 		}
-		$data = $wp_list_table->request( $new_product_id );
-		$per_page = $wp_list_table->screen->get_option( 'per_page', 'option' );
+		$data = $wp_list_table->request($new_product_id);
+		$per_page = $wp_list_table->screen->get_option('per_page', 'option');
 		$wp_list_table->column_headers();
 		$wp_list_table->items = true;
 		ob_start();
 		$wp_list_table->views();
 		$subsubsub = ob_get_clean();
 		ob_start();
-		$wp_list_table->display_tablenav( 'top' );
+		$wp_list_table->display_tablenav('top');
 		$tablenav_top = ob_get_clean();
 		ob_start();
-		$wp_list_table->display_tablenav( 'bottom' );
+		$wp_list_table->display_tablenav('bottom');
 		$tablenav_bottom = ob_get_clean();
 		ob_start();
-		$wp_list_table->single_row( $data[0] );
-		wp_send_json_success( array(
+		$wp_list_table->single_row($data[0]);
+		wp_send_json_success(array(
 			'row' => ob_get_clean(),
 			'per_page' => $per_page,
 			'tablenav_top' => $tablenav_top,
 			'tablenav_bottom' => $tablenav_bottom,
 			'subsubsub' => $subsubsub,
-		) );
+		));
 	}
 	/**
 	 * Ajax callback for save selected elements.
@@ -353,22 +353,22 @@ 
 	 * @return void JSON with number of saved elements (not used).
 	 */
 	public function ajax_save() {
-		check_ajax_referer( 'bulk-save-mass-edit-interface-3' );
+		check_ajax_referer('bulk-save-mass-edit-interface-3');
 		$i = 0;
 		$product_class = new wpshop_products();
-		if ( ! empty( $_REQUEST['cb'] ) ) {
-			foreach ( $_REQUEST['cb'] as $id ) {
-				$id = intval( $id );
-				if ( isset( $_REQUEST[ 'row_' . $id ]['thumbnail'] ) ) {
-					intval( $_REQUEST[ 'row_' . $id ]['thumbnail'] );
-					update_post_meta( $id, '_thumbnail_id', intval( $_REQUEST[ 'row_' . $id ]['thumbnail'] ) );
-					unset( $_REQUEST[ 'row_' . $id ]['thumbnail'] );
+		if (!empty($_REQUEST['cb'])) {
+			foreach ($_REQUEST['cb'] as $id) {
+				$id = intval($id);
+				if (isset($_REQUEST['row_' . $id]['thumbnail'])) {
+					intval($_REQUEST['row_' . $id]['thumbnail']);
+					update_post_meta($id, '_thumbnail_id', intval($_REQUEST['row_' . $id]['thumbnail']));
+					unset($_REQUEST['row_' . $id]['thumbnail']);
 				}
-				if ( ! empty( $_REQUEST[ 'row_' . $id ] ) ) {
+				if (!empty($_REQUEST['row_' . $id])) {
 					$product_class->save_product_custom_informations(
 						$id,
 						array_merge(
-							$_REQUEST[ 'row_' . $id ],
+							$_REQUEST['row_' . $id],
 							array(
 								'post_ID' => $id,
 								'product_id' => $id,