Eoxia / wpshop

wpshop.php

Spacing +60 added lines, -60 removed lines

@@ -18,55 +18,55 @@ 
  * @package wpshop
  */
 
-ini_set( 'memory_limit', '512M' );
+ini_set('memory_limit', '512M');
 
 /**    Check if file is include. No direct access possible with file url    */
-if ( ! defined( 'ABSPATH' ) ) {
-	die( 'Access is not allowed by this way' );
+if (!defined('ABSPATH')) {
+	die('Access is not allowed by this way');
 }
 
 /**    Allows to refresh css and js file in final user browser    */
-DEFINE( 'WPSHOP_VERSION', '1.4.4.3' );
+DEFINE('WPSHOP_VERSION', '1.4.4.3');
 
 /**    Allows to avoid problem with theme not supporting thumbnail for post    */
-add_theme_support( 'post-thumbnails' );
-add_image_size( 'wpshop-product-galery', 270, 270, true );
-add_image_size( 'wps-categorie-mini-display', 80, 80, true );
-add_image_size( 'wps-categorie-display', 480, 340, true );
+add_theme_support('post-thumbnails');
+add_image_size('wpshop-product-galery', 270, 270, true);
+add_image_size('wps-categorie-mini-display', 80, 80, true);
+add_image_size('wps-categorie-display', 480, 340, true);
 
 /**    First thing we define the main directory for our plugin in a super global var    */
-DEFINE( 'WPSHOP_PLUGIN_DIR', basename( dirname( __FILE__ ) ) );
-DEFINE( 'WPSHOP_PLUGIN_NAME', plugin_basename( __FILE__ ) );
+DEFINE('WPSHOP_PLUGIN_DIR', basename(dirname(__FILE__)));
+DEFINE('WPSHOP_PLUGIN_NAME', plugin_basename(__FILE__));
 
 /**    Get the current language to translate the different text in plugin    */
 $locale = get_locale();
 global $wpdb;
-if ( defined( 'ICL_LANGUAGE_CODE' ) ) {
-	$query = $wpdb->prepare( 'SELECT locale FROM ' . $wpdb->prefix . 'icl_locale_map WHERE code = %s', ICL_LANGUAGE_CODE );
-	$local = $wpdb->get_var( $query );
-	$locale = ! empty( $local ) ? $local : $locale;
+if (defined('ICL_LANGUAGE_CODE')) {
+	$query = $wpdb->prepare('SELECT locale FROM ' . $wpdb->prefix . 'icl_locale_map WHERE code = %s', ICL_LANGUAGE_CODE);
+	$local = $wpdb->get_var($query);
+	$locale = !empty($local) ? $local : $locale;
 }
-DEFINE( 'WPSHOP_CURRENT_LOCALE', $locale );
+DEFINE('WPSHOP_CURRENT_LOCALE', $locale);
 /**    Load plugin translation    */
-load_plugin_textdomain( 'wpshop', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
+load_plugin_textdomain('wpshop', false, dirname(plugin_basename(__FILE__)) . '/languages/');
 
 /**    Include the config file    */
 require WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/includes/config.php';
 
 /** Allow to get errors back when debug mode is set to true    */
-if ( WPSHOP_DEBUG_MODE && (in_array( long2ip( ip2long( $_SERVER['REMOTE_ADDR'] ) ), unserialize( WPSHOP_DEBUG_MODE_ALLOWED_IP ) )) ) {
-	ini_set( 'display_errors', true );
-	error_reporting( E_ALL );
+if (WPSHOP_DEBUG_MODE && (in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP)))) {
+	ini_set('display_errors', true);
+	error_reporting(E_ALL);
 }
 
 include_once WPSHOP_LIBRAIRIES_DIR . 'init.class.php';
-$current_installation_step = get_option( 'wps-installation-current-step', 1 );
+$current_installation_step = get_option('wps-installation-current-step', 1);
 
 /**    Get current plugin version    */
-$current_db_version = get_option( 'wpshop_db_options', 0 );
+$current_db_version = get_option('wpshop_db_options', 0);
 
 /**    Call main initialisation function    */
-add_action( 'init', array( 'wpshop_init', 'load' ) );
+add_action('init', array('wpshop_init', 'load'));
 
 /**    Include the main including file    */
 require WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/includes/include.php';
@@ -78,32 +78,32 @@ 
 
 /**    Call function to create the main left menu    */
 // if ( ( WPSINSTALLER_STEPS_COUNT <= $current_installation_step ) || ( !empty( $current_db_version ) && !empty( $current_db_version[ 'db_version' ] ) && ( 51 < $current_db_version[ 'db_version' ] ) ) || ( !empty( $_GET ) && !empty( $_GET[ 'installation_state' ] ) && ( "ignored" == $_GET[ 'installation_state' ] ) ) ) {
-add_action( 'admin_menu', array( 'wpshop_init', 'admin_menu' ) );
-add_action( 'menu_order', array( 'wpshop_init', 'admin_menu_order' ) );
-add_action( 'custom_menu_order', array( 'wpshop_init', 'admin_custom_menu_order' ) );
+add_action('admin_menu', array('wpshop_init', 'admin_menu'));
+add_action('menu_order', array('wpshop_init', 'admin_menu_order'));
+add_action('custom_menu_order', array('wpshop_init', 'admin_custom_menu_order'));
 
 /*    Call function for new WordPress element creating [term (product_category) / post (product)]    */
-add_action( 'init', array( 'wpshop_init', 'add_new_wp_type' ) );
+add_action('init', array('wpshop_init', 'add_new_wp_type'));
 
 /*    Call function allowing to change element front output    */
-add_action( 'the_content', array( 'wpshop_display', 'products_page' ), 1 );
+add_action('the_content', array('wpshop_display', 'products_page'), 1);
 // add_action('archive_template', array('wpshop_categories', 'category_template_switcher'));
 // }
 /**    On plugin activation create the default parameters to use the ecommerce    */
-register_activation_hook( __FILE__, array( 'wpshop_install', 'install_on_activation' ) );
+register_activation_hook(__FILE__, array('wpshop_install', 'install_on_activation'));
 
 /**    Get current plugin version    */
-$current_db_version = get_option( 'wpshop_db_options', 0 );
+$current_db_version = get_option('wpshop_db_options', 0);
 
 /**    Add the database content    */
-add_action( 'admin_init', array( 'wpshop_install', 'update_wpshop' ) );
-if ( (defined( 'WPSINSTALLER_STEPS_COUNT' ) && (WPSINSTALLER_STEPS_COUNT <= $current_installation_step)) || ( ! empty( $current_db_version ) && ! empty( $current_db_version['db_version'] ) && (51 < $current_db_version['db_version'])) || ( ! empty( $current_db_version ) && ! empty( $current_db_version['installation_state'] ) && ('ignore' == $current_db_version['installation_state'])) ) {
-	if ( in_array( long2ip( ip2long( $_SERVER['REMOTE_ADDR'] ) ), unserialize( WPSHOP_DEBUG_MODE_ALLOWED_IP ) ) ) {
-		add_action( 'admin_init', array( 'wpshop_install', 'update_wpshop_dev' ) );
+add_action('admin_init', array('wpshop_install', 'update_wpshop'));
+if ((defined('WPSINSTALLER_STEPS_COUNT') && (WPSINSTALLER_STEPS_COUNT <= $current_installation_step)) || (!empty($current_db_version) && !empty($current_db_version['db_version']) && (51 < $current_db_version['db_version'])) || (!empty($current_db_version) && !empty($current_db_version['installation_state']) && ('ignore' == $current_db_version['installation_state']))) {
+	if (in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP))) {
+		add_action('admin_init', array('wpshop_install', 'update_wpshop_dev'));
 	}
 }
 // Start session
-if ( session_id() == '' ) {
+if (session_id() == '') {
 	 session_start();
 }
 
@@ -113,52 +113,52 @@ 
 	$wpshop = new wpshop_form_management();
 	$wpshop_payment = new wpshop_payment();
 }
-add_action( 'init', 'classes_init' );
+add_action('init', 'classes_init');
 
 /** Shortcode management */
-add_shortcode( 'wpshop_att_val', array( 'wpshop_attributes', 'wpshop_att_val_func' ) ); // Attributes
-add_shortcode( 'wpshop_products', array( 'wpshop_products', 'wpshop_products_func' ) ); // Products list
-add_shortcode( 'wpshop_product', array( 'wpshop_products', 'wpshop_products_func' ) ); // Products list
-add_shortcode( 'wpshop_product_variation_summary', array( 'wpshop_products', 'wpshop_product_variations_summary' ) ); // Variation summary
-add_shortcode( 'wpshop_product_variation_value_detail', array( 'wpshop_products', 'wpshop_product_variation_value_detail' ) ); // Variation value detail
-add_shortcode( 'wpshop_related_products', array( 'wpshop_products', 'wpshop_related_products_func' ) ); // Products list
-add_shortcode( 'wpshop_category', array( 'wpshop_categories', 'wpshop_category_func' ) ); // Category
-add_shortcode( 'wpshop_att_group', array( 'wpshop_attributes_set', 'wpshop_att_group_func' ) ); // Attributes groups
-add_shortcode( 'wpshop_cart', 'wpshop_display_cart' ); // Cart
+add_shortcode('wpshop_att_val', array('wpshop_attributes', 'wpshop_att_val_func')); // Attributes
+add_shortcode('wpshop_products', array('wpshop_products', 'wpshop_products_func')); // Products list
+add_shortcode('wpshop_product', array('wpshop_products', 'wpshop_products_func')); // Products list
+add_shortcode('wpshop_product_variation_summary', array('wpshop_products', 'wpshop_product_variations_summary')); // Variation summary
+add_shortcode('wpshop_product_variation_value_detail', array('wpshop_products', 'wpshop_product_variation_value_detail')); // Variation value detail
+add_shortcode('wpshop_related_products', array('wpshop_products', 'wpshop_related_products_func')); // Products list
+add_shortcode('wpshop_category', array('wpshop_categories', 'wpshop_category_func')); // Category
+add_shortcode('wpshop_att_group', array('wpshop_attributes_set', 'wpshop_att_group_func')); // Attributes groups
+add_shortcode('wpshop_cart', 'wpshop_display_cart'); // Cart
 // add_shortcode('wpshop_mini_cart', 'wpshop_display_mini_cart'); // Mini cart
 // add_shortcode('wpshop_signup', 'wpshop_signup_init'); // Signup
 // add_shortcode('wpshop_myaccount', 'wpshop_account_display_form' );
-add_shortcode( 'wpshop_payment_result', array( 'wpshop_payment', 'wpshop_payment_result' ) ); // Payment result
-add_shortcode( 'wpshop_payment_result_unsuccessfull', array( 'wpshop_payment', 'wpshop_payment_result' ) ); // Payment result
+add_shortcode('wpshop_payment_result', array('wpshop_payment', 'wpshop_payment_result')); // Payment result
+add_shortcode('wpshop_payment_result_unsuccessfull', array('wpshop_payment', 'wpshop_payment_result')); // Payment result
 
-add_shortcode( 'wpshop_variations', array( 'wpshop_products', 'wpshop_variation' ) );
-add_shortcode( 'wpshop_entities', array( 'wpshop_entities', 'wpshop_entities_shortcode' ) );
-add_shortcode( 'wpshop_attributes', array( 'wpshop_attributes', 'wpshop_attributes_shortcode' ) );
+add_shortcode('wpshop_variations', array('wpshop_products', 'wpshop_variation'));
+add_shortcode('wpshop_entities', array('wpshop_entities', 'wpshop_entities_shortcode'));
+add_shortcode('wpshop_attributes', array('wpshop_attributes', 'wpshop_attributes_shortcode'));
 
 /** Add specific messages for wpshop elements management    */
 // add_filter('post_updated_messages', array('wpshop_messages', 'update_wp_message_list'));
-$file = basename( __FILE__ );
-$folder = basename( dirname( __FILE__ ) );
+$file = basename(__FILE__);
+$folder = basename(dirname(__FILE__));
 $hook = "in_plugin_update_message-{$folder}/{$file}";
-add_action( $hook, 'wps_update_message', 10, 2 ); // 10:priority, 2:arguments #
-function wps_update_message( $currentPluginMetadata, $newPluginMetadata ) {
+add_action($hook, 'wps_update_message', 10, 2); // 10:priority, 2:arguments #
+function wps_update_message($currentPluginMetadata, $newPluginMetadata) {
 	$message = '';
 
-	if ( '1.4.1.6' == $currentPluginMetadata['Version'] ) {
-		$message = sprintf( __( 'For security reason %1$splease read this post%2$s', 'wpshop' ), '<a href="" >', '</a>' );
+	if ('1.4.1.6' == $currentPluginMetadata['Version']) {
+		$message = sprintf(__('For security reason %1$splease read this post%2$s', 'wpshop'), '<a href="" >', '</a>');
 	}
 
 	// check "upgrade_notice"
-	if ( isset( $newPluginMetadata->upgrade_notice ) && strlen( trim( $newPluginMetadata->upgrade_notice ) ) > 0 ) {
-		$message = esc_html( $newPluginMetadata->upgrade_notice );
+	if (isset($newPluginMetadata->upgrade_notice) && strlen(trim($newPluginMetadata->upgrade_notice)) > 0) {
+		$message = esc_html($newPluginMetadata->upgrade_notice);
 	}
 
-	if ( ! empty( $message ) ) {
-		echo '<p style="background-color: #d54e21; padding: 10px; color: #f9f9f9; margin-top: 10px"><strong>' . __( 'Important upgrade notice', 'wpshop' ) . ': </strong>' . $message . '</p>';
+	if (!empty($message)) {
+		echo '<p style="background-color: #d54e21; padding: 10px; color: #f9f9f9; margin-top: 10px"><strong>' . __('Important upgrade notice', 'wpshop') . ': </strong>' . $message . '</p>';
 	}
 }
 
 require_once 'core/external/wpeo_util/singleton.util.php';
 require_once 'core/external/wpeo_util/init.util.php';
 require_once 'core/external/wpeo_log/class/log.class.php';
-\eoxia\Init_util::g()->exec( realpath( plugin_dir_path( __FILE__ ) ) . '/', basename( __FILE__, '.php' ) );
+\eoxia\Init_util::g()->exec(realpath(plugin_dir_path(__FILE__)) . '/', basename(__FILE__, '.php'));

includes/librairies/catalog/products.class.php

Indentation +3049 added lines, -3049 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'));
 }
 
 /**
@@ -25,156 +25,156 @@ 
  * @subpackage librairies
  */
 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;
-        $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;
-    }
+	public function products_list_js()
+	{
+		global $wpdb;
+		$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;
@@ -201,35 +201,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);
 
@@ -247,47 +247,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>
@@ -295,699 +295,699 @@ 
 		<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-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-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;
+	}
 
-    /**
-     * 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>';
+				}
+
+			}
+			$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';
 
-    /**
-     * 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;
+			$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>';
+		}
 
-        $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')));
+		return $content;
+	}
 
-        $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);
-        }
+	/**
+	 * 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;
 
-        return $data;
-    }
+		$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);
+		}
+
+		return $data;
+	}
 
-    public static function get_products_matching_attribute($attr_name, $attr_value)
-    {
-        global $wpdb;
+	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;
 
-        return $output;
-    }
+		$atts['product_type'] = 'related';
+		if (empty($atts['pid'])) {
+			$atts['pid'] = $wp_query->posts[0]->ID;
+		}
 
-    /**
-     * 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;
-            }
+		$related_product_output = self::wpshop_products_func($atts);
 
-        }
+		$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();
+		}
 
-        /** 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;
-            }
-        }
+		return $output;
+	}
+
+	/**
+	 * 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];
-            }
-        }
+		}
+
+		/** 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';
+				}
+			}
 
-        /** 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>';
+					}
+				}
+
+				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
-	 */
+ * 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;
 
@@ -1042,16 +1042,16 @@ 
 		}
 	}
 
-    /**
-     * 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)
@@ -1063,398 +1063,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;
     }
@@ -1464,457 +1464,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( {
@@ -1923,1534 +1923,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;
-    }
+			$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);
+	/**
+	 * 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);
+		}
 
-            /**
-             * 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 {
+
+				}
+				$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;
+				}
 
-        $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;
-                    }
-                }
-            }
+				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');
+							}
+
+						}
+					}
+				}
 
-        }
-        $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) : '';
+				$tpl_component['VARIATION_DETAIL'] = substr($tpl_component['VARIATION_DETAIL'], 0, -2);
 
-        return $output;
-    }
+				$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');
 
-    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;
-    }
+				/*    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');
+			}
 
-    /**
-     * 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_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');
+		}
 
-        $output .= wpshop_display::display_template_element('wpshop_product_configuration_summary', $product_variations_selection_args);
+		return $output;
+	}
 
-        echo $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;
+						}
+
+					}
+				}
+			}
+		}
+
+		$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;
+					}
+				}
+			}
 
-    /**
-     * 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);
+		}
+		$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;
+		}
+
+		/**    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)] = '-';
+			}
+		}
 
-        /**    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'] : '';
+		/**    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);
+				}
+			}
+		}
 
-        /**    Define the current selected currency for the order 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);
+		}
+
+		/**    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());
@@ -3466,6 +3466,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);
+	}
 }

Spacing +33 added lines, -33 removed lines

@@ -179,20 +179,20 @@ 
 	public static function admin_menu() {
 		global $submenu;
 		$attributeEntitySetList = wpshop_attributes_set::get_attribute_set_list_for_entity(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode));
-		$entities_to_unset = array( 'free_product', 'default' );
+		$entities_to_unset = array('free_product', 'default');
 		$submenu_before = $submenu['edit.php?post_type=wpshop_product'];
 		foreach ($attributeEntitySetList as $key_attribute_set => $attribute_set) {
-			if ( !( in_array( $attribute_set->slug, $entities_to_unset ) || in_array( $attribute_set->name, $entities_to_unset ) ) ) {
-				add_submenu_page( 'edit.php?post_type=wpshop_product', sprintf( __( 'Add %s', 'wpshop' ), $attribute_set->name), sprintf( __( 'Add %s', 'wpshop' ), $attribute_set->name), 'edit_posts', 'post-new.php?attribute_set=' . $attribute_set->id . '&post_type=wpshop_product');
+			if (!(in_array($attribute_set->slug, $entities_to_unset) || in_array($attribute_set->name, $entities_to_unset))) {
+				add_submenu_page('edit.php?post_type=wpshop_product', sprintf(__('Add %s', 'wpshop'), $attribute_set->name), sprintf(__('Add %s', 'wpshop'), $attribute_set->name), 'edit_posts', 'post-new.php?attribute_set=' . $attribute_set->id . '&post_type=wpshop_product');
 			}
 		}
-		$submenu_new_elements = array_diff_key ( $submenu['edit.php?post_type=wpshop_product'], $submenu_before );
+		$submenu_new_elements = array_diff_key($submenu['edit.php?post_type=wpshop_product'], $submenu_before);
 		$submenu_reorder = array();
-		foreach( $submenu_before as $key => $element ) {
-			if( empty( $submenu_reorder[$key] ) ) {
+		foreach ($submenu_before as $key => $element) {
+			if (empty($submenu_reorder[$key])) {
 				$submenu_reorder[$key] = $element;
-				if( in_array( 'post-new.php?post_type=wpshop_product', $element ) ) {
-					$submenu_reorder = array_merge( $submenu_reorder, array_values( $submenu_new_elements ) );
+				if (in_array('post-new.php?post_type=wpshop_product', $element)) {
+					$submenu_reorder = array_merge($submenu_reorder, array_values($submenu_new_elements));
 				}
 			} else {
 				$submenu_reorder[] = $element;
@@ -540,12 +540,12 @@ 
 
         $products = array();
         $query = "SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code=%s";
-        $data = (array) $wpdb->get_row($wpdb->prepare($query, $attr_name));
+        $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 ($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
@@ -695,11 +695,11 @@ 
         if (!empty($atts['product_type'])) {
             switch ($atts['product_type']) {
                 case 'related':
-                    $product_id = !empty($atts['pid']) ? (int) $atts['pid'] : get_the_ID();
+                    $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);
+                    $pids = get_post_meta((int)$product_id, WPSHOP_PRODUCT_RELATED_PRODUCTS, true);
                     if (!empty($pids) && !empty($pids[0])) {
                         $pid = implode(',', $pids);
                     }
@@ -768,8 +768,8 @@ 
                     $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>';
+											$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);
@@ -938,7 +938,7 @@ 
             // --------------------- //
             // Pagination management //
             // --------------------- //
-            if ( $display_pagination ) {
+            if ($display_pagination) {
                 if ($nb_of_product_limit == 0) {
 
                     $paginate = paginate_links(array(
@@ -1013,14 +1013,14 @@ 
 		$newQty = $product['product_stock'] - $qty;
 		$value_id = 0;
 		if ($newQty >= 0) {
-			$query = $wpdb->prepare( "
+			$query = $wpdb->prepare("
 				SELECT ATTDEC.value_id
 				FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL . " AS ATTDEC
 				LEFT JOIN " . WPSHOP_DBT_ATTRIBUTE . " AS ATT ON ATTDEC.attribute_id = ATT.id
 				WHERE ATTDEC.entity_id = %d AND ATT.code = %s
-				LIMIT 1", $product_id, 'product_stock' );
+				LIMIT 1", $product_id, 'product_stock');
 				$value_id = $wpdb->get_var($query);
-				$update = $wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => wpshop_tools::wpshop_clean($newQty)), array('value_id' => $value_id));
+				$update = $wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => wpshop_tools::wpshop_clean($newQty)), array('value_id' => $value_id));
 			}
 			// Historic
 			$attribute_histo_content = array();
@@ -1217,7 +1217,7 @@ 
     {
         global $wpdb;
 
-        $data_to_save = (!empty($data_to_save)) ? $data_to_save : (array) $_REQUEST;
+        $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);
 
@@ -1273,7 +1273,7 @@ 
                             $attributeValue = str_replace(',', '.', $attributeValue);
                         }
                         if (($attributeType == 'integer') && !is_array($attributeValue)) {
-                            $attributeValue = (int) $attributeValue;
+                            $attributeValue = (int)$attributeValue;
                         }
                         $productMetaDatas[$attributeCode] = $attributeValue;
                     }
@@ -1323,7 +1323,7 @@ 
                                     $attributeValue = str_replace(',', '.', $attribute->$value_key);
                                 }
                                 if (($attribute->data_type == 'integer') && !is_array($attributeValue)) {
-                                    $attributeValue = (int) $attribute->$value_key;
+                                    $attributeValue = (int)$attribute->$value_key;
                                 }
                                 $variation_metadata[$attribute->code] = $attribute->$value_key;
                             }
@@ -1336,7 +1336,7 @@ 
                                 $attributeValue = str_replace(',', '.', $attributeValue);
                             }
                             if (($attributeType == 'integer') && !is_array($attributeValue)) {
-                                $attributeValue = (int) $attributeValue;
+                                $attributeValue = (int)$attributeValue;
                             }
                             $variation_metadata[$attributeCode] = $attributeValue;
                         }
@@ -1672,13 +1672,13 @@ 
             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_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);
 				$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'] ) ))) {
+				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'];
@@ -2121,7 +2121,7 @@ 
             }
 
             $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 );
+						$template_part = apply_filters('wps_custom_add_to_cart_button', $template_part, $product_id);
 
             $tpl_component = array();
             $tpl_component['PRODUCT_ID'] = $product_id;
@@ -2983,7 +2983,7 @@ 
                 $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);
+                        $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;
@@ -3085,7 +3085,7 @@ 
              * Since 1.4.3.7
              * L'option du produit remplace le prix du produit de tête.
              */
-			if( true ) {
+			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'];
@@ -3452,16 +3452,16 @@ 
 		$variation_post_meta = get_post_meta($current_post_id, '_wpshop_variation_defining', true);
         $variation_post_meta['options'] = $options;
 		$variation_post_meta['follow_general_config'] = true;
-		if( $variation_post_meta['follow_general_config'] ) {
+		if ($variation_post_meta['follow_general_config']) {
 			$shop_option = get_option('wpshop_catalog_product_option', array());
-			if( isset( $shop_option ) ) {
+			if (isset($shop_option)) {
 				$variation_post_meta['options']['price_display'] = $shop_option['price_display'];
 			}
 		}
 		$variations = wpshop_attributes::get_variation_available_attribute($current_post_id);
-		if( !empty( $variations['available'] ) ) {
-			foreach( $variations['available'] as $key => $value ) {
-				if( !in_array( $value['attribute_complete_def']->code, $variation_post_meta['attributes'] ) ) {
+		if (!empty($variations['available'])) {
+			foreach ($variations['available'] as $key => $value) {
+				if (!in_array($value['attribute_complete_def']->code, $variation_post_meta['attributes'])) {
 					$variation_post_meta['attributes'][] = $value['attribute_complete_def']->code;
 				}
 			}

includes/librairies/install.class.php

Indentation +2307 added lines, -2307 removed lines

@@ -1,10 +1,10 @@ 
 <?php if (!defined('ABSPATH')) {
-    exit;
+	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'));
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -25,1785 +25,1785 @@ 
 class wpshop_install
 {
 
-    /**
-     *    Define the action launch when plugin is activate
-     *
-     * @return void
-     */
-    public static function install_on_activation()
-    {
-        /*    Create the different option needed for the plugin work properly    */
-        add_option('wpshop_db_options', array('db_version' => 0));
-        add_option('wpshop_shop_default_currency', WPSHOP_SHOP_DEFAULT_CURRENCY);
-        add_option('wpshop_emails', array('noreply_email' => get_bloginfo('admin_email'), 'contact_email' => get_bloginfo('admin_email')));
-        add_option('wpshop_catalog_product_option', array('wpshop_catalog_product_slug' => WPSHOP_CATALOG_PRODUCT_SLUG));
-        add_option('wpshop_catalog_categories_option', array('wpshop_catalog_categories_slug' => WPSHOP_CATALOG_CATEGORIES_SLUG));
-        add_option('wpshop_display_option', array('wpshop_display_list_type' => 'grid', 'wpshop_display_grid_element_number' => '3', 'wpshop_display_cat_sheet_output' => array('category_description', 'category_subcategory', 'category_subproduct')));
-    }
-
-    /**
-     *    Create the default pages
-     */
-    public static function wpshop_insert_default_pages($pages_type = '')
-    {
-        global $wpdb, $wp_rewrite;
-
-        /**    if we will create any new pages we need to flush page cache */
-        $page_creation = false;
-        $created_pages = array();
-
-        /** Default data array for add page */
-        $page_default_args = array(
-            'post_type' => 'page',
-            'comment_status' => 'closed',
-            'ping_status' => 'closed',
-            'post_status' => 'publish',
-            'post_author' => get_current_user_id(),
-        );
-
-        /**    Get defined shop type    */
-        $wpshop_shop_type = !empty($pages_type) ? $pages_type : get_option('wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE);
-
-        /**    Get the default datas for installation - Pages    */
-        $xml_default_pages = file_get_contents(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_pages.xml');
-        $defined_default_pages = new SimpleXMLElement($xml_default_pages);
-        foreach ($defined_default_pages->xpath('//pages/page') as $page) {
-            if (($wpshop_shop_type == $page->attributes()->shop_type) || ('sale' == $wpshop_shop_type)) {
-                $page_id = null;
-
-                /**    Do a specific check for cart page, for old wpshop installation    */
-                if ('wpshop_cart_page_id' == (string) $page->attributes()->code) {
-                    $query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_content LIKE %s	AND post_type != %s", '%[wpshop_basket]%', 'revision');
-                    $page_id = $wpdb->get_var($query);
-
-                    wp_update_post(array(
-                        'ID' => $page_id,
-                        'post_content' => (string) $page->content,
-                    ));
-                }
-
-                /**    Check if a page exists with the current content readed form xml file    */
-                if (empty($page_id)) {
-                    $query = $wpdb->prepare("SELECT ID FROM {$wpdb->posts} WHERE post_content LIKE %s AND post_type != %s", '%' . (string) $page->content . '%', 'revision');
-                    $page_id = $wpdb->get_var($query);
-                }
-
-                /**    If the page does not exists create it    */
-                if (empty($page_id)) {
-                    $default_page_args = wp_parse_args(array(
-                        'post_title' => __((string) $page->title, 'wpshop'),
-                        'post_name' => __((string) $page->slug, 'wpshop'),
-                        'post_content' => __((string) $page->content, 'wpshop'),
-                        'menu_order' => (string) $page->attributes()->position,
-                    ), $page_default_args);
-
-                    $page_id = wp_insert_post($default_page_args);
-                    $created_pages[] = (string) $page->attributes()->code;
-                }
-
-                /**    If the page is created or already exists associated the page to the good service    */
-                if (!empty($page_id)) {
-                    add_option((string) $page->attributes()->code, $page_id);
-
-                    $page_creation = true;
-                }
-
-            }
-        }
-
-        /**    Check if page have been created in order to do specific action    */
-        if (!empty($created_pages)) {
-            /**    If cart page and checkout page have just been created, change cart page id into checkout page id    */
-            if (in_array('wpshop_cart_page_id', $created_pages) && in_array('wpshop_checkout_page_id', $created_pages)) {
-                update_option('wpshop_cart_page_id', get_option('wpshop_checkout_page_id'));
-            }
-
-        }
-
-        wp_cache_flush();
-        /** If new page => empty cache */
-        if ($page_creation) {
-            wp_cache_delete('all_page_ids', 'pages');
-            //    $wp_rewrite->flush_rules();
-        }
-    }
-
-    /**
-     * Insert sample datas when installing wpshop the first time if the admin choose
-     */
-    public static function import_sample_datas()
-    {
-        global $wpdb, $wp_rewrite;
-
-        /** Default data array for add product */
-        $product_default_args = array(
-            'comment_status' => 'closed',
-            'ping_status' => 'closed',
-            'post_status' => 'publish',
-            'post_author' => get_current_user_id(),
-        );
-
-        /**    Get the default datas for installation - sample products    */
-        $sample_datas = file_get_contents(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/sample_datas.xml');
-        $defined_sample_datas = new SimpleXMLElement($sample_datas, LIBXML_NOCDATA);
-
-        $namespaces = $defined_sample_datas->getDocNamespaces();
-        if (!isset($namespaces['wp'])) {
-            $namespaces['wp'] = 'http://wordpress.org/export/1.1/';
-        }
-
-        if (!isset($namespaces['excerpt'])) {
-            $namespaces['excerpt'] = 'http://wordpress.org/export/1.1/excerpt/';
-        }
-
-        foreach ($defined_sample_datas->xpath('//wpshop_products/wpshop_product') as $product) {
-            $dc = $product->children('http://purl.org/dc/elements/1.1/');
-            $content = $product->children('http://purl.org/rss/1.0/modules/content/');
-            $excerpt = $product->children($namespaces['excerpt']);
-            $wp = $product->children($namespaces['wp']);
-
-            $product_args = wp_parse_args(array(
-                'post_title' => (string) $product->title,
-                'post_name' => (string) $wp->post_name,
-                'post_content' => (string) $content->encoded,
-                'post_excerpt' => (string) $excerpt->encoded,
-                'post_type' => (string) $wp->post_type,
-            ), $product_default_args);
-
-            $product_id = wp_insert_post($product_args);
-
-            foreach ($wp->postmeta as $meta) {
-                update_post_meta($product_id, (string) $meta->meta_key, (string) $meta->meta_value);
-            }
-
-            foreach ($defined_sample_datas->xpath('//wps_pdt_variations/wps_pdt_variation/wp:post_parent[. ="' . $wp->post_id . '"]/parent::*') as $product_variation) {
-                $wps_pdt_var_dc = $product_variation->children('http://purl.org/dc/elements/1.1/');
-                $wps_pdt_var_content = $product_variation->children('http://purl.org/rss/1.0/modules/content/');
-                $wps_pdt_var_excerpt = $product_variation->children($namespaces['excerpt']);
-                $wps_pdt_var_wp = $product_variation->children($namespaces['wp']);
-
-                $product_args = wp_parse_args(array(
-                    'post_title' => (string) $product_variation->title,
-                    'post_name' => (string) $wps_pdt_var_wp->post_name,
-                    'post_content' => (string) $wps_pdt_var_content->encoded,
-                    'post_excerpt' => (string) $wps_pdt_var_excerpt->encoded,
-                    'post_type' => (string) $wps_pdt_var_wp->post_type,
-                    'post_parent' => $product_id,
-                ), $product_default_args);
-
-                $product_variation_id = wp_insert_post($product_args);
-
-                foreach ($wps_pdt_var_wp->postmeta as $meta) {
-                    update_post_meta($product_variation_id, (string) $meta->meta_key, (string) $meta->meta_value);
-                }
-            }
-        }
-    }
-
-    /**
-     * Method called when plugin is loaded for database update. This method allows to update the database structure, insert default content.
-     */
-    public static function update_wpshop_dev()
-    {
-        global $wpdb, $wpshop_db_table, $wpshop_db_table_list, $wpshop_update_way, $wpshop_db_content_add, $wpshop_db_content_update, $wpshop_db_options_add, $wpshop_eav_content, $wpshop_eav_content_update, $wpshop_db_options_update;
-
-        require_once ABSPATH . 'wp-admin/includes/upgrade.php';
-
-        self::execute_operation_on_db_for_update('dev');
-    }
-
-    /**
-     * Method called when plugin is loaded for database update. This method allows to update the database structure, insert default content.
-     */
-    public static function update_wpshop()
-    {
-        global $wpdb, $wpshop_db_table, $wpshop_db_table_list, $wpshop_update_way, $wpshop_db_content_add, $wpshop_db_content_update, $wpshop_db_options_add, $wpshop_eav_content, $wpshop_eav_content_update, $wpshop_db_options_update;
-        $do_changes = false;
-
-        require_once ABSPATH . 'wp-admin/includes/upgrade.php';
-
-        $current_db_version = get_option('wpshop_db_options', 0);
-        $current_db_version = $current_db_version['db_version'];
-
-        $current_def_max_version = max(array_keys($wpshop_update_way));
-        $new_version = $current_def_max_version + 1;
-        $version_nb_delta = $current_def_max_version - $current_db_version;
-
-        /*    Check if there are modification to do    */
-        if ($current_def_max_version >= $current_db_version) {
-            /*    Check the lowest version of db to execute    */
-            $lowest_version_to_execute = $current_def_max_version - $version_nb_delta;
-
-            for ($i = $lowest_version_to_execute; $i <= $current_def_max_version; $i++) {
-                $do_changes = self::execute_operation_on_db_for_update($i);
-            }
-        }
-
-        /*    Update the db version option value    */
-        if ($do_changes) {
-            $db_version = get_option('wpshop_db_options', 0);
-            $db_version['db_version'] = $new_version;
-            update_option('wpshop_db_options', $db_version);
-        }
-    }
-
-    /**
-     * Update db structure on each plugin update
-     *
-     * @param integer $i The current plugin db version
-     * @return boolean If the changes are done correctly or not
-     */
-    public static function alter_db_structure_on_update($i)
-    {
-        $do_changes = false;
-        global $wpdb, $wpshop_db_table, $wpshop_db_table_list, $wpshop_update_way, $wpshop_db_request, $wpshop_db_delete;
-
-        /*    Check if there are modification to do    */
-        if (isset($wpshop_update_way[$i])) {
-            /*    Check if there are modification to make on table    */
-            if (isset($wpshop_db_table_list[$i])) {
-                foreach ($wpshop_db_table_list[$i] as $table_name) {
-                    dbDelta($wpshop_db_table[$table_name]);
-                }
-                $do_changes = true;
-            }
-
-            /*    Request maker    */
-            if (isset($wpshop_db_request[$i]) && is_array($wpshop_db_request) && is_array($wpshop_db_request[$i]) && (count($wpshop_db_request[$i]) > 0)) {
-                foreach ($wpshop_db_request[$i] as $request) {
-                    $wpdb->query($request);
-                    $do_changes = true;
-                }
-            }
-
-            /*    Delete datas    */
-            if (isset($wpshop_db_delete[$i]) && is_array($wpshop_db_delete) && is_array($wpshop_db_delete[$i]) && (count($wpshop_db_delete[$i]) > 0)) {
-                foreach ($wpshop_db_delete[$i] as $request) {
-                    $wpdb->query($request);
-                }
-            }
-        }
-
-        return $do_changes;
-    }
-
-    /**
-     * Do changes on database for wpshop plugin for a given version
-     *
-     * @param integer $i The wpshop db version to execute operation for
-     *
-     * @return boolean
-     */
-    public static function execute_operation_on_db_for_update($i)
-    {
-        global $wpdb, $wpshop_db_table, $wpshop_db_table_list, $wpshop_update_way, $wpshop_db_content_add, $wpshop_db_content_update, $wpshop_db_options_add, $wpshop_eav_content, $wpshop_eav_content_update, $wpshop_db_options_update, $wpshop_db_request, $wpshop_db_delete;
-        $do_changes = false;
-
-        /*    Check if there are modification to do    */
-        if (isset($wpshop_update_way[$i])) {
-            $do_changes = self::alter_db_structure_on_update($i);
-
-            /********************/
-            /*        Insert data        */
-            /********************/
-            /*    Options content    */
-            if (isset($wpshop_db_options_add[$i]) && is_array($wpshop_db_options_add) && is_array($wpshop_db_options_add[$i]) && (count($wpshop_db_options_add[$i]) > 0)) {
-                foreach ($wpshop_db_options_add[$i] as $option_name => $option_content) {
-                    add_option($option_name, $option_content, '', 'yes');
-                }
-                $do_changes = true;
-            }
-            if (isset($wpshop_db_options_update[$i]) && is_array($wpshop_db_options_update) && is_array($wpshop_db_options_update[$i]) && (count($wpshop_db_options_update[$i]) > 0)) {
-                foreach ($wpshop_db_options_update[$i] as $option_name => $option_content) {
-                    $option_current_content = get_option($option_name);
-                    foreach ($option_content as $option_key => $option_value) {
-                        $option_current_content[$option_key] = $option_value;
-                    }
-                    update_option($option_name, $option_current_content);
-                }
-                $do_changes = true;
-            }
-
-            /*    Eav content    */
-            if (isset($wpshop_eav_content[$i]) && is_array($wpshop_eav_content) && is_array($wpshop_eav_content[$i]) && (count($wpshop_eav_content[$i]) > 0)) {
-                $do_changes = self::add_content_to_eav($wpshop_eav_content[$i], $do_changes);
-            }
-            /*    Eav content update    */
-            if (isset($wpshop_eav_content_update[$i]) && is_array($wpshop_eav_content_update) && is_array($wpshop_eav_content_update[$i]) && (count($wpshop_eav_content_update[$i]) > 0)) {
-                $do_changes = self::add_content_to_eav($wpshop_eav_content_update[$i], $do_changes);
-            }
-
-            /*    Add datas    */
-            if (isset($wpshop_db_content_add[$i]) && is_array($wpshop_db_content_add) && is_array($wpshop_db_content_add[$i]) && (count($wpshop_db_content_add[$i]) > 0)) {
-                foreach ($wpshop_db_content_add[$i] as $table_name => $def) {
-                    foreach ($def as $information_index => $table_information) {
-                        $wpdb->insert($table_name, $table_information, '%s');
-                        $do_changes = true;
-                    }
-                }
-            }
-
-            /*    Update datas    */
-            if (isset($wpshop_db_content_update[$i]) && is_array($wpshop_db_content_update) && is_array($wpshop_db_content_update[$i]) && (count($wpshop_db_content_update[$i]) > 0)) {
-                foreach ($wpshop_db_content_update[$i] as $table_name => $def) {
-                    foreach ($def as $information_index => $table_information) {
-                        $wpdb->update($table_name, $table_information['datas'], $table_information['where'], '%s', '%s');
-                        $do_changes = true;
-                    }
-                }
-            }
-        }
-
-        $do_changes = self::make_specific_operation_on_update($i);
-
-        return $do_changes;
-    }
-
-    /**
-     * Create specific data in eav db model
-     *
-     * @param array $eav_content The complete array with all element to create into database
-     * @param boolean $do_changes The current state of changes to do
-     *
-     * @return boolean If there are changes to do or not
-     */
-    public static function add_content_to_eav($eav_content, $do_changes)
-    {
-        global $wpdb;
-        /*    Create entities if entites are set to be created for the current version    */
-        if (isset($eav_content['entities']) && is_array($eav_content['entities']) && is_array($eav_content['entities']) && (count($eav_content['entities']) > 0)) {
-            foreach ($eav_content['entities'] as $entity) {
-                /*    Creation de l'entité produit dans la table des posts    */
-                wpshop_entities::create_cpt_from_csv_file($entity);
-            }
-            $do_changes = true;
-        }
-
-        /*    Create attributes for a given entity if attributes are set to be created for current version    */
-        if (!empty($eav_content['attributes']) && is_array($eav_content['attributes']) && is_array($eav_content['attributes']) && (count($eav_content['attributes']) > 0)) {
-            foreach ($eav_content['attributes'] as $entity_code) {
-                wpshop_entities::create_cpt_attributes_from_csv_file($entity_code);
-            }
-            $do_changes = true;
-        }
-
-        /*    Create attribute groups for a given entity if attributes groups are set to be created for current version    */
-        if (isset($eav_content['attribute_groups']) && is_array($eav_content['attribute_groups']) && (count($eav_content['attribute_groups']) > 0)) {
-            foreach ($eav_content['attribute_groups'] as $entity_code => $attribute_set) {
-                $entity_id = wpshop_entities::get_entity_identifier_from_code($entity_code);
-
-                if ($entity_id > 0) {
-                    foreach ($attribute_set as $set_name => $set_groups) {
-                        $query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE entity_id = %d AND name = LOWER(%s)", $entity_id, wpshop_tools::slugify($set_name, array('noAccent', 'noSpaces', 'lowerCase')));
-                        $attribute_set_id = $wpdb->get_var($query);
-                        if ($attribute_set_id <= 0) {
-                            $attribute_set_content = array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_id' => $entity_id, 'name' => $set_name);
-                            if ($set_name == 'default') {
-                                $attribute_set_content['default_set'] = 'yes';
-                            }
-                            $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_SET, $attribute_set_content);
-                            $attribute_set_id = $wpdb->insert_id;
-                        }
+	/**
+	 *    Define the action launch when plugin is activate
+	 *
+	 * @return void
+	 */
+	public static function install_on_activation()
+	{
+		/*    Create the different option needed for the plugin work properly    */
+		add_option('wpshop_db_options', array('db_version' => 0));
+		add_option('wpshop_shop_default_currency', WPSHOP_SHOP_DEFAULT_CURRENCY);
+		add_option('wpshop_emails', array('noreply_email' => get_bloginfo('admin_email'), 'contact_email' => get_bloginfo('admin_email')));
+		add_option('wpshop_catalog_product_option', array('wpshop_catalog_product_slug' => WPSHOP_CATALOG_PRODUCT_SLUG));
+		add_option('wpshop_catalog_categories_option', array('wpshop_catalog_categories_slug' => WPSHOP_CATALOG_CATEGORIES_SLUG));
+		add_option('wpshop_display_option', array('wpshop_display_list_type' => 'grid', 'wpshop_display_grid_element_number' => '3', 'wpshop_display_cat_sheet_output' => array('category_description', 'category_subcategory', 'category_subproduct')));
+	}
 
-                        if ($attribute_set_id > 0) {
-                            foreach ($set_groups as $set_group_infos) {
-                                $set_group_infos_details = $set_group_infos['details'];
-                                unset($set_group_infos['details']);
-                                /*    Change an attribute set status if definition specify this param     */
-                                if (isset($set_group_infos['status'])) {
-                                    $wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET, array('last_update_date' => current_time('mysql', 0), 'status' => $set_group_infos['status']), array('id' => $attribute_set_id));
-                                }
-                                $query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id = %d AND code = LOWER(%s)", $attribute_set_id, $set_group_infos['code']);
-                                $attribute_set_section_id = $wpdb->get_var($query);
-                                if ($attribute_set_section_id <= 0) {
-                                    $new_set_section_infos = $set_group_infos;
-                                    $new_set_section_infos['status'] = (isset($new_set_section_infos['status']) ? $new_set_section_infos['status'] : 'valid');
-                                    $new_set_section_infos['creation_date'] = current_time('mysql', 0);
-                                    $new_set_section_infos['attribute_set_id'] = $attribute_set_id;
-                                    $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_GROUP, $new_set_section_infos);
-                                    $attribute_set_section_id = $wpdb->insert_id;
-                                }
-
-                                if (($attribute_set_section_id > 0) && (isset($set_group_infos_details) && is_array($set_group_infos_details) && (count($set_group_infos_details) > 0))) {
-                                    $query = $wpdb->prepare("SELECT MAX(position) AS position FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d", $entity_id, $attribute_set_id, $attribute_set_section_id);
-                                    $last_position = $wpdb->get_var($query);
-                                    $position = (int) $last_position + 1;
-                                    foreach ($set_group_infos_details as $attribute_code) {
-                                        $query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s AND entity_id = %d", $attribute_code, $entity_id);
-                                        $attribute_id = $wpdb->get_row($query);
-
-                                        if ($attribute_id->id > 0) {
-                                            $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $attribute_id->id, 'position' => $position));
-                                            $position++;
-                                        }
-                                    }
-                                }
+	/**
+	 *    Create the default pages
+	 */
+	public static function wpshop_insert_default_pages($pages_type = '')
+	{
+		global $wpdb, $wp_rewrite;
+
+		/**    if we will create any new pages we need to flush page cache */
+		$page_creation = false;
+		$created_pages = array();
+
+		/** Default data array for add page */
+		$page_default_args = array(
+			'post_type' => 'page',
+			'comment_status' => 'closed',
+			'ping_status' => 'closed',
+			'post_status' => 'publish',
+			'post_author' => get_current_user_id(),
+		);
+
+		/**    Get defined shop type    */
+		$wpshop_shop_type = !empty($pages_type) ? $pages_type : get_option('wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE);
+
+		/**    Get the default datas for installation - Pages    */
+		$xml_default_pages = file_get_contents(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_pages.xml');
+		$defined_default_pages = new SimpleXMLElement($xml_default_pages);
+		foreach ($defined_default_pages->xpath('//pages/page') as $page) {
+			if (($wpshop_shop_type == $page->attributes()->shop_type) || ('sale' == $wpshop_shop_type)) {
+				$page_id = null;
+
+				/**    Do a specific check for cart page, for old wpshop installation    */
+				if ('wpshop_cart_page_id' == (string) $page->attributes()->code) {
+					$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_content LIKE %s	AND post_type != %s", '%[wpshop_basket]%', 'revision');
+					$page_id = $wpdb->get_var($query);
+
+					wp_update_post(array(
+						'ID' => $page_id,
+						'post_content' => (string) $page->content,
+					));
+				}
 
-                            }
-                        }
-                    }
-                }
-            }
-            $do_changes = true;
-        }
-
-        return $do_changes;
-    }
-
-    /**
-     * Update specific data in eav db model
-     *
-     * @param array $eav_content The complete array with all element to create into database
-     * @param boolean $do_changes The current state of changes to do
-     *
-     * @return boolean If there are changes to do or not
-     */
-    public static function update_eav_content($eav_content, $do_changes)
-    {
-        /*    Update attributes fo a given entity if attributes are set to be updated for current version    */
-        if (isset($eav_content['attributes']) && is_array($eav_content['attributes']) && (count($eav_content['attributes']) > 0)) {
-            foreach ($eav_content['attributes'] as $entity_code => $attribute_definition) {
-                foreach ($attribute_definition as $attribute_def) {
-                    $option_list_for_attribute = '';
-                    if (isset($attribute_def['backend_input_values'])) {
-                        $option_list_for_attribute = $attribute_def['backend_input_values'];
-                        unset($attribute_def['backend_input_values']);
-                    }
+				/**    Check if a page exists with the current content readed form xml file    */
+				if (empty($page_id)) {
+					$query = $wpdb->prepare("SELECT ID FROM {$wpdb->posts} WHERE post_content LIKE %s AND post_type != %s", '%' . (string) $page->content . '%', 'revision');
+					$page_id = $wpdb->get_var($query);
+				}
 
-                    /*    Get entity identifier from code    */
-                    $attribute_def['entity_id'] = wpshop_entities::get_entity_identifier_from_code($entity_code);
-                    $attribute_def['status'] = $attribute_def['attribute_status'];
-                    unset($attribute_def['attribute_status']);
-                    $attribute_def['last_update_date'] = current_time('mysql', 0);
-                    $wpdb->update(WPSHOP_DBT_ATTRIBUTE, $attribute_def, array('code' => $attribute_def['code']));
-                    $attribute_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s", $attribute_def['code']));
-
-                    /*    Insert option values if there are some to add for the current attribute    */
-                    if (($option_list_for_attribute != '') && (is_array($option_list_for_attribute))) {
-                        foreach ($option_list_for_attribute as $option_code => $option_value) {
-                            $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' => $attribute_id, 'label' => ((substr($option_code, 0, 2) != '__') ? $option_value : __(substr($option_code, 2), 'wpshop')), 'value' => $option_value));
-                            if ($option_code == $attribute_def['default_value']) {
-                                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('last_update_date' => current_time('mysql', 0), 'default_value' => $wpdb->insert_id), array('id' => $attribute_id, 'default_value' => $option_code));
-                            }
-                        }
-                    }
-                }
-            }
-            $do_changes = true;
-        }
-
-        /*    Update attribute groups fo a given entity if attributes groups are set to be updated for current version    */
-        if (is_array($eav_content['attribute_groups']) && is_array($eav_content['attribute_groups']) && (count($eav_content['attribute_groups']) > 0)) {
-            foreach ($eav_content['attribute_groups'] as $entity_code => $attribute_set) {
-                $entity_id = wpshop_entities::get_entity_identifier_from_code($entity_code);
-
-                if ($entity_id > 0) {
-                    foreach ($attribute_set as $set_name => $set_groups) {
-                        $query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE entity_id = %d AND name = LOWER(%s)", $entity_id, wpshop_tools::slugify($set_name, array('noAccent', 'noSpaces', 'lowerCase')));
-                        $attribute_set_id = $wpdb->get_var($query);
-                        if ($attribute_set_id <= 0) {
-                            $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_SET, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_id' => $entity_id, 'name' => $set_name));
-                            $attribute_set_id = $wpdb->insert_id;
-                        }
+				/**    If the page does not exists create it    */
+				if (empty($page_id)) {
+					$default_page_args = wp_parse_args(array(
+						'post_title' => __((string) $page->title, 'wpshop'),
+						'post_name' => __((string) $page->slug, 'wpshop'),
+						'post_content' => __((string) $page->content, 'wpshop'),
+						'menu_order' => (string) $page->attributes()->position,
+					), $page_default_args);
+
+					$page_id = wp_insert_post($default_page_args);
+					$created_pages[] = (string) $page->attributes()->code;
+				}
 
-                        if ($attribute_set_id > 0) {
-                            foreach ($set_groups as $set_group_infos) {
-                                $set_group_infos_details = $set_group_infos['details'];
-                                unset($set_group_infos['details']);
-                                /*    Change an attribute set status if definition specify this param     */
-                                if (isset($set_group_infos['status'])) {
-                                    $wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET, array('last_update_date' => current_time('mysql', 0), 'status' => $set_group_infos['status']), array('id' => $attribute_set_id));
-                                }
-                                $query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id = %d AND code = LOWER(%s)", $attribute_set_id, $set_group_infos['code']);
-                                $attribute_set_section_id = $wpdb->get_var($query);
-                                if ($attribute_set_section_id <= 0) {
-                                    $new_set_section_infos = $set_group_infos;
-                                    $new_set_section_infos['status'] = (isset($new_set_section_infos['status']) ? $new_set_section_infos['status'] : 'valid');
-                                    $new_set_section_infos['creation_date'] = current_time('mysql', 0);
-                                    $new_set_section_infos['attribute_set_id'] = $attribute_set_id;
-                                    $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_GROUP, $new_set_section_infos);
-                                    $attribute_set_section_id = $wpdb->insert_id;
-                                } else {
-                                    $new_set_section_infos = $set_group_infos;
-                                    $new_set_section_infos['last_update_date'] = current_time('mysql', 0);
-                                    $wpdb->update(WPSHOP_DBT_ATTRIBUTE_GROUP, $new_set_section_infos, array('id' => $attribute_set_section_id));
-                                }
-
-                                if (($attribute_set_section_id > 0) && (isset($set_group_infos_details) && is_array($set_group_infos_details))) {
-                                    if (count($set_group_infos_details) <= 0) {
-                                        $wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('last_update_date' => current_time('mysql', 0), 'status' => 'deleted'), array('entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id));
-                                    } else {
-                                        $query = $wpdb->prepare("SELECT MAX(position) AS position FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d", $entity_id, $attribute_set_id, $attribute_set_section_id);
-                                        $last_position = $wpdb->get_var($query);
-                                        $position = (int) $last_position + 1;
-                                        foreach ($set_group_infos_details as $attribute_code) {
-                                            $query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s AND entity_id = %d", $attribute_code, $entity_id);
-                                            $attribute_id = $wpdb->get_var($query);
-                                            if ($attribute_id > 0) {
-                                                $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $attribute_id, 'position' => $position));
-                                                $position++;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            $do_changes = true;
-        }
-
-        return $do_changes;
-    }
-
-    /**
-     * Manage special operation on wpshop plugin update
-     */
-    public static function make_specific_operation_on_update($version)
-    {
-        global $wpdb, $wp_rewrite;
-        $wpshop_shop_type = get_option('wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE);
-
-        switch ($version) {
-            case 3:
-            case 6:
-                self::wpshop_insert_default_pages($wpshop_shop_type);
-                wp_cache_flush();
-                return true;
-                break;
-            case 8:
-                /**    Change metaboxes order for product in case it already exists    */
-                $query = $wpdb->prepare("SELECT umeta_id, meta_value FROM {$wpdb->usermeta} WHERE meta_key = %s", 'meta-box-order_wpshop_product');
-                $customer_metaboxes_order = $wpdb->get_results($query);
-                if (!empty($customer_metaboxes_order)) {
-                    foreach ($customer_metaboxes_order as $customer_metabox_order) {
-                        $do_changes = false;
-                        $current_order = unserialize($customer_metabox_order->meta_value);
-                        if (array_key_exists('normal', $current_order) && (false !== strpos('wpshop_product_important_datas', $current_order['normal']))) {
-                            str_replace('wpshop_product_important_datas,', '', $current_order['normal']);
-                            $do_changes = true;
-                        }
+				/**    If the page is created or already exists associated the page to the good service    */
+				if (!empty($page_id)) {
+					add_option((string) $page->attributes()->code, $page_id);
 
-                        if (array_key_exists('side', $current_order)) {
-                            str_replace('wpshop_product_important_datas,', '', $current_order['side']);
-                            str_replace('submitdiv,', 'submitdiv,wpshop_product_important_datas,', $current_order['side']);
-                            $do_changes = true;
-                        }
+					$page_creation = true;
+				}
 
-                        if (true === $do_changes) {
-                            $wpdb->update($wpdb->usermeta, array('meta_value' => serialize($current_order)), array('umeta_id' => $customer_metabox_order->umeta_id));
-                        }
-                    }
-                } else {
-                    $users = get_users(array('role' => 'administrator'));
-                    if (!empty($users)) {
-                        foreach ($users as $user) {
-                            $user_meta = array(
-                                'side' => 'submitdiv,formatdiv,wpshop_product_important_datas,wpshop_product_categorydiv,pageparentdiv,wps_barcode_product,wpshop_product_actions,wpshop_product_options,postimagediv',
-                                'normal' => 'wpshop_product_fixed_tab,postexcerpt,trackbacksdiv,postcustom,commentstatusdiv,slugdiv,authordiv,wpshop_wpshop_variations,wps_media_manager,wpshop_product_order_historic',
-                                'advanced' => '',
-                            );
-                            update_user_meta($user->ID, 'meta-box-order_wpshop_product', $user_meta);
-                        }
-                    }
-                }
+			}
+		}
+
+		/**    Check if page have been created in order to do specific action    */
+		if (!empty($created_pages)) {
+			/**    If cart page and checkout page have just been created, change cart page id into checkout page id    */
+			if (in_array('wpshop_cart_page_id', $created_pages) && in_array('wpshop_checkout_page_id', $created_pages)) {
+				update_option('wpshop_cart_page_id', get_option('wpshop_checkout_page_id'));
+			}
+
+		}
+
+		wp_cache_flush();
+		/** If new page => empty cache */
+		if ($page_creation) {
+			wp_cache_delete('all_page_ids', 'pages');
+			//    $wp_rewrite->flush_rules();
+		}
+	}
+
+	/**
+	 * Insert sample datas when installing wpshop the first time if the admin choose
+	 */
+	public static function import_sample_datas()
+	{
+		global $wpdb, $wp_rewrite;
+
+		/** Default data array for add product */
+		$product_default_args = array(
+			'comment_status' => 'closed',
+			'ping_status' => 'closed',
+			'post_status' => 'publish',
+			'post_author' => get_current_user_id(),
+		);
+
+		/**    Get the default datas for installation - sample products    */
+		$sample_datas = file_get_contents(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/sample_datas.xml');
+		$defined_sample_datas = new SimpleXMLElement($sample_datas, LIBXML_NOCDATA);
+
+		$namespaces = $defined_sample_datas->getDocNamespaces();
+		if (!isset($namespaces['wp'])) {
+			$namespaces['wp'] = 'http://wordpress.org/export/1.1/';
+		}
+
+		if (!isset($namespaces['excerpt'])) {
+			$namespaces['excerpt'] = 'http://wordpress.org/export/1.1/excerpt/';
+		}
+
+		foreach ($defined_sample_datas->xpath('//wpshop_products/wpshop_product') as $product) {
+			$dc = $product->children('http://purl.org/dc/elements/1.1/');
+			$content = $product->children('http://purl.org/rss/1.0/modules/content/');
+			$excerpt = $product->children($namespaces['excerpt']);
+			$wp = $product->children($namespaces['wp']);
+
+			$product_args = wp_parse_args(array(
+				'post_title' => (string) $product->title,
+				'post_name' => (string) $wp->post_name,
+				'post_content' => (string) $content->encoded,
+				'post_excerpt' => (string) $excerpt->encoded,
+				'post_type' => (string) $wp->post_type,
+			), $product_default_args);
+
+			$product_id = wp_insert_post($product_args);
+
+			foreach ($wp->postmeta as $meta) {
+				update_post_meta($product_id, (string) $meta->meta_key, (string) $meta->meta_value);
+			}
+
+			foreach ($defined_sample_datas->xpath('//wps_pdt_variations/wps_pdt_variation/wp:post_parent[. ="' . $wp->post_id . '"]/parent::*') as $product_variation) {
+				$wps_pdt_var_dc = $product_variation->children('http://purl.org/dc/elements/1.1/');
+				$wps_pdt_var_content = $product_variation->children('http://purl.org/rss/1.0/modules/content/');
+				$wps_pdt_var_excerpt = $product_variation->children($namespaces['excerpt']);
+				$wps_pdt_var_wp = $product_variation->children($namespaces['wp']);
+
+				$product_args = wp_parse_args(array(
+					'post_title' => (string) $product_variation->title,
+					'post_name' => (string) $wps_pdt_var_wp->post_name,
+					'post_content' => (string) $wps_pdt_var_content->encoded,
+					'post_excerpt' => (string) $wps_pdt_var_excerpt->encoded,
+					'post_type' => (string) $wps_pdt_var_wp->post_type,
+					'post_parent' => $product_id,
+				), $product_default_args);
+
+				$product_variation_id = wp_insert_post($product_args);
+
+				foreach ($wps_pdt_var_wp->postmeta as $meta) {
+					update_post_meta($product_variation_id, (string) $meta->meta_key, (string) $meta->meta_value);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Method called when plugin is loaded for database update. This method allows to update the database structure, insert default content.
+	 */
+	public static function update_wpshop_dev()
+	{
+		global $wpdb, $wpshop_db_table, $wpshop_db_table_list, $wpshop_update_way, $wpshop_db_content_add, $wpshop_db_content_update, $wpshop_db_options_add, $wpshop_eav_content, $wpshop_eav_content_update, $wpshop_db_options_update;
+
+		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+
+		self::execute_operation_on_db_for_update('dev');
+	}
+
+	/**
+	 * Method called when plugin is loaded for database update. This method allows to update the database structure, insert default content.
+	 */
+	public static function update_wpshop()
+	{
+		global $wpdb, $wpshop_db_table, $wpshop_db_table_list, $wpshop_update_way, $wpshop_db_content_add, $wpshop_db_content_update, $wpshop_db_options_add, $wpshop_eav_content, $wpshop_eav_content_update, $wpshop_db_options_update;
+		$do_changes = false;
+
+		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+
+		$current_db_version = get_option('wpshop_db_options', 0);
+		$current_db_version = $current_db_version['db_version'];
+
+		$current_def_max_version = max(array_keys($wpshop_update_way));
+		$new_version = $current_def_max_version + 1;
+		$version_nb_delta = $current_def_max_version - $current_db_version;
+
+		/*    Check if there are modification to do    */
+		if ($current_def_max_version >= $current_db_version) {
+			/*    Check the lowest version of db to execute    */
+			$lowest_version_to_execute = $current_def_max_version - $version_nb_delta;
+
+			for ($i = $lowest_version_to_execute; $i <= $current_def_max_version; $i++) {
+				$do_changes = self::execute_operation_on_db_for_update($i);
+			}
+		}
+
+		/*    Update the db version option value    */
+		if ($do_changes) {
+			$db_version = get_option('wpshop_db_options', 0);
+			$db_version['db_version'] = $new_version;
+			update_option('wpshop_db_options', $db_version);
+		}
+	}
+
+	/**
+	 * Update db structure on each plugin update
+	 *
+	 * @param integer $i The current plugin db version
+	 * @return boolean If the changes are done correctly or not
+	 */
+	public static function alter_db_structure_on_update($i)
+	{
+		$do_changes = false;
+		global $wpdb, $wpshop_db_table, $wpshop_db_table_list, $wpshop_update_way, $wpshop_db_request, $wpshop_db_delete;
+
+		/*    Check if there are modification to do    */
+		if (isset($wpshop_update_way[$i])) {
+			/*    Check if there are modification to make on table    */
+			if (isset($wpshop_db_table_list[$i])) {
+				foreach ($wpshop_db_table_list[$i] as $table_name) {
+					dbDelta($wpshop_db_table[$table_name]);
+				}
+				$do_changes = true;
+			}
+
+			/*    Request maker    */
+			if (isset($wpshop_db_request[$i]) && is_array($wpshop_db_request) && is_array($wpshop_db_request[$i]) && (count($wpshop_db_request[$i]) > 0)) {
+				foreach ($wpshop_db_request[$i] as $request) {
+					$wpdb->query($request);
+					$do_changes = true;
+				}
+			}
+
+			/*    Delete datas    */
+			if (isset($wpshop_db_delete[$i]) && is_array($wpshop_db_delete) && is_array($wpshop_db_delete[$i]) && (count($wpshop_db_delete[$i]) > 0)) {
+				foreach ($wpshop_db_delete[$i] as $request) {
+					$wpdb->query($request);
+				}
+			}
+		}
+
+		return $do_changes;
+	}
+
+	/**
+	 * Do changes on database for wpshop plugin for a given version
+	 *
+	 * @param integer $i The wpshop db version to execute operation for
+	 *
+	 * @return boolean
+	 */
+	public static function execute_operation_on_db_for_update($i)
+	{
+		global $wpdb, $wpshop_db_table, $wpshop_db_table_list, $wpshop_update_way, $wpshop_db_content_add, $wpshop_db_content_update, $wpshop_db_options_add, $wpshop_eav_content, $wpshop_eav_content_update, $wpshop_db_options_update, $wpshop_db_request, $wpshop_db_delete;
+		$do_changes = false;
+
+		/*    Check if there are modification to do    */
+		if (isset($wpshop_update_way[$i])) {
+			$do_changes = self::alter_db_structure_on_update($i);
+
+			/********************/
+			/*        Insert data        */
+			/********************/
+			/*    Options content    */
+			if (isset($wpshop_db_options_add[$i]) && is_array($wpshop_db_options_add) && is_array($wpshop_db_options_add[$i]) && (count($wpshop_db_options_add[$i]) > 0)) {
+				foreach ($wpshop_db_options_add[$i] as $option_name => $option_content) {
+					add_option($option_name, $option_content, '', 'yes');
+				}
+				$do_changes = true;
+			}
+			if (isset($wpshop_db_options_update[$i]) && is_array($wpshop_db_options_update) && is_array($wpshop_db_options_update[$i]) && (count($wpshop_db_options_update[$i]) > 0)) {
+				foreach ($wpshop_db_options_update[$i] as $option_name => $option_content) {
+					$option_current_content = get_option($option_name);
+					foreach ($option_content as $option_key => $option_value) {
+						$option_current_content[$option_key] = $option_value;
+					}
+					update_option($option_name, $option_current_content);
+				}
+				$do_changes = true;
+			}
+
+			/*    Eav content    */
+			if (isset($wpshop_eav_content[$i]) && is_array($wpshop_eav_content) && is_array($wpshop_eav_content[$i]) && (count($wpshop_eav_content[$i]) > 0)) {
+				$do_changes = self::add_content_to_eav($wpshop_eav_content[$i], $do_changes);
+			}
+			/*    Eav content update    */
+			if (isset($wpshop_eav_content_update[$i]) && is_array($wpshop_eav_content_update) && is_array($wpshop_eav_content_update[$i]) && (count($wpshop_eav_content_update[$i]) > 0)) {
+				$do_changes = self::add_content_to_eav($wpshop_eav_content_update[$i], $do_changes);
+			}
+
+			/*    Add datas    */
+			if (isset($wpshop_db_content_add[$i]) && is_array($wpshop_db_content_add) && is_array($wpshop_db_content_add[$i]) && (count($wpshop_db_content_add[$i]) > 0)) {
+				foreach ($wpshop_db_content_add[$i] as $table_name => $def) {
+					foreach ($def as $information_index => $table_information) {
+						$wpdb->insert($table_name, $table_information, '%s');
+						$do_changes = true;
+					}
+				}
+			}
+
+			/*    Update datas    */
+			if (isset($wpshop_db_content_update[$i]) && is_array($wpshop_db_content_update) && is_array($wpshop_db_content_update[$i]) && (count($wpshop_db_content_update[$i]) > 0)) {
+				foreach ($wpshop_db_content_update[$i] as $table_name => $def) {
+					foreach ($def as $information_index => $table_information) {
+						$wpdb->update($table_name, $table_information['datas'], $table_information['where'], '%s', '%s');
+						$do_changes = true;
+					}
+				}
+			}
+		}
+
+		$do_changes = self::make_specific_operation_on_update($i);
+
+		return $do_changes;
+	}
+
+	/**
+	 * Create specific data in eav db model
+	 *
+	 * @param array $eav_content The complete array with all element to create into database
+	 * @param boolean $do_changes The current state of changes to do
+	 *
+	 * @return boolean If there are changes to do or not
+	 */
+	public static function add_content_to_eav($eav_content, $do_changes)
+	{
+		global $wpdb;
+		/*    Create entities if entites are set to be created for the current version    */
+		if (isset($eav_content['entities']) && is_array($eav_content['entities']) && is_array($eav_content['entities']) && (count($eav_content['entities']) > 0)) {
+			foreach ($eav_content['entities'] as $entity) {
+				/*    Creation de l'entité produit dans la table des posts    */
+				wpshop_entities::create_cpt_from_csv_file($entity);
+			}
+			$do_changes = true;
+		}
+
+		/*    Create attributes for a given entity if attributes are set to be created for current version    */
+		if (!empty($eav_content['attributes']) && is_array($eav_content['attributes']) && is_array($eav_content['attributes']) && (count($eav_content['attributes']) > 0)) {
+			foreach ($eav_content['attributes'] as $entity_code) {
+				wpshop_entities::create_cpt_attributes_from_csv_file($entity_code);
+			}
+			$do_changes = true;
+		}
+
+		/*    Create attribute groups for a given entity if attributes groups are set to be created for current version    */
+		if (isset($eav_content['attribute_groups']) && is_array($eav_content['attribute_groups']) && (count($eav_content['attribute_groups']) > 0)) {
+			foreach ($eav_content['attribute_groups'] as $entity_code => $attribute_set) {
+				$entity_id = wpshop_entities::get_entity_identifier_from_code($entity_code);
+
+				if ($entity_id > 0) {
+					foreach ($attribute_set as $set_name => $set_groups) {
+						$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE entity_id = %d AND name = LOWER(%s)", $entity_id, wpshop_tools::slugify($set_name, array('noAccent', 'noSpaces', 'lowerCase')));
+						$attribute_set_id = $wpdb->get_var($query);
+						if ($attribute_set_id <= 0) {
+							$attribute_set_content = array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_id' => $entity_id, 'name' => $set_name);
+							if ($set_name == 'default') {
+								$attribute_set_content['default_set'] = 'yes';
+							}
+							$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_SET, $attribute_set_content);
+							$attribute_set_id = $wpdb->insert_id;
+						}
+
+						if ($attribute_set_id > 0) {
+							foreach ($set_groups as $set_group_infos) {
+								$set_group_infos_details = $set_group_infos['details'];
+								unset($set_group_infos['details']);
+								/*    Change an attribute set status if definition specify this param     */
+								if (isset($set_group_infos['status'])) {
+									$wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET, array('last_update_date' => current_time('mysql', 0), 'status' => $set_group_infos['status']), array('id' => $attribute_set_id));
+								}
+								$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id = %d AND code = LOWER(%s)", $attribute_set_id, $set_group_infos['code']);
+								$attribute_set_section_id = $wpdb->get_var($query);
+								if ($attribute_set_section_id <= 0) {
+									$new_set_section_infos = $set_group_infos;
+									$new_set_section_infos['status'] = (isset($new_set_section_infos['status']) ? $new_set_section_infos['status'] : 'valid');
+									$new_set_section_infos['creation_date'] = current_time('mysql', 0);
+									$new_set_section_infos['attribute_set_id'] = $attribute_set_id;
+									$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_GROUP, $new_set_section_infos);
+									$attribute_set_section_id = $wpdb->insert_id;
+								}
+
+								if (($attribute_set_section_id > 0) && (isset($set_group_infos_details) && is_array($set_group_infos_details) && (count($set_group_infos_details) > 0))) {
+									$query = $wpdb->prepare("SELECT MAX(position) AS position FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d", $entity_id, $attribute_set_id, $attribute_set_section_id);
+									$last_position = $wpdb->get_var($query);
+									$position = (int) $last_position + 1;
+									foreach ($set_group_infos_details as $attribute_code) {
+										$query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s AND entity_id = %d", $attribute_code, $entity_id);
+										$attribute_id = $wpdb->get_row($query);
+
+										if ($attribute_id->id > 0) {
+											$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $attribute_id->id, 'position' => $position));
+											$position++;
+										}
+									}
+								}
+
+							}
+						}
+					}
+				}
+			}
+			$do_changes = true;
+		}
+
+		return $do_changes;
+	}
+
+	/**
+	 * Update specific data in eav db model
+	 *
+	 * @param array $eav_content The complete array with all element to create into database
+	 * @param boolean $do_changes The current state of changes to do
+	 *
+	 * @return boolean If there are changes to do or not
+	 */
+	public static function update_eav_content($eav_content, $do_changes)
+	{
+		/*    Update attributes fo a given entity if attributes are set to be updated for current version    */
+		if (isset($eav_content['attributes']) && is_array($eav_content['attributes']) && (count($eav_content['attributes']) > 0)) {
+			foreach ($eav_content['attributes'] as $entity_code => $attribute_definition) {
+				foreach ($attribute_definition as $attribute_def) {
+					$option_list_for_attribute = '';
+					if (isset($attribute_def['backend_input_values'])) {
+						$option_list_for_attribute = $attribute_def['backend_input_values'];
+						unset($attribute_def['backend_input_values']);
+					}
+
+					/*    Get entity identifier from code    */
+					$attribute_def['entity_id'] = wpshop_entities::get_entity_identifier_from_code($entity_code);
+					$attribute_def['status'] = $attribute_def['attribute_status'];
+					unset($attribute_def['attribute_status']);
+					$attribute_def['last_update_date'] = current_time('mysql', 0);
+					$wpdb->update(WPSHOP_DBT_ATTRIBUTE, $attribute_def, array('code' => $attribute_def['code']));
+					$attribute_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s", $attribute_def['code']));
+
+					/*    Insert option values if there are some to add for the current attribute    */
+					if (($option_list_for_attribute != '') && (is_array($option_list_for_attribute))) {
+						foreach ($option_list_for_attribute as $option_code => $option_value) {
+							$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' => $attribute_id, 'label' => ((substr($option_code, 0, 2) != '__') ? $option_value : __(substr($option_code, 2), 'wpshop')), 'value' => $option_value));
+							if ($option_code == $attribute_def['default_value']) {
+								$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('last_update_date' => current_time('mysql', 0), 'default_value' => $wpdb->insert_id), array('id' => $attribute_id, 'default_value' => $option_code));
+							}
+						}
+					}
+				}
+			}
+			$do_changes = true;
+		}
+
+		/*    Update attribute groups fo a given entity if attributes groups are set to be updated for current version    */
+		if (is_array($eav_content['attribute_groups']) && is_array($eav_content['attribute_groups']) && (count($eav_content['attribute_groups']) > 0)) {
+			foreach ($eav_content['attribute_groups'] as $entity_code => $attribute_set) {
+				$entity_id = wpshop_entities::get_entity_identifier_from_code($entity_code);
+
+				if ($entity_id > 0) {
+					foreach ($attribute_set as $set_name => $set_groups) {
+						$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE entity_id = %d AND name = LOWER(%s)", $entity_id, wpshop_tools::slugify($set_name, array('noAccent', 'noSpaces', 'lowerCase')));
+						$attribute_set_id = $wpdb->get_var($query);
+						if ($attribute_set_id <= 0) {
+							$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_SET, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_id' => $entity_id, 'name' => $set_name));
+							$attribute_set_id = $wpdb->insert_id;
+						}
+
+						if ($attribute_set_id > 0) {
+							foreach ($set_groups as $set_group_infos) {
+								$set_group_infos_details = $set_group_infos['details'];
+								unset($set_group_infos['details']);
+								/*    Change an attribute set status if definition specify this param     */
+								if (isset($set_group_infos['status'])) {
+									$wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET, array('last_update_date' => current_time('mysql', 0), 'status' => $set_group_infos['status']), array('id' => $attribute_set_id));
+								}
+								$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id = %d AND code = LOWER(%s)", $attribute_set_id, $set_group_infos['code']);
+								$attribute_set_section_id = $wpdb->get_var($query);
+								if ($attribute_set_section_id <= 0) {
+									$new_set_section_infos = $set_group_infos;
+									$new_set_section_infos['status'] = (isset($new_set_section_infos['status']) ? $new_set_section_infos['status'] : 'valid');
+									$new_set_section_infos['creation_date'] = current_time('mysql', 0);
+									$new_set_section_infos['attribute_set_id'] = $attribute_set_id;
+									$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_GROUP, $new_set_section_infos);
+									$attribute_set_section_id = $wpdb->insert_id;
+								} else {
+									$new_set_section_infos = $set_group_infos;
+									$new_set_section_infos['last_update_date'] = current_time('mysql', 0);
+									$wpdb->update(WPSHOP_DBT_ATTRIBUTE_GROUP, $new_set_section_infos, array('id' => $attribute_set_section_id));
+								}
+
+								if (($attribute_set_section_id > 0) && (isset($set_group_infos_details) && is_array($set_group_infos_details))) {
+									if (count($set_group_infos_details) <= 0) {
+										$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('last_update_date' => current_time('mysql', 0), 'status' => 'deleted'), array('entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id));
+									} else {
+										$query = $wpdb->prepare("SELECT MAX(position) AS position FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d", $entity_id, $attribute_set_id, $attribute_set_section_id);
+										$last_position = $wpdb->get_var($query);
+										$position = (int) $last_position + 1;
+										foreach ($set_group_infos_details as $attribute_code) {
+											$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s AND entity_id = %d", $attribute_code, $entity_id);
+											$attribute_id = $wpdb->get_var($query);
+											if ($attribute_id > 0) {
+												$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $attribute_id, 'position' => $position));
+												$position++;
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			$do_changes = true;
+		}
+
+		return $do_changes;
+	}
 
-                /*    Update the product prices into database    */
-                $query = $wpdb->prepare("
+	/**
+	 * Manage special operation on wpshop plugin update
+	 */
+	public static function make_specific_operation_on_update($version)
+	{
+		global $wpdb, $wp_rewrite;
+		$wpshop_shop_type = get_option('wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE);
+
+		switch ($version) {
+			case 3:
+			case 6:
+				self::wpshop_insert_default_pages($wpshop_shop_type);
+				wp_cache_flush();
+				return true;
+				break;
+			case 8:
+				/**    Change metaboxes order for product in case it already exists    */
+				$query = $wpdb->prepare("SELECT umeta_id, meta_value FROM {$wpdb->usermeta} WHERE meta_key = %s", 'meta-box-order_wpshop_product');
+				$customer_metaboxes_order = $wpdb->get_results($query);
+				if (!empty($customer_metaboxes_order)) {
+					foreach ($customer_metaboxes_order as $customer_metabox_order) {
+						$do_changes = false;
+						$current_order = unserialize($customer_metabox_order->meta_value);
+						if (array_key_exists('normal', $current_order) && (false !== strpos('wpshop_product_important_datas', $current_order['normal']))) {
+							str_replace('wpshop_product_important_datas,', '', $current_order['normal']);
+							$do_changes = true;
+						}
+
+						if (array_key_exists('side', $current_order)) {
+							str_replace('wpshop_product_important_datas,', '', $current_order['side']);
+							str_replace('submitdiv,', 'submitdiv,wpshop_product_important_datas,', $current_order['side']);
+							$do_changes = true;
+						}
+
+						if (true === $do_changes) {
+							$wpdb->update($wpdb->usermeta, array('meta_value' => serialize($current_order)), array('umeta_id' => $customer_metabox_order->umeta_id));
+						}
+					}
+				} else {
+					$users = get_users(array('role' => 'administrator'));
+					if (!empty($users)) {
+						foreach ($users as $user) {
+							$user_meta = array(
+								'side' => 'submitdiv,formatdiv,wpshop_product_important_datas,wpshop_product_categorydiv,pageparentdiv,wps_barcode_product,wpshop_product_actions,wpshop_product_options,postimagediv',
+								'normal' => 'wpshop_product_fixed_tab,postexcerpt,trackbacksdiv,postcustom,commentstatusdiv,slugdiv,authordiv,wpshop_wpshop_variations,wps_media_manager,wpshop_product_order_historic',
+								'advanced' => '',
+							);
+							update_user_meta($user->ID, 'meta-box-order_wpshop_product', $user_meta);
+						}
+					}
+				}
+
+				/*    Update the product prices into database    */
+				$query = $wpdb->prepare("
 SELECT
 (SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s) AS product_price,
 (SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s) AS price_ht,
 (SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s) AS tx_tva,
 (SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s) AS tva", 'product_price', 'price_ht', 'tx_tva', 'tva');
-                $product_prices = $wpdb->get_row($query);
-                $tax_id = $wpdb->get_var($wpdb->prepare("SELECT ATT_OPT.id FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " AS ATT_OPT WHERE attribute_id = %d AND value = '20'", $product_prices->tx_tva));
-                $query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL . " WHERE attribute_id = %d", $product_prices->product_price);
-                $price_list = $wpdb->get_results($query);
-                foreach ($price_list as $existing_ttc_price) {
-                    $tax_rate = 1.20;
-                    $price_ht = $existing_ttc_price->value / $tax_rate;
-                    $tax_amount = $existing_ttc_price->value - $price_ht;
-
-                    $wpdb->replace(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('entity_type_id' => $existing_ttc_price->entity_type_id, 'attribute_id' => $product_prices->price_ht, 'entity_id' => $existing_ttc_price->entity_id, 'unit_id' => $existing_ttc_price->unit_id, 'user_id' => $existing_ttc_price->user_id, 'language' => $existing_ttc_price->language, 'value' => $price_ht, 'creation_date_value' => current_time('mysql', 0)));
-                    $wpdb->replace(WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER, array('entity_type_id' => $existing_ttc_price->entity_type_id, 'attribute_id' => $product_prices->tx_tva, 'entity_id' => $existing_ttc_price->entity_id, 'unit_id' => $existing_ttc_price->unit_id, 'user_id' => $existing_ttc_price->user_id, 'language' => $existing_ttc_price->language, 'value' => $tax_id, 'creation_date_value' => current_time('mysql', 0)));
-                    $wpdb->replace(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('entity_type_id' => $existing_ttc_price->entity_type_id, 'attribute_id' => $product_prices->tva, 'entity_id' => $existing_ttc_price->entity_id, 'unit_id' => $existing_ttc_price->unit_id, 'user_id' => $existing_ttc_price->user_id, 'language' => $existing_ttc_price->language, 'value' => $tax_amount, 'creation_date_value' => current_time('mysql', 0)));
-                }
-
-                /*    Update orders structure into database    */
-                $orders_id = $wpdb->get_results('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '"');
-                foreach ($orders_id as $o) {
-                    $myorder = get_post_meta($o->ID, '_order_postmeta', true);
-                    $neworder = array();
-                    $items = array();
-
-                    if (!isset($myorder['order_tva'])) {
-                        $order_total_ht = 0;
-                        $order_total_ttc = 0;
-                        $order_tva = array('20' => 0);
-
-                        foreach ($myorder['order_items'] as $item) {
-                            /* item */
-                            $pu_ht = $item['cost'] / 1.20;
-                            $pu_tva = $item['cost'] - $pu_ht;
-                            $total_ht = $pu_ht * $item['qty'];
-                            $tva_total_amount = $pu_tva * $item['qty'];
-                            $total_ttc = $item['cost'] * $item['qty'];
-                            /* item */
-                            $order_total_ht += $total_ht;
-                            $order_total_ttc += $total_ttc;
-                            $order_tva['20'] += $tva_total_amount;
-
-                            $items[] = array(
-                                'item_id' => $item['id'],
-                                'item_ref' => 'Nc',
-                                'item_name' => $item['name'],
-                                'item_qty' => $item['qty'],
-
-                                'item_pu_ht' => number_format($pu_ht, 2, '.', ''),
-                                'item_pu_ttc' => number_format($item['cost'], 2, '.', ''),
-
-                                'item_ecotaxe_ht' => number_format(0, 2, '.', ''),
-                                'item_ecotaxe_tva' => 20,
-                                'item_ecotaxe_ttc' => number_format(0, 2, '.', ''),
-
-                                'item_discount_type' => 0,
-                                'item_discount_value' => 0,
-                                'item_discount_amount' => number_format(0, 2, '.', ''),
-
-                                'item_tva_rate' => 20,
-                                'item_tva_amount' => number_format($pu_tva, 2, '.', ''),
-
-                                'item_total_ht' => number_format($total_ht, 2, '.', ''),
-                                'item_tva_total_amount' => number_format($tva_total_amount, 2, '.', ''),
-                                'item_total_ttc' => number_format($total_ttc, 2, '.', ''),
-                                /*'item_total_ttc_with_ecotaxe' => number_format($total_ttc, 2, '.', '')*/
-                            );
-                        }
+				$product_prices = $wpdb->get_row($query);
+				$tax_id = $wpdb->get_var($wpdb->prepare("SELECT ATT_OPT.id FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " AS ATT_OPT WHERE attribute_id = %d AND value = '20'", $product_prices->tx_tva));
+				$query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL . " WHERE attribute_id = %d", $product_prices->product_price);
+				$price_list = $wpdb->get_results($query);
+				foreach ($price_list as $existing_ttc_price) {
+					$tax_rate = 1.20;
+					$price_ht = $existing_ttc_price->value / $tax_rate;
+					$tax_amount = $existing_ttc_price->value - $price_ht;
+
+					$wpdb->replace(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('entity_type_id' => $existing_ttc_price->entity_type_id, 'attribute_id' => $product_prices->price_ht, 'entity_id' => $existing_ttc_price->entity_id, 'unit_id' => $existing_ttc_price->unit_id, 'user_id' => $existing_ttc_price->user_id, 'language' => $existing_ttc_price->language, 'value' => $price_ht, 'creation_date_value' => current_time('mysql', 0)));
+					$wpdb->replace(WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER, array('entity_type_id' => $existing_ttc_price->entity_type_id, 'attribute_id' => $product_prices->tx_tva, 'entity_id' => $existing_ttc_price->entity_id, 'unit_id' => $existing_ttc_price->unit_id, 'user_id' => $existing_ttc_price->user_id, 'language' => $existing_ttc_price->language, 'value' => $tax_id, 'creation_date_value' => current_time('mysql', 0)));
+					$wpdb->replace(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('entity_type_id' => $existing_ttc_price->entity_type_id, 'attribute_id' => $product_prices->tva, 'entity_id' => $existing_ttc_price->entity_id, 'unit_id' => $existing_ttc_price->unit_id, 'user_id' => $existing_ttc_price->user_id, 'language' => $existing_ttc_price->language, 'value' => $tax_amount, 'creation_date_value' => current_time('mysql', 0)));
+				}
 
-                        $neworder = array(
-                            'order_key' => $myorder['order_key'],
-                            'customer_id' => $myorder['customer_id'],
-                            'order_status' => $myorder['order_status'],
-                            'order_date' => $myorder['order_date'],
-                            'order_payment_date' => $myorder['order_payment_date'],
-                            'order_shipping_date' => $myorder['order_shipping_date'],
-                            'payment_method' => $myorder['payment_method'],
-                            'order_invoice_ref' => '',
-                            'order_currency' => $myorder['order_currency'],
-                            'order_total_ht' => $order_total_ht,
-                            'order_total_ttc' => $order_total_ttc,
-                            'order_grand_total' => $order_total_ttc,
-                            'order_shipping_cost' => number_format(0, 2, '.', ''),
-                            'order_tva' => array_map(array('wpshop_tools', 'number_format_hack'), $order_tva),
-                            'order_items' => $items,
-                        );
-                        /* Update the order postmeta */
-                        update_post_meta($o->ID, '_order_postmeta', $neworder);
-                    }
-                }
-
-                self::wpshop_insert_default_pages($wpshop_shop_type);
-                wp_cache_flush();
-                return true;
-                break;
-            case 12:
-                $query = "SELECT ID FROM " . $wpdb->users;
-                $user_list = $wpdb->get_results($query);
-                foreach ($user_list as $user) {
-                    $user_first_name = get_user_meta($user->ID, 'first_name', true);
-                    $user_last_name = get_user_meta($user->ID, 'last_name', true);
-                    $shipping_info = get_user_meta($user->ID, 'shipping_info', true);
-
-                    if (($user_first_name == '') && !empty($shipping_info['first_name'])) {
-                        update_user_meta($user->ID, 'first_name', $shipping_info['first_name']);
-                    }
+				/*    Update orders structure into database    */
+				$orders_id = $wpdb->get_results('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '"');
+				foreach ($orders_id as $o) {
+					$myorder = get_post_meta($o->ID, '_order_postmeta', true);
+					$neworder = array();
+					$items = array();
+
+					if (!isset($myorder['order_tva'])) {
+						$order_total_ht = 0;
+						$order_total_ttc = 0;
+						$order_tva = array('20' => 0);
+
+						foreach ($myorder['order_items'] as $item) {
+							/* item */
+							$pu_ht = $item['cost'] / 1.20;
+							$pu_tva = $item['cost'] - $pu_ht;
+							$total_ht = $pu_ht * $item['qty'];
+							$tva_total_amount = $pu_tva * $item['qty'];
+							$total_ttc = $item['cost'] * $item['qty'];
+							/* item */
+							$order_total_ht += $total_ht;
+							$order_total_ttc += $total_ttc;
+							$order_tva['20'] += $tva_total_amount;
+
+							$items[] = array(
+								'item_id' => $item['id'],
+								'item_ref' => 'Nc',
+								'item_name' => $item['name'],
+								'item_qty' => $item['qty'],
+
+								'item_pu_ht' => number_format($pu_ht, 2, '.', ''),
+								'item_pu_ttc' => number_format($item['cost'], 2, '.', ''),
+
+								'item_ecotaxe_ht' => number_format(0, 2, '.', ''),
+								'item_ecotaxe_tva' => 20,
+								'item_ecotaxe_ttc' => number_format(0, 2, '.', ''),
+
+								'item_discount_type' => 0,
+								'item_discount_value' => 0,
+								'item_discount_amount' => number_format(0, 2, '.', ''),
+
+								'item_tva_rate' => 20,
+								'item_tva_amount' => number_format($pu_tva, 2, '.', ''),
+
+								'item_total_ht' => number_format($total_ht, 2, '.', ''),
+								'item_tva_total_amount' => number_format($tva_total_amount, 2, '.', ''),
+								'item_total_ttc' => number_format($total_ttc, 2, '.', ''),
+								/*'item_total_ttc_with_ecotaxe' => number_format($total_ttc, 2, '.', '')*/
+							);
+						}
+
+						$neworder = array(
+							'order_key' => $myorder['order_key'],
+							'customer_id' => $myorder['customer_id'],
+							'order_status' => $myorder['order_status'],
+							'order_date' => $myorder['order_date'],
+							'order_payment_date' => $myorder['order_payment_date'],
+							'order_shipping_date' => $myorder['order_shipping_date'],
+							'payment_method' => $myorder['payment_method'],
+							'order_invoice_ref' => '',
+							'order_currency' => $myorder['order_currency'],
+							'order_total_ht' => $order_total_ht,
+							'order_total_ttc' => $order_total_ttc,
+							'order_grand_total' => $order_total_ttc,
+							'order_shipping_cost' => number_format(0, 2, '.', ''),
+							'order_tva' => array_map(array('wpshop_tools', 'number_format_hack'), $order_tva),
+							'order_items' => $items,
+						);
+						/* Update the order postmeta */
+						update_post_meta($o->ID, '_order_postmeta', $neworder);
+					}
+				}
 
-                    if (($user_last_name == '') && !empty($shipping_info['last_name'])) {
-                        update_user_meta($user->ID, 'last_name', $shipping_info['last_name']);
-                    }
-                }
-
-                /*    Update orders structure into database    */
-                $orders_id = $wpdb->get_results('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '"');
-                foreach ($orders_id as $o) {
-                    $myorder = get_post_meta($o->ID, '_order_postmeta', true);
-                    if (!empty($myorder)) {
-                        $new_items = array();
-                        foreach ($myorder['order_items'] as $item) {
-                            $new_items = $item;
-                            $new_items['item_discount_type'] = !empty($item['item_discount_rate']) ? $item['item_discount_rate'] : 'amount';
-                            // unset($new_items['item_discount_rate']);
-                            $new_items['item_discount_value'] = 0;
-                        }
-                        $myorder['order_items'] = $new_items;
+				self::wpshop_insert_default_pages($wpshop_shop_type);
+				wp_cache_flush();
+				return true;
+				break;
+			case 12:
+				$query = "SELECT ID FROM " . $wpdb->users;
+				$user_list = $wpdb->get_results($query);
+				foreach ($user_list as $user) {
+					$user_first_name = get_user_meta($user->ID, 'first_name', true);
+					$user_last_name = get_user_meta($user->ID, 'last_name', true);
+					$shipping_info = get_user_meta($user->ID, 'shipping_info', true);
+
+					if (($user_first_name == '') && !empty($shipping_info['first_name'])) {
+						update_user_meta($user->ID, 'first_name', $shipping_info['first_name']);
+					}
+
+					if (($user_last_name == '') && !empty($shipping_info['last_name'])) {
+						update_user_meta($user->ID, 'last_name', $shipping_info['last_name']);
+					}
+				}
 
-                        /* Update the order postmeta */
-                        update_post_meta($o->ID, '_order_postmeta', $myorder);
-                    }
-                }
-
-                /*    Delete useless database table    */
-                $query = "DROP TABLE " . WPSHOP_DBT_CART;
-                $wpdb->query($query);
-                $query = "DROP TABLE " . WPSHOP_DBT_CART_CONTENTS;
-                $wpdb->query($query);
-                return true;
-                break;
-            case 13:
-                $attribute_used_for_sort_by = wpshop_attributes::getElement('yes', "'valid', 'moderated', 'notused'", 'is_used_for_sort_by', true);
-                foreach ($attribute_used_for_sort_by as $attribute) {
-                    $data = query_posts(array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
-                    foreach ($data as $post) {
-                        $postmeta = get_post_meta($post->ID, '_wpshop_product_metadata', true);
-                        if (!empty($postmeta[$attribute->code])) {
-                            update_post_meta($post->ID, '_' . $attribute->code, $postmeta[$attribute->code]);
-                        }
-                    }
-                    wp_reset_query();
-                }
-                return true;
-                break;
-            case 17:
-                $products = query_posts(array(
-                    'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT)
-                );
-                $query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE default_set = %s", 'yes');
-                $default_attribute_set = $wpdb->get_var($query);
-                foreach ($products as $product) {
-                    $p_att_set_id = get_post_meta($product->ID, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true);
-                    if (empty($p_att_set_id)) {
-                        /*    Update the attribute set id for the current product    */
-                        update_post_meta($product->ID, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, $default_attribute_set);
-                    }
-                    wp_reset_query();
-                }
-                self::wpshop_insert_default_pages($wpshop_shop_type);
-                wp_cache_flush();
-                return true;
-                break;
-            case 18:
-                self::wpshop_insert_default_pages($wpshop_shop_type);
-                wp_cache_flush();
-                return true;
-                break;
-            case 19:
-                $wp_rewrite->flush_rules();
-                return true;
-                break;
-
-            case 21:
-                /**
-                 * Correction des valeurs pour l'attributs "gestion du stock" qui n'�taient pas cr�es automatiquement
-                 */
-                $query = $wpdb->prepare("SELECT ATTR_OPT.id, ATTR_OPT.value, ATTR_OPT.label, ATTR_OPT.position, ATTR_OPT.attribute_id FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " AS ATTR_OPT INNER JOIN " . WPSHOP_DBT_ATTRIBUTE . " AS ATTR ON (ATTR.id = ATTR_OPT.attribute_id) WHERE ATTR_OPT.status=%s AND ATTR.code=%s", 'valid', 'manage_stock');
-                $manage_stock_option = $wpdb->get_results($query);
-                if (!empty($manage_stock_option)) {
-                    $no_is_present = false;
-                    $attribute_id = $manage_stock_option[0]->attribute_id;
-                    foreach ($manage_stock_option as $manage_definition) {
-                        if (strtolower(__($manage_definition->value, 'wpshop')) == strtolower(__('no', 'wpshop'))) {
-                            $no_is_present = true;
-                        }
-                    }
-                    if (!$no_is_present) {
-                        $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'last_update_date' => current_time('mysql', 0), 'attribute_id' => $attribute_id, 'value' => 'no', 'label' => __('No', 'wpshop')));
-                    }
-                }
+				/*    Update orders structure into database    */
+				$orders_id = $wpdb->get_results('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '"');
+				foreach ($orders_id as $o) {
+					$myorder = get_post_meta($o->ID, '_order_postmeta', true);
+					if (!empty($myorder)) {
+						$new_items = array();
+						foreach ($myorder['order_items'] as $item) {
+							$new_items = $item;
+							$new_items['item_discount_type'] = !empty($item['item_discount_rate']) ? $item['item_discount_rate'] : 'amount';
+							// unset($new_items['item_discount_rate']);
+							$new_items['item_discount_value'] = 0;
+						}
+						$myorder['order_items'] = $new_items;
+
+						/* Update the order postmeta */
+						update_post_meta($o->ID, '_order_postmeta', $myorder);
+					}
+				}
 
-                /** Change price attribute set section order for default set */
-                $price_tab = unserialize(WPSHOP_ATTRIBUTE_PRICES);
-                unset($price_tab[array_search(WPSHOP_COST_OF_POSTAGE, $price_tab)]);
-                $query = "SELECT GROUP_CONCAT(id) FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code IN ('" . implode("','", $price_tab) . "')";
-                $attribute_ids = $wpdb->get_var($query);
+				/*    Delete useless database table    */
+				$query = "DROP TABLE " . WPSHOP_DBT_CART;
+				$wpdb->query($query);
+				$query = "DROP TABLE " . WPSHOP_DBT_CART_CONTENTS;
+				$wpdb->query($query);
+				return true;
+				break;
+			case 13:
+				$attribute_used_for_sort_by = wpshop_attributes::getElement('yes', "'valid', 'moderated', 'notused'", 'is_used_for_sort_by', true);
+				foreach ($attribute_used_for_sort_by as $attribute) {
+					$data = query_posts(array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
+					foreach ($data as $post) {
+						$postmeta = get_post_meta($post->ID, '_wpshop_product_metadata', true);
+						if (!empty($postmeta[$attribute->code])) {
+							update_post_meta($post->ID, '_' . $attribute->code, $postmeta[$attribute->code]);
+						}
+					}
+					wp_reset_query();
+				}
+				return true;
+				break;
+			case 17:
+				$products = query_posts(array(
+					'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT)
+				);
+				$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE default_set = %s", 'yes');
+				$default_attribute_set = $wpdb->get_var($query);
+				foreach ($products as $product) {
+					$p_att_set_id = get_post_meta($product->ID, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true);
+					if (empty($p_att_set_id)) {
+						/*    Update the attribute set id for the current product    */
+						update_post_meta($product->ID, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, $default_attribute_set);
+					}
+					wp_reset_query();
+				}
+				self::wpshop_insert_default_pages($wpshop_shop_type);
+				wp_cache_flush();
+				return true;
+				break;
+			case 18:
+				self::wpshop_insert_default_pages($wpshop_shop_type);
+				wp_cache_flush();
+				return true;
+				break;
+			case 19:
+				$wp_rewrite->flush_rules();
+				return true;
+				break;
+
+			case 21:
+				/**
+				 * Correction des valeurs pour l'attributs "gestion du stock" qui n'�taient pas cr�es automatiquement
+				 */
+				$query = $wpdb->prepare("SELECT ATTR_OPT.id, ATTR_OPT.value, ATTR_OPT.label, ATTR_OPT.position, ATTR_OPT.attribute_id FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " AS ATTR_OPT INNER JOIN " . WPSHOP_DBT_ATTRIBUTE . " AS ATTR ON (ATTR.id = ATTR_OPT.attribute_id) WHERE ATTR_OPT.status=%s AND ATTR.code=%s", 'valid', 'manage_stock');
+				$manage_stock_option = $wpdb->get_results($query);
+				if (!empty($manage_stock_option)) {
+					$no_is_present = false;
+					$attribute_id = $manage_stock_option[0]->attribute_id;
+					foreach ($manage_stock_option as $manage_definition) {
+						if (strtolower(__($manage_definition->value, 'wpshop')) == strtolower(__('no', 'wpshop'))) {
+							$no_is_present = true;
+						}
+					}
+					if (!$no_is_present) {
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'last_update_date' => current_time('mysql', 0), 'attribute_id' => $attribute_id, 'value' => 'no', 'label' => __('No', 'wpshop')));
+					}
+				}
 
-                $query = $wpdb->prepare("
+				/** Change price attribute set section order for default set */
+				$price_tab = unserialize(WPSHOP_ATTRIBUTE_PRICES);
+				unset($price_tab[array_search(WPSHOP_COST_OF_POSTAGE, $price_tab)]);
+				$query = "SELECT GROUP_CONCAT(id) FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code IN ('" . implode("','", $price_tab) . "')";
+				$attribute_ids = $wpdb->get_var($query);
+
+				$query = $wpdb->prepare("
 SELECT ATTR_DET.attribute_group_id
 FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " AS ATTR_DET
 	INNER JOIN " . WPSHOP_DBT_ATTRIBUTE_GROUP . " AS ATTR_GROUP ON ((ATTR_GROUP.id = ATTR_DET.attribute_group_id) AND (ATTR_GROUP.code = %s))
 	INNER JOIN " . WPSHOP_DBT_ATTRIBUTE_SET . " AS ATTR_SET ON ((ATTR_SET.id = ATTR_GROUP.attribute_set_id) AND (ATTR_SET.name = %s))
 WHERE ATTR_DET.attribute_id IN (" . $attribute_ids . ")"
-                    , 'prices', __('default', 'wpshop'));
-                $list = $wpdb->get_results($query);
-                if (!empty($list)) {
-                    $change_order = true;
-                    $old_value = $list[0]->attribute_group_id;
-                    unset($list[0]);
-                    if (!empty($list)) {
-                        foreach ($list as $data) {
-                            if ($old_value != $data->attribute_group_id) {
-                                $change_order = false;
-                            }
-                        }
-                        if ($change_order) {
-                            foreach ($price_tab as $price_code) {
-                                $query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s", $price_code);
-                                $attribute_id = $wpdb->get_var($query);
-                                switch ($price_code) {
-                                    case WPSHOP_PRODUCT_PRICE_HT:
-                                        $position = (WPSHOP_PRODUCT_PRICE_PILOT == 'HT') ? 1 : 3;
-                                        break;
-                                    case WPSHOP_PRODUCT_PRICE_TAX:
-                                        $position = 2;
-                                        break;
-                                    case WPSHOP_PRODUCT_PRICE_TTC:
-                                        $position = (WPSHOP_PRODUCT_PRICE_PILOT == 'HT') ? 3 : 1;
-                                        break;
-                                    case WPSHOP_PRODUCT_PRICE_TAX_AMOUNT:
-                                        $position = 4;
-                                        break;
-                                }
-                                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'last_update_date' => current_time('mysql', 0), 'position' => $position), array('attribute_group_id' => $old_value, 'attribute_id' => $attribute_id));
-                            }
-                        }
-                    }
-                }
-                return true;
-                break;
-            case 22:
-                $query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-                $product_entity_id = $wpdb->get_var($query);
-                if (empty($product_entityd_id) || ($product_entity_id <= 0) || !$product_entity_id) {
-                    /*    Create the product entity into post table    */
-                    $product_entity = array(
-                        'post_title' => __('Products', 'wpshop'),
-                        'post_name' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
-                        'post_content' => __('Define the entity allowing to manage product on your store. If you delete this entity you won\'t be able to manage your store', 'wpshop'),
-                        'post_status' => 'publish',
-                        'post_author' => 1,
-                        'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES,
-                    );
-                    $product_entity_id = wp_insert_post($product_entity);
-                }
-
-                /*    Update eav table with the new entity id for product    */
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('entity_id' => $product_entity_id), array('entity_id' => 1));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET, array('entity_id' => $product_entity_id), array('entity_id' => 1));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('entity_type_id' => $product_entity_id), array('entity_type_id' => 1));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME, array('entity_type_id' => $product_entity_id), array('entity_type_id' => 1));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('entity_type_id' => $product_entity_id), array('entity_type_id' => 1));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER, array('entity_type_id' => $product_entity_id), array('entity_type_id' => 1));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT, array('entity_type_id' => $product_entity_id), array('entity_type_id' => 1));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR, array('entity_type_id' => $product_entity_id), array('entity_type_id' => 1));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_HISTO, array('entity_type_id' => $product_entity_id), array('entity_type_id' => 1));
-
-                /*    Create an element of customer entity for each existing user    */
-                $user_list = get_users();
-                foreach ($user_list as $user) {
-                    wps_customer_ctr::create_entity_customer_when_user_is_created($user->ID);
-                }
-
-                return true;
-                break;
-            case 23:
-                /*    Delete duplicate entities    */
-                $query = ("SELECT ID FROM " . $wpdb->posts . " WHERE post_name LIKE '%" . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . "%' ");
-                $product_entity_list = $wpdb->get_results($query);
-                if (count($product_entity_list) > 1) {
-                    $i = 0;
-                    foreach ($product_entity_list as $product_entity) {
-                        if ($i > 0) {
-                            wp_delete_post($product_entity->ID);
-                        }
-                    }
-                }
-                return true;
-                break;
-            case 24:
-                /*    Update the link status for disabled attribute set    */
-                $query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE status = %s", 'deleted');
-                $deleted_attribute_group = $wpdb->get_results($query);
-                if (!empty($deleted_attribute_group)) {
-                    foreach ($deleted_attribute_group as $group) {
-                        $wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'deleted', 'last_update_date' => current_time('mysql', 0)), array('attribute_group_id' => $group->id));
-                    }
-                }
-
-                /*    Update entities meta management    */
-                $entities = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES));
-                if (!empty($entities)) {
-                    foreach ($entities as $entity) {
-                        $support = get_post_meta($entity->ID, '_wpshop_entity_support', true);
-                        $rewrite = get_post_meta($entity->ID, '_wpshop_entity_rewrite', true);
-                        update_post_meta($entity->ID, '_wpshop_entity_params', array('support' => $support, 'rewrite' => array('slug' => $rewrite)));
-                    }
-                }
-                wp_reset_query();
-                return true;
-                break;
-            case 25:
-                /*    Get the first entities of product and customer    */
-                $query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_name=%s AND post_type=%s ORDER BY ID ASC LIMIT 1", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES);
-                $product_entity_id = $wpdb->get_var($query);
-
-                /*    Update attributes that are not linked with entities    */
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('entity_id' => $product_entity_id), array('entity_id' => 0));
-
-                /*    Get entities that have been created a lot of time and delete them    */
-                $query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE (post_name LIKE '%%" . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . "-%%' OR post_name LIKE '%%" . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . "-%%') AND post_type=%s", WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES);
-                $entities_to_delete = $wpdb->get_results($query);
-                if (!empty($entities_to_delete) && is_array($entities_to_delete)) {
-                    foreach ($entities_to_delete as $entity) {
-                        wp_delete_post($entity->ID, true);
-                    }
-                }
-
-                /*    Get post list that are children of entities created a lot of time */
-                $query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_type LIKE %s", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . "-%");
-                $entities_to_update = $wpdb->get_results($query);
-                if (!empty($entities_to_update) && is_array($entities_to_update)) {
-                    foreach ($entities_to_update as $entity) {
-                        wp_update_post(array('ID' => $entity->ID, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS));
-                    }
-                }
-                $query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_type LIKE %s", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . "-%");
-                $entities_to_update = $wpdb->get_results($query);
-                if (!empty($entities_to_update) && is_array($entities_to_update)) {
-                    foreach ($entities_to_update as $entity) {
-                        wp_update_post(array('ID' => $entity->ID, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
-                    }
-                }
-
-                /*    Change addons managament    */
-                $wpshop_addons_options = get_option('wpshop_addons_state', array());
-                if (!empty($wpshop_addons_options)) {
-                    foreach ($wpshop_addons_options as $addon_name => $addon_state) {
-                        $options_args = array();
-                        $options_args[$addon_name]['activate'] = $addon_state;
-                        $options_args[$addon_name]['activation_date'] = current_time('mysql', 0);
-                        if (!$addon_state) {
-                            $options_args[$addon_name]['deactivation_date'] = current_time('mysql', 0);
-                        }
+					, 'prices', __('default', 'wpshop'));
+				$list = $wpdb->get_results($query);
+				if (!empty($list)) {
+					$change_order = true;
+					$old_value = $list[0]->attribute_group_id;
+					unset($list[0]);
+					if (!empty($list)) {
+						foreach ($list as $data) {
+							if ($old_value != $data->attribute_group_id) {
+								$change_order = false;
+							}
+						}
+						if ($change_order) {
+							foreach ($price_tab as $price_code) {
+								$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s", $price_code);
+								$attribute_id = $wpdb->get_var($query);
+								switch ($price_code) {
+									case WPSHOP_PRODUCT_PRICE_HT:
+										$position = (WPSHOP_PRODUCT_PRICE_PILOT == 'HT') ? 1 : 3;
+										break;
+									case WPSHOP_PRODUCT_PRICE_TAX:
+										$position = 2;
+										break;
+									case WPSHOP_PRODUCT_PRICE_TTC:
+										$position = (WPSHOP_PRODUCT_PRICE_PILOT == 'HT') ? 3 : 1;
+										break;
+									case WPSHOP_PRODUCT_PRICE_TAX_AMOUNT:
+										$position = 4;
+										break;
+								}
+								$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'last_update_date' => current_time('mysql', 0), 'position' => $position), array('attribute_group_id' => $old_value, 'attribute_id' => $attribute_id));
+							}
+						}
+					}
+				}
+				return true;
+				break;
+			case 22:
+				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+				$product_entity_id = $wpdb->get_var($query);
+				if (empty($product_entityd_id) || ($product_entity_id <= 0) || !$product_entity_id) {
+					/*    Create the product entity into post table    */
+					$product_entity = array(
+						'post_title' => __('Products', 'wpshop'),
+						'post_name' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
+						'post_content' => __('Define the entity allowing to manage product on your store. If you delete this entity you won\'t be able to manage your store', 'wpshop'),
+						'post_status' => 'publish',
+						'post_author' => 1,
+						'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES,
+					);
+					$product_entity_id = wp_insert_post($product_entity);
+				}
 
-                        add_option(WPSHOP_ADDONS_OPTION_NAME, $options_args);
-                    }
-                    delete_option('wpshop_addons_state');
-                }
-
-                /*    Update the different entities id into attribute set details table    */
-                $query = "UPDATE " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " AS ATT_DET INNER JOIN " . WPSHOP_DBT_ATTRIBUTE . " AS ATT ON (ATT.id = ATT_DET.attribute_id) SET ATT_DET.entity_type_id = ATT.entity_id";
-                $wpdb->query($query);
-
-                return true;
-                break;
-            case 26:
-                $query = "SELECT post_id, meta_value FROM " . $wpdb->postmeta . " WHERE meta_key = '_order_postmeta' ";
-                $results = $wpdb->get_results($query);
-                foreach ($results as $result) {
-                    $order_info = unserialize($result->meta_value);
-                    update_post_meta($result->post_id, '_wpshop_order_customer_id', $order_info['customer_id']);
-                    update_post_meta($result->post_id, '_wpshop_order_shipping_date', $order_info['order_shipping_date']);
-                    update_post_meta($result->post_id, '_wpshop_order_status', $order_info['order_status']);
-                }
-
-                /*    Update the different entities id into attribute set details table    */
-                $query = "UPDATE " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " AS ATT_DET INNER JOIN " . WPSHOP_DBT_ATTRIBUTE . " AS ATT ON (ATT.id = ATT_DET.attribute_id) SET ATT_DET.entity_type_id = ATT.entity_id";
-                $wpdb->query($query);
-
-                return true;
-                break;
-
-            case 29:
-                $billing_title = __('Billing address', 'wpshop');
-                $shipping_title = __('Shipping address', 'wpshop');
-
-                //UPDATE USERS ADDRESSES
-                $billing_address_set_id_query = 'SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE name = "' . $billing_title . '"';
-                $shipping_address_set_id_query = 'SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE name = "' . $shipping_title . '"';
-
-                $billing_address_set_id = $wpdb->get_var($billing_address_set_id_query);
-                $shipping_address_set_id = $wpdb->get_var($shipping_address_set_id_query);
-
-                //Add Address & Google Map API KEY options
-                add_option('wpshop_billing_address', array('choice' => $billing_address_set_id), '', 'yes');
-                add_option('wpshop_shipping_address_choice', array('activate' => 'on', 'choice' => $shipping_address_set_id), '', 'yes');
-                add_option('wpshop_google_map_api_key', '', '', 'yes');
-
-                $query = 'SELECT * FROM ' . $wpdb->users . '';
-                $results = $wpdb->get_results($query);
-                foreach ($results as $result) {
-                    $billing_infos = get_user_meta($result->ID, 'billing_info', true);
-                    $shipping_infos = get_user_meta($result->ID, 'shipping_info', true);
-                    if (!empty($billing_infos)) {
-                        //Save Billing Infos
-                        $billing_address = array();
-                        if (!empty($billing_infos['civility'])) {
-                            switch ($billing_infos['civility']) {
-                                case 1:
-                                    $civility = $mister_id;
-                                    break;
-                                case 2:
-                                    $civility = $madam_id;
-                                    break;
-                                case 3:
-                                    $civility = $miss_id;
-                                    break;
-                            }
-                        } else {
-                            $civility = $mister_id;
-                        }
-                        $billing_address = array('address_title' => $billing_title,
-                            'address_last_name' => !empty($billing_infos['last_name']) ? $billing_infos['last_name'] : '',
-                            'address_first_name' => !empty($billing_infos['first_name']) ? $billing_infos['first_name'] : '',
-                            'company' => !empty($billing_infos['company']) ? $billing_infos['company'] : '',
-                            'address' => !empty($billing_infos['address']) ? $billing_infos['address'] : '',
-                            'postcode' => !empty($billing_infos['postcode']) ? $billing_infos['postcode'] : '',
-                            'city' => !empty($billing_infos['city']) ? $billing_infos['city'] : '',
-                            'state' => !empty($billing_infos['state']) ? $billing_infos['state'] : '',
-                            'country' => !empty($billing_infos['country']) ? $billing_infos['country'] : '',
-                            'address_user_email' => !empty($billing_infos['email']) ? $billing_infos['email'] : '',
-                            'phone' => !empty($billing_infos['phone']) ? $billing_infos['phone'] : '',
-                            'tva_intra' => !empty($billing_infos['company_tva_intra']) ? $billing_infos['company_tva_intra'] : '',
-                            'civility' => $civility,
-                        );
-                        //Create the post and post_meta for the billing address
-                        $post_address = array(
-                            'post_author' => $result->ID,
-                            'post_title' => $billing_title,
-                            'post_status' => 'publish',
-                            'post_name' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS,
-                            'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS,
-                            'post_parent' => $result->ID,
-                        );
-                        $post_address_id = wp_insert_post($post_address);
-
-                        //Create the post_meta with the address infos
-                        update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', $billing_address);
-                        update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_attribute_set_id', $billing_address_set_id);
-                    }
+				/*    Update eav table with the new entity id for product    */
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('entity_id' => $product_entity_id), array('entity_id' => 1));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET, array('entity_id' => $product_entity_id), array('entity_id' => 1));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('entity_type_id' => $product_entity_id), array('entity_type_id' => 1));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME, array('entity_type_id' => $product_entity_id), array('entity_type_id' => 1));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('entity_type_id' => $product_entity_id), array('entity_type_id' => 1));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER, array('entity_type_id' => $product_entity_id), array('entity_type_id' => 1));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT, array('entity_type_id' => $product_entity_id), array('entity_type_id' => 1));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR, array('entity_type_id' => $product_entity_id), array('entity_type_id' => 1));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_HISTO, array('entity_type_id' => $product_entity_id), array('entity_type_id' => 1));
+
+				/*    Create an element of customer entity for each existing user    */
+				$user_list = get_users();
+				foreach ($user_list as $user) {
+					wps_customer_ctr::create_entity_customer_when_user_is_created($user->ID);
+				}
 
-                    if (!empty($shipping_infos)) {
-                        //Save Shipping Infos
-                        if (!empty($shipping_infos['civility'])) {
-                            switch ($shipping_infos['civility']) {
-                                case 1:
-                                    $civility = $mister_id;
-                                    break;
-                                case 2:
-                                    $civility = $madam_id;
-                                    break;
-                                case 3:
-                                    $civility = $miss_id;
-                                    break;
-                            }
-                        } else {
-                            $civility = $mister_id;
-                        }
-                        $shipping_address = array();
-                        $shipping_address = array('address_title' => $shipping_title,
-                            'address_last_name' => !empty($shipping_infos['last_name']) ? $shipping_infos['last_name'] : '',
-                            'address_first_name' => !empty($shipping_infos['first_name']) ? $shipping_infos['first_name'] : '',
-                            'company' => !empty($shipping_infos['company']) ? $shipping_infos['company'] : '',
-                            'address' => !empty($shipping_infos['address']) ? $shipping_infos['address'] : '',
-                            'postcode' => !empty($shipping_infos['postcode']) ? $shipping_infos['postcode'] : '',
-                            'city' => !empty($shipping_infos['city']) ? $shipping_infos['city'] : '',
-                            'state' => !empty($shipping_infos['state']) ? $shipping_infos['state'] : '',
-                            'country' => !empty($shipping_infos['country']) ? $shipping_infos['country'] : '',
-                            'civility' => $civility,
-                        );
-                        //Create the post and post_meta for the billing address
-                        $post_address = array(
-                            'post_author' => $result->ID,
-                            'post_title' => $shipping_title,
-                            'post_status' => 'publish',
-                            'post_name' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS,
-                            'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS,
-                            'post_parent' => $result->ID,
-                        );
-                        $post_address_id = wp_insert_post($post_address);
-                        //Create the post_meta with the address infos
-                        update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', $shipping_address);
-                        update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_attribute_set_id', $shipping_address_set_id);
-                    }
-                }
-
-                // FORMATE THE ORDER ADDRESSES INFOS
-                $results = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1));
-                foreach ($results as $result) {
-                    $address = get_post_meta($result->ID, '_order_info', true);
-
-                    $billing_address = array();
-                    if (!empty($address['billing'])) {
-                        if (!empty($address['billing']['civility'])) {
-                            switch ($address['billing']['civility']) {
-                                case 1:
-                                    $civility = $mister_id;
-                                    break;
-                                case 2:
-                                    $civility = $madam_id;
-                                    break;
-                                case 3:
-                                    $civility = $miss_id;
-                                    break;
-                                default:
-                                    $civility = $mister_id;
-                                    break;
-                            }
-                        } else {
-                            $civility = $mister_id;
-                        }
-                        $billing_address = array('address_title' => $billing_title,
-                            'address_last_name' => !empty($address['billing']['last_name']) ? $address['billing']['last_name'] : '',
-                            'address_first_name' => !empty($address['billing']['first_name']) ? $address['billing']['first_name'] : '',
-                            'company' => !empty($address['billing']['company']) ? $address['billing']['company'] : '',
-                            'address' => !empty($address['billing']['address']) ? $address['billing']['address'] : '',
-                            'postcode' => !empty($address['billing']['postcode']) ? $address['billing']['postcode'] : '',
-                            'city' => !empty($address['billing']['city']) ? $address['billing']['city'] : '',
-                            'state' => !empty($address['billing']['state']) ? $address['billing']['state'] : '',
-                            'country' => !empty($address['billing']['country']) ? $address['billing']['country'] : '',
-                            'address_user_email' => !empty($address['billing']['email']) ? $address['billing']['email'] : '',
-                            'phone' => !empty($address['billing']['phone']) ? $address['billing']['phone'] : '',
-                            'tva_intra' => !empty($address['billing']['company_tva_intra']) ? $address['billing']['company_tva_intra'] : '',
-                            'civility' => $civility,
-                        );
-                    }
+				return true;
+				break;
+			case 23:
+				/*    Delete duplicate entities    */
+				$query = ("SELECT ID FROM " . $wpdb->posts . " WHERE post_name LIKE '%" . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . "%' ");
+				$product_entity_list = $wpdb->get_results($query);
+				if (count($product_entity_list) > 1) {
+					$i = 0;
+					foreach ($product_entity_list as $product_entity) {
+						if ($i > 0) {
+							wp_delete_post($product_entity->ID);
+						}
+					}
+				}
+				return true;
+				break;
+			case 24:
+				/*    Update the link status for disabled attribute set    */
+				$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE status = %s", 'deleted');
+				$deleted_attribute_group = $wpdb->get_results($query);
+				if (!empty($deleted_attribute_group)) {
+					foreach ($deleted_attribute_group as $group) {
+						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'deleted', 'last_update_date' => current_time('mysql', 0)), array('attribute_group_id' => $group->id));
+					}
+				}
 
-                    $shipping_address = array();
-                    if (!empty($address['shipping'])) {
-                        if (!empty($address['shipping']['civility'])) {
-                            switch ($address['shipping']['civility']) {
-                                case 1:
-                                    $civility = $mister_id;
-                                    break;
-                                case 2:
-                                    $civility = $madam_id;
-                                    break;
-                                case 3:
-                                    $civility = $miss_id;
-                                    break;
-                            }
-                        } else {
-                            $civility = $mister_id;
-                        }
-                        $shipping_address = array('address_title' => $shipping_title,
-                            'address_last_name' => !empty($address['shipping']['last_name']) ? $address['shipping']['last_name'] : '',
-                            'address_first_name' => !empty($address['shipping']['first_name']) ? $address['shipping']['first_name'] : '',
-                            'company' => !empty($address['shipping']['company']) ? $address['shipping']['company'] : '',
-                            'address' => !empty($address['shipping']['address']) ? $address['shipping']['address'] : '',
-                            'postcode' => !empty($address['shipping']['postcode']) ? $address['shipping']['postcode'] : '',
-                            'city' => !empty($address['shipping']['city']) ? $address['shipping']['city'] : '',
-                            'state' => !empty($address['shipping']['state']) ? $address['shipping']['state'] : '',
-                            'country' => !empty($address['shipping']['country']) ? $address['shipping']['country'] : '',
-                            'civility' => $civility,
-                        );
-                    }
+				/*    Update entities meta management    */
+				$entities = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES));
+				if (!empty($entities)) {
+					foreach ($entities as $entity) {
+						$support = get_post_meta($entity->ID, '_wpshop_entity_support', true);
+						$rewrite = get_post_meta($entity->ID, '_wpshop_entity_rewrite', true);
+						update_post_meta($entity->ID, '_wpshop_entity_params', array('support' => $support, 'rewrite' => array('slug' => $rewrite)));
+					}
+				}
+				wp_reset_query();
+				return true;
+				break;
+			case 25:
+				/*    Get the first entities of product and customer    */
+				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_name=%s AND post_type=%s ORDER BY ID ASC LIMIT 1", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES);
+				$product_entity_id = $wpdb->get_var($query);
+
+				/*    Update attributes that are not linked with entities    */
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('entity_id' => $product_entity_id), array('entity_id' => 0));
+
+				/*    Get entities that have been created a lot of time and delete them    */
+				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE (post_name LIKE '%%" . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . "-%%' OR post_name LIKE '%%" . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . "-%%') AND post_type=%s", WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES);
+				$entities_to_delete = $wpdb->get_results($query);
+				if (!empty($entities_to_delete) && is_array($entities_to_delete)) {
+					foreach ($entities_to_delete as $entity) {
+						wp_delete_post($entity->ID, true);
+					}
+				}
 
-                    $billing_array_content = array('id' => $billing_address_set_id, 'address' => $billing_address);
-                    $shipping_array_content = array('id' => $shipping_address_set_id, 'address' => $shipping_address);
-                    $array_new_format = array('billing' => $billing_array_content, 'shipping' => $shipping_array_content);
+				/*    Get post list that are children of entities created a lot of time */
+				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_type LIKE %s", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . "-%");
+				$entities_to_update = $wpdb->get_results($query);
+				if (!empty($entities_to_update) && is_array($entities_to_update)) {
+					foreach ($entities_to_update as $entity) {
+						wp_update_post(array('ID' => $entity->ID, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS));
+					}
+				}
+				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->posts . " WHERE post_type LIKE %s", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . "-%");
+				$entities_to_update = $wpdb->get_results($query);
+				if (!empty($entities_to_update) && is_array($entities_to_update)) {
+					foreach ($entities_to_update as $entity) {
+						wp_update_post(array('ID' => $entity->ID, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
+					}
+				}
 
-                    //Update the post meta
-                    update_post_meta($result->ID, '_order_info', $array_new_format);
-                }
+				/*    Change addons managament    */
+				$wpshop_addons_options = get_option('wpshop_addons_state', array());
+				if (!empty($wpshop_addons_options)) {
+					foreach ($wpshop_addons_options as $addon_name => $addon_state) {
+						$options_args = array();
+						$options_args[$addon_name]['activate'] = $addon_state;
+						$options_args[$addon_name]['activation_date'] = current_time('mysql', 0);
+						if (!$addon_state) {
+							$options_args[$addon_name]['deactivation_date'] = current_time('mysql', 0);
+						}
+
+						add_option(WPSHOP_ADDONS_OPTION_NAME, $options_args);
+					}
+					delete_option('wpshop_addons_state');
+				}
 
-                /*    Update entities meta management    */
-                $entities = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, 'posts_per_page' => -1));
-                if (!empty($entities)) {
-                    foreach ($entities as $entity) {
-                        $params = get_post_meta($entity->ID, '_wpshop_entity_params', true);
-                        $support = (!empty($params['support'])) ? $params['support'] : '';
-                        $rewrite = (!empty($params['rewrite'])) ? $params['rewrite'] : '';
+				/*    Update the different entities id into attribute set details table    */
+				$query = "UPDATE " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " AS ATT_DET INNER JOIN " . WPSHOP_DBT_ATTRIBUTE . " AS ATT ON (ATT.id = ATT_DET.attribute_id) SET ATT_DET.entity_type_id = ATT.entity_id";
+				$wpdb->query($query);
 
-                        $display_admin_menu = 'on';
+				return true;
+				break;
+			case 26:
+				$query = "SELECT post_id, meta_value FROM " . $wpdb->postmeta . " WHERE meta_key = '_order_postmeta' ";
+				$results = $wpdb->get_results($query);
+				foreach ($results as $result) {
+					$order_info = unserialize($result->meta_value);
+					update_post_meta($result->post_id, '_wpshop_order_customer_id', $order_info['customer_id']);
+					update_post_meta($result->post_id, '_wpshop_order_shipping_date', $order_info['order_shipping_date']);
+					update_post_meta($result->post_id, '_wpshop_order_status', $order_info['order_status']);
+				}
 
-                        update_post_meta($entity->ID, '_wpshop_entity_params', array('support' => $support, 'rewrite' => $rewrite, 'display_admin_menu' => $display_admin_menu));
-                    }
-                }
-                wp_reset_query();
-
-                // Default Weight unity and Currency Options
-                add_option('wpshop_shop_weight_group', 3, '', 'yes');
-                add_option('wpshop_shop_default_weight_unity', 6, '', 'yes');
-                add_option('wpshop_shop_currency_group', 4, '', 'yes');
-
-                $default_currency = get_option('wpshop_shop_default_currency');
-                foreach (unserialize(WPSHOP_SHOP_CURRENCIES) as $k => $v) {
-                    if ($default_currency == $k) {
-                        $symbol = $v;
-                    }
-                }
-                if (!empty($symbol)) {
-                    $query = 'SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE name = "' . html_entity_decode($symbol, ENT_QUOTES, 'UTF-8') . '"';
-                    $currency = $wpdb->get_row($query);
-                    if (!empty($currency)) {
-                        update_option('wpshop_shop_default_currency', $currency->id);
-                        // Update the change rate of the default currency
-                        $wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('change_rate' => 1), array('id' => $currency->id));
-                    }
-                }
-
-                // Update the field for variation and user definition field
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_for_variation' => 'yes'), array('is_user_defined' => 'yes'));
-                // Update field type for frontend output selection
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'text'), array());
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'textarea'), array('backend_input' => 'textarea'));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'select'), array('backend_input' => 'multiple-select'));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'select'), array('backend_input' => 'select'));
-
-                add_option('wpshop_cart_option', array('product_added_to_cart' => array('dialog_msg'), 'product_added_to_quotation' => array('cart_page')));
-
-                return true;
-                break;
-
-            case '30':
-                /**    Update the current price piloting field for using it into variation specific attributes    */
-                $price_piloting_attribute = constant('WPSHOP_PRODUCT_PRICE_' . WPSHOP_PRODUCT_PRICE_PILOT);
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => $price_piloting_attribute));
-
-                /**    Update the product reference field for using it into variation specific attributes    */
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => 'product_reference'));
-
-                /**    Insert new message for admin when a customer make an order    */
-                $admin_new_order_message = get_option('WPSHOP_NEW_ORDER_ADMIN_MESSAGE');
-                if (empty($admin_new_order_message)) {
-                    wps_message_ctr::createMessage('WPSHOP_NEW_ORDER_ADMIN_MESSAGE');
-                }
-                /**    Update all amount for paypal orders    */
-                $query = $wpdb->prepare("SELECT post_id FROM " . $wpdb->postmeta . " WHERE meta_key = %s AND meta_value = %s ", '_wpshop_payment_method', 'paypal');
-                $paypal_payment_list = $wpdb->get_results($query);
-                if (!empty($paypal_payment_list)) {
-                    foreach ($paypal_payment_list as $post) {
-                        $order_meta = get_post_meta($post->post_id, '_order_postmeta', true);
-                        $order_payment_meta = get_post_meta($post->post_id, 'wpshop_payment_return_data', true);
-                        if (!empty($order_meta['order_status']) && ($order_meta['order_status'] == 'incorrect_amount')) {
-                            if (!empty($order_meta['order_grand_total']) && !empty($order_payment_meta['mc_gross'])) {
-                                $order_amount_to_pay = number_format($order_meta['order_grand_total'], 5);
-                                $order_amount_payed = number_format(floatval($order_payment_meta['mc_gross']), 5);
-                                if ($order_amount_payed == $order_amount_to_pay) {
-                                    wpshop_payment::setOrderPaymentStatus($order_id, 'completed');
-                                }
-                            }
-                        }
-                    }
-                }
-
-                /**    Save existing orders address information    */
-                $billing_title = __('Billing address', 'wpshop');
-                $shipping_title = __('Shipping address', 'wpshop');
-                $results = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1));
-                foreach ($results as $result) {
-                    $address = get_post_meta($result->ID, '_order_info', true);
-                    $address_format = array();
-
-                    $billing_address = array();
-                    if (!empty($address['billing']) && empty($address['billing']['id'])) {
-                        if (!empty($address['billing']['civility'])) {
-                            switch ($address['billing']['civility']) {
-                                case 1:
-                                    $civility = $mister_id;
-                                    break;
-                                case 2:
-                                    $civility = $madam_id;
-                                    break;
-                                case 3:
-                                    $civility = $miss_id;
-                                    break;
-                                default:
-                                    $civility = $mister_id;
-                                    break;
-                            }
-                        } else {
-                            $civility = $mister_id;
-                        }
-                        $billing_address = array('address_title' => $billing_title,
-                            'address_last_name' => !empty($address['billing']['last_name']) ? $address['billing']['last_name'] : '',
-                            'address_first_name' => !empty($address['billing']['first_name']) ? $address['billing']['first_name'] : '',
-                            'company' => !empty($address['billing']['company']) ? $address['billing']['company'] : '',
-                            'address' => !empty($address['billing']['address']) ? $address['billing']['address'] : '',
-                            'postcode' => !empty($address['billing']['postcode']) ? $address['billing']['postcode'] : '',
-                            'city' => !empty($address['billing']['city']) ? $address['billing']['city'] : '',
-                            'state' => !empty($address['billing']['state']) ? $address['billing']['state'] : '',
-                            'country' => !empty($address['billing']['country']) ? $address['billing']['country'] : '',
-                            'address_user_email' => !empty($address['billing']['email']) ? $address['billing']['email'] : '',
-                            'phone' => !empty($address['billing']['phone']) ? $address['billing']['phone'] : '',
-                            'tva_intra' => !empty($address['billing']['company_tva_intra']) ? $address['billing']['company_tva_intra'] : '',
-                            'civility' => $civility,
-                        );
-                        $billing_address_option = get_option('wpshop_billing_address');
-                        $address_format['billing']['id'] = $billing_address_option['choice'];
-                        $address_format['billing']['address'] = $shipping_address;
-                    }
+				/*    Update the different entities id into attribute set details table    */
+				$query = "UPDATE " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " AS ATT_DET INNER JOIN " . WPSHOP_DBT_ATTRIBUTE . " AS ATT ON (ATT.id = ATT_DET.attribute_id) SET ATT_DET.entity_type_id = ATT.entity_id";
+				$wpdb->query($query);
 
-                    $shipping_address = array();
-                    if (!empty($address['shipping']) && empty($address['shipping']['id'])) {
-                        if (!empty($address['shipping']['civility'])) {
-                            switch ($address['shipping']['civility']) {
-                                case 1:
-                                    $civility = $mister_id;
-                                    break;
-                                case 2:
-                                    $civility = $madam_id;
-                                    break;
-                                case 3:
-                                    $civility = $miss_id;
-                                    break;
-                            }
-                        } else {
-                            $civility = $mister_id;
-                        }
-                        $shipping_address = array('address_title' => $shipping_title,
-                            'address_last_name' => !empty($address['shipping']['last_name']) ? $address['shipping']['last_name'] : '',
-                            'address_first_name' => !empty($address['shipping']['first_name']) ? $address['shipping']['first_name'] : '',
-                            'company' => !empty($address['shipping']['company']) ? $address['shipping']['company'] : '',
-                            'address' => !empty($address['shipping']['address']) ? $address['shipping']['address'] : '',
-                            'postcode' => !empty($address['shipping']['postcode']) ? $address['shipping']['postcode'] : '',
-                            'city' => !empty($address['shipping']['city']) ? $address['shipping']['city'] : '',
-                            'state' => !empty($address['shipping']['state']) ? $address['shipping']['state'] : '',
-                            'country' => !empty($address['shipping']['country']) ? $address['shipping']['country'] : '',
-                            'civility' => $civility,
-                        );
-                        $shipping_address_options = get_option('wpshop_shipping_address_choice');
-                        $address_format['shipping']['id'] = $shipping_address_options['choice'];
-                        $address_format['shipping']['address'] = $shipping_address;
-                    }
+				return true;
+				break;
+
+			case 29:
+				$billing_title = __('Billing address', 'wpshop');
+				$shipping_title = __('Shipping address', 'wpshop');
+
+				//UPDATE USERS ADDRESSES
+				$billing_address_set_id_query = 'SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE name = "' . $billing_title . '"';
+				$shipping_address_set_id_query = 'SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE name = "' . $shipping_title . '"';
+
+				$billing_address_set_id = $wpdb->get_var($billing_address_set_id_query);
+				$shipping_address_set_id = $wpdb->get_var($shipping_address_set_id_query);
+
+				//Add Address & Google Map API KEY options
+				add_option('wpshop_billing_address', array('choice' => $billing_address_set_id), '', 'yes');
+				add_option('wpshop_shipping_address_choice', array('activate' => 'on', 'choice' => $shipping_address_set_id), '', 'yes');
+				add_option('wpshop_google_map_api_key', '', '', 'yes');
+
+				$query = 'SELECT * FROM ' . $wpdb->users . '';
+				$results = $wpdb->get_results($query);
+				foreach ($results as $result) {
+					$billing_infos = get_user_meta($result->ID, 'billing_info', true);
+					$shipping_infos = get_user_meta($result->ID, 'shipping_info', true);
+					if (!empty($billing_infos)) {
+						//Save Billing Infos
+						$billing_address = array();
+						if (!empty($billing_infos['civility'])) {
+							switch ($billing_infos['civility']) {
+								case 1:
+									$civility = $mister_id;
+									break;
+								case 2:
+									$civility = $madam_id;
+									break;
+								case 3:
+									$civility = $miss_id;
+									break;
+							}
+						} else {
+							$civility = $mister_id;
+						}
+						$billing_address = array('address_title' => $billing_title,
+							'address_last_name' => !empty($billing_infos['last_name']) ? $billing_infos['last_name'] : '',
+							'address_first_name' => !empty($billing_infos['first_name']) ? $billing_infos['first_name'] : '',
+							'company' => !empty($billing_infos['company']) ? $billing_infos['company'] : '',
+							'address' => !empty($billing_infos['address']) ? $billing_infos['address'] : '',
+							'postcode' => !empty($billing_infos['postcode']) ? $billing_infos['postcode'] : '',
+							'city' => !empty($billing_infos['city']) ? $billing_infos['city'] : '',
+							'state' => !empty($billing_infos['state']) ? $billing_infos['state'] : '',
+							'country' => !empty($billing_infos['country']) ? $billing_infos['country'] : '',
+							'address_user_email' => !empty($billing_infos['email']) ? $billing_infos['email'] : '',
+							'phone' => !empty($billing_infos['phone']) ? $billing_infos['phone'] : '',
+							'tva_intra' => !empty($billing_infos['company_tva_intra']) ? $billing_infos['company_tva_intra'] : '',
+							'civility' => $civility,
+						);
+						//Create the post and post_meta for the billing address
+						$post_address = array(
+							'post_author' => $result->ID,
+							'post_title' => $billing_title,
+							'post_status' => 'publish',
+							'post_name' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS,
+							'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS,
+							'post_parent' => $result->ID,
+						);
+						$post_address_id = wp_insert_post($post_address);
+
+						//Create the post_meta with the address infos
+						update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', $billing_address);
+						update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_attribute_set_id', $billing_address_set_id);
+					}
+
+					if (!empty($shipping_infos)) {
+						//Save Shipping Infos
+						if (!empty($shipping_infos['civility'])) {
+							switch ($shipping_infos['civility']) {
+								case 1:
+									$civility = $mister_id;
+									break;
+								case 2:
+									$civility = $madam_id;
+									break;
+								case 3:
+									$civility = $miss_id;
+									break;
+							}
+						} else {
+							$civility = $mister_id;
+						}
+						$shipping_address = array();
+						$shipping_address = array('address_title' => $shipping_title,
+							'address_last_name' => !empty($shipping_infos['last_name']) ? $shipping_infos['last_name'] : '',
+							'address_first_name' => !empty($shipping_infos['first_name']) ? $shipping_infos['first_name'] : '',
+							'company' => !empty($shipping_infos['company']) ? $shipping_infos['company'] : '',
+							'address' => !empty($shipping_infos['address']) ? $shipping_infos['address'] : '',
+							'postcode' => !empty($shipping_infos['postcode']) ? $shipping_infos['postcode'] : '',
+							'city' => !empty($shipping_infos['city']) ? $shipping_infos['city'] : '',
+							'state' => !empty($shipping_infos['state']) ? $shipping_infos['state'] : '',
+							'country' => !empty($shipping_infos['country']) ? $shipping_infos['country'] : '',
+							'civility' => $civility,
+						);
+						//Create the post and post_meta for the billing address
+						$post_address = array(
+							'post_author' => $result->ID,
+							'post_title' => $shipping_title,
+							'post_status' => 'publish',
+							'post_name' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS,
+							'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS,
+							'post_parent' => $result->ID,
+						);
+						$post_address_id = wp_insert_post($post_address);
+						//Create the post_meta with the address infos
+						update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', $shipping_address);
+						update_post_meta($post_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_attribute_set_id', $shipping_address_set_id);
+					}
+				}
 
-                    if (!empty($address_format)) {
-                        update_post_meta($result->ID, '_order_info', $address_format);
-                    }
-                }
-
-                /**    Delete username from frontend form    */
-                $attribute_login = wpshop_attributes::getElement('user_login', "'valid'", 'code');
-                if (!empty($attribute_login)) {
-                    $wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'deleted', 'last_update_date' => current_time('mysql', 0), 'position' => 0), array('attribute_id' => $attribute_login->id));
-                }
-
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('last_update_date' => current_time('mysql', 0), 'position' => 0), array('status' => 'deleted'));
-
-                return true;
-                break;
-
-            case '31':
-                /**    Change order structure in order to support several payment    */
-                $existing_orders = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1, 'post_status' => array('draft', 'trash', 'publish')));
-                if (!empty($existing_orders)) {
-                    foreach ($existing_orders as $order_main_informations) {
-                        /**    Transfer payment return data form old meta to new    */
-                        $order_payment_return_data = get_post_meta($order_main_informations->ID, 'wpshop_payment_return_data', true);
-                        update_post_meta($order_main_informations->ID, '_wpshop_payment_return_data', $order_payment_return_data);
-                        delete_post_meta($order_main_informations->ID, 'wpshop_payment_return_data');
-
-                        /**    Transfer old payment storage method to new storage method    */
-                        $order_meta = get_post_meta($order_main_informations->ID, '_order_postmeta', true);
-                        if (!empty($order_meta['order_status'])) {
-                            $order_meta['order_payment']['customer_choice'] = array('method' => (!empty($order_meta['payment_method']) ? $order_meta['payment_method'] : (!empty($order_meta['order_payment']['customer_choice']) ? $order_meta['order_payment']['customer_choice'] : '')));
-                            unset($order_meta['payment_method']);
-                            $order_meta['order_payment']['received'][0]['waited_amount'] = !empty($order_meta['order_grand_total']) ? $order_meta['order_grand_total'] : 0;
-                            $order_meta['order_payment']['received'][0]['method'] = $order_meta['order_payment']['customer_choice']['method'];
-                            $order_meta['order_payment']['received'][0]['date'] = $order_meta['order_date'];
-                            $order_meta['order_payment']['received'][0]['status'] = 'waiting_payment';
-                            $order_meta['order_payment']['received'][0]['comment'] = '';
-                            $order_meta['order_payment']['received'][0]['author'] = $order_meta['order_payment']['customer_choice'] == 'check' ? 1 : $order_meta['customer_id'];
-                            if (in_array($order_meta['order_status'], array('completed', 'shipped'))) {
-                                $order_meta['order_payment']['received'][0]['received_amount'] = $order_meta['order_grand_total'];
-                                $order_meta['order_payment']['received'][0]['payment_reference'] = wpshop_payment::get_payment_transaction_number_old_way($order_main_informations->ID);
-                                $order_meta['order_payment']['received'][0]['date'] = $order_meta['order_payment_date'];
-                                $order_meta['order_payment']['received'][0]['status'] = 'payment_received';
-                                $order_meta['order_payment']['received'][0]['comment'] = '';
-                                $order_meta['order_payment']['received'][0]['author'] = $order_meta['order_payment']['customer_choice'] == 'check' ? 1 : $order_meta['customer_id'];
-                                $order_meta['order_payment']['received'][0]['invoice_ref'] = $order_meta['order_invoice_ref'];
-                            }
-                            update_post_meta($order_main_informations->ID, '_order_postmeta', $order_meta);
-
-                            if (!empty($order_meta['order_payment']['customer_choice'])) {
-                                switch ($order_meta['order_payment']['customer_choice']) {
-                                    case 'check':
-                                        delete_post_meta($order_main_informations->ID, '_order_check_number', get_post_meta($order_main_informations->ID, '_order_check_number', true));
-                                        break;
-                                    case 'paypal':
-                                        delete_post_meta($order_main_informations->ID, '_order_paypal_txn_id', get_post_meta($order_main_informations->ID, '_order_paypal_txn_id', true));
-                                        break;
-                                    case 'cic':
-                                        delete_post_meta($order_main_informations->ID, '_order_cic_txn_id', get_post_meta($order_main_informations->ID, '_order_cic_txn_id', true));
-                                        break;
-                                }
-                            }
-                        }
-                    }
-                }
-                $wps_messages = new wps_message_ctr();
-                $wps_messages->wpshop_messages_historic_correction();
-                wp_reset_query();
-
-                $default_currency = get_option('wpshop_shop_default_currency');
-                foreach (unserialize(WPSHOP_SHOP_CURRENCIES) as $k => $v) {
-                    if ($default_currency == $k) {
-                        $symbol = $v;
-                    }
-                }
-                if (!empty($symbol)) {
-                    $query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE name = "' . html_entity_decode($symbol, ENT_QUOTES, 'UTF-8') . '"', '');
-                    $currency = $wpdb->get_row($query);
-                    if (!empty($currency)) {
-                        update_option('wpshop_shop_default_currency', $currency->id);
-                        // Update the change rate of the default currency
-                        $wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('change_rate' => 1), array('id' => $currency->id));
-                    }
-                }
-
-                $shipping_confirmation_message = get_option('WPSHOP_SHIPPING_CONFIRMATION_MESSAGE');
-                if (!empty($shipping_confirmation_message)) {
-                    $message = __('Hello [customer_first_name] [customer_last_name], this email confirms that your order ([order_key]) has just been shipped (order date : [order_date], tracking number : [order_trackingNumber]). Thank you for your loyalty. Have a good day.', 'wpshop');
-                    $post = array('ID' => $shipping_confirmation_message, 'post_content' => $message);
-                    wp_update_post($post);
-                }
-                return true;
-                break;
-            case '32':
-                /**    Update product set id that are null     */
-                $query = $wpdb->prepare("UPDATE " . $wpdb->postmeta . " SET meta_value = (SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE default_set = 'yes' AND entity_id = '" . wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) . "') WHERE meta_key = %s AND ((meta_value = '') OR (meta_value = null))", '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id');
-                $wpdb->query($query);
-
-                $addons_options = get_option(WPSHOP_ADDONS_OPTION_NAME);
-                if (!empty($addons_options) && !empty($addons_options['WPSHOP_ADDONS_QUOTATION']) && !empty($addons_options['WPSHOP_ADDONS_QUOTATION']['activate']) && $addons_options['WPSHOP_ADDONS_QUOTATION']['activate']) {
-                    $admin_new_quotation_message = get_option('WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE');
-                    if (empty($admin_new_quotation_message)) {
-                        wps_message_ctr::createMessage('WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE');
-                    }
-                    $admin_new_quotation_confirm_message = get_option('WPSHOP_QUOTATION_CONFIRMATION_MESSAGE');
-                    if (empty($admin_new_quotation_confirm_message)) {
-                        wps_message_ctr::createMessage('WPSHOP_QUOTATION_CONFIRMATION_MESSAGE');
-                    }
-                }
-
-                /**    Allows the administrator to manage a little bit more the catalog rewrite parameters    */
-                $options = get_option('wpshop_catalog_product_option');
-                $options['wpshop_catalog_product_slug_with_category'] = empty($options['wpshop_catalog_product_slug_with_category']) ? 'yes' : $options['wpshop_catalog_product_slug_with_category'];
-                update_option('wpshop_catalog_product_option', $options);
-
-                /**    Create a new page for unsuccessfull payment return    */
-                self::wpshop_insert_default_pages($wpshop_shop_type);
-                wp_cache_flush();
-
-                /**    Update the iso code of currencies    */
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('code_iso' => 'EUR'), array('name' => 'euro'));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('code_iso' => 'USD'), array('name' => 'dollar'));
-
-                /** Update VAT Rate*/
-                $query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s OR code = %s', 'tx_tva', 'eco_taxe_rate_tva');
-                $attribute_ids = $wpdb->get_results($query);
-                foreach ($attribute_ids as $attribute_id) {
-                    $query = $wpdb->prepare('UPDATE ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' SET value = replace(value, "-", ".") WHERE attribute_id = %d', $attribute_id->id);
-                    $wpdb->query($query);
-                }
-
-                return true;
-                break;
-
-            case '33':
-                /** Update the user_mail for the new system of log in/register */
-                $query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "user_email"');
-
-                /** Put discount attributes in price attribute set section*/
-                $query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE code = %s', 'prices');
-                $prices_section_id = $wpdb->get_var($query);
-
-                $query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s OR code = %s', 'discount_rate', 'discount_amount');
-                $attributes = $wpdb->get_results($query);
-                if (!empty($attributes) && !empty($prices_section_id)) {
-                    foreach ($attributes as $attribute) {
-                        $query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' SET attribute_group_id = ' . $prices_section_id . ' WHERE attribute_id = ' . $attribute->id);
-                    }
-                }
-                return true;
-                break;
+				// FORMATE THE ORDER ADDRESSES INFOS
+				$results = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1));
+				foreach ($results as $result) {
+					$address = get_post_meta($result->ID, '_order_info', true);
+
+					$billing_address = array();
+					if (!empty($address['billing'])) {
+						if (!empty($address['billing']['civility'])) {
+							switch ($address['billing']['civility']) {
+								case 1:
+									$civility = $mister_id;
+									break;
+								case 2:
+									$civility = $madam_id;
+									break;
+								case 3:
+									$civility = $miss_id;
+									break;
+								default:
+									$civility = $mister_id;
+									break;
+							}
+						} else {
+							$civility = $mister_id;
+						}
+						$billing_address = array('address_title' => $billing_title,
+							'address_last_name' => !empty($address['billing']['last_name']) ? $address['billing']['last_name'] : '',
+							'address_first_name' => !empty($address['billing']['first_name']) ? $address['billing']['first_name'] : '',
+							'company' => !empty($address['billing']['company']) ? $address['billing']['company'] : '',
+							'address' => !empty($address['billing']['address']) ? $address['billing']['address'] : '',
+							'postcode' => !empty($address['billing']['postcode']) ? $address['billing']['postcode'] : '',
+							'city' => !empty($address['billing']['city']) ? $address['billing']['city'] : '',
+							'state' => !empty($address['billing']['state']) ? $address['billing']['state'] : '',
+							'country' => !empty($address['billing']['country']) ? $address['billing']['country'] : '',
+							'address_user_email' => !empty($address['billing']['email']) ? $address['billing']['email'] : '',
+							'phone' => !empty($address['billing']['phone']) ? $address['billing']['phone'] : '',
+							'tva_intra' => !empty($address['billing']['company_tva_intra']) ? $address['billing']['company_tva_intra'] : '',
+							'civility' => $civility,
+						);
+					}
+
+					$shipping_address = array();
+					if (!empty($address['shipping'])) {
+						if (!empty($address['shipping']['civility'])) {
+							switch ($address['shipping']['civility']) {
+								case 1:
+									$civility = $mister_id;
+									break;
+								case 2:
+									$civility = $madam_id;
+									break;
+								case 3:
+									$civility = $miss_id;
+									break;
+							}
+						} else {
+							$civility = $mister_id;
+						}
+						$shipping_address = array('address_title' => $shipping_title,
+							'address_last_name' => !empty($address['shipping']['last_name']) ? $address['shipping']['last_name'] : '',
+							'address_first_name' => !empty($address['shipping']['first_name']) ? $address['shipping']['first_name'] : '',
+							'company' => !empty($address['shipping']['company']) ? $address['shipping']['company'] : '',
+							'address' => !empty($address['shipping']['address']) ? $address['shipping']['address'] : '',
+							'postcode' => !empty($address['shipping']['postcode']) ? $address['shipping']['postcode'] : '',
+							'city' => !empty($address['shipping']['city']) ? $address['shipping']['city'] : '',
+							'state' => !empty($address['shipping']['state']) ? $address['shipping']['state'] : '',
+							'country' => !empty($address['shipping']['country']) ? $address['shipping']['country'] : '',
+							'civility' => $civility,
+						);
+					}
+
+					$billing_array_content = array('id' => $billing_address_set_id, 'address' => $billing_address);
+					$shipping_array_content = array('id' => $shipping_address_set_id, 'address' => $shipping_address);
+					$array_new_format = array('billing' => $billing_array_content, 'shipping' => $shipping_array_content);
+
+					//Update the post meta
+					update_post_meta($result->ID, '_order_info', $array_new_format);
+				}
 
-            case '34':
-                $query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE code = %s', 'prices');
-                $prices_section_id = $wpdb->get_var($query);
+				/*    Update entities meta management    */
+				$entities = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, 'posts_per_page' => -1));
+				if (!empty($entities)) {
+					foreach ($entities as $entity) {
+						$params = get_post_meta($entity->ID, '_wpshop_entity_params', true);
+						$support = (!empty($params['support'])) ? $params['support'] : '';
+						$rewrite = (!empty($params['rewrite'])) ? $params['rewrite'] : '';
 
-                $query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_group_id = %d', $prices_section_id);
-                $last_position_id = $wpdb->get_var($query);
+						$display_admin_menu = 'on';
 
-                $query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE  attribute_group_id = %d AND position = %d', $prices_section_id, $last_position_id);
-                $attribute_example = $wpdb->get_row($query);
+						update_post_meta($entity->ID, '_wpshop_entity_params', array('support' => $support, 'rewrite' => $rewrite, 'display_admin_menu' => $display_admin_menu));
+					}
+				}
+				wp_reset_query();
+
+				// Default Weight unity and Currency Options
+				add_option('wpshop_shop_weight_group', 3, '', 'yes');
+				add_option('wpshop_shop_default_weight_unity', 6, '', 'yes');
+				add_option('wpshop_shop_currency_group', 4, '', 'yes');
+
+				$default_currency = get_option('wpshop_shop_default_currency');
+				foreach (unserialize(WPSHOP_SHOP_CURRENCIES) as $k => $v) {
+					if ($default_currency == $k) {
+						$symbol = $v;
+					}
+				}
+				if (!empty($symbol)) {
+					$query = 'SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE name = "' . html_entity_decode($symbol, ENT_QUOTES, 'UTF-8') . '"';
+					$currency = $wpdb->get_row($query);
+					if (!empty($currency)) {
+						update_option('wpshop_shop_default_currency', $currency->id);
+						// Update the change rate of the default currency
+						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('change_rate' => 1), array('id' => $currency->id));
+					}
+				}
 
-                $query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s OR code = %s', 'special_from', 'special_to');
-                $attributes = $wpdb->get_results($query);
-                $i = 1;
-                if (!empty($attributes) && !empty($prices_section_id)) {
+				// Update the field for variation and user definition field
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_for_variation' => 'yes'), array('is_user_defined' => 'yes'));
+				// Update field type for frontend output selection
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'text'), array());
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'textarea'), array('backend_input' => 'textarea'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'select'), array('backend_input' => 'multiple-select'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_input' => 'select'), array('backend_input' => 'select'));
 
-                    foreach ($attributes as $attribute) {
-                        $wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('attribute_group_id' => $prices_section_id), array('attribute_id' => $attribute->id));
-                        $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $attribute_example->entity_type_id, 'attribute_set_id' => $attribute_example->attribute_set_id, 'attribute_group_id' => $prices_section_id, 'attribute_id' => $attribute->id, 'position' => $last_position_id + $i));
-                        $i++;
-                    }
-                }
-                $discount_options = get_option('wpshop_catalog_product_option');
-                $status = (!empty($discount_options) && !empty($discount_options['discount'])) ? 'valid' : 'notused';
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_label' => __('Discount from', 'wpshop'), 'status' => $status), array('code' => 'special_from'));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_label' => __('Discount to', 'wpshop'), 'status' => $status), array('code' => 'special_to'));
-                return true;
-                break;
-
-            case '35':
-                $wpdb->update($wpdb->posts, array('post_status' => 'draft'), array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS));
-                return true;
-                break;
-
-            case '36':
-                wpshop_entities::create_cpt_attributes_from_csv_file(WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS);
-                @set_time_limit(900);
-                /** Change the path for old categories pictures */
-                @chmod(WPSHOP_UPLOAD_DIR . 'wpshop_product_category', 0755);
-
-                $query = 'SELECT * FROM ' . $wpdb->terms;
-                $terms = $wpdb->get_results($query);
-                if (!empty($terms)) {
-                    foreach ($terms as $term) {
-                        @chmod(WPSHOP_UPLOAD_DIR . 'wpshop_product_category/' . $term->term_id, 0755);
-                        /** Check if a picture exists **/
-                        $term_option = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $term->term_id);
-                        if (!empty($term_option) && !empty($term_option['wpshop_category_picture']) && is_file(WPSHOP_UPLOAD_DIR . $term_option['wpshop_category_picture'])) {
-                            $wp_upload_dir = wp_upload_dir();
-                            $img_path = WPSHOP_UPLOAD_DIR . $term_option['wpshop_category_picture'];
-                            $img_basename = basename($img_path);
-                            $wp_filetype = wp_check_filetype($img_basename, null);
-                            /** Check if there is an image with the same name, if yes we add a rand number to image's name **/
-                            $rand_name = (is_file($wp_upload_dir['path'] . '/' . $img_basename)) ? rand() : '';
-                            $img_basename = (!empty($rand_name)) ? $rand_name . '_' . $img_basename : $img_basename;
-                            if (copy($img_path, $wp_upload_dir['path'] . '/' . $img_basename)) {
-                                $attachment = array(
-                                    'guid' => $wp_upload_dir['url'] . '/' . $img_basename,
-                                    'post_mime_type' => $wp_filetype['type'],
-                                    'post_title' => preg_replace('/\.[^.]+$/', '', $img_basename),
-                                    'post_content' => '',
-                                    'post_status' => 'inherit',
-                                );
-                                $attach_id = wp_insert_attachment($attachment, $wp_upload_dir['path'] . '/' . $img_basename);
-                                /** Generate differnts sizes for this image **/
-                                require_once ABSPATH . 'wp-admin/includes/image.php';
-                                $attach_data = wp_generate_attachment_metadata($attach_id, $wp_upload_dir['path'] . '/' . $img_basename);
-                                wp_update_attachment_metadata($attach_id, $attach_data);
-                                /** Update option picture **/
-                                $term_option['wpshop_category_picture'] = $attach_id;
-                                update_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $term->term_id, $term_option);
-                            }
-                        }
-                    }
-                }
-
-                /** Change metabox Hidden Nav Menu Definition to display WPShop categories' metabox **/
-                $query = $wpdb->prepare('SELECT * FROM ' . $wpdb->usermeta . ' WHERE meta_key = %s', 'metaboxhidden_nav-menus');
-                $meta_keys = $wpdb->get_results($query);
-                if (!empty($meta_keys) && is_array($meta_keys)) {
-                    foreach ($meta_keys as $meta_key) {
-                        $user_id = $meta_key->user_id;
-                        $meta_value = unserialize($meta_key->meta_value);
-                        if (!empty($meta_value) && is_array($meta_value)) {
-                            $data_to_delete = array_search('add-wpshop_product_category', $meta_value);
-                            if ($data_to_delete !== false) {
-                                unset($meta_value[$data_to_delete]);
-                            }
-                        }
-                        update_user_meta($user_id, 'metaboxhidden_nav-menus', $meta_value);
-                    }
-                }
-                return true;
-                break;
-
-            case '37':
-                @set_time_limit(900);
-                /** Change the path for old categories pictures */
-                @chmod(WPSHOP_UPLOAD_DIR . 'wpshop/wpshop_product_category', 0755);
-                /** Read all categories folders **/
-                $categories_main_dir = WPSHOP_UPLOAD_DIR . 'wpshop/wpshop_product_category';
-                if (file_exists($categories_main_dir)) {
-                    $main_folder_content = scandir($categories_main_dir);
-                    /** For each category folder **/
-                    foreach ($main_folder_content as $category_folder) {
-                        if ($category_folder && substr($category_folder, 0, 1) != '.') {
-                            $category_id = $category_folder;
-                            @chmod(WPSHOP_UPLOAD_DIR . 'wpshop/wpshop_product_category/' . $category_id, 0755);
-                            $scan_category_folder = opendir($categories_main_dir . '/' . $category_folder);
-                            /** For each Picture of category **/
-                            $file_time = 0;
-                            $save_this_picture = false;
-                            while (false !== ($fichier = readdir($scan_category_folder))) {
-                                if ($fichier && substr($fichier, 0, 1) != '.') {
-                                    if ($file_time < filemtime($categories_main_dir . '/' . $category_id . '/' . $fichier)) {
-                                        $save_this_picture = true;
-                                        $file_time = filemtime($categories_main_dir . '/' . $category_id . '/' . $fichier);
-                                    }
-                                    /** Select category option **/
-                                    $term_option = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
-                                    $wp_upload_dir = wp_upload_dir();
-                                    $img_path = $categories_main_dir . '/' . $category_id . '/' . $fichier;
-                                    $img_basename = basename($img_path);
-                                    $wp_filetype = wp_check_filetype($img_basename, null);
-                                    /** Check if there is an image with the same name, if yes we add a rand number to image's name **/
-                                    $rand_name = (is_file($wp_upload_dir['path'] . '/' . $img_basename)) ? rand() : '';
-                                    $img_basename = (!empty($rand_name)) ? $rand_name . '_' . $img_basename : $img_basename;
-
-                                    if (copy($img_path, $wp_upload_dir['path'] . '/' . $img_basename)) {
-                                        $attachment = array(
-                                            'guid' => $wp_upload_dir['url'] . '/' . $img_basename,
-                                            'post_mime_type' => $wp_filetype['type'],
-                                            'post_title' => preg_replace('/\.[^.]+$/', '', $img_basename),
-                                            'post_content' => '',
-                                            'post_status' => 'inherit',
-                                        );
-                                        $attach_id = wp_insert_attachment($attachment, $wp_upload_dir['path'] . '/' . $img_basename);
-                                        /** Generate differnts sizes for this image **/
-                                        require_once ABSPATH . 'wp-admin/includes/image.php';
-                                        $attach_data = wp_generate_attachment_metadata($attach_id, $wp_upload_dir['path'] . '/' . $img_basename);
-                                        wp_update_attachment_metadata($attach_id, $attach_data);
-                                        /** Update option picture **/
-                                        $term_option['wpshop_category_picture'] = $attach_id;
-                                        if ($save_this_picture) {
-                                            update_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id, $term_option);
-                                        }
-                                        $save_this_picture = false;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                return true;
-                break;
-
-            case '38':
-                wps_message_ctr::createMessage('WPSHOP_QUOTATION_UPDATE_MESSAGE');
-                return true;
-                break;
-
-            case '39':
-                $attribute_def = wpshop_attributes::getElement('tx_tva', "'valid'", 'code');
-                /** Check if the 7% VAT Rate is not already created **/
-                $query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d AND value = %s', $attribute_def->id, '7');
-                $exist_vat_rate = $wpdb->get_results($query);
-
-                if (empty($exist_vat_rate)) {
-                    /** Get Max Position **/
-                    $query = $wpdb->prepare('SELECT MAX(position) as max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d', $attribute_def->id);
-                    $max_position = $wpdb->get_var($query);
-
-                    if (!empty($attribute_def) && !empty($attribute_def->id)) {
-                        $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' => $attribute_def->id, 'position' => (int) $max_position + 1, 'value' => '7', 'label' => '7'));
-                    }
-                }
-
-                /** Filter Search optimization **/
-                @set_time_limit(900);
-                $query = $wpdb->prepare('SELECT term_id FROM ' . $wpdb->term_taxonomy . ' WHERE taxonomy = %s ', WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
-                $categories = $wpdb->get_results($query);
-                $cats = array();
-                if (!empty($categories)) {
-                    foreach ($categories as $category) {
-                        $cats[] = $category->term_id;
-                    }
-                    $wpshop_filter_search = new wps_filter_search();
-                    $wpshop_filter_search->stock_values_for_attribute($cats);
-                }
-                return true;
-                break;
-
-            case '40':
-                /**    Store watt in puissance unit group    */
-                $query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s", __('puissance', 'wpshop'));
-                $puissance_unit_group_id = $wpdb->get_var($query);
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $puissance_unit_group_id), array('unit' => 'watt'));
-
-                /**    Store day/week/year in duration unit group    */
-                $query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s", __('duration', 'wpshop'));
-                $duration_unit_group_id = $wpdb->get_var($query);
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'day'));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'week'));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'year'));
-
-                /**    Store day/week/year in duration unit group    */
-                $query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s", __('length', 'wpshop'));
-                $length_unit_group_id = $wpdb->get_var($query);
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $length_unit_group_id), array('unit' => 'cm'));
-                return true;
-                break;
-
-            case '41':
-                /**    Get distinct attribute set and delete doublons    */
-                $query = "SELECT DISTINCT( name ) AS name, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " GROUP BY name HAVING COUNT(id) > 1";
-                $list_of_set = $wpdb->get_results($query);
-                foreach ($list_of_set as $set_infos) {
-                    $query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE name = %s AND id != %d", $set_infos->name, $set_infos->min_id);
-                    $wpdb->query($query);
-                }
-                $wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_SET);
-
-                /**    Get and delete attribute set section    */
-                $query = "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " )";
-                $wpdb->query($query);
-                $wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_GROUP);
-
-                /**    Get and delete attribute set details    */
-                $query = "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_set_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " ) OR attribute_group_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " )";
-                $wpdb->query($query);
-                $wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS);
-
-                $query = "SELECT attribute_set_id, attribute_group_id, attribute_id, MIN(id) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " GROUP BY attribute_set_id, attribute_group_id, attribute_id HAVING COUNT(id) > 1";
-                $affectation_list = $wpdb->get_results($query);
-                foreach ($affectation_list as $affectation_to_treat) {
-                    $query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_set_id = %d AND attribute_group_id = %d AND attribute_id = %d AND id != %d", $affectation_to_treat->attribute_set_id, $affectation_to_treat->attribute_group_id, $affectation_to_treat->attribute_id, $affectation_to_treat->min_id);
-                    $wpdb->query($query);
-                }
-                $wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS);
-
-                /**    Get and delete double unit    */
-                $query = "SELECT DISTINCT( unit ) AS unit, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT . " GROUP BY unit HAVING COUNT(id) > 1";
-                $list_of_set = $wpdb->get_results($query);
-                foreach ($list_of_set as $set_infos) {
-                    $query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT . " WHERE unit = %s AND id != %d", $set_infos->unit, $set_infos->min_id);
-                    $wpdb->query($query);
-                }
-                $wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_UNIT);
-
-                $query = "SELECT DISTINCT( name ) AS name, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " GROUP BY name HAVING COUNT(id) > 1";
-                $list_of_set = $wpdb->get_results($query);
-                foreach ($list_of_set as $set_infos) {
-                    $query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s AND id != %d", $set_infos->name, $set_infos->min_id);
-                    $wpdb->query($query);
-                }
-                $wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP);
-
-                /**    Get and delete attribute set details    */
-                $query = "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_set_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " ) OR attribute_group_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " )";
-                $wpdb->query($query);
-                $query = "SELECT GROUP_CONCAT( id ) AS list_id, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " GROUP BY attribute_set_id, attribute_group_id, attribute_id HAVING COUNT(id) > 1";
-                $affectation_list = $wpdb->get_results($query);
-                foreach ($affectation_list as $list) {
-                    $query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE id IN (" . (substr($list->list_id, -1) == ',' ? substr($list->list_id, 0, -1) : $list->list_id) . ") AND id != %d", $list->min_id, '');
-                    $wpdb->query($query);
-                }
-                $wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS);
-
-                return true;
-                break;
-
-            case '42':
-                $available_downloadable_product = get_option('WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE');
-                if (empty($available_downloadable_product)) {
-                    wps_message_ctr::createMessage('WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE');
-                }
-                return true;
-                break;
-
-            case '43':
-                $available_downloadable_product = get_option('WPSHOP_ORDER_IS_CANCELED');
-                if (empty($available_downloadable_product)) {
-                    wps_message_ctr::createMessage('WPSHOP_ORDER_IS_CANCELED');
-                }
-                return true;
-                break;
-
-            case '44':
-                $display_option = get_option('wpshop_display_option');
-                if (!empty($display_option) && empty($display_option['latest_products_ordered'])) {
-                    $display_option['latest_products_ordered'] = 3;
-                    update_option('wpshop_display_option', $display_option);
-                }
-
-                /** Check messages for customization **/
-                // @since 1.4.3.7 Deleted messages constants
-                /*$messages = array('WPSHOP_SIGNUP_MESSAGE' => WPSHOP_SIGNUP_MESSAGE, 'WPSHOP_PAYPAL_PAYMENT_CONFIRMATION_MESSAGE' => WPSHOP_PAYPAL_PAYMENT_CONFIRMATION_MESSAGE, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE' => WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE, 'WPSHOP_SHIPPING_CONFIRMATION_MESSAGE' => WPSHOP_SHIPPING_CONFIRMATION_MESSAGE, 'WPSHOP_ORDER_UPDATE_MESSAGE' => WPSHOP_ORDER_UPDATE_MESSAGE, 'WPSHOP_ORDER_UPDATE_PRIVATE_MESSAGE' => WPSHOP_ORDER_UPDATE_PRIVATE_MESSAGE, 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE' => WPSHOP_NEW_ORDER_ADMIN_MESSAGE, 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE' => WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE' => WPSHOP_QUOTATION_CONFIRMATION_MESSAGE, 'WPSHOP_QUOTATION_UPDATE_MESSAGE' => WPSHOP_QUOTATION_UPDATE_MESSAGE, 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE' => WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE, 'WPSHOP_ORDER_IS_CANCELED' => WPSHOP_ORDER_IS_CANCELED);
+				add_option('wpshop_cart_option', array('product_added_to_cart' => array('dialog_msg'), 'product_added_to_quotation' => array('cart_page')));
+
+				return true;
+				break;
+
+			case '30':
+				/**    Update the current price piloting field for using it into variation specific attributes    */
+				$price_piloting_attribute = constant('WPSHOP_PRODUCT_PRICE_' . WPSHOP_PRODUCT_PRICE_PILOT);
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => $price_piloting_attribute));
+
+				/**    Update the product reference field for using it into variation specific attributes    */
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => 'product_reference'));
+
+				/**    Insert new message for admin when a customer make an order    */
+				$admin_new_order_message = get_option('WPSHOP_NEW_ORDER_ADMIN_MESSAGE');
+				if (empty($admin_new_order_message)) {
+					wps_message_ctr::createMessage('WPSHOP_NEW_ORDER_ADMIN_MESSAGE');
+				}
+				/**    Update all amount for paypal orders    */
+				$query = $wpdb->prepare("SELECT post_id FROM " . $wpdb->postmeta . " WHERE meta_key = %s AND meta_value = %s ", '_wpshop_payment_method', 'paypal');
+				$paypal_payment_list = $wpdb->get_results($query);
+				if (!empty($paypal_payment_list)) {
+					foreach ($paypal_payment_list as $post) {
+						$order_meta = get_post_meta($post->post_id, '_order_postmeta', true);
+						$order_payment_meta = get_post_meta($post->post_id, 'wpshop_payment_return_data', true);
+						if (!empty($order_meta['order_status']) && ($order_meta['order_status'] == 'incorrect_amount')) {
+							if (!empty($order_meta['order_grand_total']) && !empty($order_payment_meta['mc_gross'])) {
+								$order_amount_to_pay = number_format($order_meta['order_grand_total'], 5);
+								$order_amount_payed = number_format(floatval($order_payment_meta['mc_gross']), 5);
+								if ($order_amount_payed == $order_amount_to_pay) {
+									wpshop_payment::setOrderPaymentStatus($order_id, 'completed');
+								}
+							}
+						}
+					}
+				}
+
+				/**    Save existing orders address information    */
+				$billing_title = __('Billing address', 'wpshop');
+				$shipping_title = __('Shipping address', 'wpshop');
+				$results = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1));
+				foreach ($results as $result) {
+					$address = get_post_meta($result->ID, '_order_info', true);
+					$address_format = array();
+
+					$billing_address = array();
+					if (!empty($address['billing']) && empty($address['billing']['id'])) {
+						if (!empty($address['billing']['civility'])) {
+							switch ($address['billing']['civility']) {
+								case 1:
+									$civility = $mister_id;
+									break;
+								case 2:
+									$civility = $madam_id;
+									break;
+								case 3:
+									$civility = $miss_id;
+									break;
+								default:
+									$civility = $mister_id;
+									break;
+							}
+						} else {
+							$civility = $mister_id;
+						}
+						$billing_address = array('address_title' => $billing_title,
+							'address_last_name' => !empty($address['billing']['last_name']) ? $address['billing']['last_name'] : '',
+							'address_first_name' => !empty($address['billing']['first_name']) ? $address['billing']['first_name'] : '',
+							'company' => !empty($address['billing']['company']) ? $address['billing']['company'] : '',
+							'address' => !empty($address['billing']['address']) ? $address['billing']['address'] : '',
+							'postcode' => !empty($address['billing']['postcode']) ? $address['billing']['postcode'] : '',
+							'city' => !empty($address['billing']['city']) ? $address['billing']['city'] : '',
+							'state' => !empty($address['billing']['state']) ? $address['billing']['state'] : '',
+							'country' => !empty($address['billing']['country']) ? $address['billing']['country'] : '',
+							'address_user_email' => !empty($address['billing']['email']) ? $address['billing']['email'] : '',
+							'phone' => !empty($address['billing']['phone']) ? $address['billing']['phone'] : '',
+							'tva_intra' => !empty($address['billing']['company_tva_intra']) ? $address['billing']['company_tva_intra'] : '',
+							'civility' => $civility,
+						);
+						$billing_address_option = get_option('wpshop_billing_address');
+						$address_format['billing']['id'] = $billing_address_option['choice'];
+						$address_format['billing']['address'] = $shipping_address;
+					}
+
+					$shipping_address = array();
+					if (!empty($address['shipping']) && empty($address['shipping']['id'])) {
+						if (!empty($address['shipping']['civility'])) {
+							switch ($address['shipping']['civility']) {
+								case 1:
+									$civility = $mister_id;
+									break;
+								case 2:
+									$civility = $madam_id;
+									break;
+								case 3:
+									$civility = $miss_id;
+									break;
+							}
+						} else {
+							$civility = $mister_id;
+						}
+						$shipping_address = array('address_title' => $shipping_title,
+							'address_last_name' => !empty($address['shipping']['last_name']) ? $address['shipping']['last_name'] : '',
+							'address_first_name' => !empty($address['shipping']['first_name']) ? $address['shipping']['first_name'] : '',
+							'company' => !empty($address['shipping']['company']) ? $address['shipping']['company'] : '',
+							'address' => !empty($address['shipping']['address']) ? $address['shipping']['address'] : '',
+							'postcode' => !empty($address['shipping']['postcode']) ? $address['shipping']['postcode'] : '',
+							'city' => !empty($address['shipping']['city']) ? $address['shipping']['city'] : '',
+							'state' => !empty($address['shipping']['state']) ? $address['shipping']['state'] : '',
+							'country' => !empty($address['shipping']['country']) ? $address['shipping']['country'] : '',
+							'civility' => $civility,
+						);
+						$shipping_address_options = get_option('wpshop_shipping_address_choice');
+						$address_format['shipping']['id'] = $shipping_address_options['choice'];
+						$address_format['shipping']['address'] = $shipping_address;
+					}
+
+					if (!empty($address_format)) {
+						update_post_meta($result->ID, '_order_info', $address_format);
+					}
+				}
+
+				/**    Delete username from frontend form    */
+				$attribute_login = wpshop_attributes::getElement('user_login', "'valid'", 'code');
+				if (!empty($attribute_login)) {
+					$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'deleted', 'last_update_date' => current_time('mysql', 0), 'position' => 0), array('attribute_id' => $attribute_login->id));
+				}
+
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('last_update_date' => current_time('mysql', 0), 'position' => 0), array('status' => 'deleted'));
+
+				return true;
+				break;
+
+			case '31':
+				/**    Change order structure in order to support several payment    */
+				$existing_orders = query_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'posts_per_page' => -1, 'post_status' => array('draft', 'trash', 'publish')));
+				if (!empty($existing_orders)) {
+					foreach ($existing_orders as $order_main_informations) {
+						/**    Transfer payment return data form old meta to new    */
+						$order_payment_return_data = get_post_meta($order_main_informations->ID, 'wpshop_payment_return_data', true);
+						update_post_meta($order_main_informations->ID, '_wpshop_payment_return_data', $order_payment_return_data);
+						delete_post_meta($order_main_informations->ID, 'wpshop_payment_return_data');
+
+						/**    Transfer old payment storage method to new storage method    */
+						$order_meta = get_post_meta($order_main_informations->ID, '_order_postmeta', true);
+						if (!empty($order_meta['order_status'])) {
+							$order_meta['order_payment']['customer_choice'] = array('method' => (!empty($order_meta['payment_method']) ? $order_meta['payment_method'] : (!empty($order_meta['order_payment']['customer_choice']) ? $order_meta['order_payment']['customer_choice'] : '')));
+							unset($order_meta['payment_method']);
+							$order_meta['order_payment']['received'][0]['waited_amount'] = !empty($order_meta['order_grand_total']) ? $order_meta['order_grand_total'] : 0;
+							$order_meta['order_payment']['received'][0]['method'] = $order_meta['order_payment']['customer_choice']['method'];
+							$order_meta['order_payment']['received'][0]['date'] = $order_meta['order_date'];
+							$order_meta['order_payment']['received'][0]['status'] = 'waiting_payment';
+							$order_meta['order_payment']['received'][0]['comment'] = '';
+							$order_meta['order_payment']['received'][0]['author'] = $order_meta['order_payment']['customer_choice'] == 'check' ? 1 : $order_meta['customer_id'];
+							if (in_array($order_meta['order_status'], array('completed', 'shipped'))) {
+								$order_meta['order_payment']['received'][0]['received_amount'] = $order_meta['order_grand_total'];
+								$order_meta['order_payment']['received'][0]['payment_reference'] = wpshop_payment::get_payment_transaction_number_old_way($order_main_informations->ID);
+								$order_meta['order_payment']['received'][0]['date'] = $order_meta['order_payment_date'];
+								$order_meta['order_payment']['received'][0]['status'] = 'payment_received';
+								$order_meta['order_payment']['received'][0]['comment'] = '';
+								$order_meta['order_payment']['received'][0]['author'] = $order_meta['order_payment']['customer_choice'] == 'check' ? 1 : $order_meta['customer_id'];
+								$order_meta['order_payment']['received'][0]['invoice_ref'] = $order_meta['order_invoice_ref'];
+							}
+							update_post_meta($order_main_informations->ID, '_order_postmeta', $order_meta);
+
+							if (!empty($order_meta['order_payment']['customer_choice'])) {
+								switch ($order_meta['order_payment']['customer_choice']) {
+									case 'check':
+										delete_post_meta($order_main_informations->ID, '_order_check_number', get_post_meta($order_main_informations->ID, '_order_check_number', true));
+										break;
+									case 'paypal':
+										delete_post_meta($order_main_informations->ID, '_order_paypal_txn_id', get_post_meta($order_main_informations->ID, '_order_paypal_txn_id', true));
+										break;
+									case 'cic':
+										delete_post_meta($order_main_informations->ID, '_order_cic_txn_id', get_post_meta($order_main_informations->ID, '_order_cic_txn_id', true));
+										break;
+								}
+							}
+						}
+					}
+				}
+				$wps_messages = new wps_message_ctr();
+				$wps_messages->wpshop_messages_historic_correction();
+				wp_reset_query();
+
+				$default_currency = get_option('wpshop_shop_default_currency');
+				foreach (unserialize(WPSHOP_SHOP_CURRENCIES) as $k => $v) {
+					if ($default_currency == $k) {
+						$symbol = $v;
+					}
+				}
+				if (!empty($symbol)) {
+					$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE name = "' . html_entity_decode($symbol, ENT_QUOTES, 'UTF-8') . '"', '');
+					$currency = $wpdb->get_row($query);
+					if (!empty($currency)) {
+						update_option('wpshop_shop_default_currency', $currency->id);
+						// Update the change rate of the default currency
+						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('change_rate' => 1), array('id' => $currency->id));
+					}
+				}
+
+				$shipping_confirmation_message = get_option('WPSHOP_SHIPPING_CONFIRMATION_MESSAGE');
+				if (!empty($shipping_confirmation_message)) {
+					$message = __('Hello [customer_first_name] [customer_last_name], this email confirms that your order ([order_key]) has just been shipped (order date : [order_date], tracking number : [order_trackingNumber]). Thank you for your loyalty. Have a good day.', 'wpshop');
+					$post = array('ID' => $shipping_confirmation_message, 'post_content' => $message);
+					wp_update_post($post);
+				}
+				return true;
+				break;
+			case '32':
+				/**    Update product set id that are null     */
+				$query = $wpdb->prepare("UPDATE " . $wpdb->postmeta . " SET meta_value = (SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE default_set = 'yes' AND entity_id = '" . wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) . "') WHERE meta_key = %s AND ((meta_value = '') OR (meta_value = null))", '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id');
+				$wpdb->query($query);
+
+				$addons_options = get_option(WPSHOP_ADDONS_OPTION_NAME);
+				if (!empty($addons_options) && !empty($addons_options['WPSHOP_ADDONS_QUOTATION']) && !empty($addons_options['WPSHOP_ADDONS_QUOTATION']['activate']) && $addons_options['WPSHOP_ADDONS_QUOTATION']['activate']) {
+					$admin_new_quotation_message = get_option('WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE');
+					if (empty($admin_new_quotation_message)) {
+						wps_message_ctr::createMessage('WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE');
+					}
+					$admin_new_quotation_confirm_message = get_option('WPSHOP_QUOTATION_CONFIRMATION_MESSAGE');
+					if (empty($admin_new_quotation_confirm_message)) {
+						wps_message_ctr::createMessage('WPSHOP_QUOTATION_CONFIRMATION_MESSAGE');
+					}
+				}
+
+				/**    Allows the administrator to manage a little bit more the catalog rewrite parameters    */
+				$options = get_option('wpshop_catalog_product_option');
+				$options['wpshop_catalog_product_slug_with_category'] = empty($options['wpshop_catalog_product_slug_with_category']) ? 'yes' : $options['wpshop_catalog_product_slug_with_category'];
+				update_option('wpshop_catalog_product_option', $options);
+
+				/**    Create a new page for unsuccessfull payment return    */
+				self::wpshop_insert_default_pages($wpshop_shop_type);
+				wp_cache_flush();
+
+				/**    Update the iso code of currencies    */
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('code_iso' => 'EUR'), array('name' => 'euro'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('code_iso' => 'USD'), array('name' => 'dollar'));
+
+				/** Update VAT Rate*/
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s OR code = %s', 'tx_tva', 'eco_taxe_rate_tva');
+				$attribute_ids = $wpdb->get_results($query);
+				foreach ($attribute_ids as $attribute_id) {
+					$query = $wpdb->prepare('UPDATE ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' SET value = replace(value, "-", ".") WHERE attribute_id = %d', $attribute_id->id);
+					$wpdb->query($query);
+				}
+
+				return true;
+				break;
+
+			case '33':
+				/** Update the user_mail for the new system of log in/register */
+				$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "user_email"');
+
+				/** Put discount attributes in price attribute set section*/
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE code = %s', 'prices');
+				$prices_section_id = $wpdb->get_var($query);
+
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s OR code = %s', 'discount_rate', 'discount_amount');
+				$attributes = $wpdb->get_results($query);
+				if (!empty($attributes) && !empty($prices_section_id)) {
+					foreach ($attributes as $attribute) {
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' SET attribute_group_id = ' . $prices_section_id . ' WHERE attribute_id = ' . $attribute->id);
+					}
+				}
+				return true;
+				break;
+
+			case '34':
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE code = %s', 'prices');
+				$prices_section_id = $wpdb->get_var($query);
+
+				$query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_group_id = %d', $prices_section_id);
+				$last_position_id = $wpdb->get_var($query);
+
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE  attribute_group_id = %d AND position = %d', $prices_section_id, $last_position_id);
+				$attribute_example = $wpdb->get_row($query);
+
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s OR code = %s', 'special_from', 'special_to');
+				$attributes = $wpdb->get_results($query);
+				$i = 1;
+				if (!empty($attributes) && !empty($prices_section_id)) {
+
+					foreach ($attributes as $attribute) {
+						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('attribute_group_id' => $prices_section_id), array('attribute_id' => $attribute->id));
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $attribute_example->entity_type_id, 'attribute_set_id' => $attribute_example->attribute_set_id, 'attribute_group_id' => $prices_section_id, 'attribute_id' => $attribute->id, 'position' => $last_position_id + $i));
+						$i++;
+					}
+				}
+				$discount_options = get_option('wpshop_catalog_product_option');
+				$status = (!empty($discount_options) && !empty($discount_options['discount'])) ? 'valid' : 'notused';
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_label' => __('Discount from', 'wpshop'), 'status' => $status), array('code' => 'special_from'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('frontend_label' => __('Discount to', 'wpshop'), 'status' => $status), array('code' => 'special_to'));
+				return true;
+				break;
+
+			case '35':
+				$wpdb->update($wpdb->posts, array('post_status' => 'draft'), array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS));
+				return true;
+				break;
+
+			case '36':
+				wpshop_entities::create_cpt_attributes_from_csv_file(WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS);
+				@set_time_limit(900);
+				/** Change the path for old categories pictures */
+				@chmod(WPSHOP_UPLOAD_DIR . 'wpshop_product_category', 0755);
+
+				$query = 'SELECT * FROM ' . $wpdb->terms;
+				$terms = $wpdb->get_results($query);
+				if (!empty($terms)) {
+					foreach ($terms as $term) {
+						@chmod(WPSHOP_UPLOAD_DIR . 'wpshop_product_category/' . $term->term_id, 0755);
+						/** Check if a picture exists **/
+						$term_option = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $term->term_id);
+						if (!empty($term_option) && !empty($term_option['wpshop_category_picture']) && is_file(WPSHOP_UPLOAD_DIR . $term_option['wpshop_category_picture'])) {
+							$wp_upload_dir = wp_upload_dir();
+							$img_path = WPSHOP_UPLOAD_DIR . $term_option['wpshop_category_picture'];
+							$img_basename = basename($img_path);
+							$wp_filetype = wp_check_filetype($img_basename, null);
+							/** Check if there is an image with the same name, if yes we add a rand number to image's name **/
+							$rand_name = (is_file($wp_upload_dir['path'] . '/' . $img_basename)) ? rand() : '';
+							$img_basename = (!empty($rand_name)) ? $rand_name . '_' . $img_basename : $img_basename;
+							if (copy($img_path, $wp_upload_dir['path'] . '/' . $img_basename)) {
+								$attachment = array(
+									'guid' => $wp_upload_dir['url'] . '/' . $img_basename,
+									'post_mime_type' => $wp_filetype['type'],
+									'post_title' => preg_replace('/\.[^.]+$/', '', $img_basename),
+									'post_content' => '',
+									'post_status' => 'inherit',
+								);
+								$attach_id = wp_insert_attachment($attachment, $wp_upload_dir['path'] . '/' . $img_basename);
+								/** Generate differnts sizes for this image **/
+								require_once ABSPATH . 'wp-admin/includes/image.php';
+								$attach_data = wp_generate_attachment_metadata($attach_id, $wp_upload_dir['path'] . '/' . $img_basename);
+								wp_update_attachment_metadata($attach_id, $attach_data);
+								/** Update option picture **/
+								$term_option['wpshop_category_picture'] = $attach_id;
+								update_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $term->term_id, $term_option);
+							}
+						}
+					}
+				}
+
+				/** Change metabox Hidden Nav Menu Definition to display WPShop categories' metabox **/
+				$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->usermeta . ' WHERE meta_key = %s', 'metaboxhidden_nav-menus');
+				$meta_keys = $wpdb->get_results($query);
+				if (!empty($meta_keys) && is_array($meta_keys)) {
+					foreach ($meta_keys as $meta_key) {
+						$user_id = $meta_key->user_id;
+						$meta_value = unserialize($meta_key->meta_value);
+						if (!empty($meta_value) && is_array($meta_value)) {
+							$data_to_delete = array_search('add-wpshop_product_category', $meta_value);
+							if ($data_to_delete !== false) {
+								unset($meta_value[$data_to_delete]);
+							}
+						}
+						update_user_meta($user_id, 'metaboxhidden_nav-menus', $meta_value);
+					}
+				}
+				return true;
+				break;
+
+			case '37':
+				@set_time_limit(900);
+				/** Change the path for old categories pictures */
+				@chmod(WPSHOP_UPLOAD_DIR . 'wpshop/wpshop_product_category', 0755);
+				/** Read all categories folders **/
+				$categories_main_dir = WPSHOP_UPLOAD_DIR . 'wpshop/wpshop_product_category';
+				if (file_exists($categories_main_dir)) {
+					$main_folder_content = scandir($categories_main_dir);
+					/** For each category folder **/
+					foreach ($main_folder_content as $category_folder) {
+						if ($category_folder && substr($category_folder, 0, 1) != '.') {
+							$category_id = $category_folder;
+							@chmod(WPSHOP_UPLOAD_DIR . 'wpshop/wpshop_product_category/' . $category_id, 0755);
+							$scan_category_folder = opendir($categories_main_dir . '/' . $category_folder);
+							/** For each Picture of category **/
+							$file_time = 0;
+							$save_this_picture = false;
+							while (false !== ($fichier = readdir($scan_category_folder))) {
+								if ($fichier && substr($fichier, 0, 1) != '.') {
+									if ($file_time < filemtime($categories_main_dir . '/' . $category_id . '/' . $fichier)) {
+										$save_this_picture = true;
+										$file_time = filemtime($categories_main_dir . '/' . $category_id . '/' . $fichier);
+									}
+									/** Select category option **/
+									$term_option = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
+									$wp_upload_dir = wp_upload_dir();
+									$img_path = $categories_main_dir . '/' . $category_id . '/' . $fichier;
+									$img_basename = basename($img_path);
+									$wp_filetype = wp_check_filetype($img_basename, null);
+									/** Check if there is an image with the same name, if yes we add a rand number to image's name **/
+									$rand_name = (is_file($wp_upload_dir['path'] . '/' . $img_basename)) ? rand() : '';
+									$img_basename = (!empty($rand_name)) ? $rand_name . '_' . $img_basename : $img_basename;
+
+									if (copy($img_path, $wp_upload_dir['path'] . '/' . $img_basename)) {
+										$attachment = array(
+											'guid' => $wp_upload_dir['url'] . '/' . $img_basename,
+											'post_mime_type' => $wp_filetype['type'],
+											'post_title' => preg_replace('/\.[^.]+$/', '', $img_basename),
+											'post_content' => '',
+											'post_status' => 'inherit',
+										);
+										$attach_id = wp_insert_attachment($attachment, $wp_upload_dir['path'] . '/' . $img_basename);
+										/** Generate differnts sizes for this image **/
+										require_once ABSPATH . 'wp-admin/includes/image.php';
+										$attach_data = wp_generate_attachment_metadata($attach_id, $wp_upload_dir['path'] . '/' . $img_basename);
+										wp_update_attachment_metadata($attach_id, $attach_data);
+										/** Update option picture **/
+										$term_option['wpshop_category_picture'] = $attach_id;
+										if ($save_this_picture) {
+											update_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id, $term_option);
+										}
+										$save_this_picture = false;
+									}
+								}
+							}
+						}
+					}
+				}
+				return true;
+				break;
+
+			case '38':
+				wps_message_ctr::createMessage('WPSHOP_QUOTATION_UPDATE_MESSAGE');
+				return true;
+				break;
+
+			case '39':
+				$attribute_def = wpshop_attributes::getElement('tx_tva', "'valid'", 'code');
+				/** Check if the 7% VAT Rate is not already created **/
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d AND value = %s', $attribute_def->id, '7');
+				$exist_vat_rate = $wpdb->get_results($query);
+
+				if (empty($exist_vat_rate)) {
+					/** Get Max Position **/
+					$query = $wpdb->prepare('SELECT MAX(position) as max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d', $attribute_def->id);
+					$max_position = $wpdb->get_var($query);
+
+					if (!empty($attribute_def) && !empty($attribute_def->id)) {
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' => $attribute_def->id, 'position' => (int) $max_position + 1, 'value' => '7', 'label' => '7'));
+					}
+				}
+
+				/** Filter Search optimization **/
+				@set_time_limit(900);
+				$query = $wpdb->prepare('SELECT term_id FROM ' . $wpdb->term_taxonomy . ' WHERE taxonomy = %s ', WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
+				$categories = $wpdb->get_results($query);
+				$cats = array();
+				if (!empty($categories)) {
+					foreach ($categories as $category) {
+						$cats[] = $category->term_id;
+					}
+					$wpshop_filter_search = new wps_filter_search();
+					$wpshop_filter_search->stock_values_for_attribute($cats);
+				}
+				return true;
+				break;
+
+			case '40':
+				/**    Store watt in puissance unit group    */
+				$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s", __('puissance', 'wpshop'));
+				$puissance_unit_group_id = $wpdb->get_var($query);
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $puissance_unit_group_id), array('unit' => 'watt'));
+
+				/**    Store day/week/year in duration unit group    */
+				$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s", __('duration', 'wpshop'));
+				$duration_unit_group_id = $wpdb->get_var($query);
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'day'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'week'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $duration_unit_group_id), array('unit' => 'year'));
+
+				/**    Store day/week/year in duration unit group    */
+				$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s", __('length', 'wpshop'));
+				$length_unit_group_id = $wpdb->get_var($query);
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_UNIT, array('group_id' => $length_unit_group_id), array('unit' => 'cm'));
+				return true;
+				break;
+
+			case '41':
+				/**    Get distinct attribute set and delete doublons    */
+				$query = "SELECT DISTINCT( name ) AS name, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " GROUP BY name HAVING COUNT(id) > 1";
+				$list_of_set = $wpdb->get_results($query);
+				foreach ($list_of_set as $set_infos) {
+					$query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE name = %s AND id != %d", $set_infos->name, $set_infos->min_id);
+					$wpdb->query($query);
+				}
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_SET);
+
+				/**    Get and delete attribute set section    */
+				$query = "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " )";
+				$wpdb->query($query);
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_GROUP);
+
+				/**    Get and delete attribute set details    */
+				$query = "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_set_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " ) OR attribute_group_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " )";
+				$wpdb->query($query);
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS);
+
+				$query = "SELECT attribute_set_id, attribute_group_id, attribute_id, MIN(id) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " GROUP BY attribute_set_id, attribute_group_id, attribute_id HAVING COUNT(id) > 1";
+				$affectation_list = $wpdb->get_results($query);
+				foreach ($affectation_list as $affectation_to_treat) {
+					$query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_set_id = %d AND attribute_group_id = %d AND attribute_id = %d AND id != %d", $affectation_to_treat->attribute_set_id, $affectation_to_treat->attribute_group_id, $affectation_to_treat->attribute_id, $affectation_to_treat->min_id);
+					$wpdb->query($query);
+				}
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS);
+
+				/**    Get and delete double unit    */
+				$query = "SELECT DISTINCT( unit ) AS unit, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT . " GROUP BY unit HAVING COUNT(id) > 1";
+				$list_of_set = $wpdb->get_results($query);
+				foreach ($list_of_set as $set_infos) {
+					$query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT . " WHERE unit = %s AND id != %d", $set_infos->unit, $set_infos->min_id);
+					$wpdb->query($query);
+				}
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_UNIT);
+
+				$query = "SELECT DISTINCT( name ) AS name, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " GROUP BY name HAVING COUNT(id) > 1";
+				$list_of_set = $wpdb->get_results($query);
+				foreach ($list_of_set as $set_infos) {
+					$query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP . " WHERE name = %s AND id != %d", $set_infos->name, $set_infos->min_id);
+					$wpdb->query($query);
+				}
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP);
+
+				/**    Get and delete attribute set details    */
+				$query = "DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE attribute_set_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " ) OR attribute_group_id NOT IN ( SELECT DISTINCT(id) FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " )";
+				$wpdb->query($query);
+				$query = "SELECT GROUP_CONCAT( id ) AS list_id, MIN( id ) as min_id FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " GROUP BY attribute_set_id, attribute_group_id, attribute_id HAVING COUNT(id) > 1";
+				$affectation_list = $wpdb->get_results($query);
+				foreach ($affectation_list as $list) {
+					$query = $wpdb->prepare("DELETE FROM " . WPSHOP_DBT_ATTRIBUTE_DETAILS . " WHERE id IN (" . (substr($list->list_id, -1) == ',' ? substr($list->list_id, 0, -1) : $list->list_id) . ") AND id != %d", $list->min_id, '');
+					$wpdb->query($query);
+				}
+				$wpdb->query("OPTIMIZE TABLE " . WPSHOP_DBT_ATTRIBUTE_DETAILS);
+
+				return true;
+				break;
+
+			case '42':
+				$available_downloadable_product = get_option('WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE');
+				if (empty($available_downloadable_product)) {
+					wps_message_ctr::createMessage('WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE');
+				}
+				return true;
+				break;
+
+			case '43':
+				$available_downloadable_product = get_option('WPSHOP_ORDER_IS_CANCELED');
+				if (empty($available_downloadable_product)) {
+					wps_message_ctr::createMessage('WPSHOP_ORDER_IS_CANCELED');
+				}
+				return true;
+				break;
+
+			case '44':
+				$display_option = get_option('wpshop_display_option');
+				if (!empty($display_option) && empty($display_option['latest_products_ordered'])) {
+					$display_option['latest_products_ordered'] = 3;
+					update_option('wpshop_display_option', $display_option);
+				}
+
+				/** Check messages for customization **/
+				// @since 1.4.3.7 Deleted messages constants
+				/*$messages = array('WPSHOP_SIGNUP_MESSAGE' => WPSHOP_SIGNUP_MESSAGE, 'WPSHOP_PAYPAL_PAYMENT_CONFIRMATION_MESSAGE' => WPSHOP_PAYPAL_PAYMENT_CONFIRMATION_MESSAGE, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE' => WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE, 'WPSHOP_SHIPPING_CONFIRMATION_MESSAGE' => WPSHOP_SHIPPING_CONFIRMATION_MESSAGE, 'WPSHOP_ORDER_UPDATE_MESSAGE' => WPSHOP_ORDER_UPDATE_MESSAGE, 'WPSHOP_ORDER_UPDATE_PRIVATE_MESSAGE' => WPSHOP_ORDER_UPDATE_PRIVATE_MESSAGE, 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE' => WPSHOP_NEW_ORDER_ADMIN_MESSAGE, 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE' => WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE' => WPSHOP_QUOTATION_CONFIRMATION_MESSAGE, 'WPSHOP_QUOTATION_UPDATE_MESSAGE' => WPSHOP_QUOTATION_UPDATE_MESSAGE, 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE' => WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE, 'WPSHOP_ORDER_IS_CANCELED' => WPSHOP_ORDER_IS_CANCELED);
                 if (!empty($messages)) {
                     foreach ($messages as $key => $message) {
                         $message_option = get_option($key);
@@ -1818,572 +1818,572 @@ 
                     }
                 }*/
 
-                return true;
-                break;
-
-            case '45':
-                $shipping_mode_ctr = new wps_shipping_mode_ctr();
-                $shipping_mode_ctr->migrate_default_shipping_mode();
-                return true;
-                break;
-
-            case '46':
-                wps_message_ctr::createMessage('WPSHOP_FORGOT_PASSWORD_MESSAGE');
-                wps_message_ctr::customize_message(WPSHOP_FORGOT_PASSWORD_MESSAGE);
-                return true;
-                break;
-
-            case '47':
-                wps_payment_mode::migrate_payment_modes();
-                return true;
-                break;
-
-            case '48':
-                @ini_set('max_execution_time', '500');
-
-                $count_products = wp_count_posts(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-                $output_type_option = get_option('wpshop_display_option');
-                $output_type = $output_type_option['wpshop_display_list_type'];
-
-                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) {
-                            $p = wpshop_products::get_product_data($product->ID);
-                            $price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', $output_type));
-                            update_post_meta($product->ID, '_wps_price_infos', $price);
-                        }
-                    }
-                }
-
-                return true;
-                break;
-
-            case '49':
-                update_option('wpshop_send_invoice', true);
-                return true;
-                break;
-
-            case '50':
-                $price_display_option = get_option('wpshop_catalog_product_option');
-                $price_display_option['price_display']['text_from'] = 'on';
-                $price_display_option['price_display']['lower_price'] = 'on';
-                update_option('wpshop_catalog_product_option', $price_display_option);
-
-                self::wpshop_insert_default_pages();
-
-                return true;
-                break;
-
-            case '51':
-                /**    Insert new message for direct payment link    */
-                $direct_payment_link_message = get_option('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE');
-                if (empty($direct_payment_link_message)) {
-                    wps_message_ctr::createMessage('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE');
-                }
-                return true;
-                break;
-
-            case '52':
-                $account_page_option = get_option('wpshop_myaccount_page_id');
-                if (!empty($account_page_option)) {
-                    $page_account = get_post($account_page_option);
-                    $page_content = (!empty($page_account) && !empty($page_account->post_content)) ? str_replace('[wpshop_myaccount]', '[wps_account_dashboard]', $page_account->post_content) : '[wps_account_dashboard]';
-                    wp_update_post(array('ID' => $account_page_option, 'post_content' => $page_content));
-                }
-                return true;
-                break;
-
-            case '53':
-                $payment_modes_option = get_option('wps_payment_mode');
-                if (!empty($payment_modes_option) && !empty($payment_modes_option['mode'])) {
-                    $payment_modes_option['mode']['cash_on_delivery'] = array(
-                        'name' => __('Cash on delivery', 'wpshop'),
-                        'logo' => WPSHOP_TEMPLATES_URL . 'wpshop/cheque.png',
-                        'description' => __('Pay your order on delivery', 'wpshop'));
-
-                    update_option('wps_payment_mode', $payment_modes_option);
-                }
-
-                // Mass action on products to add a flag on variation definition
-                $products = get_posts(array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
-                if (!empty($products)) {
-                    foreach ($products as $p) {
-                        $post_id = $p->ID;
-                        $check_product_have_variations = wpshop_products::get_variation($post_id);
-                        if (!empty($check_product_have_variations)) {
-                            $variation_flag = wpshop_products::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);
-                        }
-                    }
-                }
-                return true;
-                break;
-
-            case '54':
-                // Change shortcode of sign up page
-                $signup_page_id = get_option('wpshop_signup_page_id');
-                if (!empty($signup_page_id)) {
-                    $signup_page = get_post($signup_page_id);
-                    $signup_page_content = (!empty($signup_page) && !empty($signup_page->post_content)) ? str_replace('[wpshop_signup]', '[wps_account_dashboard]', $signup_page->post_content) : '[wps_account_dashboard]';
-                    wp_update_post(array('ID' => $signup_page_id, 'post_content' => $signup_page_content));
-                }
-
-                // Change Terms of sale default content
-                $terms_page_id = get_option('wpshop_terms_of_sale_page_id');
-                if (!empty($terms_page_id)) {
-                    $terms_sale_page = get_post($terms_page_id);
-                    if (!empty($terms_sale_page) && !empty($terms_sale_page->post_content) && $terms_sale_page->post_content == '[wpshop_terms_of_sale]') {
-                        $data = '<h1>' . __('Your terms of sale', 'wpshop') . '</h1>';
-                        $data .= '<h3>' . __('Rule', 'wpshop') . ' 1</h3>';
-                        $data .= '<p>Ut enim quisque sibi plurimum confidit et ut quisque maxime virtute et sapientia sic munitus est, ut nullo egeat suaque omnia in se ipso posita iudicet, ita in amicitiis expetendis colendisque maxime excellit.</p>';
-                        $data .= '<h3>' . __('Rule', 'wpshop') . ' 2</h3>';
-                        $data .= '<p>Ut enim quisque sibi plurimum confidit et ut quisque maxime virtute et sapientia sic munitus est, ut nullo egeat suaque omnia in se ipso posita iudicet, ita in amicitiis expetendis colendisque maxime excellit.</p>';
-                        $data .= '<h3>' . __('Rule', 'wpshop') . ' 3</h3>';
-                        $data .= '<p>Ut enim quisque sibi plurimum confidit et ut quisque maxime virtute et sapientia sic munitus est, ut nullo egeat suaque omnia in se ipso posita iudicet, ita in amicitiis expetendis colendisque maxime excellit.</p>';
-                        $data .= '<h3>' . __('Credits', 'wpshop') . '</h3>';
-                        $data .= sprintf(__('%s uses <a href="http://www.wpshop.fr/" target="_blank" title="%s uses WPShop e-commerce plug-in for Wordpress">WPShop e-commerce for Wordpress</a>', 'wpshop'), get_bloginfo('name'), get_bloginfo('name'));
-                        wp_update_post(array('ID' => $terms_page_id, 'post_content' => $data));
-                    }
-                }
-
-                return true;
-                break;
-
-            case '55':
-                $checkout_page_id = get_option('wpshop_checkout_page_id');
-                $checkout_page = get_post($checkout_page_id);
-                $checkout_page_content = (!empty($checkout_page) && !empty($checkout_page->post_content)) ? str_replace('[wpshop_checkout]', '[wps_checkout]', $checkout_page->post_content) : '[wps_checkout]';
-                wp_update_post(array('ID' => $checkout_page_id, 'post_content' => $checkout_page_content));
-
-                // Update cart page id
-                update_option('wpshop_cart_page_id', $checkout_page_id);
-                return true;
-                break;
-
-            case '56':
-                $wps_entities = new wpshop_entities();
-                $customer_entity_id = $wps_entities->get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
-                $query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d ORDER BY id LIMIT 1', $customer_entity_id);
-                $set = $wpdb->get_row($query);
-                if (!empty($set)) {
-                    $wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET,
-                        array('default_set' => 'yes'),
-                        array('id' => $set->id));
-                }
-                // Update Opinions activation option
-                update_option('wps_opinion', array('active' => 'on'));
-                return true;
-                break;
-
-            case '57':
-                $wpshop_cart_option = get_option('wpshop_cart_option');
-                $wpshop_cart_option['display_newsletter']['site_subscription'][] = 'yes';
-                $wpshop_cart_option['display_newsletter']['partner_subscription'][] = 'yes';
-
-                update_option('wpshop_cart_option', $wpshop_cart_option);
-                return true;
-                break;
-
-            case '58':
-                /** Turn customers publish into draft **/
-                $query = $wpdb->prepare("UPDATE {$wpdb->posts} SET post_status = %s WHERE post_type = %s", "draft", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
-                $wpdb->query($query);
-
-                $attribute_def = wpshop_attributes::getElement('tx_tva', "'valid'", 'code');
-                /** Check if the 0% VAT Rate is not already created **/
-                $query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d AND value = %s', $attribute_def->id, '0');
-                $exist_vat_rate = $wpdb->get_results($query);
-
-                if (empty($exist_vat_rate)) {
-                    /** Get Max Position **/
-                    $query = $wpdb->prepare('SELECT MAX(position) as max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d', $attribute_def->id);
-                    $max_position = $wpdb->get_var($query);
-
-                    if (!empty($attribute_def) && !empty($attribute_def->id)) {
-                        $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' => $attribute_def->id, 'position' => (int) $max_position + 1, 'value' => '0', 'label' => '0'));
-                    }
-                }
-                return true;
-                break;
-
-            case '59':
-                /** Move old images gallery to the new gallery, and remove old links **/
-                $allowed = get_allowed_mime_types();
-                $args = array(
-                    'posts_per_page' => -1,
-                    'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
-                    'post_status' => array('publish', 'draft', 'trash'),
-                );
-                $posts = get_posts($args);
-                $result = array();
-                foreach ($posts as $post) {
-                    $array = array();
-                    $array['Post'] = $post;
-                    $array['PrincipalThumbnailID'] = get_post_meta($post->ID, '_thumbnail_id', true);
-                    $array['Attachments'] = get_attached_media($allowed, $post->ID);
-                    $array['TrueAttachmentsString'] = get_post_meta($post->ID, '_wps_product_media', true);
-                    if (!empty($array['TrueAttachmentsString'])) {
-                        $TrueAttachments_id = explode(',', $array['TrueAttachmentsString']);
-                    }
-                    $array['OldAttachmentsString'] = '';
-                    foreach ($array['Attachments'] as $attachment) {
-                        $filename = basename(get_attached_file($attachment->ID));
-                        $pos_ext = strrpos($filename, '.');
-                        $filename_no_ext = substr($filename, 0, $pos_ext);
-                        if ((empty($TrueAttachments_id) || !in_array($attachment->ID, $TrueAttachments_id)) && !(preg_match('#' . $filename_no_ext . '#', $post->post_content)) && ((empty($array['PrincipalThumbnailID']) || $attachment->ID != $array['PrincipalThumbnailID']))) {
-                            $array['OldAttachmentsString'] .= $attachment->ID . ',';
-                        }
-                    }
-                    unset($TrueAttachments_id);
-                    $result[$post->ID] = $array['TrueAttachmentsString'] . $array['OldAttachmentsString'];
-                    update_post_meta($post->ID, '_wps_product_media', $result[$post->ID]);
-                }
-                return true;
-                break;
-
-            case '60':
-                /* Create default emails */
-                wps_message_ctr::create_default_message();
-
-                /** Update entries for quick add */
-                $query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_required = "yes", is_used_in_quick_add_form = "yes" WHERE code = "barcode"');
-                $query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "product_stock"');
-                $query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "manage_stock"');
-                switch (WPSHOP_PRODUCT_PRICE_PILOT) {
-                    case 'HT':
-                        $query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes", is_used_in_variation = "yes" WHERE code = "price_ht"');
-                        $query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "no" WHERE code = "tx_tva"');
-                        $query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "no", is_used_in_variation = "no" WHERE code = "product_price"');
-                        break;
-                    default:
-                        $query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes", is_used_in_variation = "yes" WHERE code = "product_price"');
-                        $query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "tx_tva"');
-                        $query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "no", is_used_in_variation = "no" WHERE code = "price_ht"');
-                        break;
-                }
-
-                /* Default country with WP language */
-                $wpshop_country_default_choice_option = get_option('wpshop_country_default_choice');
-                if (empty($wpshop_country_default_choice_option)) {
-                    update_option('wpshop_country_default_choice', substr(get_bloginfo('language'), 3));
-                }
-                return true;
-                break;
-
-            case '61':
-                /** Import the xml for guided tour */
-                wpsBubble_ctr::import_xml();
-
-                /* Hide admin bar */
-                $wpshop_display_option = get_option('wpshop_display_option');
-                if (!empty($wpshop_display_option) && empty($wpshop_display_option['wpshop_hide_admin_bar'])) {
-                    $wpshop_display_option['wpshop_hide_admin_bar'] = 'on';
-                    update_option('wpshop_display_option', $wpshop_display_option);
-                }
-
-                return true;
-                break;
-
-            case '62':
-                /** Install user default for POS */
-                wps_pos_addon::action_to_do_on_activation();
-
-                return true;
-                break;
-
-            case '63':
-                $data = get_option('wps_shipping_mode');
-                if (empty($data['modes']['default_shipping_mode_for_pos'])) {
-                    $data['modes']['default_shipping_mode_for_pos']['name'] = __('No Delivery', 'wpshop');
-                    $data['modes']['default_shipping_mode_for_pos']['explanation'] = __('Delivery method for point of sale.', 'wpshop');
-                    update_option('wps_shipping_mode', $data);
-                }
-                return true;
-                break;
-
-            case '64':
-                $options = get_option('wpshop_catalog_product_option');
-                if (!empty($options['wpshop_catalog_product_slug_with_category'])) {
-                    unset($options['wpshop_catalog_product_slug_with_category']);
-                    update_option('wpshop_catalog_product_option', $options);
-                }
-                return true;
-                break;
-
-            case '65':
-                $entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
-                $query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s AND entity_id = %d', 'company_customer', $entity_id);
-                $company_id = $wpdb->get_var($query);
-                if (!isset($company_id)) {
-                    $wpdb->insert(WPSHOP_DBT_ATTRIBUTE, array(
-                        'is_visible_in_front' => 'no',
-                        'is_visible_in_front_listing' => 'yes',
-                        'is_global' => 'no',
-                        'is_user_defined' => 'no',
-                        'is_required' => 'no',
-                        'is_visible_in_advanced_search' => 'no',
-                        'is_searchable' => 'no',
-                        'is_filterable' => 'no',
-                        'is_comparable' => 'no',
-                        'is_html_allowed_on_front' => 'no',
-                        'is_unique' => 'no',
-                        'is_filterable_in_search' => 'no',
-                        'is_used_for_sort_by' => 'no',
-                        'is_configurable' => 'no',
-                        'is_requiring_unit' => 'no',
-                        'is_recordable_in_cart_meta' => 'no',
-                        'is_used_in_admin_listing_column' => 'no',
-                        'is_used_in_quick_add_form' => 'no',
-                        'is_used_for_variation' => 'no',
-                        'is_used_in_variation' => 'no',
-                        '_display_informations_about_value' => 'no',
-                        '_need_verification' => 'no',
-                        '_unit_group_id' => null,
-                        '_default_unit' => null,
-                        'is_historisable' => 'yes',
-                        'is_intrinsic' => 'no',
-                        'data_type_to_use' => 'custom',
-                        'use_ajax_for_filling_field' => 'no',
-                        'data_type' => 'varchar',
-                        'backend_table' => null,
-                        'backend_label' => 'Company',
-                        'backend_input' => 'text',
-                        'frontend_label' => 'Company',
-                        'frontend_input' => 'text',
-                        'frontend_verification' => null,
-                        'code' => 'company_customer',
-                        'note' => '',
-                        'default_value' => '',
-                        'frontend_css_class' => 'company_customer',
-                        'backend_css_class' => null,
-                        'frontend_help_message' => null,
-                        'entity_id' => $entity_id,
-                    ));
-                    $company_id = $wpdb->insert_id;
-                }
-
-                $query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s AND entity_id = %d', 'is_provider', $entity_id);
-                $is_provider_id = $wpdb->get_var($query);
-                if (!isset($is_provider_id)) {
-                    $wpdb->insert(WPSHOP_DBT_ATTRIBUTE, array(
-                        'is_visible_in_front' => 'no',
-                        'is_visible_in_front_listing' => 'yes',
-                        'is_global' => 'no',
-                        'is_user_defined' => 'no',
-                        'is_required' => 'yes',
-                        'is_visible_in_advanced_search' => 'no',
-                        'is_searchable' => 'no',
-                        'is_filterable' => 'no',
-                        'is_comparable' => 'no',
-                        'is_html_allowed_on_front' => 'no',
-                        'is_unique' => 'no',
-                        'is_filterable_in_search' => 'no',
-                        'is_used_for_sort_by' => 'no',
-                        'is_configurable' => 'no',
-                        'is_requiring_unit' => 'no',
-                        'is_recordable_in_cart_meta' => 'no',
-                        'is_used_in_admin_listing_column' => 'no',
-                        'is_used_in_quick_add_form' => 'no',
-                        'is_used_for_variation' => 'no',
-                        'is_used_in_variation' => 'no',
-                        '_display_informations_about_value' => 'no',
-                        '_need_verification' => 'no',
-                        '_unit_group_id' => null,
-                        '_default_unit' => null,
-                        'is_historisable' => 'yes',
-                        'is_intrinsic' => 'no',
-                        'data_type_to_use' => 'custom',
-                        'use_ajax_for_filling_field' => 'no',
-                        'data_type' => 'integer',
-                        'backend_table' => null,
-                        'backend_label' => 'Provider',
-                        'backend_input' => 'select',
-                        'frontend_label' => 'Provider',
-                        'frontend_input' => 'select',
-                        'frontend_verification' => null,
-                        'code' => 'is_provider',
-                        'note' => '',
-                        'default_value' => 'no',
-                        'frontend_css_class' => 'is_provider',
-                        'backend_css_class' => null,
-                        'frontend_help_message' => null,
-                        'entity_id' => $entity_id,
-                    ));
-                    $is_provider_id = $wpdb->insert_id;
-                    $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
-                        'status' => 'valid',
-                        'attribute_id' => $is_provider_id,
-                        'creation_date_value' => current_time('mysql'),
-                        'value' => 'yes',
-                        'label' => 'Yes',
-                    ));
-                    $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
-                        'status' => 'valid',
-                        'attribute_id' => $is_provider_id,
-                        'creation_date_value' => current_time('mysql'),
-                        'value' => 'no',
-                        'label' => 'No',
-                    ));
-                    $default_value = $wpdb->insert_id;
-                    $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('default_value' => $default_value), array('id' => $is_provider_id));
-                }
-
-                $query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %s', $company_id);
-                $company_section_detail_id = $wpdb->get_var($query);
-
-                $query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %s', $is_provider_id);
-                $is_provider_section_detail_id = $wpdb->get_var($query);
-
-                if (!isset($is_provider_section_detail_id) || !isset($company_section_detail_id)) {
-                    $query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
-                    $attribute_set_id = $wpdb->get_var($query);
-
-                    $query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id = %d AND code = LOWER(%s)", $attribute_set_id, 'account');
-                    $attribute_set_section_id = $wpdb->get_var($query);
-
-                    $query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', $entity_id, $attribute_set_id, $attribute_set_section_id);
-                    $attributes_set_details = $wpdb->get_results($query);
-                    $set_details_id_postion_order = array();
-                    foreach ($attributes_set_details as $attribute_set_detail) {
-                        $query = $wpdb->prepare('SELECT code FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE id = %d', $attribute_set_detail->attribute_id);
-                        $attribute_set_detail_code = $wpdb->get_var($query);
-                        if ($attribute_set_detail_code == 'last_name') {
-                            $set_details_id_postion_order[1] = $attribute_set_detail->attribute_id;
-                        }
-                        if ($attribute_set_detail_code == 'first_name') {
-                            $set_details_id_postion_order[2] = $attribute_set_detail->attribute_id;
-                        }
-                        if ($attribute_set_detail_code == 'user_email') {
-                            $set_details_id_postion_order[3] = $attribute_set_detail->attribute_id;
-                        }
-                        if ($attribute_set_detail_code == 'user_pass') {
-                            $set_details_id_postion_order[4] = $attribute_set_detail->attribute_id;
-                        }
-                    }
-                    $max_position = count($set_details_id_postion_order);
+				return true;
+				break;
 
-                    if (!isset($company_section_detail_id)) {
-                        $max_position = $max_position + 1;
-                        $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $company_id, 'position' => (int) $max_position));
-                        $set_details_id_postion_order[$max_position] = $company_id;
-                        $company_section_detail_id = $wpdb->insert_id;
-                    }
+			case '45':
+				$shipping_mode_ctr = new wps_shipping_mode_ctr();
+				$shipping_mode_ctr->migrate_default_shipping_mode();
+				return true;
+				break;
 
-                    if (!isset($is_provider_section_detail_id)) {
-                        $max_position = $max_position + 1;
-                        $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $is_provider_id, 'position' => (int) $max_position));
-                        $set_details_id_postion_order[$max_position] = $is_provider_id;
-                        $is_provider_section_detail_id = $wpdb->insert_id;
-                    }
+			case '46':
+				wps_message_ctr::createMessage('WPSHOP_FORGOT_PASSWORD_MESSAGE');
+				wps_message_ctr::customize_message(WPSHOP_FORGOT_PASSWORD_MESSAGE);
+				return true;
+				break;
 
-                    foreach ($set_details_id_postion_order as $pos => $attr_id) {
-                        $wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('position' => $pos), array('attribute_id' => $attr_id, 'attribute_set_id' => $attribute_set_id, 'entity_type_id' => $entity_id, 'attribute_group_id' => $attribute_set_section_id), array('%d'), array('%d', '%d', '%d', '%d'));
-                    }
-                }
-
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET, array('name' => __('Free product', 'wpshop'), 'slug' => 'free_product'), array('name' => 'free_product'), array('%s', '%s'), array('%s'));
-
-                return true;
-                break;
-
-            case 66:
-                $price_behaviour_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-                $wpdb->insert(WPSHOP_DBT_ATTRIBUTE, array(
-                    'is_visible_in_front' => 'no',
-                    'is_visible_in_front_listing' => 'yes',
-                    'is_global' => 'no',
-                    'is_user_defined' => 'no',
-                    'is_required' => 'no',
-                    'is_visible_in_advanced_search' => 'no',
-                    'is_searchable' => 'no',
-                    'is_filterable' => 'no',
-                    'is_comparable' => 'no',
-                    'is_html_allowed_on_front' => 'no',
-                    'is_unique' => 'no',
-                    'is_filterable_in_search' => 'no',
-                    'is_used_for_sort_by' => 'no',
-                    'is_configurable' => 'no',
-                    'is_requiring_unit' => 'no',
-                    'is_recordable_in_cart_meta' => 'no',
-                    'is_used_in_admin_listing_column' => 'no',
-                    'is_used_in_quick_add_form' => 'no',
-                    'is_used_for_variation' => 'no',
-                    'is_used_in_variation' => 'yes',
-                    '_display_informations_about_value' => 'no',
-                    '_need_verification' => 'no',
-                    '_unit_group_id' => null,
-                    '_default_unit' => null,
-                    'is_historisable' => 'yes',
-                    'is_intrinsic' => 'no',
-                    'data_type_to_use' => 'custom',
-                    'use_ajax_for_filling_field' => 'no',
-                    'data_type' => 'integer',
-                    'backend_table' => null,
-                    'backend_label' => null,
-                    'backend_input' => 'select',
-                    'frontend_label' => 'price_behaviour',
-                    'frontend_input' => 'select',
-                    'frontend_verification' => null,
-                    'code' => 'price_behaviour',
-                    'note' => '',
-                    'default_value' => '',
-                    'frontend_css_class' => 'price_behaviour',
-                    'backend_css_class' => null,
-                    'frontend_help_message' => null,
-                    'entity_id' => $price_behaviour_entity_id,
-                ));
-                $price_behaviour = $wpdb->insert_id;
-                $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
-                    'status' => 'valid',
-                    'attribute_id' => $price_behaviour,
-                    'creation_date' => current_time('mysql'),
-                    'value' => '+',
-                    'label' => '+',
-                ));
-                $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
-                    'status' => 'valid',
-                    'attribute_id' => $price_behaviour,
-                    'creation_date' => current_time('mysql'),
-                    'value' => '=',
-                    'label' => '=',
-                ));
-                $query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d AND ( name = %s OR slug = %s )', $price_behaviour_entity_id, 'default', 'default');
-                $price_behaviour_section_id = $wpdb->get_var($query);
-                $query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d AND code = %s', $price_behaviour_section_id, 'prices');
-                $price_behaviour_section_detail_id = $wpdb->get_var($query);
-                $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array(
-                    'status' => 'deleted',
-                    'creation_date' => current_time('mysql', 0),
-                    'entity_type_id' => $price_behaviour_entity_id,
-                    'attribute_set_id' => $price_behaviour_section_id,
-                    'attribute_group_id' => $price_behaviour_section_detail_id,
-                    'attribute_id' => $price_behaviour,
-                    'position' => 0,
-                ));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => 'is_downloadable_'));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => 'tva'));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => 'price_ht'));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => 'product_stock'));
-                $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => 'product_weight'));
-                return true;
-                break;
-
-            case 67:
-                $admin_new_version_message = get_option('WPSHOP_NEW_VERSION_ADMIN_MESSAGE');
-                if (empty($admin_new_version_message)) {
-                    wps_message_ctr::createMessage('WPSHOP_NEW_VERSION_ADMIN_MESSAGE');
-                }
-                $wpshop_cart_option = get_option('wpshop_cart_option');
-                if (!empty($wpshop_cart_option) && !empty($wpshop_cart_option['total_nb_of_item_allowed'])) {
-                    $wpshop_cart_option['total_nb_of_item_allowed'][0] = (int) filter_var($wpshop_cart_option['total_nb_of_item_allowed'][0], FILTER_VALIDATE_BOOLEAN);
-                }
-                update_option('wpshop_cart_option', $wpshop_cart_option);
-                return true;
-                break;
+			case '47':
+				wps_payment_mode::migrate_payment_modes();
+				return true;
+				break;
+
+			case '48':
+				@ini_set('max_execution_time', '500');
+
+				$count_products = wp_count_posts(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+				$output_type_option = get_option('wpshop_display_option');
+				$output_type = $output_type_option['wpshop_display_list_type'];
+
+				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) {
+							$p = wpshop_products::get_product_data($product->ID);
+							$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', $output_type));
+							update_post_meta($product->ID, '_wps_price_infos', $price);
+						}
+					}
+				}
+
+				return true;
+				break;
+
+			case '49':
+				update_option('wpshop_send_invoice', true);
+				return true;
+				break;
+
+			case '50':
+				$price_display_option = get_option('wpshop_catalog_product_option');
+				$price_display_option['price_display']['text_from'] = 'on';
+				$price_display_option['price_display']['lower_price'] = 'on';
+				update_option('wpshop_catalog_product_option', $price_display_option);
+
+				self::wpshop_insert_default_pages();
+
+				return true;
+				break;
+
+			case '51':
+				/**    Insert new message for direct payment link    */
+				$direct_payment_link_message = get_option('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE');
+				if (empty($direct_payment_link_message)) {
+					wps_message_ctr::createMessage('WPSHOP_DIRECT_PAYMENT_LINK_MESSAGE');
+				}
+				return true;
+				break;
+
+			case '52':
+				$account_page_option = get_option('wpshop_myaccount_page_id');
+				if (!empty($account_page_option)) {
+					$page_account = get_post($account_page_option);
+					$page_content = (!empty($page_account) && !empty($page_account->post_content)) ? str_replace('[wpshop_myaccount]', '[wps_account_dashboard]', $page_account->post_content) : '[wps_account_dashboard]';
+					wp_update_post(array('ID' => $account_page_option, 'post_content' => $page_content));
+				}
+				return true;
+				break;
+
+			case '53':
+				$payment_modes_option = get_option('wps_payment_mode');
+				if (!empty($payment_modes_option) && !empty($payment_modes_option['mode'])) {
+					$payment_modes_option['mode']['cash_on_delivery'] = array(
+						'name' => __('Cash on delivery', 'wpshop'),
+						'logo' => WPSHOP_TEMPLATES_URL . 'wpshop/cheque.png',
+						'description' => __('Pay your order on delivery', 'wpshop'));
+
+					update_option('wps_payment_mode', $payment_modes_option);
+				}
+
+				// Mass action on products to add a flag on variation definition
+				$products = get_posts(array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
+				if (!empty($products)) {
+					foreach ($products as $p) {
+						$post_id = $p->ID;
+						$check_product_have_variations = wpshop_products::get_variation($post_id);
+						if (!empty($check_product_have_variations)) {
+							$variation_flag = wpshop_products::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);
+						}
+					}
+				}
+				return true;
+				break;
+
+			case '54':
+				// Change shortcode of sign up page
+				$signup_page_id = get_option('wpshop_signup_page_id');
+				if (!empty($signup_page_id)) {
+					$signup_page = get_post($signup_page_id);
+					$signup_page_content = (!empty($signup_page) && !empty($signup_page->post_content)) ? str_replace('[wpshop_signup]', '[wps_account_dashboard]', $signup_page->post_content) : '[wps_account_dashboard]';
+					wp_update_post(array('ID' => $signup_page_id, 'post_content' => $signup_page_content));
+				}
+
+				// Change Terms of sale default content
+				$terms_page_id = get_option('wpshop_terms_of_sale_page_id');
+				if (!empty($terms_page_id)) {
+					$terms_sale_page = get_post($terms_page_id);
+					if (!empty($terms_sale_page) && !empty($terms_sale_page->post_content) && $terms_sale_page->post_content == '[wpshop_terms_of_sale]') {
+						$data = '<h1>' . __('Your terms of sale', 'wpshop') . '</h1>';
+						$data .= '<h3>' . __('Rule', 'wpshop') . ' 1</h3>';
+						$data .= '<p>Ut enim quisque sibi plurimum confidit et ut quisque maxime virtute et sapientia sic munitus est, ut nullo egeat suaque omnia in se ipso posita iudicet, ita in amicitiis expetendis colendisque maxime excellit.</p>';
+						$data .= '<h3>' . __('Rule', 'wpshop') . ' 2</h3>';
+						$data .= '<p>Ut enim quisque sibi plurimum confidit et ut quisque maxime virtute et sapientia sic munitus est, ut nullo egeat suaque omnia in se ipso posita iudicet, ita in amicitiis expetendis colendisque maxime excellit.</p>';
+						$data .= '<h3>' . __('Rule', 'wpshop') . ' 3</h3>';
+						$data .= '<p>Ut enim quisque sibi plurimum confidit et ut quisque maxime virtute et sapientia sic munitus est, ut nullo egeat suaque omnia in se ipso posita iudicet, ita in amicitiis expetendis colendisque maxime excellit.</p>';
+						$data .= '<h3>' . __('Credits', 'wpshop') . '</h3>';
+						$data .= sprintf(__('%s uses <a href="http://www.wpshop.fr/" target="_blank" title="%s uses WPShop e-commerce plug-in for Wordpress">WPShop e-commerce for Wordpress</a>', 'wpshop'), get_bloginfo('name'), get_bloginfo('name'));
+						wp_update_post(array('ID' => $terms_page_id, 'post_content' => $data));
+					}
+				}
+
+				return true;
+				break;
+
+			case '55':
+				$checkout_page_id = get_option('wpshop_checkout_page_id');
+				$checkout_page = get_post($checkout_page_id);
+				$checkout_page_content = (!empty($checkout_page) && !empty($checkout_page->post_content)) ? str_replace('[wpshop_checkout]', '[wps_checkout]', $checkout_page->post_content) : '[wps_checkout]';
+				wp_update_post(array('ID' => $checkout_page_id, 'post_content' => $checkout_page_content));
+
+				// Update cart page id
+				update_option('wpshop_cart_page_id', $checkout_page_id);
+				return true;
+				break;
+
+			case '56':
+				$wps_entities = new wpshop_entities();
+				$customer_entity_id = $wps_entities->get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d ORDER BY id LIMIT 1', $customer_entity_id);
+				$set = $wpdb->get_row($query);
+				if (!empty($set)) {
+					$wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET,
+						array('default_set' => 'yes'),
+						array('id' => $set->id));
+				}
+				// Update Opinions activation option
+				update_option('wps_opinion', array('active' => 'on'));
+				return true;
+				break;
+
+			case '57':
+				$wpshop_cart_option = get_option('wpshop_cart_option');
+				$wpshop_cart_option['display_newsletter']['site_subscription'][] = 'yes';
+				$wpshop_cart_option['display_newsletter']['partner_subscription'][] = 'yes';
+
+				update_option('wpshop_cart_option', $wpshop_cart_option);
+				return true;
+				break;
+
+			case '58':
+				/** Turn customers publish into draft **/
+				$query = $wpdb->prepare("UPDATE {$wpdb->posts} SET post_status = %s WHERE post_type = %s", "draft", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$wpdb->query($query);
+
+				$attribute_def = wpshop_attributes::getElement('tx_tva', "'valid'", 'code');
+				/** Check if the 0% VAT Rate is not already created **/
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d AND value = %s', $attribute_def->id, '0');
+				$exist_vat_rate = $wpdb->get_results($query);
+
+				if (empty($exist_vat_rate)) {
+					/** Get Max Position **/
+					$query = $wpdb->prepare('SELECT MAX(position) as max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d', $attribute_def->id);
+					$max_position = $wpdb->get_var($query);
+
+					if (!empty($attribute_def) && !empty($attribute_def->id)) {
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'attribute_id' => $attribute_def->id, 'position' => (int) $max_position + 1, 'value' => '0', 'label' => '0'));
+					}
+				}
+				return true;
+				break;
+
+			case '59':
+				/** Move old images gallery to the new gallery, and remove old links **/
+				$allowed = get_allowed_mime_types();
+				$args = array(
+					'posts_per_page' => -1,
+					'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
+					'post_status' => array('publish', 'draft', 'trash'),
+				);
+				$posts = get_posts($args);
+				$result = array();
+				foreach ($posts as $post) {
+					$array = array();
+					$array['Post'] = $post;
+					$array['PrincipalThumbnailID'] = get_post_meta($post->ID, '_thumbnail_id', true);
+					$array['Attachments'] = get_attached_media($allowed, $post->ID);
+					$array['TrueAttachmentsString'] = get_post_meta($post->ID, '_wps_product_media', true);
+					if (!empty($array['TrueAttachmentsString'])) {
+						$TrueAttachments_id = explode(',', $array['TrueAttachmentsString']);
+					}
+					$array['OldAttachmentsString'] = '';
+					foreach ($array['Attachments'] as $attachment) {
+						$filename = basename(get_attached_file($attachment->ID));
+						$pos_ext = strrpos($filename, '.');
+						$filename_no_ext = substr($filename, 0, $pos_ext);
+						if ((empty($TrueAttachments_id) || !in_array($attachment->ID, $TrueAttachments_id)) && !(preg_match('#' . $filename_no_ext . '#', $post->post_content)) && ((empty($array['PrincipalThumbnailID']) || $attachment->ID != $array['PrincipalThumbnailID']))) {
+							$array['OldAttachmentsString'] .= $attachment->ID . ',';
+						}
+					}
+					unset($TrueAttachments_id);
+					$result[$post->ID] = $array['TrueAttachmentsString'] . $array['OldAttachmentsString'];
+					update_post_meta($post->ID, '_wps_product_media', $result[$post->ID]);
+				}
+				return true;
+				break;
+
+			case '60':
+				/* Create default emails */
+				wps_message_ctr::create_default_message();
+
+				/** Update entries for quick add */
+				$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_required = "yes", is_used_in_quick_add_form = "yes" WHERE code = "barcode"');
+				$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "product_stock"');
+				$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "manage_stock"');
+				switch (WPSHOP_PRODUCT_PRICE_PILOT) {
+					case 'HT':
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes", is_used_in_variation = "yes" WHERE code = "price_ht"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "no" WHERE code = "tx_tva"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "no", is_used_in_variation = "no" WHERE code = "product_price"');
+						break;
+					default:
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes", is_used_in_variation = "yes" WHERE code = "product_price"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "yes" WHERE code = "tx_tva"');
+						$query = $wpdb->query('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET is_used_in_quick_add_form = "no", is_used_in_variation = "no" WHERE code = "price_ht"');
+						break;
+				}
+
+				/* Default country with WP language */
+				$wpshop_country_default_choice_option = get_option('wpshop_country_default_choice');
+				if (empty($wpshop_country_default_choice_option)) {
+					update_option('wpshop_country_default_choice', substr(get_bloginfo('language'), 3));
+				}
+				return true;
+				break;
+
+			case '61':
+				/** Import the xml for guided tour */
+				wpsBubble_ctr::import_xml();
+
+				/* Hide admin bar */
+				$wpshop_display_option = get_option('wpshop_display_option');
+				if (!empty($wpshop_display_option) && empty($wpshop_display_option['wpshop_hide_admin_bar'])) {
+					$wpshop_display_option['wpshop_hide_admin_bar'] = 'on';
+					update_option('wpshop_display_option', $wpshop_display_option);
+				}
+
+				return true;
+				break;
+
+			case '62':
+				/** Install user default for POS */
+				wps_pos_addon::action_to_do_on_activation();
+
+				return true;
+				break;
+
+			case '63':
+				$data = get_option('wps_shipping_mode');
+				if (empty($data['modes']['default_shipping_mode_for_pos'])) {
+					$data['modes']['default_shipping_mode_for_pos']['name'] = __('No Delivery', 'wpshop');
+					$data['modes']['default_shipping_mode_for_pos']['explanation'] = __('Delivery method for point of sale.', 'wpshop');
+					update_option('wps_shipping_mode', $data);
+				}
+				return true;
+				break;
+
+			case '64':
+				$options = get_option('wpshop_catalog_product_option');
+				if (!empty($options['wpshop_catalog_product_slug_with_category'])) {
+					unset($options['wpshop_catalog_product_slug_with_category']);
+					update_option('wpshop_catalog_product_option', $options);
+				}
+				return true;
+				break;
+
+			case '65':
+				$entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s AND entity_id = %d', 'company_customer', $entity_id);
+				$company_id = $wpdb->get_var($query);
+				if (!isset($company_id)) {
+					$wpdb->insert(WPSHOP_DBT_ATTRIBUTE, array(
+						'is_visible_in_front' => 'no',
+						'is_visible_in_front_listing' => 'yes',
+						'is_global' => 'no',
+						'is_user_defined' => 'no',
+						'is_required' => 'no',
+						'is_visible_in_advanced_search' => 'no',
+						'is_searchable' => 'no',
+						'is_filterable' => 'no',
+						'is_comparable' => 'no',
+						'is_html_allowed_on_front' => 'no',
+						'is_unique' => 'no',
+						'is_filterable_in_search' => 'no',
+						'is_used_for_sort_by' => 'no',
+						'is_configurable' => 'no',
+						'is_requiring_unit' => 'no',
+						'is_recordable_in_cart_meta' => 'no',
+						'is_used_in_admin_listing_column' => 'no',
+						'is_used_in_quick_add_form' => 'no',
+						'is_used_for_variation' => 'no',
+						'is_used_in_variation' => 'no',
+						'_display_informations_about_value' => 'no',
+						'_need_verification' => 'no',
+						'_unit_group_id' => null,
+						'_default_unit' => null,
+						'is_historisable' => 'yes',
+						'is_intrinsic' => 'no',
+						'data_type_to_use' => 'custom',
+						'use_ajax_for_filling_field' => 'no',
+						'data_type' => 'varchar',
+						'backend_table' => null,
+						'backend_label' => 'Company',
+						'backend_input' => 'text',
+						'frontend_label' => 'Company',
+						'frontend_input' => 'text',
+						'frontend_verification' => null,
+						'code' => 'company_customer',
+						'note' => '',
+						'default_value' => '',
+						'frontend_css_class' => 'company_customer',
+						'backend_css_class' => null,
+						'frontend_help_message' => null,
+						'entity_id' => $entity_id,
+					));
+					$company_id = $wpdb->insert_id;
+				}
+
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s AND entity_id = %d', 'is_provider', $entity_id);
+				$is_provider_id = $wpdb->get_var($query);
+				if (!isset($is_provider_id)) {
+					$wpdb->insert(WPSHOP_DBT_ATTRIBUTE, array(
+						'is_visible_in_front' => 'no',
+						'is_visible_in_front_listing' => 'yes',
+						'is_global' => 'no',
+						'is_user_defined' => 'no',
+						'is_required' => 'yes',
+						'is_visible_in_advanced_search' => 'no',
+						'is_searchable' => 'no',
+						'is_filterable' => 'no',
+						'is_comparable' => 'no',
+						'is_html_allowed_on_front' => 'no',
+						'is_unique' => 'no',
+						'is_filterable_in_search' => 'no',
+						'is_used_for_sort_by' => 'no',
+						'is_configurable' => 'no',
+						'is_requiring_unit' => 'no',
+						'is_recordable_in_cart_meta' => 'no',
+						'is_used_in_admin_listing_column' => 'no',
+						'is_used_in_quick_add_form' => 'no',
+						'is_used_for_variation' => 'no',
+						'is_used_in_variation' => 'no',
+						'_display_informations_about_value' => 'no',
+						'_need_verification' => 'no',
+						'_unit_group_id' => null,
+						'_default_unit' => null,
+						'is_historisable' => 'yes',
+						'is_intrinsic' => 'no',
+						'data_type_to_use' => 'custom',
+						'use_ajax_for_filling_field' => 'no',
+						'data_type' => 'integer',
+						'backend_table' => null,
+						'backend_label' => 'Provider',
+						'backend_input' => 'select',
+						'frontend_label' => 'Provider',
+						'frontend_input' => 'select',
+						'frontend_verification' => null,
+						'code' => 'is_provider',
+						'note' => '',
+						'default_value' => 'no',
+						'frontend_css_class' => 'is_provider',
+						'backend_css_class' => null,
+						'frontend_help_message' => null,
+						'entity_id' => $entity_id,
+					));
+					$is_provider_id = $wpdb->insert_id;
+					$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
+						'status' => 'valid',
+						'attribute_id' => $is_provider_id,
+						'creation_date_value' => current_time('mysql'),
+						'value' => 'yes',
+						'label' => 'Yes',
+					));
+					$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
+						'status' => 'valid',
+						'attribute_id' => $is_provider_id,
+						'creation_date_value' => current_time('mysql'),
+						'value' => 'no',
+						'label' => 'No',
+					));
+					$default_value = $wpdb->insert_id;
+					$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('default_value' => $default_value), array('id' => $is_provider_id));
+				}
+
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %s', $company_id);
+				$company_section_detail_id = $wpdb->get_var($query);
+
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %s', $is_provider_id);
+				$is_provider_section_detail_id = $wpdb->get_var($query);
+
+				if (!isset($is_provider_section_detail_id) || !isset($company_section_detail_id)) {
+					$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
+					$attribute_set_id = $wpdb->get_var($query);
+
+					$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_GROUP . " WHERE attribute_set_id = %d AND code = LOWER(%s)", $attribute_set_id, 'account');
+					$attribute_set_section_id = $wpdb->get_var($query);
+
+					$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', $entity_id, $attribute_set_id, $attribute_set_section_id);
+					$attributes_set_details = $wpdb->get_results($query);
+					$set_details_id_postion_order = array();
+					foreach ($attributes_set_details as $attribute_set_detail) {
+						$query = $wpdb->prepare('SELECT code FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE id = %d', $attribute_set_detail->attribute_id);
+						$attribute_set_detail_code = $wpdb->get_var($query);
+						if ($attribute_set_detail_code == 'last_name') {
+							$set_details_id_postion_order[1] = $attribute_set_detail->attribute_id;
+						}
+						if ($attribute_set_detail_code == 'first_name') {
+							$set_details_id_postion_order[2] = $attribute_set_detail->attribute_id;
+						}
+						if ($attribute_set_detail_code == 'user_email') {
+							$set_details_id_postion_order[3] = $attribute_set_detail->attribute_id;
+						}
+						if ($attribute_set_detail_code == 'user_pass') {
+							$set_details_id_postion_order[4] = $attribute_set_detail->attribute_id;
+						}
+					}
+					$max_position = count($set_details_id_postion_order);
+
+					if (!isset($company_section_detail_id)) {
+						$max_position = $max_position + 1;
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $company_id, 'position' => (int) $max_position));
+						$set_details_id_postion_order[$max_position] = $company_id;
+						$company_section_detail_id = $wpdb->insert_id;
+					}
+
+					if (!isset($is_provider_section_detail_id)) {
+						$max_position = $max_position + 1;
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_id, 'attribute_set_id' => $attribute_set_id, 'attribute_group_id' => $attribute_set_section_id, 'attribute_id' => $is_provider_id, 'position' => (int) $max_position));
+						$set_details_id_postion_order[$max_position] = $is_provider_id;
+						$is_provider_section_detail_id = $wpdb->insert_id;
+					}
+
+					foreach ($set_details_id_postion_order as $pos => $attr_id) {
+						$wpdb->update(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('position' => $pos), array('attribute_id' => $attr_id, 'attribute_set_id' => $attribute_set_id, 'entity_type_id' => $entity_id, 'attribute_group_id' => $attribute_set_section_id), array('%d'), array('%d', '%d', '%d', '%d'));
+					}
+				}
+
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE_SET, array('name' => __('Free product', 'wpshop'), 'slug' => 'free_product'), array('name' => 'free_product'), array('%s', '%s'), array('%s'));
+
+				return true;
+				break;
+
+			case 66:
+				$price_behaviour_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+				$wpdb->insert(WPSHOP_DBT_ATTRIBUTE, array(
+					'is_visible_in_front' => 'no',
+					'is_visible_in_front_listing' => 'yes',
+					'is_global' => 'no',
+					'is_user_defined' => 'no',
+					'is_required' => 'no',
+					'is_visible_in_advanced_search' => 'no',
+					'is_searchable' => 'no',
+					'is_filterable' => 'no',
+					'is_comparable' => 'no',
+					'is_html_allowed_on_front' => 'no',
+					'is_unique' => 'no',
+					'is_filterable_in_search' => 'no',
+					'is_used_for_sort_by' => 'no',
+					'is_configurable' => 'no',
+					'is_requiring_unit' => 'no',
+					'is_recordable_in_cart_meta' => 'no',
+					'is_used_in_admin_listing_column' => 'no',
+					'is_used_in_quick_add_form' => 'no',
+					'is_used_for_variation' => 'no',
+					'is_used_in_variation' => 'yes',
+					'_display_informations_about_value' => 'no',
+					'_need_verification' => 'no',
+					'_unit_group_id' => null,
+					'_default_unit' => null,
+					'is_historisable' => 'yes',
+					'is_intrinsic' => 'no',
+					'data_type_to_use' => 'custom',
+					'use_ajax_for_filling_field' => 'no',
+					'data_type' => 'integer',
+					'backend_table' => null,
+					'backend_label' => null,
+					'backend_input' => 'select',
+					'frontend_label' => 'price_behaviour',
+					'frontend_input' => 'select',
+					'frontend_verification' => null,
+					'code' => 'price_behaviour',
+					'note' => '',
+					'default_value' => '',
+					'frontend_css_class' => 'price_behaviour',
+					'backend_css_class' => null,
+					'frontend_help_message' => null,
+					'entity_id' => $price_behaviour_entity_id,
+				));
+				$price_behaviour = $wpdb->insert_id;
+				$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
+					'status' => 'valid',
+					'attribute_id' => $price_behaviour,
+					'creation_date' => current_time('mysql'),
+					'value' => '+',
+					'label' => '+',
+				));
+				$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array(
+					'status' => 'valid',
+					'attribute_id' => $price_behaviour,
+					'creation_date' => current_time('mysql'),
+					'value' => '=',
+					'label' => '=',
+				));
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d AND ( name = %s OR slug = %s )', $price_behaviour_entity_id, 'default', 'default');
+				$price_behaviour_section_id = $wpdb->get_var($query);
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d AND code = %s', $price_behaviour_section_id, 'prices');
+				$price_behaviour_section_detail_id = $wpdb->get_var($query);
+				$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array(
+					'status' => 'deleted',
+					'creation_date' => current_time('mysql', 0),
+					'entity_type_id' => $price_behaviour_entity_id,
+					'attribute_set_id' => $price_behaviour_section_id,
+					'attribute_group_id' => $price_behaviour_section_detail_id,
+					'attribute_id' => $price_behaviour,
+					'position' => 0,
+				));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => 'is_downloadable_'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => 'tva'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => 'price_ht'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => 'product_stock'));
+				$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_variation' => 'yes', 'last_update_date' => current_time('mysql', 0)), array('code' => 'product_weight'));
+				return true;
+				break;
+
+			case 67:
+				$admin_new_version_message = get_option('WPSHOP_NEW_VERSION_ADMIN_MESSAGE');
+				if (empty($admin_new_version_message)) {
+					wps_message_ctr::createMessage('WPSHOP_NEW_VERSION_ADMIN_MESSAGE');
+				}
+				$wpshop_cart_option = get_option('wpshop_cart_option');
+				if (!empty($wpshop_cart_option) && !empty($wpshop_cart_option['total_nb_of_item_allowed'])) {
+					$wpshop_cart_option['total_nb_of_item_allowed'][0] = (int) filter_var($wpshop_cart_option['total_nb_of_item_allowed'][0], FILTER_VALIDATE_BOOLEAN);
+				}
+				update_option('wpshop_cart_option', $wpshop_cart_option);
+				return true;
+				break;
 
 			case 68:
 				wps_message_ctr::create_default_message();

includes/modules/wps_customer/controller/wps-customer-metaboxes.controller.01.php

Spacing +31 added lines, -31 removed lines

@@ -7,7 +7,7 @@ 
  * @package WPShop
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,8 +23,8 @@ 
 	 * Instanciation de la gestion des metaboxes / Insctanciate metaboxes management
 	 */
 	function __construct() {
-		add_action( 'add_meta_boxes_' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, array( $this, 'add_meta_box_customer' ) );
-		add_action( 'add_meta_boxes_' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER, array( $this, 'add_meta_box_order' ) );
+		add_action('add_meta_boxes_' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, array($this, 'add_meta_box_customer'));
+		add_action('add_meta_boxes_' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER, array($this, 'add_meta_box_order'));
 	}
 
 	/**
@@ -32,13 +32,13 @@ 
 	 *
 	 * @param WP_Post $customer Le client actuel / The current customer.
 	 */
-	function add_meta_box_customer( $customer ) {
-		add_meta_box( 'wps_customer_informations', __( 'Customer\'s account informations', 'wpshop' ), array( $this, 'wps_customer_account_informations' ), WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'normal', 'high' );
-		if ( 'auto-draft' !== $customer->post_status ) {
-			add_meta_box( 'wps_customer_orders', __( 'Customer\'s orders', 'wpshop' ) . '<a class="page-title-action" href="' . admin_url( 'post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER ) . '&customer_id=' . $customer->ID . '">' . __( 'Add quotation', 'wpshop' ) . '</a>', array( $this, 'wps_customer_orders_list' ), WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'normal', 'low' );
-			add_meta_box( 'wps_customer_messages_list', __( 'Customer\'s send messages', 'wpshop' ), array( $this, 'wps_customer_messages_list' ), WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'side', 'low' );
-			add_meta_box( 'wps_customer_coupons_list', __( 'Customer\'s coupons list', 'wpshop' ), array( $this, 'wps_customer_coupons_list' ), WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'side', 'low' );
-			add_meta_box( 'wps_customer_addresses_list', __( 'Customer\'s addresses', 'wpshop' ), array( $this, 'wps_customer_addresses_list' ), WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'normal', 'low' );
+	function add_meta_box_customer($customer) {
+		add_meta_box('wps_customer_informations', __('Customer\'s account informations', 'wpshop'), array($this, 'wps_customer_account_informations'), WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'normal', 'high');
+		if ('auto-draft' !== $customer->post_status) {
+			add_meta_box('wps_customer_orders', __('Customer\'s orders', 'wpshop') . '<a class="page-title-action" href="' . admin_url('post-new.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER) . '&customer_id=' . $customer->ID . '">' . __('Add quotation', 'wpshop') . '</a>', array($this, 'wps_customer_orders_list'), WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'normal', 'low');
+			add_meta_box('wps_customer_messages_list', __('Customer\'s send messages', 'wpshop'), array($this, 'wps_customer_messages_list'), WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'side', 'low');
+			add_meta_box('wps_customer_coupons_list', __('Customer\'s coupons list', 'wpshop'), array($this, 'wps_customer_coupons_list'), WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'side', 'low');
+			add_meta_box('wps_customer_addresses_list', __('Customer\'s addresses', 'wpshop'), array($this, 'wps_customer_addresses_list'), WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'normal', 'low');
 		}
 	}
 
@@ -47,14 +47,14 @@ 
 	 *
 	 * @param WP_Post $order La commande sur laquelle on se trouve / Currently edited order.
 	 */
-	function add_meta_box_order( $order ) {
+	function add_meta_box_order($order) {
 		/**	Box with order customer information	*/
 		$metabox_title_button = '';
-		$order_metadata = get_post_meta( $order->ID, '_order_postmeta', true );
-		if ( empty( $order_metadata ) || ( ! empty( $order_metadata['order_status'] ) && ( 'awaiting_payment' === $order_metadata['order_status'] ) ) ) {
-			$metabox_title_button = '<a href="' . wp_nonce_url( admin_url( 'admin-ajax.php?action=wps_load_customer_creation_form_in_admin&width=730&height=690' ), 'wps_load_customer_creation_form_in_admin', '_wpnonce' ) . '" title="' . __( 'Create a customer', 'wpshop' ) . '" class="page-title-action thickbox" >' . __( 'Create a customer', 'wpshop' ) . '</a>';
+		$order_metadata = get_post_meta($order->ID, '_order_postmeta', true);
+		if (empty($order_metadata) || (!empty($order_metadata['order_status']) && ('awaiting_payment' === $order_metadata['order_status']))) {
+			$metabox_title_button = '<a href="' . wp_nonce_url(admin_url('admin-ajax.php?action=wps_load_customer_creation_form_in_admin&width=730&height=690'), 'wps_load_customer_creation_form_in_admin', '_wpnonce') . '" title="' . __('Create a customer', 'wpshop') . '" class="page-title-action thickbox" >' . __('Create a customer', 'wpshop') . '</a>';
 		}
-		add_meta_box( 'wpshop_order_customer_information_box', '<span class="dashicons dashicons-businessman"></span> ' . __( 'Customer information', 'wpshop' ) . $metabox_title_button, array( $this, 'display_order_customer_informations_in_administration' ), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'normal', 'high' );
+		add_meta_box('wpshop_order_customer_information_box', '<span class="dashicons dashicons-businessman"></span> ' . __('Customer information', 'wpshop') . $metabox_title_button, array($this, 'display_order_customer_informations_in_administration'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'normal', 'high');
 	}
 
 	/**
@@ -62,10 +62,10 @@ 
 	 *
 	 * @param WP_Post $post Current post (customer) we are editing.
 	 */
-	function wps_customer_orders_list( $post ) {
+	function wps_customer_orders_list($post) {
 		$output = '';
 		$wps_orders = new wps_orders_ctr();
-		$output .= $wps_orders->display_orders_in_account( $post->ID );
+		$output .= $wps_orders->display_orders_in_account($post->ID);
 
 		echo $output; // WPCS: XSS ok.
 	}
@@ -75,11 +75,11 @@ 
 	 *
 	 * @param WP_Post $post Current post (customer) we are editing.
 	 */
-	function wps_customer_addresses_list( $post ) {
+	function wps_customer_addresses_list($post) {
 		$wps_addresses = new wps_address();
-		$output = $wps_addresses->display_addresses_interface( $post->ID, true );
-		echo '<input type="hidden" name="wps_customer_id" id="wps_orders_selected_customer" value="' . esc_attr( $post->ID ) . '">';
-		echo '<input type="hidden" name="wps_customer_addresses_nonce" id="wps_customer_addresses_nonce" value="' . esc_attr( wp_create_nonce( 'reload_addresses_for_customer' ) ) . '">';
+		$output = $wps_addresses->display_addresses_interface($post->ID, true);
+		echo '<input type="hidden" name="wps_customer_id" id="wps_orders_selected_customer" value="' . esc_attr($post->ID) . '">';
+		echo '<input type="hidden" name="wps_customer_addresses_nonce" id="wps_customer_addresses_nonce" value="' . esc_attr(wp_create_nonce('reload_addresses_for_customer')) . '">';
 		echo '<div id="wps_customer_addresses" class="wps-gridwrapper2-padded">' . $output . '</div>'; // WPCS: XSS ok.
 	}
 
@@ -88,9 +88,9 @@ 
 	 *
 	 * @param WP_Post $post Current post (customer) we are editing.
 	 */
-	function wps_customer_messages_list( $post ) {
+	function wps_customer_messages_list($post) {
 		$wps_messages = new wps_message_ctr();
-		$output = $wps_messages->display_message_histo_per_customer( array(), $post->ID );
+		$output = $wps_messages->display_message_histo_per_customer(array(), $post->ID);
 
 		echo $output; // WPCS: XSS ok.
 	}
@@ -100,9 +100,9 @@ 
 	 *
 	 * @param WP_Post $post Current post (customer) we are editing.
 	 */
-	function wps_customer_coupons_list( $post ) {
+	function wps_customer_coupons_list($post) {
 		$wps_vouncher = new wps_coupon_ctr();
-		$output = $wps_vouncher->display_coupons( $post->post_author );
+		$output = $wps_vouncher->display_coupons($post->post_author);
 
 		echo $output; // WPCS: XSS ok.
 	}
@@ -112,9 +112,9 @@ 
 	 *
 	 * @param WP_Post $post Current post (customer) we are editing.
 	 */
-	function wps_customer_account_informations( $post ) {
+	function wps_customer_account_informations($post) {
 		$wps_account = new wps_account_ctr();
-		$output = $wps_account->display_account_informations( $post->ID );
+		$output = $wps_account->display_account_informations($post->ID);
 
 		echo $output; // WPCS: XSS ok.
 	}
@@ -124,14 +124,14 @@ 
 	 *
 	 * @param WP_Post $post L'objet WP_Post correspond à la commande / The WP_Post object corresponding to the order.
 	 */
-	function display_order_customer_informations_in_administration( $post ) {
+	function display_order_customer_informations_in_administration($post) {
 		// N'afficher la metabox uniquement dans les commandes / Only display metabox in orders.
-		if ( ! empty( $post ) && ( WPSHOP_NEWTYPE_IDENTIFIER_ORDER === $post->post_type ) ) {
+		if (!empty($post) && (WPSHOP_NEWTYPE_IDENTIFIER_ORDER === $post->post_type)) {
 			$post_id = $post->ID;
 
-			wps_customer_admin::display_customer_informations_in_order( $post_id, ( ! empty( $_REQUEST['customer_id'] ) ? (int) $_REQUEST['customer_id'] : $post->post_parent ) );
+			wps_customer_admin::display_customer_informations_in_order($post_id, (!empty($_REQUEST['customer_id']) ? (int)$_REQUEST['customer_id'] : $post->post_parent));
 		} else {
-			esc_html_e( 'The requested order has not been found', 'wpshop' );
+			esc_html_e('The requested order has not been found', 'wpshop');
 		}
 	}
 

includes/modules/wps_message/model/wps_message_mdl.php

Spacing +9 added lines, -9 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_message_mdl {
 
 	function __construct() { }
@@ -9,20 +9,20 @@ 
 	 * @param integer $customer_id
 	 * @return array
 	 */
-	function get_messages_histo( $message_id = '', $customer_id = '' ) {
+	function get_messages_histo($message_id = '', $customer_id = '') {
 		global $wpdb;
 		$messages_data = array();
-		if( empty($customer_id) ) {
-			$query = $wpdb->prepare( 'SELECT meta_id, meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s', '_wpshop_messages_histo_' . $message_id . '%' );
+		if (empty($customer_id)) {
+			$query = $wpdb->prepare('SELECT meta_id, meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s', '_wpshop_messages_histo_' . $message_id . '%');
 		} else {
-			$query = $wpdb->prepare( 'SELECT meta_id, meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s AND post_id = %d', '_wpshop_messages_histo_' . $message_id . '%', $customer_id );
+			$query = $wpdb->prepare('SELECT meta_id, meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s AND post_id = %d', '_wpshop_messages_histo_' . $message_id . '%', $customer_id);
 		}
 
-		$messages = $wpdb->get_results( $query );
+		$messages = $wpdb->get_results($query);
 
-		if( !empty($messages) ) {
-			foreach( $messages as $message ) {
-				$messages_data[$message->meta_id] = maybe_unserialize( $message->meta_value );
+		if (!empty($messages)) {
+			foreach ($messages as $message) {
+				$messages_data[$message->meta_id] = maybe_unserialize($message->meta_value);
 			}
 		}
 		return $messages_data;

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_message_mdl {
 
 	function __construct() { }

includes/modules/wps_message/controller/wps_message_ctr.php

Spacing +205 added lines, -205 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined( 'ABSPATH' ) ) { exit;
+<?php if (!defined('ABSPATH')) { exit;
 }
 class wps_message_ctr {
 
@@ -18,19 +18,19 @@ 
 	function __construct() {
 
 		/** Js */
-		add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
+		add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
 		// End if().
 		$this->template_dir = WPS_MESSAGE_PATH . WPS_MESSAGE_DIR . '/templates/';
 		// WP General actions
-		add_action( 'admin_init', array( $this, 'wps_messages_init_actions' ) );
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ) );
-		add_action( 'manage_' . WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE . '_posts_custom_column',  array( $this, 'messages_custom_columns' ) );
-		add_filter( 'manage_edit-' . WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE . '_columns', array( $this, 'messages_edit_columns' ) );
+		add_action('admin_init', array($this, 'wps_messages_init_actions'));
+		add_action('add_meta_boxes', array($this, 'add_meta_boxes'));
+		add_action('manage_' . WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE . '_posts_custom_column', array($this, 'messages_custom_columns'));
+		add_filter('manage_edit-' . WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE . '_columns', array($this, 'messages_edit_columns'));
 		// Shortcodes
-		add_shortcode( 'wps_message_histo', array( $this, 'display_message_histo_per_customer' ) );
-		add_shortcode( 'order_customer_personnal_informations', array( $this, 'order_personnal_informations' ) );
+		add_shortcode('wps_message_histo', array($this, 'display_message_histo_per_customer'));
+		add_shortcode('order_customer_personnal_informations', array($this, 'order_personnal_informations'));
 		/** Ajax */
-		add_action( 'wp_ajax_get_content_message', array( $this, 'get_content_message' ) );
+		add_action('wp_ajax_get_content_message', array($this, 'get_content_message'));
 	}
 
 	/**
@@ -40,10 +40,10 @@ 
 
 		/** Css */
 		add_thickbox();
-		wp_register_style( 'wpeo-message-css', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/css/frontend.css', '', WPS_MESSAGE_VERSION );
-		wp_enqueue_style( 'wpeo-message-css' );
+		wp_register_style('wpeo-message-css', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/css/frontend.css', '', WPS_MESSAGE_VERSION);
+		wp_enqueue_style('wpeo-message-css');
 		/** My js */
-		wp_enqueue_script( 'wps-message-js', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/js/frontend.js', array( 'jquery', 'thickbox' ), WPS_MESSAGE_VERSION );
+		wp_enqueue_script('wps-message-js', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/js/frontend.js', array('jquery', 'thickbox'), WPS_MESSAGE_VERSION);
 	}
 
 	/**
@@ -59,23 +59,23 @@ 
 	 */
 	function create_message_type() {
 
-		register_post_type( WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, array(
+		register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, array(
 			'labels' => array(
-				'name' => __( 'Message', 'wpshop' ),
-				'singular_name' => __( 'message', 'wpshop' ),
-				'add_new' => __( 'Add message', 'wpshop' ),
-				'add_new_item' => __( 'Add New message', 'wpshop' ),
-				'edit' => __( 'Edit', 'wpshop' ),
-				'edit_item' => __( 'Edit message', 'wpshop' ),
-				'new_item' => __( 'New message', 'wpshop' ),
-				'view' => __( 'View message', 'wpshop' ),
-				'view_item' => __( 'View message', 'wpshop' ),
-				'search_items' => __( 'Search messages', 'wpshop' ),
-				'not_found' => __( 'No message found', 'wpshop' ),
-				'not_found_in_trash' => __( 'No message found in trash', 'wpshop' ),
+				'name' => __('Message', 'wpshop'),
+				'singular_name' => __('message', 'wpshop'),
+				'add_new' => __('Add message', 'wpshop'),
+				'add_new_item' => __('Add New message', 'wpshop'),
+				'edit' => __('Edit', 'wpshop'),
+				'edit_item' => __('Edit message', 'wpshop'),
+				'new_item' => __('New message', 'wpshop'),
+				'view' => __('View message', 'wpshop'),
+				'view_item' => __('View message', 'wpshop'),
+				'search_items' => __('Search messages', 'wpshop'),
+				'not_found' => __('No message found', 'wpshop'),
+				'not_found_in_trash' => __('No message found in trash', 'wpshop'),
 				'parent-item-colon' => '',
 			),
-			'description' => __( 'This is where store messages are stored.', 'wpshop' ),
+			'description' => __('This is where store messages are stored.', 'wpshop'),
 			'public' => true,
 			'show_ui' => true,
 			'capability_type' => 'post',
@@ -86,9 +86,9 @@ 
 			'show_in_nav_menus' => false,
 			'rewrite' => false,
 			'query_var' => true,
-			'supports' => array( 'title', 'editor' ),
+			'supports' => array('title', 'editor'),
 			'has_archive' => false,
-		) );
+		));
 	}
 
 	/**
@@ -97,10 +97,10 @@ 
 	function add_meta_boxes() {
 
 		// Add message sending historic meta box
-		add_meta_box( 'wpshop_message_histo',
-			__( 'Message historic', 'wpshop' ),
-			array( $this, 'message_histo_box' ),
-		WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, 'normal', 'high' );
+		add_meta_box('wpshop_message_histo',
+			__('Message historic', 'wpshop'),
+			array($this, 'message_histo_box'),
+		WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, 'normal', 'high');
 	}
 
 	/**
@@ -109,10 +109,10 @@ 
 	 * @param unknown_type $post
 	 * @param unknown_type $params
 	 */
-	function message_histo_box( $post, $params ) {
+	function message_histo_box($post, $params) {
 
 		$output  = '<div id="message_histo_container">';
-		$output .= $this->get_historic_message_by_type( $post->ID );
+		$output .= $this->get_historic_message_by_type($post->ID);
 		$output .= '</div>';
 		echo $output;
 	}
@@ -123,39 +123,39 @@ 
 	 * @param  integer $message_type_id : Message type ID
 	 * @return string
 	 */
-	function get_historic_message_by_type( $message_type_id ) {
+	function get_historic_message_by_type($message_type_id) {
 
 		global $wpdb;
 		$output = '';
-		if ( ! empty( $message_type_id ) ) {
+		if (!empty($message_type_id)) {
 			// Recover all sended messages
 			$wps_message_mdl = new wps_message_mdl();
-			$messages = $wps_message_mdl->get_messages_histo( $message_type_id );
+			$messages = $wps_message_mdl->get_messages_histo($message_type_id);
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'backend', 'message_historic' ) );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'backend', 'message_historic'));
 			$output .= ob_get_contents();
 			ob_end_clean();
 		}
 		return $output;
 	}
 
-	public static function get_xml_messages( $code = null ) {
-		if ( is_null( self::$xml_messages ) ) {
-			$xml_default_emails = file_get_contents( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_emails.xml' );
-			$default_emails = new SimpleXMLElement( $xml_default_emails );
+	public static function get_xml_messages($code = null) {
+		if (is_null(self::$xml_messages)) {
+			$xml_default_emails = file_get_contents(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_emails.xml');
+			$default_emails = new SimpleXMLElement($xml_default_emails);
 			self::$xml_messages = array();
-			foreach ( $default_emails->xpath( '//emails/email' ) as $email ) {
-				self::$xml_messages[ (string) $email->attributes()->code ] = array(
-					'shop_type' => (string) $email->attributes()->shop_type,
-					'object' => (string) $email->subject,
-					'message' => (string) $email->content,
+			foreach ($default_emails->xpath('//emails/email') as $email) {
+				self::$xml_messages[(string)$email->attributes()->code] = array(
+					'shop_type' => (string)$email->attributes()->shop_type,
+					'object' => (string)$email->subject,
+					'message' => (string)$email->content,
 				);
 			}
 		}
-		if ( is_null( $code ) ) {
+		if (is_null($code)) {
 			return self::$xml_messages;
-		} elseif ( isset( self::$xml_messages[ $code ] ) ) {
-			return self::$xml_messages[ $code ];
+		} elseif (isset(self::$xml_messages[$code])) {
+			return self::$xml_messages[$code];
 		} else {
 			return false;
 		}
@@ -165,9 +165,9 @@ 
 	 */
 	public static function create_default_message() {
 		// Read default emails for options creation
-		foreach ( self::get_xml_messages() as $code => $email ) {
-			if ( ( WPSHOP_DEFINED_SHOP_TYPE == $email['shop_type'] ) || ( 'sale' == WPSHOP_DEFINED_SHOP_TYPE ) ) {
-				self::createMessage( $code, $email['object'], $email['message'] );
+		foreach (self::get_xml_messages() as $code => $email) {
+			if ((WPSHOP_DEFINED_SHOP_TYPE == $email['shop_type']) || ('sale' == WPSHOP_DEFINED_SHOP_TYPE)) {
+				self::createMessage($code, $email['object'], $email['message']);
 			}
 		}
 	}
@@ -180,25 +180,25 @@ 
 	 * @param string $message : Message content
 	 * @return integer message ID
 	 */
-	public static function createMessage( $code, $object = '', $message = '' ) {
+	public static function createMessage($code, $object = '', $message = '') {
 		$id = 0;
-		$xml_message = self::get_xml_messages( $code );
-		$object = empty( $object ) ? $xml_message['object'] : $object;
-		$message = empty( $message ) ? $xml_message['message'] : $message;
-		$message_option = get_option( $code, null );
-		if ( empty( $message_option ) || false === get_post_status( $message_option ) ) {
-			$id = post_exists( __( $object , 'wpshop' ), self::customize_message( __( $message, 'wpshop' ) ) );
-			if( $id == 0 ) {
+		$xml_message = self::get_xml_messages($code);
+		$object = empty($object) ? $xml_message['object'] : $object;
+		$message = empty($message) ? $xml_message['message'] : $message;
+		$message_option = get_option($code, null);
+		if (empty($message_option) || false === get_post_status($message_option)) {
+			$id = post_exists(__($object, 'wpshop'), self::customize_message(__($message, 'wpshop')));
+			if ($id == 0) {
 				$new_message = array(
-					'post_title' => __( $object , 'wpshop' ),
-					'post_content' => self::customize_message( __( $message, 'wpshop' ) ),
+					'post_title' => __($object, 'wpshop'),
+					'post_content' => self::customize_message(__($message, 'wpshop')),
 					'post_status' => 'publish',
 					'post_author' => 1,
 					'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE,
 				);
-				$id = wp_insert_post( $new_message );
+				$id = wp_insert_post($new_message);
 			}
-			update_option( $code, $id );
+			update_option($code, $id);
 		} else {
 			$id = $message_option;
 		}
@@ -211,17 +211,17 @@ 
 	 *
 	 * @return array
 	 */
-	function messages_custom_columns( $column ) {
+	function messages_custom_columns($column) {
 
 		global $post;
 		$metadata = get_post_custom();
-		switch ( $column ) {
+		switch ($column) {
 			case 'extract':
-				echo wp_trim_words( $post->post_content, 55 );
+				echo wp_trim_words($post->post_content, 55);
 		break;
 			case 'last_dispatch_date':
-				if ( ! empty( $metadata['wpshop_message_last_dispatch_date'][0] ) ) {
-					echo mysql2date( 'd F Y, H:i:s',$metadata['wpshop_message_last_dispatch_date'][0], true );
+				if (!empty($metadata['wpshop_message_last_dispatch_date'][0])) {
+					echo mysql2date('d F Y, H:i:s', $metadata['wpshop_message_last_dispatch_date'][0], true);
 				} else { echo '-';
 				}
 		break;
@@ -233,14 +233,14 @@ 
 	 *
 	 * @return array
 	 */
-	function messages_edit_columns( $columns ) {
+	function messages_edit_columns($columns) {
 
 		$columns = array(
 			'cb' => '<input type="checkbox" />',
-			'title' => __( 'Name', 'wpshop' ),
-			'extract' => __( 'Extract from the message','wpshop' ),
-			'date' => __( 'Creation date','wpshop' ),
-			'last_dispatch_date' => __( 'Last dispatch date','wpshop' ),
+			'title' => __('Name', 'wpshop'),
+			'extract' => __('Extract from the message', 'wpshop'),
+			'date' => __('Creation date', 'wpshop'),
+			'last_dispatch_date' => __('Last dispatch date', 'wpshop'),
 		);
 		return $columns;
 	}
@@ -251,17 +251,17 @@ 
 	 * @param integer $current
 	 * @return string
 	 */
-	function getMessageListOption( $current = 0 ) {
+	function getMessageListOption($current = 0) {
 
-		$posts = query_posts( array(
+		$posts = query_posts(array(
 			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE,
 			'posts_per_page' => '-1',
-		) );
+		));
 		$options = '';
-		if ( ! empty( $posts ) ) {
-			$options = '<option value="0">' . __( 'Select values from list', 'wpshop' ) . '</option>';
-			foreach ( $posts as $p ) {
-				$selected = $p->ID == $current ? ' selected="selected"': '';
+		if (!empty($posts)) {
+			$options = '<option value="0">' . __('Select values from list', 'wpshop') . '</option>';
+			foreach ($posts as $p) {
+				$selected = $p->ID == $current ? ' selected="selected"' : '';
 				$options .= '<option value="' . $p->ID . '"' . $selected . '>' . $p->post_title . '</option>';
 			}
 		}
@@ -276,33 +276,33 @@ 
 	 * @param integer $customer_id : ID to identifiate the customer
 	 * @return string
 	 */
-	function display_message_histo_per_customer( $args, $customer_id = '' ) {
-		$customer_id = ( ! empty( $customer_id ) ) ? $customer_id : ( isset( $args['cid'] ) && ! empty( $args['cid'] ) ? $args['cid'] : get_current_user_id() );
-		$message_id = ( ! empty( $args ) && ! empty( $args['message_id'] ) ) ? $args['message_id'] : '';
+	function display_message_histo_per_customer($args, $customer_id = '') {
+		$customer_id = (!empty($customer_id)) ? $customer_id : (isset($args['cid']) && !empty($args['cid']) ? $args['cid'] : get_current_user_id());
+		$message_id = (!empty($args) && !empty($args['message_id'])) ? $args['message_id'] : '';
 		$message_elements = '';
 		$wps_message_mdl = new wps_message_mdl();
-		$messages_data = $wps_message_mdl->get_messages_histo( $message_id, $customer_id );
+		$messages_data = $wps_message_mdl->get_messages_histo($message_id, $customer_id);
 
 		$messages_histo = array();
- 		foreach ( $messages_data as $meta_id => $messages ) :
+ 		foreach ($messages_data as $meta_id => $messages) :
  			$i = 0;
- 			foreach ( $messages as $message ) :
-				if ( $current_user->user_email === $message['mess_user_email'] ) :
-	 				$messages_histo[ $message['mess_dispatch_date'][0] ][ $i ]['title'] = $message['mess_title'];
-	 				$messages_histo[ $message['mess_dispatch_date'][0] ][ $i ]['message'] = $message['mess_message'];
-	 				$messages_histo[ $message['mess_dispatch_date'][0] ][ $i ]['dates'] = $message['mess_dispatch_date'];
-	 				if ( ! empty( $message['mess_object_id'] ) ) {
-	 					$messages_histo[ $message['mess_dispatch_date'][0] ][ $i ]['object'] = $message['mess_object_id'];
+ 			foreach ($messages as $message) :
+				if ($current_user->user_email === $message['mess_user_email']) :
+	 				$messages_histo[$message['mess_dispatch_date'][0]][$i]['title'] = $message['mess_title'];
+	 				$messages_histo[$message['mess_dispatch_date'][0]][$i]['message'] = $message['mess_message'];
+	 				$messages_histo[$message['mess_dispatch_date'][0]][$i]['dates'] = $message['mess_dispatch_date'];
+	 				if (!empty($message['mess_object_id'])) {
+	 					$messages_histo[$message['mess_dispatch_date'][0]][$i]['object'] = $message['mess_object_id'];
 	 				}
 	 				$i++;
 				endif;
  			endforeach;
  		endforeach;
 
-		ksort( $messages_histo );
-		$messages_histo = array_reverse( $messages_histo );
+		ksort($messages_histo);
+		$messages_histo = array_reverse($messages_histo);
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'frontend', 'customer', 'messages' ) );
+		require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'frontend', 'customer', 'messages'));
 		$output = ob_get_contents();
 		ob_end_clean();
 
@@ -315,11 +315,11 @@ 
 	 * @param string $message : message content
 	 * @return string
 	 */
-	public static function customize_message( $message ) {
+	public static function customize_message($message) {
 
-		if ( ! empty( $message ) ) {
+		if (!empty($message)) {
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, WPS_MESSAGE_PATH . WPS_MESSAGE_DIR . '/templates/', 'backend', 'message_html_structure' ) );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, WPS_MESSAGE_PATH . WPS_MESSAGE_DIR . '/templates/', 'backend', 'message_html_structure'));
 			$message = ob_get_contents();
 			ob_end_clean();
 		}
@@ -330,15 +330,15 @@ 
 	 *
 	 * @return boolean
 	 */
-	function add_message( $recipient_id = 0, $email, $title, $message, $model_id, $object, $date = null ) {
+	function add_message($recipient_id = 0, $email, $title, $message, $model_id, $object, $date = null) {
 
-		$date = empty( $date ) ? current_time( 'mysql', 0 ) : $date;
+		$date = empty($date) ? current_time('mysql', 0) : $date;
 		$object_empty = array(
 			'object_type' => '',
 			'object_id' => 0,
 		);
-		$object = array_merge( $object_empty, $object );
-		$historic = get_post_meta( $recipient_id, '_wpshop_messages_histo_' . $model_id . '_' . substr( $date, 0, 7 ), true );
+		$object = array_merge($object_empty, $object);
+		$historic = get_post_meta($recipient_id, '_wpshop_messages_histo_' . $model_id . '_' . substr($date, 0, 7), true);
 		$data_to_insert = array(
 			'mess_user_id' => $recipient_id,
 			'mess_user_email' => $email,
@@ -346,10 +346,10 @@ 
 			'mess_object_id' => $object['object_id'],
 			'mess_title' => $title,
 			'mess_message' => $message,
-			'mess_dispatch_date' => array( $date ),
+			'mess_dispatch_date' => array($date),
 		);
 		$historic[] = $data_to_insert;
-		update_post_meta( $recipient_id, '_wpshop_messages_histo_' . $model_id . '_' . substr( $date, 0, 7 ), $historic );
+		update_post_meta($recipient_id, '_wpshop_messages_histo_' . $model_id . '_' . substr($date, 0, 7), $historic);
 	}
 
 	/**
@@ -361,49 +361,49 @@ 
 	 * @param boolean $duplicate_message : Duplicate a light message for historic storage
 	 * @return string
 	 */
-	function customMessage( $string, $data, $model_name = '', $duplicate_message = false ) {
+	function customMessage($string, $data, $model_name = '', $duplicate_message = false) {
 
 		$avant = array();
 		$apres = array();
-		$logo_option = get_option( 'wpshop_logo' );
+		$logo_option = get_option('wpshop_logo');
 
-		$data['your_shop_logo'] = ( ! empty( $logo_option ) ) ? '<img src="' . $logo_option . '" alt="' . get_bloginfo( 'name' ) . '" />' : '';
+		$data['your_shop_logo'] = (!empty($logo_option)) ? '<img src="' . $logo_option . '" alt="' . get_bloginfo('name') . '" />' : '';
 
-		foreach ( $data as $key => $value ) {
+		foreach ($data as $key => $value) {
 			$avant[] = '[' . $key . ']';
-			switch ( $key ) {
+			switch ($key) {
 				case 'order_content' :
-					$apres[] = ( $duplicate_message ) ? '[order_content]' : $this->order_content_template_for_mail( $data['order_id'] );
+					$apres[] = ($duplicate_message) ? '[order_content]' : $this->order_content_template_for_mail($data['order_id']);
 					break;
 				case 'order_addresses' :
-					$apres[] = ( $duplicate_message ) ? '[order_addresses]' : $this->order_addresses_template_for_mail( $data['order_id'] );
+					$apres[] = ($duplicate_message) ? '[order_addresses]' : $this->order_addresses_template_for_mail($data['order_id']);
 					break;
 
 				case 'order_billing_address' :
-					$apres[] = ( $duplicate_message ) ? '[order_billing_address]' : $this->order_addresses_template_for_mail( $data['order_id'], 'billing' );
+					$apres[] = ($duplicate_message) ? '[order_billing_address]' : $this->order_addresses_template_for_mail($data['order_id'], 'billing');
 					break;
 
 				case 'order_shipping_address' :
-					$apres[] = ( $duplicate_message ) ? '[order_shipping_address]' : $this->order_addresses_template_for_mail( $data['order_id'], 'shipping' );
+					$apres[] = ($duplicate_message) ? '[order_shipping_address]' : $this->order_addresses_template_for_mail($data['order_id'], 'shipping');
 					break;
 
 				case 'order_customer_comments' :
-					$apres[] = ( $duplicate_message ) ? '[order_customer_comments]' : $this->order_customer_comment_template_for_mail( $data['order_id'] );
+					$apres[] = ($duplicate_message) ? '[order_customer_comments]' : $this->order_customer_comment_template_for_mail($data['order_id']);
 					break;
 				case 'order_personnal_informations' :
-					$apres[] = ( $duplicate_message ) ? '[order_personnal_informations]' : $this->order_personnal_informations();
+					$apres[] = ($duplicate_message) ? '[order_personnal_informations]' : $this->order_personnal_informations();
 					break;
 				default :
 					$apres[] = $value;
 					break;
 			}
 		}
-		$string = str_replace( $avant, $apres, $string );
+		$string = str_replace($avant, $apres, $string);
 
-		$string = apply_filters( 'wps_more_customized_message', $string, $data, $duplicate_message );
+		$string = apply_filters('wps_more_customized_message', $string, $data, $duplicate_message);
 
-		if ( ($model_name != 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE') ) {
-			$string = preg_replace( '/\[(.*)\]/Usi', '', $string );
+		if (($model_name != 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE')) {
+			$string = preg_replace('/\[(.*)\]/Usi', '', $string);
 		}
 
 		return $string;
@@ -418,22 +418,22 @@ 
 	 * @param string $object : message object
 	 * @param file   $attached_file : File to attached to e-mail
 	 */
-	function wpshop_prepared_email( $email, $model_name, $data = array(), $object = array(), $attached_file = '' ) {
+	function wpshop_prepared_email($email, $model_name, $data = array(), $object = array(), $attached_file = '') {
 		global $wpdb;
-		$data = apply_filters( 'wps_extra_data_to_send_in_email', $data );
-		$model_id = get_option( $model_name, 0 );
-		$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->posts . ' WHERE ID = %s', $model_id );
-		$post_message = $wpdb->get_row( $query );
+		$data = apply_filters('wps_extra_data_to_send_in_email', $data);
+		$model_id = get_option($model_name, 0);
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE ID = %s', $model_id);
+		$post_message = $wpdb->get_row($query);
 		$duplicate_message = '';
-		if ( ! empty( $post_message ) ) {
-			$title = $this->customMessage( $post_message->post_title, $data, $model_name );
-			$message = $this->customMessage( $post_message->post_content, $data, $model_name );
+		if (!empty($post_message)) {
+			$title = $this->customMessage($post_message->post_title, $data, $model_name);
+			$message = $this->customMessage($post_message->post_content, $data, $model_name);
 			// End if().
-			if ( array_key_exists( 'order_content', $data ) || array_key_exists( 'order_addresses', $data ) || array_key_exists( 'order_customer_comments', $data ) ) {
-				$duplicate_message = $this->customMessage( $post_message->post_content, $data, $model_name, true );
+			if (array_key_exists('order_content', $data) || array_key_exists('order_addresses', $data) || array_key_exists('order_customer_comments', $data)) {
+				$duplicate_message = $this->customMessage($post_message->post_content, $data, $model_name, true);
 			}
-			if ( ! empty( $email ) ) {
-				$this->wpshop_email( $email, $title, $message, true, $model_id, $object, $attached_file, $duplicate_message );
+			if (!empty($email)) {
+				$this->wpshop_email($email, $title, $message, true, $model_id, $object, $attached_file, $duplicate_message);
 			}
 		}
 	}
@@ -450,37 +450,37 @@ 
 	 * @param file    $attachments : File to attached to e-mail
 	 * @param string  $duplicate_message : lighter message to store
 	 */
-	function wpshop_email( $email, $title, $message, $save = true, $model_id, $object = array(), $attachments = '', $duplicate_message = '' ) {
+	function wpshop_email($email, $title, $message, $save = true, $model_id, $object = array(), $attachments = '', $duplicate_message = '') {
 		global $wpdb;
 		// Sauvegarde
-		if ( $save ) {
-			$user = $wpdb->get_row( 'SELECT ID FROM ' . $wpdb->users . ' WHERE user_email="' . $email . '";' );
+		if ($save) {
+			$user = $wpdb->get_row('SELECT ID FROM ' . $wpdb->users . ' WHERE user_email="' . $email . '";');
 			$user_id = $user ? $user->ID : get_current_user_id();
-			$query = $wpdb->prepare( 'SELECT ID FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s ', $user_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-			$user_post_id = $wpdb->get_var( $query );
+			$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s ', $user_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+			$user_post_id = $wpdb->get_var($query);
 
-			if ( ! empty( $duplicate_message ) ) {
-				$this->add_message( $user_post_id, $email, $title, $duplicate_message, $model_id, $object );
+			if (!empty($duplicate_message)) {
+				$this->add_message($user_post_id, $email, $title, $duplicate_message, $model_id, $object);
 			} else {
-				$this->add_message( $user_post_id, $email, $title, $message, $model_id, $object );
+				$this->add_message($user_post_id, $email, $title, $message, $model_id, $object);
 			}
 		}
 
-		$emails = get_option( 'wpshop_emails', array() );
+		$emails = get_option('wpshop_emails', array());
 		$noreply_email = $emails['noreply_email'];
 		// Split the email to get the name
-		$vers_nom = substr( $email, 0, strpos( $email,'@' ) );
+		$vers_nom = substr($email, 0, strpos($email, '@'));
 
 		// Headers du mail
 		$headers = "MIME-Version: 1.0\r\n";
 		$headers .= "Content-type: text/html; charset=UTF-8\r\n";
-		$headers .= 'From: ' . get_bloginfo( 'name' ) . ' <' . $noreply_email . '>' . "\r\n";
+		$headers .= 'From: ' . get_bloginfo('name') . ' <' . $noreply_email . '>' . "\r\n";
 
 		// Mail en HTML
-		@wp_mail( $email, $title, $message, $headers, $attachments );
+		@wp_mail($email, $title, $message, $headers, $attachments);
 
-		if ( ! empty( $attachments ) ) {
-			unlink( $attachments );
+		if (!empty($attachments)) {
+			unlink($attachments);
 		}
 	}
 
@@ -490,13 +490,13 @@ 
 	 * @param integer $order_id : Order ID
 	 * @return string
 	 */
-	function order_content_template_for_mail( $order_id ) {
+	function order_content_template_for_mail($order_id) {
 		$message = '';
-		if ( ! empty( $order_id ) ) {
-			$currency_code = wpshop_tools::wpshop_get_currency( false );
-			$orders_infos = get_post_meta( $order_id, '_order_postmeta', true );
+		if (!empty($order_id)) {
+			$currency_code = wpshop_tools::wpshop_get_currency(false);
+			$orders_infos = get_post_meta($order_id, '_order_postmeta', true);
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_content_mail_template' ) );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_content_mail_template'));
 			$message .= ob_get_contents();
 			ob_end_clean();
 		}
@@ -510,44 +510,44 @@ 
 	 * @param integer $address_type : Address type ID
 	 * @return string
 	 */
-	function order_addresses_template_for_mail( $order_id, $address_type = '' ) {
+	function order_addresses_template_for_mail($order_id, $address_type = '') {
 		global $wpdb;
-		$shipping_option = get_option( 'wpshop_shipping_address_choice' );
-		$display_shipping = ( ! empty( $shipping_option ) && ! empty( $shipping_option['activate'] ) ) ? true : false;
+		$shipping_option = get_option('wpshop_shipping_address_choice');
+		$display_shipping = (!empty($shipping_option) && !empty($shipping_option['activate'])) ? true : false;
 		$message = '';
-		if ( ! empty( $order_id ) ) {
-			$order_addresses = get_post_meta( $order_id, '_order_info', true );
-			if ( ! empty( $order_addresses ) ) {
-				foreach ( $order_addresses as $key => $order_address ) {
-					if ( ! empty( $order_address ) && ( empty( $address_type ) || $address_type == $key ) ) {
-
-						if ( $key != 'shipping' || ($key == 'shipping' && $display_shipping) ) {
-							$address_type_title = ( ! empty( $key ) && $key == 'billing' ) ? __( 'Billing address', 'wpshop' ) : __( 'Shipping address', 'wpshop' );
+		if (!empty($order_id)) {
+			$order_addresses = get_post_meta($order_id, '_order_info', true);
+			if (!empty($order_addresses)) {
+				foreach ($order_addresses as $key => $order_address) {
+					if (!empty($order_address) && (empty($address_type) || $address_type == $key)) {
+
+						if ($key != 'shipping' || ($key == 'shipping' && $display_shipping)) {
+							$address_type_title = (!empty($key) && $key == 'billing') ? __('Billing address', 'wpshop') : __('Shipping address', 'wpshop');
 							$civility = '';
-							if ( ! empty( $order_address['address']['civility'] ) ) {
-								$query = $wpdb->prepare( 'SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $order_address['address']['civility'] );
-								$civility = $wpdb->get_var( $query );
+							if (!empty($order_address['address']['civility'])) {
+								$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $order_address['address']['civility']);
+								$civility = $wpdb->get_var($query);
 							}
 
 							// Address informations
-							$customer_last_name = ( ! empty( $order_address['address']['address_last_name'] ) ) ? $order_address['address']['address_last_name'] : '';
-							$customer_firtsname = ( ! empty( $order_address['address']['address_first_name'] ) ) ? $order_address['address']['address_first_name'] : '';
-							$customer_company = ( ! empty( $order_address['address']['company'] ) ) ? $order_address['address']['company'] : '';
-							$customer_address = ( ! empty( $order_address['address']['address'] ) ) ? $order_address['address']['address'] : '';
-							$customer_zip_code = ( ! empty( $order_address['address']['postcode'] ) ) ? $order_address['address']['postcode'] : '';
-							$customer_city = ( ! empty( $order_address['address']['city'] ) ) ? $order_address['address']['city'] : '';
-							$customer_state = ( ! empty( $order_address['address']['state'] ) ) ? $order_address['address']['state'] : '';
-							$customer_phone = ( ! empty( $order_address['address']['phone'] ) ) ? ' Tel. : ' . $order_address['address']['phone'] : '';
+							$customer_last_name = (!empty($order_address['address']['address_last_name'])) ? $order_address['address']['address_last_name'] : '';
+							$customer_firtsname = (!empty($order_address['address']['address_first_name'])) ? $order_address['address']['address_first_name'] : '';
+							$customer_company = (!empty($order_address['address']['company'])) ? $order_address['address']['company'] : '';
+							$customer_address = (!empty($order_address['address']['address'])) ? $order_address['address']['address'] : '';
+							$customer_zip_code = (!empty($order_address['address']['postcode'])) ? $order_address['address']['postcode'] : '';
+							$customer_city = (!empty($order_address['address']['city'])) ? $order_address['address']['city'] : '';
+							$customer_state = (!empty($order_address['address']['state'])) ? $order_address['address']['state'] : '';
+							$customer_phone = (!empty($order_address['address']['phone'])) ? ' Tel. : ' . $order_address['address']['phone'] : '';
 							$country = '';
-							foreach ( unserialize( WPSHOP_COUNTRY_LIST ) as $key => $value ) {
-								if ( ! empty( $order_address['address']['country'] ) && $key == $order_address['address']['country'] ) {
+							foreach (unserialize(WPSHOP_COUNTRY_LIST) as $key => $value) {
+								if (!empty($order_address['address']['country']) && $key == $order_address['address']['country']) {
 									$country = $value;
 								}
 							}
 							$customer_country = $country;
 
 							ob_start();
-							require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_addresses_template_for_mail' ) );
+							require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_addresses_template_for_mail'));
 							$message .= ob_get_contents();
 							ob_end_clean();
 						}
@@ -564,20 +564,20 @@ 
 	 * @param integer $order_id : Order ID
 	 * @return string
 	 */
-	function order_customer_comment_template_for_mail( $order_id ) {
+	function order_customer_comment_template_for_mail($order_id) {
 		global $wpdb;
 		$message = '';
-		if ( ! empty( $order_id ) ) {
-			$query = $wpdb->prepare( 'SELECT post_excerpt FROM ' . $wpdb->posts . ' WHERE ID = %d', $order_id );
-			$comment = $wpdb->get_var( $query );
-			$order_infos = get_post_meta( $order_id, '_order_postmeta', true );
-			if ( ! empty( $order_infos['order_key'] ) ) {
-				$comment_title = __( 'Comments about the order', 'wpshop' );
+		if (!empty($order_id)) {
+			$query = $wpdb->prepare('SELECT post_excerpt FROM ' . $wpdb->posts . ' WHERE ID = %d', $order_id);
+			$comment = $wpdb->get_var($query);
+			$order_infos = get_post_meta($order_id, '_order_postmeta', true);
+			if (!empty($order_infos['order_key'])) {
+				$comment_title = __('Comments about the order', 'wpshop');
 			} else {
-				$comment_title = __( 'Comments about the quotation', 'wpshop' );
+				$comment_title = __('Comments about the quotation', 'wpshop');
 			}
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_email_customer_comments' ) );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_email_customer_comments'));
 			$message .= ob_get_contents();
 			ob_end_clean();
 		}
@@ -593,15 +593,15 @@ 
 		global $wpdb;
 		$user_id = get_current_user_id();
 		$message = '';
-		$customer_entity = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-		if ( ! empty( $customer_entity ) ) {
+		$customer_entity = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+		if (!empty($customer_entity)) {
 
-			$query = $wpdb->prepare( 'SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d AND status = %s', $customer_entity, 'valid' );
-			$attributes_sets = $wpdb->get_results( $query );
+			$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d AND status = %s', $customer_entity, 'valid');
+			$attributes_sets = $wpdb->get_results($query);
 
-			if ( ! empty( $attributes_sets ) ) {
+			if (!empty($attributes_sets)) {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_personnal_informations_template_for_mail' ) );
+				require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_personnal_informations_template_for_mail'));
 				$message .= ob_get_contents();
 				ob_end_clean();
 			}
@@ -614,17 +614,17 @@ 
 	 */
 	function wpshop_messages_historic_correction() {
 		global $wpdb;
-		$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s', '_wpshop_messages_histo_%' );
-		$messages_histo = $wpdb->get_results( $query );
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s', '_wpshop_messages_histo_%');
+		$messages_histo = $wpdb->get_results($query);
 
-		foreach ( $messages_histo as $message ) {
-			$query_user = $wpdb->prepare( 'SELECT ID FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s',  $message->post_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-			$user_post_id = $wpdb->get_var( $query_user );
-			$wpdb->update( $wpdb->postmeta, array(
+		foreach ($messages_histo as $message) {
+			$query_user = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s', $message->post_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+			$user_post_id = $wpdb->get_var($query_user);
+			$wpdb->update($wpdb->postmeta, array(
 				'post_id' => $user_post_id,
 				), array(
 				'meta_id' => $message->meta_id,
-			) );
+			));
 		}
 	}
 
@@ -633,20 +633,20 @@ 
 	 * Récupères le contenu du message
 	 */
 	public function get_content_message() {
-		$_wpnonce = ! empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( ! wp_verify_nonce( $_wpnonce, 'get_content_message' ) ) {
+		if (!wp_verify_nonce($_wpnonce, 'get_content_message')) {
 			wp_die();
 		}
 
 		global $wpdb;
-		$meta_id = (int) $_GET['meta_id'];
+		$meta_id = (int)$_GET['meta_id'];
 
-		$result = $wpdb->get_results( $wpdb->prepare( 'SELECT meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_id=%d', array( ($meta_id) ) ) );
-		$result = unserialize( $result[0]->meta_value );
+		$result = $wpdb->get_results($wpdb->prepare('SELECT meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_id=%d', array(($meta_id))));
+		$result = unserialize($result[0]->meta_value);
 		$result = $result[0]['mess_message'];
 
-		wp_die( $result );
+		wp_die($result);
 	}
 
 }

includes/wpshop_ajax.php

Spacing +980 added lines, -980 removed lines

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

Braces +111 added lines, -197 removed lines

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