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; ?>

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();
 	}
 }

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

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;
 				}
 			}