Eoxia / wpshop

includes/modules/wps_opinion/templates/frontend/posted_opinion.php

Spacing +8 added lines, -8 removed lines

@@ -1,15 +1,15 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wps-table-content wps-table-row">
-		<div class="wps-table-cell"><?php echo mysql2date( get_option('date_format'), $posted_opinion->opinion_date, true ); ?></div>
-		<div class="wps-table-cell"><a href="<?php echo get_permalink($posted_opinion->opinion_post_ID); ?>" target="_blank"><?php echo get_the_post_thumbnail( $posted_opinion->opinion_post_ID, 'thumbnail', array( 'class' => 'wps-circlerounded') ); ?></a></div>
+		<div class="wps-table-cell"><?php echo mysql2date(get_option('date_format'), $posted_opinion->opinion_date, true); ?></div>
+		<div class="wps-table-cell"><a href="<?php echo get_permalink($posted_opinion->opinion_post_ID); ?>" target="_blank"><?php echo get_the_post_thumbnail($posted_opinion->opinion_post_ID, 'thumbnail', array('class' => 'wps-circlerounded')); ?></a></div>
 		<div class="wps-table-cell">
 			<a href="<?php echo get_permalink($posted_opinion->opinion_post_ID); ?>" target="_blank">
 			<?php
-			$product = get_post( $posted_opinion->opinion_post_ID );
-			if( !empty($product) && !empty($product->post_type) ) :
-				if( $product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) :
-					$product = get_post( $product->post_parent );
+			$product = get_post($posted_opinion->opinion_post_ID);
+			if (!empty($product) && !empty($product->post_type)) :
+				if ($product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) :
+					$product = get_post($product->post_parent);
 				endif;
 			endif;
 			echo $product->post_title;
@@ -17,5 +17,5 @@ 
 			</a>
 		</div>
 		<div class="wps-table-cell"><?php echo $posted_opinion->opinion_content; ?></div>
-		<div class="wps-table-cell"><?php echo wps_opinion_ctr::display_stars( $posted_opinion->opinion_rate ); ?></div>
+		<div class="wps-table-cell"><?php echo wps_opinion_ctr::display_stars($posted_opinion->opinion_rate); ?></div>
 </div>

includes/modules/wps_opinion/templates/frontend/posted_opinions.php

Spacing +12 added lines, -12 removed lines

@@ -1,23 +1,23 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if( !empty($posted_opinions) ) : ?>
-<span class="wps-h5"><?php _e( 'My opinions', 'wpshop'); ?></span>
+<?php if (!defined('ABSPATH')) exit;
+ if (!empty($posted_opinions)) : ?>
+<span class="wps-h5"><?php _e('My opinions', 'wpshop'); ?></span>
 <div class="wps-table">
 	<div class="wps-table-header wps-table-row">
-		<div class="wps-table-cell"><?php _e( 'Date', 'wps_opinion'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Picture', 'wps_opinion'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Product', 'wps_opinion'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Opinion', 'wps_opinion'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Rate', 'wps_opinion'); ?></div>
+		<div class="wps-table-cell"><?php _e('Date', 'wps_opinion'); ?></div>
+		<div class="wps-table-cell"><?php _e('Picture', 'wps_opinion'); ?></div>
+		<div class="wps-table-cell"><?php _e('Product', 'wps_opinion'); ?></div>
+		<div class="wps-table-cell"><?php _e('Opinion', 'wps_opinion'); ?></div>
+		<div class="wps-table-cell"><?php _e('Rate', 'wps_opinion'); ?></div>
 	</div>
 
 	<?php
-	if( !empty($posted_opinions) ) :
-		foreach( $posted_opinions as $posted_opinion ) :
-			require( wpshop_tools::get_template_part( WPS_OPINION_DIR, $this->template_dir,"frontend", "posted_opinion") );
+	if (!empty($posted_opinions)) :
+		foreach ($posted_opinions as $posted_opinion) :
+			require(wpshop_tools::get_template_part(WPS_OPINION_DIR, $this->template_dir, "frontend", "posted_opinion"));
 		endforeach;
 	endif;
 	?>
 </div>
 <?php else : ?>
-<div class="wps-alert-info"><?php _e( 'You never posted an opinion on a product', 'wpshop'); ?></div>
+<div class="wps-alert-info"><?php _e('You never posted an opinion on a product', 'wpshop'); ?></div>
 <?php endif; ?>

Braces +8 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  if( !empty($posted_opinions) ) : ?>
 <span class="wps-h5"><?php _e( 'My opinions', 'wpshop'); ?></span>
 <div class="wps-table">
@@ -18,6 +20,9 @@ 
 	endif;
 	?>
 </div>
-<?php else : ?>
-<div class="wps-alert-info"><?php _e( 'You never posted an opinion on a product', 'wpshop'); ?></div>
+<?php else {
+	: ?>
+<div class="wps-alert-info"><?php _e( 'You never posted an opinion on a product', 'wpshop');
+}
+?></div>
 <?php endif; ?>

includes/modules/wps_customer/templates/frontend/account/account-dashboard.php

Spacing +30 added lines, -30 removed lines

@@ -1,22 +1,22 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
-$permalink_option = get_option( 'permalink_structure' );
-$account_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_myaccount_page_id' ) );
-$account_dashboard_part = !empty( $_GET['account_dashboard_part'] ) ? sanitize_text_field( $_GET['account_dashboard_part'] ) : '';
+<?php if (!defined('ABSPATH')) exit;
+$permalink_option = get_option('permalink_structure');
+$account_page_id = wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'));
+$account_dashboard_part = !empty($_GET['account_dashboard_part']) ? sanitize_text_field($_GET['account_dashboard_part']) : '';
 ?>
 
 <?php $user_ID = get_current_user_id(); ?>
 
-<?php if ( 0 !== $user_ID ) : ?>
+<?php if (0 !== $user_ID) : ?>
 <div class="wps-user-dashboard">
-	<?php $account_user = get_userdata( $user_ID ); ?>
+	<?php $account_user = get_userdata($user_ID); ?>
 	<span class="wps-user-name">
-		<?php _e( 'Hello', 'wpshop' ); ?>
+		<?php _e('Hello', 'wpshop'); ?>
 		<strong><?php echo $account_user->data->user_login; ?></strong>
 	</span>
 	<span class="wps-user-thumbnail">
-		<?php echo get_avatar( $user_ID, 40 ); ?>
+		<?php echo get_avatar($user_ID, 40); ?>
 	</span>
-	<a href="<?php echo wp_logout_url( site_url() ); ?>" class="" title="<?php _e( 'Log out', 'wpshop' ); ?>">
+	<a href="<?php echo wp_logout_url(site_url()); ?>" class="" title="<?php _e('Log out', 'wpshop'); ?>">
 		<i class="wps-icon-power"></i>
 	</a>
 </div>
@@ -25,50 +25,50 @@ 
 <section class="wps-section-account">
 	<div class="wps-section-taskbar">
 		<ul>
-			<li class="<?php echo ( ( empty($account_dashboard_part) || ( !empty($account_dashboard_part) && $account_dashboard_part == 'account' ) ) ? 'wps-activ' : '' ); ?>">
-				<a data-target="menu1" href="<?php echo get_permalink($account_page_id).( (!empty($permalink_option) ? '?' : '&' ).'account_dashboard_part=account' ); ?>" title="" class="">
+			<li class="<?php echo ((empty($account_dashboard_part) || (!empty($account_dashboard_part) && $account_dashboard_part == 'account')) ? 'wps-activ' : ''); ?>">
+				<a data-target="menu1" href="<?php echo get_permalink($account_page_id) . ((!empty($permalink_option) ? '?' : '&') . 'account_dashboard_part=account'); ?>" title="" class="">
 					<i class="wps-icon-user"></i>
-					<span><?php _e( 'Account', 'wpshop'); ?></span>
+					<span><?php _e('Account', 'wpshop'); ?></span>
 				</a>
 			</li>
-			<li class="<?php echo ( ( !empty($account_dashboard_part) && $account_dashboard_part == 'address') ? 'wps-activ' : '' ); ?>">
-				<a href="<?php echo get_permalink($account_page_id).( (!empty($permalink_option) ? '?' : '&' ).'account_dashboard_part=address' ); ?>" title="" class="">
+			<li class="<?php echo ((!empty($account_dashboard_part) && $account_dashboard_part == 'address') ? 'wps-activ' : ''); ?>">
+				<a href="<?php echo get_permalink($account_page_id) . ((!empty($permalink_option) ? '?' : '&') . 'account_dashboard_part=address'); ?>" title="" class="">
 					<i class="wps-icon-address"></i>
-					<span><?php _e( 'Addresses', 'wpshop'); ?></span>
+					<span><?php _e('Addresses', 'wpshop'); ?></span>
 				</a>
 			</li>
-			<li class="<?php echo ( ( !empty($account_dashboard_part) && $account_dashboard_part == 'order') ? 'wps-activ' : '' ); ?>">
-				<a href="<?php echo get_permalink($account_page_id).( (!empty($permalink_option) ? '?' : '&' ).'account_dashboard_part=order' ); ?>" title="" class="">
+			<li class="<?php echo ((!empty($account_dashboard_part) && $account_dashboard_part == 'order') ? 'wps-activ' : ''); ?>">
+				<a href="<?php echo get_permalink($account_page_id) . ((!empty($permalink_option) ? '?' : '&') . 'account_dashboard_part=order'); ?>" title="" class="">
 					<i class="wps-icon-truck"></i>
-					<span><?php _e( 'Orders', 'wpshop'); ?></span>
+					<span><?php _e('Orders', 'wpshop'); ?></span>
 				</a>
 			</li>
-			<li class="<?php echo ( ( !empty($account_dashboard_part) && $account_dashboard_part == 'coupon') ? 'wps-activ' : '' ); ?>">
-				<a href="<?php echo get_permalink($account_page_id).( (!empty($permalink_option) ? '?' : '&' ).'account_dashboard_part=coupon' ); ?>" title="" class="">
+			<li class="<?php echo ((!empty($account_dashboard_part) && $account_dashboard_part == 'coupon') ? 'wps-activ' : ''); ?>">
+				<a href="<?php echo get_permalink($account_page_id) . ((!empty($permalink_option) ? '?' : '&') . 'account_dashboard_part=coupon'); ?>" title="" class="">
 					<i class="wps-icon-promo"></i>
-					<span><?php _e( 'Coupons', 'wpshop'); ?></span>
+					<span><?php _e('Coupons', 'wpshop'); ?></span>
 				</a>
 			</li>
-			<?php $opinion_option = get_option( 'wps_opinion' );
-			if( !empty($opinion_option) && !empty($opinion_option['active']) ) : ?>
-			<li class="<?php echo ( ( !empty($account_dashboard_part) && $account_dashboard_part == 'opinion') ? 'wps-activ' : '' ); ?>">
-				<a href="<?php echo get_permalink($account_page_id).( (!empty($permalink_option) ? '?' : '&' ).'account_dashboard_part=opinion' ); ?>" title="" class="">
+			<?php $opinion_option = get_option('wps_opinion');
+			if (!empty($opinion_option) && !empty($opinion_option['active'])) : ?>
+			<li class="<?php echo ((!empty($account_dashboard_part) && $account_dashboard_part == 'opinion') ? 'wps-activ' : ''); ?>">
+				<a href="<?php echo get_permalink($account_page_id) . ((!empty($permalink_option) ? '?' : '&') . 'account_dashboard_part=opinion'); ?>" title="" class="">
 					<i class="wps-icon-chat"></i>
-					<span><?php _e( 'Opinions', 'wpshop'); ?></span>
+					<span><?php _e('Opinions', 'wpshop'); ?></span>
 				</a>
 			</li>
 			<?php endif; ?>
-			<li class="<?php echo ( ( !empty($account_dashboard_part) && $account_dashboard_part == 'messages') ? 'wps-activ' : '' ); ?>">
-				<a href="<?php echo get_permalink($account_page_id).( (!empty($permalink_option) ? '?' : '&' ).'account_dashboard_part=messages' ); ?>" title="" class="">
+			<li class="<?php echo ((!empty($account_dashboard_part) && $account_dashboard_part == 'messages') ? 'wps-activ' : ''); ?>">
+				<a href="<?php echo get_permalink($account_page_id) . ((!empty($permalink_option) ? '?' : '&') . 'account_dashboard_part=messages'); ?>" title="" class="">
 					<i class="wps-icon-email"></i>
-					<span><?php _e( 'Messages', 'wpshop' ); ?></span>
+					<span><?php _e('Messages', 'wpshop'); ?></span>
 				</a>
 			</li>
 			<?php echo apply_filters('wps_my_account_extra_part_menu', ''); ?>
 		</ul>
 	</div>
 	<div class="wps-section-content">
-		<div class="wps-activ" id="wps_dashboard_content" data-nonce="<?php echo wp_create_nonce( 'wps_refresh_add_opinion_list' ); ?>">
+		<div class="wps-activ" id="wps_dashboard_content" data-nonce="<?php echo wp_create_nonce('wps_refresh_add_opinion_list'); ?>">
 			<?php echo $content; ?>
 		</div>
 	</div>

includes/modules/wps_cart/controller/wps_cart_ctr.php

Spacing +301 added lines, -301 removed lines

@@ -1,48 +1,48 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_cart {
 
 	function __construct() {
 		/** WPShop Cart Shortcode **/
-		add_shortcode( 'wps_cart', array( &$this, 'display_cart' ) );
-		add_shortcode( 'wpshop_cart', array( &$this, 'display_cart' ) );
+		add_shortcode('wps_cart', array(&$this, 'display_cart'));
+		add_shortcode('wpshop_cart', array(&$this, 'display_cart'));
 		/** WPShop Mini Cart Shortcode **/
-		add_shortcode( 'wps_mini_cart', array( &$this, 'display_mini_cart' ) );
-		add_shortcode( 'wpshop_mini_cart', array( &$this, 'display_mini_cart' ) );
+		add_shortcode('wps_mini_cart', array(&$this, 'display_mini_cart'));
+		add_shortcode('wpshop_mini_cart', array(&$this, 'display_mini_cart'));
 		/** WPShop Resume Cart Shorcode **/
-		add_shortcode( 'wps_resume_cart', array( &$this, 'display_resume_cart' ) );
-		add_shortcode( 'wpshop_resume_cart', array( &$this, 'display_resume_cart' ) );
+		add_shortcode('wps_resume_cart', array(&$this, 'display_resume_cart'));
+		add_shortcode('wpshop_resume_cart', array(&$this, 'display_resume_cart'));
 		/** Apply Coupon Interface **/
-		add_shortcode( 'wps_apply_coupon', array( &$this, 'display_apply_coupon_interface' ) );
-		add_shortcode( 'wpshop_apply_coupon', array( &$this, 'display_apply_coupon_interface' ) );
+		add_shortcode('wps_apply_coupon', array(&$this, 'display_apply_coupon_interface'));
+		add_shortcode('wpshop_apply_coupon', array(&$this, 'display_apply_coupon_interface'));
 		/** NUmeration Cart **/
-		add_shortcode( 'wps-numeration-cart', array( &$this, 'display_wps_numeration_cart' ) );
-		add_shortcode( 'wpshop-numeration-cart', array( &$this, 'display_wps_numeration_cart' ) );
+		add_shortcode('wps-numeration-cart', array(&$this, 'display_wps_numeration_cart'));
+		add_shortcode('wpshop-numeration-cart', array(&$this, 'display_wps_numeration_cart'));
 		/** Button add to cart */
-		add_shortcode( 'wpshop_button_add_to_cart', array( &$this, 'display_button_add_to_cart' ) );
+		add_shortcode('wpshop_button_add_to_cart', array(&$this, 'display_button_add_to_cart'));
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts' ) );
-		add_action( 'init', array( $this, 'load_cart_from_db' ) );
+		add_action('wp_enqueue_scripts', array($this, 'add_scripts'));
+		add_action('init', array($this, 'load_cart_from_db'));
 
 		/** Ajax Actions **/
-		add_action( 'wp_ajax_wps_reload_cart', array( $this, 'wps_reload_cart' ) );
-		add_action( 'wp_ajax_nopriv_wps_reload_cart', array( $this, 'wps_reload_cart' ) );
+		add_action('wp_ajax_wps_reload_cart', array($this, 'wps_reload_cart'));
+		add_action('wp_ajax_nopriv_wps_reload_cart', array($this, 'wps_reload_cart'));
 
-		add_action( 'wp_ajax_wps_reload_mini_cart', array( &$this, 'wps_reload_mini_cart' ) );
-		add_action( 'wp_ajax_nopriv_wps_reload_mini_cart', array( &$this, 'wps_reload_mini_cart' ) );
+		add_action('wp_ajax_wps_reload_mini_cart', array(&$this, 'wps_reload_mini_cart'));
+		add_action('wp_ajax_nopriv_wps_reload_mini_cart', array(&$this, 'wps_reload_mini_cart'));
 
-		add_action( 'wp_ajax_wps_reload_summary_cart', array( &$this, 'wps_reload_summary_cart' ) );
-		add_action( 'wp_ajax_nopriv_wps_reload_summary_cart', array( &$this, 'wps_reload_summary_cart' ) );
+		add_action('wp_ajax_wps_reload_summary_cart', array(&$this, 'wps_reload_summary_cart'));
+		add_action('wp_ajax_nopriv_wps_reload_summary_cart', array(&$this, 'wps_reload_summary_cart'));
 
-		add_action( 'wp_ajax_wps_apply_coupon', array( &$this, 'wps_apply_coupon' ) );
-		add_action( 'wp_ajax_nopriv_wps_apply_coupon', array( &$this, 'wps_apply_coupon' ) );
+		add_action('wp_ajax_wps_apply_coupon', array(&$this, 'wps_apply_coupon'));
+		add_action('wp_ajax_nopriv_wps_apply_coupon', array(&$this, 'wps_apply_coupon'));
 
-		add_action( 'wp_ajax_wps_cart_pass_to_step_two', array( &$this, 'wps_cart_pass_to_step_two' ) );
-		add_action( 'wp_ajax_nopriv_wps_cart_pass_to_step_two', array( &$this, 'wps_cart_pass_to_step_two' ) );
+		add_action('wp_ajax_wps_cart_pass_to_step_two', array(&$this, 'wps_cart_pass_to_step_two'));
+		add_action('wp_ajax_nopriv_wps_cart_pass_to_step_two', array(&$this, 'wps_cart_pass_to_step_two'));
 
-		add_action( 'wp_ajax_wps_empty_cart', array( &$this, 'wps_empty_cart' ) );
-		add_action( 'wp_ajax_nopriv_wps_empty_cart', array( &$this, 'wps_empty_cart' ) );
+		add_action('wp_ajax_wps_empty_cart', array(&$this, 'wps_empty_cart'));
+		add_action('wp_ajax_nopriv_wps_empty_cart', array(&$this, 'wps_empty_cart'));
 
-		add_action( 'wsphop_options', array(&$this, 'declare_options' ), 8);
+		add_action('wsphop_options', array(&$this, 'declare_options'), 8);
 	}
 
 	/**
@@ -50,19 +50,19 @@ 
 	 */
 	function add_scripts() {
 		wp_enqueue_script('jquery');
-		wp_enqueue_script( 'wps_cart_js',  WPS_CART_URL . WPS_CART_DIR.'/assets/frontend/js/wps_cart.js' );
+		wp_enqueue_script('wps_cart_js', WPS_CART_URL . WPS_CART_DIR . '/assets/frontend/js/wps_cart.js');
 	}
 
 	/**
 	 * Declare Cart Options
 	 */
-	public static function declare_options () {
-		if ( WPSHOP_DEFINED_SHOP_TYPE == 'sale' ) {
-			$wpshop_shop_type = !empty( $_POST['wpshop_shop_type'] ) ? sanitize_text_field( $_POST['wpshop_shop_type'] ) : '';
-			$old_wpshop_shop_type = !empty( $_POST['old_wpshop_shop_type'] ) ? sanitize_text_field( $_POST['old_wpshop_shop_type'] ) : '';
+	public static function declare_options() {
+		if (WPSHOP_DEFINED_SHOP_TYPE == 'sale') {
+			$wpshop_shop_type = !empty($_POST['wpshop_shop_type']) ? sanitize_text_field($_POST['wpshop_shop_type']) : '';
+			$old_wpshop_shop_type = !empty($_POST['old_wpshop_shop_type']) ? sanitize_text_field($_POST['old_wpshop_shop_type']) : '';
 
-			if ( ( $wpshop_shop_type == '' || $wpshop_shop_type != 'presentation' )
-				&& ( $old_wpshop_shop_type == '' || $old_wpshop_shop_type != 'presentation' ) ) {
+			if (($wpshop_shop_type == '' || $wpshop_shop_type != 'presentation')
+				&& ($old_wpshop_shop_type == '' || $old_wpshop_shop_type != 'presentation')) {
 					/**	Add module option to wpshop general options	*/
 					register_setting('wpshop_options', 'wpshop_cart_option', array('wps_cart', 'wpshop_options_validate_cart_type'));
 					add_settings_field('wpshop_cart_type', __('Which type of cart do you want to display', 'wpshop'), array('wps_cart', 'wpshop_cart_type_field'), 'wpshop_cart_info', 'wpshop_cart_info');
@@ -75,7 +75,7 @@ 
 	 * @param unknown_type $input
 	 * @return unknown
 	 */
-	public static function wpshop_options_validate_cart_type( $input ) {
+	public static function wpshop_options_validate_cart_type($input) {
 		return $input;
 	}
 
@@ -83,22 +83,22 @@ 
 	 * Cart Options Fields
 	 */
 	public static function wpshop_cart_type_field() {
-		$cart_option = get_option( 'wpshop_cart_option' );
+		$cart_option = get_option('wpshop_cart_option');
 
 		$output  = '<select name="wpshop_cart_option[cart_type]">';
-		$output .= '<option value="simplified_ati" ' .( ( !empty($cart_option) && !empty($cart_option['cart_type']) && $cart_option['cart_type'] == 'simplified_ati' ) ? 'selected="selected"' : ''). ' >' .__( 'Simplified cart ATI', 'wpshop'). '</option>';
-		$output .= '<option value="simplified_et" ' .( ( !empty($cart_option) && !empty($cart_option['cart_type']) && $cart_option['cart_type'] == 'simplified_et' ) ? 'selected="selected"' : ''). ' >' .__( 'Simplified cart ET', 'wpshop'). '</option>';
-		$output .= '<option value="full_cart" ' .( ( !empty($cart_option) && !empty($cart_option['cart_type']) && $cart_option['cart_type'] == 'full_cart' ) ? 'selected="selected"' : ''). ' >' .__( 'Full cart', 'wpshop'). '</option>';
+		$output .= '<option value="simplified_ati" ' . ((!empty($cart_option) && !empty($cart_option['cart_type']) && $cart_option['cart_type'] == 'simplified_ati') ? 'selected="selected"' : '') . ' >' . __('Simplified cart ATI', 'wpshop') . '</option>';
+		$output .= '<option value="simplified_et" ' . ((!empty($cart_option) && !empty($cart_option['cart_type']) && $cart_option['cart_type'] == 'simplified_et') ? 'selected="selected"' : '') . ' >' . __('Simplified cart ET', 'wpshop') . '</option>';
+		$output .= '<option value="full_cart" ' . ((!empty($cart_option) && !empty($cart_option['cart_type']) && $cart_option['cart_type'] == 'full_cart') ? 'selected="selected"' : '') . ' >' . __('Full cart', 'wpshop') . '</option>';
 		$output .= '</select>';
 
 		echo $output;
 	}
 
 	/** Display Cart **/
-	function display_cart( $args ) {
-		$cart_type = ( !empty($args) && !empty($args['cart_type']) ) ?  $args['cart_type']: '';
-		$oid =  ( !empty($args) && !empty($args['oid']) ) ?  $args['oid'] : '';
-		$output  = '<div id="wps_cart_container" data-nonce="' . wp_create_nonce( 'wps_reload_cart' ) . '" class="wps-bloc-loader wps-cart-wrapper">';
+	function display_cart($args) {
+		$cart_type = (!empty($args) && !empty($args['cart_type'])) ? $args['cart_type'] : '';
+		$oid = (!empty($args) && !empty($args['oid'])) ? $args['oid'] : '';
+		$output  = '<div id="wps_cart_container" data-nonce="' . wp_create_nonce('wps_reload_cart') . '" class="wps-bloc-loader wps-cart-wrapper">';
 		$output .= self::cart_content($cart_type, $oid);
 		$output .= '</div>';
 
@@ -106,84 +106,84 @@ 
 	}
 
 	/** Cart Content **/
-	public static function cart_content( $cart_type = '', $oid = '' ) {
+	public static function cart_content($cart_type = '', $oid = '') {
 		global $wpdb;
 		$output = '';
 		$account_origin = false;
-		$cart_option = get_option( 'wpshop_cart_option' );
-		$cart_option = ( !empty($cart_option) && !empty($cart_option['cart_type']) ) ? $cart_option['cart_type'] : 'simplified_ati';
+		$cart_option = get_option('wpshop_cart_option');
+		$cart_option = (!empty($cart_option) && !empty($cart_option['cart_type'])) ? $cart_option['cart_type'] : 'simplified_ati';
 
-		$price_piloting  = get_option( 'wpshop_shop_price_piloting' );
+		$price_piloting = get_option('wpshop_shop_price_piloting');
 
 		$coupon_title = $coupon_value = '';
-		$cart_content = ( !empty($_SESSION) && !empty($_SESSION['cart']) ) ? $_SESSION['cart'] : array();
-		if( !empty($oid) ) {
+		$cart_content = (!empty($_SESSION) && !empty($_SESSION['cart'])) ? $_SESSION['cart'] : array();
+		if (!empty($oid)) {
 			$account_origin = true;
-			$cart_content = get_post_meta( $oid, '_order_postmeta', true);
+			$cart_content = get_post_meta($oid, '_order_postmeta', true);
 		}
-		$currency = wpshop_tools::wpshop_get_currency( false );
+		$currency = wpshop_tools::wpshop_get_currency(false);
 
-		if ( !empty($cart_content) ) {
-			$cart_items = ( !empty($cart_content['order_items']) ) ? $cart_content['order_items'] : array();
+		if (!empty($cart_content)) {
+			$cart_items = (!empty($cart_content['order_items'])) ? $cart_content['order_items'] : array();
 
-			if ( !empty($cart_content['coupon_id']) ) {
-				$coupon_title = get_the_title( $cart_content['coupon_id']);
-				$coupon_value = wpshop_tools::formate_number( $cart_content['order_discount_amount_total_cart'] );
+			if (!empty($cart_content['coupon_id'])) {
+				$coupon_title = get_the_title($cart_content['coupon_id']);
+				$coupon_value = wpshop_tools::formate_number($cart_content['order_discount_amount_total_cart']);
 			}
 
-			if ( !empty($cart_items) ) {
+			if (!empty($cart_items)) {
 				/** Total values **/
-				$shipping_cost_et = ( !empty($cart_content['order_shipping_cost']) ) ? ( (!empty($price_piloting) && $price_piloting != 'HT') ? ( $cart_content['order_shipping_cost'] / ( 1 + ( WPSHOP_VAT_ON_SHIPPING_COST / 100 ) ) ) : $cart_content['order_shipping_cost'] ) : 0;
-				$shipping_cost_vat = ( !empty( $shipping_cost_et) ) ? ( $shipping_cost_et * ( WPSHOP_VAT_ON_SHIPPING_COST / 100 ) ) : 0;
-				$shipping_cost_ati = ( !empty($cart_content['order_shipping_cost']) ) ? ( (!empty($price_piloting) && $price_piloting != 'HT') ? $cart_content['order_shipping_cost'] : $cart_content['order_shipping_cost'] + $shipping_cost_vat ) : 0;
-				$total_et = ( !empty( $cart_content['order_total_ht']) ) ? $cart_content['order_total_ht'] : 0;
-				$order_totla_before_discount = ( !empty($cart_content['order_grand_total_before_discount']) ) ? $cart_content['order_grand_total_before_discount'] : 0;
-				$order_amount_to_pay_now = wpshop_tools::formate_number( $cart_content['order_amount_to_pay_now'] );
-				$total_ati = ( !empty( $order_amount_to_pay_now ) && !empty($oid) && $order_amount_to_pay_now > 0 ) ? $cart_content['order_amount_to_pay_now'] : ( (!empty($cart_content['order_grand_total']) ) ? $cart_content['order_grand_total'] : 0 );
+				$shipping_cost_et = (!empty($cart_content['order_shipping_cost'])) ? ((!empty($price_piloting) && $price_piloting != 'HT') ? ($cart_content['order_shipping_cost'] / (1 + (WPSHOP_VAT_ON_SHIPPING_COST / 100))) : $cart_content['order_shipping_cost']) : 0;
+				$shipping_cost_vat = (!empty($shipping_cost_et)) ? ($shipping_cost_et * (WPSHOP_VAT_ON_SHIPPING_COST / 100)) : 0;
+				$shipping_cost_ati = (!empty($cart_content['order_shipping_cost'])) ? ((!empty($price_piloting) && $price_piloting != 'HT') ? $cart_content['order_shipping_cost'] : $cart_content['order_shipping_cost'] + $shipping_cost_vat) : 0;
+				$total_et = (!empty($cart_content['order_total_ht'])) ? $cart_content['order_total_ht'] : 0;
+				$order_totla_before_discount = (!empty($cart_content['order_grand_total_before_discount'])) ? $cart_content['order_grand_total_before_discount'] : 0;
+				$order_amount_to_pay_now = wpshop_tools::formate_number($cart_content['order_amount_to_pay_now']);
+				$total_ati = (!empty($order_amount_to_pay_now) && !empty($oid) && $order_amount_to_pay_now > 0) ? $cart_content['order_amount_to_pay_now'] : ((!empty($cart_content['order_grand_total'])) ? $cart_content['order_grand_total'] : 0);
 				unset($tracking);
-				if( !empty($cart_content['order_trackingNumber']) ) {
+				if (!empty($cart_content['order_trackingNumber'])) {
 					$tracking['number'] = $cart_content['order_trackingNumber'];
 				}
-				if( !empty($cart_content['order_trackingLink']) ) {
+				if (!empty($cart_content['order_trackingLink'])) {
 					$tracking['link'] = $cart_content['order_trackingLink'];
 				}
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "cart/cart") );
+				require(wpshop_tools::get_template_part(WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "cart/cart"));
 				$output = ob_get_contents();
 				ob_end_clean();
 			}
 			else {
-				return '<div class="wps-alert-info">' .__( 'Your cart is empty', 'wpshop' ).'</div>';;
+				return '<div class="wps-alert-info">' . __('Your cart is empty', 'wpshop') . '</div>'; ;
 			}
 		}
 		else {
-			return '<div class="wps-alert-info">' .__( 'Your cart is empty', 'wpshop' ).'</div>';;
+			return '<div class="wps-alert-info">' . __('Your cart is empty', 'wpshop') . '</div>'; ;
 		}
 		return $output;
 	}
 
 	/** Display mini cart **/
-	function display_mini_cart( $args ) {
+	function display_mini_cart($args) {
 		$total_cart_item = 0;
-		$cart_content = ( !empty($_SESSION) && !empty($_SESSION['cart']) ) ? $_SESSION['cart'] : array();
-		$type = ( !empty($args) && !empty($args['type']) ) ? $args['type'] : '';
+		$cart_content = (!empty($_SESSION) && !empty($_SESSION['cart'])) ? $_SESSION['cart'] : array();
+		$type = (!empty($args) && !empty($args['type'])) ? $args['type'] : '';
 
 
-		if ( !empty($cart_content) ) {
-			$cart_items = ( !empty($cart_content['order_items']) ) ? $cart_content['order_items'] : array();
+		if (!empty($cart_content)) {
+			$cart_items = (!empty($cart_content['order_items'])) ? $cart_content['order_items'] : array();
 			/** Count items **/
-			$total_cart_item = self::total_cart_items( $cart_items );
-			$mini_cart_body = self::mini_cart_content( $type );
+			$total_cart_item = self::total_cart_items($cart_items);
+			$mini_cart_body = self::mini_cart_content($type);
 		}
 		else {
 			$mini_cart_body = self::mini_cart_content();
 		}
 		ob_start();
-		if( !empty($type) && $type == 'fixed' ) {
-			require(wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/fixed-mini-cart") );
+		if (!empty($type) && $type == 'fixed') {
+			require(wpshop_tools::get_template_part(WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/fixed-mini-cart"));
 		}
 		else {
-			require( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/mini-cart") );
+			require(wpshop_tools::get_template_part(WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/mini-cart"));
 		}
 
 		$output = ob_get_contents();
@@ -192,37 +192,37 @@ 
 	}
 
 	/** Mini cart Content **/
-	public static function mini_cart_content( $type = '') {
-		$currency = wpshop_tools::wpshop_get_currency( false );
-		$cart_content = ( !empty($_SESSION) && !empty($_SESSION['cart']) ) ? $_SESSION['cart'] : array();
+	public static function mini_cart_content($type = '') {
+		$currency = wpshop_tools::wpshop_get_currency(false);
+		$cart_content = (!empty($_SESSION) && !empty($_SESSION['cart'])) ? $_SESSION['cart'] : array();
 		$output = '';
-		if ( !empty($cart_content) ) {
-			$cart_items = ( !empty($cart_content['order_items']) ) ? $cart_content['order_items'] : array();
-			if ( !empty($cart_items) ) {
-				if ( !empty($cart_content['coupon_id']) ) {
-					$coupon_title = get_the_title( $cart_content['coupon_id']);
-					$coupon_value = wpshop_tools::formate_number( $cart_content['order_discount_amount_total_cart'] );
+		if (!empty($cart_content)) {
+			$cart_items = (!empty($cart_content['order_items'])) ? $cart_content['order_items'] : array();
+			if (!empty($cart_items)) {
+				if (!empty($cart_content['coupon_id'])) {
+					$coupon_title = get_the_title($cart_content['coupon_id']);
+					$coupon_value = wpshop_tools::formate_number($cart_content['order_discount_amount_total_cart']);
 				}
-				$order_total_before_discount = ( !empty($cart_content['order_grand_total_before_discount']) ) ? $cart_content['order_grand_total_before_discount'] : 0;
-				$shipping_cost_ati = ( !empty($cart_content['order_shipping_cost']) ) ? $cart_content['order_shipping_cost'] : 0;
-				$total_ati  = $total_cart = ( !empty($cart_content['order_amount_to_pay_now']) ) ? $cart_content['order_amount_to_pay_now'] : 0;
+				$order_total_before_discount = (!empty($cart_content['order_grand_total_before_discount'])) ? $cart_content['order_grand_total_before_discount'] : 0;
+				$shipping_cost_ati = (!empty($cart_content['order_shipping_cost'])) ? $cart_content['order_shipping_cost'] : 0;
+				$total_ati = $total_cart = (!empty($cart_content['order_amount_to_pay_now'])) ? $cart_content['order_amount_to_pay_now'] : 0;
 
 				ob_start();
-				if( !empty($type) && $type == 'fixed' ) {
-					require( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/fixed-mini-cart", "content") );
+				if (!empty($type) && $type == 'fixed') {
+					require(wpshop_tools::get_template_part(WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/fixed-mini-cart", "content"));
 				}
 				else {
-					require( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/mini-cart", "content") );
+					require(wpshop_tools::get_template_part(WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/mini-cart", "content"));
 				}
 				$output = ob_get_contents();
 				ob_end_clean();
 			}
 			else {
-				$output = '<div class="wps-alert-info">' .__( 'Your cart is empty', 'wpshop' ).'</div>';
+				$output = '<div class="wps-alert-info">' . __('Your cart is empty', 'wpshop') . '</div>';
 			}
 		}
 		else {
-			$output = '<div class="wps-alert-info">' . __( 'Your cart is empty', 'wpshop' ).'</div>';
+			$output = '<div class="wps-alert-info">' . __('Your cart is empty', 'wpshop') . '</div>';
 		}
 		return $output;
 	}
@@ -231,7 +231,7 @@ 
 	function display_resume_cart() {
 		$cart_summary_content = self::resume_cart_content();
 		ob_start();
-		require_once( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "resume-cart/resume-cart") );
+		require_once(wpshop_tools::get_template_part(WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "resume-cart/resume-cart"));
 		$output = ob_get_contents();
 		ob_end_clean();
 		return $output;
@@ -240,29 +240,29 @@ 
 	/** Resume cart Content **/
 	public static function resume_cart_content() {
 		$output = '';
-		$currency = wpshop_tools::wpshop_get_currency( false );
-		$cart_content = ( !empty($_SESSION) && !empty($_SESSION['cart']) ) ? $_SESSION['cart'] : array();
-		if ( !empty($cart_content) ) {
-			$cart_items = ( !empty($cart_content['order_items']) ) ? $cart_content['order_items'] : array();
-			if ( !empty($cart_items) ) {
-				if ( !empty($cart_content['coupon_id']) ) {
-					$coupon_title = get_the_title( $cart_content['coupon_id']);
-					$coupon_value = wpshop_tools::formate_number( $cart_content['order_discount_amount_total_cart'] );
+		$currency = wpshop_tools::wpshop_get_currency(false);
+		$cart_content = (!empty($_SESSION) && !empty($_SESSION['cart'])) ? $_SESSION['cart'] : array();
+		if (!empty($cart_content)) {
+			$cart_items = (!empty($cart_content['order_items'])) ? $cart_content['order_items'] : array();
+			if (!empty($cart_items)) {
+				if (!empty($cart_content['coupon_id'])) {
+					$coupon_title = get_the_title($cart_content['coupon_id']);
+					$coupon_value = wpshop_tools::formate_number($cart_content['order_discount_amount_total_cart']);
 				}
-				$order_total_before_discount = ( !empty($cart_content['order_grand_total_before_discount']) ) ? $cart_content['order_grand_total_before_discount'] : 0;
-				$shipping_cost_ati = ( !empty($cart_content['order_shipping_cost']) ) ? $cart_content['order_shipping_cost'] : 0;
-				$total_ati  = $total_cart = ( !empty($cart_content['order_amount_to_pay_now']) ) ? $cart_content['order_amount_to_pay_now'] : 0;
+				$order_total_before_discount = (!empty($cart_content['order_grand_total_before_discount'])) ? $cart_content['order_grand_total_before_discount'] : 0;
+				$shipping_cost_ati = (!empty($cart_content['order_shipping_cost'])) ? $cart_content['order_shipping_cost'] : 0;
+				$total_ati = $total_cart = (!empty($cart_content['order_amount_to_pay_now'])) ? $cart_content['order_amount_to_pay_now'] : 0;
 				ob_start();
-				require_once( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "resume-cart/resume-cart", "content") );
+				require_once(wpshop_tools::get_template_part(WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "resume-cart/resume-cart", "content"));
 				$output = ob_get_contents();
 				ob_end_clean();
 			}
 			else {
-				$resume_cart_body = '<div class="wps-alert-info">' .__( 'Your cart is empty', 'wpshop' ).'</div>';
+				$resume_cart_body = '<div class="wps-alert-info">' . __('Your cart is empty', 'wpshop') . '</div>';
 			}
 		}
 		else {
-			$resume_cart_body ='<div class="wps-alert-info">' .__( 'Your cart is empty', 'wpshop' ).'</div>';
+			$resume_cart_body = '<div class="wps-alert-info">' . __('Your cart is empty', 'wpshop') . '</div>';
 		}
 		return $output;
 	}
@@ -272,10 +272,10 @@ 
 	 * @param array cart
 	 * @return int total items
 	 */
-	public static function total_cart_items( $cart_items ) {
+	public static function total_cart_items($cart_items) {
 		$count = 0;
-		if( !empty($cart_items) && is_array( $cart_items )) {
-			foreach( $cart_items as $cart_item ) {
+		if (!empty($cart_items) && is_array($cart_items)) {
+			foreach ($cart_items as $cart_item) {
 				$count += $cart_item['item_qty'];
 			}
 		}
@@ -286,7 +286,7 @@ 
 	 * Reload Persistent cart for logged user and if a persistent cart exists
 	 */
 	function load_cart_from_db() {
-		if(empty($_SESSION['cart']) && get_current_user_id() ) {
+		if (empty($_SESSION['cart']) && get_current_user_id()) {
 			$cart = $this->get_persistent_cart();
 			$_SESSION['cart'] = $cart;
 			$_SESSION['coupon'] = 0;
@@ -298,7 +298,7 @@ 
 	 * @return array()
 	 */
 	function get_persistent_cart() {
-		if(get_current_user_id())
+		if (get_current_user_id())
 			$cart = get_user_meta(get_current_user_id(), '_wpshop_persistent_cart', true);
 		return empty($cart) ? array() : $cart;
 	}
@@ -314,8 +314,8 @@ 
 	 * Save the persistent cart when updated
 	 */
 	function persistent_cart_update() {
-		if(get_current_user_id())
-			update_user_meta( get_current_user_id(), '_wpshop_persistent_cart', array(
+		if (get_current_user_id())
+			update_user_meta(get_current_user_id(), '_wpshop_persistent_cart', array(
 					'cart' => $_SESSION['cart'],
 			));
 	}
@@ -324,7 +324,7 @@ 
 	 * Delete the persistent cart
 	 */
 	function persistent_cart_destroy() {
-		delete_user_meta( get_current_user_id(), '_wpshop_persistent_cart' );
+		delete_user_meta(get_current_user_id(), '_wpshop_persistent_cart');
 	}
 
 	/**
@@ -344,60 +344,60 @@ 
 	 *
 	 * @return mixed If an error occured return a alert message. In the other case if the quantity is correctly set return true
 	 */
-	function set_product_qty($product_id, $quantity, $combined_variation_id = '', $cart = array(), $from_admin = '', $order_id = '' ) {
+	function set_product_qty($product_id, $quantity, $combined_variation_id = '', $cart = array(), $from_admin = '', $order_id = '') {
 		// Init Cart var
-		$cart = ( !empty($cart) ) ? $cart : $_SESSION['cart'];
-		$wpshop_cart_type = ( !empty($cart) && !empty($cart['cart_type']) ) ? $cart['cart_type'] : 'normal';
+		$cart = (!empty($cart)) ? $cart : $_SESSION['cart'];
+		$wpshop_cart_type = (!empty($cart) && !empty($cart['cart_type'])) ? $cart['cart_type'] : 'normal';
 		$parent_product_id = $product_id;
 		$selected_variations = array();
 
 		// Test if Product exists
-		if( !empty($product_id) && !empty($cart['order_items']) && !empty( $cart['order_items'][ $product_id ] ) ) {
+		if (!empty($product_id) && !empty($cart['order_items']) && !empty($cart['order_items'][$product_id])) {
 			// Test if is composed product ID
 			$pid = $product_id;
-			if (strpos($pid,'__') !== false) {
-				$product_data_id = explode( '__', $pid );
-				$pid = ( !empty( $product_data_id ) && !empty( $product_data_id[1] ) ) ? $product_data_id[1] : $cart['order_items'][ $product_id ]['item_id'];
+			if (strpos($pid, '__') !== false) {
+				$product_data_id = explode('__', $pid);
+				$pid = (!empty($product_data_id) && !empty($product_data_id[1])) ? $product_data_id[1] : $cart['order_items'][$product_id]['item_id'];
 			}
 
 			// Checking stock
 			$wps_product_ctr = new wps_product_ctr();
-			$return = $wps_product_ctr->check_stock($pid, $quantity, $combined_variation_id );
-			if( $return !== true) {
+			$return = $wps_product_ctr->check_stock($pid, $quantity, $combined_variation_id);
+			if ($return !== true) {
 				return $return;
 			}
 
 			// Check Variations to construct product to add to cart
-			if( !empty($product_data_id) || get_post_type($product_id) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
+			if (!empty($product_data_id) || get_post_type($product_id) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
 				// Check Parent ID
-				if( get_post_type($cart['order_items'][ $product_id ]['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) {
-					$parent_product_id = $cart['order_items'][ $product_id ]['item_id'];
+				if (get_post_type($cart['order_items'][$product_id]['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) {
+					$parent_product_id = $cart['order_items'][$product_id]['item_id'];
 				}
 				else {
-					$parent_data = wpshop_products::get_parent_variation( $cart['order_items'][ $product_id ]['item_id'] );
+					$parent_data = wpshop_products::get_parent_variation($cart['order_items'][$product_id]['item_id']);
 					$parent_post = $parent_data['parent_post'];
 					$parent_product_id = $parent_post->ID;
 				}
-				if( !empty($product_data_id) ) {
-					unset( $product_data_id[0] );
-					if( !empty($product_data_id) ) {
-						foreach( $product_data_id as $i ) {
-							$mtdt = get_post_meta( $i, '_wpshop_variations_attribute_def', true );
-							if( !empty($mtdt) && is_array($mtdt) ) {
-								$selected_variations = array_merge( $selected_variations, $mtdt );
+				if (!empty($product_data_id)) {
+					unset($product_data_id[0]);
+					if (!empty($product_data_id)) {
+						foreach ($product_data_id as $i) {
+							$mtdt = get_post_meta($i, '_wpshop_variations_attribute_def', true);
+							if (!empty($mtdt) && is_array($mtdt)) {
+								$selected_variations = array_merge($selected_variations, $mtdt);
 							}
 						}
 					}
 				}
 				else {
-					$selected_variations = get_post_meta( $product_id, '_wpshop_variations_attribute_def', true );
+					$selected_variations = get_post_meta($product_id, '_wpshop_variations_attribute_def', true);
 				}
 			}
 
-			$formatted_product = $this->prepare_product_to_add_to_cart( $parent_product_id, $quantity, $selected_variations );
+			$formatted_product = $this->prepare_product_to_add_to_cart($parent_product_id, $quantity, $selected_variations);
 			$product_to_add_to_cart = $formatted_product[0];
 			$new_pid = $product_id;
-			$return = $this->add_to_cart( $product_to_add_to_cart, array( $new_pid => $quantity ), $wpshop_cart_type, array(), $from_admin, $cart, $order_id );
+			$return = $this->add_to_cart($product_to_add_to_cart, array($new_pid => $quantity), $wpshop_cart_type, array(), $from_admin, $cart, $order_id);
 			return $return;
 		}
 		else {
@@ -410,11 +410,11 @@ 
 	 * @param   string	product_id	contains the id of the product to add to the cart
 	 * @param   string	quantity	contains the quantity of the item to add
 	 */
-	function add_to_cart( $product_list, $quantity, $type='normal', $extra_params=array(), $from_admin = '', $order_meta = '', $order_id = '' ) {
+	function add_to_cart($product_list, $quantity, $type = 'normal', $extra_params = array(), $from_admin = '', $order_meta = '', $order_id = '') {
 		global $wpdb;
 		/** Check if a cart already exist. If there is already a cart that is not the same type (could be a cart or a quotation)	*/
-		if ( empty( $from_admin ) ){
-			if(isset($_SESSION['cart']['cart_type']) && $type != $_SESSION['cart']['cart_type'] ) {
+		if (empty($from_admin)) {
+			if (isset($_SESSION['cart']['cart_type']) && $type != $_SESSION['cart']['cart_type']) {
 				return __('You have another element type into your cart. Please finalize it by going to cart page.', 'wpshop');
 			}
 			else {
@@ -427,19 +427,19 @@ 
 		$order_items = array();
 
 		foreach ($product_list as $pid => $product_more_content) {
-			if ( count($product_list) == 1 ) {
-				if ( !isset( $quantity[$pid] ) ) $quantity[$pid] = 1;
+			if (count($product_list) == 1) {
+				if (!isset($quantity[$pid])) $quantity[$pid] = 1;
 				$product = wpshop_products::get_product_data($product_more_content['id'], false, '"publish", "free_product"');
 				/** Check if the selected product exist	*/
-				if ( $product === false ) return __('This product does not exist', 'wpshop');
+				if ($product === false) return __('This product does not exist', 'wpshop');
 
 				/** Get information about the product price	*/
 				$product_price_check = wpshop_prices::get_product_price($product, 'check_only');
-				if ( $product_price_check !== true ) return $product_price_check;
+				if ($product_price_check !== true) return $product_price_check;
 
 				$the_quantity = 1;
 
-				if ( !empty($product_more_content['defined_variation_priority']) && $product_more_content['defined_variation_priority'] == 'combined' && !empty($product_more_content['variations']) && !empty($product_more_content['variations'][0]) ) {
+				if (!empty($product_more_content['defined_variation_priority']) && $product_more_content['defined_variation_priority'] == 'combined' && !empty($product_more_content['variations']) && !empty($product_more_content['variations'][0])) {
 					/** Get the asked quantity for each product and check if there is enough stock	*/
 					$the_quantity = $quantity[$pid];
 				}
@@ -451,14 +451,14 @@ 
 				//$quantity[$pid] = $the_quantity;
 
 				$variation_id = 0;
-				if ( !empty($product_more_content) && !empty($product_more_content['variations']) && !empty($product_more_content['variations'][0]) && !empty($product_more_content['defined_variation_priority']) && $product_more_content['defined_variation_priority'] == 'combined' ){
+				if (!empty($product_more_content) && !empty($product_more_content['variations']) && !empty($product_more_content['variations'][0]) && !empty($product_more_content['defined_variation_priority']) && $product_more_content['defined_variation_priority'] == 'combined') {
 					$variation_id = $product_more_content['variations'][0];
 				}
 				//$quantity_to_check = ( !empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) && !empty($_SESSION['cart']['order_items'][$pid]) && !empty($_SESSION['cart']['order_items'][$pid]['item_qty'])  ) ? $_SESSION['cart']['order_items'][$pid]['item_qty'] : $the_quantity;
 
 				$wps_product_ctr = new wps_product_ctr();
-				$product_stock = $wps_product_ctr->check_stock($product_more_content['id'], $the_quantity, $variation_id );
-				if ( $product_stock !== true ) {
+				$product_stock = $wps_product_ctr->check_stock($product_more_content['id'], $the_quantity, $variation_id);
+				if ($product_stock !== true) {
 					return $product_stock;
 				}
 			}
@@ -467,99 +467,99 @@ 
 			$order_items[$pid]['product_qty'] = $the_quantity;
 
 			/** For product with variation	*/
-			$order_items[$pid]['product_variation_type'] = !empty( $product_more_content['variation_priority']) ? $product_more_content['variation_priority'] : '';
+			$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) {
+			if (!empty($product_more_content['variations'])) {
+				foreach ($product_more_content['variations'] as $variation_id) {
 					$order_items[$pid]['product_variation'][] = $variation_id;
 				}
 			}
 		}
 
-		$current_cart = ( !empty( $order_meta )) ? $order_meta : array();
-		$order = $this->calcul_cart_information($order_items, $extra_params, $current_cart );
+		$current_cart = (!empty($order_meta)) ? $order_meta : array();
+		$order = $this->calcul_cart_information($order_items, $extra_params, $current_cart);
 
-		if( empty($from_admin) ) {
+		if (empty($from_admin)) {
 			self::store_cart_in_session($order);
 			/** Store the cart into database for connected user */
-			if ( get_current_user_id() ) {
+			if (get_current_user_id()) {
 				$this->persistent_cart_update();
 			}
 		}
 		else {
-			update_post_meta($order_id, '_order_postmeta', $order );
+			update_post_meta($order_id, '_order_postmeta', $order);
 
 		}
 		return 'success';
 	}
 
-	function prepare_product_to_add_to_cart( $product_id, $product_qty, $wpshop_variation_selected = array() ) {
+	function prepare_product_to_add_to_cart($product_id, $product_qty, $wpshop_variation_selected = array()) {
 		$product_price = '';
 		$product_data = wpshop_products::get_product_data($product_id);
 
 		// Free vars
-		if ( !empty($wpshop_variation_selected['free']) ){
+		if (!empty($wpshop_variation_selected['free'])) {
 			$free_variations = $wpshop_variation_selected['free'];
 			unset($wpshop_variation_selected['free']);
 		}
 
 		// If product have many variations
-		if ( count($wpshop_variation_selected ) > 1 ) {
-			if ( !empty($wpshop_variation_selected) ) {
-				$product_with_variation = wpshop_products::get_variation_by_priority( $wpshop_variation_selected, $product_id, true );
+		if (count($wpshop_variation_selected) > 1) {
+			if (!empty($wpshop_variation_selected)) {
+				$product_with_variation = wpshop_products::get_variation_by_priority($wpshop_variation_selected, $product_id, true);
 			}
 
-			if ( !empty($product_with_variation[$product_id]['variations']) ) {
+			if (!empty($product_with_variation[$product_id]['variations'])) {
 				$product = $product_data;
 				$has_variation = true;
 				$head_product_id = $product_id;
 
-				if ( !empty($product_with_variation[$product_id]['variations']) && ( count($product_with_variation[$product_id]['variations']) == 1 ) && ($product_with_variation[$product_id]['variation_priority'] != 'single') ) {
+				if (!empty($product_with_variation[$product_id]['variations']) && (count($product_with_variation[$product_id]['variations']) == 1) && ($product_with_variation[$product_id]['variation_priority'] != 'single')) {
 					$product_id = $product_with_variation[$product_id]['variations'][0];
 				}
 				$product = wpshop_products::get_product_data($product_id, true);
 
-				$the_product = array_merge( array(
+				$the_product = array_merge(array(
 						'product_id'	=> $product_id,
 						'product_qty' 	=> $product_qty
 				), $product);
 
 				/*	Add variation to product into cart for storage	*/
-				if ( !empty($product_with_variation[$head_product_id]['variations']) ) {
-					$the_product = wpshop_products::get_variation_price_behaviour( $the_product, $product_with_variation[$head_product_id]['variations'], $head_product_id, array('type' => $product_with_variation[$head_product_id]['variation_priority']) );
+				if (!empty($product_with_variation[$head_product_id]['variations'])) {
+					$the_product = wpshop_products::get_variation_price_behaviour($the_product, $product_with_variation[$head_product_id]['variations'], $head_product_id, array('type' => $product_with_variation[$head_product_id]['variation_priority']));
 				}
 
 				$product_data = $the_product;
 			}
 		}
 
-		$product_to_add_to_cart = array( $product_id => array( 'id' => $product_id, 'product_qty' => $product_qty ) );
+		$product_to_add_to_cart = array($product_id => array('id' => $product_id, 'product_qty' => $product_qty));
 
-		if ( !empty( $wpshop_variation_selected ) ) {
-			$variation_calculator = wpshop_products::get_variation_by_priority($wpshop_variation_selected, $product_id, true );
-			if ( !empty($variation_calculator[$product_id]) ) {
+		if (!empty($wpshop_variation_selected)) {
+			$variation_calculator = wpshop_products::get_variation_by_priority($wpshop_variation_selected, $product_id, true);
+			if (!empty($variation_calculator[$product_id])) {
 				$product_to_add_to_cart[$product_id] = array_merge($product_to_add_to_cart[$product_id], $variation_calculator[$product_id]);
 			}
 		}
 
 		$new_pid = $product_id;
 		//Create custom ID on single variations Product
-		if( !empty($product_to_add_to_cart[$product_id]['variations']) && count( $product_to_add_to_cart[$product_id]['variations'] ) && !empty( $product_to_add_to_cart[$product_id]['variation_priority'] ) && $product_to_add_to_cart[$product_id]['variation_priority'] == 'single' ) {
+		if (!empty($product_to_add_to_cart[$product_id]['variations']) && count($product_to_add_to_cart[$product_id]['variations']) && !empty($product_to_add_to_cart[$product_id]['variation_priority']) && $product_to_add_to_cart[$product_id]['variation_priority'] == 'single') {
 			$tmp_obj = $product_to_add_to_cart[$product_id];
-			unset( $product_to_add_to_cart[$product_id] );
+			unset($product_to_add_to_cart[$product_id]);
 			$key = $product_id;
-			foreach( $tmp_obj['variations'] as $variation_key) {
-				$key.= '__'. $variation_key;
+			foreach ($tmp_obj['variations'] as $variation_key) {
+				$key .= '__' . $variation_key;
 			}
 			$product_to_add_to_cart[$key] = $tmp_obj;
 			$new_pid = $key;
 		}
 		// Add free variations
-		if( !empty($free_variations) ) {
+		if (!empty($free_variations)) {
 			$product_to_add_to_cart[$new_pid]['free_variation'] = $free_variations;
 		}
-		return array( $product_to_add_to_cart, $new_pid );
+		return array($product_to_add_to_cart, $new_pid);
 	}
 
 	/**
@@ -570,67 +570,67 @@ 
 	 * @param boolean $from_admin
 	 * @return array
 	 */
-	function calcul_cart_information( $product_list, $custom_order_information = '', $current_cart = array(), $from_admin = false ) {
+	function calcul_cart_information($product_list, $custom_order_information = '', $current_cart = array(), $from_admin = false) {
 		// Price piloting option
-		$price_piloting = get_option( 'wpshop_shop_price_piloting' );
+		$price_piloting = get_option('wpshop_shop_price_piloting');
 
 		// Init vars
-		$cart_infos = ( !empty($current_cart) ) ? $current_cart : ( ( !empty($_SESSION) && !empty($_SESSION['cart']) && !$from_admin ) ? $_SESSION['cart'] : array() );
-		$cart_items = ( !empty($current_cart) && !empty($current_cart['order_items']) ) ? $current_cart['order_items'] : array();
-		$cart_items = ( !empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) && !$from_admin ) ? $_SESSION['cart']['order_items'] : $cart_items;
+		$cart_infos = (!empty($current_cart)) ? $current_cart : ((!empty($_SESSION) && !empty($_SESSION['cart']) && !$from_admin) ? $_SESSION['cart'] : array());
+		$cart_items = (!empty($current_cart) && !empty($current_cart['order_items'])) ? $current_cart['order_items'] : array();
+		$cart_items = (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) && !$from_admin) ? $_SESSION['cart']['order_items'] : $cart_items;
 		$order_total_ht = $order_total_ttc = $total_vat = 0; $order_tva = array();
 		$total_weight = $nb_of_items = $order_shipping_cost_by_article = 0;
 		$order_discount_rate = $order_discount_amount = $order_items_discount_amount = $order_total_discount_amount = 0;
 		$cart_infos['order_amount_to_pay_now'] = 0;
 
 		// If Product list is not empty, add products to order
-		if( !empty($product_list) ) {
-			foreach ( $product_list as $product_id => $d ) {
+		if (!empty($product_list)) {
+			foreach ($product_list as $product_id => $d) {
 				$product_key = $product_id;
-				if( isset( $d['product_qty']) ) {
+				if (isset($d['product_qty'])) {
 					// Formate datas
 					$product_id = $head_product_id = $d['product_id'];
 					$product_qty = $d['product_qty'];
 					$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 ) ) {
+					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, '"publish", "free_product"');
-					$the_product = array_merge( array('product_id'	=> $d['product_id'], 'product_qty' 	=> $product_qty ), $product);
+					$the_product = array_merge(array('product_id'	=> $d['product_id'], 'product_qty' 	=> $product_qty), $product);
 
 					//	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']) );
+					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'] ) ) {
+					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 );
+					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($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, '.', '');
 							}
 						}
 					}
 
 					// Delete product if its qty is equals to zero, else add this product to order
-					if( empty( $d['product_qty'] ) ) {
-						unset( $cart_items[$product_key] );
-						unset( $cart_infos['order_items'][$product_key] );
+					if (empty($d['product_qty'])) {
+						unset($cart_items[$product_key]);
+						unset($cart_infos['order_items'][$product_key]);
 					}
 					else {
 						$wps_orders = new wps_orders_ctr();
@@ -641,16 +641,16 @@ 
 		}
 
 		// Add automaticaly Add-to-cart Products
-		$cart_items = $this->add_automaticaly_product_to_cart( $cart_items );
+		$cart_items = $this->add_automaticaly_product_to_cart($cart_items);
 
 		// Calcul Cart Informations
 		$cart_has_special_product = false;
-		if( !empty($cart_items) && is_array($cart_items) ) {
-			foreach( $cart_items as $item_id => $item ) {
+		if (!empty($cart_items) && is_array($cart_items)) {
+			foreach ($cart_items as $item_id => $item) {
 
-				if ( !empty( $item[ 'item_amount_to_pay_now' ] ) ) {
+				if (!empty($item['item_amount_to_pay_now'])) {
 					$cart_has_special_product = true;
-					$cart_infos['order_amount_to_pay_now'] += ( $item[ 'item_amount_to_pay_now' ] * $item[ 'item_qty' ] );
+					$cart_infos['order_amount_to_pay_now'] += ($item['item_amount_to_pay_now'] * $item['item_qty']);
 				}
 				else {
 					$cart_infos['order_amount_to_pay_now'] += $item['item_total_ttc'];
@@ -659,11 +659,11 @@ 
 				$order_total_ht += $item['item_total_ht'];
 				$order_total_ttc += $item['item_total_ttc'];
 				// VAT
-				if( !empty($order_tva[ $item['item_tva_rate'] ]) ) {
-					$order_tva[ $item['item_tva_rate'] ] += $item['item_tva_total_amount'];
+				if (!empty($order_tva[$item['item_tva_rate']])) {
+					$order_tva[$item['item_tva_rate']] += $item['item_tva_total_amount'];
 				}
 				else {
-					$order_tva[ $item['item_tva_rate'] ] = $item['item_tva_total_amount'];
+					$order_tva[$item['item_tva_rate']] = $item['item_tva_total_amount'];
 				}
 			}
 		}
@@ -677,13 +677,13 @@ 
 		$cart_infos['order_total_ttc'] = $order_total_ttc;
 
 		// Calcul Shipping cost
-		if( !$from_admin && empty( $cart_infos['order_shipping_cost_fixe'] ) && empty($_SESSION[ 'wps-pos-addon' ]) ) {
+		if (!$from_admin && empty($cart_infos['order_shipping_cost_fixe']) && empty($_SESSION['wps-pos-addon'])) {
 			$wps_shipping = new wps_shipping();
-			$total_cart_ht_or_ttc_regarding_config = ( !empty($price_piloting) && $price_piloting == 'HT' ) ? $cart_infos['order_total_ht'] : $cart_infos['order_total_ttc'];
-			$cart_weight = $wps_shipping->calcul_cart_weight( $cart_infos['order_items'] );
-			$total_shipping_cost_for_products = $wps_shipping->calcul_cart_items_shipping_cost( $cart_infos['order_items'] );
-			foreach( $cart_infos['order_items'] as $item ) {
-				if( !empty($item['item_is_downloadable_']) && ( __( $item['item_is_downloadable_'], 'wpshop') == __('Yes', 'wpshop') || __( $item['item_is_downloadable_'], 'wpshop') == __('yes', 'wpshop') ) ) {
+			$total_cart_ht_or_ttc_regarding_config = (!empty($price_piloting) && $price_piloting == 'HT') ? $cart_infos['order_total_ht'] : $cart_infos['order_total_ttc'];
+			$cart_weight = $wps_shipping->calcul_cart_weight($cart_infos['order_items']);
+			$total_shipping_cost_for_products = $wps_shipping->calcul_cart_items_shipping_cost($cart_infos['order_items']);
+			foreach ($cart_infos['order_items'] as $item) {
+				if (!empty($item['item_is_downloadable_']) && (__($item['item_is_downloadable_'], 'wpshop') == __('Yes', 'wpshop') || __($item['item_is_downloadable_'], 'wpshop') == __('yes', 'wpshop'))) {
 					$is_downloadable_products = 'is_downloadable_';
 				} else {
 					$is_downloadable_products = '';
@@ -695,39 +695,39 @@ 
 		}
 
 		// If Price piloting is ET, calcul VAT on Shipping cost
-		if ( !empty($price_piloting) && $price_piloting == 'HT') {
-			$shipping_cost_vat = ( !empty($cart_infos['order_shipping_cost']) ) ? ( WPSHOP_VAT_ON_SHIPPING_COST / 100 ) * number_format(  $cart_infos['order_shipping_cost'], 2, '.', '') : 0;
+		if (!empty($price_piloting) && $price_piloting == 'HT') {
+			$shipping_cost_vat = (!empty($cart_infos['order_shipping_cost'])) ? (WPSHOP_VAT_ON_SHIPPING_COST / 100) * number_format($cart_infos['order_shipping_cost'], 2, '.', '') : 0;
 			$order_tva['VAT_shipping_cost'] = $shipping_cost_vat;
 		}
 
 		// Calcul VAT Total
-		if( !empty($order_tva) ) {
-			foreach( $order_tva as $vat_rate => $vat_value ) {
+		if (!empty($order_tva)) {
+			foreach ($order_tva as $vat_rate => $vat_value) {
 				$total_vat += $vat_value;
 			}
 		}
 
 		// Recap totals
-		$cart_infos['order_total_ttc'] = ( $cart_infos['order_total_ht'] + ( !empty( $cart_infos ) && !empty( $cart_infos[ 'order_shipping_cost' ] )  ? $cart_infos['order_shipping_cost'] : 0 )  + $total_vat );
+		$cart_infos['order_total_ttc'] = ($cart_infos['order_total_ht'] + (!empty($cart_infos) && !empty($cart_infos['order_shipping_cost']) ? $cart_infos['order_shipping_cost'] : 0) + $total_vat);
 		$cart_infos['order_grand_total_before_discount'] = $cart_infos['order_grand_total'] = $cart_infos['order_total_ttc'];
 
 		// Total to pay now
 		$total_received = 0;
-		if( !empty( $cart_infos['order_payment']['received'] ) ) {
-			foreach( $cart_infos['order_payment']['received'] as $received ) {
-				$total_received += ( ( !empty($received['status']) && ( $received['status'] == 'payment_received') && !empty($received['received_amount']) ) ? $received['received_amount'] : 0 );
+		if (!empty($cart_infos['order_payment']['received'])) {
+			foreach ($cart_infos['order_payment']['received'] as $received) {
+				$total_received += ((!empty($received['status']) && ($received['status'] == 'payment_received') && !empty($received['received_amount'])) ? $received['received_amount'] : 0);
 			}
 		}
 		$cart_infos['order_amount_to_pay_now'] = $cart_infos['order_grand_total'] - $total_received;
 
 		// Apply cart rules
-		$cart_rule = wpshop_cart_rules::get_cart_rule( $cart_infos['order_grand_total'] );
-		if( $cart_rule['cart_rule_exist'] ) {
-			if ( !empty( $cart_rule['cart_rule_info']['discount_type'] ) ) {
-				if ( $cart_rule['cart_rule_info']['discount_type'] == 'absolute_discount' ) {
+		$cart_rule = wpshop_cart_rules::get_cart_rule($cart_infos['order_grand_total']);
+		if ($cart_rule['cart_rule_exist']) {
+			if (!empty($cart_rule['cart_rule_info']['discount_type'])) {
+				if ($cart_rule['cart_rule_info']['discount_type'] == 'absolute_discount') {
 					$cart_infos['order_discount_type'] = 'amount';
 				}
-				if ( $cart_rule['cart_rule_info']['discount_type'] == 'percent_discount' ) {
+				if ($cart_rule['cart_rule_info']['discount_type'] == 'percent_discount') {
 					$cart_infos['order_discount_type'] = 'percent';
 				}
 			}
@@ -735,15 +735,15 @@ 
 		}
 
 		// Apply coupons
-		if( !empty( $_SESSION['cart']) && !$from_admin ) {
-			if( !empty($_SESSION['cart']['coupon_id']) ) {
+		if (!empty($_SESSION['cart']) && !$from_admin) {
+			if (!empty($_SESSION['cart']['coupon_id'])) {
 				$wps_coupon_mdl = new wps_coupon_model();
-				$coupon = $wps_coupon_mdl->get_coupon_data( $_SESSION['cart']['coupon_id'] );
-				if( !empty($coupon) && !empty($coupon['wpshop_coupon_code']) ) {
+				$coupon = $wps_coupon_mdl->get_coupon_data($_SESSION['cart']['coupon_id']);
+				if (!empty($coupon) && !empty($coupon['wpshop_coupon_code'])) {
 					$wps_coupon = new wps_coupon_ctr();
-					$coupon_checking = $wps_coupon->applyCoupon( $coupon['wpshop_coupon_code'] );
+					$coupon_checking = $wps_coupon->applyCoupon($coupon['wpshop_coupon_code']);
 					// If Coupon conditions are Ok
-					if( !empty($coupon_checking) && !empty( $coupon_checking['status'] ) && ( true == $coupon_checking['status'] ) ) {
+					if (!empty($coupon_checking) && !empty($coupon_checking['status']) && (true == $coupon_checking['status'])) {
 						$cart_infos['order_discount_type'] = $coupon['wpshop_coupon_discount_type'];
 						$cart_infos['order_discount_value'] = $coupon['wpshop_coupon_discount_value'];
 					}
@@ -752,51 +752,51 @@ 
 		}
 
 		// Checking Discounts
-		if( !empty($cart_infos['order_discount_type']) && isset( $cart_infos['order_discount_value'] ) ) {
+		if (!empty($cart_infos['order_discount_type']) && isset($cart_infos['order_discount_value'])) {
 			// Calcul discount on Order
 			switch ($cart_infos['order_discount_type']) {
 				case 'amount':
-					$cart_infos['order_discount_amount_total_cart'] = number_format( str_replace( ',', '.', $cart_infos['order_discount_value'] ), 2, '.', '');
+					$cart_infos['order_discount_amount_total_cart'] = number_format(str_replace(',', '.', $cart_infos['order_discount_value']), 2, '.', '');
 				break;
 				case 'percent':
-					$cart_infos['order_discount_amount_total_cart'] = number_format( $cart_infos['order_grand_total'], 2, '.', '') * ( number_format( str_replace( ',', '.', $cart_infos['order_discount_value']), 2, '.', '') / 100);
+					$cart_infos['order_discount_amount_total_cart'] = number_format($cart_infos['order_grand_total'], 2, '.', '') * (number_format(str_replace(',', '.', $cart_infos['order_discount_value']), 2, '.', '') / 100);
 				break;
 			}
-			if ( number_format( $cart_infos['order_discount_amount_total_cart'], 2, '.', '') > number_format( $cart_infos['order_grand_total'], 2, '.', '') ) {
+			if (number_format($cart_infos['order_discount_amount_total_cart'], 2, '.', '') > number_format($cart_infos['order_grand_total'], 2, '.', '')) {
 				$cart_infos['order_grand_total'] = 0;
 			}
 			else {
-				$cart_infos['order_grand_total'] -= number_format( $cart_infos['order_discount_amount_total_cart'], 2, '.', '');
+				$cart_infos['order_grand_total'] -= number_format($cart_infos['order_discount_amount_total_cart'], 2, '.', '');
 			}
-			$cart_infos['order_amount_to_pay_now'] = number_format( $cart_infos['order_grand_total'] - $total_received, 2, '.', '');
+			$cart_infos['order_amount_to_pay_now'] = number_format($cart_infos['order_grand_total'] - $total_received, 2, '.', '');
 		}
 
 		// Apply Partial Payments
 		$wpshop_payment = new wpshop_payment();
-		if( !empty($cart_infos['cart_type']) && $cart_infos['cart_type'] == 'quotation' ) {
-			$partial_payment = $wpshop_payment->partial_payment_calcul( $cart_infos['order_grand_total'], 'for_quotation' );
+		if (!empty($cart_infos['cart_type']) && $cart_infos['cart_type'] == 'quotation') {
+			$partial_payment = $wpshop_payment->partial_payment_calcul($cart_infos['order_grand_total'], 'for_quotation');
 		}
 		else {
-			$partial_payment = $wpshop_payment->partial_payment_calcul( $cart_infos['order_grand_total'] );
+			$partial_payment = $wpshop_payment->partial_payment_calcul($cart_infos['order_grand_total']);
 		}
-		if ( !empty($partial_payment['amount_to_pay']) && ( empty( $cart_infos['order_status'] ) || $cart_infos['order_status'] == 'awaiting_payment' ) && ( empty( $product_partial_payment_amount ) ) ) {
+		if (!empty($partial_payment['amount_to_pay']) && (empty($cart_infos['order_status']) || $cart_infos['order_status'] == 'awaiting_payment') && (empty($product_partial_payment_amount))) {
 			unset($partial_payment['display']);
-			$cart_infos['order_partial_payment'] = number_format( str_replace( ',', '.', $partial_payment['amount_to_pay'] ), 2, '.', '');
-			$cart_infos['order_amount_to_pay_now'] = number_format( str_replace( ',', '.', $partial_payment['amount_to_pay'] ), 2, '.', '');
+			$cart_infos['order_partial_payment'] = number_format(str_replace(',', '.', $partial_payment['amount_to_pay']), 2, '.', '');
+			$cart_infos['order_amount_to_pay_now'] = number_format(str_replace(',', '.', $partial_payment['amount_to_pay']), 2, '.', '');
 		}
 		// Apply Partial Payments : Subscription part.
-		elseif ( ! empty( $cart_has_special_product ) ) {
-			$cart_infos['order_amount_to_pay_now'] = number_format( str_replace( ',', '.', $cart_infos['order_amount_to_pay_now'] ), 2, '.', '');
+		elseif (!empty($cart_has_special_product)) {
+			$cart_infos['order_amount_to_pay_now'] = number_format(str_replace(',', '.', $cart_infos['order_amount_to_pay_now']), 2, '.', '');
 			$cart_infos['order_product_partial_payment'] = 'subscription';
 		}
 
 		// Cart Type
-		if ( isset( $_SESSION['cart']['cart_type'] ) ) {
+		if (isset($_SESSION['cart']['cart_type'])) {
 			$cart_infos['cart_type'] = $_SESSION['cart']['cart_type'];
 		}
 
 		// Apply Extra actions on cart infos
-		$cart_infos = apply_filters( 'wps_extra_calcul_in_cart', $cart_infos, $_SESSION );
+		$cart_infos = apply_filters('wps_extra_calcul_in_cart', $cart_infos, $_SESSION);
 
 		return $cart_infos;
 	}
@@ -806,18 +806,18 @@ 
 	 * @param array $cart_items
 	 * @return array
 	 */
-	function add_automaticaly_product_to_cart( $cart_items ) {
+	function add_automaticaly_product_to_cart($cart_items) {
 		global $wpdb;
 		// Recovery all products with options
 		$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);
 		$wps_orders = new wps_orders_ctr();
-		if ( !empty($post_list_with_options) && !empty($cart_items) ) {
-			foreach ( $post_list_with_options as $product_info) {
+		if (!empty($post_list_with_options) && !empty($cart_items)) {
+			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') && empty($cart_items[$product_info->post_id]) ) {
+				if (!empty($product_meta['cart']) && !empty($product_meta['cart']['auto_add']) && ($product_meta['cart']['auto_add'] == 'yes') && empty($cart_items[$product_info->post_id])) {
 					$product = wpshop_products::get_product_data($product_info->post_id, true, '"draft", "publish"');
-					$the_product = array_merge( array(
+					$the_product = array_merge(array(
 							'product_id'	=> $product_info->post_id,
 							'product_qty' 	=> 1
 					), $product);
@@ -831,28 +831,28 @@ 
 
 	/** Ajax action to reload cart **/
 	public static function wps_reload_cart() {
-		check_ajax_referer( 'wps_reload_cart' );
+		check_ajax_referer('wps_reload_cart');
 
 		$wps_cart = new wps_cart();
 		$result = $wps_cart->cart_content();
 
-		wp_die( json_encode( array( 'response' => $result) ) );
+		wp_die(json_encode(array('response' => $result)));
 	}
 
 
 	/** Ajax action to reload mini cart */
 	public function wps_reload_mini_cart() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_reload_mini_cart' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_reload_mini_cart'))
 			wp_die();
 
 		$wps_cart = new wps_cart();
-		$result = $wps_cart->mini_cart_content( sanitize_title( $_POST['type']) );
-		$count_items = ( !empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])  ) ? $wps_cart->total_cart_items( $_SESSION['cart']['order_items'] ) : 0;
+		$result = $wps_cart->mini_cart_content(sanitize_title($_POST['type']));
+		$count_items = (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) ? $wps_cart->total_cart_items($_SESSION['cart']['order_items']) : 0;
 		$free_shipping_alert = wpshop_tools::create_custom_hook('wpshop_free_shipping_cost_alert');
 
-		echo json_encode( array( 'response' => $result, 'count_items' => $count_items, 'free_shipping_alert' => $free_shipping_alert) );
+		echo json_encode(array('response' => $result, 'count_items' => $count_items, 'free_shipping_alert' => $free_shipping_alert));
 		die();
 	}
 
@@ -862,35 +862,35 @@ 
 	 * @return string
 	 */
 	function display_wps_numeration_cart() {
-		$cart_items = ( !empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) ) ? $_SESSION['cart']['order_items'] : array();
-		$total_cart_item = self::total_cart_items( $cart_items );
+		$cart_items = (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) ? $_SESSION['cart']['order_items'] : array();
+		$total_cart_item = self::total_cart_items($cart_items);
 
 		ob_start();
-		require(wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "cart/numeration-cart") );
+		require(wpshop_tools::get_template_part(WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "cart/numeration-cart"));
 		$output = ob_get_contents();
 		ob_end_clean();
 		return $output;
 	}
 
-	public function display_button_add_to_cart( $args ) {
-		$button_text = __( 'Add to cart', 'wpshop' );
+	public function display_button_add_to_cart($args) {
+		$button_text = __('Add to cart', 'wpshop');
 		$use_button = true;
-		$output = __( 'No product has been found.', 'wpshop' );
+		$output = __('No product has been found.', 'wpshop');
 
-		if ( !empty( $args ) && !empty( $args['pid'] ) ) {
+		if (!empty($args) && !empty($args['pid'])) {
 
 			/** The user send the text in argument */
-			if ( !empty( $args['text' ] ) ) {
+			if (!empty($args['text'])) {
 				$button_text = $args['text'];
 			}
 
 			/** The user send use input */
-			if ( !empty( $args['use_button'] ) && 'false' == $args['use_button'] ) {
+			if (!empty($args['use_button']) && 'false' == $args['use_button']) {
 				$use_button = false;
 			}
 
 			ob_start();
-			require_once( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, 'frontend/cart', 'button', 'add-to-cart' ) );
+			require_once(wpshop_tools::get_template_part(WPS_CART_DIR, WPS_CART_TPL_DIR, 'frontend/cart', 'button', 'add-to-cart'));
 			$output = ob_get_clean();
 		}
 
@@ -899,21 +899,21 @@ 
 
 	/** Ajax action to reload summary cart */
 	public static function wps_reload_summary_cart() {
-		check_ajax_referer( 'wps_reload_summary_cart' );
+		check_ajax_referer('wps_reload_summary_cart');
 
 		$wps_cart = new wps_cart();
 		$result = $wps_cart->resume_cart_content();
 
-		wp_die( json_encode( array( 'response' => $result, ) ) );
+		wp_die(json_encode(array('response' => $result,)));
 	}
 
 
 	/** Display Apply Coupon Interface **/
 	function display_apply_coupon_interface() {
 		$output = '';
-		if ( !empty( $_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) ) {
+		if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
 			ob_start();
-			require_once( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "coupon/apply_coupon") );
+			require_once(wpshop_tools::get_template_part(WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "coupon/apply_coupon"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -923,30 +923,30 @@ 
 
 	/** AJAX - action to apply coupon **/
 	function wps_apply_coupon() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_apply_coupon' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_apply_coupon'))
 			wp_die();
 
 		$status = false; $response = '';
-		$coupon = ( !empty($_POST['coupon_code']) ) ? wpshop_tools::varSanitizer( $_POST['coupon_code']) : null;
-		if( !empty($coupon) ) {
+		$coupon = (!empty($_POST['coupon_code'])) ? wpshop_tools::varSanitizer($_POST['coupon_code']) : null;
+		if (!empty($coupon)) {
 			$wps_coupon_ctr = new wps_coupon_ctr();
 			$result = $wps_coupon_ctr->applyCoupon($coupon);
-			if ($result['status']===true) {
+			if ($result['status'] === true) {
 				$order = $this->calcul_cart_information(array());
 				$this->store_cart_in_session($order);
 				$status = true;
-				$response = '<div class="wps-alert-success">' .__( 'The coupon has been applied', 'wpshop' ). '</div>';
+				$response = '<div class="wps-alert-success">' . __('The coupon has been applied', 'wpshop') . '</div>';
 			}
 			else {
-				$response = '<div class="wps-alert-error">' .$result['message']. '</div>';
+				$response = '<div class="wps-alert-error">' . $result['message'] . '</div>';
 			}
 		}
 		else {
-			$response = '<div class="wps-alert-error">'.__( 'A coupon code is required', 'wpshop'). '</div>';
+			$response = '<div class="wps-alert-error">' . __('A coupon code is required', 'wpshop') . '</div>';
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		die();
 	}
 
@@ -955,24 +955,24 @@ 
 	 * AJAX - Pass to step two in the Checkout tunnel
 	 */
 	public static function wps_cart_pass_to_step_two() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_cart_pass_to_step_two' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_cart_pass_to_step_two'))
 			wp_die();
 
 		$status = false; $response = '';
-		$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-		if( !empty($checkout_page_id) ) {
-			$permalink_option = get_option( 'permalink_structure' );
-			$step = ( get_current_user_id() != 0 ) ?  3 : 2;
-			$response = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step='.$step;
+		$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+		if (!empty($checkout_page_id)) {
+			$permalink_option = get_option('permalink_structure');
+			$step = (get_current_user_id() != 0) ? 3 : 2;
+			$response = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=' . $step;
 			$response = apply_filters('wps_extra_signup_actions', $response);
 			$status = true;
 		}
 		else {
-			$response = '<div class="wps-alert-error">' .__( 'An error was occured, please retry later or contact the website administrator', 'wpshop' ). '</div>';
+			$response = '<div class="wps-alert-error">' . __('An error was occured, please retry later or contact the website administrator', 'wpshop') . '</div>';
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response));
+		echo json_encode(array('status' => $status, 'response' => $response));
 		die();
 	}
 
@@ -981,14 +981,14 @@ 
 	 * AJAX - Empty the cart
 	 */
 	function wps_empty_cart() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_empty_cart' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_empty_cart'))
 			wp_die();
 
 
 		$this->empty_cart();
-		echo json_encode( array( 'status' => true) );
+		echo json_encode(array('status' => true));
 		die();
 	}
 }

Braces +54 added lines, -64 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_cart {
 
 	function __construct() {
@@ -151,12 +153,10 @@ 
 				require( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "cart/cart") );
 				$output = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				return '<div class="wps-alert-info">' .__( 'Your cart is empty', 'wpshop' ).'</div>';;
 			}
-		}
-		else {
+		} else {
 			return '<div class="wps-alert-info">' .__( 'Your cart is empty', 'wpshop' ).'</div>';;
 		}
 		return $output;
@@ -174,15 +174,13 @@ 
 			/** Count items **/
 			$total_cart_item = self::total_cart_items( $cart_items );
 			$mini_cart_body = self::mini_cart_content( $type );
-		}
-		else {
+		} else {
 			$mini_cart_body = self::mini_cart_content();
 		}
 		ob_start();
 		if( !empty($type) && $type == 'fixed' ) {
 			require(wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/fixed-mini-cart") );
-		}
-		else {
+		} else {
 			require( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/mini-cart") );
 		}
 
@@ -210,18 +208,15 @@ 
 				ob_start();
 				if( !empty($type) && $type == 'fixed' ) {
 					require( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/fixed-mini-cart", "content") );
-				}
-				else {
+				} else {
 					require( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/mini-cart", "content") );
 				}
 				$output = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				$output = '<div class="wps-alert-info">' .__( 'Your cart is empty', 'wpshop' ).'</div>';
 			}
-		}
-		else {
+		} else {
 			$output = '<div class="wps-alert-info">' . __( 'Your cart is empty', 'wpshop' ).'</div>';
 		}
 		return $output;
@@ -256,12 +251,10 @@ 
 				require_once( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "resume-cart/resume-cart", "content") );
 				$output = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				$resume_cart_body = '<div class="wps-alert-info">' .__( 'Your cart is empty', 'wpshop' ).'</div>';
 			}
-		}
-		else {
+		} else {
 			$resume_cart_body ='<div class="wps-alert-info">' .__( 'Your cart is empty', 'wpshop' ).'</div>';
 		}
 		return $output;
@@ -298,8 +291,9 @@ 
 	 * @return array()
 	 */
 	function get_persistent_cart() {
-		if(get_current_user_id())
-			$cart = get_user_meta(get_current_user_id(), '_wpshop_persistent_cart', true);
+		if(get_current_user_id()) {
+					$cart = get_user_meta(get_current_user_id(), '_wpshop_persistent_cart', true);
+		}
 		return empty($cart) ? array() : $cart;
 	}
 
@@ -314,10 +308,11 @@ 
 	 * Save the persistent cart when updated
 	 */
 	function persistent_cart_update() {
-		if(get_current_user_id())
-			update_user_meta( get_current_user_id(), '_wpshop_persistent_cart', array(
+		if(get_current_user_id()) {
+					update_user_meta( get_current_user_id(), '_wpshop_persistent_cart', array(
 					'cart' => $_SESSION['cart'],
 			));
+		}
 	}
 
 	/**
@@ -372,8 +367,7 @@ 
 				// Check Parent ID
 				if( get_post_type($cart['order_items'][ $product_id ]['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) {
 					$parent_product_id = $cart['order_items'][ $product_id ]['item_id'];
-				}
-				else {
+				} else {
 					$parent_data = wpshop_products::get_parent_variation( $cart['order_items'][ $product_id ]['item_id'] );
 					$parent_post = $parent_data['parent_post'];
 					$parent_product_id = $parent_post->ID;
@@ -388,8 +382,7 @@ 
 							}
 						}
 					}
-				}
-				else {
+				} else {
 					$selected_variations = get_post_meta( $product_id, '_wpshop_variations_attribute_def', true );
 				}
 			}
@@ -399,8 +392,7 @@ 
 			$new_pid = $product_id;
 			$return = $this->add_to_cart( $product_to_add_to_cart, array( $new_pid => $quantity ), $wpshop_cart_type, array(), $from_admin, $cart, $order_id );
 			return $return;
-		}
-		else {
+		} else {
 			return __('This product does not exist in the cart.', 'wpshop');
 		}
 	}
@@ -416,8 +408,7 @@ 
 		if ( empty( $from_admin ) ){
 			if(isset($_SESSION['cart']['cart_type']) && $type != $_SESSION['cart']['cart_type'] ) {
 				return __('You have another element type into your cart. Please finalize it by going to cart page.', 'wpshop');
-			}
-			else {
+			} else {
 				$_SESSION['cart']['cart_type'] = $type;
 			}
 			$order_meta = $_SESSION['cart'];
@@ -428,22 +419,27 @@ 
 
 		foreach ($product_list as $pid => $product_more_content) {
 			if ( count($product_list) == 1 ) {
-				if ( !isset( $quantity[$pid] ) ) $quantity[$pid] = 1;
+				if ( !isset( $quantity[$pid] ) ) {
+					$quantity[$pid] = 1;
+				}
 				$product = wpshop_products::get_product_data($product_more_content['id'], false, '"publish", "free_product"');
 				/** Check if the selected product exist	*/
-				if ( $product === false ) return __('This product does not exist', 'wpshop');
+				if ( $product === false ) {
+					return __('This product does not exist', 'wpshop');
+				}
 
 				/** Get information about the product price	*/
 				$product_price_check = wpshop_prices::get_product_price($product, 'check_only');
-				if ( $product_price_check !== true ) return $product_price_check;
+				if ( $product_price_check !== true ) {
+					return $product_price_check;
+				}
 
 				$the_quantity = 1;
 
 				if ( !empty($product_more_content['defined_variation_priority']) && $product_more_content['defined_variation_priority'] == 'combined' && !empty($product_more_content['variations']) && !empty($product_more_content['variations'][0]) ) {
 					/** Get the asked quantity for each product and check if there is enough stock	*/
 					$the_quantity = $quantity[$pid];
-				}
-				else {
+				} else {
 					/** Get the asked quantity for each product and check if there is enough stock	*/
 					$the_quantity = $quantity[$pid];
 				}
@@ -486,8 +482,7 @@ 
 			if ( get_current_user_id() ) {
 				$this->persistent_cart_update();
 			}
-		}
-		else {
+		} else {
 			update_post_meta($order_id, '_order_postmeta', $order );
 
 		}
@@ -631,8 +626,7 @@ 
 					if( empty( $d['product_qty'] ) ) {
 						unset( $cart_items[$product_key] );
 						unset( $cart_infos['order_items'][$product_key] );
-					}
-					else {
+					} else {
 						$wps_orders = new wps_orders_ctr();
 						$cart_items[$product_key] = $wps_orders->add_product_to_order($the_product);
 					}
@@ -651,8 +645,7 @@ 
 				if ( !empty( $item[ 'item_amount_to_pay_now' ] ) ) {
 					$cart_has_special_product = true;
 					$cart_infos['order_amount_to_pay_now'] += ( $item[ 'item_amount_to_pay_now' ] * $item[ 'item_qty' ] );
-				}
-				else {
+				} else {
 					$cart_infos['order_amount_to_pay_now'] += $item['item_total_ttc'];
 				}
 
@@ -661,13 +654,11 @@ 
 				// VAT
 				if( !empty($order_tva[ $item['item_tva_rate'] ]) ) {
 					$order_tva[ $item['item_tva_rate'] ] += $item['item_tva_total_amount'];
-				}
-				else {
+				} else {
 					$order_tva[ $item['item_tva_rate'] ] = $item['item_tva_total_amount'];
 				}
 			}
-		}
-		else {
+		} else {
 			return array();
 		}
 
@@ -764,8 +755,7 @@ 
 			}
 			if ( number_format( $cart_infos['order_discount_amount_total_cart'], 2, '.', '') > number_format( $cart_infos['order_grand_total'], 2, '.', '') ) {
 				$cart_infos['order_grand_total'] = 0;
-			}
-			else {
+			} else {
 				$cart_infos['order_grand_total'] -= number_format( $cart_infos['order_discount_amount_total_cart'], 2, '.', '');
 			}
 			$cart_infos['order_amount_to_pay_now'] = number_format( $cart_infos['order_grand_total'] - $total_received, 2, '.', '');
@@ -775,8 +765,7 @@ 
 		$wpshop_payment = new wpshop_payment();
 		if( !empty($cart_infos['cart_type']) && $cart_infos['cart_type'] == 'quotation' ) {
 			$partial_payment = $wpshop_payment->partial_payment_calcul( $cart_infos['order_grand_total'], 'for_quotation' );
-		}
-		else {
+		} else {
 			$partial_payment = $wpshop_payment->partial_payment_calcul( $cart_infos['order_grand_total'] );
 		}
 		if ( !empty($partial_payment['amount_to_pay']) && ( empty( $cart_infos['order_status'] ) || $cart_infos['order_status'] == 'awaiting_payment' ) && ( empty( $product_partial_payment_amount ) ) ) {
@@ -844,8 +833,9 @@ 
 	public function wps_reload_mini_cart() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_reload_mini_cart' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_reload_mini_cart' ) ) {
+					wp_die();
+		}
 
 		$wps_cart = new wps_cart();
 		$result = $wps_cart->mini_cart_content( sanitize_title( $_POST['type']) );
@@ -925,8 +915,9 @@ 
 	function wps_apply_coupon() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_apply_coupon' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_apply_coupon' ) ) {
+					wp_die();
+		}
 
 		$status = false; $response = '';
 		$coupon = ( !empty($_POST['coupon_code']) ) ? wpshop_tools::varSanitizer( $_POST['coupon_code']) : null;
@@ -938,12 +929,10 @@ 
 				$this->store_cart_in_session($order);
 				$status = true;
 				$response = '<div class="wps-alert-success">' .__( 'The coupon has been applied', 'wpshop' ). '</div>';
-			}
-			else {
+			} else {
 				$response = '<div class="wps-alert-error">' .$result['message']. '</div>';
 			}
-		}
-		else {
+		} else {
 			$response = '<div class="wps-alert-error">'.__( 'A coupon code is required', 'wpshop'). '</div>';
 		}
 		echo json_encode( array( 'status' => $status, 'response' => $response ) );
@@ -957,8 +946,9 @@ 
 	public static function wps_cart_pass_to_step_two() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_cart_pass_to_step_two' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_cart_pass_to_step_two' ) ) {
+					wp_die();
+		}
 
 		$status = false; $response = '';
 		$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
@@ -968,8 +958,7 @@ 
 			$response = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step='.$step;
 			$response = apply_filters('wps_extra_signup_actions', $response);
 			$status = true;
-		}
-		else {
+		} else {
 			$response = '<div class="wps-alert-error">' .__( 'An error was occured, please retry later or contact the website administrator', 'wpshop' ). '</div>';
 		}
 		echo json_encode( array( 'status' => $status, 'response' => $response));
@@ -983,8 +972,9 @@ 
 	function wps_empty_cart() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_empty_cart' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_empty_cart' ) ) {
+					wp_die();
+		}
 
 
 		$this->empty_cart();

includes/modules/billing/billing.php

Indentation +1099 added lines, -1099 removed lines

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

includes/modules/wpshop_prices/wpshop_prices.php

Spacing +325 added lines, -325 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /**
  * WPSHOP Prices bootstrap file
@@ -9,17 +9,17 @@ 
  *
  */
 
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __("You are not allowed to use this service.", 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__("You are not allowed to use this service.", 'wpshop'));
 }
-if ( !class_exists("wpshop_prices") ) {
+if (!class_exists("wpshop_prices")) {
 	class wpshop_prices {
 
 		function __construct() {
 			add_action('wsphop_options', array('wpshop_prices', 'declare_options'));
 		}
 
-		public static function declare_options () {
+		public static function declare_options() {
 			register_setting('wpshop_options', 'wpshop_catalog_product_option', array('wpshop_prices', 'wpshop_options_validate_prices'));
 			add_settings_field('wpshop_catalog_product_option_discount', __('Activate the discount on products', 'wpshop'), array('wpshop_prices', 'wpshop_activate_discount_prices_field'), 'wpshop_catalog_product_option', 'wpshop_catalog_product_section');
 		}
@@ -29,37 +29,37 @@ 
 
 			/** Price attribute Def **/
 			$price_piloting_option = get_option('wpshop_shop_price_piloting');
-			$price_attribute_def = wpshop_attributes::getElement( ( (!empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? 'price_ht' : 'product_price' ), "'valid'", 'code');
+			$price_attribute_def = wpshop_attributes::getElement(((!empty($price_piloting_option) && $price_piloting_option == 'HT') ? 'price_ht' : 'product_price'), "'valid'", 'code');
 
 			/** Discount attributes **/
-			$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE code = %s OR code = %s OR  code = %s OR code = %s OR code = %s', 'discount_amount', 'discount_rate', 'special_price', 'special_from', 'special_to' );
+			$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s OR code = %s OR  code = %s OR code = %s OR code = %s', 'discount_amount', 'discount_rate', 'special_price', 'special_from', 'special_to');
 			$discount_attributes = $wpdb->get_results($query);
 
 			/** Check if discount is actived **/
-			if ( !empty( $input) && !empty($input['discount']) ) {
+			if (!empty($input) && !empty($input['discount'])) {
 				/** Activate the attributes **/
-				if ( !empty($discount_attributes) ) {
-					foreach ( $discount_attributes as $discount_attribute ) {
-						$update = $wpdb->prepare('UPDATE ' .WPSHOP_DBT_ATTRIBUTE. ' SET status = "valid" WHERE code = %s', $discount_attribute->code);
+				if (!empty($discount_attributes)) {
+					foreach ($discount_attributes as $discount_attribute) {
+						$update = $wpdb->prepare('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET status = "valid" WHERE code = %s', $discount_attribute->code);
 						$wpdb->query($update);
 					}
 				}
 
 				/** Affect discount attributes to All Attributes Set section where there is a Price attribute **/
-				$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE attribute_id = %d', $price_attribute_def->id);
-				$attributes_sections = $wpdb->get_results( $query );
-				if ( !empty($attributes_sections) ) {
-					foreach ( $attributes_sections as $attributes_section ) {
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %d', $price_attribute_def->id);
+				$attributes_sections = $wpdb->get_results($query);
+				if (!empty($attributes_sections)) {
+					foreach ($attributes_sections as $attributes_section) {
 						/** Check the Max Position for the Attribute section */
-						$query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE attribute_set_id = %d AND attribute_group_id = %d AND entity_type_id = %s', $attributes_section->attribute_set_id, $attributes_section->attribute_group_id, $attributes_section->entity_type_id);
-						$max_position = $wpdb->get_var( $query );
-						$max_position = ( !empty($max_position) ) ? $max_position : 0;
+						$query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_set_id = %d AND attribute_group_id = %d AND entity_type_id = %s', $attributes_section->attribute_set_id, $attributes_section->attribute_group_id, $attributes_section->entity_type_id);
+						$max_position = $wpdb->get_var($query);
+						$max_position = (!empty($max_position)) ? $max_position : 0;
 						/** Affect the discount attributes **/
-						foreach ( $discount_attributes as $discount_attribute) {
-							$query = $wpdb->prepare(' SELECT COUNT(*) AS count_attributes_affect FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE attribute_set_id = %d AND attribute_group_id = %d AND entity_type_id = %s AND attribute_id = %d', $attributes_section->attribute_set_id, $attributes_section->attribute_group_id, $attributes_section->entity_type_id, $discount_attribute->id);
-							$count_attribute_affectation = $wpdb->get_row( $query );
-							if ( !empty($count_attribute_affectation) && ( empty($count_attribute_affectation->count_attributes_affect) || $count_attribute_affectation->count_attributes_affect == 0 ) ) {
-								$result = $wpdb->insert( WPSHOP_DBT_ATTRIBUTE_DETAILS, array( 'status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $attributes_section->entity_type_id, 'attribute_set_id' => $attributes_section->attribute_set_id, 'attribute_group_id' => $attributes_section->attribute_group_id, 'attribute_id' => $discount_attribute->id, 'position' => $max_position) );
+						foreach ($discount_attributes as $discount_attribute) {
+							$query = $wpdb->prepare(' SELECT COUNT(*) AS count_attributes_affect FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_set_id = %d AND attribute_group_id = %d AND entity_type_id = %s AND attribute_id = %d', $attributes_section->attribute_set_id, $attributes_section->attribute_group_id, $attributes_section->entity_type_id, $discount_attribute->id);
+							$count_attribute_affectation = $wpdb->get_row($query);
+							if (!empty($count_attribute_affectation) && (empty($count_attribute_affectation->count_attributes_affect) || $count_attribute_affectation->count_attributes_affect == 0)) {
+								$result = $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $attributes_section->entity_type_id, 'attribute_set_id' => $attributes_section->attribute_set_id, 'attribute_group_id' => $attributes_section->attribute_group_id, 'attribute_id' => $discount_attribute->id, 'position' => $max_position));
 								$max_position += 1;
 							}
 						}
@@ -68,21 +68,21 @@ 
 			}
 			else {
 				/** Desactivate Discount Attributes **/
-				if ( !empty($discount_attributes) ) {
-					foreach ( $discount_attributes as $discount_attribute ) {
-						$update = $wpdb->prepare('UPDATE ' .WPSHOP_DBT_ATTRIBUTE. ' SET status = "notused" WHERE code = %s', $discount_attribute->code);
+				if (!empty($discount_attributes)) {
+					foreach ($discount_attributes as $discount_attribute) {
+						$update = $wpdb->prepare('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . ' SET status = "notused" WHERE code = %s', $discount_attribute->code);
 						$wpdb->query($update);
 					}
 				}
 
 				/** Delete the Price attribute set section affectation **/
-				$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE attribute_id = %d', $price_attribute_def->id);
-				$attributes_sections = $wpdb->get_results( $query );
-				if ( !empty($attributes_sections) ) {
-					foreach ( $attributes_sections as $attributes_section ) {
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_id = %d', $price_attribute_def->id);
+				$attributes_sections = $wpdb->get_results($query);
+				if (!empty($attributes_sections)) {
+					foreach ($attributes_sections as $attributes_section) {
 						/** Affect the discount attributes **/
-						foreach ( $discount_attributes as $discount_attribute) {
-							$wpdb->delete( WPSHOP_DBT_ATTRIBUTE_DETAILS, array( 'entity_type_id' => $attributes_section->entity_type_id, 'attribute_set_id' => $attributes_section->attribute_set_id, 'attribute_group_id' => $attributes_section->attribute_group_id, 'attribute_id' => $discount_attribute->id ) );
+						foreach ($discount_attributes as $discount_attribute) {
+							$wpdb->delete(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('entity_type_id' => $attributes_section->entity_type_id, 'attribute_set_id' => $attributes_section->attribute_set_id, 'attribute_group_id' => $attributes_section->attribute_group_id, 'attribute_id' => $discount_attribute->id));
 						}
 					}
 				}
@@ -94,72 +94,72 @@ 
 		public static function wpshop_activate_discount_prices_field() {
 			$product_discount_option = get_option('wpshop_catalog_product_option');
 
-			$output  = '<input type="checkbox" id="wpshop_catalog_product_option_discount" name="wpshop_catalog_product_option[discount]" ' .( (!empty($product_discount_option) && !empty($product_discount_option['discount'])) ? 'checked="checked"' : '' ). ' />';
-			$output .= '<a class="wpshop_infobulle_marker" title="' .__('Activate the possibility to create discount on products', 'wpshop'). '" href="#">?</a>';
+			$output  = '<input type="checkbox" id="wpshop_catalog_product_option_discount" name="wpshop_catalog_product_option[discount]" ' . ((!empty($product_discount_option) && !empty($product_discount_option['discount'])) ? 'checked="checked"' : '') . ' />';
+			$output .= '<a class="wpshop_infobulle_marker" title="' . __('Activate the possibility to create discount on products', 'wpshop') . '" href="#">?</a>';
 			echo $output;
 		}
 
-		public static function check_product_price( $product, $cart = false ) {
+		public static function check_product_price($product, $cart = false) {
 			$price_infos = array();
 			$wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
-			if ( !empty($product) ) {
-				if ( $cart ) {
-					$discount_config = self::check_discount_for_product($product['product_id'] );
-					if ( !empty($discount_config) ) {
+			if (!empty($product)) {
+				if ($cart) {
+					$discount_config = self::check_discount_for_product($product['product_id']);
+					if (!empty($discount_config)) {
 						$product['price_ttc_before_discount'] = $product['product_price'];
 						$product['price_ht_before_discount'] = $product['price_ht'];
 
-						if ( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'special_price' ) {
-							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] /100);
-							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] /100) : $discount_config['value'];
-							$product['tva'] = $product['price_ht'] * ( $product['tx_tva'] / 100);
+						if (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'special_price') {
+							$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] / 100);
+							$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] / 100) : $discount_config['value'];
+							$product['tva'] = $product['price_ht'] * ($product['tx_tva'] / 100);
 						}
-						elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
-							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht_before_discount'] - $discount_config['value'] ) : ( ( $product['price_ttc_before_discount'] - $discount_config['value'] ) / (1 + $product['tx_tva'] /100) ) ;
-							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * (1 + $product['tx_tva'] /100) : $product['price_ttc_before_discount'] - $discount_config['value'];
-							$product['tva'] =  $product['price_ht'] * ( $product['tx_tva'] / 100);
+						elseif (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount') {
+							$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? ($product['price_ht_before_discount'] - $discount_config['value']) : (($product['price_ttc_before_discount'] - $discount_config['value']) / (1 + $product['tx_tva'] / 100));
+							$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $product['price_ht'] * (1 + $product['tx_tva'] / 100) : $product['price_ttc_before_discount'] - $discount_config['value'];
+							$product['tva'] = $product['price_ht'] * ($product['tx_tva'] / 100);
 
 						}
-						elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
-							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht_before_discount'] * ( 1 -  $discount_config['value'] / 100) ) : ( ( $product['price_ttc_before_discount']  * ( 1 - ( $discount_config['value'] / 100 ) ) ) / (1 + $product['tx_tva'] /100) ) ;
-							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * ( 1 + $product['tx_tva'] /100) : $product['price_ttc_before_discount'] * ( 1 - ( $discount_config['value'] / 100 ) );
-							$product['tva'] =  $product['price_ht'] * ( $product['tx_tva'] / 100);
+						elseif (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
+							$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? ($product['price_ht_before_discount'] * (1 - $discount_config['value'] / 100)) : (($product['price_ttc_before_discount'] * (1 - ($discount_config['value'] / 100))) / (1 + $product['tx_tva'] / 100));
+							$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $product['price_ht'] * (1 + $product['tx_tva'] / 100) : $product['price_ttc_before_discount'] * (1 - ($discount_config['value'] / 100));
+							$product['tva'] = $product['price_ht'] * ($product['tx_tva'] / 100);
 
 						}
 
 
-						$price_infos['ati'] = ( !empty($product['price_ttc_before_discount'] )) ? number_format((float)$product['price_ttc_before_discount'], 2, '.', '') : number_format((float)$product['product_price'], 2, '.', '');
-						$price_infos['et'] = ( !empty($product['price_ht_before_discount'] ) ) ? number_format((float)$product['price_ht_before_discount'], 2, '.', '') : number_format((float)$product['price_ht'], 2, '.', '');
-						$price_infos['tva'] = $price_infos['et'] * ( $product['tx_tva'] / 100);
+						$price_infos['ati'] = (!empty($product['price_ttc_before_discount'])) ? number_format((float)$product['price_ttc_before_discount'], 2, '.', '') : number_format((float)$product['product_price'], 2, '.', '');
+						$price_infos['et'] = (!empty($product['price_ht_before_discount'])) ? number_format((float)$product['price_ht_before_discount'], 2, '.', '') : number_format((float)$product['price_ht'], 2, '.', '');
+						$price_infos['tva'] = $price_infos['et'] * ($product['tx_tva'] / 100);
 
-						$price_infos['discount']['discount_exist'] = ( !empty($product['price_ttc_before_discount'])  && !empty($product['price_ht_before_discount'] ) ) ? true : false;
-						$price_infos['discount']['discount_ati_price'] = ( !empty($product['price_ttc_before_discount']) ) ? number_format((float)$product['product_price'], 2, '.', '') : 0;
-						$price_infos['discount']['discount_et_price'] = ( !empty($product['price_ht_before_discount']) ) ? number_format( (float)$product['price_ht'], 2, '.', '' ) : 0;
-						$price_infos['discount']['discount_tva'] = ( !empty($product['price_ttc_before_discount']) && !empty($product['price_ht_before_discount']) ) ? number_format( ($price_infos['discount']['discount_ati_price'] - $price_infos['discount']['discount_et_price']), 2, '.', '') : 0;
+						$price_infos['discount']['discount_exist'] = (!empty($product['price_ttc_before_discount']) && !empty($product['price_ht_before_discount'])) ? true : false;
+						$price_infos['discount']['discount_ati_price'] = (!empty($product['price_ttc_before_discount'])) ? number_format((float)$product['product_price'], 2, '.', '') : 0;
+						$price_infos['discount']['discount_et_price'] = (!empty($product['price_ht_before_discount'])) ? number_format((float)$product['price_ht'], 2, '.', '') : 0;
+						$price_infos['discount']['discount_tva'] = (!empty($product['price_ttc_before_discount']) && !empty($product['price_ht_before_discount'])) ? number_format(($price_infos['discount']['discount_ati_price'] - $price_infos['discount']['discount_et_price']), 2, '.', '') : 0;
 					}
 					else {
-						$price_infos['ati'] = ( !empty($product['product_price'] )) ? number_format((float)$product['product_price'], 5, '.', '') : 0;
-						$price_infos['et'] = ( !empty($product['price_ht'] ) ) ? number_format((float)$product['price_ht'], 5, '.', '') : 0;
-						$price_infos['tva'] =  ( !empty($product['tva'] ) ) ? $product['tva'] : 0;
+						$price_infos['ati'] = (!empty($product['product_price'])) ? number_format((float)$product['product_price'], 5, '.', '') : 0;
+						$price_infos['et'] = (!empty($product['price_ht'])) ? number_format((float)$product['price_ht'], 5, '.', '') : 0;
+						$price_infos['tva'] = (!empty($product['tva'])) ? $product['tva'] : 0;
 					}
 
 
 				}
 				else {
-					if ( !empty( $product['price_ttc_before_discount']) && !empty( $product['price_ht_before_discount'] ) ) {
-						$price_infos['discount']['discount_exist'] = ( !empty($product['price_ttc_before_discount'])  && !empty($product['price_ht_before_discount'] ) ) ? true : false;
-						$price_infos['discount']['discount_ati_price'] = ( !empty($product['product_price']) ) ? number_format((float)$product['product_price'], 2, '.', '') : 0;
-						$price_infos['discount']['discount_et_price'] = ( !empty($product['price_ht']) ) ? number_format( (float)$product['price_ht'], 2, '.', '' ) : 0;
-						$price_infos['discount']['discount_tva'] = ( !empty($product['tva']) ) ? $product['tva'] : 0;
-
-						$price_infos['ati'] = ( !empty($product['price_ttc_before_discount'] )) ? number_format((float)$product['price_ttc_before_discount'], 5, '.', '') : 0;
-						$price_infos['et'] = ( !empty($product['price_ht_before_discount']) ) ? number_format((float)$product['price_ht_before_discount'], 5, '.', '') : 0;
-						$price_infos['tva'] =  $price_infos['ati'] - $price_infos['et'];
+					if (!empty($product['price_ttc_before_discount']) && !empty($product['price_ht_before_discount'])) {
+						$price_infos['discount']['discount_exist'] = (!empty($product['price_ttc_before_discount']) && !empty($product['price_ht_before_discount'])) ? true : false;
+						$price_infos['discount']['discount_ati_price'] = (!empty($product['product_price'])) ? number_format((float)$product['product_price'], 2, '.', '') : 0;
+						$price_infos['discount']['discount_et_price'] = (!empty($product['price_ht'])) ? number_format((float)$product['price_ht'], 2, '.', '') : 0;
+						$price_infos['discount']['discount_tva'] = (!empty($product['tva'])) ? $product['tva'] : 0;
+
+						$price_infos['ati'] = (!empty($product['price_ttc_before_discount'])) ? number_format((float)$product['price_ttc_before_discount'], 5, '.', '') : 0;
+						$price_infos['et'] = (!empty($product['price_ht_before_discount'])) ? number_format((float)$product['price_ht_before_discount'], 5, '.', '') : 0;
+						$price_infos['tva'] = $price_infos['ati'] - $price_infos['et'];
 					}
 					else {
-						$price_infos['ati'] = ( !empty($product['product_price'] )) ? number_format((float)$product['product_price'], 5, '.', '') : 0;
-						$price_infos['et'] = ( !empty($product['price_ht'] ) ) ? number_format((float)$product['price_ht'], 5, '.', '') : 0;
-						$price_infos['tva'] =  ( !empty($product['tva'] ) ) ? $product['tva'] : 0;
+						$price_infos['ati'] = (!empty($product['product_price'])) ? number_format((float)$product['product_price'], 5, '.', '') : 0;
+						$price_infos['et'] = (!empty($product['price_ht'])) ? number_format((float)$product['price_ht'], 5, '.', '') : 0;
+						$price_infos['tva'] = (!empty($product['tva'])) ? $product['tva'] : 0;
 					}
 				}
 			}
@@ -170,65 +170,65 @@ 
 			$wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
 // 			$wpshop_price_piloting_option = 'TTC';
  			/** Price for Mini-output **/
-			if( !empty($product['product_id']) && !$price_checking_done ) {
+			if (!empty($product['product_id']) && !$price_checking_done) {
 
 				/** Checking if it's a product with variation **/
-				$variation_option_checking = get_post_meta( $product['product_id'], '_wpshop_variation_defining', true );
+				$variation_option_checking = get_post_meta($product['product_id'], '_wpshop_variation_defining', true);
 
-				if( !empty($variation_option_checking) ) {
-					$variations_exists = wpshop_products::get_variation( $product['product_id'], 'publish' );
+				if (!empty($variation_option_checking)) {
+					$variations_exists = wpshop_products::get_variation($product['product_id'], 'publish');
 				}
 
-				if( !empty($variation_option_checking) && !empty($variations_exists) ) {
-					if ( !empty( $variation_option_checking['attributes']) ) {
-						foreach( $variation_option_checking['attributes'] as $attribute ) {
+				if (!empty($variation_option_checking) && !empty($variations_exists)) {
+					if (!empty($variation_option_checking['attributes'])) {
+						foreach ($variation_option_checking['attributes'] as $attribute) {
 							$selected_variation[$attribute] = 0;
-							if( !empty( $variation_option_checking['options'] ) && !empty( $variation_option_checking['options']['attributes_default_value'] ) && array_key_exists( $attribute, $variation_option_checking['options']['attributes_default_value']) ){
-								if ( $variation_option_checking['options']['attributes_default_value'][$attribute] != 'none') {
+							if (!empty($variation_option_checking['options']) && !empty($variation_option_checking['options']['attributes_default_value']) && array_key_exists($attribute, $variation_option_checking['options']['attributes_default_value'])) {
+								if ($variation_option_checking['options']['attributes_default_value'][$attribute] != 'none') {
 									$selected_variation[$attribute] = $variation_option_checking['options']['attributes_default_value'][$attribute];
 								}
 							}
 						}
 					}
-					if ( !empty($selected_variation) ) {
-						$product_with_variation = wpshop_products::get_variation_by_priority( $selected_variation, $product['product_id'] );
+					if (!empty($selected_variation)) {
+						$product_with_variation = wpshop_products::get_variation_by_priority($selected_variation, $product['product_id']);
 					}
-					if( empty($product_with_variation[$product['product_id']]['variations']) ) {
+					if (empty($product_with_variation[$product['product_id']]['variations'])) {
 						$product_with_variation[$product['product_id']]['variations'] = array();
 					}
-					if ( !empty($product_with_variation[$product['product_id']]['variation_priority']) ) {
-						$product =  wpshop_products::get_variation_price_behaviour( $product, $product_with_variation[$product['product_id']]['variations'], $product['product_id'], array('type' => $product_with_variation[$product['product_id']]['variation_priority'], 'text_from' => !empty($product_with_variation['text_from']) ? 'on' : '' ) );
+					if (!empty($product_with_variation[$product['product_id']]['variation_priority'])) {
+						$product = wpshop_products::get_variation_price_behaviour($product, $product_with_variation[$product['product_id']]['variations'], $product['product_id'], array('type' => $product_with_variation[$product['product_id']]['variation_priority'], 'text_from' => !empty($product_with_variation['text_from']) ? 'on' : ''));
 					}
 				}
 				else {
 					/** It's Simple product Check Discounts for products **/
-					$discount_config = self::check_discount_for_product( $product['product_id'] );
-					if ( !empty($discount_config) ) {
-						if ( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'special_price' ) {
+					$discount_config = self::check_discount_for_product($product['product_id']);
+					if (!empty($discount_config)) {
+						if (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'special_price') {
 							$product['price_ttc_before_discount'] = $product['product_price'];
 							$product['price_ht_before_discount'] = $product['price_ht'];
 
-							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] /100);
-							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] /100) : $discount_config['value'];
-							$product['tva'] = $product['price_ht'] * ( $product['tx_tva'] / 100);
+							$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] / 100);
+							$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] / 100) : $discount_config['value'];
+							$product['tva'] = $product['price_ht'] * ($product['tx_tva'] / 100);
 						}
-						elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
+						elseif (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount') {
 							$product['price_ttc_before_discount'] = $product['product_price'];
 							$product['price_ht_before_discount'] = $product['price_ht'];
 
-							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht_before_discount'] - $discount_config['value'] ) : ( ( $product['price_ttc_before_discount'] - $discount_config['value'] ) / (1 + $product['tx_tva'] /100) ) ;
-							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * (1 + $product['tx_tva'] /100) : $product['price_ttc_before_discount'] - $discount_config['value'];
-							$product['tva'] =  $product['price_ht'] * ( $product['tx_tva'] / 100);
+							$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? ($product['price_ht_before_discount'] - $discount_config['value']) : (($product['price_ttc_before_discount'] - $discount_config['value']) / (1 + $product['tx_tva'] / 100));
+							$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $product['price_ht'] * (1 + $product['tx_tva'] / 100) : $product['price_ttc_before_discount'] - $discount_config['value'];
+							$product['tva'] = $product['price_ht'] * ($product['tx_tva'] / 100);
 
 						}
-						elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
+						elseif (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
 							$product['price_ttc_before_discount'] = $product['product_price'];
 							$product['price_ht_before_discount'] = $product['price_ht'];
 
 
-							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht_before_discount'] * ( 1 - $discount_config['value'] / 100) ) : ( ( $product['price_ttc_before_discount']  * ( 1 - ( $discount_config['value'] / 100 ) ) ) / (1 + $product['tx_tva'] /100) ) ;
-							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * ( 1 + $product['tx_tva'] /100) : $product['price_ttc_before_discount'] * ( 1 - ( $discount_config['value'] / 100 ) );
-							$product['tva'] =  $product['price_ht'] * ( $product['tx_tva'] / 100);
+							$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? ($product['price_ht_before_discount'] * (1 - $discount_config['value'] / 100)) : (($product['price_ttc_before_discount'] * (1 - ($discount_config['value'] / 100))) / (1 + $product['tx_tva'] / 100));
+							$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $product['price_ht'] * (1 + $product['tx_tva'] / 100) : $product['price_ttc_before_discount'] * (1 - ($discount_config['value'] / 100));
+							$product['tva'] = $product['price_ht'] * ($product['tx_tva'] / 100);
 
 						}
 					}
@@ -236,116 +236,116 @@ 
 
 			}
 
-			$price_infos = self::check_product_price( $product );
-			$productCurrency = '<span class="wps-currency">'.wpshop_tools::wpshop_get_currency().'</span>';
+			$price_infos = self::check_product_price($product);
+			$productCurrency = '<span class="wps-currency">' . wpshop_tools::wpshop_get_currency() . '</span>';
 
 			$wps_marketing_tools = new wps_marketing_tools_ctr();
 
-			if ( !empty($price_infos) ) {
-				if ( $return_type == 'check_only' ) {
+			if (!empty($price_infos)) {
+				if ($return_type == 'check_only') {
 					/** Check if the product price has been set	*/
-					if( isset($price_infos['ati']) && $price_infos['ati'] === '') return __('This product cannot be purchased - the price is not yet announced', 'wpshop');
+					if (isset($price_infos['ati']) && $price_infos['ati'] === '') return __('This product cannot be purchased - the price is not yet announced', 'wpshop');
 					/** Check if the product price is coherent (not less than 0)	*/
-					if( isset($price_infos['ati']) && $price_infos['ati'] < 0) return __('This product cannot be purchased - its price is negative', 'wpshop');
+					if (isset($price_infos['ati']) && $price_infos['ati'] < 0) return __('This product cannot be purchased - its price is negative', 'wpshop');
 
 					return true;
 				}
-				elseif( $return_type == 'just_price_infos' ) {
+				elseif ($return_type == 'just_price_infos') {
 					$tpl_component = array();
 
-					$price = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $price_infos['et'] : $price_infos['ati'];
-					$exploded_price = explode('.', number_format($price,2, '.', ''));
-					$price = '<span class="wps-absolute-price">'.$exploded_price[0].'</span><span class="wpshop_price_centimes_display">,'.( (!empty($exploded_price[1]) ) ? $exploded_price[1] : '').'</span>';
+					$price = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $price_infos['et'] : $price_infos['ati'];
+					$exploded_price = explode('.', number_format($price, 2, '.', ''));
+					$price = '<span class="wps-absolute-price">' . $exploded_price[0] . '</span><span class="wpshop_price_centimes_display">,' . ((!empty($exploded_price[1])) ? $exploded_price[1] : '') . '</span>';
 
-					$tpl_component['TAX_PILOTING'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT')  ? __('ET', 'wpshop') : '';
+					$tpl_component['TAX_PILOTING'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? __('ET', 'wpshop') : '';
 
 					$tpl_component['CROSSED_OUT_PRICE'] = '';
 					$tpl_component['MESSAGE_SAVE_MONEY'] = '';
 
 
 
-					if( !empty($price_infos['discount']['discount_exist']) ) {
-						$crossed_out_price = ( (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? number_format($price_infos['et'], 2) : number_format($price_infos['ati'], 2) ).' '. $productCurrency;
+					if (!empty($price_infos['discount']['discount_exist'])) {
+						$crossed_out_price = ((!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? number_format($price_infos['et'], 2) : number_format($price_infos['ati'], 2)) . ' ' . $productCurrency;
 						$tpl_component['CROSSED_OUT_PRICE'] = $crossed_out_price;
-						if(!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') {
-							$exploded_discount_price = explode('.', number_format($price_infos['discount']['discount_et_price'],2, '.', ''));
+						if (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') {
+							$exploded_discount_price = explode('.', number_format($price_infos['discount']['discount_et_price'], 2, '.', ''));
 						}
 						else {
-							$exploded_discount_price = explode('.', number_format($price_infos['discount']['discount_ati_price'],2, '.', ''));
+							$exploded_discount_price = explode('.', number_format($price_infos['discount']['discount_ati_price'], 2, '.', ''));
 						}
 
-						$discount_price = $exploded_discount_price[0].'<span class="wpshop_price_centimes_display">,'.( (!empty($exploded_discount_price[1]) ) ? $exploded_discount_price[1] : '').'</span>';
-						$tpl_component['PRODUCT_PRICE'] = '<span class="wps-absolute-price">'.$discount_price.'</span> '.$productCurrency;
+						$discount_price = $exploded_discount_price[0] . '<span class="wpshop_price_centimes_display">,' . ((!empty($exploded_discount_price[1])) ? $exploded_discount_price[1] : '') . '</span>';
+						$tpl_component['PRODUCT_PRICE'] = '<span class="wps-absolute-price">' . $discount_price . '</span> ' . $productCurrency;
 
-						$tpl_component['MESSAGE_SAVE_MONEY'] = $wps_marketing_tools->display_message_you_save_money( $price_infos );
+						$tpl_component['MESSAGE_SAVE_MONEY'] = $wps_marketing_tools->display_message_you_save_money($price_infos);
 					}
 					else {
-						$tpl_component['PRODUCT_PRICE'] = $price.' '.$productCurrency;
+						$tpl_component['PRODUCT_PRICE'] = $price . ' ' . $productCurrency;
 					}
 
-					$post_type = get_post_type( $product['product_id'] );
-					if (  $post_type ==  WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) {
-						$price_display_attribute = get_post_meta( $product['product_id'], '_wpshop_variation_defining', true );
+					$post_type = get_post_type($product['product_id']);
+					if ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) {
+						$price_display_attribute = get_post_meta($product['product_id'], '_wpshop_variation_defining', true);
 					}
-					elseif( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-						$parent_def = wpshop_products::get_parent_variation ( $product['product_id'] );
-						if( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
+					elseif ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+						$parent_def = wpshop_products::get_parent_variation($product['product_id']);
+						if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
 							$parent_post = $parent_def['parent_post'];
-							$price_display_attribute = get_post_meta( $parent_post->ID, '_wpshop_variation_defining', true );
+							$price_display_attribute = get_post_meta($parent_post->ID, '_wpshop_variation_defining', true);
 						}
 					}
-					$price_display_option = get_option( 'wpshop_catalog_product_option' );
-					$tpl_component['PRICE_FROM'] = ( ( !empty($price_display_attribute) && empty($price_display_attribute['options'] ) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])  ) || ( ( !empty($price_display_attribute) && (!empty($price_display_attribute['options'] ) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from']) ) ) ) ) ) ? 'on' : '';
+					$price_display_option = get_option('wpshop_catalog_product_option');
+					$tpl_component['PRICE_FROM'] = ((!empty($price_display_attribute) && empty($price_display_attribute['options']) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])) || ((!empty($price_display_attribute) && (!empty($price_display_attribute['options']) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from'])))))) ? 'on' : '';
 
 					return $tpl_component;
 				}
-				else if ( $return_type == 'price_display' ) {
+				else if ($return_type == 'price_display') {
 					$tpl_component = array();
-					$price = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $price_infos['et'] : $price_infos['ati'];
+					$price = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $price_infos['et'] : $price_infos['ati'];
 
 					$price_data = $price_infos;
 
-					$exploded_price = explode('.', number_format($price,2, '.', ''));
-					$price = '<span class="wps-absolute-price">'.$exploded_price[0].'</span><span class="wpshop_price_centimes_display">.'.( (!empty($exploded_price[1]) ) ? $exploded_price[1] : '').'</span>';
+					$exploded_price = explode('.', number_format($price, 2, '.', ''));
+					$price = '<span class="wps-absolute-price">' . $exploded_price[0] . '</span><span class="wpshop_price_centimes_display">.' . ((!empty($exploded_price[1])) ? $exploded_price[1] : '') . '</span>';
 
-					$tpl_component['TAX_PILOTING'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT')  ? __('ET', 'wpshop') : '';
+					$tpl_component['TAX_PILOTING'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? __('ET', 'wpshop') : '';
 
 					$tpl_component['CROSSED_OUT_PRICE'] = '';
 					$tpl_component['MESSAGE_SAVE_MONEY'] = '';
 
-					if( !empty($price_infos['discount']['discount_exist']) ) {
+					if (!empty($price_infos['discount']['discount_exist'])) {
 						$text_from = false;
 						/** Get variation defining **/
-						$post_type = get_post_type( $product['product_id'] );
-						if( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-							$parent_def = wpshop_products::get_parent_variation ( $product['product_id'] );
-							if( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
+						$post_type = get_post_type($product['product_id']);
+						if ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+							$parent_def = wpshop_products::get_parent_variation($product['product_id']);
+							if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
 								$parent_post = $parent_def['parent_post'];
-								$price_display_attribute = get_post_meta( $parent_post->ID, '_wpshop_variation_defining', true );
+								$price_display_attribute = get_post_meta($parent_post->ID, '_wpshop_variation_defining', true);
 							}
 						}
 						else {
-							$price_display_attribute = get_post_meta( $product['product_id'], '_wpshop_variation_defining', true );
+							$price_display_attribute = get_post_meta($product['product_id'], '_wpshop_variation_defining', true);
 						}
-						$text_from = ( ( !empty($price_display_attribute) && empty($price_display_attribute['options'] ) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])  ) || ( ( !empty($price_display_attribute) && (!empty($price_display_attribute['options'] ) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from']) ) ) ) ) && !empty($product['text_from']) ) ? true : false;
+						$text_from = ((!empty($price_display_attribute) && empty($price_display_attribute['options']) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])) || ((!empty($price_display_attribute) && (!empty($price_display_attribute['options']) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from']))))) && !empty($product['text_from'])) ? true : false;
 
 
-						$exploded_price = explode('.', number_format($price_infos['discount']['discount_et_price'],2, '.', ''));
-						$price_infos['discount']['discount_et_price'] = '<span class="wps-absolute-price">'.$exploded_price[0].'</span><span class="wpshop_price_centimes_display">.'.( (!empty($exploded_price[1]) ) ? $exploded_price[1] : '').'</span>';
+						$exploded_price = explode('.', number_format($price_infos['discount']['discount_et_price'], 2, '.', ''));
+						$price_infos['discount']['discount_et_price'] = '<span class="wps-absolute-price">' . $exploded_price[0] . '</span><span class="wpshop_price_centimes_display">.' . ((!empty($exploded_price[1])) ? $exploded_price[1] : '') . '</span>';
 
-						$exploded_price = explode('.', number_format($price_infos['discount']['discount_ati_price'],2, '.', ''));
-						$price_infos['discount']['discount_ati_price'] = '<span class="wps-absolute-price">'.$exploded_price[0].'</span><span class="wpshop_price_centimes_display">.'.( (!empty($exploded_price[1]) ) ? $exploded_price[1] : '').'</span>';
+						$exploded_price = explode('.', number_format($price_infos['discount']['discount_ati_price'], 2, '.', ''));
+						$price_infos['discount']['discount_ati_price'] = '<span class="wps-absolute-price">' . $exploded_price[0] . '</span><span class="wpshop_price_centimes_display">.' . ((!empty($exploded_price[1])) ? $exploded_price[1] : '') . '</span>';
 
 
-						$crossed_out_price = ( (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? number_format($price_infos['et'], 2) : number_format($price_infos['ati'], 2) ).' '. $productCurrency;
-						$tpl_component['CROSSED_OUT_PRICE'] = str_replace( '.', ',', ( ( $text_from ) ? __('Price from', 'wpshop') . ' ' : '' ). wpshop_display::display_template_element('product_price_template_crossed_out_price', array('CROSSED_OUT_PRICE_VALUE' => $crossed_out_price)) );
-						$tpl_component['PRODUCT_PRICE'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? '<span class="wps-absolute-price">'. $price_infos['discount']['discount_et_price'].'</span> '.$productCurrency : '<span class="wps-absolute-price">'.$price_infos['discount']['discount_ati_price'].'</span> '.$productCurrency;
-						$tpl_component['MESSAGE_SAVE_MONEY'] = $wps_marketing_tools->display_message_you_save_money( $price_data );
+						$crossed_out_price = ((!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? number_format($price_infos['et'], 2) : number_format($price_infos['ati'], 2)) . ' ' . $productCurrency;
+						$tpl_component['CROSSED_OUT_PRICE'] = str_replace('.', ',', (($text_from) ? __('Price from', 'wpshop') . ' ' : '') . wpshop_display::display_template_element('product_price_template_crossed_out_price', array('CROSSED_OUT_PRICE_VALUE' => $crossed_out_price)));
+						$tpl_component['PRODUCT_PRICE'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? '<span class="wps-absolute-price">' . $price_infos['discount']['discount_et_price'] . '</span> ' . $productCurrency : '<span class="wps-absolute-price">' . $price_infos['discount']['discount_ati_price'] . '</span> ' . $productCurrency;
+						$tpl_component['MESSAGE_SAVE_MONEY'] = $wps_marketing_tools->display_message_you_save_money($price_data);
 
 					}
 					else {
-						if( get_post_type($product['product_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-							$parent_def = wpshop_products::get_parent_variation( $product['product_id'] );
+						if (get_post_type($product['product_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+							$parent_def = wpshop_products::get_parent_variation($product['product_id']);
 							$pid = $parent_def['parent_post'];
 							$pid = $pid->ID;
 						}
@@ -355,35 +355,35 @@ 
 
 						$text_from = false;
 						/** Get variation defining **/
-						$post_type = get_post_type( $pid );
-						if( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-							$parent_def = wpshop_products::get_parent_variation ( $pid );
-							if( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
+						$post_type = get_post_type($pid);
+						if ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+							$parent_def = wpshop_products::get_parent_variation($pid);
+							if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
 								$parent_post = $parent_def['parent_post'];
-								$price_display_attribute = get_post_meta( $parent_post->ID, '_wpshop_variation_defining', true );
+								$price_display_attribute = get_post_meta($parent_post->ID, '_wpshop_variation_defining', true);
 							}
 						}
 						else {
-							$price_display_attribute = get_post_meta( $pid, '_wpshop_variation_defining', true );
+							$price_display_attribute = get_post_meta($pid, '_wpshop_variation_defining', true);
 						}
 
-						$price_display_attribute = get_post_meta( $pid, '_wpshop_variation_defining', true );
+						$price_display_attribute = get_post_meta($pid, '_wpshop_variation_defining', true);
 
-						$text_from = ( ( !empty($price_display_attribute) && empty($price_display_attribute['options'] ) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])  ) || ( ( !empty($price_display_attribute) && (!empty($price_display_attribute['options'] ) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from']) ) ) ) ) ) ? true : false;
+						$text_from = ((!empty($price_display_attribute) && empty($price_display_attribute['options']) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])) || ((!empty($price_display_attribute) && (!empty($price_display_attribute['options']) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from'])))))) ? true : false;
 
-						$tpl_component['PRODUCT_PRICE']  = ( $text_from && !empty($product['text_from']) ) ? __('Price from', 'wpshop') . ' ' : '';
-						$tpl_component['PRODUCT_PRICE'] .= $price.' '.$productCurrency;
+						$tpl_component['PRODUCT_PRICE']  = ($text_from && !empty($product['text_from'])) ? __('Price from', 'wpshop') . ' ' : '';
+						$tpl_component['PRODUCT_PRICE'] .= $price . ' ' . $productCurrency;
 					}
 
 
 					// Replace . by ,
-					$tpl_component['PRODUCT_PRICE'] = str_replace( '.',',', $tpl_component['PRODUCT_PRICE'] );
+					$tpl_component['PRODUCT_PRICE'] = str_replace('.', ',', $tpl_component['PRODUCT_PRICE']);
 
-					if ( $output_type == 'complete_sheet' ) {
-						$price_tpl = wpshop_display::display_template_element('product_price_template_complete_sheet', $tpl_component );
+					if ($output_type == 'complete_sheet') {
+						$price_tpl = wpshop_display::display_template_element('product_price_template_complete_sheet', $tpl_component);
 					}
-					elseif ( $output_type == 'mini_output' || in_array('mini_output', $output_type ) ) {
-						$price_tpl = wpshop_display::display_template_element('product_price_template_mini_output', $tpl_component );
+					elseif ($output_type == 'mini_output' || in_array('mini_output', $output_type)) {
+						$price_tpl = wpshop_display::display_template_element('product_price_template_mini_output', $tpl_component);
 					}
 					return $price_tpl;
 				}
@@ -403,7 +403,7 @@ 
 		 * @return stdClass ( value, id ) L'id de l'attribut et le taux de TVA /
 		 * Attribute ID and the VAT rate
 		 */
-		public static function get_rate_vat( $product_id ) {
+		public static function get_rate_vat($product_id) {
 			global $wpdb;
 
 			/**
@@ -417,18 +417,18 @@ 
 						INNER JOIN " . WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER . " as ATTR_VAL_INT ON ( ATTR_VAL_INT.attribute_id = ATTR.id AND ATTR_VAL_OPTIONS.id=ATTR_VAL_INT.value )
 					WHERE ATTR.code=%s AND ATTR_VAL_INT.entity_id=%d";
 
-			$request = $wpdb->prepare( $query, array( 'tx_tva',  $product_id ) );
-			$rate_vat = $wpdb->get_row( $request );
+			$request = $wpdb->prepare($query, array('tx_tva', $product_id));
+			$rate_vat = $wpdb->get_row($request);
 
 			/**
 			 * Vérifie ensuite si elle est vide, si elle est vide met la valeur par
 			 * défaut / Then checks if it is empty , if empty the value put the
 			 * default value
 			 */
-			if( empty( $rate_vat ) ) {
-				wpeologs_ctr::log_datas_in_files( 'wps_product', array(
+			if (empty($rate_vat)) {
+				wpeologs_ctr::log_datas_in_files('wps_product', array(
 					'object_id' 	=> $product_id,
-					'message' 		=> __( 'Use the default VAT rate', 'wpshop' ) ), 0
+					'message' 		=> __('Use the default VAT rate', 'wpshop') ), 0
 				);
 
 				$query = "
@@ -437,8 +437,8 @@ 
 							INNER JOIN " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " as ATTR_VAL_OPTIONS ON ATTR_VAL_OPTIONS.attribute_id = ATTR.id
 						WHERE ATTR.code=%s AND ATTR_VAL_OPTIONS.id=ATTR.default_value";
 
-				$request = $wpdb->prepare( $query, array( 'tx_tva' ) );
-				$rate_vat = $wpdb->get_row( $request );
+				$request = $wpdb->prepare($query, array('tx_tva'));
+				$rate_vat = $wpdb->get_row($request);
 			}
 
 			/**
@@ -446,10 +446,10 @@ 
 			 * dans ce cas la on utilise le log / If it is still empty , it means that no
 			 * VAT rate found in this case the log is used
 			 */
-			if( empty( $rate_vat ) ) {
-				wpeologs_ctr::log_datas_in_files( 'wps_product', array(
+			if (empty($rate_vat)) {
+				wpeologs_ctr::log_datas_in_files('wps_product', array(
 					'object_id' 	=> $product_id,
-					'message' 		=> __( 'No VAT rate in the product and no default VAT rate found', 'wpshop' ) ), 2
+					'message' 		=> __('No VAT rate in the product and no default VAT rate found', 'wpshop') ), 2
 				);
 			}
 
@@ -459,19 +459,19 @@ 
 		/**
 		 * Check if isset Required attributes
 		 */
-		public static function check_required_attributes( $product_id ) {
+		public static function check_required_attributes($product_id) {
 			$required_attributes_list = array();
-			$variation_option = get_post_meta( $product_id, '_wpshop_variation_defining', true);
-			if ( !empty($variation_option) && !empty($variation_option['attributes']) ) {
-				if( !empty($variation_option['options']) && !empty($variation_option['options']['required_attributes']) ) {
-					foreach( $variation_option['options']['required_attributes'] as $required_attribute ) {
-						$required_attributes_list[ $required_attribute ] = $required_attribute;
+			$variation_option = get_post_meta($product_id, '_wpshop_variation_defining', true);
+			if (!empty($variation_option) && !empty($variation_option['attributes'])) {
+				if (!empty($variation_option['options']) && !empty($variation_option['options']['required_attributes'])) {
+					foreach ($variation_option['options']['required_attributes'] as $required_attribute) {
+						$required_attributes_list[$required_attribute] = $required_attribute;
 					}
 				}
 				/** Check the attribute configuration **/
-				foreach ( $variation_option['attributes'] as $variation ) {
-					$attribute_def = wpshop_attributes::getElement( $variation, '"valid"', 'code' );
-					if ( is_object($attribute_def) && !empty($attribute_def->is_required) && $attribute_def->is_required == 'yes' ) {
+				foreach ($variation_option['attributes'] as $variation) {
+					$attribute_def = wpshop_attributes::getElement($variation, '"valid"', 'code');
+					if (is_object($attribute_def) && !empty($attribute_def->is_required) && $attribute_def->is_required == 'yes') {
 						$required_attributes_list[$attribute_def->code] = $attribute_def->code;
 					}
 				}
@@ -483,60 +483,60 @@ 
 		}
 
 		/** Check the Product lower price **/
-		public static function check_product_lower_price ( $product_id ) {
+		public static function check_product_lower_price($product_id) {
 			global $wpdb;
-			$price_piloting_option = get_option( 'wpshop_shop_price_piloting' );
+			$price_piloting_option = get_option('wpshop_shop_price_piloting');
 			$lower_price_product = $min_price = 0;
-			$variations = wpshop_products::get_variation( $product_id, 'publish' );
+			$variations = wpshop_products::get_variation($product_id, 'publish');
 			$single_variations = $lower_price_product_combinaison = array();
 			$first = true;
 
 			/** Check variations type **/
-			$query = $wpdb->prepare( 'SELECT DISTINCT( SUBSTRING( m.meta_value, 3,1 ) ) AS attributes_count FROM ' .$wpdb->postmeta .' AS m INNER JOIN ' .$wpdb->posts. ' AS P ON ((P.ID = m.post_id) AND (P.post_parent = %d)) WHERE meta_key LIKE %s', $product_id, '_wpshop_variations_attribute_def' );
-			$variation_type = $wpdb->get_results( $query );
+			$query = $wpdb->prepare('SELECT DISTINCT( SUBSTRING( m.meta_value, 3,1 ) ) AS attributes_count FROM ' . $wpdb->postmeta . ' AS m INNER JOIN ' . $wpdb->posts . ' AS P ON ((P.ID = m.post_id) AND (P.post_parent = %d)) WHERE meta_key LIKE %s', $product_id, '_wpshop_variations_attribute_def');
+			$variation_type = $wpdb->get_results($query);
 
 
 			/** Check which type of variation contains the product **/
 			$contains_simple_variation = false;
-			if ( !empty($variation_type) ) {
-				foreach( $variation_type as $k => $value ) {
-					if( $value->attributes_count == '1' ) {
+			if (!empty($variation_type)) {
+				foreach ($variation_type as $k => $value) {
+					if ($value->attributes_count == '1') {
 						$contains_simple_variation = true;
 					}
 				}
 			}
 
-			if ( $contains_simple_variation ) {
+			if ($contains_simple_variation) {
 
-				if( !empty($variations) ) {
-					$attributes = get_post_meta( $product_id, '_wpshop_variation_defining', true);
-					if ( !empty($attributes) && !empty($attributes['attributes']) ) {
+				if (!empty($variations)) {
+					$attributes = get_post_meta($product_id, '_wpshop_variation_defining', true);
+					if (!empty($attributes) && !empty($attributes['attributes'])) {
 						/** Construct an array with all cheaper attributes **/
-						foreach( $attributes['attributes'] as $key=>$attribute ) {
+						foreach ($attributes['attributes'] as $key=>$attribute) {
 							$min_price = 0;
 							$first = true;
-							foreach( $variations as $k => $variation) {
-								if ( !empty($variation['variation_def']) && count($variation['variation_def']) == 1 ) {
-									if( array_key_exists($attribute, $variation['variation_def'] ) ) {
-										$variation_price = ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? $variation['variation_dif']['price_ht'] : !empty( $variation['variation_dif']['product_price'] ) ? $variation['variation_dif']['product_price'] : 0;
+							foreach ($variations as $k => $variation) {
+								if (!empty($variation['variation_def']) && count($variation['variation_def']) == 1) {
+									if (array_key_exists($attribute, $variation['variation_def'])) {
+										$variation_price = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? $variation['variation_dif']['price_ht'] : !empty($variation['variation_dif']['product_price']) ? $variation['variation_dif']['product_price'] : 0;
 
 										/** Check Discount **/
-										$variation_price = ( !empty( $variation['variation_dif']['special_price'] ) && $variation['variation_dif']['special_price'] > 0 ) ? $variation['variation_dif']['special_price'] : $variation_price;
-										if( empty($variation['variation_dif']['special_price']) && !empty($variation['variation_dif']['discount_rate']) && $variation['variation_dif']['discount_rate'] > 0) {
-											$query = $wpdb->prepare( 'SELECT value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d', $variation['variation_dif']['tx_tva'] );
-											$tx_tva = $wpdb->get_var( $query );
-											$variation_price =  $variation['variation_dif']['price_ht'] / ( 1 + ($variation['variation_dif']['discount_rate'] / 100 ) );
-											$variation_price = ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? $variation_price : $variation_price * 1 + ($tx_tva / 100);
+										$variation_price = (!empty($variation['variation_dif']['special_price']) && $variation['variation_dif']['special_price'] > 0) ? $variation['variation_dif']['special_price'] : $variation_price;
+										if (empty($variation['variation_dif']['special_price']) && !empty($variation['variation_dif']['discount_rate']) && $variation['variation_dif']['discount_rate'] > 0) {
+											$query = $wpdb->prepare('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $variation['variation_dif']['tx_tva']);
+											$tx_tva = $wpdb->get_var($query);
+											$variation_price = $variation['variation_dif']['price_ht'] / (1 + ($variation['variation_dif']['discount_rate'] / 100));
+											$variation_price = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? $variation_price : $variation_price * 1 + ($tx_tva / 100);
 										}
-										elseif( empty($variation['variation_dif']['special_price']) && !empty($variation['variation_dif']['discount_amount']) && $variation['variation_dif']['discount_amount'] > 0 ) {
-											$query = $wpdb->prepare( 'SELECT value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d', $variation['variation_dif']['tx_tva'] );
-											$tx_tva = $wpdb->get_var( $query );
-											$variation_price =  $variation['variation_dif']['price_ht'] - $variation['variation_dif']['discount_amount'];
-											$variation_price = ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? $variation_price : $variation_price * 1 + ($tx_tva / 100);
+										elseif (empty($variation['variation_dif']['special_price']) && !empty($variation['variation_dif']['discount_amount']) && $variation['variation_dif']['discount_amount'] > 0) {
+											$query = $wpdb->prepare('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $variation['variation_dif']['tx_tva']);
+											$tx_tva = $wpdb->get_var($query);
+											$variation_price = $variation['variation_dif']['price_ht'] - $variation['variation_dif']['discount_amount'];
+											$variation_price = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? $variation_price : $variation_price * 1 + ($tx_tva / 100);
 										}
 
 										/** Check the Min-price **/
-										if( $first|| $min_price >= $variation_price ) {
+										if ($first || $min_price >= $variation_price) {
 											$first = false;
 											$min_price = $variation_price;
 											$lower_price_product_combinaison['variations'][$attribute] = $k;
@@ -550,22 +550,22 @@ 
 				}
 			}
 			else {
-				if ( !empty($product_id) ) {
-					if( !empty($variations) ) {
+				if (!empty($product_id)) {
+					if (!empty($variations)) {
 
-						foreach( $variations as $variation_id => $variation) {
-							if ( !empty($variation['variation_dif']) && !empty($variation['variation_def']) && count($variation['variation_def']) > 1) {
-								$variation_price = ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? ( ( !empty($variation['variation_dif']['price_ht']) ) ? $variation['variation_dif']['price_ht'] : 0) : ( ( !empty($variation['variation_dif']['product_price']) ) ? $variation['variation_dif']['product_price'] : 0);
+						foreach ($variations as $variation_id => $variation) {
+							if (!empty($variation['variation_dif']) && !empty($variation['variation_def']) && count($variation['variation_def']) > 1) {
+								$variation_price = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? ((!empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : 0) : ((!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0);
 								/** Check the Min-price **/
-								if( $min_price >= $variation_price || $first ) {
+								if ($min_price >= $variation_price || $first) {
 									$min_price = $variation_price;
 									$var_id = $variation_id;
 								}
 							}
-							$first  = false;
+							$first = false;
 						}
 
-						if ( !empty($var_id) ) {
+						if (!empty($var_id)) {
 							$lower_price_product_combinaison['variations'][] = $var_id;
 							$lower_price_product_combinaison['variation_priority'] = 'combined';
 						}
@@ -581,25 +581,25 @@ 
 		 * @param array $discount_config
 		 * @return array
 		 */
-		public static function calcul_discounted_price( $product, $discount_config ) {
-			$wpshop_price_piloting_option = get_option( 'wpshop_shop_price_piloting');
-			if( !empty($discount_config) ) {
+		public static function calcul_discounted_price($product, $discount_config) {
+			$wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
+			if (!empty($discount_config)) {
 
-				if ( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'special_price' ) {
-					$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] /100);
-					$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] /100) : $discount_config['value'];
+				if (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'special_price') {
+					$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] / 100);
+					$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] / 100) : $discount_config['value'];
 					$product['tva'] = $product['product_price'] - $product['price_ht'];
 				}
-				elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
-					$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht'] - $discount_config['value'] ) : ( ( $product['product_price'] - $discount_config['value'] ) / (1 + $product['tx_tva'] /100) ) ;
-					$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * (1 + $product['tx_tva'] /100) : $product['product_price'] - $discount_config['value'];
-					$product['tva'] =  $product['product_price'] - $product['price_ht'];
+				elseif (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount') {
+					$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? ($product['price_ht'] - $discount_config['value']) : (($product['product_price'] - $discount_config['value']) / (1 + $product['tx_tva'] / 100));
+					$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $product['price_ht'] * (1 + $product['tx_tva'] / 100) : $product['product_price'] - $discount_config['value'];
+					$product['tva'] = $product['product_price'] - $product['price_ht'];
 
 				}
-				elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
-					$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht'] * ( 1 -  $discount_config['value'] / 100) ) : ( ( $product['product_price']  * ( 1 - ( $discount_config['value'] / 100 ) ) ) / (1 + $product['tx_tva'] /100) ) ;
-					$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * ( 1 + $product['tx_tva'] /100) : $product['product_price'] * ( 1 - ( $discount_config['value'] / 100 ) );
-					$product['tva'] =   $product['product_price'] - $product['price_ht'];
+				elseif (!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
+					$product['price_ht'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? ($product['price_ht'] * (1 - $discount_config['value'] / 100)) : (($product['product_price'] * (1 - ($discount_config['value'] / 100))) / (1 + $product['tx_tva'] / 100));
+					$product['product_price'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $product['price_ht'] * (1 + $product['tx_tva'] / 100) : $product['product_price'] * (1 - ($discount_config['value'] / 100));
+					$product['tva'] = $product['product_price'] - $product['price_ht'];
 				}
 			}
 			return $product;
@@ -607,39 +607,39 @@ 
 
 
 		/** Check Discount for Product **/
-		public static function check_discount_for_product( $product_id, $head_product_id = 0 ) {
+		public static function check_discount_for_product($product_id, $head_product_id = 0) {
 			$discount_config = array();
 			$time_def = array('0000-00-00 00:00:00', '0000-00-00');
 
-			if( !empty($product_id) ) {
-				if ( !empty($head_product_id) ) {
-					$product_meta = get_post_meta( $head_product_id, '_wpshop_product_metadata', true );
-					$product_discount_date_from = ( !empty($product_meta['special_from']) ) ? $product_meta['special_from'] : 0;
-					$product_discount_date_to = ( !empty($product_meta['special_to']) ) ? $product_meta['special_to'] : 0;
+			if (!empty($product_id)) {
+				if (!empty($head_product_id)) {
+					$product_meta = get_post_meta($head_product_id, '_wpshop_product_metadata', true);
+					$product_discount_date_from = (!empty($product_meta['special_from'])) ? $product_meta['special_from'] : 0;
+					$product_discount_date_to = (!empty($product_meta['special_to'])) ? $product_meta['special_to'] : 0;
 
-					$product_meta = get_post_meta( $product_id, '_wpshop_product_metadata', true );
+					$product_meta = get_post_meta($product_id, '_wpshop_product_metadata', true);
 				}
 				else {
-					$product_meta = get_post_meta( $product_id, '_wpshop_product_metadata', true );
-					$product_discount_date_from = ( !empty($product_meta['special_from']) ) ? $product_meta['special_from'] : 0;
-					$product_discount_date_to = ( !empty($product_meta['special_to']) ) ? $product_meta['special_to'] : 0;
+					$product_meta = get_post_meta($product_id, '_wpshop_product_metadata', true);
+					$product_discount_date_from = (!empty($product_meta['special_from'])) ? $product_meta['special_from'] : 0;
+					$product_discount_date_to = (!empty($product_meta['special_to'])) ? $product_meta['special_to'] : 0;
 				}
 
 				$current_date = date('Y-m-d');
 
-				if ( !empty( $product_meta ) ) {
+				if (!empty($product_meta)) {
 
-					if( ( empty($product_discount_date_from) && empty($product_discount_date_to) ) || ( in_array($product_discount_date_from, $time_def)  && in_array( $product_discount_date_to, $time_def) ) || (strtotime($product_discount_date_from) < strtotime($current_date) && strtotime($current_date) < strtotime($product_discount_date_to) ) ) {
+					if ((empty($product_discount_date_from) && empty($product_discount_date_to)) || (in_array($product_discount_date_from, $time_def) && in_array($product_discount_date_to, $time_def)) || (strtotime($product_discount_date_from) < strtotime($current_date) && strtotime($current_date) < strtotime($product_discount_date_to))) {
 						/** Special Price **/
-						if ( !empty($product_meta['special_price']) && $product_meta['special_price'] > 0 ) {
+						if (!empty($product_meta['special_price']) && $product_meta['special_price'] > 0) {
 							$discount_config['type'] = 'special_price';
 							$discount_config['value'] = $product_meta['special_price'];
 						}
-						elseif( !empty($product_meta['discount_amount']) && $product_meta['discount_amount'] > 0) {
+						elseif (!empty($product_meta['discount_amount']) && $product_meta['discount_amount'] > 0) {
 							$discount_config['type'] = 'discount_amount';
 							$discount_config['value'] = $product_meta['discount_amount'];
 						}
-						elseif( !empty($product_meta['discount_rate']) && $product_meta['discount_rate'] > 0 ) {
+						elseif (!empty($product_meta['discount_rate']) && $product_meta['discount_rate'] > 0) {
 							$discount_config['type'] = 'discount_rate';
 							$discount_config['value'] = $product_meta['discount_rate'];
 						}
@@ -652,13 +652,13 @@ 
 		/**
 		 * Check the parent product price
 		 */
-		function check_parent_product_price( $product ) {
+		function check_parent_product_price($product) {
 			$price_infos = array();
-			if( !empty($product) ) {
+			if (!empty($product)) {
 				$price_infos['ati'] = $product['product_price'];
 				$price_infos['et'] = $product['price_ht'];
 				$price_infos['tva'] = $product['tva'];
-				$price_infos['fork_price'] = array( 'have_fork_price' => false, 'min_product_price' => '', 'max_product_price' => '');
+				$price_infos['fork_price'] = array('have_fork_price' => false, 'min_product_price' => '', 'max_product_price' => '');
 			}
 			return $price_infos;
 		}
@@ -668,81 +668,81 @@ 
 			global $wpdb;
 			$status = false; $result = '';
 			@ini_set('max_execution_time', '500');
-			$price_piloting_option = get_option( 'wpshop_shop_price_piloting' );
-			$output_type_option = get_option( 'wpshop_display_option' );
+			$price_piloting_option = get_option('wpshop_shop_price_piloting');
+			$output_type_option = get_option('wpshop_display_option');
 			$output_type = $output_type_option['wpshop_display_list_type'];
 
 			/** Get tx_tva attribute_id **/
-			$query = $wpdb->prepare( 'SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE code = %s', 'tx_tva' );
-			$tx_tva_attribute_id = $wpdb->get_var( $query );
+			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s', 'tx_tva');
+			$tx_tva_attribute_id = $wpdb->get_var($query);
 
 			/** Product entity Definition **/
-			$product_entity = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
+			$product_entity = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
 
 			/** Attributes def **/
-			$tva_attribute_def = wpshop_attributes::getElement('tva',"'valid'", 'code');
-			$product_price_attribute_def = wpshop_attributes::getElement('product_price',"'valid'", 'code');
-			$price_ht_attribute_def = wpshop_attributes::getElement('price_ht',"'valid'", 'code');
+			$tva_attribute_def = wpshop_attributes::getElement('tva', "'valid'", 'code');
+			$product_price_attribute_def = wpshop_attributes::getElement('product_price', "'valid'", 'code');
+			$price_ht_attribute_def = wpshop_attributes::getElement('price_ht', "'valid'", 'code');
 
-			if ( !empty($tx_tva_attribute_id) ) {
-				$query = $wpdb->prepare( 'SELECT id, value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE attribute_id = %d', $tx_tva_attribute_id, 'valid' );
-				$tx_tva = $wpdb->get_results( $query );
+			if (!empty($tx_tva_attribute_id)) {
+				$query = $wpdb->prepare('SELECT id, value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d', $tx_tva_attribute_id, 'valid');
+				$tx_tva = $wpdb->get_results($query);
 
 				$tva_array = array();
 				/** Transform array to easy teatment **/
-				foreach( $tx_tva as $t ) {
-					$tva_array[ $t->id ] = $t->value;
+				foreach ($tx_tva as $t) {
+					$tva_array[$t->id] = $t->value;
 				}
 
-				if ( !empty($tx_tva) ) {
+				if (!empty($tx_tva)) {
 
 					$count_products = wp_count_posts(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
 
-					for( $i = 0; $i <= $count_products->publish; $i+= 100 ) {
-					$query = $wpdb->prepare( 'SELECT * FROM '. $wpdb->posts .' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT '.$i.', 150', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish' );
-					$products = $wpdb->get_results( $query );
+					for ($i = 0; $i <= $count_products->publish; $i += 100) {
+					$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT ' . $i . ', 150', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish');
+					$products = $wpdb->get_results($query);
 
-						if( !empty($products) ){
-	 						foreach( $products as $product ) {
-								$product_data = get_post_meta( $product->ID, '_wpshop_product_metadata', true);
-								if ( !empty($product_data) ) {
-									if ( !empty($product_data['tx_tva']) && array_key_exists( $product_data['tx_tva'], $tva_array) ) {
+						if (!empty($products)) {
+	 						foreach ($products as $product) {
+								$product_data = get_post_meta($product->ID, '_wpshop_product_metadata', true);
+								if (!empty($product_data)) {
+									if (!empty($product_data['tx_tva']) && array_key_exists($product_data['tx_tva'], $tva_array)) {
 
-										if ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) {
+										if (!empty($price_piloting_option) && $price_piloting_option == 'HT') {
 											/** Update post meta **/
-											$product_data['price_ht'] = (float)str_replace( ',', '.', $product_data['price_ht'] );
-											$product_data['product_price'] = $product_data['price_ht'] * ( 1 + ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											$product_data['tva'] = $product_data['price_ht'] * ( ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											update_post_meta( $product->ID, '_wpshop_product_metadata', $product_data);
+											$product_data['price_ht'] = (float)str_replace(',', '.', $product_data['price_ht']);
+											$product_data['product_price'] = $product_data['price_ht'] * (1 + ($tva_array[$product_data['tx_tva']] / 100));
+											$product_data['tva'] = $product_data['price_ht'] * (($tva_array[$product_data['tx_tva']] / 100));
+											update_post_meta($product->ID, '_wpshop_product_metadata', $product_data);
 
 
 											/** Update attributes values **/
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => (float)$product_data['price_ht'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => (float)$product_data['product_price'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => (float)$product_data['tva'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product->ID) );
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => (float)$product_data['price_ht']), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => (float)$product_data['product_price']), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => (float)$product_data['tva']), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product->ID));
 
 											/** Update Display price meta **/
 											$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 );
+											$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', $output_type));
+											update_post_meta($product->ID, '_wps_price_infos', $price);
 										}
 										else {
 											/** Update post meta **/
-											$product_data['product_price'] = (float)str_replace( ',', '.', $product_data['product_price'] );
-											$product_data['price_ht'] = $product_data['product_price'] / ( 1 + ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											$product_data['tva'] = $product_data['price_ht'] * ( ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											update_post_meta( $product->ID, '_wpshop_product_metadata', $product_data);
+											$product_data['product_price'] = (float)str_replace(',', '.', $product_data['product_price']);
+											$product_data['price_ht'] = $product_data['product_price'] / (1 + ($tva_array[$product_data['tx_tva']] / 100));
+											$product_data['tva'] = $product_data['price_ht'] * (($tva_array[$product_data['tx_tva']] / 100));
+											update_post_meta($product->ID, '_wpshop_product_metadata', $product_data);
 
 											/** Update attributes values **/
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['price_ht'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['tva'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['product_price'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product->ID) );
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['price_ht']), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['tva']), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['product_price']), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product->ID));
 
 
 											/** Update Display price meta **/
 											$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 );
+											$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', $output_type));
+											update_post_meta($product->ID, '_wps_price_infos', $price);
 										}
 									}
 								}
@@ -750,41 +750,41 @@ 
 
 						}
 					}
-					unset( $products );
+					unset($products);
 
 					$count_variations = wp_count_posts(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION);
-					for( $i = 0; $i <= $count_variations->publish; $i+= 100 ) {
-						$query = $wpdb->prepare( 'SELECT * FROM '. $wpdb->posts .' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT '.$i.', 100', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'publish' );
-						$product_variations = $wpdb->get_results( $query );
+					for ($i = 0; $i <= $count_variations->publish; $i += 100) {
+						$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_status = %s ORDER BY ID DESC LIMIT ' . $i . ', 100', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'publish');
+						$product_variations = $wpdb->get_results($query);
 						/** Update Products Variations **/
-						if ( !empty($product_variations) ) {
-							foreach( $product_variations as $product_variation ) {
-								$product_data = get_post_meta( $product_variation->ID, '_wpshop_product_metadata', true);
-								if ( !empty($product_data) ) {
-									if ( !empty($product_data['tx_tva']) && array_key_exists( $product_data['tx_tva'], $tva_array) ) {
-										if ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) {
+						if (!empty($product_variations)) {
+							foreach ($product_variations as $product_variation) {
+								$product_data = get_post_meta($product_variation->ID, '_wpshop_product_metadata', true);
+								if (!empty($product_data)) {
+									if (!empty($product_data['tx_tva']) && array_key_exists($product_data['tx_tva'], $tva_array)) {
+										if (!empty($price_piloting_option) && $price_piloting_option == 'HT') {
 											/** Update post meta **/
-											$product_data['price_ht'] = (float)str_replace( ',', '.', $product_data['price_ht'] );
-											$product_data['product_price'] = $product_data['price_ht'] * ( 1 + ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											$product_data['tva'] = $product_data['price_ht'] * ( ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											update_post_meta( $product_variation->ID, '_wpshop_product_metadata', $product_data);
+											$product_data['price_ht'] = (float)str_replace(',', '.', $product_data['price_ht']);
+											$product_data['product_price'] = $product_data['price_ht'] * (1 + ($tva_array[$product_data['tx_tva']] / 100));
+											$product_data['tva'] = $product_data['price_ht'] * (($tva_array[$product_data['tx_tva']] / 100));
+											update_post_meta($product_variation->ID, '_wpshop_product_metadata', $product_data);
 
 											/** Update attributes values **/
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['price_ht'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product_variation->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['product_price'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product_variation->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['tva'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product_variation->ID) );
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['price_ht']), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product_variation->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['product_price']), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product_variation->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['tva']), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product_variation->ID));
 										}
 										else {
 											/** Update post meta **/
-											$product_data['product_price'] = (float)str_replace( ',', '.', $product_data['product_price'] );
-											$product_data['price_ht'] = $product_data['product_price'] / ( 1 + ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											$product_data['tva'] = $product_data['price_ht'] * ( ($tva_array[ $product_data['tx_tva'] ] / 100) );
-											update_post_meta( $product_variation->ID, '_wpshop_product_metadata', $product_data);
+											$product_data['product_price'] = (float)str_replace(',', '.', $product_data['product_price']);
+											$product_data['price_ht'] = $product_data['product_price'] / (1 + ($tva_array[$product_data['tx_tva']] / 100));
+											$product_data['tva'] = $product_data['price_ht'] * (($tva_array[$product_data['tx_tva']] / 100));
+											update_post_meta($product_variation->ID, '_wpshop_product_metadata', $product_data);
 
 											/** Update attributes values **/
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['price_ht'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product_variation->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['tva'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product_variation->ID) );
-											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['product_price'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product_variation->ID) );
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['price_ht']), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product_variation->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['tva']), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product_variation->ID));
+											$wpdb->update(WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['product_price']), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product_variation->ID));
 										}
 									}
 								}
@@ -801,15 +801,15 @@ 
 				}
 			}
 			else {
-				$result = __( 'VAT rate attribute was not found', 'wpshop' );
+				$result = __('VAT rate attribute was not found', 'wpshop');
 			}
-			return array( $status, $result );
+			return array($status, $result);
 		}
 
 	}
 
 }
 /**	Instanciate the module utilities if not	*/
-if ( class_exists("wpshop_prices") ) {
+if (class_exists("wpshop_prices")) {
 	$wpshop_prices = new wpshop_prices();
 }

includes/librairies/catalog/products.class.php

Indentation +3125 added lines, -3125 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (!defined('ABSPATH')) {
-    exit;
+	exit;
 }
 
 /**
@@ -14,7 +14,7 @@ 
 
 /*    Check if file is include. No direct access possible with file url    */
 if (!defined('WPSHOP_VERSION')) {
-    die(__('Access is not allowed by this way', 'wpshop'));
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -26,160 +26,160 @@ 
  */
 class wpshop_products
 {
-    /**
-     *    Définition du code de la classe courante
-     */
-    const currentPageCode = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
-    const current_page_variation_code = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION;
-
-    public function add_product_to_current_order_interface()
-    {
-        $output = '';
-        $output .= self::products_list_js();
-        $output .= '<input type="text" id="wps_order_search_product" />';
-        echo $output;
-        die();
-    }
+	/**
+	 *    Définition du code de la classe courante
+	 */
+	const currentPageCode = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
+	const current_page_variation_code = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION;
+
+	public function add_product_to_current_order_interface()
+	{
+		$output = '';
+		$output .= self::products_list_js();
+		$output .= '<input type="text" id="wps_order_search_product" />';
+		echo $output;
+		die();
+	}
 
-    public function products_list_js()
-    {
-        global $wpdb;
-        /** Create a JS Array of products **/
+	public function products_list_js()
+	{
+		global $wpdb;
+		/** Create a JS Array of products **/
 //         $query = $wpdb->prepare('SELECT ID, post_title FROM ' .$wpdb->posts. '  WHERE post_type = %s AND post_status = %s', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish');
-        //         $products_post = $wpdb->get_results( $query );
-
-        $products_post = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'post_status' => 'publish', 'posts_per_page' => -1));
-
-        if (!empty($products_post)) {
-            $products_js_array = 'var products = [';
-            foreach ($products_post as $product) {
-                $barcode = get_post_meta($product->ID, '_barcode', true);
-                $products_js_array .= '{label:"#' . $product->ID . ' ' . str_replace('"', '', $product->post_title) . ' - ' . ((!empty($barcode)) ? $barcode : '') . '", ';
-                $products_js_array .= 'value:"' . $product->ID . '", ';
-                $products_js_array .= (!empty($barcode)) ? 'desc:"' . $barcode . '"},' : '},';
-            }
-            $products_js_array .= '];';
-        }
-        $output = wpshop_display::display_template_element('wps_orders_products_list_js', array('PRODUCTS_JS_ARRAY' => $products_js_array), array(), 'admin');
-        return $output;
-    }
+		//         $products_post = $wpdb->get_results( $query );
+
+		$products_post = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'post_status' => 'publish', 'posts_per_page' => -1));
+
+		if (!empty($products_post)) {
+			$products_js_array = 'var products = [';
+			foreach ($products_post as $product) {
+				$barcode = get_post_meta($product->ID, '_barcode', true);
+				$products_js_array .= '{label:"#' . $product->ID . ' ' . str_replace('"', '', $product->post_title) . ' - ' . ((!empty($barcode)) ? $barcode : '') . '", ';
+				$products_js_array .= 'value:"' . $product->ID . '", ';
+				$products_js_array .= (!empty($barcode)) ? 'desc:"' . $barcode . '"},' : '},';
+			}
+			$products_js_array .= '];';
+		}
+		$output = wpshop_display::display_template_element('wps_orders_products_list_js', array('PRODUCTS_JS_ARRAY' => $products_js_array), array(), 'admin');
+		return $output;
+	}
 
-    /**
-     *    Déclaration des produits et variations en tant que "post" de wordpress
-     *
-     *    @see register_post_type()
-     */
-    public static function create_wpshop_products_type()
-    {
-
-        $options = get_option('wpshop_catalog_product_option', array());
-        //$options2 = get_option('wpshop_catalog_categories_option', array());
-        /*echo '<pre>'; print_r( $options ); echo '</pre>';
+	/**
+	 *    Déclaration des produits et variations en tant que "post" de wordpress
+	 *
+	 *    @see register_post_type()
+	 */
+	public static function create_wpshop_products_type()
+	{
+
+		$options = get_option('wpshop_catalog_product_option', array());
+		//$options2 = get_option('wpshop_catalog_categories_option', array());
+		/*echo '<pre>'; print_r( $options ); echo '</pre>';
         echo '<pre>'; print_r( $options2 ); echo '</pre>'; exit();*/
 
-        $slug = array(
-            'slug' => '',
-            'with_front' => false,
-        );
-
-        if (empty($options['wpshop_catalog_product_slug']) || $options['wpshop_catalog_product_slug'] == '/') {
-            $slug = false;
-        } else {
-            $slug['slug'] = $options['wpshop_catalog_product_slug'];
-            if (!empty($options['wpshop_catalog_product_slug_with_category'])) {
-                $slug['slug'] .= '/%' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '%';
-            }
-        }
-        /*$product_slug .= '/%' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '%';*/
-
-        /*    Définition des produits     */
-        register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, apply_filters(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_register', array(
-            'labels' => array(
-                'name' => __('Products', 'wpshop'),
-                'singular_name' => __('Catalog', 'wpshop'),
-                'add_new_item' => __('Add new product', 'wpshop'),
-                'add_new' => __('Add new product', 'wpshop'),
-                'add_new_item' => __('Add new product', 'wpshop'),
-                'edit_item' => __('Edit product', 'wpshop'),
-                'new_item' => __('New product', 'wpshop'),
-                'view_item' => __('View product', 'wpshop'),
-                'search_items' => __('Search products', 'wpshop'),
-                'not_found' => __('No products found', 'wpshop'),
-                'not_found_in_trash' => __('No products found in Trash', 'wpshop'),
-                'parent_item_colon' => '',
-            ),
-            'supports' => unserialize(WPSHOP_REGISTER_POST_TYPE_SUPPORT),
-            'public' => true,
-            'has_archive' => false,
-            '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' => false,
+			'show_in_nav_menus' => true,
+			//'rewrite'                 => false,    //    For information see below
+			'taxonomies' => array(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES),
+			'menu_icon' => 'dashicons-archive',
+			'rewrite' => $slug,
+		)));
+
+		/*    Définition des variations de produit (Déclinaisons)    */
+		register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, apply_filters(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '_register', array(
+			'labels' => array(
+				'name' => __('Variations', 'wpshop'),
+				'singular_name' => __('Variation', 'wpshop'),
+				'add_new' => __('Add Variation', 'wpshop'),
+				'add_new_item' => __('Add New Variation', 'wpshop'),
+				'edit' => __('Edit', 'wpshop'),
+				'edit_item' => __('Edit Variation', 'wpshop'),
+				'new_item' => __('New Variation', 'wpshop'),
+				'view' => __('View Variation', 'wpshop'),
+				'view_item' => __('View Variation', 'wpshop'),
+				'search_items' => __('Search Variations', 'wpshop'),
+				'not_found' => __('No Variations found', 'wpshop'),
+				'not_found_in_trash' => __('No Variations found in trash', 'wpshop'),
+				'parent_item_colon' => '',
+			),
+			'supports' => unserialize(WPSHOP_REGISTER_POST_TYPE_SUPPORT),
+			'public' => true,
+			'has_archive' => true,
+			'show_in_nav_menus' => false,
+			'show_in_menu' => false, //'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
+
+			'publicly_queryable' => false,
+			'exclude_from_search' => true,
+			'hierarchical' => false,
+
+			//             'public'                 => true,
+			//             'show_ui'                 => false,
+			//             'rewrite'                 => false,
+			//             'query_var'                => true,
+			//             'supports'                 => array( 'title', 'editor', 'page-attributes', 'thumbnail' ),
+			//             'show_in_nav_menus'     => false
+		)
+		));
+
+		// add to our plugin init function
+		//global $wp_rewrite;
+		/*    Slug url is set into option    */
+		/*$options = get_option('wpshop_catalog_product_option', array());
         $gallery_structure = (!empty($options['wpshop_catalog_product_slug']) ? $options['wpshop_catalog_product_slug'] : 'catalog');
         $gallery_structure .= !empty($options['wpshop_catalog_product_slug_with_category']) ? '/%' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '%' : '';
         $gallery_structure .= '/%' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '%';
         $wp_rewrite->add_permastruct(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $gallery_structure, false);
         $wp_rewrite->add_rewrite_tag('%' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '%', '([^/]+)', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . "=");*/
-        //    flush_rewrite_rules();
-    }
+		//    flush_rewrite_rules();
+	}
 
-    public static function hidden_meta_boxes($hidden, $screen, $use_defaults)
-    {
-        global $wpdb;
-        if (WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT === $screen->post_type) {
-            $user_meta_for_wpshop = array('metaboxhidden_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-            foreach ($user_meta_for_wpshop as $meta_to_check) {
-                $metas_hidden = get_user_meta(get_current_user_id(), $meta_to_check, true);
-                if (empty($metas_hidden) && !is_array($metas_hidden)) {
-                    $hidden = unserialize(WPSHOP_PRODUCT_HIDDEN_METABOX);
-                }
-            }
-        }
-        return $hidden;
-    }
+	public static function hidden_meta_boxes($hidden, $screen, $use_defaults)
+	{
+		global $wpdb;
+		if (WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT === $screen->post_type) {
+			$user_meta_for_wpshop = array('metaboxhidden_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			foreach ($user_meta_for_wpshop as $meta_to_check) {
+				$metas_hidden = get_user_meta(get_current_user_id(), $meta_to_check, true);
+				if (empty($metas_hidden) && !is_array($metas_hidden)) {
+					$hidden = unserialize(WPSHOP_PRODUCT_HIDDEN_METABOX);
+				}
+			}
+		}
+		return $hidden;
+	}
 
 	public static function admin_menu() {
 		global $submenu;
@@ -206,35 +206,35 @@ 
 		$submenu['edit.php?post_type=wpshop_product'] = $submenu_reorder;
 	}
 
-    /**
-     *    Create the different bow for the product management page looking for the attribute set to create the different boxes
-     */
-    public static function add_meta_boxes()
-    {
-        global $post, $currentTabContent;
-
-        if (!empty($post->post_type) && (($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) || ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION))) {
-            /*    Get the attribute set list for the current entity    */
-            $attributeEntitySetList = wpshop_attributes_set::get_attribute_set_list_for_entity(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode));
-            /*    Check if the meta information of the current product already exists     */
-            $post_attribute_set_id = get_post_meta($post->ID, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true);
-            /*    Check if the product has been saved without meta information set    */
-            $attribute_set_id = wpshop_attributes::get_attribute_value_content('product_attribute_set_id', $post->ID, self::currentPageCode);
-            /*    Unset 'free_product' from list of attributes set    */
-            foreach ($attributeEntitySetList as $key_attribute_set => $attribute_set) {
-                if ($attribute_set->slug == 'free_product') {
-                    unset($attributeEntitySetList[$key_attribute_set]);
-                    break;
-                }
-            }
-
-            /*    Check if an attribute has already been choosen for the curernt entity or if the user has to choose a entity set before continuing    */
-            if (((count($attributeEntitySetList) == 1) || ((count($attributeEntitySetList) > 1) && (($post_attribute_set_id > 0) || (isset($attribute_set_id->value) && ($attribute_set_id->value > 0)))))) {
-                if ((count($attributeEntitySetList) == 1) || (($post_attribute_set_id <= 0) && ($attribute_set_id->value <= 0))) {
-                    $post_attribute_set_id = $attributeEntitySetList[0]->id;
-                } elseif (($post_attribute_set_id <= 0) && ($attribute_set_id->value > 0)) {
-                    $post_attribute_set_id = $attribute_set_id->value;
-                }
+	/**
+	 *    Create the different bow for the product management page looking for the attribute set to create the different boxes
+	 */
+	public static function add_meta_boxes()
+	{
+		global $post, $currentTabContent;
+
+		if (!empty($post->post_type) && (($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) || ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION))) {
+			/*    Get the attribute set list for the current entity    */
+			$attributeEntitySetList = wpshop_attributes_set::get_attribute_set_list_for_entity(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode));
+			/*    Check if the meta information of the current product already exists     */
+			$post_attribute_set_id = get_post_meta($post->ID, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true);
+			/*    Check if the product has been saved without meta information set    */
+			$attribute_set_id = wpshop_attributes::get_attribute_value_content('product_attribute_set_id', $post->ID, self::currentPageCode);
+			/*    Unset 'free_product' from list of attributes set    */
+			foreach ($attributeEntitySetList as $key_attribute_set => $attribute_set) {
+				if ($attribute_set->slug == 'free_product') {
+					unset($attributeEntitySetList[$key_attribute_set]);
+					break;
+				}
+			}
+
+			/*    Check if an attribute has already been choosen for the curernt entity or if the user has to choose a entity set before continuing    */
+			if (((count($attributeEntitySetList) == 1) || ((count($attributeEntitySetList) > 1) && (($post_attribute_set_id > 0) || (isset($attribute_set_id->value) && ($attribute_set_id->value > 0)))))) {
+				if ((count($attributeEntitySetList) == 1) || (($post_attribute_set_id <= 0) && ($attribute_set_id->value <= 0))) {
+					$post_attribute_set_id = $attributeEntitySetList[0]->id;
+				} elseif (($post_attribute_set_id <= 0) && ($attribute_set_id->value > 0)) {
+					$post_attribute_set_id = $attribute_set_id->value;
+				}
 
 		/*$post_attribute_set_id = (int) get_post_meta($post->ID, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true);
 
@@ -252,32 +252,32 @@ 
 			}
 		}*/
 
-                $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');
+				$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');
 				/*add_meta_box('wpshop_histo_attrs', __('Historic attributes', 'wpshop'), function($post) {
 					global $wpdb;
 					$limit = 40;
@@ -310,21 +310,21 @@ 
 						'total' => $max_page
 					) );
 				}, 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'] = '
+			} 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>
@@ -332,791 +332,791 @@ 
 		<li class="attribute_set_selector_after_save_instruction" >' . __('Once the group chosen, the different attribute will be displayed here', 'wpshop') . '</li>
 	</ul>';
 
-                add_meta_box('wpshop_product_attribute_set_selector', __('Product attributes', 'wpshop'), array('wpshop_products', 'meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'high', array('boxIdentifier' => 'attribute_set_selector'));
-            }
-        }
+				add_meta_box('wpshop_product_attribute_set_selector', __('Product attributes', 'wpshop'), array('wpshop_products', 'meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'high', array('boxIdentifier' => 'attribute_set_selector'));
+			}
+		}
 
-    }
+	}
 
-    /**
-     * Add a box into product edition page for options on the product
-     *
-     * @param object $post
-     */
-    public static function product_options_meta_box_content($post)
-    {
-        $output = '';
+	/**
+	 * Add a box into product edition page for options on the product
+	 *
+	 * @param object $post
+	 */
+	public static function product_options_meta_box_content($post)
+	{
+		$output = '';
 
-        $product_current_options = get_post_meta($post->ID, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', true);
+		$product_current_options = get_post_meta($post->ID, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', true);
 
-        $tpl_component = array();
-        $tpl_component['ADMIN_PRODUCT_OPTION_FOR_CART_AUTOADD_CHECKBOX_STATE'] = (!empty($product_current_options['cart']) && !empty($product_current_options['cart']['auto_add'])) ? ' checked="checked"' : '';
-        $output .= wpshop_display::display_template_element('wpshop_admin_product_option_for_cart', $tpl_component, array('type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'id' => $post->ID), 'admin');
+		$tpl_component = array();
+		$tpl_component['ADMIN_PRODUCT_OPTION_FOR_CART_AUTOADD_CHECKBOX_STATE'] = (!empty($product_current_options['cart']) && !empty($product_current_options['cart']['auto_add'])) ? ' checked="checked"' : '';
+		$output .= wpshop_display::display_template_element('wpshop_admin_product_option_for_cart', $tpl_component, array('type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'id' => $post->ID), 'admin');
 
-        echo $output;
-    }
+		echo $output;
+	}
 
-    /**
-     * Display the fixed box
-     */
-    public static function product_data_meta_box($post, $metaboxArgs)
-    {
-        $output = '';
+	/**
+	 * Display the fixed box
+	 */
+	public static function product_data_meta_box($post, $metaboxArgs)
+	{
+		$output = '';
 
-        $currentTabContent = $metaboxArgs['args']['currentTabContent'];
+		$currentTabContent = $metaboxArgs['args']['currentTabContent'];
 
-        echo '<div id="fixed-tabs" class="wpshop_tabs wpshop_detail_tabs wpshop_product_attribute_tabs" >
+		echo '<div id="fixed-tabs" class="wpshop_tabs wpshop_detail_tabs wpshop_product_attribute_tabs" >
 				<ul>';
-        if (!empty($currentTabContent['box'])) {
-            foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
-                if (!empty($currentTabContent['boxContent'][$boxIdentifier])) {
-                    if ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'fixed-tab') {
-                        echo '<li><a href="#tabs-' . sanitize_title($boxIdentifier) . '">' . __($boxTitle, 'wpshop') . '</a></li>';
-                    }
-                }
-            }
-        }
-        echo '<li><a href="#tabs-product-related">' . __('Related products', 'wpshop') . '</a></li>';
-        echo '<li><a href="#tabs-product-provider">' . __('Providers', 'wpshop') . '</a></li>';
-        echo '<li class="wpshop_product_data_display_tab" ><a href="#tabs-product-display">' . __('Product display', 'wpshop') . '</a></li>';
-        echo '</ul>';
-
-        if (!empty($currentTabContent['box'])) {
-            foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
-                if (!empty($currentTabContent['boxContent'][$boxIdentifier])) {
-                    if ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'fixed-tab') {
-                        echo '<div id="tabs-' . sanitize_title($boxIdentifier) . '">' . $currentTabContent['boxContent'][$boxIdentifier] . '</div>';
-                    }
-                }
-            }
-        }
+		if (!empty($currentTabContent['box'])) {
+			foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
+				if (!empty($currentTabContent['boxContent'][$boxIdentifier])) {
+					if ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'fixed-tab') {
+						echo '<li><a href="#tabs-' . sanitize_title($boxIdentifier) . '">' . __($boxTitle, 'wpshop') . '</a></li>';
+					}
+				}
+			}
+		}
+		echo '<li><a href="#tabs-product-related">' . __('Related products', 'wpshop') . '</a></li>';
+		echo '<li><a href="#tabs-product-provider">' . __('Providers', 'wpshop') . '</a></li>';
+		echo '<li class="wpshop_product_data_display_tab" ><a href="#tabs-product-display">' . __('Product display', 'wpshop') . '</a></li>';
+		echo '</ul>';
+
+		if (!empty($currentTabContent['box'])) {
+			foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
+				if (!empty($currentTabContent['boxContent'][$boxIdentifier])) {
+					if ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'fixed-tab') {
+						echo '<div id="tabs-' . sanitize_title($boxIdentifier) . '">' . $currentTabContent['boxContent'][$boxIdentifier] . '</div>';
+					}
+				}
+			}
+		}
 
-        echo '<div id="tabs-product-related">' . self::related_products_meta_box_content($post) . '</div>';
-        echo '<div id="tabs-product-provider">' . self::provider_products_meta_box_content($post) . '</div>';
-        echo '<div id="tabs-product-display">' . self::product_frontend_display_config_meta_box($post) . '</div>';
-        if (!empty($currentTabContent['boxMore'])) {
-            echo $currentTabContent['boxMore'];
-        }
-        echo '</div>';
+		echo '<div id="tabs-product-related">' . self::related_products_meta_box_content($post) . '</div>';
+		echo '<div id="tabs-product-provider">' . self::provider_products_meta_box_content($post) . '</div>';
+		echo '<div id="tabs-product-display">' . self::product_frontend_display_config_meta_box($post) . '</div>';
+		if (!empty($currentTabContent['boxMore'])) {
+			echo $currentTabContent['boxMore'];
+		}
+		echo '</div>';
 
-        echo $output;
-    }
+		echo $output;
+	}
 
-    /**
-     * Output the content for related product metabox
-     * @param object $post The current edited post
-     * @return string
-     */
-    public static function related_products_meta_box_content($post)
-    {
-        $content = $existing_selection = '';
-
-        if (!empty($post->ID)) {
-            $related_products_id = get_post_meta($post->ID, WPSHOP_PRODUCT_RELATED_PRODUCTS, true);
-            if (!empty($related_products_id) && !empty($related_products_id[0])) {
-                foreach ($related_products_id as $related_product_id) {
-                    $existing_selection .= '<option selected value="' . $related_product_id . '" >' . get_the_title($related_product_id) . '</option>';
-                }
-            }
-        }
+	/**
+	 * Output the content for related product metabox
+	 * @param object $post The current edited post
+	 * @return string
+	 */
+	public static function related_products_meta_box_content($post)
+	{
+		$content = $existing_selection = '';
+
+		if (!empty($post->ID)) {
+			$related_products_id = get_post_meta($post->ID, WPSHOP_PRODUCT_RELATED_PRODUCTS, true);
+			if (!empty($related_products_id) && !empty($related_products_id[0])) {
+				foreach ($related_products_id as $related_product_id) {
+					$existing_selection .= '<option selected value="' . $related_product_id . '" >' . get_the_title($related_product_id) . '</option>';
+				}
+			}
+		}
 
-        $content = '<p>' . __('Type the begin of the product name in the field below in order to add it to the related product list', 'wpshop') . '</p>
+		$content = '<p>' . __('Type the begin of the product name in the field below in order to add it to the related product list', 'wpshop') . '</p>
 			<select name="related_products_list[]" id="related_products_list" class="ajax_chosen_select_related_products" multiple >' . $existing_selection . '</select>
 			<input type="hidden" id="wpshop_ajax_search_element_type_related_products" name="wpshop_ajax_search_element_type" value="' . $post->post_type . '" />
 			<input type="hidden" id="wpshop_nonce_ajax_search_related_products" name="wpshop_nonce_ajax_search" value="' . wp_create_nonce("wpshop_element_search") . '" />';
 
-        return $content;
-    }
+		return $content;
+	}
 
-    /**
-     * Output the content for related product metabox
-     * @param object $post The current edited post
-     * @return string
-     */
-    public static function provider_products_meta_box_content($post)
-    {
-        $content = $existing_selection = '';
-
-        if (!empty($post->ID)) {
-            $providers_id = get_post_meta($post->ID, WPSHOP_PRODUCT_PROVIDER, true);
-            if (!empty($providers_id) && !empty($providers_id[0])) {
-                foreach ($providers_id as $provider_id) {
-                    $existing_selection .= '<option selected value="' . $provider_id . '" >' . get_the_title($provider_id) . '</option>';
-                }
-            }
-        }
+	/**
+	 * Output the content for related product metabox
+	 * @param object $post The current edited post
+	 * @return string
+	 */
+	public static function provider_products_meta_box_content($post)
+	{
+		$content = $existing_selection = '';
+
+		if (!empty($post->ID)) {
+			$providers_id = get_post_meta($post->ID, WPSHOP_PRODUCT_PROVIDER, true);
+			if (!empty($providers_id) && !empty($providers_id[0])) {
+				foreach ($providers_id as $provider_id) {
+					$existing_selection .= '<option selected value="' . $provider_id . '" >' . get_the_title($provider_id) . '</option>';
+				}
+			}
+		}
 
-        $content = '<p>' . __('Type the begin of a provider last name/first name in the field below to add', 'wpshop') . '</p>
+		$content = '<p>' . __('Type the begin of a provider last name/first name in the field below to add', 'wpshop') . '</p>
 			<select name="provider_list[]" id="provider_list" class="ajax_chosen_select_provider_products" multiple >' . $existing_selection . '</select>
 			<input type="hidden" id="wpshop_ajax_search_element_type_provider_products" name="wpshop_ajax_search_element_type" value="' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . '" />
 			<input type="hidden" id="wpshop_nonce_ajax_search_provider_products" name="wpshop_nonce_ajax_search" value="' . wp_create_nonce("wpshop_element_search") . '" />';
 
-        return $content;
-    }
+		return $content;
+	}
 
-    /**
-     * Define the metabox content for the action box
-     * @param obejct $post The current element being edited
-     */
-    public static function product_actions_meta_box_content($post)
-    {
-        $output = '';
-        /*
+	/**
+	 * Define the metabox content for the action box
+	 * @param obejct $post The current element being edited
+	 */
+	public static function product_actions_meta_box_content($post)
+	{
+		$output = '';
+		/*
          * Template parameters
          */
-        $template_part = 'wpshop_duplicate_product';
-        $tpl_component = array();
-        $tpl_component['PRODUCT_ID'] = $post->ID;
-        $tpl_component['PRINT_PRODUCT_SHEET_LINK'] = admin_url('admin-post.php?action=wps_product_sheet&pid=' . $post->ID);
-        /*
+		$template_part = 'wpshop_duplicate_product';
+		$tpl_component = array();
+		$tpl_component['PRODUCT_ID'] = $post->ID;
+		$tpl_component['PRINT_PRODUCT_SHEET_LINK'] = admin_url('admin-post.php?action=wps_product_sheet&pid=' . $post->ID);
+		/*
          * Build template
          */
-        $output = wpshop_display::display_template_element($template_part, $tpl_component, array(), 'admin');
-        unset($tpl_component);
+		$output = wpshop_display::display_template_element($template_part, $tpl_component, array(), 'admin');
+		unset($tpl_component);
 
-        echo $output;
-    }
+		echo $output;
+	}
 
-    /**
-     *    Define the content of the product main information box
-     */
-    public static function meta_box_content($post, $metaboxArgs)
-    {
-        global $currentTabContent;
+	/**
+	 *    Define the content of the product main information box
+	 */
+	public static function meta_box_content($post, $metaboxArgs)
+	{
+		global $currentTabContent;
 
-        /*    Add the extra fields defined by the default attribute group in the general section    */
-        echo '<div class="wpshop_extra_field_container" >' . $currentTabContent['boxContent'][$metaboxArgs['args']['boxIdentifier']] . '</div>';
-    }
+		/*    Add the extra fields defined by the default attribute group in the general section    */
+		echo '<div class="wpshop_extra_field_container" >' . $currentTabContent['boxContent'][$metaboxArgs['args']['boxIdentifier']] . '</div>';
+	}
 
-    /**
-     * Define the metabox content for product custom display in product
-     * @param object $post The current element being edited
-     * @return string The metabox content
-     */
-    public static function product_frontend_display_config_meta_box($post)
-    {
-        $content = '';
-
-        $product_attribute_frontend_display_config = null;
-        if (!empty($post->ID)) {
-            $product_attribute_frontend_display_config = get_post_meta($post->ID, WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, true);
-
-            $extra_options = get_option('wpshop_extra_options', array());
-            $column_count = (!empty($extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY']) ? $extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY'] : 3);
-            $attribute_list = wpshop_attributes::getElementWithAttributeAndValue(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $post->ID, WPSHOP_CURRENT_LOCALE);
-            $column = 1;
-
-            if (WPSHOP_DEFINED_SHOP_TYPE == 'sale') {
-                $sub_tpl_component = array();
-                $sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_NAME'] = __('Action on product', 'wpshop');
-
-                $tpl_component = array();
-                $tpl_component['ADMIN_ATTRIBUTE_LABEL'] = __('Add to cart button', 'wpshop');
-                $tpl_component['ADMIN_ATTRIBUTE_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[product_action_button][add_to_cart]';
-                $tpl_component['ADMIN_ATTRIBUTE_FD_ID'] = $post->ID . '_product_action_button_add_to_cart';
-                $button_is_set_to_be_displayed = (WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no';
-
-                $tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display($button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'complete_sheet') ? ' checked="checked"' : '';
-                $tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display($button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'mini_output') ? ' checked="checked"' : '';
-                $sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_CONTENT'] = wpshop_display::display_template_element('wpshop_admin_attr_config_for_front_display', $tpl_component, array(), 'admin');
-                unset($tpl_component);
-
-                $sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[product_action_button][add_to_cart]';
-                $sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_ID'] = 'product_action_button_add_to_cart';
-                $sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_INPUT_CHECKBOX'] = '';
-                $sub_content[1] = wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display', $sub_tpl_component, array(), 'admin');
-            }
-
-            if (!empty($attribute_list[$post->ID]) && is_array($attribute_list[$post->ID])) {
-                foreach ($attribute_list[$post->ID] as $attribute_set_section_name => $attribute_set_section_content) {
-                    if (!isset($sub_content[$column])) {
-                        $sub_content[$column] = '';
-                    }
-
-                    $attribute_sub_output = '';
-                    foreach ($attribute_set_section_content['attributes'] as $attribute_id => $attribute_def) {
-                        if ($attribute_def['attribute_code'] != 'product_attribute_set_id') {
-                            $tpl_component = array();
-                            $tpl_component['ADMIN_ATTRIBUTE_LABEL'] = $attribute_def['frontend_label'];
-                            $tpl_component['ADMIN_ATTRIBUTE_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[attribute][' . $attribute_def['attribute_code'] . ']';
-                            $tpl_component['ADMIN_ATTRIBUTE_FD_ID'] = $post->ID . '_' . $attribute_def['attribute_code'];
-                            $tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display($attribute_def['is_visible_in_front'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'complete_sheet') ? ' checked="checked"' : '';
-                            $tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display($attribute_def['is_visible_in_front_listing'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'mini_output') ? ' checked="checked"' : '';
-                            $attribute_sub_output .= wpshop_display::display_template_element('wpshop_admin_attr_config_for_front_display', $tpl_component, array(), 'admin');
-                            unset($tpl_component);
-                        }
-                    }
-
-                    $tpl_component = array();
-                    $tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_NAME'] = $attribute_set_section_name;
-                    $tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_CONTENT'] = $attribute_sub_output;
-                    $tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[attribute_set_section][' . $attribute_set_section_content['code'] . ']';
-                    $tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_ID'] = $attribute_set_section_content['code'];
-                    $ADMIN_ATTRIBUTE_SET_SECTION_COMPLETE_SHEET_CHECK = wpshop_attributes::check_attribute_display($attribute_set_section_content['display_on_frontend'], $product_attribute_frontend_display_config, 'attribute_set_section', $attribute_set_section_content['code'], 'complete_sheet') ? ' checked="checked"' : '';
-                    $tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_INPUT_CHECKBOX'] = '<input type="checkbox" name="' . self::currentPageCode . '_attr_frontend_display[attribute_set_section][' . $attribute_set_section_content['code'] . '][complete_sheet]" id="' . $attribute_set_section_content['code'] . '_complete_sheet" value="yes"' . $ADMIN_ATTRIBUTE_SET_SECTION_COMPLETE_SHEET_CHECK . ' /><label for="' . $attribute_set_section_content['code'] . '_complete_sheet" >' . __('Display in product page', 'wpshop') . '</label>';
-                    $sub_content[$column] .= wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display', $tpl_component, array(), 'admin');
-                    $column++;
-                    if ($column > $column_count) {
-                        $column = 1;
-                    }
-                }
-            }
-            $tpl_component = array();
-            $tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] = '';
-            for ($i = 1; $i <= $column_count; $i++) {
-                if (!empty($sub_content[$i])) {
-                    $tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] .= '<div class="alignleft" >' . $sub_content[$i] . '</div>';
-                }
-
-            }
-            $tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT_CLASS'] = empty($product_attribute_frontend_display_config) ? ' class="wpshopHide" ' : '';
-            $tpl_component['ADMIN_PRODUCT_ATTRIBUTE_FRONTEND_DISPLAY_MAIN_CHOICE_CHECK'] = empty($product_attribute_frontend_display_config) ? ' checked="checked"' : '';
-            $tpl_component['ADMIN_ATTRIBUTE_FD_NAME'] = self::currentPageCode . '_attr_frontend_display';
-
-            $content = wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display_default_choice', $tpl_component, array(), 'admin') . '<div class="wpshop_cls"></div>';
-        }
+	/**
+	 * Define the metabox content for product custom display in product
+	 * @param object $post The current element being edited
+	 * @return string The metabox content
+	 */
+	public static function product_frontend_display_config_meta_box($post)
+	{
+		$content = '';
+
+		$product_attribute_frontend_display_config = null;
+		if (!empty($post->ID)) {
+			$product_attribute_frontend_display_config = get_post_meta($post->ID, WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, true);
+
+			$extra_options = get_option('wpshop_extra_options', array());
+			$column_count = (!empty($extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY']) ? $extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY'] : 3);
+			$attribute_list = wpshop_attributes::getElementWithAttributeAndValue(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $post->ID, WPSHOP_CURRENT_LOCALE);
+			$column = 1;
+
+			if (WPSHOP_DEFINED_SHOP_TYPE == 'sale') {
+				$sub_tpl_component = array();
+				$sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_NAME'] = __('Action on product', 'wpshop');
+
+				$tpl_component = array();
+				$tpl_component['ADMIN_ATTRIBUTE_LABEL'] = __('Add to cart button', 'wpshop');
+				$tpl_component['ADMIN_ATTRIBUTE_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[product_action_button][add_to_cart]';
+				$tpl_component['ADMIN_ATTRIBUTE_FD_ID'] = $post->ID . '_product_action_button_add_to_cart';
+				$button_is_set_to_be_displayed = (WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no';
+
+				$tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display($button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'complete_sheet') ? ' checked="checked"' : '';
+				$tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display($button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'mini_output') ? ' checked="checked"' : '';
+				$sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_CONTENT'] = wpshop_display::display_template_element('wpshop_admin_attr_config_for_front_display', $tpl_component, array(), 'admin');
+				unset($tpl_component);
+
+				$sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[product_action_button][add_to_cart]';
+				$sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_ID'] = 'product_action_button_add_to_cart';
+				$sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_INPUT_CHECKBOX'] = '';
+				$sub_content[1] = wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display', $sub_tpl_component, array(), 'admin');
+			}
 
-        return $content;
-    }
+			if (!empty($attribute_list[$post->ID]) && is_array($attribute_list[$post->ID])) {
+				foreach ($attribute_list[$post->ID] as $attribute_set_section_name => $attribute_set_section_content) {
+					if (!isset($sub_content[$column])) {
+						$sub_content[$column] = '';
+					}
+
+					$attribute_sub_output = '';
+					foreach ($attribute_set_section_content['attributes'] as $attribute_id => $attribute_def) {
+						if ($attribute_def['attribute_code'] != 'product_attribute_set_id') {
+							$tpl_component = array();
+							$tpl_component['ADMIN_ATTRIBUTE_LABEL'] = $attribute_def['frontend_label'];
+							$tpl_component['ADMIN_ATTRIBUTE_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[attribute][' . $attribute_def['attribute_code'] . ']';
+							$tpl_component['ADMIN_ATTRIBUTE_FD_ID'] = $post->ID . '_' . $attribute_def['attribute_code'];
+							$tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display($attribute_def['is_visible_in_front'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'complete_sheet') ? ' checked="checked"' : '';
+							$tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display($attribute_def['is_visible_in_front_listing'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'mini_output') ? ' checked="checked"' : '';
+							$attribute_sub_output .= wpshop_display::display_template_element('wpshop_admin_attr_config_for_front_display', $tpl_component, array(), 'admin');
+							unset($tpl_component);
+						}
+					}
 
-    /**
-     * Retrieve the attribute list used for sorting product into frontend listing
-     * @return array The attribute list to use for listing sorting
-     */
-    public static function get_sorting_criteria()
-    {
-        global $wpdb;
+					$tpl_component = 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>';
+				}
 
-        $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')));
+			}
+			$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';
 
-        $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);
-        }
+			$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>';
+		}
 
-        return $data;
-    }
+		return $content;
+	}
+
+	/**
+	 * Retrieve the attribute list used for sorting product into frontend listing
+	 * @return array The attribute list to use for listing sorting
+	 */
+	public static function get_sorting_criteria()
+	{
+		global $wpdb;
+
+		$data = array(array('code' => 'title', 'frontend_label' => __('Product name', 'wpshop')), array('code' => 'date', 'frontend_label' => __('Date added', 'wpshop')), array('code' => 'modified', 'frontend_label' => __('Date modified', 'wpshop')), array('code' => 'rand', 'frontend_label' => __('Random', 'wpshop')));
+
+		$query = $wpdb->prepare("SELECT code, frontend_label FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE is_used_for_sort_by = %s", 'yes');
+		$results = $wpdb->get_results($query, ARRAY_A);
+		if (!empty($results)) {
+			$data = array_merge($data, $results);
+		}
+
+		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');
+		}
+
+		if (!empty($data)) {
+			foreach ($data as $p) {
+				if (!empty($p) && is_object($p) && !empty($p->entity_id)) {
+					$products[] = $p->entity_id;
+				}
+			}
+		}
+		return $products;
+	}
 
-        $related_product_output = self::wpshop_products_func($atts);
+	/**
+	 * Related product shortcode reader
+	 *
+	 * @param array $atts {
+	 *    pid : Product idenfifier to get related element for
+	 *    display_mode : The output mode if defined (grid || list)
+	 * }
+	 *
+	 * @return string
+	 *
+	 */
+	public static function wpshop_related_products_func($atts)
+	{
+		global $wp_query;
+
+		$atts['product_type'] = 'related';
+		if (empty($atts['pid'])) {
+			$atts['pid'] = $wp_query->posts[0]->ID;
+		}
 
-        $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_output = self::wpshop_products_func($atts);
 
-        return $output;
-    }
+		$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();
+		}
 
-    /**
-     * 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;
-            }
+		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;
+				}
 
-        /** 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;
-            }
-        }
+			} else {
+				$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);
+		/** 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;
+					}
 
-            if ($data[0]) {
-                $have_results = true;
-                $string = $data[1];
-            }
-        }
+					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):
-                        $criteria .= '<option value="' . $c['code'] . '" ' . selected( $atts['order'], $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');
-        }
+				$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):
+						$criteria .= '<option value="' . $c['code'] . '" ' . selected( $atts['order'], $c['code'], false ) . '>' . __($c['frontend_label'], 'wpshop') . '</option>';
+					endforeach;
+					$sub_tpl_component['SORTING_CRITERIA_LIST'] = $criteria;
+					$tpl_component['SORTING_CRITERIA'] = wpshop_display::display_template_element($sub_template_part, $sub_tpl_component);
+					unset($sub_tpl_component);
+				}
 
-        return do_shortcode($string);
-    }
+				if (empty($atts['sorting']) || (!empty($atts['sorting']) && ($atts['sorting'] != 'no'))) {
+					$tpl_component['DISPLAY_TYPE_STATE_GRID'] = $type == 'grid' ? ' active' : null;
+					$tpl_component['DISPLAY_TYPE_STATE_LIST'] = $type == 'list' ? ' active' : null;
+					$sorting = wpshop_display::display_template_element($template_part, $tpl_component);
+				} else if (!empty($atts['sorting']) && ($atts['sorting'] == 'no')) {
+					$sub_template_part = 'product_listing_sorting_criteria_hidden';
+					$sub_tpl_component = array();
+					$sub_tpl_component['CRITERIA_DEFAULT'] = !empty($sorting_criteria[0]['code']) ? $sorting_criteria[0]['code'] : 'title';
+					$tpl_component['SORTING_CRITERIA'] = wpshop_display::display_template_element($sub_template_part, $sub_tpl_component, array(), 'admin');
+					unset($sub_tpl_component);
+
+					$template_part = 'product_listing_sorting_hidden';
+					$sorting = wpshop_display::display_template_element($template_part, $tpl_component, array(), 'admin');
+				}
+			}
+			unset($tpl_component);
 
-    public static function wpshop_get_product_by_criteria($criteria = null, $cid = 0, $pid = 0, $display_type, $order = 'ASC', $page_number, $products_per_page = 0, $nb_of_product_limit = 0, $grid_element_nb_per_line = WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE, $display_pagination = true)
-    {
-        global $wpdb;
+			if (!empty($atts) && !empty($atts['container']) && $atts['container'] == 'no') {
+				$string = $sorting . '<div data-nonce="' . wp_create_nonce('products_by_criteria') . '" class="wps-catalog-container wps-bloc-loader">' . $string . '</div>';
+			} else {
+				$string = '<div class="wpshop_products_block">' . $sorting . '<div data-nonce="' . wp_create_nonce('products_by_criteria') . '" class="wps-catalog-container wps-bloc-loader">' . $string . '</div></div>';
+			}
+		} else if (empty($atts['no_result_message']) || ($atts['no_result_message'] != 'no')) {
+			$string = __('There is nothing to output here', 'wpshop');
+		}
 
-        $string = '<span id="wpshop_loading">&nbsp;</span>';
-        $have_results = false;
-        $display_type = (!empty($display_type) && in_array($display_type, array('grid', 'list'))) ? $display_type : 'grid';
+		return do_shortcode($string);
+	}
 
-        /** Check if Discount are activated */
-        $discount_option = get_option('wpshop_catalog_product_option');
+	public static function wpshop_get_product_by_criteria($criteria = null, $cid = 0, $pid = 0, $display_type, $order = 'ASC', $page_number, $products_per_page = 0, $nb_of_product_limit = 0, $grid_element_nb_per_line = WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE, $display_pagination = true)
+	{
+		global $wpdb;
 
-        if ($criteria == 'product_price' && !empty($discount_option) && !empty($discount_option['discount']) && $discount_option['discount'] == 'on') {
-            $criteria = 'wpshop_displayed_price';
-        }
+		$string = '<span id="wpshop_loading">&nbsp;</span>';
+		$have_results = false;
+		$display_type = (!empty($display_type) && in_array($display_type, array('grid', 'list'))) ? $display_type : 'grid';
 
-        $query = array(
-            'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
-            'order' => $order,
-            'posts_per_page' => $products_per_page,
-            'paged' => $page_number,
-            'post_status' => 'publish',
-        );
-
-        // If the limit is greater than zero, hide pagination and change posts_per_page var
-        if ($nb_of_product_limit > 0) {
-            $query['posts_per_page'] = $nb_of_product_limit;
-            unset($query['paged']);
-        }
-        if (!empty($pid)) {
-            if (!is_array($pid)) {
-                $pid = explode(',', $pid);
-            }
+		/** Check if Discount are activated */
+		$discount_option = get_option('wpshop_catalog_product_option');
 
-            $query['post__in'] = $pid;
-        }
-        if (!empty($cid)) {
-            $cid = explode(',', $cid);
-            $query['tax_query'] = array(array(
-                'taxonomy' => WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES,
-                'field' => 'id',
-                'terms' => $cid,
-                'operator' => 'IN',
-            ));
-        }
-        if ($criteria != null) {
-            switch ($criteria) {
-                case 'creator':
-                case 'author':
-                    $query['author'] = get_current_user_id();
-                    break;
-                case 'none':
-                case 'ID':
-                case 'title':
-                case 'date':
-                case 'modified':
-                case 'relevance':
-                case 'post__in':
-                case 'rand':
-                    $query['orderby'] = $criteria;
-                    break;
-                default:
-                    if (!empty($pid)) {
-                        $post_meta = get_post_meta($pid, '_' . $criteria, true);
-                    } else {
-                        $check_meta = $wpdb->prepare("SELECT COUNT(meta_id) as meta_criteria FROM " . $wpdb->postmeta . " WHERE meta_key = %s", '_' . $criteria);
-                        $post_meta = $wpdb->get_var($check_meta);
-                    }
-                    if (!empty($post_meta)) {
-                        if (in_array($criteria, array('wpshop_displayed_price', 'product_price'))) {
-                            $query['orderby'] = 'meta_value_num';
-                        } else {
-                            $query['orderby'] = 'meta_value';
-                        }
-                        $query['meta_key'] = '_' . $criteria;
-                    }
-                    break;
-            }
-        } else {
-            $query['orderby'] = 'menu_order ID';
-        }
-        $post_per_page = $query['posts_per_page'];
-        $total_products = (!empty($query['post__in'])) ? $query['post__in'] : 0;
-        if (!empty($pid) && !empty($query['post__in']) && count($query['post__in']) > $query['posts_per_page']) {
-            $tmp_array = array();
-
-            if (empty($page_number) || $page_number == 1) {
-                for ($i = 0; $i < $query['posts_per_page']; $i++) {
-                    $tmp_array[] = $query['post__in'][$i];
-                }
-            } else {
-                $begin_number = (($page_number - 1) * $query['posts_per_page']);
-                for ($i = $begin_number; $i < $query['posts_per_page'] + $begin_number; $i++) {
-                    if (!empty($query['post__in'][$i])) {
-                        $tmp_array[] = $query['post__in'][$i];
-                    }
-                }
-            }
-            unset($query['post__in']);
-            $query['post__in'] = $tmp_array;
-            $query['posts_per_page'] = -1;
-        }
+		if ($criteria == 'product_price' && !empty($discount_option) && !empty($discount_option['discount']) && $discount_option['discount'] == 'on') {
+			$criteria = 'wpshop_displayed_price';
+		}
 
-        $query['post_status'] = 'publish';
-
-        $custom_query = new WP_Query($query);
-
-        if ($custom_query->have_posts()) {
-            $have_results = true;
-
-            // ---------------- //
-            // Products listing //
-            // ---------------- //
-            $current_position = 1;
-            $product_list = '';
-            while ($custom_query->have_posts()): $custom_query->the_post();
-                $cats = get_the_terms(get_the_ID(), WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
-                $cats = !empty($cats) && is_array($cats) ? array_values($cats) : array();
-                $cat_id = empty($cats) ? 0 : $cats[0]->term_id;
-                $product_list .= self::product_mini_output(get_the_ID(), $cat_id, $display_type, $current_position, $grid_element_nb_per_line);
-                $current_position++;
-            endwhile;
-            $tpl_component = array();
-            $tpl_component['PRODUCT_CONTAINER_TYPE_CLASS'] = ($display_type == 'grid' ? ' ' . $display_type . '_' . $grid_element_nb_per_line : '') . ' ' . $display_type . '_mode';
-            $tpl_component['PRODUCT_LIST_DISPLAY_TYPE'] = $display_type;
-            $tpl_component['PRODUCT_LIST_PER_LINE'] = $grid_element_nb_per_line;
-            $tpl_component['PRODUCT_LIST'] = $product_list;
-            $tpl_component['CROSSED_OUT_PRICE'] = '';
-            $tpl_component['LOW_STOCK_ALERT_MESSAGE'] = '';
-            $string = wpshop_display::display_template_element('product_list_container', $tpl_component);
-
-            // --------------------- //
-            // Pagination management //
-            // --------------------- //
-            if ( $display_pagination ) {
-                if ($nb_of_product_limit == 0) {
-
-                    $paginate = paginate_links(array(
-                        'base' => '%_%',
-                        'format' => '/?page_product=%#%',
-                        'current' => $page_number,
-                        'total' => $custom_query->max_num_pages,
-                        'type' => 'array',
-                        'prev_next' => false,
-                    ));
-                    if (!empty($paginate)) {
-                        $string .= '<ul class="pagination wps-pagination">';
-                        foreach ($paginate as $p) {
-                            $string .= '<li>' . $p . '</li>';
-                        }
-                        $string .= '</ul>';
-                    }
-                }
-
-                if (!empty($pid) && !empty($query['post__in']) && count($total_products) > $post_per_page) {
-                    $paginate = paginate_links(array(
-                        'base' => '%_%',
-                        'format' => '/?page_product=%#%',
-                        'current' => $page_number,
-                        'total' => ceil(count($total_products) / $post_per_page),
-                        'type' => 'array',
-                        'prev_next' => false,
-                    ));
-                    if (!empty($paginate)) {
-                        $string .= '<ul class="pagination wps-pagination">';
-                        foreach ($paginate as $p) {
-                            $string .= '<li>' . $p . '</li>';
-                        }
-                        $string .= '</ul>';
-                    }
-                }
-            }
+		$query = array(
+			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
+			'order' => $order,
+			'posts_per_page' => $products_per_page,
+			'paged' => $page_number,
+			'post_status' => 'publish',
+		);
+
+		// If the limit is greater than zero, hide pagination and change posts_per_page var
+		if ($nb_of_product_limit > 0) {
+			$query['posts_per_page'] = $nb_of_product_limit;
+			unset($query['paged']);
+		}
+		if (!empty($pid)) {
+			if (!is_array($pid)) {
+				$pid = explode(',', $pid);
+			}
 
-        }
-        wp_reset_query(); // important
+			$query['post__in'] = $pid;
+		}
+		if (!empty($cid)) {
+			$cid = explode(',', $cid);
+			$query['tax_query'] = array(array(
+				'taxonomy' => WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES,
+				'field' => 'id',
+				'terms' => $cid,
+				'operator' => 'IN',
+			));
+		}
+		if ($criteria != null) {
+			switch ($criteria) {
+				case 'creator':
+				case 'author':
+					$query['author'] = get_current_user_id();
+					break;
+				case 'none':
+				case 'ID':
+				case 'title':
+				case 'date':
+				case 'modified':
+				case 'relevance':
+				case 'post__in':
+				case 'rand':
+					$query['orderby'] = $criteria;
+					break;
+				default:
+					if (!empty($pid)) {
+						$post_meta = get_post_meta($pid, '_' . $criteria, true);
+					} else {
+						$check_meta = $wpdb->prepare("SELECT COUNT(meta_id) as meta_criteria FROM " . $wpdb->postmeta . " WHERE meta_key = %s", '_' . $criteria);
+						$post_meta = $wpdb->get_var($check_meta);
+					}
+					if (!empty($post_meta)) {
+						if (in_array($criteria, array('wpshop_displayed_price', 'product_price'))) {
+							$query['orderby'] = 'meta_value_num';
+						} else {
+							$query['orderby'] = 'meta_value';
+						}
+						$query['meta_key'] = '_' . $criteria;
+					}
+					break;
+			}
+		} else {
+			$query['orderby'] = 'menu_order ID';
+		}
+		$post_per_page = $query['posts_per_page'];
+		$total_products = (!empty($query['post__in'])) ? $query['post__in'] : 0;
+		if (!empty($pid) && !empty($query['post__in']) && count($query['post__in']) > $query['posts_per_page']) {
+			$tmp_array = array();
+
+			if (empty($page_number) || $page_number == 1) {
+				for ($i = 0; $i < $query['posts_per_page']; $i++) {
+					$tmp_array[] = $query['post__in'][$i];
+				}
+			} else {
+				$begin_number = (($page_number - 1) * $query['posts_per_page']);
+				for ($i = $begin_number; $i < $query['posts_per_page'] + $begin_number; $i++) {
+					if (!empty($query['post__in'][$i])) {
+						$tmp_array[] = $query['post__in'][$i];
+					}
+				}
+			}
+			unset($query['post__in']);
+			$query['post__in'] = $tmp_array;
+			$query['posts_per_page'] = -1;
+		}
 
-        return array($have_results, $string);
-    }
+		$query['post_status'] = 'publish';
+
+		$custom_query = new WP_Query($query);
+
+		if ($custom_query->have_posts()) {
+			$have_results = true;
+
+			// ---------------- //
+			// Products listing //
+			// ---------------- //
+			$current_position = 1;
+			$product_list = '';
+			while ($custom_query->have_posts()): $custom_query->the_post();
+				$cats = get_the_terms(get_the_ID(), WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
+				$cats = !empty($cats) && is_array($cats) ? array_values($cats) : array();
+				$cat_id = empty($cats) ? 0 : $cats[0]->term_id;
+				$product_list .= self::product_mini_output(get_the_ID(), $cat_id, $display_type, $current_position, $grid_element_nb_per_line);
+				$current_position++;
+			endwhile;
+			$tpl_component = array();
+			$tpl_component['PRODUCT_CONTAINER_TYPE_CLASS'] = ($display_type == 'grid' ? ' ' . $display_type . '_' . $grid_element_nb_per_line : '') . ' ' . $display_type . '_mode';
+			$tpl_component['PRODUCT_LIST_DISPLAY_TYPE'] = $display_type;
+			$tpl_component['PRODUCT_LIST_PER_LINE'] = $grid_element_nb_per_line;
+			$tpl_component['PRODUCT_LIST'] = $product_list;
+			$tpl_component['CROSSED_OUT_PRICE'] = '';
+			$tpl_component['LOW_STOCK_ALERT_MESSAGE'] = '';
+			$string = wpshop_display::display_template_element('product_list_container', $tpl_component);
+
+			// --------------------- //
+			// Pagination management //
+			// --------------------- //
+			if ( $display_pagination ) {
+				if ($nb_of_product_limit == 0) {
+
+					$paginate = paginate_links(array(
+						'base' => '%_%',
+						'format' => '/?page_product=%#%',
+						'current' => $page_number,
+						'total' => $custom_query->max_num_pages,
+						'type' => 'array',
+						'prev_next' => false,
+					));
+					if (!empty($paginate)) {
+						$string .= '<ul class="pagination wps-pagination">';
+						foreach ($paginate as $p) {
+							$string .= '<li>' . $p . '</li>';
+						}
+						$string .= '</ul>';
+					}
+				}
 
-    /**
-     * Update quantity for a product
-     * @param integer $product_id The product we want to update quantity for
-     * @param decimal $qty The new quantity
-     */
-    public static function reduce_product_stock_qty($product_id, $qty, $variation_id = '')
-    {
-        global $wpdb;
-
-        $product = self::get_product_data($product_id);
-        /** Check if there is variation ***/
-        if (!empty($variation_id) && $variation_id != $product_id) {
-            $variation_post_type = get_post_type($variation_id);
-            if ($variation_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
-                /** Check if variation def is combined **/
-                $variations = get_post_meta($product_id, '_wpshop_variation_defining', true);
-                if (!empty($variations) && !empty($variations['options']) && !empty($variations['options']['priority']) && in_array('combined', $variations['options']['priority'])) {
-                    /** Get post meta of variation */
-                    $variation_metadata = get_post_meta($variation_id, '_wpshop_product_metadata', true);
-                    if (!empty($variation_metadata) && isset($variation_metadata['product_stock'])) {
-                        $product = self::get_product_data($variation_id);
-                        $product_id = $variation_id;
-                    }
-                }
-            }
-        }
+				if (!empty($pid) && !empty($query['post__in']) && count($total_products) > $post_per_page) {
+					$paginate = paginate_links(array(
+						'base' => '%_%',
+						'format' => '/?page_product=%#%',
+						'current' => $page_number,
+						'total' => ceil(count($total_products) / $post_per_page),
+						'type' => 'array',
+						'prev_next' => false,
+					));
+					if (!empty($paginate)) {
+						$string .= '<ul class="pagination wps-pagination">';
+						foreach ($paginate as $p) {
+							$string .= '<li>' . $p . '</li>';
+						}
+						$string .= '</ul>';
+					}
+				}
+			}
+
+		}
+		wp_reset_query(); // important
 
-        if (!empty($product)) {
-            $newQty = $product['product_stock'] - $qty;
-            $value_id = 0;
-            if ($newQty >= 0) {
-                $query = '
+		return array($have_results, $string);
+	}
+
+	/**
+	 * Update quantity for a product
+	 * @param integer $product_id The product we want to update quantity for
+	 * @param decimal $qty The new quantity
+	 */
+	public static function reduce_product_stock_qty($product_id, $qty, $variation_id = '')
+	{
+		global $wpdb;
+
+		$product = self::get_product_data($product_id);
+		/** Check if there is variation ***/
+		if (!empty($variation_id) && $variation_id != $product_id) {
+			$variation_post_type = get_post_type($variation_id);
+			if ($variation_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+				/** Check if variation def is combined **/
+				$variations = get_post_meta($product_id, '_wpshop_variation_defining', true);
+				if (!empty($variations) && !empty($variations['options']) && !empty($variations['options']['priority']) && in_array('combined', $variations['options']['priority'])) {
+					/** Get post meta of variation */
+					$variation_metadata = get_post_meta($variation_id, '_wpshop_product_metadata', true);
+					if (!empty($variation_metadata) && isset($variation_metadata['product_stock'])) {
+						$product = self::get_product_data($variation_id);
+						$product_id = $variation_id;
+					}
+				}
+			}
+		}
+
+		if (!empty($product)) {
+			$newQty = $product['product_stock'] - $qty;
+			$value_id = 0;
+			if ($newQty >= 0) {
+				$query = '
 					SELECT wp_wpshop__attribute_value_decimal.value_id
 					FROM wp_wpshop__attribute_value_decimal
 					LEFT JOIN wp_wpshop__attribute ON wp_wpshop__attribute_value_decimal.attribute_id = wp_wpshop__attribute.id
 					WHERE wp_wpshop__attribute_value_decimal.entity_id=' . $product_id . ' AND wp_wpshop__attribute.code="product_stock"
 					LIMIT 1
 				';
-                $value_id = $wpdb->get_var($query);
-                $update = $wpdb->update('wp_wpshop__attribute_value_decimal', array('value' => wpshop_tools::wpshop_clean($newQty)), array('value_id' => $value_id));
-            }
-            // Historic
-            $attribute_histo_content = array();
-            $attribute_histo_content['status'] = 'valid';
-            $attribute_histo_content['creation_date'] = current_time('mysql', 0);
-            $attribute_histo_content['creation_date_value'] = (!empty($attribute_histo[0]->creation_date_value)) ? $attribute_histo[0]->creation_date_value : current_time('mysql', 0);
-            $attribute_histo_content['original_value_id'] = $value_id;
-            $attribute_histo_content['entity_type_id'] = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-            $stock_atribute = wpshop_attributes::getElement('product_stock', "'valid'", 'code');
-            $attribute_histo_content['attribute_id'] = $stock_atribute->id;
-            $attribute_histo_content['entity_id'] = $product_id;
-            $attribute_histo_content['value'] = $product['product_stock'];
-            $attribute_histo_content['value_type'] = 'wp_wpshop__attribute_value_decimal';
-            $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_HISTO, $attribute_histo_content);
-
-            $product_meta = get_post_meta($product_id, '_wpshop_product_metadata', true);
-            $product_meta['product_stock'] = $newQty;
-            update_post_meta($product_id, '_wpshop_product_metadata', $product_meta);
-        }
-    }
+				$value_id = $wpdb->get_var($query);
+				$update = $wpdb->update('wp_wpshop__attribute_value_decimal', array('value' => wpshop_tools::wpshop_clean($newQty)), array('value_id' => $value_id));
+			}
+			// Historic
+			$attribute_histo_content = array();
+			$attribute_histo_content['status'] = 'valid';
+			$attribute_histo_content['creation_date'] = current_time('mysql', 0);
+			$attribute_histo_content['creation_date_value'] = (!empty($attribute_histo[0]->creation_date_value)) ? $attribute_histo[0]->creation_date_value : current_time('mysql', 0);
+			$attribute_histo_content['original_value_id'] = $value_id;
+			$attribute_histo_content['entity_type_id'] = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			$stock_atribute = wpshop_attributes::getElement('product_stock', "'valid'", 'code');
+			$attribute_histo_content['attribute_id'] = $stock_atribute->id;
+			$attribute_histo_content['entity_id'] = $product_id;
+			$attribute_histo_content['value'] = $product['product_stock'];
+			$attribute_histo_content['value_type'] = 'wp_wpshop__attribute_value_decimal';
+			$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_HISTO, $attribute_histo_content);
+
+			$product_meta = get_post_meta($product_id, '_wpshop_product_metadata', true);
+			$product_meta['product_stock'] = $newQty;
+			update_post_meta($product_id, '_wpshop_product_metadata', $product_meta);
+		}
+	}
 
-    /**
-     * Retrieve an array with complete information about a given product
-     * @param integer $product_id
-     * @param boolean $for_cart_storage
-     * @return array Information about the product defined by first parameter
-     */
-    public static function get_product_data($product_id, $for_cart_storage = false, $post_status = '"publish"')
-    {
-        global $wpdb;
-        $query = $wpdb->prepare('
+	/**
+	 * Retrieve an array with complete information about a given product
+	 * @param integer $product_id
+	 * @param boolean $for_cart_storage
+	 * @return array Information about the product defined by first parameter
+	 */
+	public static function get_product_data($product_id, $for_cart_storage = false, $post_status = '"publish"')
+	{
+		global $wpdb;
+		$query = $wpdb->prepare('
 			SELECT P.*, PM.meta_value AS attribute_set_id
 			FROM ' . $wpdb->posts . ' AS P
 				INNER JOIN ' . $wpdb->postmeta . ' AS PM ON (PM.post_id=P.ID)
@@ -1128,398 +1128,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);
 
-        return $product_data;
-    }
+		$product_data = array();
+		$product_meta = array();
 
-    /**
-     * 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];
-    }
+		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 : '';
 
-    /**
-     * 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['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);
+		}
+
+		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;
+							}
+						}
+					}
 
-        return $permalink;
+					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);
 
-        //echo '<pre>'; print_r($permalink); echo '</pre>'; exit();
+					/** 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);
 
-        //wpshop_catalog_categories_slug wpshop_catalog_no_category_slug
+					/*    Update product price looking for shop parameters    */
+					wpshop_products::calculate_price($variation_id);
+				}
+			}
 
-        /*if(false) {
-        global $wp_query;
-        $product_categories = wp_get_object_terms( $post->ID, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES );
+			/*    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;
+
+		//echo '<pre>'; print_r($permalink); echo '</pre>'; exit();
+
+		//wpshop_catalog_categories_slug wpshop_catalog_no_category_slug
+
+		/*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;
     }
@@ -1529,457 +1529,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();
+				}
+			}
+		}
+
+		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/>
+	/**
+	 *
+	 * @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( {
@@ -1988,1533 +1988,1533 @@ 
 		});
 	});
 </script>';
-    }
+	}
 
-    /**
-     * Allows to manage output for special state for a product (New product/highlight product)
-     *
-     * @param string $special The type of special type we want to output
-     * @param string $output_type The current display type (used for product listing)
-     * @param string $special_state_def The value allowing to test if we have to display a special state for the product
-     * @param datetime $special_state_start The start date if applicable for the special state
-     * @param datetime $special_state_end The end date if applicable for the special state
-     *
-     * @return array $product_special_state The product special state
-     */
-    public static function display_product_special_state($special, $output_type, $special_state_def, $special_state_start, $special_state_end)
-    {
-        $product_special_state = array();
-        $product_special_state['output'] = $product_special_state['class'] = '';
-
-        /** Get product special state definition    */
-        $special_state_def = !empty($special_state_def) ? $special_state_def : 'No';
-        $special_state_start = !empty($special_state_start) ? substr($special_state_start, 0, 10) : null;
-        $special_state_end = !empty($special_state_end) ? substr($special_state_end, 0, 10) : null;
-
-        /** Get current time    */
-        $current_time = substr(current_time('mysql', 0), 0, 10);
-
-        /** PRODUCT MARK AS NEW */
-        $show_product_special_state = false;
-        if ((strtolower(__($special_state_def, 'wpshop')) === strtolower(__('Yes', 'wpshop'))) &&
-            (empty($special_state_start) || ($special_state_start == '0000-00-00') || ($special_state_start >= $current_time)) &&
-            (empty($special_state_end) || ($special_state_end == '0000-00-00') || ($special_state_end <= $current_time))) {
-            $show_product_special_state = true;
-        }
+	/**
+	 * Allows to manage output for special state for a product (New product/highlight product)
+	 *
+	 * @param string $special The type of special type we want to output
+	 * @param string $output_type The current display type (used for product listing)
+	 * @param string $special_state_def The value allowing to test if we have to display a special state for the product
+	 * @param datetime $special_state_start The start date if applicable for the special state
+	 * @param datetime $special_state_end The end date if applicable for the special state
+	 *
+	 * @return array $product_special_state The product special state
+	 */
+	public static function display_product_special_state($special, $output_type, $special_state_def, $special_state_start, $special_state_end)
+	{
+		$product_special_state = array();
+		$product_special_state['output'] = $product_special_state['class'] = '';
+
+		/** Get product special state definition    */
+		$special_state_def = !empty($special_state_def) ? $special_state_def : 'No';
+		$special_state_start = !empty($special_state_start) ? substr($special_state_start, 0, 10) : null;
+		$special_state_end = !empty($special_state_end) ? substr($special_state_end, 0, 10) : null;
+
+		/** Get current time    */
+		$current_time = substr(current_time('mysql', 0), 0, 10);
+
+		/** PRODUCT MARK AS NEW */
+		$show_product_special_state = false;
+		if ((strtolower(__($special_state_def, 'wpshop')) === strtolower(__('Yes', 'wpshop'))) &&
+			(empty($special_state_start) || ($special_state_start == '0000-00-00') || ($special_state_start >= $current_time)) &&
+			(empty($special_state_end) || ($special_state_end == '0000-00-00') || ($special_state_end <= $current_time))) {
+			$show_product_special_state = true;
+		}
 
-        if ($show_product_special_state) {
-            /** Check the type of special output needed    */
-            switch ($special) {
-                case 'declare_new':
-                    $product_special_state['class'] = ' wpshop_product_is_new_' . $output_type;
-                    $template_part = 'product_is_new_sticker';
-                    break;
-
-                case 'highlight_product':
-                    $product_special_state['class'] = ' wpshop_product_featured_' . $output_type;
-                    $template_part = 'product_is_featured_sticker';
-                    break;
-            }
-
-            /** Template parameters    */
-            $tpl_component = array();
-
-            /** Build template        */
-            $tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-            if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
-                /**    Include the old way template part    */
-                ob_start();
-                require wpshop_display::get_template_file($tpl_way_to_take[1]);
-                $product_special_state['output'] = ob_get_contents();
-                ob_end_clean();
-            } else {
-                $product_special_state['output'] = wpshop_display::display_template_element($template_part, $tpl_component);
-            }
-            unset($tpl_component);
-        }
+		if ($show_product_special_state) {
+			/** Check the type of special output needed    */
+			switch ($special) {
+				case 'declare_new':
+					$product_special_state['class'] = ' wpshop_product_is_new_' . $output_type;
+					$template_part = 'product_is_new_sticker';
+					break;
 
-        return $product_special_state;
-    }
+				case 'highlight_product':
+					$product_special_state['class'] = ' wpshop_product_featured_' . $output_type;
+					$template_part = 'product_is_featured_sticker';
+					break;
+			}
 
-    /**
-     * Prepare product price for saving and easier read later
-     *
-     * @param integer $element_id Identifier of current product
-     */
-    public static function calculate_price($element_id)
-    {
-        global $wpdb;
-
-        /**
-         * Récupères les attributs suivants : product_price, price_ht et tva
-         * par rapport à $element_id / Get the next attributes : product_price,
-         * price_ht and tva
-         */
-        $query = $wpdb->prepare(
-            "SELECT ATTR.code, ATTR_VAL.value_id AS id, ATTR_VAL.value, ATTR.id AS attribute_id
+			/** Template parameters    */
+			$tpl_component = array();
+
+			/** Build template        */
+			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
+				/**    Include the old way template part    */
+				ob_start();
+				require wpshop_display::get_template_file($tpl_way_to_take[1]);
+				$product_special_state['output'] = ob_get_contents();
+				ob_end_clean();
+			} else {
+				$product_special_state['output'] = wpshop_display::display_template_element($template_part, $tpl_component);
+			}
+			unset($tpl_component);
+		}
+
+		return $product_special_state;
+	}
+
+	/**
+	 * Prepare product price for saving and easier read later
+	 *
+	 * @param integer $element_id Identifier of current product
+	 */
+	public static function calculate_price($element_id)
+	{
+		global $wpdb;
+
+		/**
+		 * Récupères les attributs suivants : product_price, price_ht et tva
+		 * par rapport à $element_id / Get the next attributes : product_price,
+		 * price_ht and tva
+		 */
+		$query = $wpdb->prepare(
+			"SELECT ATTR.code, ATTR_VAL.value_id AS id, ATTR_VAL.value, ATTR.id AS attribute_id
 			FROM " . WPSHOP_DBT_ATTRIBUTE . " AS ATTR
 				RIGHT JOIN " . WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL . " AS ATTR_VAL ON ((ATTR_VAL.attribute_id = ATTR.id) AND (ATTR_VAL.entity_id = %d))
 			WHERE ATTR.code IN ('" . implode("', '", unserialize(WPSHOP_ATTRIBUTE_PRICES)) . "')",
-            $element_id
-        );
-        $prices_attribute = $wpdb->get_results($query, OBJECT_K);
-
-        /** Si aucun prix trouvé on stop la méthode / If not found price, stop the method */
-        if (empty($prices_attribute)) {
-            return false;
-        } else {
-            /**
-             * Récupère le prix de base selon le pilotage de prix de la boutique / Get
-             * the base amount according on the shop price control
-             */
-            $base_price = $prices_attribute[constant('WPSHOP_PRODUCT_PRICE_' . WPSHOP_PRODUCT_PRICE_PILOT)]->value;
-            $rate_vat = wpshop_prices::get_rate_vat($element_id);
-            $divider_price_ttc = 1 + ($rate_vat->value / 100);
-
-            /**
-             * Informations nécessaire pour crée un attribut / Information needed to
-             * create an attribute
-             */
-            $entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-            $language = WPSHOP_CURRENT_LOCALE;
-            $icl_post_language = !empty($_REQUEST['icl_post_language']) ? sanitize_text_field($_REQUEST['icl_post_language']) : '';
-
-            if (!empty($icl_post_language)) {
-                $query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", $icl_post_language);
-                $language = $wpdb->get_var($query);
-            }
-
-            /**
-             * Vérifie la configuration pour savoir comment calculer les prix pour le produit /
-             * Check configuration to know how to make the calcul for the product
-             */
-            if (WPSHOP_PRODUCT_PRICE_PILOT == 'HT') {
-                $price_with_vat = ($base_price * $divider_price_ttc);
-                $price_no_vat = $base_price;
-            } else if (WPSHOP_PRODUCT_PRICE_PILOT == 'TTC') {
-                $price_with_vat = $base_price;
-                $price_no_vat = ($price_with_vat / $divider_price_ttc);
-            }
-
-            /**
-             * Le dernier paramètre permet de ne pas supprimer les attributs du même
-             * type que celui-ci / The last parameter allows not to delete the
-             * attributes of the same type as this one
-             */
-            wpshop_attributes::saveAttributeForEntity(array('decimal' => array('product_price' => $price_with_vat)), $entity_type_id, $element_id, $language, 'wpshop_products');
-            wpshop_attributes::saveAttributeForEntity(array('decimal' => array('price_ht' => $price_no_vat)), $entity_type_id, $element_id, $language, 'wpshop_product');
-
-            /** Ajout ou met à jour de l'attribut tva / Add or update the attribute vat */
-            $vat_amount = $price_with_vat - $price_no_vat;
-            wpshop_attributes::saveAttributeForEntity(array('decimal' => array('tva' => $vat_amount)), $entity_type_id, $element_id, $language, 'wpshop_product');
-
-            /**    Update the product meta information with the calculated prices    */
-            $product_postmeta = get_post_meta($element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
-            $product_postmeta[WPSHOP_PRODUCT_PRICE_TTC] = number_format(round($price_with_vat, 5), 5, '.', '');
-            $product_postmeta[WPSHOP_PRODUCT_PRICE_HT] = number_format(round($price_no_vat, 5), 5, '.', '');
-            $product_postmeta[WPSHOP_PRODUCT_PRICE_TAX_AMOUNT] = number_format(round($vat_amount, 5), 5, '.', '');
-            $product_postmeta[WPSHOP_PRODUCT_PRICE_TAX] = $rate_vat->id;
-
-            update_post_meta($element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $product_postmeta);
+			$element_id
+		);
+		$prices_attribute = $wpdb->get_results($query, OBJECT_K);
+
+		/** Si aucun prix trouvé on stop la méthode / If not found price, stop the method */
+		if (empty($prices_attribute)) {
+			return false;
+		} else {
+			/**
+			 * Récupère le prix de base selon le pilotage de prix de la boutique / Get
+			 * the base amount according on the shop price control
+			 */
+			$base_price = $prices_attribute[constant('WPSHOP_PRODUCT_PRICE_' . WPSHOP_PRODUCT_PRICE_PILOT)]->value;
+			$rate_vat = wpshop_prices::get_rate_vat($element_id);
+			$divider_price_ttc = 1 + ($rate_vat->value / 100);
+
+			/**
+			 * Informations nécessaire pour crée un attribut / Information needed to
+			 * create an attribute
+			 */
+			$entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			$language = WPSHOP_CURRENT_LOCALE;
+			$icl_post_language = !empty($_REQUEST['icl_post_language']) ? sanitize_text_field($_REQUEST['icl_post_language']) : '';
+
+			if (!empty($icl_post_language)) {
+				$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", $icl_post_language);
+				$language = $wpdb->get_var($query);
+			}
 
-            /** Met à jour la meta _wps_price_infos */
-            $p = wpshop_products::get_product_data($element_id);
-            $price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', 'grid'));
-            update_post_meta($element_id, '_wps_price_infos', $price);
+			/**
+			 * Vérifie la configuration pour savoir comment calculer les prix pour le produit /
+			 * Check configuration to know how to make the calcul for the product
+			 */
+			if (WPSHOP_PRODUCT_PRICE_PILOT == 'HT') {
+				$price_with_vat = ($base_price * $divider_price_ttc);
+				$price_no_vat = $base_price;
+			} else if (WPSHOP_PRODUCT_PRICE_PILOT == 'TTC') {
+				$price_with_vat = $base_price;
+				$price_no_vat = ($price_with_vat / $divider_price_ttc);
+			}
 
-            /** Met à jour la meta _wpshop_displayed_price */
-            wps_filter_search::save_displayed_price_meta($element_id);
-        }
+			/**
+			 * Le dernier paramètre permet de ne pas supprimer les attributs du même
+			 * type que celui-ci / The last parameter allows not to delete the
+			 * attributes of the same type as this one
+			 */
+			wpshop_attributes::saveAttributeForEntity(array('decimal' => array('product_price' => $price_with_vat)), $entity_type_id, $element_id, $language, 'wpshop_products');
+			wpshop_attributes::saveAttributeForEntity(array('decimal' => array('price_ht' => $price_no_vat)), $entity_type_id, $element_id, $language, 'wpshop_product');
+
+			/** Ajout ou met à jour de l'attribut tva / Add or update the attribute vat */
+			$vat_amount = $price_with_vat - $price_no_vat;
+			wpshop_attributes::saveAttributeForEntity(array('decimal' => array('tva' => $vat_amount)), $entity_type_id, $element_id, $language, 'wpshop_product');
+
+			/**    Update the product meta information with the calculated prices    */
+			$product_postmeta = get_post_meta($element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
+			$product_postmeta[WPSHOP_PRODUCT_PRICE_TTC] = number_format(round($price_with_vat, 5), 5, '.', '');
+			$product_postmeta[WPSHOP_PRODUCT_PRICE_HT] = number_format(round($price_no_vat, 5), 5, '.', '');
+			$product_postmeta[WPSHOP_PRODUCT_PRICE_TAX_AMOUNT] = number_format(round($vat_amount, 5), 5, '.', '');
+			$product_postmeta[WPSHOP_PRODUCT_PRICE_TAX] = $rate_vat->id;
+
+			update_post_meta($element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $product_postmeta);
+
+			/** Met à jour la meta _wps_price_infos */
+			$p = wpshop_products::get_product_data($element_id);
+			$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', 'grid'));
+			update_post_meta($element_id, '_wps_price_infos', $price);
+
+			/** Met à jour la meta _wpshop_displayed_price */
+			wps_filter_search::save_displayed_price_meta($element_id);
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Allows to get the good button for adding product to cart
-     *
-     * @param integer $product_id The product identifier
-     * @param boolean $productStock If there is the possibility to add the given product to the cart
-     *
-     * @return string $button The html output for the button
-     */
-    public static function display_add_to_cart_button($product_id, $productStock, $output_type = 'mini')
-    {
-        $button = '';
+	/**
+	 * Allows to get the good button for adding product to cart
+	 *
+	 * @param integer $product_id The product identifier
+	 * @param boolean $productStock If there is the possibility to add the given product to the cart
+	 *
+	 * @return string $button The html output for the button
+	 */
+	public static function display_add_to_cart_button($product_id, $productStock, $output_type = 'mini')
+	{
+		$button = '';
 //         $attributes_frontend_display = get_post_meta( $product_id, '_wpshop_product_attributes_frontend_display', true );
 
-        if (WPSHOP_DEFINED_SHOP_TYPE == 'sale' /*&& ( empty($attributes_frontend_display) || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['mini_output']) && $output_type == 'mini') || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['complete_sheet']) && $output_type == 'complete') ) */) {
-            /*
+		if (WPSHOP_DEFINED_SHOP_TYPE == 'sale' /*&& ( empty($attributes_frontend_display) || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['mini_output']) && $output_type == 'mini') || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['complete_sheet']) && $output_type == 'complete') ) */) {
+			/*
              * Check if current product has variation for button display
              */
-            $variations_exists = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'post_parent' => $product_id));
-            $variations_list = (!empty($variations_exists) && is_array(wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode)))) ? true : false;
+			$variations_exists = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'post_parent' => $product_id));
+			$variations_list = (!empty($variations_exists) && is_array(wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode)))) ? true : false;
 
-            /*
+			/*
              * Template parameters
              */
 
-            if (get_post_type($product_id) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) {
-                /** Check variation stock **/
-                $variations = self::get_variation($product_id);
-                if (!empty($variations)) {
-                    foreach ($variations as $variation) {
-                        if (!empty($variation) && !empty($variation['variation_dif']) && !empty($variation['variation_dif']['product_stock'])) {
-                            $productStock += $variation['variation_dif']['product_stock'];
-                        }
-                    }
-                }
-            }
-
-            $template_part = ($variations_list && ($output_type == 'mini')) ? 'configure_product_button' : (!empty($productStock) ? 'add_to_cart_button' : 'unavailable_product_button');
+			if (get_post_type($product_id) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) {
+				/** Check variation stock **/
+				$variations = self::get_variation($product_id);
+				if (!empty($variations)) {
+					foreach ($variations as $variation) {
+						if (!empty($variation) && !empty($variation['variation_dif']) && !empty($variation['variation_dif']['product_stock'])) {
+							$productStock += $variation['variation_dif']['product_stock'];
+						}
+					}
+				}
+			}
+
+			$template_part = ($variations_list && ($output_type == 'mini')) ? 'configure_product_button' : (!empty($productStock) ? 'add_to_cart_button' : 'unavailable_product_button');
 						$template_part = apply_filters( 'wps_custom_add_to_cart_button', $template_part, $product_id );
 
-            $tpl_component = array();
-            $tpl_component['PRODUCT_ID'] = $product_id;
-            $tpl_component['PRODUCT_PERMALINK'] = get_permalink($product_id);
-            $tpl_component['PRODUCT_TITLE'] = get_the_title($product_id);
+			$tpl_component = array();
+			$tpl_component['PRODUCT_ID'] = $product_id;
+			$tpl_component['PRODUCT_PERMALINK'] = get_permalink($product_id);
+			$tpl_component['PRODUCT_TITLE'] = get_the_title($product_id);
 
-            /*
+			/*
              * Build template
              */
-            $tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-            if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
-                /*    Include the old way template part    */
-                ob_start();
-                require wpshop_display::get_template_file($tpl_way_to_take[1]);
-                $button = ob_get_contents();
-                ob_end_clean();
-            } else {
-                $button = wpshop_display::display_template_element($template_part, $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $product_id, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . 'output_type' => $output_type));
-            }
-            unset($tpl_component);
-        }
-        return $button;
-    }
-
-    /**
-     * Allows to get the good button for adding product to a quotation
-     *
-     * @param integer $product_id The product identifier
-     * @param boolean $product_quotation_state The state of the quotation addons
-     *
-     * @return string $button The html output for the button
-     */
-    public static function display_quotation_button($product_id, $product_quotation_state, $output_type = 'mini')
-    {
-        $quotation_button = '';
-
-        if (WPSHOP_ADDONS_QUOTATION && (!empty($product_quotation_state) && strtolower(__($product_quotation_state, 'wpshop')) == strtolower(__('Yes', 'wpshop'))) && (empty($_SESSION['cart']['cart_type']) || ($_SESSION['cart']['cart_type'] == 'quotation'))) {
-            $variations_list = (is_array(wpshop_products::get_variation($product_id)) && is_array(wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode)))) ? array_merge(wpshop_products::get_variation($product_id), wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode))) : array();
-            /**
-             * Template parameters
-             */
-            $template_part = (!empty($variations_list) && ($output_type == 'mini')) ? 'configure_quotation_button' : 'ask_quotation_button';
-            $tpl_component = array();
-            $tpl_component['PRODUCT_ID'] = $product_id;
-            $tpl_component['PRODUCT_PERMALINK'] = get_permalink($product_id);
-            $tpl_component['PRODUCT_TITLE'] = get_the_title($product_id);
+			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
+				/*    Include the old way template part    */
+				ob_start();
+				require wpshop_display::get_template_file($tpl_way_to_take[1]);
+				$button = ob_get_contents();
+				ob_end_clean();
+			} else {
+				$button = wpshop_display::display_template_element($template_part, $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $product_id, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . 'output_type' => $output_type));
+			}
+			unset($tpl_component);
+		}
+		return $button;
+	}
 
-            /**
-             * Build template
-             */
-            $tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-            if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
-                /*    Include the old way template part    */
-                ob_start();
-                require wpshop_display::get_template_file($tpl_way_to_take[1]);
-                $quotation_button = ob_get_contents();
-                ob_end_clean();
-            } else {
-                $quotation_button = wpshop_display::display_template_element($template_part, $tpl_component);
-            }
-            unset($tpl_component);
-        }
+	/**
+	 * Allows to get the good button for adding product to a quotation
+	 *
+	 * @param integer $product_id The product identifier
+	 * @param boolean $product_quotation_state The state of the quotation addons
+	 *
+	 * @return string $button The html output for the button
+	 */
+	public static function display_quotation_button($product_id, $product_quotation_state, $output_type = 'mini')
+	{
+		$quotation_button = '';
+
+		if (WPSHOP_ADDONS_QUOTATION && (!empty($product_quotation_state) && strtolower(__($product_quotation_state, 'wpshop')) == strtolower(__('Yes', 'wpshop'))) && (empty($_SESSION['cart']['cart_type']) || ($_SESSION['cart']['cart_type'] == 'quotation'))) {
+			$variations_list = (is_array(wpshop_products::get_variation($product_id)) && is_array(wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode)))) ? array_merge(wpshop_products::get_variation($product_id), wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode))) : array();
+			/**
+			 * Template parameters
+			 */
+			$template_part = (!empty($variations_list) && ($output_type == 'mini')) ? 'configure_quotation_button' : 'ask_quotation_button';
+			$tpl_component = array();
+			$tpl_component['PRODUCT_ID'] = $product_id;
+			$tpl_component['PRODUCT_PERMALINK'] = get_permalink($product_id);
+			$tpl_component['PRODUCT_TITLE'] = get_the_title($product_id);
+
+			/**
+			 * Build template
+			 */
+			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
+				/*    Include the old way template part    */
+				ob_start();
+				require wpshop_display::get_template_file($tpl_way_to_take[1]);
+				$quotation_button = ob_get_contents();
+				ob_end_clean();
+			} else {
+				$quotation_button = wpshop_display::display_template_element($template_part, $tpl_component);
+			}
+			unset($tpl_component);
+		}
 
-        return $quotation_button;
-    }
+		return $quotation_button;
+	}
 
-    /**
-     * Return the output for a product attachement gallery (picture or document)
-     *
-     * @param string $attachement_type The type of attachement to output. allows to define with type of template to take
-     * @param string $content The gallery content build previously
-     *
-     * @return string The attachement gallery output
-     */
-    public static function display_attachment_gallery($attachement_type, $content)
-    {
-        $galery_output = '';
-
-        /*
+	/**
+	 * Return the output for a product attachement gallery (picture or document)
+	 *
+	 * @param string $attachement_type The type of attachement to output. allows to define with type of template to take
+	 * @param string $content The gallery content build previously
+	 *
+	 * @return string The attachement gallery output
+	 */
+	public static function display_attachment_gallery($attachement_type, $content)
+	{
+		$galery_output = '';
+
+		/*
          * Get the template part for given galery type
          */
-        switch ($attachement_type) {
-            case 'picture':
-                $template_part = 'product_attachment_picture_galery';
-                break;
-            case 'document':
-                $template_part = 'product_attachment_galery';
-                break;
-        }
+		switch ($attachement_type) {
+			case 'picture':
+				$template_part = 'product_attachment_picture_galery';
+				break;
+			case 'document':
+				$template_part = 'product_attachment_galery';
+				break;
+		}
 
-        /*
+		/*
          * Template parameters
          */
-        $tpl_component = array();
-        $tpl_component['PRODUCT_ATTACHMENT_OUTPUT_CONTENT'] = $content;
-        $tpl_component['ATTACHMENT_ITEM_TYPE'] = $attachement_type;
+		$tpl_component = array();
+		$tpl_component['PRODUCT_ATTACHMENT_OUTPUT_CONTENT'] = $content;
+		$tpl_component['ATTACHMENT_ITEM_TYPE'] = $attachement_type;
 
-        /*
+		/*
          * Build template
          */
-        $tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-        if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
-            /*    Include the old way template part    */
-            ob_start();
-            require wpshop_display::get_template_file($tpl_way_to_take[1]);
-            $galery_output = ob_get_contents();
-            ob_end_clean();
-        } else {
-            $galery_output = wpshop_display::display_template_element($template_part, $tpl_component);
-        }
-        unset($tpl_component);
+		$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
+		if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
+			/*    Include the old way template part    */
+			ob_start();
+			require wpshop_display::get_template_file($tpl_way_to_take[1]);
+			$galery_output = ob_get_contents();
+			ob_end_clean();
+		} else {
+			$galery_output = wpshop_display::display_template_element($template_part, $tpl_component);
+		}
+		unset($tpl_component);
 
-        return $galery_output;
-    }
+		return $galery_output;
+	}
 
-    /**
-     * Define the metabox to display in product edition page in backend
-     * @param object $post The current element displayed for edition
-     */
-    public static function meta_box_variations($post)
-    {
-        $output = '';
-        /*    Variations container    */
-        $tpl_component = array();
-        $tpl_component['ADMIN_VARIATION_CONTAINER'] = self::display_variation_admin($post->ID);
-        $tpl_component['LINK_NEW_INTERFACE'] = wp_nonce_url(get_edit_post_link($post->ID) . '&wps_variation_interface=true', 'wps_remove_variation_interface');
-        $output .= wpshop_display::display_template_element('wpshop_admin_variation_metabox', $tpl_component, array(), 'admin');
-        echo '<span class="wpshop_loading_ wpshopHide" ><img src="' . admin_url('images/loading.gif') . '" alt="loading picture" /></span>' . $output . '<div class="wpshop_cls" ></div>';
-    }
+	/**
+	 * Define the metabox to display in product edition page in backend
+	 * @param object $post The current element displayed for edition
+	 */
+	public static function meta_box_variations($post)
+	{
+		$output = '';
+		/*    Variations container    */
+		$tpl_component = array();
+		$tpl_component['ADMIN_VARIATION_CONTAINER'] = self::display_variation_admin($post->ID);
+		$tpl_component['LINK_NEW_INTERFACE'] = wp_nonce_url(get_edit_post_link($post->ID) . '&wps_variation_interface=true', 'wps_remove_variation_interface');
+		$output .= wpshop_display::display_template_element('wpshop_admin_variation_metabox', $tpl_component, array(), 'admin');
+		echo '<span class="wpshop_loading_ wpshopHide" ><img src="' . admin_url('images/loading.gif') . '" alt="loading picture" /></span>' . $output . '<div class="wpshop_cls" ></div>';
+	}
 
-    /**
-     * Call variation creation function with a list of defined variation
-     *
-     * @param array $possible_variations A list of variation to create for the current element
-     * @param integer $element_id The product we want to create variation for
-     *
-     * @return mixed The last created variation identifier
-     */
-    public static function creation_variation_callback($possible_variations, $element_id)
-    {
-        /** Get existing variation    */
-        $existing_variations_in_db = wpshop_products::get_variation($element_id);
-        $existing_variations = array();
-        if (!empty($existing_variations_in_db)) {
-            foreach ($existing_variations_in_db as $variations_def) {
-                $existing_variations[] = $variations_def['variation_def'];
-            }
-        }
-        /** New variation definition    */
-        $attribute_defining_variation = get_post_meta($element_id, '_wpshop_variation_defining', true);
-
-        /**    Read possible values    */
-        foreach ($possible_variations as $variation_definition) {
-            if (in_array($variation_definition, $existing_variations)) {
-                continue;
-            }
-
-            $attribute_to_set = array();
-            foreach ($variation_definition as $attribute_code => $attribute_selected_value) {
-                $attribute = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
-                $attribute_to_set[$attribute->data_type][$attribute_code] = $attribute_selected_value;
-                if (empty($attribute_defining_variation['attributes']) || (!in_array($attribute_code, $attribute_defining_variation['attributes']))) {
-                    $attribute_defining_variation['attributes'][] = $attribute_code;
-                }
-            }
-            $variation_id = wpshop_products::create_variation($element_id, $attribute_to_set);
-        }
-        update_post_meta($element_id, '_wpshop_variation_defining', $attribute_defining_variation);
+	/**
+	 * Call variation creation function with a list of defined variation
+	 *
+	 * @param array $possible_variations A list of variation to create for the current element
+	 * @param integer $element_id The product we want to create variation for
+	 *
+	 * @return mixed The last created variation identifier
+	 */
+	public static function creation_variation_callback($possible_variations, $element_id)
+	{
+		/** Get existing variation    */
+		$existing_variations_in_db = wpshop_products::get_variation($element_id);
+		$existing_variations = array();
+		if (!empty($existing_variations_in_db)) {
+			foreach ($existing_variations_in_db as $variations_def) {
+				$existing_variations[] = $variations_def['variation_def'];
+			}
+		}
+		/** New variation definition    */
+		$attribute_defining_variation = get_post_meta($element_id, '_wpshop_variation_defining', true);
 
-        return !empty($variation_id) ? $variation_id : 0;
-    }
+		/**    Read possible values    */
+		foreach ($possible_variations as $variation_definition) {
+			if (in_array($variation_definition, $existing_variations)) {
+				continue;
+			}
 
-    /**
-     * Create a new variation for product
-     *
-     * @param integer $head_product The product identifier to create the new variation for
-     * @param array $variation_attributes Attribute list for the variation
-     *
-     * @return mixed <number, WP_Error> The variation identifier or an error in case the creation was not succesfull
-     */
-    public static function create_variation($head_product, $variation_attributes)
-    {
-        /** Create custom title */
-        $title_variation = "";
-        if (!empty($variation_attributes)) {
-            foreach ($variation_attributes as $type => $array) {
-                if (!empty($array)) {
-                    foreach ($array as $code => $value) {
-                        $title_variation .= " " . $code . " " . $value;
-                    }
-                }
-            }
-        }
+			$attribute_to_set = array();
+			foreach ($variation_definition as $attribute_code => $attribute_selected_value) {
+				$attribute = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
+				$attribute_to_set[$attribute->data_type][$attribute_code] = $attribute_selected_value;
+				if (empty($attribute_defining_variation['attributes']) || (!in_array($attribute_code, $attribute_defining_variation['attributes']))) {
+					$attribute_defining_variation['attributes'][] = $attribute_code;
+				}
+			}
+			$variation_id = wpshop_products::create_variation($element_id, $attribute_to_set);
+		}
+		update_post_meta($element_id, '_wpshop_variation_defining', $attribute_defining_variation);
 
-        $variation = array(
-            'post_title' => sprintf(__('Product %s variation %s', 'wpshop'), $head_product, get_the_title($head_product)) . $title_variation,
-            'post_content' => '',
-            'post_status' => 'publish',
-            'post_author' => get_current_user_id(),
-            'post_parent' => $head_product,
-            'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION,
-        );
-        $variation_id = wp_insert_post($variation);
-
-        wpshop_attributes::saveAttributeForEntity($variation_attributes, wpshop_entities::get_entity_identifier_from_code(wpshop_products::currentPageCode), $variation_id, WPSHOP_CURRENT_LOCALE, '');
-
-        /*    Update product price looking for shop parameters    */
-        wpshop_products::calculate_price($variation_id);
-
-        /*    Save the attributes values into wordpress post metadata database in order to have a backup and to make frontend search working    */
-        $productMetaDatas = array();
-        foreach ($variation_attributes as $attributeType => $attributeValues) {
-            foreach ($attributeValues as $attributeCode => $attributeValue) {
-                if (!empty($attributeValue)) {
-                    $productMetaDatas[$attributeCode] = $attributeValue;
-                }
-            }
-        }
-        update_post_meta($variation_id, '_wpshop_variations_attribute_def', $productMetaDatas);
-        update_post_meta($variation_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $productMetaDatas);
-        update_post_meta($variation_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, get_post_meta($head_product, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
+		return !empty($variation_id) ? $variation_id : 0;
+	}
 
-        return $variation_id;
-    }
+	/**
+	 * Create a new variation for product
+	 *
+	 * @param integer $head_product The product identifier to create the new variation for
+	 * @param array $variation_attributes Attribute list for the variation
+	 *
+	 * @return mixed <number, WP_Error> The variation identifier or an error in case the creation was not succesfull
+	 */
+	public static function create_variation($head_product, $variation_attributes)
+	{
+		/** Create custom title */
+		$title_variation = "";
+		if (!empty($variation_attributes)) {
+			foreach ($variation_attributes as $type => $array) {
+				if (!empty($array)) {
+					foreach ($array as $code => $value) {
+						$title_variation .= " " . $code . " " . $value;
+					}
+				}
+			}
+		}
 
-    /**
-     * Get variation list for a given product
-     *
-     * @param integer $head_product The product identifier to get the variation for
-     * @return object The variation list
-     */
-    public static function get_variation($head_product, $type = 'any')
-    {
-        global $wpdb;
-        $variations_output = null;
-        $args = array(
-            'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION,
-            'post_parent' => $head_product,
-            'orderby' => 'ID',
-            'order' => 'ASC',
-            'posts_per_page' => -1,
-            'post_status' => $type,
-        );
-        $variations = get_posts($args);
-
-        if (!empty($variations)) {
-            $head_wpshop_variation_definition = get_post_meta($head_product, '_wpshop_variation_defining', true);
-
-            foreach ($variations as $post_def) {
-                $data = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $post_def->ID, WPSHOP_CURRENT_LOCALE, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, "'valid', 'deleted'");
-                foreach ($data as $content) {
-                    $attribute_value = 'attribute_value_' . $content->data_type;
-                    if (!empty($content->$attribute_value)) {
-                        if (!empty($head_wpshop_variation_definition['attributes']) && in_array($content->code, $head_wpshop_variation_definition['attributes'])) {
-                            $variations_output[$post_def->ID]['variation_def'][$content->code] = $content->$attribute_value;
-                        } else {
-                            $variations_output[$post_def->ID]['variation_dif'][$content->code] = $content->$attribute_value;
-                        }
-                    }
-                }
-                $variations_output[$post_def->ID]['post'] = $post_def;
-            }
-        }
-        wp_reset_query();
-        return $variations_output;
-    }
+		$variation = array(
+			'post_title' => sprintf(__('Product %s variation %s', 'wpshop'), $head_product, get_the_title($head_product)) . $title_variation,
+			'post_content' => '',
+			'post_status' => 'publish',
+			'post_author' => get_current_user_id(),
+			'post_parent' => $head_product,
+			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION,
+		);
+		$variation_id = wp_insert_post($variation);
+
+		wpshop_attributes::saveAttributeForEntity($variation_attributes, wpshop_entities::get_entity_identifier_from_code(wpshop_products::currentPageCode), $variation_id, WPSHOP_CURRENT_LOCALE, '');
+
+		/*    Update product price looking for shop parameters    */
+		wpshop_products::calculate_price($variation_id);
+
+		/*    Save the attributes values into wordpress post metadata database in order to have a backup and to make frontend search working    */
+		$productMetaDatas = array();
+		foreach ($variation_attributes as $attributeType => $attributeValues) {
+			foreach ($attributeValues as $attributeCode => $attributeValue) {
+				if (!empty($attributeValue)) {
+					$productMetaDatas[$attributeCode] = $attributeValue;
+				}
+			}
+		}
+		update_post_meta($variation_id, '_wpshop_variations_attribute_def', $productMetaDatas);
+		update_post_meta($variation_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $productMetaDatas);
+		update_post_meta($variation_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, get_post_meta($head_product, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
 
-    /**
-     * Affichage des variations d'un produit dans l'administration
-     *
-     * @param integer $head_product L'identifiant du produit dont on veut afficher les variations
-     * @return string Le code html permettant l'affichage des variations dans l'interface d'édition du produit
-     */
-    public static function display_variation_admin($head_product)
-    {
-        $output = '';
-        $productCurrency = wpshop_tools::wpshop_get_currency();
-        /*    Récupération de la liste des variations pour le produit en cours d'édition    */
-        $variations = self::get_variation($head_product);
-        $price_piloting = get_option('wpshop_shop_price_piloting');
-
-        /*    Affichage de la liste des variations pour le produit en cours d'édition    */
-        if (!empty($variations) && is_array($variations)) {
-            $existing_variation_list = wpshop_display::display_template_element('wpshop_admin_existing_variation_controller', array(), array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product), 'admin');
-
-            foreach ($variations as $variation) {
-                $tpl_component = array();
-
-                $tpl_component['ADMIN_EXISTING_VARIATIONS_CLASS'] = ' wpshop_variation_' . self::currentPageCode;
-                $tpl_component['VARIATION_IDENTIFIER'] = $variation['post']->ID;
-                $tpl_component['VARIATION_DETAIL'] = '  ';
-                $p = (!empty($variation['variation_dif']['product_price']) || !empty($variation['variation_dif']['price_ht'])) ? ((!empty($price_piloting) && $price_piloting == 'HT' && !empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : (!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0) : 0;
-                $tpl_component['VARIATION_DETAIL_PRICE'] = number_format($p, 2, '.', '') . ' ' . $productCurrency . ' ' . ((!empty($price_piloting) && $price_piloting == 'HT') ? __('ET', 'wpshop') : __('ATI', 'wpshop'));
-                if (!empty($price_piloting) && $price_piloting == 'HT') {
-
-                } else {
-
-                }
-                $post_obj = $variation['post'];
-
-                $parent_product_infos = wpshop_products::get_parent_variation($post_obj->ID);
-                if (!empty($parent_product_infos)) {
-                    $parent_post = $parent_product_infos['parent_post'];
-                    $product_option_postmeta = get_post_meta($parent_post->ID, '_wpshop_variation_defining', true);
-                    if (!empty($product_option_postmeta['options']['price_behaviour']) && !empty($product_option_postmeta['options']['price_behaviour'][0]) && $product_option_postmeta['options']['price_behaviour'][0] == 'addition') {
-                        if (!empty($price_piloting) && $price_piloting == 'HT') {
-                            $product_price = ((!empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : 0) + $parent_product_infos['parent_post_meta']['price_ht'];
-                        } else {
-                            $product_price = ((!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0) + $parent_product_infos['parent_post_meta']['product_price'];
-                        }
-                        $tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Variation price combined with the parent product price', 'wpshop');
-                    } else {
-                        if (!empty($price_piloting) && $price_piloting == 'HT') {
-                            $product_price = (!empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : 0;
-                        } else {
-                            $product_price = (!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0;
-                        }
-                        $tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Only variation\'s price is used', 'wpshop');
-                    }
-                    $product_price = number_format(str_replace(',', '.', $product_price), 2, '.', '') . ' ' . $productCurrency . ' ' . ((!empty($price_piloting) && $price_piloting == 'HT') ? __('ET', 'wpshop') : __('ATI', 'wpshop'));
-                    $tpl_component['VARIATION_DETAIL_SALE_PRICE'] = $product_price;
-                }
-
-                if (!empty($variation['variation_def'])) {
-                    foreach ($variation['variation_def'] as $variation_key => $variation_value) {
-                        if (!empty($variation_value)) {
-                            $attribute_def_for_variation = wpshop_attributes::getElement($variation_key, "'valid'", 'code');
-                            $tpl_component['VARIATION_DETAIL'] .= '<input type="hidden" name="' . self::current_page_variation_code . '[' . $variation['post']->ID . '][attribute][' . $attribute_def_for_variation->data_type . '][' . $variation_key . ']" value="' . $variation_value . '" />' . wpshop_display::display_template_element('wpshop_admin_variation_item_def_header', array('VARIATION_ATTRIBUTE_CODE' => $attribute_def_for_variation->frontend_label, 'VARIATION_ATTRIBUTE_CODE_VALUE' => stripslashes(wpshop_attributes::get_attribute_type_select_option_info($variation_value, 'label', $attribute_def_for_variation->data_type_to_use, true))), array(), 'admin');
-                            $tpl_component['VARIATION_IMAGE_CHOICE'] = '';
-
-                            /** Define Link image to variation interface **/
-                            if (!empty($product_option_postmeta) && !empty($product_option_postmeta['attributes']) && !empty($product_option_postmeta['variation_type']) && ((count($product_option_postmeta['attributes']) == 1 && $product_option_postmeta['variation_type'] == 'single') || ($product_option_postmeta['variation_type'] == 'combined'))) {
-                                $pictures = get_posts(array('post_type' => 'attachment', 'posts_per_page' => -1, 'post_status' => null, 'post_parent' => $head_product));
-
-                                $media_id_data = get_post_meta($head_product, '_wps_product_media', true);
-                                if (!empty($media_id_data)) {
-                                    $medias_ids = explode(',', $media_id_data);
-
-                                    if (!empty($medias_ids)) {
-                                        foreach ($medias_ids as $media_id) {
-                                            if (!empty($media_id)) {
-                                                $pictures[] = get_post($media_id);
-                                            }
-                                        }
-                                    }
-                                }
-
-                                $pictures_data = '';
-                                if (!empty($pictures)) {
-                                    $selected_picture = get_post_meta($variation['post']->ID, '_wps_variation_attached_picture', true);
-
-                                    $done_picture = array();
-                                    foreach ($pictures as $picture) {
-                                        if (!in_array($picture->ID, $done_picture)) {
-                                            if (wp_attachment_is_image($picture->ID)) {
-                                                $checked = ((!empty($selected_picture) && $selected_picture == $picture->ID) ? 'checked="checked"' : '');
-                                                $pictures_data .= wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_element', array('PICTURE_CHOICE_VARIATION_ID' => $picture->ID, 'PRODUCT_VARIATION_ID' => $variation['post']->ID, 'PICTURE_CHOICE_SELECTED' => $checked, 'PICTURE_CHOICE_VARIATION_IMG' => wp_get_attachment_image($picture->ID, 'thumbnail')), array(), 'admin');
-
-                                                $done_picture[] = $picture->ID;
-                                            }
-                                        }
-                                    }
-                                }
-
-                                $tpl_component['VARIATION_IMAGE_CHOICE'] = wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_container', array('PICTURE_CHOICE_CONTAINER_CONTENT' => $pictures_data), array(), 'admin');
-                            }
-
-                        }
-                    }
-                }
-
-                $tpl_component['VARIATION_DETAIL'] = substr($tpl_component['VARIATION_DETAIL'], 0, -2);
-
-                $tpl_component['ADMIN_VARIATION_SPECIFIC_DEFINITION_CONTAINER_CLASS'] = ' wpshopHide';
-                $tpl_component['VARIATION_DEFINITION'] = wpshop_attributes::get_variation_attribute(array('post_id' => $variation['post']->ID, 'input_class' => ' ', 'field_name' => wpshop_products::current_page_variation_code . '[' . $variation['post']->ID . ']', 'page_code' => self::current_page_variation_code, 'field_id' => self::current_page_variation_code . '_' . $variation['post']->ID, 'variation_dif_values' => (!empty($variation['variation_dif']) ? $variation['variation_dif'] : array())));
-                $tpl_component['VARIATION_DEFINITION_CONTENT'] = wpshop_display::display_template_element('wpshop_admin_variation_item_specific_def', $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION => $variation['post']->ID), 'admin');
-
-                /*    Add the variation definition to output    */
-                $existing_variation_list .= wpshop_display::display_template_element('wpshop_admin_variation_item_def', $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION => $variation['post']->ID), 'admin');
-            }
-
-            $output .= wpshop_display::display_template_element('wpshop_admin_existing_variation_list', array('ADMIN_EXISTING_VARIATIONS_CONTAINER_CLASS' => '', 'ADMIN_EXISTING_VARIATIONS_CONTAINER' => $existing_variation_list), array(), 'admin');
-            /*    Reset de la liste des résultats pour éviter les comportements indésirables    */
-            wp_reset_query();
-        } else {
-            $output = __('No variation found for this product. Please use button above for create one', 'wpshop');
-        }
+		return $variation_id;
+	}
 
-        return $output;
-    }
+	/**
+	 * Get variation list for a given product
+	 *
+	 * @param integer $head_product The product identifier to get the variation for
+	 * @return object The variation list
+	 */
+	public static function get_variation($head_product, $type = 'any')
+	{
+		global $wpdb;
+		$variations_output = null;
+		$args = array(
+			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION,
+			'post_parent' => $head_product,
+			'orderby' => 'ID',
+			'order' => 'ASC',
+			'posts_per_page' => -1,
+			'post_status' => $type,
+		);
+		$variations = get_posts($args);
+
+		if (!empty($variations)) {
+			$head_wpshop_variation_definition = get_post_meta($head_product, '_wpshop_variation_defining', true);
+
+			foreach ($variations as $post_def) {
+				$data = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $post_def->ID, WPSHOP_CURRENT_LOCALE, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, "'valid', 'deleted'");
+				foreach ($data as $content) {
+					$attribute_value = 'attribute_value_' . $content->data_type;
+					if (!empty($content->$attribute_value)) {
+						if (!empty($head_wpshop_variation_definition['attributes']) && in_array($content->code, $head_wpshop_variation_definition['attributes'])) {
+							$variations_output[$post_def->ID]['variation_def'][$content->code] = $content->$attribute_value;
+						} else {
+							$variations_output[$post_def->ID]['variation_dif'][$content->code] = $content->$attribute_value;
+						}
+					}
+				}
+				$variations_output[$post_def->ID]['post'] = $post_def;
+			}
+		}
+		wp_reset_query();
+		return $variations_output;
+	}
 
-    /**
-     * Retrieve and display the variation for a given product
-     * @param integer $product_id The product identifier to get variation for
-     */
-    public static function wpshop_variation($post_id = '', $from_admin = false, $order_id = '', $qty = 1)
-    {
-        global $wp_query;
-        $output = '';
-
-        $product_id = empty($post_id) ? $wp_query->post->ID : $post_id;
-        $wpshop_product_attributes_frontend_display = get_post_meta($product_id, '_wpshop_product_attributes_frontend_display', true);
-        $head_wpshop_variation_definition = get_post_meta($product_id, '_wpshop_variation_defining', true);
-
-        /**    Get attribute order for current product    */
-        $product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($product_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
-        $output_order = array();
-        if (count($product_attribute_order_detail) > 0) {
-            if (!empty($product_attribute_order_detail)) {
-                foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
-                    foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
-                        if (!empty($attribute_def->code)) {
-                            $output_order[$attribute_def->code] = $position;
-                        }
-
-                    }
-                }
-            }
-        }
+	/**
+	 * Affichage des variations d'un produit dans l'administration
+	 *
+	 * @param integer $head_product L'identifiant du produit dont on veut afficher les variations
+	 * @return string Le code html permettant l'affichage des variations dans l'interface d'édition du produit
+	 */
+	public static function display_variation_admin($head_product)
+	{
+		$output = '';
+		$productCurrency = wpshop_tools::wpshop_get_currency();
+		/*    Récupération de la liste des variations pour le produit en cours d'édition    */
+		$variations = self::get_variation($head_product);
+		$price_piloting = get_option('wpshop_shop_price_piloting');
+
+		/*    Affichage de la liste des variations pour le produit en cours d'édition    */
+		if (!empty($variations) && is_array($variations)) {
+			$existing_variation_list = wpshop_display::display_template_element('wpshop_admin_existing_variation_controller', array(), array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product), 'admin');
+
+			foreach ($variations as $variation) {
+				$tpl_component = array();
+
+				$tpl_component['ADMIN_EXISTING_VARIATIONS_CLASS'] = ' wpshop_variation_' . self::currentPageCode;
+				$tpl_component['VARIATION_IDENTIFIER'] = $variation['post']->ID;
+				$tpl_component['VARIATION_DETAIL'] = '  ';
+				$p = (!empty($variation['variation_dif']['product_price']) || !empty($variation['variation_dif']['price_ht'])) ? ((!empty($price_piloting) && $price_piloting == 'HT' && !empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : (!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0) : 0;
+				$tpl_component['VARIATION_DETAIL_PRICE'] = number_format($p, 2, '.', '') . ' ' . $productCurrency . ' ' . ((!empty($price_piloting) && $price_piloting == 'HT') ? __('ET', 'wpshop') : __('ATI', 'wpshop'));
+				if (!empty($price_piloting) && $price_piloting == 'HT') {
+
+				} else {
 
-        $variations_params = array();
-        $variation_attribute = array();
-        $variation_attribute_ordered = array();
-        $possible_values = array();
-        $possible_values_for_selection_calculation = array();
-
-        /*    Vérification de l'existence de déclinaison pour le produit    */
-        $wpshop_variation_list = self::get_variation($product_id);
-        if (!empty($wpshop_variation_list)) {
-            foreach ($wpshop_variation_list as $variation) {
-                if (!empty($variation['variation_def'])) {
-                    $display_option = get_post_meta($post_id, '_wpshop_product_attributes_frontend_display', true);
-                    foreach ($variation['variation_def'] as $attribute_code => $attribute_value) {
-                        if (empty($display_option) || (!empty($display_option['attribute']) && !empty($display_option['attribute'][$attribute_code]) && !empty($display_option['attribute'][$attribute_code]['complete_sheet']))) {
-                            $tpl_component = array();
-
-                            $attribute_db_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
-                            $default_value_is_serial = false;
-                            $attribute_list_first_element = $attribute_db_definition->default_value;
-                            if (!empty($attribute_db_definition->default_value) && ($attribute_db_definition->default_value == serialize(false) || wpshop_tools::is_serialized($attribute_db_definition->default_value))) {
-                                $default_value_is_serial = true;
-                                $tmp_default_value = unserialize($attribute_db_definition->default_value);
-                                $attribute_list_first_element = !empty($tmp_default_value['field_options']['label_for_first_item']) ? $tmp_default_value['field_options']['label_for_first_item'] : null;
-                            }
-
-                            if ($default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none')) {
-                                $possible_values[$attribute_code][0][0] = ($default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none')) ? stripslashes(sprintf($attribute_list_first_element, strtolower($attribute_db_definition->frontend_label))) : __('Choose a value', 'wpshop');
-                            }
-
-                            if (!empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'custom')) {
-                                $tpl_component['VARIATION_VALUE'] = stripslashes(wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'label', 'custom'));
-                                $position = wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'position', 'custom');
-                            } else if (!empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'internal')) {
-                                $post_def = get_post($attribute_value);
-                                $tpl_component['VARIATION_VALUE'] = stripslashes($post_def->post_title);
-                                $position = $post_def->menu_order;
-                            }
-
-                            if (!empty($variation['variation_dif'])) {
-                                foreach ($variation['variation_dif'] as $attribute_dif_code => $attribute_dif_value) {
-                                    $wpshop_prices_attributes = unserialize(WPSHOP_ATTRIBUTE_PRICES);
-                                    $the_value = $attribute_dif_value;
-                                    if (in_array($attribute_dif_code, $wpshop_prices_attributes)) {
-                                        $the_value = wpshop_display::format_field_output('wpshop_product_price', $attribute_dif_value);
-                                    }
-                                    $tpl_component['VARIATION_DIF_' . strtoupper($attribute_dif_code)] = stripslashes($the_value);
-                                }
-                            }
-                            if (!empty($attribute_value)) {
-                                $possible_values[$attribute_code][$position][$attribute_value] = wpshop_display::display_template_element('product_variation_item_possible_values', $tpl_component, array('type' => 'attribute_for_variation', 'id' => $attribute_code));
-                                $possible_values_for_selection_calculation[$attribute_code][$attribute_value] = $tpl_component['VARIATION_VALUE'];
-                            }
-                            unset($tpl_component);
-                        }
-                    }
-                }
-            }
-
-            $variation_tpl = array();
-            if (!empty($head_wpshop_variation_definition['attributes'])) {
-                foreach ($head_wpshop_variation_definition['attributes'] as $attribute_code) {
-                    $attribute_db_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
-
-                    if (!empty($attribute_db_definition)) {
-                        $attribute_display_state = wpshop_attributes::check_attribute_display($attribute_db_definition->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_code, 'complete_sheet');
-
-                        $is_required = ((!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && (in_array($attribute_code, $head_wpshop_variation_definition['options']['required_attributes'])))) ? true : false;
-                        if (!$is_required && $attribute_db_definition->is_required == 'yes') {
-                            $is_required = true;
-                        }
-
-                        $input_def = array();
-                        $input_def['type'] = $attribute_db_definition->frontend_input;
-                        $value = isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code] : (!empty($attribute_db_definition->default_value) ? $attribute_db_definition->default_value : null);
-                        if (in_array($attribute_db_definition->frontend_input, array('radio', 'checkbox'))) {
-                            unset($possible_values[$attribute_code][0]);
-                            $value = array($value);
-                        }
-                        $input_def['id'] = 'wpshop_variation_attr_' . $attribute_code;
-                        $input_def['name'] = $attribute_code;
-                        $real_possible_values = array();
-                        if (!empty($possible_values[$attribute_code])) {
-                            ksort($possible_values[$attribute_code]);
-                            foreach ($possible_values[$attribute_code] as $position => $def) {
-                                foreach ($def as $attribute_value => $attribute_value_output) {
-                                    $real_possible_values[$attribute_value] = $attribute_value_output;
-                                    if (!empty($attribute_value)) {
-                                        global $wpdb;
-                                        $query = $wpdb->prepare("SELECT post_status FROM " . $wpdb->postmeta . " AS P_META INNER JOIN " . $wpdb->posts . " as P ON ((P.ID = P_META.post_id) AND (P.post_parent = %d)) WHERE P_META.meta_value LIKE '%%" . serialize($attribute_code) . serialize($attribute_value) . "%%'", $product_id);
-                                        if ('draft' == $wpdb->get_var($query)) {
-                                            unset($real_possible_values[$attribute_value]);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        $input_def['possible_value'] = $real_possible_values;
-                        $input_def['valueToPut'] = 'index';
-                        $input_def['value'] = $value;
-
-                        $input_def['options']['more_input'] = '';
-                        if (!empty($possible_values_for_selection_calculation[$attribute_code])) {
-                            foreach ($possible_values_for_selection_calculation[$attribute_code] as $value_id => $value) {
-                                $input_def['options']['more_input'] .= '<input type="hidden" disabled="disabled" value="' . str_replace("\\", "", $value) . '" name="' . $input_def['id'] . '_current_value" id="' . $input_def['id'] . '_current_value_' . $value_id . '" />';
-                            }
-                        }
-
-                        $input_def['options_label']['original'] = true;
-                        $input_def['option'] = 'data-nonce="' . wp_create_nonce('wpshop_ajax_wpshop_variation_selection') . '" class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_code . ' ' : '') . ($attribute_db_definition->_display_informations_about_value == 'yes' ? ' wpshop_display_information_about_value' : '') . ' ' . ((is_admin()) ? $attribute_db_definition->backend_css_class : $attribute_db_definition->frontend_css_class) . '" ';
-
-                        if (!empty($real_possible_values)) {
-                            $tpl_component = array();
-                            $attribute_output_def['value'] = isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code] : $input_def['value'];
-                            $tpl_component['VARIATION_INPUT'] = wpshop_form::check_input_type($input_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) . $input_def['options']['more_input'];
-                            $tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_code . '" >' . stripslashes($attribute_db_definition->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_db_definition->frontend_label));
-                            $tpl_component['VARIATION_CODE'] = $attribute_code;
-                            $tpl_component['VARIATION_LABEL_HELPER'] = !empty($attribute_db_definition->frontend_help_message) ? ' title="' . $attribute_db_definition->frontend_help_message . '" ' : '';
-                            $tpl_component['VARIATION_LABEL_CLASS'] = !empty($attribute_db_definition->frontend_help_message) ? ' wpshop_att_variation_helper' : '';
-                            $tpl_component['VARIATION_IDENTIFIER'] = $input_def['id'];
-                            $tpl_component['VARIATION_PARENT_ID'] = $product_id;
-                            $tpl_component['VARIATION_PARENT_TYPE'] = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
-                            $tpl_component['VARIATION_CONTAINER_CLASS'] = ($is_required ? ' attribute_is_required_container attribute_is_required_container_' . $attribute_code : '') . ' wpshop_variation_' . $attribute_code . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_' . $product_id;
-                            $tpl_component['VARIATION_REQUIRED_INDICATION'] = ($is_required) ? __('Required variation', 'wpshop') : '';
-                            $variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_code)] = wpshop_display::display_template_element('product_variation_item', $tpl_component);
-                            $variation_attribute_ordered[$output_order[$attribute_code]] = $variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_code)];
-                        }
-
-                        $variation_attribute[] = $attribute_code;
-                    }
-                }
-            }
+				}
+				$post_obj = $variation['post'];
+
+				$parent_product_infos = wpshop_products::get_parent_variation($post_obj->ID);
+				if (!empty($parent_product_infos)) {
+					$parent_post = $parent_product_infos['parent_post'];
+					$product_option_postmeta = get_post_meta($parent_post->ID, '_wpshop_variation_defining', true);
+					if (!empty($product_option_postmeta['options']['price_behaviour']) && !empty($product_option_postmeta['options']['price_behaviour'][0]) && $product_option_postmeta['options']['price_behaviour'][0] == 'addition') {
+						if (!empty($price_piloting) && $price_piloting == 'HT') {
+							$product_price = ((!empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : 0) + $parent_product_infos['parent_post_meta']['price_ht'];
+						} else {
+							$product_price = ((!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0) + $parent_product_infos['parent_post_meta']['product_price'];
+						}
+						$tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Variation price combined with the parent product price', 'wpshop');
+					} else {
+						if (!empty($price_piloting) && $price_piloting == 'HT') {
+							$product_price = (!empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : 0;
+						} else {
+							$product_price = (!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0;
+						}
+						$tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Only variation\'s price is used', 'wpshop');
+					}
+					$product_price = number_format(str_replace(',', '.', $product_price), 2, '.', '') . ' ' . $productCurrency . ' ' . ((!empty($price_piloting) && $price_piloting == 'HT') ? __('ET', 'wpshop') : __('ATI', 'wpshop'));
+					$tpl_component['VARIATION_DETAIL_SALE_PRICE'] = $product_price;
+				}
 
-        }
-        $variation_tpl['VARIATION_FORM_ELEMENT_ID'] = $product_id;
-        wp_reset_query();
-
-        $attribute_defined_to_be_user_defined = wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode));
-        if (!empty($attribute_defined_to_be_user_defined)) {
-            foreach ($attribute_defined_to_be_user_defined as $attribute_not_in_variation_but_user_defined) {
-                $is_required = ((!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && (in_array($attribute_not_in_variation_but_user_defined->code, $head_wpshop_variation_definition['options']['required_attributes']))) || $attribute_not_in_variation_but_user_defined->is_required == 'yes') ? true : false;
-
-                $attribute_display_state = wpshop_attributes::check_attribute_display($attribute_not_in_variation_but_user_defined->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_not_in_variation_but_user_defined->code, 'complete_sheet');
-                if ($attribute_display_state && array_key_exists($attribute_not_in_variation_but_user_defined->code, $output_order) && !in_array($attribute_not_in_variation_but_user_defined->code, $variation_attribute) && ($attribute_not_in_variation_but_user_defined->is_used_for_variation == 'no')) {
-                    $attribute_output_def = wpshop_attributes::get_attribute_field_definition($attribute_not_in_variation_but_user_defined, (is_array($head_wpshop_variation_definition) && isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code] : ''));
-
-                    $tpl_component = array();
-                    $attribute_output_def['option'] = 'data-nonce="' . wp_create_nonce('wpshop_ajax_wpshop_variation_selection') . '" class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_not_in_variation_but_user_defined->code : '') . ' ' . (str_replace('"', '', str_replace('class="', '', $attribute_output_def['option']))) . ' ' . ((is_admin()) ? $attribute_not_in_variation_but_user_defined->backend_css_class : $attribute_not_in_variation_but_user_defined->frontend_css_class) . '" ';
-                    $tpl_component['VARIATION_INPUT'] = wpshop_form::check_input_type($attribute_output_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '[free]') . $attribute_output_def['options'];
-                    $tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_not_in_variation_but_user_defined->code . '" >' . stripslashes($attribute_not_in_variation_but_user_defined->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_not_in_variation_but_user_defined->frontend_label));
-                    $tpl_component['VARIATION_CODE'] = $attribute_not_in_variation_but_user_defined->code;
-                    $tpl_component['VARIATION_LABEL_HELPER'] = !empty($attribute_not_in_variation_but_user_defined->frontend_help_message) ? ' title="' . $attribute_not_in_variation_but_user_defined->frontend_help_message . '" ' : '';
-                    $tpl_component['VARIATION_LABEL_CLASS'] = !empty($attribute_not_in_variation_but_user_defined->frontend_help_message) ? ' wpshop_att_variation_helper' : '';
-                    $tpl_component['VARIATION_REQUIRED_INDICATION'] = ($is_required) ? __('Required variation', 'wpshop') : '';
-                    $tpl_component['VARIATION_IDENTIFIER'] = $attribute_output_def['id'];
-                    $tpl_component['VARIATION_PARENT_ID'] = $product_id;
-                    $tpl_component['VARIATION_PARENT_TYPE'] = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
-                    $tpl_component['VARIATION_CONTAINER_CLASS'] = ($is_required ? ' attribute_is_required_container attribute_is_required_container_' . $attribute_not_in_variation_but_user_defined->code : '') . ' wpshop_variation_' . $attribute_not_in_variation_but_user_defined->code . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_' . $product_id;
-                    $variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_not_in_variation_but_user_defined->code)] = ($attribute_output_def['type'] != 'hidden') ? wpshop_display::display_template_element('product_variation_item', $tpl_component) : wpshop_form::check_input_type($attribute_output_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '[free]') . $attribute_output_def['options'];
-                    $variation_attribute_ordered[$output_order[$attribute_not_in_variation_but_user_defined->code]] = $variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_not_in_variation_but_user_defined->code)];
-                }
-            }
-        }
-        $variation_tpl['VARIATION_FORM_VARIATION_LIST'] = '';
-        if (!empty($variation_attribute_ordered) && is_array($variation_attribute_ordered)) {
-            ksort($variation_attribute_ordered);
-            foreach ($variation_attribute_ordered as $attribute_variation_to_output) {
-                $variation_tpl['VARIATION_FORM_VARIATION_LIST'] .= $attribute_variation_to_output;
-            }
-        }
-        $variation_tpl['FROM_ADMIN_INDICATOR'] = $variation_tpl['ORDER_ID_INDICATOR'] = '';
-        $variation_tpl['PRODUCT_ADDED_TO_CART_QTY'] = (!empty($qty)) ? $qty : 1;
-        if ($from_admin && !empty($order_id)) {
-            $variation_tpl['FROM_ADMIN_INDICATOR'] = '<input type="hidden" name="wps_orders_from_admin" value="1" />';
-            $variation_tpl['ORDER_ID_INDICATOR'] = '<input type="hidden" name="wps_orders_order_id" value="' . $order_id . '" />';
-        }
-        $output = !empty($variation_tpl['VARIATION_FORM_VARIATION_LIST']) ? wpshop_display::display_template_element('product_variation_form', $variation_tpl) : '';
+				if (!empty($variation['variation_def'])) {
+					foreach ($variation['variation_def'] as $variation_key => $variation_value) {
+						if (!empty($variation_value)) {
+							$attribute_def_for_variation = wpshop_attributes::getElement($variation_key, "'valid'", 'code');
+							$tpl_component['VARIATION_DETAIL'] .= '<input type="hidden" name="' . self::current_page_variation_code . '[' . $variation['post']->ID . '][attribute][' . $attribute_def_for_variation->data_type . '][' . $variation_key . ']" value="' . $variation_value . '" />' . wpshop_display::display_template_element('wpshop_admin_variation_item_def_header', array('VARIATION_ATTRIBUTE_CODE' => $attribute_def_for_variation->frontend_label, 'VARIATION_ATTRIBUTE_CODE_VALUE' => stripslashes(wpshop_attributes::get_attribute_type_select_option_info($variation_value, 'label', $attribute_def_for_variation->data_type_to_use, true))), array(), 'admin');
+							$tpl_component['VARIATION_IMAGE_CHOICE'] = '';
+
+							/** Define Link image to variation interface **/
+							if (!empty($product_option_postmeta) && !empty($product_option_postmeta['attributes']) && !empty($product_option_postmeta['variation_type']) && ((count($product_option_postmeta['attributes']) == 1 && $product_option_postmeta['variation_type'] == 'single') || ($product_option_postmeta['variation_type'] == 'combined'))) {
+								$pictures = get_posts(array('post_type' => 'attachment', 'posts_per_page' => -1, 'post_status' => null, 'post_parent' => $head_product));
+
+								$media_id_data = get_post_meta($head_product, '_wps_product_media', true);
+								if (!empty($media_id_data)) {
+									$medias_ids = explode(',', $media_id_data);
+
+									if (!empty($medias_ids)) {
+										foreach ($medias_ids as $media_id) {
+											if (!empty($media_id)) {
+												$pictures[] = get_post($media_id);
+											}
+										}
+									}
+								}
+
+								$pictures_data = '';
+								if (!empty($pictures)) {
+									$selected_picture = get_post_meta($variation['post']->ID, '_wps_variation_attached_picture', true);
+
+									$done_picture = array();
+									foreach ($pictures as $picture) {
+										if (!in_array($picture->ID, $done_picture)) {
+											if (wp_attachment_is_image($picture->ID)) {
+												$checked = ((!empty($selected_picture) && $selected_picture == $picture->ID) ? 'checked="checked"' : '');
+												$pictures_data .= wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_element', array('PICTURE_CHOICE_VARIATION_ID' => $picture->ID, 'PRODUCT_VARIATION_ID' => $variation['post']->ID, 'PICTURE_CHOICE_SELECTED' => $checked, 'PICTURE_CHOICE_VARIATION_IMG' => wp_get_attachment_image($picture->ID, 'thumbnail')), array(), 'admin');
+
+												$done_picture[] = $picture->ID;
+											}
+										}
+									}
+								}
+
+								$tpl_component['VARIATION_IMAGE_CHOICE'] = wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_container', array('PICTURE_CHOICE_CONTAINER_CONTENT' => $pictures_data), array(), 'admin');
+							}
+
+						}
+					}
+				}
 
-        return $output;
-    }
+				$tpl_component['VARIATION_DETAIL'] = substr($tpl_component['VARIATION_DETAIL'], 0, -2);
 
-    public static function get_parent_variation($variation_id)
-    {
-        $result = array();
-        if (!empty($variation_id)) {
-            $variation_post = get_post($variation_id);
-            if (!empty($variation_post) && !empty($variation_post->post_parent)) {
-                $result['parent_post'] = get_post($variation_post->post_parent);
-                $result['parent_post_meta'] = get_post_meta($variation_post->post_parent, '_wpshop_product_metadata', true);
-            }
-        }
-        return $result;
-    }
+				$tpl_component['ADMIN_VARIATION_SPECIFIC_DEFINITION_CONTAINER_CLASS'] = ' wpshopHide';
+				$tpl_component['VARIATION_DEFINITION'] = wpshop_attributes::get_variation_attribute(array('post_id' => $variation['post']->ID, 'input_class' => ' ', 'field_name' => wpshop_products::current_page_variation_code . '[' . $variation['post']->ID . ']', 'page_code' => self::current_page_variation_code, 'field_id' => self::current_page_variation_code . '_' . $variation['post']->ID, 'variation_dif_values' => (!empty($variation['variation_dif']) ? $variation['variation_dif'] : array())));
+				$tpl_component['VARIATION_DEFINITION_CONTENT'] = wpshop_display::display_template_element('wpshop_admin_variation_item_specific_def', $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION => $variation['post']->ID), 'admin');
 
-    /**
-     * Display the current configuration for a given product
-     * @param array $shortcode_attribute Some parameters given by the shortcode for display
-     */
-    public function wpshop_product_variations_summary($shortcode_attribute)
-    {
-        $output = '';
-
-        $product_variations_selection_args = array(
-            'CURRENCY_SELECTOR' => wpshop_attributes_unit::wpshop_shop_currency_list_field(),
-            'PRODUCT_VARIATION_SELECTION_DISPLAY' => '',
-        );
-
-        $current_user_id = get_current_user_id();
-
-        if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
-            foreach ($_SESSION['cart']['order_items'] as $item_id => $item) {
-                if (!empty($item) && !empty($item['item_id'])) {
-
-                    $free_variations = array();
-                    if (!empty($item['item_meta']) && !empty($item['item_meta']['free_variation'])) {
-                        foreach ($item['item_meta']['free_variation'] as $attribute_code => $attribute_value) {
-                            $free_variations[] = $attribute_code . '-_variation_val_-' . $attribute_value;
-                        }
-                    }
-
-                    $variations = array();
-                    if (!empty($item['item_meta']) && !empty($item['item_meta']['variations'])) {
-                        foreach ($item['item_meta']['variations'] as $variation_id => $variation_def) {
-
-                            if (!empty($variation_def['item_meta']) && !empty($variation_def['item_meta']['variation_definition'])) {
-                                foreach ($variation_def['item_meta']['variation_definition'] as $attribute_code => $attribute_selected_data) {
-                                    $variations[] = $attribute_code . '-_variation_val_-' . $attribute_selected_data['ID'];
-                                }
-                            }
-                        }
-                    }
-                    $product_variation_summary = self::wpshop_ajax_wpshop_variation_selection($item['item_id'], $variations, $free_variations, null, $item['item_qty']);
-
-                    $product_variations_selection_args['PRODUCT_VARIATION_SELECTION_DISPLAY'] .= $product_variation_summary[1]['product_output'];
-                }
-            }
-        }
+				/*    Add the variation definition to output    */
+				$existing_variation_list .= wpshop_display::display_template_element('wpshop_admin_variation_item_def', $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION => $variation['post']->ID), 'admin');
+			}
 
-        $output .= wpshop_display::display_template_element('wpshop_product_configuration_summary', $product_variations_selection_args);
+			$output .= wpshop_display::display_template_element('wpshop_admin_existing_variation_list', array('ADMIN_EXISTING_VARIATIONS_CONTAINER_CLASS' => '', 'ADMIN_EXISTING_VARIATIONS_CONTAINER' => $existing_variation_list), array(), 'admin');
+			/*    Reset de la liste des résultats pour éviter les comportements indésirables    */
+			wp_reset_query();
+		} else {
+			$output = __('No variation found for this product. Please use button above for create one', 'wpshop');
+		}
 
-        echo $output;
-    }
+		return $output;
+	}
+
+	/**
+	 * Retrieve and display the variation for a given product
+	 * @param integer $product_id The product identifier to get variation for
+	 */
+	public static function wpshop_variation($post_id = '', $from_admin = false, $order_id = '', $qty = 1)
+	{
+		global $wp_query;
+		$output = '';
+
+		$product_id = empty($post_id) ? $wp_query->post->ID : $post_id;
+		$wpshop_product_attributes_frontend_display = get_post_meta($product_id, '_wpshop_product_attributes_frontend_display', true);
+		$head_wpshop_variation_definition = get_post_meta($product_id, '_wpshop_variation_defining', true);
+
+		/**    Get attribute order for current product    */
+		$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($product_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
+		$output_order = array();
+		if (count($product_attribute_order_detail) > 0) {
+			if (!empty($product_attribute_order_detail)) {
+				foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
+					foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
+						if (!empty($attribute_def->code)) {
+							$output_order[$attribute_def->code] = $position;
+						}
+
+					}
+				}
+			}
+		}
+
+		$variations_params = array();
+		$variation_attribute = array();
+		$variation_attribute_ordered = array();
+		$possible_values = array();
+		$possible_values_for_selection_calculation = array();
+
+		/*    Vérification de l'existence de déclinaison pour le produit    */
+		$wpshop_variation_list = self::get_variation($product_id);
+		if (!empty($wpshop_variation_list)) {
+			foreach ($wpshop_variation_list as $variation) {
+				if (!empty($variation['variation_def'])) {
+					$display_option = get_post_meta($post_id, '_wpshop_product_attributes_frontend_display', true);
+					foreach ($variation['variation_def'] as $attribute_code => $attribute_value) {
+						if (empty($display_option) || (!empty($display_option['attribute']) && !empty($display_option['attribute'][$attribute_code]) && !empty($display_option['attribute'][$attribute_code]['complete_sheet']))) {
+							$tpl_component = array();
+
+							$attribute_db_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
+							$default_value_is_serial = false;
+							$attribute_list_first_element = $attribute_db_definition->default_value;
+							if (!empty($attribute_db_definition->default_value) && ($attribute_db_definition->default_value == serialize(false) || wpshop_tools::is_serialized($attribute_db_definition->default_value))) {
+								$default_value_is_serial = true;
+								$tmp_default_value = unserialize($attribute_db_definition->default_value);
+								$attribute_list_first_element = !empty($tmp_default_value['field_options']['label_for_first_item']) ? $tmp_default_value['field_options']['label_for_first_item'] : null;
+							}
+
+							if ($default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none')) {
+								$possible_values[$attribute_code][0][0] = ($default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none')) ? stripslashes(sprintf($attribute_list_first_element, strtolower($attribute_db_definition->frontend_label))) : __('Choose a value', 'wpshop');
+							}
+
+							if (!empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'custom')) {
+								$tpl_component['VARIATION_VALUE'] = stripslashes(wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'label', 'custom'));
+								$position = wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'position', 'custom');
+							} else if (!empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'internal')) {
+								$post_def = get_post($attribute_value);
+								$tpl_component['VARIATION_VALUE'] = stripslashes($post_def->post_title);
+								$position = $post_def->menu_order;
+							}
+
+							if (!empty($variation['variation_dif'])) {
+								foreach ($variation['variation_dif'] as $attribute_dif_code => $attribute_dif_value) {
+									$wpshop_prices_attributes = unserialize(WPSHOP_ATTRIBUTE_PRICES);
+									$the_value = $attribute_dif_value;
+									if (in_array($attribute_dif_code, $wpshop_prices_attributes)) {
+										$the_value = wpshop_display::format_field_output('wpshop_product_price', $attribute_dif_value);
+									}
+									$tpl_component['VARIATION_DIF_' . strtoupper($attribute_dif_code)] = stripslashes($the_value);
+								}
+							}
+							if (!empty($attribute_value)) {
+								$possible_values[$attribute_code][$position][$attribute_value] = wpshop_display::display_template_element('product_variation_item_possible_values', $tpl_component, array('type' => 'attribute_for_variation', 'id' => $attribute_code));
+								$possible_values_for_selection_calculation[$attribute_code][$attribute_value] = $tpl_component['VARIATION_VALUE'];
+							}
+							unset($tpl_component);
+						}
+					}
+				}
+			}
+
+			$variation_tpl = array();
+			if (!empty($head_wpshop_variation_definition['attributes'])) {
+				foreach ($head_wpshop_variation_definition['attributes'] as $attribute_code) {
+					$attribute_db_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
+
+					if (!empty($attribute_db_definition)) {
+						$attribute_display_state = wpshop_attributes::check_attribute_display($attribute_db_definition->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_code, 'complete_sheet');
+
+						$is_required = ((!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && (in_array($attribute_code, $head_wpshop_variation_definition['options']['required_attributes'])))) ? true : false;
+						if (!$is_required && $attribute_db_definition->is_required == 'yes') {
+							$is_required = true;
+						}
+
+						$input_def = array();
+						$input_def['type'] = $attribute_db_definition->frontend_input;
+						$value = isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code] : (!empty($attribute_db_definition->default_value) ? $attribute_db_definition->default_value : null);
+						if (in_array($attribute_db_definition->frontend_input, array('radio', 'checkbox'))) {
+							unset($possible_values[$attribute_code][0]);
+							$value = array($value);
+						}
+						$input_def['id'] = 'wpshop_variation_attr_' . $attribute_code;
+						$input_def['name'] = $attribute_code;
+						$real_possible_values = array();
+						if (!empty($possible_values[$attribute_code])) {
+							ksort($possible_values[$attribute_code]);
+							foreach ($possible_values[$attribute_code] as $position => $def) {
+								foreach ($def as $attribute_value => $attribute_value_output) {
+									$real_possible_values[$attribute_value] = $attribute_value_output;
+									if (!empty($attribute_value)) {
+										global $wpdb;
+										$query = $wpdb->prepare("SELECT post_status FROM " . $wpdb->postmeta . " AS P_META INNER JOIN " . $wpdb->posts . " as P ON ((P.ID = P_META.post_id) AND (P.post_parent = %d)) WHERE P_META.meta_value LIKE '%%" . serialize($attribute_code) . serialize($attribute_value) . "%%'", $product_id);
+										if ('draft' == $wpdb->get_var($query)) {
+											unset($real_possible_values[$attribute_value]);
+										}
+									}
+								}
+							}
+						}
+						$input_def['possible_value'] = $real_possible_values;
+						$input_def['valueToPut'] = 'index';
+						$input_def['value'] = $value;
+
+						$input_def['options']['more_input'] = '';
+						if (!empty($possible_values_for_selection_calculation[$attribute_code])) {
+							foreach ($possible_values_for_selection_calculation[$attribute_code] as $value_id => $value) {
+								$input_def['options']['more_input'] .= '<input type="hidden" disabled="disabled" value="' . str_replace("\\", "", $value) . '" name="' . $input_def['id'] . '_current_value" id="' . $input_def['id'] . '_current_value_' . $value_id . '" />';
+							}
+						}
+
+						$input_def['options_label']['original'] = true;
+						$input_def['option'] = 'data-nonce="' . wp_create_nonce('wpshop_ajax_wpshop_variation_selection') . '" class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_code . ' ' : '') . ($attribute_db_definition->_display_informations_about_value == 'yes' ? ' wpshop_display_information_about_value' : '') . ' ' . ((is_admin()) ? $attribute_db_definition->backend_css_class : $attribute_db_definition->frontend_css_class) . '" ';
+
+						if (!empty($real_possible_values)) {
+							$tpl_component = array();
+							$attribute_output_def['value'] = isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code] : $input_def['value'];
+							$tpl_component['VARIATION_INPUT'] = wpshop_form::check_input_type($input_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) . $input_def['options']['more_input'];
+							$tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_code . '" >' . stripslashes($attribute_db_definition->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_db_definition->frontend_label));
+							$tpl_component['VARIATION_CODE'] = $attribute_code;
+							$tpl_component['VARIATION_LABEL_HELPER'] = !empty($attribute_db_definition->frontend_help_message) ? ' title="' . $attribute_db_definition->frontend_help_message . '" ' : '';
+							$tpl_component['VARIATION_LABEL_CLASS'] = !empty($attribute_db_definition->frontend_help_message) ? ' wpshop_att_variation_helper' : '';
+							$tpl_component['VARIATION_IDENTIFIER'] = $input_def['id'];
+							$tpl_component['VARIATION_PARENT_ID'] = $product_id;
+							$tpl_component['VARIATION_PARENT_TYPE'] = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
+							$tpl_component['VARIATION_CONTAINER_CLASS'] = ($is_required ? ' attribute_is_required_container attribute_is_required_container_' . $attribute_code : '') . ' wpshop_variation_' . $attribute_code . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_' . $product_id;
+							$tpl_component['VARIATION_REQUIRED_INDICATION'] = ($is_required) ? __('Required variation', 'wpshop') : '';
+							$variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_code)] = wpshop_display::display_template_element('product_variation_item', $tpl_component);
+							$variation_attribute_ordered[$output_order[$attribute_code]] = $variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_code)];
+						}
+
+						$variation_attribute[] = $attribute_code;
+					}
+				}
+			}
+
+		}
+		$variation_tpl['VARIATION_FORM_ELEMENT_ID'] = $product_id;
+		wp_reset_query();
+
+		$attribute_defined_to_be_user_defined = wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode));
+		if (!empty($attribute_defined_to_be_user_defined)) {
+			foreach ($attribute_defined_to_be_user_defined as $attribute_not_in_variation_but_user_defined) {
+				$is_required = ((!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && (in_array($attribute_not_in_variation_but_user_defined->code, $head_wpshop_variation_definition['options']['required_attributes']))) || $attribute_not_in_variation_but_user_defined->is_required == 'yes') ? true : false;
+
+				$attribute_display_state = wpshop_attributes::check_attribute_display($attribute_not_in_variation_but_user_defined->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_not_in_variation_but_user_defined->code, 'complete_sheet');
+				if ($attribute_display_state && array_key_exists($attribute_not_in_variation_but_user_defined->code, $output_order) && !in_array($attribute_not_in_variation_but_user_defined->code, $variation_attribute) && ($attribute_not_in_variation_but_user_defined->is_used_for_variation == 'no')) {
+					$attribute_output_def = wpshop_attributes::get_attribute_field_definition($attribute_not_in_variation_but_user_defined, (is_array($head_wpshop_variation_definition) && isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code] : ''));
+
+					$tpl_component = array();
+					$attribute_output_def['option'] = 'data-nonce="' . wp_create_nonce('wpshop_ajax_wpshop_variation_selection') . '" class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_not_in_variation_but_user_defined->code : '') . ' ' . (str_replace('"', '', str_replace('class="', '', $attribute_output_def['option']))) . ' ' . ((is_admin()) ? $attribute_not_in_variation_but_user_defined->backend_css_class : $attribute_not_in_variation_but_user_defined->frontend_css_class) . '" ';
+					$tpl_component['VARIATION_INPUT'] = wpshop_form::check_input_type($attribute_output_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '[free]') . $attribute_output_def['options'];
+					$tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_not_in_variation_but_user_defined->code . '" >' . stripslashes($attribute_not_in_variation_but_user_defined->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_not_in_variation_but_user_defined->frontend_label));
+					$tpl_component['VARIATION_CODE'] = $attribute_not_in_variation_but_user_defined->code;
+					$tpl_component['VARIATION_LABEL_HELPER'] = !empty($attribute_not_in_variation_but_user_defined->frontend_help_message) ? ' title="' . $attribute_not_in_variation_but_user_defined->frontend_help_message . '" ' : '';
+					$tpl_component['VARIATION_LABEL_CLASS'] = !empty($attribute_not_in_variation_but_user_defined->frontend_help_message) ? ' wpshop_att_variation_helper' : '';
+					$tpl_component['VARIATION_REQUIRED_INDICATION'] = ($is_required) ? __('Required variation', 'wpshop') : '';
+					$tpl_component['VARIATION_IDENTIFIER'] = $attribute_output_def['id'];
+					$tpl_component['VARIATION_PARENT_ID'] = $product_id;
+					$tpl_component['VARIATION_PARENT_TYPE'] = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
+					$tpl_component['VARIATION_CONTAINER_CLASS'] = ($is_required ? ' attribute_is_required_container attribute_is_required_container_' . $attribute_not_in_variation_but_user_defined->code : '') . ' wpshop_variation_' . $attribute_not_in_variation_but_user_defined->code . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_' . $product_id;
+					$variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_not_in_variation_but_user_defined->code)] = ($attribute_output_def['type'] != 'hidden') ? wpshop_display::display_template_element('product_variation_item', $tpl_component) : wpshop_form::check_input_type($attribute_output_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '[free]') . $attribute_output_def['options'];
+					$variation_attribute_ordered[$output_order[$attribute_not_in_variation_but_user_defined->code]] = $variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_not_in_variation_but_user_defined->code)];
+				}
+			}
+		}
+		$variation_tpl['VARIATION_FORM_VARIATION_LIST'] = '';
+		if (!empty($variation_attribute_ordered) && is_array($variation_attribute_ordered)) {
+			ksort($variation_attribute_ordered);
+			foreach ($variation_attribute_ordered as $attribute_variation_to_output) {
+				$variation_tpl['VARIATION_FORM_VARIATION_LIST'] .= $attribute_variation_to_output;
+			}
+		}
+		$variation_tpl['FROM_ADMIN_INDICATOR'] = $variation_tpl['ORDER_ID_INDICATOR'] = '';
+		$variation_tpl['PRODUCT_ADDED_TO_CART_QTY'] = (!empty($qty)) ? $qty : 1;
+		if ($from_admin && !empty($order_id)) {
+			$variation_tpl['FROM_ADMIN_INDICATOR'] = '<input type="hidden" name="wps_orders_from_admin" value="1" />';
+			$variation_tpl['ORDER_ID_INDICATOR'] = '<input type="hidden" name="wps_orders_order_id" value="' . $order_id . '" />';
+		}
+		$output = !empty($variation_tpl['VARIATION_FORM_VARIATION_LIST']) ? wpshop_display::display_template_element('product_variation_form', $variation_tpl) : '';
+
+		return $output;
+	}
+
+	public static function get_parent_variation($variation_id)
+	{
+		$result = array();
+		if (!empty($variation_id)) {
+			$variation_post = get_post($variation_id);
+			if (!empty($variation_post) && !empty($variation_post->post_parent)) {
+				$result['parent_post'] = get_post($variation_post->post_parent);
+				$result['parent_post_meta'] = get_post_meta($variation_post->post_parent, '_wpshop_product_metadata', true);
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Display the current configuration for a given product
+	 * @param array $shortcode_attribute Some parameters given by the shortcode for display
+	 */
+	public function wpshop_product_variations_summary($shortcode_attribute)
+	{
+		$output = '';
+
+		$product_variations_selection_args = array(
+			'CURRENCY_SELECTOR' => wpshop_attributes_unit::wpshop_shop_currency_list_field(),
+			'PRODUCT_VARIATION_SELECTION_DISPLAY' => '',
+		);
+
+		$current_user_id = get_current_user_id();
+
+		if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
+			foreach ($_SESSION['cart']['order_items'] as $item_id => $item) {
+				if (!empty($item) && !empty($item['item_id'])) {
+
+					$free_variations = array();
+					if (!empty($item['item_meta']) && !empty($item['item_meta']['free_variation'])) {
+						foreach ($item['item_meta']['free_variation'] as $attribute_code => $attribute_value) {
+							$free_variations[] = $attribute_code . '-_variation_val_-' . $attribute_value;
+						}
+					}
 
-    /**
-     * Affichage du résumé du produit sélectionné avec le prix par option / Display a summary of selected product with the price per option
-     *
-     * @param integer $product_id L'identifiant du produit qui est ajouté au panier / The product identifier added to cart
-     * @param array $wpshop_variation_selected La liste des options ayant un prix sélectionnées par le client / Options list with price selected by the customer
-     * @param array $wpshop_free_variation La liste des options n'entrainant pas de modification du prix final sélectionnées par le client / Options list without price selected by the customer
-     * @param string $wpshop_current_for_display Inconnu / Unknown
-     * @param integer $product_qty La quantité commandée par le client / Quantity ordered by the customer
-     *
-     * @return array Le résultat du calcul pour l'affichage / Output result
-     */
-    public static function wpshop_ajax_wpshop_variation_selection($product_id, $wpshop_variation_selected, $wpshop_free_variation, $wpshop_current_for_display, $product_qty = 1)
-    {
-        global $wpdb;
-
-        $wpshop_cart = new wps_cart();
-        $wpshop_products = new wpshop_products();
-
-        $response = '';
-        $response_status = $has_variation = false;
-        $tpl_component = array();
-
-        // Check if variations exists
-        if (!empty($wpshop_variation_selected) || !empty($wpshop_free_variation)) {
-
-            //Recover all selected variations
-            $variations_selected = array();
-            if (!empty($wpshop_variation_selected)) {
-                foreach ($wpshop_variation_selected as $selected_variation) {
-                    $variation_definition = explode('-_variation_val_-', $selected_variation);
-                    $variations_selected[$variation_definition[0]] = $variation_definition[1];
-                }
-            }
-
-            // Check variations priority
-            $product_with_variation = wpshop_products::get_variation_by_priority($variations_selected, $product_id);
-
-            // Check if $product_with_variation have variations
-            if (!empty($product_with_variation[$product_id]['variations']) || !empty($wpshop_free_variation)) {
-
-                $formatted_product = $wpshop_cart->prepare_product_to_add_to_cart($product_id, $product_qty, $variations_selected);
-                $product_to_add_to_cart = $formatted_product[0];
-                foreach ($formatted_product[0] as $pid => $product_more_content) {
-                    $order_items[$pid]['product_id'] = $product_more_content['id'];
-
-                    /** For product with variation    */
-                    $order_items[$pid]['product_variation_type'] = !empty($product_more_content['variation_priority']) ? $product_more_content['variation_priority'] : '';
-                    $order_items[$pid]['free_variation'] = !empty($product_more_content['free_variation']) ? $product_more_content['free_variation'] : '';
-                    $order_items[$pid]['product_variation'] = '';
-                    if (!empty($product_more_content['variations'])) {
-                        foreach ($product_more_content['variations'] as $variation_id) {
-                            $order_items[$pid]['product_variation'][] = $variation_id;
-                        }
-                    }
-                }
-
-                // If Product list is not empty, add products to order
-                if (!empty($order_items)) {
-                    foreach ($order_items as $product_id => $d) {
-                        $product_key = $product_id;
-
-                        // Formate datas
-                        $product_id = $head_product_id = $d['product_id'];
-                        $product_variation = !empty($d['product_variation']) ? $d['product_variation'] : null;
-
-                        // If product is a single variation product
-                        if (!empty($product_variation) && (count($product_variation) == 1)) {
-                            $product_id = $product_variation[0];
-                        }
-
-                        // Construct final product
-                        $product = wpshop_products::get_product_data($d['product_id'], true);
-                        $the_product = array_merge(array('product_id' => $d['product_id'], 'product_qty' => 1), $product);
+					$variations = 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, '.', '');
+								}
+							}
+						}
+					}
+				}
 
-        return array($response_status, $response);
-    }
+				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'];
+				}
 
-    /**
-     * 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());
-    }
+				$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);
+				}
 
-    /**
-     * 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)) . "'", $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;
-            }
-        }
+				//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');
+			}
+		}
 
-        return $product_to_add_to_cart;
-    }
+		return array($response_status, $response);
+	}
 
-    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.
-             */
+	/**
+	 * 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)) . "'", $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;
+			}
+		}
+
+		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)] = '-';
+			}
+		}
+
+		/**    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);
+				}
+			}
+		}
 
-        /**    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'] : '';
+		$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);
+		}
 
-        /**    Define the current selected currency for the order summary    */
+		/**    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());
@@ -3530,6 +3530,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 +28 added lines, -28 removed lines

@@ -184,20 +184,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;
@@ -604,12 +604,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
@@ -759,11 +759,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);
                     }
@@ -832,7 +832,7 @@ 
                     $sub_tpl_component = array();
                     $criteria = '';
                     foreach ($sorting_criteria as $c):
-                        $criteria .= '<option value="' . $c['code'] . '" ' . selected( $atts['order'], $c['code'], false ) . '>' . __($c['frontend_label'], 'wpshop') . '</option>';
+                        $criteria .= '<option value="' . $c['code'] . '" ' . selected($atts['order'], $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);
@@ -1001,7 +1001,7 @@ 
             // --------------------- //
             // Pagination management //
             // --------------------- //
-            if ( $display_pagination ) {
+            if ($display_pagination) {
                 if ($nb_of_product_limit == 0) {
 
                     $paginate = paginate_links(array(
@@ -1282,7 +1282,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);
 
@@ -1338,7 +1338,7 @@ 
                             $attributeValue = str_replace(',', '.', $attributeValue);
                         }
                         if (($attributeType == 'integer') && !is_array($attributeValue)) {
-                            $attributeValue = (int) $attributeValue;
+                            $attributeValue = (int)$attributeValue;
                         }
                         $productMetaDatas[$attributeCode] = $attributeValue;
                     }
@@ -1388,7 +1388,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;
                             }
@@ -1401,7 +1401,7 @@ 
                                 $attributeValue = str_replace(',', '.', $attributeValue);
                             }
                             if (($attributeType == 'integer') && !is_array($attributeValue)) {
-                                $attributeValue = (int) $attributeValue;
+                                $attributeValue = (int)$attributeValue;
                             }
                             $variation_metadata[$attributeCode] = $attributeValue;
                         }
@@ -1737,13 +1737,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'];
@@ -2186,7 +2186,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;
@@ -3149,7 +3149,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'];
@@ -3516,16 +3516,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;
 				}
 			}