Eoxia / wpshop

includes/librairies/purchase/orders.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -265,7 +265,7 @@ 
 
 
 	/** Renvoi une nouvelle r�f�rence unique pour une commande
-	* @return int
+	* @return string
 	*/
 	public static function get_new_order_reference(){
 		$number_figures = get_option('wpshop_order_number_figures', false);
@@ -286,7 +286,7 @@ 
 	}
 
 	/** Renvoi une nouvelle r�f�rence unique pour un devis
-	* @return int
+	* @return string
 	*/
 	public static function get_new_pre_order_reference($save = true){
 		$number_figures = get_option('wpshop_order_number_figures', false);

Spacing +130 added lines, -130 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Products management method file
  *
@@ -10,8 +10,8 @@ 
  */
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -70,7 +70,7 @@ 
 		/**	Add action button	*/
 		add_meta_box(
 			'wpshop_order_actions',
-			'<span class="dashicons dashicons-info"></span> '.__('Actions on order', 'wpshop'),
+			'<span class="dashicons dashicons-info"></span> ' . __('Actions on order', 'wpshop'),
 			array('wpshop_orders', 'order_actions'),
 				WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'side', 'high'
 		);
@@ -110,7 +110,7 @@ 
 	 *
 	 * @param object $order The current order being edited
 	 */
-	public static function order_actions( $order ) {
+	public static function order_actions($order) {
 		$output = '';
 
 		$order_status = unserialize(WPSHOP_ORDER_STATUS);
@@ -118,37 +118,37 @@ 
 
 		$tpl_component = array();
 
-		$delete_button = wpshop_display::display_template_element('wpshop_admin_order_action_del_button', array('ADMIN_ORDER_DELETE_LINK' => esc_url( get_delete_post_link($order->ID) ) , 'ADMIN_ORDER_DELETE_TEXT' => (!EMPTY_TRASH_DAYS ? __('Delete Permanently', 'wpshop') :  __('Move to Trash', 'wpshop'))), array(), 'admin');
-		$tpl_component['ADMIN_ORDER_DELETE_ORDER'] = current_user_can( "delete_post", $order->ID ) ? $delete_button : '';
+		$delete_button = wpshop_display::display_template_element('wpshop_admin_order_action_del_button', array('ADMIN_ORDER_DELETE_LINK' => esc_url(get_delete_post_link($order->ID)), 'ADMIN_ORDER_DELETE_TEXT' => (!EMPTY_TRASH_DAYS ? __('Delete Permanently', 'wpshop') : __('Move to Trash', 'wpshop'))), array(), 'admin');
+		$tpl_component['ADMIN_ORDER_DELETE_ORDER'] = current_user_can("delete_post", $order->ID) ? $delete_button : '';
 
 		/**	Add an action list	*/
 		$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] = '';
 
 		/**	Display main information about the order	*/
 		$order_main_info = '';
-		if(!empty($order_postmeta['order_date'])){
-			$order_main_info .=  '<div class="wps-product-section"><span class="dashicons dashicons-calendar-alt"></span> <strong>'.__('Order date','wpshop').' : </strong><br/>'.mysql2date('d F Y H:i:s', $order_postmeta['order_date'], true).'</div>';
+		if (!empty($order_postmeta['order_date'])) {
+			$order_main_info .= '<div class="wps-product-section"><span class="dashicons dashicons-calendar-alt"></span> <strong>' . __('Order date', 'wpshop') . ' : </strong><br/>' . mysql2date('d F Y H:i:s', $order_postmeta['order_date'], true) . '</div>';
 		}
 		$order_main_info .= '<div class="wps-product-section">';
-		if(empty($order_postmeta['order_date']) || (empty($order_postmeta['order_key']) && empty($order_postmeta['order_temporary_key']) && empty($order_postmeta['order_invoice_ref']))){
-			$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Temporary quotation reference','wpshop').': </strong>'.self::get_new_pre_order_reference(false).'<br/>';
+		if (empty($order_postmeta['order_date']) || (empty($order_postmeta['order_key']) && empty($order_postmeta['order_temporary_key']) && empty($order_postmeta['order_invoice_ref']))) {
+			$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Temporary quotation reference', 'wpshop') . ': </strong>' . self::get_new_pre_order_reference(false) . '<br/>';
 		}
-		else{
-			if(!empty($order_postmeta['order_key'])){
-				$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Order reference','wpshop').' : </strong>'.$order_postmeta['order_key'].'<br/>';
+		else {
+			if (!empty($order_postmeta['order_key'])) {
+				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Order reference', 'wpshop') . ' : </strong>' . $order_postmeta['order_key'] . '<br/>';
 			}
-			if(!empty($order_postmeta['order_temporary_key'])){
-				$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Pre-order reference','wpshop').': </strong>'.$order_postmeta['order_temporary_key'].'<br/>';
-				$post_ID = !empty( $_GET['post'] ) ? (int) $_GET['post'] : 0;
-				$order_main_info .= '<a href="' .admin_url( 'admin-post.php?action=wps_invoice&order_id=' . $post_ID . '&mode=pdf' ) . '">' .__('Download the quotation', 'wpshop'). '</a><br />';
+			if (!empty($order_postmeta['order_temporary_key'])) {
+				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Pre-order reference', 'wpshop') . ': </strong>' . $order_postmeta['order_temporary_key'] . '<br/>';
+				$post_ID = !empty($_GET['post']) ? (int)$_GET['post'] : 0;
+				$order_main_info .= '<a href="' . admin_url('admin-post.php?action=wps_invoice&order_id=' . $post_ID . '&mode=pdf') . '">' . __('Download the quotation', 'wpshop') . '</a><br />';
 			}
-			if(!empty($order_postmeta['order_invoice_ref'])){
+			if (!empty($order_postmeta['order_invoice_ref'])) {
 				$sub_tpl_component = array();
 				$sub_tpl_component['ADMIN_ORDER_RECEIVED_PAYMENT_INVOICE_REF'] = $order_postmeta['order_invoice_ref'];
 				$sub_tpl_component['ADMIN_ORDER_PAYMENT_RECEIVED_LINE_CLASSES'] = '';
-				$sub_tpl_component['ADMIN_ORDER_INVOICE_DOWNLOAD_LINK'] = admin_url( 'admin-post.php?action=wps_invoice&order_id=' . $order->ID );
+				$sub_tpl_component['ADMIN_ORDER_INVOICE_DOWNLOAD_LINK'] = admin_url('admin-post.php?action=wps_invoice&order_id=' . $order->ID);
 				$order_invoice_download = wpshop_display::display_template_element('wpshop_admin_order_payment_received_invoice_download_links', $sub_tpl_component, array(), 'admin');
-				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>'. __('Invoice number','wpshop').': </strong>'.$order_postmeta['order_invoice_ref'].'<br/>' . $order_invoice_download . '';
+				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Invoice number', 'wpshop') . ': </strong>' . $order_postmeta['order_invoice_ref'] . '<br/>' . $order_invoice_download . '';
 			}
 			else {
 				$order_main_info .= wpshop_display::display_template_element('wpshop_admin_order_generate_invoice_button', array(), array(), 'admin');
@@ -158,7 +158,7 @@ 
 
 
 		/*Add the current order status in display**/
-			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= ( !empty($order_postmeta['order_status']) ) ? (sprintf('<span class="order_status_' . $order->ID . ' wpshop_order_status_container wpshop_order_status_%1$s ">%2$s</span>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop')) ) : '';
+			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= (!empty($order_postmeta['order_status'])) ? (sprintf('<span class="order_status_' . $order->ID . ' wpshop_order_status_container wpshop_order_status_%1$s ">%2$s</span>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop'))) : '';
 
 			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= $order_main_info;
 
@@ -184,21 +184,21 @@ 
 		}*/
 
 		/*Add the button regarding the order status**/
-		if ( !empty($order_postmeta['order_status']) ) {
-			if( in_array( $order_postmeta['order_status'], array( 'awaiting_payment', 'partially_paid' ) ) ) {
-				$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><input id="wps_direct_link_url" type="text" value="' . wpshop_checkout::wps_direct_payment_link_url( $order->ID ) . '"/><a class="wps-bton-second-mini-rounded" data-copy-target="#wps_direct_link_url" title="Copier"><span class="dashicons dashicons-editor-paste-text"></span></a><a data-nonce="' . wp_create_nonce( 'wps_send_direct_payment_link' ) . '" role="button" class="wps-bton-second-mini-rounded send_direct_payment_link" href="#" title="Envoyer par mail"><span class="dashicons dashicons-email"></span></a></div>';
+		if (!empty($order_postmeta['order_status'])) {
+			if (in_array($order_postmeta['order_status'], array('awaiting_payment', 'partially_paid'))) {
+				$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><input id="wps_direct_link_url" type="text" value="' . wpshop_checkout::wps_direct_payment_link_url($order->ID) . '"/><a class="wps-bton-second-mini-rounded" data-copy-target="#wps_direct_link_url" title="Copier"><span class="dashicons dashicons-editor-paste-text"></span></a><a data-nonce="' . wp_create_nonce('wps_send_direct_payment_link') . '" role="button" class="wps-bton-second-mini-rounded send_direct_payment_link" href="#" title="Envoyer par mail"><span class="dashicons dashicons-email"></span></a></div>';
 			}
-			if( $order_postmeta['order_status'] == 'awaiting_payment' ) {
-				$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><button class="wps-bton-second-mini-rounded markAsCanceled order_'.$order->ID.'" >'.__('Cancel this order', 'wpshop').'</button><input type="hidden" id="markascanceled_order_hidden_indicator" name="markascanceled_order_hidden_indicator" /></div>';
+			if ($order_postmeta['order_status'] == 'awaiting_payment') {
+				$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><button class="wps-bton-second-mini-rounded markAsCanceled order_' . $order->ID . '" >' . __('Cancel this order', 'wpshop') . '</button><input type="hidden" id="markascanceled_order_hidden_indicator" name="markascanceled_order_hidden_indicator" /></div>';
 			}
-			$credit_meta = get_post_meta( $order->ID, '_wps_order_credit', true );
+			$credit_meta = get_post_meta($order->ID, '_wps_order_credit', true);
 
-			if ( empty($credit_meta) ) {
-				if( $order_postmeta['order_status'] == 'refunded') {
-					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container">' .__('Credit Slip number', 'wpshop'). ' : <strong>'. ( (!empty($order_postmeta) && !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['refunded_action']) && !empty($order_postmeta['order_payment']['refunded_action']['credit_slip_ref']) ) ? '<a href="' .admin_url( 'admin-post.php?action=wps_invoice&order_id=' .$order->ID. '&amp;invoice_ref=' .$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'&credit_slip=ok' ). '" target="_blank">'.$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'</a>' : '') .'</strong></div>';
+			if (empty($credit_meta)) {
+				if ($order_postmeta['order_status'] == 'refunded') {
+					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container">' . __('Credit Slip number', 'wpshop') . ' : <strong>' . ((!empty($order_postmeta) && !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['refunded_action']) && !empty($order_postmeta['order_payment']['refunded_action']['credit_slip_ref'])) ? '<a href="' . admin_url('admin-post.php?action=wps_invoice&order_id=' . $order->ID . '&amp;invoice_ref=' . $order_postmeta['order_payment']['refunded_action']['credit_slip_ref'] . '&credit_slip=ok') . '" target="_blank">' . $order_postmeta['order_payment']['refunded_action']['credit_slip_ref'] . '</a>' : '') . '</strong></div>';
 				}
 				else {
-					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container" ><button class="wps-bton-second-mini-rounded markAsRefunded order_' .$order->ID. '">' .__('Refund this order', 'wpshop'). '</button><input type="hidden" id="markasrefunded_order_hidden_indicator" name="markasrefunded_order_hidden_indicator" /></div>';
+					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container" ><button class="wps-bton-second-mini-rounded markAsRefunded order_' . $order->ID . '">' . __('Refund this order', 'wpshop') . '</button><input type="hidden" id="markasrefunded_order_hidden_indicator" name="markasrefunded_order_hidden_indicator" /></div>';
 				}
 			}
 		}
@@ -210,7 +210,7 @@ 
 	function order_container_in_admin() {
 		global $post;
 		$output  = '<div id="wps_order_content_container">';
-		$output .= self::order_content( $post );
+		$output .= self::order_content($post);
 		$output .= '</div>';
 		echo $output;
 	}
@@ -221,13 +221,13 @@ 
 	 *
 	 * @param order $post The complete order content
 	 */
-	function order_content( $post ) {
+	function order_content($post) {
 		$order_content = '';
 
 		$order = get_post_meta($post->ID, '_order_postmeta', true);
 
 		$order_content .= '<div id="order_product_container" class="order_product_container wpshop_cls" >';
-		if($order){/*	Read the order content if the order has product	*/
+		if ($order) {/*	Read the order content if the order has product	*/
 			$order_content .= '<input type="hidden" value="" name="order_products_to_delete" id="order_products_to_delete" />' . wpshop_cart::display_cart(true, $order, 'admin');
 			if (empty($order['order_invoice_ref'])) {
 				$order_content .= '<div id="order_refresh_button_container" class="wpshop_clear_block" ><input type="button" class="button-primary alignright wpshopHide" id="wpshop_admin_order_recalculate" value="' . __('Refresh order informations', 'wpshop') . '" /></div>';
@@ -245,18 +245,18 @@ 
 	/** Generate the billing reference regarding the order $order_id
 	 * @return void
 	*/
-	function order_generate_billing_number($order_id, $force_invoicing = false){
+	function order_generate_billing_number($order_id, $force_invoicing = false) {
 		global $wpdb, $wpshop_modules_billing;
 
 		// Get the order from the db
 		$order = get_post_meta($order_id, '_order_postmeta', true);
 
 		// If the payment is completed
-		if(($order['order_status']=='completed') || $force_invoicing) {
+		if (($order['order_status'] == 'completed') || $force_invoicing) {
 
 			// If the reference hasn't been generated yet
-			if(empty($order['order_invoice_ref'])) {
-				$order['order_invoice_ref'] = $wpshop_modules_billing->generate_invoice_number( $order_id );
+			if (empty($order['order_invoice_ref'])) {
+				$order['order_invoice_ref'] = $wpshop_modules_billing->generate_invoice_number($order_id);
 
 				update_post_meta($order_id, '_order_postmeta', $order);
 			}
@@ -267,45 +267,45 @@ 
 	/** Renvoi une nouvelle r�f�rence unique pour une commande
 	* @return int
 	*/
-	public static function get_new_order_reference(){
+	public static function get_new_order_reference() {
 		$number_figures = get_option('wpshop_order_number_figures', false);
 		/* If the number doesn't exist, we create a default one */
-		if(!$number_figures){
+		if (!$number_figures) {
 			$number_figures = 5;
 			update_option('wpshop_order_number_figures', $number_figures);
 		}
 
 		$order_current_number = get_option('wpshop_order_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
+		if (!$order_current_number) { $order_current_number = 1; }
 		else { $order_current_number++; }
 		update_option('wpshop_order_current_number', $order_current_number);
 
-		$order_ref = (string)sprintf('%0'.$number_figures.'d', $order_current_number);
-		return WPSHOP_ORDER_REFERENCE_PREFIX.$order_ref;
+		$order_ref = (string)sprintf('%0' . $number_figures . 'd', $order_current_number);
+		return WPSHOP_ORDER_REFERENCE_PREFIX . $order_ref;
 	}
 
 	/** Renvoi une nouvelle r�f�rence unique pour un devis
 	* @return int
 	*/
-	public static function get_new_pre_order_reference($save = true){
+	public static function get_new_pre_order_reference($save = true) {
 		$number_figures = get_option('wpshop_order_number_figures', false);
 		/* If the number doesn't exist, we create a default one */
-		if(!$number_figures){
+		if (!$number_figures) {
 			$number_figures = 5;
 			update_option('wpshop_order_number_figures', $number_figures);
 		}
 
 		$order_current_number = get_option('wpshop_preorder_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
+		if (!$order_current_number) { $order_current_number = 1; }
 		else { $order_current_number++; }
-		if($save){
+		if ($save) {
 			update_option('wpshop_preorder_current_number', $order_current_number);
 		}
 
-		$order_ref = (string)sprintf('%0'.$number_figures.'d', $order_current_number);
-		return WPSHOP_PREORDER_REFERENCE_PREFIX.$order_ref;
+		$order_ref = (string)sprintf('%0' . $number_figures . 'd', $order_current_number);
+		return WPSHOP_PREORDER_REFERENCE_PREFIX . $order_ref;
 	}
 
 
@@ -320,24 +320,24 @@ 
 	 *
 	 *	@return void
 	 */
-	public static function set_order_customer_addresses($user_id, $order_id, $shipping_address_id='', $billing_address_id=''){
+	public static function set_order_customer_addresses($user_id, $order_id, $shipping_address_id = '', $billing_address_id = '') {
 		/**	Get order informations	*/
 		$billing_info['id'] = get_post_meta($billing_address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
-		$billing_info['address'] = get_post_meta($billing_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
-		$billing_info['address_id'] = ( !empty($_SESSION['billing_address']) ) ? intval( $_SESSION['billing_address'] ) : '';
-		if ( !empty($_SESSION['shipping_partner_id']) ) {
-			$partner_address_id = get_post_meta( $_SESSION['shipping_partner_id'], '_wpshop_attached_address', true);
+		$billing_info['address'] = get_post_meta($billing_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
+		$billing_info['address_id'] = (!empty($_SESSION['billing_address'])) ? intval($_SESSION['billing_address']) : '';
+		if (!empty($_SESSION['shipping_partner_id'])) {
+			$partner_address_id = get_post_meta($_SESSION['shipping_partner_id'], '_wpshop_attached_address', true);
 			if (!empty($partner_address_id)) {
-				foreach( $partner_address_id as $address_id ) {
+				foreach ($partner_address_id as $address_id) {
 					$shipping_info['id'] = get_post_meta($address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
-					$shipping_info['address'] = get_post_meta( $address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
+					$shipping_info['address'] = get_post_meta($address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
 				}
 			}
 		}
 		else {
 			$shipping_info['id'] = get_post_meta($shipping_address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
-			$shipping_info['address'] = get_post_meta($shipping_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
-			$shipping_info['address_id'] = ( !empty($_SESSION['shipping_address']) ) ? intval( $_SESSION['shipping_address'] ) : '';
+			$shipping_info['address'] = get_post_meta($shipping_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
+			$shipping_info['address_id'] = (!empty($_SESSION['shipping_address'])) ? intval($_SESSION['shipping_address']) : '';
 		}
 
 		$order_info = array('billing' => $billing_info, 'shipping' => $shipping_info);
@@ -350,7 +350,7 @@ 
 	/** Set the custom colums
 	 * @return array
 	*/
-	static function orders_edit_columns($columns){
+	static function orders_edit_columns($columns) {
 	  $columns = array(
 		'cb' => '<input type="checkbox" />',
 		'order_identifier' => __('Identifiers', 'wpshop'),
@@ -370,42 +370,42 @@ 
 	 * @return array
 	*/
 	public static function orders_custom_columns($column, $post_id) {
-		if ( get_post_type( $post_id ) == WPSHOP_NEWTYPE_IDENTIFIER_ORDER ) {
+		if (get_post_type($post_id) == WPSHOP_NEWTYPE_IDENTIFIER_ORDER) {
 			global $civility, $order_status;
 
 			$metadata = get_post_custom();
 
-			$order_postmeta = isset($metadata['_order_postmeta'][0])?unserialize($metadata['_order_postmeta'][0]):'';
-			$addresses = get_post_meta($post_id,'_order_info', true);
+			$order_postmeta = isset($metadata['_order_postmeta'][0]) ? unserialize($metadata['_order_postmeta'][0]) : '';
+			$addresses = get_post_meta($post_id, '_order_info', true);
 
-			switch($column){
+			switch ($column) {
 				case "order_identifier":
-					if( !empty( $order_postmeta['order_key'] ) ) {
+					if (!empty($order_postmeta['order_key'])) {
 						echo '<b>' . $order_postmeta['order_key'] . '</b><br>';
 					}
-					if( !empty( $order_postmeta['order_invoice_ref'] ) ) {
+					if (!empty($order_postmeta['order_invoice_ref'])) {
 						echo '<i>' . $order_postmeta['order_invoice_ref'] . '</i>';
-					} elseif( !empty($order_postmeta['order_temporary_key'] ) ) {
+					} elseif (!empty($order_postmeta['order_temporary_key'])) {
 						echo '<b>' . $order_postmeta['order_temporary_key'] . '</b>';
 					}
 				break;
 
 				case "order_status":
-					echo !empty($order_postmeta['order_status']) ? sprintf('<mark class="%s" id="order_status_'.$post_id.'">%s</mark>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop')) : __('Unknown Status', 'wpshop');
+					echo !empty($order_postmeta['order_status']) ? sprintf('<mark class="%s" id="order_status_' . $post_id . '">%s</mark>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop')) : __('Unknown Status', 'wpshop');
 				break;
 
 				case "order_billing":
-					if ( !empty($addresses['billing']) && !empty($addresses['billing']['address']) && is_array($addresses['billing']['address']) ) {
+					if (!empty($addresses['billing']) && !empty($addresses['billing']['address']) && is_array($addresses['billing']['address'])) {
 						$billing = $addresses['billing']['address'];
 					}
-					else if ( !empty($addresses['billing']) ) {
+					else if (!empty($addresses['billing'])) {
 						$billing = $addresses['billing'];
 					}
-					if ( !empty($billing) ) {
-						echo (!empty($billing['civility']) ? __(wpshop_attributes::get_attribute_type_select_option_info($billing['civility'], 'label', 'custom'), 'wpshop') : null).' <strong>'.(!empty($billing['address_first_name']) ? $billing['address_first_name'] : null).' '.(!empty($billing['address_last_name']) ? $billing['address_last_name'] : null).'</strong>';
-						echo empty($billing['company'])?'<br />':', <i>'.$billing['company'].'</i><br />';
-						echo (!empty($billing['address']) ? $billing['address'] : null).'<br />';
-						echo (!empty($billing['postcode']) ? $billing['postcode'] : null).' '.(!empty($billing['city']) ? $billing['city'] : null).', '.(!empty($billing['country']) ? $billing['country'] : null);
+					if (!empty($billing)) {
+						echo (!empty($billing['civility']) ? __(wpshop_attributes::get_attribute_type_select_option_info($billing['civility'], 'label', 'custom'), 'wpshop') : null) . ' <strong>' . (!empty($billing['address_first_name']) ? $billing['address_first_name'] : null) . ' ' . (!empty($billing['address_last_name']) ? $billing['address_last_name'] : null) . '</strong>';
+						echo empty($billing['company']) ? '<br />' : ', <i>' . $billing['company'] . '</i><br />';
+						echo (!empty($billing['address']) ? $billing['address'] : null) . '<br />';
+						echo (!empty($billing['postcode']) ? $billing['postcode'] : null) . ' ' . (!empty($billing['city']) ? $billing['city'] : null) . ', ' . (!empty($billing['country']) ? $billing['country'] : null);
 						echo (!empty($billing['phone']) ? '<br />' . $billing['phone'] : '');
 					}
 					else {
@@ -414,33 +414,33 @@ 
 				break;
 
 				case "order_shipping":
-					if ( !empty($addresses['shipping']) && !empty($addresses['shipping']['address']) && is_array($addresses['shipping']['address']) ) {
+					if (!empty($addresses['shipping']) && !empty($addresses['shipping']['address']) && is_array($addresses['shipping']['address'])) {
 						$shipping = $addresses['shipping']['address'];
 					}
-					else if ( !empty($addresses['shipping']) ) {
+					else if (!empty($addresses['shipping'])) {
 						$shipping = $addresses['shipping'];
 					}
-					if ( !empty($shipping) ) {
-						echo '<strong>'.(!empty($shipping['address_first_name']) ? $shipping['address_first_name'] : null).' '.(!empty($shipping['address_last_name']) ? $shipping['address_last_name'] : null).'</strong>';
-						echo empty($shipping['company'])?'<br />':', <i>'.$shipping['company'].'</i><br />';
-						echo (!empty($shipping['address']) ? $shipping['address'] : null).'<br />';
-						echo (!empty($shipping['postcode']) ? $shipping['postcode'] : null).' '.(!empty($shipping['city']) ? $shipping['city'] : null).', '.(!empty($shipping['country']) ? $shipping['country'] : null);
+					if (!empty($shipping)) {
+						echo '<strong>' . (!empty($shipping['address_first_name']) ? $shipping['address_first_name'] : null) . ' ' . (!empty($shipping['address_last_name']) ? $shipping['address_last_name'] : null) . '</strong>';
+						echo empty($shipping['company']) ? '<br />' : ', <i>' . $shipping['company'] . '</i><br />';
+						echo (!empty($shipping['address']) ? $shipping['address'] : null) . '<br />';
+						echo (!empty($shipping['postcode']) ? $shipping['postcode'] : null) . ' ' . (!empty($shipping['city']) ? $shipping['city'] : null) . ', ' . (!empty($shipping['country']) ? $shipping['country'] : null);
 					}
-					else{
+					else {
 						echo __('No information available for user shipping', 'wpshop');
 					}
 				break;
 
 				case "order_type":
-						echo '<a href="'.admin_url('post.php?post='.$post_id.'&action=edit').'">'.(!empty($order_postmeta['order_temporary_key']) ? __('Quotation','wpshop') :  __('Basic order','wpshop')).'</a>';
+						echo '<a href="' . admin_url('post.php?post=' . $post_id . '&action=edit') . '">' . (!empty($order_postmeta['order_temporary_key']) ? __('Quotation', 'wpshop') : __('Basic order', 'wpshop')) . '</a>';
 						$buttons = '<p class="row-actions">';
 						// Voir la commande
-						$buttons .= '<a class="button button-small" href="'.admin_url('post.php?post='.$post_id.'&action=edit').'">'.__('View', 'wpshop').'</a>';
+						$buttons .= '<a class="button button-small" href="' . admin_url('post.php?post=' . $post_id . '&action=edit') . '">' . __('View', 'wpshop') . '</a>';
 						// Marquer comme envoy�
 						if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'completed')) {
-							$buttons .= '<a data-id="' . $post_id . '" class="wps-bton-second-mini-rounded markAsShipped order_'.$post_id.' wps-bton-loader">'.__('Mark as shipped', 'wpshop').'</a> ';
+							$buttons .= '<a data-id="' . $post_id . '" class="wps-bton-second-mini-rounded markAsShipped order_' . $post_id . ' wps-bton-loader">' . __('Mark as shipped', 'wpshop') . '</a> ';
 						}
-						else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment' )) {
+						else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment')) {
 							//		$buttons .= '<a class="button markAsCompleted order_'.$post_id.' alignleft" >'.__('Payment received', 'wpshop').'</a>' . wpshop_payment::display_payment_receiver_interface($post_id) . ' ';
 						}
 						$buttons .= '</p>';
@@ -453,7 +453,7 @@ 
 
 				case "order_total":
 					$currency = !empty($order_postmeta['order_currency']) ? $order_postmeta['order_currency'] : get_option('wpshop_shop_default_currency');
-					echo isset( $order_postmeta['order_grand_total'] ) ? number_format( $order_postmeta['order_grand_total'], 2, '.', '' ).' '.  wpshop_tools::wpshop_get_sigle($currency) : 'NaN';
+					echo isset($order_postmeta['order_grand_total']) ? number_format($order_postmeta['order_grand_total'], 2, '.', '') . ' ' . wpshop_tools::wpshop_get_sigle($currency) : 'NaN';
 				break;
 
 				/*case "order_actions":
@@ -481,10 +481,10 @@ 
 	}
 
 	public static function list_table_filters() {
-		$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';
-		$entity_filter = !empty( $_GET['entity_filter'] ) ? sanitize_text_field( $_GET['entity_filter'] ) : '';
-		$entity_filter_btpf = !empty( $_GET['entity_filter_btpf'] ) ? sanitize_text_field( $_GET['entity_filter_btpf'] ) : '';
-		$entity_filter_btps = !empty( $_GET['entity_filter_btps'] ) ? sanitize_text_field( $_GET['entity_filter_btps'] ) : '';
+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+		$entity_filter = !empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : '';
+		$entity_filter_btpf = !empty($_GET['entity_filter_btpf']) ? sanitize_text_field($_GET['entity_filter_btpf']) : '';
+		$entity_filter_btps = !empty($_GET['entity_filter_btps']) ? sanitize_text_field($_GET['entity_filter_btps']) : '';
 
 		if (isset($post_type)) {
 			if (post_type_exists($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER)) {
@@ -496,23 +496,23 @@ 
 				echo wpshop_form::form_input_select('entity_filter', 'entity_filter', $filter_possibilities, $entity_filter, '', 'index');
 				$min = $entity_filter_btpf;
 				$max = $entity_filter_btps;
-				echo ' <label for="entity_filter_btpf">'.__('Between two prices', 'wpshop').'</label> ';
-				echo wpshop_form::form_input('entity_filter_btpf', 'entity_filter_btpf', $min, 'text', 'placeholder="'.__('Minimum price', 'wpshop').'"', null);
-				echo wpshop_form::form_input('entity_filter_btps', 'entity_filter_btps', $max, 'text', 'placeholder="'.__('Maximum price', 'wpshop').'"', null);
+				echo ' <label for="entity_filter_btpf">' . __('Between two prices', 'wpshop') . '</label> ';
+				echo wpshop_form::form_input('entity_filter_btpf', 'entity_filter_btpf', $min, 'text', 'placeholder="' . __('Minimum price', 'wpshop') . '"', null);
+				echo wpshop_form::form_input('entity_filter_btps', 'entity_filter_btps', $max, 'text', 'placeholder="' . __('Maximum price', 'wpshop') . '"', null);
 			}
 		}
 	}
 
 	public static function list_table_filter_parse_query($query) {
 		global $pagenow, $wpdb;
-		$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';
-		$entity_filter = !empty( $_GET['entity_filter'] ) ? sanitize_text_field( $_GET['entity_filter'] ) : '';
-		$entity_filter_btpf = !empty( $_GET['entity_filter_btpf'] ) ? sanitize_text_field( $_GET['entity_filter_btpf'] ) : '';
-		$entity_filter_btps = !empty( $_GET['entity_filter_btps'] ) ? sanitize_text_field( $_GET['entity_filter_btps'] ) : '';
+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+		$entity_filter = !empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : '';
+		$entity_filter_btpf = !empty($_GET['entity_filter_btpf']) ? sanitize_text_field($_GET['entity_filter_btpf']) : '';
+		$entity_filter_btps = !empty($_GET['entity_filter_btps']) ? sanitize_text_field($_GET['entity_filter_btps']) : '';
 
-		if ( is_admin() && ($pagenow == 'edit.php') && !empty( $post_type ) && ( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER ) && !empty( $entity_filter ) ) {
+		if (is_admin() && ($pagenow == 'edit.php') && !empty($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER) && !empty($entity_filter)) {
 			$check = null;
-			switch ( $entity_filter ) {
+			switch ($entity_filter) {
 				case 'all':
 					$sql_query = $wpdb->prepare(
 						"SELECT ID
@@ -576,27 +576,27 @@ 
 						break;
 			}
 
-			if ( !empty( $check ) ) {
-				if( !empty($no_btp) && $no_btp == 'yes' ) {
+			if (!empty($check)) {
+				if (!empty($no_btp) && $no_btp == 'yes') {
 					$min = 'minimum';
 					$max = 'maximum';
 				} else {
-					$min = ( !empty($_GET['entity_filter_btpf']) && is_numeric($_GET['entity_filter_btpf']) ) ? sanitize_text_field( $_GET['entity_filter_btpf'] ) : 'minimum';
-					$max = ( !empty($_GET['entity_filter_btps']) && is_numeric($_GET['entity_filter_btps']) ) ? sanitize_text_field( $_GET['entity_filter_btps'] ) : 'maximum';
+					$min = (!empty($_GET['entity_filter_btpf']) && is_numeric($_GET['entity_filter_btpf'])) ? sanitize_text_field($_GET['entity_filter_btpf']) : 'minimum';
+					$max = (!empty($_GET['entity_filter_btps']) && is_numeric($_GET['entity_filter_btps'])) ? sanitize_text_field($_GET['entity_filter_btps']) : 'maximum';
 				}
 				$results = $wpdb->get_results($sql_query);
 				$post_id_list = array();
 				$i = 0;
-				foreach($results as $item){
+				foreach ($results as $item) {
 					$meta_value = get_post_meta($item->ID, '_order_postmeta');
-					$price = ( !empty( $meta_value[0]['order_grand_total'] ) ) ? $meta_value[0]['order_grand_total'] : '';
-					if( $price >= $min || $min == 'minimum' ) {
-						if( $price <= $max || $max == 'maximum' ) {
+					$price = (!empty($meta_value[0]['order_grand_total'])) ? $meta_value[0]['order_grand_total'] : '';
+					if ($price >= $min || $min == 'minimum') {
+						if ($price <= $max || $max == 'maximum') {
 							$post_id_list[] = $item->ID;
 						}
 					}
 				}
-				if( empty($post_id_list) ) {
+				if (empty($post_id_list)) {
 					$post_id_list[] = 'no_result';
 				}
 				$query->query_vars[$check] = $post_id_list;
@@ -607,55 +607,55 @@ 
 
 
 
-	function latest_products_ordered ( $orders ) {
+	function latest_products_ordered($orders) {
 		global $wpdb;
 		$product_id = $output = '';
 		$products = array();
 		$display_option = get_option('wpshop_display_option');
-		if ( !empty($orders) && !empty($display_option) && !empty($display_option['latest_products_ordered']) ) {
-			foreach( $orders as $order ) {
-				$order_content = get_post_meta( $order->ID, '_order_postmeta', true );
-				if ( !empty($order_content) && !empty( $order_content['order_items']) ) {
+		if (!empty($orders) && !empty($display_option) && !empty($display_option['latest_products_ordered'])) {
+			foreach ($orders as $order) {
+				$order_content = get_post_meta($order->ID, '_order_postmeta', true);
+				if (!empty($order_content) && !empty($order_content['order_items'])) {
 
-					foreach( $order_content['order_items'] as $item ) {
-						if ( count( $products) >= $display_option['latest_products_ordered'] ) {
+					foreach ($order_content['order_items'] as $item) {
+						if (count($products) >= $display_option['latest_products_ordered']) {
 							continue;
 						}
 						$product_id = $item['item_id'];
-						if ( !empty( $item) && !empty($item['item_meta']) && !empty($item['item_meta']['variation_definition']) ) {
-							$parent_def = wpshop_products::get_parent_variation( $item['item_id'] );
-							if ( !empty( $parent_def ) ) {
+						if (!empty($item) && !empty($item['item_meta']) && !empty($item['item_meta']['variation_definition'])) {
+							$parent_def = wpshop_products::get_parent_variation($item['item_id']);
+							if (!empty($parent_def)) {
 								$parent_post = $parent_def['parent_post'];
 								$product_id = $parent_post->ID;
 							}
 						}
 
-						if ( !in_array($product_id, $products) ) {
+						if (!in_array($product_id, $products)) {
 							$products[] = $product_id;
 						}
 					}
 				}
 			}
-			if ( !empty($products) ) {
+			if (!empty($products)) {
 				$products_id = implode(",", $products);
-				$output = wpshop_display::display_template_element('latest_products_ordered', array('LATEST_PRODUCTS_ORDERED' => do_shortcode('[wpshop_products pid="' .$products_id. '"]')) );
+				$output = wpshop_display::display_template_element('latest_products_ordered', array('LATEST_PRODUCTS_ORDERED' => do_shortcode('[wpshop_products pid="' . $products_id . '"]')));
 			}
 		}
 		return $output;
 	}
 
-	function get_order_list_for_customer( $customer_id ) {
+	function get_order_list_for_customer($customer_id) {
 		global $wpdb;
 		$output = '';
 
-		if( !empty($customer_id) ) {
-			 $query = $wpdb->prepare( 'SELECT *
-							 		   FROM ' .$wpdb->posts. '
+		if (!empty($customer_id)) {
+			 $query = $wpdb->prepare('SELECT *
+							 		   FROM ' .$wpdb->posts . '
 							 		   WHERE post_author = %d
-							 		   AND post_type = %s', $customer_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-			 $orders = $wpdb->get_results( $query );
+							 		   AND post_type = %s', $customer_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+			 $orders = $wpdb->get_results($query);
 
-			 foreach( $orders as $order ) {
+			 foreach ($orders as $order) {
 
 			 }
 		}

includes/modules/wps_orders/controller/wps_orders_ctr.php

Doc Comments +2 added lines, -2 removed lines

@@ -124,7 +124,7 @@ 
 		/**
 		 *	Build an array with the different items to add to an order
 		 *
-		 *	@param array $products The item list to add to the order
+		 *	@param array $product The item list to add to the order
 		 *
 		 *	@return array $item_list The item to add to order
 		 */
@@ -418,7 +418,7 @@ 
 	 *
 	 * @method wps_token_order_customer
 	 * @param  int $order_id OrderID.
-	 * @return mixed sha1 or false.
+	 * @return false|string sha1 or false.
 	 */
 	public static function wps_token_order_customer( $order_id ) {
 		$order_metadata = get_post_meta( $order_id, '_order_postmeta', true );

Indentation +1 added lines, -1 removed lines

@@ -346,7 +346,7 @@
 			$_SESSION['billing_address'] = $order_info['billing']['address_id'];
 			$_SESSION['cart'] = $order_meta;
 			$_SESSION['cart']['order_id'] = $order_id;
-    		$_SESSION['cart']['cart_type'] = 'cart';
+			$_SESSION['cart']['cart_type'] = 'cart';
 			$_SESSION['cart']['order_shipping_cost_fixe'] = 'on';
 			$permalink = get_permalink( get_option( 'wpshop_cart_page_id' ) ) . '?order_step=5';
 		} else {

Spacing +155 added lines, -155 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined( 'ABSPATH' ) ) { exit;
+<?php if (!defined('ABSPATH')) { exit;
 }
 class wps_orders_ctr {
 
@@ -20,24 +20,24 @@ 
 
 		/** Template Load */
 		// add_filter( 'wpshop_custom_template', array( &$this, 'custom_template_load' ) );
-		add_shortcode( 'order_customer_informations', array( &$this, 'display_order_customer_informations' ) );
-		add_shortcode( 'wps_orders_in_customer_account', array( $this, 'display_orders_in_account' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'wps_orders_scripts' ) );
+		add_shortcode('order_customer_informations', array(&$this, 'display_order_customer_informations'));
+		add_shortcode('wps_orders_in_customer_account', array($this, 'display_orders_in_account'));
+		add_action('wp_enqueue_scripts', array($this, 'wps_orders_scripts'));
 		/**	Include the different javascript	*/
-		add_action( 'admin_init', array( &$this, 'admin_js' ) );
+		add_action('admin_init', array(&$this, 'admin_js'));
 
 		/** Ajax Actions */
 		// add_action( 'wp_ajax_wps_add_product_to_quotation', array( &$this, 'wps_add_product_to_quotation') );
 		// add_action( 'wap_ajax_wps_change_product_list', array( &$this, 'wps_change_product_list') );
 		// add_action( 'wap_ajax_wps_orders_load_variations_container', array( &$this, 'wps_orders_load_variations_container') );
 		// add_action( 'wap_ajax_wps_order_refresh_in_admin', array( &$this, 'wps_order_refresh_in_admin') );
-		add_action( 'wp_ajax_wps_orders_load_details', array( $this, 'wps_orders_load_details' ) );
+		add_action('wp_ajax_wps_orders_load_details', array($this, 'wps_orders_load_details'));
 		// Add a product sale historic in administration product panel
-		add_action( 'wp_ajax_wps_order_choose_customer', array( $this, 'wps_order_choose_customer' ) );
+		add_action('wp_ajax_wps_order_choose_customer', array($this, 'wps_order_choose_customer'));
 		/** For delete order */
-		add_action( 'wp_ajax_wps_delete_order', array( $this, 'wps_delete_order' ) );
+		add_action('wp_ajax_wps_delete_order', array($this, 'wps_delete_order'));
 		/** Invoice Page */
-		add_action( 'admin_post_wps_invoice', array( $this, 'wps_invoice_output' ) );
+		add_action('admin_post_wps_invoice', array($this, 'wps_invoice_output'));
 	}
 
 		/**
@@ -54,7 +54,7 @@ 
 		 */
 	function wps_orders_scripts() {
 
-		wp_enqueue_script( 'wps_orders_fronend', WPS_ORDERS_URL . WPS_ORDERS_DIR . '/assets/frontend/js/wps_orders.js' );
+		wp_enqueue_script('wps_orders_fronend', WPS_ORDERS_URL . WPS_ORDERS_DIR . '/assets/frontend/js/wps_orders.js');
 	}
 
 	function display_order_customer_informations() {
@@ -62,23 +62,23 @@ 
 		global $post_id;
 		global $wpdb;
 		$output = '';
-		if ( ! empty( $post_id ) ) {
-			$order_postmeta = get_post_meta( $post_id, '_order_postmeta', true );
-			$order_info = get_post_meta( $post_id, '_order_info', true );
+		if (!empty($post_id)) {
+			$order_postmeta = get_post_meta($post_id, '_order_postmeta', true);
+			$order_info = get_post_meta($post_id, '_order_info', true);
 			/** Check the order status */
-			if ( ! empty( $order_postmeta ) ) {
-				if ( ! empty( $order_postmeta['order_status'] )  && $order_postmeta['order_status'] != 'awaiting_payment' ) {
-					$output = wps_address::display_an_address( $order_info['billing']['address'] );
-					$output .= wps_address::display_an_address( $order_info['shipping']['address'] );
+			if (!empty($order_postmeta)) {
+				if (!empty($order_postmeta['order_status']) && $order_postmeta['order_status'] != 'awaiting_payment') {
+					$output = wps_address::display_an_address($order_info['billing']['address']);
+					$output .= wps_address::display_an_address($order_info['shipping']['address']);
 				} else {
-					$output = wps_address::display_an_address( $order_info['billing']['address'] );
+					$output = wps_address::display_an_address($order_info['billing']['address']);
 				}
 			}
 		} else {
 			/** Display  "Choose customer or create one" Interface */
 			$tpl_component = array();
 			$args = array(
-			'show_option_all' => __( 'Choose a customer', 'wpshop' ),
+			'show_option_all' => __('Choose a customer', 'wpshop'),
 			'orderby' => 'display_name',
 			'order' => 'ASC',
 			'include' => null, // string
@@ -92,10 +92,10 @@ 
 						'id' => null, // integer
 						'class' => 'chosen_select', // string
 						'blog_id' => $GLOBALS['blog_id'],
-			'who' => null,// string
+			'who' => null, // string
 			);
-			$tpl_component['CUSTOMERS_LIST'] = wp_dropdown_users( $args );
-			$output = wpshop_display::display_template_element( 'wps_orders_choose_customer_interface', $tpl_component, array(), 'admin' );
+			$tpl_component['CUSTOMERS_LIST'] = wp_dropdown_users($args);
+			$output = wpshop_display::display_template_element('wps_orders_choose_customer_interface', $tpl_component, array(), 'admin');
 		}
 		return $output;
 	}
@@ -106,16 +106,16 @@ 
 		 * @param integer $customer_id
 		 * @return string
 		 */
-	function display_orders_in_account( $customer_id = '' ) {
+	function display_orders_in_account($customer_id = '') {
 
 		$output = '';
-		$customer_id = ( ! empty( $customer_id ) ) ? $customer_id : get_current_user_id();
-		$from_admin = ( ! empty( $customer_id ) ) ? true : false;
+		$customer_id = (!empty($customer_id)) ? $customer_id : get_current_user_id();
+		$from_admin = (!empty($customer_id)) ? true : false;
 		$wps_orders_mdl = new wps_orders_mdl();
-		$orders = $wps_orders_mdl->get_customer_orders( $customer_id );
+		$orders = $wps_orders_mdl->get_customer_orders($customer_id);
 		// Display orders
 		ob_start();
-		require_once( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, 'frontend', 'orders_list_in_account' ) );
+		require_once(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, 'frontend', 'orders_list_in_account'));
 		$output = ob_get_contents();
 		ob_end_clean();
 		return $output;
@@ -128,102 +128,102 @@ 
 		 *
 		 *	@return array $item_list The item to add to order
 		 */
-	function add_product_to_order( $product ) {
+	function add_product_to_order($product) {
 
 		global $wpdb;
-		if ( ! empty( $product ) && empty( $product['price_ttc_before_discount'] ) && empty( $product['price_ht_before_discount'] ) ) {
-			$price_infos = wpshop_prices::check_product_price( $product, true );
-			$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'];
-			$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'];
-			$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'];
+		if (!empty($product) && empty($product['price_ttc_before_discount']) && empty($product['price_ht_before_discount'])) {
+			$price_infos = wpshop_prices::check_product_price($product, true);
+			$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'];
+			$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'];
+			$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'];
 		}
 
-		$price_piloting = get_option( 'wpshop_shop_price_piloting' );
-		if ( ! empty( $price_piloting ) && $price_piloting == 'HT' ) {
+		$price_piloting = get_option('wpshop_shop_price_piloting');
+		if (!empty($price_piloting) && $price_piloting == 'HT') {
 			$total_ht = $product['price_ht'] * $product['product_qty'];
-			$tva_total_amount = $total_ht * ( $product['tx_tva'] / 100 );
+			$tva_total_amount = $total_ht * ($product['tx_tva'] / 100);
 			$total_ttc = $total_ht + $tva_total_amount;
 		} else {
 			$total_ttc = $product['product_price'] * $product['product_qty'];
-			$total_ht  = $total_ttc / ( 1 + ( $product['tx_tva'] / 100 ) );
+			$total_ht  = $total_ttc / (1 + ($product['tx_tva'] / 100));
 			$tva_total_amount = $total_ttc - $total_ht;
 		}
 
-		$tva = ! empty( $product[ WPSHOP_PRODUCT_PRICE_TAX ] ) ? $product[ WPSHOP_PRODUCT_PRICE_TAX ] : null;
+		$tva = !empty($product[WPSHOP_PRODUCT_PRICE_TAX]) ? $product[WPSHOP_PRODUCT_PRICE_TAX] : null;
 		$item_discount_type = $item_discount_value = $item_discount_amount = 0;
-		$d_amount = ! empty( $product ) && ! empty( $product['discount_amount'] ) ? wpshop_tools::formate_number( $product['discount_amount'] ) : null;
-		$d_rate = ! empty( $product ) && ! empty( $product['discount_rate'] ) ? wpshop_tools::formate_number( $product['discount_rate'] ) : null;
-		$d_special = ! empty( $product ) && ! empty( $product['special_price'] ) ? wpshop_tools::formate_number( $product['special_price'] ) : null;
-		if ( ! empty( $d_amount ) ) {
+		$d_amount = !empty($product) && !empty($product['discount_amount']) ? wpshop_tools::formate_number($product['discount_amount']) : null;
+		$d_rate = !empty($product) && !empty($product['discount_rate']) ? wpshop_tools::formate_number($product['discount_rate']) : null;
+		$d_special = !empty($product) && !empty($product['special_price']) ? wpshop_tools::formate_number($product['special_price']) : null;
+		if (!empty($d_amount)) {
 			$item_discount_type = 'discount_amount';
 			$item_discount_amount = $product['discount_amount'];
 			$item_discount_value = $product['discount_amount'];
-		} elseif ( ! empty( $d_rate ) ) {
+		} elseif (!empty($d_rate)) {
 			$item_discount_type = 'discount_rate';
 			$item_discount_amount = $product['discount_rate'];
 			$item_discount_value = $product['discount_rate'];
-		} elseif ( ! empty( $d_special ) ) {
+		} elseif (!empty($d_special)) {
 			$item_discount_type = 'special_price';
 			$item_discount_amount = $product['special_price'];
 			$item_discount_value = $product['special_price'];
 		}
 
-		$item = array( 'item_id' => $product['product_id'], 'item_ref' => ! empty( $product['product_reference'] ) ? $product['product_reference'] : null, 'item_name' => ! empty( $product['product_name'] ) ? $product['product_name'] : 'wpshop_product_' . $product['product_id'], 'item_qty' => $product['product_qty'], 'item_pu_ht' => $product['price_ht'], 'item_pu_ttc' => $product['product_price'], 'item_ecotaxe_ht' => 0, 'item_ecotaxe_tva' => 19.6, 'item_ecotaxe_ttc' => 0, 'item_discount_type' => $item_discount_type, 'item_discount_value' => $item_discount_value, 'item_discount_amount' => $item_discount_amount, 'item_tva_rate' => $tva, 'item_tva_amount' => $product['tva'], 'item_total_ht' => $total_ht, 'item_tva_total_amount' => $tva_total_amount, 'item_total_ttc' => $total_ttc, 'item_meta' => ! empty( $product['item_meta'] ) ? $product['item_meta'] : array() );
-		$array_not_to_do = array( WPSHOP_PRODUCT_PRICE_HT, WPSHOP_PRODUCT_PRICE_TTC, WPSHOP_PRODUCT_PRICE_TAX_AMOUNT, 'product_qty', WPSHOP_PRODUCT_PRICE_TAX, 'product_id', 'product_reference', 'product_name', 'variations' );
-		if ( ! empty( $product['item_meta'] ) ) {
-			foreach ( $product['item_meta'] as $key => $value ) {
-				if ( ! isset( $item[ 'item_' . $key ] ) && ! in_array( $key, $array_not_to_do ) && ! empty( $product[ $key ] ) ) {
-					$item[ 'item_' . $key ] = $product[ $key ];
+		$item = array('item_id' => $product['product_id'], 'item_ref' => !empty($product['product_reference']) ? $product['product_reference'] : null, 'item_name' => !empty($product['product_name']) ? $product['product_name'] : 'wpshop_product_' . $product['product_id'], 'item_qty' => $product['product_qty'], 'item_pu_ht' => $product['price_ht'], 'item_pu_ttc' => $product['product_price'], 'item_ecotaxe_ht' => 0, 'item_ecotaxe_tva' => 19.6, 'item_ecotaxe_ttc' => 0, 'item_discount_type' => $item_discount_type, 'item_discount_value' => $item_discount_value, 'item_discount_amount' => $item_discount_amount, 'item_tva_rate' => $tva, 'item_tva_amount' => $product['tva'], 'item_total_ht' => $total_ht, 'item_tva_total_amount' => $tva_total_amount, 'item_total_ttc' => $total_ttc, 'item_meta' => !empty($product['item_meta']) ? $product['item_meta'] : array());
+		$array_not_to_do = array(WPSHOP_PRODUCT_PRICE_HT, WPSHOP_PRODUCT_PRICE_TTC, WPSHOP_PRODUCT_PRICE_TAX_AMOUNT, 'product_qty', WPSHOP_PRODUCT_PRICE_TAX, 'product_id', 'product_reference', 'product_name', 'variations');
+		if (!empty($product['item_meta'])) {
+			foreach ($product['item_meta'] as $key => $value) {
+				if (!isset($item['item_' . $key]) && !in_array($key, $array_not_to_do) && !empty($product[$key])) {
+					$item['item_' . $key] = $product[$key];
 				}
 			}
 		}
 
 		/** Check if it's a variation product */
-		if ( ! empty( $product ) && ! empty( $product['item_meta'] ) && ! empty( $product['item_meta']['variations'] ) ) {
-			foreach ( $product['item_meta']['variations'] as $k => $variation ) {
-				$product_variation_def = get_post_meta( $k, '_wpshop_variations_attribute_def', true );
-				if ( ! empty( $product_variation_def ) ) {
-					foreach ( $product_variation_def as $attribute_code => $variation_id ) {
-						$variation_attribute_def = wpshop_attributes::getElement( $attribute_code, '"valid"', 'code' );
-						if ( ! empty( $variation_attribute_def ) ) {
-							$item['item_meta']['variation_definition'][ $attribute_code ]['NAME'] = $variation_attribute_def->frontend_label;
-							if ( $variation_attribute_def->data_type_to_use == 'custom' ) {
-								$query = $wpdb->prepare( 'SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id=%d', $variation_id );
-								$variation_name = $wpdb->get_var( $query );
+		if (!empty($product) && !empty($product['item_meta']) && !empty($product['item_meta']['variations'])) {
+			foreach ($product['item_meta']['variations'] as $k => $variation) {
+				$product_variation_def = get_post_meta($k, '_wpshop_variations_attribute_def', true);
+				if (!empty($product_variation_def)) {
+					foreach ($product_variation_def as $attribute_code => $variation_id) {
+						$variation_attribute_def = wpshop_attributes::getElement($attribute_code, '"valid"', 'code');
+						if (!empty($variation_attribute_def)) {
+							$item['item_meta']['variation_definition'][$attribute_code]['NAME'] = $variation_attribute_def->frontend_label;
+							if ($variation_attribute_def->data_type_to_use == 'custom') {
+								$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id=%d', $variation_id);
+								$variation_name = $wpdb->get_var($query);
 							} else {
-								$variation_post = get_post( $variation_id );
+								$variation_post = get_post($variation_id);
 								$variation_name = $variation_post->post_title;
 							}
-							$item['item_meta']['variation_definition'][ $attribute_code ]['UNSTYLED_VALUE'] = $variation_name;
-							$item['item_meta']['variation_definition'][ $attribute_code ]['VALUE'] = $variation_name;
+							$item['item_meta']['variation_definition'][$attribute_code]['UNSTYLED_VALUE'] = $variation_name;
+							$item['item_meta']['variation_definition'][$attribute_code]['VALUE'] = $variation_name;
 						}
 					}
 				}
 			}
 		} else {
 				/** Check if it's product with one variation */
-				$product_variation_def = get_post_meta( $product['product_id'], '_wpshop_variations_attribute_def', true );
-			if ( ! empty( $product_variation_def ) ) {
-				foreach ( $product_variation_def as $attribute_code => $variation_id ) {
-					$variation_attribute_def = wpshop_attributes::getElement( $attribute_code, '"valid"', 'code' );
-					if ( ! empty( $variation_attribute_def ) ) {
-							$item['item_meta']['variation_definition'][ $attribute_code ]['NAME'] = $variation_attribute_def->frontend_label;
-						if ( $variation_attribute_def->data_type_to_use == 'custom' ) {
-								$query = $wpdb->prepare( 'SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id=%d', $variation_id );
-							$variation_name = $wpdb->get_var( $query );
+				$product_variation_def = get_post_meta($product['product_id'], '_wpshop_variations_attribute_def', true);
+			if (!empty($product_variation_def)) {
+				foreach ($product_variation_def as $attribute_code => $variation_id) {
+					$variation_attribute_def = wpshop_attributes::getElement($attribute_code, '"valid"', 'code');
+					if (!empty($variation_attribute_def)) {
+							$item['item_meta']['variation_definition'][$attribute_code]['NAME'] = $variation_attribute_def->frontend_label;
+						if ($variation_attribute_def->data_type_to_use == 'custom') {
+								$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id=%d', $variation_id);
+							$variation_name = $wpdb->get_var($query);
 						} else {
-							$variation_post = get_post( $variation_id );
+							$variation_post = get_post($variation_id);
 							$variation_name = $variation_post->post_title;
 						}
-						$item['item_meta']['variation_definition'][ $attribute_code ]['UNSTYLED_VALUE'] = $variation_name;
-						$item['item_meta']['variation_definition'][ $attribute_code ]['VALUE'] = $variation_name;
+						$item['item_meta']['variation_definition'][$attribute_code]['UNSTYLED_VALUE'] = $variation_name;
+						$item['item_meta']['variation_definition'][$attribute_code]['VALUE'] = $variation_name;
 					}
 				}
 			}
 		}
 
 		/**	On ajoute la possibilité d'étendre les données produits ajoutées dans le panier / Add possibility to extends product data saved into cart	*/
-		$item = apply_filters( 'wpshop-add-product-to-order', $item, $product );
+		$item = apply_filters('wpshop-add-product-to-order', $item, $product);
 		return $item;
 	}
 
@@ -232,40 +232,40 @@ 
 		 */
 	function wps_invoice_output() {
 
-		$order_id = ( ! empty( $_GET['order_id'] )) ? (int) $_GET['order_id'] : null;
-		$invoice_ref = ( ! empty( $_GET['invoice_ref'] )) ? sanitize_text_field( $_GET['invoice_ref'] ) : null;
-		$mode = ( ! empty( $_GET['mode'] )) ? sanitize_text_field( $_GET['mode'] ) : 'html';
-		$is_credit_slip = ( ! empty( $_GET['credit_slip'] )) ? sanitize_text_field( $_GET['credit_slip'] ) : null;
+		$order_id = (!empty($_GET['order_id'])) ? (int)$_GET['order_id'] : null;
+		$invoice_ref = (!empty($_GET['invoice_ref'])) ? sanitize_text_field($_GET['invoice_ref']) : null;
+		$mode = (!empty($_GET['mode'])) ? sanitize_text_field($_GET['mode']) : 'html';
+		$is_credit_slip = (!empty($_GET['credit_slip'])) ? sanitize_text_field($_GET['credit_slip']) : null;
 		$user_id = get_current_user_id();
-		if ( ! empty( $order_id ) && $user_id != 0 ) {
+		if (!empty($order_id) && $user_id != 0) {
 			/**	Order reading	*/
-			$order_postmeta = get_post_meta( $order_id, '_order_postmeta', true );
+			$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 			/**	Start invoice display	*/
-			if ( ! empty( $is_credit_slip ) ) {
-				$html_content = wpshop_modules_billing::generate_html_invoice( $order_id, $invoice_ref, 'credit_slip' );
+			if (!empty($is_credit_slip)) {
+				$html_content = wpshop_modules_billing::generate_html_invoice($order_id, $invoice_ref, 'credit_slip');
 			} else {
-				$html_content = wpshop_modules_billing::generate_html_invoice( $order_id, $invoice_ref );
+				$html_content = wpshop_modules_billing::generate_html_invoice($order_id, $invoice_ref);
 			}
 
-			if ( $mode == 'pdf' ) {
-				require_once( WPSHOP_LIBRAIRIES_DIR . 'HTML2PDF/html2pdf.class.php' );
+			if ($mode == 'pdf') {
+				require_once(WPSHOP_LIBRAIRIES_DIR . 'HTML2PDF/html2pdf.class.php');
 				try {
 					// $html_content = wpshop_display::display_template_element('invoice_print_page_content_css', array(), array(), 'common') . '<page>' . $html_content . '</page>';
-					$html_content = wpshop_display::display_template_element( 'invoice_page_content_css', array(), array(), 'common' ) . '<page>' . $html_content . '</page>';
-					$html2pdf = new HTML2PDF( 'P', 'A4', 'fr' );
-					$html2pdf->setDefaultFont( 'Arial' );
-					$html2pdf->writeHTML( $html_content );
-					$html2pdf->Output( 'order_' . $order_id . '.pdf', 'D' );
+					$html_content = wpshop_display::display_template_element('invoice_page_content_css', array(), array(), 'common') . '<page>' . $html_content . '</page>';
+					$html2pdf = new HTML2PDF('P', 'A4', 'fr');
+					$html2pdf->setDefaultFont('Arial');
+					$html2pdf->writeHTML($html_content);
+					$html2pdf->Output('order_' . $order_id . '.pdf', 'D');
 				} catch (HTML2PDF_exception $e) {
 					echo $e;
 					exit;
 				}
 			} else {
-				$order_invoice_ref = ( ! empty( $order_postmeta['order_invoice_ref'] ) ) ? $order_postmeta['order_invoice_ref'] : '';
-				$tpl_component['INVOICE_CSS'] = wpshop_display::display_template_element( 'invoice_page_content_css', array(), array(), 'common' );
+				$order_invoice_ref = (!empty($order_postmeta['order_invoice_ref'])) ? $order_postmeta['order_invoice_ref'] : '';
+				$tpl_component['INVOICE_CSS'] = wpshop_display::display_template_element('invoice_page_content_css', array(), array(), 'common');
 				$tpl_component['INVOICE_MAIN_PAGE'] = $html_content;
-				$tpl_component['INVOICE_TITLE_PAGE'] = sprintf( __( 'Invoice %1$s for order %3$s (#%2$s)', 'wpshop' ), $order_invoice_ref, $order_id, $order_postmeta['order_key'] );
-				echo wpshop_display::display_template_element( 'invoice_page', $tpl_component, array(), 'common' );
+				$tpl_component['INVOICE_TITLE_PAGE'] = sprintf(__('Invoice %1$s for order %3$s (#%2$s)', 'wpshop'), $order_invoice_ref, $order_id, $order_postmeta['order_key']);
+				echo wpshop_display::display_template_element('invoice_page', $tpl_component, array(), 'common');
 			}
 		}
 		die();
@@ -277,21 +277,21 @@ 
 		 */
 	function wps_orders_load_details() {
 
-		check_ajax_referer( 'wps_orders_load_details' );
-		$order_id = ( ! empty( $_POST['order_id'] ) ) ? wpshop_tools::varSanitizer( $_POST['order_id'] ) : '';
+		check_ajax_referer('wps_orders_load_details');
+		$order_id = (!empty($_POST['order_id'])) ? wpshop_tools::varSanitizer($_POST['order_id']) : '';
 		$user_id = get_current_user_id();
 		$status = false;
 		$result = '';
-		if ( ! empty( $order_id ) ) {
-			$order = get_post( $order_id );
-			$order_infos = get_post_meta( $order_id, '_order_postmeta', true );
-			$order_key = ( ! empty( $order_infos['order_key'] ) ) ? $order_infos['order_key'] : '-';
-			if ( ! empty( $order ) && ! empty( $user_id ) && $order->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER && $order->post_author == $user_id ) {
-				$result = do_shortcode( '[wps_cart cart_type="summary" oid="' . $order_id . '"]' );
+		if (!empty($order_id)) {
+			$order = get_post($order_id);
+			$order_infos = get_post_meta($order_id, '_order_postmeta', true);
+			$order_key = (!empty($order_infos['order_key'])) ? $order_infos['order_key'] : '-';
+			if (!empty($order) && !empty($user_id) && $order->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER && $order->post_author == $user_id) {
+				$result = do_shortcode('[wps_cart cart_type="summary" oid="' . $order_id . '"]');
 				$status = true;
 			}
 		}
-		echo json_encode( array( 'status' => $status, 'title' => sprintf( __( 'Order n° %s details', 'wpshop' ), $order_key ), 'content' => $result ) );
+		echo json_encode(array('status' => $status, 'title' => sprintf(__('Order n° %s details', 'wpshop'), $order_key), 'content' => $result));
 		wp_die();
 	}
 
@@ -300,60 +300,60 @@ 
 		 */
 	function wps_order_choose_customer() {
 
-		$_wpnonce = ! empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
-		if ( ! wp_verify_nonce( $_wpnonce, 'wps_order_choose_customer' ) ) {
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
+		if (!wp_verify_nonce($_wpnonce, 'wps_order_choose_customer')) {
 				wp_die();
 		}
 
 		$status = false;
 		$billing_data = $shipping_data = '';
-		$customer_id = ( ! empty( $_POST['customer_id'] ) ) ? intval( $_POST['customer_id'] ): null;
-		if ( ! empty( $customer_id ) ) {
+		$customer_id = (!empty($_POST['customer_id'])) ? intval($_POST['customer_id']) : null;
+		if (!empty($customer_id)) {
 			$wps_address = new wps_address();
-			$billing_option = get_option( 'wpshop_billing_address' );
-			$shipping_option = get_option( 'wpshop_shipping_address_choice' );
+			$billing_option = get_option('wpshop_billing_address');
+			$shipping_option = get_option('wpshop_shipping_address_choice');
 			$billing_option = $billing_option['choice'];
-			$customer_addresses_list = wps_address::get_addresses_list( $customer_id );
+			$customer_addresses_list = wps_address::get_addresses_list($customer_id);
 			$status = true;
-			$billing_data = '<div class="wps-alert-info">' . sprintf( __( 'No Billing address created, <a href="%s" title="' . __( 'Create a new billing address', 'wpshop' ) . '" class="thickbox">create one</a>', 'wpshop' ),admin_url( 'admin-ajax.php' ) . '?action=wps-add-an-address-in-admin&address_type=' . $billing_option . '&customer_id=' . $customer_id . '&height=600' ) . '</div>';
-			if ( ! empty( $shipping_option ) && ! empty( $shipping_option['activate'] ) ) {
+			$billing_data = '<div class="wps-alert-info">' . sprintf(__('No Billing address created, <a href="%s" title="' . __('Create a new billing address', 'wpshop') . '" class="thickbox">create one</a>', 'wpshop'), admin_url('admin-ajax.php') . '?action=wps-add-an-address-in-admin&address_type=' . $billing_option . '&customer_id=' . $customer_id . '&height=600') . '</div>';
+			if (!empty($shipping_option) && !empty($shipping_option['activate'])) {
 				$shipping_option = $shipping_option['choice'];
-				$shipping_data = '<div class="wps-alert-info">' . sprintf( __( 'No shipping address created, <a href="%s" title="' . __( 'Create a new shipping address', 'wpshop' ) . '" class="thickbox">create one</a>', 'wpshop' ),admin_url( 'admin-ajax.php' ) . '?action=wps-add-an-address-in-admin&address_type=' . $shipping_option . '&customer_id=' . $customer_id . '&height=600' ) . '</div>';
+				$shipping_data = '<div class="wps-alert-info">' . sprintf(__('No shipping address created, <a href="%s" title="' . __('Create a new shipping address', 'wpshop') . '" class="thickbox">create one</a>', 'wpshop'), admin_url('admin-ajax.php') . '?action=wps-add-an-address-in-admin&address_type=' . $shipping_option . '&customer_id=' . $customer_id . '&height=600') . '</div>';
 			}
 
-			if ( ! empty( $customer_addresses_list ) ) {
-				foreach ( $customer_addresses_list as $address_type => $customer_addresses ) {
-					if ( $billing_option == $address_type ) {
-						$billing_data = $wps_address->display_address_in_administration( $customer_addresses, $address_type );
+			if (!empty($customer_addresses_list)) {
+				foreach ($customer_addresses_list as $address_type => $customer_addresses) {
+					if ($billing_option == $address_type) {
+						$billing_data = $wps_address->display_address_in_administration($customer_addresses, $address_type);
 					} else {
-						$shipping_data = $wps_address->display_address_in_administration( $customer_addresses, $address_type );
+						$shipping_data = $wps_address->display_address_in_administration($customer_addresses, $address_type);
 					}
 				}
 			}
 		}
-		echo json_encode( array( 'status' => $status, 'billing_data' => $billing_data, 'shipping_data' => $shipping_data ) );
+		echo json_encode(array('status' => $status, 'billing_data' => $billing_data, 'shipping_data' => $shipping_data));
 		wp_die();
 	}
 
-	static function pay_quotation( $order_id ) {
+	static function pay_quotation($order_id) {
 
 		$status = true;
-		$order_id = (int) $order_id;
-		$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
-		$order_info = get_post_meta( $order_id, '_order_info', true );
-		$_SESSION['shipping_method'] = isset( $order_meta['order_payment']['shipping_method'] ) ? $order_meta['order_payment']['shipping_method'] : 'No Shipping method required';
-		if ( isset( $order_info['billing']['address_id'] ) ) {
+		$order_id = (int)$order_id;
+		$order_meta = get_post_meta($order_id, '_order_postmeta', true);
+		$order_info = get_post_meta($order_id, '_order_info', true);
+		$_SESSION['shipping_method'] = isset($order_meta['order_payment']['shipping_method']) ? $order_meta['order_payment']['shipping_method'] : 'No Shipping method required';
+		if (isset($order_info['billing']['address_id'])) {
 			$_SESSION['billing_address'] = $order_info['billing']['address_id'];
 			$_SESSION['cart'] = $order_meta;
 			$_SESSION['cart']['order_id'] = $order_id;
     		$_SESSION['cart']['cart_type'] = 'cart';
 			$_SESSION['cart']['order_shipping_cost_fixe'] = 'on';
-			$permalink = get_permalink( get_option( 'wpshop_cart_page_id' ) ) . '?order_step=5';
+			$permalink = get_permalink(get_option('wpshop_cart_page_id')) . '?order_step=5';
 		} else {
-			$status = self::add_order_to_session( $order_id );
-			$permalink = get_permalink( wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) ) );
+			$status = self::add_order_to_session($order_id);
+			$permalink = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id')));
 		}
-		return array( 'status' => $status, 'permalink' => $permalink );
+		return array('status' => $status, 'permalink' => $permalink);
 	}
 
 	/**
@@ -362,54 +362,54 @@ 
 	 * @method add_order_to_session
 	 * @param  int $order_id Id of order.
 	 */
-	public static function add_order_to_session( $order_id ) {
+	public static function add_order_to_session($order_id) {
 
-		$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
-		if ( $order_meta != false ) {
+		$order_meta = get_post_meta($order_id, '_order_postmeta', true);
+		if ($order_meta != false) {
 			$_SESSION['cart'] = array();
 			$_SESSION['cart']['order_amount_to_pay_now'] = $order_meta['order_amount_to_pay_now'];
 			$_SESSION['cart']['order_items'] = array();
-			if ( ! empty( $order_meta ) && ! empty( $order_meta['order_items'] ) ) {
+			if (!empty($order_meta) && !empty($order_meta['order_items'])) {
 				$wpshop_cart_type = 'cart';
-				foreach ( $order_meta['order_items'] as $item ) {
-					$_SESSION['cart']['order_items'][ $item['item_id'] ] = $item;
+				foreach ($order_meta['order_items'] as $item) {
+					$_SESSION['cart']['order_items'][$item['item_id']] = $item;
 				}
 				$wps_cart_ctr = new wps_cart();
-				$order = $wps_cart_ctr->calcul_cart_information( array() );
-				$wps_cart_ctr->store_cart_in_session( $order );
+				$order = $wps_cart_ctr->calcul_cart_information(array());
+				$wps_cart_ctr->store_cart_in_session($order);
 			}
 			$_SESSION['order_id'] = $order_id;
 		}
-		return (bool) ($order_meta != false);
+		return (bool)($order_meta != false);
 	}
 	/**
 	 * AJAX - Delete order by order_id
 	 */
 	public function wps_delete_order() {
 
-		$_wpnonce = ! empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
-		if ( ! wp_verify_nonce( $_wpnonce, 'wps_delete_order' ) ) {
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
+		if (!wp_verify_nonce($_wpnonce, 'wps_delete_order')) {
 				wp_die();
 		}
 
 		$status = false;
 		$output = '';
-		$order_id = ! empty( $_POST['order_id'] ) ? (int) $_POST['order_id'] : 0;
-		if ( $order_id ) {
-			$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
+		$order_id = !empty($_POST['order_id']) ? (int)$_POST['order_id'] : 0;
+		if ($order_id) {
+			$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 			$wps_credit = new wps_credit();
-			$wps_credit->create_an_credit( $order_id );
+			$wps_credit->create_an_credit($order_id);
 			$order_meta['order_status'] = 'canceled';
-			$order_meta['order_payment']['refunded_action']['refunded_date'] = current_time( 'mysql', 0 );
+			$order_meta['order_payment']['refunded_action']['refunded_date'] = current_time('mysql', 0);
 			$order_meta['order_payment']['refunded_action']['author'] = get_current_user_id();
-			update_post_meta( $order_id, '_order_postmeta', $order_meta );
+			update_post_meta($order_id, '_order_postmeta', $order_meta);
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, 'frontend', 'order_row_in_account' ) );
+			require(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, 'frontend', 'order_row_in_account'));
 			$output = ob_get_contents();
 			ob_end_clean();
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status, 'row' => $output ) );
+		echo json_encode(array('status' => $status, 'row' => $output));
 		wp_die();
 	}
 
@@ -420,11 +420,11 @@ 
 	 * @param  int $order_id OrderID.
 	 * @return mixed sha1 or false.
 	 */
-	public static function wps_token_order_customer( $order_id ) {
-		$order_metadata = get_post_meta( $order_id, '_order_postmeta', true );
-		if ( ! isset( $order_metadata['customer_id'] ) ) {
+	public static function wps_token_order_customer($order_id) {
+		$order_metadata = get_post_meta($order_id, '_order_postmeta', true);
+		if (!isset($order_metadata['customer_id'])) {
 			return false;
 		}
-		return sha1( site_url() . '_' . $order_id . '_' . $order_metadata['customer_id'] . '_' . date( 'ym' ) );
+		return sha1(site_url() . '_' . $order_id . '_' . $order_metadata['customer_id'] . '_' . date('ym'));
 	}
 }

includes/librairies/purchase/checkout.class.php

Spacing +87 added lines, -87 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'));
 }
 
 /**
@@ -25,11 +25,11 @@ 
 	/** Constructor of the class
 	* @return void
 	*/
-	function __construct () {
+	function __construct() {
 	}
 
 
-	public static function process_checkout($paymentMethod='paypal', $order_id = 0, $customer_id = 0, $customer_billing_address_id = 0, $customer_shipping_address_id = 0) {
+	public static function process_checkout($paymentMethod = 'paypal', $order_id = 0, $customer_id = 0, $customer_billing_address_id = 0, $customer_shipping_address_id = 0) {
 
 		global $wpdb, $wpshop, $wpshop_cart;
 		$wps_message = new wps_message_ctr();
@@ -38,22 +38,22 @@ 
 		if (is_user_logged_in()) :
 			$user_id = get_current_user_id();
 
-		if ( $customer_id != 0 ) {
+		if ($customer_id != 0) {
 			$user_id = $customer_id;
 		}
 
 			// If the order is already created in the db
-			if(!empty($order_id) && is_numeric($order_id)) {
+			if (!empty($order_id) && is_numeric($order_id)) {
 				$order = get_post_meta($order_id, '_order_postmeta', true);
 
-				if(!empty($order)) {
-					if($order['customer_id'] == $user_id) {
+				if (!empty($order)) {
+					if ($order['customer_id'] == $user_id) {
 						$order['payment_method'] = $paymentMethod;
-						$_SESSION['order_id'] = (int) $order_id;
+						$_SESSION['order_id'] = (int)$order_id;
 						// Store cart in session
 						//wpshop_cart::store_cart_in_session($order);
 						// Add a payment
-						$order['order_payment']['received'][] = array( 'method' => $paymentMethod, 'waited_amount' => $order['order_amount_to_pay_now'], 'status' => 'waiting_payment', 'author' => get_current_user_id() );
+						$order['order_payment']['received'][] = array('method' => $paymentMethod, 'waited_amount' => $order['order_amount_to_pay_now'], 'status' => 'waiting_payment', 'author' => get_current_user_id());
 
 						// On enregistre la commande
 						update_post_meta($order_id, '_order_postmeta', $order);
@@ -63,12 +63,12 @@ 
 				}
 				else $wpshop->add_error(__('The order doesn\'t exist.', 'wpshop'));
 			}
-			else{
+			else {
 				$order_data = array(
 					'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
-					'post_title' => sprintf(__('Order - %s','wpshop'), mysql2date('d M Y\, H:i:s', current_time('mysql', 0), true)),
+					'post_title' => sprintf(__('Order - %s', 'wpshop'), mysql2date('d M Y\, H:i:s', current_time('mysql', 0), true)),
 					'post_status' => 'publish',
-					'post_excerpt' => !empty($_POST['wps-customer-comment']) ? sanitize_text_field( $_POST['wps-customer-comment'] ) : '',
+					'post_excerpt' => !empty($_POST['wps-customer-comment']) ? sanitize_text_field($_POST['wps-customer-comment']) : '',
 					'post_author' => $user_id,
 					'comment_status' => 'closed'
 				);
@@ -78,7 +78,7 @@ 
 				$order_tva = array();
 
 				//$cart = (array)$wpshop_cart->cart;
-				if ( !empty($_SESSION['cart']) && !empty( $_SESSION['cart']['shipping_method']) ) {
+				if (!empty($_SESSION['cart']) && !empty($_SESSION['cart']['shipping_method'])) {
 					$_SESSION['cart']['shipping_method'] = __('Standard shipping method', 'wpshop');
 				}
 				$cart = (array)$_SESSION['cart'];
@@ -90,35 +90,35 @@ 
 				$_SESSION['order_id'] = $order_id;
 
 				// Cr�ation des codes de t�l�chargement si il y a des produits t�l�chargeable dans le panier
-				if ( !empty( $cart['order_items'] ) ) {
-					foreach($cart['order_items'] as $c) {
+				if (!empty($cart['order_items'])) {
+					foreach ($cart['order_items'] as $c) {
 						$product_id = $c['item_id'];
 						$product = null;
-						if( isset( $c['item_meta']['variations'] ) ) {
-							foreach ( $c['item_meta']['variations'] as $variation_id => $variation ) {
-								if( isset( $variation['item_meta']['is_downloadable_'] ) ) {
+						if (isset($c['item_meta']['variations'])) {
+							foreach ($c['item_meta']['variations'] as $variation_id => $variation) {
+								if (isset($variation['item_meta']['is_downloadable_'])) {
 									$product_id = $c['item_id'] . '__' . $variation_id;
-									$product = wpshop_products::get_product_data( $product_id );
+									$product = wpshop_products::get_product_data($product_id);
 								}
 							}
 						}
-						if( !isset( $product ) ) {
-							$product = wpshop_products::get_product_data( $c['item_id'] );
+						if (!isset($product)) {
+							$product = wpshop_products::get_product_data($c['item_id']);
 							$product_id = $c['item_id'];
 							/** Check if it's a variation and check the parent product **/
-							if ( get_post_type( $c['item_id'] ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-								$parent_def = wpshop_products::get_parent_variation( $c['item_id'] );
-								if ( !empty($parent_def) && !empty($parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['is_downloadable_']) ) {
+							if (get_post_type($c['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+								$parent_def = wpshop_products::get_parent_variation($c['item_id']);
+								if (!empty($parent_def) && !empty($parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['is_downloadable_'])) {
 									$product['is_downloadable_'] = $parent_def['parent_post_meta']['is_downloadable_'];
 								}
 							}
 						}
-						if(!empty($product['is_downloadable_'])) {
+						if (!empty($product['is_downloadable_'])) {
 							$download_codes[$product_id] = array('item_id' => $product_id, 'download_code' => uniqid('', true));
 						}
 					}
 				}
-				if(!empty($download_codes)) update_user_meta($user_id, '_order_download_codes_'.$order_id, $download_codes);
+				if (!empty($download_codes)) update_user_meta($user_id, '_order_download_codes_' . $order_id, $download_codes);
 
 				// Informations de commande � stocker
 				$currency = wpshop_tools::wpshop_get_currency(true);
@@ -133,12 +133,12 @@ 
 					'order_payment' 		=> array(
 					'customer_choice' 		=> array('method' => $paymentMethod),
 					'received'				=> array('0' => array('method' => $paymentMethod, 'waited_amount' => $cart['order_amount_to_pay_now'], 'status' =>  'waiting_payment', 'author' => $user_id)),
-					'shipping_method'       => ( ( !empty( $_SESSION['shipping_method']) ) ? wpshop_tools::varSanitizer( $_SESSION['shipping_method']) : __('Standard shipping method', 'wpshop') )
+					'shipping_method'       => ((!empty($_SESSION['shipping_method'])) ? wpshop_tools::varSanitizer($_SESSION['shipping_method']) : __('Standard shipping method', 'wpshop'))
 					),
 				), $cart);
 
 				// Si c'est un devis
-				if ( $paymentMethod == 'quotation' ) {
+				if ($paymentMethod == 'quotation') {
 					$order['order_temporary_key'] = wpshop_orders::get_new_pre_order_reference();
 				}
 				else {
@@ -146,9 +146,9 @@ 
 				}
 
 				//Round final amount
-				$order['order_grand_total'] = number_format( round($order['order_grand_total'], 2), 2, '.', '');
-				$order['order_total_ttc'] = number_format( round($order['order_total_ttc'], 2), 2, '.', '');
-				$order['order_amount_to_pay_now'] = number_format( round($order['order_amount_to_pay_now'], 2), 2, '.', '');
+				$order['order_grand_total'] = number_format(round($order['order_grand_total'], 2), 2, '.', '');
+				$order['order_total_ttc'] = number_format(round($order['order_total_ttc'], 2), 2, '.', '');
+				$order['order_amount_to_pay_now'] = number_format(round($order['order_amount_to_pay_now'], 2), 2, '.', '');
 
 				/** On enregistre la commande	*/
 				update_post_meta($order_id, '_order_postmeta', $order);
@@ -157,75 +157,75 @@ 
 				update_post_meta($order_id, '_wpshop_order_status', $order['order_status']);
 
 
-				do_action( 'wps_order_extra_save', $order_id );
+				do_action('wps_order_extra_save', $order_id);
 
 				//Add an action to extra actions on order save
 				// @TODO : REQUEST
-				$args = array( 'order_id' => $order_id, 'posted_data' => $_REQUEST );
-				wpshop_tools::create_custom_hook( 'wps_order_extra_save_action', $args );
+				$args = array('order_id' => $order_id, 'posted_data' => $_REQUEST);
+				wpshop_tools::create_custom_hook('wps_order_extra_save_action', $args);
 
 				/**	Set custmer information for the order	*/
-				$shipping_address =  ( !empty($shipping_address_option) && !empty($shipping_address_option['activate']) ) ? ( ( !empty($_SESSION['shipping_address']) ) ? wpshop_tools::varSanitizer($_SESSION['shipping_address']) : $customer_shipping_address_id ) : '';
-				$billing_address =  ( !empty($_SESSION['billing_address']) ) ? wpshop_tools::varSanitizer($_SESSION['billing_address']) : $customer_billing_address_id;
+				$shipping_address = (!empty($shipping_address_option) && !empty($shipping_address_option['activate'])) ? ((!empty($_SESSION['shipping_address'])) ? wpshop_tools::varSanitizer($_SESSION['shipping_address']) : $customer_shipping_address_id) : '';
+				$billing_address = (!empty($_SESSION['billing_address'])) ? wpshop_tools::varSanitizer($_SESSION['billing_address']) : $customer_billing_address_id;
 
 
-				if ( !empty( $billing_address) ) {
+				if (!empty($billing_address)) {
 					wpshop_orders::set_order_customer_addresses($user_id, $order_id, $shipping_address, $billing_address);
 				}
 
-				if ( !empty($_SESSION['shipping_address_to_save']) ) {
+				if (!empty($_SESSION['shipping_address_to_save'])) {
 					$order_infos_postmeta = get_post_meta($order_id, '_order_info', true);
 					$order_infos_postmeta['shipping']['address'] = $_SESSION['shipping_address_to_save'];
 					$order_infos_postmeta['shipping']['address_id'] = '';
 					update_post_meta($order_id, '_order_info', $order_infos_postmeta);
-					unset( $_SESSION['shipping_address_to_save'] );
+					unset($_SESSION['shipping_address_to_save']);
 				}
 
 
 				/** Save Coupon use **/
-				if ( !empty($_SESSION['cart']['coupon_id']) ) {
+				if (!empty($_SESSION['cart']['coupon_id'])) {
 					$wps_coupon_mdl = new wps_coupon_model();
-					$wps_coupon_mdl->save_coupon_use( $_SESSION['cart']['coupon_id'] );
+					$wps_coupon_mdl->save_coupon_use($_SESSION['cart']['coupon_id']);
 				}
 
 				/**	Notify the customer as the case	*/
 				$user_info = get_userdata($user_id);
 				$email = $user_info->user_email;
-				$first_name = $user_info->user_firstname ;
+				$first_name = $user_info->user_firstname;
 				$last_name = $user_info->user_lastname;
 
 				// Envoie du message de confirmation de commande au client
-				$order_meta = get_post_meta( $order_id, '_order_postmeta', true);
+				$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 
-				$shipping_mode_option = get_option( 'wps_shipping_mode' );
-				$shipping_method = ( !empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ( (!empty($order_meta['order_payment']['shipping_method']) ) ? $order_meta['order_payment']['shipping_method'] : '' );
+				$shipping_mode_option = get_option('wps_shipping_mode');
+				$shipping_method = (!empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ((!empty($order_meta['order_payment']['shipping_method'])) ? $order_meta['order_payment']['shipping_method'] : '');
 
-				if ( !empty($order_meta) && !empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation' && empty($order_meta['order_key']) ) {
-					$wps_message->wpshop_prepared_email($email, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_date' => current_time('mysql', 0), 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '') );
+				if (!empty($order_meta) && !empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation' && empty($order_meta['order_key'])) {
+					$wps_message->wpshop_prepared_email($email, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE', array('order_id' => $order_id, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_date' => current_time('mysql', 0), 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => ''));
 				}
 				else {
-					$email_option = get_option( 'wpshop_emails' );
-					if ( empty($email_option['send_confirmation_order_message']) ) {
-						$payment_method_option = get_option( 'wps_payment_mode' );
-						$order_payment_method = ( !empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_meta['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])  ) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
+					$email_option = get_option('wpshop_emails');
+					if (empty($email_option['send_confirmation_order_message'])) {
+						$payment_method_option = get_option('wps_payment_mode');
+						$order_payment_method = (!empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_meta['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
 
-						$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ( ( !empty($order_meta['order_key']) ) ? $order_meta['order_key'] : ''),'order_date' => current_time('mysql', 0),  'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '',  'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '' ) );
+						$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ((!empty($order_meta['order_key'])) ? $order_meta['order_key'] : ''), 'order_date' => current_time('mysql', 0), 'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => ''));
 					}
 				}
 
-				if ( empty($_SESSION['wps-pos-addon']) ) {
+				if (empty($_SESSION['wps-pos-addon'])) {
 					$email_option = get_option('wpshop_emails');
-					if( empty($email_option) || ( !empty($email_option) && empty($email_option['send_confirmation_order_message']) ) ){
-						self::send_order_email_to_administrator( $order_id, $user_info );
+					if (empty($email_option) || (!empty($email_option) && empty($email_option['send_confirmation_order_message']))) {
+						self::send_order_email_to_administrator($order_id, $user_info);
 					}
 				}
 
 
 				/** IF Order amount is 0, Finish the Order **/
-				if ( $cart['order_amount_to_pay_now'] == 0 ) {
+				if ($cart['order_amount_to_pay_now'] == 0) {
 					$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 					$payment_status = 'completed';
-					$params_array = array (
+					$params_array = array(
 						'method' =>'free',
 						'waited_amount' => $order_meta['order_amount_to_pay_now'],
 						'status' =>  'payment_received',
@@ -236,14 +236,14 @@ 
 					);
 					wpshop_payment::check_order_payment_total_amount($order_id, $params_array, $payment_status);
 				}
-				apply_filters( 'wpshop_finish_order_extra_actions', $order_id);
+				apply_filters('wpshop_finish_order_extra_actions', $order_id);
 			}
 		endif;
 		return $order_id;
 	}
 
-	public static function send_order_email_to_administrator ( $order_id, $customer_infos = ''  ) {
-		if ( !empty($order_id) ) {
+	public static function send_order_email_to_administrator($order_id, $customer_infos = '') {
+		if (!empty($order_id)) {
 			$wps_message = new wps_message_ctr();
 			$order_infos = get_post_meta($order_id, '_order_postmeta', true);
 			//Send email to administrator(s)
@@ -251,11 +251,11 @@ 
 			$shop_admin_email = $shop_admin_email_option['contact_email'];
 			$order_tmp_key = '';
 
-			$shipping_mode_option = get_option( 'wps_shipping_mode' );
-			$shipping_method = ( !empty($order_infos['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_infos['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_infos['order_payment']['shipping_method']]['name'] : ( (!empty($order_infos['order_payment']['shipping_method']) ) ? $order_infos['order_payment']['shipping_method'] : '' );
+			$shipping_mode_option = get_option('wps_shipping_mode');
+			$shipping_method = (!empty($order_infos['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_infos['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_infos['order_payment']['shipping_method']]['name'] : ((!empty($order_infos['order_payment']['shipping_method'])) ? $order_infos['order_payment']['shipping_method'] : '');
 
 
-			if( !empty( $order_infos ) && !empty($order_infos['cart_type']) && $order_infos['cart_type'] == 'normal' && !empty($order_infos['order_key']) ){
+			if (!empty($order_infos) && !empty($order_infos['cart_type']) && $order_infos['cart_type'] == 'normal' && !empty($order_infos['order_key'])) {
 				$message_type = 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE';
 			}
 			else {
@@ -263,12 +263,12 @@ 
 				$order_tmp_key = $order_infos['order_temporary_key'];
 			}
 
-			$payment_method_option = get_option( 'wps_payment_mode' );
-			$order_payment_method = ( !empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_infos['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']])  ) ? $payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']]['name'] : $order_infos['order_payment']['customer_choice']['method'];
+			$payment_method_option = get_option('wps_payment_mode');
+			$order_payment_method = (!empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_infos['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']])) ? $payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']]['name'] : $order_infos['order_payment']['customer_choice']['method'];
 
-			$data_to_send = array('order_id' => $order_id, 'order_key' => $order_infos['order_key'], 'customer_email' => ( !empty($customer_infos) && !empty($customer_infos->user_email) ) ? $customer_infos->user_email : '' , 'customer_last_name' => ( !empty($customer_infos) && !empty($customer_infos->user_lastname) ) ? $customer_infos->user_lastname : '', 'customer_first_name' => ( !empty($customer_infos) && !empty($customer_infos->user_firstname) ) ? $customer_infos->user_firstname : '', 'order_date' => $order_infos['order_date'], 'order_payment_method' => $order_payment_method, 'order_temporary_key' => $order_tmp_key, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '','order_shipping_method' => $shipping_method, 'order_personnal_informations' => '' );
+			$data_to_send = array('order_id' => $order_id, 'order_key' => $order_infos['order_key'], 'customer_email' => (!empty($customer_infos) && !empty($customer_infos->user_email)) ? $customer_infos->user_email : '', 'customer_last_name' => (!empty($customer_infos) && !empty($customer_infos->user_lastname)) ? $customer_infos->user_lastname : '', 'customer_first_name' => (!empty($customer_infos) && !empty($customer_infos->user_firstname)) ? $customer_infos->user_firstname : '', 'order_date' => $order_infos['order_date'], 'order_payment_method' => $order_payment_method, 'order_temporary_key' => $order_tmp_key, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '');
 
-			$wps_message->wpshop_prepared_email( $shop_admin_email, $message_type, $data_to_send, array('object_type' => 'order', 'object_id' => $order_id));
+			$wps_message->wpshop_prepared_email($shop_admin_email, $message_type, $data_to_send, array('object_type' => 'order', 'object_id' => $order_id));
 		}
 	}
 
@@ -279,13 +279,13 @@ 
 	 * @param mixed $data Array or false.
 	 * @return void
 	 */
-	public static function wps_direct_payment_link( $data = false ) {
-		$data = empty( $data ) ? self::wps_direct_payment_link_verify_token() : $data;
-		if ( (bool) $data ) {
-			wps_orders_ctr::pay_quotation( $data['oid'] );
-			wpshop_tools::wpshop_safe_redirect( get_permalink( wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) ) ) . '?order_step=5' );
+	public static function wps_direct_payment_link($data = false) {
+		$data = empty($data) ? self::wps_direct_payment_link_verify_token() : $data;
+		if ((bool)$data) {
+			wps_orders_ctr::pay_quotation($data['oid']);
+			wpshop_tools::wpshop_safe_redirect(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'))) . '?order_step=5');
 		} else {
-			wpshop_tools::wpshop_safe_redirect( get_permalink( wpshop_tools::get_page_id( get_option( 'wpshop_myaccount_page_id' ) ) ) );
+			wpshop_tools::wpshop_safe_redirect(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))));
 		}
 	}
 	/**
@@ -295,12 +295,12 @@ 
 	 * @param mixed $data Array or false.
 	 * @return void
 	 */
-	public static function wps_direct_payment_link_nopriv( $data = false ) {
-		$data = empty( $data ) ? self::wps_direct_payment_link_verify_token() : $data;
-		if ( (bool) $data ) {
-			wp_set_auth_cookie( $data['cid'], true, is_ssl() );
+	public static function wps_direct_payment_link_nopriv($data = false) {
+		$data = empty($data) ? self::wps_direct_payment_link_verify_token() : $data;
+		if ((bool)$data) {
+			wp_set_auth_cookie($data['cid'], true, is_ssl());
 		}
-		self::wps_direct_payment_link( $data );
+		self::wps_direct_payment_link($data);
 	}
 	/**
 	 * Verify token in request.
@@ -309,11 +309,11 @@ 
 	 * @return mixed Customer id or false.
 	 */
 	public static function wps_direct_payment_link_verify_token() {
-		$token = ! empty( $_GET['token'] ) ? sanitize_text_field( $_GET['token'] ) : '';
-		$order_id = ! empty( $_GET['order_id'] ) ? (int) $_GET['order_id'] : '';
-		$order_metadata = get_post_meta( $order_id, '_order_postmeta', true );
-		$customer_id = ! empty( $order_metadata['customer_id'] ) ? (int) $order_metadata['customer_id'] : false;
-		return ( (bool) $customer_id && wps_orders_ctr::wps_token_order_customer( $order_id ) === $token ) ? array( 'oid' => $order_id, 'cid' => $customer_id ) : false;
+		$token = !empty($_GET['token']) ? sanitize_text_field($_GET['token']) : '';
+		$order_id = !empty($_GET['order_id']) ? (int)$_GET['order_id'] : '';
+		$order_metadata = get_post_meta($order_id, '_order_postmeta', true);
+		$customer_id = !empty($order_metadata['customer_id']) ? (int)$order_metadata['customer_id'] : false;
+		return ((bool)$customer_id && wps_orders_ctr::wps_token_order_customer($order_id) === $token) ? array('oid' => $order_id, 'cid' => $customer_id) : false;
 	}
 	/**
 	 * Get URL for wps_direct_link.
@@ -322,7 +322,7 @@ 
 	 * @param  int $order_id OrderID.
 	 * @return string Url or empty string.
 	 */
-	public static function wps_direct_payment_link_url( $order_id ) {
-		return ( (bool) ( $token = wps_orders_ctr::wps_token_order_customer( (int) $order_id ) ) ) ? admin_url( 'admin-post.php?action=wps_direct_payment_link&token=' . $token . '&amp;order_id=' . (int) $order_id ) : '';
+	public static function wps_direct_payment_link_url($order_id) {
+		return ((bool)($token = wps_orders_ctr::wps_token_order_customer((int)$order_id))) ? admin_url('admin-post.php?action=wps_direct_payment_link&token=' . $token . '&amp;order_id=' . (int)$order_id) : '';
 	}
 }

Braces +14 added lines, -12 removed lines

@@ -1,4 +1,6 @@ 
-<?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' ) ) {
@@ -58,12 +60,13 @@ 
 						// On enregistre la commande
 						update_post_meta($order_id, '_order_postmeta', $order);
 						update_post_meta($order_id, '_wpshop_order_customer_id', $user_id);
+					} else {
+						$wpshop->add_error(__('You don\'t own the order', 'wpshop'));
 					}
-					else $wpshop->add_error(__('You don\'t own the order', 'wpshop'));
+				} else {
+					$wpshop->add_error(__('The order doesn\'t exist.', 'wpshop'));
 				}
-				else $wpshop->add_error(__('The order doesn\'t exist.', 'wpshop'));
-			}
-			else{
+			} else{
 				$order_data = array(
 					'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
 					'post_title' => sprintf(__('Order - %s','wpshop'), mysql2date('d M Y\, H:i:s', current_time('mysql', 0), true)),
@@ -118,7 +121,9 @@ 
 						}
 					}
 				}
-				if(!empty($download_codes)) update_user_meta($user_id, '_order_download_codes_'.$order_id, $download_codes);
+				if(!empty($download_codes)) {
+					update_user_meta($user_id, '_order_download_codes_'.$order_id, $download_codes);
+				}
 
 				// Informations de commande � stocker
 				$currency = wpshop_tools::wpshop_get_currency(true);
@@ -140,8 +145,7 @@ 
 				// Si c'est un devis
 				if ( $paymentMethod == 'quotation' ) {
 					$order['order_temporary_key'] = wpshop_orders::get_new_pre_order_reference();
-				}
-				else {
+				} else {
 					$order['order_key'] = wpshop_orders::get_new_order_reference();
 				}
 
@@ -202,8 +206,7 @@ 
 
 				if ( !empty($order_meta) && !empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation' && empty($order_meta['order_key']) ) {
 					$wps_message->wpshop_prepared_email($email, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_date' => current_time('mysql', 0), 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '') );
-				}
-				else {
+				} else {
 					$email_option = get_option( 'wpshop_emails' );
 					if ( empty($email_option['send_confirmation_order_message']) ) {
 						$payment_method_option = get_option( 'wps_payment_mode' );
@@ -257,8 +260,7 @@ 
 
 			if( !empty( $order_infos ) && !empty($order_infos['cart_type']) && $order_infos['cart_type'] == 'normal' && !empty($order_infos['order_key']) ){
 				$message_type = 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE';
-			}
-			else {
+			} else {
 				$message_type = 'WPSHOP_NEW_QUOTATION_ADMIN_MESSAGE';
 				$order_tmp_key = $order_infos['order_temporary_key'];
 			}

includes/librairies/notices.class.php

Spacing +21 added lines, -21 removed lines

@@ -1,7 +1,7 @@ 
-<?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'));
 }
 
 /**
@@ -19,36 +19,36 @@ 
 * @package wpshop
 * @subpackage librairies
 */
-class wpshop_notices{
+class wpshop_notices {
 
 	/** Notice the user to install the plugin */
 	public static function sale_shop_notice() {
-		$plug_version = substr( WPSHOP_VERSION, 0, 5 );
+		$plug_version = substr(WPSHOP_VERSION, 0, 5);
 
 
-		$notice_display_user_option = get_user_meta( get_current_user_id(), '_wps_hide_notice_messages_indicator', true);
+		$notice_display_user_option = get_user_meta(get_current_user_id(), '_wps_hide_notice_messages_indicator', true);
 
 		$notice = '';
 		$messages_to_hide = '';
 		/* Check that the user has already choose a payment method */
-		$paymentMethod = get_option( 'wps_payment_mode' );
+		$paymentMethod = get_option('wps_payment_mode');
 		$no_payment_mode_configurated = true;
-		if ( !empty($paymentMethod ) && !empty($paymentMethod['mode']) ) {
-			foreach( $paymentMethod['mode'] as $k => $pm ) {
-				if ( !empty($pm['active'] ) ) {
+		if (!empty($paymentMethod) && !empty($paymentMethod['mode'])) {
+			foreach ($paymentMethod['mode'] as $k => $pm) {
+				if (!empty($pm['active'])) {
 					$no_payment_mode_configurated = false;
 				}
 			}
 		}
 
-		if( $no_payment_mode_configurated ) {
-			$notice .= '<li>' . __('Payment method are missing', 'wpshop') . '&nbsp;<a href="' . admin_url('options-general.php?page='.WPSHOP_URL_SLUG_OPTION.'#wpshop_payments_option') . '" class="button-primary wpshop_missing_parameters_button" >' . __('Choose a payment method', 'wpshop') . '</a></li>';
+		if ($no_payment_mode_configurated) {
+			$notice .= '<li>' . __('Payment method are missing', 'wpshop') . '&nbsp;<a href="' . admin_url('options-general.php?page=' . WPSHOP_URL_SLUG_OPTION . '#wpshop_payments_option') . '" class="button-primary wpshop_missing_parameters_button" >' . __('Choose a payment method', 'wpshop') . '</a></li>';
 		}
 
 		/* Check that the user has already choose a payment method */
 		$emails = get_option('wpshop_emails', array());
-		if(empty($emails)) {
-			$notice .= '<li>' . __('Shop emails are misssing', 'wpshop') . '&nbsp;<a href="' . admin_url('options-general.php?page='.WPSHOP_URL_SLUG_OPTION.'#wpshop_emails_option') . '" class="button-primary wpshop_missing_parameters_button" >' . __('Configure shop emails', 'wpshop') . '</a></li>';
+		if (empty($emails)) {
+			$notice .= '<li>' . __('Shop emails are misssing', 'wpshop') . '&nbsp;<a href="' . admin_url('options-general.php?page=' . WPSHOP_URL_SLUG_OPTION . '#wpshop_emails_option') . '" class="button-primary wpshop_missing_parameters_button" >' . __('Configure shop emails', 'wpshop') . '</a></li>';
 		}
 
 
@@ -58,20 +58,20 @@ 
 			$messages_to_hide .= 'SLICKSHOP,';
 		}*/
 
-		$install = !empty( $_GET[ 'install' ] ) ? sanitize_text_field( $_GET[ 'install' ] ) : '';
+		$install = !empty($_GET['install']) ? sanitize_text_field($_GET['install']) : '';
 
-		if(!empty($notice) && ( empty( $install ) ) ) {
-			$notice='<p>'.__('You configure your shop to be a sale shop. But some configuration are missing for this type of shop using', 'wpshop').'</p><ul>'.$notice.'</ul>';
-			if ( !empty($messages_to_hide) ) {
-				$notice .= '<button data-nonce="' . wp_create_nonce( 'wps_hide_notice_messages' ) . '" class="wps_hide_notice_message button-secondary" id="wps_hide_notice_message">' .__('Hide this message', 'wpshop'). '</button>';
-				$notice .= '<input type="hidden" id="hide_messages_indicator" value="' .$messages_to_hide. '"/>';
+		if (!empty($notice) && (empty($install))) {
+			$notice = '<p>' . __('You configure your shop to be a sale shop. But some configuration are missing for this type of shop using', 'wpshop') . '</p><ul>' . $notice . '</ul>';
+			if (!empty($messages_to_hide)) {
+				$notice .= '<button data-nonce="' . wp_create_nonce('wps_hide_notice_messages') . '" class="wps_hide_notice_message button-secondary" id="wps_hide_notice_message">' . __('Hide this message', 'wpshop') . '</button>';
+				$notice .= '<input type="hidden" id="hide_messages_indicator" value="' . $messages_to_hide . '"/>';
 			}
 			self::admin_notice_container($notice, 'wpshop_shop_sale_type_notice');
 		}
 	}
 
 	/**		*/
-	public static function admin_notice_container($message, $container_class = ''){
+	public static function admin_notice_container($message, $container_class = '') {
 		?>
 		<div class="updated wpshop_admin_notice <?php echo $container_class; ?>" id="<?php echo $container_class; ?>" >
 			<h3><?php _e('Configure my shop', 'wpshop') ?></h3>

includes/librairies/install.class.php

Indentation +2396 added lines, -2396 removed lines

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

includes/modules/wps_media_manager/controller/wps_media_manager_backend_ctr.php

Spacing +33 added lines, -33 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_media_manager_backend_ctr {
 	/** Define the main directory containing the template for the current plugin
 	 * @var string
@@ -9,14 +9,14 @@ 
 		$this->template_dir = WPS_MEDIA_MANAGER_PATH . WPS_MEDIA_MANAGER_DIR . "/templates/";
 
 		// Add action to create custom type and custom taxonomy
-		add_action( 'add_meta_boxes', array($this, 'add_meta_box') );
-		add_action( 'save_post', array($this, 'save_post_actions') );
+		add_action('add_meta_boxes', array($this, 'add_meta_box'));
+		add_action('save_post', array($this, 'save_post_actions'));
 
 		// Add Scripts
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_backend' ) );
+		add_action('admin_enqueue_scripts', array($this, 'add_scripts_backend'));
 
 		// Ajax Actions
-		add_action( 'wp_ajax_display_pictures_in_backend', array( $this, 'wp_ajax_display_pictures_in_backend' ) );
+		add_action('wp_ajax_display_pictures_in_backend', array($this, 'wp_ajax_display_pictures_in_backend'));
 	}
 
 	/**
@@ -24,16 +24,16 @@ 
 	 */
 	function add_scripts_backend() {
 		global $current_screen;
-		if ( ! in_array( $current_screen->post_type, array( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ), true ) )
+		if (!in_array($current_screen->post_type, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT), true))
 			return;
 
-		wp_enqueue_script( 'jquery');
-		wp_enqueue_script( 'jquery-ui');
-		wp_enqueue_script( 'jquery-ui-sortable');
-		wp_enqueue_script( 'wps_media_manager_backend', WPS_MEDIA_MANAGER_URL . WPS_MEDIA_MANAGER_DIR .'/assets/js/wps_media_manager_backend.js');
+		wp_enqueue_script('jquery');
+		wp_enqueue_script('jquery-ui');
+		wp_enqueue_script('jquery-ui-sortable');
+		wp_enqueue_script('wps_media_manager_backend', WPS_MEDIA_MANAGER_URL . WPS_MEDIA_MANAGER_DIR . '/assets/js/wps_media_manager_backend.js');
 
-		wp_register_style( 'wps_media_manager_css_backend', WPS_MEDIA_MANAGER_URL . WPS_MEDIA_MANAGER_DIR .'/assets/css/wps_media_manager_backend.css' );
-		wp_enqueue_style( 'wps_media_manager_css_backend' );
+		wp_register_style('wps_media_manager_css_backend', WPS_MEDIA_MANAGER_URL . WPS_MEDIA_MANAGER_DIR . '/assets/css/wps_media_manager_backend.css');
+		wp_enqueue_style('wps_media_manager_css_backend');
 
 	}
 
@@ -41,7 +41,7 @@ 
 	 * Display meta Box in Project Custom Type
 	 */
 	function add_meta_box() {
-		add_meta_box('wps_media_manager', __('Media Manager', 'wpshop' ),array( $this, 'meta_box' ), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal','low');
+		add_meta_box('wps_media_manager', __('Media Manager', 'wpshop'), array($this, 'meta_box'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'low');
 	}
 
 	/**
@@ -50,51 +50,51 @@ 
 	function meta_box() {
 		global $post;
 		$media = '';
-		$media_id_data = get_post_meta( $post->ID, '_wps_product_media', true );
-		if( !empty($media_id_data) ) {
-			$media_id = explode( ',', $media_id_data );
+		$media_id_data = get_post_meta($post->ID, '_wps_product_media', true);
+		if (!empty($media_id_data)) {
+			$media_id = explode(',', $media_id_data);
 			ob_start();
-			require_once( wpshop_tools::get_template_part( WPS_MEDIA_MANAGER_DIR, $this->template_dir, "backend", "media_list") );
+			require_once(wpshop_tools::get_template_part(WPS_MEDIA_MANAGER_DIR, $this->template_dir, "backend", "media_list"));
 			$media = ob_get_contents();
 			ob_end_clean();
 		}
-		require_once( wpshop_tools::get_template_part( WPS_MEDIA_MANAGER_DIR, $this->template_dir, "backend", "meta_box") );
+		require_once(wpshop_tools::get_template_part(WPS_MEDIA_MANAGER_DIR, $this->template_dir, "backend", "meta_box"));
 	}
 
 	/**
 	 * AJAX - Display pictures in backend panel
 	 */
 	function wp_ajax_display_pictures_in_backend() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wp_ajax_display_pictures_in_backend' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wp_ajax_display_pictures_in_backend'))
 			wp_die();
 
 		$status = true; $response = '';
 		$media_indicator = !empty($_POST['media_id']) ? (int)$_POST['media_id'] : null;
-		if( !empty($media_indicator) ) {
-			$media_id = explode( ',', $media_indicator );
-			if( !empty($media_id) ) {
+		if (!empty($media_indicator)) {
+			$media_id = explode(',', $media_indicator);
+			if (!empty($media_id)) {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_MEDIA_MANAGER_DIR, $this->template_dir, "backend", "media_list") );
+				require(wpshop_tools::get_template_part(WPS_MEDIA_MANAGER_DIR, $this->template_dir, "backend", "media_list"));
 				$response = ob_get_contents();
 				ob_end_clean();
 			}
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 
 	// @TODO: NONCE et vérifier product_media
 	function save_post_actions() {
-		$post_type = !empty( $_POST['post_type'] ) ? sanitize_text_field( $_POST['post_type'] ) : '';
-		$product_media_form = !empty( $_POST['product_media_form'] ) ? sanitize_text_field( $_POST['product_media_form'] ) : '';
-		$action = !empty( $_POST['action'] ) ? sanitize_text_field( $_POST['action'] ) : '';
-		$product_media = !empty( $_POST['product_media'] ) ? sanitize_text_field( $_POST['product_media'] ) : '';
-		$post_ID = !empty( $_POST['post_ID'] ) ? (int) $_POST['post_ID'] : 0;
-
-		if ( !empty($post_type) && !empty($product_media_form) && $product_media_form == 'post' && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT && !empty( $action ) && $action != 'autosave' ) {
-			update_post_meta( $post_ID, '_wps_product_media', $product_media );
+		$post_type = !empty($_POST['post_type']) ? sanitize_text_field($_POST['post_type']) : '';
+		$product_media_form = !empty($_POST['product_media_form']) ? sanitize_text_field($_POST['product_media_form']) : '';
+		$action = !empty($_POST['action']) ? sanitize_text_field($_POST['action']) : '';
+		$product_media = !empty($_POST['product_media']) ? sanitize_text_field($_POST['product_media']) : '';
+		$post_ID = !empty($_POST['post_ID']) ? (int)$_POST['post_ID'] : 0;
+
+		if (!empty($post_type) && !empty($product_media_form) && $product_media_form == 'post' && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT && !empty($action) && $action != 'autosave') {
+			update_post_meta($post_ID, '_wps_product_media', $product_media);
 		}
 	}
 

Braces +9 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_media_manager_backend_ctr {
 	/** Define the main directory containing the template for the current plugin
 	 * @var string
@@ -24,8 +26,9 @@ 
 	 */
 	function add_scripts_backend() {
 		global $current_screen;
-		if ( ! in_array( $current_screen->post_type, array( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ), true ) )
-			return;
+		if ( ! in_array( $current_screen->post_type, array( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ), true ) ) {
+					return;
+		}
 
 		wp_enqueue_script( 'jquery');
 		wp_enqueue_script( 'jquery-ui');
@@ -67,8 +70,9 @@ 
 	function wp_ajax_display_pictures_in_backend() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wp_ajax_display_pictures_in_backend' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wp_ajax_display_pictures_in_backend' ) ) {
+					wp_die();
+		}
 
 		$status = true; $response = '';
 		$media_indicator = !empty($_POST['media_id']) ? (int)$_POST['media_id'] : null;

includes/modules/wps_payment_mode/wps_payment_mode.php

Spacing +72 added lines, -72 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * WPShop Payment Mode bootstrap file
  * @author Jérôme ALLEGRE - Eoxia dev team <dev@eoxia.com>
@@ -8,12 +8,12 @@ 
  *
  */
 
-if ( !class_exists("wps_payment_mode") ) {
+if (!class_exists("wps_payment_mode")) {
 
 	/** Template Global vars **/
 	DEFINE('WPS_PAYMENT_MODE_DIR', basename(dirname(__FILE__)));
-	DEFINE('WPS_PAYMENT_MODE_PATH', str_replace( "\\", "/", str_replace( WPS_PAYMENT_MODE_DIR, "", dirname( __FILE__ ) ) ) );
-	DEFINE('WPS_PAYMENT_MODE_URL', str_replace( str_replace( "\\", "/", ABSPATH), site_url() . '/', WPS_PAYMENT_MODE_PATH ) );
+	DEFINE('WPS_PAYMENT_MODE_PATH', str_replace("\\", "/", str_replace(WPS_PAYMENT_MODE_DIR, "", dirname(__FILE__))));
+	DEFINE('WPS_PAYMENT_MODE_URL', str_replace(str_replace("\\", "/", ABSPATH), site_url() . '/', WPS_PAYMENT_MODE_PATH));
 
 
 	class wps_payment_mode {
@@ -32,55 +32,55 @@ 
 			$this->template_dir = WPS_PAYMENT_MODE_PATH . WPS_PAYMENT_MODE_DIR . "/templates/";
 
 			/** Checking Payment Mode Option **/
-			$payment_option = get_option( 'wps_payment_mode' );
-			if ( empty($payment_option) ) {
+			$payment_option = get_option('wps_payment_mode');
+			if (empty($payment_option)) {
 				self::migrate_payment_modes();
 			}
 
 			/** Check if SystemPay is registred in Payment Main Option **/
-			$payment_option = get_option( 'wps_payment_mode' );
-			if ( !empty($payment_option) && !empty($payment_option['mode']) && !array_key_exists('checks', $payment_option['mode']) ) {
+			$payment_option = get_option('wps_payment_mode');
+			if (!empty($payment_option) && !empty($payment_option['mode']) && !array_key_exists('checks', $payment_option['mode'])) {
 				$payment_option['mode']['checks']['name'] = __('Checks', 'wpshop');
-				$payment_option['mode']['checks']['logo'] = WPSHOP_TEMPLATES_URL.'wpshop/medias/cheque.png';
+				$payment_option['mode']['checks']['logo'] = WPSHOP_TEMPLATES_URL . 'wpshop/medias/cheque.png';
 				$payment_option['mode']['checks']['description'] = __('Reservation of products upon receipt of the check.', 'wpshop');
-				update_option( 'wps_payment_mode', $payment_option );
+				update_option('wps_payment_mode', $payment_option);
 			}
 
-			if ( !empty($payment_option) && !empty($payment_option['mode']) && !array_key_exists('banktransfer', $payment_option['mode']) ) {
+			if (!empty($payment_option) && !empty($payment_option['mode']) && !array_key_exists('banktransfer', $payment_option['mode'])) {
 				$payment_modes['mode']['banktransfer']['name'] = __('Banktransfer', 'wpshop');
-				$payment_modes['mode']['banktransfer']['logo'] = WPSHOP_TEMPLATES_URL.'wpshop/medias/cheque.png';
+				$payment_modes['mode']['banktransfer']['logo'] = WPSHOP_TEMPLATES_URL . 'wpshop/medias/cheque.png';
 				$payment_modes['mode']['banktransfer']['description'] = __('Reservation of products upon confirmation of payment.', 'wpshop');
-				update_option( 'wps_payment_mode', $payment_option );
+				update_option('wps_payment_mode', $payment_option);
 			}
 
-			add_action( 'wp_enqueue_scripts', array( $this, 'add_script') );
-			add_action( 'admin_enqueue_scripts', array( $this, 'add_admin_scripts') );
+			add_action('wp_enqueue_scripts', array($this, 'add_script'));
+			add_action('admin_enqueue_scripts', array($this, 'add_admin_scripts'));
 
 			/** Create Options **/
-			add_action('wsphop_options', array(&$this, 'create_options') );
+			add_action('wsphop_options', array(&$this, 'create_options'));
 
-			add_filter( 'wps_payment_mode_interface_checks', array( &$this, 'display_interface_check') );
-			add_filter( 'wps_payment_mode_interface_banktransfer', array( &$this, 'display_admin_interface_banktransfer') );
-			add_filter( 'wps_payment_mode_interface_cic', array( 'wpshop_CIC', 'display_admin_part') );
+			add_filter('wps_payment_mode_interface_checks', array(&$this, 'display_interface_check'));
+			add_filter('wps_payment_mode_interface_banktransfer', array(&$this, 'display_admin_interface_banktransfer'));
+			add_filter('wps_payment_mode_interface_cic', array('wpshop_CIC', 'display_admin_part'));
 
-			add_shortcode( 'wps_payment', array( &$this, 'display_payment_modes' ));
+			add_shortcode('wps_payment', array(&$this, 'display_payment_modes'));
 
 		}
 
 		function add_script() {
-			wp_enqueue_script( 'jquery');
-			wp_enqueue_script( 'wps_payment_mode', plugins_url('assets/frontend/js/wps_payment_mode.js', __FILE__) );
+			wp_enqueue_script('jquery');
+			wp_enqueue_script('wps_payment_mode', plugins_url('assets/frontend/js/wps_payment_mode.js', __FILE__));
 		}
 
 		function add_admin_scripts($hook) {
-			if( $hook != 'settings_page_wpshop_option' )
+			if ($hook != 'settings_page_wpshop_option')
 				return;
 
 			add_thickbox();
-			wp_enqueue_script( 'jquery');
+			wp_enqueue_script('jquery');
 			wp_enqueue_script('jquery-ui');
 			wp_enqueue_script('jquery-ui-sortable');
-			wp_enqueue_script( 'wps_payment_mode_js', plugins_url('assets/backend/js/wps_payment_mode.js', __FILE__) );
+			wp_enqueue_script('wps_payment_mode_js', plugins_url('assets/backend/js/wps_payment_mode.js', __FILE__));
 		}
 
 
@@ -98,25 +98,25 @@ 
 		 * @param array $input
 		 * @return array
 		 */
-		function wps_validate_payment_option( $input ) {
-			if( is_array($input) ) {
-				foreach( $input['mode'] as $mode_key => $mode_config ) {
-					if ( !empty($_FILES[$mode_key.'_logo']['name']) && empty($_FILES[$mode_key.'_logo']['error']) ) {
-						$filename = $_FILES[$mode_key.'_logo'];
-						$upload  = wp_handle_upload($filename, array('test_form' => false));
-						$wp_filetype = wp_check_filetype(basename($filename['name']), null );
+		function wps_validate_payment_option($input) {
+			if (is_array($input)) {
+				foreach ($input['mode'] as $mode_key => $mode_config) {
+					if (!empty($_FILES[$mode_key . '_logo']['name']) && empty($_FILES[$mode_key . '_logo']['error'])) {
+						$filename = $_FILES[$mode_key . '_logo'];
+						$upload = wp_handle_upload($filename, array('test_form' => false));
+						$wp_filetype = wp_check_filetype(basename($filename['name']), null);
 						$wp_upload_dir = wp_upload_dir();
 						$attachment = array(
-								'guid' => $wp_upload_dir['url'] . '/' . basename( $filename['name'] ),
+								'guid' => $wp_upload_dir['url'] . '/' . basename($filename['name']),
 								'post_mime_type' => $wp_filetype['type'],
 								'post_title' => preg_replace(' /\.[^.]+$/', '', basename($filename['name'])),
 								'post_content' => '',
 								'post_status' => 'inherit'
 						);
-						$attach_id = wp_insert_attachment( $attachment, $upload['file']);
+						$attach_id = wp_insert_attachment($attachment, $upload['file']);
 						require_once(ABSPATH . 'wp-admin/includes/image.php');
-						$attach_data = wp_generate_attachment_metadata( $attach_id, $upload['file'] );
-						wp_update_attachment_metadata( $attach_id, $attach_data );
+						$attach_data = wp_generate_attachment_metadata($attach_id, $upload['file']);
+						wp_update_attachment_metadata($attach_id, $attach_data);
 
 						$input['mode'][$mode_key]['logo'] = $attach_id;
 					}
@@ -130,68 +130,68 @@ 
 		 */
 		function display_payment_modes_in_admin() {
 			$output = '';
-			$payment_option = get_option( 'wps_payment_mode' );
+			$payment_option = get_option('wps_payment_mode');
 
-			require_once( wpshop_tools::get_template_part( WPS_PAYMENT_MODE_DIR, $this->template_dir, "backend", "payment-modes") );
+			require_once(wpshop_tools::get_template_part(WPS_PAYMENT_MODE_DIR, $this->template_dir, "backend", "payment-modes"));
 
 		}
 
 
 		public static function migrate_payment_modes() {
 			$payment_modes = array();
-			$payment_option = get_option( 'wpshop_paymentMethod' );
+			$payment_option = get_option('wpshop_paymentMethod');
 			$methods = array();
-			$methods['display_position']['paypal'] = ( !empty($payment_option) && !empty($payment_option['paypal']) ) ? 'on' : '';
-			$methods['display_position']['checks'] = ( !empty($payment_option) && !empty($payment_option['checks']) ) ? 'on' : '';
-			$methods['display_position']['banktransfer'] = ( !empty($payment_option) && !empty($payment_option['banktransfer']) ) ? 'on' : '';
-			$methods['default_method'] = ( !empty($payment_option['default_method']) ) ? $payment_option['default_method'] : 'checks';
-
-			if ( !empty($payment_option['display_position']) ) {
-				$methods['display_position'] = array_merge( $methods['display_position'], $payment_option['display_position'] );
-				foreach( $methods['display_position'] as $k => $v ) {
-					if ( !empty($payment_option[$k]) ) {
+			$methods['display_position']['paypal'] = (!empty($payment_option) && !empty($payment_option['paypal'])) ? 'on' : '';
+			$methods['display_position']['checks'] = (!empty($payment_option) && !empty($payment_option['checks'])) ? 'on' : '';
+			$methods['display_position']['banktransfer'] = (!empty($payment_option) && !empty($payment_option['banktransfer'])) ? 'on' : '';
+			$methods['default_method'] = (!empty($payment_option['default_method'])) ? $payment_option['default_method'] : 'checks';
+
+			if (!empty($payment_option['display_position'])) {
+				$methods['display_position'] = array_merge($methods['display_position'], $payment_option['display_position']);
+				foreach ($methods['display_position'] as $k => $v) {
+					if (!empty($payment_option[$k])) {
 						$methods['display_position'][$k] = $payment_option[$k];
 					}
 				}
 			}
 
-			if ( !empty($methods) && !empty($methods['display_position']) ) {
-				foreach( $methods['display_position'] as $key => $value ) {
-						$payment_modes['mode'][$key]['active'] = ( !empty($methods['display_position'][ $key ]) && $methods['display_position'][ $key ] == 'on' ) ? $methods['display_position'][ $key ] : '';
-						switch( $key ) {
+			if (!empty($methods) && !empty($methods['display_position'])) {
+				foreach ($methods['display_position'] as $key => $value) {
+						$payment_modes['mode'][$key]['active'] = (!empty($methods['display_position'][$key]) && $methods['display_position'][$key] == 'on') ? $methods['display_position'][$key] : '';
+						switch ($key) {
 							case 'paypal' :
 								$payment_modes['mode'][$key]['name'] = __('Paypal', 'wpshop');
-								$payment_modes['mode'][$key]['logo'] = WPSHOP_TEMPLATES_URL.'wpshop/medias/paypal.png';
+								$payment_modes['mode'][$key]['logo'] = WPSHOP_TEMPLATES_URL . 'wpshop/medias/paypal.png';
 								$payment_modes['mode'][$key]['description'] = __('Tips : If you have a Paypal account, by choosing this payment method, you will be redirected to the secure payment site Paypal to make your payment. Debit your PayPal account, immediate booking products.', 'wpshop');
 							break;
 							case 'banktransfer' :
 								$payment_modes['mode'][$key]['name'] = __('Banktransfer', 'wpshop');
-								$payment_modes['mode'][$key]['logo'] = WPSHOP_TEMPLATES_URL.'wpshop/medias/cheque.png';
+								$payment_modes['mode'][$key]['logo'] = WPSHOP_TEMPLATES_URL . 'wpshop/medias/cheque.png';
 								$payment_modes['mode'][$key]['description'] = __('Reservation of products upon confirmation of payment.', 'wpshop');
 							break;
 							case 'checks' :
 								$payment_modes['mode'][$key]['name'] = __('Checks', 'wpshop');
-								$payment_modes['mode'][$key]['logo'] = WPSHOP_TEMPLATES_URL.'wpshop/medias/cheque.png';
+								$payment_modes['mode'][$key]['logo'] = WPSHOP_TEMPLATES_URL . 'wpshop/medias/cheque.png';
 								$payment_modes['mode'][$key]['description'] = __('Reservation of products upon receipt of the check.', 'wpshop');
 								$payment_modes['mode'][$key]['active'] = 'on';
 							break;
 							case 'systempay' :
 								$payment_modes['mode'][$key]['name'] = __('Systempay', 'wpshop');
-								$payment_modes['mode'][$key]['logo'] = plugins_url().'/wpshop_systemPay/img/systemPay.png';
+								$payment_modes['mode'][$key]['logo'] = plugins_url() . '/wpshop_systemPay/img/systemPay.png';
 								$payment_modes['mode'][$key]['description'] = __('SystemPay - Banque Populaire', 'wpshop_systemPay');
 							break;
 							case 'cic' :
 								$payment_modes['mode'][$key]['name'] = __('CIC', 'wpshop');
-								$payment_modes['mode'][$key]['logo'] = WPSHOP_TEMPLATES_URL.'wpshop/medias/cic_payment_logo.jpg';
+								$payment_modes['mode'][$key]['logo'] = WPSHOP_TEMPLATES_URL . 'wpshop/medias/cic_payment_logo.jpg';
 								$payment_modes['mode'][$key]['description'] = __('Reservation of products upon confirmation of payment.', 'wpshop');
 							break;
 						}
 				}
 
-				if ( $methods['default_method'] ) {
+				if ($methods['default_method']) {
 					$payment_modes['default_choice'] = $methods['default_method'];
 				}
-				update_option( 'wps_payment_mode', $payment_modes);
+				update_option('wps_payment_mode', $payment_modes);
 			}
 
 		}
@@ -212,31 +212,31 @@ 
 
 			$wpshop_paymentMethod_options = get_option('wpshop_paymentMethod_options');
 			$output  = '<div class="wps-boxed">';
-			$output .= '<div class="wps-form-group"><label>'.__('Bank name', 'wpshop').'</label><div class="wps-form"><input name="wpshop_paymentMethod_options[banktransfer][bank_name]" type="text" value="'.(!empty($wpshop_paymentMethod_options) && !empty($wpshop_paymentMethod_options['banktransfer']) && !empty($wpshop_paymentMethod_options['banktransfer']['bank_name'])?$wpshop_paymentMethod_options['banktransfer']['bank_name']:'').'" /></div></div>';
-			$output .= '<div class="wps-form-group"><label>'.__('IBAN', 'wpshop').'</label><div class="wps-form"><input name="wpshop_paymentMethod_options[banktransfer][iban]" type="text" value="'.(!empty($wpshop_paymentMethod_options) && !empty($wpshop_paymentMethod_options['banktransfer']) && !empty($wpshop_paymentMethod_options['banktransfer']['iban'])?$wpshop_paymentMethod_options['banktransfer']['iban']:'').'" /></div></div>';
-			$output .= '<div class="wps-form-group"><label>'.__('BIC/SWIFT', 'wpshop').'</label><div class="wps-form"><input name="wpshop_paymentMethod_options[banktransfer][bic]" type="text" value="'.(!empty($wpshop_paymentMethod_options) && !empty($wpshop_paymentMethod_options['banktransfer']) && !empty($wpshop_paymentMethod_options['banktransfer']['bic'])?$wpshop_paymentMethod_options['banktransfer']['bic']:'').'" /></div></div>';
-			$output .= '<div class="wps-form-group"><label>'.__('Account owner name', 'wpshop').'</label><div class="wps-form"><input name="wpshop_paymentMethod_options[banktransfer][accountowner]" type="text" value="'.(!empty($wpshop_paymentMethod_options) && !empty($wpshop_paymentMethod_options['banktransfer']) && !empty($wpshop_paymentMethod_options['banktransfer']['accountowner'])?$wpshop_paymentMethod_options['banktransfer']['accountowner']:'').'" /></div></div>';
+			$output .= '<div class="wps-form-group"><label>' . __('Bank name', 'wpshop') . '</label><div class="wps-form"><input name="wpshop_paymentMethod_options[banktransfer][bank_name]" type="text" value="' . (!empty($wpshop_paymentMethod_options) && !empty($wpshop_paymentMethod_options['banktransfer']) && !empty($wpshop_paymentMethod_options['banktransfer']['bank_name']) ? $wpshop_paymentMethod_options['banktransfer']['bank_name'] : '') . '" /></div></div>';
+			$output .= '<div class="wps-form-group"><label>' . __('IBAN', 'wpshop') . '</label><div class="wps-form"><input name="wpshop_paymentMethod_options[banktransfer][iban]" type="text" value="' . (!empty($wpshop_paymentMethod_options) && !empty($wpshop_paymentMethod_options['banktransfer']) && !empty($wpshop_paymentMethod_options['banktransfer']['iban']) ? $wpshop_paymentMethod_options['banktransfer']['iban'] : '') . '" /></div></div>';
+			$output .= '<div class="wps-form-group"><label>' . __('BIC/SWIFT', 'wpshop') . '</label><div class="wps-form"><input name="wpshop_paymentMethod_options[banktransfer][bic]" type="text" value="' . (!empty($wpshop_paymentMethod_options) && !empty($wpshop_paymentMethod_options['banktransfer']) && !empty($wpshop_paymentMethod_options['banktransfer']['bic']) ? $wpshop_paymentMethod_options['banktransfer']['bic'] : '') . '" /></div></div>';
+			$output .= '<div class="wps-form-group"><label>' . __('Account owner name', 'wpshop') . '</label><div class="wps-form"><input name="wpshop_paymentMethod_options[banktransfer][accountowner]" type="text" value="' . (!empty($wpshop_paymentMethod_options) && !empty($wpshop_paymentMethod_options['banktransfer']) && !empty($wpshop_paymentMethod_options['banktransfer']['accountowner']) ? $wpshop_paymentMethod_options['banktransfer']['accountowner'] : '') . '" /></div></div>';
 			$output .= '</div>';
 			return $output;
 		}
 
 		function display_payment_modes() {
 			$output = '';
-			$payment_modes = get_option( 'wps_payment_mode' );
+			$payment_modes = get_option('wps_payment_mode');
 
-			if ( !empty($payment_modes) && !empty($payment_modes['mode']) ) {
-				$default_choice = ( !empty($payment_modes['default_choice']) ) ? $payment_modes['default_choice'] : '';
+			if (!empty($payment_modes) && !empty($payment_modes['mode'])) {
+				$default_choice = (!empty($payment_modes['default_choice'])) ? $payment_modes['default_choice'] : '';
 				$payment_modes = $payment_modes['mode'];
 				$tmp_array = array();
-				foreach( $payment_modes as $payment_mode_id => $payment_mode ) {
-					if( !empty($payment_mode['active']) ) {
-						$tmp_array[ $payment_mode_id ] = $payment_mode;
+				foreach ($payment_modes as $payment_mode_id => $payment_mode) {
+					if (!empty($payment_mode['active'])) {
+						$tmp_array[$payment_mode_id] = $payment_mode;
 					}
 				}
-				$payment_modes = apply_filters( 'wps-paymentmode-filter', $tmp_array );
+				$payment_modes = apply_filters('wps-paymentmode-filter', $tmp_array);
 
 				ob_start();
-				require_once( wpshop_tools::get_template_part( WPS_PAYMENT_MODE_DIR, $this->template_dir, "frontend", "payment-modes") );
+				require_once(wpshop_tools::get_template_part(WPS_PAYMENT_MODE_DIR, $this->template_dir, "frontend", "payment-modes"));
 				$output = ob_get_contents();
 				ob_end_clean();
 			}
@@ -249,6 +249,6 @@ 
 }
 
 /**	Instanciate the module utilities if not	*/
-if ( class_exists("wps_payment_mode") ) {
+if (class_exists("wps_payment_mode")) {
 	$wps_shipping_mode = new wps_payment_mode();
 }

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * WPShop Payment Mode bootstrap file
  * @author Jérôme ALLEGRE - Eoxia dev team <dev@eoxia.com>
@@ -73,8 +75,9 @@ 
 		}
 
 		function add_admin_scripts($hook) {
-			if( $hook != 'settings_page_wpshop_option' )
-				return;
+			if( $hook != 'settings_page_wpshop_option' ) {
+							return;
+			}
 
 			add_thickbox();
 			wp_enqueue_script( 'jquery');

includes/modules/wps_cart/controller/wps_cart_ctr.php

Spacing +302 added lines, -302 removed lines

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

Braces +54 added lines, -64 removed lines

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

includes/modules/wps_cart/templates/frontend/cart/cart-total.php

Spacing +74 added lines, -74 removed lines

@@ -1,29 +1,29 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wps-cart-cartouche">
 	<div class="wps-cart-message">
-		<?php if( $cart_type != 'admin-panel' ) : ?>
-			<?php if ( !empty($cart_type) && $cart_type == 'summary' && !$account_origin ) : ?>
-				<?php $url_step_one = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_checkout_page_id') ) ); ?>
-				<?php printf( __( 'You have forget an item ? <a href="%s">Modify your cart !</a>', 'wpshop'), $url_step_one ); ?>
+		<?php if ($cart_type != 'admin-panel') : ?>
+			<?php if (!empty($cart_type) && $cart_type == 'summary' && !$account_origin) : ?>
+				<?php $url_step_one = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'))); ?>
+				<?php printf(__('You have forget an item ? <a href="%s">Modify your cart !</a>', 'wpshop'), $url_step_one); ?>
 			<?php else : ?>
-				<?php if( !$account_origin ) :
+				<?php if (!$account_origin) :
 							echo do_shortcode('[wps_apply_coupon]');
 						else : ?>
-					<button id="<?php echo $oid; ?>" class="wps-bton-first-mini-rounded make_order_again" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_restart_the_order' ); ?>"><?php _e( 'Make this order again', 'wpshop'); ?></button>
+					<button id="<?php echo $oid; ?>" class="wps-bton-first-mini-rounded make_order_again" data-nonce="<?php echo wp_create_nonce('ajax_wpshop_restart_the_order'); ?>"><?php _e('Make this order again', 'wpshop'); ?></button>
 				<?php endif; ?>
-				<?php if( !empty($tracking) ) : ?>
+				<?php if (!empty($tracking)) : ?>
 					<p><br />
-					<?php if( !empty($tracking['number']) ) : ?>
-						<strong><?php _e('Tracking number','wpshop'); ?> :</strong> <?php _e($tracking['number']); ?><br />
+					<?php if (!empty($tracking['number'])) : ?>
+						<strong><?php _e('Tracking number', 'wpshop'); ?> :</strong> <?php _e($tracking['number']); ?><br />
 					<?php endif; ?>
-					<?php if( !empty($tracking['link']) ) : ?>
+					<?php if (!empty($tracking['link'])) : ?>
 						<?php /** Check if http:// it's found in the link */
 						$url = $tracking['link'];
-						if('http://' != substr($url, 0, 7))
+						if ('http://' != substr($url, 0, 7))
 							$url = 'http://' . $url;
 						?>
-						<a class="wps-bton-fourth-mini-rounded" href="<?php echo $url; ?>" target="_blank"><?php _e('Tracking link','wpshop'); ?></a>
+						<a class="wps-bton-fourth-mini-rounded" href="<?php echo $url; ?>" target="_blank"><?php _e('Tracking link', 'wpshop'); ?></a>
 					<?php endif; ?>
 					</p>
 				<?php endif; ?>
@@ -31,141 +31,141 @@ 
 		<?php endif; ?>
 	</div><!-- wps-cart-message -->
 	<div class="wps-cart-total">
-		<?php $shipping_price_from = get_option( 'wpshop_shipping_cost_from' ); ?>
+		<?php $shipping_price_from = get_option('wpshop_shipping_cost_from'); ?>
 
 		<!--	Recap shipping	-->
 
-		<?php if( $cart_option == 'full_cart' || $cart_option == 'simplified_et' || $price_piloting == 'HT' ) : ?>
+		<?php if ($cart_option == 'full_cart' || $cart_option == 'simplified_et' || $price_piloting == 'HT') : ?>
 			<p>
-				<?php _e( 'Shipping cost ET', 'wpshop'); ?> <?php echo ( ( !empty($shipping_price_from) && empty( $_SESSION['shipping_address'] ) ) ? '<br/><i>('.__( 'From', 'wpshop').')</i>' : '' ); ?>
+				<?php _e('Shipping cost ET', 'wpshop'); ?> <?php echo ((!empty($shipping_price_from) && empty($_SESSION['shipping_address'])) ? '<br/><i>(' . __('From', 'wpshop') . ')</i>' : ''); ?>
 				<span class="wps-alignRight">
-					<?php if( $cart_type != 'admin-panel' ) : ?>
-						<strong><?php echo wpshop_tools::formate_number( $shipping_cost_et ); ?></strong> <?php echo $currency; ?>
+					<?php if ($cart_type != 'admin-panel') : ?>
+						<strong><?php echo wpshop_tools::formate_number($shipping_cost_et); ?></strong> <?php echo $currency; ?>
 					<?php else : ?>
-						<?php if( ( empty( $cart_content['order_status'] ) || ( $cart_content['order_status'] == 'awaiting_payment' ) || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) && $price_piloting == 'HT' ) : ?>
-							<input type="text" size="5" value="<?php echo number_format( $shipping_cost_et, 2 ); ?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
+						<?php if ((empty($cart_content['order_status']) || ($cart_content['order_status'] == 'awaiting_payment') || ((!empty($cart_content['cart_type']) && $cart_content['cart_type'] == 'quotation') && $cart_content['order_status'] != 'completed')) && $price_piloting == 'HT') : ?>
+							<input type="text" size="5" value="<?php echo number_format($shipping_cost_et, 2); ?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
 						<?php else : ?>
-							<strong><?php echo wpshop_tools::formate_number( $shipping_cost_et ); ?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
+							<strong><?php echo wpshop_tools::formate_number($shipping_cost_et); ?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
 						<?php endif; ?>
 					<?php endif; ?>
 				</span>
 			</p>
 		<?php endif; ?>
 
-		<?php if( $cart_option == 'full_cart' ) : ?>
+		<?php if ($cart_option == 'full_cart') : ?>
 			<p>
-				<?php _e( 'VAT on Shipping cost', 'wpshop'); ?>
+				<?php _e('VAT on Shipping cost', 'wpshop'); ?>
 				<span class="wps-alignRight">
-					<strong><?php echo wpshop_tools::formate_number( $shipping_cost_vat ); ?></strong> <?php echo $currency; ?>
+					<strong><?php echo wpshop_tools::formate_number($shipping_cost_vat); ?></strong> <?php echo $currency; ?>
 				</span>
 			</p>
 		<?php endif; ?>
 
-		<?php if( $cart_option == 'full_cart' || $cart_option == 'simplified_ati' || $price_piloting == 'TTC' ) : ?>
+		<?php if ($cart_option == 'full_cart' || $cart_option == 'simplified_ati' || $price_piloting == 'TTC') : ?>
 			<p>
-				<?php _e( 'Shipping cost', 'wpshop'); ?> <?php echo ( ( !empty($shipping_price_from) && empty( $_SESSION['shipping_address'] ) ) ? '<br/><i>('.__( 'From', 'wpshop').')</i>' : '' ); ?>
+				<?php _e('Shipping cost', 'wpshop'); ?> <?php echo ((!empty($shipping_price_from) && empty($_SESSION['shipping_address'])) ? '<br/><i>(' . __('From', 'wpshop') . ')</i>' : ''); ?>
 				<span class="wps-alignRight">
-					<?php if( $cart_type != 'admin-panel' ) : ?>
-						<strong><?php echo wpshop_tools::formate_number( $shipping_cost_ati ); ?></strong> <?php echo $currency; ?>
+					<?php if ($cart_type != 'admin-panel') : ?>
+						<strong><?php echo wpshop_tools::formate_number($shipping_cost_ati); ?></strong> <?php echo $currency; ?>
 					<?php else : ?>
-						<?php if( ( empty( $cart_content['order_status'] ) || ( $cart_content['order_status'] == 'awaiting_payment' ) || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) && $price_piloting == 'TTC' ) : ?>
-							<input type="text" size="5" value="<?php echo number_format( $shipping_cost_ati, 2 ); ?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
+						<?php if ((empty($cart_content['order_status']) || ($cart_content['order_status'] == 'awaiting_payment') || ((!empty($cart_content['cart_type']) && $cart_content['cart_type'] == 'quotation') && $cart_content['order_status'] != 'completed')) && $price_piloting == 'TTC') : ?>
+							<input type="text" size="5" value="<?php echo number_format($shipping_cost_ati, 2); ?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
 						<?php else : ?>
-							<strong><?php echo wpshop_tools::formate_number( $shipping_cost_ati ); ?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
+							<strong><?php echo wpshop_tools::formate_number($shipping_cost_ati); ?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
 						<?php endif; ?>
 					<?php endif; ?>
 				</span>
 			</p>
 		<?php endif; ?>
 
-		<?php if( $cart_option == 'full_cart' && !empty($cart_content['order_tva']) ) : ?>
-		<?php foreach( $cart_content['order_tva'] as $order_vat_rate => $order_vat_value ) :
-				if( $order_vat_rate != 'VAT_shipping_cost') :
+		<?php if ($cart_option == 'full_cart' && !empty($cart_content['order_tva'])) : ?>
+		<?php foreach ($cart_content['order_tva'] as $order_vat_rate => $order_vat_value) :
+				if ($order_vat_rate != 'VAT_shipping_cost') :
 					?>
 					<p>
-						<?php printf( __( 'VAT (%s %%)', 'wpshop'), $order_vat_rate); ?>
+						<?php printf(__('VAT (%s %%)', 'wpshop'), $order_vat_rate); ?>
 						<span class="wps-alignRight">
-							<strong><?php echo wpshop_tools::formate_number( $order_vat_value ); ?></strong> <?php echo $currency; ?>
+							<strong><?php echo wpshop_tools::formate_number($order_vat_value); ?></strong> <?php echo $currency; ?>
 						</span>
 					</p>
 					<?php
 				endif;
 		endforeach; ?>
 		<?php endif; ?>
-			<?php if( !empty($cart_content['order_discount_value']) || ( $cart_type == 'admin-panel' ) ) : ?>
+			<?php if (!empty($cart_content['order_discount_value']) || ($cart_type == 'admin-panel')) : ?>
 				<p>
-					<?php _e( 'Discount', 'wpshop'); ?>
+					<?php _e('Discount', 'wpshop'); ?>
 					<span class="wps-alignRight">
-						<?php if( ( $cart_type == 'admin-panel' ) && ( empty( $cart_content['order_status'] ) || $cart_content['order_status'] == 'awaiting_payment' || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) ) : ?>
-							<input type="text" id="wps-orders-discount-value" size="5" style="text-align : right" value="<?php echo ( !empty($cart_content['order_discount_value']) ) ? $cart_content['order_discount_value'] : number_format( 0, 2 ); ?>"/>
+						<?php if (($cart_type == 'admin-panel') && (empty($cart_content['order_status']) || $cart_content['order_status'] == 'awaiting_payment' || ((!empty($cart_content['cart_type']) && $cart_content['cart_type'] == 'quotation') && $cart_content['order_status'] != 'completed'))) : ?>
+							<input type="text" id="wps-orders-discount-value" size="5" style="text-align : right" value="<?php echo (!empty($cart_content['order_discount_value'])) ? $cart_content['order_discount_value'] : number_format(0, 2); ?>"/>
 						<?php else : ?>
-							<?php if( !empty($cart_content['order_discount_value']) ) : ?>
-								<strong><?php echo $cart_content['order_discount_value']; ?> <?php echo ( !empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'percent' ) ? '%' : wpshop_tools::wpshop_get_currency(); ?></strong>
+							<?php if (!empty($cart_content['order_discount_value'])) : ?>
+								<strong><?php echo $cart_content['order_discount_value']; ?> <?php echo (!empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'percent') ? '%' : wpshop_tools::wpshop_get_currency(); ?></strong>
 							<?php else : ?>
 								0 <?php echo wpshop_tools::wpshop_get_currency(); ?>
 							<?php endif; ?>
 						<?php endif; ?>
 					</span>
 				</p>
-				<?php if( ( $cart_type == 'admin-panel' ) && ( empty( $cart_content['order_status'] ) || $cart_content['order_status'] == 'awaiting_payment' || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) ) : ?>
+				<?php if (($cart_type == 'admin-panel') && (empty($cart_content['order_status']) || $cart_content['order_status'] == 'awaiting_payment' || ((!empty($cart_content['cart_type']) && $cart_content['cart_type'] == 'quotation') && $cart_content['order_status'] != 'completed'))) : ?>
 					<p>
-						<?php _e( 'Discount type', 'wpshop'); ?>
+						<?php _e('Discount type', 'wpshop'); ?>
 						<span class="wps-alignRight">
 							<select id="wps-orders-discount-type">
-								<option value="percent" <?php echo ( !empty($cart_content) && !empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'percent' ) ? 'selected="selected"' : ''; ?>>%</option>
-								<option value="amount" <?php echo ( !empty($cart_content) && !empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'amount' ) ? 'selected="selected"' : ''; ?>><?php echo wpshop_tools::wpshop_get_currency(); ?></option>
+								<option value="percent" <?php echo (!empty($cart_content) && !empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'percent') ? 'selected="selected"' : ''; ?>>%</option>
+								<option value="amount" <?php echo (!empty($cart_content) && !empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'amount') ? 'selected="selected"' : ''; ?>><?php echo wpshop_tools::wpshop_get_currency(); ?></option>
 							</select>
 						</span>
 					</p>
 				<?php endif; ?>
 			<?php endif; ?>
 
-			<?php if ( !empty( $cart_content['coupon_id']) ) : ?>
-			<p><?php _e( 'Total ATI before discount', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $order_totla_before_discount ); ?></strong> <?php echo $currency; ?></span></p>
-			<p><?php _e( 'Discount', 'wpshop'); ?> (<?php echo $coupon_title; ?>) <span class="wps-alignRight"><strong><?php echo $coupon_value; ?></strong><?php echo $currency; ?></span></p>
+			<?php if (!empty($cart_content['coupon_id'])) : ?>
+			<p><?php _e('Total ATI before discount', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($order_totla_before_discount); ?></strong> <?php echo $currency; ?></span></p>
+			<p><?php _e('Discount', 'wpshop'); ?> (<?php echo $coupon_title; ?>) <span class="wps-alignRight"><strong><?php echo $coupon_value; ?></strong><?php echo $currency; ?></span></p>
 			<?php endif; ?>
 
-			<?php if( !empty($_SESSION['cart']['order_partial_payment']) ) :
-				$wps_partial_payment_data = get_option( 'wpshop_payment_partial' );
-				if( !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' ) {
+			<?php if (!empty($_SESSION['cart']['order_partial_payment'])) :
+				$wps_partial_payment_data = get_option('wpshop_payment_partial');
+				if (!empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') {
 					$partial_payment_informations = $wps_partial_payment_data['for_quotation'];
 				} else {
 					$partial_payment_informations = $wps_partial_payment_data['for_all'];
 				}
-				$partial_payment_amount =  $_SESSION['cart']['order_partial_payment'];
+				$partial_payment_amount = $_SESSION['cart']['order_partial_payment'];
 			?>
-				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $cart_content['order_grand_total'] ); ?></strong> <?php echo $currency; ?></span></p>
+				<p class="wps-hightlight"><?php _e('Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($cart_content['order_grand_total']); ?></strong> <?php echo $currency; ?></span></p>
 				<p class="wps-hightlight">
-				<?php printf(__('Payable now %s','wpshop'), '(' . $partial_payment_informations['value'] . ( ( !empty($partial_payment_informations['type']) && $partial_payment_informations['type'] == 'percentage' ) ? '%': wpshop_tools::wpshop_get_currency( false ) ) . ')'); ?>
-				<span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $partial_payment_amount ); ?></strong> <?php echo $currency; ?>
+				<?php printf(__('Payable now %s', 'wpshop'), '(' . $partial_payment_informations['value'] . ((!empty($partial_payment_informations['type']) && $partial_payment_informations['type'] == 'percentage') ? '%' : wpshop_tools::wpshop_get_currency(false)) . ')'); ?>
+				<span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($partial_payment_amount); ?></strong> <?php echo $currency; ?>
 				</span></p>
-			<?php elseif ( !empty( $cart_content ) && !empty( $cart_content[ 'order_status'] ) && ( 'partially_paid' == $cart_content[ 'order_status' ] ) && !empty( $cart_content[ 'order_payment' ] ) && !empty( $cart_content[ 'order_payment' ][ 'received' ] ) ) : ?>
-				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $cart_content['order_grand_total'] ); ?></strong> <?php echo $currency; ?></span></p>
+			<?php elseif (!empty($cart_content) && !empty($cart_content['order_status']) && ('partially_paid' == $cart_content['order_status']) && !empty($cart_content['order_payment']) && !empty($cart_content['order_payment']['received'])) : ?>
+				<p class="wps-hightlight"><?php _e('Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($cart_content['order_grand_total']); ?></strong> <?php echo $currency; ?></span></p>
 				<?php $allready_received_amount = 0; ?>
-				<?php foreach ( $cart_content[ 'order_payment' ][ 'received' ] as $payment ) : ?>
-					<?php if ( ! empty( $payment[ 'status' ] ) && 'payment_received' == $payment[ 'status' ] ) : ?>
-						<?php $allready_received_amount += $payment[ 'received_amount' ]; ?>
+				<?php foreach ($cart_content['order_payment']['received'] as $payment) : ?>
+					<?php if (!empty($payment['status']) && 'payment_received' == $payment['status']) : ?>
+						<?php $allready_received_amount += $payment['received_amount']; ?>
 					<?php endif; ?>
 				<?php endforeach; ?>
-				<p><?php _e( 'Already paid', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $allready_received_amount ); ?></strong> <?php echo $currency; ?></span></p>
-				<p class="wps-hightlight"><?php _e( 'Due amount for this order', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $cart_content['order_grand_total'] - $allready_received_amount ); ?></strong> <?php echo $currency; ?></span></p>
+				<p><?php _e('Already paid', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($allready_received_amount); ?></strong> <?php echo $currency; ?></span></p>
+				<p class="wps-hightlight"><?php _e('Due amount for this order', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($cart_content['order_grand_total'] - $allready_received_amount); ?></strong> <?php echo $currency; ?></span></p>
 			<?php else : ?>
-				<?php if ( isset( $_SESSION[ 'cart' ][ 'order_product_partial_payment' ]) ) : ?>
-				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $_SESSION['cart']['order_amount_to_pay_now'] ); ?></strong> <?php echo $currency; ?></span></p>
+				<?php if (isset($_SESSION['cart']['order_product_partial_payment'])) : ?>
+				<p class="wps-hightlight"><?php _e('Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($_SESSION['cart']['order_amount_to_pay_now']); ?></strong> <?php echo $currency; ?></span></p>
 				<?php else: ?>
-				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $total_ati ); ?></strong> <?php echo $currency; ?></span></p>
+				<p class="wps-hightlight"><?php _e('Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($total_ati); ?></strong> <?php echo $currency; ?></span></p>
 				<?php endif; ?>
 			<?php endif; ?>
 	</div><!-- wps-cart-total -->
 </div><!-- wps-cart-cartouche -->
 
-<?php if ( empty($cart_type) || ( !empty($cart_type) && $cart_type != 'summary' && $cart_type != 'admin-panel')  ) : ?>
+<?php if (empty($cart_type) || (!empty($cart_type) && $cart_type != 'summary' && $cart_type != 'admin-panel')) : ?>
 <div class="wps-checkout-actions">
-	<button data-nonce="<?php echo wp_create_nonce( 'wps_empty_cart' ); ?>" class="wps-bton-second emptyCart"><?php _e( 'Empty the cart', 'wpshop' ); ?></button>
-	<?php if( !empty( $_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' ) : ?>
-		<button class="wps-bton-first" data-nonce="<?php echo wp_create_nonce( 'wps_cart_pass_to_step_two' ); ?>" id="wps-cart-order-action"><?php _e( 'Validate my quotation', 'wpshop' ); ?></button>
+	<button data-nonce="<?php echo wp_create_nonce('wps_empty_cart'); ?>" class="wps-bton-second emptyCart"><?php _e('Empty the cart', 'wpshop'); ?></button>
+	<?php if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') : ?>
+		<button class="wps-bton-first" data-nonce="<?php echo wp_create_nonce('wps_cart_pass_to_step_two'); ?>" id="wps-cart-order-action"><?php _e('Validate my quotation', 'wpshop'); ?></button>
 	<?php else : ?>
-		<button class="wps-bton-first" data-nonce="<?php echo wp_create_nonce( 'wps_cart_pass_to_step_two' ); ?>" id="wps-cart-order-action"><?php _e( 'Order', 'wpshop' ); ?></button>
+		<button class="wps-bton-first" data-nonce="<?php echo wp_create_nonce('wps_cart_pass_to_step_two'); ?>" id="wps-cart-order-action"><?php _e('Order', 'wpshop'); ?></button>
 	<?php endif; ?>
 </div>
 <div class="wps-cart-notices">
@@ -175,11 +175,11 @@ 
 </div>
 <?php endif; ?>
 
-<?php if( !empty($cart_type) && $cart_type == 'admin-panel' && ( empty( $cart_content['order_status'] ) || $cart_content['order_status'] == 'awaiting_payment' || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) ) : ?>
-	<button class="wps-bton-second-rounded alignRight" data-nonce="<?php echo wp_create_nonce( 'wps_orders_update_cart_informations' ); ?>" id="wps-orders-update-cart-informations"><i class="dashicons dashicons-update"></i><?php _e( 'Update order informations', 'wpshop'); ?></button>
+<?php if (!empty($cart_type) && $cart_type == 'admin-panel' && (empty($cart_content['order_status']) || $cart_content['order_status'] == 'awaiting_payment' || ((!empty($cart_content['cart_type']) && $cart_content['cart_type'] == 'quotation') && $cart_content['order_status'] != 'completed'))) : ?>
+	<button class="wps-bton-second-rounded alignRight" data-nonce="<?php echo wp_create_nonce('wps_orders_update_cart_informations'); ?>" id="wps-orders-update-cart-informations"><i class="dashicons dashicons-update"></i><?php _e('Update order informations', 'wpshop'); ?></button>
 <?php endif; ?>
 <?php $wps_payment_mode = get_option('wps_payment_mode'); ?>
-<?php if( isset( $wps_payment_mode['mode']['paypal']['active'] ) ): ?>
+<?php if (isset($wps_payment_mode['mode']['paypal']['active'])): ?>
 	<div class="wps-secured-logos">
 		<span class="wps-logo-paypal"></span>
 		<span class="wps-logo-visa"></span>

Braces +59 added lines, -24 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <div class="wps-cart-cartouche">
 	<div class="wps-cart-message">
@@ -6,11 +8,16 @@ 
 			<?php if ( !empty($cart_type) && $cart_type == 'summary' && !$account_origin ) : ?>
 				<?php $url_step_one = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_checkout_page_id') ) ); ?>
 				<?php printf( __( 'You have forget an item ? <a href="%s">Modify your cart !</a>', 'wpshop'), $url_step_one ); ?>
-			<?php else : ?>
+			<?php else {
+	: ?>
 				<?php if( !$account_origin ) :
 							echo do_shortcode('[wps_apply_coupon]');
-						else : ?>
-					<button id="<?php echo $oid; ?>" class="wps-bton-first-mini-rounded make_order_again" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_restart_the_order' ); ?>"><?php _e( 'Make this order again', 'wpshop'); ?></button>
+}
+						else {
+							: ?>
+					<button id="<?php echo $oid;
+						}
+						?>" class="wps-bton-first-mini-rounded make_order_again" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_restart_the_order' ); ?>"><?php _e( 'Make this order again', 'wpshop'); ?></button>
 				<?php endif; ?>
 				<?php if( !empty($tracking) ) : ?>
 					<p><br />
@@ -20,8 +27,9 @@ 
 					<?php if( !empty($tracking['link']) ) : ?>
 						<?php /** Check if http:// it's found in the link */
 						$url = $tracking['link'];
-						if('http://' != substr($url, 0, 7))
-							$url = 'http://' . $url;
+						if('http://' != substr($url, 0, 7)) {
+													$url = 'http://' . $url;
+						}
 						?>
 						<a class="wps-bton-fourth-mini-rounded" href="<?php echo $url; ?>" target="_blank"><?php _e('Tracking link','wpshop'); ?></a>
 					<?php endif; ?>
@@ -41,11 +49,17 @@ 
 				<span class="wps-alignRight">
 					<?php if( $cart_type != 'admin-panel' ) : ?>
 						<strong><?php echo wpshop_tools::formate_number( $shipping_cost_et ); ?></strong> <?php echo $currency; ?>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<?php if( ( empty( $cart_content['order_status'] ) || ( $cart_content['order_status'] == 'awaiting_payment' ) || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) && $price_piloting == 'HT' ) : ?>
-							<input type="text" size="5" value="<?php echo number_format( $shipping_cost_et, 2 ); ?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
-						<?php else : ?>
-							<strong><?php echo wpshop_tools::formate_number( $shipping_cost_et ); ?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
+							<input type="text" size="5" value="<?php echo number_format( $shipping_cost_et, 2 );
+}
+?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
+						<?php else {
+	: ?>
+							<strong><?php echo wpshop_tools::formate_number( $shipping_cost_et );
+}
+?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
 						<?php endif; ?>
 					<?php endif; ?>
 				</span>
@@ -67,11 +81,17 @@ 
 				<span class="wps-alignRight">
 					<?php if( $cart_type != 'admin-panel' ) : ?>
 						<strong><?php echo wpshop_tools::formate_number( $shipping_cost_ati ); ?></strong> <?php echo $currency; ?>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<?php if( ( empty( $cart_content['order_status'] ) || ( $cart_content['order_status'] == 'awaiting_payment' ) || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) && $price_piloting == 'TTC' ) : ?>
-							<input type="text" size="5" value="<?php echo number_format( $shipping_cost_ati, 2 ); ?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
-						<?php else : ?>
-							<strong><?php echo wpshop_tools::formate_number( $shipping_cost_ati ); ?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
+							<input type="text" size="5" value="<?php echo number_format( $shipping_cost_ati, 2 );
+}
+?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
+						<?php else {
+	: ?>
+							<strong><?php echo wpshop_tools::formate_number( $shipping_cost_ati );
+}
+?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
 						<?php endif; ?>
 					<?php endif; ?>
 				</span>
@@ -98,11 +118,17 @@ 
 					<span class="wps-alignRight">
 						<?php if( ( $cart_type == 'admin-panel' ) && ( empty( $cart_content['order_status'] ) || $cart_content['order_status'] == 'awaiting_payment' || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) ) : ?>
 							<input type="text" id="wps-orders-discount-value" size="5" style="text-align : right" value="<?php echo ( !empty($cart_content['order_discount_value']) ) ? $cart_content['order_discount_value'] : number_format( 0, 2 ); ?>"/>
-						<?php else : ?>
+						<?php else {
+	: ?>
 							<?php if( !empty($cart_content['order_discount_value']) ) : ?>
-								<strong><?php echo $cart_content['order_discount_value']; ?> <?php echo ( !empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'percent' ) ? '%' : wpshop_tools::wpshop_get_currency(); ?></strong>
-							<?php else : ?>
-								0 <?php echo wpshop_tools::wpshop_get_currency(); ?>
+								<strong><?php echo $cart_content['order_discount_value'];
+}
+?> <?php echo ( !empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'percent' ) ? '%' : wpshop_tools::wpshop_get_currency(); ?></strong>
+							<?php else {
+	: ?>
+								0 <?php echo wpshop_tools::wpshop_get_currency();
+}
+?>
 							<?php endif; ?>
 						<?php endif; ?>
 					</span>
@@ -149,11 +175,17 @@ 
 				<?php endforeach; ?>
 				<p><?php _e( 'Already paid', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $allready_received_amount ); ?></strong> <?php echo $currency; ?></span></p>
 				<p class="wps-hightlight"><?php _e( 'Due amount for this order', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $cart_content['order_grand_total'] - $allready_received_amount ); ?></strong> <?php echo $currency; ?></span></p>
-			<?php else : ?>
+			<?php else {
+	: ?>
 				<?php if ( isset( $_SESSION[ 'cart' ][ 'order_product_partial_payment' ]) ) : ?>
-				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $_SESSION['cart']['order_amount_to_pay_now'] ); ?></strong> <?php echo $currency; ?></span></p>
-				<?php else: ?>
-				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $total_ati ); ?></strong> <?php echo $currency; ?></span></p>
+				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop');
+}
+?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $_SESSION['cart']['order_amount_to_pay_now'] ); ?></strong> <?php echo $currency; ?></span></p>
+				<?php else {
+	: ?>
+				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop');
+}
+?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $total_ati ); ?></strong> <?php echo $currency; ?></span></p>
 				<?php endif; ?>
 			<?php endif; ?>
 	</div><!-- wps-cart-total -->
@@ -164,8 +196,11 @@ 
 	<button data-nonce="<?php echo wp_create_nonce( 'wps_empty_cart' ); ?>" class="wps-bton-second emptyCart"><?php _e( 'Empty the cart', 'wpshop' ); ?></button>
 	<?php if( !empty( $_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' ) : ?>
 		<button class="wps-bton-first" data-nonce="<?php echo wp_create_nonce( 'wps_cart_pass_to_step_two' ); ?>" id="wps-cart-order-action"><?php _e( 'Validate my quotation', 'wpshop' ); ?></button>
-	<?php else : ?>
-		<button class="wps-bton-first" data-nonce="<?php echo wp_create_nonce( 'wps_cart_pass_to_step_two' ); ?>" id="wps-cart-order-action"><?php _e( 'Order', 'wpshop' ); ?></button>
+	<?php else {
+	: ?>
+		<button class="wps-bton-first" data-nonce="<?php echo wp_create_nonce( 'wps_cart_pass_to_step_two' );
+}
+?>" id="wps-cart-order-action"><?php _e( 'Order', 'wpshop' ); ?></button>
 	<?php endif; ?>
 </div>
 <div class="wps-cart-notices">