Eoxia / wpshop

includes/modules/wps_quotation/controller/wps_quotation_backend_ctr.php

Spacing +73 added lines, -73 removed lines

@@ -1,21 +1,21 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_quotation_backend_ctr {
 	/*
 	 * Declare filter and actions
 	 */
 	public function __construct() {
 		/**	Appel des styles pour l'administration / Call style for administration	*/
-		add_action( 'admin_enqueue_scripts', array( &$this, 'admin_assets' ) );
+		add_action('admin_enqueue_scripts', array(&$this, 'admin_assets'));
 
 		/**	Définition du filtre permettant le champs d'activation du module avec un code obtenu sur la boutique / Define the filter allowing to display an input for module activation with a given code from the shop	*/
-		add_filter( 'wps-addon-extra-info', array( $this, 'display_addon_activation_form' ) );
+		add_filter('wps-addon-extra-info', array($this, 'display_addon_activation_form'));
 		/**	Déclaration de la requête Ajax permettant de vérifier le code d'activation et d'activer le module le cas échéant / Declare ajax request allowing to check the code and activate addon in case the code is correct	*/
-		add_action( 'wp_ajax_check_code_for_activation', array( $this, 'check_code_for_activation' ) );
+		add_action('wp_ajax_check_code_for_activation', array($this, 'check_code_for_activation'));
 
-		add_filter( 'wps-filter-free-product-bton-tpl', array( $this, 'wps_free_product_bton_tpl' ) );
-		add_action( 'wp_ajax_wps_free_product_form_page_tpl', array( $this, 'wps_free_product_form_page_tpl' ) );
-		add_action( 'wp_ajax_wps_create_new_free_product', array( $this, 'wps_create_new_free_product' ) );
-		add_action( 'init', array( $this, 'wps_free_product_post_status' ) );
+		add_filter('wps-filter-free-product-bton-tpl', array($this, 'wps_free_product_bton_tpl'));
+		add_action('wp_ajax_wps_free_product_form_page_tpl', array($this, 'wps_free_product_form_page_tpl'));
+		add_action('wp_ajax_wps_create_new_free_product', array($this, 'wps_create_new_free_product'));
+		add_action('init', array($this, 'wps_free_product_post_status'));
 	}
 
 
@@ -23,10 +23,10 @@ 
 	 * Inclusion des feuilles de styles pour l'administration / Admin css enqueue
 	 */
 	function admin_assets($hook) {
-		if ( $hook != 'settings_page_wpshop_option' )
+		if ($hook != 'settings_page_wpshop_option')
 			return;
 
-		wp_enqueue_script( 'wps_quotation_admin_js', WPS_QUOTATION_URL . '/assets/js/backend.js', array( 'jquery', ), WPSHOP_VERSION );
+		wp_enqueue_script('wps_quotation_admin_js', WPS_QUOTATION_URL . '/assets/js/backend.js', array('jquery',), WPSHOP_VERSION);
 	}
 
 
@@ -34,36 +34,36 @@ 
 	/*
 	 * Create a new post status for free products
 	 */
-	function wps_free_product_post_status(){
-		register_post_status( 'free_product', array(
-			'label'                     => __( 'Free product', 'wpshop' ),
+	function wps_free_product_post_status() {
+		register_post_status('free_product', array(
+			'label'                     => __('Free product', 'wpshop'),
 			'public'                    => false,
 			'exclude_from_search'       => true,
 			'show_in_admin_all_list'    => false,
 			'show_in_admin_status_list' => false,
-		) );
+		));
 	}
 	/*
 	 * Template for display button - Filter : 'wps_orders\templates\backend\product-listing\wps_orders_product_listing.php'
 	 * @param integer $order_id ID of order
 	 */
 	public function wps_free_product_bton_tpl($order_id) {
-		$order_post_meta = get_post_meta( $order_id, '_wpshop_order_status', true );
-		if ( 'completed' != $order_post_meta ) {
-			require ( wpshop_tools::get_template_part( WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "add_free_product_bton_tpl") );
+		$order_post_meta = get_post_meta($order_id, '_wpshop_order_status', true);
+		if ('completed' != $order_post_meta) {
+			require (wpshop_tools::get_template_part(WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "add_free_product_bton_tpl"));
 		}
 	}
 	/*
 	 * Template for display form (AjaxForm) - Call from : Line 3 'templates\backend\add_free_product_form_page_tpl.php'
 	 */
 	public function wps_free_product_form_page_tpl() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_free_product_form_page_tpl' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_free_product_form_page_tpl'))
 			wp_die();
 
-		$order_id = ( !empty($_GET['oid']) ) ? intval( $_GET['oid']) : null;
-		require ( wpshop_tools::get_template_part( WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "add_free_product_form_page_tpl") );
+		$order_id = (!empty($_GET['oid'])) ? intval($_GET['oid']) : null;
+		require (wpshop_tools::get_template_part(WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "add_free_product_form_page_tpl"));
 		wp_die();
 	}
 	/*
@@ -73,9 +73,9 @@ 
 	 * @return integer $pid Product ID
 	 */
 	public function wps_create_new_free_product() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_create_new_free_product' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_create_new_free_product'))
 			wp_die();
 
 		global $wpdb;
@@ -83,43 +83,43 @@ 
 		$output = __('Error at product creation!', 'wpshop');
 		$new_product_id = -1;
 
-		$post_title = ( !empty($_POST['post_title']) ) ? sanitize_text_field( $_POST['post_title'] ) : -1;
-		$post_content = ( !empty($_POST['post_content']) ) ? nl2br( esc_textarea( $_POST['post_content'] ) ) : ''; 
-		$attributes = ( !empty($_POST['attribute']) ) ? (array) $_POST['attribute'] : array();
+		$post_title = (!empty($_POST['post_title'])) ? sanitize_text_field($_POST['post_title']) : -1;
+		$post_content = (!empty($_POST['post_content'])) ? nl2br(esc_textarea($_POST['post_content'])) : ''; 
+		$attributes = (!empty($_POST['attribute'])) ? (array)$_POST['attribute'] : array();
 
-		if( $post_title != -1 ) {
-			$new_product_id = wp_insert_post( array(
+		if ($post_title != -1) {
+			$new_product_id = wp_insert_post(array(
 				'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
 				'post_status' => 'free_product',
 				'post_title' => $post_title,
 				'post_content' => $post_content,
-			) );
-			if( !is_object( $new_product_id ) ) {
+			));
+			if (!is_object($new_product_id)) {
 				$attribute_set_list = wpshop_attributes_set::get_attribute_set_list_for_entity(wpshop_entities::get_entity_identifier_from_code('wpshop_product'));
 				$id_attribute_set = null;
-				foreach( $attribute_set_list as $attribute_set ) {
-					if( $attribute_set->slug == 'free_product' ) {
+				foreach ($attribute_set_list as $attribute_set) {
+					if ($attribute_set->slug == 'free_product') {
 						$id_attribute_set = $attribute_set->id;
 						break;
 					}
 				}
-				update_post_meta( $new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $id_attribute_set );
-				$data_to_save['post_ID'] = $data_to_save['product_id'] = intval( $new_product_id );
-				$data_to_save['wpshop_product_attribute'] = ( !empty($attributes) ) ? $attributes : array();
+				update_post_meta($new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $id_attribute_set);
+				$data_to_save['post_ID'] = $data_to_save['product_id'] = intval($new_product_id);
+				$data_to_save['wpshop_product_attribute'] = (!empty($attributes)) ? $attributes : array();
 				$data_to_save['user_ID'] = get_current_user_id();
 				$data_to_save['action'] = 'editpost';
 				$status = false;
 				$output = __('Product created partially!', 'wpshop');
-				if( !empty($new_product_id) && !empty( $data_to_save['user_ID'] ) ) {
+				if (!empty($new_product_id) && !empty($data_to_save['user_ID'])) {
 					$product_class = new wpshop_products();
-					$product_class->save_product_custom_informations( $new_product_id, $data_to_save );
+					$product_class->save_product_custom_informations($new_product_id, $data_to_save);
 					$status = true;
 					$output = __('Product created successfully.', 'wpshop');
 				}
 			}
 		}
 
-		echo json_encode( array( 'status' => $status, 'message' => $output, 'pid' => $new_product_id ) );
+		echo json_encode(array('status' => $status, 'message' => $output, 'pid' => $new_product_id));
 		wp_die();
 	}
 
@@ -129,78 +129,78 @@ 
 	 *
 	 * @param string $module Le nom du module en cours d'affichage et pour lequel il faut afficher le champs/ The module being displayed and to add input for
 	 */
-	function display_addon_activation_form( $module ) {
-		if ( WPS_QUOTATION_DIR == $module ) {
+	function display_addon_activation_form($module) {
+		if (WPS_QUOTATION_DIR == $module) {
 
 			/** Récupération du statut du module devis / Get current quotation addon state */
-			$addon_option = get_option( 'wpshop_addons' );
+			$addon_option = get_option('wpshop_addons');
 
-			if ( empty( $addon_option ) || ( !empty( $addon_option[ 'WPSHOP_ADDONS_QUOTATION' ] ) && ( false === ( $addon_option['WPSHOP_ADDONS_QUOTATION']['activate'] ) ) ) ) {
-				$quotation_module_def = get_plugin_data( WPS_QUOTATION_PATH . '/wps_quotation.php' );
-				require ( wpshop_tools::get_template_part( WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "addon", "activation" ) );
+			if (empty($addon_option) || (!empty($addon_option['WPSHOP_ADDONS_QUOTATION']) && (false === ($addon_option['WPSHOP_ADDONS_QUOTATION']['activate'])))) {
+				$quotation_module_def = get_plugin_data(WPS_QUOTATION_PATH . '/wps_quotation.php');
+				require (wpshop_tools::get_template_part(WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "addon", "activation"));
 			}
-			else if ( !empty( $addon_option[ 'WPSHOP_ADDONS_QUOTATION' ] ) && ( true === ( $addon_option['WPSHOP_ADDONS_QUOTATION']['activate'] ) ) ) {
-				require ( wpshop_tools::get_template_part( WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "addon", "activated" ) );
+			else if (!empty($addon_option['WPSHOP_ADDONS_QUOTATION']) && (true === ($addon_option['WPSHOP_ADDONS_QUOTATION']['activate']))) {
+				require (wpshop_tools::get_template_part(WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "addon", "activated"));
 			}
 		}
 	}
 
 	function check_code_for_activation() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'check_code_for_activation' ) )
+		if (!wp_verify_nonce($_wpnonce, 'check_code_for_activation'))
 			wp_die();
 
 		$response = array(
 			'status' => false,
-			'message' => __( 'Activation code for quotation addon is invalid, please check it and try again.', 'wpshop' ),
+			'message' => __('Activation code for quotation addon is invalid, please check it and try again.', 'wpshop'),
 		);
-		$required_code = wpshop_tools::get_plugin_validation_code( WPS_QUOTATION_DIR, site_url() );
-		$code = sanitize_text_field( $_POST[ 'code' ] );
-		if ( $code === $required_code ) {
+		$required_code = wpshop_tools::get_plugin_validation_code(WPS_QUOTATION_DIR, site_url());
+		$code = sanitize_text_field($_POST['code']);
+		if ($code === $required_code) {
 			$this->action_to_do_to_activate();
 			$response = array(
 				'status' => true,
-				'message' => __( 'Quotation addon have been successfully activated.', 'wpshop' ),
+				'message' => __('Quotation addon have been successfully activated.', 'wpshop'),
 			);
 		}
 
-		wp_die( json_encode( $response ) );
+		wp_die(json_encode($response));
 	}
 
 	/**
 	 * Action to do when the activation code is OK
 	 */
-	function action_to_do_to_activate(){
+	function action_to_do_to_activate() {
 		global $wpdb;
 		/** Activate the plug in **/
-		$addon_option = get_option( 'wpshop_addons' );
+		$addon_option = get_option('wpshop_addons');
 		$addon_option['WPSHOP_ADDONS_QUOTATION']['activate'] = true;
 		$addon_option['WPSHOP_ADDONS_QUOTATION']['activation_date'] = current_time('mysql', 0);
 
-		update_option( 'wpshop_addons', $addon_option );
+		update_option('wpshop_addons', $addon_option);
 
 		/** Activate the Quotation attribute **/
-		$wpdb->update( WPSHOP_DBT_ATTRIBUTE, array('status' => 'valid'), array('code' => 'quotation_allowed') );
+		$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('status' => 'valid'), array('code' => 'quotation_allowed'));
 
-		$attribute_def = wpshop_attributes::getElement( 'quotation_allowed', '"valid"', 'code' );
+		$attribute_def = wpshop_attributes::getElement('quotation_allowed', '"valid"', 'code');
 
 		/** Add the attribute in attributes groups section **/
-		$query = $wpdb->prepare('SELECT id, attribute_set_id FROM ' .WPSHOP_DBT_ATTRIBUTE_GROUP. ' WHERE code = %s', 'general');
-		$attribute_set_sections = $wpdb->get_results( $query );
-
-		if ( !empty($attribute_set_sections) ) {
-			$entity_type_def = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
-			if ( !empty( $entity_type_def) ) {
-				foreach ( $attribute_set_sections as $attribute_set_section ) {
-					$query = $wpdb->prepare('SELECT COUNT(*) AS count_attribute_affectation FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d AND attribute_id = %d', $entity_type_def, $attribute_set_section->attribute_set_id, $attribute_set_section->id, $attribute_def->id);
-					$count_attribute_affectation = $wpdb->get_var( $query );
-
-					if ( $count_attribute_affectation == 0 ) {
-						$query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', $entity_type_def, $attribute_set_section->attribute_set_id, $attribute_set_section->id);
-						$max_position = $wpdb->get_var( $query );
+		$query = $wpdb->prepare('SELECT id, attribute_set_id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE code = %s', 'general');
+		$attribute_set_sections = $wpdb->get_results($query);
+
+		if (!empty($attribute_set_sections)) {
+			$entity_type_def = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			if (!empty($entity_type_def)) {
+				foreach ($attribute_set_sections as $attribute_set_section) {
+					$query = $wpdb->prepare('SELECT COUNT(*) AS count_attribute_affectation FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d AND attribute_id = %d', $entity_type_def, $attribute_set_section->attribute_set_id, $attribute_set_section->id, $attribute_def->id);
+					$count_attribute_affectation = $wpdb->get_var($query);
+
+					if ($count_attribute_affectation == 0) {
+						$query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', $entity_type_def, $attribute_set_section->attribute_set_id, $attribute_set_section->id);
+						$max_position = $wpdb->get_var($query);
 						/** Insert attribute detail **/
-						$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_type_def, 'attribute_set_id' =>  $attribute_set_section->attribute_set_id, 'attribute_group_id' => $attribute_set_section->id, 'attribute_id' => $attribute_def->id, 'position' => (int)$max_position + 1) );
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_type_def, 'attribute_set_id' =>  $attribute_set_section->attribute_set_id, 'attribute_group_id' => $attribute_set_section->id, 'attribute_id' => $attribute_def->id, 'position' => (int)$max_position + 1));
 					}
 				}
 			}

includes/modules/billing/billing.php

Spacing +8 added lines, -8 removed lines

@@ -103,8 +103,8 @@ 
 					add_settings_field('wpshop_billing_address_choice', __('Billing address choice', 'wpshop'), array(&$this, 'wpshop_billing_address_choice_field'), 'wpshop_billing_info', 'wpshop_billing_info');
 					add_settings_field('wpshop_billing_address_include_into_register', '', array(&$this, 'wpshop_billing_address_include_into_register_field'), 'wpshop_billing_info', 'wpshop_billing_info');
 
-					register_setting( 'wpshop_options', 'wpshop_billing_invoice_footer_area' );
-					add_settings_field( 'wpshop_billing_invoice_footer_area', __( 'Free text for invoice footer', 'wpshop' ), array( $this, 'wpshop_billing_invoice_footer_area' ), 'wpshop_billing_info', 'wpshop_billing_info' );
+					register_setting('wpshop_options', 'wpshop_billing_invoice_footer_area');
+					add_settings_field('wpshop_billing_invoice_footer_area', __('Free text for invoice footer', 'wpshop'), array($this, 'wpshop_billing_invoice_footer_area'), 'wpshop_billing_info', 'wpshop_billing_info');
 
 					$quotation_option = get_option('wpshop_addons');
 					if (!empty($quotation_option) && !empty($quotation_option['WPSHOP_ADDONS_QUOTATION']) && !empty($quotation_option['WPSHOP_ADDONS_QUOTATION']['activate'])) {
@@ -165,11 +165,11 @@ 
 		 * Define the field allowing to define the invoice footer
 		 */
 		public function wpshop_billing_invoice_footer_area() {
-			$wpshop_billing_invoice_footer_area = get_option( 'wpshop_billing_invoice_footer_area' );
+			$wpshop_billing_invoice_footer_area = get_option('wpshop_billing_invoice_footer_area');
 			$wp_editor_args = array(
 				'media_buttons' => false,
 			);
-			wp_editor( $wpshop_billing_invoice_footer_area, 'wpshop_billing_invoice_footer_area', $wp_editor_args );
+			wp_editor($wpshop_billing_invoice_footer_area, 'wpshop_billing_invoice_footer_area', $wp_editor_args);
 		}
 
 				public function wpshop_options_validate_billing_number_figures($input)
@@ -307,7 +307,7 @@ 
 						update_option('wpshop_billing_current_number', $billing_current_number);
 
 						/**		Create the new invoice number with all parameters viewed above		*/
-						$invoice_ref = WPSHOP_BILLING_REFERENCE_PREFIX . ((string) sprintf('%0' . $number_figures . 'd', $billing_current_number));
+						$invoice_ref = WPSHOP_BILLING_REFERENCE_PREFIX . ((string)sprintf('%0' . $number_figures . 'd', $billing_current_number));
 
 						return $invoice_ref;
 				}
@@ -471,7 +471,7 @@ 
 																		$item_title = $item['item_name'];
 																}
 																$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = $item_title;
-																if ( 'free_product' === get_post_status( $item_id ) ) {
+																if ('free_product' === get_post_status($item_id)) {
 																	$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = '<b>' . $sub_tpl_component['INVOICE_ROW_ITEM_NAME'] . '</b><br>' . get_post_field('post_content', $item_id);
 																}
 																/**		Get attribute order for current product		*/
@@ -607,7 +607,7 @@ 
 
 																		unset($sub_tpl_component);
 																		$total_partial_payment += (!empty($received_payment['received_amount'])) ? $received_payment['received_amount'] : 0;
-																} else if ( !empty( $received_payment['status'] ) && 'payment_received' == $received_payment['status'] ) {
+																} else if (!empty($received_payment['status']) && 'payment_received' == $received_payment['status']) {
 																		$last_payment += (!empty($received_payment['received_amount'])) ? $received_payment['received_amount'] : 0;
 																}
 
@@ -992,7 +992,7 @@ 
 				public static function generate_footer_invoice() {
 						$output = '';
 						$emails = get_option('wpshop_emails', array());
-						$wpshop_billing_invoice_footer_area = get_option( 'wpshop_billing_invoice_footer_area' );
+						$wpshop_billing_invoice_footer_area = get_option('wpshop_billing_invoice_footer_area');
 
 						$tpl_component['COMPANY_EMAIL'] = (!empty($emails) && !empty($emails['contact_email'])) ? $emails['contact_email'] : '';
 						$tpl_component['COMPANY_WEBSITE'] = site_url();

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

Spacing +81 added lines, -81 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.
@@ -246,13 +246,13 @@ 
 		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();
@@ -264,11 +264,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_deregister_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_deregister_style('wpshop_main_css');
 	}
 	/**
 	 * Change default url for set_url_scheme(). See pagination & get_views. Impossible to re-use set_url_sheme inner.
@@ -277,7 +277,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'] ) );
@@ -292,23 +292,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(
@@ -320,30 +320,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.
@@ -352,22 +352,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,

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

Spacing +245 added lines, -245 removed lines

@@ -5,14 +5,14 @@ 
  * @package wps-mass-interface3
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
-if ( ! class_exists( 'WP_List_Table' ) ) {
+if (!class_exists('WP_List_Table')) {
 	include_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	exit( 'class-wp-list-table.php not found.' );
+if (!class_exists('WP_List_Table')) {
+	exit('class-wp-list-table.php not found.');
 }
 /**
  *  Custom WP_List_Table to edit attributes from WPShop EAV.
@@ -78,20 +78,20 @@ 
 	 * @method __construct
 	 * @param  array $args New key : exclude_attribute_codes.
 	 */
-	public function __construct( $args ) {
-		if ( isset( $args['exclude_attribute_codes'] ) ) {
+	public function __construct($args) {
+		if (isset($args['exclude_attribute_codes'])) {
 			$this->exclude_attribute_codes = $args['exclude_attribute_codes'];
 		}
 		parent::__construct(
 			array(
 				'plural' => 'posts',
 				'ajax' => true,
-				'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+				'screen' => isset($args['screen']) ? $args['screen'] : null,
 			)
 		);
-		$this->current_view = (int) substr( $this->screen->id, strpos( $this->screen->id, '_att_set_' ) + 9 );
-		$this->entity_id = (int) wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
-		$this->_post_types = array( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION );
+		$this->current_view = (int)substr($this->screen->id, strpos($this->screen->id, '_att_set_') + 9);
+		$this->entity_id = (int)wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+		$this->_post_types = array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION);
 	}
 	/**
 	 * List columns.
@@ -102,15 +102,15 @@ 
 	public function get_columns() {
 		$columns = array(
 			'cb'        => '<input type="checkbox" />',
-			'title'     => __( 'Title' ),
-			'thumbnail' => __( 'Thumbnail' ),
+			'title'     => __('Title'),
+			'thumbnail' => __('Thumbnail'),
 		);
-		foreach ( $this->request_items_columns() as $column => $data_column ) {
-			if ( ! empty( $column ) && ! empty( $data_column ) ) {
-				$columns[ $column ] = $data_column['name'];
+		foreach ($this->request_items_columns() as $column => $data_column) {
+			if (!empty($column) && !empty($data_column)) {
+				$columns[$column] = $data_column['name'];
 			}
 		}
-		$columns['date'] = __( 'Date' );
+		$columns['date'] = __('Date');
 		return $columns;
 	}
 	/**
@@ -121,12 +121,12 @@ 
 	 */
 	protected function get_sortable_columns() {
 		$sortable_columns = array(
-			'title'     => array( 'title', false ),
-			'thumbnail' => array( 'thumbnail', false ),
-			'date' => array( 'p.post_date', false ),
+			'title'     => array('title', false),
+			'thumbnail' => array('thumbnail', false),
+			'date' => array('p.post_date', false),
 		);
-		foreach ( $this->request_items_columns() as $column => $data_column ) {
-			$sortable_columns[ $column ] = array( $data_column['code'], false );
+		foreach ($this->request_items_columns() as $column => $data_column) {
+			$sortable_columns[$column] = array($data_column['code'], false);
 		}
 		return $sortable_columns;
 	}
@@ -138,22 +138,22 @@ 
 	 * @param  string $column_name Current column.
 	 * @return string
 	 */
-	public function column_default( $item, $column_name ) {
-		if ( isset( $this->columns_items[ $column_name ] ) && is_callable( array( $this, "column_data_{$this->columns_items[ $column_name ]['type']}" ) ) ) {
-			$callable_ext = str_replace( '-', '_', $this->columns_items[ $column_name ]['type'] );
-			$callable = array( $this, "column_data_{$callable_ext}" );
-			if ( ! is_callable( $callable ) ) {
-				$callable = array( $this, 'column_data_text' );
+	public function column_default($item, $column_name) {
+		if (isset($this->columns_items[$column_name]) && is_callable(array($this, "column_data_{$this->columns_items[$column_name]['type']}"))) {
+			$callable_ext = str_replace('-', '_', $this->columns_items[$column_name]['type']);
+			$callable = array($this, "column_data_{$callable_ext}");
+			if (!is_callable($callable)) {
+				$callable = array($this, 'column_data_text');
 			}
 			return call_user_func(
 				$callable,
-				(int) $this->columns_items[ $column_name ]['id'],
-				$this->columns_items[ $column_name ]['code'],
-				$this->columns_items[ $column_name ]['data'],
+				(int)$this->columns_items[$column_name]['id'],
+				$this->columns_items[$column_name]['code'],
+				$this->columns_items[$column_name]['data'],
 				$item
 			);
 		}
-		return print_r( $item[ $column_name ], true );
+		return print_r($item[$column_name], true);
 	}
 	/**
 	 * Column content for checkbox.
@@ -162,7 +162,7 @@ 
 	 * @param  array $item Result of sql query.
 	 * @return string
 	 */
-	public function column_cb( $item ) {
+	public function column_cb($item) {
 		return sprintf(
 			'<input type="checkbox" name="cb[]" value="%d" />',
 			$item['ID']
@@ -175,52 +175,52 @@ 
 	 * @param  array $item Result of sql query.
 	 * @return string
 	 */
-	public function column_thumbnail( $item ) {
+	public function column_thumbnail($item) {
 		$thumbnail_id = '';
-		$link_content = get_the_post_thumbnail( $item['ID'], array( 25, 25 ) );
-		if ( ! empty( $link_content ) ) {
+		$link_content = get_the_post_thumbnail($item['ID'], array(25, 25));
+		if (!empty($link_content)) {
 			$link_content = "<span class=\"img\">{$link_content}</span>";
-			$thumbnail_id = get_post_thumbnail_id( $item['ID'] );
+			$thumbnail_id = get_post_thumbnail_id($item['ID']);
 		}
-		$popup_title = __( 'Choose Image' );
+		$popup_title = __('Choose Image');
 		return sprintf(
 			'<input type="hidden" name="row_%1$s[thumbnail]" value="%2$s"><a href="#thumbnail" data-media-title="%3$s">%4$s<span class="text">%3$s</span></a>',
 			$item['ID'],
 			$thumbnail_id,
-			__( 'Choose Image' ),
+			__('Choose Image'),
 			$link_content
 		);
 	}
-	public function column_date( $item ) {
+	public function column_date($item) {
 		global $mode;
 
-		if ( '0000-00-00 00:00:00' === $item['pdate'] ) {
-			$t_time = $h_time = __( 'Unpublished' );
+		if ('0000-00-00 00:00:00' === $item['pdate']) {
+			$t_time = $h_time = __('Unpublished');
 			$time_diff = 0;
 		} else {
-			$t_time = get_the_time( __( 'Y/m/d g:i:s a' ) );
+			$t_time = get_the_time(__('Y/m/d g:i:s a'));
 			$m_time = $item['pdate'];
-			$time = get_post_time( 'G', true, $item['ID'] );
+			$time = get_post_time('G', true, $item['ID']);
 
 			$time_diff = time() - $time;
 
-			if ( $time_diff > 0 && $time_diff < DAY_IN_SECONDS ) {
-				$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
+			if ($time_diff > 0 && $time_diff < DAY_IN_SECONDS) {
+				$h_time = sprintf(__('%s ago'), human_time_diff($time));
 			} else {
-				$h_time = mysql2date( __( 'Y/m/d' ), $m_time );
+				$h_time = mysql2date(__('Y/m/d'), $m_time);
 			}
 		}
 
-		if ( 'publish' === $item['status'] ) {
-			_e( 'Published' );
-		} elseif ( 'future' === $item['status'] ) {
-			if ( $time_diff > 0 ) {
-				echo '<strong class="error-message">' . __( 'Missed schedule' ) . '</strong>';
+		if ('publish' === $item['status']) {
+			_e('Published');
+		} elseif ('future' === $item['status']) {
+			if ($time_diff > 0) {
+				echo '<strong class="error-message">' . __('Missed schedule') . '</strong>';
 			} else {
-				_e( 'Scheduled' );
+				_e('Scheduled');
 			}
 		} else {
-			_e( 'Last Modified' );
+			_e('Last Modified');
 		}
 		echo '<br />';
 		echo '<abbr title="' . $t_time . '">' . $h_time . '</abbr>';
@@ -232,39 +232,39 @@ 
 	 * @param  array $item Result of sql query.
 	 * @return string
 	 */
-	public function column_title( $item ) {
-		if ( 'private' === $item['status'] ) {
-			$post_states['private'] = __( 'Private' );
+	public function column_title($item) {
+		if ('private' === $item['status']) {
+			$post_states['private'] = __('Private');
 		}
-		if ( 'draft' === $item['status'] ) {
-			$post_states['draft'] = __( 'Draft' );
+		if ('draft' === $item['status']) {
+			$post_states['draft'] = __('Draft');
 		}
-		if ( 'pending' === $item['status'] ) {
-			$post_states['pending'] = _x( 'Pending', 'post status' );
+		if ('pending' === $item['status']) {
+			$post_states['pending'] = _x('Pending', 'post status');
 		}
-		if ( 'future' === $item['status'] ) {
-			$post_states['scheduled'] = __( 'Scheduled' );
+		if ('future' === $item['status']) {
+			$post_states['scheduled'] = __('Scheduled');
 		}
-		if ( current_user_can( 'edit_post', $item['ID'] ) && 'trash' !== $item['status'] ) {
+		if (current_user_can('edit_post', $item['ID']) && 'trash' !== $item['status']) {
 			$result = sprintf(
 				'<a class="row-title" href="%s" aria-label="%s">%s</a>',
-				get_edit_post_link( $item['ID'] ),
+				get_edit_post_link($item['ID']),
 				// translators: WordPress translate.
-				esc_attr( sprintf( __( '&#8220;%s&#8221; (Edit)' ), $item['title'] ) ),
+				esc_attr(sprintf(__('&#8220;%s&#8221; (Edit)'), $item['title'])),
 				$item['title']
 			);
 		} else {
 			$result = $item['title'];
 		}
-		if ( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION === $item['type'] ) {
-			$attr_def = get_post_meta( $item['ID'], '_wpshop_variations_attribute_def', true );
+		if (WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION === $item['type']) {
+			$attr_def = get_post_meta($item['ID'], '_wpshop_variations_attribute_def', true);
 			$columns_items = $this->request_items_columns();
 			$first_variation = true;
-			$parent = $this->items[ $item['parent'] ];
-			foreach ( $attr_def as $key => $value ) {
-				foreach ( $this->get_select_items_option( $columns_items[ $key ]['id'] ) as $all_value ) {
-					if ( $all_value['id'] === $value ) {
-						if ( $first_variation ) {
+			$parent = $this->items[$item['parent']];
+			foreach ($attr_def as $key => $value) {
+				foreach ($this->get_select_items_option($columns_items[$key]['id']) as $all_value) {
+					if ($all_value['id'] === $value) {
+						if ($first_variation) {
 							$result = $parent['title'] . ' : ';
 							$first_variation = false;
 						} else {
@@ -276,19 +276,19 @@ 
 				}
 			}
 		}
-		if ( ! empty( $post_states ) ) {
-			$state_count = count( $post_states );
+		if (!empty($post_states)) {
+			$state_count = count($post_states);
 			$i = 0;
 			$result .= ' &mdash; ';
-			foreach ( $post_states as $state ) {
+			foreach ($post_states as $state) {
 				++$i;
-				( $i === $state_count ) ? $sep = '' : $sep = ', ';
+				($i === $state_count) ? $sep = '' : $sep = ', ';
 				$result .= "<span class='post-state'>$state$sep</span>";
 			}
 		}
 		return sprintf(
 			'<strong>%s</strong>',
-			isset( $item['lvl'] ) ? $item['lvl'] . $result : $result
+			isset($item['lvl']) ? $item['lvl'] . $result : $result
 		);
 	}
 	/**
@@ -301,7 +301,7 @@ 
 	 * @param  array  $item           Result of sql query.
 	 * @return string
 	 */
-	public function column_data_default( $attribute_id, $attribute_code, $attribute_data, $item ) {
+	public function column_data_default($attribute_id, $attribute_code, $attribute_data, $item) {
 		return 'default';
 	}
 	/**
@@ -314,13 +314,13 @@ 
 	 * @param  array  $item           Result of sql query.
 	 * @return string
 	 */
-	public function column_data_text( $attribute_id, $attribute_code, $attribute_data, $item ) {
+	public function column_data_text($attribute_id, $attribute_code, $attribute_data, $item) {
 		$unit = '';
-		if ( is_array( $item[ $attribute_code ] ) ) {
-			$unit = ' ' . $item[ $attribute_code ]['unit'];
-			$value = $item[ $attribute_code ]['value'];
+		if (is_array($item[$attribute_code])) {
+			$unit = ' ' . $item[$attribute_code]['unit'];
+			$value = $item[$attribute_code]['value'];
 		} else {
-			$value = $item[ $attribute_code ];
+			$value = $item[$attribute_code];
 		}
 		return sprintf(
 			'<input type="text" name="row_%2$s[wpshop_product_attribute][%3$s][%1$s]" value="%4$s">',
@@ -341,34 +341,34 @@ 
 	 * @param  array  $item           Result of sql query.
 	 * @return string
 	 */
-	public function column_data_select( $attribute_id, $attribute_code, $attribute_data, $item ) {
+	public function column_data_select($attribute_id, $attribute_code, $attribute_data, $item) {
 		$unit = '';
-		if ( is_array( $item[ $attribute_code ] ) && isset( $item[ $attribute_code ]['unit'] ) ) {
-			$unit = ' ' . $item[ $attribute_code ]['unit'];
-			$value = $item[ $attribute_code ]['value'];
+		if (is_array($item[$attribute_code]) && isset($item[$attribute_code]['unit'])) {
+			$unit = ' ' . $item[$attribute_code]['unit'];
+			$value = $item[$attribute_code]['value'];
 		} else {
-			$value = $item[ $attribute_code ];
+			$value = $item[$attribute_code];
 		}
 		$has_selected = false;
 		$select_items = array();
-		foreach ( $this->get_select_items_option( $attribute_id ) as $option_item ) {
-			if ( is_array( $value ) ) {
-				foreach ( $value as $val ) {
-					$selected = selected( $val, $option_item['id'], false );
-					if ( ! empty( $selected ) ) {
+		foreach ($this->get_select_items_option($attribute_id) as $option_item) {
+			if (is_array($value)) {
+				foreach ($value as $val) {
+					$selected = selected($val, $option_item['id'], false);
+					if (!empty($selected)) {
 						break;
 					}
 				}
 			} else {
-				$selected = selected( $value, $option_item['id'], false );
+				$selected = selected($value, $option_item['id'], false);
 			}
-			$has_selected = empty( $selected ) ? $has_selected : true;
+			$has_selected = empty($selected) ? $has_selected : true;
 			$select_items[] = "<option value=\"{$option_item['id']}\"{$selected}>{$option_item['label']}</option>";
 		}
-		if ( ! $has_selected ) {
-			array_unshift( $select_items, '<option selected disabled>' . __( 'None' ) . '</option>' );
+		if (!$has_selected) {
+			array_unshift($select_items, '<option selected disabled>' . __('None') . '</option>');
 		}
-		$select_items = implode( '', $select_items );
+		$select_items = implode('', $select_items);
 		return sprintf(
 			'<select name="row_%2$s[wpshop_product_attribute][%3$s][%1$s]">%4$s</select>',
 			$attribute_code,
@@ -388,13 +388,13 @@ 
 	 * @param  array  $item           Result of sql query.
 	 * @return string
 	 */
-	public function column_data_textarea( $attribute_id, $attribute_code, $attribute_data, $item ) {
+	public function column_data_textarea($attribute_id, $attribute_code, $attribute_data, $item) {
 		$unit = '';
-		if ( is_array( $item[ $attribute_code ] ) ) {
-			$unit = ' ' . $item[ $attribute_code ]['unit'];
-			$value = $item[ $attribute_code ]['value'];
+		if (is_array($item[$attribute_code])) {
+			$unit = ' ' . $item[$attribute_code]['unit'];
+			$value = $item[$attribute_code]['value'];
 		} else {
-			$value = $item[ $attribute_code ];
+			$value = $item[$attribute_code];
 		}
 		return sprintf(
 			'<textarea name="row_%2$s[wpshop_product_attribute][%3$s][%1$s]">%4$s</textarea>',
@@ -415,29 +415,29 @@ 
 	 * @param  array  $item           Result of sql query.
 	 * @return string
 	 */
-	public function column_data_multiple_select( $attribute_id, $attribute_code, $attribute_data, $item ) {
+	public function column_data_multiple_select($attribute_id, $attribute_code, $attribute_data, $item) {
 		$unit = '';
-		if ( is_array( $item[ $attribute_code ] ) && isset( $item[ $attribute_code ]['unit'] ) ) {
-			$unit = ' ' . $item[ $attribute_code ]['unit'];
-			$value = $item[ $attribute_code ]['value'];
+		if (is_array($item[$attribute_code]) && isset($item[$attribute_code]['unit'])) {
+			$unit = ' ' . $item[$attribute_code]['unit'];
+			$value = $item[$attribute_code]['value'];
 		} else {
-			$value = $item[ $attribute_code ];
+			$value = $item[$attribute_code];
 		}
 		$select_items = array();
-		foreach ( $this->get_select_items_option( $attribute_id ) as $option_item ) {
-			if ( is_array( $value ) ) {
-				foreach ( $value as $val ) {
-					$selected = selected( $val, $option_item['id'], false );
-					if ( ! empty( $selected ) ) {
+		foreach ($this->get_select_items_option($attribute_id) as $option_item) {
+			if (is_array($value)) {
+				foreach ($value as $val) {
+					$selected = selected($val, $option_item['id'], false);
+					if (!empty($selected)) {
 						break;
 					}
 				}
 			} else {
-				$selected = selected( $value, $option_item['id'], false );
+				$selected = selected($value, $option_item['id'], false);
 			}
 			$select_items[] = "<option value=\"{$option_item['id']}\"{$selected}>{$option_item['label']}</option>";
 		}
-		$select_items = implode( '', $select_items );
+		$select_items = implode('', $select_items);
 		return sprintf(
 			'<select class="chosen-select" multiple data-placeholder="%6$s" name="row_%2$s[wpshop_product_attribute][%3$s][%1$s][]">%4$s</select>',
 			$attribute_code,
@@ -455,9 +455,9 @@ 
 	 * @param  Mixed $id_post Null = all / Int = single.
 	 * @return array Return all values with ARRAY_A.
 	 */
-	public function request( $id_post = null ) {
+	public function request($id_post = null) {
 		global $wpdb;
-		$per_page = $this->get_items_per_page( $this->screen->get_option( 'per_page', 'option' ) );
+		$per_page = $this->get_items_per_page($this->screen->get_option('per_page', 'option'));
 		$include_states = array(
 			'publish',
 			'future',
@@ -467,17 +467,17 @@ 
 			'trash',
 			'scheduled',
 		);
-		$include_states = implode( "','", $include_states );
-		$post_types = implode( "','", $this->_post_types );
-		$orderby = isset( $_REQUEST['orderby'] ) ? esc_sql( $_REQUEST['orderby'] ) : 'p.post_date'; // WPCS: CSRF ok.
-		$order = isset( $_REQUEST['order'] ) ? esc_sql( strtoupper( $_REQUEST['order'] ) ) : 'DESC'; // WPCS: CSRF ok.
-		$cast = isset( $_REQUEST['cast'] ) ? esc_sql( $_REQUEST['cast'] ) : ''; // WPCS: CSRF ok.
-		$cast = strtoupper( $cast );
-		$s = isset( $_REQUEST['s'] ) ? esc_sql( $_REQUEST['s'] ) : ''; // WPCS: CSRF ok.
-		$exclude_attribute_codes = implode( "','", $this->exclude_attribute_codes );
-		$items_count = $wpdb->prepare( "SELECT FOUND_ROWS() FROM {$wpdb->posts} WHERE 1 = %d", 1 );
+		$include_states = implode("','", $include_states);
+		$post_types = implode("','", $this->_post_types);
+		$orderby = isset($_REQUEST['orderby']) ? esc_sql($_REQUEST['orderby']) : 'p.post_date'; // WPCS: CSRF ok.
+		$order = isset($_REQUEST['order']) ? esc_sql(strtoupper($_REQUEST['order'])) : 'DESC'; // WPCS: CSRF ok.
+		$cast = isset($_REQUEST['cast']) ? esc_sql($_REQUEST['cast']) : ''; // WPCS: CSRF ok.
+		$cast = strtoupper($cast);
+		$s = isset($_REQUEST['s']) ? esc_sql($_REQUEST['s']) : ''; // WPCS: CSRF ok.
+		$exclude_attribute_codes = implode("','", $this->exclude_attribute_codes);
+		$items_count = $wpdb->prepare("SELECT FOUND_ROWS() FROM {$wpdb->posts} WHERE 1 = %d", 1);
 		$true = true;
-		if ( $true ) { // FOUND_ROWS incompatibilities ?
+		if ($true) { // FOUND_ROWS incompatibilities ?
 			$items_count = $wpdb->prepare(
 				"SELECT COUNT(*)
 				FROM {$wpdb->posts} p
@@ -499,7 +499,7 @@ 
 		$wpsdb_values_text = WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT;
 		$wpsdb_values_options = WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS;
 		$extra_select = '';
-		if ( ! in_array( $orderby, apply_filters( 'wps_mass_list_custom_orderby', array( 'title', 'ID', 'thumbnail', 'p.post_date' ) ), true ) ) {
+		if (!in_array($orderby, apply_filters('wps_mass_list_custom_orderby', array('title', 'ID', 'thumbnail', 'p.post_date')), true)) {
 			$extra_select = "SELECT GROUP_CONCAT( IFNULL( val_dec1.value,
 				IFNULL( val_dat1.value,
 					IFNULL( val_tex1.value,
@@ -521,14 +521,14 @@ 
 			LEFT JOIN {$wpsdb_values_options} val_opt1 ON val_opt1.attribute_id = attr1.id AND val_opt1.id = val_int1.value
 			WHERE p1.ID = p.ID";
 			$extra_select = "( {$extra_select} )";
-			if ( ! empty( $cast ) ) {
+			if (!empty($cast)) {
 				$extra_select = "CAST( {$extra_select} AS {$cast} )";
 			}
 			$extra_select = ",
 			{$extra_select} AS {$orderby}";
 		}
-		if ( 'thumbnail' === $orderby ) {
-			$ids = $wpdb->get_col( $wpdb->prepare(
+		if ('thumbnail' === $orderby) {
+			$ids = $wpdb->get_col($wpdb->prepare(
 				"SELECT CAST( pm.post_id AS SIGNED INTEGER ) as col
 				FROM {$wpdb->postmeta} pm
 				JOIN {$wpdb->posts} p ON pm.post_id = p.ID AND p.post_type IN ( '{$post_types}' )
@@ -537,21 +537,21 @@ 
 				ORDER BY pm.meta_value {$order}",
 				'_thumbnail_id',
 				0
-			) );
-			$ids = implode( ', ', $ids );
+			));
+			$ids = implode(', ', $ids);
 			$orderby = "FIELD( p.ID, {$ids} )";
 		}
-		$orderby = apply_filters( 'wps_mass_list_custom_orderby_query', $orderby );
+		$orderby = apply_filters('wps_mass_list_custom_orderby_query', $orderby);
 		$extra = "GROUP BY p.ID
 		ORDER BY {$orderby} {$order}
 		LIMIT %d, %d";
-		if ( ! is_null( $id_post ) ) {
-			$id_post = intval( $id_post );
+		if (!is_null($id_post)) {
+			$id_post = intval($id_post);
 			$extra = "AND p.ID = {$id_post}";
 			$s = '';
 		}
 		$wpdb->query(
-			$wpdb->prepare( 'SET SESSION group_concat_max_len = %d', 1000000 )
+			$wpdb->prepare('SET SESSION group_concat_max_len = %d', 1000000)
 		);
 		$datas = $wpdb->get_results(
 			$wpdb->prepare(
@@ -606,23 +606,23 @@ 
 				$this->request_current_view(),
 				$this->entity_id,
 				'%' . $s . '%',
-				( $this->get_pagenum() -1 ) * $per_page,
+				($this->get_pagenum() - 1) * $per_page,
 				$per_page
 			),
 			ARRAY_A
 		);
-		if ( ! is_array( $datas ) ) {
+		if (!is_array($datas)) {
 			$datas = array();
 		}
-		if ( ! isset( $this->_pagination_args['total_items'] ) && ! isset( $this->_pagination_args['per_page'] ) ) {
+		if (!isset($this->_pagination_args['total_items']) && !isset($this->_pagination_args['per_page'])) {
 			$this->set_pagination_args(
 				array(
-					'total_items' => (int) $wpdb->get_var( $items_count ),
-					'per_page' => $this->get_items_per_page( $this->screen->get_option( 'per_page', 'option' ) ),
+					'total_items' => (int)$wpdb->get_var($items_count),
+					'per_page' => $this->get_items_per_page($this->screen->get_option('per_page', 'option')),
 				)
 			);
 		}
-		return array_map( array( $this, 'data_reorganize' ), $datas );
+		return array_map(array($this, 'data_reorganize'), $datas);
 	}
 	/**
 	 * Main function to call before display WP_List_Table. See parent class.
@@ -631,8 +631,8 @@ 
 	 * @return void Same results as request() but id as key.
 	 */
 	public function prepare_items() {
-		foreach ( $this->request() as $item ) {
-			$this->items[ $item['ID'] ] = $item;
+		foreach ($this->request() as $item) {
+			$this->items[$item['ID']] = $item;
 		}
 	}
 	/**
@@ -642,20 +642,20 @@ 
 	 * @param  string $column_key Current column.
 	 * @return string
 	 */
-	public function cast_column( $column_key ) {
+	public function cast_column($column_key) {
 		$columns_items = $this->request_items_columns();
-		if ( isset( $columns_items[ $column_key ] ) ) {
-			$cast = $columns_items[ $column_key ]['data'];
-			if ( in_array( $cast, array( 'varchar', 'text' ), true ) ) {
+		if (isset($columns_items[$column_key])) {
+			$cast = $columns_items[$column_key]['data'];
+			if (in_array($cast, array('varchar', 'text'), true)) {
 				$cast = 'char';
 			}
-			if ( 'tx_tva' === $column_key ) {
+			if ('tx_tva' === $column_key) {
 				return 'decimal';
 			}
-			if ( 'integer' === $cast && 'select' === $columns_items[ $column_key ]['type'] ) {
+			if ('integer' === $cast && 'select' === $columns_items[$column_key]['type']) {
 				return null;
 			}
-			if ( 'integer' === $cast && 'multiple-select' === $columns_items[ $column_key ]['type'] ) {
+			if ('integer' === $cast && 'multiple-select' === $columns_items[$column_key]['type']) {
 				return null;
 			}
 			return $cast;
@@ -669,12 +669,12 @@ 
 	 * @param  array $item Result of sql query.
 	 * @return array Item reorganized.
 	 */
-	public function data_reorganize( $item ) {
-		$values = explode( ';', $item['data'] );
-		foreach ( $values as $value ) {
-			$value = explode( ':', $value );
-			if ( ! isset( $this->columns_items[ $value[1] ] ) ) {
-				$this->columns_items[ $value[1] ] = array(
+	public function data_reorganize($item) {
+		$values = explode(';', $item['data']);
+		foreach ($values as $value) {
+			$value = explode(':', $value);
+			if (!isset($this->columns_items[$value[1]])) {
+				$this->columns_items[$value[1]] = array(
 					'id' => $value[0],
 					'code' => $value[1],
 					'name' => $value[2],
@@ -682,32 +682,32 @@ 
 					'data' => $value[7],
 				);
 			}
-			if ( 'yes' === $value[4] ) {
-				if ( isset( $item[ $value[1] ]['value'] ) ) {
-					if ( is_array( $item[ $value[1] ]['value'] ) ) {
-						$item[ $value[1] ]['value'][] = $value[3];
+			if ('yes' === $value[4]) {
+				if (isset($item[$value[1]]['value'])) {
+					if (is_array($item[$value[1]]['value'])) {
+						$item[$value[1]]['value'][] = $value[3];
 					} else {
-						$item[ $value[1] ]['value'] = array( $item[ $value[1] ]['value'], $value[3] );
+						$item[$value[1]]['value'] = array($item[$value[1]]['value'], $value[3]);
 					}
 				} else {
-					$item[ $value[1] ] = array(
+					$item[$value[1]] = array(
 						'value' => $value[3],
 						'unit' => $value[5],
 					);
 				}
 			} else {
-				if ( isset( $item[ $value[1] ] ) ) {
-					if ( is_array( $item[ $value[1] ] ) ) {
-						$item[ $value[1] ][] = $value[3];
-					} elseif ( $item[ $value[1] ] !== $value[3] ) {
-						$item[ $value[1] ] = array( $item[ $value[1] ], $value[3] );
+				if (isset($item[$value[1]])) {
+					if (is_array($item[$value[1]])) {
+						$item[$value[1]][] = $value[3];
+					} elseif ($item[$value[1]] !== $value[3]) {
+						$item[$value[1]] = array($item[$value[1]], $value[3]);
 					}
 				} else {
-					$item[ $value[1] ] = $value[3];
+					$item[$value[1]] = $value[3];
 				}
 			}
 		}// End foreach().
-		unset( $item['data'] );
+		unset($item['data']);
 		return $item;
 	}
 	/**
@@ -717,11 +717,11 @@ 
 	 * @param  int $attribute_id Attribute ID.
 	 * @return array
 	 */
-	public function get_select_items_option( $attribute_id ) {
-		if ( ! isset( self::$wpsdb_values_options[ $attribute_id ] ) ) {
+	public function get_select_items_option($attribute_id) {
+		if (!isset(self::$wpsdb_values_options[$attribute_id])) {
 			global $wpdb;
 			$wpsdb_values_options = WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS;
-			self::$wpsdb_values_options[ $attribute_id ] = $wpdb->get_results(
+			self::$wpsdb_values_options[$attribute_id] = $wpdb->get_results(
 				$wpdb->prepare(
 					"SELECT *
 					FROM {$wpsdb_values_options}
@@ -732,7 +732,7 @@ 
 				ARRAY_A
 			);
 		}
-		return self::$wpsdb_values_options[ $attribute_id ];
+		return self::$wpsdb_values_options[$attribute_id];
 	}
 	/**
 	 * Get all views available.
@@ -742,7 +742,7 @@ 
 	 */
 	public function request_views() {
 		global $wpdb;
-		if ( is_null( $this->_views ) ) {
+		if (is_null($this->_views)) {
 			$wpsdb_sets = WPSHOP_DBT_ATTRIBUTE_SET;
 			$include_states = array(
 				'publish',
@@ -753,8 +753,8 @@ 
 				'trash',
 				'scheduled',
 			);
-			$include_states = implode( "','", $include_states );
-			$post_types = implode( "','", $this->_post_types );
+			$include_states = implode("','", $include_states);
+			$post_types = implode("','", $this->_post_types);
 			$this->_views = $wpdb->get_results(
 				$wpdb->prepare(
 					"SELECT s.id, name, slug, default_set, COUNT(p.ID) AS count
@@ -780,9 +780,9 @@ 
 	 * @return [type]               [description]
 	 */
 	public function request_current_view() {
-		if ( is_null( $this->current_view ) ) {
-			foreach ( $this->request_views() as $view ) {
-				if ( filter_var( $view['default_set'], FILTER_VALIDATE_BOOLEAN ) ) {
+		if (is_null($this->current_view)) {
+			foreach ($this->request_views() as $view) {
+				if (filter_var($view['default_set'], FILTER_VALIDATE_BOOLEAN)) {
 					$this->current_view = $view['id'];
 				}
 			}
@@ -796,12 +796,12 @@ 
 	 * @return array See :754 order columns.
 	 */
 	public function request_items_columns() {
-		if ( empty( $this->columns_items ) ) {
+		if (empty($this->columns_items)) {
 			global $wpdb;
 			$wpsdb_attribute = WPSHOP_DBT_ATTRIBUTE;
 			$wpsdb_attribute_set = WPSHOP_DBT_ATTRIBUTE_DETAILS;
-			$exclude_attribute_codes = implode( "','", $this->exclude_attribute_codes );
-			foreach ( $wpdb->get_results(
+			$exclude_attribute_codes = implode("','", $this->exclude_attribute_codes);
+			foreach ($wpdb->get_results(
 				$wpdb->prepare(
 					"SELECT attr.id, attr.code, attr.frontend_label AS name, attr.backend_input AS type, attr.data_type AS data
 					FROM {$wpsdb_attribute} attr
@@ -815,11 +815,11 @@ 
 					$this->entity_id
 				),
 				ARRAY_A
-			) as $column ) {
-				$this->columns_items[ $column['code'] ] = $column;
+			) as $column) {
+				$this->columns_items[$column['code']] = $column;
 			}
 		}
-		ksort( $this->columns_items );
+		ksort($this->columns_items);
 		return $this->columns_items;
 	}
 	/**
@@ -830,30 +830,30 @@ 
 	 */
 	public function get_views() {
 		$result = array();
-		foreach ( $this->request_views() as $view ) {
+		foreach ($this->request_views() as $view) {
 			$class = '';
-			if ( (int) $view['id'] === (int) $this->request_current_view() ) {
+			if ((int)$view['id'] === (int)$this->request_current_view()) {
 				$class = ' class="current"';
 			}
-			$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+			$current_url = set_url_scheme('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
 			$link = add_query_arg(
 				array(
 					'page' =>
 					str_replace(
 						"{$this->screen->post_type}_page_",
 						'',
-						substr( $this->screen->id, 0, strpos( $this->screen->id, '_att_set_' ) ) . '_att_set_' . $view['id']
+						substr($this->screen->id, 0, strpos($this->screen->id, '_att_set_')) . '_att_set_' . $view['id']
 					),
 				),
 				$current_url
 			);
-			$link = remove_query_arg( 'paged', $link );
-			$result[ $view['id'] ] = sprintf(
+			$link = remove_query_arg('paged', $link);
+			$result[$view['id']] = sprintf(
 				'<a href="%s"%s>%s <span class="count">(%s)</span></a>',
-				esc_url( $link ),
+				esc_url($link),
 				$class,
 				$view['name'],
-				number_format_i18n( $view['count'] )
+				number_format_i18n($view['count'])
 			);
 		}
 		return $result;
@@ -865,10 +865,10 @@ 
 	 * @param  string $which Can be top or bottom.
 	 * @return void Direct display.
 	 */
-	public function bulk_actions( $which = '' ) {
-		submit_button( __( 'Save changes', 'wpshop' ), 'bulk-save', 'bulk-save', false, array(
-			'data-nonce' => wp_create_nonce( 'bulk-save-mass-edit-interface-3' ),
-		) );
+	public function bulk_actions($which = '') {
+		submit_button(__('Save changes', 'wpshop'), 'bulk-save', 'bulk-save', false, array(
+			'data-nonce' => wp_create_nonce('bulk-save-mass-edit-interface-3'),
+		));
 		?><span class="spinner"></span><?php
 	}
 	/**
@@ -882,34 +882,34 @@ 
 	 * @param  array $rows    List of rows always traited.
 	 * @return void
 	 */
-	private function _display_row( &$lvl, $item_id, $item, &$rows ) {
-		if ( array_key_exists( $item_id, $rows ) ) {
+	private function _display_row(&$lvl, $item_id, $item, &$rows) {
+		if (array_key_exists($item_id, $rows)) {
 			return;
 		}
-		if ( ! array_key_exists( $item['parent'], $this->items ) && 0 !== (int) $item['parent'] ) {
-			$parent_item = $this->request( $item['parent'] );
-			if ( isset( $parent_item[0] ) ) {
-				$this->items[ $item['parent'] ] = $parent_item[0];
+		if (!array_key_exists($item['parent'], $this->items) && 0 !== (int)$item['parent']) {
+			$parent_item = $this->request($item['parent']);
+			if (isset($parent_item[0])) {
+				$this->items[$item['parent']] = $parent_item[0];
 			} else {
-				$this->items[ $item['parent'] ] = null;
+				$this->items[$item['parent']] = null;
 			}
 		}
-		if ( array_key_exists( $item['parent'], $rows ) ) {
-			$offset = array_search( $item['parent'], array_keys( $rows ), true );
-			$rows_a = array_slice( $rows, $offset, null, true );
-			$rows_a[ $item_id ] = $item;
-			$rows_b = array_slice( $rows, 0, $offset, true );
-			$rows = array_replace( $rows_a, $rows_b );
+		if (array_key_exists($item['parent'], $rows)) {
+			$offset = array_search($item['parent'], array_keys($rows), true);
+			$rows_a = array_slice($rows, $offset, null, true);
+			$rows_a[$item_id] = $item;
+			$rows_b = array_slice($rows, 0, $offset, true);
+			$rows = array_replace($rows_a, $rows_b);
 			// $rows = $rows_a + $rows_b; FASTER ?
 			$lvl++;
-		} elseif ( 0 !== (int) $item['parent'] ) {
-			$this->_display_row( $lvl, $item['parent'], $this->items[ $item['parent'] ], $rows );
+		} elseif (0 !== (int)$item['parent']) {
+			$this->_display_row($lvl, $item['parent'], $this->items[$item['parent']], $rows);
 			$lvl++;
 		}
-		if ( ! empty( $item ) ) {
-			$item['lvl'] = str_repeat( '&#8212; ', $lvl );
+		if (!empty($item)) {
+			$item['lvl'] = str_repeat('&#8212; ', $lvl);
 		}
-		$rows[ $item_id ] = $item;
+		$rows[$item_id] = $item;
 	}
 	/**
 	 * See WP_List_Table.
@@ -919,13 +919,13 @@ 
 	 */
 	public function display_rows() {
 		$rows = array();
-		foreach ( $this->items as $item_id => $item ) {
+		foreach ($this->items as $item_id => $item) {
 			$lvl = 0;
-			$this->_display_row( $lvl, $item_id, $item, $rows );
+			$this->_display_row($lvl, $item_id, $item, $rows);
 		}
-		foreach ( $rows as $item ) {
-			if ( ! empty( $item ) ) {
-				$this->single_row( $item );
+		foreach ($rows as $item) {
+			if (!empty($item)) {
+				$this->single_row($item);
 			}
 		}
 	}
@@ -946,52 +946,52 @@ 
 	 * @param  boolean $with_id See wp_list_table::print_column_headers.
 	 * @return void Direct display.
 	 */
-	public function print_column_headers( $with_id = true ) {
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+	public function print_column_headers($with_id = true) {
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
-		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
-		$current_url = remove_query_arg( 'paged', $current_url );
+		$current_url = set_url_scheme('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+		$current_url = remove_query_arg('paged', $current_url);
 
-		if ( isset( $_GET['orderby'] ) ) { // WPCS: CSRF ok.
+		if (isset($_GET['orderby'])) { // WPCS: CSRF ok.
 			$current_orderby = $_GET['orderby']; // WPCS: CSRF ok.
 		} else {
 			$current_orderby = '';
 		}
 
-		if ( isset( $_GET['order'] ) && 'desc' === $_GET['order'] ) { // WPCS: CSRF ok.
+		if (isset($_GET['order']) && 'desc' === $_GET['order']) { // WPCS: CSRF ok.
 			$current_order = 'desc';
 		} else {
 			$current_order = 'asc';
 		}
 
-		if ( ! empty( $columns['cb'] ) ) {
+		if (!empty($columns['cb'])) {
 			static $cb_counter = 1;
-			$columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' ) . '</label>'
+			$columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __('Select All') . '</label>'
 			 . '<input id="cb-select-all-' . $cb_counter . '" type="checkbox" />';
 			$cb_counter++;
 		}
 
-		foreach ( $columns as $column_key => $column_display_name ) {
-			$class = array( 'manage-column', "column-$column_key" );
+		foreach ($columns as $column_key => $column_display_name) {
+			$class = array('manage-column', "column-$column_key");
 
-			if ( in_array( $column_key, $hidden, true ) ) {
+			if (in_array($column_key, $hidden, true)) {
 				$class[] = 'hidden';
 			}
 
-			if ( 'cb' === $column_key ) {
+			if ('cb' === $column_key) {
 				$class[] = 'check-column';
-			} elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ), true ) ) {
+			} elseif (in_array($column_key, array('posts', 'comments', 'links'), true)) {
 				$class[] = 'num';
 			}
 
-			if ( $column_key === $primary ) {
+			if ($column_key === $primary) {
 				$class[] = 'column-primary';
 			}
 
-			if ( isset( $sortable[ $column_key ] ) ) {
-				list( $orderby, $desc_first ) = $sortable[ $column_key ];
+			if (isset($sortable[$column_key])) {
+				list($orderby, $desc_first) = $sortable[$column_key];
 
-				if ( $current_orderby === $orderby ) {
+				if ($current_orderby === $orderby) {
 					$order = 'asc' === $current_order ? 'desc' : 'asc';
 					$class[] = 'sorted';
 					$class[] = $current_order;
@@ -1001,17 +1001,17 @@ 
 					$class[] = $desc_first ? 'asc' : 'desc';
 				}
 
-				$cast = $this->cast_column( $column_key );
+				$cast = $this->cast_column($column_key);
 
-				$column_display_name = '<a href="' . esc_url( add_query_arg( compact( 'orderby', 'order', 'cast' ), $current_url ) ) . '"><span>' . $column_display_name . '</span><span class="sorting-indicator"></span></a>';
+				$column_display_name = '<a href="' . esc_url(add_query_arg(compact('orderby', 'order', 'cast'), $current_url)) . '"><span>' . $column_display_name . '</span><span class="sorting-indicator"></span></a>';
 			}
 
-			$tag = ( 'cb' === $column_key ) ? 'td' : 'th';
-			$scope = ( 'th' === $tag ) ? 'scope="col"' : '';
+			$tag = ('cb' === $column_key) ? 'td' : 'th';
+			$scope = ('th' === $tag) ? 'scope="col"' : '';
 			$id = $with_id ? "id='$column_key'" : '';
 
-			if ( ! empty( $class ) ) {
-				$class = "class='" . join( ' ', $class ) . "'";
+			if (!empty($class)) {
+				$class = "class='" . join(' ', $class) . "'";
 			}
 
 			echo "<$tag $scope $id $class>$column_display_name</$tag>"; // WPCS: XSS ok.

includes/modules/wps_orders/templates/backend/product-listing/wps_orders_product_listing_table.php

Spacing +35 added lines, -35 removed lines

@@ -1,81 +1,81 @@
-<?php if ( ! defined( 'ABSPATH' ) ) { exit;
+<?php if (!defined('ABSPATH')) { exit;
 }
- $order_post_meta = ! empty( $post ) ? get_post_meta( $post->ID, '_wpshop_order_status', true ) : ''; ?>
+ $order_post_meta = !empty($post) ? get_post_meta($post->ID, '_wpshop_order_status', true) : ''; ?>
 <div class="wps-table">
 	<div class="wps-table-header wps-table-row">
-		<div class="wps-table-cell"><?php _e( 'Picture', 'wpshop' ); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Product reference', 'wpshop' ); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Product name', 'wpshop' ); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Price', 'wpshop' ); ?></div>
+		<div class="wps-table-cell"><?php _e('Picture', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Product reference', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Product name', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Price', 'wpshop'); ?></div>
 
-		<?php if ( 'completed' != $order_post_meta ) : ?>
-			<div class="wps-table-cell"><?php _e( 'Quantity', 'wpshop' ); ?></div>
-			<div class="wps-table-cell"><?php _e( 'Add to order', 'wpshop' ); ?></div>
+		<?php if ('completed' != $order_post_meta) : ?>
+			<div class="wps-table-cell"><?php _e('Quantity', 'wpshop'); ?></div>
+			<div class="wps-table-cell"><?php _e('Add to order', 'wpshop'); ?></div>
 		<?php endif; ?>
 	</div>
-	<?php if ( ! empty( $products ) ) :
-		$total_products = count( $products );
+	<?php if (!empty($products)) :
+		$total_products = count($products);
 		$i = 0;
 		$elements_per_page = 20;
-		$paged = absint( isset( $_REQUEST['paged_order'] ) ? $_REQUEST['paged_order'] : 1 );
-		$paginate_links = paginate_links( array(
+		$paged = absint(isset($_REQUEST['paged_order']) ? $_REQUEST['paged_order'] : 1);
+		$paginate_links = paginate_links(array(
 			'base' => '%_%',
 			'format' => '?paged_order=%#%',
 			'current' => $paged,
-			'total' => ceil( $total_products / $elements_per_page ),
+			'total' => ceil($total_products / $elements_per_page),
 			'type' => 'list',
 			'prev_next' => true,
-		) );
-		foreach ( $products as $product ) :
-			if ( ( $elements_per_page * ( $paged - 1 ) ) > $i ) {
+		));
+		foreach ($products as $product) :
+			if (($elements_per_page * ($paged - 1)) > $i) {
 				$i++;
 				continue;
-			} elseif ( ( $elements_per_page * $paged ) <= $i ) {
+			} elseif (($elements_per_page * $paged) <= $i) {
 				break;
 			}
 			$i++;
 			$pid = $product->ID;
 	?>
-	<?php $product_metadata = get_post_meta( $product->ID, '_wpshop_product_metadata', true ); ?>
+	<?php $product_metadata = get_post_meta($product->ID, '_wpshop_product_metadata', true); ?>
 	<div class="wps-table-content wps-table-row">
-		<div class="wps-table-cell  wps-cart-item-img"><?php echo get_the_post_thumbnail( $product->ID, 'thumbnail' ); ?></div>
-		<div class="wps-table-cell"><?php echo ( ! empty( $product_metadata ) && $product_metadata['product_reference']) ? $product_metadata['product_reference'] : ''; ?></div>
+		<div class="wps-table-cell  wps-cart-item-img"><?php echo get_the_post_thumbnail($product->ID, 'thumbnail'); ?></div>
+		<div class="wps-table-cell"><?php echo (!empty($product_metadata) && $product_metadata['product_reference']) ? $product_metadata['product_reference'] : ''; ?></div>
 		<div class="wps-table-cell"><?php echo $product->post_title; ?></div>
 		<div class="wps-table-cell">
 		<?php
-		  $product = wpshop_products::get_product_data( $product->ID );
-		  echo wpshop_prices::get_product_price( $product, 'price_display', array( 'mini_output', 'grid' ) );
+		  $product = wpshop_products::get_product_data($product->ID);
+		  echo wpshop_prices::get_product_price($product, 'price_display', array('mini_output', 'grid'));
 		?>
 		</div>
-		<?php if ( 'completed' != $order_post_meta ) : ?>
+		<?php if ('completed' != $order_post_meta) : ?>
 			<div class="wps-table-cell">
-				<a class="wps-bton-icon-minus-small wps-cart-reduce-product-qty" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_set_qty_for_product_into_cart' ); ?>" href=""></a>
+				<a class="wps-bton-icon-minus-small wps-cart-reduce-product-qty" data-nonce="<?php echo wp_create_nonce('ajax_wpshop_set_qty_for_product_into_cart'); ?>" href=""></a>
 				<input id="wps-cart-product-qty-<?php echo $pid; ?>" class="wps-cart-product-qty" type="text" value="1" name="french-hens" size="3" style="text-align : center">
-				<a class="wps-bton-icon-plus-small wps-cart-add-product-qty" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_set_qty_for_product_into_cart' ); ?>" href=""></a>
+				<a class="wps-bton-icon-plus-small wps-cart-add-product-qty" data-nonce="<?php echo wp_create_nonce('ajax_wpshop_set_qty_for_product_into_cart'); ?>" href=""></a>
 			</div>
 			<div class="wps-table-cell">
-				<a href="#" data-nonce="<?php echo wp_create_nonce( 'wps_add_product_to_order_admin' ); ?>" class="wps-bton-first-mini-rounded wps-order-add-product" id="wps-order-add-product-<?php echo $pid; ?>"><i class="wps-icon-basket"></i> <?php _e( 'Add to order', 'wpshop' ); ?></a>
+				<a href="#" data-nonce="<?php echo wp_create_nonce('wps_add_product_to_order_admin'); ?>" class="wps-bton-first-mini-rounded wps-order-add-product" id="wps-order-add-product-<?php echo $pid; ?>"><i class="wps-icon-basket"></i> <?php _e('Add to order', 'wpshop'); ?></a>
 			</div>
 		<?php endif; ?>
 	 </div>
 		<?php endforeach;
   else :
-		if ( ! empty( $research ) ) : ?>
-		   <div class="wps-alert-info"><?php printf( __( 'No products corresponds to the search <strong>"%s"</strong>', 'wpshop' ), $research ); ?></div>
+		if (!empty($research)) : ?>
+		   <div class="wps-alert-info"><?php printf(__('No products corresponds to the search <strong>"%s"</strong>', 'wpshop'), $research); ?></div>
 		<?php else :
-		   $letter_display = ( strtoupper( $current_letter ) != 'ALL' ) ? $current_letter : __( 'ALL', 'wpshop' ); ?>
-			<div class="wps-alert-info"><?php printf( __( 'No products corresponds to the letter <strong>"%s"</strong> search', 'wpshop' ), strtoupper( $letter_display ) ); ?></div>
+		   $letter_display = (strtoupper($current_letter) != 'ALL') ? $current_letter : __('ALL', 'wpshop'); ?>
+			<div class="wps-alert-info"><?php printf(__('No products corresponds to the letter <strong>"%s"</strong> search', 'wpshop'), strtoupper($letter_display)); ?></div>
 	<?php endif;
 	   endif; ?>
 </div>
 <?php
-if ( ! empty( $products ) && $total_products > $elements_per_page ) :
+if (!empty($products) && $total_products > $elements_per_page) :
 	echo $paginate_links;
 	?>
 	<input type="hidden" name="last_query[oid]" value="<?php echo $post->ID; ?>">
-	<input type="hidden" name="last_query[letter]" value="<?php echo strtoupper( $current_letter ); ?>">
-	<input type="hidden" name="last_query[research]" value="<?php echo isset( $research ) ? $research : ''; ?>">
-	<input type="hidden" name="last_query[_wpnonce]" value="<?php echo wp_create_nonce( 'refresh_product_list_' . strtolower( $current_letter ) ); ?>">
+	<input type="hidden" name="last_query[letter]" value="<?php echo strtoupper($current_letter); ?>">
+	<input type="hidden" name="last_query[research]" value="<?php echo isset($research) ? $research : ''; ?>">
+	<input type="hidden" name="last_query[_wpnonce]" value="<?php echo wp_create_nonce('refresh_product_list_' . strtolower($current_letter)); ?>">
 	<?php
 endif;
 ?>

Braces +10 added lines, -4 removed lines

@@ -59,11 +59,17 @@
 		<?php endif; ?>
 	 </div>
 		<?php endforeach;
-  else :
+  else {
+  	:
 		if ( ! empty( $research ) ) : ?>
-		   <div class="wps-alert-info"><?php printf( __( 'No products corresponds to the search <strong>"%s"</strong>', 'wpshop' ), $research ); ?></div>
-		<?php else :
-		   $letter_display = ( strtoupper( $current_letter ) != 'ALL' ) ? $current_letter : __( 'ALL', 'wpshop' ); ?>
+		   <div class="wps-alert-info"><?php printf( __( 'No products corresponds to the search <strong>"%s"</strong>', 'wpshop' ), $research );
+  }
+  ?></div>
+		<?php else {
+	:
+		   $letter_display = ( strtoupper( $current_letter ) != 'ALL' ) ? $current_letter : __( 'ALL', 'wpshop' );
+}
+?>
 			<div class="wps-alert-info"><?php printf( __( 'No products corresponds to the letter <strong>"%s"</strong> search', 'wpshop' ), strtoupper( $letter_display ) ); ?></div>
 	<?php endif;
 	   endif; ?>

includes/modules/wps-eav-revisions/wps-eav-revisions.php

Spacing +22 added lines, -22 removed lines

@@ -2,25 +2,25 @@ 
 class WPS_EAV_Revisions {
 	public static $created_revisions = array();
 	public function __construct() {
-		add_action( 'save_post', array( $this, 'save_post' ), 100, 2 );
-		add_action( 'wp_restore_post_revision', array( $this, 'wp_restore_post_revision' ), 10, 2 );
-		add_filter( '_wp_post_revision_fields', array( $this, 'wp_post_revision_fields' ), 10, 2 );
+		add_action('save_post', array($this, 'save_post'), 100, 2);
+		add_action('wp_restore_post_revision', array($this, 'wp_restore_post_revision'), 10, 2);
+		add_filter('_wp_post_revision_fields', array($this, 'wp_post_revision_fields'), 10, 2);
 	}
-	public function save_post( $post_id, $post ) {
-		if ( false === wp_is_post_revision( $post_id ) ) {
-			if ( ( ! isset( self::$created_revisions[ $post_id ] ) || true !== self::$created_revisions[ $post_id ] ) && post_type_supports( $post->post_type, 'revisions' ) ) {
-				self::$created_revisions[ wp_is_post_revision( $post_id ) ] = true;
-				add_filter( 'wp_save_post_revision_post_has_changed', array( $this, 'wp_save_post_revision_post_has_changed' ), 10, 3 );
-				wp_save_post_revision( $post_id );
+	public function save_post($post_id, $post) {
+		if (false === wp_is_post_revision($post_id)) {
+			if ((!isset(self::$created_revisions[$post_id]) || true !== self::$created_revisions[$post_id]) && post_type_supports($post->post_type, 'revisions')) {
+				self::$created_revisions[wp_is_post_revision($post_id)] = true;
+				add_filter('wp_save_post_revision_post_has_changed', array($this, 'wp_save_post_revision_post_has_changed'), 10, 3);
+				wp_save_post_revision($post_id);
 			}
 		} else {
-			self::$created_revisions[ wp_is_post_revision( $post_id ) ] = true;
+			self::$created_revisions[wp_is_post_revision($post_id)] = true;
 		}
 	}
-	public function wp_save_post_revision_post_has_changed( $post_has_changed, $last_revision, $post ) {
+	public function wp_save_post_revision_post_has_changed($post_has_changed, $last_revision, $post) {
 		return true;
 	}
-	public function wp_restore_post_revision( $post_id, $revision_id ) {
+	public function wp_restore_post_revision($post_id, $revision_id) {
 		/*
 		$post     = get_post( $post_id );
 		$revision = get_post( $revision_id );
@@ -31,7 +31,7 @@ 
 			update_post_meta( $post_id, 'foo', $meta );
 		}*/
 	}
-	public function wp_post_revision_fields( $fields, $post ) {
+	public function wp_post_revision_fields($fields, $post) {
 		global $wpdb;
 		$wpsdb_attribute = WPSHOP_DBT_ATTRIBUTE;
 		$wpsdb_attribute_set = WPSHOP_DBT_ATTRIBUTE_DETAILS;
@@ -42,7 +42,7 @@ 
 		$wpsdb_values_varchar = WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR;
 		$wpsdb_values_text = WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT;
 		$wpsdb_values_options = WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS;
-		$datas = $wpdb->get_results( $wpdb->prepare(
+		$datas = $wpdb->get_results($wpdb->prepare(
 			"SELECT attr.id,
 			attr.code,
 			attr.frontend_label,
@@ -71,18 +71,18 @@ 
 			WHERE p.ID = %d
 			GROUP BY attr.code",
 			$post['ID']
-		), ARRAY_A );
-		foreach ( $datas as $data ) {
-			$fields[ $data['id'] ] = $data['frontend_label'];
-			add_filter( "_wp_post_revision_field_{$data['id']}", array( $this, 'wp_post_revision_field' ), 10, 4 );
+		), ARRAY_A);
+		foreach ($datas as $data) {
+			$fields[$data['id']] = $data['frontend_label'];
+			add_filter("_wp_post_revision_field_{$data['id']}", array($this, 'wp_post_revision_field'), 10, 4);
 		}
 		return $fields;
 	}
-	public function wp_post_revision_field( $value, $field, $revision, $fromto ) {
+	public function wp_post_revision_field($value, $field, $revision, $fromto) {
 		global $wpdb;
 		$wpsdb_histo = WPSHOP_DBT_ATTRIBUTE_VALUES_HISTO;
 		$wpsdb_values_options = WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS;
-		$result = $wpdb->get_var( $wpdb->prepare(
+		$result = $wpdb->get_var($wpdb->prepare(
 			"SELECT IFNULL( val_opt.label,
 				histo.value
 			)
@@ -95,8 +95,8 @@ 
 			$revision->post_date,
 			$field,
 			$revision->post_parent
-		) );
-		$result = ( '0' === $result ) ? null : $result;
+		));
+		$result = ('0' === $result) ? null : $result;
 		return $result;
 	}
 }

includes/config.php

Spacing +250 added lines, -250 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined( 'ABSPATH' ) ) { exit;
+<?php if (!defined('ABSPATH')) { exit;
 }
 /**
 * Plugin configuration file.
@@ -12,322 +12,322 @@ 
 */
 
 // End if().
-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'));
 }
 
 // End if().
 global $wpdb;
 /*	Define the shop type	*/
-DEFINE( 'WPSHOP_DEFAULT_SHOP_TYPE', 'sale' );
-$wpshop_shop_type = get_option( 'wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE );
-DEFINE( 'WPSHOP_DEFINED_SHOP_TYPE', $wpshop_shop_type );
+DEFINE('WPSHOP_DEFAULT_SHOP_TYPE', 'sale');
+$wpshop_shop_type = get_option('wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE);
+DEFINE('WPSHOP_DEFINED_SHOP_TYPE', $wpshop_shop_type);
 
 /*
   Define the different path for the plugin    */
    /*	Define main plugin directory for our plugin	*/
- DEFINE( 'WPSHOP_DIR', WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR );
-   DEFINE( 'WPSHOP_URL', WP_PLUGIN_URL . '/' . WPSHOP_PLUGIN_DIR );
+ DEFINE('WPSHOP_DIR', WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR);
+   DEFINE('WPSHOP_URL', WP_PLUGIN_URL . '/' . WPSHOP_PLUGIN_DIR);
 
   /*	Define languages directory for our plugin	*/
- DEFINE( 'WPSHOP_LANGUAGES_DIR', WPSHOP_DIR . '/languages/' );
-  DEFINE( 'WPSHOP_LANGUAGES_URL', WPSHOP_URL . '/languages/' );
+ DEFINE('WPSHOP_LANGUAGES_DIR', WPSHOP_DIR . '/languages/');
+  DEFINE('WPSHOP_LANGUAGES_URL', WPSHOP_URL . '/languages/');
 
  /*	Define includes directory for our plugin	*/
- DEFINE( 'WPSHOP_INCLUDES_DIR', WPSHOP_DIR . '/includes/' );
-	DEFINE( 'WPSHOP_INCLUDES_URL', WPSHOP_URL . '/includes/' );
-	DEFINE( 'WPSHOP_MODULES_DIR', WPSHOP_INCLUDES_DIR . 'modules/' );
+ DEFINE('WPSHOP_INCLUDES_DIR', WPSHOP_DIR . '/includes/');
+	DEFINE('WPSHOP_INCLUDES_URL', WPSHOP_URL . '/includes/');
+	DEFINE('WPSHOP_MODULES_DIR', WPSHOP_INCLUDES_DIR . 'modules/');
 	  /*	Define librairies directory for our plugin	*/
-	 DEFINE( 'WPSHOP_LIBRAIRIES_DIR', WPSHOP_INCLUDES_DIR . 'librairies/' );
-		DEFINE( 'WPSHOP_LIBRAIRIES_URL', WPSHOP_INCLUDES_URL . 'librairies/' );
+	 DEFINE('WPSHOP_LIBRAIRIES_DIR', WPSHOP_INCLUDES_DIR . 'librairies/');
+		DEFINE('WPSHOP_LIBRAIRIES_URL', WPSHOP_INCLUDES_URL . 'librairies/');
 
    /*	Define templates directory for our plugin	*/
- DEFINE( 'WPSHOP_TEMPLATES_DIR', WPSHOP_DIR . '/templates/' );
-  DEFINE( 'WPSHOP_TEMPLATES_URL', WPSHOP_URL . '/templates/' );
+ DEFINE('WPSHOP_TEMPLATES_DIR', WPSHOP_DIR . '/templates/');
+  DEFINE('WPSHOP_TEMPLATES_URL', WPSHOP_URL . '/templates/');
 	  /*	Define medias directory for our plugin	*/
-	 DEFINE( 'WPSHOP_MEDIAS_DIR', WPSHOP_TEMPLATES_DIR . 'admin/medias/' );
-	 DEFINE( 'WPSHOP_MEDIAS_URL', WPSHOP_TEMPLATES_URL . 'admin/medias/' );
+	 DEFINE('WPSHOP_MEDIAS_DIR', WPSHOP_TEMPLATES_DIR . 'admin/medias/');
+	 DEFINE('WPSHOP_MEDIAS_URL', WPSHOP_TEMPLATES_URL . 'admin/medias/');
 		 /*	Define plugin icon directory	*/
-		 DEFINE( 'WPSHOP_MEDIAS_ICON_DIR', WPSHOP_MEDIAS_DIR . 'icones/' );
-		 DEFINE( 'WPSHOP_MEDIAS_ICON_URL', WPSHOP_MEDIAS_URL . 'icones/' );
+		 DEFINE('WPSHOP_MEDIAS_ICON_DIR', WPSHOP_MEDIAS_DIR . 'icones/');
+		 DEFINE('WPSHOP_MEDIAS_ICON_URL', WPSHOP_MEDIAS_URL . 'icones/');
 		 /*	Define plugin picture directory	*/
-		 DEFINE( 'WPSHOP_MEDIAS_IMAGES_DIR', WPSHOP_MEDIAS_DIR . 'images/' );
-		   DEFINE( 'WPSHOP_MEDIAS_IMAGES_URL', WPSHOP_MEDIAS_URL . 'images/' );
+		 DEFINE('WPSHOP_MEDIAS_IMAGES_DIR', WPSHOP_MEDIAS_DIR . 'images/');
+		   DEFINE('WPSHOP_MEDIAS_IMAGES_URL', WPSHOP_MEDIAS_URL . 'images/');
 	   /*	Define medias directory for our plugin	*/
-	 DEFINE( 'WPSHOP_JS_DIR', WPSHOP_TEMPLATES_DIR . 'admin/js/' );
-	 DEFINE( 'WPSHOP_JS_URL', WPSHOP_TEMPLATES_URL . 'admin/js/' );
+	 DEFINE('WPSHOP_JS_DIR', WPSHOP_TEMPLATES_DIR . 'admin/js/');
+	 DEFINE('WPSHOP_JS_URL', WPSHOP_TEMPLATES_URL . 'admin/js/');
 	 /*	Define medias directory for our plugin	*/
-	 DEFINE( 'WPSHOP_CSS_DIR', WPSHOP_TEMPLATES_DIR . 'admin/css/' );
-	   DEFINE( 'WPSHOP_CSS_URL', WPSHOP_TEMPLATES_URL . 'admin/css/' );
+	 DEFINE('WPSHOP_CSS_DIR', WPSHOP_TEMPLATES_DIR . 'admin/css/');
+	   DEFINE('WPSHOP_CSS_URL', WPSHOP_TEMPLATES_URL . 'admin/css/');
 /*	Define upload dir	*/
  $wp_upload_dir = wp_upload_dir();
-  DEFINE( 'WPSHOP_UPLOAD_DIR', $wp_upload_dir['basedir'] . '/' );
-	DEFINE( 'WPSHOP_UPLOAD_URL', $wp_upload_dir['baseurl'] . '/' );
-	DEFINE( 'WPSHOP_WP_UPLOAD_DIR', $wp_upload_dir['basedir'] . '/' );
- DEFINE( 'WPSHOP_WP_UPLOAD_URL', $wp_upload_dir['baseurl'] . '/' );
+  DEFINE('WPSHOP_UPLOAD_DIR', $wp_upload_dir['basedir'] . '/');
+	DEFINE('WPSHOP_UPLOAD_URL', $wp_upload_dir['baseurl'] . '/');
+	DEFINE('WPSHOP_WP_UPLOAD_DIR', $wp_upload_dir['basedir'] . '/');
+ DEFINE('WPSHOP_WP_UPLOAD_URL', $wp_upload_dir['baseurl'] . '/');
 
 /*
   Define external ajax file url   */
 // DEFINE('WPSHOP_AJAX_FILE_URL', WPSHOP_INCLUDES_URL . 'ajax.php');
 /*	Define element for new type creation	*/
- DEFINE( 'WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES', 'wpshop_entities' );
- DEFINE( 'WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS', 'wpshop_customers' );
-   DEFINE( 'WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT', 'wpshop_product' );
-   DEFINE( 'WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS', 'wpshop_address' );
-   DEFINE( 'WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION', 'wps_pdt_variations' );
- DEFINE( 'WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS_GROUP', 'wps_customer_group' );
-   DEFINE( 'WPSHOP_IDENTIFIER_PRODUCT', 'P' );
-	DEFINE( 'WPSHOP_NEWTYPE_IDENTIFIER_ORDER', 'wpshop_shop_order' );
-  DEFINE( 'WPSHOP_NEWTYPE_IDENTIFIER_COUPON', 'wpshop_shop_coupon' );
-	DEFINE( 'WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE', 'wpshop_shop_message' );
-  DEFINE( 'WPSHOP_NEWTYPE_IDENTIFIER_GROUP', 'wpshop_shop_group' );
-  DEFINE( 'WPSHOP_NEWTYPE_IDENTIFIER_ADDONS', 'wpshop_shop_addons' );
-	DEFINE( 'WPSHOP_ATTRIBUTE_SET_ID_META_KEY', '_%s_attribute_set_id' );
-  DEFINE( 'WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id' );
-   DEFINE( 'WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY', '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_attribute_set_id' );
-   DEFINE( 'WPSHOP_PRODUCT_ATTRIBUTE_META_KEY', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_metadata' );
-  DEFINE( 'WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES', 'wpshop_product_category' );
-   DEFINE( 'WPSHOP_PRODUCT_RELATED_PRODUCTS', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_related_products' );
-	DEFINE( 'WPSHOP_PRODUCT_PROVIDER', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_provider' );
-	DEFINE( 'WPSHOP_PRODUCT_VIEW_NB', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_view_nb' );
-  DEFINE( 'WPSHOP_PRODUCT_FRONT_DISPLAY_CONF', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attributes_frontend_display' );
-
-  DEFINE( 'WPSHOP_DEFAULT_CUSTOM_TYPES', serialize( array( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS ) ) );
-
-
-	DEFINE( 'WPSHOP_IDENTIFIER_CUSTOMER', 'U' );
-   $cat_options = get_option( 'wpshop_catalog_categories_option' );
-   DEFINE( 'WPSHOP_UNCATEGORIZED_PRODUCT_SLUG', ! empty( $cat_options['wpshop_catalog_no_category_slug'] ) ? $cat_options['wpshop_catalog_no_category_slug'] : 'no-category' );
-   DEFINE( 'WPSHOP_CATALOG_PRODUCT_SLUG', 'catalog' );
-	DEFINE( 'WPSHOP_CATALOG_CATEGORIES_SLUG', 'catalog' );
- DEFINE( 'WPSHOP_CATALOG_PRODUCT_NO_CATEGORY', 'no-categories' );
-   include_once( WPSHOP_LIBRAIRIES_DIR . 'purchase/list_countries.php' );
- DEFINE( 'WPSHOP_COUNTRY_LIST', serialize( $wpshop_tab_countries ) );
-
-
- DEFINE( 'WPSHOP_COMMON_ATTRIBUTES_PARENT_VARIATION_PRODUCT', serialize( array( 'tx_tva' ) ) );
+ DEFINE('WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES', 'wpshop_entities');
+ DEFINE('WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS', 'wpshop_customers');
+   DEFINE('WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT', 'wpshop_product');
+   DEFINE('WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS', 'wpshop_address');
+   DEFINE('WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION', 'wps_pdt_variations');
+ DEFINE('WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS_GROUP', 'wps_customer_group');
+   DEFINE('WPSHOP_IDENTIFIER_PRODUCT', 'P');
+	DEFINE('WPSHOP_NEWTYPE_IDENTIFIER_ORDER', 'wpshop_shop_order');
+  DEFINE('WPSHOP_NEWTYPE_IDENTIFIER_COUPON', 'wpshop_shop_coupon');
+	DEFINE('WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE', 'wpshop_shop_message');
+  DEFINE('WPSHOP_NEWTYPE_IDENTIFIER_GROUP', 'wpshop_shop_group');
+  DEFINE('WPSHOP_NEWTYPE_IDENTIFIER_ADDONS', 'wpshop_shop_addons');
+	DEFINE('WPSHOP_ATTRIBUTE_SET_ID_META_KEY', '_%s_attribute_set_id');
+  DEFINE('WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id');
+   DEFINE('WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY', '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_attribute_set_id');
+   DEFINE('WPSHOP_PRODUCT_ATTRIBUTE_META_KEY', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_metadata');
+  DEFINE('WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES', 'wpshop_product_category');
+   DEFINE('WPSHOP_PRODUCT_RELATED_PRODUCTS', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_related_products');
+	DEFINE('WPSHOP_PRODUCT_PROVIDER', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_provider');
+	DEFINE('WPSHOP_PRODUCT_VIEW_NB', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_view_nb');
+  DEFINE('WPSHOP_PRODUCT_FRONT_DISPLAY_CONF', '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attributes_frontend_display');
+
+  DEFINE('WPSHOP_DEFAULT_CUSTOM_TYPES', serialize(array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS)));
+
+
+	DEFINE('WPSHOP_IDENTIFIER_CUSTOMER', 'U');
+   $cat_options = get_option('wpshop_catalog_categories_option');
+   DEFINE('WPSHOP_UNCATEGORIZED_PRODUCT_SLUG', !empty($cat_options['wpshop_catalog_no_category_slug']) ? $cat_options['wpshop_catalog_no_category_slug'] : 'no-category');
+   DEFINE('WPSHOP_CATALOG_PRODUCT_SLUG', 'catalog');
+	DEFINE('WPSHOP_CATALOG_CATEGORIES_SLUG', 'catalog');
+ DEFINE('WPSHOP_CATALOG_PRODUCT_NO_CATEGORY', 'no-categories');
+   include_once(WPSHOP_LIBRAIRIES_DIR . 'purchase/list_countries.php');
+ DEFINE('WPSHOP_COUNTRY_LIST', serialize($wpshop_tab_countries));
+
+
+ DEFINE('WPSHOP_COMMON_ATTRIBUTES_PARENT_VARIATION_PRODUCT', serialize(array('tx_tva')));
 /*	Define database table names	*/
- DEFINE( 'WPSHOP_DBT_ENTITIES', $wpdb->prefix . 'wpshop__entity' );
- DEFINE( 'WPSHOP_DBT_ATTRIBUTE_SET', $wpdb->prefix . 'wpshop__attribute_set' );
- DEFINE( 'WPSHOP_DBT_ATTRIBUTE_GROUP', $wpdb->prefix . 'wpshop__attribute_set_section' );
-   DEFINE( 'WPSHOP_DBT_ATTRIBUTE_DETAILS', $wpdb->prefix . 'wpshop__attribute_set_section_details' );
-
-	DEFINE( 'WPSHOP_DBT_ATTRIBUTE_UNIT', $wpdb->prefix . 'wpshop__attributes_unit' );
-  DEFINE( 'WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP', $wpdb->prefix . 'wpshop__attributes_unit_groups' );
-
-	DEFINE( 'WPSHOP_DBT_ATTRIBUTE', $wpdb->prefix . 'wpshop__attribute' );
- DEFINE( 'WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX', $wpdb->prefix . 'wpshop__attribute_value_' );
-	DEFINE( 'WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR', WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . 'varchar' );
-   DEFINE( 'WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME', WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . 'datetime' );
- DEFINE( 'WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL', WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . 'decimal' );
-   DEFINE( 'WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER', WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . 'integer' );
-   DEFINE( 'WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT', WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . 'text' );
- DEFINE( 'WPSHOP_DBT_ATTRIBUTE_VALUES_HISTO', WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . '_histo' );
-  DEFINE( 'WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS', WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . 'options' );
-
-  DEFINE( 'WPSHOP_DBT_HISTORIC', $wpdb->prefix . 'wpshop__historique' );
- DEFINE( 'WPSHOP_DBT_MESSAGES', $wpdb->prefix . 'wpshop__message' );
+ DEFINE('WPSHOP_DBT_ENTITIES', $wpdb->prefix . 'wpshop__entity');
+ DEFINE('WPSHOP_DBT_ATTRIBUTE_SET', $wpdb->prefix . 'wpshop__attribute_set');
+ DEFINE('WPSHOP_DBT_ATTRIBUTE_GROUP', $wpdb->prefix . 'wpshop__attribute_set_section');
+   DEFINE('WPSHOP_DBT_ATTRIBUTE_DETAILS', $wpdb->prefix . 'wpshop__attribute_set_section_details');
+
+	DEFINE('WPSHOP_DBT_ATTRIBUTE_UNIT', $wpdb->prefix . 'wpshop__attributes_unit');
+  DEFINE('WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP', $wpdb->prefix . 'wpshop__attributes_unit_groups');
+
+	DEFINE('WPSHOP_DBT_ATTRIBUTE', $wpdb->prefix . 'wpshop__attribute');
+ DEFINE('WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX', $wpdb->prefix . 'wpshop__attribute_value_');
+	DEFINE('WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR', WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . 'varchar');
+   DEFINE('WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME', WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . 'datetime');
+ DEFINE('WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL', WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . 'decimal');
+   DEFINE('WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER', WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . 'integer');
+   DEFINE('WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT', WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . 'text');
+ DEFINE('WPSHOP_DBT_ATTRIBUTE_VALUES_HISTO', WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . '_histo');
+  DEFINE('WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS', WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . 'options');
+
+  DEFINE('WPSHOP_DBT_HISTORIC', $wpdb->prefix . 'wpshop__historique');
+ DEFINE('WPSHOP_DBT_MESSAGES', $wpdb->prefix . 'wpshop__message');
 
    /*	Delete table at database version 12 for new cart management with session and usermeta database	*/
- DEFINE( 'WPSHOP_DBT_CART', $wpdb->prefix . 'wpshop__cart' );
-   DEFINE( 'WPSHOP_DBT_CART_CONTENTS', $wpdb->prefix . 'wpshop__cart_contents' );
+ DEFINE('WPSHOP_DBT_CART', $wpdb->prefix . 'wpshop__cart');
+   DEFINE('WPSHOP_DBT_CART_CONTENTS', $wpdb->prefix . 'wpshop__cart_contents');
 /*	Define the different url for the plugin	*/
- DEFINE( 'WPSHOP_URL_SLUG_DASHBOARD', 'wpshop_dashboard' );
- DEFINE( 'WPSHOP_URL_SLUG_ATTRIBUTE_LISTING', 'wpshop_attribute' );
- DEFINE( 'WPSHOP_URL_SLUG_SHORTCODES', 'wpshop_shortcodes' );
-   DEFINE( 'WPSHOP_URL_SLUG_ABOUT', 'wpshop_about' );
- DEFINE( 'WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING', 'wpshop_attribute_group' );
-   DEFINE( 'WPSHOP_URL_SLUG_OPTION', 'wpshop_option' );
-   DEFINE( 'WPSHOP_URL_SLUG_MESSAGES', 'wpshop_messages' );
-   DEFINE( 'WPSHOP_URL_SLUG_TOOLS', 'wpshop_tools' );
+ DEFINE('WPSHOP_URL_SLUG_DASHBOARD', 'wpshop_dashboard');
+ DEFINE('WPSHOP_URL_SLUG_ATTRIBUTE_LISTING', 'wpshop_attribute');
+ DEFINE('WPSHOP_URL_SLUG_SHORTCODES', 'wpshop_shortcodes');
+   DEFINE('WPSHOP_URL_SLUG_ABOUT', 'wpshop_about');
+ DEFINE('WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING', 'wpshop_attribute_group');
+   DEFINE('WPSHOP_URL_SLUG_OPTION', 'wpshop_option');
+   DEFINE('WPSHOP_URL_SLUG_MESSAGES', 'wpshop_messages');
+   DEFINE('WPSHOP_URL_SLUG_TOOLS', 'wpshop_tools');
 /*	Define the different pictures for the plugin	*/
- DEFINE( 'WPSHOP_AUTHORIZED_PICS_EXTENSIONS', 'gif|jp(e)*g|png' );
-  DEFINE( 'WPSHOP_LOADING_ICON', admin_url( 'images/loading.gif' ) );
-	DEFINE( 'WPSHOP_ERROR_ICON', WPSHOP_MEDIAS_URL . 'icones/informations/error_s.png' );
-  DEFINE( 'WPSHOP_SUCCES_ICON', WPSHOP_MEDIAS_URL . 'icones/informations/success_s.png' );
-   DEFINE( 'WPSHOP_DEFAULT_PRODUCT_PICTURE', WPSHOP_MEDIAS_IMAGES_URL . 'no_picture.png' );
-   DEFINE( 'WPSHOP_DEFAULT_CATEGORY_PICTURE', WPSHOP_MEDIAS_IMAGES_URL . 'no_picture.png' );
-  DEFINE( 'WPSHOP_PRODUCT_NOT_EXIST', WPSHOP_MEDIAS_IMAGES_URL . 'not_exist.gif' );
+ DEFINE('WPSHOP_AUTHORIZED_PICS_EXTENSIONS', 'gif|jp(e)*g|png');
+  DEFINE('WPSHOP_LOADING_ICON', admin_url('images/loading.gif'));
+	DEFINE('WPSHOP_ERROR_ICON', WPSHOP_MEDIAS_URL . 'icones/informations/error_s.png');
+  DEFINE('WPSHOP_SUCCES_ICON', WPSHOP_MEDIAS_URL . 'icones/informations/success_s.png');
+   DEFINE('WPSHOP_DEFAULT_PRODUCT_PICTURE', WPSHOP_MEDIAS_IMAGES_URL . 'no_picture.png');
+   DEFINE('WPSHOP_DEFAULT_CATEGORY_PICTURE', WPSHOP_MEDIAS_IMAGES_URL . 'no_picture.png');
+  DEFINE('WPSHOP_PRODUCT_NOT_EXIST', WPSHOP_MEDIAS_IMAGES_URL . 'not_exist.gif');
 
 /*
   Define various configuration vars   */
    /*	FRONTEND DISPLAY	*/
- $wpshop_display_option = get_option( 'wpshop_display_option' );
-	DEFINE( 'WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE', (isset( $wpshop_display_option['wpshop_display_grid_element_number'] ) && ($wpshop_display_option['wpshop_display_grid_element_number'] >= 1) ? $wpshop_display_option['wpshop_display_grid_element_number'] : 1) );
-	DEFINE( 'WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE_MIN_RANGE', 1 );
-  DEFINE( 'WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE_MAX_RANGE', 6 );
+ $wpshop_display_option = get_option('wpshop_display_option');
+	DEFINE('WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE', (isset($wpshop_display_option['wpshop_display_grid_element_number']) && ($wpshop_display_option['wpshop_display_grid_element_number'] >= 1) ? $wpshop_display_option['wpshop_display_grid_element_number'] : 1));
+	DEFINE('WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE_MIN_RANGE', 1);
+  DEFINE('WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE_MAX_RANGE', 6);
 
- DEFINE( 'WPSHOP_ELEMENT_NB_PER_PAGE', ! empty( $wpshop_display_option['wpshop_display_element_per_page'] ) ? $wpshop_display_option['wpshop_display_element_per_page'] : 20 );
- DEFINE( 'WPSHOP_DISPLAY_GALLERY_ELEMENT_NUMBER_PER_LINE', 3 );
- DEFINE( 'WPSHOP_DISPLAY_LIST_TYPE', $wpshop_display_option['wpshop_display_list_type'] );
+ DEFINE('WPSHOP_ELEMENT_NB_PER_PAGE', !empty($wpshop_display_option['wpshop_display_element_per_page']) ? $wpshop_display_option['wpshop_display_element_per_page'] : 20);
+ DEFINE('WPSHOP_DISPLAY_GALLERY_ELEMENT_NUMBER_PER_LINE', 3);
+ DEFINE('WPSHOP_DISPLAY_LIST_TYPE', $wpshop_display_option['wpshop_display_list_type']);
 
  /*	ADMIN DISPLAY	*/
  $attribute_page_layout_types = array(
-	 'tab' => __( 'Tabs', 'wpshop' ),
-	 'separated_bloc' => __( 'Separated bloc', 'wpshop' ),
+	 'tab' => __('Tabs', 'wpshop'),
+	 'separated_bloc' => __('Separated bloc', 'wpshop'),
  );
-  $wpshop_admin_display_option = get_option( 'wpshop_admin_display_option', array() );
-   DEFINE( 'WPSHOP_ATTRIBUTE_SET_EDITION_PAGE_LAYOUT', ( ! empty( $wpshop_admin_display_option['wpshop_admin_attr_set_layout'] )?$wpshop_admin_display_option['wpshop_admin_attr_set_layout']:'separated_bloc') );
- DEFINE( 'WPSHOP_ATTRIBUTE_EDITION_PAGE_LAYOUT', ( ! empty( $wpshop_admin_display_option['wpshop_admin_attr_layout'] )?$wpshop_admin_display_option['wpshop_admin_attr_layout']:'tab') );
+  $wpshop_admin_display_option = get_option('wpshop_admin_display_option', array());
+   DEFINE('WPSHOP_ATTRIBUTE_SET_EDITION_PAGE_LAYOUT', (!empty($wpshop_admin_display_option['wpshop_admin_attr_set_layout']) ? $wpshop_admin_display_option['wpshop_admin_attr_set_layout'] : 'separated_bloc'));
+ DEFINE('WPSHOP_ATTRIBUTE_EDITION_PAGE_LAYOUT', (!empty($wpshop_admin_display_option['wpshop_admin_attr_layout']) ? $wpshop_admin_display_option['wpshop_admin_attr_layout'] : 'tab'));
 	$product_page_layout_types = array(
-		'movable-tab' => __( 'Separated box in product page', 'wpshop' ),
-		'fixed-tab' => __( 'A tab in product data box "Product data"', 'wpshop' ),
-		'each-box' => __( 'In each attribute group section "Product data"', 'wpshop' ),
+		'movable-tab' => __('Separated box in product page', 'wpshop'),
+		'fixed-tab' => __('A tab in product data box "Product data"', 'wpshop'),
+		'each-box' => __('In each attribute group section "Product data"', 'wpshop'),
 	);
-	DEFINE( 'WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE', ( ! empty( $wpshop_admin_display_option['wpshop_admin_product_shortcode_display'] )?$wpshop_admin_display_option['wpshop_admin_product_shortcode_display']:'each-box') );
+	DEFINE('WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE', (!empty($wpshop_admin_display_option['wpshop_admin_product_shortcode_display']) ? $wpshop_admin_display_option['wpshop_admin_product_shortcode_display'] : 'each-box'));
 	/*  Define debug vars   */
-	$extra_options = get_option( 'wpshop_extra_options', array() );
-	DEFINE( 'WPSHOP_ADDONS_OPTION_NAME', 'wpshop_addons' );
-	$wpshop_addons_state = get_option( WPSHOP_ADDONS_OPTION_NAME, array() );
+	$extra_options = get_option('wpshop_extra_options', array());
+	DEFINE('WPSHOP_ADDONS_OPTION_NAME', 'wpshop_addons');
+	$wpshop_addons_state = get_option(WPSHOP_ADDONS_OPTION_NAME, array());
 
 	/*	ALLOWED IPS	*/
-	$default_ip = array( '127.0.0.1', '0.0.0.0' );
-	DEFINE( 'WPSHOP_DEBUG_MODE_ALLOWED_IP', ( ! empty( $extra_options['WPSHOP_DEBUG_MODE_ALLOWED_IP'] )?serialize( array_merge( $default_ip, array( $extra_options['WPSHOP_DEBUG_MODE_ALLOWED_IP'] ) ) ):serialize( $default_ip )) );
+	$default_ip = array('127.0.0.1', '0.0.0.0');
+	DEFINE('WPSHOP_DEBUG_MODE_ALLOWED_IP', (!empty($extra_options['WPSHOP_DEBUG_MODE_ALLOWED_IP']) ? serialize(array_merge($default_ip, array($extra_options['WPSHOP_DEBUG_MODE_ALLOWED_IP']))) : serialize($default_ip)));
 	/*	DEBUG MODE	*/
 	$debug_mode = false;
-	if ( ! empty( $extra_options['WPSHOP_DEBUG_MODE'] ) && ($extra_options['WPSHOP_DEBUG_MODE'] == 'true') ) {
+	if (!empty($extra_options['WPSHOP_DEBUG_MODE']) && ($extra_options['WPSHOP_DEBUG_MODE'] == 'true')) {
 		$debug_mode = true;
 	}
-	DEFINE( 'WPSHOP_DEBUG_MODE', $debug_mode );
+	DEFINE('WPSHOP_DEBUG_MODE', $debug_mode);
 	// End if().
 	$delete_data = false;
-	if ( ! empty( $extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION'] ) && ($extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION'] == 'true') ) {
+	if (!empty($extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION']) && ($extra_options['WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION'] == 'true')) {
 		$delete_data = true;
 	}
-	DEFINE( 'WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION', $delete_data );
+	DEFINE('WPSHOP_DEBUG_MODE_ALLOW_DATA_DELETION', $delete_data);
 
 	// End if().
 	$tools_menu_display = false;
-	if ( ! empty( $extra_options['WPSHOP_DISPLAY_TOOLS_MENU'] ) && ($extra_options['WPSHOP_DISPLAY_TOOLS_MENU'] == 'true') ) {
+	if (!empty($extra_options['WPSHOP_DISPLAY_TOOLS_MENU']) && ($extra_options['WPSHOP_DISPLAY_TOOLS_MENU'] == 'true')) {
 		$tools_menu_display = true;
 	}
-	DEFINE( 'WPSHOP_DISPLAY_TOOLS_MENU', $tools_menu_display );
+	DEFINE('WPSHOP_DISPLAY_TOOLS_MENU', $tools_menu_display);
 
 	// End if().
 	$attr_value_per_user = false;
-	if ( ! empty( $extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER'] ) && ($extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER'] == 'true') ) {
+	if (!empty($extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER']) && ($extra_options['WPSHOP_ATTRIBUTE_VALUE_PER_USER'] == 'true')) {
 		$attr_value_per_user = true;
 	}
-	DEFINE( 'WPSHOP_ATTRIBUTE_VALUE_PER_USER', $attr_value_per_user );
+	DEFINE('WPSHOP_ATTRIBUTE_VALUE_PER_USER', $attr_value_per_user);
 
 	// End if().
 	$display_available_keys_for_template = false;
-	if ( ! empty( $extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE'] ) && ($extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE'] == 'true') ) {
+	if (!empty($extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE']) && ($extra_options['WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE'] == 'true')) {
 		 $display_available_keys_for_template = true;
 	}
-	DEFINE( 'WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE', $display_available_keys_for_template );
+	DEFINE('WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE', $display_available_keys_for_template);
 
 	// End if().
 	$display_value_attribute_type_select = false;
-	if ( ! empty( $extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT'] ) && ($extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT'] == 'true') ) {
+	if (!empty($extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT']) && ($extra_options['WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT'] == 'true')) {
 		$display_value_attribute_type_select = true;
 	}
-	DEFINE( 'WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT', $display_value_attribute_type_select );
+	DEFINE('WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT', $display_value_attribute_type_select);
 	// End if().
-	DEFINE( 'WPSHOP_PRODUCT_REFERENCE_PREFIX', 'PDCT' );
-	DEFINE( 'WPSHOP_PRODUCT_REFERENCE_PREFIX_NB_FILL', 5 );
-	DEFINE( 'WPSHOP_BILLING_REFERENCE_PREFIX', 'FA' );
-	DEFINE( 'WPSHOP_CREDIT_SLIP_REFERENCE_PREFIX', 'AV' );
-	DEFINE( 'WPSHOP_ORDER_REFERENCE_PREFIX', 'OR' );
-	DEFINE( 'WPSHOP_PREORDER_REFERENCE_PREFIX', 'D' );
+	DEFINE('WPSHOP_PRODUCT_REFERENCE_PREFIX', 'PDCT');
+	DEFINE('WPSHOP_PRODUCT_REFERENCE_PREFIX_NB_FILL', 5);
+	DEFINE('WPSHOP_BILLING_REFERENCE_PREFIX', 'FA');
+	DEFINE('WPSHOP_CREDIT_SLIP_REFERENCE_PREFIX', 'AV');
+	DEFINE('WPSHOP_ORDER_REFERENCE_PREFIX', 'OR');
+	DEFINE('WPSHOP_PREORDER_REFERENCE_PREFIX', 'D');
 	/*  Define the different pages to create for basic usage    */
 	$default_pages = array();
-	$product_options = get_option( 'wpshop_catalog_product_option' );
+	$product_options = get_option('wpshop_catalog_product_option');
 	$default_pages['presentation'][] = array(
 		'page_code' => 'wpshop_product_page_id',
-		'post_title' => __( 'Shop', 'wpshop' ),
-		'post_name' => ! empty( $product_options['wpshop_catalog_product_slug'] ) ? $product_options['wpshop_catalog_product_slug'] : 'catalog',
+		'post_title' => __('Shop', 'wpshop'),
+		'post_name' => !empty($product_options['wpshop_catalog_product_slug']) ? $product_options['wpshop_catalog_product_slug'] : 'catalog',
 		'post_content' => '[wpshop_products]',
 		'menu_order' => 569841,
 	);
 	$default_pages['presentation'][] = array(
 		'page_code' => 'wpshop_cart_page_id',
-		'post_title' => __( 'Cart', 'wpshop' ),
+		'post_title' => __('Cart', 'wpshop'),
 		'post_name' => 'cart',
 		'post_content' => '[wpshop_cart]',
 		'menu_order' => 569842,
 	);
 	$default_pages['presentation'][] = array(
 		'page_code' => 'wpshop_checkout_page_id',
-		'post_title' => __( 'Checkout', 'wpshop' ),
+		'post_title' => __('Checkout', 'wpshop'),
 		'post_name' => 'checkout',
 		'post_content' => '[wpshop_checkout]',
 		'menu_order' => 569843,
 	);
 	$default_pages['presentation'][] = array(
 		'page_code' => 'wpshop_myaccount_page_id',
-		'post_title' => __( 'My account', 'wpshop' ),
+		'post_title' => __('My account', 'wpshop'),
 		'post_name' => 'myaccount',
 		'post_content' => '[wpshop_myaccount]',
 		'menu_order' => 569844,
 	);
 	$default_pages['presentation'][] = array(
 		'page_code' => 'wpshop_signup_page_id',
-		'post_title' => __( 'Signup', 'wpshop' ),
+		'post_title' => __('Signup', 'wpshop'),
 		'post_name' => 'signup',
 		'post_content' => '[wpshop_signup]',
 		'menu_order' => 569845,
 	);
 	$default_pages['sale'][] = array(
 		'page_code' => 'wpshop_payment_return_page_id',
-		'post_title' => __( 'Payment return successfull', 'wpshop' ),
+		'post_title' => __('Payment return successfull', 'wpshop'),
 		'post_name' => 'return',
 		'post_content' => '[wpshop_payment_result]',
 		'menu_order' => 569846,
 	);
 	$default_pages['sale'][] = array(
 		'page_code' => 'wpshop_payment_return_nok_page_id',
-		'post_title' => __( 'Payment return unsuccessfull', 'wpshop' ),
+		'post_title' => __('Payment return unsuccessfull', 'wpshop'),
 		'post_name' => 'unsuccessfull_payment_return',
 		'post_content' => '[wpshop_payment_result_unsuccessfull]',
 		'menu_order' => 569848,
 	);
 	$default_pages['presentation'][] = array(
 		'page_code' => 'wpshop_terms_of_sale_page_id',
-		'post_title' => __( 'Terms of sale', 'wpshop' ),
+		'post_title' => __('Terms of sale', 'wpshop'),
 		'post_name' => 'terms-of-sale',
 		'post_content' => '[wpshop_terms_of_sale]',
 		'menu_order' => 569847,
 	);
 
-	DEFINE( 'WPSHOP_DEFAULT_PAGES', serialize( $default_pages ) );
+	DEFINE('WPSHOP_DEFAULT_PAGES', serialize($default_pages));
 	/*  Define the different vars used for price calculation    */
-	$wpshop_shop_price_piloting = get_option( 'wpshop_shop_price_piloting' );
-	DEFINE( 'WPSHOP_PRODUCT_PRICE_PILOT', ( ! empty( $wpshop_shop_price_piloting ) ? $wpshop_shop_price_piloting : 'TTC') );
-
-	DEFINE( 'WPSHOP_COST_OF_POSTAGE', 'cost_of_postage' );
-	DEFINE( 'WPSHOP_PRODUCT_PRICE_HT', 'price_ht' );
-	DEFINE( 'WPSHOP_PRODUCT_PRICE_TAX', 'tx_tva' );
-	DEFINE( 'WPSHOP_PRODUCT_PRICE_TTC', 'product_price' );
-	DEFINE( 'WPSHOP_PRODUCT_PRICE_TAX_AMOUNT', 'tva' );
-	DEFINE( 'WPSHOP_PRODUCT_WEIGHT', 'product_weight' );
-	DEFINE( 'WPSHOP_PRODUCT_SPECIAL_PRICE', 'special_price' );
-	DEFINE( 'WPSHOP_PRODUCT_SPECIAL_PRICE_DATE_FROM', 'special_from' );
-	DEFINE( 'WPSHOP_PRODUCT_SPECIAL_PRICE_DATE_TO', 'special_to' );
-	DEFINE( 'WPSHOP_PRODUCT_DISCOUNT_AMOUNT', 'discount_amount' );
-	DEFINE( 'WPSHOP_VAT_ON_SHIPPING_COST', apply_filters( 'wps_change_shipping_vat', 20 ) );
-
-	DEFINE( 'WPSHOP_ATTRIBUTE_PRICES', serialize( array( WPSHOP_PRODUCT_PRICE_HT, WPSHOP_PRODUCT_PRICE_TAX, WPSHOP_PRODUCT_PRICE_TTC, WPSHOP_PRODUCT_PRICE_TAX_AMOUNT ) ) );
-	DEFINE( 'WPSHOP_ATTRIBUTE_WEIGHT', serialize( array( WPSHOP_PRODUCT_WEIGHT ) ) );
+	$wpshop_shop_price_piloting = get_option('wpshop_shop_price_piloting');
+	DEFINE('WPSHOP_PRODUCT_PRICE_PILOT', (!empty($wpshop_shop_price_piloting) ? $wpshop_shop_price_piloting : 'TTC'));
+
+	DEFINE('WPSHOP_COST_OF_POSTAGE', 'cost_of_postage');
+	DEFINE('WPSHOP_PRODUCT_PRICE_HT', 'price_ht');
+	DEFINE('WPSHOP_PRODUCT_PRICE_TAX', 'tx_tva');
+	DEFINE('WPSHOP_PRODUCT_PRICE_TTC', 'product_price');
+	DEFINE('WPSHOP_PRODUCT_PRICE_TAX_AMOUNT', 'tva');
+	DEFINE('WPSHOP_PRODUCT_WEIGHT', 'product_weight');
+	DEFINE('WPSHOP_PRODUCT_SPECIAL_PRICE', 'special_price');
+	DEFINE('WPSHOP_PRODUCT_SPECIAL_PRICE_DATE_FROM', 'special_from');
+	DEFINE('WPSHOP_PRODUCT_SPECIAL_PRICE_DATE_TO', 'special_to');
+	DEFINE('WPSHOP_PRODUCT_DISCOUNT_AMOUNT', 'discount_amount');
+	DEFINE('WPSHOP_VAT_ON_SHIPPING_COST', apply_filters('wps_change_shipping_vat', 20));
+
+	DEFINE('WPSHOP_ATTRIBUTE_PRICES', serialize(array(WPSHOP_PRODUCT_PRICE_HT, WPSHOP_PRODUCT_PRICE_TAX, WPSHOP_PRODUCT_PRICE_TTC, WPSHOP_PRODUCT_PRICE_TAX_AMOUNT)));
+	DEFINE('WPSHOP_ATTRIBUTE_WEIGHT', serialize(array(WPSHOP_PRODUCT_WEIGHT)));
 	/*  Define the different attribute that user won't be able to delete from interface */
-	DEFINE( 'WPSHOP_ATTRIBUTE_UNDELETABLE', serialize( array_merge( array(), unserialize( WPSHOP_ATTRIBUTE_PRICES ) ) ) );
+	DEFINE('WPSHOP_ATTRIBUTE_UNDELETABLE', serialize(array_merge(array(), unserialize(WPSHOP_ATTRIBUTE_PRICES))));
 	/*  Define the attribute list to hide or variation creation */
-	DEFINE( 'WPSHOP_VARIATION_ATTRIBUTE_TO_HIDE', serialize( array_merge( unserialize( WPSHOP_ATTRIBUTE_PRICES ), array( 'product_attribute_set_id', 'product_reference' ) ) ) );
+	DEFINE('WPSHOP_VARIATION_ATTRIBUTE_TO_HIDE', serialize(array_merge(unserialize(WPSHOP_ATTRIBUTE_PRICES), array('product_attribute_set_id', 'product_reference'))));
 	/*  Define the default currency */
-	DEFINE( 'WPSHOP_SHOP_DEFAULT_CURRENCY', 'EUR' );
-	DEFINE( 'WPSHOP_SHOP_CURRENCIES', serialize( array(
+	DEFINE('WPSHOP_SHOP_DEFAULT_CURRENCY', 'EUR');
+	DEFINE('WPSHOP_SHOP_CURRENCIES', serialize(array(
 		'EUR' => 'euro',
 		'USD' => 'dollar',
-	) ) );
+	)));
 
 	/*  Define the shipping default rules   */
-	DEFINE( 'WPSHOP_SHOP_SHIPPING_RULES', serialize( array(
+	DEFINE('WPSHOP_SHOP_SHIPPING_RULES', serialize(array(
 		'min_max' => array(
 			'min' => 0,
 			'max' => 30,
 		),
 		'free_from' => 4500,
-	) ) );
+	)));
 	$shipping_fees_array = array(
 		'active' => false,
 		'fees' => array(
@@ -351,66 +351,66 @@ 
 			),
 		),
 	);
-	DEFINE( 'WPSHOP_SHOP_CUSTOM_SHIPPING', serialize( $shipping_fees_array ) );
+	DEFINE('WPSHOP_SHOP_CUSTOM_SHIPPING', serialize($shipping_fees_array));
 
 	/*  Define addons modules */
-	DEFINE( 'WPSHOP_ADDONS_KEY_IS', '48' );
-	DEFINE( 'WPSHOP_ADDONS_STATES_CLASS', serialize( array(
+	DEFINE('WPSHOP_ADDONS_KEY_IS', '48');
+	DEFINE('WPSHOP_ADDONS_STATES_CLASS', serialize(array(
 		true => 'wpshop_addons_state wpshop_addons_state_activated',
 		false => 'wpshop_addons_state wpshop_addons_state_deactivated',
-	) ) );
-	DEFINE( 'WPSHOP_ADDONS_LIST', serialize( array(
-		'WPSHOP_ADDONS_QUOTATION' => array( __( 'Quotation','wpshop' ), '48', 'per_site', 'quotation_allowed', 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE' ),
-		'WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC' => array( __( 'Payment gateway CIC','wpshop' ), '32', 'per_site', '' ),/* , 'WPSHOP_ADDONS_PRICE_PER_GROUP' => array(__('Price per user group','wpshop'), '13', 'free') */
-	) ) );
-	DEFINE( 'WPSHOP_ADDONS_QUOTATION', ( ! empty( $wpshop_addons_state['WPSHOP_ADDONS_QUOTATION']['activate'] )?$wpshop_addons_state['WPSHOP_ADDONS_QUOTATION']['activate']:false) );
-	DEFINE( 'WPSHOP_ADDONS_PRICE_PER_GROUP', ( ! empty( $wpshop_addons_state['WPSHOP_ADDONS_PRICE_PER_GROUP']['activate'] )?$wpshop_addons_state['WPSHOP_ADDONS_PRICE_PER_GROUP']['activate']:false) );
-	DEFINE( 'WPSHOP_PAYMENT_METHOD_CIC', ( ! empty( $wpshop_addons_state['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC']['activate'] )?$wpshop_addons_state['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC']['activate']:false) );
-	DEFINE( 'WPSHOP_ADDONS_QUOTATION_CODE', 'nfdJK-AsBCO-%AZDZA' );
-	DEFINE( 'WPSHOP_ADDONS_PRICE_PER_GROUP_CODE', '7GnnQ-5FeqZ-BiKz3' );
-	DEFINE( 'WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC', 'nZYsM-vQ8qC-VfVfA' );
+	)));
+	DEFINE('WPSHOP_ADDONS_LIST', serialize(array(
+		'WPSHOP_ADDONS_QUOTATION' => array(__('Quotation', 'wpshop'), '48', 'per_site', 'quotation_allowed', 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE'),
+		'WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC' => array(__('Payment gateway CIC', 'wpshop'), '32', 'per_site', ''), /* , 'WPSHOP_ADDONS_PRICE_PER_GROUP' => array(__('Price per user group','wpshop'), '13', 'free') */
+	)));
+	DEFINE('WPSHOP_ADDONS_QUOTATION', (!empty($wpshop_addons_state['WPSHOP_ADDONS_QUOTATION']['activate']) ? $wpshop_addons_state['WPSHOP_ADDONS_QUOTATION']['activate'] : false));
+	DEFINE('WPSHOP_ADDONS_PRICE_PER_GROUP', (!empty($wpshop_addons_state['WPSHOP_ADDONS_PRICE_PER_GROUP']['activate']) ? $wpshop_addons_state['WPSHOP_ADDONS_PRICE_PER_GROUP']['activate'] : false));
+	DEFINE('WPSHOP_PAYMENT_METHOD_CIC', (!empty($wpshop_addons_state['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC']['activate']) ? $wpshop_addons_state['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC']['activate'] : false));
+	DEFINE('WPSHOP_ADDONS_QUOTATION_CODE', 'nfdJK-AsBCO-%AZDZA');
+	DEFINE('WPSHOP_ADDONS_PRICE_PER_GROUP_CODE', '7GnnQ-5FeqZ-BiKz3');
+	DEFINE('WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC', 'nZYsM-vQ8qC-VfVfA');
 
 	/*  Define payment method params    */
-	$wpshop_paymentMethod = get_option( 'wps_payment_mode' );
-	if ( WPSHOP_PAYMENT_METHOD_CIC || ! empty( $wpshop_paymentMethod['mode'] ) && ! empty( $wpshop_paymentMethod['mode']['cic'] ) ) {
-		$cmcic_params = get_option( 'wpshop_cmcic_params', array() );
-		if ( ! empty( $cmcic_params ) ) {
-			DEFINE( 'CMCIC_CLE', $cmcic_params['cle'] );
-			 DEFINE( 'CMCIC_TPE', $cmcic_params['tpe'] );
-			 DEFINE( 'CMCIC_VERSION', $cmcic_params['version'] );
-			 DEFINE( 'CMCIC_SERVEUR', $cmcic_params['serveur'] );
-			 DEFINE( 'CMCIC_CODESOCIETE', $cmcic_params['codesociete'] );
-			 DEFINE( 'CMCIC_URLOK', '' );
-			 DEFINE( 'CMCIC_URLKO', '' );
+	$wpshop_paymentMethod = get_option('wps_payment_mode');
+	if (WPSHOP_PAYMENT_METHOD_CIC || !empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic'])) {
+		$cmcic_params = get_option('wpshop_cmcic_params', array());
+		if (!empty($cmcic_params)) {
+			DEFINE('CMCIC_CLE', $cmcic_params['cle']);
+			 DEFINE('CMCIC_TPE', $cmcic_params['tpe']);
+			 DEFINE('CMCIC_VERSION', $cmcic_params['version']);
+			 DEFINE('CMCIC_SERVEUR', $cmcic_params['serveur']);
+			 DEFINE('CMCIC_CODESOCIETE', $cmcic_params['codesociete']);
+			 DEFINE('CMCIC_URLOK', '');
+			 DEFINE('CMCIC_URLKO', '');
 		}
 	}
 
 	/** Civility    */
 	$civility = array(
-		1 => __( 'Mr.','wpshop' ),
-		__( 'Mrs.','wpshop' ),
-		__( 'Miss','wpshop' ),
+		1 => __('Mr.', 'wpshop'),
+		__('Mrs.', 'wpshop'),
+		__('Miss', 'wpshop'),
 	);
 	/** Status  */
 	$order_status = array(
-		'' => __( 'Awaiting treatment', 'wpshop' ),
-		'awaiting_payment' => __( 'Awaiting payment', 'wpshop' ),
-		'partially_paid' => __( 'Partially paid', 'wpshop' ),
-		'completed' => __( 'Paid', 'wpshop' ),
-		'shipped' => __( 'Shipped', 'wpshop' ),
-		'denied' => __( 'Denied', 'wpshop' ),
-		'incorrect_amount' => __( 'Incorrect amount', 'wpshop' ),
-		'canceled' => __( 'Canceled', 'wpshop' ),
-		'payment_refused' => __( 'Refused payment', 'wpshop' ),
-		'refunded' => __( 'Refunded', 'wpshop' ),
-		'pos' => __( 'Taken in store', 'wpshop' ),
+		'' => __('Awaiting treatment', 'wpshop'),
+		'awaiting_payment' => __('Awaiting payment', 'wpshop'),
+		'partially_paid' => __('Partially paid', 'wpshop'),
+		'completed' => __('Paid', 'wpshop'),
+		'shipped' => __('Shipped', 'wpshop'),
+		'denied' => __('Denied', 'wpshop'),
+		'incorrect_amount' => __('Incorrect amount', 'wpshop'),
+		'canceled' => __('Canceled', 'wpshop'),
+		'payment_refused' => __('Refused payment', 'wpshop'),
+		'refunded' => __('Refunded', 'wpshop'),
+		'pos' => __('Taken in store', 'wpshop'),
 	);
-	DEFINE( 'WPSHOP_ORDER_STATUS', serialize( $order_status ) );
+	DEFINE('WPSHOP_ORDER_STATUS', serialize($order_status));
 
 	// End if().
-	DEFINE( 'WPSHOP_REGISTER_POST_TYPE_SUPPORT', serialize( array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions' ) ) );
+	DEFINE('WPSHOP_REGISTER_POST_TYPE_SUPPORT', serialize(array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions')));
 	$register_post_type_args = array(
-		'labels' => array( 'name', 'singular_name', 'add_new', 'add_new_item', 'edit', 'edit_item', 'new_item', 'view', 'view_item', 'search_items', 'not_found', 'not_found_in_trash' ),
+		'labels' => array('name', 'singular_name', 'add_new', 'add_new_item', 'edit', 'edit_item', 'new_item', 'view', 'view_item', 'search_items', 'not_found', 'not_found_in_trash'),
 		'description' => 'text',
 		'public' => 'boolean',
 		'exclude_from_search' => 'boolean',
@@ -418,64 +418,64 @@ 
 		'show_ui' => 'boolean',
 		'show_in_nav_menus' => 'boolean',
 		'show_in_menu' => 'boolean|text',
-		'capabilities' => array( 'publish_posts', 'edit_posts', 'edit_others_posts', 'delete_posts', 'delete_others_posts', 'read_private_posts', 'edit_post', 'delete_post', 'read_post' ),
+		'capabilities' => array('publish_posts', 'edit_posts', 'edit_others_posts', 'delete_posts', 'delete_others_posts', 'read_private_posts', 'edit_post', 'delete_post', 'read_post'),
 		'hierarchical' => false,
 		'rewrite' => false,
 		'query_var' => true,
-		'supports' => unserialize( WPSHOP_REGISTER_POST_TYPE_SUPPORT ),
+		'supports' => unserialize(WPSHOP_REGISTER_POST_TYPE_SUPPORT),
 	);
-	DEFINE( 'WPSHOP_REGISTER_POST_TYPE_ARGS', serialize( $register_post_type_args ) );
-	DEFINE( 'WPSHOP_REGISTER_POST_TYPE_MANDATORY_SUPPORTS', serialize( array( 'title', 'editor', 'thumbnail', 'excerpt' ) ) );
-	DEFINE( 'WPSHOP_PRODUCT_HIDDEN_METABOX', serialize( array( 'formatdiv', 'pageparentdiv', 'postexcerpt', 'trackbacksdiv', 'postcustom', 'commentstatusdiv', 'commentsdiv', 'slugdiv', 'authordiv', 'revisionsdiv' ) ) );
+	DEFINE('WPSHOP_REGISTER_POST_TYPE_ARGS', serialize($register_post_type_args));
+	DEFINE('WPSHOP_REGISTER_POST_TYPE_MANDATORY_SUPPORTS', serialize(array('title', 'editor', 'thumbnail', 'excerpt')));
+	DEFINE('WPSHOP_PRODUCT_HIDDEN_METABOX', serialize(array('formatdiv', 'pageparentdiv', 'postexcerpt', 'trackbacksdiv', 'postcustom', 'commentstatusdiv', 'commentsdiv', 'slugdiv', 'authordiv', 'revisionsdiv')));
 
 	/* Shop type    */
-	DEFINE( 'WPSHOP_SHOP_TYPES', serialize( array( 'presentation', 'sale' ) ) );
+	DEFINE('WPSHOP_SHOP_TYPES', serialize(array('presentation', 'sale')));
 
 	/* Attribute select_data_type   */
-	DEFINE( 'WPSHOP_ATTR_SELECT_TYPE', serialize( array(
+	DEFINE('WPSHOP_ATTR_SELECT_TYPE', serialize(array(
 		'custom' => 'custom_data',
 		'internal' => 'internal_data',
-	) ) );
-	DEFINE( 'WPSHOP_ATTR_SELECT_TYPE_TOGGLED', serialize( array(
+	)));
+	DEFINE('WPSHOP_ATTR_SELECT_TYPE_TOGGLED', serialize(array(
 		'custom' => 'internal_data',
 		'internal' => 'custom_data',
-	) ) );
+	)));
 
 	/*  Define the types existing into the current WordPress installation   */
-	$default_to_exclude = array( 'attachment', 'revision', 'nav_menu_item', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE );
-	DEFINE( 'WPSHOP_INTERNAL_TYPES_TO_EXCLUDE', ( ! empty( $extra_options['WPSHOP_INTERNAL_TYPES_TO_EXCLUDE'] )?serialize( array_merge( array( $extra_options['WPSHOP_INTERNAL_TYPES_TO_EXCLUDE'] ),$default_to_exclude ) ):serialize( $default_to_exclude )) );
+	$default_to_exclude = array('attachment', 'revision', 'nav_menu_item', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE);
+	DEFINE('WPSHOP_INTERNAL_TYPES_TO_EXCLUDE', (!empty($extra_options['WPSHOP_INTERNAL_TYPES_TO_EXCLUDE']) ? serialize(array_merge(array($extra_options['WPSHOP_INTERNAL_TYPES_TO_EXCLUDE']), $default_to_exclude)) : serialize($default_to_exclude)));
 
 	/*
      Start form field display config */
 	/*  Get the list of possible posts status   */
-	$posts_status = array( 'publish', 'pending', 'draft', 'auto-draft', 'future', 'private', 'inherit', 'trash' );
+	$posts_status = array('publish', 'pending', 'draft', 'auto-draft', 'future', 'private', 'inherit', 'trash');
 
 	/*  General configuration   */
-	$comboxOptionToHide = array( 'deleted' );
+	$comboxOptionToHide = array('deleted');
 
 	/*  Attributes form */
-	$attribute_displayed_field = array( 'id', 'status', 'entity_id', 'is_required', 'is_unique', 'is_visible_in_front', 'is_visible_in_front_listing', 'frontend_input', 'backend_input', 'frontend_label', 'default_value', 'is_requiring_unit', '_unit_group_id', '_default_unit', 'is_historisable', 'is_intrinsic', 'is_filterable', 'code', 'is_used_for_sort_by', 'is_visible_in_advanced_search', 'is_used_in_admin_listing_column', 'is_used_in_quick_add_form', 'frontend_verification', 'is_user_defined', 'is_used_in_variation', 'is_used_for_variation', '_need_verification', '_display_informations_about_value', 'frontend_css_class', 'backend_css_class', 'frontend_help_message', 'is_searchable' );
+	$attribute_displayed_field = array('id', 'status', 'entity_id', 'is_required', 'is_unique', 'is_visible_in_front', 'is_visible_in_front_listing', 'frontend_input', 'backend_input', 'frontend_label', 'default_value', 'is_requiring_unit', '_unit_group_id', '_default_unit', 'is_historisable', 'is_intrinsic', 'is_filterable', 'code', 'is_used_for_sort_by', 'is_visible_in_advanced_search', 'is_used_in_admin_listing_column', 'is_used_in_quick_add_form', 'frontend_verification', 'is_user_defined', 'is_used_in_variation', 'is_used_for_variation', '_need_verification', '_display_informations_about_value', 'frontend_css_class', 'backend_css_class', 'frontend_help_message', 'is_searchable');
 	$attribute_options_group = array(
-		__( 'Attribute unit', 'wpshop' ) => array( 'is_requiring_unit', '_unit_group_id', '_default_unit' ),
-		__( 'Frontend option', 'wpshop' ) => array( 'is_visible_in_front', 'is_visible_in_front_listing', 'is_used_for_sort_by', 'is_visible_in_advanced_search', 'is_searchable', '_display_informations_about_value' ),
-		__( 'Variations', 'wpshop' ) => array( 'is_user_defined', 'is_used_in_variation', 'is_used_for_variation', 'frontend_input' ),
+		__('Attribute unit', 'wpshop') => array('is_requiring_unit', '_unit_group_id', '_default_unit'),
+		__('Frontend option', 'wpshop') => array('is_visible_in_front', 'is_visible_in_front_listing', 'is_used_for_sort_by', 'is_visible_in_advanced_search', 'is_searchable', '_display_informations_about_value'),
+		__('Variations', 'wpshop') => array('is_user_defined', 'is_used_in_variation', 'is_used_for_variation', 'frontend_input'),
 	);
-	DEFINE( 'WPSHOP_ATTRIBUTE_DEF_COLUMN_INTO_OPTIONS', serialize( array( '_need_verification', 'frontend_verification', 'frontend_css_class', 'backend_css_class', 'frontend_help_message', 'frontend_help_message' ) ) );
+	DEFINE('WPSHOP_ATTRIBUTE_DEF_COLUMN_INTO_OPTIONS', serialize(array('_need_verification', 'frontend_verification', 'frontend_css_class', 'backend_css_class', 'frontend_help_message', 'frontend_help_message')));
 
 	/*  General form    */
-	$attribute_hidden_field = array( 'position' );
+	$attribute_hidden_field = array('position');
 
 	/*  Definition des differents champs pour les formulaires   */
 	$customer_adress_information_field = array(
-		'civility' => __( 'Civility', 'wpshop' ),
-		'first_name' => __( 'First name', 'wpshop' ),
-		'last_name' => __( 'Last name', 'wpshop' ),
-		'email' => __( 'Email adress', 'wpshop' ),
-		'phone' => __( 'Phone number', 'wpshop' ),
-		'company' => __( 'Company', 'wpshop' ),
-		'address' => __( 'Adresse', 'wpshop' ),
-		'postcode' => __( 'Postcode', 'wpshop' ),
-		'city' => __( 'City', 'wpshop' ),
-		'country' => __( 'Country', 'wpshop' ),
+		'civility' => __('Civility', 'wpshop'),
+		'first_name' => __('First name', 'wpshop'),
+		'last_name' => __('Last name', 'wpshop'),
+		'email' => __('Email adress', 'wpshop'),
+		'phone' => __('Phone number', 'wpshop'),
+		'company' => __('Company', 'wpshop'),
+		'address' => __('Adresse', 'wpshop'),
+		'postcode' => __('Postcode', 'wpshop'),
+		'city' => __('City', 'wpshop'),
+		'country' => __('Country', 'wpshop'),
 	);
 	/*  End form field display config       */

includes/librairies/eav/attributes.class.php

Spacing +559 added lines, -559 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,7 +20,7 @@ 
  * @package wpshop
  * @subpackage librairies
  */
-class wpshop_attributes{
+class wpshop_attributes {
 	/*	Define the database table used in the current class	*/
 	const dbTable = WPSHOP_DBT_ATTRIBUTE;
 	/*	Define the url listing slug used in the current class	*/
@@ -50,7 +50,7 @@ 
 	 *
 	 *	@return string The table of the class
 	 */
-	function setMessage($message){
+	function setMessage($message) {
 		$this->pageMessage = $message;
 	}
 	/**
@@ -58,7 +58,7 @@ 
 	 *
 	 *	@return string The table of the class
 	 */
-	function getListingSlug(){
+	function getListingSlug() {
 		return self::urlSlugListing;
 	}
 	/**
@@ -66,7 +66,7 @@ 
 	 *
 	 *	@return string The table of the class
 	 */
-	function getEditionSlug(){
+	function getEditionSlug() {
 		return self::urlSlugEdition;
 	}
 	/**
@@ -74,7 +74,7 @@ 
 	 *
 	 *	@return string The table of the class
 	 */
-	public static function getDbTable(){
+	public static function getDbTable() {
 		return self::dbTable;
 	}
 	/**
@@ -82,21 +82,21 @@ 
 	 *
 	 *	@return string $title The title of the page looking at the environnement
 	 */
-	function pageTitle(){
+	function pageTitle() {
 		$action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : '';
 		$objectInEdition = isset($_REQUEST['id']) ? sanitize_key($_REQUEST['id']) : '';
-		$page = !empty( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
+		$page = !empty($_GET['page']) ? sanitize_text_field($_GET['page']) : '';
 
-		$title = __(self::pageTitle, 'wpshop' );
-		if($action != ''){
-			if(($action == 'edit') || ($action == 'delete')){
+		$title = __(self::pageTitle, 'wpshop');
+		if ($action != '') {
+			if (($action == 'edit') || ($action == 'delete')) {
 				$editedItem = self::getElement($objectInEdition);
 				$title = sprintf(__(self::pageEditingTitle, 'wpshop'), str_replace("\\", "", $editedItem->frontend_label));
 			}
-			elseif($action == 'add')
+			elseif ($action == 'add')
 				$title = __(self::pageAddingTitle, 'wpshop');
 		}
-		elseif((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug()))
+		elseif ((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug()))
 			$title = __(self::pageAddingTitle, 'wpshop');
 
 		return $title;
@@ -105,7 +105,7 @@ 
 	/**
 	 *	Define the different message and action after an action is send through the element interface
 	 */
-	function elementAction(){
+	function elementAction() {
 		global $wpdb, $initialEavData;
 
 		$pageMessage = $actionResult = '';
@@ -118,75 +118,75 @@ 
 		$saveditem = isset($_REQUEST['saveditem']) ? sanitize_text_field($_REQUEST['saveditem']) : '';
 		$set_section = !empty($_REQUEST[self::getDbTable()]['set_section']) ? sanitize_text_field($_REQUEST[self::getDbTable()]['set_section']) : '';
 		//@TODO $_REQUEST
-		$id = !empty($_REQUEST['id']) ? (int) $_REQUEST['id'] : null;
-		if(!empty($action) && ($action=='activate') ){
-			if( isset($id) ) {
+		$id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : null;
+		if (!empty($action) && ($action == 'activate')) {
+			if (isset($id)) {
 				$query = $wpdb->update(self::getDbTable(), array('status'=>'moderated'), array('id'=>$id));
 				wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=edit&id=" . $id));
 			}
 		}
-		if(($action != '') && ($action == 'saveok') && ($saveditem > 0)){
+		if (($action != '') && ($action == 'saveok') && ($saveditem > 0)) {
 			$editedElement = self::getElement($saveditem);
 			$pageMessage = '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully saved', 'wpshop'), '<span class="bold" >' . $editedElement->code . '</span>');
 		}
-		elseif(($action != '') && ($action == 'deleteok') && ($saveditem > 0)){
+		elseif (($action != '') && ($action == 'deleteok') && ($saveditem > 0)) {
 			$editedElement = self::getElement($saveditem, "'deleted'");
 			$pageMessage = '<img src="' . WPSHOP_SUCCES_ICON . '" alt="action success" class="wpshopPageMessage_Icon" />' . sprintf(__('%s succesfully deleted', 'wpshop'), '<span class="bold" >' . $editedElement->code . '</span>');
 		}
 
-		$attribute_parameter = !empty( $_REQUEST[self::getDbTable()] ) ? (array)$_REQUEST[self::getDbTable()] : array();
-		 if ( !empty($set_section) ) unset($attribute_parameter['set_section']);
+		$attribute_parameter = !empty($_REQUEST[self::getDbTable()]) ? (array)$_REQUEST[self::getDbTable()] : array();
+		 if (!empty($set_section)) unset($attribute_parameter['set_section']);
 
 		$wpshop_attribute_combo_values_list_order_def = !empty($attribute_parameter['wpshop_attribute_combo_values_list_order_def']) ? $attribute_parameter['wpshop_attribute_combo_values_list_order_def'] : array();
 		// @TODO $_REQUEST
 		// unset($_REQUEST[self::getDbTable()]['wpshop_attribute_combo_values_list_order_def']);
 
-		if(!isset($attribute_parameter['status'])){
+		if (!isset($attribute_parameter['status'])) {
 			$attribute_parameter['status'] = 'moderated';
 		}
-		if(!isset($attribute_parameter['is_historisable'])){
+		if (!isset($attribute_parameter['is_historisable'])) {
 			$attribute_parameter['is_historisable'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_required'])){
+		if (!isset($attribute_parameter['is_required'])) {
 			$attribute_parameter['is_required'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_used_in_admin_listing_column'])){
+		if (!isset($attribute_parameter['is_used_in_admin_listing_column'])) {
 			$attribute_parameter['is_used_in_admin_listing_column'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_used_in_quick_add_form'])){
+		if (!isset($attribute_parameter['is_used_in_quick_add_form'])) {
 			$attribute_parameter['is_used_in_quick_add_form'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_intrinsic'])){
+		if (!isset($attribute_parameter['is_intrinsic'])) {
 			$attribute_parameter['is_intrinsic'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_requiring_unit'])){
+		if (!isset($attribute_parameter['is_requiring_unit'])) {
 			$attribute_parameter['is_requiring_unit'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_visible_in_front'])){
+		if (!isset($attribute_parameter['is_visible_in_front'])) {
 			$attribute_parameter['is_visible_in_front'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_visible_in_front_listing'])){
+		if (!isset($attribute_parameter['is_visible_in_front_listing'])) {
 			$attribute_parameter['is_visible_in_front_listing'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_used_for_sort_by'])){
+		if (!isset($attribute_parameter['is_used_for_sort_by'])) {
 			$attribute_parameter['is_used_for_sort_by'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_visible_in_advanced_search'])){
+		if (!isset($attribute_parameter['is_visible_in_advanced_search'])) {
 			$attribute_parameter['is_visible_in_advanced_search'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_searchable'])){
+		if (!isset($attribute_parameter['is_searchable'])) {
 			$attribute_parameter['is_searchable'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_used_for_variation'])){
+		if (!isset($attribute_parameter['is_used_for_variation'])) {
 			$attribute_parameter['is_used_for_variation'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_used_in_variation'])){
+		if (!isset($attribute_parameter['is_used_in_variation'])) {
 			$attribute_parameter['is_used_in_variation'] = 'no';
 		}
-		if(!isset($attribute_parameter['is_user_defined'])){
+		if (!isset($attribute_parameter['is_user_defined'])) {
 			$attribute_parameter['is_user_defined'] = 'no';
 		}
-		if(!isset($attribute_parameter['_display_informations_about_value'])){
+		if (!isset($attribute_parameter['_display_informations_about_value'])) {
 			$attribute_parameter['_display_informations_about_value'] = 'no';
 		}
 
@@ -195,58 +195,58 @@ 
 			switch ($attribute_parameter['frontend_input']) {
 				case 'short_text':
 						$attribute_parameter['frontend_input'] = 'text';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if (empty($attribute_parameter['backend_input'])) $attribute_parameter['backend_input'] = 'text';
 						$attribute_parameter['data_type'] = 'varchar';
 					break;
 				case 'date_field':
 						$attribute_parameter['frontend_input'] = 'text';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if (empty($attribute_parameter['backend_input'])) $attribute_parameter['backend_input'] = 'text';
 						$attribute_parameter['data_type'] = 'datetime';
 					break;
 				case 'float_field':
 						$attribute_parameter['frontend_input'] = 'text';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if (empty($attribute_parameter['backend_input'])) $attribute_parameter['backend_input'] = 'text';
 						$attribute_parameter['data_type'] = 'decimal';
 					break;
 				case 'hidden_field':
 						$attribute_parameter['frontend_input'] = 'hidden';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if (empty($attribute_parameter['backend_input'])) $attribute_parameter['backend_input'] = 'text';
 						$attribute_parameter['data_type'] = 'varchar';
 					break;
 				case 'pass_field':
 						$attribute_parameter['frontend_input'] = 'password';
-						if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+						if (empty($attribute_parameter['backend_input'])) $attribute_parameter['backend_input'] = 'text';
 						$attribute_parameter['data_type'] = 'varchar';
 					break;
 
 				case 'select':
 						$attribute_parameter['frontend_input'] = 'select';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
+						if (empty($attribute_parameter['backend_input']) || empty($id))
 							$attribute_parameter['backend_input'] = 'multiple-select';
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 				case 'multiple-select':
 						$attribute_parameter['frontend_input'] = 'multiple-select';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
+						if (empty($attribute_parameter['backend_input']) || empty($id))
 							$attribute_parameter['backend_input'] = 'multiple-select';
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 				case 'radio':
 						$attribute_parameter['frontend_input'] = 'radio';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
+						if (empty($attribute_parameter['backend_input']) || empty($id))
 							$attribute_parameter['backend_input'] = 'multiple-select';
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 				case 'checkbox':
 						$attribute_parameter['frontend_input'] = 'checkbox';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
+						if (empty($attribute_parameter['backend_input']) || empty($id))
 							$attribute_parameter['backend_input'] = 'multiple-select';
 						$attribute_parameter['data_type'] = 'integer';
 					break;
 
 				case 'textarea':
 						$attribute_parameter['frontend_input'] = 'textarea';
-						if ( empty($attribute_parameter['backend_input']) || empty($id) )
+						if (empty($attribute_parameter['backend_input']) || empty($id))
 							$attribute_parameter['backend_input'] = 'textarea';
 						$attribute_parameter['data_type'] = 'text';
 					break;
@@ -254,7 +254,7 @@ 
 		}
 		else {
 			$attribute_parameter['frontend_input'] = 'text';
-			if ( empty($attribute_parameter['backend_input']) ) $attribute_parameter['backend_input'] = 'text';
+			if (empty($attribute_parameter['backend_input'])) $attribute_parameter['backend_input'] = 'text';
 			$attribute_parameter['data_type'] = 'varchar';
 		}
 
@@ -263,55 +263,55 @@ 
 			// $attribute_parameter['use_ajax_for_filling_field']='no';
 		// }
 		$attribute_parameter['use_ajax_for_filling_field'] = 'yes';
-		if( $attribute_parameter['backend_input'] == 'multiple-select' ) {
+		if ($attribute_parameter['backend_input'] == 'multiple-select') {
 			$attribute_parameter['is_used_for_variation'] = 'yes';
 		}
 
 		/*	Define the database operation type from action launched by the user	 */
 		$attribute_parameter['default_value'] = (!empty($attribute_parameter['default_value']) && is_array($attribute_parameter['default_value'])) ? serialize($attribute_parameter['default_value']) : (isset($attribute_parameter['default_value']) ? str_replace('"', "'", $attribute_parameter['default_value']) : '');
-		if ( $attribute_parameter['data_type'] == 'datetime' ) {
+		if ($attribute_parameter['data_type'] == 'datetime') {
 			$date_default_value_trasform_into_config = array('default_value' => $attribute_parameter['default_value'], 'field_options' => (!empty($_POST[self::getDbTable() . '_options']) ? sanitize_text_field($_POST[self::getDbTable() . '_options']) : null));
-			$attribute_parameter['default_value'] = serialize( $date_default_value_trasform_into_config );
+			$attribute_parameter['default_value'] = serialize($date_default_value_trasform_into_config);
 		}
 		/*****************************		GENERIC				**************************/
 		/*************************************************************************/
-		$pageAction = (!empty($attribute_parameter['frontend_label']) && isset($_REQUEST[self::getDbTable() . '_action'])) ? sanitize_text_field($_REQUEST[self::getDbTable() . '_action']) : ((!empty($_GET['action']) && ($_GET['action']=='delete')) ? sanitize_text_field($_GET['action']) : '');
+		$pageAction = (!empty($attribute_parameter['frontend_label']) && isset($_REQUEST[self::getDbTable() . '_action'])) ? sanitize_text_field($_REQUEST[self::getDbTable() . '_action']) : ((!empty($_GET['action']) && ($_GET['action'] == 'delete')) ? sanitize_text_field($_GET['action']) : '');
 		$id = isset($attribute_parameter['id']) ? sanitize_key($attribute_parameter['id']) : ((!empty($_GET['id'])) ? $_GET['id'] : '');
-		if(($pageAction != '') && (($pageAction == 'edit') || ($pageAction == 'editandcontinue'))){
-			if(current_user_can('wpshop_edit_attributes')){
+		if (($pageAction != '') && (($pageAction == 'edit') || ($pageAction == 'editandcontinue'))) {
+			if (current_user_can('wpshop_edit_attributes')) {
 				$attribute_parameter['last_update_date'] = date('Y-m-d H:i:s');
-				if($pageAction == 'delete'){
+				if ($pageAction == 'delete') {
 					$attribute_code = $attribute_parameter['code'];
-					if(!isset($attribute_parameter['code']) || ($attribute_parameter['code'] == '')){
+					if (!isset($attribute_parameter['code']) || ($attribute_parameter['code'] == '')) {
 						$attribute = self::getElement($id, "'valid', 'moderated', 'notused'", 'id');
 						$attribute_code = $attribute->code;
 					}
-					if(!in_array($attribute_code, $attribute_undeletable)){
-						if(current_user_can('wpshop_delete_attributes')){
+					if (!in_array($attribute_code, $attribute_undeletable)) {
+						if (current_user_can('wpshop_delete_attributes')) {
 							$attribute_parameter['status'] = 'deleted';
 						}
-						else{
+						else {
 							$actionResult = 'userNotAllowedForActionDelete';
 						}
 					}
-					else{
+					else {
 						$actionResult = 'unDeletableAtribute';
 					}
 				}
 				$actionResult = wpshop_database::update($attribute_parameter, $id, self::getDbTable());
 			}
-			else{
+			else {
 				$actionResult = 'userNotAllowedForActionEdit';
 			}
 		}
-		elseif(($pageAction != '') && (($pageAction == 'delete'))){
+		elseif (($pageAction != '') && (($pageAction == 'delete'))) {
 			$attribute_code = '';
-			if (empty(	$attribute_parameter['code'])) {
+			if (empty($attribute_parameter['code'])) {
 				$attribute = self::getElement($id, "'valid', 'moderated', 'notused', 'deleted'", 'id');
 				$attribute_code = $attribute->code;
 			}
 			if (!in_array($attribute_code, $attribute_undeletable)) {
-				if(current_user_can('wpshop_delete_attributes')){
+				if (current_user_can('wpshop_delete_attributes')) {
 					$attribute_parameter['last_update_date'] = current_time('mysql', 0);
 					$attribute_parameter['status'] = 'deleted';
 					$actionResult = wpshop_database::update($attribute_parameter, $id, self::getDbTable());
@@ -322,21 +322,21 @@ 
 			else
 				$actionResult = 'unDeletableAtribute';
 		}
-		elseif(($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))){
-			if(current_user_can('wpshop_add_attributes')){
+		elseif (($pageAction != '') && (($pageAction == 'save') || ($pageAction == 'saveandcontinue') || ($pageAction == 'add'))) {
+			if (current_user_can('wpshop_add_attributes')) {
 				$attribute_parameter['creation_date'] = current_time('mysql', 0);
-				if(trim($attribute_parameter['code']) == ''){
+				if (trim($attribute_parameter['code']) == '') {
 					$attribute_parameter['code'] = $attribute_parameter['frontend_label'];
 				}
 				$attribute_parameter['code'] = wpshop_tools::slugify(str_replace("\'", "_", str_replace('\"', "_", $attribute_parameter['code'])), array('noAccent', 'noSpaces', 'lowerCase', 'noPunctuation'));
 				$code_exists = self::getElement($attribute_parameter['code'], "'valid', 'moderated', 'deleted'", 'code');
-				if((is_object($code_exists) || is_array($code_exists)) && (count($code_exists) > 0)){
+				if ((is_object($code_exists) || is_array($code_exists)) && (count($code_exists) > 0)) {
 					$attribute_parameter['code'] = $attribute_parameter['code'] . '_' . (count($code_exists) + rand());
 				}
 				$actionResult = wpshop_database::save($attribute_parameter, self::getDbTable());
 				$id = $wpdb->insert_id;
 			}
-			else{
+			else {
 				$actionResult = 'userNotAllowedForActionAdd';
 			}
 		}
@@ -345,9 +345,9 @@ 
 		/************		CHANGE THE FIELD NAME TO TAKE TO DISPLAY				*************/
 		/************		CHANGE ERROR MESSAGE FOR SPECIFIC CASE					*************/
 		/****************************************************************************/
-		if($actionResult != ''){
+		if ($actionResult != '') {
 			$elementIdentifierForMessage = __('the attribute', 'wpshop');
-			if(!empty($attribute_parameter['name']))$elementIdentifierForMessage = '<span class="bold" >' . $attribute_parameter['frontend_label'] . '</span>';
+			if (!empty($attribute_parameter['name']))$elementIdentifierForMessage = '<span class="bold" >' . $attribute_parameter['frontend_label'] . '</span>';
 			if ($actionResult == 'error') {/*	CHANGE HERE FOR SPECIFIC CASE	*/
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . sprintf(__('An error occured while saving %s', 'wpshop'), $elementIdentifierForMessage, ' -> ' . $wpdb->last_error);
 			}
@@ -359,11 +359,11 @@ 
 				$done_options_value = array();
 				$default_value = $attribute_parameter['default_value'];
 				$i = 1;
-				$options = !empty($_REQUEST['options']) ? (array) $_REQUEST['options'] : array();
-				$optionsValue = !empty($_REQUEST['optionsValue']) ? (array) $_REQUEST['optionsValue'] : array();
-				$optionsUpdate = !empty($_REQUEST['optionsUpdate']) ? (array) $_REQUEST['optionsUpdate'] : array();
-				$optionsUpdateValue = !empty($_REQUEST['optionsUpdateValue']) ? (array) $_REQUEST['optionsUpdateValue'] : array();
-				if ( !empty($optionsUpdate) ) {
+				$options = !empty($_REQUEST['options']) ? (array)$_REQUEST['options'] : array();
+				$optionsValue = !empty($_REQUEST['optionsValue']) ? (array)$_REQUEST['optionsValue'] : array();
+				$optionsUpdate = !empty($_REQUEST['optionsUpdate']) ? (array)$_REQUEST['optionsUpdate'] : array();
+				$optionsUpdateValue = !empty($_REQUEST['optionsUpdateValue']) ? (array)$_REQUEST['optionsUpdateValue'] : array();
+				if (!empty($optionsUpdate)) {
 					/**
 					 *	Check if there is an attribute code into sended request or if we have to get the code from database (Bug fix)
 					 */
@@ -377,25 +377,25 @@ 
 					foreach ($optionsUpdate as $option_key => $option_label) {
 						$option_value = !empty($optionsUpdateValue[$option_key]) ? str_replace(",", ".", $optionsUpdateValue[$option_key]) : '';
 
-						if ( empty($option_value) || !in_array($option_value, $done_options_value) ) {
+						if (empty($option_value) || !in_array($option_value, $done_options_value)) {
 							/*	Update an existing value only if the value does not exist into existing list	*/
 							$label = (($option_label != '') ? $option_label : str_replace(",", ".", $option_value));
 							$value = str_replace(",", ".", $option_value);
-							if( !WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT ) {
+							if (!WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT) {
 								$label = $option_label;
-								$value =  str_replace(",", ".", $label);
+								$value = str_replace(",", ".", $label);
 							}
 
 							$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('last_update_date' => current_time('mysql', 0), 'position' => $i, 'label' => stripslashes($label), 'value' => stripslashes($value)), array('id' => $option_key));
 							$done_options_value[] = str_replace(",", ".", $option_value);
 
 							/*	Check if this value is used for price calculation and make update on the different product using this value	*/
-							if($attribute_code == WPSHOP_PRODUCT_PRICE_TAX){
+							if ($attribute_code == WPSHOP_PRODUCT_PRICE_TAX) {
 								$action = wpshop_prices::mass_update_prices();
 							}
 						}
 
-						if($default_value == $option_key) {
+						if ($default_value == $option_key) {
 							/*	Update an existing a only if the value does not exist into existing list	*/
 							$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('last_update_date' => current_time('mysql', 0), 'default_value' => $option_key), array('id' => $id));
 							$done_options_value[] = str_replace(",", ".", $option_value);
@@ -403,13 +403,13 @@ 
 						$i++;
 					}
 				}
-				if ( !empty($options) ) {
-					foreach ( $options as $option_key => $option_label ) {
+				if (!empty($options)) {
+					foreach ($options as $option_key => $option_label) {
 						$option_value = !empty($optionsValue[$option_key]) ? str_replace(",", ".", $optionsValue[$option_key]) : sanitize_title($option_label);
 
 						/*	Check what value to use for the new values	*/
 						$label = (!empty($option_label) ? $option_label : str_replace(",", ".", $option_value));
-						if( !WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT && empty($option_value) ) {
+						if (!WPSHOP_DISPLAY_VALUE_FOR_ATTRIBUTE_SELECT && empty($option_value)) {
 							$label = $option_label;
 							$option_value = sanitize_title($label);
 						}
@@ -417,7 +417,7 @@ 
 						// If the optionsUpdateValue is empty, set it a empty array to avoid error calling the in_array() function
 						// $_REQUEST['optionsUpdateValue'] = !empty($_REQUEST['optionsUpdateValue']) ? $_REQUEST['optionsUpdateValue'] : array();
 
-						if (!in_array($option_value, $done_options_value) && !in_array($option_value, $optionsUpdateValue) ) {
+						if (!in_array($option_value, $done_options_value) && !in_array($option_value, $optionsUpdateValue)) {
 
 							$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('creation_date' => current_time('mysql', 0), 'status' => 'valid', 'attribute_id' => $id, 'position' => $i, 'label' => stripslashes($label), 'value' => stripslashes($option_value)));
 							$done_options_value[] = str_replace(",", ".", $option_value);
@@ -435,19 +435,19 @@ 
 				}
 
 				// If the is_used_for_sort_by is mark as yes, we have to get out some attributes and save it separately
-				if( (!empty($attribute_parameter['is_used_for_sort_by']) && ($attribute_parameter['is_used_for_sort_by'] == 'yes')) || (!empty($attribute_parameter['is_filterable']) && ($attribute_parameter['is_filterable'] == 'yes')) || (!empty($attribute_parameter['is_searchable']) && ($attribute_parameter['is_searchable'] == 'yes')) ){
+				if ((!empty($attribute_parameter['is_used_for_sort_by']) && ($attribute_parameter['is_used_for_sort_by'] == 'yes')) || (!empty($attribute_parameter['is_filterable']) && ($attribute_parameter['is_filterable'] == 'yes')) || (!empty($attribute_parameter['is_searchable']) && ($attribute_parameter['is_searchable'] == 'yes'))) {
 					$attribute_code = $attribute_parameter['code'];
-					if(!isset($attribute_parameter['code']) || ($attribute_parameter['code'] == '')){
+					if (!isset($attribute_parameter['code']) || ($attribute_parameter['code'] == '')) {
 						$attribute = self::getElement($id, "'valid', 'moderated', 'notused'", 'id');
 						$attribute_code = $attribute->code;
 					}
 
 					$count_products = wp_count_posts(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-					for( $i = 0; $i <= $count_products->publish; $i+= 20 ) {
-						$query = $wpdb->prepare( 'SELECT * FROM '. $wpdb->posts .' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT '.$i.', 20', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish' );
-						$products = $wpdb->get_results( $query );
-						if ( !empty($products) ) {
-							foreach( $products as $product ) {
+					for ($i = 0; $i <= $count_products->publish; $i += 20) {
+						$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT ' . $i . ', 20', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish');
+						$products = $wpdb->get_results($query);
+						if (!empty($products)) {
+							foreach ($products as $product) {
 								$query = $wpdb->prepare("SELECT value FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attribute_parameter['data_type'] . " WHERE attribute_id = %d AND entity_type_id = %d AND entity_id = %d AND value != '' ORDER BY creation_date_value DESC", $id, $attribute_parameter['entity_id'], $product->ID);
 								$value = $wpdb->get_var($query);
 								update_post_meta($product->ID, '_' . $attribute_code, $value);
@@ -457,13 +457,13 @@ 
 					wp_reset_query();
 				}
 
-				if ( $pageAction != 'delete' ) {/*	Add the new attribute in the additionnal informations attribute group	*/
-					if ( !empty($set_section) ) {
+				if ($pageAction != 'delete') {/*	Add the new attribute in the additionnal informations attribute group	*/
+					if (!empty($set_section)) {
 						$choosen_set_section = explode('_', $set_section);
 						$set_id = $choosen_set_section[0];
 						$group_id = $choosen_set_section[1];
 					}
-					else{
+					else {
 						$attribute_current_attribute_set = 0;
 						$query = $wpdb->prepare("
 								SELECT id
@@ -473,7 +473,7 @@ 
 									AND ATTRIBUTE_SET_DETAILS.entity_type_id = %d", $id, $attribute_parameter['entity_id']);
 						$attribute_current_attribute_set = $wpdb->get_results($query);
 
-						if ( empty($attribute_current_attribute_set) ) {
+						if (empty($attribute_current_attribute_set)) {
 							$query = $wpdb->prepare("
 								SELECT
 									(
@@ -494,12 +494,12 @@ 
 							$wpshop_default_group = $wpdb->get_row($query);
 
 							$set_id = $wpshop_default_group->attribute_set_id;
-							$default_group_id = ( !empty( $wpshop_default_group->default_attribute_group_id) ) ? $wpshop_default_group->default_attribute_group_id : '';
+							$default_group_id = (!empty($wpshop_default_group->default_attribute_group_id)) ? $wpshop_default_group->default_attribute_group_id : '';
 							$group_id = !empty($default_group_id) ? $default_group_id : $wpshop_default_group->attribute_group_id;
 						}
 					}
 
-					if ( !empty($set_id) && !empty($group_id) ) {
+					if (!empty($set_id) && !empty($group_id)) {
 						$query = $wpdb->prepare(
 								"SELECT (MAX(position) + 1) AS position
 								FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . "
@@ -511,12 +511,12 @@ 
 								$attribute_parameter['entity_id']
 						);
 						$wpshopAttributePosition = $wpdb->get_var($query);
-						if($wpshopAttributePosition == 0)$wpshopAttributePosition = 1;
+						if ($wpshopAttributePosition == 0)$wpshopAttributePosition = 1;
 						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $attribute_parameter['entity_id'], 'attribute_set_id' => $set_id, 'attribute_group_id' => $group_id, 'attribute_id' => $id, 'position' => $wpshopAttributePosition));
 					}
 				}
 
-				if ( !empty($wpshop_attribute_combo_values_list_order_def) ) {
+				if (!empty($wpshop_attribute_combo_values_list_order_def)) {
 					$post_order = explode(',', $wpshop_attribute_combo_values_list_order_def);
 					$position = 1;
 					foreach ($post_order as $post_id) {
@@ -532,19 +532,19 @@ 
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=saveok&saveditem=" . $id));
 				}
 				else */
-				if ( $pageAction == 'add' )
+				if ($pageAction == 'add')
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=edit&id=" . $id));
-				elseif ( $pageAction == 'delete' )
+				elseif ($pageAction == 'delete')
 					wpshop_tools::wpshop_safe_redirect(admin_url('admin.php?page=' . self::getListingSlug() . "&action=deleteok&saveditem=" . $id));
 			}
-			elseif(($actionResult == 'userNotAllowedForActionEdit') || ($actionResult == 'userNotAllowedForActionAdd') || ($actionResult == 'userNotAllowedForActionDelete')){
+			elseif (($actionResult == 'userNotAllowedForActionEdit') || ($actionResult == 'userNotAllowedForActionAdd') || ($actionResult == 'userNotAllowedForActionDelete')) {
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . __('You are not allowed to do this action', 'wpshop');
 			}
-			elseif(($actionResult == 'unDeletableAtribute')){
+			elseif (($actionResult == 'unDeletableAtribute')) {
 				$pageMessage .= '<img src="' . WPSHOP_ERROR_ICON . '" alt="action error" class="wpshopPageMessage_Icon" />' . __('This attribute could not be deleted due to configuration', 'wpshop');
 			}
 
-			if(empty($attribute_parameter['frontend_label']) && ($pageAction!='delete')){
+			if (empty($attribute_parameter['frontend_label']) && ($pageAction != 'delete')) {
 				$pageMessage .= __('Please enter an label for the attribut', 'wpshop');
 			}
 		}
@@ -562,37 +562,37 @@ 
 		//Create an instance of our package class...
 		$wpshop_list_table = new wpshop_attributes_custom_List_table();
 		//Fetch, prepare, sort, and filter our data...
-		$status="'valid'";
-		$attribute_status = !empty($_REQUEST['attribute_status']) ? sanitize_text_field( $_REQUEST['attribute_status'] ) : null;
-		$s = !empty($_REQUEST['s']) ? sanitize_text_field( $_REQUEST['s'] ) : null;
+		$status = "'valid'";
+		$attribute_status = !empty($_REQUEST['attribute_status']) ? sanitize_text_field($_REQUEST['attribute_status']) : null;
+		$s = !empty($_REQUEST['s']) ? sanitize_text_field($_REQUEST['s']) : null;
 		$order = !empty($_REQUEST['order']) ? sanitize_text_field($_REQUEST['order']) : null;
 		$orderby = !empty($_REQUEST['orderby']) ? sanitize_text_field($_REQUEST['orderby']) : null;
-		if(!empty($attribute_status)){
-			switch($attribute_status){
+		if (!empty($attribute_status)) {
+			switch ($attribute_status) {
 				case 'unactive':
-					$status="'moderated', 'notused'";
-					if(empty($order_by) && empty($order)){
+					$status = "'moderated', 'notused'";
+					if (empty($order_by) && empty($order)) {
 						// @TODO : REQUEST
 						// $_REQUEST['orderby']='status';
 						// $_REQUEST['order']='asc';
 					}
 					break;
 				default:
-					$status="'".sanitize_text_field($_REQUEST['attribute_status'])."'";
+					$status = "'" . sanitize_text_field($_REQUEST['attribute_status']) . "'";
 					break;
 			}
 		}
-		if ( !empty($s) ) {
-			$query = $wpdb->prepare("SELECT * FROM " . self::dbTable . ' WHERE frontend_label LIKE "%%%1$s%%" OR frontend_label LIKE "%%%2$s%%" AND backend_label LIKE "%%%1$s%%" OR backend_label LIKE "%%%2$s%%" AND code LIKE "%%%1$s%%" OR code LIKE "%%%2$s%%"', $s, __($s, 'wpshop') );
-			$attr_set_list = $wpdb->get_results( $query );
+		if (!empty($s)) {
+			$query = $wpdb->prepare("SELECT * FROM " . self::dbTable . ' WHERE frontend_label LIKE "%%%1$s%%" OR frontend_label LIKE "%%%2$s%%" AND backend_label LIKE "%%%1$s%%" OR backend_label LIKE "%%%2$s%%" AND code LIKE "%%%1$s%%" OR code LIKE "%%%2$s%%"', $s, __($s, 'wpshop'));
+			$attr_set_list = $wpdb->get_results($query);
 		}
 		else {
-			$attr_set_list = self::getElement( '', $status );
+			$attr_set_list = self::getElement('', $status);
 		}
-		$i=0;
-		$attribute_set_list=array();
-		foreach($attr_set_list as $attr_set){
-			if(!empty($attr_set->id) && ($attr_set->code != 'product_attribute_set_id') ){
+		$i = 0;
+		$attribute_set_list = array();
+		foreach ($attr_set_list as $attr_set) {
+			if (!empty($attr_set->id) && ($attr_set->code != 'product_attribute_set_id')) {
 				$attribute_set_list[$i]['id'] = $attr_set->id;
 				$attribute_set_list[$i]['name'] = $attr_set->frontend_label;
 				$attribute_set_list[$i]['status'] = $attr_set->status;
@@ -640,31 +640,31 @@ 
 		global $attribute_displayed_field, $attribute_options_group;
 		$dbFieldList = wpshop_database::fields_to_input(self::getDbTable());
 		$editedItem = '';
-		if($itemToEdit != '')
+		if ($itemToEdit != '')
 			$editedItem = self::getElement($itemToEdit);
 
 		$the_form_content_hidden = $the_form_general_content = '';
 		$the_form_option_content_list = array();
-		foreach($dbFieldList as $input_key => $input_def){
+		foreach ($dbFieldList as $input_key => $input_def) {
 
-			if(!isset($attribute_displayed_field) || !is_array($attribute_displayed_field) || in_array($input_def['name'], $attribute_displayed_field)){
+			if (!isset($attribute_displayed_field) || !is_array($attribute_displayed_field) || in_array($input_def['name'], $attribute_displayed_field)) {
 				$input_def['label'] = $input_def['name'];
-				$input_def_id=$input_def['id']='wpshop_' . self::currentPageCode . '_edition_table_field_id_'.$input_def['label'];
+				$input_def_id = $input_def['id'] = 'wpshop_' . self::currentPageCode . '_edition_table_field_id_' . $input_def['label'];
 
 				$pageAction = isset($_REQUEST[self::getDbTable() . '_action']) ? sanitize_text_field($_REQUEST[self::getDbTable() . '_action']) : '';
 				$requestFormValue = isset($_REQUEST[self::currentPageCode][$input_def['label']]) ? sanitize_text_field($_REQUEST[self::currentPageCode][$input_def['label']]) : '';
 				$currentFieldValue = $input_def['value'];
-				if(is_object($editedItem))
+				if (is_object($editedItem))
 					$currentFieldValue = $editedItem->{$input_def['label']};
-				elseif(($pageAction != '') && ($requestFormValue != ''))
+				elseif (($pageAction != '') && ($requestFormValue != ''))
 					$currentFieldValue = $requestFormValue;
 
-				if($input_def['label'] == 'status'){
-					if(in_array('notused', $input_def['possible_value'])){
+				if ($input_def['label'] == 'status') {
+					if (in_array('notused', $input_def['possible_value'])) {
 						$key = array_keys($input_def['possible_value'], 'notused');
 						unset($input_def['possible_value'][$key[0]]);
 					}
-					if(in_array('dbl', $input_def['possible_value'])){
+					if (in_array('dbl', $input_def['possible_value'])) {
 						$key = array_keys($input_def['possible_value'], 'dbl');
 						unset($input_def['possible_value'][$key[0]]);
 					}
@@ -672,94 +672,94 @@ 
 					$input_def['type'] = 'checkbox';
 					$input_def['label'] = __('Use this attribute', 'wpshop');
 					$input_def['possible_value'] = array('valid');
-					$input_def_id.='_valid';
-					$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box for using this attribute', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+					$input_def_id .= '_valid';
+					$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box for using this attribute', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 				}
 
-				if ( (substr($input_def['label'], 0, 3) == 'is_') || ( $input_def['label'] == '_display_informations_about_value') ) {
+				if ((substr($input_def['label'], 0, 3) == 'is_') || ($input_def['label'] == '_display_informations_about_value')) {
 					$input_def['type'] = 'checkbox';
 					$input_def['possible_value'] = 'yes';
 				}
-				switch($input_def['label']){
+				switch ($input_def['label']) {
 					case 'is_requiring_unit':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box for using unit with this attribute', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box for using unit with this attribute', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_visible_in_front':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box for displaying this attribute in shop', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box for displaying this attribute in shop', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_visible_in_front_listing':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box for displaying this attribute in product listing in shop', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box for displaying this attribute in product listing in shop', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_used_for_sort_by':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box for displaying this attribute into sortbar', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box for displaying this attribute into sortbar', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_searchable':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box for including values of this attribute as search parameter', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box for including values of this attribute as search parameter', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_visible_in_advanced_search':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box for using in advanced search form', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box for using in advanced search form', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'frontend_css_class':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Separate with a space each CSS Class', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Separate with a space each CSS Class', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'backend_css_class':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Separate with a space each CSS Class', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Separate with a space each CSS Class', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_historisable':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box if you want to save the different value this attribute, each time it is modified', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box if you want to save the different value this attribute, each time it is modified', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_filterable':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box if you want to use this attribute in the filter search', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box if you want to use this attribute in the filter search', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_intrinsic':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box if this attribute is intrinsic for a product', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box if this attribute is intrinsic for a product', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_used_for_variation':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box if this attribute is used for variation. It means that the user would be able to choose a value in frontend', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box if this attribute is used for variation. It means that the user would be able to choose a value in frontend', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 					case 'is_used_in_variation':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box if you want to use this attribute for variation definition', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
-						if ( !empty($editedItem) && ($editedItem->is_used_for_variation == 'yes') ) {
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box if you want to use this attribute for variation definition', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
+						if (!empty($editedItem) && ($editedItem->is_used_for_variation == 'yes')) {
 							$input_def['option'] = 'disabled="disabled"';
 						}
 					break;
 					case 'is_user_defined':
-						$input_def['options_label']['custom'] = '<a href="#" title="'.__('Check this box if you want your customer to choose a value for this attribute into frontend product', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+						$input_def['options_label']['custom'] = '<a href="#" title="' . __('Check this box if you want your customer to choose a value for this attribute into frontend product', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 					break;
 				}
 
 				$input_def['value'] = $currentFieldValue;
-				if($input_def['label'] == 'code')
+				if ($input_def['label'] == 'code')
 					$input_def['type'] = 'hidden';
-				elseif($input_def['label'] == 'entity_id'){
+				elseif ($input_def['label'] == 'entity_id') {
 					$input_def['possible_value'] = wpshop_entities::get_entities_list();
 					$input_def['valueToPut'] = 'index';
 					$input_def['type'] = 'select';
 
-					$i=0;
-					foreach($input_def['possible_value'] as $entity_id => $entity_name) {
-						if($i <= 0){
+					$i = 0;
+					foreach ($input_def['possible_value'] as $entity_id => $entity_name) {
+						if ($i <= 0) {
 							$current_entity_id = $entity_id;
 						}
 						$i++;
 					}
 				}
-				elseif($input_def['label'] == '_unit_group_id'){
+				elseif ($input_def['label'] == '_unit_group_id') {
 					$input_def['possible_value'] = wpshop_attributes_unit::get_unit_group();
 					$input_def['type'] = 'select';
 				}
-				elseif($input_def['label'] == '_default_unit'){
+				elseif ($input_def['label'] == '_default_unit') {
 					$unit_group_list = wpshop_attributes_unit::get_unit_group();
-					$input_def['possible_value'] = wpshop_attributes_unit::get_unit_list_for_group(!empty($editedItem->_unit_group_id)?$editedItem->_unit_group_id:(!empty($unit_group_list)?$unit_group_list[0]->id:''));
+					$input_def['possible_value'] = wpshop_attributes_unit::get_unit_list_for_group(!empty($editedItem->_unit_group_id) ? $editedItem->_unit_group_id : (!empty($unit_group_list) ? $unit_group_list[0]->id : ''));
 					$input_def['type'] = 'select';
 				}
 				elseif ($input_def['label'] == 'backend_input') {
-					if ( !is_object($editedItem) ) {
+					if (!is_object($editedItem)) {
 						$input_def['type'] = 'hidden';
 					}
 					else {
 						$new_possible_value = array();
-						switch ( $editedItem->data_type) {
+						switch ($editedItem->data_type) {
 							case 'integer':
 								$new_possible_value[__('Checkbox', 'wpshop')] = 'checkbox';
 								$new_possible_value[__('Radio button', 'wpshop')] = 'radio';
@@ -767,7 +767,7 @@ 
 								$new_possible_value[__('multiple-select', 'wpshop')] = 'multiple-select';
 								break;
 							case 'varchar':
-								switch ( $input_def['value'] ) {
+								switch ($input_def['value']) {
 									case 'hidden':
 										$new_possible_value[__('Hidden field', 'wpshop')] = 'hidden_field';
 										break;
@@ -795,8 +795,8 @@ 
 				elseif ($input_def['label'] == 'frontend_input') {
 					$new_possible_value = array();
 
-					if ( is_object($editedItem) ) {
-						switch ( $editedItem->data_type) {
+					if (is_object($editedItem)) {
+						switch ($editedItem->data_type) {
 							case 'integer':
 								$new_possible_value[__('Checkbox', 'wpshop')] = 'checkbox';
 								$new_possible_value[__('Radio button', 'wpshop')] = 'radio';
@@ -804,7 +804,7 @@ 
 								$new_possible_value[__('multiple-select', 'wpshop')] = 'multiple-select';
 								break;
 							case 'varchar':
-									switch ( $input_def['value'] ) {
+									switch ($input_def['value']) {
 										case 'hidden':
 											$new_possible_value[__('Hidden field', 'wpshop')] = 'hidden_field';
 										break;
@@ -842,10 +842,10 @@ 
 
 					$input_def['possible_value'] = $new_possible_value;
 
-					if ( !empty($editedItem->frontend_input) ) {
-						switch ( $editedItem->frontend_input ) {
+					if (!empty($editedItem->frontend_input)) {
+						switch ($editedItem->frontend_input) {
 							case 'text':
-								switch ( $editedItem->data_type ) {
+								switch ($editedItem->data_type) {
 									case 'varchar':
 										$input_def['value'] = 'short_text';
 									break;
@@ -870,7 +870,7 @@ 
 					}
 				}
 
-				if(is_object($editedItem) && (($input_def['label'] == 'code') || ($input_def['label'] == 'data_type') || ($input_def['label'] == 'entity_id'))){
+				if (is_object($editedItem) && (($input_def['label'] == 'code') || ($input_def['label'] == 'data_type') || ($input_def['label'] == 'entity_id'))) {
 					// $input_def['type'] = 'hidden';
 					$input_def['option'] = ' disabled="disabled" ';
 					$the_form_content_hidden .= '<input type="hidden" name="' . self::getDbTable() . '[' . $input_def['name'] . ']" value="' . $input_def['value'] . '" />';
@@ -881,16 +881,16 @@ 
 				$input_def['value'] = str_replace("\\", "", $input_def['value']);
 
 				$the_input = wpshop_form::check_input_type($input_def, self::getDbTable());
-				if ( $input_def['label'] == 'default_value' ) {
-					if ( !empty($editedItem->frontend_input) ) {
-						switch ( $editedItem->frontend_input ) {
+				if ($input_def['label'] == 'default_value') {
+					if (!empty($editedItem->frontend_input)) {
+						switch ($editedItem->frontend_input) {
 							case 'text':
 								$input_def['type'] = 'text';
-								switch ( $editedItem->data_type ) {
+								switch ($editedItem->data_type) {
 									case 'datetime':
-										$the_input = wpshop_attributes::attribute_type_date_config( unserialize($input_def['value']) );
+										$the_input = wpshop_attributes::attribute_type_date_config(unserialize($input_def['value']));
 
-										$input_def['label'] = __('Date field configuration','wpshop');
+										$input_def['label'] = __('Date field configuration', 'wpshop');
 									break;
 									default:
 										$the_input = wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE);
@@ -907,7 +907,7 @@ 
 							case 'multiple-select':
 							case 'radio':
 							case 'checkbox':
-								$input_def['label'] = __('Options list for attribute','wpshop') . '
+								$input_def['label'] = __('Options list for attribute', 'wpshop') . '
 <div class="alignright wpshop_change_select_data_type" >
 	+' . __('Change data type for this attribute', 'wpshop') . '
 </div>';
@@ -921,50 +921,50 @@ 
 						}
 					}
 					else {
-						$input_def['type']='text';
+						$input_def['type'] = 'text';
 						$the_input = wpshop_form::check_input_type($input_def, self::getDbTable());
 					}
 				}
-				if( $input_def['label'] == '_unit_group_id') {
+				if ($input_def['label'] == '_unit_group_id') {
 					$the_input .= '<div id="wpshop_loader_input_group_unit"></div>';
-					$the_input .= '<a class="button-primary" href="#wpshop_unit_group_list" id="wpshop_attribute_group_unit_manager_opener" data-nonce="' . wp_create_nonce( 'load_unit_interface' ) . '">'.__('Manage group unit', 'wpshop').'</a>';
+					$the_input .= '<a class="button-primary" href="#wpshop_unit_group_list" id="wpshop_attribute_group_unit_manager_opener" data-nonce="' . wp_create_nonce('load_unit_interface') . '">' . __('Manage group unit', 'wpshop') . '</a>';
 				}
 
-				if( $input_def['label'] == '_default_unit') {
+				if ($input_def['label'] == '_default_unit') {
 					$the_input .= '<div id="wpshop_loader_input_unit"></div>';
-					$the_input .= '<a class="button-primary" href="#wpshop_unit_list" id="wpshop_attribute_unit_manager_opener" data-nonce="' . wp_create_nonce( 'load_unit_interface' ) . '">'.__('Manage units', 'wpshop').'</a>';
+					$the_input .= '<a class="button-primary" href="#wpshop_unit_list" id="wpshop_attribute_unit_manager_opener" data-nonce="' . wp_create_nonce('load_unit_interface') . '">' . __('Manage units', 'wpshop') . '</a>';
 					$the_input .= '<input type="hidden" name="input_wpshop_load_attribute_unit_list" id="input_wpshop_load_attribute_unit_list" value="' . wp_create_nonce("wpshop_load_attribute_unit_list") . '" />';
 					$the_input .= '<div id="wpshop_attribute_unit_manager" title="' . __('Unit management', 'wpshop') . '" class="wpshopHide" ><div class="loading_picture_container" id="product_chooser_picture" ><img src="' . WPSHOP_LOADING_ICON . '" alt="loading..." /></div></div>';
 				}
 
 
-				if($input_def['type'] != 'hidden'){
-					if ( ($input_def['label'] == 'entity_id') && is_object($editedItem) ) {
+				if ($input_def['type'] != 'hidden') {
+					if (($input_def['label'] == 'entity_id') && is_object($editedItem)) {
 						$the_input .= '<br/><span class="wpshop_duplicate_attribute" >' . __('Duplicate this attribute to . another entity', 'wpshop') . '</span>';
 					}
 					$input = '
-		<tr class="wpshop_' . self::currentPageCode . '_edition_table_line wpshop_' . self::currentPageCode . '_edition_table_line_'.$input_def['name'].'" >
-			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_label wpshop_' . self::currentPageCode . '_edition_table_field_label_'.$input_def['name'].'" ><label for="'.$input_def_id.'" >' . __($input_def['label'], 'wpshop') . '</label></td>
-			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_input wpshop_' . self::currentPageCode . '_edition_table_field_input_'.$input_def['name'].'" >' . $the_input . '</td>
+		<tr class="wpshop_' . self::currentPageCode . '_edition_table_line wpshop_' . self::currentPageCode . '_edition_table_line_' . $input_def['name'] . '" >
+			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_label wpshop_' . self::currentPageCode . '_edition_table_field_label_' . $input_def['name'] . '" ><label for="' . $input_def_id . '" >' . __($input_def['label'], 'wpshop') . '</label></td>
+			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_input wpshop_' . self::currentPageCode . '_edition_table_field_input_' . $input_def['name'] . '" >' . $the_input . '</td>
 		</tr>';
-					if ( (substr($input_def['label'], 0, 3) == 'is_') || (substr($input_def['label'], 0, 1) == '_') || in_array($input_def['label'], unserialize( WPSHOP_ATTRIBUTE_DEF_COLUMN_INTO_OPTIONS )) )
+					if ((substr($input_def['label'], 0, 3) == 'is_') || (substr($input_def['label'], 0, 1) == '_') || in_array($input_def['label'], unserialize(WPSHOP_ATTRIBUTE_DEF_COLUMN_INTO_OPTIONS)))
 						$the_form_option_content_list[$input_def['label']] = $input;
 					else {
 						$the_form_general_content .= $input;
-						if ( ($input_def['label'] == 'frontend_input') && !is_object($editedItem) ) {
+						if (($input_def['label'] == 'frontend_input') && !is_object($editedItem)) {
 
-							$the_input = wpshop_attributes_set::get_attribute_set_complete_list($current_entity_id,  self::getDbTable(), self::currentPageCode);
+							$the_input = wpshop_attributes_set::get_attribute_set_complete_list($current_entity_id, self::getDbTable(), self::currentPageCode);
 
 							$input = '
 		<tr class="wpshop_' . self::currentPageCode . '_edition_table_line wpshop_' . self::currentPageCode . '_edition_table_line_set_section" >
-			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_label wpshop_' . self::currentPageCode . '_edition_table_field_label_set_section" ><label for="'.self::currentPageCode.'_set_section" >' . __('Affect this new attribute to the set section', 'wpshop') . '</label></td>
+			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_label wpshop_' . self::currentPageCode . '_edition_table_field_label_set_section" ><label for="' . self::currentPageCode . '_set_section" >' . __('Affect this new attribute to the set section', 'wpshop') . '</label></td>
 			<td class="wpshop_' . self::currentPageCode . '_edition_table_cell wpshop_' . self::currentPageCode . '_edition_table_field_input wpshop_' . self::currentPageCode . '_edition_table_field_input_set_section" >' . $the_input . '</td>
 		</tr>';
 							$the_form_general_content .= $input;
 						}
 					}
 				}
-				else{
+				else {
 					$the_form_content_hidden .= '
 				' . $the_input;
 				}
@@ -980,17 +980,17 @@ 
 		$section_content = $the_form_general_content;
 
 		ob_start();
-		include(WPSHOP_TEMPLATES_DIR.'admin/admin_box_section.tpl.php');
+		include(WPSHOP_TEMPLATES_DIR . 'admin/admin_box_section.tpl.php');
 		$the_form_general_content = ob_get_contents();
 		ob_end_clean();
 
 		/** It is attribute TVA, add a button to calcilate price in mass **/
-		if ( !empty($editedItem) && !empty($editedItem->code) && $editedItem->code == 'tx_tva' ) {
-			$the_form_general_content .= '<input type="button" data-nonce="' . wp_create_nonce( 'wps_update_products_prices' ) . '" id="wps_update_price_infos" value="' .__('Update all products price', 'wpshop').'" /> <img src="' .WPSHOP_LOADING_ICON. '" alt="" id="update_products_loader" /> <br/>';
-			$the_form_general_content .= __('If you have updated your VAT rates, save it and update your products price after', 'wpshop' );
+		if (!empty($editedItem) && !empty($editedItem->code) && $editedItem->code == 'tx_tva') {
+			$the_form_general_content .= '<input type="button" data-nonce="' . wp_create_nonce('wps_update_products_prices') . '" id="wps_update_price_infos" value="' . __('Update all products price', 'wpshop') . '" /> <img src="' . WPSHOP_LOADING_ICON . '" alt="" id="update_products_loader" /> <br/>';
+			$the_form_general_content .= __('If you have updated your VAT rates, save it and update your products price after', 'wpshop');
 		}
 		if (!empty($the_form_option_content_list)) {
-			$the_form_option_content_section='';
+			$the_form_option_content_section = '';
 			foreach ($attribute_options_group as $group_name => $group_content) {
 				$section_content = '';
 				foreach ($group_content as $group_code) {
@@ -999,23 +999,23 @@ 
 						unset($the_form_option_content_list[$group_code]);
 					}
 				}
-				$section_legend = __($group_name,'wpshop');
+				$section_legend = __($group_name, 'wpshop');
 				$section_page_code = self::currentPageCode;
 
 				ob_start();
-				include(WPSHOP_TEMPLATES_DIR.'admin/admin_box_section.tpl.php');
+				include(WPSHOP_TEMPLATES_DIR . 'admin/admin_box_section.tpl.php');
 				$the_form_option_content_section .= ob_get_contents();
 				ob_end_clean();
 			}
 
 			/*	Check there are other attributes to display not in defined group	*/
 			if (!empty($the_form_option_content_list)) {
-				$section_legend = __('General options','wpshop');
+				$section_legend = __('General options', 'wpshop');
 				$section_content = implode('', $the_form_option_content_list);
 				$section_page_code = self::currentPageCode;
 
 				ob_start();
-				include(WPSHOP_TEMPLATES_DIR.'admin/admin_box_section.tpl.php');
+				include(WPSHOP_TEMPLATES_DIR . 'admin/admin_box_section.tpl.php');
 				$the_form_option_content = ob_get_contents();
 				ob_end_clean();
 
@@ -1025,17 +1025,17 @@ 
 		}
 
 		/*	Default content for the current page	*/
-		$bloc_list[self::currentPageCode]['main_info']['title']=__('Main informations', 'wpshop');
+		$bloc_list[self::currentPageCode]['main_info']['title'] = __('Main informations', 'wpshop');
 		$bloc_list[self::currentPageCode]['main_info']['content'] = $the_form_general_content;
 
-		$bloc_list[self::currentPageCode]['options']['title']=__('Options', 'wpshop');
-		$bloc_list[self::currentPageCode]['options']['content']=$the_form_option_content;
+		$bloc_list[self::currentPageCode]['options']['title'] = __('Options', 'wpshop');
+		$bloc_list[self::currentPageCode]['options']['content'] = $the_form_option_content;
 
-		$action = !empty( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action' ] ) : '';
+		$action = !empty($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : '';
 		$the_form = '
 <form name="' . self::getDbTable() . '_form" id="' . self::getDbTable() . '_form" method="post" action="#" >
-	' . wpshop_form::form_input(self::getDbTable() . '_action', self::getDbTable() . '_action', (isset($action) && ($action != '') ? sanitize_text_field($action) : 'save') , 'hidden') . '
-	' . wpshop_form::form_input(self::currentPageCode . '_form_has_modification', self::currentPageCode . '_form_has_modification', 'no' , 'hidden') . $the_form_content_hidden . wpshop_display::custom_page_output_builder($bloc_list, WPSHOP_ATTRIBUTE_EDITION_PAGE_LAYOUT) . '
+	' . wpshop_form::form_input(self::getDbTable() . '_action', self::getDbTable() . '_action', (isset($action) && ($action != '') ? sanitize_text_field($action) : 'save'), 'hidden') . '
+	' . wpshop_form::form_input(self::currentPageCode . '_form_has_modification', self::currentPageCode . '_form_has_modification', 'no', 'hidden') . $the_form_content_hidden . wpshop_display::custom_page_output_builder($bloc_list, WPSHOP_ATTRIBUTE_EDITION_PAGE_LAYOUT) . '
 </form>
 <div title="' . __('Change data type for selected attribute', 'wpshop') . '" id="wpshop_dialog_change_select_data_type" ><div id="wpshop_dialog_change_select_data_type_container" ></div></div>';
 		$input_def['possible_value'] = wpshop_entities::get_entities_list();
@@ -1053,7 +1053,7 @@ 
 		$the_form .= '
 <script type="text/javascript" >
 	wpshop(document).ready(function(){
-		wpshopMainInterface("'.self::getDbTable().'", "' . __('Are you sure you want to quit this page? You will loose all current modification', 'wpshop') . '", "' . __('Are you sure you want to delete this attributes group?', 'wpshop') . '");
+		wpshopMainInterface("'.self::getDbTable() . '", "' . __('Are you sure you want to quit this page? You will loose all current modification', 'wpshop') . '", "' . __('Are you sure you want to delete this attributes group?', 'wpshop') . '");
 
 		jQuery("#wpshop_dialog_duplicate_attribute").dialog({
 			autoOpen: false,
@@ -1063,7 +1063,7 @@ 
 			dialogClass: "wpshop_uidialog_box",
 			resizable: false,
 			buttons:{
-				"'.__('Duplicate', 'wpshop').'": function(){
+				"'.__('Duplicate', 'wpshop') . '": function(){
 					var data = {
 						action: "wpshop_duplicate_attribute",
 						wpshop_ajax_nonce: "' . wp_create_nonce("wpshop_duplicate_attribute") . '",
@@ -1079,7 +1079,7 @@ 
 						}
 					}, "json");
 				},
-				"'.__('Cancel', 'wpshop').'": function(){
+				"'.__('Cancel', 'wpshop') . '": function(){
 					jQuery(this).dialog("close");
 					jQuery(".wpshop_duplicate_attribute_result").remove();
 				}
@@ -1097,7 +1097,7 @@ 
 			dialogClass: "wpshop_uidialog_box",
 			resizable: false,
 			buttons:{
-				"'.__('Change type', 'wpshop').'": function(){
+				"'.__('Change type', 'wpshop') . '": function(){
 					var delete_entity = false;
 					if(jQuery("#delete_entity").is(":checked")){
 						var delete_entity = true;
@@ -1120,7 +1120,7 @@ 
 						jQuery("#wpshop_dialog_change_select_data_type").dialog("close");
 					}, "json");
 				},
-				"'.__('Cancel', 'wpshop').'": function(){
+				"'.__('Cancel', 'wpshop') . '": function(){
 					jQuery(this).dialog("close");
 				}
 			}
@@ -1160,7 +1160,7 @@ 
 			change_unit_list();
 		});';
 
-		if ( !is_object($editedItem) )  {
+		if (!is_object($editedItem)) {
 			$the_form .= '
 		jQuery("#wpshop_attributes_edition_table_field_id_frontend_input").change(function(){
 			jQuery(".wpshop_attributes_edition_table_field_input_default_value").html(jQuery("#wpshopLoadingPicture").html());
@@ -1243,23 +1243,23 @@ 
 	 *
 	 *	@return string $currentPageButton The html output code with the different button to add to the interface
 	 */
-	function getPageFormButton($element_id = 0){
+	function getPageFormButton($element_id = 0) {
 		$action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : 'add';
 		$currentPageButton = '';
 
 		 //$currentPageButton .= '<h2 class="cancelButton alignleft" ><a href="' . admin_url('edit.php?post_type='.WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES.'&amp;page=' . self::getListingSlug()) . '" class="button add-new-h2" >' . __('Back', 'wpshop') . '</a></h2>';
 
-		if(($action == 'add') && (current_user_can('wpshop_add_attributes')))
+		if (($action == 'add') && (current_user_can('wpshop_add_attributes')))
 			$currentPageButton .= '<input type="button" class="button-primary" id="add" name="add" value="' . __('Add', 'wpshop') . '" />';
 
-		elseif(current_user_can('wpshop_edit_attributes'))
+		elseif (current_user_can('wpshop_edit_attributes'))
 		$currentPageButton .= '<input type="button" class="button-primary" id="save" name="save" value="' . __('Save', 'wpshop') . '" />';
 
 		$attribute_undeletable = unserialize(WPSHOP_ATTRIBUTE_UNDELETABLE);
 		$attribute = self::getElement($element_id, "'valid', 'moderated', 'notused'", 'id');
-		$attribute_code = !empty($attribute->code)?$attribute->code:'';
-		if(current_user_can('wpshop_delete_attributes') && ($action != 'add') && !in_array($attribute_code, $attribute_undeletable))
-			$currentPageButton .= '<input type="button" class="button-secondary wpshop_delete_element_button wpshop_delete_element_button_'.self::currentPageCode.'" id="delete" name="delete" value="' . __('Delete', 'wpshop') . '" />';
+		$attribute_code = !empty($attribute->code) ? $attribute->code : '';
+		if (current_user_can('wpshop_delete_attributes') && ($action != 'add') && !in_array($attribute_code, $attribute_undeletable))
+			$currentPageButton .= '<input type="button" class="button-secondary wpshop_delete_element_button wpshop_delete_element_button_' . self::currentPageCode . '" id="delete" name="delete" value="' . __('Delete', 'wpshop') . '" />';
 
 		return $currentPageButton;
 	}
@@ -1273,22 +1273,22 @@ 
 	 *
 	 *	@return object $element_list A wordpress database object containing the attribute list
 	 */
-	public static function getElement($element_id = '', $element_status = "'valid', 'moderated', 'notused'", $field_to_search = 'id', $list = false){
+	public static function getElement($element_id = '', $element_status = "'valid', 'moderated', 'notused'", $field_to_search = 'id', $list = false) {
 
 		global $wpdb;
 		$element_list = array();
 		$moreQuery = "";
-		$moreArgs = array( 1, );
+		$moreArgs = array(1,);
 
-		$orderby = !empty( $_REQUEST['orderby'] ) ? sanitize_text_field( $_REQUEST['orderby'] ) : '';
-		$order = !empty( $_REQUEST['order'] ) ? sanitize_text_field( $_REQUEST['order'] ) : '';
+		$orderby = !empty($_REQUEST['orderby']) ? sanitize_text_field($_REQUEST['orderby']) : '';
+		$order = !empty($_REQUEST['order']) ? sanitize_text_field($_REQUEST['order']) : '';
 
-		if($element_id != ''){
+		if ($element_id != '') {
 			$moreQuery .= "
 					AND CURRENT_ELEMENT." . $field_to_search . " = %s ";
 			$moreArgs[] = $element_id;
 		}
-		if(!empty($orderby) && !empty($order)){
+		if (!empty($orderby) && !empty($order)) {
 			$moreQuery .= "
 					ORDER BY " . $orderby . "  " . $order;
 		}
@@ -1297,15 +1297,15 @@ 
 			"SELECT CURRENT_ELEMENT.*, ENTITIES.post_name as entity
 			FROM " . self::getDbTable() . " AS CURRENT_ELEMENT
 			INNER JOIN {$wpdb->posts} AS ENTITIES ON (ENTITIES.ID = CURRENT_ELEMENT.entity_id)
-			WHERE %d AND CURRENT_ELEMENT.status IN (".$element_status.") " . $moreQuery,
+			WHERE %d AND CURRENT_ELEMENT.status IN (" . $element_status . ") " . $moreQuery,
 			$moreArgs
 		);
 
 		/*	Get the query result regarding on the function parameters. If there must be only one result or a collection	*/
-		if(($element_id == '') || $list){
+		if (($element_id == '') || $list) {
 			$element_list = $wpdb->get_results($query);
 		}
-		else{
+		else {
 			$element_list = $wpdb->get_row($query);
 		}
 
@@ -1327,8 +1327,8 @@ 
 		$user_id = function_exists('is_user_logged_in') && is_user_logged_in() ? get_current_user_id() : '0';
 		$sent_attribute_list = array();
 
-		if ( !empty($attributeToSet) ) {
-			$attributeToSet = apply_filters( 'save_attribute_for_entity', $attributeToSet, $entityTypeId, $entityId );
+		if (!empty($attributeToSet)) {
+			$attributeToSet = apply_filters('save_attribute_for_entity', $attributeToSet, $entityTypeId, $entityId);
 			$old_attribute_to_set = $attributeToSet;
 			$attribute_setted = array();
 			foreach ($attributeToSet as $attributeType => $attributeTypeDetails) {
@@ -1337,39 +1337,39 @@ 
 					'entity_id' => $entityId,
 					'entity_type_id' => $entityTypeId
 				);
-				if ( WPSHOP_ATTRIBUTE_VALUE_PER_USER ) {
+				if (WPSHOP_ATTRIBUTE_VALUE_PER_USER) {
 					$delete_current_attribute_values_params['user_id'] = $user_id;
 				}
 
-				if(!empty($attributeTypeDetails) && is_array($attributeTypeDetails)) {
-					$attributeTypeDetails = apply_filters( "save_attribute_for_entity_{$attributeType}", $attributeTypeDetails, $entityTypeId, $entityId );
-					foreach($attributeTypeDetails as $attribute_code => $attributeValue) {
-						$attributeValue = apply_filters( "save_attribute_for_entity_{$attributeType}_{$attribute_code}", apply_filters( "save_attribute_for_entity__{$attribute_code}", $attributeValue, $entityTypeId, $entityId ), $entityTypeId, $entityId );
+				if (!empty($attributeTypeDetails) && is_array($attributeTypeDetails)) {
+					$attributeTypeDetails = apply_filters("save_attribute_for_entity_{$attributeType}", $attributeTypeDetails, $entityTypeId, $entityId);
+					foreach ($attributeTypeDetails as $attribute_code => $attributeValue) {
+						$attributeValue = apply_filters("save_attribute_for_entity_{$attributeType}_{$attribute_code}", apply_filters("save_attribute_for_entity__{$attribute_code}", $attributeValue, $entityTypeId, $entityId), $entityTypeId, $entityId);
 						$old_attribute_value = $attributeValue;
 
-						if ( $attributeType == 'decimal' ) {
+						if ($attributeType == 'decimal') {
 							$attributeValue = str_replace(',', '.', $attributeValue);
 						}
-						if ( ($attributeType == 'integer') && !is_array($attributeValue) ) {
+						if (($attributeType == 'integer') && !is_array($attributeValue)) {
 							$attributeValue = (int)$attributeValue;
 						}
 						$more_query_params_values = array();
-						if($attribute_code != 'unit') {
+						if ($attribute_code != 'unit') {
 
 							$unit_id = 0;
-							if(isset($attributeTypeDetails['unit'][$attribute_code])){
+							if (isset($attributeTypeDetails['unit'][$attribute_code])) {
 								$unit_id = $attributeTypeDetails['unit'][$attribute_code];
 							}
 
 							$currentAttribute = self::getElement($attribute_code, "'valid'", 'code');
-							if( !empty($currentAttribute) ){
+							if (!empty($currentAttribute)) {
 								$sent_attribute_list[] = $currentAttribute->id;
 
 								/*	Enregistrement de la valeur actuelle de l'attribut dans la table d'historique si l'option historique est activee sur l'attribut courant	*/
-								if (  $currentAttribute->is_historisable == 'yes') {
+								if ($currentAttribute->is_historisable == 'yes') {
 									$query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType . " WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d", $entityTypeId, $currentAttribute->id, $entityId);
 									$attribute_histo = $wpdb->get_results($query);
-									if(!empty($attribute_histo)){
+									if (!empty($attribute_histo)) {
 										$attribute_histo_content['status'] = 'valid';
 										$attribute_histo_content['creation_date'] = current_time('mysql', 0);
 										$attribute_histo_content['creation_date_value'] = $attribute_histo[0]->creation_date_value;
@@ -1387,8 +1387,8 @@ 
 								}
 								$attributeValue = str_replace("\\", "", $attributeValue);
 
-								if ( empty($from) || (!empty($attributeValue)) ) {
-									$wpdb->delete(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.$attributeType, array_merge($delete_current_attribute_values_params, array('attribute_id' => $currentAttribute->id)));
+								if (empty($from) || (!empty($attributeValue))) {
+									$wpdb->delete(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType, array_merge($delete_current_attribute_values_params, array('attribute_id' => $currentAttribute->id)));
 
 									/**	Insertion de la nouvelle valeur de l'attribut dans la base	*/
 									$query_params = array(
@@ -1402,66 +1402,66 @@ 
 										'creation_date_value' => current_time('mysql', 0)
 									);
 									/**	Si l'attribut courant est contenu dans un tableau (exemple: select multiple) on lit tout le tableau et on enregistre chaque valeur separement	*/
-									if(is_array($attributeValue)){
-										foreach($attributeValue as $a){
-											$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.$attributeType, array_merge($query_params, array('value' => $a)));
+									if (is_array($attributeValue)) {
+										foreach ($attributeValue as $a) {
+											$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType, array_merge($query_params, array('value' => $a)));
 										}
 									}
-									else{
-										$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.$attributeType, array_merge($query_params, array('value' => $attributeValue)));
-										wpeologs_ctr::log_datas_in_files( 'wpshop_attributes', array(
+									else {
+										$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType, array_merge($query_params, array('value' => $attributeValue)));
+										wpeologs_ctr::log_datas_in_files('wpshop_attributes', array(
 											'object_id' 	=> $entityId,
-											'message' 		=> __( 'Add the attribute : ' . $currentAttribute->code . ' with value : ' . $attributeValue , 'wpshop' ) ), 0
+											'message' 		=> __('Add the attribute : ' . $currentAttribute->code . ' with value : ' . $attributeValue, 'wpshop') ), 0
 										);
 									}
 
 									/**	Dans le cas ou l'attribut courant est utilise dans l'interface permettant de trier les produits (option de l'attribut) on defini une meta specifique	*/
-									if ( ( ($currentAttribute->is_used_for_sort_by == 'yes') || ($currentAttribute->is_searchable == 'yes'))  || ( $currentAttribute->is_filterable == 'yes') && !empty($attributeValue) ) :
-										update_post_meta($entityId, '_'.$attribute_code, $attributeValue);
+									if ((($currentAttribute->is_used_for_sort_by == 'yes') || ($currentAttribute->is_searchable == 'yes')) || ($currentAttribute->is_filterable == 'yes') && !empty($attributeValue)) :
+										update_post_meta($entityId, '_' . $attribute_code, $attributeValue);
 									endif;
 
 									/**	Enregistrement de toutes les valeurs des attributs dans une meta du produit	*/
-									$attribute_option = (!empty($_POST['attribute_option'][$attribute_code])) ? (array) $_POST['attribute_option'][$attribute_code] : null;
+									$attribute_option = (!empty($_POST['attribute_option'][$attribute_code])) ? (array)$_POST['attribute_option'][$attribute_code] : null;
 									if (isset($attribute_option)) {
 										$value = self::get_attribute_type_select_option_info($attributeTypeDetails[$attribute_code], 'value');
 										if (strtolower($value) == 'yes') :
-											update_post_meta($entityId, 'attribute_option_'.$attribute_code, $attribute_option);
+											update_post_meta($entityId, 'attribute_option_' . $attribute_code, $attribute_option);
 										else :
-											delete_post_meta($entityId, 'attribute_option_'.$attribute_code);
+											delete_post_meta($entityId, 'attribute_option_' . $attribute_code);
 										endif;
 									}
 								}
 							}
 						}
-						do_action( "saved_attribute_for_entity_{$attributeType}_{$attribute_code}", $attributeValue, $old_attribute_value, $entityTypeId, $entityId );
-						do_action( "saved_attribute_for_entity__{$attribute_code}", $attributeValue, $old_attribute_value, $entityTypeId, $entityId );
-						if ( isset( $attribute_setted[$attributeType][$attribute_code] ) ) {
-							if( is_array( $attribute_setted[$attributeType][$attribute_code] )) {
+						do_action("saved_attribute_for_entity_{$attributeType}_{$attribute_code}", $attributeValue, $old_attribute_value, $entityTypeId, $entityId);
+						do_action("saved_attribute_for_entity__{$attribute_code}", $attributeValue, $old_attribute_value, $entityTypeId, $entityId);
+						if (isset($attribute_setted[$attributeType][$attribute_code])) {
+							if (is_array($attribute_setted[$attributeType][$attribute_code])) {
 								$attribute_setted[$attributeType][$attribute_code][] = $attributeValue;
 							} else {
-								$attribute_setted[$attributeType][$attribute_code] = array( $attribute_setted[$attributeType][$attribute_code], $attributeValue );
+								$attribute_setted[$attributeType][$attribute_code] = array($attribute_setted[$attributeType][$attribute_code], $attributeValue);
 							}
 						} else {
 							$attribute_setted[$attributeType][$attribute_code] = $attributeValue;
 						}
 					}
 
-					if ( empty($from) ) {
-						$query = $wpdb->prepare("SELECT value_id FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.$attributeType . " WHERE attribute_id NOT IN ('" . implode("', '", $sent_attribute_list) . "') AND entity_id = %d AND entity_type_id = %d", $entityId, $entityTypeId);
+					if (empty($from)) {
+						$query = $wpdb->prepare("SELECT value_id FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType . " WHERE attribute_id NOT IN ('" . implode("', '", $sent_attribute_list) . "') AND entity_id = %d AND entity_type_id = %d", $entityId, $entityTypeId);
 						$attr_to_delete = $wpdb->get_results($query);
-						if(!empty($attr_to_delete)){
+						if (!empty($attr_to_delete)) {
 							foreach ($attr_to_delete as $value) {
-								$wpdb->delete(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.$attributeType, array_merge($delete_current_attribute_values_params, array('value_id' => $value->value_id)));
-								wpeologs_ctr::log_datas_in_files( 'wpshop_attributes', array(
+								$wpdb->delete(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType, array_merge($delete_current_attribute_values_params, array('value_id' => $value->value_id)));
+								wpeologs_ctr::log_datas_in_files('wpshop_attributes', array(
 									'object_id' 	=> $entityId,
-									'message' 		=> __( 'Remove the attribute : ' . $value->value_id, 'wpshop' ) ), 0
+									'message' 		=> __('Remove the attribute : ' . $value->value_id, 'wpshop') ), 0
 								);
 							}
 						}
 					}
 				}
 			}
-			do_action( "saved_attribute_for_entity", $attribute_setted, $old_attribute_to_set, $entityTypeId, $entityId );
+			do_action("saved_attribute_for_entity", $attribute_setted, $old_attribute_to_set, $entityTypeId, $entityId);
 		}
 	}
 
@@ -1481,7 +1481,7 @@ 
 
 		$query_params = "";
 		$query_params_values = array($attributeId, $entityTypeId, $entityId);
-		if(WPSHOP_ATTRIBUTE_VALUE_PER_USER && (isset($atribute_params['intrinsic']) && ($atribute_params['intrinsic'] != 'yes'))){
+		if (WPSHOP_ATTRIBUTE_VALUE_PER_USER && (isset($atribute_params['intrinsic']) && ($atribute_params['intrinsic'] != 'yes'))) {
 			$query_params = "
 				AND ATTR_VAL.user_id = %d";
 			$query_params_values[] = get_current_user_id();
@@ -1497,20 +1497,20 @@ 
 		);
 		$attributeValue = $wpdb->get_results($query);
 
-		if ( ( (count($attributeValue) <= 1 ) && !empty($attributeValue[0]) ) && ( empty($atribute_params['frontend_input']) || ($atribute_params['frontend_input'] != 'multiple-select') )) {
+		if (((count($attributeValue) <= 1) && !empty($attributeValue[0])) && (empty($atribute_params['frontend_input']) || ($atribute_params['frontend_input'] != 'multiple-select'))) {
 			$attributeValue = $attributeValue[0];
 		}
-		else{
+		else {
 			$entity_meta = get_post_meta($entityId, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
-			if ( !empty($entity_meta) ) {
+			if (!empty($entity_meta)) {
 				$query = $wpdb->prepare("SELECT code FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE id = %d AND entity_id = %d ", $attributeId, $entityTypeId);
 				$attribute_code = $wpdb->get_var($query);
 				$attributeValue = !empty($entity_meta[$attribute_code]) ? $entity_meta[$attribute_code] : null;
 			}
-			if ( is_array($attributeValue) ) {
+			if (is_array($attributeValue)) {
 				$tmp_array = array();
-				if ( !empty($attributeValue) ) {
-					foreach ( $attributeValue as $att ) {
+				if (!empty($attributeValue)) {
+					foreach ($attributeValue as $att) {
 						$obj = new stdClass();
 						$obj->value = $att;
 						$obj->unit_id = 0;
@@ -1541,9 +1541,9 @@ 
 		$elements = array();
 		$elementsWithAttributeAndValues = self::get_attribute_list_for_item($entityId, $elementId, $language);
 
-		foreach ( $elementsWithAttributeAndValues as $elementDefinition ) {
+		foreach ($elementsWithAttributeAndValues as $elementDefinition) {
 			$arrayKey = $elementDefinition->attribute_id;
-			if ( $keyForArray == 'code' ) {
+			if ($keyForArray == 'code') {
 				$arrayKey = $elementDefinition->attribute_code;
 			}
 			$elements[$elementId][$elementDefinition->attribute_set_section_name]['code'] = $elementDefinition->attribute_set_section_code;
@@ -1553,7 +1553,7 @@ 
 			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['backend_table'] = $elementDefinition->backend_table;
 			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['backend_input'] = $elementDefinition->backend_input;
 			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['frontend_input'] = $elementDefinition->frontend_input;
-			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['frontend_label'] = __( $elementDefinition->frontend_label, 'wpshop' );
+			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['frontend_label'] = __($elementDefinition->frontend_label, 'wpshop');
 			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['attribute_code'] = $elementDefinition->attribute_code;
 			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['data_type_to_use'] = $elementDefinition->data_type_to_use;
 			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['is_visible_in_front'] = $elementDefinition->is_visible_in_front;
@@ -1563,29 +1563,29 @@ 
 			$attributeValueField = 'attribute_value_' . $elementDefinition->data_type;
 
 			// Manage the value differently if it is an array or not
-			if ( !empty($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value']) ) {
+			if (!empty($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'])) {
 				if (is_array($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'])) {
 					$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'][] = $elementDefinition->$attributeValueField;
 				}
 				else {
-					$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'] = array($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'],$elementDefinition->$attributeValueField);
+					$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'] = array($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'], $elementDefinition->$attributeValueField);
 				}
 			}
 			else {
 				$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['value'] = $elementDefinition->$attributeValueField;
 			}
 
-			if ( $elementDefinition->backend_input == 'multiple-select' ) {
+			if ($elementDefinition->backend_input == 'multiple-select') {
 				$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['select_value'] = self::get_attribute_type_select_option_info($attributeValueField, 'value');
 			}
 
 			$attributeUnitField = 'attribute_unit_' . $elementDefinition->data_type;
-			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['unit'] = __( $elementDefinition->$attributeUnitField, 'wpshop' );
-			if( !empty($elementDefinition->is_requiring_unit ) && ( $elementDefinition->is_requiring_unit == 'yes' ) && empty( $elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['unit'] ) ) {
+			$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['unit'] = __($elementDefinition->$attributeUnitField, 'wpshop');
+			if (!empty($elementDefinition->is_requiring_unit) && ($elementDefinition->is_requiring_unit == 'yes') && empty($elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['unit'])) {
 				$unit = '';
-				$query = $wpdb->prepare( 'SELECT unit FROM '. WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id = %d AND status = %s', $elementDefinition->_default_unit, 'valid');
-				$unit = $wpdb->get_var( $query );
-				$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['unit'] = __( $unit, 'wpshop' );
+				$query = $wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id = %d AND status = %s', $elementDefinition->_default_unit, 'valid');
+				$unit = $wpdb->get_var($query);
+				$elements[$elementId][$elementDefinition->attribute_set_section_name]['attributes'][$arrayKey]['unit'] = __($unit, 'wpshop');
 			}
 
 		}
@@ -1597,7 +1597,7 @@ 
 		$elementsWithAttributeAndValues = array();
 		$moreQuery = "";
 
-		$entity_type = empty($defined_entity_type) ? get_post_type( $elementId ) : $defined_entity_type;
+		$entity_type = empty($defined_entity_type) ? get_post_type($elementId) : $defined_entity_type;
 
 		$query = $wpdb->prepare(
 				"SELECT POST_META.*,
@@ -1646,23 +1646,23 @@ 
 	 *
 	 * @return boolean The result to know if the element has to be displayed on frontend
 	 */
-	public static function check_attribute_display( $attribute_main_config, $attribute_custom_config, $attribute_or_set, $attribute_code, $output_type) {
-		if ( $attribute_main_config === 'yes' ) {
+	public static function check_attribute_display($attribute_main_config, $attribute_custom_config, $attribute_or_set, $attribute_code, $output_type) {
+		if ($attribute_main_config === 'yes') {
 			$attribute_output = true;
-			if ( ( is_array($attribute_custom_config) && in_array($attribute_or_set, array('attribute', 'attribute_set_section', 'product_action_button')) && !empty($attribute_custom_config[$attribute_or_set]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'yes' )
-				 || empty($attribute_custom_config) ) {
+			if ((is_array($attribute_custom_config) && in_array($attribute_or_set, array('attribute', 'attribute_set_section', 'product_action_button')) && !empty($attribute_custom_config[$attribute_or_set]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'yes')
+				 || empty($attribute_custom_config)) {
 				$attribute_output = true;
 			}
-			else if ( empty($attribute_custom_config[$attribute_or_set][$attribute_code]) || empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) || (!empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ( $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'no')) )  {
+			else if (empty($attribute_custom_config[$attribute_or_set][$attribute_code]) || empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) || (!empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'no'))) {
 				$attribute_output = false;
 			}
 		}
-		elseif ( $attribute_main_config === 'no' ) {
+		elseif ($attribute_main_config === 'no') {
 			$attribute_output = false;
-			if ( empty($attribute_custom_config[$attribute_or_set]) || empty($attribute_custom_config[$attribute_or_set][$attribute_code]) ) {
+			if (empty($attribute_custom_config[$attribute_or_set]) || empty($attribute_custom_config[$attribute_or_set][$attribute_code])) {
 				$attribute_output = false;
 			}
-			else if ( !empty($attribute_custom_config) && !empty($attribute_custom_config[$attribute_or_set]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ( $attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'yes') )  {
+			else if (!empty($attribute_custom_config) && !empty($attribute_custom_config[$attribute_or_set]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code]) && !empty($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type]) && ($attribute_custom_config[$attribute_or_set][$attribute_code][$output_type] == 'yes')) {
 				$attribute_output = true;
 			}
 		}
@@ -1679,22 +1679,22 @@ 
 		global $wpdb;
 		global $wp_query;
 
-		$attribute = self::getElement( $atts['attid'] );
-		if(empty($atts['pid'])) $atts['pid'] = $wp_query->posts[0]->ID;
-		$attribute_main_config = ( empty($atts['output_type']) || ($atts['output_type'] == 'complete_sheet') ) ? $attribute->is_visible_in_front : $attribute->is_visible_in_front_listing;
-		$output_type = ( empty($atts['output_type']) || ($atts['output_type'] == 'complete_sheet') ) ? 'complete_sheet' : 'mini_output';
+		$attribute = self::getElement($atts['attid']);
+		if (empty($atts['pid'])) $atts['pid'] = $wp_query->posts[0]->ID;
+		$attribute_main_config = (empty($atts['output_type']) || ($atts['output_type'] == 'complete_sheet')) ? $attribute->is_visible_in_front : $attribute->is_visible_in_front_listing;
+		$output_type = (empty($atts['output_type']) || ($atts['output_type'] == 'complete_sheet')) ? 'complete_sheet' : 'mini_output';
 		$product_attribute_custom_config = get_post_meta($atts['pid'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, true);
-		$display_attribute_value = wpshop_attributes::check_attribute_display( $attribute_main_config, $product_attribute_custom_config, 'attribute', $attribute->code, $output_type);
+		$display_attribute_value = wpshop_attributes::check_attribute_display($attribute_main_config, $product_attribute_custom_config, 'attribute', $attribute->code, $output_type);
 
-		if ( !empty( $attribute->data_type ) ) {
+		if (!empty($attribute->data_type)) {
 			$attributeDefinition['unit'] = '';
 
 			$has_value = false;
-			$query = $wpdb->prepare("SELECT value FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attribute->data_type . " WHERE entity_id=%s AND attribute_id=%d", $atts['pid'], $atts['attid'] );
-			if ( in_array($attribute->backend_input, array('multiple-select', 'checkbox')) ) {
+			$query = $wpdb->prepare("SELECT value FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attribute->data_type . " WHERE entity_id=%s AND attribute_id=%d", $atts['pid'], $atts['attid']);
+			if (in_array($attribute->backend_input, array('multiple-select', 'checkbox'))) {
 				$list_of_value = $wpdb->get_results($query);
-				if ( !empty($list_of_value) ) {
-					foreach ( $list_of_value as $value ) {
+				if (!empty($list_of_value)) {
+					foreach ($list_of_value as $value) {
 						$data[] = $value->value;
 					}
 					$has_value = true;
@@ -1702,10 +1702,10 @@ 
 			}
 			else {
 				$data = $wpdb->get_var($query);
-				if ( !empty($data) ) {
+				if (!empty($data)) {
 					$has_value = true;
 				}
-				elseif( !empty($attribute->default_value) ) {
+				elseif (!empty($attribute->default_value)) {
 					$has_value = true;
 					$data = $attribute->default_value;
 				}
@@ -1717,7 +1717,7 @@ 
 			$attributeDefinition['is_requiring_unit'] = $attribute->is_requiring_unit;
 			$attributeDefinition['backend_input'] = $attribute->backend_input;
 			$attributeDefinition['data_type_to_use'] = $attribute->data_type_to_use;
-			$attribute_display = wpshop_attributes::wps_attribute_values_display( $attributeDefinition );
+			$attribute_display = wpshop_attributes::wps_attribute_values_display($attributeDefinition);
 			$attribute_value = $attribute_display[0];
 			$attributeDefinition['value'] = $attribute_display[1];
 			$attribute_unit_list = $attribute_display[2];
@@ -1737,13 +1737,13 @@ 
 	 * @param array $specific_argument Optionnal The different parameters used for filter output
 	 * @return array The definition for the field used to display an attribute
 	 */
-	public static function get_attribute_field_definition( $attribute, $attribute_value = '', $specific_argument = array() ) {
+	public static function get_attribute_field_definition($attribute, $attribute_value = '', $specific_argument = array()) {
 		global $wpdb;
 		$wpshop_price_attributes = unserialize(WPSHOP_ATTRIBUTE_PRICES);
 		$wpshop_weight_attributes = unserialize(WPSHOP_ATTRIBUTE_WEIGHT);
 		$input_def = array();
 		$input_def['option'] = $input_def['field_container_class'] = '';
-		$attributeInputDomain = (!empty($specific_argument['field_custom_name_prefix']) || (!empty($specific_argument['field_custom_name_prefix']) && ($specific_argument['field_custom_name_prefix'] == 'empty')) ) ? $specific_argument['field_custom_name_prefix'] : ((!empty($specific_argument['page_code']) ? $specific_argument['page_code'] . '_' : '' ) . 'attribute[' . $attribute->data_type . ']');
+		$attributeInputDomain = (!empty($specific_argument['field_custom_name_prefix']) || (!empty($specific_argument['field_custom_name_prefix']) && ($specific_argument['field_custom_name_prefix'] == 'empty'))) ? $specific_argument['field_custom_name_prefix'] : ((!empty($specific_argument['page_code']) ? $specific_argument['page_code'] . '_' : '') . 'attribute[' . $attribute->data_type . ']');
 		$input_def['input_domain'] = $attributeInputDomain;
 		$input_def['id'] = (!empty($specific_argument) && !empty($specific_argument['field_id']) ? $specific_argument['field_id'] . '_' : '') . 'attribute_' . $attribute->id;
 		$input_def['intrinsec'] = $attribute->is_intrinsic;
@@ -1763,26 +1763,26 @@ 
 		$input_def['frontend_type'] = $attribute->frontend_input;
 		$input_def['is_used_in_quick_add_form'] = $attribute->is_used_in_quick_add_form;
 
-		if ( !empty($attribute_value) && !is_object($attribute_value) ) {
+		if (!empty($attribute_value) && !is_object($attribute_value)) {
 			$input_def['value'] = $attribute_value;
 		}
-		else if ( !empty($attribute_value->value) ) {
+		else if (!empty($attribute_value->value)) {
 			$input_def['value'] = stripslashes($attribute_value->value);
 		}
-		else if ( !empty($specific_argument['element_identifier']) && empty($attribute_value) && (get_post_status($specific_argument['element_identifier']) != 'auto-draft') ) {
+		else if (!empty($specific_argument['element_identifier']) && empty($attribute_value) && (get_post_status($specific_argument['element_identifier']) != 'auto-draft')) {
 			$input_def['value'] = '';
 		}
 
 		$input_def['options'] = '';
 		$input_more_class = !empty($specific_argument['input_class']) ? $specific_argument['input_class'] : '';
 		if ($attribute->data_type == 'datetime') {
-			$date_config = unserialize( $attribute->default_value );
+			$date_config = unserialize($attribute->default_value);
 			if ((($date_config['default_value'] == '') || ($date_config['default_value'] == 'date_of_current_day')) && ($date_config['default_value'] == 'date_of_current_day')) {
 				$input_def['value'] = date('Y-m-d');
 			}
 			else {
 				/**	Modification due to a message on eoxia forum: http://www.eoxia.com/forums/topic/bug-attribut-de-type-date-dans-fiche-produit-admin/	*/
-				$input_def['value'] = !empty($attribute_value->value) && is_string($attribute_value->value) ? str_replace( " 00:00:00", "", $attribute_value->value ) : ( !empty($attribute_value) && is_string($attribute_value) ? str_replace( " 00:00:00", "", $attribute_value ) : '' );
+				$input_def['value'] = !empty($attribute_value->value) && is_string($attribute_value->value) ? str_replace(" 00:00:00", "", $attribute_value->value) : (!empty($attribute_value) && is_string($attribute_value) ? str_replace(" 00:00:00", "", $attribute_value) : '');
 			}
 			$input_more_class .= ' wpshop_input_datetime ';
 			$field_script = '<script type="text/javascript" >
@@ -1795,31 +1795,31 @@ 
 		wpshop("#' . $input_def['id'] . '").datepicker("option", "navigationAsDateFormat", true);
 		wpshop("#' . $input_def['id'] . '").val("' . str_replace(" 00:00:00", "", $input_def['value']) . '");';
 
-			if ( !empty($date_config['field_options']['attribute_type_date_options_available_date_past_futur']) ) {
-				if ( !empty($date_config['field_options']['attribute_type_date_options_available_date_past_futur']['minDate'][0]) ) {
+			if (!empty($date_config['field_options']['attribute_type_date_options_available_date_past_futur'])) {
+				if (!empty($date_config['field_options']['attribute_type_date_options_available_date_past_futur']['minDate'][0])) {
 					$field_script .= '
 		wpshop("#' . $input_def['id'] . '").datepicker("option", "minDate", "' . $date_config['field_options']['attribute_type_date_options_available_date_past_futur']['minDate'][0] . '");';
 				}
-				if ( !empty($date_config['field_options']['attribute_type_date_options_available_date_past_futur']['maxDate'][0]) ) {
+				if (!empty($date_config['field_options']['attribute_type_date_options_available_date_past_futur']['maxDate'][0])) {
 					$field_script .= '
 		wpshop("#' . $input_def['id'] . '").datepicker("option", "maxDate", "' . $date_config['field_options']['attribute_type_date_options_available_date_past_futur']['maxDate'][0] . '");';
 				}
 			}
 
 			$script_options = $script_options_params = array();
-			if ( !empty($date_config['field_options']['attribute_type_date_options_day_to_show']) ) {
+			if (!empty($date_config['field_options']['attribute_type_date_options_day_to_show'])) {
 				$day_to_show_list = '    ';
-				foreach ( $date_config['field_options']['attribute_type_date_options_day_to_show'] as $day_to_show ) {
+				foreach ($date_config['field_options']['attribute_type_date_options_day_to_show'] as $day_to_show) {
 					$day_to_show_list .= '(date.getDay() == ' . $day_to_show . ') || ';
 				}
 				$script_options[] = '( ' . substr($day_to_show_list, 0, -4) . ' )';
 			}
 
-			if ( !empty($date_config['field_options']['attribute_type_date_options_available_date_type'][0]) ) {
-				if ( !empty($date_config['field_options']['attribute_type_date_options_available_date']) ) {
+			if (!empty($date_config['field_options']['attribute_type_date_options_available_date_type'][0])) {
+				if (!empty($date_config['field_options']['attribute_type_date_options_available_date'])) {
 					$available_date = ' ';
-					foreach ( $date_config['field_options']['attribute_type_date_options_available_date'] as $avalaible_date_list ) {
-						if ( !empty($avalaible_date_list) ) {
+					foreach ($date_config['field_options']['attribute_type_date_options_available_date'] as $avalaible_date_list) {
+						if (!empty($avalaible_date_list)) {
 							$available_date .= '"' . $avalaible_date_list . '",';
 						}
 					}
@@ -1828,7 +1828,7 @@ 
 				}
 			}
 
-			if ( !empty( $script_options ) ) {
+			if (!empty($script_options)) {
 				$field_script .= '
 		wpshop("#' . $input_def['id'] . '").datepicker("option", "beforeShowDay", function(date){
 			' . implode(' ', $script_options_params) . ';
@@ -1856,37 +1856,37 @@ 
 </script>';
 			$input_def['options'] .= $field_script;
 		}
-		if ( in_array($attribute->backend_input, array('multiple-select', 'select', 'radio', 'checkbox'))) {
-			$input_more_class .= (!empty($specific_argument['no_chosen']) ? '' : ' chosen_select ' );
+		if (in_array($attribute->backend_input, array('multiple-select', 'select', 'radio', 'checkbox'))) {
+			$input_more_class .= (!empty($specific_argument['no_chosen']) ? '' : ' chosen_select ');
 			$input_def['type'] = ((!empty($specific_argument['from']) && ($specific_argument['from'] == 'frontend')) || (!is_admin() && empty($specific_argument['from'])) ? $attribute->frontend_input : $attribute->backend_input);
 			$input_def['valueToPut'] = 'index';
 
 			$select_display = self::get_select_output($attribute, $specific_argument);
-			if ( empty( $input_def[ 'options_label' ] ) && !empty( $specific_argument ) && (!empty($specific_argument['from']) && ($specific_argument['from'] == 'frontend') ) ) {
-				$input_def[ 'options_label' ][ 'original' ] = true;
+			if (empty($input_def['options_label']) && !empty($specific_argument) && (!empty($specific_argument['from']) && ($specific_argument['from'] == 'frontend'))) {
+				$input_def['options_label']['original'] = true;
 			}
 			$input_def['options'] .= $select_display['more_input'];
 			$input_def['possible_value'] = (!empty($select_display) && !empty($select_display['possible_value'])) ? $select_display['possible_value'] : '';
-			if ( !is_admin() ) {
+			if (!is_admin()) {
 				$input_def['options'] .= '<input type="hidden" value="' . str_replace("\\", "", $input_def['value']) . '" name="wpshop_product_attribute_' . $attribute->code . '_current_value" id="wpshop_product_attribute_' . $attribute->code . '_current_value" />';
 			}
-			if ( in_array($attribute->backend_input, array('multiple-select', 'checkbox')) && is_admin() && (empty($specific_argument['from']) || ($specific_argument['from'] != 'frontend')) ) {
-				$input_def['options'] .= wpshop_display::display_template_element('select_list_multiple_bulk_action', array( 'CURRENT_ATTRIBUTE_ID' => $input_def['id'], 'CURRENT_ATTRIBUTE_CODE' => $attribute->code), array(), 'admin');
+			if (in_array($attribute->backend_input, array('multiple-select', 'checkbox')) && is_admin() && (empty($specific_argument['from']) || ($specific_argument['from'] != 'frontend'))) {
+				$input_def['options'] .= wpshop_display::display_template_element('select_list_multiple_bulk_action', array('CURRENT_ATTRIBUTE_ID' => $input_def['id'], 'CURRENT_ATTRIBUTE_CODE' => $attribute->code), array(), 'admin');
 			}
 		}
 		$input_def['label_pointer'] = 'for="' . $input_def['id'] . '"';
-		if(($input_def['type'] == 'radio') || ($input_def['type'] == 'checkbox')){
+		if (($input_def['type'] == 'radio') || ($input_def['type'] == 'checkbox')) {
 			$input_def['label_pointer'] = '';
 		}
 
 		/*
 		 * Specifc treatment for price attributes
 		 */
-		if((WPSHOP_PRODUCT_PRICE_PILOT == 'HT') && ($attribute->code == WPSHOP_PRODUCT_PRICE_TTC) ){
+		if ((WPSHOP_PRODUCT_PRICE_PILOT == 'HT') && ($attribute->code == WPSHOP_PRODUCT_PRICE_TTC)) {
 			$input_def['option'] .= ' readonly="readonly" ';
 			$input_more_class .= ' wpshop_prices_readonly';
 		}
-		elseif((WPSHOP_PRODUCT_PRICE_PILOT == 'TTC') && ($attribute->code == WPSHOP_PRODUCT_PRICE_HT) ){
+		elseif ((WPSHOP_PRODUCT_PRICE_PILOT == 'TTC') && ($attribute->code == WPSHOP_PRODUCT_PRICE_HT)) {
 			$input_def['option'] .= ' readonly="readonly" ';
 			$input_more_class .= ' wpshop_prices_readonly';
 		}
@@ -1897,7 +1897,7 @@ 
 
 		$input_def['label'] = str_replace("\\", "", $input_def['label']);
 // 		$input_def['value'] = str_replace("\\", "", $input_def['value']);
-		$input_def['option'] .= ' class="wpshop_product_attribute_' . $attribute->code . $input_more_class . ' ' . (( is_admin() ) ? $attribute->backend_css_class : $attribute->frontend_css_class) . ( !empty($attribute->frontend_verification) ? ' wps_attr_verification_' . $attribute->frontend_verification : '' ) . '" ';
+		$input_def['option'] .= ' class="wpshop_product_attribute_' . $attribute->code . $input_more_class . ' ' . ((is_admin()) ? $attribute->backend_css_class : $attribute->frontend_css_class) . (!empty($attribute->frontend_verification) ? ' wps_attr_verification_' . $attribute->frontend_verification : '') . '" ';
 		$input_def['title'] = !empty($attribute->frontend_help_message) ? ' title="' . $attribute->frontend_help_message . '" ' : '';
 
 		if (($attribute->is_intrinsic == 'yes') && ((!empty($input_def['value'])) || ($input_def['value'] > 0))) {
@@ -1908,13 +1908,13 @@ 
 		 * Add the unit to the attribute if attribute configuration is set to yes
 		 */
 		if ($attribute->is_requiring_unit == 'yes') {
-			if ( in_array($attribute->code, $wpshop_price_attributes) || ( WPSHOP_COST_OF_POSTAGE == $attribute->code) ) {
+			if (in_array($attribute->code, $wpshop_price_attributes) || (WPSHOP_COST_OF_POSTAGE == $attribute->code)) {
 				$input_def['options'] .= '&nbsp;<span class="attribute_currency" id="attribute_currency_' . $attribute->id . '" >' . wpshop_tools::wpshop_get_currency() . '</span>';
 			}
-			elseif ( in_array($attribute->code, $wpshop_weight_attributes) ) {
+			elseif (in_array($attribute->code, $wpshop_weight_attributes)) {
 				$weight_defaut_unity_option = get_option('wpshop_shop_default_weight_unity');
-				$query = $wpdb->prepare('SELECT name FROM '. WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id=%d', $weight_defaut_unity_option);
-				$unity = $wpdb->get_var( $query );
+				$query = $wpdb->prepare('SELECT name FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id=%d', $weight_defaut_unity_option);
+				$unity = $wpdb->get_var($query);
 				$input_def['options'] .= '&nbsp;<span class="attribute_weight" id="attribute_weight_' . $attribute->id . '" >' . __($unity, 'wpshop') . '</span>';
 			}
 			else {
@@ -1922,11 +1922,11 @@ 
 				$unit_input_def['possible_value'] = wpshop_attributes_unit::get_unit_list_for_group($attribute->_unit_group_id);
 				$unit_input_def['type'] = 'select';
 				$unit_input_def['option'] = ' class="wpshop_attribute_unit_input chosen_select" ';
-				$unit_input_def['id'] = ( !empty($specific_argument['page_code']) ? $specific_argument['page_code'] : null ) . '_' . ( !empty($specific_argument['element_identifier']) ? $specific_argument['element_identifier'] : null ) . '_unit_attribute_' . $attribute->id;
+				$unit_input_def['id'] = (!empty($specific_argument['page_code']) ? $specific_argument['page_code'] : null) . '_' . (!empty($specific_argument['element_identifier']) ? $specific_argument['element_identifier'] : null) . '_unit_attribute_' . $attribute->id;
 				$unit_input_def['name'] = $attribute->code;
 				$unit_input_def['value'] = (!empty($attribute_value->unit_id) ? $attribute_value->unit_id : '');
-				if($unit_input_def['value'] == ''){
-					if ( $attribute->_default_unit > 0 ) {
+				if ($unit_input_def['value'] == '') {
+					if ($attribute->_default_unit > 0) {
 						$unit_input_def['value'] = $attribute->_default_unit;
 					}
 					else {
@@ -1940,18 +1940,18 @@ 
 		/*
 		 * Add indication on postage cost tax
 		 */
-		if ( $attribute->code == WPSHOP_COST_OF_POSTAGE ) {
+		if ($attribute->code == WPSHOP_COST_OF_POSTAGE) {
 			$input_def['options'] .= ' <span class="attribute_currency" >' . __('ATI', 'wpshop') . '</span>';
 		}
 
 		/*
 		 * Create the field output
 		 */
-		if ( is_admin() && ($attribute->data_type == 'datetime') && ($attribute->is_user_defined == 'yes') && (empty($specific_argument['from']) || ($specific_argument['from'] != 'frontend')) ) {
-			$input_def['output'] = sprintf(__('You select this field to be defined by final customer into frontend part. To change this behaviour you have to change attribute option "%s"', 'wpshop'),__('is_user_defined', 'wpshop'));
+		if (is_admin() && ($attribute->data_type == 'datetime') && ($attribute->is_user_defined == 'yes') && (empty($specific_argument['from']) || ($specific_argument['from'] != 'frontend'))) {
+			$input_def['output'] = sprintf(__('You select this field to be defined by final customer into frontend part. To change this behaviour you have to change attribute option "%s"', 'wpshop'), __('is_user_defined', 'wpshop'));
 			$input_def['options'] = '';
 			$input_def['label_pointer'] = '';
-			$input_def['option'] = substr( $input_def['option'], 0 , -2 ) . ' wpshop_attributes_is_user_defined_admin_field "';
+			$input_def['option'] = substr($input_def['option'], 0, -2) . ' wpshop_attributes_is_user_defined_admin_field "';
 			$input_def['field_container_class'] .= 'wpshop_attributes_is_user_defined_admin_container';
 		}
 		else {
@@ -1966,7 +1966,7 @@ 
 	 * @param string $output_from
 	 * @return string The output for
 	 */
-	public static function display_attribute( $attribute_code, $output_from = 'admin', $output_specs = array() ) {
+	public static function display_attribute($attribute_code, $output_from = 'admin', $output_specs = array()) {
 		$output = '';
 		/*	Get the page code	*/
 		$currentPageCode = !empty($output_specs['page_code']) ? $output_specs['page_code'] : '';
@@ -1977,17 +1977,17 @@ 
 
 		/*	Get attribute input definition	*/
 		$current_value = (!empty($output_specs['current_value']) ? $output_specs['current_value'] : '');
-		$input = wpshop_attributes::get_attribute_field_definition( $attribute_def, $current_value, array_merge($output_specs, array('input_class' => ' wpshop_attributes_display', 'from' => $output_from)) );
+		$input = wpshop_attributes::get_attribute_field_definition($attribute_def, $current_value, array_merge($output_specs, array('input_class' => ' wpshop_attributes_display', 'from' => $output_from)));
 
 		/*	Create default output	*/
 		$input_to_display = $input['output'] . $input['options'];
 
 		/*	Check if current field is linked to an addon, and if the addon is activated	*/
 		$addons_list = unserialize(WPSHOP_ADDONS_LIST);
-		foreach ( $addons_list as $addon_code => $addon_def ) {
-			if ( in_array($attribute_code, $addon_def) ) {
-				if ( constant($addon_code) === false ) {
-					$input_to_display = '<a href="' . admin_url('options-general.php?page=wpshop_option#wpshop_addons_option') . '" >' . __("This addon isn't activated, click to activate",'wpshop') . '</a>';
+		foreach ($addons_list as $addon_code => $addon_def) {
+			if (in_array($attribute_code, $addon_def)) {
+				if (constant($addon_code) === false) {
+					$input_to_display = '<a href="' . admin_url('options-general.php?page=wpshop_option#wpshop_addons_option') . '" >' . __("This addon isn't activated, click to activate", 'wpshop') . '</a>';
 				}
 			}
 		}
@@ -2012,11 +2012,11 @@ 
 		/*
 		 * Display attribute option if applicable
 		 */
-		if ( $output_from == 'admin') {
-			$attribute_option_display = $attribute_def->backend_input=='select' && (strtolower( __(self::get_attribute_type_select_option_info($input['value'], 'value'), 'wpshop') ) == strtolower(__('yes', 'wpshop'))) ? '' : ' wpshopHide';
+		if ($output_from == 'admin') {
+			$attribute_option_display = $attribute_def->backend_input == 'select' && (strtolower(__(self::get_attribute_type_select_option_info($input['value'], 'value'), 'wpshop')) == strtolower(__('yes', 'wpshop'))) ? '' : ' wpshopHide';
 
 			$output['field'] .= '
-	<div class="attribute_option_'.$attribute_def->code.''.$attribute_option_display.'">'.self::get_attribute_option_fields($element_identifier, $attribute_def->code).'</div>';
+	<div class="attribute_option_'.$attribute_def->code . '' . $attribute_option_display . '">' . self::get_attribute_option_fields($element_identifier, $attribute_def->code) . '</div>';
 		}
 
 		$output['field'] .= '</div>';
@@ -2034,36 +2034,36 @@ 
 	 *
 	 * @return string The html code to output directly tabs
 	 */
-	public static function attribute_of_entity_to_tab( $element_code, $element_id, $element_definition ) {
+	public static function attribute_of_entity_to_tab($element_code, $element_id, $element_definition) {
 		$attributeContentOutput = '';
 
 		/**	Get the different attribute affected to the entity	*/
 		$element_atribute_list = wpshop_attributes::getElementWithAttributeAndValue($element_code, $element_id, WPSHOP_CURRENT_LOCALE, '', 'frontend');
 
 
-		if ( is_array($element_atribute_list) && (count($element_atribute_list) > 0) ) {
-			foreach ( $element_atribute_list[$element_id] as $attributeSetSectionName => $attributeSetContent ) {
+		if (is_array($element_atribute_list) && (count($element_atribute_list) > 0)) {
+			foreach ($element_atribute_list[$element_id] as $attributeSetSectionName => $attributeSetContent) {
 				$attributeToShowNumber = 0;
 				$attributeOutput = '';
 
-				foreach ( $attributeSetContent['attributes'] as $attributeId => $attributeDefinition ) {
+				foreach ($attributeSetContent['attributes'] as $attributeId => $attributeDefinition) {
 
 					/**	Check the value type to check if empty or not	*/
-					if ( $attributeDefinition['data_type'] == 'int' ) {
+					if ($attributeDefinition['data_type'] == 'int') {
 						$attributeDefinition['value'] = (int)$attributeDefinition['value'];
 					}
-					else if ( $attributeDefinition['data_type'] == 'decimal' ) {
+					else if ($attributeDefinition['data_type'] == 'decimal') {
 						$attributeDefinition['value'] = (float)$attributeDefinition['value'];
 					}
 
 					/** Check if the attribute is set to be displayed in frontend	*/
-					$attribute_display_state = wpshop_attributes::check_attribute_display( $attributeDefinition['is_visible_in_front'], $element_definition['custom_display'], 'attribute', $attributeDefinition['code'], 'complete_sheet');
+					$attribute_display_state = wpshop_attributes::check_attribute_display($attributeDefinition['is_visible_in_front'], $element_definition['custom_display'], 'attribute', $attributeDefinition['code'], 'complete_sheet');
 
 					/**	Output the field if the value is not null	*/
 
-					if ( (is_array($attributeDefinition['value']) || ( !empty($attributeDefinition['value']) ) ) && $attribute_display_state) {
+					if ((is_array($attributeDefinition['value']) || (!empty($attributeDefinition['value']))) && $attribute_display_state) {
 
-						$attribute_display = wpshop_attributes::wps_attribute_values_display( $attributeDefinition );
+						$attribute_display = wpshop_attributes::wps_attribute_values_display($attributeDefinition);
 						$attribute_value = $attribute_display[0];
 						$attributeDefinition['value'] = $attribute_display[1];
 						$attribute_unit_list = $attribute_display[2];
@@ -2074,8 +2074,8 @@ 
 						$tpl_component['PDT_ENTITY_CODE'] = self::currentPageCode;
 						$tpl_component['ATTRIBUTE_CODE'] = $attributeDefinition['attribute_code'];
 						$tpl_component['ATTRIBUTE_LABEL'] = __($attributeDefinition['frontend_label'], 'wpshop');
-						$tpl_component['ATTRIBUTE_VALUE'] = (  !is_array($attribute_value) ) ? stripslashes($attribute_value) : $attribute_value;
-						$tpl_component['ATTRIBUTE_VALUE_UNIT'] =  $attribute_unit_list;
+						$tpl_component['ATTRIBUTE_VALUE'] = (!is_array($attribute_value)) ? stripslashes($attribute_value) : $attribute_value;
+						$tpl_component['ATTRIBUTE_VALUE_UNIT'] = $attribute_unit_list;
 
 						/** Build template	*/
 						$attributeOutput .= wpshop_display::display_template_element($template_part, $tpl_component);
@@ -2086,9 +2086,9 @@ 
 				}
 
 				/** Check if the attribute set section is set to be displayed in frontend	*/
-				$attribute_set_display_state = wpshop_attributes::check_attribute_display( $attributeSetContent['display_on_frontend'], $element_definition['custom_display'], 'attribute_set_section', $attributeSetContent['code'], 'complete_sheet');
+				$attribute_set_display_state = wpshop_attributes::check_attribute_display($attributeSetContent['display_on_frontend'], $element_definition['custom_display'], 'attribute_set_section', $attributeSetContent['code'], 'complete_sheet');
 
-				if ( !$attribute_set_display_state ) {
+				if (!$attribute_set_display_state) {
 					$attributeToShowNumber = 0;
 					$attributeOutput = '';
 				}
@@ -2098,8 +2098,8 @@ 
 
 			/** Gestion de l'affichage	*/
 			$tab_list = $content_list = '';
-			foreach ( $element_atribute_list[$element_id] as $attributeSetSectionName => $attributeSetContent ) {
-				if ( !empty($attributeSetContent['count']) > 0 ) {
+			foreach ($element_atribute_list[$element_id] as $attributeSetSectionName => $attributeSetContent) {
+				if (!empty($attributeSetContent['count']) > 0) {
 					/** Template parameters	*/
 					$template_part = 'product_attribute_tabs';
 					$tpl_component = array();
@@ -2108,7 +2108,7 @@ 
 
 					/** 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(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -2128,7 +2128,7 @@ 
 
 					/** 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(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -2142,16 +2142,16 @@ 
 				}
 			}
 
-			if ( $tab_list != '' ) {
+			if ($tab_list != '') {
 				/** Template parameters	*/
 				$template_part = 'product_attribute_container';
 				$tpl_component = array();
-				$tpl_component['PDT_TABS'] = apply_filters( 'wpshop_extra_tabs_menu_before', '' ).$tab_list.apply_filters( 'wpshop_extra_tabs_menu_after', '' );
-				$tpl_component['PDT_TAB_DETAIL'] = apply_filters( 'wpshop_extra_tabs_content_before', '' ).$content_list.apply_filters( 'wpshop_extra_tabs_content_after', '' );
+				$tpl_component['PDT_TABS'] = apply_filters('wpshop_extra_tabs_menu_before', '') . $tab_list . apply_filters('wpshop_extra_tabs_menu_after', '');
+				$tpl_component['PDT_TAB_DETAIL'] = apply_filters('wpshop_extra_tabs_content_before', '') . $content_list . apply_filters('wpshop_extra_tabs_content_after', '');
 
 				/** 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(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -2174,9 +2174,9 @@ 
 	 * @param unknown_type $attributeDefinition
 	 * @return multitype:Ambigous <unknown, string> Ambigous <string, string> Ambigous <>
 	 */
-	public static function wps_attribute_values_display( $attributeDefinition ) {
+	public static function wps_attribute_values_display($attributeDefinition) {
 		$attribute_unit_list = '';
-		if ( !empty($attributeDefinition['unit']) ) {
+		if (!empty($attributeDefinition['unit'])) {
 			/** Template parameters	*/
 			$template_part = 'product_attribute_unit';
 			$tpl_component = array();
@@ -2188,31 +2188,31 @@ 
 		}
 
 		$attribute_value = $attributeDefinition['value'];
-		if ( $attributeDefinition['data_type'] == 'decimal' ) {
-			$attribute_value =(is_numeric($attribute_value) ) ? number_format($attribute_value, 2, ',', '') : $attribute_value;
-			if ( in_array($attributeDefinition['code'], unserialize(WPSHOP_ATTRIBUTE_PRICES)) ) {
-				if ( $attributeDefinition['is_requiring_unit'] == 'yes' ) {
+		if ($attributeDefinition['data_type'] == 'decimal') {
+			$attribute_value = (is_numeric($attribute_value)) ? number_format($attribute_value, 2, ',', '') : $attribute_value;
+			if (in_array($attributeDefinition['code'], unserialize(WPSHOP_ATTRIBUTE_PRICES))) {
+				if ($attributeDefinition['is_requiring_unit'] == 'yes') {
 					$attribute_unit_list = ' ' . wpshop_tools::wpshop_get_currency();
 				}
 				$attributeDefinition['value'] = wpshop_display::format_field_output('wpshop_product_price', $attributeDefinition['value']);
 			}
 		}
-		if ( $attributeDefinition['data_type'] == 'datetime' ) {
+		if ($attributeDefinition['data_type'] == 'datetime') {
 			$attribute_value = mysql2date('d/m/Y', $attributeDefinition['value'], true);
 		}
-		if ( $attributeDefinition['backend_input'] == 'select' ) {
+		if ($attributeDefinition['backend_input'] == 'select') {
 			$attribute_value = wpshop_attributes::get_attribute_type_select_option_info($attributeDefinition['value'], 'label', $attributeDefinition['data_type_to_use']);
 		}
 		/** Manage differently if its an array of values or not	*/
-		if ( $attributeDefinition['backend_input'] == 'multiple-select') {
+		if ($attributeDefinition['backend_input'] == 'multiple-select') {
 			$attribute_value = '';
-			if ( is_array($attributeDefinition['value']) ) {
+			if (is_array($attributeDefinition['value'])) {
 				foreach ($attributeDefinition['value'] as $v) {
-					$attribute_value .= ' / '.wpshop_attributes::get_attribute_type_select_option_info($v, 'label', $attributeDefinition['data_type_to_use']);
+					$attribute_value .= ' / ' . wpshop_attributes::get_attribute_type_select_option_info($v, 'label', $attributeDefinition['data_type_to_use']);
 				}
 			}
-			else $attribute_value = ' / '.wpshop_attributes::get_attribute_type_select_option_info($attributeDefinition['value'], 'label', $attributeDefinition['data_type_to_use']);
-			$attribute_value = substr($attribute_value,3);
+			else $attribute_value = ' / ' . wpshop_attributes::get_attribute_type_select_option_info($attributeDefinition['value'], 'label', $attributeDefinition['data_type_to_use']);
+			$attribute_value = substr($attribute_value, 3);
 		}
 
 		return array($attribute_value, $attributeDefinition['value'], $attribute_unit_list);
@@ -2222,13 +2222,13 @@ 
 	 * Manage display for the output when user uses a shortcode for attributes display
 	 * @param array $shorcode_args The list of argument passed through the shortcode
 	 */
-	function wpshop_attributes_shortcode( $shorcode_args ) {
+	function wpshop_attributes_shortcode($shorcode_args) {
 		$output = '';
 		/*
 		 * Read the attribute list
 		*/
-		foreach ( explode(', ', $shorcode_args['attributes']) as $attribute_code ) {
-			$attribute_output_def = wpshop_attributes::display_attribute( $attribute_code, $shorcode_args['from'] );
+		foreach (explode(', ', $shorcode_args['attributes']) as $attribute_code) {
+			$attribute_output_def = wpshop_attributes::display_attribute($attribute_code, $shorcode_args['from']);
 			$output .= $attribute_output_def['field'];
 		}
 
@@ -2250,7 +2250,7 @@ 
 		$productAttributeSetDetails = wpshop_attributes_set::getAttributeSetDetails($attributeSetId, "'valid','deleted'");
 		$attribute_specification = array('page_code' => $currentPageCode, 'element_identifier' => $itemToEdit, 'field_id' => $currentPageCode . '_' . $itemToEdit . '_');
 
-		if ( count($productAttributeSetDetails) > 0 ) {
+		if (count($productAttributeSetDetails) > 0) {
 			/*	Read the attribute list in order to output	*/
 			$shortcodes_attr = '';
 			$shortcodes_to_display = false;
@@ -2260,80 +2260,80 @@ 
 
 				$shortcodes = $currentTabContent = '';
 				$output_nb = 0;
-				if(count($productAttributeSetDetail['attribut']) >= 1){
-					foreach($productAttributeSetDetail['attribut'] as $attribute){
+				if (count($productAttributeSetDetail['attribut']) >= 1) {
+					foreach ($productAttributeSetDetail['attribut'] as $attribute) {
 
-						if ( !empty($attribute->id) ) {
-							if ( $attribute->code == 'product_attribute_set_id' ) {
+						if (!empty($attribute->id)) {
+							if ($attribute->code == 'product_attribute_set_id') {
 								$attribute_set_id_is_present = true;
 							}
 
 							/** Generic part for attribute field output	*/
 							$value = wpshop_attributes::getAttributeValueForEntityInSet($attribute->data_type, $attribute->id, wpshop_entities::get_entity_identifier_from_code($currentPageCode), $itemToEdit, array('intrinsic' => $attribute->is_intrinsic, 'backend_input' => $attribute->backend_input));
-							$product_meta = get_post_meta( $itemToEdit, '_wpshop_product_metadata', true);
+							$product_meta = get_post_meta($itemToEdit, '_wpshop_product_metadata', true);
 
 							/**	Check if value is empty and get value in meta if not empty	*/
 							$value = (empty($value) && !empty($product_meta[$attribute->code])) ? $product_meta[$attribute->code] : (!empty($value) ? $value : null);
 
 							/*	Manage specific field as the attribute_set_id in product form	*/
-							if ( $attribute->code == 'product_attribute_set_id' ) {
+							if ($attribute->code == 'product_attribute_set_id') {
 
 								$value = empty($value) ? $attributeSetId : $value;
 							}
 							$attribute_specification['current_value'] = $value;
-							$attribute_output_def = apply_filters( 'wpshop_attribute_output_def', wpshop_attributes::display_attribute( $attribute->code, 'admin', $attribute_specification), $itemToEdit );
-							if ( ($attribute_output_def['field_definition']['type'] != 'hidden') && ($attribute->code != 'product_attribute_set_id') ) {
+							$attribute_output_def = apply_filters('wpshop_attribute_output_def', wpshop_attributes::display_attribute($attribute->code, 'admin', $attribute_specification), $itemToEdit);
+							if (($attribute_output_def['field_definition']['type'] != 'hidden') && ($attribute->code != 'product_attribute_set_id')) {
 								$currentTabContent .= $attribute_output_def['field'];
-								$shortcode_code_def=array();
-								$shortcode_code_def['attribute_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['main_code'] = 'wpshop_att_val';
-								$shortcode_code_def['attribute_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['attrs_exemple']['type'] = $attribute->data_type;
-								$shortcode_code_def['attribute_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['attrs_exemple']['attid'] = $attribute->id;
-								$shortcode_code_def['attribute_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['attrs_exemple']['pid'] = $itemToEdit;
+								$shortcode_code_def = array();
+								$shortcode_code_def['attribute_' . str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['main_code'] = 'wpshop_att_val';
+								$shortcode_code_def['attribute_' . str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['attrs_exemple']['type'] = $attribute->data_type;
+								$shortcode_code_def['attribute_' . str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['attrs_exemple']['attid'] = $attribute->id;
+								$shortcode_code_def['attribute_' . str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label']))]['attrs_exemple']['pid'] = $itemToEdit;
 								ob_start();
-								wps_shortcodes_ctr::output_shortcode('attribute_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label'])), $shortcode_code_def, 'wpshop_product_shortcode_display wpshop_product_attribute_shortcode_display wpshop_product_attribute_shortcode_display_'.str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label'])).' wpshop_cls');
-								$shortcodes .= '<li class="wpshop_cls" >'.sprintf(__('Insertion code for the attribute %s for this product', 'wpshop'), '<span>'.__($attribute_output_def['field_definition']['label'], 'wpshop').'</span>').ob_get_contents().'</li>';
+								wps_shortcodes_ctr::output_shortcode('attribute_' . str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label'])), $shortcode_code_def, 'wpshop_product_shortcode_display wpshop_product_attribute_shortcode_display wpshop_product_attribute_shortcode_display_' . str_replace('-', '_', sanitize_title($attribute_output_def['field_definition']['label'])) . ' wpshop_cls');
+								$shortcodes .= '<li class="wpshop_cls" >' . sprintf(__('Insertion code for the attribute %s for this product', 'wpshop'), '<span>' . __($attribute_output_def['field_definition']['label'], 'wpshop') . '</span>') . ob_get_contents() . '</li>';
 								ob_end_clean();
 							}
 							else {
-								if ( $attribute->code == 'product_attribute_set_id' ) {
+								if ($attribute->code == 'product_attribute_set_id') {
 									$attribute_output_def['field_definition']['type'] = 'hidden';
 								}
-								$currentTabContent .=  wpshop_form::check_input_type($attribute_output_def['field_definition'], $attribute_output_def['field_definition']['input_domain']);
+								$currentTabContent .= wpshop_form::check_input_type($attribute_output_def['field_definition'], $attribute_output_def['field_definition']['input_domain']);
 							}
 							$output_nb++;
 						}
 					}
 
-					$currentTabContent = apply_filters( 'wps_entity_attribute_edition', $currentTabContent, $itemToEdit, $productAttributeSetDetail );
+					$currentTabContent = apply_filters('wps_entity_attribute_edition', $currentTabContent, $itemToEdit, $productAttributeSetDetail);
 
 					$shortcode_code['attributes_set']['main_code'] = 'wpshop_att_group';
 					$shortcode_code['attributes_set']['attrs_exemple']['pid'] = $itemToEdit;
 					$shortcode_code['attributes_set']['attrs_exemple']['sid'] = $productAttributeSetDetail['id'];
 					ob_start();
-					wps_shortcodes_ctr::output_shortcode('attributes_set', $shortcode_code, 'wpshop_product_shortcode_display wpshop_product_attribute_group_shortcode_display wpshop_product_attribute_group_shortcode_display_'.str_replace('-', '_', sanitize_title($productAttributeSetDetail['name'])).' cls');
-					$attribute_group_display = sprintf(__('Insertion code for attribute group %s for this product', 'wpshop'), '<span>'.$productAttributeSetDetail['name'].'</span>').ob_get_contents().'<ul class="" >'.$shortcodes.'</ul>';
+					wps_shortcodes_ctr::output_shortcode('attributes_set', $shortcode_code, 'wpshop_product_shortcode_display wpshop_product_attribute_group_shortcode_display wpshop_product_attribute_group_shortcode_display_' . str_replace('-', '_', sanitize_title($productAttributeSetDetail['name'])) . ' cls');
+					$attribute_group_display = sprintf(__('Insertion code for attribute group %s for this product', 'wpshop'), '<span>' . $productAttributeSetDetail['name'] . '</span>') . ob_get_contents() . '<ul class="" >' . $shortcodes . '</ul>';
 					ob_end_clean();
 
-					if( WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE == 'each-box' )
-						$currentTabContent .= '<div class="wpshop_cls" ><strong>'.__('Shortcodes','wpshop').'</strong> - <a href="#" class="show-hide-shortcodes">' . __('Display', 'wpshop') . '</a><div class="wpshop_product_shortcode_display wpshop_product_shortcode_display_container wpshopHide" >' . $attribute_group_display . '</div></div>';
+					if (WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE == 'each-box')
+						$currentTabContent .= '<div class="wpshop_cls" ><strong>' . __('Shortcodes', 'wpshop') . '</strong> - <a href="#" class="show-hide-shortcodes">' . __('Display', 'wpshop') . '</a><div class="wpshop_product_shortcode_display wpshop_product_shortcode_display_container wpshopHide" >' . $attribute_group_display . '</div></div>';
 					else
 						$shortcodes_attr .= $attribute_group_display;
 
-					if ( $output_nb <= 0 ) {
+					if ($output_nb <= 0) {
 						$currentTabContent = __('Nothing avaiblable here. You can go in attribute management interface in order to add content here.', 'wpshop');
 					}
 				}
 
 				if ($output_nb > 0) {
 					$shortcodes_to_display = true;
-					if ( $outputType == 'box' ) {
+					if ($outputType == 'box') {
 						$box['box'][$productAttributeSetDetail['code']] = $productAttributeSetDetail['name'];
-						$box['box'][$productAttributeSetDetail['code'].'_backend_display_type'] = $productAttributeSetDetail['backend_display_type'];
+						$box['box'][$productAttributeSetDetail['code'] . '_backend_display_type'] = $productAttributeSetDetail['backend_display_type'];
 						$box['boxContent'][$productAttributeSetDetail['code']] = '
 			<div id="wpshop_' . $currentPageCode . '_' . wpshop_tools::slugify($productAttributeSetDetail['code'], array('noAccent')) . '_form" >' . $currentTabContent . '
 							</div><div class="wpshop_cls" ></div>';
 					}
-					else if ( $outputType == 'column' ) {
+					else if ($outputType == 'column') {
 						$currentTabContent = str_replace('wpshop_form_input_element', 'wpshop_form_input_column', $currentTabContent);
 						$currentTabContent = str_replace('wpshop_form_label', 'wpshop_form_label_column', $currentTabContent);
 
@@ -2343,11 +2343,11 @@ 
 				}
 			}
 
-			if( !$attribute_set_id_is_present ) {
+			if (!$attribute_set_id_is_present) {
 				/*	Get attribute definition	*/
 				$attribute_def = wpshop_attributes::getElement('product_attribute_set_id', "'valid'", 'code');
 				/*	Get attribute input definition	*/
-				$input = wpshop_attributes::get_attribute_field_definition( $attribute_def, $attributeSetId, array_merge($attribute_specification, array('input_class' => ' wpshop_attributes_display', 'from' => 'admin')) );
+				$input = wpshop_attributes::get_attribute_field_definition($attribute_def, $attributeSetId, array_merge($attribute_specification, array('input_class' => ' wpshop_attributes_display', 'from' => 'admin')));
 				$input['type'] = 'hidden';
 
 				$box['boxMore'] = wpshop_form::check_input_type($input, $input['input_domain']);
@@ -2358,13 +2358,13 @@ 
 			$dialog_identifier = 'wpshop_new_attribute_option_value_add';
 			$dialog_input_identifier = 'wpshop_new_attribute_option_value';
 			ob_start();
-			include(WPSHOP_TEMPLATES_DIR.'admin/add_new_element_dialog.tpl.php');
+			include(WPSHOP_TEMPLATES_DIR . 'admin/add_new_element_dialog.tpl.php');
 			$box['boxMore'] .= ob_get_contents();
 			ob_end_clean();
 			$box['boxMore'] .= '<input type="hidden" name="wpshop_attribute_type_select_code" value="" id="wpshop_attribute_type_select_code" />';
 
-			if ( $shortcodes_to_display ) {
-				switch ( WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE ) {
+			if ($shortcodes_to_display) {
+				switch (WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE) {
 					case 'fixed-tab':
 					case 'movable-tab':
 						if ($outputType == 'box') {
@@ -2372,7 +2372,7 @@ 
 							$box['boxContent']['shortcode'] = $shortcodes_attr;
 							$box['box']['shortcode_backend_display_type'] = WPSHOP_PRODUCT_SHORTCODE_DISPLAY_TYPE;
 						}
-						else{
+						else {
 							$box['columnTitle']['shortcode'] = __('Product Shortcodes', 'wpshop');
 							$box['columnContent']['shortcode'] = $shortcodes_attr;
 						}
@@ -2396,12 +2396,12 @@ 
 		$ouput['more_input'] = '';
 
 		$attribute_default_value = $attribute->default_value;
-		if ( !empty($attribute->default_value) && ($attribute->default_value == serialize(false) || wpshop_tools::is_serialized( $attribute->default_value ) ) ) {
+		if (!empty($attribute->default_value) && ($attribute->default_value == serialize(false) || wpshop_tools::is_serialized($attribute->default_value))) {
 			$tmp_default_value = unserialize($attribute->default_value);
 			$attribute_default_value = !empty($tmp_default_value["default_value"]) ? $tmp_default_value["default_value"] : null;
 		}
 
-		if ( $attribute->data_type_to_use == 'custom') {
+		if ($attribute->data_type_to_use == 'custom') {
 			$query = $wpdb->prepare("SELECT id, label, value, '' as name FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE attribute_id = %d AND status = 'valid' ORDER BY position", $attribute->id);
 			$attribute_select_options = $wpdb->get_results($query);
 
@@ -2413,11 +2413,11 @@ 
 // 				}
 			endforeach;
 		}
-		elseif ( $attribute->data_type_to_use == 'internal')  {
+		elseif ($attribute->data_type_to_use == 'internal') {
 			switch ($attribute_default_value) {
 				case 'users':
 					$users = get_users('orderby=nicename');
-					foreach($users as $user){
+					foreach ($users as $user) {
 						$attribute_select_options_list[$user->ID] = $user->display_name;
 					}
 				break;
@@ -2426,11 +2426,11 @@ 
 					$wpshop_attr_custom_post_query = new WP_Query(array(
 						'post_type' => $attribute_default_value,
 						'posts_per_page' => -1,
-						'post_status' => array( 'publish', 'draft', 'future' ) ,
+						'post_status' => array('publish', 'draft', 'future'),
 					));
 
-					if($wpshop_attr_custom_post_query->have_posts()):
-						foreach($wpshop_attr_custom_post_query->posts as $post){
+					if ($wpshop_attr_custom_post_query->have_posts()):
+						foreach ($wpshop_attr_custom_post_query->posts as $post) {
 							$attribute_select_options_list[$post->ID] = $post->post_title;
 						}
 					endif;
@@ -2441,27 +2441,27 @@ 
 
 		/*	There is no value existing for this value	*/
 		if (empty($attribute_select_options_list)) :
-			$ouput['more_input'].=__('Nothing found for this field', 'wpshop');
+			$ouput['more_input'] .= __('Nothing found for this field', 'wpshop');
 		else:
 			/*	Add a default value to the combobox list	*/
 			$default_value_is_serial = false;
 			$attribute_list_first_element = $attribute->default_value;
-			if ( !empty($attribute->default_value) && ($attribute->default_value == serialize(false) || wpshop_tools::is_serialized( $attribute->default_value ) ) ) {
+			if (!empty($attribute->default_value) && ($attribute->default_value == serialize(false) || wpshop_tools::is_serialized($attribute->default_value))) {
 				$default_value_is_serial = true;
 				$tmp_default_value = unserialize($attribute->default_value);
 				$attribute_list_first_element = $tmp_default_value["field_options"]["label_for_first_item"];
 			}
 			//if ( !in_array($attribute->frontend_input, array('radio', 'checkbox')) || ($attribute_list_first_element != 'none') ) $ouput['possible_value'][] = ($default_value_is_serial && !empty($attribute_list_first_element)) ? $attribute_list_first_element : __('Choose a value', 'wpshop');
-			foreach ( $attribute_select_options_list as $option_key => $option_value ) {
+			foreach ($attribute_select_options_list as $option_key => $option_value) {
 				$ouput['possible_value'][$option_key] = stripslashes($option_value);
 			}
 		endif;
 
 		/*	Add a extra element to create a new element into list	*/
-		if ( is_admin()  && ( empty($provenance['from']) || ($provenance['from'] != 'frontend')) ) {
+		if (is_admin() && (empty($provenance['from']) || ($provenance['from'] != 'frontend'))) {
 			/**	$ouput['more_input'] .= '<img src="'.WPSHOP_MEDIAS_ICON_URL.'add.png" id="new_value_pict_' . $attribute->code . '" alt="'.__('Add a new value for this attribute', 'wpshop').'" title="'.__('Add a new value for this attribute', 'wpshop').'" class="wpshop_icons wpshop_icons_add_new_value_to_option_list wpshop_icons_add_new_value_to_option_list_'.$attribute->code.'" />';	*/
 		}
-		else if ( 'yes' == $attribute->is_used_in_quick_add_form ) {
+		else if ('yes' == $attribute->is_used_in_quick_add_form) {
 			$tpl_component = array();
 			$tpl_component['NEW_ELEMENT_CREATION_FIELD'] = 'attribute[new_value_creation][' . $attribute->code . ']';
 			$ouput['more_input'] .= wpshop_display::display_template_element('quick_entity_specific_field_new_element', $tpl_component);
@@ -2470,11 +2470,11 @@ 
 		return $ouput;
 	}
 
-	public static function get_affected_value_for_list( $attribute_code, $element_id, $attribute_data_type ) {
+	public static function get_affected_value_for_list($attribute_code, $element_id, $attribute_data_type) {
 		global $wpdb;
 		$affected_value = array();
 
-		if ( $attribute_data_type == 'custom' ) {
+		if ($attribute_data_type == 'custom') {
 			$query = $wpdb->prepare("
 SELECT ATT_SELECT_OPTIONS_VALUE.id AS chosen_val, ATT_SELECT_OPTIONS_VALUE.value
 FROM " . WPSHOP_DBT_ATTRIBUTE . " AS ATT
@@ -2496,20 +2496,20 @@ 
 		}
 
 		$attribute_values_for_variations = $wpdb->get_results($query);
-		foreach ( $attribute_values_for_variations as $attribute_def ) {
-			$affected_value[] = (int) $attribute_def->chosen_val;
+		foreach ($attribute_values_for_variations as $attribute_def) {
+			$affected_value[] = (int)$attribute_def->chosen_val;
 		}
 
 		return $affected_value;
 	}
 
 	public static function get_attribute_option_output($item, $attr_code, $attr_option, $additionnal_params = '') {
-		switch($attr_code){
+		switch ($attr_code) {
 			case 'is_downloadable_':
-				$option = get_post_meta($item['item_id'], 'attribute_option_'.$attr_code, true);
-				switch($attr_option){
+				$option = get_post_meta($item['item_id'], 'attribute_option_' . $attr_code, true);
+				switch ($attr_option) {
 					case 'file_url':
-						if(in_array($additionnal_params['order_status'], array('completed', 'shipped')) && (!empty($item['item_'.$attr_code]) && (strtolower(__($item['item_'.$attr_code], 'wpshop')) == __('yes','wpshop'))) ){
+						if (in_array($additionnal_params['order_status'], array('completed', 'shipped')) && (!empty($item['item_' . $attr_code]) && (strtolower(__($item['item_' . $attr_code], 'wpshop')) == __('yes', 'wpshop')))) {
 							$file_url = isset($option[$attr_option]) ? $option[$attr_option] : false;
 							return $file_url;
 						}
@@ -2522,17 +2522,17 @@ 
 
 	public static function get_attribute_option_fields($postid, $code) {
 
-		switch($code){
+		switch ($code) {
 			case 'is_downloadable_':
-				$data = get_post_meta($postid, 'attribute_option_'.$code, true);
-				$data['file_url'] = !empty($data['file_url'])?$data['file_url']:__('No file selected', 'wpshop');
-				$fields =  wp_nonce_field( 'ajax_wpshop_show_downloadable_interface_in_admin'.$postid, '_show_downloadable_interface_in_admin_wpnonce', true, false );
+				$data = get_post_meta($postid, 'attribute_option_' . $code, true);
+				$data['file_url'] = !empty($data['file_url']) ? $data['file_url'] : __('No file selected', 'wpshop');
+				$fields = wp_nonce_field('ajax_wpshop_show_downloadable_interface_in_admin' . $postid, '_show_downloadable_interface_in_admin_wpnonce', true, false);
 				$fields .= '<div class="wpshop_form_label alignleft">&nbsp;</div>
 						<div class="wpshop_form_input_element alignleft">
-						<div class="send_downloadable_file_dialog wpshop_add_box" data-post="'.$postid.'" title="' .__('Send the downloadable file', 'wpshop'). '"></div>
-						<a data-nonce="' . wp_create_nonce( "ajax_wpshop_fill_the_downloadable_dialog".$postid ) . '"  class="send_downlodable_file wps-bton-first-mini-rounded">' .__('Send a file', 'wpshop').'</a>
-						<input type="hidden" class="product_identifer_field" value="' .( !empty($postid) ? esc_attr( $postid ) : '') . '" /><br/><u>'.__('File url','wpshop').' :</u>
-						<div class="is_downloadable_statut_'.$postid.'"><a href="' .$data['file_url']. '" target="_blank" download>'.basename($data['file_url']).'</a></div>
+						<div class="send_downloadable_file_dialog wpshop_add_box" data-post="'.$postid . '" title="' . __('Send the downloadable file', 'wpshop') . '"></div>
+						<a data-nonce="' . wp_create_nonce("ajax_wpshop_fill_the_downloadable_dialog" . $postid) . '"  class="send_downlodable_file wps-bton-first-mini-rounded">' . __('Send a file', 'wpshop') . '</a>
+						<input type="hidden" class="product_identifer_field" value="' .(!empty($postid) ? esc_attr($postid) : '') . '" /><br/><u>' . __('File url', 'wpshop') . ' :</u>
+						<div class="is_downloadable_statut_'.$postid . '"><a href="' . $data['file_url'] . '" target="_blank" download>' . basename($data['file_url']) . '</a></div>
 						</div>';
 				return $fields;
 				break;
@@ -2557,8 +2557,8 @@ 
 		$attribute_value_content = '';
 
 		$atributes = self::getElement($attribute_code, "'valid'", 'code');
-		if ( !empty($atributes) ) {
-			$attribute_value_content = self::getAttributeValueForEntityInSet($atributes->data_type, $atributes->id,  wpshop_entities::get_entity_identifier_from_code($entity_type), $entity_id);
+		if (!empty($atributes)) {
+			$attribute_value_content = self::getAttributeValueForEntityInSet($atributes->data_type, $atributes->id, wpshop_entities::get_entity_identifier_from_code($entity_type), $entity_id);
 		}
 
 		return $attribute_value_content;
@@ -2570,14 +2570,14 @@ 
 	 * @param mixed $value
 	 * @return string The complete interface allowing to manage datetime attribute field
 	 */
-	function attribute_type_date_config( $value ) {
+	function attribute_type_date_config($value) {
 		$date_config_output = '';
 
 		$input_def['name'] = 'default_value';
 		$input_def['type'] = 'checkbox';
 		$input_def['possible_value'] = 'date_of_current_day';
 		$input_def['value'] = !empty($value['default_value']) ? $value['default_value'] : '';
-		$input_def['options_label']['custom'] = ' ' . __('Use the date of the day as default value', 'wpshop') . ' <a href="#" title="'.__('Check this box for using date of the day as value when editing a product', 'wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		$input_def['options_label']['custom'] = ' ' . __('Use the date of the day as default value', 'wpshop') . ' <a href="#" title="' . __('Check this box for using date of the day as value when editing a product', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 		$date_config_output .= wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE);
 
 		$input_def = array();
@@ -2586,35 +2586,35 @@ 
 		$input_def['type'] = 'checkbox';
 		$input_def['valueToPut'] = 'index';
 		$input_def['value'] = !empty($value['field_options']['attribute_type_date_options_day_to_show']) ? $value['field_options']['attribute_type_date_options_day_to_show'] : '';
-		$input_def['possible_value'] = array('1' => ' ' . __('Monday', 'wpshop'), '2' => ' ' .__('Tuesday', 'wpshop'), '3' => ' ' .__('Wednesday', 'wpshop'), '4' => ' ' .__('Thursday', 'wpshop'), '5' => ' ' .__('Friday', 'wpshop'), '6' => ' ' .__('Saturday', 'wpshop'), '0' => ' ' .__('Sunday', 'wpshop'));
+		$input_def['possible_value'] = array('1' => ' ' . __('Monday', 'wpshop'), '2' => ' ' . __('Tuesday', 'wpshop'), '3' => ' ' . __('Wednesday', 'wpshop'), '4' => ' ' . __('Thursday', 'wpshop'), '5' => ' ' . __('Friday', 'wpshop'), '6' => ' ' . __('Saturday', 'wpshop'), '0' => ' ' . __('Sunday', 'wpshop'));
 		$input_def['options_label']['original'] = true;
-		$date_config_output .= '<div>' . __('Choose available days in date picker', 'wpshop') . '<a href="#" title="'.__('This option allows you to define the available day in final datepicker', 'wpshop').'" class="wpshop_infobulle_marker">?</a>' . '<br/>' . wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_day_to_show]') . '</div>';
+		$date_config_output .= '<div>' . __('Choose available days in date picker', 'wpshop') . '<a href="#" title="' . __('This option allows you to define the available day in final datepicker', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>' . '<br/>' . wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_day_to_show]') . '</div>';
 
 		/**	Past and futur date restriction	*/
 		$input_def = array();
 		$input_def['name'] = '';
 		$input_def['type'] = 'text';
-		$date_config_output .= '<div id="wpshop_avalaible_date_for_past_and_futur" >' . __('Calendar past and futur date available', 'wpshop') . '<a href="#" title="'.__('Define if the end user is allowed to choose past and/or futur date', 'wpshop').'" class="wpshop_infobulle_marker">?</a><br/>';
+		$date_config_output .= '<div id="wpshop_avalaible_date_for_past_and_futur" >' . __('Calendar past and futur date available', 'wpshop') . '<a href="#" title="' . __('Define if the end user is allowed to choose past and/or futur date', 'wpshop') . '" class="wpshop_infobulle_marker">?</a><br/>';
 		$available_type_input_def = array();
 		$available_type_input_def['name'] = '';
 		$available_type_input_def['id'] = 'wpshop_attributes_edition_table_field_attribute_type_date_options_available_date_past_futur_minimum';
 		$available_type_input_def['type'] = 'text';
 		$available_type_input_def['value'] = !empty($value['field_options']['attribute_type_date_options_available_date_past_futur']['minDate'][0]) ? $value['field_options']['attribute_type_date_options_available_date_past_futur']['minDate'][0] : '';
-		$date_config_output .= __('Minimum date to show', 'wpshop') . '<a href="#" title="'.__('If you want the calendar to start today put only 0, if you want to show anterior date, put the number of Day or Month or Year (ex: -1D)', 'wpshop').'" class="wpshop_infobulle_marker">?</a>' . wpshop_form::check_input_type($available_type_input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date_past_futur][minDate]') . '<br/>';
+		$date_config_output .= __('Minimum date to show', 'wpshop') . '<a href="#" title="' . __('If you want the calendar to start today put only 0, if you want to show anterior date, put the number of Day or Month or Year (ex: -1D)', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>' . wpshop_form::check_input_type($available_type_input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date_past_futur][minDate]') . '<br/>';
 		$available_type_input_def = array();
 		$available_type_input_def['name'] = '';
 		$available_type_input_def['id'] = 'wpshop_attributes_edition_table_field_attribute_type_date_options_available_date_past_futur_maximum';
 		$available_type_input_def['type'] = 'text';
 		$available_type_input_def['value'] = !empty($value['field_options']['attribute_type_date_options_available_date_past_futur']['maxDate'][0]) ? $value['field_options']['attribute_type_date_options_available_date_past_futur']['maxDate'][0] : '';
-		$date_config_output .= __('Maximum date to show', 'wpshop') . '<a href="#" title="'.__('If you want the calendar to end today put only 0, if you want to show date in futur, put the number of Day or Month or Year (ex: +1M)', 'wpshop').'" class="wpshop_infobulle_marker">?</a>' . wpshop_form::check_input_type($available_type_input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date_past_futur][maxDate]') . '<br/>';
+		$date_config_output .= __('Maximum date to show', 'wpshop') . '<a href="#" title="' . __('If you want the calendar to end today put only 0, if you want to show date in futur, put the number of Day or Month or Year (ex: +1M)', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>' . wpshop_form::check_input_type($available_type_input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date_past_futur][maxDate]') . '<br/>';
 		$date_config_output .= '</div>';
 
 		$input_def = array();
 		$input_def['name'] = '';
 		$input_def['type'] = 'text';
 		$date_config_output .= '
-<div id="wpshop_attribute_date_empy_field" class="wpshopHide" ><br/>' . wpshop_form::check_input_type(array_merge($input_def, array('value' => '', 'id' => 'wpshop_attributes_edition_table_field_attribute_type_date_options_available_date_new_input')), WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date]') .'</div>
-<div id="wpshop_avalaible_date_list_container" >' . __('Choose available date in date picker', 'wpshop') . '<a href="#" title="'.__('This option allows you to define the available date in final datepicker', 'wpshop').'" class="wpshop_infobulle_marker">?</a><br/>';
+<div id="wpshop_attribute_date_empy_field" class="wpshopHide" ><br/>' . wpshop_form::check_input_type(array_merge($input_def, array('value' => '', 'id' => 'wpshop_attributes_edition_table_field_attribute_type_date_options_available_date_new_input')), WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date]') . '</div>
+<div id="wpshop_avalaible_date_list_container" >' . __('Choose available date in date picker', 'wpshop') . '<a href="#" title="' . __('This option allows you to define the available date in final datepicker', 'wpshop') . '" class="wpshop_infobulle_marker">?</a><br/>';
 
 		$available_type_input_def = array();
 		$available_type_input_def['name'] = '';
@@ -2627,9 +2627,9 @@ 
 		$date_config_output .= wpshop_form::check_input_type($available_type_input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date_type]') . '<br/>';
 
 		$existing = 0;
-		if ( !empty($value['field_options']['attribute_type_date_options_available_date']) ) {
-			foreach ( $value['field_options']['attribute_type_date_options_available_date'] as $index => $value ) {
-				if ( !empty($value) ) {
+		if (!empty($value['field_options']['attribute_type_date_options_available_date'])) {
+			foreach ($value['field_options']['attribute_type_date_options_available_date'] as $index => $value) {
+				if (!empty($value)) {
 					$input_def['value'] = $value;
 					$input_def['id'] = 'wpshop_attributes_edition_table_field_attribute_type_date_options_available_date_' . $index;
 					$date_config_output .= wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE . '_options[attribute_type_date_options_available_date]') . '<br/>';
@@ -2653,20 +2653,20 @@ 
 	 * @param array $values Valeurs d'attributs
 	 * @return array
 	 */
-	public static function setAttributesValuesForItem($entityId, $values=array(), $defaultValueForOthers=false, $from = 'webservice') {
-		$message='';
+	public static function setAttributesValuesForItem($entityId, $values = array(), $defaultValueForOthers = false, $from = 'webservice') {
+		$message = '';
 		$attribute_available = array();
 		$attribute_final = array();
 		$entity_type = get_post_type($entityId);
-		$data = self::get_attribute_list_for_item( wpshop_entities::get_entity_identifier_from_code($entity_type), $entityId, WPSHOP_CURRENT_LOCALE);
-		foreach($data as $d) $attribute_available[$d->attribute_code] = array('attribute_id' => $d->attribute_id, 'data_type' => $d->data_type);
+		$data = self::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code($entity_type), $entityId, WPSHOP_CURRENT_LOCALE);
+		foreach ($data as $d) $attribute_available[$d->attribute_code] = array('attribute_id' => $d->attribute_id, 'data_type' => $d->data_type);
 
 		// Creation d'un array "propre" et valide pour la fonction self::saveAttributeForEntity
-		foreach ( $values as $key => $value ) {
-			if ( in_array( $key, array_keys( $attribute_available ) ) ) {
+		foreach ($values as $key => $value) {
+			if (in_array($key, array_keys($attribute_available))) {
 				$attribute_final[$attribute_available[$key]['data_type']][$key] = $value;
 			}
-			else $message .= sprintf(__('Impossible to set "%s" attribute', 'wpshop'), $key)."\n";
+			else $message .= sprintf(__('Impossible to set "%s" attribute', 'wpshop'), $key) . "\n";
 		}
 
 		// Pour les autres attributs non donné on leur affecte leur valeur par défaut
@@ -2687,7 +2687,7 @@ 
 			}
 		}
 
-		switch ( $entity_type ) {
+		switch ($entity_type) {
 			case WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT:
 					$meta_key = WPSHOP_PRODUCT_ATTRIBUTE_META_KEY;
 				break;
@@ -2717,22 +2717,22 @@ 
 	 */
 	public static function get_attribute_type_select_option_info($option_id, $field = 'label', $attribute_data_type = 'custom', $only_value = false) {
 		global $wpdb;
-		if( ! is_numeric( $option_id ) ) {
+		if (!is_numeric($option_id)) {
 			return '';
 		}
-		$option_id = (int) $option_id;
-		switch ( $attribute_data_type ) {
+		$option_id = (int)$option_id;
+		switch ($attribute_data_type) {
 			case 'internal':
 				$entity_infos = get_post($option_id);
-				if ( !empty($entity_infos) ) {
-					if ( !$only_value ) {
+				if (!empty($entity_infos)) {
+					if (!$only_value) {
 						/** Template parameters */
 						$template_part = 'product_attribute_value_internal';
 						$tpl_component = array();
 						$tpl_component['ATTRIBUTE_VALUE_POST_LINK'] = get_permalink($option_id);
 						$tpl_component['ATTRIBUTE_VALUE_POST_TITLE'] = $entity_infos->post_title;
 
-						foreach ( $entity_infos as $post_definition_key => $post_definition_value ) {
+						foreach ($entity_infos as $post_definition_key => $post_definition_value) {
 							$tpl_component['ATTRIBUTE_VALUE_' . strtoupper($post_definition_key)] = $entity_infos->$post_definition_key;
 						}
 
@@ -2747,8 +2747,8 @@ 
 				break;
 
 			default:
-				if ( ! array_key_exists( $option_id, self::$select_option_info_cache ) ) {
-					$query = $wpdb->prepare("SELECT " . $field . " FROM ".WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS." WHERE id=%d LIMIT 1", $option_id);
+				if (!array_key_exists($option_id, self::$select_option_info_cache)) {
+					$query = $wpdb->prepare("SELECT " . $field . " FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE id=%d LIMIT 1", $option_id);
 					self::$select_option_info_cache[$option_id] = $wpdb->get_var($query);
 				}
 				$info = self::$select_option_info_cache[$option_id];
@@ -2788,39 +2788,39 @@ 
 	 * @param string $data_type optionnal Le type de donnees choisi pour cet attribut (custom | internal)
 	 * @return string Le resultat sous forme de code html pour la liste des options
 	 */
-	function get_select_options_list($attribute_id, $data_type='custom') {
+	function get_select_options_list($attribute_id, $data_type = 'custom') {
 		global $wpdb;
 		$output = '';
 
 		$attribute_select_options = self::get_select_option_list_($attribute_id);
 
 		/*	Add possibily to choose datat type to use with list	*/
-		if(empty($attribute_id) || (!empty($attribute_select_options) && empty($attribute_select_options[0]->data_type_to_use))){
-			unset($input_def);$input_def=array();
+		if (empty($attribute_id) || (!empty($attribute_select_options) && empty($attribute_select_options[0]->data_type_to_use))) {
+			unset($input_def); $input_def = array();
 			$input_def['label'] = __('Type of data for list', 'wpshop');
 			$input_def['type'] = 'radio';
 			$input_def['name'] = 'data_type_to_use';
 			$input_def['valueToPut'] = 'index';
 			$input_def['possible_value'] = unserialize(WPSHOP_ATTR_SELECT_TYPE);
 			$input_def['option'] = 'class="wpshop_cls wpshop_attr_combo_data_type"';
-			$input_def['value'] = $data_type.'_data';
+			$input_def['value'] = $data_type . '_data';
 			$input_def['options_label']['original'] = true;
 			$output = wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE);
 		}
 
-		if(!empty($attribute_id) || !empty($data_type)){
-			$defaut_value = ( !empty($attribute_select_options[0]) && !empty($attribute_select_options[0]->default_value) ) ? $attribute_select_options[0]->default_value : null;
+		if (!empty($attribute_id) || !empty($data_type)) {
+			$defaut_value = (!empty($attribute_select_options[0]) && !empty($attribute_select_options[0]->default_value)) ? $attribute_select_options[0]->default_value : null;
 			$default_is_serial = false;
-			if ( !empty($attribute_select_options[0]->default_value) && ($attribute_select_options[0]->default_value == serialize(false) || wpshop_tools::is_serialized( $attribute_select_options[0]->default_value ) ) ) {
+			if (!empty($attribute_select_options[0]->default_value) && ($attribute_select_options[0]->default_value == serialize(false) || wpshop_tools::is_serialized($attribute_select_options[0]->default_value))) {
 				$defaut_value = unserialize($attribute_select_options[0]->default_value);
 				$default_is_serial = true;
 			}
 			/**	Add a custom text first item of list	*/
-			$output .= '<div class="wpshop_cls" ><label for="text_for_empty_value" >' . __('Text displayed when no value selected', 'wpshop') . '</label> <input type="text" name="' . WPSHOP_DBT_ATTRIBUTE . '[default_value][field_options][label_for_first_item]" value="' . (($default_is_serial && is_array($defaut_value) && !empty($defaut_value["field_options"]["label_for_first_item"])) ? stripslashes( $defaut_value["field_options"]["label_for_first_item"] ) : __('Choose a value', 'wpshop')) . '" id="text_for_empty_value" /></div>';
+			$output .= '<div class="wpshop_cls" ><label for="text_for_empty_value" >' . __('Text displayed when no value selected', 'wpshop') . '</label> <input type="text" name="' . WPSHOP_DBT_ATTRIBUTE . '[default_value][field_options][label_for_first_item]" value="' . (($default_is_serial && is_array($defaut_value) && !empty($defaut_value["field_options"]["label_for_first_item"])) ? stripslashes($defaut_value["field_options"]["label_for_first_item"]) : __('Choose a value', 'wpshop')) . '" id="text_for_empty_value" /></div>';
 
-			if((($data_type == 'custom') && empty($attribute_select_options)) || (!empty($attribute_select_options) && !empty($attribute_select_options[0]->data_type_to_use) && ($attribute_select_options[0]->data_type_to_use == 'custom'))){
+			if ((($data_type == 'custom') && empty($attribute_select_options)) || (!empty($attribute_select_options) && !empty($attribute_select_options[0]->data_type_to_use) && ($attribute_select_options[0]->data_type_to_use == 'custom'))) {
 				$sub_output = '';
-				if ( !empty($attribute_select_options) && !empty($attribute_select_options[0]) && !empty($attribute_select_options[0]->id) ) {
+				if (!empty($attribute_select_options) && !empty($attribute_select_options[0]) && !empty($attribute_select_options[0]->id)) {
 					$sub_output .= '
 					<li class="wpshop_attribute_combo_options_container ui-state-disabled" >
 						<input type="radio" name="' . WPSHOP_DBT_ATTRIBUTE . '[default_value][default_value]" value="" id="default_value_empty" ' . (($default_is_serial && is_array($defaut_value) && empty($defaut_value["default_value"])) || empty($defaut_value) ? 'checked ' : '') . '/> <label for="default_value_empty">' . __('No default value', 'wpshop') . '</label>
@@ -2833,7 +2833,7 @@ 
 						$tpl_component['ADMIN_ATTRIBUTE_VALUES_OPTION_VALUE'] = str_replace(".", ",", $options->value);
 						$tpl_component['ADMIN_ATTRIBUTE_VALUES_OPTION_STATE'] = (!empty($options->id) && (($default_is_serial && is_array($defaut_value) && !empty($defaut_value["default_value"]) && ($defaut_value["default_value"] == $options->id))) ? ' checked="checked"' : '');
 						$tpl_component['ADMIN_ATTRIBUTE_VALUE_OPTIN_ACTIONS'] = '';
-						if( current_user_can('wpshop_delete_attributes_select_values') && ($options->value_id >= 0) ):
+						if (current_user_can('wpshop_delete_attributes_select_values') && ($options->value_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_id), 'admin');
 						endif;
 						$sub_output .= wpshop_display::display_template_element('wpshop_admin_attr_option_value_item', $tpl_component, array('type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $attribute_id), 'admin');
@@ -2841,13 +2841,13 @@ 
 					}
 				}
 				$add_button = $add_dialog_box = $user_more_script = '';
-				if( current_user_can('wpshop_add_attributes_select_values') ) {
+				if (current_user_can('wpshop_add_attributes_select_values')) {
 
 					$dialog_title = __('New value for attribute', 'wpshop');
 					$dialog_identifier = 'wpshop_new_attribute_option_value_add';
 					$dialog_input_identifier = 'wpshop_new_attribute_option_value';
 					ob_start();
-					include(WPSHOP_TEMPLATES_DIR.'admin/add_new_element_dialog.tpl.php');
+					include(WPSHOP_TEMPLATES_DIR . 'admin/add_new_element_dialog.tpl.php');
 					$add_dialog_box = ob_get_contents();
 					ob_end_clean();
 
@@ -2855,23 +2855,23 @@ 
 					$add_button_parent_class = 'wpshop_attribute_option_value_add';
 					$add_button_name = 'wpshop_add_option_to_select';
 					ob_start();
-					include(WPSHOP_TEMPLATES_DIR.'admin/add_new_element_with_dialog.tpl.php');
+					include(WPSHOP_TEMPLATES_DIR . 'admin/add_new_element_with_dialog.tpl.php');
 					$add_button = ob_get_contents();
 					ob_end_clean();
 
 					$user_more_script = '
-			jQuery("#'.$dialog_identifier.'").dialog({
+			jQuery("#'.$dialog_identifier . '").dialog({
 				modal: true,
 				dialogClass: "wpshop_uidialog_box",
 				autoOpen:false,
 				show: "blind",
 				resizable: false,
 				buttons:{
-					"'.__('Add', 'wpshop').'": function(){
+					"'.__('Add', 'wpshop') . '": function(){
 						var data = {
 							action: "new_option_for_select",
 							wpshop_ajax_nonce: "' . wp_create_nonce("wpshop_new_option_for_attribute_creation") . '",
-							attribute_new_label: jQuery("#'.$dialog_input_identifier.'").val(),
+							attribute_new_label: jQuery("#'.$dialog_input_identifier . '").val(),
 							attribute_identifier: "' . $attribute_id . '"
 						};
 						jQuery.post(ajaxurl, data, function(response) {
@@ -2887,21 +2887,21 @@ 
 
 						jQuery(this).children("img").show();
 					},
-					"'.__('Cancel', 'wpshop').'": function(){
+					"'.__('Cancel', 'wpshop') . '": function(){
 						jQuery(this).dialog("close");
 					}
 				},
 				close:function(){
-					jQuery("#'.$dialog_input_identifier.'").val("");
+					jQuery("#'.$dialog_input_identifier . '").val("");
 				}
 			});
-			jQuery(".'.$add_button_parent_class.' input").click(function(){
-				jQuery("#'.$dialog_identifier.'").dialog("open");
+			jQuery(".'.$add_button_parent_class . ' input").click(function(){
+				jQuery("#'.$dialog_identifier . '").dialog("open");
 			});';
 
 				}
 				$output .= $add_dialog_box . '
-	<ul id="sortable_attribute" class="wpshop_cls" >'.(count($attribute_select_options)>5 ? $add_button : '').$sub_output.$add_button.'
+	<ul id="sortable_attribute" class="wpshop_cls" >'.(count($attribute_select_options) > 5 ? $add_button : '') . $sub_output . $add_button . '
 	</ul>
 	<input type="hidden" value="' . wp_create_nonce("wpshop_new_option_for_attribute_deletion") . '" name="wpshop_new_option_for_attribute_deletion_nonce" id="wpshop_new_option_for_attribute_deletion_nonce" />
 	<script type="text/javascript" >
@@ -2917,7 +2917,7 @@ 
 					var data = {
 						action: "attribute_output_type",
 						current_type: jQuery("#wpshop_attributes_edition_table_field_id_frontend_input").val(),
-						elementIdentifier: "'.$attribute_id.'",
+						elementIdentifier: "'.$attribute_id . '",
 						data_type_to_use: jQuery(this).val(),
 						wpshop_ajax_nonce: "' . wp_create_nonce("wpshop_attribute_output_type_selection") . '"
 					};
@@ -2932,10 +2932,10 @@ 
 		});
 	</script>';
 			}
-			elseif((($data_type == 'internal') && empty($attribute_select_options)) || (!empty($attribute_select_options) && !empty($attribute_select_options[0]->data_type_to_use) && ($attribute_select_options[0]->data_type_to_use == 'internal'))){
-				$sub_output='';
+			elseif ((($data_type == 'internal') && empty($attribute_select_options)) || (!empty($attribute_select_options) && !empty($attribute_select_options[0]->data_type_to_use) && ($attribute_select_options[0]->data_type_to_use == 'internal'))) {
+				$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'] = 'default_value][default_value';
@@ -2944,20 +2944,20 @@ 
 				$input_def['possible_value'] = $wp_types;
 				$input_def['value'] = (($default_is_serial && is_array($defaut_value) && !empty($defaut_value["default_value"])) ? $defaut_value["default_value"] : (!empty($defaut_value) ? $defaut_value : null));
 				$combo_wp_type = wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE);
-				$output .= '<div class="wpshop_cls">'.$combo_wp_type.'</div>';
-				if ( !empty($attribute_id) ) {
+				$output .= '<div class="wpshop_cls">' . $combo_wp_type . '</div>';
+				if (!empty($attribute_id)) {
 					$option_list = '<div>' . __('You can reorder element for display them in the order you want into frontend part', 'wpshop') . '</div>';
-					$options_for_current_attribute = query_posts( array('post_type' => $input_def['value'], 'posts_per_page' => -1, 'orderby' => 'menu_order', 'order' => 'ASC' ) );
-					if ( !empty($options_for_current_attribute) ) {
+					$options_for_current_attribute = query_posts(array('post_type' => $input_def['value'], 'posts_per_page' => -1, 'orderby' => 'menu_order', 'order' => 'ASC'));
+					if (!empty($options_for_current_attribute)) {
 						$option_list .= '<ul class="wpshop_attribute_combo_values_list_container" >';
 						$current_order = ' ';
-						foreach ( $options_for_current_attribute as $options_def ) {
+						foreach ($options_for_current_attribute as $options_def) {
 							$current_order .= 'post_' . $options_def->ID . ',';
 							$option_list .= '<li id="post_' . $options_def->ID . '" class="wpshop_attribute_combo_values_list_item wpshop_attribute_combo_values_list_item_' . $options_def->ID . '" ><span class="wpshop_internal_value_for_option_list_identifier" >#' . $options_def->ID . '</span> ' . $options_def->post_title . '</li>';
 						}
 						$option_list .= '</ul><input type="hidden" value="' . substr($current_order, 0, -1) . '" name="' . WPSHOP_DBT_ATTRIBUTE . '[wpshop_attribute_combo_values_list_order_def]" id="wpshop_attribute_combo_values_list_order_def" />';
 					}
-					$output .= '<div class="wpshop_cls">'.$option_list.'</div>';
+					$output .= '<div class="wpshop_cls">' . $option_list . '</div>';
 				}
 			}
 		}
@@ -2985,8 +2985,8 @@ 
 		$attribute_list_for_entity = self::getElement($entity_id, "'valid'", 'entity_id', true);
 
 		/*	Read the list	*/
-		if ( !empty ($attribute_list_for_entity ) ) {
-			foreach ( $attribute_list_for_entity as $attribute) {
+		if (!empty ($attribute_list_for_entity)) {
+			foreach ($attribute_list_for_entity as $attribute) {
 				switch ($list_for) {
 					case 'attribute_value':
 							$checkbox_state = ' ';
@@ -2995,8 +2995,8 @@ 
 								<select id="wpshop_shortcode_element_attribute_value_product_list_' . $attribute->id . '" class="wpshop_shortcode_element_attribute_value_product_list" >';
 
 							global $post;
-							$posts = get_posts( array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'numberposts' => -1) );
-							foreach( $posts as $post ) :
+							$posts = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'numberposts' => -1));
+							foreach ($posts as $post) :
 								setup_postdata($post);
 								$attribute_possible_values .= '<option value="' . get_the_ID() . '" >' . get_the_ID() . ' - ' . get_the_title() . '</option>';
 							endforeach;
@@ -3012,23 +3012,23 @@ 
 
 						$checkbox_state = 'disabled ';
 						$attribute_possible_values = '';
-						if ( !empty($attribute_values) ) {
+						if (!empty($attribute_values)) {
 							$checkbox_state = '';
 							$attribute_possible_values = '
 							<div class="wpshop_shortcode_element_product_listing_per_attribute_value wpshop_shortcode_element_prodcut_listing_per_attribute_value_' . $attribute->code . '_container" >
 								<select id="wpshop_attribute_value_for_shortcode_generation_' . $attribute->id . '" class="wpshop_shortcode_element_prodcut_listing_per_attribute_value hidden" >';
 
-								if ( ($attribute->data_type == 'integer') && ( ($attribute->backend_input == 'select') || ($attribute->backend_input == 'multiple-select') ) ) {
+								if (($attribute->data_type == 'integer') && (($attribute->backend_input == 'select') || ($attribute->backend_input == 'multiple-select'))) {
 									$query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE attribute_id=%d ORDER BY position", $attribute->id);
 									$possible_values = $wpdb->get_results($query);
 									$already_selected_values = array();
 									foreach ($attribute_values as $attribute_value) {
-										if ( !empty($attribute_value->value) ) {
+										if (!empty($attribute_value->value)) {
 											$already_selected_values[] = $attribute_value->value;
 										}
 									}
 									foreach ($possible_values as $value) {
-										if ( in_array( $value->id, $already_selected_values ) ) {
+										if (in_array($value->id, $already_selected_values)) {
 											$attribute_possible_values .= '
 									<option value="' . $value->value . '" >' . $value->label . '</option>';
 										}
@@ -3036,7 +3036,7 @@ 
 								}
 								else {
 									foreach ($attribute_values as $attribute_value) {
-										if ( !empty($attribute_value->value) ) {
+										if (!empty($attribute_value->value)) {
 											$attribute_possible_values .= '
 									<option value="' . $attribute_value->value . '" >' . $attribute_value->value . '</option>';
 										}
@@ -3065,23 +3065,23 @@ 
 	 *
 	 * @return object The attribute list as a wordpress database object
 	 */
-	function get_attribute_list_in_same_set_section( $attribute_code ) {
+	function get_attribute_list_in_same_set_section($attribute_code) {
 		global $wpdb;
 
 		$attribute_def = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
 
 		/** Get the entire list of attribute in price set section for display	*/
-		$query = $wpdb->prepare( "SELECT entity_type_id, attribute_set_id, attribute_group_id FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_id = %d AND status = 'valid'", $attribute_def->id);
+		$query = $wpdb->prepare("SELECT entity_type_id, attribute_set_id, attribute_group_id FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_id = %d AND status = 'valid'", $attribute_def->id);
 		$attribute_attribution_def = $wpdb->get_row($query);
 
-		$query = $wpdb->prepare( "
+		$query = $wpdb->prepare("
 							SELECT ATTR.code, is_visible_in_front_listing, is_visible_in_front
 							FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " AS SET_SECTION_DETAIL
 								INNER JOIN " . WPSHOP_DBT_ATTRIBUTE . " AS ATTR ON (ATTR.id = SET_SECTION_DETAIL.attribute_id)
 							WHERE entity_type_id = %d
 								AND attribute_set_id = %d
 								AND attribute_group_id = %d",
-				$attribute_attribution_def->entity_type_id, $attribute_attribution_def->attribute_set_id, $attribute_attribution_def->attribute_group_id );
+				$attribute_attribution_def->entity_type_id, $attribute_attribution_def->attribute_set_id, $attribute_attribution_def->attribute_group_id);
 		$atribute_list = $wpdb->get_results($query);
 
 		return $atribute_list;
@@ -3092,7 +3092,7 @@ 
 	 * @param unknown_type $current_entity_id
 	 * @return Ambigous <multitype:, multitype:NULL >
 	 */
-	public static function get_variation_available_attribute( $current_entity_id ) {
+	public static function get_variation_available_attribute($current_entity_id) {
 		global $wpdb;
 		$final_list = array();
 
@@ -3100,7 +3100,7 @@ 
 		$query = $wpdb->prepare(
 				"SELECT ATT.*, ENTITY_META.meta_value
 				FROM " . self::getDbTable() . " AS ATT
-					INNER JOIN " . WPSHOP_DBT_ATTRIBUTE_DETAILS. " AS ATT_DETAILS ON ((ATT_DETAILS.attribute_id = ATT.id) AND (ATT_DETAILS.entity_type_id = %d) AND (ATT_DETAILS.status = 'valid'))
+					INNER JOIN " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " AS ATT_DETAILS ON ((ATT_DETAILS.attribute_id = ATT.id) AND (ATT_DETAILS.entity_type_id = %d) AND (ATT_DETAILS.status = 'valid'))
 					INNER JOIN " . $wpdb->postmeta . " AS ENTITY_META ON ((ENTITY_META.meta_key = %s) AND (ENTITY_META.meta_value = ATT_DETAILS.attribute_set_id))
 				WHERE ATT.status IN ('valid')
 					AND ATT.is_used_for_variation = %s
@@ -3110,10 +3110,10 @@ 
 		);
 		$attribute_list = $wpdb->get_results($query);
 		foreach ($attribute_list as $attribute) {
-			if ( !in_array($attribute->code, unserialize(WPSHOP_VARIATION_ATTRIBUTE_TO_HIDE)) && in_array($attribute->backend_input, array('select', 'multiple-select')) ) {
-				$attribute_values_for_variations = wpshop_attributes::get_affected_value_for_list( $attribute->code, $current_entity_id, $attribute->data_type_to_use );
+			if (!in_array($attribute->code, unserialize(WPSHOP_VARIATION_ATTRIBUTE_TO_HIDE)) && in_array($attribute->backend_input, array('select', 'multiple-select'))) {
+				$attribute_values_for_variations = wpshop_attributes::get_affected_value_for_list($attribute->code, $current_entity_id, $attribute->data_type_to_use);
 
-				if ( empty($attribute_values_for_variations) ) {
+				if (empty($attribute_values_for_variations)) {
 					$final_list['unavailable'][$attribute->code]['label'] = $attribute->frontend_label;
 					$final_list['unavailable'][$attribute->code]['values'] = array();
 					$final_list['unavailable'][$attribute->code]['attribute_complete_def'] = $attribute;
@@ -3133,16 +3133,16 @@ 
 	 * @param integer $current_entity_id The current element edited
 	 * @return Ambigous <string, string, mixed>
 	 */
-	public static function get_variation_available_attribute_display( $current_entity_id, $variation_type = 'multiple' ) {
+	public static function get_variation_available_attribute_display($current_entity_id, $variation_type = 'multiple') {
 		$attribute_list = wpshop_attributes::get_variation_available_attribute($current_entity_id);
 
 		$attribute_defined_as_available_for_variation = '';
-		if ( !empty($attribute_list) ) {
+		if (!empty($attribute_list)) {
 			foreach ($attribute_list as $list_type => $attribute_list_by_type) {
 				$sub_attribute_list = '';
 				foreach ($attribute_list_by_type as $attribute_code => $attribute_def) {
 					$tpl_component = array();
-					if ( $list_type == 'available' ) {
+					if ($list_type == 'available') {
 						$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_LABEL_STATE'] = '';
 						$tpl_component['ADMIN_VARIATIONS_DEF_LIST_ATTRIBUTE_CHECKBOX_STATE'] = '';
 						$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_LABEL_EXPLAINATION'] = '';
@@ -3156,13 +3156,13 @@ 
 					$tpl_component['ADMIN_ATTRIBUTE_CODE_FOR_VARIATION'] = $attribute_code;
 					$tpl_component['ADMIN_VARIATIONS_DEF_ATTRIBUTE_TO_USE_NAME'] = $attribute_code;
 					$tpl_component['ADMIN_VARIATION_ATTRIBUTE_CONTAINER_CLASS'] = ' wpshop_attribute_for_variation_' . $attribute_code;
-					$tpl_component['ADMIN_VARIATION_NEW_SINGLE_LABEL'] = __( $attribute_def['label'], 'wpshop' );
+					$tpl_component['ADMIN_VARIATION_NEW_SINGLE_LABEL'] = __($attribute_def['label'], 'wpshop');
 					$tpl_component['ADMIN_VARIATION_NEW_SINGLE_INPUT'] = '';
-					if ( $variation_type == 'single' ) {
-						$attribute_output_def = wpshop_attributes::get_attribute_field_definition( $attribute_def['attribute_complete_def'], $attribute_def['values'], array('from' => 'frontend', 'field_custom_name_prefix' => 'variation_attr', 'input_class' => ' variation_attribute_usable_input') );
-						if ( !empty($attribute_output_def['possible_value']) ) {
-							foreach( $attribute_output_def['possible_value'] as $value_id => $value ){
-								if ( !in_array($value_id, $attribute_def['values']) ) {
+					if ($variation_type == 'single') {
+						$attribute_output_def = wpshop_attributes::get_attribute_field_definition($attribute_def['attribute_complete_def'], $attribute_def['values'], array('from' => 'frontend', 'field_custom_name_prefix' => 'variation_attr', 'input_class' => ' variation_attribute_usable_input'));
+						if (!empty($attribute_output_def['possible_value'])) {
+							foreach ($attribute_output_def['possible_value'] as $value_id => $value) {
+								if (!in_array($value_id, $attribute_def['values'])) {
 									unset($attribute_output_def['possible_value'][$value_id]);
 								}
 							}
@@ -3177,7 +3177,7 @@ 
 			}
 		}
 
-		return array($attribute_defined_as_available_for_variation, ( (!empty($attribute_list['available']) ) ? $attribute_list['available'] : ''), ( ( !empty($attribute_list['unavailable']) ) ? $attribute_list['unavailable'] : ''));
+		return array($attribute_defined_as_available_for_variation, ((!empty($attribute_list['available'])) ? $attribute_list['available'] : ''), ((!empty($attribute_list['unavailable'])) ? $attribute_list['unavailable'] : ''));
 	}
 
 	/**
@@ -3186,18 +3186,18 @@ 
 	 * @param array $variations_attribute_parameters Allows to give some parameters for customize list
 	 * @return string The output for all specific attribute in each product with option
 	 */
-	public static function get_variation_attribute( $variations_attribute_parameters ) {
+	public static function get_variation_attribute($variations_attribute_parameters) {
 		$output = '';
 
 		$attribute_list = wpshop_attributes::getElement('yes', "'valid'", "is_used_in_variation", true);
-		if ( !empty( $attribute_list ) ) {
+		if (!empty($attribute_list)) {
 			$tpl_component = array();
 			$tpl_component['ADMIN_VARIATION_DETAIL'] = '';
 			$price_piloting_option = get_option('wpshop_shop_price_piloting');
-			foreach ( $attribute_list as $attribute_def ) {
+			foreach ($attribute_list as $attribute_def) {
 
 				$variations_attribute_parameters['field_custom_name_prefix'] = $variations_attribute_parameters['field_name'] . '[attribute][' . $attribute_def->data_type . ']';
-				$attribute_output_def = wpshop_attributes::get_attribute_field_definition( $attribute_def, (!empty($variations_attribute_parameters['variation_dif_values'][$attribute_def->code]) ? $variations_attribute_parameters['variation_dif_values'][$attribute_def->code] : ''), $variations_attribute_parameters );
+				$attribute_output_def = wpshop_attributes::get_attribute_field_definition($attribute_def, (!empty($variations_attribute_parameters['variation_dif_values'][$attribute_def->code]) ? $variations_attribute_parameters['variation_dif_values'][$attribute_def->code] : ''), $variations_attribute_parameters);
 
 				$field_output = $attribute_output_def['output'];
 
@@ -3209,9 +3209,9 @@ 
 				$sub_tpl_component['ADMIN_VARIATION_DETAIL_DEF_ID'] = $attribute_output_def['id'];
 				$sub_tpl_component['ADMIN_VARIATION_DETAIL_DEF_LABEL'] = $attribute_output_def['label'];
 				$sub_tpl_component['ADMIN_VARIATION_DETAIL_DEF_INPUT'] = $field_output;
-				if( isset( $variations_attribute_parameters['post_id'] ) ) {
-					$attribute_option_display = $attribute_def->backend_input=='select' && (strtolower( __(self::get_attribute_type_select_option_info($attribute_output_def['value'], 'value'), 'wpshop') ) == strtolower( __('yes', 'wpshop') )) ? '' : ' wpshopHide';
-					$sub_tpl_component['ADMIN_VARIATION_DETAIL_DEF_INPUT'] .= '<div class="attribute_option_'.$attribute_def->code.''.$attribute_option_display.'">'.self::get_attribute_option_fields($variations_attribute_parameters['post_id'], $attribute_def->code).'</div>';
+				if (isset($variations_attribute_parameters['post_id'])) {
+					$attribute_option_display = $attribute_def->backend_input == 'select' && (strtolower(__(self::get_attribute_type_select_option_info($attribute_output_def['value'], 'value'), 'wpshop')) == strtolower(__('yes', 'wpshop'))) ? '' : ' wpshopHide';
+					$sub_tpl_component['ADMIN_VARIATION_DETAIL_DEF_INPUT'] .= '<div class="attribute_option_' . $attribute_def->code . '' . $attribute_option_display . '">' . self::get_attribute_option_fields($variations_attribute_parameters['post_id'], $attribute_def->code) . '</div>';
 				}
 				$tpl_component['ADMIN_VARIATION_DETAIL'] .= wpshop_display::display_template_element('wpshop_admin_variation_item_details_line', $sub_tpl_component, array(), 'admin');
 				unset($sub_tpl_component);
@@ -3222,7 +3222,7 @@ 
 		return $output;
 	}
 
-	public static function get_attribute_user_defined( $use_defined_parameters, $status = "'publish'" ) {
+	public static function get_attribute_user_defined($use_defined_parameters, $status = "'publish'") {
 		global $wpdb;
 		$attribute_user_defined_list = array();
 
@@ -3249,12 +3249,12 @@ 
 	 * @param string $post_type The current
 	 *
 	 */
-	function quick_edit( $column_name, $entity ) {
-		switch ( $entity ) {
+	function quick_edit($column_name, $entity) {
+		switch ($entity) {
 			case WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT:
 				$attribute_def = wpshop_attributes::getElement($column_name, "'valid'", 'code');
-				if ( !empty($attribute_def) ) {
-					$input_def = self::get_attribute_field_definition( $attribute_def, '', array('input_class' => ' wpshop_bulk_and_quick_edit_input') );
+				if (!empty($attribute_def)) {
+					$input_def = self::get_attribute_field_definition($attribute_def, '', array('input_class' => ' wpshop_bulk_and_quick_edit_input'));
 					$input = wpshop_form::check_input_type($input_def, $input_def['input_domain']);
 ?>
 	<div class="wpshop_bulk_and_quick_edit_column_container wpshop_bulk_and_quick_edit_column_<?php echo $column_name; ?>_container">
@@ -3274,12 +3274,12 @@ 
 	 * @param string $post_type The current
 	 *
 	 */
-	public static function bulk_edit( $column_name, $entity ) {
-		switch ( $entity ) {
+	public static function bulk_edit($column_name, $entity) {
+		switch ($entity) {
 			case WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT:
 				$attribute_def = wpshop_attributes::getElement($column_name, "'valid'", 'code');
-				if ( !empty($attribute_def) ) {
-					$input_def = self::get_attribute_field_definition( $attribute_def, '', array('input_class' => ' wpshop_bulk_and_quick_edit_input') );
+				if (!empty($attribute_def)) {
+					$input_def = self::get_attribute_field_definition($attribute_def, '', array('input_class' => ' wpshop_bulk_and_quick_edit_input'));
 					$input = wpshop_form::check_input_type($input_def, $input_def['input_domain']);
 ?>
 	<div class="wpshop_bulk_and_quick_edit_column_container wpshop_bulk_and_quick_edit_column_<?php echo $column_name; ?>_container">

includes/librairies/catalog/products.class.php

Indentation +3123 added lines, -3123 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (!defined('ABSPATH')) {
-    exit;
+	exit;
 }
 
 /**
@@ -14,7 +14,7 @@ 
 
 /*    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'));
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -26,160 +26,160 @@ 
  */
 class wpshop_products
 {
-    /**
-     *    Définition du code de la classe courante
-     */
-    const currentPageCode = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
-    const current_page_variation_code = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION;
-
-    public function add_product_to_current_order_interface()
-    {
-        $output = '';
-        $output .= self::products_list_js();
-        $output .= '<input type="text" id="wps_order_search_product" />';
-        echo $output;
-        die();
-    }
+	/**
+	 *    Définition du code de la classe courante
+	 */
+	const currentPageCode = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
+	const current_page_variation_code = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION;
+
+	public function add_product_to_current_order_interface()
+	{
+		$output = '';
+		$output .= self::products_list_js();
+		$output .= '<input type="text" id="wps_order_search_product" />';
+		echo $output;
+		die();
+	}
 
-    public function products_list_js()
-    {
-        global $wpdb;
-        /** Create a JS Array of products **/
+	public function products_list_js()
+	{
+		global $wpdb;
+		/** Create a JS Array of products **/
 //         $query = $wpdb->prepare('SELECT ID, post_title FROM ' .$wpdb->posts. '  WHERE post_type = %s AND post_status = %s', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish');
-        //         $products_post = $wpdb->get_results( $query );
-
-        $products_post = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'post_status' => 'publish', 'posts_per_page' => -1));
-
-        if (!empty($products_post)) {
-            $products_js_array = 'var products = [';
-            foreach ($products_post as $product) {
-                $barcode = get_post_meta($product->ID, '_barcode', true);
-                $products_js_array .= '{label:"#' . $product->ID . ' ' . str_replace('"', '', $product->post_title) . ' - ' . ((!empty($barcode)) ? $barcode : '') . '", ';
-                $products_js_array .= 'value:"' . $product->ID . '", ';
-                $products_js_array .= (!empty($barcode)) ? 'desc:"' . $barcode . '"},' : '},';
-            }
-            $products_js_array .= '];';
-        }
-        $output = wpshop_display::display_template_element('wps_orders_products_list_js', array('PRODUCTS_JS_ARRAY' => $products_js_array), array(), 'admin');
-        return $output;
-    }
+		//         $products_post = $wpdb->get_results( $query );
+
+		$products_post = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'post_status' => 'publish', 'posts_per_page' => -1));
+
+		if (!empty($products_post)) {
+			$products_js_array = 'var products = [';
+			foreach ($products_post as $product) {
+				$barcode = get_post_meta($product->ID, '_barcode', true);
+				$products_js_array .= '{label:"#' . $product->ID . ' ' . str_replace('"', '', $product->post_title) . ' - ' . ((!empty($barcode)) ? $barcode : '') . '", ';
+				$products_js_array .= 'value:"' . $product->ID . '", ';
+				$products_js_array .= (!empty($barcode)) ? 'desc:"' . $barcode . '"},' : '},';
+			}
+			$products_js_array .= '];';
+		}
+		$output = wpshop_display::display_template_element('wps_orders_products_list_js', array('PRODUCTS_JS_ARRAY' => $products_js_array), array(), 'admin');
+		return $output;
+	}
 
-    /**
-     *    Déclaration des produits et variations en tant que "post" de wordpress
-     *
-     *    @see register_post_type()
-     */
-    public static function create_wpshop_products_type()
-    {
-
-        $options = get_option('wpshop_catalog_product_option', array());
-        //$options2 = get_option('wpshop_catalog_categories_option', array());
-        /*echo '<pre>'; print_r( $options ); echo '</pre>';
+	/**
+	 *    Déclaration des produits et variations en tant que "post" de wordpress
+	 *
+	 *    @see register_post_type()
+	 */
+	public static function create_wpshop_products_type()
+	{
+
+		$options = get_option('wpshop_catalog_product_option', array());
+		//$options2 = get_option('wpshop_catalog_categories_option', array());
+		/*echo '<pre>'; print_r( $options ); echo '</pre>';
         echo '<pre>'; print_r( $options2 ); echo '</pre>'; exit();*/
 
-        $slug = array(
-            'slug' => '',
-            'with_front' => false,
-        );
-
-        if (empty($options['wpshop_catalog_product_slug']) || $options['wpshop_catalog_product_slug'] == '/') {
-            $slug = false;
-        } else {
-            $slug['slug'] = $options['wpshop_catalog_product_slug'];
-            if (!empty($options['wpshop_catalog_product_slug_with_category'])) {
-                $slug['slug'] .= '/%' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '%';
-            }
-        }
-        /*$product_slug .= '/%' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '%';*/
-
-        /*    Définition des produits     */
-        register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, apply_filters(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_register', array(
-            'labels' => array(
-                'name' => __('Products', 'wpshop'),
-                'singular_name' => __('Catalog', 'wpshop'),
-                'add_new_item' => __('Add new product', 'wpshop'),
-                'add_new' => __('Add new product', 'wpshop'),
-                'add_new_item' => __('Add new product', 'wpshop'),
-                'edit_item' => __('Edit product', 'wpshop'),
-                'new_item' => __('New product', 'wpshop'),
-                'view_item' => __('View product', 'wpshop'),
-                'search_items' => __('Search products', 'wpshop'),
-                'not_found' => __('No products found', 'wpshop'),
-                'not_found_in_trash' => __('No products found in Trash', 'wpshop'),
-                'parent_item_colon' => '',
-            ),
-            'supports' => unserialize(WPSHOP_REGISTER_POST_TYPE_SUPPORT),
-            'public' => true,
-            'has_archive' => true,
-            'show_in_nav_menus' => true,
-            //'rewrite'                 => false,    //    For information see below
-            'taxonomies' => array(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES),
-            'menu_icon' => 'dashicons-archive',
-            'rewrite' => $slug,
-        )));
-
-        /*    Définition des variations de produit (Déclinaisons)    */
-        register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, apply_filters(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '_register', array(
-            'labels' => array(
-                'name' => __('Variations', 'wpshop'),
-                'singular_name' => __('Variation', 'wpshop'),
-                'add_new' => __('Add Variation', 'wpshop'),
-                'add_new_item' => __('Add New Variation', 'wpshop'),
-                'edit' => __('Edit', 'wpshop'),
-                'edit_item' => __('Edit Variation', 'wpshop'),
-                'new_item' => __('New Variation', 'wpshop'),
-                'view' => __('View Variation', 'wpshop'),
-                'view_item' => __('View Variation', 'wpshop'),
-                'search_items' => __('Search Variations', 'wpshop'),
-                'not_found' => __('No Variations found', 'wpshop'),
-                'not_found_in_trash' => __('No Variations found in trash', 'wpshop'),
-                'parent_item_colon' => '',
-            ),
-            'supports' => unserialize(WPSHOP_REGISTER_POST_TYPE_SUPPORT),
-            'public' => true,
-            'has_archive' => true,
-            'show_in_nav_menus' => false,
-            'show_in_menu' => false, //'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
-
-            'publicly_queryable' => false,
-            'exclude_from_search' => true,
-            'hierarchical' => false,
-
-            //             'public'                 => true,
-            //             'show_ui'                 => false,
-            //             'rewrite'                 => false,
-            //             'query_var'                => true,
-            //             'supports'                 => array( 'title', 'editor', 'page-attributes', 'thumbnail' ),
-            //             'show_in_nav_menus'     => false
-        )
-        ));
-
-        // add to our plugin init function
-        //global $wp_rewrite;
-        /*    Slug url is set into option    */
-        /*$options = get_option('wpshop_catalog_product_option', array());
+		$slug = array(
+			'slug' => '',
+			'with_front' => false,
+		);
+
+		if (empty($options['wpshop_catalog_product_slug']) || $options['wpshop_catalog_product_slug'] == '/') {
+			$slug = false;
+		} else {
+			$slug['slug'] = $options['wpshop_catalog_product_slug'];
+			if (!empty($options['wpshop_catalog_product_slug_with_category'])) {
+				$slug['slug'] .= '/%' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '%';
+			}
+		}
+		/*$product_slug .= '/%' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '%';*/
+
+		/*    Définition des produits     */
+		register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, apply_filters(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_register', array(
+			'labels' => array(
+				'name' => __('Products', 'wpshop'),
+				'singular_name' => __('Catalog', 'wpshop'),
+				'add_new_item' => __('Add new product', 'wpshop'),
+				'add_new' => __('Add new product', 'wpshop'),
+				'add_new_item' => __('Add new product', 'wpshop'),
+				'edit_item' => __('Edit product', 'wpshop'),
+				'new_item' => __('New product', 'wpshop'),
+				'view_item' => __('View product', 'wpshop'),
+				'search_items' => __('Search products', 'wpshop'),
+				'not_found' => __('No products found', 'wpshop'),
+				'not_found_in_trash' => __('No products found in Trash', 'wpshop'),
+				'parent_item_colon' => '',
+			),
+			'supports' => unserialize(WPSHOP_REGISTER_POST_TYPE_SUPPORT),
+			'public' => true,
+			'has_archive' => true,
+			'show_in_nav_menus' => true,
+			//'rewrite'                 => false,    //    For information see below
+			'taxonomies' => array(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES),
+			'menu_icon' => 'dashicons-archive',
+			'rewrite' => $slug,
+		)));
+
+		/*    Définition des variations de produit (Déclinaisons)    */
+		register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, apply_filters(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '_register', array(
+			'labels' => array(
+				'name' => __('Variations', 'wpshop'),
+				'singular_name' => __('Variation', 'wpshop'),
+				'add_new' => __('Add Variation', 'wpshop'),
+				'add_new_item' => __('Add New Variation', 'wpshop'),
+				'edit' => __('Edit', 'wpshop'),
+				'edit_item' => __('Edit Variation', 'wpshop'),
+				'new_item' => __('New Variation', 'wpshop'),
+				'view' => __('View Variation', 'wpshop'),
+				'view_item' => __('View Variation', 'wpshop'),
+				'search_items' => __('Search Variations', 'wpshop'),
+				'not_found' => __('No Variations found', 'wpshop'),
+				'not_found_in_trash' => __('No Variations found in trash', 'wpshop'),
+				'parent_item_colon' => '',
+			),
+			'supports' => unserialize(WPSHOP_REGISTER_POST_TYPE_SUPPORT),
+			'public' => true,
+			'has_archive' => true,
+			'show_in_nav_menus' => false,
+			'show_in_menu' => false, //'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
+
+			'publicly_queryable' => false,
+			'exclude_from_search' => true,
+			'hierarchical' => false,
+
+			//             'public'                 => true,
+			//             'show_ui'                 => false,
+			//             'rewrite'                 => false,
+			//             'query_var'                => true,
+			//             'supports'                 => array( 'title', 'editor', 'page-attributes', 'thumbnail' ),
+			//             'show_in_nav_menus'     => false
+		)
+		));
+
+		// add to our plugin init function
+		//global $wp_rewrite;
+		/*    Slug url is set into option    */
+		/*$options = get_option('wpshop_catalog_product_option', array());
         $gallery_structure = (!empty($options['wpshop_catalog_product_slug']) ? $options['wpshop_catalog_product_slug'] : 'catalog');
         $gallery_structure .= !empty($options['wpshop_catalog_product_slug_with_category']) ? '/%' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '%' : '';
         $gallery_structure .= '/%' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '%';
         $wp_rewrite->add_permastruct(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $gallery_structure, false);
         $wp_rewrite->add_rewrite_tag('%' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '%', '([^/]+)', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . "=");*/
-        //    flush_rewrite_rules();
-    }
+		//    flush_rewrite_rules();
+	}
 
-    public static function hidden_meta_boxes($hidden, $screen, $use_defaults)
-    {
-        global $wpdb;
-        if (WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT === $screen->post_type) {
-            $user_meta_for_wpshop = array('metaboxhidden_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-            foreach ($user_meta_for_wpshop as $meta_to_check) {
-                $metas_hidden = get_user_meta(get_current_user_id(), $meta_to_check, true);
-                if (empty($metas_hidden) && !is_array($metas_hidden)) {
-                    $hidden = unserialize(WPSHOP_PRODUCT_HIDDEN_METABOX);
-                }
-            }
-        }
-        return $hidden;
-    }
+	public static function hidden_meta_boxes($hidden, $screen, $use_defaults)
+	{
+		global $wpdb;
+		if (WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT === $screen->post_type) {
+			$user_meta_for_wpshop = array('metaboxhidden_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			foreach ($user_meta_for_wpshop as $meta_to_check) {
+				$metas_hidden = get_user_meta(get_current_user_id(), $meta_to_check, true);
+				if (empty($metas_hidden) && !is_array($metas_hidden)) {
+					$hidden = unserialize(WPSHOP_PRODUCT_HIDDEN_METABOX);
+				}
+			}
+		}
+		return $hidden;
+	}
 
 	public static function admin_menu() {
 		global $submenu;
@@ -206,35 +206,35 @@ 
 		$submenu['edit.php?post_type=wpshop_product'] = $submenu_reorder;
 	}
 
-    /**
-     *    Create the different bow for the product management page looking for the attribute set to create the different boxes
-     */
-    public static function add_meta_boxes()
-    {
-        global $post, $currentTabContent;
-
-        if (!empty($post->post_type) && (($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) || ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION))) {
-            /*    Get the attribute set list for the current entity    */
-            $attributeEntitySetList = wpshop_attributes_set::get_attribute_set_list_for_entity(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode));
-            /*    Check if the meta information of the current product already exists     */
-            $post_attribute_set_id = get_post_meta($post->ID, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true);
-            /*    Check if the product has been saved without meta information set    */
-            $attribute_set_id = wpshop_attributes::get_attribute_value_content('product_attribute_set_id', $post->ID, self::currentPageCode);
-            /*    Unset 'free_product' from list of attributes set    */
-            foreach ($attributeEntitySetList as $key_attribute_set => $attribute_set) {
-                if ($attribute_set->slug == 'free_product') {
-                    unset($attributeEntitySetList[$key_attribute_set]);
-                    break;
-                }
-            }
-
-            /*    Check if an attribute has already been choosen for the curernt entity or if the user has to choose a entity set before continuing    */
-            if (((count($attributeEntitySetList) == 1) || ((count($attributeEntitySetList) > 1) && (($post_attribute_set_id > 0) || (isset($attribute_set_id->value) && ($attribute_set_id->value > 0)))))) {
-                if ((count($attributeEntitySetList) == 1) || (($post_attribute_set_id <= 0) && ($attribute_set_id->value <= 0))) {
-                    $post_attribute_set_id = $attributeEntitySetList[0]->id;
-                } elseif (($post_attribute_set_id <= 0) && ($attribute_set_id->value > 0)) {
-                    $post_attribute_set_id = $attribute_set_id->value;
-                }
+	/**
+	 *    Create the different bow for the product management page looking for the attribute set to create the different boxes
+	 */
+	public static function add_meta_boxes()
+	{
+		global $post, $currentTabContent;
+
+		if (!empty($post->post_type) && (($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) || ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION))) {
+			/*    Get the attribute set list for the current entity    */
+			$attributeEntitySetList = wpshop_attributes_set::get_attribute_set_list_for_entity(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode));
+			/*    Check if the meta information of the current product already exists     */
+			$post_attribute_set_id = get_post_meta($post->ID, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true);
+			/*    Check if the product has been saved without meta information set    */
+			$attribute_set_id = wpshop_attributes::get_attribute_value_content('product_attribute_set_id', $post->ID, self::currentPageCode);
+			/*    Unset 'free_product' from list of attributes set    */
+			foreach ($attributeEntitySetList as $key_attribute_set => $attribute_set) {
+				if ($attribute_set->slug == 'free_product') {
+					unset($attributeEntitySetList[$key_attribute_set]);
+					break;
+				}
+			}
+
+			/*    Check if an attribute has already been choosen for the curernt entity or if the user has to choose a entity set before continuing    */
+			if (((count($attributeEntitySetList) == 1) || ((count($attributeEntitySetList) > 1) && (($post_attribute_set_id > 0) || (isset($attribute_set_id->value) && ($attribute_set_id->value > 0)))))) {
+				if ((count($attributeEntitySetList) == 1) || (($post_attribute_set_id <= 0) && ($attribute_set_id->value <= 0))) {
+					$post_attribute_set_id = $attributeEntitySetList[0]->id;
+				} elseif (($post_attribute_set_id <= 0) && ($attribute_set_id->value > 0)) {
+					$post_attribute_set_id = $attribute_set_id->value;
+				}
 
 		/*$post_attribute_set_id = (int) get_post_meta($post->ID, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true);
 
@@ -252,47 +252,47 @@ 
 			}
 		}*/
 
-                $currentTabContent = wpshop_attributes::entities_attribute_box($post_attribute_set_id, self::currentPageCode, $post->ID);
-
-                $fixed_box_exist = false;
-                /*    Get all the other attribute set for hte current entity    */
-                if (isset($currentTabContent['box']) && count($currentTabContent['box']) > 0) {
-                    foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
-                        if (!empty($currentTabContent['box'][$boxIdentifier . '_backend_display_type']) && ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'movable-tab')) {
-                            add_meta_box('wpshop_product_' . $boxIdentifier, __($boxTitle, 'wpshop'), array('wpshop_products', 'meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'default', array('boxIdentifier' => $boxIdentifier));
-                        } else {
-                            $fixed_box_exist = true;
-                        }
-
-                    }
-                }
-                if ($fixed_box_exist) {
-                    add_meta_box('wpshop_product_fixed_tab', __('Product data', 'wpshop'), array('wpshop_products', 'product_data_meta_box'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'high', array('currentTabContent' => $currentTabContent));
-                    add_meta_box('wpshop_product_fixed_tab', __('Product data', 'wpshop'), array('wpshop_products', 'product_data_meta_box'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'normal', 'high', array('currentTabContent' => $currentTabContent));
-                }
-
-                add_meta_box('wpshop_wpshop_variations', __('Product variation', 'wpshop'), array('wpshop_products', 'meta_box_variations'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'default');
-                // Actions
-                // @since 1.4.3.7 Deleted
-                //add_meta_box('wpshop_product_actions', __('Actions', 'wpshop'), array('wpshop_products', 'product_actions_meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'side', 'default');
-
-                /**    Product option    */
-                add_meta_box('wpshop_product_options', __('Options', 'wpshop'), array('wpshop_products', 'product_options_meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'side', 'default');
-            } else if (count($attributeEntitySetList) > 1) {
-                $input_def['id'] = 'product_attribute_set_id';
-                $input_def['name'] = 'product_attribute_set_id';
-                $input_def['value'] = '';
-                $input_def['type'] = 'select';
-                $input_def['possible_value'] = $attributeEntitySetList;
-
-                $input_def['value'] = '';
-                foreach ($attributeEntitySetList as $set) {
-                    if ($set->default_set == 'yes') {
-                        $input_def['value'] = $set->id;
-                    }
-                }
-
-                $currentTabContent['boxContent']['attribute_set_selector'] = '
+				$currentTabContent = wpshop_attributes::entities_attribute_box($post_attribute_set_id, self::currentPageCode, $post->ID);
+
+				$fixed_box_exist = false;
+				/*    Get all the other attribute set for hte current entity    */
+				if (isset($currentTabContent['box']) && count($currentTabContent['box']) > 0) {
+					foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
+						if (!empty($currentTabContent['box'][$boxIdentifier . '_backend_display_type']) && ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'movable-tab')) {
+							add_meta_box('wpshop_product_' . $boxIdentifier, __($boxTitle, 'wpshop'), array('wpshop_products', 'meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'default', array('boxIdentifier' => $boxIdentifier));
+						} else {
+							$fixed_box_exist = true;
+						}
+
+					}
+				}
+				if ($fixed_box_exist) {
+					add_meta_box('wpshop_product_fixed_tab', __('Product data', 'wpshop'), array('wpshop_products', 'product_data_meta_box'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'high', array('currentTabContent' => $currentTabContent));
+					add_meta_box('wpshop_product_fixed_tab', __('Product data', 'wpshop'), array('wpshop_products', 'product_data_meta_box'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'normal', 'high', array('currentTabContent' => $currentTabContent));
+				}
+
+				add_meta_box('wpshop_wpshop_variations', __('Product variation', 'wpshop'), array('wpshop_products', 'meta_box_variations'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'default');
+				// Actions
+				// @since 1.4.3.7 Deleted
+				//add_meta_box('wpshop_product_actions', __('Actions', 'wpshop'), array('wpshop_products', 'product_actions_meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'side', 'default');
+
+				/**    Product option    */
+				add_meta_box('wpshop_product_options', __('Options', 'wpshop'), array('wpshop_products', 'product_options_meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'side', 'default');
+			} else if (count($attributeEntitySetList) > 1) {
+				$input_def['id'] = 'product_attribute_set_id';
+				$input_def['name'] = 'product_attribute_set_id';
+				$input_def['value'] = '';
+				$input_def['type'] = 'select';
+				$input_def['possible_value'] = $attributeEntitySetList;
+
+				$input_def['value'] = '';
+				foreach ($attributeEntitySetList as $set) {
+					if ($set->default_set == 'yes') {
+						$input_def['value'] = $set->id;
+					}
+				}
+
+				$currentTabContent['boxContent']['attribute_set_selector'] = '
 	<ul class="attribute_set_selector" >
 		<li class="attribute_set_selector_title_select" ><label for="title" >' . __('Choose a title for your product', 'wpshop') . '</label></li>
 		<li class="attribute_set_selector_group_selector" ><label for="' . $input_def['id'] . '" >' . __('Choose an attribute group for this product', 'wpshop') . '</label>&nbsp;' . wpshop_form::check_input_type($input_def, self::currentPageCode . '_attribute[integer]') . '</li>
@@ -300,792 +300,792 @@ 
 		<li class="attribute_set_selector_after_save_instruction" >' . __('Once the group chosen, the different attribute will be displayed here', 'wpshop') . '</li>
 	</ul>';
 
-                add_meta_box('wpshop_product_attribute_set_selector', __('Product attributes', 'wpshop'), array('wpshop_products', 'meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'high', array('boxIdentifier' => 'attribute_set_selector'));
-            }
-        }
+				add_meta_box('wpshop_product_attribute_set_selector', __('Product attributes', 'wpshop'), array('wpshop_products', 'meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'high', array('boxIdentifier' => 'attribute_set_selector'));
+			}
+		}
 
-    }
+	}
 
-    /**
-     * Add a box into product edition page for options on the product
-     *
-     * @param object $post
-     */
-    public static function product_options_meta_box_content($post)
-    {
-        $output = '';
+	/**
+	 * Add a box into product edition page for options on the product
+	 *
+	 * @param object $post
+	 */
+	public static function product_options_meta_box_content($post)
+	{
+		$output = '';
 
-        $product_current_options = get_post_meta($post->ID, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', true);
+		$product_current_options = get_post_meta($post->ID, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', true);
 
-        $tpl_component = array();
-        $tpl_component['ADMIN_PRODUCT_OPTION_FOR_CART_AUTOADD_CHECKBOX_STATE'] = (!empty($product_current_options['cart']) && !empty($product_current_options['cart']['auto_add'])) ? ' checked="checked"' : '';
-        $output .= wpshop_display::display_template_element('wpshop_admin_product_option_for_cart', $tpl_component, array('type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'id' => $post->ID), 'admin');
+		$tpl_component = array();
+		$tpl_component['ADMIN_PRODUCT_OPTION_FOR_CART_AUTOADD_CHECKBOX_STATE'] = (!empty($product_current_options['cart']) && !empty($product_current_options['cart']['auto_add'])) ? ' checked="checked"' : '';
+		$output .= wpshop_display::display_template_element('wpshop_admin_product_option_for_cart', $tpl_component, array('type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'id' => $post->ID), 'admin');
 
-        echo $output;
-    }
+		echo $output;
+	}
 
-    /**
-     * Display the fixed box
-     */
-    public static function product_data_meta_box($post, $metaboxArgs)
-    {
-        $output = '';
+	/**
+	 * Display the fixed box
+	 */
+	public static function product_data_meta_box($post, $metaboxArgs)
+	{
+		$output = '';
 
-        $currentTabContent = $metaboxArgs['args']['currentTabContent'];
+		$currentTabContent = $metaboxArgs['args']['currentTabContent'];
 
-        echo '<div id="fixed-tabs" class="wpshop_tabs wpshop_detail_tabs wpshop_product_attribute_tabs" >
+		echo '<div id="fixed-tabs" class="wpshop_tabs wpshop_detail_tabs wpshop_product_attribute_tabs" >
 				<ul>';
-        if (!empty($currentTabContent['box'])) {
-            foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
-                if (!empty($currentTabContent['boxContent'][$boxIdentifier])) {
-                    if ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'fixed-tab') {
-                        echo '<li><a href="#tabs-' . sanitize_title($boxIdentifier) . '">' . __($boxTitle, 'wpshop') . '</a></li>';
-                    }
-                }
-            }
-        }
-        echo '<li><a href="#tabs-product-related">' . __('Related products', 'wpshop') . '</a></li>';
-        echo '<li><a href="#tabs-product-provider">' . __('Providers', 'wpshop') . '</a></li>';
-        echo '<li class="wpshop_product_data_display_tab" ><a href="#tabs-product-display">' . __('Product display', 'wpshop') . '</a></li>';
-        echo '</ul>';
-
-        if (!empty($currentTabContent['box'])) {
-            foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
-                if (!empty($currentTabContent['boxContent'][$boxIdentifier])) {
-                    if ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'fixed-tab') {
-                        echo '<div id="tabs-' . sanitize_title($boxIdentifier) . '">' . $currentTabContent['boxContent'][$boxIdentifier] . '</div>';
-                    }
-                }
-            }
-        }
+		if (!empty($currentTabContent['box'])) {
+			foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
+				if (!empty($currentTabContent['boxContent'][$boxIdentifier])) {
+					if ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'fixed-tab') {
+						echo '<li><a href="#tabs-' . sanitize_title($boxIdentifier) . '">' . __($boxTitle, 'wpshop') . '</a></li>';
+					}
+				}
+			}
+		}
+		echo '<li><a href="#tabs-product-related">' . __('Related products', 'wpshop') . '</a></li>';
+		echo '<li><a href="#tabs-product-provider">' . __('Providers', 'wpshop') . '</a></li>';
+		echo '<li class="wpshop_product_data_display_tab" ><a href="#tabs-product-display">' . __('Product display', 'wpshop') . '</a></li>';
+		echo '</ul>';
+
+		if (!empty($currentTabContent['box'])) {
+			foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
+				if (!empty($currentTabContent['boxContent'][$boxIdentifier])) {
+					if ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'fixed-tab') {
+						echo '<div id="tabs-' . sanitize_title($boxIdentifier) . '">' . $currentTabContent['boxContent'][$boxIdentifier] . '</div>';
+					}
+				}
+			}
+		}
 
-        echo '<div id="tabs-product-related">' . self::related_products_meta_box_content($post) . '</div>';
-        echo '<div id="tabs-product-provider">' . self::provider_products_meta_box_content($post) . '</div>';
-        echo '<div id="tabs-product-display">' . self::product_frontend_display_config_meta_box($post) . '</div>';
-        if (!empty($currentTabContent['boxMore'])) {
-            echo $currentTabContent['boxMore'];
-        }
-        echo '</div>';
+		echo '<div id="tabs-product-related">' . self::related_products_meta_box_content($post) . '</div>';
+		echo '<div id="tabs-product-provider">' . self::provider_products_meta_box_content($post) . '</div>';
+		echo '<div id="tabs-product-display">' . self::product_frontend_display_config_meta_box($post) . '</div>';
+		if (!empty($currentTabContent['boxMore'])) {
+			echo $currentTabContent['boxMore'];
+		}
+		echo '</div>';
 
-        echo $output;
-    }
+		echo $output;
+	}
 
-    /**
-     * Output the content for related product metabox
-     * @param object $post The current edited post
-     * @return string
-     */
-    public static function related_products_meta_box_content($post)
-    {
-        $content = $existing_selection = '';
-
-        if (!empty($post->ID)) {
-            $related_products_id = get_post_meta($post->ID, WPSHOP_PRODUCT_RELATED_PRODUCTS, true);
-            if (!empty($related_products_id) && !empty($related_products_id[0])) {
-                foreach ($related_products_id as $related_product_id) {
-                    $existing_selection .= '<option selected value="' . $related_product_id . '" >' . get_the_title($related_product_id) . '</option>';
-                }
-            }
-        }
+	/**
+	 * Output the content for related product metabox
+	 * @param object $post The current edited post
+	 * @return string
+	 */
+	public static function related_products_meta_box_content($post)
+	{
+		$content = $existing_selection = '';
+
+		if (!empty($post->ID)) {
+			$related_products_id = get_post_meta($post->ID, WPSHOP_PRODUCT_RELATED_PRODUCTS, true);
+			if (!empty($related_products_id) && !empty($related_products_id[0])) {
+				foreach ($related_products_id as $related_product_id) {
+					$existing_selection .= '<option selected value="' . $related_product_id . '" >' . get_the_title($related_product_id) . '</option>';
+				}
+			}
+		}
 
-        $content = '<p>' . __('Type the begin of the product name in the field below in order to add it to the related product list', 'wpshop') . '</p>
+		$content = '<p>' . __('Type the begin of the product name in the field below in order to add it to the related product list', 'wpshop') . '</p>
 			<select name="related_products_list[]" id="related_products_list" class="ajax_chosen_select_related_products" multiple >' . $existing_selection . '</select>
 			<input type="hidden" id="wpshop_ajax_search_element_type_related_products" name="wpshop_ajax_search_element_type" value="' . $post->post_type . '" />
 			<input type="hidden" id="wpshop_nonce_ajax_search_related_products" name="wpshop_nonce_ajax_search" value="' . wp_create_nonce("wpshop_element_search") . '" />';
 
-        return $content;
-    }
+		return $content;
+	}
 
-    /**
-     * Output the content for related product metabox
-     * @param object $post The current edited post
-     * @return string
-     */
-    public static function provider_products_meta_box_content($post)
-    {
-        $content = $existing_selection = '';
-
-        if (!empty($post->ID)) {
-            $providers_id = get_post_meta($post->ID, WPSHOP_PRODUCT_PROVIDER, true);
-            if (!empty($providers_id) && !empty($providers_id[0])) {
-                foreach ($providers_id as $provider_id) {
-                    $existing_selection .= '<option selected value="' . $provider_id . '" >' . get_the_title($provider_id) . '</option>';
-                }
-            }
-        }
+	/**
+	 * Output the content for related product metabox
+	 * @param object $post The current edited post
+	 * @return string
+	 */
+	public static function provider_products_meta_box_content($post)
+	{
+		$content = $existing_selection = '';
+
+		if (!empty($post->ID)) {
+			$providers_id = get_post_meta($post->ID, WPSHOP_PRODUCT_PROVIDER, true);
+			if (!empty($providers_id) && !empty($providers_id[0])) {
+				foreach ($providers_id as $provider_id) {
+					$existing_selection .= '<option selected value="' . $provider_id . '" >' . get_the_title($provider_id) . '</option>';
+				}
+			}
+		}
 
-        $content = '<p>' . __('Type the begin of a provider last name/first name in the field below to add', 'wpshop') . '</p>
+		$content = '<p>' . __('Type the begin of a provider last name/first name in the field below to add', 'wpshop') . '</p>
 			<select name="provider_list[]" id="provider_list" class="ajax_chosen_select_provider_products" multiple >' . $existing_selection . '</select>
 			<input type="hidden" id="wpshop_ajax_search_element_type_provider_products" name="wpshop_ajax_search_element_type" value="' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . '" />
 			<input type="hidden" id="wpshop_nonce_ajax_search_provider_products" name="wpshop_nonce_ajax_search" value="' . wp_create_nonce("wpshop_element_search") . '" />';
 
-        return $content;
-    }
+		return $content;
+	}
 
-    /**
-     * Define the metabox content for the action box
-     * @param obejct $post The current element being edited
-     */
-    public static function product_actions_meta_box_content($post)
-    {
-        $output = '';
-        /*
+	/**
+	 * Define the metabox content for the action box
+	 * @param obejct $post The current element being edited
+	 */
+	public static function product_actions_meta_box_content($post)
+	{
+		$output = '';
+		/*
          * Template parameters
          */
-        $template_part = 'wpshop_duplicate_product';
-        $tpl_component = array();
-        $tpl_component['PRODUCT_ID'] = $post->ID;
-        $tpl_component['PRINT_PRODUCT_SHEET_LINK'] = admin_url('admin-post.php?action=wps_product_sheet&pid=' . $post->ID);
-        /*
+		$template_part = 'wpshop_duplicate_product';
+		$tpl_component = array();
+		$tpl_component['PRODUCT_ID'] = $post->ID;
+		$tpl_component['PRINT_PRODUCT_SHEET_LINK'] = admin_url('admin-post.php?action=wps_product_sheet&pid=' . $post->ID);
+		/*
          * Build template
          */
-        $output = wpshop_display::display_template_element($template_part, $tpl_component, array(), 'admin');
-        unset($tpl_component);
+		$output = wpshop_display::display_template_element($template_part, $tpl_component, array(), 'admin');
+		unset($tpl_component);
 
-        echo $output;
-    }
+		echo $output;
+	}
 
-    /**
-     *    Define the content of the product main information box
-     */
-    public static function meta_box_content($post, $metaboxArgs)
-    {
-        global $currentTabContent;
+	/**
+	 *    Define the content of the product main information box
+	 */
+	public static function meta_box_content($post, $metaboxArgs)
+	{
+		global $currentTabContent;
 
-        /*    Add the extra fields defined by the default attribute group in the general section    */
-        echo '<div class="wpshop_extra_field_container" >' . $currentTabContent['boxContent'][$metaboxArgs['args']['boxIdentifier']] . '</div>';
-    }
+		/*    Add the extra fields defined by the default attribute group in the general section    */
+		echo '<div class="wpshop_extra_field_container" >' . $currentTabContent['boxContent'][$metaboxArgs['args']['boxIdentifier']] . '</div>';
+	}
 
-    /**
-     * Define the metabox content for product custom display in product
-     * @param object $post The current element being edited
-     * @return string The metabox content
-     */
-    public static function product_frontend_display_config_meta_box($post)
-    {
-        $content = '';
-
-        $product_attribute_frontend_display_config = null;
-        if (!empty($post->ID)) {
-            $product_attribute_frontend_display_config = get_post_meta($post->ID, WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, true);
-
-            $extra_options = get_option('wpshop_extra_options', array());
-            $column_count = (!empty($extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY']) ? $extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY'] : 3);
-            $attribute_list = wpshop_attributes::getElementWithAttributeAndValue(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $post->ID, WPSHOP_CURRENT_LOCALE);
-            $column = 1;
-
-            if (WPSHOP_DEFINED_SHOP_TYPE == 'sale') {
-                $sub_tpl_component = array();
-                $sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_NAME'] = __('Action on product', 'wpshop');
-
-                $tpl_component = array();
-                $tpl_component['ADMIN_ATTRIBUTE_LABEL'] = __('Add to cart button', 'wpshop');
-                $tpl_component['ADMIN_ATTRIBUTE_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[product_action_button][add_to_cart]';
-                $tpl_component['ADMIN_ATTRIBUTE_FD_ID'] = $post->ID . '_product_action_button_add_to_cart';
-                $button_is_set_to_be_displayed = (WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no';
-
-                $tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display($button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'complete_sheet') ? ' checked="checked"' : '';
-                $tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display($button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'mini_output') ? ' checked="checked"' : '';
-                $sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_CONTENT'] = wpshop_display::display_template_element('wpshop_admin_attr_config_for_front_display', $tpl_component, array(), 'admin');
-                unset($tpl_component);
-
-                $sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[product_action_button][add_to_cart]';
-                $sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_ID'] = 'product_action_button_add_to_cart';
-                $sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_INPUT_CHECKBOX'] = '';
-                $sub_content[1] = wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display', $sub_tpl_component, array(), 'admin');
-            }
-
-            if (!empty($attribute_list[$post->ID]) && is_array($attribute_list[$post->ID])) {
-                foreach ($attribute_list[$post->ID] as $attribute_set_section_name => $attribute_set_section_content) {
-                    if (!isset($sub_content[$column])) {
-                        $sub_content[$column] = '';
-                    }
-
-                    $attribute_sub_output = '';
-                    foreach ($attribute_set_section_content['attributes'] as $attribute_id => $attribute_def) {
-                        if ($attribute_def['attribute_code'] != 'product_attribute_set_id') {
-                            $tpl_component = array();
-                            $tpl_component['ADMIN_ATTRIBUTE_LABEL'] = $attribute_def['frontend_label'];
-                            $tpl_component['ADMIN_ATTRIBUTE_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[attribute][' . $attribute_def['attribute_code'] . ']';
-                            $tpl_component['ADMIN_ATTRIBUTE_FD_ID'] = $post->ID . '_' . $attribute_def['attribute_code'];
-                            $tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display($attribute_def['is_visible_in_front'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'complete_sheet') ? ' checked="checked"' : '';
-                            $tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display($attribute_def['is_visible_in_front_listing'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'mini_output') ? ' checked="checked"' : '';
-                            $attribute_sub_output .= wpshop_display::display_template_element('wpshop_admin_attr_config_for_front_display', $tpl_component, array(), 'admin');
-                            unset($tpl_component);
-                        }
-                    }
-
-                    $tpl_component = array();
-                    $tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_NAME'] = $attribute_set_section_name;
-                    $tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_CONTENT'] = $attribute_sub_output;
-                    $tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[attribute_set_section][' . $attribute_set_section_content['code'] . ']';
-                    $tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_ID'] = $attribute_set_section_content['code'];
-                    $ADMIN_ATTRIBUTE_SET_SECTION_COMPLETE_SHEET_CHECK = wpshop_attributes::check_attribute_display($attribute_set_section_content['display_on_frontend'], $product_attribute_frontend_display_config, 'attribute_set_section', $attribute_set_section_content['code'], 'complete_sheet') ? ' checked="checked"' : '';
-                    $tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_INPUT_CHECKBOX'] = '<input type="checkbox" name="' . self::currentPageCode . '_attr_frontend_display[attribute_set_section][' . $attribute_set_section_content['code'] . '][complete_sheet]" id="' . $attribute_set_section_content['code'] . '_complete_sheet" value="yes"' . $ADMIN_ATTRIBUTE_SET_SECTION_COMPLETE_SHEET_CHECK . ' /><label for="' . $attribute_set_section_content['code'] . '_complete_sheet" >' . __('Display in product page', 'wpshop') . '</label>';
-                    $sub_content[$column] .= wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display', $tpl_component, array(), 'admin');
-                    $column++;
-                    if ($column > $column_count) {
-                        $column = 1;
-                    }
-                }
-            }
-            $tpl_component = array();
-            $tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] = '';
-            for ($i = 1; $i <= $column_count; $i++) {
-                if (!empty($sub_content[$i])) {
-                    $tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] .= '<div class="alignleft" >' . $sub_content[$i] . '</div>';
-                }
-
-            }
-            $tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT_CLASS'] = empty($product_attribute_frontend_display_config) ? ' class="wpshopHide" ' : '';
-            $tpl_component['ADMIN_PRODUCT_ATTRIBUTE_FRONTEND_DISPLAY_MAIN_CHOICE_CHECK'] = empty($product_attribute_frontend_display_config) ? ' checked="checked"' : '';
-            $tpl_component['ADMIN_ATTRIBUTE_FD_NAME'] = self::currentPageCode . '_attr_frontend_display';
-
-            $content = wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display_default_choice', $tpl_component, array(), 'admin') . '<div class="wpshop_cls"></div>';
-        }
+	/**
+	 * Define the metabox content for product custom display in product
+	 * @param object $post The current element being edited
+	 * @return string The metabox content
+	 */
+	public static function product_frontend_display_config_meta_box($post)
+	{
+		$content = '';
+
+		$product_attribute_frontend_display_config = null;
+		if (!empty($post->ID)) {
+			$product_attribute_frontend_display_config = get_post_meta($post->ID, WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, true);
+
+			$extra_options = get_option('wpshop_extra_options', array());
+			$column_count = (!empty($extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY']) ? $extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY'] : 3);
+			$attribute_list = wpshop_attributes::getElementWithAttributeAndValue(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $post->ID, WPSHOP_CURRENT_LOCALE);
+			$column = 1;
+
+			if (WPSHOP_DEFINED_SHOP_TYPE == 'sale') {
+				$sub_tpl_component = array();
+				$sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_NAME'] = __('Action on product', 'wpshop');
+
+				$tpl_component = array();
+				$tpl_component['ADMIN_ATTRIBUTE_LABEL'] = __('Add to cart button', 'wpshop');
+				$tpl_component['ADMIN_ATTRIBUTE_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[product_action_button][add_to_cart]';
+				$tpl_component['ADMIN_ATTRIBUTE_FD_ID'] = $post->ID . '_product_action_button_add_to_cart';
+				$button_is_set_to_be_displayed = (WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no';
+
+				$tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display($button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'complete_sheet') ? ' checked="checked"' : '';
+				$tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display($button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'mini_output') ? ' checked="checked"' : '';
+				$sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_CONTENT'] = wpshop_display::display_template_element('wpshop_admin_attr_config_for_front_display', $tpl_component, array(), 'admin');
+				unset($tpl_component);
+
+				$sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[product_action_button][add_to_cart]';
+				$sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_ID'] = 'product_action_button_add_to_cart';
+				$sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_INPUT_CHECKBOX'] = '';
+				$sub_content[1] = wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display', $sub_tpl_component, array(), 'admin');
+			}
 
-        return $content;
-    }
+			if (!empty($attribute_list[$post->ID]) && is_array($attribute_list[$post->ID])) {
+				foreach ($attribute_list[$post->ID] as $attribute_set_section_name => $attribute_set_section_content) {
+					if (!isset($sub_content[$column])) {
+						$sub_content[$column] = '';
+					}
+
+					$attribute_sub_output = '';
+					foreach ($attribute_set_section_content['attributes'] as $attribute_id => $attribute_def) {
+						if ($attribute_def['attribute_code'] != 'product_attribute_set_id') {
+							$tpl_component = array();
+							$tpl_component['ADMIN_ATTRIBUTE_LABEL'] = $attribute_def['frontend_label'];
+							$tpl_component['ADMIN_ATTRIBUTE_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[attribute][' . $attribute_def['attribute_code'] . ']';
+							$tpl_component['ADMIN_ATTRIBUTE_FD_ID'] = $post->ID . '_' . $attribute_def['attribute_code'];
+							$tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display($attribute_def['is_visible_in_front'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'complete_sheet') ? ' checked="checked"' : '';
+							$tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display($attribute_def['is_visible_in_front_listing'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'mini_output') ? ' checked="checked"' : '';
+							$attribute_sub_output .= wpshop_display::display_template_element('wpshop_admin_attr_config_for_front_display', $tpl_component, array(), 'admin');
+							unset($tpl_component);
+						}
+					}
+
+					$tpl_component = array();
+					$tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_NAME'] = $attribute_set_section_name;
+					$tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_CONTENT'] = $attribute_sub_output;
+					$tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[attribute_set_section][' . $attribute_set_section_content['code'] . ']';
+					$tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_ID'] = $attribute_set_section_content['code'];
+					$ADMIN_ATTRIBUTE_SET_SECTION_COMPLETE_SHEET_CHECK = wpshop_attributes::check_attribute_display($attribute_set_section_content['display_on_frontend'], $product_attribute_frontend_display_config, 'attribute_set_section', $attribute_set_section_content['code'], 'complete_sheet') ? ' checked="checked"' : '';
+					$tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_INPUT_CHECKBOX'] = '<input type="checkbox" name="' . self::currentPageCode . '_attr_frontend_display[attribute_set_section][' . $attribute_set_section_content['code'] . '][complete_sheet]" id="' . $attribute_set_section_content['code'] . '_complete_sheet" value="yes"' . $ADMIN_ATTRIBUTE_SET_SECTION_COMPLETE_SHEET_CHECK . ' /><label for="' . $attribute_set_section_content['code'] . '_complete_sheet" >' . __('Display in product page', 'wpshop') . '</label>';
+					$sub_content[$column] .= wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display', $tpl_component, array(), 'admin');
+					$column++;
+					if ($column > $column_count) {
+						$column = 1;
+					}
+				}
+			}
+			$tpl_component = array();
+			$tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] = '';
+			for ($i = 1; $i <= $column_count; $i++) {
+				if (!empty($sub_content[$i])) {
+					$tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] .= '<div class="alignleft" >' . $sub_content[$i] . '</div>';
+				}
 
-    /**
-     * Retrieve the attribute list used for sorting product into frontend listing
-     * @return array The attribute list to use for listing sorting
-     */
-    public static function get_sorting_criteria()
-    {
-        global $wpdb;
+			}
+			$tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT_CLASS'] = empty($product_attribute_frontend_display_config) ? ' class="wpshopHide" ' : '';
+			$tpl_component['ADMIN_PRODUCT_ATTRIBUTE_FRONTEND_DISPLAY_MAIN_CHOICE_CHECK'] = empty($product_attribute_frontend_display_config) ? ' checked="checked"' : '';
+			$tpl_component['ADMIN_ATTRIBUTE_FD_NAME'] = self::currentPageCode . '_attr_frontend_display';
 
-        $data = array(array('code' => 'title', 'frontend_label' => __('Product name', 'wpshop')), array('code' => 'date', 'frontend_label' => __('Date added', 'wpshop')), array('code' => 'modified', 'frontend_label' => __('Date modified', 'wpshop')), array('code' => 'rand', 'frontend_label' => __('Random', 'wpshop')));
+			$content = wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display_default_choice', $tpl_component, array(), 'admin') . '<div class="wpshop_cls"></div>';
+		}
 
-        $query = $wpdb->prepare("SELECT code, frontend_label FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE is_used_for_sort_by = %s", 'yes');
-        $results = $wpdb->get_results($query, ARRAY_A);
-        if (!empty($results)) {
-            $data = array_merge($data, $results);
-        }
+		return $content;
+	}
 
-        return $data;
-    }
+	/**
+	 * Retrieve the attribute list used for sorting product into frontend listing
+	 * @return array The attribute list to use for listing sorting
+	 */
+	public static function get_sorting_criteria()
+	{
+		global $wpdb;
+
+		$data = array(array('code' => 'title', 'frontend_label' => __('Product name', 'wpshop')), array('code' => 'date', 'frontend_label' => __('Date added', 'wpshop')), array('code' => 'modified', 'frontend_label' => __('Date modified', 'wpshop')), array('code' => 'rand', 'frontend_label' => __('Random', 'wpshop')));
+
+		$query = $wpdb->prepare("SELECT code, frontend_label FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE is_used_for_sort_by = %s", 'yes');
+		$results = $wpdb->get_results($query, ARRAY_A);
+		if (!empty($results)) {
+			$data = array_merge($data, $results);
+		}
 
-    public static function get_products_matching_attribute($attr_name, $attr_value)
-    {
-        global $wpdb;
+		return $data;
+	}
+
+	public static function get_products_matching_attribute($attr_name, $attr_value)
+	{
+		global $wpdb;
 
-        $products = array();
-        $query = "SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code=%s";
-        $data = (array) $wpdb->get_row($wpdb->prepare($query, $attr_name));
+		$products = array();
+		$query = "SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code=%s";
+		$data = (array) $wpdb->get_row($wpdb->prepare($query, $attr_name));
 
-        if (!empty($data)) {
-            if ($data['data_type_to_use'] == 'custom') {
-                // Find which table to take
-                if ($data['data_type'] == 'datetime') {$table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME;} elseif ($data['data_type'] == 'decimal') {$table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL;} elseif ($data['data_type'] == 'integer') {$table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER;} elseif ($data['data_type'] == 'options') {$table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS;} elseif ($data['data_type'] == 'text') {$table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT;} elseif ($data['data_type'] == 'varchar') {$table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR;}
+		if (!empty($data)) {
+			if ($data['data_type_to_use'] == 'custom') {
+				// Find which table to take
+				if ($data['data_type'] == 'datetime') {$table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME;} elseif ($data['data_type'] == 'decimal') {$table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL;} elseif ($data['data_type'] == 'integer') {$table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER;} elseif ($data['data_type'] == 'options') {$table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS;} elseif ($data['data_type'] == 'text') {$table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT;} elseif ($data['data_type'] == 'varchar') {$table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR;}
 
-                if (isset($table_name)) {
-                    // If the value is an id of a select, radio or checkbox
-                    if (in_array($data['backend_input'], array('select', 'multiple-select', 'radio', 'checkbox'))) {
+				if (isset($table_name)) {
+					// If the value is an id of a select, radio or checkbox
+					if (in_array($data['backend_input'], array('select', 'multiple-select', 'radio', 'checkbox'))) {
 
-                        $query = $wpdb->prepare("
+						$query = $wpdb->prepare("
 							SELECT " . $table_name . ".entity_id FROM " . $table_name . "
 							INNER JOIN {$wpdb->posts} AS P ON ( ( P.ID = " . $table_name . ".entity_id ) AND ( P.post_status = 'publish' ) )
 							LEFT JOIN " . WPSHOP_DBT_ATTRIBUTE . " AS ATT ON ATT.id = " . $table_name . ".attribute_id
 							LEFT JOIN " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " AS ATT_OPT ON " . $table_name . ".value = ATT_OPT.id
 							WHERE ATT.code=%s AND ( ATT_OPT.value=%s OR ATT_OPT.value=%s )", $attr_name, strtolower(__($attr_value, 'wpshop')), $attr_value
-                        );
-                        $data = $wpdb->get_results($query);
-                    } else {
+						);
+						$data = $wpdb->get_results($query);
+					} else {
 
-                        $query = $wpdb->prepare("
+						$query = $wpdb->prepare("
 							SELECT " . $table_name . ".entity_id FROM " . $table_name . "
 							INNER JOIN {$wpdb->posts} AS P ON ( ( P.ID = " . $table_name . ".entity_id ) AND ( P.post_status = 'publish' ) )
 							INNER JOIN " . WPSHOP_DBT_ATTRIBUTE . " AS ATT ON ATT.id = " . $table_name . ".attribute_id
 								INNER JOIN {$wpdb->posts} AS P ON ( ( P.ID = " . $table_name . ".entity_id ) AND ( P.post_status = 'publish' ) )
 							WHERE ATT.code=%s AND " . $table_name . ".value=%s", $attr_name, sprintf('%.5f', $attr_value) // force useless zero like 48.58000
-                        );
-                        $data = $wpdb->get_results($query);
-
-                    }
-                } else {
-                    return __('Incorrect shortcode', 'wpshop');
-                }
-
-            } elseif ($data['data_type_to_use'] == 'internal') {
-                /** Check the ID of manufacturer **/
-                $default_value = unserialize($data['default_value']);
-                if (!empty($default_value) && !empty($default_value['default_value'])) {
-                    $query = get_post($attr_value);
-                    $pid = (!empty($query) && !empty($query->ID)) ? $query->ID : '';
-                    if (!empty($pid)) {
-                        $query = $wpdb->prepare('SELECT post_id AS entity_id FROM ' . $wpdb->postmeta . ' WHERE post_id = ID AND post_status = %s AND meta_key = %s AND meta_value = %s', 'publish', '_' . $data['code'], $pid);
-                        $data = $wpdb->get_results($query);
-                    }
-                }
-            } else {
-                return __('Incorrect shortcode', 'wpshop');
-            }
-
-        } else {
-            return __('Incorrect shortcode', 'wpshop');
-        }
+						);
+						$data = $wpdb->get_results($query);
 
-        if (!empty($data)) {
-            foreach ($data as $p) {
-                if (!empty($p) && is_object($p) && !empty($p->entity_id)) {
-                    $products[] = $p->entity_id;
-                }
-            }
-        }
-        return $products;
-    }
+					}
+				} else {
+					return __('Incorrect shortcode', 'wpshop');
+				}
 
-    /**
-     * Related product shortcode reader
-     *
-     * @param array $atts {
-     *    pid : Product idenfifier to get related element for
-     *    display_mode : The output mode if defined (grid || list)
-     * }
-     *
-     * @return string
-     *
-     */
-    public static function wpshop_related_products_func($atts)
-    {
-        global $wp_query;
+			} elseif ($data['data_type_to_use'] == 'internal') {
+				/** Check the ID of manufacturer **/
+				$default_value = unserialize($data['default_value']);
+				if (!empty($default_value) && !empty($default_value['default_value'])) {
+					$query = get_post($attr_value);
+					$pid = (!empty($query) && !empty($query->ID)) ? $query->ID : '';
+					if (!empty($pid)) {
+						$query = $wpdb->prepare('SELECT post_id AS entity_id FROM ' . $wpdb->postmeta . ' WHERE post_id = ID AND post_status = %s AND meta_key = %s AND meta_value = %s', 'publish', '_' . $data['code'], $pid);
+						$data = $wpdb->get_results($query);
+					}
+				}
+			} else {
+				return __('Incorrect shortcode', 'wpshop');
+			}
 
-        $atts['product_type'] = 'related';
-        if (empty($atts['pid'])) {
-            $atts['pid'] = $wp_query->posts[0]->ID;
-        }
+		} else {
+			return __('Incorrect shortcode', 'wpshop');
+		}
 
-        $related_product_output = self::wpshop_products_func($atts);
+		if (!empty($data)) {
+			foreach ($data as $p) {
+				if (!empty($p) && is_object($p) && !empty($p->entity_id)) {
+					$products[] = $p->entity_id;
+				}
+			}
+		}
+		return $products;
+	}
 
-        $output = '';
-        if (!empty($related_product_output)) {
-            ob_start();
-            require wpshop_tools::get_template_part(WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, 'frontend', 'related_product');
-            $output = ob_get_contents();
-            ob_end_clean();
-        }
+	/**
+	 * Related product shortcode reader
+	 *
+	 * @param array $atts {
+	 *    pid : Product idenfifier to get related element for
+	 *    display_mode : The output mode if defined (grid || list)
+	 * }
+	 *
+	 * @return string
+	 *
+	 */
+	public static function wpshop_related_products_func($atts)
+	{
+		global $wp_query;
+
+		$atts['product_type'] = 'related';
+		if (empty($atts['pid'])) {
+			$atts['pid'] = $wp_query->posts[0]->ID;
+		}
 
-        return $output;
-    }
+		$related_product_output = self::wpshop_products_func($atts);
 
-    /**
-     * Display a list of product from a shortcode
-     *
-     * @param array $atts {
-     *    limit : The number of element to display
-     *    order : The information to order list by
-     *    sorting : List order (ASC | DESC)
-     *    display : Display size (normal | mini)
-     *    type : Display tyep (grid | list) only work with display=normal
-     *    pagination : The number of element per page
-     * display_pagination : Display the pagination or not
-     * }
-     *
-     * @return string
-     *
-     **/
-    public static function wpshop_products_func($atts)
-    {
-        global $wpdb, $wp_query;
-
-        $string = '';
-        $have_results = false;
-        $output_results = true;
-        $type = (empty($atts['type']) or !in_array($atts['type'], array('grid', 'list'))) ? WPSHOP_DISPLAY_LIST_TYPE : $atts['type'];
-        $pagination = isset($atts['pagination']) ? intval($atts['pagination']) : WPSHOP_ELEMENT_NB_PER_PAGE;
-        $cid = !empty($atts['cid']) ? $atts['cid'] : 0;
-        $pid = !empty($atts['pid']) ? $atts['pid'] : 0;
-        $order_by_sorting = (!empty($atts['sorting']) && ($atts['sorting'] == 'DESC')) ? 'DESC' : 'ASC';
-        $limit = isset($atts['limit']) ? intval($atts['limit']) : 0;
-        $grid_element_nb_per_line = !empty($atts['grid_element_nb_per_line']) ? $atts['grid_element_nb_per_line'] : WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE;
-        $display_pagination = (!empty($atts['display_pagination'])) ? (($atts['display_pagination'] === "yes") ? true : false) : true;
-        $attr = '';
-
-        $sorting_criteria = self::get_sorting_criteria();
-
-        /** Get products which have att_name equal to att_value    */
-        if (!empty($atts['att_name']) && !empty($atts['att_value'])) {
-            $attr = $atts['att_name'] . ':' . $atts['att_value'];
-
-            $products = self::get_products_matching_attribute($atts['att_name'], $atts['att_value']);
-
-            // Foreach on the found products
-            if (!empty($products)) {
-                $pid = implode(',', $products);
-                if (empty($pid)) {
-                    $output_results = false;
-                }
-
-            } else {
-                $output_results = false;
-            }
+		$output = '';
+		if (!empty($related_product_output)) {
+			ob_start();
+			require wpshop_tools::get_template_part(WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, 'frontend', 'related_product');
+			$output = ob_get_contents();
+			ob_end_clean();
+		}
 
-        }
+		return $output;
+	}
 
-        /** Get related products    */
-        if (!empty($atts['product_type'])) {
-            switch ($atts['product_type']) {
-                case 'related':
-                    $product_id = !empty($atts['pid']) ? (int) $atts['pid'] : get_the_ID();
-                    $type = !empty($atts['display_mode']) && in_array($atts['display_mode'], array('list', 'grid')) ? $atts['display_mode'] : WPSHOP_DISPLAY_LIST_TYPE;
-                    $grid_element_nb_per_line = !empty($atts['grid_element_nb_per_line']) ? $atts['grid_element_nb_per_line'] : WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE;
-
-                    $pids = get_post_meta((int) $product_id, WPSHOP_PRODUCT_RELATED_PRODUCTS, true);
-                    if (!empty($pids) && !empty($pids[0])) {
-                        $pid = implode(',', $pids);
-                    }
-                    if (empty($pid) || $pid == $product_id) {
-                        $output_results = false;
-                    }
-
-                    break;
-            }
-        }
+	/**
+	 * Display a list of product from a shortcode
+	 *
+	 * @param array $atts {
+	 *    limit : The number of element to display
+	 *    order : The information to order list by
+	 *    sorting : List order (ASC | DESC)
+	 *    display : Display size (normal | mini)
+	 *    type : Display tyep (grid | list) only work with display=normal
+	 *    pagination : The number of element per page
+	 * display_pagination : Display the pagination or not
+	 * }
+	 *
+	 * @return string
+	 *
+	 **/
+	public static function wpshop_products_func($atts)
+	{
+		global $wpdb, $wp_query;
+
+		$string = '';
+		$have_results = false;
+		$output_results = true;
+		$type = (empty($atts['type']) or !in_array($atts['type'], array('grid', 'list'))) ? WPSHOP_DISPLAY_LIST_TYPE : $atts['type'];
+		$pagination = isset($atts['pagination']) ? intval($atts['pagination']) : WPSHOP_ELEMENT_NB_PER_PAGE;
+		$cid = !empty($atts['cid']) ? $atts['cid'] : 0;
+		$pid = !empty($atts['pid']) ? $atts['pid'] : 0;
+		$order_by_sorting = (!empty($atts['sorting']) && ($atts['sorting'] == 'DESC')) ? 'DESC' : 'ASC';
+		$limit = isset($atts['limit']) ? intval($atts['limit']) : 0;
+		$grid_element_nb_per_line = !empty($atts['grid_element_nb_per_line']) ? $atts['grid_element_nb_per_line'] : WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE;
+		$display_pagination = (!empty($atts['display_pagination'])) ? (($atts['display_pagination'] === "yes") ? true : false) : true;
+		$attr = '';
+
+		$sorting_criteria = self::get_sorting_criteria();
+
+		/** Get products which have att_name equal to att_value    */
+		if (!empty($atts['att_name']) && !empty($atts['att_value'])) {
+			$attr = $atts['att_name'] . ':' . $atts['att_value'];
+
+			$products = self::get_products_matching_attribute($atts['att_name'], $atts['att_value']);
+
+			// Foreach on the found products
+			if (!empty($products)) {
+				$pid = implode(',', $products);
+				if (empty($pid)) {
+					$output_results = false;
+				}
 
-        /** Output all the products    */
-        if ($output_results) {
-            $data = self::wpshop_get_product_by_criteria((!empty($atts['order']) ? $atts['order'] : (!empty($atts['creator']) ? ($atts['creator'] == 'current') : '')), $cid, $pid, $type, $order_by_sorting, 1, $pagination, $limit, $grid_element_nb_per_line, $display_pagination);
+			} else {
+				$output_results = false;
+			}
 
-            if ($data[0]) {
-                $have_results = true;
-                $string = $data[1];
-            }
-        }
+		}
 
-        /** If there are result to display    */
-        if ($have_results) {
-            $sorting = '';
-            if (!empty($pid)) {
-                $product_list = explode(',', $pid);
-                if (count($product_list) == 1) {
-                    $atts['sorting'] = 'no';
-                }
-            }
-
-            /*
+		/** Get related products    */
+		if (!empty($atts['product_type'])) {
+			switch ($atts['product_type']) {
+				case 'related':
+					$product_id = !empty($atts['pid']) ? (int) $atts['pid'] : get_the_ID();
+					$type = !empty($atts['display_mode']) && in_array($atts['display_mode'], array('list', 'grid')) ? $atts['display_mode'] : WPSHOP_DISPLAY_LIST_TYPE;
+					$grid_element_nb_per_line = !empty($atts['grid_element_nb_per_line']) ? $atts['grid_element_nb_per_line'] : WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE;
+
+					$pids = get_post_meta((int) $product_id, WPSHOP_PRODUCT_RELATED_PRODUCTS, true);
+					if (!empty($pids) && !empty($pids[0])) {
+						$pid = implode(',', $pids);
+					}
+					if (empty($pid) || $pid == $product_id) {
+						$output_results = false;
+					}
+
+					break;
+			}
+		}
+
+		/** Output all the products    */
+		if ($output_results) {
+			$data = self::wpshop_get_product_by_criteria((!empty($atts['order']) ? $atts['order'] : (!empty($atts['creator']) ? ($atts['creator'] == 'current') : '')), $cid, $pid, $type, $order_by_sorting, 1, $pagination, $limit, $grid_element_nb_per_line, $display_pagination);
+
+			if ($data[0]) {
+				$have_results = true;
+				$string = $data[1];
+			}
+		}
+
+		/** If there are result to display    */
+		if ($have_results) {
+			$sorting = '';
+			if (!empty($pid)) {
+				$product_list = explode(',', $pid);
+				if (count($product_list) == 1) {
+					$atts['sorting'] = 'no';
+				}
+			}
+
+			/*
              * Template parameters
              */
-            $template_part = 'product_listing_sorting';
-            $tpl_component = array();
+			$template_part = 'product_listing_sorting';
+			$tpl_component = array();
 
-            /*
+			/*
              * 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])) {
-                /*    Include the old way template part    */
-                ob_start();
-                require wpshop_display::get_template_file($tpl_way_to_take[1]);
-                $sorting = ob_get_contents();
-                ob_end_clean();
-            } else {
-                /*
+			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
+				/*    Include the old way template part    */
+				ob_start();
+				require wpshop_display::get_template_file($tpl_way_to_take[1]);
+				$sorting = ob_get_contents();
+				ob_end_clean();
+			} else {
+				/*
                  * Display hidden field every times
                  */
-                $sub_template_part = 'product_listing_sorting_hidden_field';
-                $sub_tpl_component = array();
-                $sub_tpl_component['DISPLAY_TYPE'] = $type;
-                $sub_tpl_component['ORDER'] = $order_by_sorting;
-                $sub_tpl_component['PRODUCT_NUMBER'] = $pagination;
-                $sub_tpl_component['CURRENT_PAGE'] = 1;
-                $sub_tpl_component['CATEGORY_ID'] = $cid;
-                $sub_tpl_component['PRODUCT_ID'] = $pid;
-                $sub_tpl_component['ATTR'] = $attr;
-                $tpl_component['SORTING_HIDDEN_FIELDS'] = wpshop_display::display_template_element($sub_template_part, $sub_tpl_component, array(), 'admin');
-                unset($sub_tpl_component);
-
-                if ((!empty($sorting_criteria) && is_array($sorting_criteria))) {
-                    $sub_template_part = 'product_listing_sorting_criteria';
-                    $sub_tpl_component = array();
-                    $criteria = '';
-                    foreach ($sorting_criteria as $c):
+				$sub_template_part = 'product_listing_sorting_hidden_field';
+				$sub_tpl_component = array();
+				$sub_tpl_component['DISPLAY_TYPE'] = $type;
+				$sub_tpl_component['ORDER'] = $order_by_sorting;
+				$sub_tpl_component['PRODUCT_NUMBER'] = $pagination;
+				$sub_tpl_component['CURRENT_PAGE'] = 1;
+				$sub_tpl_component['CATEGORY_ID'] = $cid;
+				$sub_tpl_component['PRODUCT_ID'] = $pid;
+				$sub_tpl_component['ATTR'] = $attr;
+				$tpl_component['SORTING_HIDDEN_FIELDS'] = wpshop_display::display_template_element($sub_template_part, $sub_tpl_component, array(), 'admin');
+				unset($sub_tpl_component);
+
+				if ((!empty($sorting_criteria) && is_array($sorting_criteria))) {
+					$sub_template_part = 'product_listing_sorting_criteria';
+					$sub_tpl_component = array();
+					$criteria = '';
+					foreach ($sorting_criteria as $c):
 						$selected = isset( $atts['order'] ) ? $atts['order'] : null;
-                        $criteria .= '<option value="' . $c['code'] . '" ' . selected( $selected, $c['code'], false ) . '>' . __($c['frontend_label'], 'wpshop') . '</option>';
-                    endforeach;
-                    $sub_tpl_component['SORTING_CRITERIA_LIST'] = $criteria;
-                    $tpl_component['SORTING_CRITERIA'] = wpshop_display::display_template_element($sub_template_part, $sub_tpl_component);
-                    unset($sub_tpl_component);
-                }
-
-                if (empty($atts['sorting']) || (!empty($atts['sorting']) && ($atts['sorting'] != 'no'))) {
-                    $tpl_component['DISPLAY_TYPE_STATE_GRID'] = $type == 'grid' ? ' active' : null;
-                    $tpl_component['DISPLAY_TYPE_STATE_LIST'] = $type == 'list' ? ' active' : null;
-                    $sorting = wpshop_display::display_template_element($template_part, $tpl_component);
-                } else if (!empty($atts['sorting']) && ($atts['sorting'] == 'no')) {
-                    $sub_template_part = 'product_listing_sorting_criteria_hidden';
-                    $sub_tpl_component = array();
-                    $sub_tpl_component['CRITERIA_DEFAULT'] = !empty($sorting_criteria[0]['code']) ? $sorting_criteria[0]['code'] : 'title';
-                    $tpl_component['SORTING_CRITERIA'] = wpshop_display::display_template_element($sub_template_part, $sub_tpl_component, array(), 'admin');
-                    unset($sub_tpl_component);
-
-                    $template_part = 'product_listing_sorting_hidden';
-                    $sorting = wpshop_display::display_template_element($template_part, $tpl_component, array(), 'admin');
-                }
-            }
-            unset($tpl_component);
-
-            if (!empty($atts) && !empty($atts['container']) && $atts['container'] == 'no') {
-                $string = $sorting . '<div data-nonce="' . wp_create_nonce('products_by_criteria') . '" class="wps-catalog-container wps-bloc-loader">' . $string . '</div>';
-            } else {
-                $string = '<div class="wpshop_products_block">' . $sorting . '<div data-nonce="' . wp_create_nonce('products_by_criteria') . '" class="wps-catalog-container wps-bloc-loader">' . $string . '</div></div>';
-            }
-        } else if (empty($atts['no_result_message']) || ($atts['no_result_message'] != 'no')) {
-            $string = __('There is nothing to output here', 'wpshop');
-        }
+						$criteria .= '<option value="' . $c['code'] . '" ' . selected( $selected, $c['code'], false ) . '>' . __($c['frontend_label'], 'wpshop') . '</option>';
+					endforeach;
+					$sub_tpl_component['SORTING_CRITERIA_LIST'] = $criteria;
+					$tpl_component['SORTING_CRITERIA'] = wpshop_display::display_template_element($sub_template_part, $sub_tpl_component);
+					unset($sub_tpl_component);
+				}
 
-        return do_shortcode($string);
-    }
+				if (empty($atts['sorting']) || (!empty($atts['sorting']) && ($atts['sorting'] != 'no'))) {
+					$tpl_component['DISPLAY_TYPE_STATE_GRID'] = $type == 'grid' ? ' active' : null;
+					$tpl_component['DISPLAY_TYPE_STATE_LIST'] = $type == 'list' ? ' active' : null;
+					$sorting = wpshop_display::display_template_element($template_part, $tpl_component);
+				} else if (!empty($atts['sorting']) && ($atts['sorting'] == 'no')) {
+					$sub_template_part = 'product_listing_sorting_criteria_hidden';
+					$sub_tpl_component = array();
+					$sub_tpl_component['CRITERIA_DEFAULT'] = !empty($sorting_criteria[0]['code']) ? $sorting_criteria[0]['code'] : 'title';
+					$tpl_component['SORTING_CRITERIA'] = wpshop_display::display_template_element($sub_template_part, $sub_tpl_component, array(), 'admin');
+					unset($sub_tpl_component);
+
+					$template_part = 'product_listing_sorting_hidden';
+					$sorting = wpshop_display::display_template_element($template_part, $tpl_component, array(), 'admin');
+				}
+			}
+			unset($tpl_component);
 
-    public static function wpshop_get_product_by_criteria($criteria = null, $cid = 0, $pid = 0, $display_type, $order = 'ASC', $page_number, $products_per_page = 0, $nb_of_product_limit = 0, $grid_element_nb_per_line = WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE, $display_pagination = true)
-    {
-        global $wpdb;
+			if (!empty($atts) && !empty($atts['container']) && $atts['container'] == 'no') {
+				$string = $sorting . '<div data-nonce="' . wp_create_nonce('products_by_criteria') . '" class="wps-catalog-container wps-bloc-loader">' . $string . '</div>';
+			} else {
+				$string = '<div class="wpshop_products_block">' . $sorting . '<div data-nonce="' . wp_create_nonce('products_by_criteria') . '" class="wps-catalog-container wps-bloc-loader">' . $string . '</div></div>';
+			}
+		} else if (empty($atts['no_result_message']) || ($atts['no_result_message'] != 'no')) {
+			$string = __('There is nothing to output here', 'wpshop');
+		}
 
-        $string = '<span id="wpshop_loading">&nbsp;</span>';
-        $have_results = false;
-        $display_type = (!empty($display_type) && in_array($display_type, array('grid', 'list'))) ? $display_type : 'grid';
+		return do_shortcode($string);
+	}
 
-        /** Check if Discount are activated */
-        $discount_option = get_option('wpshop_catalog_product_option');
+	public static function wpshop_get_product_by_criteria($criteria = null, $cid = 0, $pid = 0, $display_type, $order = 'ASC', $page_number, $products_per_page = 0, $nb_of_product_limit = 0, $grid_element_nb_per_line = WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE, $display_pagination = true)
+	{
+		global $wpdb;
 
-        if ($criteria == 'product_price' && !empty($discount_option) && !empty($discount_option['discount']) && $discount_option['discount'] == 'on') {
-            $criteria = 'wpshop_displayed_price';
-        }
+		$string = '<span id="wpshop_loading">&nbsp;</span>';
+		$have_results = false;
+		$display_type = (!empty($display_type) && in_array($display_type, array('grid', 'list'))) ? $display_type : 'grid';
 
-        $query = array(
-            'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
-            'order' => $order,
-            'posts_per_page' => $products_per_page,
-            'paged' => $page_number,
-            'post_status' => 'publish',
-        );
-
-        // If the limit is greater than zero, hide pagination and change posts_per_page var
-        if ($nb_of_product_limit > 0) {
-            $query['posts_per_page'] = $nb_of_product_limit;
-            unset($query['paged']);
-        }
-        if (!empty($pid)) {
-            if (!is_array($pid)) {
-                $pid = explode(',', $pid);
-            }
+		/** Check if Discount are activated */
+		$discount_option = get_option('wpshop_catalog_product_option');
 
-            $query['post__in'] = $pid;
-        }
-        if (!empty($cid)) {
-            $cid = explode(',', $cid);
-            $query['tax_query'] = array(array(
-                'taxonomy' => WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES,
-                'field' => 'id',
-                'terms' => $cid,
-                'operator' => 'IN',
-            ));
-        }
-        if ($criteria != null) {
-            switch ($criteria) {
-                case 'creator':
-                case 'author':
-                    $query['author'] = get_current_user_id();
-                    break;
-                case 'none':
-                case 'ID':
-                case 'title':
-                case 'date':
-                case 'modified':
-                case 'relevance':
-                case 'post__in':
-                case 'rand':
-                    $query['orderby'] = $criteria;
-                    break;
-                default:
-                    if (!empty($pid)) {
-                        $post_meta = get_post_meta($pid, '_' . $criteria, true);
-                    } else {
-                        $check_meta = $wpdb->prepare("SELECT COUNT(meta_id) as meta_criteria FROM " . $wpdb->postmeta . " WHERE meta_key = %s", '_' . $criteria);
-                        $post_meta = $wpdb->get_var($check_meta);
-                    }
-                    if (!empty($post_meta)) {
-                        if (in_array($criteria, array('wpshop_displayed_price', 'product_price'))) {
-                            $query['orderby'] = 'meta_value_num';
-                        } else {
-                            $query['orderby'] = 'meta_value';
-                        }
-                        $query['meta_key'] = '_' . $criteria;
-                    }
-                    break;
-            }
-        } else {
-            $query['orderby'] = 'menu_order ID';
-        }
-        $post_per_page = $query['posts_per_page'];
-        $total_products = (!empty($query['post__in'])) ? $query['post__in'] : 0;
-        if (!empty($pid) && !empty($query['post__in']) && count($query['post__in']) > $query['posts_per_page']) {
-            $tmp_array = array();
-
-            if (empty($page_number) || $page_number == 1) {
-                for ($i = 0; $i < $query['posts_per_page']; $i++) {
-                    $tmp_array[] = $query['post__in'][$i];
-                }
-            } else {
-                $begin_number = (($page_number - 1) * $query['posts_per_page']);
-                for ($i = $begin_number; $i < $query['posts_per_page'] + $begin_number; $i++) {
-                    if (!empty($query['post__in'][$i])) {
-                        $tmp_array[] = $query['post__in'][$i];
-                    }
-                }
-            }
-            unset($query['post__in']);
-            $query['post__in'] = $tmp_array;
-            $query['posts_per_page'] = -1;
-        }
+		if ($criteria == 'product_price' && !empty($discount_option) && !empty($discount_option['discount']) && $discount_option['discount'] == 'on') {
+			$criteria = 'wpshop_displayed_price';
+		}
 
-        $query['post_status'] = 'publish';
-
-        $custom_query = new WP_Query($query);
-
-        if ($custom_query->have_posts()) {
-            $have_results = true;
-
-            // ---------------- //
-            // Products listing //
-            // ---------------- //
-            $current_position = 1;
-            $product_list = '';
-            while ($custom_query->have_posts()): $custom_query->the_post();
-                $cats = get_the_terms(get_the_ID(), WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
-                $cats = !empty($cats) && is_array($cats) ? array_values($cats) : array();
-                $cat_id = empty($cats) ? 0 : $cats[0]->term_id;
-                $product_list .= self::product_mini_output(get_the_ID(), $cat_id, $display_type, $current_position, $grid_element_nb_per_line);
-                $current_position++;
-            endwhile;
-            $tpl_component = array();
-            $tpl_component['PRODUCT_CONTAINER_TYPE_CLASS'] = ($display_type == 'grid' ? ' ' . $display_type . '_' . $grid_element_nb_per_line : '') . ' ' . $display_type . '_mode';
-            $tpl_component['PRODUCT_LIST_DISPLAY_TYPE'] = $display_type;
-            $tpl_component['PRODUCT_LIST_PER_LINE'] = $grid_element_nb_per_line;
-            $tpl_component['PRODUCT_LIST'] = $product_list;
-            $tpl_component['CROSSED_OUT_PRICE'] = '';
-            $tpl_component['LOW_STOCK_ALERT_MESSAGE'] = '';
-            $string = wpshop_display::display_template_element('product_list_container', $tpl_component);
-
-            // --------------------- //
-            // Pagination management //
-            // --------------------- //
-            if ( $display_pagination ) {
-                if ($nb_of_product_limit == 0) {
-
-                    $paginate = paginate_links(array(
-                        'base' => '%_%',
-                        'format' => '/?page_product=%#%',
-                        'current' => $page_number,
-                        'total' => $custom_query->max_num_pages,
-                        'type' => 'array',
-                        'prev_next' => false,
-                    ));
-                    if (!empty($paginate)) {
-                        $string .= '<ul class="pagination wps-pagination">';
-                        foreach ($paginate as $p) {
-                            $string .= '<li>' . $p . '</li>';
-                        }
-                        $string .= '</ul>';
-                    }
-                }
-
-                if (!empty($pid) && !empty($query['post__in']) && count($total_products) > $post_per_page) {
-                    $paginate = paginate_links(array(
-                        'base' => '%_%',
-                        'format' => '/?page_product=%#%',
-                        'current' => $page_number,
-                        'total' => ceil(count($total_products) / $post_per_page),
-                        'type' => 'array',
-                        'prev_next' => false,
-                    ));
-                    if (!empty($paginate)) {
-                        $string .= '<ul class="pagination wps-pagination">';
-                        foreach ($paginate as $p) {
-                            $string .= '<li>' . $p . '</li>';
-                        }
-                        $string .= '</ul>';
-                    }
-                }
-            }
+		$query = array(
+			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
+			'order' => $order,
+			'posts_per_page' => $products_per_page,
+			'paged' => $page_number,
+			'post_status' => 'publish',
+		);
+
+		// If the limit is greater than zero, hide pagination and change posts_per_page var
+		if ($nb_of_product_limit > 0) {
+			$query['posts_per_page'] = $nb_of_product_limit;
+			unset($query['paged']);
+		}
+		if (!empty($pid)) {
+			if (!is_array($pid)) {
+				$pid = explode(',', $pid);
+			}
 
-        }
-        wp_reset_query(); // important
+			$query['post__in'] = $pid;
+		}
+		if (!empty($cid)) {
+			$cid = explode(',', $cid);
+			$query['tax_query'] = array(array(
+				'taxonomy' => WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES,
+				'field' => 'id',
+				'terms' => $cid,
+				'operator' => 'IN',
+			));
+		}
+		if ($criteria != null) {
+			switch ($criteria) {
+				case 'creator':
+				case 'author':
+					$query['author'] = get_current_user_id();
+					break;
+				case 'none':
+				case 'ID':
+				case 'title':
+				case 'date':
+				case 'modified':
+				case 'relevance':
+				case 'post__in':
+				case 'rand':
+					$query['orderby'] = $criteria;
+					break;
+				default:
+					if (!empty($pid)) {
+						$post_meta = get_post_meta($pid, '_' . $criteria, true);
+					} else {
+						$check_meta = $wpdb->prepare("SELECT COUNT(meta_id) as meta_criteria FROM " . $wpdb->postmeta . " WHERE meta_key = %s", '_' . $criteria);
+						$post_meta = $wpdb->get_var($check_meta);
+					}
+					if (!empty($post_meta)) {
+						if (in_array($criteria, array('wpshop_displayed_price', 'product_price'))) {
+							$query['orderby'] = 'meta_value_num';
+						} else {
+							$query['orderby'] = 'meta_value';
+						}
+						$query['meta_key'] = '_' . $criteria;
+					}
+					break;
+			}
+		} else {
+			$query['orderby'] = 'menu_order ID';
+		}
+		$post_per_page = $query['posts_per_page'];
+		$total_products = (!empty($query['post__in'])) ? $query['post__in'] : 0;
+		if (!empty($pid) && !empty($query['post__in']) && count($query['post__in']) > $query['posts_per_page']) {
+			$tmp_array = array();
+
+			if (empty($page_number) || $page_number == 1) {
+				for ($i = 0; $i < $query['posts_per_page']; $i++) {
+					$tmp_array[] = $query['post__in'][$i];
+				}
+			} else {
+				$begin_number = (($page_number - 1) * $query['posts_per_page']);
+				for ($i = $begin_number; $i < $query['posts_per_page'] + $begin_number; $i++) {
+					if (!empty($query['post__in'][$i])) {
+						$tmp_array[] = $query['post__in'][$i];
+					}
+				}
+			}
+			unset($query['post__in']);
+			$query['post__in'] = $tmp_array;
+			$query['posts_per_page'] = -1;
+		}
 
-        return array($have_results, $string);
-    }
+		$query['post_status'] = 'publish';
+
+		$custom_query = new WP_Query($query);
+
+		if ($custom_query->have_posts()) {
+			$have_results = true;
+
+			// ---------------- //
+			// Products listing //
+			// ---------------- //
+			$current_position = 1;
+			$product_list = '';
+			while ($custom_query->have_posts()): $custom_query->the_post();
+				$cats = get_the_terms(get_the_ID(), WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
+				$cats = !empty($cats) && is_array($cats) ? array_values($cats) : array();
+				$cat_id = empty($cats) ? 0 : $cats[0]->term_id;
+				$product_list .= self::product_mini_output(get_the_ID(), $cat_id, $display_type, $current_position, $grid_element_nb_per_line);
+				$current_position++;
+			endwhile;
+			$tpl_component = array();
+			$tpl_component['PRODUCT_CONTAINER_TYPE_CLASS'] = ($display_type == 'grid' ? ' ' . $display_type . '_' . $grid_element_nb_per_line : '') . ' ' . $display_type . '_mode';
+			$tpl_component['PRODUCT_LIST_DISPLAY_TYPE'] = $display_type;
+			$tpl_component['PRODUCT_LIST_PER_LINE'] = $grid_element_nb_per_line;
+			$tpl_component['PRODUCT_LIST'] = $product_list;
+			$tpl_component['CROSSED_OUT_PRICE'] = '';
+			$tpl_component['LOW_STOCK_ALERT_MESSAGE'] = '';
+			$string = wpshop_display::display_template_element('product_list_container', $tpl_component);
+
+			// --------------------- //
+			// Pagination management //
+			// --------------------- //
+			if ( $display_pagination ) {
+				if ($nb_of_product_limit == 0) {
+
+					$paginate = paginate_links(array(
+						'base' => '%_%',
+						'format' => '/?page_product=%#%',
+						'current' => $page_number,
+						'total' => $custom_query->max_num_pages,
+						'type' => 'array',
+						'prev_next' => false,
+					));
+					if (!empty($paginate)) {
+						$string .= '<ul class="pagination wps-pagination">';
+						foreach ($paginate as $p) {
+							$string .= '<li>' . $p . '</li>';
+						}
+						$string .= '</ul>';
+					}
+				}
 
-    /**
-     * Update quantity for a product
-     * @param integer $product_id The product we want to update quantity for
-     * @param decimal $qty The new quantity
-     */
-    public static function reduce_product_stock_qty($product_id, $qty, $variation_id = '')
-    {
-        global $wpdb;
-
-        $product = self::get_product_data($product_id);
-        /** Check if there is variation ***/
-        if (!empty($variation_id) && $variation_id != $product_id) {
-            $variation_post_type = get_post_type($variation_id);
-            if ($variation_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
-                /** Check if variation def is combined **/
-                $variations = get_post_meta($product_id, '_wpshop_variation_defining', true);
-                if (!empty($variations) && !empty($variations['options']) && !empty($variations['options']['priority']) && in_array('combined', $variations['options']['priority'])) {
-                    /** Get post meta of variation */
-                    $variation_metadata = get_post_meta($variation_id, '_wpshop_product_metadata', true);
-                    if (!empty($variation_metadata) && isset($variation_metadata['product_stock'])) {
-                        $product = self::get_product_data($variation_id);
-                        $product_id = $variation_id;
-                    }
-                }
-            }
-        }
+				if (!empty($pid) && !empty($query['post__in']) && count($total_products) > $post_per_page) {
+					$paginate = paginate_links(array(
+						'base' => '%_%',
+						'format' => '/?page_product=%#%',
+						'current' => $page_number,
+						'total' => ceil(count($total_products) / $post_per_page),
+						'type' => 'array',
+						'prev_next' => false,
+					));
+					if (!empty($paginate)) {
+						$string .= '<ul class="pagination wps-pagination">';
+						foreach ($paginate as $p) {
+							$string .= '<li>' . $p . '</li>';
+						}
+						$string .= '</ul>';
+					}
+				}
+			}
+
+		}
+		wp_reset_query(); // important
+
+		return array($have_results, $string);
+	}
+
+	/**
+	 * Update quantity for a product
+	 * @param integer $product_id The product we want to update quantity for
+	 * @param decimal $qty The new quantity
+	 */
+	public static function reduce_product_stock_qty($product_id, $qty, $variation_id = '')
+	{
+		global $wpdb;
+
+		$product = self::get_product_data($product_id);
+		/** Check if there is variation ***/
+		if (!empty($variation_id) && $variation_id != $product_id) {
+			$variation_post_type = get_post_type($variation_id);
+			if ($variation_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+				/** Check if variation def is combined **/
+				$variations = get_post_meta($product_id, '_wpshop_variation_defining', true);
+				if (!empty($variations) && !empty($variations['options']) && !empty($variations['options']['priority']) && in_array('combined', $variations['options']['priority'])) {
+					/** Get post meta of variation */
+					$variation_metadata = get_post_meta($variation_id, '_wpshop_product_metadata', true);
+					if (!empty($variation_metadata) && isset($variation_metadata['product_stock'])) {
+						$product = self::get_product_data($variation_id);
+						$product_id = $variation_id;
+					}
+				}
+			}
+		}
 
-        if (!empty($product)) {
-            $newQty = $product['product_stock'] - $qty;
-            $value_id = 0;
-            if ($newQty >= 0) {
-                $query = '
+		if (!empty($product)) {
+			$newQty = $product['product_stock'] - $qty;
+			$value_id = 0;
+			if ($newQty >= 0) {
+				$query = '
 					SELECT wp_wpshop__attribute_value_decimal.value_id
 					FROM wp_wpshop__attribute_value_decimal
 					LEFT JOIN wp_wpshop__attribute ON wp_wpshop__attribute_value_decimal.attribute_id = wp_wpshop__attribute.id
 					WHERE wp_wpshop__attribute_value_decimal.entity_id=' . $product_id . ' AND wp_wpshop__attribute.code="product_stock"
 					LIMIT 1
 				';
-                $value_id = $wpdb->get_var($query);
-                $update = $wpdb->update('wp_wpshop__attribute_value_decimal', array('value' => wpshop_tools::wpshop_clean($newQty)), array('value_id' => $value_id));
-            }
-            // Historic
-            $attribute_histo_content = array();
-            $attribute_histo_content['status'] = 'valid';
-            $attribute_histo_content['creation_date'] = current_time('mysql', 0);
-            $attribute_histo_content['creation_date_value'] = (!empty($attribute_histo[0]->creation_date_value)) ? $attribute_histo[0]->creation_date_value : current_time('mysql', 0);
-            $attribute_histo_content['original_value_id'] = $value_id;
-            $attribute_histo_content['entity_type_id'] = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-            $stock_atribute = wpshop_attributes::getElement('product_stock', "'valid'", 'code');
-            $attribute_histo_content['attribute_id'] = $stock_atribute->id;
-            $attribute_histo_content['entity_id'] = $product_id;
-            $attribute_histo_content['value'] = $product['product_stock'];
-            $attribute_histo_content['value_type'] = 'wp_wpshop__attribute_value_decimal';
-            $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_HISTO, $attribute_histo_content);
-
-            $product_meta = get_post_meta($product_id, '_wpshop_product_metadata', true);
-            $product_meta['product_stock'] = $newQty;
-            update_post_meta($product_id, '_wpshop_product_metadata', $product_meta);
-        }
-    }
+				$value_id = $wpdb->get_var($query);
+				$update = $wpdb->update('wp_wpshop__attribute_value_decimal', array('value' => wpshop_tools::wpshop_clean($newQty)), array('value_id' => $value_id));
+			}
+			// Historic
+			$attribute_histo_content = array();
+			$attribute_histo_content['status'] = 'valid';
+			$attribute_histo_content['creation_date'] = current_time('mysql', 0);
+			$attribute_histo_content['creation_date_value'] = (!empty($attribute_histo[0]->creation_date_value)) ? $attribute_histo[0]->creation_date_value : current_time('mysql', 0);
+			$attribute_histo_content['original_value_id'] = $value_id;
+			$attribute_histo_content['entity_type_id'] = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			$stock_atribute = wpshop_attributes::getElement('product_stock', "'valid'", 'code');
+			$attribute_histo_content['attribute_id'] = $stock_atribute->id;
+			$attribute_histo_content['entity_id'] = $product_id;
+			$attribute_histo_content['value'] = $product['product_stock'];
+			$attribute_histo_content['value_type'] = 'wp_wpshop__attribute_value_decimal';
+			$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_HISTO, $attribute_histo_content);
+
+			$product_meta = get_post_meta($product_id, '_wpshop_product_metadata', true);
+			$product_meta['product_stock'] = $newQty;
+			update_post_meta($product_id, '_wpshop_product_metadata', $product_meta);
+		}
+	}
 
-    /**
-     * Retrieve an array with complete information about a given product
-     * @param integer $product_id
-     * @param boolean $for_cart_storage
-     * @return array Information about the product defined by first parameter
-     */
-    public static function get_product_data($product_id, $for_cart_storage = false, $post_status = '"publish"')
-    {
-        global $wpdb;
-        $query = $wpdb->prepare('
+	/**
+	 * Retrieve an array with complete information about a given product
+	 * @param integer $product_id
+	 * @param boolean $for_cart_storage
+	 * @return array Information about the product defined by first parameter
+	 */
+	public static function get_product_data($product_id, $for_cart_storage = false, $post_status = '"publish"')
+	{
+		global $wpdb;
+		$query = $wpdb->prepare('
 			SELECT P.*, PM.meta_value AS attribute_set_id
 			FROM ' . $wpdb->posts . ' AS P
 				INNER JOIN ' . $wpdb->postmeta . ' AS PM ON (PM.post_id=P.ID)
@@ -1097,398 +1097,398 @@ 
 			LIMIT 1
 		', $product_id);
 
-        $product = $wpdb->get_row($query);
-
-        $product_data = array();
-        $product_meta = array();
-
-        if (!empty($product)) {
-            $product_data['product_id'] = (!empty($product->ID)) ? $product->ID : '';
-            $product_data['post_name'] = (!empty($product->post_name)) ? $product->post_name : '';
-            $product_data['product_name'] = (!empty($product->post_title)) ? $product->post_title : '';
-            $product_data['post_title'] = (!empty($product->post_title)) ? $product->post_title : '';
-
-            $product_data['product_author_id'] = (!empty($product->post_author)) ? $product->post_author : '';
-            $product_data['product_date'] = (!empty($product->post_date)) ? $product->post_date : '';
-            $product_data['product_content'] = (!empty($product->post_content)) ? $product->post_content : '';
-            $product_data['product_excerpt'] = (!empty($product->post_excerpt)) ? $product->post_excerpt : wp_trim_words($product_data['product_content'], apply_filters('excerpt_length', 50), '...');
-
-            $product_data['product_meta_attribute_set_id'] = (!empty($product->attribute_set_id)) ? $product->attribute_set_id : '';
-
-            $data = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT), $product->ID, WPSHOP_CURRENT_LOCALE, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-            if (!empty($data)) {
-                foreach ($data as $attribute) {
-                    $data_type = 'attribute_value_' . $attribute->data_type;
-                    $value = $attribute->$data_type;
-                    if (in_array($attribute->backend_input, array('select', 'multiple-select', 'radio', 'checkbox'))) {
-                        $value = wpshop_attributes::get_attribute_type_select_option_info($value, 'value');
-                    }
-
-                    /** Special traitment regarding attribute_code    */
-                    switch ($attribute->attribute_code) {
-                        case 'product_weight':
-                            $default_weight_unity = get_option('wpshop_shop_default_weight_unity');
-                            if (!empty($default_weight_unity)) {
-                                $query = $wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id = %d', $default_weight_unity);
-                                $unity = $wpdb->get_var($query);
-                                if ($unity == 'kg') {
-                                    $value *= 1000;
-                                }
-
-                            }
-                            break;
-                        default:
-                            $value = !empty($value) ? $value : 0;
-                            break;
-                    }
-                    $product_data[$attribute->attribute_code] = $value;
-
-                    if (!$for_cart_storage or $for_cart_storage && $attribute->is_recordable_in_cart_meta == 'yes') {
-                        $meta = get_post_meta($product->ID, 'attribute_option_' . $attribute->attribute_code, true);
-                        if (!empty($meta)) {
-                            $product_meta[$attribute->attribute_code] = $meta;
-                        }
-                    }
-
-                    if (($attribute->is_visible_in_front == 'yes') && (!in_array($attribute->attribute_code, unserialize(WPSHOP_ATTRIBUTE_PRICES)))) {
-                        $product_meta['attribute_visible'][$attribute->attribute_code] = $value;
-                    }
-                    if (($attribute->is_visible_in_front_listing == 'yes') && (!in_array($attribute->attribute_code, unserialize(WPSHOP_ATTRIBUTE_PRICES)))) {
-                        $product_meta['attribute_visible_listing'][$attribute->attribute_code] = $value;
-                    }
-                }
-            } else {
-
-            }
-
-            /**    Get datas about product options    */
-            if ($product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
-                $variation_details = get_post_meta($product->ID, '_wpshop_variations_attribute_def', true);
-
-                foreach ($variation_details as $attribute_code => $attribute_value) {
-                    $variation_id = $attribute_value;
-                    $attribute_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
-
-                    $product_meta['variation_definition'][$attribute_code]['UNSTYLED_VALUE'] = stripslashes(wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'label', $attribute_definition->data_type_to_use, true));
-                    $product_meta['variation_definition'][$attribute_code]['NAME'] = $attribute_definition->frontend_label;
-                    switch ($attribute_definition->backend_input) {
-                        case 'select':
-                        case 'multiple-select':
-                        case 'radio':
-                        case 'checkbox':
-                            $attribute_value = wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'label', $attribute_definition->data_type_to_use, true);
-                            break;
-                    }
-                    $product_meta['variation_definition'][$attribute_code]['VALUE'] = $attribute_value;
-                    $product_meta['variation_definition'][$attribute_code]['ID'] = $variation_id;
-                }
-            }
-
-            $product_data['item_meta'] = !empty($product_meta) ? $product_meta : array();
-
-            /** Get the display definition for the current product for checking custom display    */
-            $product_data['custom_display'] = get_post_meta($product_id, WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, true);
-        }
+		$product = $wpdb->get_row($query);
+
+		$product_data = array();
+		$product_meta = array();
+
+		if (!empty($product)) {
+			$product_data['product_id'] = (!empty($product->ID)) ? $product->ID : '';
+			$product_data['post_name'] = (!empty($product->post_name)) ? $product->post_name : '';
+			$product_data['product_name'] = (!empty($product->post_title)) ? $product->post_title : '';
+			$product_data['post_title'] = (!empty($product->post_title)) ? $product->post_title : '';
+
+			$product_data['product_author_id'] = (!empty($product->post_author)) ? $product->post_author : '';
+			$product_data['product_date'] = (!empty($product->post_date)) ? $product->post_date : '';
+			$product_data['product_content'] = (!empty($product->post_content)) ? $product->post_content : '';
+			$product_data['product_excerpt'] = (!empty($product->post_excerpt)) ? $product->post_excerpt : wp_trim_words($product_data['product_content'], apply_filters('excerpt_length', 50), '...');
+
+			$product_data['product_meta_attribute_set_id'] = (!empty($product->attribute_set_id)) ? $product->attribute_set_id : '';
+
+			$data = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT), $product->ID, WPSHOP_CURRENT_LOCALE, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			if (!empty($data)) {
+				foreach ($data as $attribute) {
+					$data_type = 'attribute_value_' . $attribute->data_type;
+					$value = $attribute->$data_type;
+					if (in_array($attribute->backend_input, array('select', 'multiple-select', 'radio', 'checkbox'))) {
+						$value = wpshop_attributes::get_attribute_type_select_option_info($value, 'value');
+					}
+
+					/** Special traitment regarding attribute_code    */
+					switch ($attribute->attribute_code) {
+						case 'product_weight':
+							$default_weight_unity = get_option('wpshop_shop_default_weight_unity');
+							if (!empty($default_weight_unity)) {
+								$query = $wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id = %d', $default_weight_unity);
+								$unity = $wpdb->get_var($query);
+								if ($unity == 'kg') {
+									$value *= 1000;
+								}
+
+							}
+							break;
+						default:
+							$value = !empty($value) ? $value : 0;
+							break;
+					}
+					$product_data[$attribute->attribute_code] = $value;
+
+					if (!$for_cart_storage or $for_cart_storage && $attribute->is_recordable_in_cart_meta == 'yes') {
+						$meta = get_post_meta($product->ID, 'attribute_option_' . $attribute->attribute_code, true);
+						if (!empty($meta)) {
+							$product_meta[$attribute->attribute_code] = $meta;
+						}
+					}
+
+					if (($attribute->is_visible_in_front == 'yes') && (!in_array($attribute->attribute_code, unserialize(WPSHOP_ATTRIBUTE_PRICES)))) {
+						$product_meta['attribute_visible'][$attribute->attribute_code] = $value;
+					}
+					if (($attribute->is_visible_in_front_listing == 'yes') && (!in_array($attribute->attribute_code, unserialize(WPSHOP_ATTRIBUTE_PRICES)))) {
+						$product_meta['attribute_visible_listing'][$attribute->attribute_code] = $value;
+					}
+				}
+			} else {
 
-        return $product_data;
-    }
+			}
 
-    /**
-     * Add a product into the db. This function is used for the EDI
-     * @param $name Name of the product
-     * @param $description Description of the product
-     * @param $attrs List of the attributes and values of the product
-     * @return boolean
-     */
-    public function addProduct($name, $description, $attrs = array())
-    {
-        $new_product = wpshop_entities::create_new_entity(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $name, $description, $attrs);
-        return $new_product[0];
-    }
+			/**    Get datas about product options    */
+			if ($product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+				$variation_details = get_post_meta($product->ID, '_wpshop_variations_attribute_def', true);
+
+				foreach ($variation_details as $attribute_code => $attribute_value) {
+					$variation_id = $attribute_value;
+					$attribute_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
+
+					$product_meta['variation_definition'][$attribute_code]['UNSTYLED_VALUE'] = stripslashes(wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'label', $attribute_definition->data_type_to_use, true));
+					$product_meta['variation_definition'][$attribute_code]['NAME'] = $attribute_definition->frontend_label;
+					switch ($attribute_definition->backend_input) {
+						case 'select':
+						case 'multiple-select':
+						case 'radio':
+						case 'checkbox':
+							$attribute_value = wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'label', $attribute_definition->data_type_to_use, true);
+							break;
+					}
+					$product_meta['variation_definition'][$attribute_code]['VALUE'] = $attribute_value;
+					$product_meta['variation_definition'][$attribute_code]['ID'] = $variation_id;
+				}
+			}
 
-    /**
-     * Retrieve a product listing
-     * @param boolean $formated If the output have to be formated or not
-     * @param string $product_search Optionnal Define a search term for request
-     * @return object|string If $formated is set to true will display an html output with all product. Else return a wordpress database object with the product list
-     */
-    public static function product_list($formated = false, $product_search = null)
-    {
-        global $wpdb;
-
-        $query_extra_params = $query_extra_params_value = '';
-        if (!empty($product_search)) {
-            $query_extra_params = " AND post_title LIKE '%%" . $product_search . "%%'";
-            if (is_array($product_search)) {
-                $query_extra_params = " AND ID IN (%s)";
-                $query_extra_params_value = implode(",", $product_search);
-            }
-        }
+			$product_data['item_meta'] = !empty($product_meta) ? $product_meta : array();
+
+			/** Get the display definition for the current product for checking custom display    */
+			$product_data['custom_display'] = get_post_meta($product_id, WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, true);
+		}
+
+		return $product_data;
+	}
+
+	/**
+	 * Add a product into the db. This function is used for the EDI
+	 * @param $name Name of the product
+	 * @param $description Description of the product
+	 * @param $attrs List of the attributes and values of the product
+	 * @return boolean
+	 */
+	public function addProduct($name, $description, $attrs = array())
+	{
+		$new_product = wpshop_entities::create_new_entity(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $name, $description, $attrs);
+		return $new_product[0];
+	}
+
+	/**
+	 * Retrieve a product listing
+	 * @param boolean $formated If the output have to be formated or not
+	 * @param string $product_search Optionnal Define a search term for request
+	 * @return object|string If $formated is set to true will display an html output with all product. Else return a wordpress database object with the product list
+	 */
+	public static function product_list($formated = false, $product_search = null)
+	{
+		global $wpdb;
+
+		$query_extra_params = $query_extra_params_value = '';
+		if (!empty($product_search)) {
+			$query_extra_params = " AND post_title LIKE '%%" . $product_search . "%%'";
+			if (is_array($product_search)) {
+				$query_extra_params = " AND ID IN (%s)";
+				$query_extra_params_value = implode(",", $product_search);
+			}
+		}
 
-        $query = $wpdb->prepare("SELECT ID, post_title FROM " . $wpdb->posts . " WHERE post_type=%s AND post_status=%s" . $query_extra_params, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish', $query_extra_params_value);
-        $data = $wpdb->get_results($query);
+		$query = $wpdb->prepare("SELECT ID, post_title FROM " . $wpdb->posts . " WHERE post_type=%s AND post_status=%s" . $query_extra_params, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish', $query_extra_params_value);
+		$data = $wpdb->get_results($query);
 
-        /*
+		/*
          * Make some arangement on output if parameter is given
          */
-        if ($formated) {
-            $product_string = '';
-            foreach ($data as $d) {
-                $product_string .= '
+		if ($formated) {
+			$product_string = '';
+			foreach ($data as $d) {
+				$product_string .= '
 					<li class="wpshop_shortcode_element_container wpshop_shortcode_element_container_product" >
 						<input type="checkbox" class="wpshop_shortcode_element wpshop_shortcode_element_product" value="' . $d->ID . '" id="' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '-' . $d->ID . '" name="products[]" /><label for="' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '-' . $d->ID . '" > ' . $d->post_title . '</label>
 					</li>';
-            }
-        }
+			}
+		}
 
-        return $formated ? $product_string : $data;
-    }
+		return $formated ? $product_string : $data;
+	}
 
-    /**
-     * Enregistrement des données pour le produit
-     */
-    public function save_product_custom_informations($post_id, $data_to_save = array())
-    {
-        global $wpdb;
-
-        $data_to_save = (!empty($data_to_save)) ? $data_to_save : (array) $_REQUEST;
-        // Apply a filter to extra actions
-        $data_to_save = apply_filters('wps_save_product_extra_filter', $data_to_save);
-
-        if (!empty($data_to_save['post_ID']) && ((get_post_type($data_to_save['post_ID']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) || (get_post_type($data_to_save['post_ID']) == "free_product"))) {
-            if (!empty($data_to_save[wpshop_products::currentPageCode . '_attribute'])) {
-                /*    Fill the product reference automatically if nothing is sent    */
-                if (empty($data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'])) {
-                    $query = "SELECT MAX(ID) AS PDCT_ID FROM {$wpdb->posts}";
-                    $last_ref = $wpdb->get_var($query);
-                    $data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'] = WPSHOP_PRODUCT_REFERENCE_PREFIX . str_repeat(0, WPSHOP_PRODUCT_REFERENCE_PREFIX_NB_FILL) . $last_ref;
-                } else {
-                    /* Check if the product reference existing in the database */
-                    $ref = $data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'];
-                    $query = $wpdb->prepare(
-                        "SELECT value_id
+	/**
+	 * Enregistrement des données pour le produit
+	 */
+	public function save_product_custom_informations($post_id, $data_to_save = array())
+	{
+		global $wpdb;
+
+		$data_to_save = (!empty($data_to_save)) ? $data_to_save : (array) $_REQUEST;
+		// Apply a filter to extra actions
+		$data_to_save = apply_filters('wps_save_product_extra_filter', $data_to_save);
+
+		if (!empty($data_to_save['post_ID']) && ((get_post_type($data_to_save['post_ID']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) || (get_post_type($data_to_save['post_ID']) == "free_product"))) {
+			if (!empty($data_to_save[wpshop_products::currentPageCode . '_attribute'])) {
+				/*    Fill the product reference automatically if nothing is sent    */
+				if (empty($data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'])) {
+					$query = "SELECT MAX(ID) AS PDCT_ID FROM {$wpdb->posts}";
+					$last_ref = $wpdb->get_var($query);
+					$data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'] = WPSHOP_PRODUCT_REFERENCE_PREFIX . str_repeat(0, WPSHOP_PRODUCT_REFERENCE_PREFIX_NB_FILL) . $last_ref;
+				} else {
+					/* Check if the product reference existing in the database */
+					$ref = $data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'];
+					$query = $wpdb->prepare(
+						"SELECT value_id
 						FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR . "
 							INNER JOIN {$wpdb->posts} ON ( ID = entity_id )
 						WHERE value = %s
 							AND entity_id != %d
 							AND entity_type_id = %d"
-                        , $ref, $data_to_save['post_ID'], wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
-                    $existing_reference = $wpdb->get_var($query);
-
-                    /* If this product reference exist -> Create a new product reference */
-                    if ($wpdb->num_rows > 0) {
-                        $query = "SELECT MAX(ID) AS PDCT_ID FROM " . $wpdb->posts;
-                        $last_ref = $wpdb->get_var($query);
-                        $data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'] = WPSHOP_PRODUCT_REFERENCE_PREFIX . str_repeat(0, WPSHOP_PRODUCT_REFERENCE_PREFIX_NB_FILL) . $last_ref;
-                    }
-                }
-
-                /*    Save the attributes values into wpshop eav database    */
-                $update_from = !empty($data_to_save[wpshop_products::currentPageCode . '_provenance']) ? $data_to_save[wpshop_products::currentPageCode . '_provenance'] : '';
-                $lang = WPSHOP_CURRENT_LOCALE;
-                if (!empty($data_to_save['icl_post_language'])) {
-                    $query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", $data_to_save['icl_post_language']);
-                    $lang = $wpdb->get_var($query);
-                }
-                wpshop_attributes::saveAttributeForEntity($data_to_save[wpshop_products::currentPageCode . '_attribute'], wpshop_entities::get_entity_identifier_from_code(wpshop_products::currentPageCode), $data_to_save['post_ID'], $lang, $update_from);
-
-                /*    Update product price looking for shop parameters    */
-                wpshop_products::calculate_price($data_to_save['post_ID']);
-
-                /*    Save the attributes values into wordpress post metadata database in order to have a backup and to make frontend search working    */
-                $productMetaDatas = array();
-                foreach ($data_to_save[wpshop_products::currentPageCode . '_attribute'] 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($data_to_save['post_ID'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, $attributeValue);
-                        }
-                        if ($attributeType == 'decimal') {
-                            $attributeValue = str_replace(',', '.', $attributeValue);
-                        }
-                        if (($attributeType == 'integer') && !is_array($attributeValue)) {
-                            $attributeValue = (int) $attributeValue;
-                        }
-                        $productMetaDatas[$attributeCode] = $attributeValue;
-                    }
-                }
-                update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $productMetaDatas);
-            }
-
-            if (!empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']) && empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']['default_config'])) {
-                update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, $data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']);
-            } else if ($data_to_save['action'] != 'autosave') {
-                delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF);
-            }
-
-            $product = wpshop_products::get_product_data($data_to_save['post_ID'], false, '"publish"');
-            if (empty($product['product_id'])) {
-                $product['product_id'] = $data_to_save['post_ID'];
-            }
-            $price = wpshop_prices::get_product_price($product, 'just_price_infos', array('mini_output', 'grid'));
-            update_post_meta($data_to_save['post_ID'], '_wps_price_infos', $price);
-
-            /**    Save product variation    */
-            if (!empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION])) {
-                foreach ($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION] as $variation_id => $variation_definition) {
-
-                    foreach (unserialize(WPSHOP_ATTRIBUTE_PRICES) as $price_attribute_code) {
-                        $price_attr_def = wpshop_attributes::getElement($price_attribute_code, "'valid'", 'code');
-                        if (!empty($variation_definition) && !empty($variation_definition['attribute']) && is_object($price_attr_def) && !empty($variation_definition['attribute'][$price_attr_def->data_type]) && is_array($variation_definition['attribute'][$price_attr_def->data_type]) && !array_key_exists($price_attribute_code, $variation_definition['attribute'][$price_attr_def->data_type])) {
-                            $variation_definition['attribute'][$price_attr_def->data_type][$price_attribute_code] = !empty($data_to_save[wpshop_products::currentPageCode . '_attribute'][$price_attr_def->data_type][$price_attribute_code]) ? $data_to_save[wpshop_products::currentPageCode . '_attribute'][$price_attr_def->data_type][$price_attribute_code] : 0;
-                        }
-                    }
-                    $lang = WPSHOP_CURRENT_LOCALE;
-                    if (!empty($data_to_save['icl_post_language'])) {
-                        $query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", $data_to_save['icl_post_language']);
-                        $lang = $wpdb->get_var($query);
-                    }
-                    wpshop_attributes::saveAttributeForEntity($variation_definition['attribute'], wpshop_entities::get_entity_identifier_from_code(wpshop_products::currentPageCode), $variation_id, $lang);
-
-                    /**    Save the attributes values into wordpress post metadata database in order to have a backup and to make frontend search working    */
-                    $variation_metadata = get_post_meta($variation_id, '_wpshop_product_metadata', true);
-                    if (!empty($variation_metadata)) {
-                        $attributes_list = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION), $variation_id);
-                        if (!empty($attributes_list)) {
-                            foreach ($attributes_list as $attribute) {
-                                $value_key = 'attribute_value_' . $attribute->data_type;
-                                $attributeValue = $attribute->$value_key;
-                                if ($attribute->data_type == 'decimal') {
-                                    $attributeValue = str_replace(',', '.', $attribute->$value_key);
-                                }
-                                if (($attribute->data_type == 'integer') && !is_array($attributeValue)) {
-                                    $attributeValue = (int) $attribute->$value_key;
-                                }
-                                $variation_metadata[$attribute->code] = $attribute->$value_key;
-                            }
-                        }
-                    }
-
-                    foreach ($variation_definition['attribute'] as $attributeType => $attributeValues) {
-                        foreach ($attributeValues as $attributeCode => $attributeValue) {
-                            if ($attributeType == 'decimal') {
-                                $attributeValue = str_replace(',', '.', $attributeValue);
-                            }
-                            if (($attributeType == 'integer') && !is_array($attributeValue)) {
-                                $attributeValue = (int) $attributeValue;
-                            }
-                            $variation_metadata[$attributeCode] = $attributeValue;
-                        }
-                    }
-                    update_post_meta($variation_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $variation_metadata);
-
-                    /** Save attached picture id **/
-                    $attached_picture_id = (!empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION][$variation_id]['wps_attached_picture_id'])) ? intval($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION][$variation_id]['wps_attached_picture_id']) : '';
-                    $selected_picture = update_post_meta($variation_id, '_wps_variation_attached_picture', $attached_picture_id);
-
-                    /*    Update product price looking for shop parameters    */
-                    wpshop_products::calculate_price($variation_id);
-                }
-            }
-
-            /*    Update the related products list*/
-            if (!empty($data_to_save['related_products_list'])) {
-                update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_RELATED_PRODUCTS, $data_to_save['related_products_list']);
-            } else if ($data_to_save['action'] != 'autosave') {
-                delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_RELATED_PRODUCTS);
-            }
-            /*    Update the provider list*/
-            if (!empty($data_to_save['provider_list'])) {
-                update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_PROVIDER, $data_to_save['provider_list']);
-            } else if ($data_to_save['action'] != 'autosave') {
-                delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_PROVIDER);
-            }
-
-            /*    Update product options    */
-            if (!empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['options'])) {
-                update_post_meta($data_to_save['post_ID'], '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', $data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['options']);
-            } else if ($data_to_save['action'] != 'autosave') {
-                delete_post_meta($data_to_save['post_ID'], '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options');
-            }
-
-            /** Add flag on variations to check which type of variation **/
-            $check_product_have_variations = self::get_variation($post_id);
-            if (!empty($check_product_have_variations)) {
-                $variation_flag = self::check_variation_type($post_id);
-                $variation_defining = get_post_meta($post_id, '_wpshop_variation_defining', true);
-                $variation_defining['variation_type'] = $variation_flag;
-                update_post_meta($post_id, '_wpshop_variation_defining', $variation_defining);
-            }
-            add_post_meta($post_id, '_wpshop_variation_defining', array('follow_general_config' => true, 'options' => array('priority' => array('combined'), 'price_behaviour' => array('replacement'), 'price_display' => (!empty($catalog_product_option) && !empty($catalog_product_option['price_display'])) ? $catalog_product_option['price_display'] : array('text_from' => 'on', 'lower_price' => 'on'))), true);
-        }
+						, $ref, $data_to_save['post_ID'], wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
+					$existing_reference = $wpdb->get_var($query);
+
+					/* If this product reference exist -> Create a new product reference */
+					if ($wpdb->num_rows > 0) {
+						$query = "SELECT MAX(ID) AS PDCT_ID FROM " . $wpdb->posts;
+						$last_ref = $wpdb->get_var($query);
+						$data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'] = WPSHOP_PRODUCT_REFERENCE_PREFIX . str_repeat(0, WPSHOP_PRODUCT_REFERENCE_PREFIX_NB_FILL) . $last_ref;
+					}
+				}
 
-        flush_rewrite_rules();
-    }
+				/*    Save the attributes values into wpshop eav database    */
+				$update_from = !empty($data_to_save[wpshop_products::currentPageCode . '_provenance']) ? $data_to_save[wpshop_products::currentPageCode . '_provenance'] : '';
+				$lang = WPSHOP_CURRENT_LOCALE;
+				if (!empty($data_to_save['icl_post_language'])) {
+					$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", $data_to_save['icl_post_language']);
+					$lang = $wpdb->get_var($query);
+				}
+				wpshop_attributes::saveAttributeForEntity($data_to_save[wpshop_products::currentPageCode . '_attribute'], wpshop_entities::get_entity_identifier_from_code(wpshop_products::currentPageCode), $data_to_save['post_ID'], $lang, $update_from);
+
+				/*    Update product price looking for shop parameters    */
+				wpshop_products::calculate_price($data_to_save['post_ID']);
+
+				/*    Save the attributes values into wordpress post metadata database in order to have a backup and to make frontend search working    */
+				$productMetaDatas = array();
+				foreach ($data_to_save[wpshop_products::currentPageCode . '_attribute'] 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($data_to_save['post_ID'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, $attributeValue);
+						}
+						if ($attributeType == 'decimal') {
+							$attributeValue = str_replace(',', '.', $attributeValue);
+						}
+						if (($attributeType == 'integer') && !is_array($attributeValue)) {
+							$attributeValue = (int) $attributeValue;
+						}
+						$productMetaDatas[$attributeCode] = $attributeValue;
+					}
+				}
+				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $productMetaDatas);
+			}
 
-    /**
-     * Return the variation type
-     * @param integer $post_id
-     * @return string
-     */
-    public function check_variation_type($post_id)
-    {
-        $variation_type = 'single';
-        if (!empty($variation_type)) {
-            $variations = self::get_variation($post_id);
-            if (!empty($variations)) {
-                foreach ($variations as $variation_id => $variation_data) {
-                    if (!empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) == 1) {
-                        return 'single';
-                    } elseif (!empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) > 1) {
-                        $variation_type = 'combined';
-                    }
-                }
-            }
-        }
-        return $variation_type;
-    }
+			if (!empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']) && empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']['default_config'])) {
+				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, $data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']);
+			} else if ($data_to_save['action'] != 'autosave') {
+				delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF);
+			}
 
-    /**
-     * Allows to define a specific permalink for each product by checking the parent categories
-     *
-     * @param mixed $permalink The actual permalink of the element
-     * @param object $post The post we want to set the permalink for
-     * @param void
-     *
-     * @return mixed The new permalink for the current element
-     */
-    public static function set_product_permalink($permalink, $post, $unknown)
-    {
-        $options = get_option('wpshop_catalog_product_option', array());
-
-        if ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT/* && 'publish' == $post->post_status */) {
-            if (!isset($options['wpshop_catalog_product_slug_with_category']) || $options['wpshop_catalog_product_slug_with_category'] != 'yes') {
-                return $permalink;
-            } else {
-                $options_cats = get_option('wpshop_catalog_categories_option', array());
-                $product_categories = wp_get_object_terms($post->ID, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
-                if (empty($product_categories)) {
-                    $product_category_slug = $options_cats['wpshop_catalog_no_category_slug'];
-                } else {
-                    $product_category_slug = $product_categories[0]->slug;
-                }
-                $permalink = str_replace('%' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '%', $product_category_slug, $permalink);
-            }
-        }
+			$product = wpshop_products::get_product_data($data_to_save['post_ID'], false, '"publish"');
+			if (empty($product['product_id'])) {
+				$product['product_id'] = $data_to_save['post_ID'];
+			}
+			$price = wpshop_prices::get_product_price($product, 'just_price_infos', array('mini_output', 'grid'));
+			update_post_meta($data_to_save['post_ID'], '_wps_price_infos', $price);
+
+			/**    Save product variation    */
+			if (!empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION])) {
+				foreach ($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION] as $variation_id => $variation_definition) {
+
+					foreach (unserialize(WPSHOP_ATTRIBUTE_PRICES) as $price_attribute_code) {
+						$price_attr_def = wpshop_attributes::getElement($price_attribute_code, "'valid'", 'code');
+						if (!empty($variation_definition) && !empty($variation_definition['attribute']) && is_object($price_attr_def) && !empty($variation_definition['attribute'][$price_attr_def->data_type]) && is_array($variation_definition['attribute'][$price_attr_def->data_type]) && !array_key_exists($price_attribute_code, $variation_definition['attribute'][$price_attr_def->data_type])) {
+							$variation_definition['attribute'][$price_attr_def->data_type][$price_attribute_code] = !empty($data_to_save[wpshop_products::currentPageCode . '_attribute'][$price_attr_def->data_type][$price_attribute_code]) ? $data_to_save[wpshop_products::currentPageCode . '_attribute'][$price_attr_def->data_type][$price_attribute_code] : 0;
+						}
+					}
+					$lang = WPSHOP_CURRENT_LOCALE;
+					if (!empty($data_to_save['icl_post_language'])) {
+						$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", $data_to_save['icl_post_language']);
+						$lang = $wpdb->get_var($query);
+					}
+					wpshop_attributes::saveAttributeForEntity($variation_definition['attribute'], wpshop_entities::get_entity_identifier_from_code(wpshop_products::currentPageCode), $variation_id, $lang);
+
+					/**    Save the attributes values into wordpress post metadata database in order to have a backup and to make frontend search working    */
+					$variation_metadata = get_post_meta($variation_id, '_wpshop_product_metadata', true);
+					if (!empty($variation_metadata)) {
+						$attributes_list = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION), $variation_id);
+						if (!empty($attributes_list)) {
+							foreach ($attributes_list as $attribute) {
+								$value_key = 'attribute_value_' . $attribute->data_type;
+								$attributeValue = $attribute->$value_key;
+								if ($attribute->data_type == 'decimal') {
+									$attributeValue = str_replace(',', '.', $attribute->$value_key);
+								}
+								if (($attribute->data_type == 'integer') && !is_array($attributeValue)) {
+									$attributeValue = (int) $attribute->$value_key;
+								}
+								$variation_metadata[$attribute->code] = $attribute->$value_key;
+							}
+						}
+					}
+
+					foreach ($variation_definition['attribute'] as $attributeType => $attributeValues) {
+						foreach ($attributeValues as $attributeCode => $attributeValue) {
+							if ($attributeType == 'decimal') {
+								$attributeValue = str_replace(',', '.', $attributeValue);
+							}
+							if (($attributeType == 'integer') && !is_array($attributeValue)) {
+								$attributeValue = (int) $attributeValue;
+							}
+							$variation_metadata[$attributeCode] = $attributeValue;
+						}
+					}
+					update_post_meta($variation_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $variation_metadata);
+
+					/** Save attached picture id **/
+					$attached_picture_id = (!empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION][$variation_id]['wps_attached_picture_id'])) ? intval($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION][$variation_id]['wps_attached_picture_id']) : '';
+					$selected_picture = update_post_meta($variation_id, '_wps_variation_attached_picture', $attached_picture_id);
+
+					/*    Update product price looking for shop parameters    */
+					wpshop_products::calculate_price($variation_id);
+				}
+			}
+
+			/*    Update the related products list*/
+			if (!empty($data_to_save['related_products_list'])) {
+				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_RELATED_PRODUCTS, $data_to_save['related_products_list']);
+			} else if ($data_to_save['action'] != 'autosave') {
+				delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_RELATED_PRODUCTS);
+			}
+			/*    Update the provider list*/
+			if (!empty($data_to_save['provider_list'])) {
+				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_PROVIDER, $data_to_save['provider_list']);
+			} else if ($data_to_save['action'] != 'autosave') {
+				delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_PROVIDER);
+			}
+
+			/*    Update product options    */
+			if (!empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['options'])) {
+				update_post_meta($data_to_save['post_ID'], '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', $data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['options']);
+			} else if ($data_to_save['action'] != 'autosave') {
+				delete_post_meta($data_to_save['post_ID'], '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options');
+			}
+
+			/** Add flag on variations to check which type of variation **/
+			$check_product_have_variations = self::get_variation($post_id);
+			if (!empty($check_product_have_variations)) {
+				$variation_flag = self::check_variation_type($post_id);
+				$variation_defining = get_post_meta($post_id, '_wpshop_variation_defining', true);
+				$variation_defining['variation_type'] = $variation_flag;
+				update_post_meta($post_id, '_wpshop_variation_defining', $variation_defining);
+			}
+			add_post_meta($post_id, '_wpshop_variation_defining', array('follow_general_config' => true, 'options' => array('priority' => array('combined'), 'price_behaviour' => array('replacement'), 'price_display' => (!empty($catalog_product_option) && !empty($catalog_product_option['price_display'])) ? $catalog_product_option['price_display'] : array('text_from' => 'on', 'lower_price' => 'on'))), true);
+		}
+
+		flush_rewrite_rules();
+	}
+
+	/**
+	 * Return the variation type
+	 * @param integer $post_id
+	 * @return string
+	 */
+	public function check_variation_type($post_id)
+	{
+		$variation_type = 'single';
+		if (!empty($variation_type)) {
+			$variations = self::get_variation($post_id);
+			if (!empty($variations)) {
+				foreach ($variations as $variation_id => $variation_data) {
+					if (!empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) == 1) {
+						return 'single';
+					} elseif (!empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) > 1) {
+						$variation_type = 'combined';
+					}
+				}
+			}
+		}
+		return $variation_type;
+	}
+
+	/**
+	 * Allows to define a specific permalink for each product by checking the parent categories
+	 *
+	 * @param mixed $permalink The actual permalink of the element
+	 * @param object $post The post we want to set the permalink for
+	 * @param void
+	 *
+	 * @return mixed The new permalink for the current element
+	 */
+	public static function set_product_permalink($permalink, $post, $unknown)
+	{
+		$options = get_option('wpshop_catalog_product_option', array());
+
+		if ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT/* && 'publish' == $post->post_status */) {
+			if (!isset($options['wpshop_catalog_product_slug_with_category']) || $options['wpshop_catalog_product_slug_with_category'] != 'yes') {
+				return $permalink;
+			} else {
+				$options_cats = get_option('wpshop_catalog_categories_option', array());
+				$product_categories = wp_get_object_terms($post->ID, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
+				if (empty($product_categories)) {
+					$product_category_slug = $options_cats['wpshop_catalog_no_category_slug'];
+				} else {
+					$product_category_slug = $product_categories[0]->slug;
+				}
+				$permalink = str_replace('%' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '%', $product_category_slug, $permalink);
+			}
+		}
 
-        return $permalink;
+		return $permalink;
 
-        //echo '<pre>'; print_r($permalink); echo '</pre>'; exit();
+		//echo '<pre>'; print_r($permalink); echo '</pre>'; exit();
 
-        //wpshop_catalog_categories_slug wpshop_catalog_no_category_slug
+		//wpshop_catalog_categories_slug wpshop_catalog_no_category_slug
 
-        /*if(false) {
+		/*if(false) {
         global $wp_query;
         $product_categories = wp_get_object_terms( $post->ID, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES );
 
         if(count($product_categories) == 0){            /*    Product has only one category we get the only available slug    */
-        /*        $product_category_slug = WPSHOP_UNCATEGORIZED_PRODUCT_SLUG;
+		/*        $product_category_slug = WPSHOP_UNCATEGORIZED_PRODUCT_SLUG;
         }
         elseif(count($product_categories) == 1){    /*    Product has only one category we get the only available slug    */
-        /*        $product_category_slug = $product_categories[0]->slug;
+		/*        $product_category_slug = $product_categories[0]->slug;
         }
         else{                                                                            /*    Product has several categories choose the slug of the we want    */
-        /*        $product_category_slugs = array();
+		/*        $product_category_slugs = array();
     foreach($product_categories as $product_category){
     $product_category_slugs[] = $product_category->slug;
     }
@@ -1498,457 +1498,457 @@ 
     $permalink = str_replace('%' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '%', $product_category_slug, $permalink);
     return apply_filters('wpshop_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_permalink', $permalink, $post->ID );
     }*/
-    }
+	}
 
-    public static function set_product_request_by_name($query)
-    {
-        $options = get_option('wpshop_catalog_product_option', array());
+	public static function set_product_request_by_name($query)
+	{
+		$options = get_option('wpshop_catalog_product_option', array());
 
-        if ($query->is_main_query() && (2 == count($query->query) || isset($query->query['page'])) && !empty($query->query['name']) && empty($options['wpshop_catalog_product_slug']));
-        //    $query->set( 'post_type', array( 'post', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'page' ) );
-    }
+		if ($query->is_main_query() && (2 == count($query->query) || isset($query->query['page'])) && !empty($query->query['name']) && empty($options['wpshop_catalog_product_slug']));
+		//    $query->set( 'post_type', array( 'post', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'page' ) );
+	}
 
-    /**
-     *    Define output for product
-     *
-     *    @param mixed $initialContent The initial product content defined into wordpress basic admin interface
-     *    @param integer $product_id The product identifier we want to get and output attribute for
-     *
-     *    @return mixed $content The content to add or to modify the product output in frontend
-     */
-    public static function product_complete_sheet_output($initialContent, $product_id)
-    {
-        $content = $attributeContentOutput = '';
-        $wps_product_ctr = new wps_product_ctr();
-        /** Log number of view for the current product    */
-        $product_view_number = get_post_meta($product_id, WPSHOP_PRODUCT_VIEW_NB, true);
-        $product_view_number++;
-        update_post_meta($product_id, WPSHOP_PRODUCT_VIEW_NB, $product_view_number);
-
-        /** Get product definition    */
-
-        $product = self::get_product_data($product_id);
-        wp_cache_set('wpshop_product_data_' . $product_id, $product);
-
-        /** Get the product thumbnail    */
-        $productThumbnail = wpshop_display::display_template_element('product_thumbnail_default', array());
-        if (has_post_thumbnail($product_id)) {
-            $thumbnail_url = wp_get_attachment_image_src(get_post_thumbnail_id(), 'full');
-            $tpl_component = array();
-            $tpl_component['PRODUCT_THUMBNAIL_URL'] = $thumbnail_url[0];
-            $tpl_component['PRODUCT_THUMBNAIL'] = get_the_post_thumbnail($product_id, 'wpshop-product-galery');
-            $tpl_component['PRODUCT_THUMBNAIL_FULL'] = get_the_post_thumbnail($product_id, 'full');
-            $image_attributes = wp_get_attachment_metadata(get_post_thumbnail_id());
-            if (!empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes'])) {
-                foreach ($image_attributes['sizes'] as $size_name => $size_def) {
-                    $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = wp_get_attachment_image(get_post_thumbnail_id(), $size_name);
-                    $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = (!empty($tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)])) ? $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
-                }
-            }
-            $tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] = (!empty($tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'])) ? $tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
-            $productThumbnail = wpshop_display::display_template_element('product_thumbnail', $tpl_component);
-            unset($tpl_component);
-        }
+	/**
+	 *    Define output for product
+	 *
+	 *    @param mixed $initialContent The initial product content defined into wordpress basic admin interface
+	 *    @param integer $product_id The product identifier we want to get and output attribute for
+	 *
+	 *    @return mixed $content The content to add or to modify the product output in frontend
+	 */
+	public static function product_complete_sheet_output($initialContent, $product_id)
+	{
+		$content = $attributeContentOutput = '';
+		$wps_product_ctr = new wps_product_ctr();
+		/** Log number of view for the current product    */
+		$product_view_number = get_post_meta($product_id, WPSHOP_PRODUCT_VIEW_NB, true);
+		$product_view_number++;
+		update_post_meta($product_id, WPSHOP_PRODUCT_VIEW_NB, $product_view_number);
+
+		/** Get product definition    */
+
+		$product = self::get_product_data($product_id);
+		wp_cache_set('wpshop_product_data_' . $product_id, $product);
+
+		/** Get the product thumbnail    */
+		$productThumbnail = wpshop_display::display_template_element('product_thumbnail_default', array());
+		if (has_post_thumbnail($product_id)) {
+			$thumbnail_url = wp_get_attachment_image_src(get_post_thumbnail_id(), 'full');
+			$tpl_component = array();
+			$tpl_component['PRODUCT_THUMBNAIL_URL'] = $thumbnail_url[0];
+			$tpl_component['PRODUCT_THUMBNAIL'] = get_the_post_thumbnail($product_id, 'wpshop-product-galery');
+			$tpl_component['PRODUCT_THUMBNAIL_FULL'] = get_the_post_thumbnail($product_id, 'full');
+			$image_attributes = wp_get_attachment_metadata(get_post_thumbnail_id());
+			if (!empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes'])) {
+				foreach ($image_attributes['sizes'] as $size_name => $size_def) {
+					$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = wp_get_attachment_image(get_post_thumbnail_id(), $size_name);
+					$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = (!empty($tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)])) ? $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
+				}
+			}
+			$tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] = (!empty($tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'])) ? $tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
+			$productThumbnail = wpshop_display::display_template_element('product_thumbnail', $tpl_component);
+			unset($tpl_component);
+		}
 
-        $product_document_galery = wps_media_manager_frontend_ctr::get_product_complete_sheet_attachments($product_id);
-
-        /**    Retrieve product attributes for output    */
-        $attributeContentOutput = wpshop_attributes::attribute_of_entity_to_tab(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $product_id, $product);
-
-        /** Retrieve product price */
-        $price_attribute = wpshop_attributes::getElement('product_price', "'valid'", 'code');
-        $price_display = wpshop_attributes::check_attribute_display($price_attribute->is_visible_in_front, $product['custom_display'], 'attribute', 'product_price', 'complete_sheet');
-        $catalog_options = get_option('wpshop_catalog_main_option', array());
-        $productPrice = '';
-        $wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
-        $check_product_price = wpshop_prices::check_product_price($product);
-        $result_price_piloting = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $check_product_price['et'] : $check_product_price['ati'];
-        if ($price_display && !(!empty($catalog_options) && (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes') && $result_price_piloting == 0)) {
-            $productPrice = wpshop_prices::get_product_price($product, 'price_display', 'complete_sheet');
-        }
+		$product_document_galery = wps_media_manager_frontend_ctr::get_product_complete_sheet_attachments($product_id);
+
+		/**    Retrieve product attributes for output    */
+		$attributeContentOutput = wpshop_attributes::attribute_of_entity_to_tab(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $product_id, $product);
+
+		/** Retrieve product price */
+		$price_attribute = wpshop_attributes::getElement('product_price', "'valid'", 'code');
+		$price_display = wpshop_attributes::check_attribute_display($price_attribute->is_visible_in_front, $product['custom_display'], 'attribute', 'product_price', 'complete_sheet');
+		$catalog_options = get_option('wpshop_catalog_main_option', array());
+		$productPrice = '';
+		$wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
+		$check_product_price = wpshop_prices::check_product_price($product);
+		$result_price_piloting = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $check_product_price['et'] : $check_product_price['ati'];
+		if ($price_display && !(!empty($catalog_options) && (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes') && $result_price_piloting == 0)) {
+			$productPrice = wpshop_prices::get_product_price($product, 'price_display', 'complete_sheet');
+		}
 
-        /** Check if there is at less 1 product in stock    */
-        $productStock = $wps_product_ctr->check_stock($product_id, 1);
-        $productStock = ($productStock === true) ? 1 : null;
+		/** Check if there is at less 1 product in stock    */
+		$productStock = $wps_product_ctr->check_stock($product_id, 1);
+		$productStock = ($productStock === true) ? 1 : null;
 
-        /** if !product stock check product have variation with stock **/
+		/** if !product stock check product have variation with stock **/
 //         if ( empty($productStock) ) {
-        $product_variation_meta = get_post_meta($product_id, '_wpshop_variation_defining', true);
-        if (!empty($product_variation_meta) && !empty($product_variation_meta['options']) && !empty($product_variation_meta['options']['priority']) && in_array('combined', $product_variation_meta['options']['priority'])) {
-            $variations = wpshop_products::get_variation($product_id);
-            if (!empty($variations)) {
-                foreach ($variations as $variation) {
-                    if (!empty($variation) && !empty($variation['variation_dif']) && array_key_exists('product_stock', $variation['variation_dif']) && round($variation['variation_dif']['product_stock']) > 0) {
-                        $productStock = 1;
-                    }
-                }
-            }
-        }
+		$product_variation_meta = get_post_meta($product_id, '_wpshop_variation_defining', true);
+		if (!empty($product_variation_meta) && !empty($product_variation_meta['options']) && !empty($product_variation_meta['options']['priority']) && in_array('combined', $product_variation_meta['options']['priority'])) {
+			$variations = wpshop_products::get_variation($product_id);
+			if (!empty($variations)) {
+				foreach ($variations as $variation) {
+					if (!empty($variation) && !empty($variation['variation_dif']) && array_key_exists('product_stock', $variation['variation_dif']) && round($variation['variation_dif']['product_stock']) > 0) {
+						$productStock = 1;
+					}
+				}
+			}
+		}
 //         }
 
-        /** Define "Add to cart" button     */
-        $add_to_cart_button_display_state = wpshop_attributes::check_attribute_display(((WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no'), $product['custom_display'], 'product_action_button', 'add_to_cart', 'complete_sheet');
-        $display_price_state_when_price_is_empty = true;
-        if (empty($productPrice) && (!empty($catalog_options) || (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes'))) {
-            $display_price_state_when_price_is_empty = false;
-        } else if (!empty($productPrice)) {
-            $display_price_state_when_price_is_empty = true;
-        }
-        $add_to_cart_button = (true === $add_to_cart_button_display_state) && (true === $display_price_state_when_price_is_empty) ? self::display_add_to_cart_button($product_id, $productStock, 'complete') : '';
-        $product_quantity_chooser_input = (true === $add_to_cart_button_display_state) ? wpshop_display::display_template_element('product_complete_sheet_quantity_chooser', array('PRODUCT_ID' => $product_id)) : '';
-
-        /** Define "Ask a quotation" button    */
-        $quotation_button = self::display_quotation_button($product_id, (!empty($product['quotation_allowed']) ? $product['quotation_allowed'] : null), 'complete');
-
-        /** Template parameters    */
-        $template_part = 'product_complete_tpl';
-        $tpl_component = array();
-
-        $tpl_component['PRODUCT_VARIATIONS'] = wpshop_products::wpshop_variation($product_id);
-        $tpl_component['PRODUCT_ID'] = $product_id;
-        $tpl_component['PRODUCT_TITLE'] = $product['post_title'];
-        $tpl_component['PRODUCT_THUMBNAIL'] = $productThumbnail;
-        $tpl_component['PRODUCT_GALERY_PICS'] = '';
-        $tpl_component['PRODUCT_PRICE'] = $productPrice;
-        $modules_option = get_option('wpshop_modules');
-        $tpl_component['LOW_STOCK_ALERT_MESSAGE'] = '';
-        if (!empty($modules_option) && !empty($modules_option['wpshop_low_stock_alert']) && $modules_option['wpshop_low_stock_alert']['activated'] == 'on') {
-            $wps_marketing_tools = new wps_marketing_tools_ctr();
-            $tpl_component['LOW_STOCK_ALERT_MESSAGE'] = $wps_marketing_tools->display_alert_stock_message(array('id' => $product_id));
-        }
+		/** Define "Add to cart" button     */
+		$add_to_cart_button_display_state = wpshop_attributes::check_attribute_display(((WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no'), $product['custom_display'], 'product_action_button', 'add_to_cart', 'complete_sheet');
+		$display_price_state_when_price_is_empty = true;
+		if (empty($productPrice) && (!empty($catalog_options) || (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes'))) {
+			$display_price_state_when_price_is_empty = false;
+		} else if (!empty($productPrice)) {
+			$display_price_state_when_price_is_empty = true;
+		}
+		$add_to_cart_button = (true === $add_to_cart_button_display_state) && (true === $display_price_state_when_price_is_empty) ? self::display_add_to_cart_button($product_id, $productStock, 'complete') : '';
+		$product_quantity_chooser_input = (true === $add_to_cart_button_display_state) ? wpshop_display::display_template_element('product_complete_sheet_quantity_chooser', array('PRODUCT_ID' => $product_id)) : '';
+
+		/** Define "Ask a quotation" button    */
+		$quotation_button = self::display_quotation_button($product_id, (!empty($product['quotation_allowed']) ? $product['quotation_allowed'] : null), 'complete');
+
+		/** Template parameters    */
+		$template_part = 'product_complete_tpl';
+		$tpl_component = array();
+
+		$tpl_component['PRODUCT_VARIATIONS'] = wpshop_products::wpshop_variation($product_id);
+		$tpl_component['PRODUCT_ID'] = $product_id;
+		$tpl_component['PRODUCT_TITLE'] = $product['post_title'];
+		$tpl_component['PRODUCT_THUMBNAIL'] = $productThumbnail;
+		$tpl_component['PRODUCT_GALERY_PICS'] = '';
+		$tpl_component['PRODUCT_PRICE'] = $productPrice;
+		$modules_option = get_option('wpshop_modules');
+		$tpl_component['LOW_STOCK_ALERT_MESSAGE'] = '';
+		if (!empty($modules_option) && !empty($modules_option['wpshop_low_stock_alert']) && $modules_option['wpshop_low_stock_alert']['activated'] == 'on') {
+			$wps_marketing_tools = new wps_marketing_tools_ctr();
+			$tpl_component['LOW_STOCK_ALERT_MESSAGE'] = $wps_marketing_tools->display_alert_stock_message(array('id' => $product_id));
+		}
 
-        /** Gallery **/
-        $tpl_component['PRODUCT_COMPLETE_SHEET_GALLERY'] = wps_media_manager_frontend_ctr::get_product_complete_sheet_galery($product_id);
-
-        $product_new_def = self::display_product_special_state('declare_new', 'complete', (!empty($product['declare_new']) ? $product['declare_new'] : 'no'), (!empty($product['set_new_from']) ? $product['set_new_from'] : ''), (!empty($product['set_new_to']) ? $product['set_new_to'] : ''));
-
-        $product_new = $product_new_def['output'];
-        $product_class = $product_new_def['class'];
-
-        $product_featured_def = self::display_product_special_state('highlight_product', 'complete', (!empty($product['highlight_product']) ? $product['highlight_product'] : 'no'), (!empty($product['highlight_from']) ? $product['highlight_from'] : ''), (!empty($product['highlight_to']) ? $product['highlight_to'] : ''));
-        $product_featured = $product_featured_def['output'];
-        $product_class .= $product_featured_def['class'];
-
-        $tpl_component['PRODUCT_IS_NEW'] = $product_new;
-        $tpl_component['PRODUCT_IS_FEATURED'] = $product_featured;
-        $tpl_component['PRODUCT_EXTRA_STATE'] = $tpl_component['PRODUCT_IS_NEW'] . $tpl_component['PRODUCT_IS_FEATURED'];
-
-        $tpl_component['PRODUCT_INITIAL_CONTENT'] = $initialContent;
-        $tpl_component['PRODUCT_BUTTON_ADD_TO_CART'] = $add_to_cart_button;
-        $tpl_component['PRODUCT_BUTTON_QUOTATION'] = $quotation_button;
-        $tpl_component['PRODUCT_QUANTITY_CHOOSER'] = $product_quantity_chooser_input;
-        $tpl_component['PRODUCT_BUTTONS'] = $tpl_component['PRODUCT_BUTTON_QUOTATION'] . $tpl_component['PRODUCT_BUTTON_ADD_TO_CART'];
-        $tpl_component['PRODUCT_GALERY_DOCS'] = $product_document_galery;
-        $tpl_component['PRODUCT_FEATURES'] = $attributeContentOutput;
-        $tpl_component = apply_filters('wps-filter-product-complete-sheet-output', $tpl_component, $product_id);
-
-        /** 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])) {
-            /*    Include the old way template part    */
-            ob_start();
-            require wpshop_display::get_template_file($tpl_way_to_take[1]);
-            $content = ob_get_contents();
-            ob_end_clean();
-        } else {
-            $content = wpshop_display::display_template_element($template_part, $tpl_component);
-        }
-        unset($tpl_component);
-        return $content;
-    }
+		/** Gallery **/
+		$tpl_component['PRODUCT_COMPLETE_SHEET_GALLERY'] = wps_media_manager_frontend_ctr::get_product_complete_sheet_galery($product_id);
+
+		$product_new_def = self::display_product_special_state('declare_new', 'complete', (!empty($product['declare_new']) ? $product['declare_new'] : 'no'), (!empty($product['set_new_from']) ? $product['set_new_from'] : ''), (!empty($product['set_new_to']) ? $product['set_new_to'] : ''));
+
+		$product_new = $product_new_def['output'];
+		$product_class = $product_new_def['class'];
+
+		$product_featured_def = self::display_product_special_state('highlight_product', 'complete', (!empty($product['highlight_product']) ? $product['highlight_product'] : 'no'), (!empty($product['highlight_from']) ? $product['highlight_from'] : ''), (!empty($product['highlight_to']) ? $product['highlight_to'] : ''));
+		$product_featured = $product_featured_def['output'];
+		$product_class .= $product_featured_def['class'];
+
+		$tpl_component['PRODUCT_IS_NEW'] = $product_new;
+		$tpl_component['PRODUCT_IS_FEATURED'] = $product_featured;
+		$tpl_component['PRODUCT_EXTRA_STATE'] = $tpl_component['PRODUCT_IS_NEW'] . $tpl_component['PRODUCT_IS_FEATURED'];
+
+		$tpl_component['PRODUCT_INITIAL_CONTENT'] = $initialContent;
+		$tpl_component['PRODUCT_BUTTON_ADD_TO_CART'] = $add_to_cart_button;
+		$tpl_component['PRODUCT_BUTTON_QUOTATION'] = $quotation_button;
+		$tpl_component['PRODUCT_QUANTITY_CHOOSER'] = $product_quantity_chooser_input;
+		$tpl_component['PRODUCT_BUTTONS'] = $tpl_component['PRODUCT_BUTTON_QUOTATION'] . $tpl_component['PRODUCT_BUTTON_ADD_TO_CART'];
+		$tpl_component['PRODUCT_GALERY_DOCS'] = $product_document_galery;
+		$tpl_component['PRODUCT_FEATURES'] = $attributeContentOutput;
+		$tpl_component = apply_filters('wps-filter-product-complete-sheet-output', $tpl_component, $product_id);
+
+		/** 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])) {
+			/*    Include the old way template part    */
+			ob_start();
+			require wpshop_display::get_template_file($tpl_way_to_take[1]);
+			$content = ob_get_contents();
+			ob_end_clean();
+		} else {
+			$content = wpshop_display::display_template_element($template_part, $tpl_component);
+		}
+		unset($tpl_component);
+		return $content;
+	}
 
-    public static function product_mini_output($product_id, $category_id, $output_type = 'list', $current_item_position = 1, $grid_element_nb_per_line = WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE)
-    {
-        $content = '';
-        $product_information = $product_class = '';
+	public static function product_mini_output($product_id, $category_id, $output_type = 'list', $current_item_position = 1, $grid_element_nb_per_line = WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE)
+	{
+		$content = '';
+		$product_information = $product_class = '';
 
-        /** Get the product thumbnail    */
-        $productThumbnail = wpshop_display::display_template_element('product_thumbnail_default', array());
-        if (has_post_thumbnail($product_id)) {
-            $productThumbnail = get_the_post_thumbnail($product_id, 'thumbnail');
-        }
+		/** Get the product thumbnail    */
+		$productThumbnail = wpshop_display::display_template_element('product_thumbnail_default', array());
+		if (has_post_thumbnail($product_id)) {
+			$productThumbnail = get_the_post_thumbnail($product_id, 'thumbnail');
+		}
 
-        $product = self::get_product_data($product_id);
+		$product = self::get_product_data($product_id);
 
-        /**    Get the product information for output    */
-        if (!empty($product)) {
+		/**    Get the product information for output    */
+		if (!empty($product)) {
 
-            $product_title = $product['post_title'];
-            $product_name = $product['post_name'];
-            $product_link = get_permalink($product_id);
-            $product_more_informations = $product['product_content'];
-            $product_excerpt = $product['product_excerpt'];
+			$product_title = $product['post_title'];
+			$product_name = $product['post_name'];
+			$product_link = get_permalink($product_id);
+			$product_more_informations = $product['product_content'];
+			$product_excerpt = $product['product_excerpt'];
 
-            if (strpos($product['product_content'], '<!--more-->')) {
-                $post_content = explode('<!--more-->', $product['product_content']);
-                $product_more_informations = $post_content[0];
-            }
+			if (strpos($product['product_content'], '<!--more-->')) {
+				$post_content = explode('<!--more-->', $product['product_content']);
+				$product_more_informations = $post_content[0];
+			}
 
-        } else {
-            $productThumbnail = wpshop_display::display_template_element('product_thumbnail_default', array());
-            $product_title = '<i>' . __('This product does not exist', 'wpshop') . '</i>';
-            $product_link = '';
-            $product_more_informations = '';
-            $product_excerpt = '';
-        }
+		} else {
+			$productThumbnail = wpshop_display::display_template_element('product_thumbnail_default', array());
+			$product_title = '<i>' . __('This product does not exist', 'wpshop') . '</i>';
+			$product_link = '';
+			$product_more_informations = '';
+			$product_excerpt = '';
+		}
 
-        /** Retrieve product price    */
-        $price_attribute = wpshop_attributes::getElement('product_price', "'valid'", 'code');
-        $price_display = wpshop_attributes::check_attribute_display($price_attribute->is_visible_in_front_listing, $product['custom_display'], 'attribute', 'product_price', 'mini_output');
-        $catalog_options = get_option('wpshop_catalog_main_option', array());
-        $productPrice = '';
-        $wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
-        $check_product_price = wpshop_prices::check_product_price($product);
-        $result_price_piloting = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $check_product_price['et'] : $check_product_price['ati'];
-        if ($price_display && !(!empty($catalog_options) && (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes') && $result_price_piloting == 0)) {
-            $product_price_infos = wpshop_prices::get_product_price($product, 'just_price_infos', 'mini_output');
-
-            if (!empty($product_price_infos)) {
-                $tpl_component_price = array();
-                /** Price piloting **/
+		/** Retrieve product price    */
+		$price_attribute = wpshop_attributes::getElement('product_price', "'valid'", 'code');
+		$price_display = wpshop_attributes::check_attribute_display($price_attribute->is_visible_in_front_listing, $product['custom_display'], 'attribute', 'product_price', 'mini_output');
+		$catalog_options = get_option('wpshop_catalog_main_option', array());
+		$productPrice = '';
+		$wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
+		$check_product_price = wpshop_prices::check_product_price($product);
+		$result_price_piloting = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $check_product_price['et'] : $check_product_price['ati'];
+		if ($price_display && !(!empty($catalog_options) && (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes') && $result_price_piloting == 0)) {
+			$product_price_infos = wpshop_prices::get_product_price($product, 'just_price_infos', 'mini_output');
+
+			if (!empty($product_price_infos)) {
+				$tpl_component_price = array();
+				/** Price piloting **/
 				$price_display_option = get_option( 'wpshop_catalog_product_option' );
 				$tpl_component['PRICE_FROM'] = (!empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from']) ) ? 'on' : '';
-                $price_ploting = get_option('wpshop_shop_price_piloting');
-                $tpl_component_price['CROSSED_OUT_PRICE'] = (!empty($product_price_infos['CROSSED_OUT_PRICE'])) ? ((!empty($product_price_infos['PRICE_FROM'])) ? __('Price from', 'wpshop') . ' ' : '') . wpshop_display::display_template_element('product_price_template_crossed_out_price', array('CROSSED_OUT_PRICE_VALUE' => $product_price_infos['CROSSED_OUT_PRICE'])) : '';
-                $variations = wpshop_products::get_variation($product_id);
+				$price_ploting = get_option('wpshop_shop_price_piloting');
+				$tpl_component_price['CROSSED_OUT_PRICE'] = (!empty($product_price_infos['CROSSED_OUT_PRICE'])) ? ((!empty($product_price_infos['PRICE_FROM'])) ? __('Price from', 'wpshop') . ' ' : '') . wpshop_display::display_template_element('product_price_template_crossed_out_price', array('CROSSED_OUT_PRICE_VALUE' => $product_price_infos['CROSSED_OUT_PRICE'])) : '';
+				$variations = wpshop_products::get_variation($product_id);
 				$tpl_component_price['PRODUCT_PRICE'] = $product_price_infos['PRODUCT_PRICE'];
 				if(empty($product_price_infos['CROSSED_OUT_PRICE']) && (!empty($variations) && (!empty($product_price_infos['PRICE_FROM']) || !empty( $tpl_component['PRICE_FROM'] ) ))) {
 					$tpl_component_price['PRODUCT_PRICE'] = __('Price from', 'wpshop') . ' ' . $tpl_component_price['PRODUCT_PRICE'];
 				}
-                $tpl_component_price['MESSAGE_SAVE_MONEY'] = $product_price_infos['MESSAGE_SAVE_MONEY'];
-                $tpl_component_price['TAX_PILOTING'] = (!empty($price_ploting) && $price_ploting == 'HT') ? __('ET', 'wpshop') : '';
-                $product_price_infos['MESSAGE_SAVE_MONEY'];
-                $productPrice = wpshop_display::display_template_element('product_price_template_mini_output', $tpl_component_price);
-            } else {
-                $productPrice = wpshop_prices::get_product_price($product, 'price_display', array('mini_output', $output_type));
-            }
-        }
+				$tpl_component_price['MESSAGE_SAVE_MONEY'] = $product_price_infos['MESSAGE_SAVE_MONEY'];
+				$tpl_component_price['TAX_PILOTING'] = (!empty($price_ploting) && $price_ploting == 'HT') ? __('ET', 'wpshop') : '';
+				$product_price_infos['MESSAGE_SAVE_MONEY'];
+				$productPrice = wpshop_display::display_template_element('product_price_template_mini_output', $tpl_component_price);
+			} else {
+				$productPrice = wpshop_prices::get_product_price($product, 'price_display', array('mini_output', $output_type));
+			}
+		}
 
-        /** Check if there is at less 1 product in stock    */
-        $wps_product_ctr = new wps_product_ctr();
-        $productStock = $wps_product_ctr->check_stock($product_id, 1);
-        $productStock = $productStock === true ? 1 : null;
-
-        /** Define "Add to cart" button    */
-        $add_to_cart_button_display_state = wpshop_attributes::check_attribute_display(((WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no'), $product['custom_display'], 'product_action_button', 'add_to_cart', 'mini_output');
-        $display_price_state_when_price_is_empty = false;
-        if (empty($productPrice) && (!empty($catalog_options) || (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes'))) {
-            $display_price_state_when_price_is_empty = false;
-        } else if (!empty($productPrice)) {
-            $display_price_state_when_price_is_empty = true;
-        }
-        $add_to_cart_button = (true === $add_to_cart_button_display_state) && (true === $display_price_state_when_price_is_empty) ? self::display_add_to_cart_button($product_id, $productStock, 'mini') : '';
-        $product_quantity_chooser_input = (true === $add_to_cart_button_display_state) ? wpshop_display::display_template_element('product_complete_sheet_quantity_chooser', array('PRODUCT_ID' => $product_id)) : '';
+		/** Check if there is at less 1 product in stock    */
+		$wps_product_ctr = new wps_product_ctr();
+		$productStock = $wps_product_ctr->check_stock($product_id, 1);
+		$productStock = $productStock === true ? 1 : null;
+
+		/** Define "Add to cart" button    */
+		$add_to_cart_button_display_state = wpshop_attributes::check_attribute_display(((WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no'), $product['custom_display'], 'product_action_button', 'add_to_cart', 'mini_output');
+		$display_price_state_when_price_is_empty = false;
+		if (empty($productPrice) && (!empty($catalog_options) || (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes'))) {
+			$display_price_state_when_price_is_empty = false;
+		} else if (!empty($productPrice)) {
+			$display_price_state_when_price_is_empty = true;
+		}
+		$add_to_cart_button = (true === $add_to_cart_button_display_state) && (true === $display_price_state_when_price_is_empty) ? self::display_add_to_cart_button($product_id, $productStock, 'mini') : '';
+		$product_quantity_chooser_input = (true === $add_to_cart_button_display_state) ? wpshop_display::display_template_element('product_complete_sheet_quantity_chooser', array('PRODUCT_ID' => $product_id)) : '';
 
-        /** Define "Ask a quotation" button    */
-        $quotation_button = self::display_quotation_button($product_id, (!empty($product['quotation_allowed']) ? $product['quotation_allowed'] : null));
-        $product_new_def = self::display_product_special_state('declare_new', $output_type, (!empty($product['declare_new']) ? $product['declare_new'] : 'no'), (!empty($product['set_new_from']) ? $product['set_new_from'] : ''), (!empty($product['set_new_to']) ? $product['set_new_to'] : ''));
+		/** Define "Ask a quotation" button    */
+		$quotation_button = self::display_quotation_button($product_id, (!empty($product['quotation_allowed']) ? $product['quotation_allowed'] : null));
+		$product_new_def = self::display_product_special_state('declare_new', $output_type, (!empty($product['declare_new']) ? $product['declare_new'] : 'no'), (!empty($product['set_new_from']) ? $product['set_new_from'] : ''), (!empty($product['set_new_to']) ? $product['set_new_to'] : ''));
 
-        $product_new = $product_new_def['output'];
-        $product_class .= $product_new_def['class'];
+		$product_new = $product_new_def['output'];
+		$product_class .= $product_new_def['class'];
 
-        $product_featured_def = self::display_product_special_state('highlight_product', $output_type, (!empty($product['highlight_product']) ? $product['highlight_product'] : 'no'), (!empty($product['highlight_from']) ? $product['highlight_from'] : ''), (!empty($product['highlight_to']) ? $product['highlight_to'] : ''));
-        $product_featured = $product_featured_def['output'];
-        $product_class .= $product_featured_def['class'];
+		$product_featured_def = self::display_product_special_state('highlight_product', $output_type, (!empty($product['highlight_product']) ? $product['highlight_product'] : 'no'), (!empty($product['highlight_from']) ? $product['highlight_from'] : ''), (!empty($product['highlight_to']) ? $product['highlight_to'] : ''));
+		$product_featured = $product_featured_def['output'];
+		$product_class .= $product_featured_def['class'];
 
-        if (!($current_item_position % $grid_element_nb_per_line)) {
-            $product_class .= ' wpshop_last_product_of_line';
-        }
+		if (!($current_item_position % $grid_element_nb_per_line)) {
+			$product_class .= ' wpshop_last_product_of_line';
+		}
 
-        if (!empty($product['product_id'])) {
-            /** Template parameters    */
-            $template_part = 'product_mini_' . $output_type;
-            $tpl_component = array();
-            $tpl_component['PRODUCT_THUMBNAIL'] = wpshop_display::display_template_element('product_thumbnail_default', array());
-            $tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] = wpshop_display::display_template_element('product_thumbnail_default', array());
-            $tpl_component['PRODUCT_ID'] = $product_id;
-            $tpl_component['PRODUCT_CLASS'] = $product_class;
-            $tpl_component['PRODUCT_BUTTON_ADD_TO_CART'] = $add_to_cart_button;
-            $tpl_component['PRODUCT_BUTTON_QUOTATION'] = $quotation_button;
-            $tpl_component['PRODUCT_QUANTITY_CHOOSER'] = $product_quantity_chooser_input;
-            $tpl_component['PRODUCT_BUTTONS'] = $tpl_component['PRODUCT_BUTTON_ADD_TO_CART'] . $tpl_component['PRODUCT_BUTTON_QUOTATION'];
-            $tpl_component['PRODUCT_PRICE'] = $productPrice;
-            $tpl_component['PRODUCT_PERMALINK'] = $product_link;
-            $tpl_component['PRODUCT_TITLE'] = (!empty($product_title)) ? $product_title : '';
-            $tpl_component['PRODUCT_NAME'] = $product_name;
-            $tpl_component['PRODUCT_DESCRIPTION'] = $product_more_informations;
-            $tpl_component['PRODUCT_IS_NEW'] = $product_new;
-            $tpl_component['PRODUCT_IS_FEATURED'] = $product_featured;
-            $tpl_component['PRODUCT_EXTRA_STATE'] = $tpl_component['PRODUCT_IS_NEW'] . $tpl_component['PRODUCT_IS_FEATURED'];
-            $tpl_component['PRODUCT_THUMBNAIL'] = $productThumbnail;
-
-            if (has_post_thumbnail($product_id)) {
-                $image_attributes = wp_get_attachment_metadata(get_post_thumbnail_id($product_id));
-                if (!empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes'])) {
-                    $existing_image_sizes = get_intermediate_image_sizes();
-                    foreach ($existing_image_sizes as $size_name) {
-                        $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = wp_get_attachment_image(get_post_thumbnail_id($product_id), $size_name);
-                        $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = (!empty($tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)])) ? $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
-                    }
-                }
-            }
-
-            $tpl_component['PRODUCT_EXCERPT'] = $product_excerpt;
-            $tpl_component['PRODUCT_OUTPUT_TYPE'] = $output_type;
-            $tpl_component = apply_filters('wps-filter-product-mini-output', $tpl_component, $product_id);
-
-            /** 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])) {
-                /**    Include the old way template part    */
-                ob_start();
-                require wpshop_display::get_template_file($tpl_way_to_take[1]);
-                $content = ob_get_contents();
-                ob_end_clean();
-            } else {
-                $content = wpshop_display::display_template_element($template_part, $tpl_component);
-            }
-            unset($tpl_component);
+		if (!empty($product['product_id'])) {
+			/** Template parameters    */
+			$template_part = 'product_mini_' . $output_type;
+			$tpl_component = array();
+			$tpl_component['PRODUCT_THUMBNAIL'] = wpshop_display::display_template_element('product_thumbnail_default', array());
+			$tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] = wpshop_display::display_template_element('product_thumbnail_default', array());
+			$tpl_component['PRODUCT_ID'] = $product_id;
+			$tpl_component['PRODUCT_CLASS'] = $product_class;
+			$tpl_component['PRODUCT_BUTTON_ADD_TO_CART'] = $add_to_cart_button;
+			$tpl_component['PRODUCT_BUTTON_QUOTATION'] = $quotation_button;
+			$tpl_component['PRODUCT_QUANTITY_CHOOSER'] = $product_quantity_chooser_input;
+			$tpl_component['PRODUCT_BUTTONS'] = $tpl_component['PRODUCT_BUTTON_ADD_TO_CART'] . $tpl_component['PRODUCT_BUTTON_QUOTATION'];
+			$tpl_component['PRODUCT_PRICE'] = $productPrice;
+			$tpl_component['PRODUCT_PERMALINK'] = $product_link;
+			$tpl_component['PRODUCT_TITLE'] = (!empty($product_title)) ? $product_title : '';
+			$tpl_component['PRODUCT_NAME'] = $product_name;
+			$tpl_component['PRODUCT_DESCRIPTION'] = $product_more_informations;
+			$tpl_component['PRODUCT_IS_NEW'] = $product_new;
+			$tpl_component['PRODUCT_IS_FEATURED'] = $product_featured;
+			$tpl_component['PRODUCT_EXTRA_STATE'] = $tpl_component['PRODUCT_IS_NEW'] . $tpl_component['PRODUCT_IS_FEATURED'];
+			$tpl_component['PRODUCT_THUMBNAIL'] = $productThumbnail;
+
+			if (has_post_thumbnail($product_id)) {
+				$image_attributes = wp_get_attachment_metadata(get_post_thumbnail_id($product_id));
+				if (!empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes'])) {
+					$existing_image_sizes = get_intermediate_image_sizes();
+					foreach ($existing_image_sizes as $size_name) {
+						$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = wp_get_attachment_image(get_post_thumbnail_id($product_id), $size_name);
+						$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = (!empty($tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)])) ? $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
+					}
+				}
+			}
 
-        }
+			$tpl_component['PRODUCT_EXCERPT'] = $product_excerpt;
+			$tpl_component['PRODUCT_OUTPUT_TYPE'] = $output_type;
+			$tpl_component = apply_filters('wps-filter-product-mini-output', $tpl_component, $product_id);
+
+			/** 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])) {
+				/**    Include the old way template part    */
+				ob_start();
+				require wpshop_display::get_template_file($tpl_way_to_take[1]);
+				$content = ob_get_contents();
+				ob_end_clean();
+			} else {
+				$content = wpshop_display::display_template_element($template_part, $tpl_component);
+			}
+			unset($tpl_component);
 
-        return $content;
-    }
+		}
 
-    /**
-     *    Get the products (post) of a given category
-     *
-     *    @param string $category_slug The category slug we want to get the product list for
-     *
-     *    @return mixed $widget_content The output for the product list
-     */
-    public static function get_product_of_category($category_slug, $category_id)
-    {
-        global $top_categories;
-        $widget_content = '';
-        $products = wp_cache_get('wpshop_products_category_' . $category_id);
-        if (false == $products) {
-            $args = array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES => $category_slug);
-            $products = get_posts($args);
-            wp_cache_set('wpshop_products_category_' . $category_id, $products);
-        }
-        if (is_array($products) && (count($products) > 0)) {
-            foreach ($products as $product) {
-                if ($product->post_status == "publish") {
-                    ob_start();
-                    require wpshop_display::get_template_file('categories_products-widget.tpl.php');
-                    $widget_content .= ob_get_contents();
-                    ob_end_clean();
-                }
-            }
-        }
+		return $content;
+	}
 
-        echo $widget_content;
-    }
+	/**
+	 *    Get the products (post) of a given category
+	 *
+	 *    @param string $category_slug The category slug we want to get the product list for
+	 *
+	 *    @return mixed $widget_content The output for the product list
+	 */
+	public static function get_product_of_category($category_slug, $category_id)
+	{
+		global $top_categories;
+		$widget_content = '';
+		$products = wp_cache_get('wpshop_products_category_' . $category_id);
+		if (false == $products) {
+			$args = array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES => $category_slug);
+			$products = get_posts($args);
+			wp_cache_set('wpshop_products_category_' . $category_id, $products);
+		}
+		if (is_array($products) && (count($products) > 0)) {
+			foreach ($products as $product) {
+				if ($product->post_status == "publish") {
+					ob_start();
+					require wpshop_display::get_template_file('categories_products-widget.tpl.php');
+					$widget_content .= ob_get_contents();
+					ob_end_clean();
+				}
+			}
+		}
 
-    /**
-     *
-     * @param unknown_type $selected_product
-     * @return string
-     */
-    public function custom_product_list($selected_product = array())
-    {
-        global $wpdb;
-
-        /*    Start the table definition    */
-        $tableId = 'wpshop_product_list';
-        $tableTitles = array();
-        $tableTitles[] = '';
-        $tableTitles[] = __('Id', 'wpshop');
-        $tableTitles[] = __('Quantity', 'wpshop');
-        $tableTitles[] = __('Reference', 'wpshop');
-        $tableTitles[] = __('Product name', 'wpshop');
-        $tableTitles[] = __('Actions', 'wpshop');
-        $tableTitles[] = __('Price', 'wpshop');
-        $tableClasses = array();
-        $tableClasses[] = 'wpshop_product_selector_column';
-        $tableClasses[] = 'wpshop_product_identifier_column';
-        $tableClasses[] = 'wpshop_product_quantity_column';
-        $tableClasses[] = 'wpshop_product_sku_column';
-        $tableClasses[] = 'wpshop_product_name_column';
-        $tableClasses[] = 'wpshop_product_link_column';
-        $tableClasses[] = 'wpshop_product_price_column';
-
-        /*    Get post list    */
-        $has_result = false;
-        $current_line_index = 0;
-        $posts = query_posts(array(
-            'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'posts_per_page' => -1,
-        ));
-        if (!empty($posts)) {
-            $has_result = true;
-            foreach ($posts as $post) {
-                $tableRowsId[$current_line_index] = 'product_' . $post->ID;
-
-                $post_info = get_post_meta($post->ID, '_wpshop_product_metadata', true);
-
-                unset($tableRowValue);
-                $tableRowValue[] = array('class' => 'wpshop_product_selector_cell', 'value' => '<input type="checkbox" name="wp_list_product[]" value="' . $post->ID . '" class="wpshop_product_cb_dialog" id="wpshop_product_cb_dialog_' . $post->ID . '" />');
-                $tableRowValue[] = array('class' => 'wpshop_product_identifier_cell', 'value' => '<label for="wpshop_product_cb_dialog_' . $post->ID . '" >' . WPSHOP_IDENTIFIER_PRODUCT . $post->ID . '</label>');
-                $tableRowValue[] = array('class' => 'wpshop_product_quantity_cell', 'value' => '<a href="#" class="order_product_action_button qty_change">-</a><input type="text" name="wpshop_pdt_qty[' . $post->ID . ']" value="1" class="wpshop_order_product_qty" /><a href="#" class="order_product_action_button qty_change">+</a>');
-                $tableRowValue[] = array('class' => 'wpshop_product_sku_cell', 'value' => (!empty($post_info['product_reference'])) ? $post_info['product_reference'] : '');
-                $tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $post->post_title);
-                $tableRowValue[] = array('class' => 'wpshop_product_link_cell', 'value' => '<a href="' . $post->guid . '" target="wpshop_product_view_product" target="wpshop_view_product" >' . __('View product', 'wpshop') . '</a><br/>
+		echo $widget_content;
+	}
+
+	/**
+	 *
+	 * @param unknown_type $selected_product
+	 * @return string
+	 */
+	public function custom_product_list($selected_product = array())
+	{
+		global $wpdb;
+
+		/*    Start the table definition    */
+		$tableId = 'wpshop_product_list';
+		$tableTitles = array();
+		$tableTitles[] = '';
+		$tableTitles[] = __('Id', 'wpshop');
+		$tableTitles[] = __('Quantity', 'wpshop');
+		$tableTitles[] = __('Reference', 'wpshop');
+		$tableTitles[] = __('Product name', 'wpshop');
+		$tableTitles[] = __('Actions', 'wpshop');
+		$tableTitles[] = __('Price', 'wpshop');
+		$tableClasses = array();
+		$tableClasses[] = 'wpshop_product_selector_column';
+		$tableClasses[] = 'wpshop_product_identifier_column';
+		$tableClasses[] = 'wpshop_product_quantity_column';
+		$tableClasses[] = 'wpshop_product_sku_column';
+		$tableClasses[] = 'wpshop_product_name_column';
+		$tableClasses[] = 'wpshop_product_link_column';
+		$tableClasses[] = 'wpshop_product_price_column';
+
+		/*    Get post list    */
+		$has_result = false;
+		$current_line_index = 0;
+		$posts = query_posts(array(
+			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'posts_per_page' => -1,
+		));
+		if (!empty($posts)) {
+			$has_result = true;
+			foreach ($posts as $post) {
+				$tableRowsId[$current_line_index] = 'product_' . $post->ID;
+
+				$post_info = get_post_meta($post->ID, '_wpshop_product_metadata', true);
+
+				unset($tableRowValue);
+				$tableRowValue[] = array('class' => 'wpshop_product_selector_cell', 'value' => '<input type="checkbox" name="wp_list_product[]" value="' . $post->ID . '" class="wpshop_product_cb_dialog" id="wpshop_product_cb_dialog_' . $post->ID . '" />');
+				$tableRowValue[] = array('class' => 'wpshop_product_identifier_cell', 'value' => '<label for="wpshop_product_cb_dialog_' . $post->ID . '" >' . WPSHOP_IDENTIFIER_PRODUCT . $post->ID . '</label>');
+				$tableRowValue[] = array('class' => 'wpshop_product_quantity_cell', 'value' => '<a href="#" class="order_product_action_button qty_change">-</a><input type="text" name="wpshop_pdt_qty[' . $post->ID . ']" value="1" class="wpshop_order_product_qty" /><a href="#" class="order_product_action_button qty_change">+</a>');
+				$tableRowValue[] = array('class' => 'wpshop_product_sku_cell', 'value' => (!empty($post_info['product_reference'])) ? $post_info['product_reference'] : '');
+				$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $post->post_title);
+				$tableRowValue[] = array('class' => 'wpshop_product_link_cell', 'value' => '<a href="' . $post->guid . '" target="wpshop_product_view_product" target="wpshop_view_product" >' . __('View product', 'wpshop') . '</a><br/>
 				<a href="' . admin_url('post.php?post=' . $post->ID . '&action=edit') . '" target="wpshop_edit_product" >' . __('Edit product', 'wpshop') . '</a>');
-                $tableRowValue[] = array('class' => 'wpshop_product_price_cell', 'value' => __('Price ET', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_HT])) ? round($post_info[WPSHOP_PRODUCT_PRICE_HT], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : '') . '<br/>' . __('Price ATI', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_TTC])) ? round($post_info[WPSHOP_PRODUCT_PRICE_TTC], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : ''));
-                $tableRows[] = $tableRowValue;
+				$tableRowValue[] = array('class' => 'wpshop_product_price_cell', 'value' => __('Price ET', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_HT])) ? round($post_info[WPSHOP_PRODUCT_PRICE_HT], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : '') . '<br/>' . __('Price ATI', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_TTC])) ? round($post_info[WPSHOP_PRODUCT_PRICE_TTC], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : ''));
+				$tableRows[] = $tableRowValue;
 
-                $current_line_index++;
-            }
-            wp_reset_query();
-        }
-        $posts = query_posts(array(
-            'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'posts_per_page' => -1,
-        ));
-        if (!empty($posts)) {
-            $has_result = true;
-            foreach ($posts as $post) {
-                $tableRowsId[$current_line_index] = 'product_' . $post->ID;
-
-                $post_info = get_post_meta($post->ID, '_wpshop_product_metadata', true);
-
-                unset($tableRowValue);
-                $tableRowValue[] = array('class' => 'wpshop_product_selector_cell', 'value' => '<input type="checkbox" name="wp_list_product[]" value="' . $post->ID . '" class="wpshop_product_cb_dialog" id="wpshop_product_cb_dialog_' . $post->ID . '" />');
-                $tableRowValue[] = array('class' => 'wpshop_product_identifier_cell', 'value' => '<label for="wpshop_product_cb_dialog_' . $post->ID . '" >' . WPSHOP_IDENTIFIER_PRODUCT . $post->ID . '</label>');
-                $tableRowValue[] = array('class' => 'wpshop_product_quantity_cell', 'value' => '<a href="#" class="order_product_action_button qty_change">-</a><input type="text" name="wpshop_pdt_qty[' . $post->ID . ']" value="1" class="wpshop_order_product_qty" /><a href="#" class="order_product_action_button qty_change">+</a>');
-                $tableRowValue[] = array('class' => 'wpshop_product_sku_cell', 'value' => (!empty($post_info['product_reference'])) ? $post_info['product_reference'] : '');
-                $parent_product = wpshop_products::get_parent_variation($post->ID);
-                if (!empty($parent_product) && !empty($parent_product['parent_post'])) {
-                    $product_variations_postmeta = get_post_meta($post->ID, '_wpshop_variations_attribute_def', true);
-                    $query = $wpdb->prepare('SELECT frontend_label FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s', key($product_variations_postmeta));
-                    $option_name = $wpdb->get_var($query);
-                    $query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $product_variations_postmeta[key($product_variations_postmeta)]);
-                    $option_value = $wpdb->get_var($query);
-                    $parent_post = $parent_product['parent_post'];
-                    $tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $parent_post->post_title . ' <br/>(' . $option_name . ' : ' . $option_value . ')');
-                } else {
-                    $tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $post->post_title);
-                }
-
-                $tableRowValue[] = array('class' => 'wpshop_product_link_cell', 'value' => '<a href="' . $post->guid . '" target="wpshop_product_view_product" target="wpshop_view_product" >' . __('View product', 'wpshop') . '</a><br/>
+				$current_line_index++;
+			}
+			wp_reset_query();
+		}
+		$posts = query_posts(array(
+			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'posts_per_page' => -1,
+		));
+		if (!empty($posts)) {
+			$has_result = true;
+			foreach ($posts as $post) {
+				$tableRowsId[$current_line_index] = 'product_' . $post->ID;
+
+				$post_info = get_post_meta($post->ID, '_wpshop_product_metadata', true);
+
+				unset($tableRowValue);
+				$tableRowValue[] = array('class' => 'wpshop_product_selector_cell', 'value' => '<input type="checkbox" name="wp_list_product[]" value="' . $post->ID . '" class="wpshop_product_cb_dialog" id="wpshop_product_cb_dialog_' . $post->ID . '" />');
+				$tableRowValue[] = array('class' => 'wpshop_product_identifier_cell', 'value' => '<label for="wpshop_product_cb_dialog_' . $post->ID . '" >' . WPSHOP_IDENTIFIER_PRODUCT . $post->ID . '</label>');
+				$tableRowValue[] = array('class' => 'wpshop_product_quantity_cell', 'value' => '<a href="#" class="order_product_action_button qty_change">-</a><input type="text" name="wpshop_pdt_qty[' . $post->ID . ']" value="1" class="wpshop_order_product_qty" /><a href="#" class="order_product_action_button qty_change">+</a>');
+				$tableRowValue[] = array('class' => 'wpshop_product_sku_cell', 'value' => (!empty($post_info['product_reference'])) ? $post_info['product_reference'] : '');
+				$parent_product = wpshop_products::get_parent_variation($post->ID);
+				if (!empty($parent_product) && !empty($parent_product['parent_post'])) {
+					$product_variations_postmeta = get_post_meta($post->ID, '_wpshop_variations_attribute_def', true);
+					$query = $wpdb->prepare('SELECT frontend_label FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s', key($product_variations_postmeta));
+					$option_name = $wpdb->get_var($query);
+					$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $product_variations_postmeta[key($product_variations_postmeta)]);
+					$option_value = $wpdb->get_var($query);
+					$parent_post = $parent_product['parent_post'];
+					$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $parent_post->post_title . ' <br/>(' . $option_name . ' : ' . $option_value . ')');
+				} else {
+					$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $post->post_title);
+				}
+
+				$tableRowValue[] = array('class' => 'wpshop_product_link_cell', 'value' => '<a href="' . $post->guid . '" target="wpshop_product_view_product" target="wpshop_view_product" >' . __('View product', 'wpshop') . '</a><br/>
 				<a href="' . admin_url('post.php?post=' . $post->ID . '&action=edit') . '" target="wpshop_edit_product" >' . __('Edit product', 'wpshop') . '</a>');
-                $tableRowValue[] = array('class' => 'wpshop_product_price_cell', 'value' => __('Price ET', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_HT])) ? round($post_info[WPSHOP_PRODUCT_PRICE_HT], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : '') . '<br/>' . __('Price ATI', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_TTC])) ? round($post_info[WPSHOP_PRODUCT_PRICE_TTC], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : ''));
-                $tableRows[] = $tableRowValue;
+				$tableRowValue[] = array('class' => 'wpshop_product_price_cell', 'value' => __('Price ET', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_HT])) ? round($post_info[WPSHOP_PRODUCT_PRICE_HT], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : '') . '<br/>' . __('Price ATI', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_TTC])) ? round($post_info[WPSHOP_PRODUCT_PRICE_TTC], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : ''));
+				$tableRows[] = $tableRowValue;
 
-                $current_line_index++;
-            }
-            wp_reset_query();
-        }
+				$current_line_index++;
+			}
+			wp_reset_query();
+		}
 
-        if (!$has_result) {
-            $tableRowsId[] = 'no_product_found';
-            unset($tableRowValue);
-            $tableRowValue[] = array('class' => 'wpshop_product_selector_cell', 'value' => '');
-            $tableRowValue[] = array('class' => 'wpshop_product_identifier_cell', 'value' => '');
-            $tableRowValue[] = array('class' => 'wpshop_product_quantity_cell', 'value' => '');
-            $tableRowValue[] = array('class' => 'wpshop_product_sku_cell', 'value' => __('No element to ouput here', 'wpshop'));
-            $tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => '');
-            $tableRowValue[] = array('class' => 'wpshop_product_link_cell', 'value' => '');
-            $tableRowValue[] = array('class' => 'wpshop_product_price_cell', 'value' => '');
-            $tableRows[] = $tableRowValue;
-        }
+		if (!$has_result) {
+			$tableRowsId[] = 'no_product_found';
+			unset($tableRowValue);
+			$tableRowValue[] = array('class' => 'wpshop_product_selector_cell', 'value' => '');
+			$tableRowValue[] = array('class' => 'wpshop_product_identifier_cell', 'value' => '');
+			$tableRowValue[] = array('class' => 'wpshop_product_quantity_cell', 'value' => '');
+			$tableRowValue[] = array('class' => 'wpshop_product_sku_cell', 'value' => __('No element to ouput here', 'wpshop'));
+			$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => '');
+			$tableRowValue[] = array('class' => 'wpshop_product_link_cell', 'value' => '');
+			$tableRowValue[] = array('class' => 'wpshop_product_price_cell', 'value' => '');
+			$tableRows[] = $tableRowValue;
+		}
 
-        return wpshop_display::getTable($tableId, $tableTitles, $tableRows, $tableClasses, $tableRowsId, '', false) . '
+		return wpshop_display::getTable($tableId, $tableTitles, $tableRows, $tableClasses, $tableRowsId, '', false) . '
 <script type="text/javascript" >
 	wpshop(document).ready(function(){
 		jQuery("#' . $tableId . '").dataTable( {
@@ -1957,1534 +1957,1534 @@ 
 		});
 	});
 </script>';
-    }
+	}
 
-    /**
-     * Allows to manage output for special state for a product (New product/highlight product)
-     *
-     * @param string $special The type of special type we want to output
-     * @param string $output_type The current display type (used for product listing)
-     * @param string $special_state_def The value allowing to test if we have to display a special state for the product
-     * @param datetime $special_state_start The start date if applicable for the special state
-     * @param datetime $special_state_end The end date if applicable for the special state
-     *
-     * @return array $product_special_state The product special state
-     */
-    public static function display_product_special_state($special, $output_type, $special_state_def, $special_state_start, $special_state_end)
-    {
-        $product_special_state = array();
-        $product_special_state['output'] = $product_special_state['class'] = '';
-
-        /** Get product special state definition    */
-        $special_state_def = !empty($special_state_def) ? $special_state_def : 'No';
-        $special_state_start = !empty($special_state_start) ? substr($special_state_start, 0, 10) : null;
-        $special_state_end = !empty($special_state_end) ? substr($special_state_end, 0, 10) : null;
-
-        /** Get current time    */
-        $current_time = substr(current_time('mysql', 0), 0, 10);
-
-        /** PRODUCT MARK AS NEW */
-        $show_product_special_state = false;
-        if ((strtolower(__($special_state_def, 'wpshop')) === strtolower(__('Yes', 'wpshop'))) &&
-            (empty($special_state_start) || ($special_state_start == '0000-00-00') || ($special_state_start >= $current_time)) &&
-            (empty($special_state_end) || ($special_state_end == '0000-00-00') || ($special_state_end <= $current_time))) {
-            $show_product_special_state = true;
-        }
+	/**
+	 * Allows to manage output for special state for a product (New product/highlight product)
+	 *
+	 * @param string $special The type of special type we want to output
+	 * @param string $output_type The current display type (used for product listing)
+	 * @param string $special_state_def The value allowing to test if we have to display a special state for the product
+	 * @param datetime $special_state_start The start date if applicable for the special state
+	 * @param datetime $special_state_end The end date if applicable for the special state
+	 *
+	 * @return array $product_special_state The product special state
+	 */
+	public static function display_product_special_state($special, $output_type, $special_state_def, $special_state_start, $special_state_end)
+	{
+		$product_special_state = array();
+		$product_special_state['output'] = $product_special_state['class'] = '';
+
+		/** Get product special state definition    */
+		$special_state_def = !empty($special_state_def) ? $special_state_def : 'No';
+		$special_state_start = !empty($special_state_start) ? substr($special_state_start, 0, 10) : null;
+		$special_state_end = !empty($special_state_end) ? substr($special_state_end, 0, 10) : null;
+
+		/** Get current time    */
+		$current_time = substr(current_time('mysql', 0), 0, 10);
+
+		/** PRODUCT MARK AS NEW */
+		$show_product_special_state = false;
+		if ((strtolower(__($special_state_def, 'wpshop')) === strtolower(__('Yes', 'wpshop'))) &&
+			(empty($special_state_start) || ($special_state_start == '0000-00-00') || ($special_state_start >= $current_time)) &&
+			(empty($special_state_end) || ($special_state_end == '0000-00-00') || ($special_state_end <= $current_time))) {
+			$show_product_special_state = true;
+		}
 
-        if ($show_product_special_state) {
-            /** Check the type of special output needed    */
-            switch ($special) {
-                case 'declare_new':
-                    $product_special_state['class'] = ' wpshop_product_is_new_' . $output_type;
-                    $template_part = 'product_is_new_sticker';
-                    break;
-
-                case 'highlight_product':
-                    $product_special_state['class'] = ' wpshop_product_featured_' . $output_type;
-                    $template_part = 'product_is_featured_sticker';
-                    break;
-            }
-
-            /** Template parameters    */
-            $tpl_component = array();
-
-            /** 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])) {
-                /**    Include the old way template part    */
-                ob_start();
-                require wpshop_display::get_template_file($tpl_way_to_take[1]);
-                $product_special_state['output'] = ob_get_contents();
-                ob_end_clean();
-            } else {
-                $product_special_state['output'] = wpshop_display::display_template_element($template_part, $tpl_component);
-            }
-            unset($tpl_component);
-        }
+		if ($show_product_special_state) {
+			/** Check the type of special output needed    */
+			switch ($special) {
+				case 'declare_new':
+					$product_special_state['class'] = ' wpshop_product_is_new_' . $output_type;
+					$template_part = 'product_is_new_sticker';
+					break;
 
-        return $product_special_state;
-    }
+				case 'highlight_product':
+					$product_special_state['class'] = ' wpshop_product_featured_' . $output_type;
+					$template_part = 'product_is_featured_sticker';
+					break;
+			}
 
-    /**
-     * Prepare product price for saving and easier read later
-     *
-     * @param integer $element_id Identifier of current product
-     */
-    public static function calculate_price($element_id)
-    {
-        global $wpdb;
-
-        /**
-         * Récupères les attributs suivants : product_price, price_ht et tva
-         * par rapport à $element_id / Get the next attributes : product_price,
-         * price_ht and tva
-         */
-        $query = $wpdb->prepare(
-            "SELECT ATTR.code, ATTR_VAL.value_id AS id, ATTR_VAL.value, ATTR.id AS attribute_id
+			/** Template parameters    */
+			$tpl_component = array();
+
+			/** 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])) {
+				/**    Include the old way template part    */
+				ob_start();
+				require wpshop_display::get_template_file($tpl_way_to_take[1]);
+				$product_special_state['output'] = ob_get_contents();
+				ob_end_clean();
+			} else {
+				$product_special_state['output'] = wpshop_display::display_template_element($template_part, $tpl_component);
+			}
+			unset($tpl_component);
+		}
+
+		return $product_special_state;
+	}
+
+	/**
+	 * Prepare product price for saving and easier read later
+	 *
+	 * @param integer $element_id Identifier of current product
+	 */
+	public static function calculate_price($element_id)
+	{
+		global $wpdb;
+
+		/**
+		 * Récupères les attributs suivants : product_price, price_ht et tva
+		 * par rapport à $element_id / Get the next attributes : product_price,
+		 * price_ht and tva
+		 */
+		$query = $wpdb->prepare(
+			"SELECT ATTR.code, ATTR_VAL.value_id AS id, ATTR_VAL.value, ATTR.id AS attribute_id
 			FROM " . WPSHOP_DBT_ATTRIBUTE . " AS ATTR
 				RIGHT JOIN " . WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL . " AS ATTR_VAL ON ((ATTR_VAL.attribute_id = ATTR.id) AND (ATTR_VAL.entity_id = %d))
 			WHERE ATTR.code IN ('" . implode("', '", unserialize(WPSHOP_ATTRIBUTE_PRICES)) . "')",
-            $element_id
-        );
-        $prices_attribute = $wpdb->get_results($query, OBJECT_K);
-
-        /** Si aucun prix trouvé on stop la méthode / If not found price, stop the method */
-        if (empty($prices_attribute)) {
-            return false;
-        } else {
-            /**
-             * Récupère le prix de base selon le pilotage de prix de la boutique / Get
-             * the base amount according on the shop price control
-             */
-            $base_price = $prices_attribute[constant('WPSHOP_PRODUCT_PRICE_' . WPSHOP_PRODUCT_PRICE_PILOT)]->value;
-            $rate_vat = wpshop_prices::get_rate_vat($element_id);
-            $divider_price_ttc = 1 + ($rate_vat->value / 100);
-
-            /**
-             * Informations nécessaire pour crée un attribut / Information needed to
-             * create an attribute
-             */
-            $entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-            $language = WPSHOP_CURRENT_LOCALE;
-            $icl_post_language = !empty($_REQUEST['icl_post_language']) ? sanitize_text_field($_REQUEST['icl_post_language']) : '';
-
-            if (!empty($icl_post_language)) {
-                $query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", $icl_post_language);
-                $language = $wpdb->get_var($query);
-            }
-
-            /**
-             * Vérifie la configuration pour savoir comment calculer les prix pour le produit /
-             * Check configuration to know how to make the calcul for the product
-             */
-            if (WPSHOP_PRODUCT_PRICE_PILOT == 'HT') {
-                $price_with_vat = ($base_price * $divider_price_ttc);
-                $price_no_vat = $base_price;
-            } else if (WPSHOP_PRODUCT_PRICE_PILOT == 'TTC') {
-                $price_with_vat = $base_price;
-                $price_no_vat = ($price_with_vat / $divider_price_ttc);
-            }
-
-            /**
-             * Le dernier paramètre permet de ne pas supprimer les attributs du même
-             * type que celui-ci / The last parameter allows not to delete the
-             * attributes of the same type as this one
-             */
-            wpshop_attributes::saveAttributeForEntity(array('decimal' => array('product_price' => $price_with_vat)), $entity_type_id, $element_id, $language, 'wpshop_products');
-            wpshop_attributes::saveAttributeForEntity(array('decimal' => array('price_ht' => $price_no_vat)), $entity_type_id, $element_id, $language, 'wpshop_product');
-
-            /** Ajout ou met à jour de l'attribut tva / Add or update the attribute vat */
-            $vat_amount = $price_with_vat - $price_no_vat;
-            wpshop_attributes::saveAttributeForEntity(array('decimal' => array('tva' => $vat_amount)), $entity_type_id, $element_id, $language, 'wpshop_product');
-
-            /**    Update the product meta information with the calculated prices    */
-            $product_postmeta = get_post_meta($element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
-            $product_postmeta[WPSHOP_PRODUCT_PRICE_TTC] = number_format(round($price_with_vat, 5), 5, '.', '');
-            $product_postmeta[WPSHOP_PRODUCT_PRICE_HT] = number_format(round($price_no_vat, 5), 5, '.', '');
-            $product_postmeta[WPSHOP_PRODUCT_PRICE_TAX_AMOUNT] = number_format(round($vat_amount, 5), 5, '.', '');
-            $product_postmeta[WPSHOP_PRODUCT_PRICE_TAX] = $rate_vat->id;
-
-            update_post_meta($element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $product_postmeta);
+			$element_id
+		);
+		$prices_attribute = $wpdb->get_results($query, OBJECT_K);
+
+		/** Si aucun prix trouvé on stop la méthode / If not found price, stop the method */
+		if (empty($prices_attribute)) {
+			return false;
+		} else {
+			/**
+			 * Récupère le prix de base selon le pilotage de prix de la boutique / Get
+			 * the base amount according on the shop price control
+			 */
+			$base_price = $prices_attribute[constant('WPSHOP_PRODUCT_PRICE_' . WPSHOP_PRODUCT_PRICE_PILOT)]->value;
+			$rate_vat = wpshop_prices::get_rate_vat($element_id);
+			$divider_price_ttc = 1 + ($rate_vat->value / 100);
+
+			/**
+			 * Informations nécessaire pour crée un attribut / Information needed to
+			 * create an attribute
+			 */
+			$entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			$language = WPSHOP_CURRENT_LOCALE;
+			$icl_post_language = !empty($_REQUEST['icl_post_language']) ? sanitize_text_field($_REQUEST['icl_post_language']) : '';
+
+			if (!empty($icl_post_language)) {
+				$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", $icl_post_language);
+				$language = $wpdb->get_var($query);
+			}
 
-            /** Met à jour la meta _wps_price_infos */
-            $p = wpshop_products::get_product_data($element_id);
-            $price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', 'grid'));
-            update_post_meta($element_id, '_wps_price_infos', $price);
+			/**
+			 * Vérifie la configuration pour savoir comment calculer les prix pour le produit /
+			 * Check configuration to know how to make the calcul for the product
+			 */
+			if (WPSHOP_PRODUCT_PRICE_PILOT == 'HT') {
+				$price_with_vat = ($base_price * $divider_price_ttc);
+				$price_no_vat = $base_price;
+			} else if (WPSHOP_PRODUCT_PRICE_PILOT == 'TTC') {
+				$price_with_vat = $base_price;
+				$price_no_vat = ($price_with_vat / $divider_price_ttc);
+			}
 
-            /** Met à jour la meta _wpshop_displayed_price */
-            wps_filter_search::save_displayed_price_meta($element_id);
-        }
+			/**
+			 * Le dernier paramètre permet de ne pas supprimer les attributs du même
+			 * type que celui-ci / The last parameter allows not to delete the
+			 * attributes of the same type as this one
+			 */
+			wpshop_attributes::saveAttributeForEntity(array('decimal' => array('product_price' => $price_with_vat)), $entity_type_id, $element_id, $language, 'wpshop_products');
+			wpshop_attributes::saveAttributeForEntity(array('decimal' => array('price_ht' => $price_no_vat)), $entity_type_id, $element_id, $language, 'wpshop_product');
+
+			/** Ajout ou met à jour de l'attribut tva / Add or update the attribute vat */
+			$vat_amount = $price_with_vat - $price_no_vat;
+			wpshop_attributes::saveAttributeForEntity(array('decimal' => array('tva' => $vat_amount)), $entity_type_id, $element_id, $language, 'wpshop_product');
+
+			/**    Update the product meta information with the calculated prices    */
+			$product_postmeta = get_post_meta($element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
+			$product_postmeta[WPSHOP_PRODUCT_PRICE_TTC] = number_format(round($price_with_vat, 5), 5, '.', '');
+			$product_postmeta[WPSHOP_PRODUCT_PRICE_HT] = number_format(round($price_no_vat, 5), 5, '.', '');
+			$product_postmeta[WPSHOP_PRODUCT_PRICE_TAX_AMOUNT] = number_format(round($vat_amount, 5), 5, '.', '');
+			$product_postmeta[WPSHOP_PRODUCT_PRICE_TAX] = $rate_vat->id;
+
+			update_post_meta($element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $product_postmeta);
+
+			/** Met à jour la meta _wps_price_infos */
+			$p = wpshop_products::get_product_data($element_id);
+			$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', 'grid'));
+			update_post_meta($element_id, '_wps_price_infos', $price);
+
+			/** Met à jour la meta _wpshop_displayed_price */
+			wps_filter_search::save_displayed_price_meta($element_id);
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Allows to get the good button for adding product to cart
-     *
-     * @param integer $product_id The product identifier
-     * @param boolean $productStock If there is the possibility to add the given product to the cart
-     *
-     * @return string $button The html output for the button
-     */
-    public static function display_add_to_cart_button($product_id, $productStock, $output_type = 'mini')
-    {
-        $button = '';
+	/**
+	 * Allows to get the good button for adding product to cart
+	 *
+	 * @param integer $product_id The product identifier
+	 * @param boolean $productStock If there is the possibility to add the given product to the cart
+	 *
+	 * @return string $button The html output for the button
+	 */
+	public static function display_add_to_cart_button($product_id, $productStock, $output_type = 'mini')
+	{
+		$button = '';
 //         $attributes_frontend_display = get_post_meta( $product_id, '_wpshop_product_attributes_frontend_display', true );
 
-        if (WPSHOP_DEFINED_SHOP_TYPE == 'sale' /*&& ( empty($attributes_frontend_display) || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['mini_output']) && $output_type == 'mini') || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['complete_sheet']) && $output_type == 'complete') ) */) {
-            /*
+		if (WPSHOP_DEFINED_SHOP_TYPE == 'sale' /*&& ( empty($attributes_frontend_display) || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['mini_output']) && $output_type == 'mini') || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['complete_sheet']) && $output_type == 'complete') ) */) {
+			/*
              * Check if current product has variation for button display
              */
-            $variations_exists = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'post_parent' => $product_id));
-            $variations_list = (!empty($variations_exists) && is_array(wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode)))) ? true : false;
+			$variations_exists = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'post_parent' => $product_id));
+			$variations_list = (!empty($variations_exists) && is_array(wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode)))) ? true : false;
 
-            /*
+			/*
              * Template parameters
              */
 
-            if (get_post_type($product_id) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) {
-                /** Check variation stock **/
-                $variations = self::get_variation($product_id);
-                if (!empty($variations)) {
-                    foreach ($variations as $variation) {
-                        if (!empty($variation) && !empty($variation['variation_dif']) && !empty($variation['variation_dif']['product_stock'])) {
-                            $productStock += $variation['variation_dif']['product_stock'];
-                        }
-                    }
-                }
-            }
-
-            $template_part = ($variations_list && ($output_type == 'mini')) ? 'configure_product_button' : (!empty($productStock) ? 'add_to_cart_button' : 'unavailable_product_button');
+			if (get_post_type($product_id) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) {
+				/** Check variation stock **/
+				$variations = self::get_variation($product_id);
+				if (!empty($variations)) {
+					foreach ($variations as $variation) {
+						if (!empty($variation) && !empty($variation['variation_dif']) && !empty($variation['variation_dif']['product_stock'])) {
+							$productStock += $variation['variation_dif']['product_stock'];
+						}
+					}
+				}
+			}
+
+			$template_part = ($variations_list && ($output_type == 'mini')) ? 'configure_product_button' : (!empty($productStock) ? 'add_to_cart_button' : 'unavailable_product_button');
 						$template_part = apply_filters( 'wps_custom_add_to_cart_button', $template_part, $product_id );
 
-            $tpl_component = array();
-            $tpl_component['PRODUCT_ID'] = $product_id;
-            $tpl_component['PRODUCT_PERMALINK'] = get_permalink($product_id);
-            $tpl_component['PRODUCT_TITLE'] = get_the_title($product_id);
+			$tpl_component = array();
+			$tpl_component['PRODUCT_ID'] = $product_id;
+			$tpl_component['PRODUCT_PERMALINK'] = get_permalink($product_id);
+			$tpl_component['PRODUCT_TITLE'] = get_the_title($product_id);
 
-            /*
+			/*
              * 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])) {
-                /*    Include the old way template part    */
-                ob_start();
-                require wpshop_display::get_template_file($tpl_way_to_take[1]);
-                $button = ob_get_contents();
-                ob_end_clean();
-            } else {
-                $button = wpshop_display::display_template_element($template_part, $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $product_id, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . 'output_type' => $output_type));
-            }
-            unset($tpl_component);
-        }
-        return $button;
-    }
-
-    /**
-     * Allows to get the good button for adding product to a quotation
-     *
-     * @param integer $product_id The product identifier
-     * @param boolean $product_quotation_state The state of the quotation addons
-     *
-     * @return string $button The html output for the button
-     */
-    public static function display_quotation_button($product_id, $product_quotation_state, $output_type = 'mini')
-    {
-        $quotation_button = '';
-
-        if (WPSHOP_ADDONS_QUOTATION && (!empty($product_quotation_state) && strtolower(__($product_quotation_state, 'wpshop')) == strtolower(__('Yes', 'wpshop'))) && (empty($_SESSION['cart']['cart_type']) || ($_SESSION['cart']['cart_type'] == 'quotation'))) {
-            $variations_list = (is_array(wpshop_products::get_variation($product_id)) && is_array(wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode)))) ? array_merge(wpshop_products::get_variation($product_id), wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode))) : array();
-            /**
-             * Template parameters
-             */
-            $template_part = (!empty($variations_list) && ($output_type == 'mini')) ? 'configure_quotation_button' : 'ask_quotation_button';
-            $tpl_component = array();
-            $tpl_component['PRODUCT_ID'] = $product_id;
-            $tpl_component['PRODUCT_PERMALINK'] = get_permalink($product_id);
-            $tpl_component['PRODUCT_TITLE'] = get_the_title($product_id);
+			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
+				/*    Include the old way template part    */
+				ob_start();
+				require wpshop_display::get_template_file($tpl_way_to_take[1]);
+				$button = ob_get_contents();
+				ob_end_clean();
+			} else {
+				$button = wpshop_display::display_template_element($template_part, $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $product_id, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . 'output_type' => $output_type));
+			}
+			unset($tpl_component);
+		}
+		return $button;
+	}
 
-            /**
-             * 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])) {
-                /*    Include the old way template part    */
-                ob_start();
-                require wpshop_display::get_template_file($tpl_way_to_take[1]);
-                $quotation_button = ob_get_contents();
-                ob_end_clean();
-            } else {
-                $quotation_button = wpshop_display::display_template_element($template_part, $tpl_component);
-            }
-            unset($tpl_component);
-        }
+	/**
+	 * Allows to get the good button for adding product to a quotation
+	 *
+	 * @param integer $product_id The product identifier
+	 * @param boolean $product_quotation_state The state of the quotation addons
+	 *
+	 * @return string $button The html output for the button
+	 */
+	public static function display_quotation_button($product_id, $product_quotation_state, $output_type = 'mini')
+	{
+		$quotation_button = '';
+
+		if (WPSHOP_ADDONS_QUOTATION && (!empty($product_quotation_state) && strtolower(__($product_quotation_state, 'wpshop')) == strtolower(__('Yes', 'wpshop'))) && (empty($_SESSION['cart']['cart_type']) || ($_SESSION['cart']['cart_type'] == 'quotation'))) {
+			$variations_list = (is_array(wpshop_products::get_variation($product_id)) && is_array(wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode)))) ? array_merge(wpshop_products::get_variation($product_id), wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode))) : array();
+			/**
+			 * Template parameters
+			 */
+			$template_part = (!empty($variations_list) && ($output_type == 'mini')) ? 'configure_quotation_button' : 'ask_quotation_button';
+			$tpl_component = array();
+			$tpl_component['PRODUCT_ID'] = $product_id;
+			$tpl_component['PRODUCT_PERMALINK'] = get_permalink($product_id);
+			$tpl_component['PRODUCT_TITLE'] = get_the_title($product_id);
+
+			/**
+			 * 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])) {
+				/*    Include the old way template part    */
+				ob_start();
+				require wpshop_display::get_template_file($tpl_way_to_take[1]);
+				$quotation_button = ob_get_contents();
+				ob_end_clean();
+			} else {
+				$quotation_button = wpshop_display::display_template_element($template_part, $tpl_component);
+			}
+			unset($tpl_component);
+		}
 
-        return $quotation_button;
-    }
+		return $quotation_button;
+	}
 
-    /**
-     * Return the output for a product attachement gallery (picture or document)
-     *
-     * @param string $attachement_type The type of attachement to output. allows to define with type of template to take
-     * @param string $content The gallery content build previously
-     *
-     * @return string The attachement gallery output
-     */
-    public static function display_attachment_gallery($attachement_type, $content)
-    {
-        $galery_output = '';
-
-        /*
+	/**
+	 * Return the output for a product attachement gallery (picture or document)
+	 *
+	 * @param string $attachement_type The type of attachement to output. allows to define with type of template to take
+	 * @param string $content The gallery content build previously
+	 *
+	 * @return string The attachement gallery output
+	 */
+	public static function display_attachment_gallery($attachement_type, $content)
+	{
+		$galery_output = '';
+
+		/*
          * Get the template part for given galery type
          */
-        switch ($attachement_type) {
-            case 'picture':
-                $template_part = 'product_attachment_picture_galery';
-                break;
-            case 'document':
-                $template_part = 'product_attachment_galery';
-                break;
-        }
+		switch ($attachement_type) {
+			case 'picture':
+				$template_part = 'product_attachment_picture_galery';
+				break;
+			case 'document':
+				$template_part = 'product_attachment_galery';
+				break;
+		}
 
-        /*
+		/*
          * Template parameters
          */
-        $tpl_component = array();
-        $tpl_component['PRODUCT_ATTACHMENT_OUTPUT_CONTENT'] = $content;
-        $tpl_component['ATTACHMENT_ITEM_TYPE'] = $attachement_type;
+		$tpl_component = array();
+		$tpl_component['PRODUCT_ATTACHMENT_OUTPUT_CONTENT'] = $content;
+		$tpl_component['ATTACHMENT_ITEM_TYPE'] = $attachement_type;
 
-        /*
+		/*
          * 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])) {
-            /*    Include the old way template part    */
-            ob_start();
-            require wpshop_display::get_template_file($tpl_way_to_take[1]);
-            $galery_output = ob_get_contents();
-            ob_end_clean();
-        } else {
-            $galery_output = wpshop_display::display_template_element($template_part, $tpl_component);
-        }
-        unset($tpl_component);
+		$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
+		if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
+			/*    Include the old way template part    */
+			ob_start();
+			require wpshop_display::get_template_file($tpl_way_to_take[1]);
+			$galery_output = ob_get_contents();
+			ob_end_clean();
+		} else {
+			$galery_output = wpshop_display::display_template_element($template_part, $tpl_component);
+		}
+		unset($tpl_component);
 
-        return $galery_output;
-    }
+		return $galery_output;
+	}
 
-    /**
-     * Define the metabox to display in product edition page in backend
-     * @param object $post The current element displayed for edition
-     */
-    public static function meta_box_variations($post)
-    {
-        $output = '';
-        /*    Variations container    */
-        $tpl_component = array();
-        $tpl_component['ADMIN_VARIATION_CONTAINER'] = self::display_variation_admin($post->ID);
-        $tpl_component['LINK_NEW_INTERFACE'] = wp_nonce_url(get_edit_post_link($post->ID) . '&wps_variation_interface=true', 'wps_remove_variation_interface');
-        $output .= wpshop_display::display_template_element('wpshop_admin_variation_metabox', $tpl_component, array(), 'admin');
-        echo '<span class="wpshop_loading_ wpshopHide" ><img src="' . admin_url('images/loading.gif') . '" alt="loading picture" /></span>' . $output . '<div class="wpshop_cls" ></div>';
-    }
+	/**
+	 * Define the metabox to display in product edition page in backend
+	 * @param object $post The current element displayed for edition
+	 */
+	public static function meta_box_variations($post)
+	{
+		$output = '';
+		/*    Variations container    */
+		$tpl_component = array();
+		$tpl_component['ADMIN_VARIATION_CONTAINER'] = self::display_variation_admin($post->ID);
+		$tpl_component['LINK_NEW_INTERFACE'] = wp_nonce_url(get_edit_post_link($post->ID) . '&wps_variation_interface=true', 'wps_remove_variation_interface');
+		$output .= wpshop_display::display_template_element('wpshop_admin_variation_metabox', $tpl_component, array(), 'admin');
+		echo '<span class="wpshop_loading_ wpshopHide" ><img src="' . admin_url('images/loading.gif') . '" alt="loading picture" /></span>' . $output . '<div class="wpshop_cls" ></div>';
+	}
 
-    /**
-     * Call variation creation function with a list of defined variation
-     *
-     * @param array $possible_variations A list of variation to create for the current element
-     * @param integer $element_id The product we want to create variation for
-     *
-     * @return mixed The last created variation identifier
-     */
-    public static function creation_variation_callback($possible_variations, $element_id)
-    {
-        /** Get existing variation    */
-        $existing_variations_in_db = wpshop_products::get_variation($element_id);
-        $existing_variations = array();
-        if (!empty($existing_variations_in_db)) {
-            foreach ($existing_variations_in_db as $variations_def) {
-                $existing_variations[] = $variations_def['variation_def'];
-            }
-        }
-        /** New variation definition    */
-        $attribute_defining_variation = get_post_meta($element_id, '_wpshop_variation_defining', true);
-
-        /**    Read possible values    */
-        foreach ($possible_variations as $variation_definition) {
-            if (in_array($variation_definition, $existing_variations)) {
-                continue;
-            }
-
-            $attribute_to_set = array();
-            foreach ($variation_definition as $attribute_code => $attribute_selected_value) {
-                $attribute = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
-                $attribute_to_set[$attribute->data_type][$attribute_code] = $attribute_selected_value;
-                if (empty($attribute_defining_variation['attributes']) || (!in_array($attribute_code, $attribute_defining_variation['attributes']))) {
-                    $attribute_defining_variation['attributes'][] = $attribute_code;
-                }
-            }
-            $variation_id = wpshop_products::create_variation($element_id, $attribute_to_set);
-        }
-        update_post_meta($element_id, '_wpshop_variation_defining', $attribute_defining_variation);
+	/**
+	 * Call variation creation function with a list of defined variation
+	 *
+	 * @param array $possible_variations A list of variation to create for the current element
+	 * @param integer $element_id The product we want to create variation for
+	 *
+	 * @return mixed The last created variation identifier
+	 */
+	public static function creation_variation_callback($possible_variations, $element_id)
+	{
+		/** Get existing variation    */
+		$existing_variations_in_db = wpshop_products::get_variation($element_id);
+		$existing_variations = array();
+		if (!empty($existing_variations_in_db)) {
+			foreach ($existing_variations_in_db as $variations_def) {
+				$existing_variations[] = $variations_def['variation_def'];
+			}
+		}
+		/** New variation definition    */
+		$attribute_defining_variation = get_post_meta($element_id, '_wpshop_variation_defining', true);
 
-        return !empty($variation_id) ? $variation_id : 0;
-    }
+		/**    Read possible values    */
+		foreach ($possible_variations as $variation_definition) {
+			if (in_array($variation_definition, $existing_variations)) {
+				continue;
+			}
 
-    /**
-     * Create a new variation for product
-     *
-     * @param integer $head_product The product identifier to create the new variation for
-     * @param array $variation_attributes Attribute list for the variation
-     *
-     * @return mixed <number, WP_Error> The variation identifier or an error in case the creation was not succesfull
-     */
-    public static function create_variation($head_product, $variation_attributes)
-    {
-        /** Create custom title */
-        $title_variation = "";
-        if (!empty($variation_attributes)) {
-            foreach ($variation_attributes as $type => $array) {
-                if (!empty($array)) {
-                    foreach ($array as $code => $value) {
-                        $title_variation .= " " . $code . " " . $value;
-                    }
-                }
-            }
-        }
+			$attribute_to_set = array();
+			foreach ($variation_definition as $attribute_code => $attribute_selected_value) {
+				$attribute = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
+				$attribute_to_set[$attribute->data_type][$attribute_code] = $attribute_selected_value;
+				if (empty($attribute_defining_variation['attributes']) || (!in_array($attribute_code, $attribute_defining_variation['attributes']))) {
+					$attribute_defining_variation['attributes'][] = $attribute_code;
+				}
+			}
+			$variation_id = wpshop_products::create_variation($element_id, $attribute_to_set);
+		}
+		update_post_meta($element_id, '_wpshop_variation_defining', $attribute_defining_variation);
 
-        $variation = array(
-            'post_title' => sprintf(__('Product %s variation %s', 'wpshop'), $head_product, get_the_title($head_product)) . $title_variation,
-            'post_content' => '',
-            'post_status' => 'publish',
-            'post_author' => get_current_user_id(),
-            'post_parent' => $head_product,
-            'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION,
-        );
-        $variation_id = wp_insert_post($variation);
-
-        wpshop_attributes::saveAttributeForEntity($variation_attributes, wpshop_entities::get_entity_identifier_from_code(wpshop_products::currentPageCode), $variation_id, WPSHOP_CURRENT_LOCALE, '');
-
-        /*    Update product price looking for shop parameters    */
-        wpshop_products::calculate_price($variation_id);
-
-        /*    Save the attributes values into wordpress post metadata database in order to have a backup and to make frontend search working    */
-        $productMetaDatas = array();
-        foreach ($variation_attributes as $attributeType => $attributeValues) {
-            foreach ($attributeValues as $attributeCode => $attributeValue) {
-                if (!empty($attributeValue)) {
-                    $productMetaDatas[$attributeCode] = $attributeValue;
-                }
-            }
-        }
-        update_post_meta($variation_id, '_wpshop_variations_attribute_def', $productMetaDatas);
-        update_post_meta($variation_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $productMetaDatas);
-        update_post_meta($variation_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, get_post_meta($head_product, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
+		return !empty($variation_id) ? $variation_id : 0;
+	}
 
-        return $variation_id;
-    }
+	/**
+	 * Create a new variation for product
+	 *
+	 * @param integer $head_product The product identifier to create the new variation for
+	 * @param array $variation_attributes Attribute list for the variation
+	 *
+	 * @return mixed <number, WP_Error> The variation identifier or an error in case the creation was not succesfull
+	 */
+	public static function create_variation($head_product, $variation_attributes)
+	{
+		/** Create custom title */
+		$title_variation = "";
+		if (!empty($variation_attributes)) {
+			foreach ($variation_attributes as $type => $array) {
+				if (!empty($array)) {
+					foreach ($array as $code => $value) {
+						$title_variation .= " " . $code . " " . $value;
+					}
+				}
+			}
+		}
 
-    /**
-     * Get variation list for a given product
-     *
-     * @param integer $head_product The product identifier to get the variation for
-     * @return object The variation list
-     */
-    public static function get_variation($head_product, $type = 'any')
-    {
-        global $wpdb;
-        $variations_output = null;
-        $args = array(
-            'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION,
-            'post_parent' => $head_product,
-            'orderby' => 'ID',
-            'order' => 'ASC',
-            'posts_per_page' => -1,
-            'post_status' => $type,
-        );
-        $variations = get_posts($args);
-
-        if (!empty($variations)) {
-            $head_wpshop_variation_definition = get_post_meta($head_product, '_wpshop_variation_defining', true);
-
-            foreach ($variations as $post_def) {
-                $data = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $post_def->ID, WPSHOP_CURRENT_LOCALE, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, "'valid', 'deleted'");
-                foreach ($data as $content) {
-                    $attribute_value = 'attribute_value_' . $content->data_type;
-                    if (!empty($content->$attribute_value)) {
-                        if (!empty($head_wpshop_variation_definition['attributes']) && in_array($content->code, $head_wpshop_variation_definition['attributes'])) {
-                            $variations_output[$post_def->ID]['variation_def'][$content->code] = $content->$attribute_value;
-                        } else {
-                            $variations_output[$post_def->ID]['variation_dif'][$content->code] = $content->$attribute_value;
-                        }
-                    }
-                }
-                $variations_output[$post_def->ID]['post'] = $post_def;
-            }
-        }
-        wp_reset_query();
-        return $variations_output;
-    }
+		$variation = array(
+			'post_title' => sprintf(__('Product %s variation %s', 'wpshop'), $head_product, get_the_title($head_product)) . $title_variation,
+			'post_content' => '',
+			'post_status' => 'publish',
+			'post_author' => get_current_user_id(),
+			'post_parent' => $head_product,
+			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION,
+		);
+		$variation_id = wp_insert_post($variation);
+
+		wpshop_attributes::saveAttributeForEntity($variation_attributes, wpshop_entities::get_entity_identifier_from_code(wpshop_products::currentPageCode), $variation_id, WPSHOP_CURRENT_LOCALE, '');
+
+		/*    Update product price looking for shop parameters    */
+		wpshop_products::calculate_price($variation_id);
+
+		/*    Save the attributes values into wordpress post metadata database in order to have a backup and to make frontend search working    */
+		$productMetaDatas = array();
+		foreach ($variation_attributes as $attributeType => $attributeValues) {
+			foreach ($attributeValues as $attributeCode => $attributeValue) {
+				if (!empty($attributeValue)) {
+					$productMetaDatas[$attributeCode] = $attributeValue;
+				}
+			}
+		}
+		update_post_meta($variation_id, '_wpshop_variations_attribute_def', $productMetaDatas);
+		update_post_meta($variation_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $productMetaDatas);
+		update_post_meta($variation_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, get_post_meta($head_product, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
 
-    /**
-     * Affichage des variations d'un produit dans l'administration
-     *
-     * @param integer $head_product L'identifiant du produit dont on veut afficher les variations
-     * @return string Le code html permettant l'affichage des variations dans l'interface d'édition du produit
-     */
-    public static function display_variation_admin($head_product)
-    {
-        $output = '';
-        $productCurrency = wpshop_tools::wpshop_get_currency();
-        /*    Récupération de la liste des variations pour le produit en cours d'édition    */
-        $variations = self::get_variation($head_product);
-        $price_piloting = get_option('wpshop_shop_price_piloting');
-
-        /*    Affichage de la liste des variations pour le produit en cours d'édition    */
-        if (!empty($variations) && is_array($variations)) {
-            $existing_variation_list = wpshop_display::display_template_element('wpshop_admin_existing_variation_controller', array(), array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product), 'admin');
-
-            foreach ($variations as $variation) {
-                $tpl_component = array();
-
-                $tpl_component['ADMIN_EXISTING_VARIATIONS_CLASS'] = ' wpshop_variation_' . self::currentPageCode;
-                $tpl_component['VARIATION_IDENTIFIER'] = $variation['post']->ID;
-                $tpl_component['VARIATION_DETAIL'] = '  ';
-                $p = (!empty($variation['variation_dif']['product_price']) || !empty($variation['variation_dif']['price_ht'])) ? ((!empty($price_piloting) && $price_piloting == 'HT' && !empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : (!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0) : 0;
-                $tpl_component['VARIATION_DETAIL_PRICE'] = number_format($p, 2, '.', '') . ' ' . $productCurrency . ' ' . ((!empty($price_piloting) && $price_piloting == 'HT') ? __('ET', 'wpshop') : __('ATI', 'wpshop'));
-                if (!empty($price_piloting) && $price_piloting == 'HT') {
-
-                } else {
-
-                }
-                $post_obj = $variation['post'];
-
-                $parent_product_infos = wpshop_products::get_parent_variation($post_obj->ID);
-                if (!empty($parent_product_infos)) {
-                    $parent_post = $parent_product_infos['parent_post'];
-                    $product_option_postmeta = get_post_meta($parent_post->ID, '_wpshop_variation_defining', true);
-                    if (!empty($product_option_postmeta['options']['price_behaviour']) && !empty($product_option_postmeta['options']['price_behaviour'][0]) && $product_option_postmeta['options']['price_behaviour'][0] == 'addition') {
-                        if (!empty($price_piloting) && $price_piloting == 'HT') {
-                            $product_price = ((!empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : 0) + $parent_product_infos['parent_post_meta']['price_ht'];
-                        } else {
-                            $product_price = ((!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0) + $parent_product_infos['parent_post_meta']['product_price'];
-                        }
-                        $tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Variation price combined with the parent product price', 'wpshop');
-                    } else {
-                        if (!empty($price_piloting) && $price_piloting == 'HT') {
-                            $product_price = (!empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : 0;
-                        } else {
-                            $product_price = (!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0;
-                        }
-                        $tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Only variation\'s price is used', 'wpshop');
-                    }
-                    $product_price = number_format(str_replace(',', '.', $product_price), 2, '.', '') . ' ' . $productCurrency . ' ' . ((!empty($price_piloting) && $price_piloting == 'HT') ? __('ET', 'wpshop') : __('ATI', 'wpshop'));
-                    $tpl_component['VARIATION_DETAIL_SALE_PRICE'] = $product_price;
-                }
-
-                if (!empty($variation['variation_def'])) {
-                    foreach ($variation['variation_def'] as $variation_key => $variation_value) {
-                        if (!empty($variation_value)) {
-                            $attribute_def_for_variation = wpshop_attributes::getElement($variation_key, "'valid'", 'code');
-                            $tpl_component['VARIATION_DETAIL'] .= '<input type="hidden" name="' . self::current_page_variation_code . '[' . $variation['post']->ID . '][attribute][' . $attribute_def_for_variation->data_type . '][' . $variation_key . ']" value="' . $variation_value . '" />' . wpshop_display::display_template_element('wpshop_admin_variation_item_def_header', array('VARIATION_ATTRIBUTE_CODE' => $attribute_def_for_variation->frontend_label, 'VARIATION_ATTRIBUTE_CODE_VALUE' => stripslashes(wpshop_attributes::get_attribute_type_select_option_info($variation_value, 'label', $attribute_def_for_variation->data_type_to_use, true))), array(), 'admin');
-                            $tpl_component['VARIATION_IMAGE_CHOICE'] = '';
-
-                            /** Define Link image to variation interface **/
-                            if (!empty($product_option_postmeta) && !empty($product_option_postmeta['attributes']) && !empty($product_option_postmeta['variation_type']) && ((count($product_option_postmeta['attributes']) == 1 && $product_option_postmeta['variation_type'] == 'single') || ($product_option_postmeta['variation_type'] == 'combined'))) {
-                                $pictures = get_posts(array('post_type' => 'attachment', 'posts_per_page' => -1, 'post_status' => null, 'post_parent' => $head_product));
-
-                                $media_id_data = get_post_meta($head_product, '_wps_product_media', true);
-                                if (!empty($media_id_data)) {
-                                    $medias_ids = explode(',', $media_id_data);
-
-                                    if (!empty($medias_ids)) {
-                                        foreach ($medias_ids as $media_id) {
-                                            if (!empty($media_id)) {
-                                                $pictures[] = get_post($media_id);
-                                            }
-                                        }
-                                    }
-                                }
-
-                                $pictures_data = '';
-                                if (!empty($pictures)) {
-                                    $selected_picture = get_post_meta($variation['post']->ID, '_wps_variation_attached_picture', true);
-
-                                    $done_picture = array();
-                                    foreach ($pictures as $picture) {
-                                        if (!in_array($picture->ID, $done_picture)) {
-                                            if (wp_attachment_is_image($picture->ID)) {
-                                                $checked = ((!empty($selected_picture) && $selected_picture == $picture->ID) ? 'checked="checked"' : '');
-                                                $pictures_data .= wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_element', array('PICTURE_CHOICE_VARIATION_ID' => $picture->ID, 'PRODUCT_VARIATION_ID' => $variation['post']->ID, 'PICTURE_CHOICE_SELECTED' => $checked, 'PICTURE_CHOICE_VARIATION_IMG' => wp_get_attachment_image($picture->ID, 'thumbnail')), array(), 'admin');
-
-                                                $done_picture[] = $picture->ID;
-                                            }
-                                        }
-                                    }
-                                }
-
-                                $tpl_component['VARIATION_IMAGE_CHOICE'] = wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_container', array('PICTURE_CHOICE_CONTAINER_CONTENT' => $pictures_data), array(), 'admin');
-                            }
-
-                        }
-                    }
-                }
-
-                $tpl_component['VARIATION_DETAIL'] = substr($tpl_component['VARIATION_DETAIL'], 0, -2);
-
-                $tpl_component['ADMIN_VARIATION_SPECIFIC_DEFINITION_CONTAINER_CLASS'] = ' wpshopHide';
-                $tpl_component['VARIATION_DEFINITION'] = wpshop_attributes::get_variation_attribute(array('post_id' => $variation['post']->ID, 'input_class' => ' ', 'field_name' => wpshop_products::current_page_variation_code . '[' . $variation['post']->ID . ']', 'page_code' => self::current_page_variation_code, 'field_id' => self::current_page_variation_code . '_' . $variation['post']->ID, 'variation_dif_values' => (!empty($variation['variation_dif']) ? $variation['variation_dif'] : array())));
-                $tpl_component['VARIATION_DEFINITION_CONTENT'] = wpshop_display::display_template_element('wpshop_admin_variation_item_specific_def', $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION => $variation['post']->ID), 'admin');
-
-                /*    Add the variation definition to output    */
-                $existing_variation_list .= wpshop_display::display_template_element('wpshop_admin_variation_item_def', $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION => $variation['post']->ID), 'admin');
-            }
-
-            $output .= wpshop_display::display_template_element('wpshop_admin_existing_variation_list', array('ADMIN_EXISTING_VARIATIONS_CONTAINER_CLASS' => '', 'ADMIN_EXISTING_VARIATIONS_CONTAINER' => $existing_variation_list), array(), 'admin');
-            /*    Reset de la liste des résultats pour éviter les comportements indésirables    */
-            wp_reset_query();
-        } else {
-            $output = __('No variation found for this product. Please use button above for create one', 'wpshop');
-        }
+		return $variation_id;
+	}
 
-        return $output;
-    }
+	/**
+	 * Get variation list for a given product
+	 *
+	 * @param integer $head_product The product identifier to get the variation for
+	 * @return object The variation list
+	 */
+	public static function get_variation($head_product, $type = 'any')
+	{
+		global $wpdb;
+		$variations_output = null;
+		$args = array(
+			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION,
+			'post_parent' => $head_product,
+			'orderby' => 'ID',
+			'order' => 'ASC',
+			'posts_per_page' => -1,
+			'post_status' => $type,
+		);
+		$variations = get_posts($args);
+
+		if (!empty($variations)) {
+			$head_wpshop_variation_definition = get_post_meta($head_product, '_wpshop_variation_defining', true);
+
+			foreach ($variations as $post_def) {
+				$data = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $post_def->ID, WPSHOP_CURRENT_LOCALE, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, "'valid', 'deleted'");
+				foreach ($data as $content) {
+					$attribute_value = 'attribute_value_' . $content->data_type;
+					if (!empty($content->$attribute_value)) {
+						if (!empty($head_wpshop_variation_definition['attributes']) && in_array($content->code, $head_wpshop_variation_definition['attributes'])) {
+							$variations_output[$post_def->ID]['variation_def'][$content->code] = $content->$attribute_value;
+						} else {
+							$variations_output[$post_def->ID]['variation_dif'][$content->code] = $content->$attribute_value;
+						}
+					}
+				}
+				$variations_output[$post_def->ID]['post'] = $post_def;
+			}
+		}
+		wp_reset_query();
+		return $variations_output;
+	}
 
-    /**
-     * Retrieve and display the variation for a given product
-     * @param integer $product_id The product identifier to get variation for
-     */
-    public static function wpshop_variation($post_id = '', $from_admin = false, $order_id = '', $qty = 1)
-    {
-        global $wp_query;
-        $output = '';
-
-        $product_id = empty($post_id) ? $wp_query->post->ID : $post_id;
-        $wpshop_product_attributes_frontend_display = get_post_meta($product_id, '_wpshop_product_attributes_frontend_display', true);
-        $head_wpshop_variation_definition = get_post_meta($product_id, '_wpshop_variation_defining', true);
-
-        /**    Get attribute order for current product    */
-        $product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($product_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
-        $output_order = array();
-        if (count($product_attribute_order_detail) > 0) {
-            if (!empty($product_attribute_order_detail)) {
-                foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
-                    foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
-                        if (!empty($attribute_def->code)) {
-                            $output_order[$attribute_def->code] = $position;
-                        }
-
-                    }
-                }
-            }
-        }
+	/**
+	 * Affichage des variations d'un produit dans l'administration
+	 *
+	 * @param integer $head_product L'identifiant du produit dont on veut afficher les variations
+	 * @return string Le code html permettant l'affichage des variations dans l'interface d'édition du produit
+	 */
+	public static function display_variation_admin($head_product)
+	{
+		$output = '';
+		$productCurrency = wpshop_tools::wpshop_get_currency();
+		/*    Récupération de la liste des variations pour le produit en cours d'édition    */
+		$variations = self::get_variation($head_product);
+		$price_piloting = get_option('wpshop_shop_price_piloting');
+
+		/*    Affichage de la liste des variations pour le produit en cours d'édition    */
+		if (!empty($variations) && is_array($variations)) {
+			$existing_variation_list = wpshop_display::display_template_element('wpshop_admin_existing_variation_controller', array(), array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product), 'admin');
+
+			foreach ($variations as $variation) {
+				$tpl_component = array();
+
+				$tpl_component['ADMIN_EXISTING_VARIATIONS_CLASS'] = ' wpshop_variation_' . self::currentPageCode;
+				$tpl_component['VARIATION_IDENTIFIER'] = $variation['post']->ID;
+				$tpl_component['VARIATION_DETAIL'] = '  ';
+				$p = (!empty($variation['variation_dif']['product_price']) || !empty($variation['variation_dif']['price_ht'])) ? ((!empty($price_piloting) && $price_piloting == 'HT' && !empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : (!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0) : 0;
+				$tpl_component['VARIATION_DETAIL_PRICE'] = number_format($p, 2, '.', '') . ' ' . $productCurrency . ' ' . ((!empty($price_piloting) && $price_piloting == 'HT') ? __('ET', 'wpshop') : __('ATI', 'wpshop'));
+				if (!empty($price_piloting) && $price_piloting == 'HT') {
+
+				} else {
 
-        $variations_params = array();
-        $variation_attribute = array();
-        $variation_attribute_ordered = array();
-        $possible_values = array();
-        $possible_values_for_selection_calculation = array();
-
-        /*    Vérification de l'existence de déclinaison pour le produit    */
-        $wpshop_variation_list = self::get_variation($product_id);
-        if (!empty($wpshop_variation_list)) {
-            foreach ($wpshop_variation_list as $variation) {
-                if (!empty($variation['variation_def'])) {
-                    $display_option = get_post_meta($post_id, '_wpshop_product_attributes_frontend_display', true);
-                    foreach ($variation['variation_def'] as $attribute_code => $attribute_value) {
-                        if (empty($display_option) || (!empty($display_option['attribute']) && !empty($display_option['attribute'][$attribute_code]) && !empty($display_option['attribute'][$attribute_code]['complete_sheet']))) {
-                            $tpl_component = array();
-
-                            $attribute_db_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
-                            $default_value_is_serial = false;
-                            $attribute_list_first_element = $attribute_db_definition->default_value;
-                            if (!empty($attribute_db_definition->default_value) && ($attribute_db_definition->default_value == serialize(false) || wpshop_tools::is_serialized($attribute_db_definition->default_value))) {
-                                $default_value_is_serial = true;
-                                $tmp_default_value = unserialize($attribute_db_definition->default_value);
-                                $attribute_list_first_element = !empty($tmp_default_value['field_options']['label_for_first_item']) ? $tmp_default_value['field_options']['label_for_first_item'] : null;
-                            }
-
-                            if ($default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none')) {
-                                $possible_values[$attribute_code][0][0] = ($default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none')) ? stripslashes(sprintf($attribute_list_first_element, strtolower($attribute_db_definition->frontend_label))) : __('Choose a value', 'wpshop');
-                            }
-
-                            if (!empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'custom')) {
-                                $tpl_component['VARIATION_VALUE'] = stripslashes(wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'label', 'custom'));
-                                $position = wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'position', 'custom');
-                            } else if (!empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'internal')) {
-                                $post_def = get_post($attribute_value);
-                                $tpl_component['VARIATION_VALUE'] = stripslashes($post_def->post_title);
-                                $position = $post_def->menu_order;
-                            }
-
-                            if (!empty($variation['variation_dif'])) {
-                                foreach ($variation['variation_dif'] as $attribute_dif_code => $attribute_dif_value) {
-                                    $wpshop_prices_attributes = unserialize(WPSHOP_ATTRIBUTE_PRICES);
-                                    $the_value = $attribute_dif_value;
-                                    if (in_array($attribute_dif_code, $wpshop_prices_attributes)) {
-                                        $the_value = wpshop_display::format_field_output('wpshop_product_price', $attribute_dif_value);
-                                    }
-                                    $tpl_component['VARIATION_DIF_' . strtoupper($attribute_dif_code)] = stripslashes($the_value);
-                                }
-                            }
-                            if (!empty($attribute_value)) {
-                                $possible_values[$attribute_code][$position][$attribute_value] = wpshop_display::display_template_element('product_variation_item_possible_values', $tpl_component, array('type' => 'attribute_for_variation', 'id' => $attribute_code));
-                                $possible_values_for_selection_calculation[$attribute_code][$attribute_value] = $tpl_component['VARIATION_VALUE'];
-                            }
-                            unset($tpl_component);
-                        }
-                    }
-                }
-            }
-
-            $variation_tpl = array();
-            if (!empty($head_wpshop_variation_definition['attributes'])) {
-                foreach ($head_wpshop_variation_definition['attributes'] as $attribute_code) {
-                    $attribute_db_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
-
-                    if (!empty($attribute_db_definition)) {
-                        $attribute_display_state = wpshop_attributes::check_attribute_display($attribute_db_definition->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_code, 'complete_sheet');
-
-                        $is_required = ((!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'])))) ? true : false;
-                        if (!$is_required && $attribute_db_definition->is_required == 'yes') {
-                            $is_required = true;
-                        }
-
-                        $input_def = array();
-                        $input_def['type'] = $attribute_db_definition->frontend_input;
-                        $value = isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code] : (!empty($attribute_db_definition->default_value) ? $attribute_db_definition->default_value : null);
-                        if (in_array($attribute_db_definition->frontend_input, array('radio', 'checkbox'))) {
-                            unset($possible_values[$attribute_code][0]);
-                            $value = array($value);
-                        }
-                        $input_def['id'] = 'wpshop_variation_attr_' . $attribute_code;
-                        $input_def['name'] = $attribute_code;
-                        $real_possible_values = array();
-                        if (!empty($possible_values[$attribute_code])) {
-                            ksort($possible_values[$attribute_code]);
-                            foreach ($possible_values[$attribute_code] as $position => $def) {
-                                foreach ($def as $attribute_value => $attribute_value_output) {
-                                    $real_possible_values[$attribute_value] = $attribute_value_output;
-                                    if (!empty($attribute_value)) {
-                                        global $wpdb;
-                                        $query = $wpdb->prepare("SELECT post_status FROM " . $wpdb->postmeta . " AS P_META INNER JOIN " . $wpdb->posts . " as P ON ((P.ID = P_META.post_id) AND (P.post_parent = %d)) WHERE P_META.meta_value LIKE '%%" . serialize($attribute_code) . serialize($attribute_value) . "%%'", $product_id);
-                                        if ('draft' == $wpdb->get_var($query)) {
-                                            unset($real_possible_values[$attribute_value]);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        $input_def['possible_value'] = $real_possible_values;
-                        $input_def['valueToPut'] = 'index';
-                        $input_def['value'] = $value;
-
-                        $input_def['options']['more_input'] = '';
-                        if (!empty($possible_values_for_selection_calculation[$attribute_code])) {
-                            foreach ($possible_values_for_selection_calculation[$attribute_code] as $value_id => $value) {
-                                $input_def['options']['more_input'] .= '<input type="hidden" disabled="disabled" value="' . str_replace("\\", "", $value) . '" name="' . $input_def['id'] . '_current_value" id="' . $input_def['id'] . '_current_value_' . $value_id . '" />';
-                            }
-                        }
-
-                        $input_def['options_label']['original'] = true;
-                        $input_def['option'] = 'data-nonce="' . wp_create_nonce('wpshop_ajax_wpshop_variation_selection') . '" class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_code . ' ' : '') . ($attribute_db_definition->_display_informations_about_value == 'yes' ? ' wpshop_display_information_about_value' : '') . ' ' . ((is_admin()) ? $attribute_db_definition->backend_css_class : $attribute_db_definition->frontend_css_class) . '" ';
-
-                        if (!empty($real_possible_values)) {
-                            $tpl_component = array();
-                            $attribute_output_def['value'] = isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code] : $input_def['value'];
-                            $tpl_component['VARIATION_INPUT'] = wpshop_form::check_input_type($input_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) . $input_def['options']['more_input'];
-                            $tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_code . '" >' . stripslashes($attribute_db_definition->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_db_definition->frontend_label));
-                            $tpl_component['VARIATION_CODE'] = $attribute_code;
-                            $tpl_component['VARIATION_LABEL_HELPER'] = !empty($attribute_db_definition->frontend_help_message) ? ' title="' . $attribute_db_definition->frontend_help_message . '" ' : '';
-                            $tpl_component['VARIATION_LABEL_CLASS'] = !empty($attribute_db_definition->frontend_help_message) ? ' wpshop_att_variation_helper' : '';
-                            $tpl_component['VARIATION_IDENTIFIER'] = $input_def['id'];
-                            $tpl_component['VARIATION_PARENT_ID'] = $product_id;
-                            $tpl_component['VARIATION_PARENT_TYPE'] = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
-                            $tpl_component['VARIATION_CONTAINER_CLASS'] = ($is_required ? ' attribute_is_required_container attribute_is_required_container_' . $attribute_code : '') . ' wpshop_variation_' . $attribute_code . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_' . $product_id;
-                            $tpl_component['VARIATION_REQUIRED_INDICATION'] = ($is_required) ? __('Required variation', 'wpshop') : '';
-                            $variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_code)] = wpshop_display::display_template_element('product_variation_item', $tpl_component);
-                            $variation_attribute_ordered[$output_order[$attribute_code]] = $variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_code)];
-                        }
-
-                        $variation_attribute[] = $attribute_code;
-                    }
-                }
-            }
+				}
+				$post_obj = $variation['post'];
+
+				$parent_product_infos = wpshop_products::get_parent_variation($post_obj->ID);
+				if (!empty($parent_product_infos)) {
+					$parent_post = $parent_product_infos['parent_post'];
+					$product_option_postmeta = get_post_meta($parent_post->ID, '_wpshop_variation_defining', true);
+					if (!empty($product_option_postmeta['options']['price_behaviour']) && !empty($product_option_postmeta['options']['price_behaviour'][0]) && $product_option_postmeta['options']['price_behaviour'][0] == 'addition') {
+						if (!empty($price_piloting) && $price_piloting == 'HT') {
+							$product_price = ((!empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : 0) + $parent_product_infos['parent_post_meta']['price_ht'];
+						} else {
+							$product_price = ((!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0) + $parent_product_infos['parent_post_meta']['product_price'];
+						}
+						$tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Variation price combined with the parent product price', 'wpshop');
+					} else {
+						if (!empty($price_piloting) && $price_piloting == 'HT') {
+							$product_price = (!empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : 0;
+						} else {
+							$product_price = (!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0;
+						}
+						$tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Only variation\'s price is used', 'wpshop');
+					}
+					$product_price = number_format(str_replace(',', '.', $product_price), 2, '.', '') . ' ' . $productCurrency . ' ' . ((!empty($price_piloting) && $price_piloting == 'HT') ? __('ET', 'wpshop') : __('ATI', 'wpshop'));
+					$tpl_component['VARIATION_DETAIL_SALE_PRICE'] = $product_price;
+				}
 
-        }
-        $variation_tpl['VARIATION_FORM_ELEMENT_ID'] = $product_id;
-        wp_reset_query();
-
-        $attribute_defined_to_be_user_defined = wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode));
-        if (!empty($attribute_defined_to_be_user_defined)) {
-            foreach ($attribute_defined_to_be_user_defined as $attribute_not_in_variation_but_user_defined) {
-                $is_required = ((!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && (in_array($attribute_not_in_variation_but_user_defined->code, $head_wpshop_variation_definition['options']['required_attributes']))) || $attribute_not_in_variation_but_user_defined->is_required == 'yes') ? true : false;
-
-                $attribute_display_state = wpshop_attributes::check_attribute_display($attribute_not_in_variation_but_user_defined->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_not_in_variation_but_user_defined->code, 'complete_sheet');
-                if ($attribute_display_state && array_key_exists($attribute_not_in_variation_but_user_defined->code, $output_order) && !in_array($attribute_not_in_variation_but_user_defined->code, $variation_attribute) && ($attribute_not_in_variation_but_user_defined->is_used_for_variation == 'no')) {
-                    $attribute_output_def = wpshop_attributes::get_attribute_field_definition($attribute_not_in_variation_but_user_defined, (is_array($head_wpshop_variation_definition) && isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code] : ''));
-
-                    $tpl_component = array();
-                    $attribute_output_def['option'] = 'data-nonce="' . wp_create_nonce('wpshop_ajax_wpshop_variation_selection') . '" class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_not_in_variation_but_user_defined->code : '') . ' ' . (str_replace('"', '', str_replace('class="', '', $attribute_output_def['option']))) . ' ' . ((is_admin()) ? $attribute_not_in_variation_but_user_defined->backend_css_class : $attribute_not_in_variation_but_user_defined->frontend_css_class) . '" ';
-                    $tpl_component['VARIATION_INPUT'] = wpshop_form::check_input_type($attribute_output_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '[free]') . $attribute_output_def['options'];
-                    $tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_not_in_variation_but_user_defined->code . '" >' . stripslashes($attribute_not_in_variation_but_user_defined->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_not_in_variation_but_user_defined->frontend_label));
-                    $tpl_component['VARIATION_CODE'] = $attribute_not_in_variation_but_user_defined->code;
-                    $tpl_component['VARIATION_LABEL_HELPER'] = !empty($attribute_not_in_variation_but_user_defined->frontend_help_message) ? ' title="' . $attribute_not_in_variation_but_user_defined->frontend_help_message . '" ' : '';
-                    $tpl_component['VARIATION_LABEL_CLASS'] = !empty($attribute_not_in_variation_but_user_defined->frontend_help_message) ? ' wpshop_att_variation_helper' : '';
-                    $tpl_component['VARIATION_REQUIRED_INDICATION'] = ($is_required) ? __('Required variation', 'wpshop') : '';
-                    $tpl_component['VARIATION_IDENTIFIER'] = $attribute_output_def['id'];
-                    $tpl_component['VARIATION_PARENT_ID'] = $product_id;
-                    $tpl_component['VARIATION_PARENT_TYPE'] = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
-                    $tpl_component['VARIATION_CONTAINER_CLASS'] = ($is_required ? ' attribute_is_required_container attribute_is_required_container_' . $attribute_not_in_variation_but_user_defined->code : '') . ' wpshop_variation_' . $attribute_not_in_variation_but_user_defined->code . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_' . $product_id;
-                    $variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_not_in_variation_but_user_defined->code)] = ($attribute_output_def['type'] != 'hidden') ? wpshop_display::display_template_element('product_variation_item', $tpl_component) : wpshop_form::check_input_type($attribute_output_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '[free]') . $attribute_output_def['options'];
-                    $variation_attribute_ordered[$output_order[$attribute_not_in_variation_but_user_defined->code]] = $variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_not_in_variation_but_user_defined->code)];
-                }
-            }
-        }
-        $variation_tpl['VARIATION_FORM_VARIATION_LIST'] = '';
-        if (!empty($variation_attribute_ordered) && is_array($variation_attribute_ordered)) {
-            ksort($variation_attribute_ordered);
-            foreach ($variation_attribute_ordered as $attribute_variation_to_output) {
-                $variation_tpl['VARIATION_FORM_VARIATION_LIST'] .= $attribute_variation_to_output;
-            }
-        }
-        $variation_tpl['FROM_ADMIN_INDICATOR'] = $variation_tpl['ORDER_ID_INDICATOR'] = '';
-        $variation_tpl['PRODUCT_ADDED_TO_CART_QTY'] = (!empty($qty)) ? $qty : 1;
-        if ($from_admin && !empty($order_id)) {
-            $variation_tpl['FROM_ADMIN_INDICATOR'] = '<input type="hidden" name="wps_orders_from_admin" value="1" />';
-            $variation_tpl['ORDER_ID_INDICATOR'] = '<input type="hidden" name="wps_orders_order_id" value="' . $order_id . '" />';
-        }
-        $output = !empty($variation_tpl['VARIATION_FORM_VARIATION_LIST']) ? wpshop_display::display_template_element('product_variation_form', $variation_tpl) : '';
+				if (!empty($variation['variation_def'])) {
+					foreach ($variation['variation_def'] as $variation_key => $variation_value) {
+						if (!empty($variation_value)) {
+							$attribute_def_for_variation = wpshop_attributes::getElement($variation_key, "'valid'", 'code');
+							$tpl_component['VARIATION_DETAIL'] .= '<input type="hidden" name="' . self::current_page_variation_code . '[' . $variation['post']->ID . '][attribute][' . $attribute_def_for_variation->data_type . '][' . $variation_key . ']" value="' . $variation_value . '" />' . wpshop_display::display_template_element('wpshop_admin_variation_item_def_header', array('VARIATION_ATTRIBUTE_CODE' => $attribute_def_for_variation->frontend_label, 'VARIATION_ATTRIBUTE_CODE_VALUE' => stripslashes(wpshop_attributes::get_attribute_type_select_option_info($variation_value, 'label', $attribute_def_for_variation->data_type_to_use, true))), array(), 'admin');
+							$tpl_component['VARIATION_IMAGE_CHOICE'] = '';
+
+							/** Define Link image to variation interface **/
+							if (!empty($product_option_postmeta) && !empty($product_option_postmeta['attributes']) && !empty($product_option_postmeta['variation_type']) && ((count($product_option_postmeta['attributes']) == 1 && $product_option_postmeta['variation_type'] == 'single') || ($product_option_postmeta['variation_type'] == 'combined'))) {
+								$pictures = get_posts(array('post_type' => 'attachment', 'posts_per_page' => -1, 'post_status' => null, 'post_parent' => $head_product));
+
+								$media_id_data = get_post_meta($head_product, '_wps_product_media', true);
+								if (!empty($media_id_data)) {
+									$medias_ids = explode(',', $media_id_data);
+
+									if (!empty($medias_ids)) {
+										foreach ($medias_ids as $media_id) {
+											if (!empty($media_id)) {
+												$pictures[] = get_post($media_id);
+											}
+										}
+									}
+								}
+
+								$pictures_data = '';
+								if (!empty($pictures)) {
+									$selected_picture = get_post_meta($variation['post']->ID, '_wps_variation_attached_picture', true);
+
+									$done_picture = array();
+									foreach ($pictures as $picture) {
+										if (!in_array($picture->ID, $done_picture)) {
+											if (wp_attachment_is_image($picture->ID)) {
+												$checked = ((!empty($selected_picture) && $selected_picture == $picture->ID) ? 'checked="checked"' : '');
+												$pictures_data .= wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_element', array('PICTURE_CHOICE_VARIATION_ID' => $picture->ID, 'PRODUCT_VARIATION_ID' => $variation['post']->ID, 'PICTURE_CHOICE_SELECTED' => $checked, 'PICTURE_CHOICE_VARIATION_IMG' => wp_get_attachment_image($picture->ID, 'thumbnail')), array(), 'admin');
+
+												$done_picture[] = $picture->ID;
+											}
+										}
+									}
+								}
+
+								$tpl_component['VARIATION_IMAGE_CHOICE'] = wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_container', array('PICTURE_CHOICE_CONTAINER_CONTENT' => $pictures_data), array(), 'admin');
+							}
+
+						}
+					}
+				}
 
-        return $output;
-    }
+				$tpl_component['VARIATION_DETAIL'] = substr($tpl_component['VARIATION_DETAIL'], 0, -2);
 
-    public static function get_parent_variation($variation_id)
-    {
-        $result = array();
-        if (!empty($variation_id)) {
-            $variation_post = get_post($variation_id);
-            if (!empty($variation_post) && !empty($variation_post->post_parent)) {
-                $result['parent_post'] = get_post($variation_post->post_parent);
-                $result['parent_post_meta'] = get_post_meta($variation_post->post_parent, '_wpshop_product_metadata', true);
-            }
-        }
-        return $result;
-    }
+				$tpl_component['ADMIN_VARIATION_SPECIFIC_DEFINITION_CONTAINER_CLASS'] = ' wpshopHide';
+				$tpl_component['VARIATION_DEFINITION'] = wpshop_attributes::get_variation_attribute(array('post_id' => $variation['post']->ID, 'input_class' => ' ', 'field_name' => wpshop_products::current_page_variation_code . '[' . $variation['post']->ID . ']', 'page_code' => self::current_page_variation_code, 'field_id' => self::current_page_variation_code . '_' . $variation['post']->ID, 'variation_dif_values' => (!empty($variation['variation_dif']) ? $variation['variation_dif'] : array())));
+				$tpl_component['VARIATION_DEFINITION_CONTENT'] = wpshop_display::display_template_element('wpshop_admin_variation_item_specific_def', $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION => $variation['post']->ID), 'admin');
 
-    /**
-     * Display the current configuration for a given product
-     * @param array $shortcode_attribute Some parameters given by the shortcode for display
-     */
-    public function wpshop_product_variations_summary($shortcode_attribute)
-    {
-        $output = '';
-
-        $product_variations_selection_args = array(
-            'CURRENCY_SELECTOR' => wpshop_attributes_unit::wpshop_shop_currency_list_field(),
-            'PRODUCT_VARIATION_SELECTION_DISPLAY' => '',
-        );
-
-        $current_user_id = get_current_user_id();
-
-        if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
-            foreach ($_SESSION['cart']['order_items'] as $item_id => $item) {
-                if (!empty($item) && !empty($item['item_id'])) {
-
-                    $free_variations = array();
-                    if (!empty($item['item_meta']) && !empty($item['item_meta']['free_variation'])) {
-                        foreach ($item['item_meta']['free_variation'] as $attribute_code => $attribute_value) {
-                            $free_variations[] = $attribute_code . '-_variation_val_-' . $attribute_value;
-                        }
-                    }
-
-                    $variations = array();
-                    if (!empty($item['item_meta']) && !empty($item['item_meta']['variations'])) {
-                        foreach ($item['item_meta']['variations'] as $variation_id => $variation_def) {
-
-                            if (!empty($variation_def['item_meta']) && !empty($variation_def['item_meta']['variation_definition'])) {
-                                foreach ($variation_def['item_meta']['variation_definition'] as $attribute_code => $attribute_selected_data) {
-                                    $variations[] = $attribute_code . '-_variation_val_-' . $attribute_selected_data['ID'];
-                                }
-                            }
-                        }
-                    }
-                    $product_variation_summary = self::wpshop_ajax_wpshop_variation_selection($item['item_id'], $variations, $free_variations, null, $item['item_qty']);
-
-                    $product_variations_selection_args['PRODUCT_VARIATION_SELECTION_DISPLAY'] .= $product_variation_summary[1]['product_output'];
-                }
-            }
-        }
+				/*    Add the variation definition to output    */
+				$existing_variation_list .= wpshop_display::display_template_element('wpshop_admin_variation_item_def', $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION => $variation['post']->ID), 'admin');
+			}
 
-        $output .= wpshop_display::display_template_element('wpshop_product_configuration_summary', $product_variations_selection_args);
+			$output .= wpshop_display::display_template_element('wpshop_admin_existing_variation_list', array('ADMIN_EXISTING_VARIATIONS_CONTAINER_CLASS' => '', 'ADMIN_EXISTING_VARIATIONS_CONTAINER' => $existing_variation_list), array(), 'admin');
+			/*    Reset de la liste des résultats pour éviter les comportements indésirables    */
+			wp_reset_query();
+		} else {
+			$output = __('No variation found for this product. Please use button above for create one', 'wpshop');
+		}
 
-        echo $output;
-    }
+		return $output;
+	}
+
+	/**
+	 * Retrieve and display the variation for a given product
+	 * @param integer $product_id The product identifier to get variation for
+	 */
+	public static function wpshop_variation($post_id = '', $from_admin = false, $order_id = '', $qty = 1)
+	{
+		global $wp_query;
+		$output = '';
+
+		$product_id = empty($post_id) ? $wp_query->post->ID : $post_id;
+		$wpshop_product_attributes_frontend_display = get_post_meta($product_id, '_wpshop_product_attributes_frontend_display', true);
+		$head_wpshop_variation_definition = get_post_meta($product_id, '_wpshop_variation_defining', true);
+
+		/**    Get attribute order for current product    */
+		$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($product_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
+		$output_order = array();
+		if (count($product_attribute_order_detail) > 0) {
+			if (!empty($product_attribute_order_detail)) {
+				foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
+					foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
+						if (!empty($attribute_def->code)) {
+							$output_order[$attribute_def->code] = $position;
+						}
+
+					}
+				}
+			}
+		}
 
-    /**
-     * Affichage du résumé du produit sélectionné avec le prix par option / Display a summary of selected product with the price per option
-     *
-     * @param integer $product_id L'identifiant du produit qui est ajouté au panier / The product identifier added to cart
-     * @param array $wpshop_variation_selected La liste des options ayant un prix sélectionnées par le client / Options list with price selected by the customer
-     * @param array $wpshop_free_variation La liste des options n'entrainant pas de modification du prix final sélectionnées par le client / Options list without price selected by the customer
-     * @param string $wpshop_current_for_display Inconnu / Unknown
-     * @param integer $product_qty La quantité commandée par le client / Quantity ordered by the customer
-     *
-     * @return array Le résultat du calcul pour l'affichage / Output result
-     */
-    public static function wpshop_ajax_wpshop_variation_selection($product_id, $wpshop_variation_selected, $wpshop_free_variation, $wpshop_current_for_display, $product_qty = 1)
-    {
-        global $wpdb;
-
-        $wpshop_cart = new wps_cart();
-        $wpshop_products = new wpshop_products();
-
-        $response = '';
-        $response_status = $has_variation = false;
-        $tpl_component = array();
-
-        // Check if variations exists
-        if (!empty($wpshop_variation_selected) || !empty($wpshop_free_variation)) {
-
-            //Recover all selected variations
-            $variations_selected = array();
-            if (!empty($wpshop_variation_selected)) {
-                foreach ($wpshop_variation_selected as $selected_variation) {
-                    $variation_definition = explode('-_variation_val_-', $selected_variation);
-                    $variations_selected[$variation_definition[0]] = $variation_definition[1];
-                }
-            }
-
-            // Check variations priority
-            $product_with_variation = wpshop_products::get_variation_by_priority($variations_selected, $product_id);
-
-            // Check if $product_with_variation have variations
-            if (!empty($product_with_variation[$product_id]['variations']) || !empty($wpshop_free_variation)) {
-
-                $formatted_product = $wpshop_cart->prepare_product_to_add_to_cart($product_id, $product_qty, $variations_selected);
-                $product_to_add_to_cart = $formatted_product[0];
-                foreach ($formatted_product[0] as $pid => $product_more_content) {
-                    $order_items[$pid]['product_id'] = $product_more_content['id'];
-
-                    /** For product with variation    */
-                    $order_items[$pid]['product_variation_type'] = !empty($product_more_content['variation_priority']) ? $product_more_content['variation_priority'] : '';
-                    $order_items[$pid]['free_variation'] = !empty($product_more_content['free_variation']) ? $product_more_content['free_variation'] : '';
-                    $order_items[$pid]['product_variation'] = '';
-                    if (!empty($product_more_content['variations'])) {
-                        foreach ($product_more_content['variations'] as $variation_id) {
-                            $order_items[$pid]['product_variation'][] = $variation_id;
-                        }
-                    }
-                }
-
-                // If Product list is not empty, add products to order
-                if (!empty($order_items)) {
-                    foreach ($order_items as $product_id => $d) {
-                        $product_key = $product_id;
-
-                        // Formate datas
-                        $product_id = $head_product_id = $d['product_id'];
-                        $product_variation = !empty($d['product_variation']) ? $d['product_variation'] : null;
-
-                        // If product is a single variation product
-                        if (!empty($product_variation) && (count($product_variation) == 1)) {
-                            $product_id = $product_variation[0];
-                        }
-
-                        // Construct final product
-                        $product = wpshop_products::get_product_data($d['product_id'], true);
-                        $the_product = array_merge(array('product_id' => $d['product_id'], 'product_qty' => 1), $product);
+		$variations_params = array();
+		$variation_attribute = array();
+		$variation_attribute_ordered = array();
+		$possible_values = array();
+		$possible_values_for_selection_calculation = array();
+
+		/*    Vérification de l'existence de déclinaison pour le produit    */
+		$wpshop_variation_list = self::get_variation($product_id);
+		if (!empty($wpshop_variation_list)) {
+			foreach ($wpshop_variation_list as $variation) {
+				if (!empty($variation['variation_def'])) {
+					$display_option = get_post_meta($post_id, '_wpshop_product_attributes_frontend_display', true);
+					foreach ($variation['variation_def'] as $attribute_code => $attribute_value) {
+						if (empty($display_option) || (!empty($display_option['attribute']) && !empty($display_option['attribute'][$attribute_code]) && !empty($display_option['attribute'][$attribute_code]['complete_sheet']))) {
+							$tpl_component = array();
+
+							$attribute_db_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
+							$default_value_is_serial = false;
+							$attribute_list_first_element = $attribute_db_definition->default_value;
+							if (!empty($attribute_db_definition->default_value) && ($attribute_db_definition->default_value == serialize(false) || wpshop_tools::is_serialized($attribute_db_definition->default_value))) {
+								$default_value_is_serial = true;
+								$tmp_default_value = unserialize($attribute_db_definition->default_value);
+								$attribute_list_first_element = !empty($tmp_default_value['field_options']['label_for_first_item']) ? $tmp_default_value['field_options']['label_for_first_item'] : null;
+							}
+
+							if ($default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none')) {
+								$possible_values[$attribute_code][0][0] = ($default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none')) ? stripslashes(sprintf($attribute_list_first_element, strtolower($attribute_db_definition->frontend_label))) : __('Choose a value', 'wpshop');
+							}
+
+							if (!empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'custom')) {
+								$tpl_component['VARIATION_VALUE'] = stripslashes(wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'label', 'custom'));
+								$position = wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'position', 'custom');
+							} else if (!empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'internal')) {
+								$post_def = get_post($attribute_value);
+								$tpl_component['VARIATION_VALUE'] = stripslashes($post_def->post_title);
+								$position = $post_def->menu_order;
+							}
+
+							if (!empty($variation['variation_dif'])) {
+								foreach ($variation['variation_dif'] as $attribute_dif_code => $attribute_dif_value) {
+									$wpshop_prices_attributes = unserialize(WPSHOP_ATTRIBUTE_PRICES);
+									$the_value = $attribute_dif_value;
+									if (in_array($attribute_dif_code, $wpshop_prices_attributes)) {
+										$the_value = wpshop_display::format_field_output('wpshop_product_price', $attribute_dif_value);
+									}
+									$tpl_component['VARIATION_DIF_' . strtoupper($attribute_dif_code)] = stripslashes($the_value);
+								}
+							}
+							if (!empty($attribute_value)) {
+								$possible_values[$attribute_code][$position][$attribute_value] = wpshop_display::display_template_element('product_variation_item_possible_values', $tpl_component, array('type' => 'attribute_for_variation', 'id' => $attribute_code));
+								$possible_values_for_selection_calculation[$attribute_code][$attribute_value] = $tpl_component['VARIATION_VALUE'];
+							}
+							unset($tpl_component);
+						}
+					}
+				}
+			}
+
+			$variation_tpl = array();
+			if (!empty($head_wpshop_variation_definition['attributes'])) {
+				foreach ($head_wpshop_variation_definition['attributes'] as $attribute_code) {
+					$attribute_db_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
+
+					if (!empty($attribute_db_definition)) {
+						$attribute_display_state = wpshop_attributes::check_attribute_display($attribute_db_definition->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_code, 'complete_sheet');
+
+						$is_required = ((!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'])))) ? true : false;
+						if (!$is_required && $attribute_db_definition->is_required == 'yes') {
+							$is_required = true;
+						}
+
+						$input_def = array();
+						$input_def['type'] = $attribute_db_definition->frontend_input;
+						$value = isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code] : (!empty($attribute_db_definition->default_value) ? $attribute_db_definition->default_value : null);
+						if (in_array($attribute_db_definition->frontend_input, array('radio', 'checkbox'))) {
+							unset($possible_values[$attribute_code][0]);
+							$value = array($value);
+						}
+						$input_def['id'] = 'wpshop_variation_attr_' . $attribute_code;
+						$input_def['name'] = $attribute_code;
+						$real_possible_values = array();
+						if (!empty($possible_values[$attribute_code])) {
+							ksort($possible_values[$attribute_code]);
+							foreach ($possible_values[$attribute_code] as $position => $def) {
+								foreach ($def as $attribute_value => $attribute_value_output) {
+									$real_possible_values[$attribute_value] = $attribute_value_output;
+									if (!empty($attribute_value)) {
+										global $wpdb;
+										$query = $wpdb->prepare("SELECT post_status FROM " . $wpdb->postmeta . " AS P_META INNER JOIN " . $wpdb->posts . " as P ON ((P.ID = P_META.post_id) AND (P.post_parent = %d)) WHERE P_META.meta_value LIKE '%%" . serialize($attribute_code) . serialize($attribute_value) . "%%'", $product_id);
+										if ('draft' == $wpdb->get_var($query)) {
+											unset($real_possible_values[$attribute_value]);
+										}
+									}
+								}
+							}
+						}
+						$input_def['possible_value'] = $real_possible_values;
+						$input_def['valueToPut'] = 'index';
+						$input_def['value'] = $value;
+
+						$input_def['options']['more_input'] = '';
+						if (!empty($possible_values_for_selection_calculation[$attribute_code])) {
+							foreach ($possible_values_for_selection_calculation[$attribute_code] as $value_id => $value) {
+								$input_def['options']['more_input'] .= '<input type="hidden" disabled="disabled" value="' . str_replace("\\", "", $value) . '" name="' . $input_def['id'] . '_current_value" id="' . $input_def['id'] . '_current_value_' . $value_id . '" />';
+							}
+						}
+
+						$input_def['options_label']['original'] = true;
+						$input_def['option'] = 'data-nonce="' . wp_create_nonce('wpshop_ajax_wpshop_variation_selection') . '" class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_code . ' ' : '') . ($attribute_db_definition->_display_informations_about_value == 'yes' ? ' wpshop_display_information_about_value' : '') . ' ' . ((is_admin()) ? $attribute_db_definition->backend_css_class : $attribute_db_definition->frontend_css_class) . '" ';
+
+						if (!empty($real_possible_values)) {
+							$tpl_component = array();
+							$attribute_output_def['value'] = isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code] : $input_def['value'];
+							$tpl_component['VARIATION_INPUT'] = wpshop_form::check_input_type($input_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) . $input_def['options']['more_input'];
+							$tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_code . '" >' . stripslashes($attribute_db_definition->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_db_definition->frontend_label));
+							$tpl_component['VARIATION_CODE'] = $attribute_code;
+							$tpl_component['VARIATION_LABEL_HELPER'] = !empty($attribute_db_definition->frontend_help_message) ? ' title="' . $attribute_db_definition->frontend_help_message . '" ' : '';
+							$tpl_component['VARIATION_LABEL_CLASS'] = !empty($attribute_db_definition->frontend_help_message) ? ' wpshop_att_variation_helper' : '';
+							$tpl_component['VARIATION_IDENTIFIER'] = $input_def['id'];
+							$tpl_component['VARIATION_PARENT_ID'] = $product_id;
+							$tpl_component['VARIATION_PARENT_TYPE'] = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
+							$tpl_component['VARIATION_CONTAINER_CLASS'] = ($is_required ? ' attribute_is_required_container attribute_is_required_container_' . $attribute_code : '') . ' wpshop_variation_' . $attribute_code . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_' . $product_id;
+							$tpl_component['VARIATION_REQUIRED_INDICATION'] = ($is_required) ? __('Required variation', 'wpshop') : '';
+							$variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_code)] = wpshop_display::display_template_element('product_variation_item', $tpl_component);
+							$variation_attribute_ordered[$output_order[$attribute_code]] = $variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_code)];
+						}
+
+						$variation_attribute[] = $attribute_code;
+					}
+				}
+			}
+
+		}
+		$variation_tpl['VARIATION_FORM_ELEMENT_ID'] = $product_id;
+		wp_reset_query();
+
+		$attribute_defined_to_be_user_defined = wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode));
+		if (!empty($attribute_defined_to_be_user_defined)) {
+			foreach ($attribute_defined_to_be_user_defined as $attribute_not_in_variation_but_user_defined) {
+				$is_required = ((!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && (in_array($attribute_not_in_variation_but_user_defined->code, $head_wpshop_variation_definition['options']['required_attributes']))) || $attribute_not_in_variation_but_user_defined->is_required == 'yes') ? true : false;
+
+				$attribute_display_state = wpshop_attributes::check_attribute_display($attribute_not_in_variation_but_user_defined->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_not_in_variation_but_user_defined->code, 'complete_sheet');
+				if ($attribute_display_state && array_key_exists($attribute_not_in_variation_but_user_defined->code, $output_order) && !in_array($attribute_not_in_variation_but_user_defined->code, $variation_attribute) && ($attribute_not_in_variation_but_user_defined->is_used_for_variation == 'no')) {
+					$attribute_output_def = wpshop_attributes::get_attribute_field_definition($attribute_not_in_variation_but_user_defined, (is_array($head_wpshop_variation_definition) && isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code] : ''));
+
+					$tpl_component = array();
+					$attribute_output_def['option'] = 'data-nonce="' . wp_create_nonce('wpshop_ajax_wpshop_variation_selection') . '" class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_not_in_variation_but_user_defined->code : '') . ' ' . (str_replace('"', '', str_replace('class="', '', $attribute_output_def['option']))) . ' ' . ((is_admin()) ? $attribute_not_in_variation_but_user_defined->backend_css_class : $attribute_not_in_variation_but_user_defined->frontend_css_class) . '" ';
+					$tpl_component['VARIATION_INPUT'] = wpshop_form::check_input_type($attribute_output_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '[free]') . $attribute_output_def['options'];
+					$tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_not_in_variation_but_user_defined->code . '" >' . stripslashes($attribute_not_in_variation_but_user_defined->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_not_in_variation_but_user_defined->frontend_label));
+					$tpl_component['VARIATION_CODE'] = $attribute_not_in_variation_but_user_defined->code;
+					$tpl_component['VARIATION_LABEL_HELPER'] = !empty($attribute_not_in_variation_but_user_defined->frontend_help_message) ? ' title="' . $attribute_not_in_variation_but_user_defined->frontend_help_message . '" ' : '';
+					$tpl_component['VARIATION_LABEL_CLASS'] = !empty($attribute_not_in_variation_but_user_defined->frontend_help_message) ? ' wpshop_att_variation_helper' : '';
+					$tpl_component['VARIATION_REQUIRED_INDICATION'] = ($is_required) ? __('Required variation', 'wpshop') : '';
+					$tpl_component['VARIATION_IDENTIFIER'] = $attribute_output_def['id'];
+					$tpl_component['VARIATION_PARENT_ID'] = $product_id;
+					$tpl_component['VARIATION_PARENT_TYPE'] = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
+					$tpl_component['VARIATION_CONTAINER_CLASS'] = ($is_required ? ' attribute_is_required_container attribute_is_required_container_' . $attribute_not_in_variation_but_user_defined->code : '') . ' wpshop_variation_' . $attribute_not_in_variation_but_user_defined->code . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_' . $product_id;
+					$variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_not_in_variation_but_user_defined->code)] = ($attribute_output_def['type'] != 'hidden') ? wpshop_display::display_template_element('product_variation_item', $tpl_component) : wpshop_form::check_input_type($attribute_output_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '[free]') . $attribute_output_def['options'];
+					$variation_attribute_ordered[$output_order[$attribute_not_in_variation_but_user_defined->code]] = $variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_not_in_variation_but_user_defined->code)];
+				}
+			}
+		}
+		$variation_tpl['VARIATION_FORM_VARIATION_LIST'] = '';
+		if (!empty($variation_attribute_ordered) && is_array($variation_attribute_ordered)) {
+			ksort($variation_attribute_ordered);
+			foreach ($variation_attribute_ordered as $attribute_variation_to_output) {
+				$variation_tpl['VARIATION_FORM_VARIATION_LIST'] .= $attribute_variation_to_output;
+			}
+		}
+		$variation_tpl['FROM_ADMIN_INDICATOR'] = $variation_tpl['ORDER_ID_INDICATOR'] = '';
+		$variation_tpl['PRODUCT_ADDED_TO_CART_QTY'] = (!empty($qty)) ? $qty : 1;
+		if ($from_admin && !empty($order_id)) {
+			$variation_tpl['FROM_ADMIN_INDICATOR'] = '<input type="hidden" name="wps_orders_from_admin" value="1" />';
+			$variation_tpl['ORDER_ID_INDICATOR'] = '<input type="hidden" name="wps_orders_order_id" value="' . $order_id . '" />';
+		}
+		$output = !empty($variation_tpl['VARIATION_FORM_VARIATION_LIST']) ? wpshop_display::display_template_element('product_variation_form', $variation_tpl) : '';
+
+		return $output;
+	}
+
+	public static function get_parent_variation($variation_id)
+	{
+		$result = array();
+		if (!empty($variation_id)) {
+			$variation_post = get_post($variation_id);
+			if (!empty($variation_post) && !empty($variation_post->post_parent)) {
+				$result['parent_post'] = get_post($variation_post->post_parent);
+				$result['parent_post_meta'] = get_post_meta($variation_post->post_parent, '_wpshop_product_metadata', true);
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Display the current configuration for a given product
+	 * @param array $shortcode_attribute Some parameters given by the shortcode for display
+	 */
+	public function wpshop_product_variations_summary($shortcode_attribute)
+	{
+		$output = '';
+
+		$product_variations_selection_args = array(
+			'CURRENCY_SELECTOR' => wpshop_attributes_unit::wpshop_shop_currency_list_field(),
+			'PRODUCT_VARIATION_SELECTION_DISPLAY' => '',
+		);
+
+		$current_user_id = get_current_user_id();
+
+		if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
+			foreach ($_SESSION['cart']['order_items'] as $item_id => $item) {
+				if (!empty($item) && !empty($item['item_id'])) {
+
+					$free_variations = array();
+					if (!empty($item['item_meta']) && !empty($item['item_meta']['free_variation'])) {
+						foreach ($item['item_meta']['free_variation'] as $attribute_code => $attribute_value) {
+							$free_variations[] = $attribute_code . '-_variation_val_-' . $attribute_value;
+						}
+					}
+
+					$variations = array();
+					if (!empty($item['item_meta']) && !empty($item['item_meta']['variations'])) {
+						foreach ($item['item_meta']['variations'] as $variation_id => $variation_def) {
+
+							if (!empty($variation_def['item_meta']) && !empty($variation_def['item_meta']['variation_definition'])) {
+								foreach ($variation_def['item_meta']['variation_definition'] as $attribute_code => $attribute_selected_data) {
+									$variations[] = $attribute_code . '-_variation_val_-' . $attribute_selected_data['ID'];
+								}
+							}
+						}
+					}
+					$product_variation_summary = self::wpshop_ajax_wpshop_variation_selection($item['item_id'], $variations, $free_variations, null, $item['item_qty']);
+
+					$product_variations_selection_args['PRODUCT_VARIATION_SELECTION_DISPLAY'] .= $product_variation_summary[1]['product_output'];
+				}
+			}
+		}
+
+		$output .= wpshop_display::display_template_element('wpshop_product_configuration_summary', $product_variations_selection_args);
+
+		echo $output;
+	}
+
+	/**
+	 * Affichage du résumé du produit sélectionné avec le prix par option / Display a summary of selected product with the price per option
+	 *
+	 * @param integer $product_id L'identifiant du produit qui est ajouté au panier / The product identifier added to cart
+	 * @param array $wpshop_variation_selected La liste des options ayant un prix sélectionnées par le client / Options list with price selected by the customer
+	 * @param array $wpshop_free_variation La liste des options n'entrainant pas de modification du prix final sélectionnées par le client / Options list without price selected by the customer
+	 * @param string $wpshop_current_for_display Inconnu / Unknown
+	 * @param integer $product_qty La quantité commandée par le client / Quantity ordered by the customer
+	 *
+	 * @return array Le résultat du calcul pour l'affichage / Output result
+	 */
+	public static function wpshop_ajax_wpshop_variation_selection($product_id, $wpshop_variation_selected, $wpshop_free_variation, $wpshop_current_for_display, $product_qty = 1)
+	{
+		global $wpdb;
+
+		$wpshop_cart = new wps_cart();
+		$wpshop_products = new wpshop_products();
+
+		$response = '';
+		$response_status = $has_variation = false;
+		$tpl_component = array();
+
+		// Check if variations exists
+		if (!empty($wpshop_variation_selected) || !empty($wpshop_free_variation)) {
+
+			//Recover all selected variations
+			$variations_selected = array();
+			if (!empty($wpshop_variation_selected)) {
+				foreach ($wpshop_variation_selected as $selected_variation) {
+					$variation_definition = explode('-_variation_val_-', $selected_variation);
+					$variations_selected[$variation_definition[0]] = $variation_definition[1];
+				}
+			}
+
+			// Check variations priority
+			$product_with_variation = wpshop_products::get_variation_by_priority($variations_selected, $product_id);
+
+			// Check if $product_with_variation have variations
+			if (!empty($product_with_variation[$product_id]['variations']) || !empty($wpshop_free_variation)) {
+
+				$formatted_product = $wpshop_cart->prepare_product_to_add_to_cart($product_id, $product_qty, $variations_selected);
+				$product_to_add_to_cart = $formatted_product[0];
+				foreach ($formatted_product[0] as $pid => $product_more_content) {
+					$order_items[$pid]['product_id'] = $product_more_content['id'];
+
+					/** For product with variation    */
+					$order_items[$pid]['product_variation_type'] = !empty($product_more_content['variation_priority']) ? $product_more_content['variation_priority'] : '';
+					$order_items[$pid]['free_variation'] = !empty($product_more_content['free_variation']) ? $product_more_content['free_variation'] : '';
+					$order_items[$pid]['product_variation'] = '';
+					if (!empty($product_more_content['variations'])) {
+						foreach ($product_more_content['variations'] as $variation_id) {
+							$order_items[$pid]['product_variation'][] = $variation_id;
+						}
+					}
+				}
+
+				// If Product list is not empty, add products to order
+				if (!empty($order_items)) {
+					foreach ($order_items as $product_id => $d) {
+						$product_key = $product_id;
+
+						// Formate datas
+						$product_id = $head_product_id = $d['product_id'];
+						$product_variation = !empty($d['product_variation']) ? $d['product_variation'] : null;
+
+						// If product is a single variation product
+						if (!empty($product_variation) && (count($product_variation) == 1)) {
+							$product_id = $product_variation[0];
+						}
+
+						// Construct final product
+						$product = wpshop_products::get_product_data($d['product_id'], true);
+						$the_product = array_merge(array('product_id' => $d['product_id'], 'product_qty' => 1), $product);
 						$the_product['text_from'] = $product_with_variation['text_from'];
 
-                        //    Add variation to product into cart for storage
-                        if (!empty($product_variation)) {
-                            $the_product = wpshop_products::get_variation_price_behaviour($the_product, $product_variation, $head_product_id, array('type' => $d['product_variation_type']));
-                        }
-
-                        // Free Variations Checking
-                        if (!empty($d['free_variation'])) {
-                            $the_product['item_meta']['free_variation'] = $d['free_variation'];
-                            $head_product_id = $the_product['product_id'];
-                        }
-
-                        // If product is a variation, we check parent product general
-                        if (get_post_type($the_product['product_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
-                            $parent_def = wpshop_products::get_parent_variation($the_product['product_id']);
-                            if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
-                                $variation_def = get_post_meta($parent_def['parent_post']->ID, '_wpshop_variation_defining', true);
-                                $parent_meta = $parent_def['parent_post_meta'];
-                                if (!empty($variation_def) && !empty($variation_def['options']) && !empty($variation_def['options']['priority']) && in_array('combined', $variation_def['options']['priority']) && !empty($variation_def['options']['price_behaviour']) && in_array('addition', $variation_def['options']['price_behaviour']) && !empty($variation_def['attributes']) && count($variation_def['attributes']) > 1) {
-                                    $the_product['product_price'] += number_format(str_replace(',', '.', $parent_meta['product_price']), 2, '.', '');
-                                    $the_product['price_ht'] += number_format(str_replace(',', '.', $parent_meta['price_ht']), 2, '.', '');
-                                    $the_product['tva'] += number_format(str_replace(',', '.', $parent_meta['tva']), 2, '.', '');
-                                }
-                            }
-                        }
-                    }
-                }
-
-                if (!empty($the_product) && empty($the_product['price_ttc_before_discount']) && empty($the_product['price_ht_before_discount'])) {
-                    $price_infos = wpshop_prices::check_product_price($the_product, true);
-                    if (!empty($price_infos['discount']['discount_exist'])) {
-                        $the_product['price_ttc_before_discount'] = $the_product['product_price'];
-                        $the_product['price_ht_before_discount'] = $the_product['price_ht'];
-                    }
-                    $the_product['price_ht'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_et_price'] : $price_infos['et'];
-                    $the_product['product_price'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_ati_price'] : $price_infos['ati'];
-                    $the_product['tva'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_tva'] : $price_infos['tva'];
-                }
-
-                $product = wpshop_products::get_product_data($product_id, true, '"publish", "draft"');
-                // Add free variations to product
-                if (!empty($wpshop_free_variation)) {
-                    $the_product['item_meta']['free_variation'] = $wpshop_free_variation;
-                }
-                // Change picture if have a selected variation
-                $the_selected_variation = !empty($product_with_variation) && !empty($product_with_variation[$head_product_id]) && !empty($product_with_variation[$head_product_id]['variations']) ? $product_with_variation[$head_product_id]['variations'] : null;
-                $response['wps_product_image'] = $wpshop_products->wps_selected_variation_picture($head_product_id, $the_selected_variation);
-
-                // Price Display
-                $price_attribute = wpshop_attributes::getElement('product_price', "'valid'", 'code');
-                $price_display = wpshop_attributes::check_attribute_display($price_attribute->is_visible_in_front, $product['custom_display'], 'attribute', 'product_price', 'complete_sheet');
-                $productPrice = '';
-                if ($price_display) {
-                    $response['product_price_output'] = wpshop_prices::get_product_price($the_product, 'price_display', 'complete_sheet', false, true);
-                }
-
-                //Get Summary cart
-                $response['product_output'] = $wpshop_products->wps_get_summary_variations_product($product_id, $the_product, (!empty($wpshop_variation_selected) || !empty($wpshop_free_variation) ? true : false));
-                $response_status = true;
-            } else {
-                //Product without variations
-                $product_data = wpshop_products::get_product_data($product_id);
-                $response['product_price_output'] = wpshop_prices::get_product_price($product_data, 'price_display', 'complete_sheet');
+						//    Add variation to product into cart for storage
+						if (!empty($product_variation)) {
+							$the_product = wpshop_products::get_variation_price_behaviour($the_product, $product_variation, $head_product_id, array('type' => $d['product_variation_type']));
+						}
+
+						// Free Variations Checking
+						if (!empty($d['free_variation'])) {
+							$the_product['item_meta']['free_variation'] = $d['free_variation'];
+							$head_product_id = $the_product['product_id'];
+						}
+
+						// If product is a variation, we check parent product general
+						if (get_post_type($the_product['product_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+							$parent_def = wpshop_products::get_parent_variation($the_product['product_id']);
+							if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
+								$variation_def = get_post_meta($parent_def['parent_post']->ID, '_wpshop_variation_defining', true);
+								$parent_meta = $parent_def['parent_post_meta'];
+								if (!empty($variation_def) && !empty($variation_def['options']) && !empty($variation_def['options']['priority']) && in_array('combined', $variation_def['options']['priority']) && !empty($variation_def['options']['price_behaviour']) && in_array('addition', $variation_def['options']['price_behaviour']) && !empty($variation_def['attributes']) && count($variation_def['attributes']) > 1) {
+									$the_product['product_price'] += number_format(str_replace(',', '.', $parent_meta['product_price']), 2, '.', '');
+									$the_product['price_ht'] += number_format(str_replace(',', '.', $parent_meta['price_ht']), 2, '.', '');
+									$the_product['tva'] += number_format(str_replace(',', '.', $parent_meta['tva']), 2, '.', '');
+								}
+							}
+						}
+					}
+				}
+
+				if (!empty($the_product) && empty($the_product['price_ttc_before_discount']) && empty($the_product['price_ht_before_discount'])) {
+					$price_infos = wpshop_prices::check_product_price($the_product, true);
+					if (!empty($price_infos['discount']['discount_exist'])) {
+						$the_product['price_ttc_before_discount'] = $the_product['product_price'];
+						$the_product['price_ht_before_discount'] = $the_product['price_ht'];
+					}
+					$the_product['price_ht'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_et_price'] : $price_infos['et'];
+					$the_product['product_price'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_ati_price'] : $price_infos['ati'];
+					$the_product['tva'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_tva'] : $price_infos['tva'];
+				}
+
+				$product = wpshop_products::get_product_data($product_id, true, '"publish", "draft"');
+				// Add free variations to product
+				if (!empty($wpshop_free_variation)) {
+					$the_product['item_meta']['free_variation'] = $wpshop_free_variation;
+				}
+				// Change picture if have a selected variation
+				$the_selected_variation = !empty($product_with_variation) && !empty($product_with_variation[$head_product_id]) && !empty($product_with_variation[$head_product_id]['variations']) ? $product_with_variation[$head_product_id]['variations'] : null;
+				$response['wps_product_image'] = $wpshop_products->wps_selected_variation_picture($head_product_id, $the_selected_variation);
+
+				// Price Display
+				$price_attribute = wpshop_attributes::getElement('product_price', "'valid'", 'code');
+				$price_display = wpshop_attributes::check_attribute_display($price_attribute->is_visible_in_front, $product['custom_display'], 'attribute', 'product_price', 'complete_sheet');
+				$productPrice = '';
+				if ($price_display) {
+					$response['product_price_output'] = wpshop_prices::get_product_price($the_product, 'price_display', 'complete_sheet', false, true);
+				}
+
+				//Get Summary cart
+				$response['product_output'] = $wpshop_products->wps_get_summary_variations_product($product_id, $the_product, (!empty($wpshop_variation_selected) || !empty($wpshop_free_variation) ? true : false));
 				$response_status = true;
-            }
-        }
+			} else {
+				//Product without variations
+				$product_data = wpshop_products::get_product_data($product_id);
+				$response['product_price_output'] = wpshop_prices::get_product_price($product_data, 'price_display', 'complete_sheet');
+				$response_status = true;
+			}
+		}
 
-        return array($response_status, $response);
-    }
+		return array($response_status, $response);
+	}
 
-    /**
-     * Display information for a given value of an attribute defined as an entity, when attribute option for detail view is set as true
-     *
-     * @param array $shortcode_attribute Some parameters given by the shortcode for display
-     */
-    public function wpshop_product_variation_value_detail($shortcode_attribute)
-    {
-        echo wpshop_display::display_template_element('wpshop_product_variation_value_detail_container', array());
-    }
+	/**
+	 * Display information for a given value of an attribute defined as an entity, when attribute option for detail view is set as true
+	 *
+	 * @param array $shortcode_attribute Some parameters given by the shortcode for display
+	 */
+	public function wpshop_product_variation_value_detail($shortcode_attribute)
+	{
+		echo wpshop_display::display_template_element('wpshop_product_variation_value_detail_container', array());
+	}
 
-    /**
-     * Build the product structure with variation for product choosed by the user into frontend sheet
-     *
-     * @param array $selected_variation THe list of variation choosed by the user in product frontend sheet
-     * @param integer $product_id The basic product choose by the user in frontend
-     *
-     * @return array The product list for adding to the cart build by variation priority
-     */
-    public static function get_variation_by_priority($selected_variation, $product_id, $add_to_cart_action = false)
-    {
-        global $wpdb;
-        $all_required_variations_selected = $no_selected_variation = true;
-        $single_variations = $combined_variations = $product_to_add_to_cart = array();
-
-        // Check if all required variations are selected
-        $required_attributes_list = wpshop_prices::check_required_attributes($product_id);
-        foreach ($selected_variation as $k => $value) {
-            if ($value == 0 && in_array($k, $required_attributes_list)) {
-                $all_required_variations_selected = false;
-            }
-            if ($value != 0) {
-                $no_selected_variation = false;
-            }
-        }
-        if (!empty($selected_variation)) {
-            //Check variations configuration
-            $product_variation_configuration = get_post_meta($product_id, '_wpshop_variation_defining', true);
-            // Check variations type
-            $product_variation_type = (!empty($product_variation_configuration) && !empty($product_variation_configuration['variation_type'])) ? $product_variation_configuration['variation_type'] : 'single';
-            $product_to_add_to_cart[$product_id]['variation_priority'] = $product_variation_type;
-
-            //Check defined variation priority
-            $priority = (!empty($product_variation_configuration['options']) && !empty($product_variation_configuration['options']['priority'][0])) ? $product_variation_configuration['options']['priority'][0] : 'combined';
-            $product_to_add_to_cart[$product_id]['defined_variation_priority'] = $priority;
-
-            // Recover all product variations
-            $query_variation = $selected_variation;
-            // Delete free variations
-            unset($query_variation['free']);
-
-            if ($product_variation_type == 'single') {
-                // Get single variations
-                $single_variations = array();
-                foreach ($selected_variation as $attribute_code => $attribute_value) {
-                    if (isset($attribute_value) && $attribute_code != 'free') {
-                        $query = $wpdb->prepare("SELECT ID FROM " . $wpdb->postmeta . " AS P_META INNER JOIN " . $wpdb->posts . " as P ON ((P.ID = P_META.post_id) AND (P.post_parent = %d)) WHERE P_META.meta_value = '" . serialize(array($attribute_code => $attribute_value)) . "' OR P_META.meta_value = '" . serialize(array($attribute_code => (int) $attribute_value)) . "'", $product_id);
-                        $single_variation_id = $wpdb->get_var($query);
-                        if (!empty($single_variation_id)) {
-                            $single_variations[] = $single_variation_id;
-                            unset($query_variation[$attribute_code]);
-                        }
-                    }
-                }
-            } else {
-                // Get combined variations
-                $query = $wpdb->prepare("SELECT ID FROM " . $wpdb->postmeta . " AS P_META INNER JOIN " . $wpdb->posts . " as P ON ((P.ID = P_META.post_id) AND (P.post_parent = %d)) WHERE P_META.meta_key = '_wpshop_variations_attribute_def' AND P_META.meta_value = '" . serialize($query_variation) . "'", $product_id);
-                $combined_variation_id = $wpdb->get_var($query);
-                if (!empty($combined_variation_id)) {
-                    $combined_variations[] = $combined_variation_id;
-                }
-
-            }
-
-            //If all required variations are not selected
-            if (!$all_required_variations_selected || $no_selected_variation) {
-                $product_to_add_to_cart['text_from'] = 'on';
-                // If we choose to display lower price variation combinaison
-                if (empty($product_variation_configuration) || (!empty($product_variation_configuration) && empty($product_variation_configuration['options'])) || (!empty($product_variation_configuration) && !empty($product_variation_configuration['options']) && !empty($product_variation_configuration['options']['price_display']) && !empty($product_variation_configuration['options']['price_display']['lower_price']))) {
-                    //Get lower price variation combinaison
-                    $lower_price_variations = wpshop_prices::check_product_lower_price($product_id);
-                    if (!empty($lower_price_variations['variations']) && is_array($lower_price_variations['variations'])) {
-                        foreach ($lower_price_variations['variations'] as $lower_price_variation) {
-                            $product_to_add_to_cart[$product_id]['variations'][] = $lower_price_variation;
-                        }
-                    }
-                    $product_to_add_to_cart['display_lower_price'] = true;
-                } else {
-                    $product_to_add_to_cart[$product_id]['variations'] = array();
-                }
-            } else {
-                $product_to_add_to_cart['text_from'] = '';
-                $product_to_add_to_cart[$product_id]['variations'] = (!empty($product_variation_type) && $product_variation_type == 'single') ? $single_variations : $combined_variations;
-            }
-        }
+	/**
+	 * Build the product structure with variation for product choosed by the user into frontend sheet
+	 *
+	 * @param array $selected_variation THe list of variation choosed by the user in product frontend sheet
+	 * @param integer $product_id The basic product choose by the user in frontend
+	 *
+	 * @return array The product list for adding to the cart build by variation priority
+	 */
+	public static function get_variation_by_priority($selected_variation, $product_id, $add_to_cart_action = false)
+	{
+		global $wpdb;
+		$all_required_variations_selected = $no_selected_variation = true;
+		$single_variations = $combined_variations = $product_to_add_to_cart = array();
+
+		// Check if all required variations are selected
+		$required_attributes_list = wpshop_prices::check_required_attributes($product_id);
+		foreach ($selected_variation as $k => $value) {
+			if ($value == 0 && in_array($k, $required_attributes_list)) {
+				$all_required_variations_selected = false;
+			}
+			if ($value != 0) {
+				$no_selected_variation = false;
+			}
+		}
+		if (!empty($selected_variation)) {
+			//Check variations configuration
+			$product_variation_configuration = get_post_meta($product_id, '_wpshop_variation_defining', true);
+			// Check variations type
+			$product_variation_type = (!empty($product_variation_configuration) && !empty($product_variation_configuration['variation_type'])) ? $product_variation_configuration['variation_type'] : 'single';
+			$product_to_add_to_cart[$product_id]['variation_priority'] = $product_variation_type;
+
+			//Check defined variation priority
+			$priority = (!empty($product_variation_configuration['options']) && !empty($product_variation_configuration['options']['priority'][0])) ? $product_variation_configuration['options']['priority'][0] : 'combined';
+			$product_to_add_to_cart[$product_id]['defined_variation_priority'] = $priority;
+
+			// Recover all product variations
+			$query_variation = $selected_variation;
+			// Delete free variations
+			unset($query_variation['free']);
+
+			if ($product_variation_type == 'single') {
+				// Get single variations
+				$single_variations = array();
+				foreach ($selected_variation as $attribute_code => $attribute_value) {
+					if (isset($attribute_value) && $attribute_code != 'free') {
+						$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->postmeta . " AS P_META INNER JOIN " . $wpdb->posts . " as P ON ((P.ID = P_META.post_id) AND (P.post_parent = %d)) WHERE P_META.meta_value = '" . serialize(array($attribute_code => $attribute_value)) . "' OR P_META.meta_value = '" . serialize(array($attribute_code => (int) $attribute_value)) . "'", $product_id);
+						$single_variation_id = $wpdb->get_var($query);
+						if (!empty($single_variation_id)) {
+							$single_variations[] = $single_variation_id;
+							unset($query_variation[$attribute_code]);
+						}
+					}
+				}
+			} else {
+				// Get combined variations
+				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->postmeta . " AS P_META INNER JOIN " . $wpdb->posts . " as P ON ((P.ID = P_META.post_id) AND (P.post_parent = %d)) WHERE P_META.meta_key = '_wpshop_variations_attribute_def' AND P_META.meta_value = '" . serialize($query_variation) . "'", $product_id);
+				$combined_variation_id = $wpdb->get_var($query);
+				if (!empty($combined_variation_id)) {
+					$combined_variations[] = $combined_variation_id;
+				}
 
-        return $product_to_add_to_cart;
-    }
+			}
 
-    public static function get_variation_price_behaviour($product_into_cart, $product_variations, $head_product_id, $variations_options)
-    {
-        global $wpdb;
-
-        if (!empty($product_variations)) {
-            // Initialize variations total price datas
-            $variations_total_price = array('price_et' => 0, 'vat_amount' => 0, 'price_ati' => 0);
-            $variations_discount_total_price = array('price_et' => 0, 'vat_amount' => 0, 'price_ati' => 0);
-            $vat_rate = 0;
-            $discount_amount = $discount_rate = $special_price = 0;
-            // Recover Head product metadata
-            $head_product_metadata = get_post_meta($head_product_id, '_wpshop_product_metadata', true);
-            $tva_rate_id = (!empty($head_product_metadata['tx_tva'])) ? $head_product_metadata['tx_tva'] : 0;
-            if (!empty($tva_rate_id)) {
-                // Recover VAT Rate of product
-                $query = $wpdb->prepare('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $tva_rate_id);
-                $vat_rate = $wpdb->get_var($query);
-            }
-            $price_piloting = get_option('wpshop_shop_price_piloting');
-            foreach ($product_variations as $product_variation) {
-                $variation_metadata['product_price'] = 0;
-                $variation_metadata = get_post_meta($product_variation, '_wpshop_product_metadata', true);
-                if (!empty($variation_metadata)) {
-                    $p_et = ((empty($price_piloting) || $price_piloting == 'TTC') ? ((!empty($variation_metadata['product_price']) ? $variation_metadata['product_price'] : 0) / (1 + ($vat_rate / 100))) : $variation_metadata['price_ht']);
-                    $p_ati = ((empty($price_piloting) || $price_piloting == 'TTC') ? (!empty($variation_metadata['product_price']) ? $variation_metadata['product_price'] : 0) : ($variation_metadata['price_ht'] * (1 + ($vat_rate / 100))));
-
-                    $variations_total_price['price_et'] += $p_et;
-                    $variations_total_price['price_ati'] += $p_ati;
-                    $variations_total_price['vat_amount'] += $p_ati - $p_et;
-
-                    $variation_metadata['tx_tva'] = $product_into_cart['tx_tva'] = $vat_rate;
-
-                    // Check discount
-                    $discount_config = wpshop_prices::check_discount_for_product($product_variation);
-                    if (!empty($discount_config) && !empty($discount_config['value'])) {
-                        $variation_discount_prices = wpshop_prices::calcul_discounted_price($variation_metadata, $discount_config);
-                        $variations_discount_total_price['price_et'] += $variation_discount_prices['price_ht'];
-                        $variations_discount_total_price['price_ati'] += $variation_discount_prices['product_price'];
-                        $variations_discount_total_price['vat_amount'] += $variation_discount_prices['tva'];
-
-                        if (!empty($discount_config['type']) && $discount_config['type'] == 'discount_amount') {
-                            $product_into_cart['discount_amount'] = $discount_amount + $product_into_cart['discount_amount'];
-                        } elseif (!empty($discount_config['type']) && $discount_config['type'] == 'discount_rate') {
-                            $product_into_cart['discount_rate'] = $discount_rate + $discount_config['value'];
-                        } elseif (!empty($discount_config['type']) && $discount_config['type'] == 'special_price') {
-                            $product_into_cart['special_price'] = $special_price + $discount_config['value'];
-                        }
-                    }
-
-                    $product_variation_def = wpshop_products::get_product_data($product_variation, true, '"publish", "draft"');
-                    $product_into_cart['item_meta']['variations'][$product_variation] = $product_variation_def;
-                }
-            }
-
-            // Check if add or replace variation price to head product
-            /**
-             * Since 1.4.3.7
-             * L'option du produit remplace le prix du produit de tête.
-             */
+			//If all required variations are not selected
+			if (!$all_required_variations_selected || $no_selected_variation) {
+				$product_to_add_to_cart['text_from'] = 'on';
+				// If we choose to display lower price variation combinaison
+				if (empty($product_variation_configuration) || (!empty($product_variation_configuration) && empty($product_variation_configuration['options'])) || (!empty($product_variation_configuration) && !empty($product_variation_configuration['options']) && !empty($product_variation_configuration['options']['price_display']) && !empty($product_variation_configuration['options']['price_display']['lower_price']))) {
+					//Get lower price variation combinaison
+					$lower_price_variations = wpshop_prices::check_product_lower_price($product_id);
+					if (!empty($lower_price_variations['variations']) && is_array($lower_price_variations['variations'])) {
+						foreach ($lower_price_variations['variations'] as $lower_price_variation) {
+							$product_to_add_to_cart[$product_id]['variations'][] = $lower_price_variation;
+						}
+					}
+					$product_to_add_to_cart['display_lower_price'] = true;
+				} else {
+					$product_to_add_to_cart[$product_id]['variations'] = array();
+				}
+			} else {
+				$product_to_add_to_cart['text_from'] = '';
+				$product_to_add_to_cart[$product_id]['variations'] = (!empty($product_variation_type) && $product_variation_type == 'single') ? $single_variations : $combined_variations;
+			}
+		}
+
+		return $product_to_add_to_cart;
+	}
+
+	public static function get_variation_price_behaviour($product_into_cart, $product_variations, $head_product_id, $variations_options)
+	{
+		global $wpdb;
+
+		if (!empty($product_variations)) {
+			// Initialize variations total price datas
+			$variations_total_price = array('price_et' => 0, 'vat_amount' => 0, 'price_ati' => 0);
+			$variations_discount_total_price = array('price_et' => 0, 'vat_amount' => 0, 'price_ati' => 0);
+			$vat_rate = 0;
+			$discount_amount = $discount_rate = $special_price = 0;
+			// Recover Head product metadata
+			$head_product_metadata = get_post_meta($head_product_id, '_wpshop_product_metadata', true);
+			$tva_rate_id = (!empty($head_product_metadata['tx_tva'])) ? $head_product_metadata['tx_tva'] : 0;
+			if (!empty($tva_rate_id)) {
+				// Recover VAT Rate of product
+				$query = $wpdb->prepare('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $tva_rate_id);
+				$vat_rate = $wpdb->get_var($query);
+			}
+			$price_piloting = get_option('wpshop_shop_price_piloting');
+			foreach ($product_variations as $product_variation) {
+				$variation_metadata['product_price'] = 0;
+				$variation_metadata = get_post_meta($product_variation, '_wpshop_product_metadata', true);
+				if (!empty($variation_metadata)) {
+					$p_et = ((empty($price_piloting) || $price_piloting == 'TTC') ? ((!empty($variation_metadata['product_price']) ? $variation_metadata['product_price'] : 0) / (1 + ($vat_rate / 100))) : $variation_metadata['price_ht']);
+					$p_ati = ((empty($price_piloting) || $price_piloting == 'TTC') ? (!empty($variation_metadata['product_price']) ? $variation_metadata['product_price'] : 0) : ($variation_metadata['price_ht'] * (1 + ($vat_rate / 100))));
+
+					$variations_total_price['price_et'] += $p_et;
+					$variations_total_price['price_ati'] += $p_ati;
+					$variations_total_price['vat_amount'] += $p_ati - $p_et;
+
+					$variation_metadata['tx_tva'] = $product_into_cart['tx_tva'] = $vat_rate;
+
+					// Check discount
+					$discount_config = wpshop_prices::check_discount_for_product($product_variation);
+					if (!empty($discount_config) && !empty($discount_config['value'])) {
+						$variation_discount_prices = wpshop_prices::calcul_discounted_price($variation_metadata, $discount_config);
+						$variations_discount_total_price['price_et'] += $variation_discount_prices['price_ht'];
+						$variations_discount_total_price['price_ati'] += $variation_discount_prices['product_price'];
+						$variations_discount_total_price['vat_amount'] += $variation_discount_prices['tva'];
+
+						if (!empty($discount_config['type']) && $discount_config['type'] == 'discount_amount') {
+							$product_into_cart['discount_amount'] = $discount_amount + $product_into_cart['discount_amount'];
+						} elseif (!empty($discount_config['type']) && $discount_config['type'] == 'discount_rate') {
+							$product_into_cart['discount_rate'] = $discount_rate + $discount_config['value'];
+						} elseif (!empty($discount_config['type']) && $discount_config['type'] == 'special_price') {
+							$product_into_cart['special_price'] = $special_price + $discount_config['value'];
+						}
+					}
+
+					$product_variation_def = wpshop_products::get_product_data($product_variation, true, '"publish", "draft"');
+					$product_into_cart['item_meta']['variations'][$product_variation] = $product_variation_def;
+				}
+			}
+
+			// Check if add or replace variation price to head product
+			/**
+			 * Since 1.4.3.7
+			 * L'option du produit remplace le prix du produit de tête.
+			 */
 			if( true ) {
-                //Replace the product price
-                if (!empty($variations_discount_total_price) && !empty($variations_discount_total_price['price_ati'])) {
-                    $product_into_cart['price_ttc_before_discount'] = $variations_total_price['price_ati'];
-                    $product_into_cart['price_ht_before_discount'] = $variations_total_price['price_et'];
-
-                    $product_into_cart['product_price'] = $variations_discount_total_price['price_ati'];
-                    $product_into_cart['price_ht'] = $variations_discount_total_price['price_et'];
-                    $product_into_cart['tva'] = $variations_discount_total_price['vat_amount'];
-                } else {
-                    $product_into_cart['product_price'] = $variations_total_price['price_ati'];
-                    $product_into_cart['price_ht'] = $variations_total_price['price_et'];
-                    $product_into_cart['tva'] = $variations_total_price['vat_amount'];
-                }
-            } else {
-                // Add variations price to product price
-                if (!empty($variations_discount_total_price) && !empty($variations_discount_total_price['price_ati'])) {
-                    $product_into_cart['price_ttc_before_discount'] = ($product_into_cart['product_price'] + $variations_total_price['price_ati']);
-                    $product_into_cart['price_ht_before_discount'] = ($product_into_cart['price_ht'] + $variations_total_price['price_et']);
-
-                    $product_into_cart['product_price'] += $variations_discount_total_price['price_ati'];
-                    $product_into_cart['price_ht'] += $variations_discount_total_price['price_et'];
-                    $product_into_cart['tva'] += $variations_discount_total_price['vat_amount'];
-                } else {
-                    $product_into_cart['product_price'] += $variations_total_price['price_ati'];
-                    $product_into_cart['price_ht'] += $variations_total_price['price_et'];
-                    $product_into_cart['tva'] += $variations_total_price['vat_amount'];
-                }
-                // Check parent discount
-                $parent_discount_config = wpshop_prices::check_discount_for_product($head_product_id);
-                if (!empty($parent_discount_config)) {
-                    $product_into_cart['price_ttc_before_discount'] = (!empty($product_into_cart['price_ttc_before_discount'])) ? $product_into_cart['price_ttc_before_discount'] : $product_into_cart['product_price'];
-                    $product_into_cart['price_ht_before_discount'] = (!empty($product_into_cart['price_ht_before_discount'])) ? $product_into_cart['price_ht_before_discount'] : $product_into_cart['price_ht'];
-                    $product_into_cart = wpshop_prices::calcul_discounted_price($product_into_cart, $parent_discount_config);
-
-                    if (!empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_amount') {
-                        $product_into_cart['discount_amount'] = $discount_amount + $parent_discount_config['value'];
-                    } elseif (!empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_rate') {
-                        $product_into_cart['discount_rate'] = $discount_rate + $parent_discount_config['value'];
-                    } elseif (!empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'special_price') {
-                        $product_into_cart['special_price'] = $special_price + $parent_discount_config['value'];
-                    }
-                }
-            }
-        } else {
-            // If product have just Free variations
-            $discount_config = wpshop_prices::check_discount_for_product($head_product_id);
-            if (!empty($discount_config)) {
-                $product_into_cart['price_ttc_before_discount'] = (!empty($product_into_cart['price_ttc_before_discount'])) ? $product_into_cart['price_ttc_before_discount'] : $product_into_cart['product_price'];
-                $product_into_cart['price_ht_before_discount'] = (!empty($product_into_cart['price_ht_before_discount'])) ? $product_into_cart['price_ht_before_discount'] : $product_into_cart['price_ht'];
-                $product_into_cart = wpshop_prices::calcul_discounted_price($product_into_cart, $discount_config);
-            }
-        }
+				//Replace the product price
+				if (!empty($variations_discount_total_price) && !empty($variations_discount_total_price['price_ati'])) {
+					$product_into_cart['price_ttc_before_discount'] = $variations_total_price['price_ati'];
+					$product_into_cart['price_ht_before_discount'] = $variations_total_price['price_et'];
+
+					$product_into_cart['product_price'] = $variations_discount_total_price['price_ati'];
+					$product_into_cart['price_ht'] = $variations_discount_total_price['price_et'];
+					$product_into_cart['tva'] = $variations_discount_total_price['vat_amount'];
+				} else {
+					$product_into_cart['product_price'] = $variations_total_price['price_ati'];
+					$product_into_cart['price_ht'] = $variations_total_price['price_et'];
+					$product_into_cart['tva'] = $variations_total_price['vat_amount'];
+				}
+			} else {
+				// Add variations price to product price
+				if (!empty($variations_discount_total_price) && !empty($variations_discount_total_price['price_ati'])) {
+					$product_into_cart['price_ttc_before_discount'] = ($product_into_cart['product_price'] + $variations_total_price['price_ati']);
+					$product_into_cart['price_ht_before_discount'] = ($product_into_cart['price_ht'] + $variations_total_price['price_et']);
+
+					$product_into_cart['product_price'] += $variations_discount_total_price['price_ati'];
+					$product_into_cart['price_ht'] += $variations_discount_total_price['price_et'];
+					$product_into_cart['tva'] += $variations_discount_total_price['vat_amount'];
+				} else {
+					$product_into_cart['product_price'] += $variations_total_price['price_ati'];
+					$product_into_cart['price_ht'] += $variations_total_price['price_et'];
+					$product_into_cart['tva'] += $variations_total_price['vat_amount'];
+				}
+				// Check parent discount
+				$parent_discount_config = wpshop_prices::check_discount_for_product($head_product_id);
+				if (!empty($parent_discount_config)) {
+					$product_into_cart['price_ttc_before_discount'] = (!empty($product_into_cart['price_ttc_before_discount'])) ? $product_into_cart['price_ttc_before_discount'] : $product_into_cart['product_price'];
+					$product_into_cart['price_ht_before_discount'] = (!empty($product_into_cart['price_ht_before_discount'])) ? $product_into_cart['price_ht_before_discount'] : $product_into_cart['price_ht'];
+					$product_into_cart = wpshop_prices::calcul_discounted_price($product_into_cart, $parent_discount_config);
+
+					if (!empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_amount') {
+						$product_into_cart['discount_amount'] = $discount_amount + $parent_discount_config['value'];
+					} elseif (!empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_rate') {
+						$product_into_cart['discount_rate'] = $discount_rate + $parent_discount_config['value'];
+					} elseif (!empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'special_price') {
+						$product_into_cart['special_price'] = $special_price + $parent_discount_config['value'];
+					}
+				}
+			}
+		} else {
+			// If product have just Free variations
+			$discount_config = wpshop_prices::check_discount_for_product($head_product_id);
+			if (!empty($discount_config)) {
+				$product_into_cart['price_ttc_before_discount'] = (!empty($product_into_cart['price_ttc_before_discount'])) ? $product_into_cart['price_ttc_before_discount'] : $product_into_cart['product_price'];
+				$product_into_cart['price_ht_before_discount'] = (!empty($product_into_cart['price_ht_before_discount'])) ? $product_into_cart['price_ht_before_discount'] : $product_into_cart['price_ht'];
+				$product_into_cart = wpshop_prices::calcul_discounted_price($product_into_cart, $discount_config);
+			}
+		}
 
-        // Text From indicator
-        if (!empty($variations_options) && !empty($variations_options['text_from'])) {
-            $product_into_cart['text_from'] = $variations_options['text_from'];
-        }
-        return $product_into_cart;
-    }
+		// Text From indicator
+		if (!empty($variations_options) && !empty($variations_options['text_from'])) {
+			$product_into_cart['text_from'] = $variations_options['text_from'];
+		}
+		return $product_into_cart;
+	}
 
-    /**
-     * Read an array with product options chosen by the customer, order into an array regarding admin definition
-     *
-     * @param array $product_definition_value The array with the selected product option to ordered
-     * @param array $output_order The good order for attribute defined by administrator
-     * @param dtring $from_page A string allowing to take a specific template regarding the current page
-     *
-     * @return array The array containing all product options ordered as the admin configure it
-     */
-    public static function get_selected_variation_display($product_definition_value, $output_order, $from_page = null, $template_part = 'wpshop', $output_type = null)
-    {
-        $variation_attribute_ordered = array();
-        $variation_attribute_ordered['prices'] = array();
-        $variation_attribute_ordered['attribute_list'] = array();
-
-        if (!empty($product_definition_value['variation_definition']) && is_array($product_definition_value['variation_definition'])) {
-            foreach ($product_definition_value['variation_definition'] as $variation_attribute_code => $variation_attribute_detail) {
-                $variation_tpl_component = array();
-                foreach ($variation_attribute_detail as $info_name => $info_value) {
-                    $variation_tpl_component['VARIATION_' . strtoupper($info_name)] = in_array($info_name, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ? wpshop_display::format_field_output('wpshop_product_price', $info_value) : stripslashes($info_value);
-                }
-                $variation_tpl_component['VARIATION_ID'] = $variation_attribute_code;
-                $variation_tpl_component['VARIATION_ATT_CODE'] = $variation_attribute_code;
-                if (!empty($output_order[$variation_attribute_code])) {
-                    $display_data = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $variation_attribute_code), $template_part);
-                    if (!in_array($display_data, $variation_attribute_ordered['attribute_list'])) {
-                        $variation_attribute_ordered['attribute_list'][$output_order[$variation_attribute_code]] = $display_data;
-                    }
-                } else {
-                    $display_data = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $variation_attribute_code), $template_part);
-                    if (!in_array($display_data, $variation_attribute_ordered['attribute_list'])) {
-                        $variation_attribute_ordered['attribute_list'][] = $display_data;
-                    }
-                }
-                unset($variation_tpl_component);
-            }
-        }
+	/**
+	 * Read an array with product options chosen by the customer, order into an array regarding admin definition
+	 *
+	 * @param array $product_definition_value The array with the selected product option to ordered
+	 * @param array $output_order The good order for attribute defined by administrator
+	 * @param dtring $from_page A string allowing to take a specific template regarding the current page
+	 *
+	 * @return array The array containing all product options ordered as the admin configure it
+	 */
+	public static function get_selected_variation_display($product_definition_value, $output_order, $from_page = null, $template_part = 'wpshop', $output_type = null)
+	{
+		$variation_attribute_ordered = array();
+		$variation_attribute_ordered['prices'] = array();
+		$variation_attribute_ordered['attribute_list'] = array();
+
+		if (!empty($product_definition_value['variation_definition']) && is_array($product_definition_value['variation_definition'])) {
+			foreach ($product_definition_value['variation_definition'] as $variation_attribute_code => $variation_attribute_detail) {
+				$variation_tpl_component = array();
+				foreach ($variation_attribute_detail as $info_name => $info_value) {
+					$variation_tpl_component['VARIATION_' . strtoupper($info_name)] = in_array($info_name, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ? wpshop_display::format_field_output('wpshop_product_price', $info_value) : stripslashes($info_value);
+				}
+				$variation_tpl_component['VARIATION_ID'] = $variation_attribute_code;
+				$variation_tpl_component['VARIATION_ATT_CODE'] = $variation_attribute_code;
+				if (!empty($output_order[$variation_attribute_code])) {
+					$display_data = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $variation_attribute_code), $template_part);
+					if (!in_array($display_data, $variation_attribute_ordered['attribute_list'])) {
+						$variation_attribute_ordered['attribute_list'][$output_order[$variation_attribute_code]] = $display_data;
+					}
+				} else {
+					$display_data = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $variation_attribute_code), $template_part);
+					if (!in_array($display_data, $variation_attribute_ordered['attribute_list'])) {
+						$variation_attribute_ordered['attribute_list'][] = $display_data;
+					}
+				}
+				unset($variation_tpl_component);
+			}
+		}
 
-        if (!empty($product_definition_value['variations']) && is_array($product_definition_value['variations'])) {
-            foreach ($product_definition_value['variations'] as $variation_id => $variation_details) {
-                $variation_tpl_component = array();
-                foreach ($variation_details as $info_name => $info_value) {
-                    if ($info_name != 'item_meta') {
-                        $variation_tpl_component['VARIATION_DETAIL_' . strtoupper($info_name)] = in_array($info_name, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ? wpshop_display::format_field_output('wpshop_product_price', $info_value) : stripslashes($info_value);
-                    }
-                }
-                foreach ($variation_details['item_meta']['variation_definition'] as $variation_attribute_code => $variation_attribute_def) {
-                    $variation_tpl_component['VARIATION_NAME'] = stripslashes($variation_attribute_def['NAME']);
-                    $variation_tpl_component['VARIATION_VALUE'] = stripslashes($variation_attribute_def['VALUE']);
-                    $variation_tpl_component['VARIATION_ID'] = $variation_id;
-                    $variation_tpl_component['VARIATION_ATT_CODE'] = $variation_attribute_code;
-
-                    $variation_attribute_ordered['prices'][$variation_attribute_code] = $variation_tpl_component['VARIATION_DETAIL_PRODUCT_PRICE'];
-                }
-                if (!empty($output_order[$variation_attribute_code])) {
-                    $variation_attribute_ordered['attribute_list'][$output_order[$variation_attribute_code]] = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $variation_attribute_code), $template_part);
-                }
-                unset($variation_tpl_component);
-            }
-        }
+		if (!empty($product_definition_value['variations']) && is_array($product_definition_value['variations'])) {
+			foreach ($product_definition_value['variations'] as $variation_id => $variation_details) {
+				$variation_tpl_component = array();
+				foreach ($variation_details as $info_name => $info_value) {
+					if ($info_name != 'item_meta') {
+						$variation_tpl_component['VARIATION_DETAIL_' . strtoupper($info_name)] = in_array($info_name, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ? wpshop_display::format_field_output('wpshop_product_price', $info_value) : stripslashes($info_value);
+					}
+				}
+				foreach ($variation_details['item_meta']['variation_definition'] as $variation_attribute_code => $variation_attribute_def) {
+					$variation_tpl_component['VARIATION_NAME'] = stripslashes($variation_attribute_def['NAME']);
+					$variation_tpl_component['VARIATION_VALUE'] = stripslashes($variation_attribute_def['VALUE']);
+					$variation_tpl_component['VARIATION_ID'] = $variation_id;
+					$variation_tpl_component['VARIATION_ATT_CODE'] = $variation_attribute_code;
 
-        /**    Free Variation part    */
-        if (!empty($product_definition_value['free_variation']) && is_array($product_definition_value['free_variation'])) {
-            foreach ($product_definition_value['free_variation'] as $build_variation_key => $build_variation) {
-                if (strpos($build_variation, '-_variation_val_-')) {
-                    $variation_definition = explode('-_variation_val_-', $build_variation);
-                    $attribute_code = $variation_definition[0];
-                    $attribute_selected_value = $variation_definition[1];
-                } else {
-                    $attribute_code = $build_variation_key;
-                    $attribute_selected_value = $build_variation;
-                }
-
-                $free_variation_attribute_def = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
-                $variation_tpl_component['VARIATION_NAME'] = stripslashes($free_variation_attribute_def->frontend_label);
-                $value_to_outut = $attribute_selected_value;
-                switch ($free_variation_attribute_def->data_type) {
-                    case 'datetime':
-                        $value_to_outut = mysql2date(get_option('date_format'), $attribute_selected_value, true);
-                        break;
-                }
-
-                if (in_array($free_variation_attribute_def->backend_input, array('select', 'multiple-select'))) {
-                    switch ($free_variation_attribute_def->data_type_to_use) {
-                        case 'custom':
-                        case 'internal':
-                            $possible_values = wpshop_attributes::get_select_output($free_variation_attribute_def);
-                            $value_to_outut = $possible_values['possible_value'][$attribute_selected_value];
-                            break;
-                    }
-                }
-                $variation_tpl_component['VARIATION_VALUE'] = stripslashes($value_to_outut);
-                $variation_tpl_component['VARIATION_ID'] = $attribute_code;
-                $variation_tpl_component['VARIATION_ATT_CODE'] = $attribute_code;
-                if (!empty($value_to_outut) && !empty($output_order[$free_variation_attribute_def->code])) {
-                    $display_data = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $attribute_code), $template_part);
-                    if (!in_array($display_data, $variation_attribute_ordered['attribute_list'])) {
-                        $variation_attribute_ordered['attribute_list'][$output_order[$free_variation_attribute_def->code]] = $display_data;
-                    }
-                }
-                unset($variation_tpl_component);
-            }
-        }
-        return $variation_attribute_ordered;
-    }
+					$variation_attribute_ordered['prices'][$variation_attribute_code] = $variation_tpl_component['VARIATION_DETAIL_PRODUCT_PRICE'];
+				}
+				if (!empty($output_order[$variation_attribute_code])) {
+					$variation_attribute_ordered['attribute_list'][$output_order[$variation_attribute_code]] = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $variation_attribute_code), $template_part);
+				}
+				unset($variation_tpl_component);
+			}
+		}
 
-    public function wps_selected_variation_picture($head_product_id, $variations)
-    {
-        $response = array();
-        /** Selected Product image **/
-        $post_thumbnail_id = get_post_thumbnail_id($head_product_id);
-        if (!empty($post_thumbnail_id)) {
-            $response['img_id'] = $post_thumbnail_id;
-            $response['img'] = wp_get_attachment_image($post_thumbnail_id, 'wpshop-product-galery');
-            $response['img_url'] = wp_get_attachment_url($post_thumbnail_id);
-        }
+		/**    Free Variation part    */
+		if (!empty($product_definition_value['free_variation']) && is_array($product_definition_value['free_variation'])) {
+			foreach ($product_definition_value['free_variation'] as $build_variation_key => $build_variation) {
+				if (strpos($build_variation, '-_variation_val_-')) {
+					$variation_definition = explode('-_variation_val_-', $build_variation);
+					$attribute_code = $variation_definition[0];
+					$attribute_selected_value = $variation_definition[1];
+				} else {
+					$attribute_code = $build_variation_key;
+					$attribute_selected_value = $build_variation;
+				}
 
-        /** check if have one variation **/
-        if (!empty($variations) && count($variations) == 1) {
-            $variation_attached_image_id = get_post_meta($variations[0], '_wps_variation_attached_picture', true);
-            if (!empty($variation_attached_image_id)) {
-                $response['img_id'] = $variation_attached_image_id;
-                $response['img'] = wp_get_attachment_image($variation_attached_image_id, 'wpshop-product-galery');
-                $response['img_url'] = wp_get_attachment_url($variation_attached_image_id);
-            }
-        }
-        return $response;
-    }
+				$free_variation_attribute_def = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
+				$variation_tpl_component['VARIATION_NAME'] = stripslashes($free_variation_attribute_def->frontend_label);
+				$value_to_outut = $attribute_selected_value;
+				switch ($free_variation_attribute_def->data_type) {
+					case 'datetime':
+						$value_to_outut = mysql2date(get_option('date_format'), $attribute_selected_value, true);
+						break;
+				}
 
-    /** Add a meta box of product sales history in product administration panel **/
-    public function meta_box_product_sale_informations()
-    {
-        global $post;
-        $product_id = $post->ID;
-
-        $variations = self::get_variation($product_id);
-
-        $sales_informations = array();
-        /** Query **/
-        $data_to_compare = '"item_id";s:' . strlen($product_id) . ':"' . $product_id . '";';
-        $query_args = array('posts_per_page' => -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'] : '',
-                );
-            }
-        }
+				if (in_array($free_variation_attribute_def->backend_input, array('select', 'multiple-select'))) {
+					switch ($free_variation_attribute_def->data_type_to_use) {
+						case 'custom':
+						case 'internal':
+							$possible_values = wpshop_attributes::get_select_output($free_variation_attribute_def);
+							$value_to_outut = $possible_values['possible_value'][$attribute_selected_value];
+							break;
+					}
+				}
+				$variation_tpl_component['VARIATION_VALUE'] = stripslashes($value_to_outut);
+				$variation_tpl_component['VARIATION_ID'] = $attribute_code;
+				$variation_tpl_component['VARIATION_ATT_CODE'] = $attribute_code;
+				if (!empty($value_to_outut) && !empty($output_order[$free_variation_attribute_def->code])) {
+					$display_data = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $attribute_code), $template_part);
+					if (!in_array($display_data, $variation_attribute_ordered['attribute_list'])) {
+						$variation_attribute_ordered['attribute_list'][$output_order[$free_variation_attribute_def->code]] = $display_data;
+					}
+				}
+				unset($variation_tpl_component);
+			}
+		}
+		return $variation_attribute_ordered;
+	}
 
-        /** If product has been ordered **/
-        $output = '';
-        if (!empty($sales_informations)) {
-            $output .= '<p>' . __('This product has been ordered', 'wpshop') . ' :</p>';
-            $output .= '<ul>';
-            foreach ($sales_informations as $sales_information) {
-                $output .= '<li>' . sprintf(__('Ordered by %s %s (%s) on %s (Order ref. : %s)', 'wpshop'), $sales_information['customer_name'], $sales_information['customer_firstname'], $sales_information['customer_email'], $sales_information['order_date'], $sales_information['order_key']) . '</li>';
-            }
-            $output .= '</ul>';
-        } else {
-            $output .= __('This product has never been ordered', 'wpshop');
-        }
+	public function wps_selected_variation_picture($head_product_id, $variations)
+	{
+		$response = array();
+		/** Selected Product image **/
+		$post_thumbnail_id = get_post_thumbnail_id($head_product_id);
+		if (!empty($post_thumbnail_id)) {
+			$response['img_id'] = $post_thumbnail_id;
+			$response['img'] = wp_get_attachment_image($post_thumbnail_id, 'wpshop-product-galery');
+			$response['img_url'] = wp_get_attachment_url($post_thumbnail_id);
+		}
 
-        echo $output;
-    }
+		/** check if have one variation **/
+		if (!empty($variations) && count($variations) == 1) {
+			$variation_attached_image_id = get_post_meta($variations[0], '_wps_variation_attached_picture', true);
+			if (!empty($variation_attached_image_id)) {
+				$response['img_id'] = $variation_attached_image_id;
+				$response['img'] = wp_get_attachment_image($variation_attached_image_id, 'wpshop-product-galery');
+				$response['img_url'] = wp_get_attachment_url($variation_attached_image_id);
+			}
+		}
+		return $response;
+	}
 
-    public function wps_get_summary_variations_product($product_id, $the_product, $has_variation)
-    {
-        global $wpdb, $wpshop_payment;
-        $output = '';
-        $tpl_component = array();
-        /**    Get attribute order for current product    */
-        $product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($product_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
-        $output_order = array();
-        if (count($product_attribute_order_detail) > 0) {
-            foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
-                foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
-                    if (!empty($attribute_def->code)) {
-                        $output_order[$attribute_def->code] = $position;
-                    }
-
-                }
-            }
-        }
-        $variation_attribute_ordered = array();
-
-        /** Check if product is a variation and change his name **/
-        $product_post_type = get_post_type($the_product['product_id']);
-        if (!empty($product_post_type) && $product_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
-            $parent_infos = wpshop_products::get_parent_variation($the_product['product_id']);
-            $parent_post = (!empty($parent_infos) && !empty($parent_infos['parent_post'])) ? $parent_infos['parent_post'] : array();
-            $the_product['product_name'] = $the_product['post_title'] = $parent_post->post_title;
-        }
+	/** Add a meta box of product sales history in product administration panel **/
+	public function meta_box_product_sale_informations()
+	{
+		global $post;
+		$product_id = $post->ID;
+
+		$variations = self::get_variation($product_id);
+
+		$sales_informations = array();
+		/** Query **/
+		$data_to_compare = '"item_id";s:' . strlen($product_id) . ':"' . $product_id . '";';
+		$query_args = array('posts_per_page' => -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'] : '',
+				);
+			}
+		}
 
-        foreach ($the_product as $product_definition_key => $product_definition_value) {
-            if ($product_definition_key != 'item_meta') {
-                $tpl_component['PRODUCT_MAIN_INFO_' . strtoupper($product_definition_key)] = $product_definition_value;
-                if (!empty($wpshop_current_for_display) && in_array($product_definition_key, unserialize(WPSHOP_ATTRIBUTE_PRICES))) {
-                    $tpl_component['PRODUCT_MAIN_INFO_' . strtoupper($product_definition_key)] = $product_definition_value;
-                }
-            } else {
-                $variation_attribute_ordered = wpshop_products::get_selected_variation_display($product_definition_value, $output_order, 'selection_summary');
-            }
-        }
+		/** If product has been ordered **/
+		$output = '';
+		if (!empty($sales_informations)) {
+			$output .= '<p>' . __('This product has been ordered', 'wpshop') . ' :</p>';
+			$output .= '<ul>';
+			foreach ($sales_informations as $sales_information) {
+				$output .= '<li>' . sprintf(__('Ordered by %s %s (%s) on %s (Order ref. : %s)', 'wpshop'), $sales_information['customer_name'], $sales_information['customer_firstname'], $sales_information['customer_email'], $sales_information['order_date'], $sales_information['order_key']) . '</li>';
+			}
+			$output .= '</ul>';
+		} else {
+			$output .= __('This product has never been ordered', 'wpshop');
+		}
 
-        ksort($variation_attribute_ordered['attribute_list']);
-        $tpl_component['PRODUCT_VARIATION_SUMMARY_DETAILS'] = '';
-        foreach ($variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output) {
-            $tpl_component['PRODUCT_VARIATION_SUMMARY_DETAILS'] .= $attribute_variation_to_output;
-        }
+		echo $output;
+	}
 
-        /**    For security get all attributes defined as user defined or used in variation in order to set default value to empty    */
-        $attribute_list = wpshop_attributes::getElement('yes', "'valid'", "is_used_for_variation", true);
-        if (!empty($attribute_list)) {
-            foreach ($attribute_list as $attribute_def) {
-                $tpl_component['VARIATION_SUMMARY_ATTRIBUTE_PER_PRICE_' . strtoupper($attribute_def->code)] = '-';
-            }
-        }
+	public function wps_get_summary_variations_product($product_id, $the_product, $has_variation)
+	{
+		global $wpdb, $wpshop_payment;
+		$output = '';
+		$tpl_component = array();
+		/**    Get attribute order for current product    */
+		$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($product_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
+		$output_order = array();
+		if (count($product_attribute_order_detail) > 0) {
+			foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
+				foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
+					if (!empty($attribute_def->code)) {
+						$output_order[$attribute_def->code] = $position;
+					}
 
-        /**    Fill the array with all prices for different variations    */
-        foreach ($variation_attribute_ordered['prices'] as $attribute => $prices) {
-            $tpl_component['VARIATION_SUMMARY_ATTRIBUTE_PER_PRICE_' . strtoupper($attribute)] = $prices;
-        }
+				}
+			}
+		}
+		$variation_attribute_ordered = array();
+
+		/** Check if product is a variation and change his name **/
+		$product_post_type = get_post_type($the_product['product_id']);
+		if (!empty($product_post_type) && $product_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+			$parent_infos = wpshop_products::get_parent_variation($the_product['product_id']);
+			$parent_post = (!empty($parent_infos) && !empty($parent_infos['parent_post'])) ? $parent_infos['parent_post'] : array();
+			$the_product['product_name'] = $the_product['post_title'] = $parent_post->post_title;
+		}
 
-        $tpl_component['PRODUCT_VARIATION_SUMMARY_MORE_CONTENT'] = '';
-        $query = $wpdb->prepare("SELECT post_id, meta_value FROM " . $wpdb->postmeta . " WHERE meta_key = %s ", '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options');
-        $post_list_with_options = $wpdb->get_results($query);
-        if (!empty($post_list_with_options)) {
-            $additionnal_price = 0;
-            foreach ($post_list_with_options as $product_info) {
-                $product_meta = unserialize($product_info->meta_value);
-                if (!empty($product_meta['cart']) && !empty($product_meta['cart']['auto_add']) && ($product_meta['cart']['auto_add'] == 'yes')) {
-                    $product = wpshop_products::get_product_data($product_info->post_id, true, '"publish", "draft"');
-
-                    $the_product = array_merge(array(
-                        'product_id' => $product_info->post_id,
-                        'product_qty' => 1,
-                    ), $product);
-
-                    $additionnal_price += (!$different_currency || ($change_rate == 1)) ? $the_product['product_price'] : ($the_product['product_price'] * $change_rate);
-                    $tpl_component['AUTO_PRODUCT_NAME'] = $the_product['product_name'];
-
-                    $tpl_component['AUTO_PRODUCT_PRODUCT_PRICE'] = wpshop_display::format_field_output('wpshop_product_price', (!$different_currency || ($change_rate == 1)) ? $the_product['product_price'] : ($the_product['product_price'] * $change_rate));
-                    $tpl_component['PRODUCT_VARIATION_SUMMARY_MORE_CONTENT'] = wpshop_display::display_template_element('wpshop_product_configuration_summary_detail_auto_product', $tpl_component);
-                }
-            }
-        }
+		foreach ($the_product as $product_definition_key => $product_definition_value) {
+			if ($product_definition_key != 'item_meta') {
+				$tpl_component['PRODUCT_MAIN_INFO_' . strtoupper($product_definition_key)] = $product_definition_value;
+				if (!empty($wpshop_current_for_display) && in_array($product_definition_key, unserialize(WPSHOP_ATTRIBUTE_PRICES))) {
+					$tpl_component['PRODUCT_MAIN_INFO_' . strtoupper($product_definition_key)] = $product_definition_value;
+				}
+			} else {
+				$variation_attribute_ordered = wpshop_products::get_selected_variation_display($product_definition_value, $output_order, 'selection_summary');
+			}
+		}
 
-        $tpl_component['PRODUCT_VARIATION_SUMMARY_GRAND_TOTAL'] = '';
-        $tpl_component['SUMMARY_FINAL_RESULT_PRICE_NO_FORMAT'] = '';
-        if (!empty($additionnal_price)) {
-            $tpl_component['SUMMARY_FINAL_RESULT_PRICE'] = wpshop_display::format_field_output('wpshop_product_price', $tpl_component['PRODUCT_MAIN_INFO_PRODUCT_PRICE'] + $additionnal_price);
-            $tpl_component['SUMMARY_FINAL_RESULT_PRICE_NO_FORMAT'] = ($tpl_component['PRODUCT_MAIN_INFO_PRODUCT_PRICE'] + $additionnal_price);
-            $tpl_component['PRODUCT_VARIATION_SUMMARY_GRAND_TOTAL'] = wpshop_display::display_template_element('wpshop_product_configuration_summary_detail_final_result', $tpl_component);
-        }
+		ksort($variation_attribute_ordered['attribute_list']);
+		$tpl_component['PRODUCT_VARIATION_SUMMARY_DETAILS'] = '';
+		foreach ($variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output) {
+			$tpl_component['PRODUCT_VARIATION_SUMMARY_DETAILS'] .= $attribute_variation_to_output;
+		}
 
-        /**    Call informtion for partial payment    */
-        $partial_payment = $wpshop_payment->partial_payment_calcul($tpl_component['SUMMARY_FINAL_RESULT_PRICE_NO_FORMAT']);
-        $tpl_component['PARTIAL_PAYMENT_INFO'] = !empty($partial_payment['amount_to_pay']) ? $partial_payment['display'] : '';
+		/**    For security get all attributes defined as user defined or used in variation in order to set default value to empty    */
+		$attribute_list = wpshop_attributes::getElement('yes', "'valid'", "is_used_for_variation", true);
+		if (!empty($attribute_list)) {
+			foreach ($attribute_list as $attribute_def) {
+				$tpl_component['VARIATION_SUMMARY_ATTRIBUTE_PER_PRICE_' . strtoupper($attribute_def->code)] = '-';
+			}
+		}
 
-        /**    Define the current selected currency for the order summary    */
+		/**    Fill the array with all prices for different variations    */
+		foreach ($variation_attribute_ordered['prices'] as $attribute => $prices) {
+			$tpl_component['VARIATION_SUMMARY_ATTRIBUTE_PER_PRICE_' . strtoupper($attribute)] = $prices;
+		}
+
+		$tpl_component['PRODUCT_VARIATION_SUMMARY_MORE_CONTENT'] = '';
+		$query = $wpdb->prepare("SELECT post_id, meta_value FROM " . $wpdb->postmeta . " WHERE meta_key = %s ", '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options');
+		$post_list_with_options = $wpdb->get_results($query);
+		if (!empty($post_list_with_options)) {
+			$additionnal_price = 0;
+			foreach ($post_list_with_options as $product_info) {
+				$product_meta = unserialize($product_info->meta_value);
+				if (!empty($product_meta['cart']) && !empty($product_meta['cart']['auto_add']) && ($product_meta['cart']['auto_add'] == 'yes')) {
+					$product = wpshop_products::get_product_data($product_info->post_id, true, '"publish", "draft"');
+
+					$the_product = array_merge(array(
+						'product_id' => $product_info->post_id,
+						'product_qty' => 1,
+					), $product);
+
+					$additionnal_price += (!$different_currency || ($change_rate == 1)) ? $the_product['product_price'] : ($the_product['product_price'] * $change_rate);
+					$tpl_component['AUTO_PRODUCT_NAME'] = $the_product['product_name'];
+
+					$tpl_component['AUTO_PRODUCT_PRODUCT_PRICE'] = wpshop_display::format_field_output('wpshop_product_price', (!$different_currency || ($change_rate == 1)) ? $the_product['product_price'] : ($the_product['product_price'] * $change_rate));
+					$tpl_component['PRODUCT_VARIATION_SUMMARY_MORE_CONTENT'] = wpshop_display::display_template_element('wpshop_product_configuration_summary_detail_auto_product', $tpl_component);
+				}
+			}
+		}
+
+		$tpl_component['PRODUCT_VARIATION_SUMMARY_GRAND_TOTAL'] = '';
+		$tpl_component['SUMMARY_FINAL_RESULT_PRICE_NO_FORMAT'] = '';
+		if (!empty($additionnal_price)) {
+			$tpl_component['SUMMARY_FINAL_RESULT_PRICE'] = wpshop_display::format_field_output('wpshop_product_price', $tpl_component['PRODUCT_MAIN_INFO_PRODUCT_PRICE'] + $additionnal_price);
+			$tpl_component['SUMMARY_FINAL_RESULT_PRICE_NO_FORMAT'] = ($tpl_component['PRODUCT_MAIN_INFO_PRODUCT_PRICE'] + $additionnal_price);
+			$tpl_component['PRODUCT_VARIATION_SUMMARY_GRAND_TOTAL'] = wpshop_display::display_template_element('wpshop_product_configuration_summary_detail_final_result', $tpl_component);
+		}
+
+		/**    Call informtion for partial payment    */
+		$partial_payment = $wpshop_payment->partial_payment_calcul($tpl_component['SUMMARY_FINAL_RESULT_PRICE_NO_FORMAT']);
+		$tpl_component['PARTIAL_PAYMENT_INFO'] = !empty($partial_payment['amount_to_pay']) ? $partial_payment['display'] : '';
+
+		/**    Define the current selected currency for the order summary    */
 //         $response['product_output'] = $has_variation ? wpshop_display::display_template_element('wpshop_product_configuration_summary_detail', $tpl_component) : '';
-        $output = $has_variation ? wpshop_display::display_template_element('wpshop_product_configuration_summary_detail', $tpl_component) : '';
-        return $output;
-    }
+		$output = $has_variation ? wpshop_display::display_template_element('wpshop_product_configuration_summary_detail', $tpl_component) : '';
+		return $output;
+	}
 
-    /**
-     * Get product ID if ID = "id-parent__id-variation" or "id-variation" or "id-parent"
-     * @param string $ID ID product variations or not
-     * @return string Return ID
-     */
-    public static function get_id_variation($ID)
-    {
-        $result = explode('__', $ID);
-        return end($result);
-    }
+	/**
+	 * Get product ID if ID = "id-parent__id-variation" or "id-variation" or "id-parent"
+	 * @param string $ID ID product variations or not
+	 * @return string Return ID
+	 */
+	public static function get_id_variation($ID)
+	{
+		$result = explode('__', $ID);
+		return end($result);
+	}
 
-    /**
-     * Update all variations definitions who not modified
-     * @param array $new_value
-     * @param array $old_value
-     * @return array $new_value
-     */
-    public static function update_wpshop_catalog_product_option($new_value, $old_value)
-    {
-        global $wpdb;
-        $query = $wpdb->prepare('SELECT post_id, meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s AND meta_value LIKE %s', '_wpshop_variation_defining', '%' . serialize('follow_general_config') . '%');
-        foreach ($wpdb->get_results($query) as $wpshop_variation_defining) {
-            $wpshop_variation_defining_value = unserialize($wpshop_variation_defining->meta_value);
-            $wpshop_variation_defining_value['options']['price_display'] = $new_value['price_display'];
-            update_post_meta($wpshop_variation_defining->post_id, '_wpshop_variation_defining', $wpshop_variation_defining_value);
-        }
-        return $new_value;
-    }
+	/**
+	 * Update all variations definitions who not modified
+	 * @param array $new_value
+	 * @param array $old_value
+	 * @return array $new_value
+	 */
+	public static function update_wpshop_catalog_product_option($new_value, $old_value)
+	{
+		global $wpdb;
+		$query = $wpdb->prepare('SELECT post_id, meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s AND meta_value LIKE %s', '_wpshop_variation_defining', '%' . serialize('follow_general_config') . '%');
+		foreach ($wpdb->get_results($query) as $wpshop_variation_defining) {
+			$wpshop_variation_defining_value = unserialize($wpshop_variation_defining->meta_value);
+			$wpshop_variation_defining_value['options']['price_display'] = $new_value['price_display'];
+			update_post_meta($wpshop_variation_defining->post_id, '_wpshop_variation_defining', $wpshop_variation_defining_value);
+		}
+		return $new_value;
+	}
 
-    public static function variation_parameters_save($current_post_id, $options)
-    {
+	public static function variation_parameters_save($current_post_id, $options)
+	{
 		$variation_post_meta = get_post_meta($current_post_id, '_wpshop_variation_defining', true);
-        $variation_post_meta['options'] = $options;
+		$variation_post_meta['options'] = $options;
 		$variation_post_meta['follow_general_config'] = true;
 		if( $variation_post_meta['follow_general_config'] ) {
 			$shop_option = get_option('wpshop_catalog_product_option', array());
@@ -3500,6 +3500,6 @@ 
 				}
 			}
 		}
-        update_post_meta($current_post_id, '_wpshop_variation_defining', $variation_post_meta);
-    }
+		update_post_meta($current_post_id, '_wpshop_variation_defining', $variation_post_meta);
+	}
 }