Eoxia / wpshop

includes/librairies/display/display.class.php

Spacing +128 added lines, -128 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -30,8 +30,8 @@ 
 	*
 	*	@return string Html code composing the page header
 	*/
-	public static function displayPageHeader($pageTitle, $pageIcon, $iconTitle, $iconAlt, $hasAddButton = true, $addButtonLink = '', $actionInformationMessage = '', $current_page_slug = ''){
-		include(WPSHOP_TEMPLATES_DIR.'admin/admin_page_header.tpl.php');
+	public static function displayPageHeader($pageTitle, $pageIcon, $iconTitle, $iconAlt, $hasAddButton = true, $addButtonLink = '', $actionInformationMessage = '', $current_page_slug = '') {
+		include(WPSHOP_TEMPLATES_DIR . 'admin/admin_page_header.tpl.php');
 	}
 
 	/**
@@ -41,8 +41,8 @@ 
 	*
 	*	@return string Html code composing the page footer
 	*/
-	public static function displayPageFooter($formActionButton){
-		include(WPSHOP_TEMPLATES_DIR.'admin/admin_page_footer.tpl.php');
+	public static function displayPageFooter($formActionButton) {
+		include(WPSHOP_TEMPLATES_DIR . 'admin/admin_page_footer.tpl.php');
 	}
 
 	/**
@@ -50,7 +50,7 @@ 
 	*
 	*	@return string The complete html page output
 	*/
-	public static function display_page(){
+	public static function display_page() {
 
 		$pageAddButton = false;
 		$pageMessage = $addButtonLink = $pageFormButton = $pageIcon = $pageIconTitle = $pageIconAlt = $objectType = '';
@@ -60,13 +60,13 @@ 
 		$action = isset($_REQUEST['action']) ? wpshop_tools::varSanitizer($_REQUEST['action']) : '';
 
 		/*	Select the content to add to the page looking for the parameter	*/
-		switch($pageSlug){
+		switch ($pageSlug) {
 			case WPSHOP_URL_SLUG_ATTRIBUTE_LISTING:
 				$objectType = new wpshop_attributes();
 				$current_user_can_edit = current_user_can('wpshop_edit_attributes');
 				$current_user_can_add = current_user_can('wpshop_add_attributes');
 				$current_user_can_delete = current_user_can('wpshop_delete_attributes');
-				if(current_user_can('wpshop_add_attributes')){
+				if (current_user_can('wpshop_add_attributes')) {
 					$pageAddButton = true;
 				}
 			break;
@@ -75,7 +75,7 @@ 
 				$current_user_can_edit = current_user_can('wpshop_edit_attribute_set');
 				$current_user_can_add = current_user_can('wpshop_add_attribute_set');
 				$current_user_can_delete = current_user_can('wpshop_delete_attribute_set');
-				if(current_user_can('wpshop_add_attribute_set')){
+				if (current_user_can('wpshop_add_attribute_set')) {
 					$pageAddButton = true;
 				}
 			break;
@@ -88,20 +88,20 @@ 
 				$pageAddButton = false;
 				$objectType = new wpshop_messages();
 				$current_user_can_edit = true;
-				$mid = !empty( $_GET['mid'] ) ? sanitize_text_field( $_GET['mid'] ) : '';
-				if(!empty($mid)){
+				$mid = !empty($_GET['mid']) ? sanitize_text_field($_GET['mid']) : '';
+				if (!empty($mid)) {
 					$action = 'edit';
 				}
 			break;
 			default:{
-				$pageTitle = sprintf(__('You have to add this page into %s at line %s', 'wpshop'), __FILE__, (__LINE__ - 4));
+				$pageTitle = sprintf(__('You have to add this page into %s at line %s', 'wpshop'), __FILE__, (__LINE__ -4));
 				$pageAddButton = false;
 			}
 			break;
 		}
 
-		if($objectType != ''){
-			if(($action != '') && ((($action == 'edit') && $current_user_can_edit) || (($action == 'add') && $current_user_can_add) || (($action == 'delete') && $current_user_can_delete))){
+		if ($objectType != '') {
+			if (($action != '') && ((($action == 'edit') && $current_user_can_edit) || (($action == 'add') && $current_user_can_add) || (($action == 'delete') && $current_user_can_delete))) {
 				$outputType = 'adding';
 			}
 			$objectType->elementAction();
@@ -110,10 +110,10 @@ 
 			$pageIconTitle = self::getPageIconInformation('title', $objectType);
 			$pageIconAlt = self::getPageIconInformation('alt', $objectType);
 
-			if($outputType == 'listing'){
+			if ($outputType == 'listing') {
 				$pageContent = $objectType->elementList();
 			}
-			elseif($outputType == 'adding'){
+			elseif ($outputType == 'adding') {
 				$pageAddButton = false;
 
 				$pageFormButton = $objectType->getPageFormButton($objectToEdit);
@@ -123,11 +123,11 @@ 
 
 			$pageTitle = $objectType->pageTitle();
 			$pageMessage = $objectType->pageMessage;
-			if ( in_array( $objectType->getEditionSlug(), array(WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING) ) ) {
+			if (in_array($objectType->getEditionSlug(), array(WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING))) {
 				$addButtonLink = admin_url('admin.php?page=' . $objectType->getEditionSlug() . '&amp;action=add');
 			}
 			else {
-				$addButtonLink = admin_url('edit.php?post_type='.WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES.'&amp;page=' . $objectType->getEditionSlug() . '&amp;action=add');
+				$addButtonLink = admin_url('edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES . '&amp;page=' . $objectType->getEditionSlug() . '&amp;action=add');
 			}
 		}
 
@@ -149,37 +149,37 @@ 
 	 *
 	 * @return string The output builded from selected type
 	 */
-	public static function custom_page_output_builder($content, $output_type='tab') {
+	public static function custom_page_output_builder($content, $output_type = 'tab') {
 		$output_custom_layout = '';
 
-		switch ( $output_type ) {
+		switch ($output_type) {
 			case 'separated_bloc':
-				foreach ( $content as $element_type => $element_type_details ) {
-					$output_custom_layout.='
-	<div class="wpshop_separated_bloc wpshop_separated_bloc_'.$element_type.'" >';
-					foreach ( $element_type_details as $element_type_key => $element_type_content ) {
-						$output_custom_layout.='
-		<div class="wpshop_admin_box wpshop_admin_box_'.$element_type.' wpshop_admin_box_'.$element_type.'_'.$element_type_key.'" >
+				foreach ($content as $element_type => $element_type_details) {
+					$output_custom_layout .= '
+	<div class="wpshop_separated_bloc wpshop_separated_bloc_'.$element_type . '" >';
+					foreach ($element_type_details as $element_type_key => $element_type_content) {
+						$output_custom_layout .= '
+		<div class="wpshop_admin_box wpshop_admin_box_'.$element_type . ' wpshop_admin_box_' . $element_type . '_' . $element_type_key . '" >
 			<h3>' . $element_type_content['title'] . '</h3>' . $element_type_content['content'] . '
 		</div>';
 					}
-					$output_custom_layout.='
+					$output_custom_layout .= '
 	</div>';
 				}
 			break;
 			case 'tab':
-				$tab_list=$tab_content_list='';
-				foreach ( $content as $element_type => $element_type_details ) {
-					foreach ( $element_type_details as $element_type_key => $element_type_content ) {
-						$tab_list.='
-		<li><a href="#wpshop_'.$element_type.'_'.$element_type_key.'" >'.$element_type_content['title'].'</a></li>';
-						$tab_content_list.='
-		<div id="wpshop_'.$element_type.'_'.$element_type_key.'" class="wpshop_admin_box wpshop_admin_box_'.$element_type.' wpshop_admin_box_'.$element_type.'_'.$element_type_key.'" >'.$element_type_content['content'].'
+				$tab_list = $tab_content_list = '';
+				foreach ($content as $element_type => $element_type_details) {
+					foreach ($element_type_details as $element_type_key => $element_type_content) {
+						$tab_list .= '
+		<li><a href="#wpshop_'.$element_type . '_' . $element_type_key . '" >' . $element_type_content['title'] . '</a></li>';
+						$tab_content_list .= '
+		<div id="wpshop_'.$element_type . '_' . $element_type_key . '" class="wpshop_admin_box wpshop_admin_box_' . $element_type . ' wpshop_admin_box_' . $element_type . '_' . $element_type_key . '" >' . $element_type_content['content'] . '
 		</div>';
 					}
 				}
-				$output_custom_layout.='
-	<div id="wpshopFormManagementContainer" class="wpshop_tabs wpshop_full_page_tabs wpshop_'.$element_type.'_tabs" >
+				$output_custom_layout .= '
+	<div id="wpshopFormManagementContainer" class="wpshop_tabs wpshop_full_page_tabs wpshop_'.$element_type . '_tabs" >
 		<ul>' . $tab_list . '</ul>' . $tab_content_list . '
 	</div>';
 					break;
@@ -201,21 +201,21 @@ 
 	 *
 	 *	@return string $table The html code of the table to output
 	 */
-	public static function getTable($tableId, $tableTitles, $tableRows, $tableClasses, $tableRowsId, $tableSummary = '', $withFooter = true){
+	public static function getTable($tableId, $tableTitles, $tableRows, $tableClasses, $tableRowsId, $tableSummary = '', $withFooter = true) {
 		$tableTitleBar = $tableBody = '';
 
 		/*	Create the header and footer row	*/
-		for($i=0; $i<count($tableTitles); $i++){
+		for ($i = 0; $i < count($tableTitles); $i++) {
 			$tableTitleBar .= '
 				<th class="' . $tableClasses[$i] . '" scope="col" >' . $tableTitles[$i] . '</th>';
 		}
 
 		/*	Create each table row	*/
-		for($lineNumber=0; $lineNumber<count($tableRows); $lineNumber++){
+		for ($lineNumber = 0; $lineNumber < count($tableRows); $lineNumber++) {
 			$tableRow = $tableRows[$lineNumber];
 			$tableBody .= '
 		<tr id="' . $tableRowsId[$lineNumber] . '" class="tableRow" >';
-			for($i=0; $i<count($tableRow); $i++){
+			for ($i = 0; $i < count($tableRow); $i++) {
 				$tableBody .= '
 			<td class="' . $tableClasses[$i] . ' ' . $tableRow[$i]['class'] . '" >' . $tableRow[$i]['value'] . '</td>';
 			}
@@ -226,13 +226,13 @@ 
 		/*	Create the table output	*/
 		$table = '
 <table id="' . $tableId . '" cellspacing="0" cellpadding="0" class="widefat post fixed" >';
-		if($tableTitleBar != ''){
+		if ($tableTitleBar != '') {
 			$table .= '
 	<thead>
 			<tr class="tableTitleHeader" >' . $tableTitleBar . '
 			</tr>
 	</thead>';
-			if($withFooter){
+			if ($withFooter) {
 				$table .= '
 	<tfoot>
 			<tr class="tableTitleFooter" >' . $tableTitleBar . '
@@ -255,8 +255,8 @@ 
 	 *
 	 * @return string $pageIconInformation The information to output in the page
 	 */
-	public static function getPageIconInformation($infoType, $object){
-		switch($infoType){
+	public static function getPageIconInformation($infoType, $object) {
+		switch ($infoType) {
 			case 'path':
 				$pageIconInformation = $object->pageIcon;
 			break;
@@ -278,18 +278,18 @@ 
 	 *
 	 * @return string $file_path The good filepath to include
 	 */
-	public static function get_template_file($file_name, $default_dir = WPSHOP_TEMPLATES_DIR, $dir_name = 'wpshop', $usage_type = 'include', $check_only_custom = false){
+	public static function get_template_file($file_name, $default_dir = WPSHOP_TEMPLATES_DIR, $dir_name = 'wpshop', $usage_type = 'include', $check_only_custom = false) {
 		$file_path = '';
 		$the_file = $dir_name . '/' . $file_name;
 
 		if (is_file(get_stylesheet_directory() . '/' . $the_file)) {
 			$default_dir = str_replace(WP_CONTENT_DIR, WP_CONTENT_URL, get_stylesheet_directory());
-			if($usage_type == 'include'){
+			if ($usage_type == 'include') {
 				$default_dir = get_stylesheet_directory();
 			}
 			$file_path = $default_dir . '/' . $the_file;
 		}
-		else if ( !$check_only_custom ) {
+		else if (!$check_only_custom) {
 			$file_path = $default_dir . $the_file;
 		}
 
@@ -312,124 +312,124 @@ 
 		$custom_template_part = get_stylesheet_directory() . '/' . $default_template_dir . '/';
 
 		/** Let support the old way of template managing	*/
-		switch ( $template_part ) {
+		switch ($template_part) {
 			case 'category_mini_list':
 					$old_file_to_take_care_url = 'category-mini-list.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'category_mini_grid':
 					$old_file_to_take_care_url = 'category-mini-grid.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_complete_tpl':
 					$old_file_to_take_care_url = 'product.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_mini_list':
 					$old_file_to_take_care_url = 'product-mini-list.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_mini_grid':
 					$old_file_to_take_care_url = 'product-mini-grid.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_listing_sorting':
 					$old_file_to_take_care_url = 'product_listing_sorting.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'unavailable_product_button':
 					$old_file_to_take_care_url = 'not_available_product_button.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'add_to_cart_button':
 					$old_file_to_take_care_url = 'available_product_button.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'ask_quotation_button':
 					$old_file_to_take_care_url = 'quotation_button.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'mini_cart_content':
 					$old_file_to_take_care_url = 'wpshop_mini_cart.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_is_new_sticker':
 					$old_file_to_take_care_url = 'product-is-new.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_is_featured_sticker':
 					$old_file_to_take_care_url = 'product-is-featured.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attribute_container':
 					$old_file_to_take_care_url = 'product-attribute-front-display-main-container.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attribute_tabs':
 					$old_file_to_take_care_url = 'product-attribute-front-display-tabs.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attribute_tabs_detail':
 					$old_file_to_take_care_url = 'product-attribute-front-display-tabs-content.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attachment_picture_galery':
 					$old_file_to_take_care_url = 'product_picture_galery.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attachment_galery':
 					$old_file_to_take_care_url = 'product_document_library.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attachment_item_picture':
 					$old_file_to_take_care_url = 'product_attachment_picture_line.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attachment_item_document':
 					$old_file_to_take_care_url = 'product_attachment_document_line.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_added_to_cart_message':
 					$old_file_to_take_care_url = 'product_added_to_cart_message.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
@@ -459,13 +459,13 @@ 
 	 */
 	public static function display_template_element($template_part, $template_part_component, $extras_args = array(), $default_template_dir = 'wpshop') {
 		/**	Set the template element to return by default before checking if custom exists in order to be sure to return something	*/
-		$default_template_element = wpshop_display::check_template_to_display( 'default', $template_part, $extras_args, $default_template_dir );
+		$default_template_element = wpshop_display::check_template_to_display('default', $template_part, $extras_args, $default_template_dir);
 
 		/**	Check in custom template if there is not a custom element to display for current 	*/
-		$custom_template_element = wpshop_display::check_template_to_display( 'custom', $template_part, $extras_args, $default_template_dir );
+		$custom_template_element = wpshop_display::check_template_to_display('custom', $template_part, $extras_args, $default_template_dir);
 		$tpl_element_to_return = !empty($custom_template_element) ? $custom_template_element : $default_template_element;
 
-		$template_part_component = apply_filters( 'wps_filter_display_' . $template_part, $template_part_component, $extras_args, $default_template_dir );
+		$template_part_component = apply_filters('wps_filter_display_' . $template_part, $template_part_component, $extras_args, $default_template_dir);
 
 		return self::feed_template($tpl_element_to_return, $template_part_component);
 	}
@@ -477,44 +477,44 @@ 
 		/*	Load template component	*/
 		/*	Get default admin template	*/
 		require_once(WPSHOP_TEMPLATES_DIR . 'admin/main_elements.tpl.php');
-		$wpshop_template['admin']['default'] = ($tpl_element);unset($tpl_element);
+		$wpshop_template['admin']['default'] = ($tpl_element); unset($tpl_element);
 		/*	Get custom admin template	*/
-		if ( is_file(get_stylesheet_directory() . '/admin/main_elements.tpl.php') ) {
+		if (is_file(get_stylesheet_directory() . '/admin/main_elements.tpl.php')) {
 			require_once(get_stylesheet_directory() . '/admin/main_elements.tpl.php');
 			if (!empty($tpl_element))
-				$wpshop_template['admin']['custom'] = ($tpl_element);unset($tpl_element);
+				$wpshop_template['admin']['custom'] = ($tpl_element); unset($tpl_element);
 		}
-		if ( is_file(get_stylesheet_directory() . '/admin/wpshop_elements_template.tpl.php') ) {
+		if (is_file(get_stylesheet_directory() . '/admin/wpshop_elements_template.tpl.php')) {
 			require_once(get_stylesheet_directory() . '/admin/wpshop_elements_template.tpl.php');
 			if (!empty($tpl_element))
-				$wpshop_template['admin']['custom'] = ($tpl_element);unset($tpl_element);
+				$wpshop_template['admin']['custom'] = ($tpl_element); unset($tpl_element);
 		}
 		/*	Get default frontend template	*/
 		require_once(WPSHOP_TEMPLATES_DIR . 'wpshop/main_elements.tpl.php');
-		$wpshop_template['wpshop']['default'] = ($tpl_element);unset($tpl_element);
+		$wpshop_template['wpshop']['default'] = ($tpl_element); unset($tpl_element);
 		/*	Get custom frontend template	*/
-		if ( is_file(get_stylesheet_directory() . '/wpshop/main_elements.tpl.php') ) {
+		if (is_file(get_stylesheet_directory() . '/wpshop/main_elements.tpl.php')) {
 			require_once(get_stylesheet_directory() . '/wpshop/main_elements.tpl.php');
 			if (!empty($tpl_element))
-				$wpshop_template['wpshop']['custom'] = ($tpl_element);unset($tpl_element);
+				$wpshop_template['wpshop']['custom'] = ($tpl_element); unset($tpl_element);
 		}
-		if ( is_file(get_stylesheet_directory() . '/wpshop/wpshop_elements_template.tpl.php') ) {
+		if (is_file(get_stylesheet_directory() . '/wpshop/wpshop_elements_template.tpl.php')) {
 			require_once(get_stylesheet_directory() . '/wpshop/wpshop_elements_template.tpl.php');
 			if (!empty($tpl_element))
-				$wpshop_template['wpshop']['custom'] = ($tpl_element);unset($tpl_element);
+				$wpshop_template['wpshop']['custom'] = ($tpl_element); unset($tpl_element);
 		}
-		foreach ( $wpshop_template as $site_side => $types ) {
-			foreach ( $types as $type => $tpl_component ) {
-				foreach ( $tpl_component as $tpl_key => $tpl_content ) {
+		foreach ($wpshop_template as $site_side => $types) {
+			foreach ($types as $type => $tpl_component) {
+				foreach ($tpl_component as $tpl_key => $tpl_content) {
 					$wpshop_template[$site_side][$type][$tpl_key] = str_replace("
 ", '', $tpl_content);
 				}
 			}
 		}
 
-		$wpshop_template = apply_filters( 'wpshop_custom_template', $wpshop_template);
+		$wpshop_template = apply_filters('wpshop_custom_template', $wpshop_template);
 
-		DEFINE( 'WPSHOP_TEMPLATE', serialize($wpshop_template) );
+		DEFINE('WPSHOP_TEMPLATE', serialize($wpshop_template));
 	}
 
 	/**
@@ -525,12 +525,12 @@ 
 	 *
 	 * @return array The new array with all elment, internal and module templates
 	 */
-	public static function add_modules_template_to_internal( $tpl_element, $templates ) {
-		if ( !empty($tpl_element) ) {
-			foreach ( $tpl_element as $template_part => $template_part_content) {
-				if ( !empty($template_part_content) && is_array($template_part_content) ) {
-					foreach ( $template_part_content as $template_type => $template_type_content) {
-						foreach ( $template_type_content as $template_key => $template) {
+	public static function add_modules_template_to_internal($tpl_element, $templates) {
+		if (!empty($tpl_element)) {
+			foreach ($tpl_element as $template_part => $template_part_content) {
+				if (!empty($template_part_content) && is_array($template_part_content)) {
+					foreach ($template_part_content as $template_type => $template_type_content) {
+						foreach ($template_type_content as $template_key => $template) {
 							$templates[$template_part][$template_type][$template_key] = $template;
 						}
 					}
@@ -550,20 +550,20 @@ 
 	 *
 	 * @return string The good template to take in care, regarding on the given parameters
 	 */
-	public static function check_template_to_display( $part, $template_part, $extras_args, $default_template_dir  ) {
+	public static function check_template_to_display($part, $template_part, $extras_args, $default_template_dir) {
 		$tpl_element_to_return = '';
 
 		/**	Get the defined template	*/
 		$template = defined("WPSHOP_TEMPLATE") ? unserialize(WPSHOP_TEMPLATE) : array();
 
-		if ( !empty($extras_args['type']) && !empty($extras_args['id']) && !empty( $template[$default_template_dir][$part]) && !empty($extras_args['page']) && !empty( $template[$default_template_dir][$part][$extras_args['page']] ) && !empty( $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']]) && !empty( $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']] ) && !empty( $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']][$template_part] ) ) {
+		if (!empty($extras_args['type']) && !empty($extras_args['id']) && !empty($template[$default_template_dir][$part]) && !empty($extras_args['page']) && !empty($template[$default_template_dir][$part][$extras_args['page']]) && !empty($template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']]) && !empty($template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']]) && !empty($template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']][$template_part])) {
 			$tpl_element_to_return = $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']][$template_part];
 		}
-		elseif ( !empty($extras_args['type']) && !empty($extras_args['id']) && !empty( $template[$default_template_dir][$part][$extras_args['type']]) && !empty( $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']] ) && !empty( $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']][$template_part] ) ) {
+		elseif (!empty($extras_args['type']) && !empty($extras_args['id']) && !empty($template[$default_template_dir][$part][$extras_args['type']]) && !empty($template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']]) && !empty($template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']][$template_part])) {
 			$tpl_element_to_return = $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']][$template_part];
 		}
 		/**	Check if the file have been duplicated into theme directory for customization	*/
-		elseif ( !empty( $template[$default_template_dir][$part] ) && !empty( $template[$default_template_dir][$part][$template_part] ) ) {
+		elseif (!empty($template[$default_template_dir][$part]) && !empty($template[$default_template_dir][$part][$template_part])) {
 			$tpl_element_to_return = $template[$default_template_dir][$part][$template_part];
 		}
 
@@ -583,13 +583,13 @@ 
 		$feed['CURRENCY'] = wpshop_tools::wpshop_get_currency();
 		$feed['CURRENCY_CHOOSEN'] = wpshop_tools::wpshop_get_currency();
 		$feed['CURRENCY_SELECTOR'] = wpshop_attributes_unit::wpshop_shop_currency_list_field();
-		$feed['CART_LINK'] = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_cart_page_id') ) );
+		$feed['CART_LINK'] = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_cart_page_id')));
 
 		$available_key = array();
 		foreach ($feed as $element => $value) {
-			$available_key[] = '{WPSHOP_'.$element.'}';
-			if ( !is_array($value) ) {
-				$template_to_fill = str_replace('{WPSHOP_'.$element.'}', $value, $template_to_fill);
+			$available_key[] = '{WPSHOP_' . $element . '}';
+			if (!is_array($value)) {
+				$template_to_fill = str_replace('{WPSHOP_' . $element . '}', $value, $template_to_fill);
 			}
 		}
 		if (WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE) $template_to_fill = '<!-- Available keys : ' . implode(' / ', $available_key) . ' -->' . $template_to_fill;
@@ -602,11 +602,11 @@ 
 	 *
 	 * @param boolean $force_replacement Define if we overwrite in all case or just if it not exist
 	 */
-	public static function check_template_file( $force_replacement = false ) {
+	public static function check_template_file($force_replacement = false) {
 		$wpshop_directory = get_stylesheet_directory() . '/wpshop';
 
 		/*	Add different file template	*/
-		if(!is_dir($wpshop_directory)){
+		if (!is_dir($wpshop_directory)) {
 			@mkdir($wpshop_directory, 0755, true);
 		}
 		/* On s'assure que le dossier principal est bien en 0755	*/
@@ -614,12 +614,12 @@ 
 		$upload_dir = wp_upload_dir();
 
 		/*	Add the category template	*/
-		if(!is_file(get_stylesheet_directory() . '/taxonomy-wpshop_product_category.php') || ($force_replacement)){
+		if (!is_file(get_stylesheet_directory() . '/taxonomy-wpshop_product_category.php') || ($force_replacement)) {
 			@copy(WPSHOP_TEMPLATES_DIR . 'taxonomy-wpshop_product_category.php', get_stylesheet_directory() . '/taxonomy-wpshop_product_category.php');
 		}
 
 		/*	Add the product template	*/
-		if(!is_file(get_stylesheet_directory() . '/single-wpshop_product.php') || ($force_replacement)){
+		if (!is_file(get_stylesheet_directory() . '/single-wpshop_product.php') || ($force_replacement)) {
 			@copy(WPSHOP_TEMPLATES_DIR . 'single-wpshop_product.php', get_stylesheet_directory() . '/single-wpshop_product.php');
 		}
 	}
@@ -637,31 +637,31 @@ 
 		/*	Check if user is on taxonomy edition page	*/
 		if ($pagenow == 'edit-tags.php') {
 
-			if(!user_can_richedit()) { return; }
+			if (!user_can_richedit()) { return; }
 
 			$taxonomies = get_taxonomies();
 
 			foreach ($taxonomies as $tax) {
-				if ( in_array($tax, array(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES)) ) {
-					add_action($tax . '_edit_form_fields', array('wpshop_display','wpshop_add_form'));
-					add_action($tax . '_add_form_fields', array('wpshop_display','wpshop_add_form'));
+				if (in_array($tax, array(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES))) {
+					add_action($tax . '_edit_form_fields', array('wpshop_display', 'wpshop_add_form'));
+					add_action($tax . '_add_form_fields', array('wpshop_display', 'wpshop_add_form'));
 				}
 			}
-			$action = !empty( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action'] ) : '';
-			$taxonomy = !empty( $_REQUEST['taxonomy'] ) ? sanitize_text_field( $_REQUEST['taxonomy'] ) : '';
+			$action = !empty($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : '';
+			$taxonomy = !empty($_REQUEST['taxonomy']) ? sanitize_text_field($_REQUEST['taxonomy']) : '';
 
 			if ($pagenow == 'edit-tags.php' && isset($action) && $action == 'edit' && empty($taxonomy)) {
-				add_action('edit_term',array('wpshop_display','wpshop_rt_taxonomy_save'));
+				add_action('edit_term', array('wpshop_display', 'wpshop_rt_taxonomy_save'));
 			}
 
-			foreach ( array( 'pre_term_description', 'pre_link_description', 'pre_link_notes', 'pre_user_description' ) as $filter ) {
-				remove_filter( $filter, 'wp_filter_kses' );
+			foreach (array('pre_term_description', 'pre_link_description', 'pre_link_notes', 'pre_user_description') as $filter) {
+				remove_filter($filter, 'wp_filter_kses');
 			}
 
 		}
 
 		/*	Enable shortcodes in category, taxonomy, tag descriptions */
-		if(function_exists('term_description')) {
+		if (function_exists('term_description')) {
 			add_filter('term_description', 'do_shortcode');
 		}
 		else {
@@ -677,8 +677,8 @@ 
 
 		$a = array('description');
 		foreach ($a as $v) {
-			$term = (array) $_POST[$v];
-			wp_update_term($tag_ID,$v,$term);
+			$term = (array)$_POST[$v];
+			wp_update_term($tag_ID, $v, $term);
 		}
 	}
 
@@ -690,9 +690,9 @@ 
 	public static function wpshop_add_form($object = '') {
 		global $pagenow;
 
-		$content = is_object($object) && isset($object->description) ? ( html_entity_decode( $object->description, ENT_COMPAT | ENT_HTML401, 'UTF-8' ) ) : '';
+		$content = is_object($object) && isset($object->description) ? (html_entity_decode($object->description, ENT_COMPAT | ENT_HTML401, 'UTF-8')) : '';
 
-		if( in_array($pagenow, array('edit-tags.php')) ) {
+		if (in_array($pagenow, array('edit-tags.php'))) {
 			$editor_id = 'tag_description';
 			$editor_selector = 'description';
 		}
@@ -722,8 +722,8 @@ 
 
 	public static function wps_hide_admin_bar_for_customers() {
 		$wpshop_hide_admin_bar_option = get_option('wpshop_display_option');
-		if ( !empty($wpshop_hide_admin_bar_option) && !empty($wpshop_hide_admin_bar_option['wpshop_hide_admin_bar']) && ! current_user_can( 'manage_options' ) ) {
-			show_admin_bar( false );
+		if (!empty($wpshop_hide_admin_bar_option) && !empty($wpshop_hide_admin_bar_option['wpshop_hide_admin_bar']) && !current_user_can('manage_options')) {
+			show_admin_bar(false);
 		}
 	}
 
@@ -737,7 +737,7 @@ 
 	 * @param string $content The content of a post
 	 * @return Ambigous <mixed, string>|unknown
 	 */
-	public static function products_page( $content = '' ) {
+	public static function products_page($content = '') {
 		global $wp_query;
 
 		if (!empty($wp_query->queried_object) && !empty($wp_query->queried_object->post_type) && ($wp_query->queried_object->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT)) {
@@ -756,15 +756,15 @@ 
 	 *
 	 * @return string The formated value
 	 */
-	public static function format_field_output( $output_type, $value ) {
+	public static function format_field_output($output_type, $value) {
 		$formated_value = $value;
 
-		if ( !empty($value) ) {
-			switch ( $output_type ) {
+		if (!empty($value)) {
+			switch ($output_type) {
 				case 'wpshop_product_price':
-					$formated_value = (is_numeric($value) ) ? number_format($value, 2, ',', '') : $value;
+					$formated_value = (is_numeric($value)) ? number_format($value, 2, ',', '') : $value;
 					$formated_value_content = explode(',', $formated_value);
-					if ( !empty($formated_value_content) && !empty($formated_value_content[1]) && $formated_value_content[1] <= 0 ) {
+					if (!empty($formated_value_content) && !empty($formated_value_content[1]) && $formated_value_content[1] <= 0) {
 						$formated_value = $formated_value_content[0];
 					}
 				break;

includes/librairies/catalog/products.class.php

Indentation +3123 added lines, -3123 removed lines

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

Spacing +24 added lines, -24 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;
@@ -572,12 +572,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
@@ -727,11 +727,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);
                     }
@@ -1250,7 +1250,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);
 
@@ -1306,7 +1306,7 @@ 
                             $attributeValue = str_replace(',', '.', $attributeValue);
                         }
                         if (($attributeType == 'integer') && !is_array($attributeValue)) {
-                            $attributeValue = (int) $attributeValue;
+                            $attributeValue = (int)$attributeValue;
                         }
                         $productMetaDatas[$attributeCode] = $attributeValue;
                     }
@@ -1356,7 +1356,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;
                             }
@@ -1369,7 +1369,7 @@ 
                                 $attributeValue = str_replace(',', '.', $attributeValue);
                             }
                             if (($attributeType == 'integer') && !is_array($attributeValue)) {
-                                $attributeValue = (int) $attributeValue;
+                                $attributeValue = (int)$attributeValue;
                             }
                             $variation_metadata[$attributeCode] = $attributeValue;
                         }
@@ -1705,13 +1705,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'];
@@ -2154,7 +2154,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;
@@ -3117,7 +3117,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'];
@@ -3485,9 +3485,9 @@ 
         $variation_post_meta['options'] = $options;
 		$variation_post_meta['follow_general_config'] = true;
 		$variations = wpshop_attributes::get_variation_available_attribute($current_post_id);
-		if( !empty( $variations['available'] ) ) {
-			foreach( $variations['available'] as $key => $value ) {
-				echo '<pre>'; print_r( $value ); echo '</pre>';
+		if (!empty($variations['available'])) {
+			foreach ($variations['available'] as $key => $value) {
+				echo '<pre>'; print_r($value); echo '</pre>';
 			}
 		}
 		//$variations = (array) array_merge((isset($variations['available']) ? $variations['available'] : array()), (isset($variations['unavailable']) ? $variations['unavailable'] : array()));exit();

includes/modules/wps_shipping/controller/wps_shipping_mode_ajax_actions.php

Spacing +93 added lines, -93 removed lines

@@ -1,62 +1,62 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_shipping_mode_ajax_actions {
 
 	function __construct() {
 		/** Ajax Actions **/
-		add_action('wp_ajax_save_shipping_rule',array( $this, 'wpshop_ajax_save_shipping_rule'));
-		add_action('wp_ajax_display_shipping_rules',array( $this, 'wpshop_ajax_display_shipping_rules'));
-		add_action('wp_ajax_delete_shipping_rule',array( $this, 'wpshop_ajax_delete_shipping_rule'));
-		add_action('wp_ajax_wps_add_new_shipping_mode',array( $this, 'wps_add_new_shipping_mode'));
-		add_action('wp_ajax_wps_delete_shipping_mode',array( $this, 'wps_delete_shipping_mode'));
-		add_action('wp_ajax_wps_reload_shipping_mode',array( $this, 'wps_reload_shipping_mode'));
-		add_action('wp_ajax_wps_calculate_shipping_cost',array( $this, 'wps_calculate_shipping_cost'));
-		add_action( 'wp_ajax_wps_load_shipping_methods', array(&$this, 'wps_load_shipping_methods') );
+		add_action('wp_ajax_save_shipping_rule', array($this, 'wpshop_ajax_save_shipping_rule'));
+		add_action('wp_ajax_display_shipping_rules', array($this, 'wpshop_ajax_display_shipping_rules'));
+		add_action('wp_ajax_delete_shipping_rule', array($this, 'wpshop_ajax_delete_shipping_rule'));
+		add_action('wp_ajax_wps_add_new_shipping_mode', array($this, 'wps_add_new_shipping_mode'));
+		add_action('wp_ajax_wps_delete_shipping_mode', array($this, 'wps_delete_shipping_mode'));
+		add_action('wp_ajax_wps_reload_shipping_mode', array($this, 'wps_reload_shipping_mode'));
+		add_action('wp_ajax_wps_calculate_shipping_cost', array($this, 'wps_calculate_shipping_cost'));
+		add_action('wp_ajax_wps_load_shipping_methods', array(&$this, 'wps_load_shipping_methods'));
 	}
 
 	/**
 	 * AJAX - Save custom Rules
 	 **/
-	function wpshop_ajax_save_shipping_rule(){
-		check_ajax_referer( 'wpshop_ajax_save_shipping_rule' );
+	function wpshop_ajax_save_shipping_rule() {
+		check_ajax_referer('wpshop_ajax_save_shipping_rule');
 
 		global $wpdb;
 		$wps_shipping = new wps_shipping();
 		$status = false;
 		$reponse = array();
-		$fees_data = ( !empty($_POST['fees_data']) ) ?  ( $_POST['fees_data'] ) : null;
-		$weight_rule = ( !empty($_POST['weight_rule']) ) ? wpshop_tools::varSanitizer( $_POST['weight_rule'] ) : null;
-		$shipping_price = ( !empty($_POST['shipping_price']) ) ? wpshop_tools::varSanitizer( $_POST['shipping_price'] ) : 0;
-		$selected_country = ( !empty($_POST['selected_country']) ) ? wpshop_tools::varSanitizer( $_POST['selected_country'] ) : null;
-		$shipping_rules = $wps_shipping->shipping_fees_string_2_array( stripslashes($fees_data) );
+		$fees_data = (!empty($_POST['fees_data'])) ? ($_POST['fees_data']) : null;
+		$weight_rule = (!empty($_POST['weight_rule'])) ? wpshop_tools::varSanitizer($_POST['weight_rule']) : null;
+		$shipping_price = (!empty($_POST['shipping_price'])) ? wpshop_tools::varSanitizer($_POST['shipping_price']) : 0;
+		$selected_country = (!empty($_POST['selected_country'])) ? wpshop_tools::varSanitizer($_POST['selected_country']) : null;
+		$shipping_rules = $wps_shipping->shipping_fees_string_2_array(stripslashes($fees_data));
 
-		$weight_defaut_unity_option = get_option ('wpshop_shop_default_weight_unity');
-		$query = $wpdb->prepare('SELECT unit FROM '. WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id=%d', $weight_defaut_unity_option);
-		$unity = $wpdb->get_var( $query );
+		$weight_defaut_unity_option = get_option('wpshop_shop_default_weight_unity');
+		$query = $wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id=%d', $weight_defaut_unity_option);
+		$unity = $wpdb->get_var($query);
 
-		$weight_rule = ( !empty($unity) && $unity == 'kg' ) ? $weight_rule * 1000 : $weight_rule;
+		$weight_rule = (!empty($unity) && $unity == 'kg') ? $weight_rule * 1000 : $weight_rule;
 		//Check if this shipping rule (same country and same weight) already exist in the shipping rules definition
-		if( !empty($shipping_rules) ) {
+		if (!empty($shipping_rules)) {
 			$existing_country = false;
 			$tab_key = -1;
-			foreach ( $shipping_rules as $key=>$shipping_rule) {
-				if ( $shipping_rule['destination'] == $selected_country) {
+			foreach ($shipping_rules as $key=>$shipping_rule) {
+				if ($shipping_rule['destination'] == $selected_country) {
 					$existing_country = true;
 					$tab_key = $key;
 				}
 			}
-			if ( $existing_country && $tab_key > -1) {
+			if ($existing_country && $tab_key > -1) {
 				$shipping_rules[$tab_key]['fees'][$weight_rule] = $shipping_price;
 			}
 			else {
-				$shipping_rules[] = array( 'destination' => $selected_country, 'rule' => 'weight', 'fees' => array($weight_rule => $shipping_price) );
+				$shipping_rules[] = array('destination' => $selected_country, 'rule' => 'weight', 'fees' => array($weight_rule => $shipping_price));
 			}
 			$status = true;
 		}
 		else {
-			$shipping_rules = array( '0' => array('destination' => $selected_country, 'rule' => 'weight', 'fees' => array( $weight_rule => $shipping_price)) );
+			$shipping_rules = array('0' => array('destination' => $selected_country, 'rule' => 'weight', 'fees' => array($weight_rule => $shipping_price)));
 			$status = true;
 		}
-		$reponse = array('status' => $status, 'reponse' => $wps_shipping->shipping_fees_array_2_string( $shipping_rules ) );
+		$reponse = array('status' => $status, 'reponse' => $wps_shipping->shipping_fees_array_2_string($shipping_rules));
 		echo json_encode($reponse);
 		die();
 	}
@@ -65,18 +65,18 @@ 
 	 * AJAX - Delete Custom shipping Rule
 	 */
 	function wpshop_ajax_delete_shipping_rule() {
-		check_ajax_referer( 'wpshop_ajax_delete_shipping_rule' );
+		check_ajax_referer('wpshop_ajax_delete_shipping_rule');
 
 		global $wpdb;
 		$wps_shipping = new wps_shipping();
-		$fees_data = ( !empty($_POST['fees_data']) ) ? ( $_POST['fees_data'] ) : null;
-		$country_and_weight =  ( !empty($_POST['country_and_weight']) ) ? sanitize_text_field( $_POST['country_and_weight'] ) : null;
+		$fees_data = (!empty($_POST['fees_data'])) ? ($_POST['fees_data']) : null;
+		$country_and_weight = (!empty($_POST['country_and_weight'])) ? sanitize_text_field($_POST['country_and_weight']) : null;
 		$datas = explode("|", $country_and_weight);
 		$country = $datas[0];
 		$weight = $datas[1];
 		$shipping_mode_id = $datas[2];
 
-		$shipping_rules = $wps_shipping->shipping_fees_string_2_array( stripslashes($fees_data) );
+		$shipping_rules = $wps_shipping->shipping_fees_string_2_array(stripslashes($fees_data));
 
 		/** Check the default weight unity **/
 // 		$weight_unity_id = get_option('wpshop_shop_default_weight_unity');
@@ -89,46 +89,46 @@ 
 // 			}
 // 		}
 
-		if ( array_key_exists($country, $shipping_rules) ) {
-			if ( array_key_exists((string)$weight, $shipping_rules[$country]['fees']) ) {
+		if (array_key_exists($country, $shipping_rules)) {
+			if (array_key_exists((string)$weight, $shipping_rules[$country]['fees'])) {
 				unset($shipping_rules[$country]['fees'][$weight]);
 			}
-			if ( empty($shipping_rules[$country]['fees']) ) {
+			if (empty($shipping_rules[$country]['fees'])) {
 				unset($shipping_rules[$country]);
 			}
 
 		}
-		foreach ( $shipping_rules as $k=>$shipping_rule ) {
-			if ( !isset($shipping_rule['fees']) ) {
+		foreach ($shipping_rules as $k=>$shipping_rule) {
+			if (!isset($shipping_rule['fees'])) {
 				unset($shipping_rules[$k]);
 			}
 		}
 
 		$status = true;
 
-		if ( !empty( $shipping_rules ) ) {
-			$rules = $wps_shipping->shipping_fees_array_2_string( $shipping_rules );
+		if (!empty($shipping_rules)) {
+			$rules = $wps_shipping->shipping_fees_array_2_string($shipping_rules);
 		}
 		else {
 			$rules = '';
 		}
 
-		wp_die( json_encode( array( 'status' => $status, 'reponse' => $rules, ) ) );
+		wp_die(json_encode(array('status' => $status, 'reponse' => $rules,)));
 	}
 
 	/**
 	 * AJAX - Display Created custom shipping rules
 	 */
-	function wpshop_ajax_display_shipping_rules () {
-		check_ajax_referer( 'wpshop_ajax_display_shipping_rules' );
+	function wpshop_ajax_display_shipping_rules() {
+		check_ajax_referer('wpshop_ajax_display_shipping_rules');
 
 		$status = false;
-		$fees_data = ( !empty($_POST['fees_data']) ) ? ( $_POST['fees_data'] ) : null;
-		$shipping_mode_id = ( !empty($_POST['shipping_mode_id']) ) ? sanitize_title($_POST['shipping_mode_id']) : null;
+		$fees_data = (!empty($_POST['fees_data'])) ? ($_POST['fees_data']) : null;
+		$shipping_mode_id = (!empty($_POST['shipping_mode_id'])) ? sanitize_title($_POST['shipping_mode_id']) : null;
 		$result = '';
-		if( !empty($fees_data) ) {
+		if (!empty($fees_data)) {
 			$wps_shipping_mode_ctr = new wps_shipping_mode_ctr();
-			$result = $wps_shipping_mode_ctr->generate_shipping_rules_table( $fees_data, $shipping_mode_id );
+			$result = $wps_shipping_mode_ctr->generate_shipping_rules_table($fees_data, $shipping_mode_id);
 			$status = true;
 		}
 		else {
@@ -146,38 +146,38 @@ 
 	 * AJAX - Reload shippig mode interface
 	 */
 	function wps_reload_shipping_mode() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_reload_shipping_mode' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_reload_shipping_mode'))
 			wp_die();
 
 		$status = false; $allow_order = true;
 		$result = '';
-		$address_id = !empty( $_POST['address_id'] ) ? (int) $_POST['address_id'] : 0;
-		if ( !empty($address_id) ) {
+		$address_id = !empty($_POST['address_id']) ? (int)$_POST['address_id'] : 0;
+		if (!empty($address_id)) {
 			$_SESSION['shipping_address'] = $address_id;
 		}
-		$shipping_address_id = ( !empty($_SESSION['shipping_address']) ) ? $_SESSION['shipping_address'] : '';
-		if ( !empty($shipping_address_id) ) {
+		$shipping_address_id = (!empty($_SESSION['shipping_address'])) ? $_SESSION['shipping_address'] : '';
+		if (!empty($shipping_address_id)) {
 			//$result = self::generate_shipping_mode_for_an_address();
 			$wps_shipping_mode_ctr = new wps_shipping_mode_ctr();
 // 			$shipping_modes = $wps_shipping_mode_ctr->generate_shipping_mode_for_an_address( intval($_POST['address_id']) );
 
 			$status = $allow_order = $shipping_modes[0];
-			if( empty( $shipping_modes[0]) || $shipping_modes[0] == false ) {
+			if (empty($shipping_modes[0]) || $shipping_modes[0] == false) {
 				$status = false;
 			}
 
 			$result = $shipping_modes[1];
 
-			if ( $status == false ) {
+			if ($status == false) {
 				$allow_order = false;
-				$result = '<div class="error_bloc">' .__('Sorry ! You can\'t order on this shop, because we don\'t ship in your country.', 'wpshop' ). '</div>';
+				$result = '<div class="error_bloc">' . __('Sorry ! You can\'t order on this shop, because we don\'t ship in your country.', 'wpshop') . '</div>';
 			}
 
 		}
-		$response = array('status' => $status, 'response' => $result, 'allow_order' => $allow_order );
-		echo json_encode( $response );
+		$response = array('status' => $status, 'response' => $result, 'allow_order' => $allow_order);
+		echo json_encode($response);
 		die();
 	}
 
@@ -185,26 +185,26 @@ 
 	 * AJAX - Calculate Shipping cost
 	 */
 	function wps_calculate_shipping_cost() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_calculate_shipping_cost' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_calculate_shipping_cost'))
 			wp_die();
 
 		$status = false;
 		$result = '';
 		$chosen_method = !empty($_POST['chosen_method']) ? wpshop_tools::varSanitizer($_POST['chosen_method']) : null;
 
-		if( !empty($chosen_method) ) {
+		if (!empty($chosen_method)) {
 			$_SESSION['shipping_method'] = $chosen_method;
 			$wps_cart = new wps_cart();
-			$order = $wps_cart->calcul_cart_information( array() );
+			$order = $wps_cart->calcul_cart_information(array());
 			$wps_cart->store_cart_in_session($order);
 
 			$status = true;
 		}
 
-		$response = array('status' => $status );
-		echo json_encode( $response );
+		$response = array('status' => $status);
+		echo json_encode($response);
 		die();
 	}
 
@@ -212,68 +212,68 @@ 
 	 * AJAX - (New checkout Tunnel ) Load available shipping modes
 	 */
 	function wps_load_shipping_methods() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_load_shipping_methods' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_load_shipping_methods'))
 			wp_die();
 
 		$status = true; $response = '';
-		$shipping_address_id = ( !empty($_POST['shipping_address']) ) ? intval( $_POST['shipping_address'] ) : null;
-		if ( !empty($shipping_address_id) ) {
+		$shipping_address_id = (!empty($_POST['shipping_address'])) ? intval($_POST['shipping_address']) : null;
+		if (!empty($shipping_address_id)) {
 			// Check if element is an address
 			$check_address_type = get_post($shipping_address_id);
-			if ( !empty($check_address_type) && $check_address_type->post_author == get_current_user_id() && $check_address_type->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS ) {
+			if (!empty($check_address_type) && $check_address_type->post_author == get_current_user_id() && $check_address_type->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS) {
 				// Get address metadatas
-				$address_metadata = get_post_meta( $shipping_address_id, '_wpshop_address_metadata', true );
-				if( !empty($address_metadata) && !empty($address_metadata['country']) ) {
+				$address_metadata = get_post_meta($shipping_address_id, '_wpshop_address_metadata', true);
+				if (!empty($address_metadata) && !empty($address_metadata['country'])) {
 					$country = $address_metadata['country'];
 					$postcode = $address_metadata['postcode'];
-					$shipping_methods = get_option( 'wps_shipping_mode' );
+					$shipping_methods = get_option('wps_shipping_mode');
 					$available_shipping_methods = array();
-					if( !empty($shipping_methods) && !empty($shipping_methods['modes']) ) {
+					if (!empty($shipping_methods) && !empty($shipping_methods['modes'])) {
 						// Check all shipping methods
-						foreach( $shipping_methods['modes'] as $shipping_method_id => $shipping_method ){
-							if ( empty($shipping_method['limit_destination']) || ( empty($shipping_method['limit_destination']['country']) || ( !empty($shipping_method['limit_destination']['country']) && in_array($country, $shipping_method['limit_destination']['country']) ) ) ) {
-								$available_shipping_methods[ $shipping_method_id ] = $shipping_method;
+						foreach ($shipping_methods['modes'] as $shipping_method_id => $shipping_method) {
+							if (empty($shipping_method['limit_destination']) || (empty($shipping_method['limit_destination']['country']) || (!empty($shipping_method['limit_destination']['country']) && in_array($country, $shipping_method['limit_destination']['country'])))) {
+								$available_shipping_methods[$shipping_method_id] = $shipping_method;
 							}
 						}
-						if( !empty($available_shipping_methods) ) {
-							foreach( $available_shipping_methods as $shipping_mode_id => $shipping_mode ) {
+						if (!empty($available_shipping_methods)) {
+							foreach ($available_shipping_methods as $shipping_mode_id => $shipping_mode) {
 								ob_start();
-								require( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, WPS_SHIPPING_MODE_PATH . WPS_SHIPPING_MODE_DIR . "/templates/","frontend", "shipping-mode", "element") );
+								require(wpshop_tools::get_template_part(WPS_SHIPPING_MODE_DIR, WPS_SHIPPING_MODE_PATH . WPS_SHIPPING_MODE_DIR . "/templates/", "frontend", "shipping-mode", "element"));
 								$response .= ob_get_contents();
 								ob_end_clean();
 
 							}
 						}
 						else {
-							$response = '<div class="wps-alert-error">' .__( 'No shipping method available for your shipping address', 'wpshop' ). '</div>';
+							$response = '<div class="wps-alert-error">' . __('No shipping method available for your shipping address', 'wpshop') . '</div>';
 						}
 
 					}
 					else {
-						$response = '<div class="wps-alert-info">' .__( 'No shipping method available', 'wpshop' ). '</div>';
+						$response = '<div class="wps-alert-info">' . __('No shipping method available', 'wpshop') . '</div>';
 					}
 				}
 			}
 		}
 		else {
-			$response = '<div class="wps-alert-info">' .__( 'Please select a shipping address to choose a shipping method', 'wpshop' ). '</div>';
+			$response = '<div class="wps-alert-info">' . __('Please select a shipping address to choose a shipping method', 'wpshop') . '</div>';
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		die();
 	}
 
 
 	function wps_add_new_shipping_mode() {
-		check_ajax_referer( 'wps_add_new_shipping_mode' );
+		check_ajax_referer('wps_add_new_shipping_mode');
 
 		$status = false; $reponse = '';
 
-		$k = 'wps_custom_shipping_mode_'.time();
+		$k = 'wps_custom_shipping_mode_' . time();
 		$shipping_mode = array();
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, WPS_SHIPPING_MODE_PATH . WPS_SHIPPING_MODE_DIR . "/templates/", "backend", "shipping-mode") );
+		require(wpshop_tools::get_template_part(WPS_SHIPPING_MODE_DIR, WPS_SHIPPING_MODE_PATH . WPS_SHIPPING_MODE_DIR . "/templates/", "backend", "shipping-mode"));
 		$response .= ob_get_contents();
 		ob_end_clean();
 
@@ -281,23 +281,23 @@ 
 		jQuery("select.chosen_select").chosen( WPSHOP_CHOSEN_ATTRS );
 	} );</script>';
 
-		$status = ( !empty($response) ) ? true : false;
+		$status = (!empty($response)) ? true : false;
 
-		echo json_encode( array( 'status' => $status, 'response' => $response) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 
 	function wps_delete_shipping_mode() {
-		check_ajax_referer( 'wps_delete_shipping_mode' );
-		$shipping_mode = ! empty( $_POST['shipping_mode'] ) ? sanitize_text_field( $_POST['shipping_mode'] ) : null;
-		$wps_shipping_mode = get_option( 'wps_shipping_mode' );
-		if ( ! empty( $wps_shipping_mode['modes'] ) && array_key_exists( $shipping_mode, $wps_shipping_mode['modes'] ) ) {
-			unset( $wps_shipping_mode['modes'][ $shipping_mode ] );
-			if ( ! empty( $wps_shipping_mode['default_choice'] ) && $wps_shipping_mode['default_choice'] === $shipping_mode ) {
+		check_ajax_referer('wps_delete_shipping_mode');
+		$shipping_mode = !empty($_POST['shipping_mode']) ? sanitize_text_field($_POST['shipping_mode']) : null;
+		$wps_shipping_mode = get_option('wps_shipping_mode');
+		if (!empty($wps_shipping_mode['modes']) && array_key_exists($shipping_mode, $wps_shipping_mode['modes'])) {
+			unset($wps_shipping_mode['modes'][$shipping_mode]);
+			if (!empty($wps_shipping_mode['default_choice']) && $wps_shipping_mode['default_choice'] === $shipping_mode) {
 				$wps_shipping_mode['default_choice'] = 'default_shipping_mode';
 			}
 		}
-		update_option( 'wps_shipping_mode', $wps_shipping_mode );
+		update_option('wps_shipping_mode', $wps_shipping_mode);
 		wp_send_json_success();
 	}
 }

includes/modules/wps_shipping/templates/backend/shipping-mode-configuration-custom-rules-table.php

Spacing +10 added lines, -10 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 $wps_shipping = new wps_shipping();
-$shipping_rules = $wps_shipping->shipping_fees_string_2_array( stripslashes($fees_data) );
+$shipping_rules = $wps_shipping->shipping_fees_string_2_array(stripslashes($fees_data));
 
-if( !empty($shipping_rules) ) : ?>
+if (!empty($shipping_rules)) : ?>
 
 	<div class="wps-table-header wps-table-row">
 		<div class="wps-table-cell"><?php _e('Country', 'wpshop'); ?></div>
@@ -11,22 +11,22 @@ 
 		<div class="wps-table-cell"><?php _e('Delete', 'wpshop'); ?></div>
 	</div>
 
-	<?php foreach ( $shipping_rules as $shipping_rule ) :
+	<?php foreach ($shipping_rules as $shipping_rule) :
 			$country_name = '';
 			$code_country = explode('-', $shipping_rule['destination']);
 			$code_country = $code_country[0];
-			foreach ( $country_list as $key=>$country ) :
-				if (  $key == $code_country ) :
+			foreach ($country_list as $key=>$country) :
+				if ($key == $code_country) :
 					$country_name = $country;
 				endif;
 			endforeach;
-			if ( !empty($shipping_rule['fees']) ) :
-				foreach( $shipping_rule['fees'] as $p => $fee ) : ?>
+			if (!empty($shipping_rule['fees'])) :
+				foreach ($shipping_rule['fees'] as $p => $fee) : ?>
 				<div class="wps-table-content wps-table-row" data-element="<?php echo $shipping_rule['destination']; ?>|<?php echo $p; ?>|<?php echo $fee; ?>">
 					<div class="wps-table-cell"><?php echo $country_name; ?> (<?php echo $shipping_rule['destination']; ?>)</div>
-					<div class="wps-table-cell"><?php echo ($unity == 'kg') ? $p / 1000 : $p; ?> <?php _e( $unity, 'wpshop')?></div>
+					<div class="wps-table-cell"><?php echo ($unity == 'kg') ? $p / 1000 : $p; ?> <?php _e($unity, 'wpshop')?></div>
 					<div class="wps-table-cell"><?php echo $fee; ?> <?php echo wpshop_tools::wpshop_get_currency(); ?></div>
-					<div class="wps-table-cell"><a href="#" id="<?php echo $shipping_rule['destination']; ?>|<?php echo $p; ?>|<?php echo $shipping_mode_id; ?>" data-nonce="<?php echo wp_create_nonce( 'wpshop_ajax_delete_shipping_rule' ); ?>" class="delete_rule" title="<?php echo $shipping_mode_id; ?>"><i class="wps-icon-trash"></i></a></div>
+					<div class="wps-table-cell"><a href="#" id="<?php echo $shipping_rule['destination']; ?>|<?php echo $p; ?>|<?php echo $shipping_mode_id; ?>" data-nonce="<?php echo wp_create_nonce('wpshop_ajax_delete_shipping_rule'); ?>" class="delete_rule" title="<?php echo $shipping_mode_id; ?>"><i class="wps-icon-trash"></i></a></div>
 				</div>
 	<?php
 				endforeach;

includes/modules/wps_product/modules/wps_product_mass_interface/controller/wps_product_mass_interface_ctr.php

Spacing +142 added lines, -142 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Main controller file for product mass modification module
  *
@@ -21,29 +21,29 @@ 
 	 */
 	function __construct() {
 		// Add submenu
-		add_action('admin_menu', array( $this, 'register_mass_products_edit_submenu' ), 350 );
+		add_action('admin_menu', array($this, 'register_mass_products_edit_submenu'), 350);
 
 		// Trigger ajax action
-		add_action( 'wp_ajax_wps_mass_edit_change_page', array( $this, 'wps_mass_edit_change_page') );
-		add_action( 'wp_ajax_wps_mass_edit_product_save_action', array( $this, 'wps_save_product_quick_interface') );
-		add_action( 'wp_ajax_wps_mass_interface_new_product_creation', array( $this, 'wps_mass_interface_new_product_creation' ) );
-		add_action( 'wp_ajax_wps_mass_delete_file', array( $this, 'wps_mass_delete_file' ) );
-		add_action( 'wp_ajax_wps_mass_edit_update_files_list', array( $this, 'wps_mass_edit_update_files_list' ) );
+		add_action('wp_ajax_wps_mass_edit_change_page', array($this, 'wps_mass_edit_change_page'));
+		add_action('wp_ajax_wps_mass_edit_product_save_action', array($this, 'wps_save_product_quick_interface'));
+		add_action('wp_ajax_wps_mass_interface_new_product_creation', array($this, 'wps_mass_interface_new_product_creation'));
+		add_action('wp_ajax_wps_mass_delete_file', array($this, 'wps_mass_delete_file'));
+		add_action('wp_ajax_wps_mass_edit_update_files_list', array($this, 'wps_mass_edit_update_files_list'));
 		// add_action( 'wap_ajax_wps_mass_delete_post', array( $this, 'wps_mass_delete_post' ) );
 	}
 
 	function register_mass_products_edit_submenu() {
-		$this->submenu = add_submenu_page( 'edit.php?post_type=wpshop_product', __( 'Mass product edit', 'wpshop' ), __( 'Mass product edit', 'wpshop' ), 'manage_options', 'mass_edit_interface', array($this, 'wps_display_mass_edit_interface' ) );
+		$this->submenu = add_submenu_page('edit.php?post_type=wpshop_product', __('Mass product edit', 'wpshop'), __('Mass product edit', 'wpshop'), 'manage_options', 'mass_edit_interface', array($this, 'wps_display_mass_edit_interface'));
 		// Declare Styles and JS Files.
-		add_action( 'admin_print_styles-' . $this->submenu, array( $this, 'admin_print_styles' ) );
-		add_action( 'admin_print_scripts-' . $this->submenu, array( $this, 'admin_print_scripts' ) );
+		add_action('admin_print_styles-' . $this->submenu, array($this, 'admin_print_styles'));
+		add_action('admin_print_scripts-' . $this->submenu, array($this, 'admin_print_scripts'));
 	}
 
 	/**
 	 * Add css to administration
 	 */
 	function admin_print_styles() {
-		wp_enqueue_style( 'wps-mass-product-update', WPS_PDCT_MASS_URL . '/assets/css/backend.css' );
+		wp_enqueue_style('wps-mass-product-update', WPS_PDCT_MASS_URL . '/assets/css/backend.css');
 	}
 
 	/**
@@ -51,12 +51,12 @@ 
 	 */
 	function admin_print_scripts() {
 		wp_enqueue_media();
-		wp_enqueue_script( 'admin_product_js', WPS_PDCT_MASS_URL . '/assets/js/backend.js', '', WPS_PDCT_MASS_VERSION, true );
+		wp_enqueue_script('admin_product_js', WPS_PDCT_MASS_URL . '/assets/js/backend.js', '', WPS_PDCT_MASS_VERSION, true);
 		$output = '<script type="text/javascript">';
-		$output .= 'var WPS_MASS_ERROR_INIT = "' .__( 'An error has occured, the page cannot be initialized', 'wpshop' ). '";';
-		$output .= 'var WPS_MASS_ERROR_PRODUCT_CREATION = "' .__( 'An error was occured, the new product cannot be created', 'wpshop' ). '";';
-		$output .= 'var WPS_MASS_ERROR_PRODUCT_SAVE = "' .__( 'You must select product to save', 'wpshop' ). '";';
-		$output .= 'var WPS_MASS_CONFIRMATION_NEW_PRODUCT = "' .__( 'You will save selected products, are you sure to continue ?', 'wpshop' ). '";';
+		$output .= 'var WPS_MASS_ERROR_INIT = "' . __('An error has occured, the page cannot be initialized', 'wpshop') . '";';
+		$output .= 'var WPS_MASS_ERROR_PRODUCT_CREATION = "' . __('An error was occured, the new product cannot be created', 'wpshop') . '";';
+		$output .= 'var WPS_MASS_ERROR_PRODUCT_SAVE = "' . __('You must select product to save', 'wpshop') . '";';
+		$output .= 'var WPS_MASS_CONFIRMATION_NEW_PRODUCT = "' . __('You will save selected products, are you sure to continue ?', 'wpshop') . '";';
 		$output .= '</script>';
 		echo $output;
 	}
@@ -68,15 +68,15 @@ 
 	 *
 	 * @return array
 	 */
-	function check_attribute_to_display_for_quick_add( $attribute_list, $quick_add_form_attributes = array() ) {
-
-		if ( !empty( $attribute_list ) ) {
-			foreach( $attribute_list as $attributes_group ) {
-				foreach( $attributes_group as $attributes_sections ) {
-					if( !empty($attributes_sections) && !empty($attributes_sections['attributes']) ) {
-						foreach( $attributes_sections['attributes'] as $attribute_id => $att_def ) {
-							if( !empty($att_def) && !empty($att_def['is_used_in_quick_add_form']) && $att_def['is_used_in_quick_add_form'] == 'yes' ) {
-								$quick_add_form_attributes[ $attribute_id ] = $att_def;
+	function check_attribute_to_display_for_quick_add($attribute_list, $quick_add_form_attributes = array()) {
+
+		if (!empty($attribute_list)) {
+			foreach ($attribute_list as $attributes_group) {
+				foreach ($attributes_group as $attributes_sections) {
+					if (!empty($attributes_sections) && !empty($attributes_sections['attributes'])) {
+						foreach ($attributes_sections['attributes'] as $attribute_id => $att_def) {
+							if (!empty($att_def) && !empty($att_def['is_used_in_quick_add_form']) && $att_def['is_used_in_quick_add_form'] == 'yes') {
+								$quick_add_form_attributes[$attribute_id] = $att_def;
 							}
 						}
 					}
@@ -93,29 +93,29 @@ 
 	 * @param integer $page
 	 * @return string
 	 */
-	function display_products_list( $default = 1, $page = 0  ) {
+	function display_products_list($default = 1, $page = 0) {
 		global $wpdb;
 		// Product entity
-		$product_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
+		$product_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
 
 		$user_id = get_current_user_id();
 		// Check product limit
-		$product_limit = get_user_meta( $user_id, 'edit_wpshop_product_per_page', true );
-		$product_limit = ( !empty($product_limit) ) ? $product_limit : 20;
+		$product_limit = get_user_meta($user_id, 'edit_wpshop_product_per_page', true);
+		$product_limit = (!empty($product_limit)) ? $product_limit : 20;
 
 		// Get products for the current page
 		$wps_product_mass_interface_mdl = new wps_product_mass_interface_mdl();
-		$products = $wps_product_mass_interface_mdl->get_quick_interface_products( $default, $page, $product_limit );
+		$products = $wps_product_mass_interface_mdl->get_quick_interface_products($default, $page, $product_limit);
 
 		// Construct Table Head Data
 		$quick_add_form_attributes = array();
 		$get_attributes_quick_add_form = $wps_product_mass_interface_mdl->get_attributes_quick_add_form();
-		foreach( $get_attributes_quick_add_form as $quick_add_form_attribute ) {
+		foreach ($get_attributes_quick_add_form as $quick_add_form_attribute) {
 			$quick_add_form_attributes[$quick_add_form_attribute['id']] = $quick_add_form_attribute;
 		}
 
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "product_list" ) );
+		require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "product_list"));
 		$output = ob_get_contents();
 		ob_end_clean();
 		return $output;
@@ -131,25 +131,25 @@ 
 		$products_attributes_groups = $wps_product_mass_interface_mdl->get_product_attributes_sets();
 
 		$default = '';
-		if( !empty($products_attributes_groups) ) {
-			foreach( $products_attributes_groups as $key => $products_attributes_group ) {
-				if( $products_attributes_group->slug == 'free_product' ) {
-					unset( $products_attributes_groups[$key] );
+		if (!empty($products_attributes_groups)) {
+			foreach ($products_attributes_groups as $key => $products_attributes_group) {
+				if ($products_attributes_group->slug == 'free_product') {
+					unset($products_attributes_groups[$key]);
 				}
-				if( !empty($products_attributes_group->default_set) && $products_attributes_group->default_set == 'yes' ) {
+				if (!empty($products_attributes_group->default_set) && $products_attributes_group->default_set == 'yes') {
 					$default = $products_attributes_group->id;
 				}
 			}
 		}
 		// Check page
-		$page = ( !empty( $_GET[ 'page' ] ) && is_int( (int)$_GET[ 'page' ] ) && $_GET[ 'page' ] > 0 ) ? (int)($_GET[ 'page' ] - 1) : 0;
+		$page = (!empty($_GET['page']) && is_int((int)$_GET['page']) && $_GET['page'] > 0) ? (int)($_GET['page'] - 1) : 0;
 		// Display product tab
-		$product_list_interface = $this->display_products_list( $default, $page );
+		$product_list_interface = $this->display_products_list($default, $page);
 
 		// Get pagination
-		$pagination = $this->get_products_pagination( $page, $default );
+		$pagination = $this->get_products_pagination($page, $default);
 
-		require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface" ) );
+		require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface"));
 	}
 
 	/**
@@ -157,13 +157,13 @@ 
 	 *
 	 * @return string
 	 */
-	function get_products_pagination( $current_page, $attribute_set_id = 1 ) {
+	function get_products_pagination($current_page, $attribute_set_id = 1) {
 		global $wpdb;
 		$user_id = get_current_user_id();
 		$output = '';
 		/**	Define the element number per page. If the user change the default value, take this value	*/
-		$one_page_limit = get_user_meta( $user_id, 'edit_wpshop_product_per_page', true );
-		$one_page_limit = ( !empty($one_page_limit) ) ? $one_page_limit : 20;
+		$one_page_limit = get_user_meta($user_id, 'edit_wpshop_product_per_page', true);
+		$one_page_limit = (!empty($one_page_limit)) ? $one_page_limit : 20;
 
 		/**	Count the number of product existing in the shop	*/
 		$query = $wpdb->prepare(
@@ -175,37 +175,37 @@ 
 				AND meta_value = %s
 				AND post_status IN ( 'publish', 'draft' )",
 				WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, '_wpshop_product_attribute_set_id', $attribute_set_id);
-		$products = $wpdb->get_var( $query );
+		$products = $wpdb->get_var($query);
 
-			if( !empty($products) ) {
+			if (!empty($products)) {
 			$args = array(
 			'base' => '%_%',
-			'format' => admin_url( 'admin-ajax.php?action=wps_add_quick_interface&page=%#%' ),
-					'current' => ( $current_page + 1 ),
-					'total' => ceil( $products / $one_page_limit ),
+			'format' => admin_url('admin-ajax.php?action=wps_add_quick_interface&page=%#%'),
+					'current' => ($current_page + 1),
+					'total' => ceil($products / $one_page_limit),
 						'type' => 'array',
 						'prev_next' => false,
 						'show_all' => true,
 			);
-			$paginate = paginate_links( $args );
+			$paginate = paginate_links($args);
 
 				$wps_product_ctr = new wps_product_ctr();
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface_pagination" ) );
+				require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface_pagination"));
 				$output = ob_get_contents();
 			ob_end_clean();
 			}
 			return $output;
 			}
 
-	function wps_product_attached_files( $product_id ) {
+	function wps_product_attached_files($product_id) {
 		global $wpdb;
 		$output = '';
-		$query = $wpdb->prepare( 'SELECT * FROM ' .$wpdb->posts. ' WHERE post_parent = %d AND post_type = %s AND post_mime_type LIKE %s', $product_id, 'attachment', 'application%' );
-		$files = $wpdb->get_results( $query );
-		if( !empty($files) ) {
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_parent = %d AND post_type = %s AND post_mime_type LIKE %s', $product_id, 'attachment', 'application%');
+		$files = $wpdb->get_results($query);
+		if (!empty($files)) {
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "attached_files_list" ) );
+			require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "attached_files_list"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -217,23 +217,23 @@ 
 	 * AJAX - Change page action on mass edit product interface
 	 */
 	function wps_mass_edit_change_page() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_change_page' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_edit_change_page'))
 			wp_die();
 
 		$status = false; $response = '';
-		$page = ( !empty($_POST['page_id']) ) ? intval( $_POST['page_id'] ) - 1 : 0;
-		$attribute_set_id = ( !empty($_POST['att_set_id']) ) ? intval( $_POST['att_set_id'] ) : 1;
-		if( !empty($attribute_set_id) ) {
+		$page = (!empty($_POST['page_id'])) ? intval($_POST['page_id']) - 1 : 0;
+		$attribute_set_id = (!empty($_POST['att_set_id'])) ? intval($_POST['att_set_id']) : 1;
+		if (!empty($attribute_set_id)) {
 			// Get tab
-			$response = $this->display_products_list( $attribute_set_id, $page );
-			$pagination = $this->get_products_pagination( $page, $attribute_set_id );
-			if( !empty($response) ) {
+			$response = $this->display_products_list($attribute_set_id, $page);
+			$pagination = $this->get_products_pagination($page, $attribute_set_id);
+			if (!empty($response)) {
 				$status = true;
 			}
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response, 'pagination' => $pagination ) );
+		echo json_encode(array('status' => $status, 'response' => $response, 'pagination' => $pagination));
 		wp_die();
 	}
 
@@ -241,30 +241,30 @@ 
 	 * AJAX - Create a draft product and display the line allowing to edit informations for this product
 	 */
 	function wps_mass_interface_new_product_creation() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_interface_new_product_creation' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_interface_new_product_creation'))
 			wp_die();
 
 		global $wpdb;
 		$output = $pagination = '';
 		$status = false;
 
-		$new_product_id = wp_insert_post( array(
+		$new_product_id = wp_insert_post(array(
 				'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
 				'post_status' => 'publish',
-				'post_title' => __( 'New product', 'wpshop' ),
-		) );
+				'post_title' => __('New product', 'wpshop'),
+		));
 
-		if( !is_object($new_product_id) ) {
+		if (!is_object($new_product_id)) {
 			$status = true;
 		}
-		if ( !empty( $new_product_id ) ) {
-			$product_attribute_set_id = ( !empty($_POST['attributes_set']) ) ? intval( $_POST['attributes_set'] ) : 1;
-			update_post_meta( $new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $product_attribute_set_id );
+		if (!empty($new_product_id)) {
+			$product_attribute_set_id = (!empty($_POST['attributes_set'])) ? intval($_POST['attributes_set']) : 1;
+			update_post_meta($new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $product_attribute_set_id);
 		}
 
-		echo json_encode( array( 'status' => $status, 'response' => $output, 'pagination' => $pagination ) );
+		echo json_encode(array('status' => $status, 'response' => $output, 'pagination' => $pagination));
 		wp_die();
 	}
 
@@ -272,32 +272,32 @@ 
 	 * AJAX - Save datas
 	 */
 	function wps_save_product_quick_interface() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_save_product_quick_interface' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_save_product_quick_interface'))
 			wp_die();
 
 		global $wpdb;
 		$response = ''; $status = false;
 		$count_products_to_update = 0; $total_updated_products = 0;
 
-		$wps_product_quick_save = !empty( $_REQUEST['wps_product_quick_save'] ) ? (array) $_REQUEST['wps_product_quick_save'] : array();
-		$wps_mass_interface = !empty( $_REQUEST['wps_mass_interface'] ) ? (array) $_REQUEST['wps_mass_interface'] : array();
-		$wpshop_product_attribute = !empty( $_REQUEST['wpshop_product_attribute'] ) ? (array) $_REQUEST['wpshop_product_attribute'] : array();
+		$wps_product_quick_save = !empty($_REQUEST['wps_product_quick_save']) ? (array)$_REQUEST['wps_product_quick_save'] : array();
+		$wps_mass_interface = !empty($_REQUEST['wps_mass_interface']) ? (array)$_REQUEST['wps_mass_interface'] : array();
+		$wpshop_product_attribute = !empty($_REQUEST['wpshop_product_attribute']) ? (array)$_REQUEST['wpshop_product_attribute'] : array();
 
 		// ------------------------------------------------------------------------------------------------------
 
-		foreach( $_REQUEST['concur'] as $post_id => $columns ) {
+		foreach ($_REQUEST['concur'] as $post_id => $columns) {
 			$concur = array();
-			for( $i = $count = 0; $i <= $count; $i++ ) {
-				foreach( $columns as $key => $rows ) {
-					$count = count( $rows )-1;
+			for ($i = $count = 0; $i <= $count; $i++) {
+				foreach ($columns as $key => $rows) {
+					$count = count($rows) - 1;
 					$concur[$i][$key] = $rows[$i];
 				}
-				if( empty( $concur[$i]['is_row'] ) ) {
-					unset( $concur[$i] );
+				if (empty($concur[$i]['is_row'])) {
+					unset($concur[$i]);
 				} else {
-					unset( $concur[$i]['is_row'] );
+					unset($concur[$i]['is_row']);
 
 					$dotPos = strrpos($concur[$i]['price'], '.');
 					$commaPos = strrpos($concur[$i]['price'], ',');
@@ -307,7 +307,7 @@ 
 					} else {
 						$concur[$i]['price'] = floatval(
 							preg_replace("/[^0-9]/", "", substr($concur[$i]['price'], 0, $sep)) . '.' .
-							preg_replace("/[^0-9]/", "", substr($concur[$i]['price'], $sep+1, strlen($concur[$i]['price'])))
+							preg_replace("/[^0-9]/", "", substr($concur[$i]['price'], $sep + 1, strlen($concur[$i]['price'])))
 						);
 					}
 
@@ -315,51 +315,51 @@ 
 					$concur[$i]['price'] = $concur[$i]['price'];
 				}
 			}
-			update_post_meta( $post_id, '_concur', $concur );
+			update_post_meta($post_id, '_concur', $concur);
 		}
 
 		// ------------------------------------------------------------------------------------------------------
 
-		if( !empty($wps_product_quick_save) ) {
-			$count_products_to_update = count( $wps_product_quick_save );
-			foreach( $wps_product_quick_save as $product_to_save ) {
+		if (!empty($wps_product_quick_save)) {
+			$count_products_to_update = count($wps_product_quick_save);
+			foreach ($wps_product_quick_save as $product_to_save) {
 				$data_to_save = array();
 				// Update post
-				$updated_post = wp_update_post( array( 'ID' => $product_to_save,
-						'post_title' => sanitize_text_field( $wps_mass_interface[$product_to_save]['post_title'] ),
-						'post_content' => wp_kses_post( $wps_mass_interface[$product_to_save]['post_content'] ),
+				$updated_post = wp_update_post(array('ID' => $product_to_save,
+						'post_title' => sanitize_text_field($wps_mass_interface[$product_to_save]['post_title']),
+						'post_content' => wp_kses_post($wps_mass_interface[$product_to_save]['post_content']),
 						)
 				);
 				// Update attributes
-				if( !empty($updated_post) ) {
+				if (!empty($updated_post)) {
 					// Update Featured picture
-					if( !empty($wps_mass_interface[$product_to_save]['picture']) ) {
-						$thumbnail_exist = get_post_meta( $updated_post, '_thumbnail_id', true );
-						if($wps_mass_interface[$product_to_save]['picture'] != 'deleted') {
-							wp_update_post( array('ID' => (int)$wps_mass_interface[$product_to_save]['picture'], 'post_parent' => $updated_post) );
-							update_post_meta( $updated_post, '_thumbnail_id', (int)$wps_mass_interface[$product_to_save]['picture'] );
+					if (!empty($wps_mass_interface[$product_to_save]['picture'])) {
+						$thumbnail_exist = get_post_meta($updated_post, '_thumbnail_id', true);
+						if ($wps_mass_interface[$product_to_save]['picture'] != 'deleted') {
+							wp_update_post(array('ID' => (int)$wps_mass_interface[$product_to_save]['picture'], 'post_parent' => $updated_post));
+							update_post_meta($updated_post, '_thumbnail_id', (int)$wps_mass_interface[$product_to_save]['picture']);
 						}
-						elseif($wps_mass_interface[$product_to_save]['picture'] == 'deleted' && !empty($thumbnail_exist)) {
-							delete_post_meta( $updated_post, '_thumbnail_id' );
+						elseif ($wps_mass_interface[$product_to_save]['picture'] == 'deleted' && !empty($thumbnail_exist)) {
+							delete_post_meta($updated_post, '_thumbnail_id');
 						}
 					}
 
 					// Update files datas
-					if( !empty($wps_mass_interface[$product_to_save]['files']) ) {
-						$files_data = explode( ',', sanitize_text_field( $_REQUEST['wps_mass_interface'][$product_to_save]['files'] ) );
-						if( !empty($files_data) && is_array($files_data) ) {
-							foreach( $files_data as $file_id ) {
-								if( !empty($file_id) ) {
-									wp_update_post( array('ID' => $file_id, 'post_parent' => $updated_post) );
+					if (!empty($wps_mass_interface[$product_to_save]['files'])) {
+						$files_data = explode(',', sanitize_text_field($_REQUEST['wps_mass_interface'][$product_to_save]['files']));
+						if (!empty($files_data) && is_array($files_data)) {
+							foreach ($files_data as $file_id) {
+								if (!empty($file_id)) {
+									wp_update_post(array('ID' => $file_id, 'post_parent' => $updated_post));
 								}
 							}
 						}
 					}
 
-					$data_to_save['post_ID'] = $data_to_save['product_id'] = intval( $product_to_save );
-					$data_to_save['wpshop_product_attribute'] = ( !empty($wpshop_product_attribute[ $product_to_save ]) ) ? $wpshop_product_attribute[ $product_to_save ] : array();
+					$data_to_save['post_ID'] = $data_to_save['product_id'] = intval($product_to_save);
+					$data_to_save['wpshop_product_attribute'] = (!empty($wpshop_product_attribute[$product_to_save])) ? $wpshop_product_attribute[$product_to_save] : array();
 
-					if(empty($data_to_save['wpshop_product_attribute']['varchar']['barcode'])) {
+					if (empty($data_to_save['wpshop_product_attribute']['varchar']['barcode'])) {
 						// Get current barcode
 						$wps_product_mdl = new wps_product_mdl();
 						$attid = wpshop_attributes::getElement('barcode', "'valid'", 'code')->id;
@@ -370,34 +370,34 @@ 
 					$data_to_save['user_ID'] = get_current_user_id();
 					$data_to_save['action'] = 'editpost';
 
-					if( !empty($wps_mass_interface[$product_to_save]['post_delete']) && $wps_mass_interface[$product_to_save]['post_delete'] == "true" ) {
-						wp_trash_post( $product_to_save );
+					if (!empty($wps_mass_interface[$product_to_save]['post_delete']) && $wps_mass_interface[$product_to_save]['post_delete'] == "true") {
+						wp_trash_post($product_to_save);
 					}
 
-					if( !empty($product_to_save) && !empty( $data_to_save['user_ID'] ) ) {
+					if (!empty($product_to_save) && !empty($data_to_save['user_ID'])) {
 						$product_class = new wpshop_products();
-						$product_class->save_product_custom_informations( $product_to_save, $data_to_save );
+						$product_class->save_product_custom_informations($product_to_save, $data_to_save);
 						$total_updated_products++;
 					}
 				}
 			}
 		}
 		// Checking status
-		$status = ( $total_updated_products == $count_products_to_update ) ? true : false;
+		$status = ($total_updated_products == $count_products_to_update) ? true : false;
 
-		if( $status ) {
-			$response = sprintf( __( '%d products have been successfully updated', 'wpshop'), $total_updated_products );
+		if ($status) {
+			$response = sprintf(__('%d products have been successfully updated', 'wpshop'), $total_updated_products);
 		}
 		else {
-			if( !empty($total_updated_products) ) {
-				$response = sprintf( __( 'All selected products do not be updated. %d on %d products have been successfully updated', 'wpshop'), $total_updated_products, $count_products_to_update );
+			if (!empty($total_updated_products)) {
+				$response = sprintf(__('All selected products do not be updated. %d on %d products have been successfully updated', 'wpshop'), $total_updated_products, $count_products_to_update);
 			}
 			else {
-				$response = __( 'No product have been updated', 'wpshop');
+				$response = __('No product have been updated', 'wpshop');
 			}
 		}
 
-		echo json_encode( array('status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 
@@ -405,18 +405,18 @@ 
 	* Delete product list
 	**/
 	function wps_mass_delete_file() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_delete_file' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_delete_file'))
 			wp_die();
 
 		$status = false;
-		$file_id = (!empty($_POST['file_id']) ) ? intval($_POST['file_id']) : null;
-		if( !empty($file_id) ) {
-			wp_update_post( array('ID' => $file_id, 'post_parent' => 0) );
+		$file_id = (!empty($_POST['file_id'])) ? intval($_POST['file_id']) : null;
+		if (!empty($file_id)) {
+			wp_update_post(array('ID' => $file_id, 'post_parent' => 0));
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status ) );
+		echo json_encode(array('status' => $status));
 		wp_die();
 	}
 
@@ -424,32 +424,32 @@ 
 	* Update product files list
 	*/
 	function wps_mass_edit_update_files_list() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_update_files_list' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_edit_update_files_list'))
 			wp_die();
 
 		$status = false; $response = '';
-		$product_id = ( !empty($_POST['product_id']) ) ? intval($_POST['product_id']) : null;
-		$files = ( !empty($_POST['files']) ) ? intval($_POST['files']) : null;
-		if( !empty($product_id ) ) {
+		$product_id = (!empty($_POST['product_id'])) ? intval($_POST['product_id']) : null;
+		$files = (!empty($_POST['files'])) ? intval($_POST['files']) : null;
+		if (!empty($product_id)) {
 			// Update files datas
-			if( !empty($files) ) {
-				$files_data = explode( ',', $files );
-				if( !empty($files_data) && is_array($files_data) ) {
-					foreach( $files_data as $file_id ) {
-						if( !empty($file_id) ) {
-							wp_update_post( array('ID' => $file_id, 'post_parent' => $product_id) );
+			if (!empty($files)) {
+				$files_data = explode(',', $files);
+				if (!empty($files_data) && is_array($files_data)) {
+					foreach ($files_data as $file_id) {
+						if (!empty($file_id)) {
+							wp_update_post(array('ID' => $file_id, 'post_parent' => $product_id));
 						}
 					}
 				}
 			}
 
 
-			$response = $this->wps_product_attached_files( $product_id );
+			$response = $this->wps_product_attached_files($product_id);
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 

includes/modules/wps_shortcodes/controller/wps_shortcodes_ctr.php

Spacing +89 added lines, -89 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 class wps_shortcodes_ctr
 {
@@ -29,7 +29,7 @@ 
 	 *
 	 *	@return string The table of the class
 	 */
-	function setMessage($message){
+	function setMessage($message) {
 		$this->pageMessage = $message;
 	}
 	/**
@@ -37,7 +37,7 @@ 
 	 *
 	 *	@return string The table of the class
 	 */
-	function getListingSlug(){
+	function getListingSlug() {
 		return self::urlSlugListing;
 	}
 	/**
@@ -45,7 +45,7 @@ 
 	 *
 	 *	@return string The table of the class
 	 */
-	function getEditionSlug(){
+	function getEditionSlug() {
 		return self::urlSlugEdition;
 	}
 	/**
@@ -58,33 +58,33 @@ 
 	 *
 	 *	@return string $title The title of the page looking at the environnement
 	 */
-	function pageTitle(){
+	function pageTitle() {
 		$action = isset($_REQUEST['action']) ? wpshop_tools::varSanitizer($_REQUEST['action']) : '';
 		$objectInEdition = isset($_REQUEST['id']) ? wpshop_tools::varSanitizer($_REQUEST['id']) : '';
-		$page = !empty( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
+		$page = !empty($_GET['page']) ? sanitize_text_field($_GET['page']) : '';
 
-		$title = __(self::pageTitle, 'wpshop' );
-		if($action != ''){
-			if(($action == 'edit') || ($action == 'delete')){
+		$title = __(self::pageTitle, 'wpshop');
+		if ($action != '') {
+			if (($action == 'edit') || ($action == 'delete')) {
 				$editedItem = self::getElement($objectInEdition);
 				$title = sprintf(__(self::pageEditingTitle, 'wpshop'), str_replace("\\", "", $editedItem->frontend_label) . '&nbsp;(' . $editedItem->code . ')');
 			}
-			elseif($action == 'add'){
+			elseif ($action == 'add') {
 				$title = __(self::pageAddingTitle, 'wpshop');
 			}
 		}
-		elseif((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug())){
+		elseif ((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug())) {
 			$title = __(self::pageAddingTitle, 'wpshop');
 		}
 		return $title;
 	}
 
-	function elementAction(){
+	function elementAction() {
 
 	}
 
 	/** Définition des shortcodes pour les afficher dans le template list-shortcode */
-	public static function shortcode_definition(){
+	public static function shortcode_definition() {
 		$shortcodes = array();
 
 		/*	Product tab	*/
@@ -95,17 +95,17 @@ 
 		$shortcodes['simple_product']['attrs_exemple']['pid'] = '12';
 		$shortcodes['simple_product']['attrs_exemple']['type'] = 'list';
 
-		$shortcodes['wpshop_product_title']['main_title'] = __( 'Product title', 'wpshop' );
+		$shortcodes['wpshop_product_title']['main_title'] = __('Product title', 'wpshop');
 		$shortcodes['wpshop_product_title']['main_code'] = 'wpshop_product_title';
 		$shortcodes['wpshop_product_title']['attrs_def']['pid'] = 'ID_DU_PRODUIT';
 		$shortcodes['wpshop_product_title']['attrs_exemple']['pid'] = '12';
 
-		$shortcodes['wpshop_product_content']['main_title'] = __( 'Product content', 'wpshop' );
+		$shortcodes['wpshop_product_content']['main_title'] = __('Product content', 'wpshop');
 		$shortcodes['wpshop_product_content']['main_code'] = 'wpshop_product_content';
 		$shortcodes['wpshop_product_content']['attrs_def']['pid'] = 'ID_DU_PRODUIT';
 		$shortcodes['wpshop_product_content']['attrs_exemple']['pid'] = '12';
 
-		$shortcodes['wpshop_product_thumbnail']['main_title'] = __( 'Product thumbnail', 'wpshop' );
+		$shortcodes['wpshop_product_thumbnail']['main_title'] = __('Product thumbnail', 'wpshop');
 		$shortcodes['wpshop_product_thumbnail']['main_code'] = 'wpshop_product_thumbnail';
 		$shortcodes['wpshop_product_thumbnail']['attrs_def']['pid'] = 'ID_DU_PRODUIT';
 		$shortcodes['wpshop_product_thumbnail']['attrs_def']['size'] = 'TAILLE_DU_PRODUIT';
@@ -208,31 +208,31 @@ 
 		return $shortcodes;
 	}
 
-	public static function output_shortcode($shortcode_code, $specific_shorcode = '', $more_class_shortcode_helper = ''){
-		$shortcode = ( empty($specific_shorcode) ? self::shortcode_definition() : $specific_shorcode );
+	public static function output_shortcode($shortcode_code, $specific_shorcode = '', $more_class_shortcode_helper = '') {
+		$shortcode = (empty($specific_shorcode) ? self::shortcode_definition() : $specific_shorcode);
 
-		$shortcode_main_title = ( !empty($shortcode[$shortcode_code]['main_title']) ? $shortcode[$shortcode_code]['main_title'] : '' );
-		$shorcode_main_code = ( !empty($shortcode[$shortcode_code]['main_code']) ? $shortcode[$shortcode_code]['main_code'] : '' );
+		$shortcode_main_title = (!empty($shortcode[$shortcode_code]['main_title']) ? $shortcode[$shortcode_code]['main_title'] : '');
+		$shorcode_main_code = (!empty($shortcode[$shortcode_code]['main_code']) ? $shortcode[$shortcode_code]['main_code'] : '');
 		$shorcode_attributes_def = ' ';
-		if(!empty($shortcode[$shortcode_code]['attrs_def'])){
-			foreach($shortcode[$shortcode_code]['attrs_def'] as $attr_name => $attr_values){
-				$shorcode_attributes_def .= $attr_name.'="'.$attr_values.'" ';
+		if (!empty($shortcode[$shortcode_code]['attrs_def'])) {
+			foreach ($shortcode[$shortcode_code]['attrs_def'] as $attr_name => $attr_values) {
+				$shorcode_attributes_def .= $attr_name . '="' . $attr_values . '" ';
 			}
 		}
 		$shorcode_attributes_def = substr($shorcode_attributes_def, 0, -1);
 		$shorcode_attributes_exemple = ' ';
-		if(!empty($shortcode[$shortcode_code]['attrs_exemple'])){
-			foreach($shortcode[$shortcode_code]['attrs_exemple'] as $attr_name => $attr_values){
-				$shorcode_attributes_exemple .= $attr_name.'="'.$attr_values.'" ';
+		if (!empty($shortcode[$shortcode_code]['attrs_exemple'])) {
+			foreach ($shortcode[$shortcode_code]['attrs_exemple'] as $attr_name => $attr_values) {
+				$shorcode_attributes_exemple .= $attr_name . '="' . $attr_values . '" ';
 			}
 		}
 		$shorcode_attributes_exemple = substr($shorcode_attributes_exemple, 0, -1);
 
-		require( wpshop_tools::get_template_part( WPS_SHORTCODES_DIR, WPS_SHORTCODES_TEMPLATES_MAIN_DIR, "backend", 'shortcode_help.tpl' ) );
+		require(wpshop_tools::get_template_part(WPS_SHORTCODES_DIR, WPS_SHORTCODES_TEMPLATES_MAIN_DIR, "backend", 'shortcode_help.tpl'));
 	}
 
 	public static function wysiwyg_button() {
-		if ( ! current_user_can('edit_posts') && ! current_user_can('edit_pages') ) return;
+		if (!current_user_can('edit_posts') && !current_user_can('edit_pages')) return;
 		//if ( get_user_option('rich_editing') == 'true') :
 		/*add_filter('mce_external_plugins', array('wps_shortcodes_ctr', 'add_button_to_wysiwyg'));
 		add_filter('mce_buttons', array('wps_shortcodes_ctr', 'register_wysiwyg_button'));*/
@@ -242,11 +242,11 @@ 
 		$ver += 3;
 		return $ver;
 	}
-	public static function add_button_to_wysiwyg($plugin_array){
+	public static function add_button_to_wysiwyg($plugin_array) {
 		$plugin_array['wpshop_wysiwyg_shortcodes'] = WPSHOP_JS_URL . 'pages/wysiwyg_editor.js';
 		return $plugin_array;
 	}
-	public static function register_wysiwyg_button($existing_button){
+	public static function register_wysiwyg_button($existing_button) {
 		array_push($existing_button, "|", "wpshop_wysiwyg_shortcodes");
 		return $existing_button;
 	}
@@ -257,10 +257,10 @@ 
 	 *
 	 * @return string
 	 */
-	function elementList(){
+	function elementList() {
 		$shortcode_list = '';
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_SHORTCODES_DIR, WPS_SHORTCODES_TEMPLATES_MAIN_DIR, "backend", 'list', 'shortcode' ) );
+		require(wpshop_tools::get_template_part(WPS_SHORTCODES_DIR, WPS_SHORTCODES_TEMPLATES_MAIN_DIR, "backend", 'list', 'shortcode'));
 		$shortcode_list = ob_get_contents();
 		ob_end_clean();
 
@@ -270,45 +270,45 @@ 
 
 	public function __construct() {
 		add_action('init', array($this, 'help_tab_shortcodes'));
-		add_action( "admin_head", array( $this, 'shortcode_text_localization' ) );
+		add_action("admin_head", array($this, 'shortcode_text_localization'));
 	}
 
 	/**
 	 * Localize Script
 	 */
 	function shortcode_text_localization() {
-	    $plugin_url = plugins_url( '/', __FILE__ );
+	    $plugin_url = plugins_url('/', __FILE__);
 	?>
 	<!-- TinyMCE Shortcode Plugin -->
 	<script type='text/javascript'>
 	var wpshop_mce_shortcode = {
-	    'url': "<?php _e('Insert shortcode into page content', 'wpshop' ); ?>",
-	    'product_listing': "<?php _e('Product listing', 'wpshop' ); ?>",
-	    'url': "<?php _e('By product ID', 'wpshop' ); ?>",
-	    'url': "<?php _e('By attribute value', 'wpshop' ); ?>",
-	    'url': "<?php _e('Wpshop categories', 'wpshop' ); ?>",
-	    'url': "<?php _e('Attribute value', 'wpshop' ); ?>",
-	    'url': "<?php _e('Custom message content', 'wpshop' ); ?>",
-	    'url': "<?php _e('Customer first name', 'wpshop' ); ?>",
-	    'url': "<?php _e('Customer last name', 'wpshop' ); ?>",
-	    'url': "<?php _e('Customer email', 'wpshop' ); ?>",
-	    'url': "<?php _e('Order identifer', 'wpshop' ); ?>",
-	    'url': "<?php _e('Paypal transaction ID', 'wpshop' ); ?>",
-	    'url': "<?php _e('Order content', 'wpshop' ); ?>",
-	    'url': "<?php _e('Customer personnal informations', 'wpshop' ); ?>",
-	    'url': "<?php _e('Order addresses', 'wpshop' ); ?>",
-	    'url': "<?php _e('Billing order address', 'wpshop' ); ?>",
-	    'url': "<?php _e('Shipping order address', 'wpshop' ); ?>",
-	    'url': "<?php _e('Shipping method', 'wpshop' ); ?>",
-	    'url': "<?php _e('order payment_method', 'wpshop' ); ?>",
-	    'url': "<?php _e('Order customer comment', 'wpshop' ); ?>",
-	    'url': "<?php _e('Wpshop custom tags', 'wpshop' ); ?>",
-	    'url': "<?php _e('Cart', 'wpshop' ); ?>",
-	    'url': "<?php _e('Cart widget', 'wpshop' ); ?>",
-	    'url': "<?php _e('Checkout', 'wpshop' ); ?>",
-	    'url': "<?php _e('Customer account', 'wpshop' ); ?>",
-	    'url': "<?php _e('Shop', 'wpshop' ); ?>",
-	    'url': "<?php _e('Advanced search', 'wpshop' ); ?>",
+	    'url': "<?php _e('Insert shortcode into page content', 'wpshop'); ?>",
+	    'product_listing': "<?php _e('Product listing', 'wpshop'); ?>",
+	    'url': "<?php _e('By product ID', 'wpshop'); ?>",
+	    'url': "<?php _e('By attribute value', 'wpshop'); ?>",
+	    'url': "<?php _e('Wpshop categories', 'wpshop'); ?>",
+	    'url': "<?php _e('Attribute value', 'wpshop'); ?>",
+	    'url': "<?php _e('Custom message content', 'wpshop'); ?>",
+	    'url': "<?php _e('Customer first name', 'wpshop'); ?>",
+	    'url': "<?php _e('Customer last name', 'wpshop'); ?>",
+	    'url': "<?php _e('Customer email', 'wpshop'); ?>",
+	    'url': "<?php _e('Order identifer', 'wpshop'); ?>",
+	    'url': "<?php _e('Paypal transaction ID', 'wpshop'); ?>",
+	    'url': "<?php _e('Order content', 'wpshop'); ?>",
+	    'url': "<?php _e('Customer personnal informations', 'wpshop'); ?>",
+	    'url': "<?php _e('Order addresses', 'wpshop'); ?>",
+	    'url': "<?php _e('Billing order address', 'wpshop'); ?>",
+	    'url': "<?php _e('Shipping order address', 'wpshop'); ?>",
+	    'url': "<?php _e('Shipping method', 'wpshop'); ?>",
+	    'url': "<?php _e('order payment_method', 'wpshop'); ?>",
+	    'url': "<?php _e('Order customer comment', 'wpshop'); ?>",
+	    'url': "<?php _e('Wpshop custom tags', 'wpshop'); ?>",
+	    'url': "<?php _e('Cart', 'wpshop'); ?>",
+	    'url': "<?php _e('Cart widget', 'wpshop'); ?>",
+	    'url': "<?php _e('Checkout', 'wpshop'); ?>",
+	    'url': "<?php _e('Customer account', 'wpshop'); ?>",
+	    'url': "<?php _e('Shop', 'wpshop'); ?>",
+	    'url': "<?php _e('Advanced search', 'wpshop'); ?>",
 	};
 	</script>
 	<!-- TinyMCE Shortcode Plugin -->
@@ -317,23 +317,23 @@ 
 
 	public function shortcode_xmlloader() {
 		$shortcodes_list = array();
-		$ini_get_checking = ini_get( 'allow_url_fopen' );
-		if ( $ini_get_checking != 0 ) {
-			$content = @file_get_contents( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/lshortcodes.xml' );
-			$list_shortcodes_xml = ( $content !== false ) ? new SimpleXmlElement( $content ) : null;
-			if ( !empty($list_shortcodes_xml) && !empty($list_shortcodes_xml->channel) )  {
+		$ini_get_checking = ini_get('allow_url_fopen');
+		if ($ini_get_checking != 0) {
+			$content = @file_get_contents(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/lshortcodes.xml');
+			$list_shortcodes_xml = ($content !== false) ? new SimpleXmlElement($content) : null;
+			if (!empty($list_shortcodes_xml) && !empty($list_shortcodes_xml->channel)) {
 				global $shortcode_tags;
-				foreach( $list_shortcodes_xml->channel->category as $i => $category ) {
-					$shortcodes_list[(String) $category->title]['desc_cat_' . (String) $category->title] = (String) $category->description;
-					foreach( $category->item as $j => $item_xml ) {
+				foreach ($list_shortcodes_xml->channel->category as $i => $category) {
+					$shortcodes_list[(String)$category->title]['desc_cat_' . (String)$category->title] = (String)$category->description;
+					foreach ($category->item as $j => $item_xml) {
 						$item = array();
-						$item['title'] = (String) $item_xml->title;
-						$item['description'] = (String) $item_xml->description;
-						foreach( $item_xml->args as $argument) {
-							$item['args'][(String) $argument->identifier] = (String) $argument->params;
+						$item['title'] = (String)$item_xml->title;
+						$item['description'] = (String)$item_xml->description;
+						foreach ($item_xml->args as $argument) {
+							$item['args'][(String)$argument->identifier] = (String)$argument->params;
 						}
-						$item['active'] = ( array_key_exists((String) $item_xml->identifier, $shortcode_tags) ) ? 'true' : 'false';
-						$shortcodes_list[(String) $category->title]['items'][(String) $item_xml->identifier] = $item;
+						$item['active'] = (array_key_exists((String)$item_xml->identifier, $shortcode_tags)) ? 'true' : 'false';
+						$shortcodes_list[(String)$category->title]['items'][(String)$item_xml->identifier] = $item;
 					}
 				}
 			}
@@ -342,10 +342,10 @@ 
 	}
 
 	public function help_tab_shortcodes() {
-		if( current_user_can('edit_posts') &&  current_user_can('edit_pages') && get_user_option('rich_editing') == 'true' ) {
-			add_filter( 'mce_external_plugins', array( $this, 'wpshop_add_buttons' ) );
-			add_filter( 'mce_buttons', array( $this, 'wpshop_register_buttons' ) );
-			add_action( 'admin_footer', array( $this, 'wpshop_get_shortcodes' ) );
+		if (current_user_can('edit_posts') && current_user_can('edit_pages') && get_user_option('rich_editing') == 'true') {
+			add_filter('mce_external_plugins', array($this, 'wpshop_add_buttons'));
+			add_filter('mce_buttons', array($this, 'wpshop_register_buttons'));
+			add_action('admin_footer', array($this, 'wpshop_get_shortcodes'));
 		}
 		/*$shortcodes = $this->shortcode_xmlloader();
 		ob_start();
@@ -356,12 +356,12 @@ 
 		$wps_help_tabs->set_help_tab( 'shortcodes', __( 'Shortcodes', 'wpshop' ), $content, array('edit-post', 'post', 'edit-page', 'page', 'edit-comments', 'comments', 'edit-wpshop_product', 'wpshop_product', 'edit-wpshop_product_category') );*/
 	}
 
-	public function wpshop_register_buttons( $buttons ) {
-		array_push( $buttons, 'separator', 'pushortcodes' );
+	public function wpshop_register_buttons($buttons) {
+		array_push($buttons, 'separator', 'pushortcodes');
 		return $buttons;
 	}
 
-	public function wpshop_add_buttons( $plugin_array ) {
+	public function wpshop_add_buttons($plugin_array) {
 		$plugin_array['pushortcodes'] = WPSHOP_JS_URL . 'pages/shortcode-tinymce-button.js';
 		return $plugin_array;
 	}
@@ -369,12 +369,12 @@ 
 	public function wpshop_get_shortcodes() {
 		echo '<script type="text/javascript">var shortcodes_button = new Array();';
 		$count = 0;
-		foreach( $this->shortcode_xmlloader() as $category ) {
-			foreach( $category['items'] as $shortcode => $shortcode_args ) {
+		foreach ($this->shortcode_xmlloader() as $category) {
+			foreach ($category['items'] as $shortcode => $shortcode_args) {
 				echo "shortcodes_button[{$count}] = { text: '[$shortcode]', content: '[$shortcode";
-				if( isset( $shortcode_args['args'] ) ) {
-					foreach( $shortcode_args['args'] as $argument => $parameter ) {
-						echo ' ' . $argument . '="' . urlencode( $parameter ) . '"';
+				if (isset($shortcode_args['args'])) {
+					foreach ($shortcode_args['args'] as $argument => $parameter) {
+						echo ' ' . $argument . '="' . urlencode($parameter) . '"';
 					}
 				}
 				echo "]' };";
@@ -384,9 +384,9 @@ 
 		echo '</script>';
 	}
 
-	public static function wps_shortcodes_wysiwyg_dialog(){
+	public static function wps_shortcodes_wysiwyg_dialog() {
 		global $wpdb;
-		require( wpshop_tools::get_template_part( WPS_SHORTCODES_DIR, WPS_SHORTCODES_TEMPLATES_MAIN_DIR, "backend", 'wysiwyg_dialog', 'shortcode' ) );
+		require(wpshop_tools::get_template_part(WPS_SHORTCODES_DIR, WPS_SHORTCODES_TEMPLATES_MAIN_DIR, "backend", 'wysiwyg_dialog', 'shortcode'));
 		die();
 	}
 }

templates/single-wpshop_product.php

Indentation +5 added lines, -5 removed lines

@@ -15,13 +15,13 @@
         <main id="main" class="site-main" role="main">
 
             <?php
-                /* Start the Loop */
-                while ( have_posts() ) : the_post();
+				/* Start the Loop */
+				while ( have_posts() ) : the_post();
 
-                    the_content();
+					the_content();
 
-                endwhile; // End of the loop.
-            ?>
+				endwhile; // End of the loop.
+			?>
 
         </main><!-- #main -->
     </div><!-- #primary -->

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
             <?php
                 /* Start the Loop */
-                while ( have_posts() ) : the_post();
+                while (have_posts()) : the_post();
 
                     the_content();