Eoxia / wpshop

includes/modules/wps_shipping/controller/wps_shipping_ctr.php

Doc Comments +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
 	 * Return s custom shipping cost for a cart
 	 * @param string $dest Shipping area zone
 	 * @param array $data
-	 * @param array $fees
+	 * @param string $fees
 	 * @return number|boolean|Ambigous <number, unknown>
 	 */
 	function calculate_custom_shipping_cost($dest='', $data, $fees, $shipping_method = false) {

Spacing +105 added lines, -105 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_shipping {
 	function __construct() {
 
@@ -11,41 +11,41 @@ 
 	 */
 	function shipping_fees_string_2_array($fees_string) {
 		$data = array();
-		if(!empty($fees_string) && !is_array($fees_string) ) {
-			if(preg_match_all('#{[^{]+}#', $fees_string, $cont)){
-				foreach($cont[0] as $c) {
+		if (!empty($fees_string) && !is_array($fees_string)) {
+			if (preg_match_all('#{[^{]+}#', $fees_string, $cont)) {
+				foreach ($cont[0] as $c) {
 					preg_match_all('#([a-z]+) ?: ?"(.+)"#', $c, $atts);
 					$temp_data = array();
 					$country_code = '';
-					foreach($atts[1] as $key => $value) {
-						$temp_data[$value] =  $atts[2][$key];
-						if($value=='destination') {
+					foreach ($atts[1] as $key => $value) {
+						$temp_data[$value] = $atts[2][$key];
+						if ($value == 'destination') {
 							$country_code = $atts[2][$key];
 						}
-						elseif($value=='fees') {
+						elseif ($value == 'fees') {
 							$fees_data = array();
 							$fees = explode(',', $atts[2][$key]);
-							foreach($fees as $fee){
+							foreach ($fees as $fee) {
 								$fee_element = explode(':', $fee);
-								$fees_data[trim($fee_element[0])] =  trim($fee_element[1]);
+								$fees_data[trim($fee_element[0])] = trim($fee_element[1]);
 							}
 							$number = count($fees_data);
 
 							$fees_data_1 = array();
 							preg_match_all('#([0-9]+\.?[0-9]?+) ?: ?([0-9]+\.?[0-9]?+)#', $atts[2][$key], $fees);
-							foreach($fees[1] as $_key => $_value) {
-								$fees_data_1[$_value] =  $fees[2][$_key];
+							foreach ($fees[1] as $_key => $_value) {
+								$fees_data_1[$_value] = $fees[2][$_key];
 							}
 							$number_1 = count($fees_data_1);
 							if ($number == $number_1) {
-								$temp_data[$value] =  $fees_data;
+								$temp_data[$value] = $fees_data;
 							}
 							else {
-								$temp_data[$value] =  $fees_data_1;
+								$temp_data[$value] = $fees_data_1;
 							}
 						}
 					}
-					if(!empty($country_code)) {
+					if (!empty($country_code)) {
 						$data[$country_code] = $temp_data;
 					}
 				}
@@ -62,21 +62,21 @@ 
 	 */
 	function shipping_fees_array_2_string($fees_array) {
 		$string = '';
-		if(!empty($fees_array)) {
-			foreach($fees_array as $d) {
-				$string .= '{'."\n";
-				foreach($d as $att => $value) {
+		if (!empty($fees_array)) {
+			foreach ($fees_array as $d) {
+				$string .= '{' . "\n";
+				foreach ($d as $att => $value) {
 					$val = '';
-					if($att=='fees') {
-						foreach($value as $_k=>$_value) $val .= $_k.':'.$_value.', ';
-						$val = substr($val,0,-2);
+					if ($att == 'fees') {
+						foreach ($value as $_k=>$_value) $val .= $_k . ':' . $_value . ', ';
+						$val = substr($val, 0, -2);
 					} else $val = $value;
-					$string .= $att.': "'.$val.'",'."\n";
+					$string .= $att . ': "' . $val . '",' . "\n";
 				}
-				$string = substr($string,0,-2)."\n";
-				$string .= '},'."\n";
+				$string = substr($string, 0, -2) . "\n";
+				$string .= '},' . "\n";
 			}
-			$string = substr($string,0,-2);
+			$string = substr($string, 0, -2);
 			return $string;
 		}
 		else return false;
@@ -92,18 +92,18 @@ 
 	 *
 	 * @return number|string The sipping cost for the current cart
 	 */
-	function get_shipping_cost( $nb_of_items, $total_cart, $total_shipping_cost, $total_weight, $selected_method = '' ) {
+	function get_shipping_cost($nb_of_items, $total_cart, $total_shipping_cost, $total_weight, $selected_method = '') {
 		global $wpdb;
-		$shipping_mode_option = get_option( 'wps_shipping_mode' );
-		if( !empty($selected_method) || isset( $_SESSION['shipping_address'] ) && empty( $_SESSION['shipping_method'] ) ) {
-			if( !empty($selected_method) ) {
+		$shipping_mode_option = get_option('wps_shipping_mode');
+		if (!empty($selected_method) || isset($_SESSION['shipping_address']) && empty($_SESSION['shipping_method'])) {
+			if (!empty($selected_method)) {
 				$chosen_shipping_mode = $selected_method;
 			} else {
 				$ship_mod = new wps_shipping_mode_ctr();
-				$shipping_modes = $ship_mod->get_shipping_mode_for_address( $_SESSION['shipping_address'] );
-				if( !empty( $shipping_modes ) ) {
+				$shipping_modes = $ship_mod->get_shipping_mode_for_address($_SESSION['shipping_address']);
+				if (!empty($shipping_modes)) {
 					$shipping_modes = $shipping_modes['modes'];
-					foreach( $shipping_modes as $key => $shipping_mode ) {
+					foreach ($shipping_modes as $key => $shipping_mode) {
 						$chosen_shipping_mode = $key;
 						break;
 					}
@@ -113,37 +113,37 @@ 
 			}
 		}
 		else {
-			if( !empty( $_SESSION['shipping_method'] ) ) {
-				$chosen_shipping_mode = wpshop_tools::varSanitizer( $_SESSION['shipping_method'] );
+			if (!empty($_SESSION['shipping_method'])) {
+				$chosen_shipping_mode = wpshop_tools::varSanitizer($_SESSION['shipping_method']);
 			} else {
 				$chosen_shipping_mode = 'default_choice';
 			}
 		}
 
-		$default_weight_unity = get_option( 'wpshop_shop_default_weight_unity' );
-		if ( !empty($default_weight_unity) ) {
-			$query = $wpdb->prepare('SELECT unit FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id = %d', $default_weight_unity);
-			$weight_unity = $wpdb->get_var( $query );
+		$default_weight_unity = get_option('wpshop_shop_default_weight_unity');
+		if (!empty($default_weight_unity)) {
+			$query = $wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id = %d', $default_weight_unity);
+			$weight_unity = $wpdb->get_var($query);
 
-			if ( !empty($weight_unity) && $weight_unity == 'kg' ) {
+			if (!empty($weight_unity) && $weight_unity == 'kg') {
 
 				$total_weight = $total_weight * 1000;
 			}
 		}
 
-		if ( ( !empty($_SESSION['shipping_method']) && $_SESSION['shipping_method'] == 'shipping-partners' ) || !empty( $_SESSION['wps-pos-addon']) ) {
+		if ((!empty($_SESSION['shipping_method']) && $_SESSION['shipping_method'] == 'shipping-partners') || !empty($_SESSION['wps-pos-addon'])) {
 			return 0;
 		}
 		
 		/** Take the selected shipping mode **/
-		if( $chosen_shipping_mode == 'default_choice' ) {
-			if( !empty( $shipping_mode_option['modes'][$shipping_mode_option['default_choice']]) ) {
+		if ($chosen_shipping_mode == 'default_choice') {
+			if (!empty($shipping_mode_option['modes'][$shipping_mode_option['default_choice']])) {
 				$selected_shipping_mode_config = $shipping_mode_option['modes'][$shipping_mode_option['default_choice']];
 			} else {
 				$selected_shipping_mode_config = '';
 			}
 		} else {
-			if( !empty( $shipping_mode_option['modes'][$chosen_shipping_mode]) ) {
+			if (!empty($shipping_mode_option['modes'][$chosen_shipping_mode])) {
 				$selected_shipping_mode_config = $shipping_mode_option['modes'][$chosen_shipping_mode];
 			} else {
 				$selected_shipping_mode_config = '';
@@ -155,41 +155,41 @@ 
 
 
 		/** Free Shipping **/
-		if ( ( !empty($selected_shipping_mode_config) && !empty($selected_shipping_mode_config['free_shipping']) ) || ( $selected_method == 'is_downloadable_' ) ) {
+		if ((!empty($selected_shipping_mode_config) && !empty($selected_shipping_mode_config['free_shipping'])) || ($selected_method == 'is_downloadable_')) {
 			$shipping_cost = 0;
 		}
 		/** Free Shipping From **/
-		elseif( !empty($selected_shipping_mode_config) && !empty($selected_shipping_mode_config['free_from']) && $selected_shipping_mode_config['free_from'] >= 0 && $selected_shipping_mode_config['free_from'] <= number_format( $total_cart, 2, '.', '') ) {
+		elseif (!empty($selected_shipping_mode_config) && !empty($selected_shipping_mode_config['free_from']) && $selected_shipping_mode_config['free_from'] >= 0 && $selected_shipping_mode_config['free_from'] <= number_format($total_cart, 2, '.', '')) {
 			$shipping_cost = 0;
 		}
 		else {
 			/** Check Custom Shipping Cost **/
 			
-			if ( !empty($selected_shipping_mode_config['custom_shipping_rules']) && !empty($selected_shipping_mode_config['custom_shipping_rules']['active']) ) {
+			if (!empty($selected_shipping_mode_config['custom_shipping_rules']) && !empty($selected_shipping_mode_config['custom_shipping_rules']['active'])) {
 				$address_infos = '';
-				if( !empty( $_SESSION['shipping_address'] ) ) {
-					$address_infos = get_post_meta($_SESSION['shipping_address'],'_wpshop_address_metadata', true);
+				if (!empty($_SESSION['shipping_address'])) {
+					$address_infos = get_post_meta($_SESSION['shipping_address'], '_wpshop_address_metadata', true);
 				}
-				$country = ( !empty($address_infos['country']) ) ? $address_infos['country'] : '';
+				$country = (!empty($address_infos['country'])) ? $address_infos['country'] : '';
 				/** Check Active Postcode option **/
-				if ( !empty($selected_shipping_mode_config['active_cp']) ) {
+				if (!empty($selected_shipping_mode_config['active_cp'])) {
 					$postcode = $address_infos['postcode'];
-					if ( array_key_exists($country.'-'.$postcode, $selected_shipping_mode_config['custom_shipping_rules']['fees']) ) {
-						$country = $country.'-'.$postcode;
+					if (array_key_exists($country . '-' . $postcode, $selected_shipping_mode_config['custom_shipping_rules']['fees'])) {
+						$country = $country . '-' . $postcode;
 					}
-					elseif( array_key_exists($country.'-OTHERS', $selected_shipping_mode_config['custom_shipping_rules']['fees']) ) {
-						$country = $country.'-OTHERS';
+					elseif (array_key_exists($country . '-OTHERS', $selected_shipping_mode_config['custom_shipping_rules']['fees'])) {
+						$country = $country . '-OTHERS';
 					}
 				}
-				$shipping_cost += $this->calculate_custom_shipping_cost($country, array('weight'=>$total_weight,'price'=> $total_cart), $selected_shipping_mode_config['custom_shipping_rules']['fees'], $chosen_shipping_mode);
+				$shipping_cost += $this->calculate_custom_shipping_cost($country, array('weight'=>$total_weight, 'price'=> $total_cart), $selected_shipping_mode_config['custom_shipping_rules']['fees'], $chosen_shipping_mode);
 			}
 
 			/** Min- Max config **/
-			if ( !empty($selected_shipping_mode_config['min_max']) && !empty($selected_shipping_mode_config['min_max']['activate']) ) {
-				if ( !empty($selected_shipping_mode_config['min_max']['min']) && $shipping_cost < $selected_shipping_mode_config['min_max']['min'] ) {
+			if (!empty($selected_shipping_mode_config['min_max']) && !empty($selected_shipping_mode_config['min_max']['activate'])) {
+				if (!empty($selected_shipping_mode_config['min_max']['min']) && $shipping_cost < $selected_shipping_mode_config['min_max']['min']) {
 					$shipping_cost = $selected_shipping_mode_config['min_max']['min'];
 				}
-				elseif( !empty($selected_shipping_mode_config['min_max']['max']) &&$shipping_cost > $selected_shipping_mode_config['min_max']['max']) {
+				elseif (!empty($selected_shipping_mode_config['min_max']['max']) && $shipping_cost > $selected_shipping_mode_config['min_max']['max']) {
 					$shipping_cost = $selected_shipping_mode_config['min_max']['max'];
 				}
 
@@ -207,40 +207,40 @@ 
 	 * @param array $fees
 	 * @return number|boolean|Ambigous <number, unknown>
 	 */
-	function calculate_custom_shipping_cost($dest='', $data, $fees, $shipping_method = false) {
+	function calculate_custom_shipping_cost($dest = '', $data, $fees, $shipping_method = false) {
 		$fees_table = array();
 		$key = ''; $price = 0;
 
-		if ( !empty($_SESSION['shipping_partner_id']) ) {
+		if (!empty($_SESSION['shipping_partner_id'])) {
 			return 0;
 		}
 
-		if($shipping_method === false) {
+		if ($shipping_method === false) {
 			$shipping_method = $_SESSION['shipping_method'];
 		}
 
-		if(!empty($fees) || !empty($dest) ) {
-			$custom_shipping_option = get_option( 'wpshop_custom_shipping', true );
-			$shipping_modes = get_option( 'wps_shipping_mode' );
+		if (!empty($fees) || !empty($dest)) {
+			$custom_shipping_option = get_option('wpshop_custom_shipping', true);
+			$shipping_modes = get_option('wps_shipping_mode');
 
-			if ( !empty($shipping_method) ) {
-				if ( !empty($shipping_modes) && !empty($shipping_modes['modes']) && !empty($shipping_modes['modes'][ $shipping_method ]) ) {
-					$custom_shipping_option = $shipping_modes['modes'][ $shipping_method ]['custom_shipping_rules'];
+			if (!empty($shipping_method)) {
+				if (!empty($shipping_modes) && !empty($shipping_modes['modes']) && !empty($shipping_modes['modes'][$shipping_method])) {
+					$custom_shipping_option = $shipping_modes['modes'][$shipping_method]['custom_shipping_rules'];
 				}
 			}
 			$found_active_cp_rule = $found_active_departement_rule = false;
-			$shipping_address_def = get_post_meta( $_SESSION['shipping_address'], '_wpshop_address_metadata', true );
+			$shipping_address_def = get_post_meta($_SESSION['shipping_address'], '_wpshop_address_metadata', true);
 			$postcode = '';
-			if ( !empty($shipping_address_def) ) {
+			if (!empty($shipping_address_def)) {
 				$postcode = $shipping_address_def['postcode'];
 			}
 
 			/** Search Postcode custom fees **/
-			if ( !empty($custom_shipping_option) && !empty($custom_shipping_option['active_cp']) ) {
-				$key = $dest.'-'.$postcode;
-				if ( array_key_exists($key, $fees) ) {
+			if (!empty($custom_shipping_option) && !empty($custom_shipping_option['active_cp'])) {
+				$key = $dest . '-' . $postcode;
+				if (array_key_exists($key, $fees)) {
 					foreach ($fees[$key]['fees'] as $k => $shipping_price) {
-						if ( $data['weight'] <= $k) {
+						if ($data['weight'] <= $k) {
 							break;
 						}
 					}
@@ -249,13 +249,13 @@ 
 			}
 
 			/** Search Department custom fees **/
-			if( !empty($custom_shipping_option) && !empty($custom_shipping_option['active_department']) && !$found_active_cp_rule ) {
-				$department = substr( $postcode, 0,2 );
-				$key = $dest.'-'.$department;
+			if (!empty($custom_shipping_option) && !empty($custom_shipping_option['active_department']) && !$found_active_cp_rule) {
+				$department = substr($postcode, 0, 2);
+				$key = $dest . '-' . $department;
 				/** Check if a rule exists **/
-				if ( array_key_exists($key, $fees) ) {
+				if (array_key_exists($key, $fees)) {
 					foreach ($fees[$key]['fees'] as $k => $shipping_price) {
-						if ( $data['weight'] <= $k) {
+						if ($data['weight'] <= $k) {
 							break;
 						}
 					}
@@ -264,11 +264,11 @@ 
 			}
 
 			/** Search general custom fees **/
-			if( !$found_active_cp_rule && !$found_active_departement_rule ){
-				if ( array_key_exists($dest, $fees) ) {
+			if (!$found_active_cp_rule && !$found_active_departement_rule) {
+				if (array_key_exists($dest, $fees)) {
 					$key = $dest;
 				}
-				elseif( array_key_exists( 'OTHERS', $fees) ) {
+				elseif (array_key_exists('OTHERS', $fees)) {
 					$key = 'OTHERS';
 				}
 				else {
@@ -277,10 +277,10 @@ 
 			}
 
 			//Search fees
-			if ( !empty($key) ) {
-				ksort( $fees[$key]['fees'] );
+			if (!empty($key)) {
+				ksort($fees[$key]['fees']);
 				foreach ($fees[$key]['fees'] as $k => $shipping_price) {
-					if ( $data['weight'] <= $k) {
+					if ($data['weight'] <= $k) {
 						$price = $shipping_price;
 						break;
 					}
@@ -302,14 +302,14 @@ 
 	 * @param array $cart_items
 	 * @return number
 	 */
-	function calcul_cart_items_shipping_cost( $cart_items ) {
+	function calcul_cart_items_shipping_cost($cart_items) {
 		$shipping_cost = 0;
-		if( !empty($cart_items) ) {
-			foreach( $cart_items as $cart_item ) {
-				$product_data = get_post_meta( $cart_item['item_id'], '_wpshop_product_metadata', true );
+		if (!empty($cart_items)) {
+			foreach ($cart_items as $cart_item) {
+				$product_data = get_post_meta($cart_item['item_id'], '_wpshop_product_metadata', true);
 
-				if ( !empty( $product_data ) && !empty( $product_data['cost_of_postage'] ) ) {
-					$shipping_cost += ( $product_data['cost_of_postage'] * $cart_item['item_qty'] );
+				if (!empty($product_data) && !empty($product_data['cost_of_postage'])) {
+					$shipping_cost += ($product_data['cost_of_postage'] * $cart_item['item_qty']);
 				}
 			}
 		}
@@ -322,32 +322,32 @@ 
 	 * @param array $cart_items
 	 * @return number
 	 */
-	function calcul_cart_weight( $cart_items ) {
+	function calcul_cart_weight($cart_items) {
 		$cart_weight = 0;
-		if ( !empty( $cart_items) ) {
-			foreach( $cart_items as $id_item => $cart_item ) {
+		if (!empty($cart_items)) {
+			foreach ($cart_items as $id_item => $cart_item) {
 				$id_item = wpshop_products::get_id_variation($id_item);
-				if ( get_post_type($id_item) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-					$product_data = get_post_meta( $id_item, '_wpshop_product_metadata', true );
-					if ( !empty($product_data) && !empty($product_data['product_weight']) ) {
-						$cart_weight += ( $product_data['product_weight'] * $cart_item['item_qty'] );
+				if (get_post_type($id_item) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+					$product_data = get_post_meta($id_item, '_wpshop_product_metadata', true);
+					if (!empty($product_data) && !empty($product_data['product_weight'])) {
+						$cart_weight += ($product_data['product_weight'] * $cart_item['item_qty']);
 					}
 					else {
-						$parent_def = wpshop_products::get_parent_variation( $id_item );
-						if ( !empty($parent_def) && !empty( $parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['product_weight']) ) {
-							$cart_weight += ( $parent_def['parent_post_meta']['product_weight'] * $cart_item['item_qty'] );
+						$parent_def = wpshop_products::get_parent_variation($id_item);
+						if (!empty($parent_def) && !empty($parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['product_weight'])) {
+							$cart_weight += ($parent_def['parent_post_meta']['product_weight'] * $cart_item['item_qty']);
 						}
 					}
 				}
 				else {
-					$product_data = get_post_meta( $cart_item['item_id'], '_wpshop_product_metadata', true );
-					if ( !empty($product_data) && !empty($product_data['product_weight']) && !empty($cart_item['item_qty'])  ) {
-						$cart_weight += ( $product_data['product_weight'] * $cart_item['item_qty'] );
+					$product_data = get_post_meta($cart_item['item_id'], '_wpshop_product_metadata', true);
+					if (!empty($product_data) && !empty($product_data['product_weight']) && !empty($cart_item['item_qty'])) {
+						$cart_weight += ($product_data['product_weight'] * $cart_item['item_qty']);
 					}
 				}
 			}
 		}
-		$cart_weight = apply_filters( 'extra_cart_weight_calcul', $cart_weight, $cart_items );
+		$cart_weight = apply_filters('extra_cart_weight_calcul', $cart_weight, $cart_items);
 		return $cart_weight;
 	}
 

Braces +22 added lines, -26 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_shipping {
 	function __construct() {
 
@@ -21,8 +23,7 @@ 
 						$temp_data[$value] =  $atts[2][$key];
 						if($value=='destination') {
 							$country_code = $atts[2][$key];
-						}
-						elseif($value=='fees') {
+						} elseif($value=='fees') {
 							$fees_data = array();
 							$fees = explode(',', $atts[2][$key]);
 							foreach($fees as $fee){
@@ -39,8 +40,7 @@ 
 							$number_1 = count($fees_data_1);
 							if ($number == $number_1) {
 								$temp_data[$value] =  $fees_data;
-							}
-							else {
+							} else {
 								$temp_data[$value] =  $fees_data_1;
 							}
 						}
@@ -68,9 +68,13 @@ 
 				foreach($d as $att => $value) {
 					$val = '';
 					if($att=='fees') {
-						foreach($value as $_k=>$_value) $val .= $_k.':'.$_value.', ';
+						foreach($value as $_k=>$_value) {
+							$val .= $_k.':'.$_value.', ';
+						}
 						$val = substr($val,0,-2);
-					} else $val = $value;
+					} else {
+						$val = $value;
+					}
 					$string .= $att.': "'.$val.'",'."\n";
 				}
 				$string = substr($string,0,-2)."\n";
@@ -78,8 +82,9 @@ 
 			}
 			$string = substr($string,0,-2);
 			return $string;
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -111,8 +116,7 @@ 
 					$chosen_shipping_mode = 'default_choice';
 				}
 			}
-		}
-		else {
+		} else {
 			if( !empty( $_SESSION['shipping_method'] ) ) {
 				$chosen_shipping_mode = wpshop_tools::varSanitizer( $_SESSION['shipping_method'] );
 			} else {
@@ -161,8 +165,7 @@ 
 		/** Free Shipping From **/
 		elseif( !empty($selected_shipping_mode_config) && !empty($selected_shipping_mode_config['free_from']) && $selected_shipping_mode_config['free_from'] >= 0 && $selected_shipping_mode_config['free_from'] <= number_format( $total_cart, 2, '.', '') ) {
 			$shipping_cost = 0;
-		}
-		else {
+		} else {
 			/** Check Custom Shipping Cost **/
 			
 			if ( !empty($selected_shipping_mode_config['custom_shipping_rules']) && !empty($selected_shipping_mode_config['custom_shipping_rules']['active']) ) {
@@ -176,8 +179,7 @@ 
 					$postcode = $address_infos['postcode'];
 					if ( array_key_exists($country.'-'.$postcode, $selected_shipping_mode_config['custom_shipping_rules']['fees']) ) {
 						$country = $country.'-'.$postcode;
-					}
-					elseif( array_key_exists($country.'-OTHERS', $selected_shipping_mode_config['custom_shipping_rules']['fees']) ) {
+					} elseif( array_key_exists($country.'-OTHERS', $selected_shipping_mode_config['custom_shipping_rules']['fees']) ) {
 						$country = $country.'-OTHERS';
 					}
 				}
@@ -188,8 +190,7 @@ 
 			if ( !empty($selected_shipping_mode_config['min_max']) && !empty($selected_shipping_mode_config['min_max']['activate']) ) {
 				if ( !empty($selected_shipping_mode_config['min_max']['min']) && $shipping_cost < $selected_shipping_mode_config['min_max']['min'] ) {
 					$shipping_cost = $selected_shipping_mode_config['min_max']['min'];
-				}
-				elseif( !empty($selected_shipping_mode_config['min_max']['max']) &&$shipping_cost > $selected_shipping_mode_config['min_max']['max']) {
+				} elseif( !empty($selected_shipping_mode_config['min_max']['max']) &&$shipping_cost > $selected_shipping_mode_config['min_max']['max']) {
 					$shipping_cost = $selected_shipping_mode_config['min_max']['max'];
 				}
 
@@ -267,11 +268,9 @@ 
 			if( !$found_active_cp_rule && !$found_active_departement_rule ){
 				if ( array_key_exists($dest, $fees) ) {
 					$key = $dest;
-				}
-				elseif( array_key_exists( 'OTHERS', $fees) ) {
+				} elseif( array_key_exists( 'OTHERS', $fees) ) {
 					$key = 'OTHERS';
-				}
-				else {
+				} else {
 					return false;
 				}
 			}
@@ -288,8 +287,7 @@ 
 						$price = $shipping_price;
 					}
 				}
-			}
-			else {
+			} else {
 				return false;
 			}
 			return $price;
@@ -331,15 +329,13 @@ 
 					$product_data = get_post_meta( $id_item, '_wpshop_product_metadata', true );
 					if ( !empty($product_data) && !empty($product_data['product_weight']) ) {
 						$cart_weight += ( $product_data['product_weight'] * $cart_item['item_qty'] );
-					}
-					else {
+					} else {
 						$parent_def = wpshop_products::get_parent_variation( $id_item );
 						if ( !empty($parent_def) && !empty( $parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['product_weight']) ) {
 							$cart_weight += ( $parent_def['parent_post_meta']['product_weight'] * $cart_item['item_qty'] );
 						}
 					}
-				}
-				else {
+				} else {
 					$product_data = get_post_meta( $cart_item['item_id'], '_wpshop_product_metadata', true );
 					if ( !empty($product_data) && !empty($product_data['product_weight']) && !empty($cart_item['item_qty'])  ) {
 						$cart_weight += ( $product_data['product_weight'] * $cart_item['item_qty'] );

includes/modules/wps_shipping/controller/wps_shipping_mode_ctr.php

Doc Comments +1 added lines, -2 removed lines

@@ -196,7 +196,6 @@ 
 
 	/**
 	 * Generate Shipping mode configuration back-office interface
-	 * @param string $key
 	 * @param array $shipping_mode
 	 * @return string
 	 */
@@ -232,7 +231,7 @@ 
 	/**
 	 * Generate cutom fees resume table
 	 * @param array $fees_data
-	 * @param string $key
+	 * @param integer|null $shipping_mode_id
 	 */
 	function generate_shipping_rules_table( $fees_data, $shipping_mode_id ){
 		global $wpdb;

Spacing +104 added lines, -104 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_shipping_mode_ctr {
 
 	/**
@@ -18,23 +18,23 @@ 
 		/** Template Load **/
 	//	add_filter( 'wpshop_custom_template', array( $this, 'custom_template_load' ) );
 
-		add_action( 'admin_init', array( $this, 'migrate_default_shipping_mode' ) );
+		add_action('admin_init', array($this, 'migrate_default_shipping_mode'));
 
 		/**	Add module option to wpshop general options	*/
-		add_filter('wpshop_options', array( $this, 'add_options'), 9);
-		add_action('wsphop_options', array( $this, 'create_options'), 8);
+		add_filter('wpshop_options', array($this, 'add_options'), 9);
+		add_action('wsphop_options', array($this, 'create_options'), 8);
 
 		// Add files in back-office
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_in_admin' ) );
+		add_action('admin_enqueue_scripts', array($this, 'add_scripts_in_admin'));
 		// Add files in front-office
-		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts') );
+		add_action('wp_enqueue_scripts', array($this, 'add_scripts'));
 
 		// Available Shortcodes
-		add_shortcode( 'wps_shipping_mode', array( &$this, 'display_shipping_mode') );
-		add_shortcode( 'wps_shipping_method', array( &$this, 'display_shipping_methods') );
-		add_shortcode( 'wps_shipping_summary', array( &$this, 'display_shipping_summary') );
+		add_shortcode('wps_shipping_mode', array(&$this, 'display_shipping_mode'));
+		add_shortcode('wps_shipping_method', array(&$this, 'display_shipping_methods'));
+		add_shortcode('wps_shipping_summary', array(&$this, 'display_shipping_summary'));
 
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_box') );
+		add_action('add_meta_boxes', array($this, 'add_meta_box'));
 	}
 
 	function add_meta_box() {
@@ -44,7 +44,7 @@ 
 		if (!empty($shipping_option['activate']) && $shipping_option['activate']) {
 			add_meta_box(
 			'wpshop_order_shipping',
-			'<span class="dashicons dashicons-palmtree"></span> '.__('Shipping', 'wpshop'),
+			'<span class="dashicons dashicons-palmtree"></span> ' . __('Shipping', 'wpshop'),
 			array($this, 'order_shipping_box'),
 			WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'side', 'low'
 					);
@@ -57,11 +57,11 @@ 
 	 */
 	function add_scripts() {
 		//CSS files
-		wp_register_style( 'wps_shipping_mode_css', WPS_SHIPPING_MODE_URL . WPS_SHIPPING_MODE_DIR .'/assets/frontend/css/wps_shipping_mode.css', false );
-		wp_enqueue_style( 'wps_shipping_mode_css' );
+		wp_register_style('wps_shipping_mode_css', WPS_SHIPPING_MODE_URL . WPS_SHIPPING_MODE_DIR . '/assets/frontend/css/wps_shipping_mode.css', false);
+		wp_enqueue_style('wps_shipping_mode_css');
 		// Javascript Files
-		wp_enqueue_script( 'jquery' );
-		wp_enqueue_script( 'wps_shipping_method_js', WPS_SHIPPING_MODE_URL . WPS_SHIPPING_MODE_DIR .'/assets/frontend/js/shipping_method.js', false );
+		wp_enqueue_script('jquery');
+		wp_enqueue_script('wps_shipping_method_js', WPS_SHIPPING_MODE_URL . WPS_SHIPPING_MODE_DIR . '/assets/frontend/js/shipping_method.js', false);
 	}
 
 	/**
@@ -72,10 +72,10 @@ 
 		wp_enqueue_script('jquery');
 		wp_enqueue_script('jquery-ui-sortable');
 		// Javascript files
-		wp_enqueue_script( 'wps_shipping_mode_js', WPS_SHIPPING_MODE_URL . WPS_SHIPPING_MODE_DIR .'/assets/backend/js/wps_shipping_mode.js', false );
+		wp_enqueue_script('wps_shipping_mode_js', WPS_SHIPPING_MODE_URL . WPS_SHIPPING_MODE_DIR . '/assets/backend/js/wps_shipping_mode.js', false);
 		//CSS files
-		wp_register_style( 'wps_shipping_mode_css', WPS_SHIPPING_MODE_URL . WPS_SHIPPING_MODE_DIR .'/assets/backend/css/wps_shipping_mode.css', false );
-		wp_enqueue_style( 'wps_shipping_mode_css' );
+		wp_register_style('wps_shipping_mode_css', WPS_SHIPPING_MODE_URL . WPS_SHIPPING_MODE_DIR . '/assets/backend/css/wps_shipping_mode.css', false);
+		wp_enqueue_style('wps_shipping_mode_css');
 	}
 
 
@@ -97,7 +97,7 @@ 
 	/**
 	 * Declare option groups for the module
 	 */
-	function add_options( $option_group ) {
+	function add_options($option_group) {
 		$option_group['wpshop_shipping_option']['subgroups']['wps_shipping_mode']['class'] = ' wpshop_admin_box_options_shipping_mode';
 		return $option_group;
 	}
@@ -106,38 +106,38 @@ 
 	 * Create Options
 	 **/
 	function create_options() {
-		add_settings_section('wps_shipping_mode', '<span class="dashicons dashicons-admin-site"></span>'.__('Shipping method', 'wpshop'), '', 'wps_shipping_mode');
-		register_setting('wpshop_options', 'wps_shipping_mode', array( $this, 'wpshop_options_validate_wps_shipping_mode'));
-		add_settings_field('wps_shipping_mode', ''/*__('Shipping Mode', 'wpshop')*/, array( $this, 'display_shipping_mode_in_admin'), 'wps_shipping_mode', 'wps_shipping_mode');
+		add_settings_section('wps_shipping_mode', '<span class="dashicons dashicons-admin-site"></span>' . __('Shipping method', 'wpshop'), '', 'wps_shipping_mode');
+		register_setting('wpshop_options', 'wps_shipping_mode', array($this, 'wpshop_options_validate_wps_shipping_mode'));
+		add_settings_field('wps_shipping_mode', ''/*__('Shipping Mode', 'wpshop')*/, array($this, 'display_shipping_mode_in_admin'), 'wps_shipping_mode', 'wps_shipping_mode');
 	}
 
 	/**
 	 * WPS Shipping mode Option Validator
 	 **/
-	function wpshop_options_validate_wps_shipping_mode( $input ) {
+	function wpshop_options_validate_wps_shipping_mode($input) {
 		$wps_shipping = new wps_shipping();
-		if ( !empty($input['modes']) ) {
-			foreach( $input['modes'] as $mode => $mode_det ) {
+		if (!empty($input['modes'])) {
+			foreach ($input['modes'] as $mode => $mode_det) {
 				/** Custom Shipping rules **/
-				$input['modes'][$mode]['custom_shipping_rules']['fees'] = $wps_shipping->shipping_fees_string_2_array( $input['modes'][$mode]['custom_shipping_rules']['fees'] );
+				$input['modes'][$mode]['custom_shipping_rules']['fees'] = $wps_shipping->shipping_fees_string_2_array($input['modes'][$mode]['custom_shipping_rules']['fees']);
 
 				/** Shipping Modes Logo Treatment **/
-				if ( !empty($_FILES[$mode.'_logo']['name']) && empty($_FILES[$mode.'_logo']['error']) ) {
-					$filename = $_FILES[$mode.'_logo'];
-					$upload  = wp_handle_upload($filename, array('test_form' => false));
-					$wp_filetype = wp_check_filetype(basename($filename['name']), null );
+				if (!empty($_FILES[$mode . '_logo']['name']) && empty($_FILES[$mode . '_logo']['error'])) {
+					$filename = $_FILES[$mode . '_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['modes'][$mode]['logo'] = $attach_id;
 				}
@@ -151,38 +151,38 @@ 
 	 **/
 	function migrate_default_shipping_mode() {
 		$data = array();
-		$shipping_mode_option = get_option( 'wps_shipping_mode' );
-		if ( empty($shipping_mode_option) ) {
+		$shipping_mode_option = get_option('wps_shipping_mode');
+		if (empty($shipping_mode_option)) {
 			$data['modes']['default_shipping_mode']['active'] = 'on';
 			$data['modes']['default_shipping_mode']['name'] = __('Home Delivery', 'wpshop');
 			$data['modes']['default_shipping_mode']['explanation'] = __('Your purchase will be delivered directly to you at home', 'wpshop');
 			/** Check CUstom Shipping **/
-			$custom_shipping_option = get_option( 'wpshop_custom_shipping' );
-			if ( !empty($custom_shipping_option) ) {
+			$custom_shipping_option = get_option('wpshop_custom_shipping');
+			if (!empty($custom_shipping_option)) {
 				$data['modes']['default_shipping_mode']['custom_shipping_rules'] = $custom_shipping_option;
 			}
 			/** Check Country Limit **/
-			$limit_destination = get_option( 'wpshop_limit_shipping_destination' );
-			if ( !empty($custom_shipping_option) ) {
+			$limit_destination = get_option('wpshop_limit_shipping_destination');
+			if (!empty($custom_shipping_option)) {
 				$data['modes']['default_shipping_mode']['limit_destination'] = $limit_destination;
 			}
 
 			/** Check Others shipping configurations **/
 			$wpshop_shipping_rules_option = get_option('wpshop_shipping_rules');
-			if ( !empty($wpshop_shipping_rules_option) ){
-				if ( !empty($wpshop_shipping_rules_option['min_max']) ) {
+			if (!empty($wpshop_shipping_rules_option)) {
+				if (!empty($wpshop_shipping_rules_option['min_max'])) {
 					$data['modes']['default_shipping_mode']['min_max'] = $wpshop_shipping_rules_option['min_max'];
 				}
-				if ( !empty($wpshop_shipping_rules_option['free_from']) ) {
+				if (!empty($wpshop_shipping_rules_option['free_from'])) {
 					$data['modes']['default_shipping_mode']['free_from'] = $wpshop_shipping_rules_option['free_from'];
 				}
-				if ( !empty($wpshop_shipping_rules_option['wpshop_shipping_rule_free_shipping']) ) {
+				if (!empty($wpshop_shipping_rules_option['wpshop_shipping_rule_free_shipping'])) {
 					$data['modes']['default_shipping_mode']['free_shipping'] = $wpshop_shipping_rules_option['wpshop_shipping_rule_free_shipping'];
 				}
 			}
 			$data['default_choice'] = 'default_shipping_mode';
 
-			update_option( 'wps_shipping_mode', $data );
+			update_option('wps_shipping_mode', $data);
 		}
 	}
 
@@ -190,8 +190,8 @@ 
 	 *  Display the Admin Interface for Shipping Mode
 	 **/
 	function display_shipping_mode_in_admin() {
-		$shipping_mode_option = get_option( 'wps_shipping_mode' );
-		require_once( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, $this->template_dir, "backend", "shipping-modes") );
+		$shipping_mode_option = get_option('wps_shipping_mode');
+		require_once(wpshop_tools::get_template_part(WPS_SHIPPING_MODE_DIR, $this->template_dir, "backend", "shipping-modes"));
 	}
 
 	/**
@@ -200,28 +200,28 @@ 
 	 * @param array $shipping_mode
 	 * @return string
 	 */
-	function generate_shipping_mode_interface( $k, $shipping_mode ) {
+	function generate_shipping_mode_interface($k, $shipping_mode) {
 		global $wpdb;
 		$tpl_component = array();
 
-		$shipping_mode_option = get_option( 'wps_shipping_mode');
-		$default_shipping_mode = !empty( $shipping_mode_option['default_choice'] ) ? $shipping_mode_option['default_choice'] : '';
+		$shipping_mode_option = get_option('wps_shipping_mode');
+		$default_shipping_mode = !empty($shipping_mode_option['default_choice']) ? $shipping_mode_option['default_choice'] : '';
 
 		$countries = unserialize(WPSHOP_COUNTRY_LIST);
 
 		/** Default Weight Unity **/
-		$weight_defaut_unity_option = get_option ('wpshop_shop_default_weight_unity');
-		$query = $wpdb->prepare('SELECT name FROM '. WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id=%d', $weight_defaut_unity_option);
-		$unity = $wpdb->get_var( $query );
+		$weight_defaut_unity_option = get_option('wpshop_shop_default_weight_unity');
+		$query = $wpdb->prepare('SELECT name FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id=%d', $weight_defaut_unity_option);
+		$unity = $wpdb->get_var($query);
 
 
-		$fees_data = ( !empty($shipping_mode) & !empty($shipping_mode['custom_shipping_rules']) && !empty($shipping_mode['custom_shipping_rules']['fees']) ) ? $shipping_mode['custom_shipping_rules']['fees'] : array();
-		if(is_array($fees_data)) {
+		$fees_data = (!empty($shipping_mode) & !empty($shipping_mode['custom_shipping_rules']) && !empty($shipping_mode['custom_shipping_rules']['fees'])) ? $shipping_mode['custom_shipping_rules']['fees'] : array();
+		if (is_array($fees_data)) {
 			$wps_shipping = new wps_shipping();
 			$fees_data = $wps_shipping->shipping_fees_array_2_string($fees_data);
 		}
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, $this->template_dir, "backend", "shipping-mode-configuration-interface") );
+		require(wpshop_tools::get_template_part(WPS_SHIPPING_MODE_DIR, $this->template_dir, "backend", "shipping-mode-configuration-interface"));
 		$output = ob_get_contents();
 		ob_end_clean();
 
@@ -234,22 +234,22 @@ 
 	 * @param array $fees_data
 	 * @param string $key
 	 */
-	function generate_shipping_rules_table( $fees_data, $shipping_mode_id ){
+	function generate_shipping_rules_table($fees_data, $shipping_mode_id) {
 		global $wpdb;
 		$result = '';
-		if ( !empty( $fees_data) ) {
+		if (!empty($fees_data)) {
 			$wps_shipping = new wps_shipping();
-			$shipping_rules =$wps_shipping->shipping_fees_string_2_array( stripslashes($fees_data) );
+			$shipping_rules = $wps_shipping->shipping_fees_string_2_array(stripslashes($fees_data));
 			$result = '';
-			$tpl_component ='';
+			$tpl_component = '';
 			$tpl_component['CUSTOM_SHIPPING_RULES_LINES'] = '';
 			$tpl_component['SHIPPING_MODE_ID'] = $shipping_mode_id;
 			$country_list = unserialize(WPSHOP_COUNTRY_LIST);
-			$weight_defaut_unity_option = get_option ('wpshop_shop_default_weight_unity');
-			$query = $wpdb->prepare('SELECT unit FROM '. WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id=%d', $weight_defaut_unity_option);
-			$unity = $wpdb->get_var( $query );
+			$weight_defaut_unity_option = get_option('wpshop_shop_default_weight_unity');
+			$query = $wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id=%d', $weight_defaut_unity_option);
+			$unity = $wpdb->get_var($query);
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, $this->template_dir, "backend", "shipping-mode-configuration-custom-rules-table") );
+			require(wpshop_tools::get_template_part(WPS_SHIPPING_MODE_DIR, $this->template_dir, "backend", "shipping-mode-configuration-custom-rules-table"));
 			$result = ob_get_contents();
 			ob_end_clean();
 		}
@@ -269,16 +269,16 @@ 
 	 */
 	function display_shipping_methods() {
 		$output = $shipping_methods = ''; $no_shipping_mode_for_area = false;
-		$shipping_modes = get_option( 'wps_shipping_mode' );
-		if( !empty($_SESSION['shipping_address']) ) {
-			$shipping_modes = $this->get_shipping_mode_for_address( $_SESSION['shipping_address'] );
-			if( empty($shipping_modes) ) {
+		$shipping_modes = get_option('wps_shipping_mode');
+		if (!empty($_SESSION['shipping_address'])) {
+			$shipping_modes = $this->get_shipping_mode_for_address($_SESSION['shipping_address']);
+			if (empty($shipping_modes)) {
 				$no_shipping_mode_for_area = true;
 			}
 		}
-		$shipping_modes = apply_filters( 'wps_filter_shipping_methods', $shipping_modes );
+		$shipping_modes = apply_filters('wps_filter_shipping_methods', $shipping_modes);
 		ob_start();
-		require_once( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, $this->template_dir, "frontend", "shipping-mode", "container") );
+		require_once(wpshop_tools::get_template_part(WPS_SHIPPING_MODE_DIR, $this->template_dir, "frontend", "shipping-mode", "container"));
 		$output = ob_get_contents();
 		ob_end_clean();
 
@@ -291,24 +291,24 @@ 
 	 */
 	function display_shipping_summary() {
 		$output = '';
-		$billing_address_id = ( !empty($_SESSION['billing_address']) ) ? $_SESSION['billing_address'] : null;
-		$shipping_address_id = ( !empty($_SESSION['shipping_address']) ) ? $_SESSION['shipping_address'] : null;
-		$shipping_mode = ( !empty($_SESSION['shipping_method']) ) ? $_SESSION['shipping_method'] : null;
+		$billing_address_id = (!empty($_SESSION['billing_address'])) ? $_SESSION['billing_address'] : null;
+		$shipping_address_id = (!empty($_SESSION['shipping_address'])) ? $_SESSION['shipping_address'] : null;
+		$shipping_mode = (!empty($_SESSION['shipping_method'])) ? $_SESSION['shipping_method'] : null;
 
-		if( !empty($billing_address_id)  ) {
+		if (!empty($billing_address_id)) {
 			$billing_infos = get_post_meta($billing_address_id, '_wpshop_address_metadata', true);
-			$billing_content = wps_address::display_an_address( $billing_infos, $billing_address_id);
+			$billing_content = wps_address::display_an_address($billing_infos, $billing_address_id);
 
-			if ( !empty($shipping_address_id) && !empty($shipping_mode) ) {
+			if (!empty($shipping_address_id) && !empty($shipping_mode)) {
 				$shipping_infos = get_post_meta($shipping_address_id, '_wpshop_address_metadata', true);
-				$shipping_content = wps_address::display_an_address( $shipping_infos, $shipping_address_id);
+				$shipping_content = wps_address::display_an_address($shipping_infos, $shipping_address_id);
 
-				$shipping_mode_option = get_option( 'wps_shipping_mode' );
-				$shipping_mode = ( !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && !empty($shipping_mode_option['modes'][$shipping_mode]) && !empty($shipping_mode_option['modes'][$shipping_mode]['name']) ) ? $shipping_mode_option['modes'][$shipping_mode]['name'] : '';
+				$shipping_mode_option = get_option('wps_shipping_mode');
+				$shipping_mode = (!empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && !empty($shipping_mode_option['modes'][$shipping_mode]) && !empty($shipping_mode_option['modes'][$shipping_mode]['name'])) ? $shipping_mode_option['modes'][$shipping_mode]['name'] : '';
 			}
 
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, $this->template_dir, "frontend", "shipping-infos", "summary") );
+			require(wpshop_tools::get_template_part(WPS_SHIPPING_MODE_DIR, $this->template_dir, "frontend", "shipping-infos", "summary"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -322,42 +322,42 @@ 
 	 * @param integer $address_id
 	 * @return string
 	 */
-	function get_shipping_mode_for_address( $address_id ) {
+	function get_shipping_mode_for_address($address_id) {
 		$shipping_modes_to_display = array();
-		if( !empty($address_id) ) {
-			$shipping_modes = get_option( 'wps_shipping_mode' );
-			$address_metadata = /*isset( $postcode ) ? array( 'postcode' => $postcode ) :*/ get_post_meta( $address_id, '_wpshop_address_metadata', true);
-			if( !empty( $shipping_modes ) && !empty($shipping_modes['modes']) ){
-				foreach( $shipping_modes['modes'] as $k => $shipping_mode ) {
-					if ( !empty($shipping_mode) && !empty($shipping_mode['active']) ) {
+		if (!empty($address_id)) {
+			$shipping_modes = get_option('wps_shipping_mode');
+			$address_metadata = /*isset( $postcode ) ? array( 'postcode' => $postcode ) :*/ get_post_meta($address_id, '_wpshop_address_metadata', true);
+			if (!empty($shipping_modes) && !empty($shipping_modes['modes'])) {
+				foreach ($shipping_modes['modes'] as $k => $shipping_mode) {
+					if (!empty($shipping_mode) && !empty($shipping_mode['active'])) {
 						/** Check Country Shipping Limitation **/
-						if ( empty($shipping_mode['limit_destination']) || ( !empty($shipping_mode['limit_destination']) && empty($shipping_mode['limit_destination']['country']) ) || ( !empty($shipping_mode['limit_destination']) && !empty($shipping_mode['limit_destination']['country']) && in_array($address_metadata['country'], $shipping_mode['limit_destination']['country']) ) ) {
+						if (empty($shipping_mode['limit_destination']) || (!empty($shipping_mode['limit_destination']) && empty($shipping_mode['limit_destination']['country'])) || (!empty($shipping_mode['limit_destination']) && !empty($shipping_mode['limit_destination']['country']) && in_array($address_metadata['country'], $shipping_mode['limit_destination']['country']))) {
 							/** Check Limit Destination By Postcode **/
 							$visible = true;
 							/** Check Postcode limitation **/
-							if ( !empty($shipping_mode['limit_destination']) && !empty($shipping_mode['limit_destination']['postcode']) ) {
-								$postcodes = explode(',', $shipping_mode['limit_destination']['postcode'] );
-								foreach( $postcodes as $postcode_id => $postcode ) {
-									$postcodes[ $postcode_id ] = trim( str_replace( ' ', '', $postcode) );
+							if (!empty($shipping_mode['limit_destination']) && !empty($shipping_mode['limit_destination']['postcode'])) {
+								$postcodes = explode(',', $shipping_mode['limit_destination']['postcode']);
+								foreach ($postcodes as $postcode_id => $postcode) {
+									$postcodes[$postcode_id] = trim(str_replace(' ', '', $postcode));
 								}
-								if ( !in_array($address_metadata['postcode'], $postcodes) ) {
+								if (!in_array($address_metadata['postcode'], $postcodes)) {
 									$visible = false;
 								}
 							}
 							/** Check Department limitation **/
-							$department = substr( $address_metadata['postcode'], 0, 2 );
-							if ( !empty($shipping_mode['limit_destination']) && !empty($shipping_mode['limit_destination']['department']) ) {
-								$departments = explode(',', $shipping_mode['limit_destination']['department'] );
-								foreach( $departments as $department_id => $d ) {
-									$departments[ $department_id ] = trim( str_replace( ' ', '', $d) );
+							$department = substr($address_metadata['postcode'], 0, 2);
+							if (!empty($shipping_mode['limit_destination']) && !empty($shipping_mode['limit_destination']['department'])) {
+								$departments = explode(',', $shipping_mode['limit_destination']['department']);
+								foreach ($departments as $department_id => $d) {
+									$departments[$department_id] = trim(str_replace(' ', '', $d));
 								}
 
-								if ( !in_array($department, $departments) ) {
+								if (!in_array($department, $departments)) {
 									$visible = false;
 								}
 							}
 
-							if ( $visible ) {
+							if ($visible) {
 								$shipping_modes_to_display['modes'][$k] = $shipping_mode;
 							}
 						}
@@ -373,12 +373,12 @@ 
 	 * Display shipping informations in order administration panel
 	 * @param object $order : Order post infos
 	 */
-	function order_shipping_box( $order ) {
-		$shipping_mode_option = get_option( 'wps_shipping_mode' );
+	function order_shipping_box($order) {
+		$shipping_mode_option = get_option('wps_shipping_mode');
 		$order_postmeta = get_post_meta($order->ID, '_order_postmeta', true);
-		$shipping_method_name = ( !empty($order_postmeta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_postmeta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_postmeta['order_payment']['shipping_method']]['name'] : ( (!empty($order_postmeta['order_payment']['shipping_method']) ) ? $order_postmeta['order_payment']['shipping_method'] : '' );
+		$shipping_method_name = (!empty($order_postmeta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_postmeta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_postmeta['order_payment']['shipping_method']]['name'] : ((!empty($order_postmeta['order_payment']['shipping_method'])) ? $order_postmeta['order_payment']['shipping_method'] : '');
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, $this->template_dir, "backend", "order-shipping-infos") );
+		require(wpshop_tools::get_template_part(WPS_SHIPPING_MODE_DIR, $this->template_dir, "backend", "order-shipping-infos"));
 		$output = ob_get_contents();
 		ob_end_clean();
 		echo $output;

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/modules/wps_shortcodes/controller/wps_shortcodes_ctr.php

Doc Comments +3 added lines

@@ -207,6 +207,9 @@
 		return $shortcodes;
 	}
 
+	/**
+	 * @param string $shortcode_code
+	 */
 	public static function output_shortcode($shortcode_code, $specific_shorcode = '', $more_class_shortcode_helper = ''){
 		$shortcode = ( empty($specific_shorcode) ? self::shortcode_definition() : $specific_shorcode );
 

Spacing +49 added lines, -49 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 class wps_shortcodes_ctr
 {
@@ -29,7 +29,7 @@ 
 	 *
 	 *	@return string The table of the class
 	 */
-	function setMessage($message){
+	function setMessage($message) {
 		$this->pageMessage = $message;
 	}
 	/**
@@ -37,7 +37,7 @@ 
 	 *
 	 *	@return string The table of the class
 	 */
-	function getListingSlug(){
+	function getListingSlug() {
 		return self::urlSlugListing;
 	}
 	/**
@@ -45,7 +45,7 @@ 
 	 *
 	 *	@return string The table of the class
 	 */
-	function getEditionSlug(){
+	function getEditionSlug() {
 		return self::urlSlugEdition;
 	}
 	/**
@@ -58,33 +58,33 @@ 
 	 *
 	 *	@return string $title The title of the page looking at the environnement
 	 */
-	function pageTitle(){
+	function pageTitle() {
 		$action = isset($_REQUEST['action']) ? wpshop_tools::varSanitizer($_REQUEST['action']) : '';
 		$objectInEdition = isset($_REQUEST['id']) ? wpshop_tools::varSanitizer($_REQUEST['id']) : '';
-		$page = !empty( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
+		$page = !empty($_GET['page']) ? sanitize_text_field($_GET['page']) : '';
 
-		$title = __(self::pageTitle, 'wpshop' );
-		if($action != ''){
-			if(($action == 'edit') || ($action == 'delete')){
+		$title = __(self::pageTitle, 'wpshop');
+		if ($action != '') {
+			if (($action == 'edit') || ($action == 'delete')) {
 				$editedItem = self::getElement($objectInEdition);
 				$title = sprintf(__(self::pageEditingTitle, 'wpshop'), str_replace("\\", "", $editedItem->frontend_label) . '&nbsp;(' . $editedItem->code . ')');
 			}
-			elseif($action == 'add'){
+			elseif ($action == 'add') {
 				$title = __(self::pageAddingTitle, 'wpshop');
 			}
 		}
-		elseif((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug())){
+		elseif ((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug())) {
 			$title = __(self::pageAddingTitle, 'wpshop');
 		}
 		return $title;
 	}
 
-	function elementAction(){
+	function elementAction() {
 
 	}
 
 	/** Définition des shortcodes pour les afficher dans le template list-shortcode */
-	public static function shortcode_definition(){
+	public static function shortcode_definition() {
 		$shortcodes = array();
 
 		/*	Product tab	*/
@@ -95,17 +95,17 @@ 
 		$shortcodes['simple_product']['attrs_exemple']['pid'] = '12';
 		$shortcodes['simple_product']['attrs_exemple']['type'] = 'list';
 
-		$shortcodes['wpshop_product_title']['main_title'] = __( 'Product title', 'wpshop' );
+		$shortcodes['wpshop_product_title']['main_title'] = __('Product title', 'wpshop');
 		$shortcodes['wpshop_product_title']['main_code'] = 'wpshop_product_title';
 		$shortcodes['wpshop_product_title']['attrs_def']['pid'] = 'ID_DU_PRODUIT';
 		$shortcodes['wpshop_product_title']['attrs_exemple']['pid'] = '12';
 
-		$shortcodes['wpshop_product_content']['main_title'] = __( 'Product content', 'wpshop' );
+		$shortcodes['wpshop_product_content']['main_title'] = __('Product content', 'wpshop');
 		$shortcodes['wpshop_product_content']['main_code'] = 'wpshop_product_content';
 		$shortcodes['wpshop_product_content']['attrs_def']['pid'] = 'ID_DU_PRODUIT';
 		$shortcodes['wpshop_product_content']['attrs_exemple']['pid'] = '12';
 
-		$shortcodes['wpshop_product_thumbnail']['main_title'] = __( 'Product thumbnail', 'wpshop' );
+		$shortcodes['wpshop_product_thumbnail']['main_title'] = __('Product thumbnail', 'wpshop');
 		$shortcodes['wpshop_product_thumbnail']['main_code'] = 'wpshop_product_thumbnail';
 		$shortcodes['wpshop_product_thumbnail']['attrs_def']['pid'] = 'ID_DU_PRODUIT';
 		$shortcodes['wpshop_product_thumbnail']['attrs_def']['size'] = 'TAILLE_DU_PRODUIT';
@@ -208,32 +208,32 @@ 
 		return $shortcodes;
 	}
 
-	public static function output_shortcode($shortcode_code, $specific_shorcode = '', $more_class_shortcode_helper = ''){
-		$shortcode = ( empty($specific_shorcode) ? self::shortcode_definition() : $specific_shorcode );
+	public static function output_shortcode($shortcode_code, $specific_shorcode = '', $more_class_shortcode_helper = '') {
+		$shortcode = (empty($specific_shorcode) ? self::shortcode_definition() : $specific_shorcode);
 
-		$shortcode_main_title = ( !empty($shortcode[$shortcode_code]['main_title']) ? $shortcode[$shortcode_code]['main_title'] : '' );
-		$shorcode_main_code = ( !empty($shortcode[$shortcode_code]['main_code']) ? $shortcode[$shortcode_code]['main_code'] : '' );
+		$shortcode_main_title = (!empty($shortcode[$shortcode_code]['main_title']) ? $shortcode[$shortcode_code]['main_title'] : '');
+		$shorcode_main_code = (!empty($shortcode[$shortcode_code]['main_code']) ? $shortcode[$shortcode_code]['main_code'] : '');
 		$shorcode_attributes_def = ' ';
-		if(!empty($shortcode[$shortcode_code]['attrs_def'])){
-			foreach($shortcode[$shortcode_code]['attrs_def'] as $attr_name => $attr_values){
-				$shorcode_attributes_def .= $attr_name.'="'.$attr_values.'" ';
+		if (!empty($shortcode[$shortcode_code]['attrs_def'])) {
+			foreach ($shortcode[$shortcode_code]['attrs_def'] as $attr_name => $attr_values) {
+				$shorcode_attributes_def .= $attr_name . '="' . $attr_values . '" ';
 			}
 		}
 		$shorcode_attributes_def = substr($shorcode_attributes_def, 0, -1);
 		$shorcode_attributes_exemple = ' ';
-		if(!empty($shortcode[$shortcode_code]['attrs_exemple'])){
-			foreach($shortcode[$shortcode_code]['attrs_exemple'] as $attr_name => $attr_values){
-				$shorcode_attributes_exemple .= $attr_name.'="'.$attr_values.'" ';
+		if (!empty($shortcode[$shortcode_code]['attrs_exemple'])) {
+			foreach ($shortcode[$shortcode_code]['attrs_exemple'] as $attr_name => $attr_values) {
+				$shorcode_attributes_exemple .= $attr_name . '="' . $attr_values . '" ';
 			}
 		}
 		$shorcode_attributes_exemple = substr($shorcode_attributes_exemple, 0, -1);
 
-		require( wpshop_tools::get_template_part( WPS_SHORTCODES_DIR, WPS_SHORTCODES_TEMPLATES_MAIN_DIR, "backend", 'shortcode_help.tpl' ) );
+		require(wpshop_tools::get_template_part(WPS_SHORTCODES_DIR, WPS_SHORTCODES_TEMPLATES_MAIN_DIR, "backend", 'shortcode_help.tpl'));
 	}
 
 	public static function wysiwyg_button() {
-		if ( ! current_user_can('edit_posts') && ! current_user_can('edit_pages') ) return;
-		if ( get_user_option('rich_editing') == 'true') :
+		if (!current_user_can('edit_posts') && !current_user_can('edit_pages')) return;
+		if (get_user_option('rich_editing') == 'true') :
 		add_filter('mce_external_plugins', array('wps_shortcodes_ctr', 'add_button_to_wysiwyg'));
 		add_filter('mce_buttons', array('wps_shortcodes_ctr', 'register_wysiwyg_button'));
 		endif;
@@ -242,11 +242,11 @@ 
 		$ver += 3;
 		return $ver;
 	}
-	public static function add_button_to_wysiwyg($plugin_array){
+	public static function add_button_to_wysiwyg($plugin_array) {
 		$plugin_array['wpshop_wysiwyg_shortcodes'] = WPSHOP_JS_URL . 'pages/wysiwyg_editor.js';
 		return $plugin_array;
 	}
-	public static function register_wysiwyg_button($existing_button){
+	public static function register_wysiwyg_button($existing_button) {
 		array_push($existing_button, "|", "wpshop_wysiwyg_button");
 		return $existing_button;
 	}
@@ -257,10 +257,10 @@ 
 	 *
 	 * @return string
 	 */
-	function elementList(){
+	function elementList() {
 		$shortcode_list = '';
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_SHORTCODES_DIR, WPS_SHORTCODES_TEMPLATES_MAIN_DIR, "backend", 'list', 'shortcode' ) );
+		require(wpshop_tools::get_template_part(WPS_SHORTCODES_DIR, WPS_SHORTCODES_TEMPLATES_MAIN_DIR, "backend", 'list', 'shortcode'));
 		$shortcode_list = ob_get_contents();
 		ob_end_clean();
 
@@ -274,23 +274,23 @@ 
 
 	public function shortcode_xmlloader() {
 		$shortcodes_list = array();
-		$ini_get_checking = ini_get( 'allow_url_fopen' );
-		if ( $ini_get_checking != 0 ) {
-			$content = @file_get_contents( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/lshortcodes.xml' );
-			$list_shortcodes_xml = ( $content !== false ) ? new SimpleXmlElement( $content ) : null;
-			if ( !empty($list_shortcodes_xml) && !empty($list_shortcodes_xml->channel) )  {
+		$ini_get_checking = ini_get('allow_url_fopen');
+		if ($ini_get_checking != 0) {
+			$content = @file_get_contents(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/lshortcodes.xml');
+			$list_shortcodes_xml = ($content !== false) ? new SimpleXmlElement($content) : null;
+			if (!empty($list_shortcodes_xml) && !empty($list_shortcodes_xml->channel)) {
 				global $shortcode_tags;
-				foreach( $list_shortcodes_xml->channel->category as $i => $category ) {
-					$shortcodes_list[(String) $category->title]['desc_cat_' . (String) $category->title] = (String) $category->description;
-					foreach( $category->item as $j => $item_xml ) {
+				foreach ($list_shortcodes_xml->channel->category as $i => $category) {
+					$shortcodes_list[(String)$category->title]['desc_cat_' . (String)$category->title] = (String)$category->description;
+					foreach ($category->item as $j => $item_xml) {
 						$item = array();
-						$item['title'] = (String) $item_xml->title;
-						$item['description'] = (String) $item_xml->description;
-						foreach( $item_xml->args as $argument) {
-							$item['args'][(String) $argument->identifier] = (String) $argument->params;
+						$item['title'] = (String)$item_xml->title;
+						$item['description'] = (String)$item_xml->description;
+						foreach ($item_xml->args as $argument) {
+							$item['args'][(String)$argument->identifier] = (String)$argument->params;
 						}
-						$item['active'] = ( array_key_exists((String) $item_xml->identifier, $shortcode_tags) ) ? 'true' : 'false';
-						$shortcodes_list[(String) $category->title]['items'][(String) $item_xml->identifier] = $item;
+						$item['active'] = (array_key_exists((String)$item_xml->identifier, $shortcode_tags)) ? 'true' : 'false';
+						$shortcodes_list[(String)$category->title]['items'][(String)$item_xml->identifier] = $item;
 					}
 				}
 			}
@@ -301,10 +301,10 @@ 
 	public function help_tab_shortcodes() {
 		$shortcodes = $this->shortcode_xmlloader();
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_SHORTCODES_DIR, WPS_SHORTCODES_TEMPLATES_MAIN_DIR, "backend", 'shortcode_help_tab' ) );
+		require(wpshop_tools::get_template_part(WPS_SHORTCODES_DIR, WPS_SHORTCODES_TEMPLATES_MAIN_DIR, "backend", 'shortcode_help_tab'));
 		$content = ob_get_contents();
 		ob_end_clean();
 		global $wps_help_tabs;
-		$wps_help_tabs->set_help_tab( 'shortcodes', __( 'Shortcodes', 'wpshop' ), $content, array('edit-post', 'post', 'edit-page', 'page', 'edit-comments', 'comments', 'edit-wpshop_product', 'wpshop_product', 'edit-wpshop_product_category') );
+		$wps_help_tabs->set_help_tab('shortcodes', __('Shortcodes', 'wpshop'), $content, array('edit-post', 'post', 'edit-page', 'page', 'edit-comments', 'comments', 'edit-wpshop_product', 'wpshop_product', 'edit-wpshop_product_category'));
 	}
 }

Braces +8 added lines, -6 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 class wps_shortcodes_ctr
 {
@@ -68,12 +70,10 @@ 
 			if(($action == 'edit') || ($action == 'delete')){
 				$editedItem = self::getElement($objectInEdition);
 				$title = sprintf(__(self::pageEditingTitle, 'wpshop'), str_replace("\\", "", $editedItem->frontend_label) . '&nbsp;(' . $editedItem->code . ')');
-			}
-			elseif($action == 'add'){
+			} elseif($action == 'add'){
 				$title = __(self::pageAddingTitle, 'wpshop');
 			}
-		}
-		elseif((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug())){
+		} elseif((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug())){
 			$title = __(self::pageAddingTitle, 'wpshop');
 		}
 		return $title;
@@ -232,7 +232,9 @@ 
 	}
 
 	public static function wysiwyg_button() {
-		if ( ! current_user_can('edit_posts') && ! current_user_can('edit_pages') ) return;
+		if ( ! current_user_can('edit_posts') && ! current_user_can('edit_pages') ) {
+			return;
+		}
 		if ( get_user_option('rich_editing') == 'true') :
 		add_filter('mce_external_plugins', array('wps_shortcodes_ctr', 'add_button_to_wysiwyg'));
 		add_filter('mce_buttons', array('wps_shortcodes_ctr', 'register_wysiwyg_button'));

includes/modules/wps_statistics/controller/wps_statistics_ctr.php

Doc Comments -2 removed lines

@@ -117,8 +117,6 @@
 
 	/**
 	 * Display Best sales Statistics
-	 * @param string $begindate
-	 * @param string $enddate
 	 * @return string
 	 */
 	function wps_statistics_best_sales() {

Indentation +4 added lines, -4 removed lines

@@ -25,8 +25,8 @@ 
 
 
 	/**
-	* Add Javascript files
-	*/
+	 * Add Javascript files
+	 */
 	function add_scripts() {
 		wp_enqueue_script( 'jquery' );
 		wp_enqueue_script( 'jquery-ui-datepicker');
@@ -46,8 +46,8 @@ 
 	}
 
 	/**
-	* Add CSS files
-	*/
+	 * Add CSS files
+	 */
 	function add_css_files() {
 		wp_register_style('wps_statistics_css', WPS_STATISTICS_URL . '/assets/css/wps_statistics.css', '', WPS_STATISTICS_VERSION);
 		wp_enqueue_style('wps_statistics_css');

Braces +9 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 class wps_statistics_ctr {
 	private $wps_stats_mdl;
@@ -205,8 +207,7 @@ 
 		ob_end_clean();
 		if( ( !empty( $args) ) && !empty( $args['return'] ) && $args['return'] ) {
 			return $output;
-		}
-		else {
+		} else {
 			echo $output;
 		}
 	}
@@ -251,8 +252,7 @@ 
 								if ( $count_users < $year[$j] ) {
 									$count_users = $year[$j];
 								}
-							}
-							else {
+							} else {
 								$canvas_js .= '0,';
 							}
 						}
@@ -269,12 +269,12 @@ 
 				/** Legend **/
 				$canvas_js .= '<center><ul class="wps_statistics_legend">';
 				foreach( $colors as $color ) {
-					if ( !empty($color) && !empty($color[2]) )
-					$canvas_js .= '<li style="width : auto; margin-right : 20px;"><div style="background : ' .$color[0]. ';" class="legend_indicator"></div>' .$color[2]. '</li>';
+					if ( !empty($color) && !empty($color[2]) ) {
+										$canvas_js .= '<li style="width : auto; margin-right : 20px;"><div style="background : ' .$color[0]. ';" class="legend_indicator"></div>' .$color[2]. '</li>';
+					}
 				}
 				$canvas_js .= '</ul></center>';
-		}
-		else {
+		} else {
 			$canvas_js = __( 'No customer account has been created on your shop', 'wpshop');
 		}
 	}

Spacing +90 added lines, -90 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 class wps_statistics_ctr {
 	private $wps_stats_mdl;
@@ -6,19 +6,19 @@ 
 
 		// WP Main Actions
 		add_action('admin_menu', array(&$this, 'register_stats_menu'), 250);
-		add_action( 'save_post', array( &$this, 'wps_statistics_save_customer_infos') );
-		add_action('add_meta_boxes', array( &$this, 'add_customer_meta_box'), 1 );
+		add_action('save_post', array(&$this, 'wps_statistics_save_customer_infos'));
+		add_action('add_meta_boxes', array(&$this, 'add_customer_meta_box'), 1);
 
 		// Add Javascript Files in admin
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts' ) );
-		add_action('admin_footer', array( $this, 'admin_extra_js') );
+		add_action('admin_enqueue_scripts', array($this, 'add_scripts'));
+		add_action('admin_footer', array($this, 'admin_extra_js'));
 
 		// Add CSS File
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_css_files' ) );
+		add_action('admin_enqueue_scripts', array($this, 'add_css_files'));
 
 		// Ajax Actions
-		add_action('wp_ajax_wps_reload_statistics', array( &$this, 'wps_reload_statistics') );
-		add_action('wp_ajax_wps_hourly_order_day', array( &$this, 'wps_hourly_order_day') );
+		add_action('wp_ajax_wps_reload_statistics', array(&$this, 'wps_reload_statistics'));
+		add_action('wp_ajax_wps_hourly_order_day', array(&$this, 'wps_hourly_order_day'));
 
 		$this->wps_stats_mdl = new wps_statistics_mdl();
 	}
@@ -28,12 +28,12 @@ 
 	* Add Javascript files
 	*/
 	function add_scripts() {
-		wp_enqueue_script( 'jquery' );
-		wp_enqueue_script( 'jquery-ui-datepicker');
-		wp_enqueue_script( 'postbox');
-		wp_enqueue_script( 'wps_statistics_js_chart', WPSHOP_JS_URL.'Chart.js' );
-		wp_enqueue_script( 'wps_statistics_js', WPS_STATISTICS_URL.'/assets/js/wps_statistics.js' );
-		wp_enqueue_script( 'wps_hourlyorders', WPS_STATISTICS_URL.'/assets/js/hourlyorders.js' );
+		wp_enqueue_script('jquery');
+		wp_enqueue_script('jquery-ui-datepicker');
+		wp_enqueue_script('postbox');
+		wp_enqueue_script('wps_statistics_js_chart', WPSHOP_JS_URL . 'Chart.js');
+		wp_enqueue_script('wps_statistics_js', WPS_STATISTICS_URL . '/assets/js/wps_statistics.js');
+		wp_enqueue_script('wps_hourlyorders', WPS_STATISTICS_URL . '/assets/js/hourlyorders.js');
 	}
 
 	/**
@@ -58,19 +58,19 @@ 
 	 */
 	function add_customer_meta_box() {
 		global $post;
-		add_meta_box( 'wps_statistics_customer', __( 'Statistics', 'wps_price' ), array( &$this, 'wps_statistics_meta_box_content' ), WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'side', 'low' );
+		add_meta_box('wps_statistics_customer', __('Statistics', 'wps_price'), array(&$this, 'wps_statistics_meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'side', 'low');
 
 	}
 
 	/** Add Statistics Meta Boxes **/
 	function add_stats_meta_boxes() {
-		$user_stats_order = get_user_meta( get_current_user_id(), 'meta-box-order_boutique_page_wpshop_statistics', true );
-		add_meta_box( 'wps-best-sales-statistics',__('Best sales', 'wpshop'), array( $this, 'wps_statistics_best_sales' ), 'wpshop_statistics', 'left_column' );
-		add_meta_box( 'wps-most-viewed-statistics',__('Most viewed products', 'wpshop'), array( $this, 'wps_statistics_most_viewed_products' ), 'wpshop_statistics', 'right_column' );
-		add_meta_box( 'wps-orders-by-month-statistics',__('Orders', 'wpshop'), array( $this, 'wps_statistics_orders_by_month' ), 'wpshop_statistics', 'left_column' );
-		add_meta_box( 'wps-orders-status',__('Orders status', 'wpshop'), array( $this, 'wps_statistics_orders_status' ), 'wpshop_statistics', 'left_column' );
-		add_meta_box( 'wps-orders-moment-statistics',__('Orders Hours', 'wpshop'), array( $this, 'wps_statistics_orders_moment' ), 'wpshop_statistics', 'right_column' );
-		add_meta_box( 'wps-best-customers',__('Best customers', 'wpshop'), array( $this, 'wps_statistics_best_customers' ), 'wpshop_statistics', 'right_column' );
+		$user_stats_order = get_user_meta(get_current_user_id(), 'meta-box-order_boutique_page_wpshop_statistics', true);
+		add_meta_box('wps-best-sales-statistics', __('Best sales', 'wpshop'), array($this, 'wps_statistics_best_sales'), 'wpshop_statistics', 'left_column');
+		add_meta_box('wps-most-viewed-statistics', __('Most viewed products', 'wpshop'), array($this, 'wps_statistics_most_viewed_products'), 'wpshop_statistics', 'right_column');
+		add_meta_box('wps-orders-by-month-statistics', __('Orders', 'wpshop'), array($this, 'wps_statistics_orders_by_month'), 'wpshop_statistics', 'left_column');
+		add_meta_box('wps-orders-status', __('Orders status', 'wpshop'), array($this, 'wps_statistics_orders_status'), 'wpshop_statistics', 'left_column');
+		add_meta_box('wps-orders-moment-statistics', __('Orders Hours', 'wpshop'), array($this, 'wps_statistics_orders_moment'), 'wpshop_statistics', 'right_column');
+		add_meta_box('wps-best-customers', __('Best customers', 'wpshop'), array($this, 'wps_statistics_best_customers'), 'wpshop_statistics', 'right_column');
 	}
 
 	/**
@@ -79,10 +79,10 @@ 
 	function wps_statistics_meta_box_content() {
 		global $post;
 		$user_meta = '';
-		if ( !empty($post) && !empty($post->post_author) ) {
-			$user_meta = get_user_meta( $post->post_author, 'wps_statistics_exclude_customer', true );
+		if (!empty($post) && !empty($post->post_author)) {
+			$user_meta = get_user_meta($post->post_author, 'wps_statistics_exclude_customer', true);
 		}
-		$output = '<input type="checkbox" name="wps_statistics_exclude_customer" id="wps_statistics_exclude_customer" ' .( (!empty($user_meta) ) ? 'checked="checked"' : '' ). '/> <label for="wps_statistics_exclude_customer">' .__('Exclude this customer from WPShop Statistics', 'wpshop'). '</label>';
+		$output = '<input type="checkbox" name="wps_statistics_exclude_customer" id="wps_statistics_exclude_customer" ' . ((!empty($user_meta)) ? 'checked="checked"' : '') . '/> <label for="wps_statistics_exclude_customer">' . __('Exclude this customer from WPShop Statistics', 'wpshop') . '</label>';
 		echo $output;
 	}
 
@@ -90,15 +90,15 @@ 
 	 * Save action to exclude customer of statistics
 	 */
 	function wps_statistics_save_customer_infos() {
-		$action = !empty( $_POST['action'] ) ? sanitize_text_field( $_POST['action'] ) : '';
-		$post_type = !empty( $_POST['post_type'] ) ? sanitize_text_field( $_POST['post_type'] ) : '';
-		$post_id = !empty( $_POST['post_ID'] ) ? (int) $_POST['post_ID'] : 0;
-		$wps_statistics_exclude_customer = isset( $_POST['wps_statistics_exclude_customer'] ) ? (int) $_POST['wps_statistics_exclude_customer'] : 0;
-
-		if ( !empty($action) && $action != 'autosave' && !empty($post_type) && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ) {
-			$customer_def = get_post( $post_id );
-			if( isset( $wps_statistics_exclude_customer ) ) {
-				update_user_meta( $customer_def->post_author, 'wps_statistics_exclude_customer', $wps_statistics_exclude_customer );
+		$action = !empty($_POST['action']) ? sanitize_text_field($_POST['action']) : '';
+		$post_type = !empty($_POST['post_type']) ? sanitize_text_field($_POST['post_type']) : '';
+		$post_id = !empty($_POST['post_ID']) ? (int)$_POST['post_ID'] : 0;
+		$wps_statistics_exclude_customer = isset($_POST['wps_statistics_exclude_customer']) ? (int)$_POST['wps_statistics_exclude_customer'] : 0;
+
+		if (!empty($action) && $action != 'autosave' && !empty($post_type) && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS) {
+			$customer_def = get_post($post_id);
+			if (isset($wps_statistics_exclude_customer)) {
+				update_user_meta($customer_def->post_author, 'wps_statistics_exclude_customer', $wps_statistics_exclude_customer);
 			}
 		}
 	}
@@ -107,7 +107,7 @@ 
 	 * Register statistics Menu
 	 */
 	function register_stats_menu() {
-		add_submenu_page( 'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER, __('Statistics', 'wpshop' ), __('Statistics', 'wpshop'), 'wpshop_view_statistics', 'wpshop_statistics', array($this, 'wps_display_statistics'));
+		add_submenu_page('edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER, __('Statistics', 'wpshop'), __('Statistics', 'wpshop'), 'wpshop_view_statistics', 'wpshop_statistics', array($this, 'wps_display_statistics'));
 	}
 
 	/**
@@ -115,9 +115,9 @@ 
 	 */
 	function wps_display_statistics() {
 		$this->add_stats_meta_boxes();
-		echo wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
-		echo wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-		require( wpshop_tools::get_template_part( WPS_STATISTICS_DIR, WPS_STATISTICS_TEMPLATES_MAIN_DIR, "backend", "wps-statistics") );
+		echo wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false);
+		echo wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
+		require(wpshop_tools::get_template_part(WPS_STATISTICS_DIR, WPS_STATISTICS_TEMPLATES_MAIN_DIR, "backend", "wps-statistics"));
 	}
 
 	/**
@@ -127,12 +127,12 @@ 
 	 * @return string
 	 */
 	function wps_statistics_best_sales() {
-		$begin_date =  ( !empty($_POST['begin_date']) ) ? wpshop_tools::varSanitizer($_POST['begin_date']) : date( 'Y-m-d', strtotime( '1 months ago') );
-		$end_date = ( !empty($_POST['end_date']) ) ? wpshop_tools::varSanitizer( $_POST['end_date'] ) : date('Y-m-d');
-		$products = $this->wps_stats_mdl->wps_best_sales_datas($begin_date, $end_date );
-		$colors = array( '#69D2E7', '#E0E4CC', '#F38630', '#64BC43', '#8F33E0', '#F990E6', '#414141', '#E03E3E');
+		$begin_date = (!empty($_POST['begin_date'])) ? wpshop_tools::varSanitizer($_POST['begin_date']) : date('Y-m-d', strtotime('1 months ago'));
+		$end_date = (!empty($_POST['end_date'])) ? wpshop_tools::varSanitizer($_POST['end_date']) : date('Y-m-d');
+		$products = $this->wps_stats_mdl->wps_best_sales_datas($begin_date, $end_date);
+		$colors = array('#69D2E7', '#E0E4CC', '#F38630', '#64BC43', '#8F33E0', '#F990E6', '#414141', '#E03E3E');
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_STATISTICS_DIR, WPS_STATISTICS_TEMPLATES_MAIN_DIR, "backend", "wps_statistics_best_sales") );
+		require(wpshop_tools::get_template_part(WPS_STATISTICS_DIR, WPS_STATISTICS_TEMPLATES_MAIN_DIR, "backend", "wps_statistics_best_sales"));
 		$output = ob_get_contents();
 		ob_end_clean();
 		echo $output;
@@ -141,9 +141,9 @@ 
 	/** Display most viewed products statistics **/
 	function wps_statistics_most_viewed_products() {
 		$products = $this->wps_stats_mdl->wps_most_viewed_products_datas();
-		$colors = array( '#69D2E7', '#E0E4CC', '#F38630', '#64BC43', '#8F33E0', '#F990E6', '#414141', '#E03E3E');
+		$colors = array('#69D2E7', '#E0E4CC', '#F38630', '#64BC43', '#8F33E0', '#F990E6', '#414141', '#E03E3E');
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_STATISTICS_DIR, WPS_STATISTICS_TEMPLATES_MAIN_DIR, "backend", "wps_statistics_most_viewed_products") );
+		require(wpshop_tools::get_template_part(WPS_STATISTICS_DIR, WPS_STATISTICS_TEMPLATES_MAIN_DIR, "backend", "wps_statistics_most_viewed_products"));
 		$output = ob_get_contents();
 		ob_end_clean();
 		echo $output;
@@ -154,9 +154,9 @@ 
 	 */
 	function wps_statistics_orders_by_month() {
 		$order_recap = $this->wps_stats_mdl->wps_orders_by_month();
-		$colors = array( array('#9AE5F4', '#0074A2'), array('#E0E4CC', '#A8AA99'));
+		$colors = array(array('#9AE5F4', '#0074A2'), array('#E0E4CC', '#A8AA99'));
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_STATISTICS_DIR, WPS_STATISTICS_TEMPLATES_MAIN_DIR, "backend", "wps_statistics_orders_by_month") );
+		require(wpshop_tools::get_template_part(WPS_STATISTICS_DIR, WPS_STATISTICS_TEMPLATES_MAIN_DIR, "backend", "wps_statistics_orders_by_month"));
 		$output = ob_get_contents();
 		ob_end_clean();
 		echo $output;
@@ -166,15 +166,15 @@ 
 	 * Display order status statistics
 	 */
 	function wps_statistics_orders_status() {
-		$begin_date =  ( !empty($_POST['begin_date']) ) ? wpshop_tools::varSanitizer( $_POST['begin_date'] ) : date( 'Y-m-d', strtotime( '1 months ago') );
-		$end_date = ( !empty($_POST['end_date']) ) ? wpshop_tools::varSanitizer( $_POST['end_date'] ) : date('Y-m-d');
+		$begin_date = (!empty($_POST['begin_date'])) ? wpshop_tools::varSanitizer($_POST['begin_date']) : date('Y-m-d', strtotime('1 months ago'));
+		$end_date = (!empty($_POST['end_date'])) ? wpshop_tools::varSanitizer($_POST['end_date']) : date('Y-m-d');
 		$orders_status = $this->wps_stats_mdl->wps_order_status($begin_date, $end_date);
-		$colors = array( 'canceled' => '#E0E4CC', 'shipped' => '#69D2E7', 'pos' => '#6993e7', 'completed' => '#64BC43', 'refunded' => '#E03E3E', 'partially_paid' => '#FF9900','awaiting_payment' => '#F4FA58', 'denied' => '#414141', 'incorrect_amount' => '#F38630', 'payment_refused' => '#8F33E0');
-		$payment_status = unserialize( WPSHOP_ORDER_STATUS );
-		if( !empty($orders_status) ) {
-			arsort( $orders_status );
+		$colors = array('canceled' => '#E0E4CC', 'shipped' => '#69D2E7', 'pos' => '#6993e7', 'completed' => '#64BC43', 'refunded' => '#E03E3E', 'partially_paid' => '#FF9900', 'awaiting_payment' => '#F4FA58', 'denied' => '#414141', 'incorrect_amount' => '#F38630', 'payment_refused' => '#8F33E0');
+		$payment_status = unserialize(WPSHOP_ORDER_STATUS);
+		if (!empty($orders_status)) {
+			arsort($orders_status);
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_STATISTICS_DIR, WPS_STATISTICS_TEMPLATES_MAIN_DIR, "backend", "wps_statistics_orders_status") );
+			require(wpshop_tools::get_template_part(WPS_STATISTICS_DIR, WPS_STATISTICS_TEMPLATES_MAIN_DIR, "backend", "wps_statistics_orders_status"));
 			$output = ob_get_contents();
 			ob_end_clean();
 			echo $output;
@@ -185,12 +185,12 @@ 
 	 * Display Best customers Statistics
 	 */
 	function wps_statistics_best_customers() {
-		$begin_date =  ( !empty($_POST['begin_date']) ) ? wpshop_tools::varSanitizer( $_POST['begin_date'] ) : date( 'Y-m-d', strtotime( '1 months ago') );
-		$end_date = ( !empty($_POST['end_date']) ) ? wpshop_tools::varSanitizer( $_POST['end_date'] ) : date('Y-m-d');
-		$customer_recap = $this->wps_stats_mdl->wps_best_customers( $begin_date, $end_date );
-		$colors = array( '#69D2E7', '#E0E4CC', '#F38630', '#64BC43', '#8F33E0', '#F990E6', '#414141', '#E03E3E');
+		$begin_date = (!empty($_POST['begin_date'])) ? wpshop_tools::varSanitizer($_POST['begin_date']) : date('Y-m-d', strtotime('1 months ago'));
+		$end_date = (!empty($_POST['end_date'])) ? wpshop_tools::varSanitizer($_POST['end_date']) : date('Y-m-d');
+		$customer_recap = $this->wps_stats_mdl->wps_best_customers($begin_date, $end_date);
+		$colors = array('#69D2E7', '#E0E4CC', '#F38630', '#64BC43', '#8F33E0', '#F990E6', '#414141', '#E03E3E');
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_STATISTICS_DIR, WPS_STATISTICS_TEMPLATES_MAIN_DIR, "backend", "wps_statistics_best_customers") );
+		require(wpshop_tools::get_template_part(WPS_STATISTICS_DIR, WPS_STATISTICS_TEMPLATES_MAIN_DIR, "backend", "wps_statistics_best_customers"));
 		$output = ob_get_contents();
 		ob_end_clean();
 		echo $output;
@@ -199,16 +199,16 @@ 
 	/**
 	 * Display Orders moment in the day Statistics
 	 */
-	function wps_statistics_orders_moment( $args = array( 'choosen_day' => '', 'return' => false ) ) {
-		$begin_date =  ( !empty($_POST['begin_date']) ) ? wpshop_tools::varSanitizer( $_POST['begin_date'] ) : date( 'Y-m-d', strtotime( '1 months ago') );
-		$end_date = ( !empty($_POST['end_date']) ) ? wpshop_tools::varSanitizer( $_POST['end_date'] ) : date('Y-m-d');
-		$datadate = $this->wps_stats_mdl->wps_get_orders_by_hours( $begin_date, $end_date, ( ( !empty($args['choosen_day']) ) ? $args['choosen_day'] : '' ) );
-		$days = array( 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
+	function wps_statistics_orders_moment($args = array('choosen_day' => '', 'return' => false)) {
+		$begin_date = (!empty($_POST['begin_date'])) ? wpshop_tools::varSanitizer($_POST['begin_date']) : date('Y-m-d', strtotime('1 months ago'));
+		$end_date = (!empty($_POST['end_date'])) ? wpshop_tools::varSanitizer($_POST['end_date']) : date('Y-m-d');
+		$datadate = $this->wps_stats_mdl->wps_get_orders_by_hours($begin_date, $end_date, ((!empty($args['choosen_day'])) ? $args['choosen_day'] : ''));
+		$days = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_STATISTICS_DIR, WPS_STATISTICS_TEMPLATES_MAIN_DIR, "backend", "wps_statistics_orders_moment") );
+		require(wpshop_tools::get_template_part(WPS_STATISTICS_DIR, WPS_STATISTICS_TEMPLATES_MAIN_DIR, "backend", "wps_statistics_orders_moment"));
 		$output = ob_get_contents();
 		ob_end_clean();
-		if( ( !empty( $args) ) && !empty( $args['return'] ) && $args['return'] ) {
+		if ((!empty($args)) && !empty($args['return']) && $args['return']) {
 			return $output;
 		}
 		else {
@@ -222,42 +222,42 @@ 
 	function wps_hourly_order_day() {
 		$status = false; $response = '';
 
-		$day = ( !empty($_POST['day']) ) ? sanitize_text_field( $_POST['day'] ) : null;
-		$width = !empty( $_POST['width'] ) ? (int) $_POST['width'] : 0;
-		$height = !empty( $_POST['height'] ) ? (int) $_POST['height'] : 0;
+		$day = (!empty($_POST['day'])) ? sanitize_text_field($_POST['day']) : null;
+		$width = !empty($_POST['width']) ? (int)$_POST['width'] : 0;
+		$height = !empty($_POST['height']) ? (int)$_POST['height'] : 0;
 		
-		$response = $this->wps_statistics_orders_moment( array( 'choosen_day' => $day, 'return' => true, 'width' => $width, 'height' => $height ) );
+		$response = $this->wps_statistics_orders_moment(array('choosen_day' => $day, 'return' => true, 'width' => $width, 'height' => $height));
 		$status = true;
-		echo json_encode( array( 'status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 
 
 
-	function customers_by_month(){
+	function customers_by_month() {
 	$canvas_js = '';
 	$box_title = __('Monthly customers', 'wpshop');
 	$canvas_width = 550;
 	$canvas_height = 400;
 	$products = $this->wps_stats_mdl->wps_customers_month();
-		if ( !empty($customers_recap) ) {
-				krsort( $customers_recap );
+		if (!empty($customers_recap)) {
+				krsort($customers_recap);
 				$canvas_js .= '<script type="text/javascript">';
-				$canvas_js .= 'var data  = { labels : ["' .__('January', 'wpshop'). '","' .__('February', 'wpshop'). '","' .__('March', 'wpshop'). '","' .__('April', 'wpshop'). '","' .__('May', 'wpshop'). '","' .__('June', 'wpshop'). '","' .__('July', 'wpshop'). '","' .__('August', 'wpshop'). '" ,"' .__('September', 'wpshop'). '" ,"' .__('October', 'wpshop'). '","' .__('November', 'wpshop'). '","' .__('December', 'wpshop'). '"],';
+				$canvas_js .= 'var data  = { labels : ["' . __('January', 'wpshop') . '","' . __('February', 'wpshop') . '","' . __('March', 'wpshop') . '","' . __('April', 'wpshop') . '","' . __('May', 'wpshop') . '","' . __('June', 'wpshop') . '","' . __('July', 'wpshop') . '","' . __('August', 'wpshop') . '" ,"' . __('September', 'wpshop') . '" ,"' . __('October', 'wpshop') . '","' . __('November', 'wpshop') . '","' . __('December', 'wpshop') . '"],';
 				$canvas_js .= 'datasets : [';
 				$i = 0;
-				$colors = array(array('#E0E4CC', '#A8AA99') , array('#69D2E7', '#4CA3B5'));
-				$customers_recap = array_slice( $customers_recap, 0, 2, true );
-				$customers_recap = array_reverse( $customers_recap, true );
-				foreach( $customers_recap as $y => $year ) {
+				$colors = array(array('#E0E4CC', '#A8AA99'), array('#69D2E7', '#4CA3B5'));
+				$customers_recap = array_slice($customers_recap, 0, 2, true);
+				$customers_recap = array_reverse($customers_recap, true);
+				foreach ($customers_recap as $y => $year) {
 
-					if ( $i < 2 ) {
-						$canvas_js .= '{fillColor : "' .$colors[$i][0]. '",strokeColor :"' .$colors[$i][1]. '",';
+					if ($i < 2) {
+						$canvas_js .= '{fillColor : "' . $colors[$i][0] . '",strokeColor :"' . $colors[$i][1] . '",';
 						$canvas_js .= 'data : [';
-						for( $j = 1; $j <= 12; $j++) {
-							if( !empty($year[$j]) ) {
-								$canvas_js .= $year[$j].',';
-								if ( $count_users < $year[$j] ) {
+						for ($j = 1; $j <= 12; $j++) {
+							if (!empty($year[$j])) {
+								$canvas_js .= $year[$j] . ',';
+								if ($count_users < $year[$j]) {
 									$count_users = $year[$j];
 								}
 							}
@@ -272,19 +272,19 @@ 
 					}
 				}
 				$canvas_js .= ']};';
-				$canvas_js .= 'var BarCustomers = new Chart(document.getElementById("wps_customers_account_creation").getContext("2d")).Bar(data, {scaleOverride : true, scaleSteps : ' .round( ($count_users / 5) ). ', scaleStepWidth : 5, scaleStartValue : 0});';
+				$canvas_js .= 'var BarCustomers = new Chart(document.getElementById("wps_customers_account_creation").getContext("2d")).Bar(data, {scaleOverride : true, scaleSteps : ' . round(($count_users / 5)) . ', scaleStepWidth : 5, scaleStartValue : 0});';
 				$canvas_js .= '</script>';
 
 				/** Legend **/
 				$canvas_js .= '<center><ul class="wps_statistics_legend">';
-				foreach( $colors as $color ) {
-					if ( !empty($color) && !empty($color[2]) )
-					$canvas_js .= '<li style="width : auto; margin-right : 20px;"><div style="background : ' .$color[0]. ';" class="legend_indicator"></div>' .$color[2]. '</li>';
+				foreach ($colors as $color) {
+					if (!empty($color) && !empty($color[2]))
+					$canvas_js .= '<li style="width : auto; margin-right : 20px;"><div style="background : ' . $color[0] . ';" class="legend_indicator"></div>' . $color[2] . '</li>';
 				}
 				$canvas_js .= '</ul></center>';
 		}
 		else {
-			$canvas_js = __( 'No customer account has been created on your shop', 'wpshop');
+			$canvas_js = __('No customer account has been created on your shop', 'wpshop');
 		}
 	}
 

includes/modules/wpshop_prices/wpshop_prices.php

Doc Comments +4 added lines

@@ -166,6 +166,9 @@ 
 			return $price_infos;
 		}
 
+		/**
+		 * @param string $return_type
+		 */
 		public static function get_product_price($product, $return_type, $output_type = '', $only_price = false, $price_checking_done = false) {
 			$wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
 // 			$wpshop_price_piloting_option = 'TTC';
@@ -458,6 +461,7 @@ 
 
 		/**
 		 * Check if isset Required attributes
+		 * @param integer $product_id
 		 */
 		public static function check_required_attributes( $product_id ) {
 			$required_attributes_list = array();

Spacing +325 added lines, -325 removed lines

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

Braces +39 added lines, -63 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * WPSHOP Prices bootstrap file
@@ -65,8 +67,7 @@ 
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				/** Desactivate Discount Attributes **/
 				if ( !empty($discount_attributes) ) {
 					foreach ( $discount_attributes as $discount_attribute ) {
@@ -113,14 +114,12 @@ 
 							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] /100);
 							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] /100) : $discount_config['value'];
 							$product['tva'] = $product['price_ht'] * ( $product['tx_tva'] / 100);
-						}
-						elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
+						} elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
 							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht_before_discount'] - $discount_config['value'] ) : ( ( $product['price_ttc_before_discount'] - $discount_config['value'] ) / (1 + $product['tx_tva'] /100) ) ;
 							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * (1 + $product['tx_tva'] /100) : $product['price_ttc_before_discount'] - $discount_config['value'];
 							$product['tva'] =  $product['price_ht'] * ( $product['tx_tva'] / 100);
 
-						}
-						elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
+						} elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
 							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht_before_discount'] * ( 1 -  $discount_config['value'] / 100) ) : ( ( $product['price_ttc_before_discount']  * ( 1 - ( $discount_config['value'] / 100 ) ) ) / (1 + $product['tx_tva'] /100) ) ;
 							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * ( 1 + $product['tx_tva'] /100) : $product['price_ttc_before_discount'] * ( 1 - ( $discount_config['value'] / 100 ) );
 							$product['tva'] =  $product['price_ht'] * ( $product['tx_tva'] / 100);
@@ -136,16 +135,14 @@ 
 						$price_infos['discount']['discount_ati_price'] = ( !empty($product['price_ttc_before_discount']) ) ? number_format((float)$product['product_price'], 2, '.', '') : 0;
 						$price_infos['discount']['discount_et_price'] = ( !empty($product['price_ht_before_discount']) ) ? number_format( (float)$product['price_ht'], 2, '.', '' ) : 0;
 						$price_infos['discount']['discount_tva'] = ( !empty($product['price_ttc_before_discount']) && !empty($product['price_ht_before_discount']) ) ? number_format( ($price_infos['discount']['discount_ati_price'] - $price_infos['discount']['discount_et_price']), 2, '.', '') : 0;
-					}
-					else {
+					} else {
 						$price_infos['ati'] = ( !empty($product['product_price'] )) ? number_format((float)$product['product_price'], 5, '.', '') : 0;
 						$price_infos['et'] = ( !empty($product['price_ht'] ) ) ? number_format((float)$product['price_ht'], 5, '.', '') : 0;
 						$price_infos['tva'] =  ( !empty($product['tva'] ) ) ? $product['tva'] : 0;
 					}
 
 
-				}
-				else {
+				} else {
 					if ( !empty( $product['price_ttc_before_discount']) && !empty( $product['price_ht_before_discount'] ) ) {
 						$price_infos['discount']['discount_exist'] = ( !empty($product['price_ttc_before_discount'])  && !empty($product['price_ht_before_discount'] ) ) ? true : false;
 						$price_infos['discount']['discount_ati_price'] = ( !empty($product['product_price']) ) ? number_format((float)$product['product_price'], 2, '.', '') : 0;
@@ -155,8 +152,7 @@ 
 						$price_infos['ati'] = ( !empty($product['price_ttc_before_discount'] )) ? number_format((float)$product['price_ttc_before_discount'], 5, '.', '') : 0;
 						$price_infos['et'] = ( !empty($product['price_ht_before_discount']) ) ? number_format((float)$product['price_ht_before_discount'], 5, '.', '') : 0;
 						$price_infos['tva'] =  $price_infos['ati'] - $price_infos['et'];
-					}
-					else {
+					} else {
 						$price_infos['ati'] = ( !empty($product['product_price'] )) ? number_format((float)$product['product_price'], 5, '.', '') : 0;
 						$price_infos['et'] = ( !empty($product['price_ht'] ) ) ? number_format((float)$product['price_ht'], 5, '.', '') : 0;
 						$price_infos['tva'] =  ( !empty($product['tva'] ) ) ? $product['tva'] : 0;
@@ -199,8 +195,7 @@ 
 					if ( !empty($product_with_variation[$product['product_id']]['variation_priority']) ) {
 						$product =  wpshop_products::get_variation_price_behaviour( $product, $product_with_variation[$product['product_id']]['variations'], $product['product_id'], array('type' => $product_with_variation[$product['product_id']]['variation_priority'], 'text_from' => !empty($product_with_variation['text_from']) ? 'on' : '' ) );
 					}
-				}
-				else {
+				} else {
 					/** It's Simple product Check Discounts for products **/
 					$discount_config = self::check_discount_for_product( $product['product_id'] );
 					if ( !empty($discount_config) ) {
@@ -211,8 +206,7 @@ 
 							$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] /100);
 							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] /100) : $discount_config['value'];
 							$product['tva'] = $product['price_ht'] * ( $product['tx_tva'] / 100);
-						}
-						elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
+						} elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
 							$product['price_ttc_before_discount'] = $product['product_price'];
 							$product['price_ht_before_discount'] = $product['price_ht'];
 
@@ -220,8 +214,7 @@ 
 							$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * (1 + $product['tx_tva'] /100) : $product['price_ttc_before_discount'] - $discount_config['value'];
 							$product['tva'] =  $product['price_ht'] * ( $product['tx_tva'] / 100);
 
-						}
-						elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
+						} elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
 							$product['price_ttc_before_discount'] = $product['product_price'];
 							$product['price_ht_before_discount'] = $product['price_ht'];
 
@@ -244,13 +237,16 @@ 
 			if ( !empty($price_infos) ) {
 				if ( $return_type == 'check_only' ) {
 					/** Check if the product price has been set	*/
-					if( isset($price_infos['ati']) && $price_infos['ati'] === '') return __('This product cannot be purchased - the price is not yet announced', 'wpshop');
+					if( isset($price_infos['ati']) && $price_infos['ati'] === '') {
+						return __('This product cannot be purchased - the price is not yet announced', 'wpshop');
+					}
 					/** Check if the product price is coherent (not less than 0)	*/
-					if( isset($price_infos['ati']) && $price_infos['ati'] < 0) return __('This product cannot be purchased - its price is negative', 'wpshop');
+					if( isset($price_infos['ati']) && $price_infos['ati'] < 0) {
+						return __('This product cannot be purchased - its price is negative', 'wpshop');
+					}
 
 					return true;
-				}
-				elseif( $return_type == 'just_price_infos' ) {
+				} elseif( $return_type == 'just_price_infos' ) {
 					$tpl_component = array();
 
 					$price = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $price_infos['et'] : $price_infos['ati'];
@@ -269,8 +265,7 @@ 
 						$tpl_component['CROSSED_OUT_PRICE'] = $crossed_out_price;
 						if(!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') {
 							$exploded_discount_price = explode('.', number_format($price_infos['discount']['discount_et_price'],2, '.', ''));
-						}
-						else {
+						} else {
 							$exploded_discount_price = explode('.', number_format($price_infos['discount']['discount_ati_price'],2, '.', ''));
 						}
 
@@ -278,16 +273,14 @@ 
 						$tpl_component['PRODUCT_PRICE'] = '<span class="wps-absolute-price">'.$discount_price.'</span> '.$productCurrency;
 
 						$tpl_component['MESSAGE_SAVE_MONEY'] = $wps_marketing_tools->display_message_you_save_money( $price_infos );
-					}
-					else {
+					} else {
 						$tpl_component['PRODUCT_PRICE'] = $price.' '.$productCurrency;
 					}
 
 					$post_type = get_post_type( $product['product_id'] );
 					if (  $post_type ==  WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) {
 						$price_display_attribute = get_post_meta( $product['product_id'], '_wpshop_variation_defining', true );
-					}
-					elseif( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
+					} elseif( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
 						$parent_def = wpshop_products::get_parent_variation ( $product['product_id'] );
 						if( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
 							$parent_post = $parent_def['parent_post'];
@@ -298,8 +291,7 @@ 
 					$tpl_component['PRICE_FROM'] = ( ( !empty($price_display_attribute) && empty($price_display_attribute['options'] ) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])  ) || ( ( !empty($price_display_attribute) && (!empty($price_display_attribute['options'] ) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from']) ) ) ) ) ) ? 'on' : '';
 
 					return $tpl_component;
-				}
-				else if ( $return_type == 'price_display' ) {
+				} else if ( $return_type == 'price_display' ) {
 					$tpl_component = array();
 					$price = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $price_infos['et'] : $price_infos['ati'];
 
@@ -323,8 +315,7 @@ 
 								$parent_post = $parent_def['parent_post'];
 								$price_display_attribute = get_post_meta( $parent_post->ID, '_wpshop_variation_defining', true );
 							}
-						}
-						else {
+						} else {
 							$price_display_attribute = get_post_meta( $product['product_id'], '_wpshop_variation_defining', true );
 						}
 						$text_from = ( ( !empty($price_display_attribute) && empty($price_display_attribute['options'] ) && !empty($price_display_option) && !empty($price_display_option['price_display']) && !empty($price_display_option['price_display']['text_from'])  ) || ( ( !empty($price_display_attribute) && (!empty($price_display_attribute['options'] ) && (!empty($price_display_attribute['options']['price_display']) && !empty($price_display_attribute['options']['price_display']['text_from']) ) ) ) ) && !empty($product['text_from']) ) ? true : false;
@@ -342,14 +333,12 @@ 
 						$tpl_component['PRODUCT_PRICE'] = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? '<span class="wps-absolute-price">'. $price_infos['discount']['discount_et_price'].'</span> '.$productCurrency : '<span class="wps-absolute-price">'.$price_infos['discount']['discount_ati_price'].'</span> '.$productCurrency;
 						$tpl_component['MESSAGE_SAVE_MONEY'] = $wps_marketing_tools->display_message_you_save_money( $price_data );
 
-					}
-					else {
+					} else {
 						if( get_post_type($product['product_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
 							$parent_def = wpshop_products::get_parent_variation( $product['product_id'] );
 							$pid = $parent_def['parent_post'];
 							$pid = $pid->ID;
-						}
-						else {
+						} else {
 							$pid = $product['product_id'];
 						}
 
@@ -362,8 +351,7 @@ 
 								$parent_post = $parent_def['parent_post'];
 								$price_display_attribute = get_post_meta( $parent_post->ID, '_wpshop_variation_defining', true );
 							}
-						}
-						else {
+						} else {
 							$price_display_attribute = get_post_meta( $pid, '_wpshop_variation_defining', true );
 						}
 
@@ -381,8 +369,7 @@ 
 
 					if ( $output_type == 'complete_sheet' ) {
 						$price_tpl = wpshop_display::display_template_element('product_price_template_complete_sheet', $tpl_component );
-					}
-					elseif ( $output_type == 'mini_output' || in_array('mini_output', $output_type ) ) {
+					} elseif ( $output_type == 'mini_output' || in_array('mini_output', $output_type ) ) {
 						$price_tpl = wpshop_display::display_template_element('product_price_template_mini_output', $tpl_component );
 					}
 					return $price_tpl;
@@ -527,8 +514,7 @@ 
 											$tx_tva = $wpdb->get_var( $query );
 											$variation_price =  $variation['variation_dif']['price_ht'] / ( 1 + ($variation['variation_dif']['discount_rate'] / 100 ) );
 											$variation_price = ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? $variation_price : $variation_price * 1 + ($tx_tva / 100);
-										}
-										elseif( empty($variation['variation_dif']['special_price']) && !empty($variation['variation_dif']['discount_amount']) && $variation['variation_dif']['discount_amount'] > 0 ) {
+										} elseif( empty($variation['variation_dif']['special_price']) && !empty($variation['variation_dif']['discount_amount']) && $variation['variation_dif']['discount_amount'] > 0 ) {
 											$query = $wpdb->prepare( 'SELECT value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d', $variation['variation_dif']['tx_tva'] );
 											$tx_tva = $wpdb->get_var( $query );
 											$variation_price =  $variation['variation_dif']['price_ht'] - $variation['variation_dif']['discount_amount'];
@@ -548,8 +534,7 @@ 
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				if ( !empty($product_id) ) {
 					if( !empty($variations) ) {
 
@@ -589,14 +574,12 @@ 
 					$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] : $discount_config['value'] / (1 + $product['tx_tva'] /100);
 					$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $discount_config['value'] * (1 + $product['tx_tva'] /100) : $discount_config['value'];
 					$product['tva'] = $product['product_price'] - $product['price_ht'];
-				}
-				elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
+				} elseif( !empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_amount' ) {
 					$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht'] - $discount_config['value'] ) : ( ( $product['product_price'] - $discount_config['value'] ) / (1 + $product['tx_tva'] /100) ) ;
 					$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * (1 + $product['tx_tva'] /100) : $product['product_price'] - $discount_config['value'];
 					$product['tva'] =  $product['product_price'] - $product['price_ht'];
 
-				}
-				elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
+				} elseif(!empty($discount_config['type']) && !empty($discount_config['value']) && $discount_config['type'] == 'discount_rate') {
 					$product['price_ht'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? ( $product['price_ht'] * ( 1 -  $discount_config['value'] / 100) ) : ( ( $product['product_price']  * ( 1 - ( $discount_config['value'] / 100 ) ) ) / (1 + $product['tx_tva'] /100) ) ;
 					$product['product_price'] = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT' ) ? $product['price_ht'] * ( 1 + $product['tx_tva'] /100) : $product['product_price'] * ( 1 - ( $discount_config['value'] / 100 ) );
 					$product['tva'] =   $product['product_price'] - $product['price_ht'];
@@ -618,8 +601,7 @@ 
 					$product_discount_date_to = ( !empty($product_meta['special_to']) ) ? $product_meta['special_to'] : 0;
 
 					$product_meta = get_post_meta( $product_id, '_wpshop_product_metadata', true );
-				}
-				else {
+				} else {
 					$product_meta = get_post_meta( $product_id, '_wpshop_product_metadata', true );
 					$product_discount_date_from = ( !empty($product_meta['special_from']) ) ? $product_meta['special_from'] : 0;
 					$product_discount_date_to = ( !empty($product_meta['special_to']) ) ? $product_meta['special_to'] : 0;
@@ -634,12 +616,10 @@ 
 						if ( !empty($product_meta['special_price']) && $product_meta['special_price'] > 0 ) {
 							$discount_config['type'] = 'special_price';
 							$discount_config['value'] = $product_meta['special_price'];
-						}
-						elseif( !empty($product_meta['discount_amount']) && $product_meta['discount_amount'] > 0) {
+						} elseif( !empty($product_meta['discount_amount']) && $product_meta['discount_amount'] > 0) {
 							$discount_config['type'] = 'discount_amount';
 							$discount_config['value'] = $product_meta['discount_amount'];
-						}
-						elseif( !empty($product_meta['discount_rate']) && $product_meta['discount_rate'] > 0 ) {
+						} elseif( !empty($product_meta['discount_rate']) && $product_meta['discount_rate'] > 0 ) {
 							$discount_config['type'] = 'discount_rate';
 							$discount_config['value'] = $product_meta['discount_rate'];
 						}
@@ -725,8 +705,7 @@ 
 											$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 );
-										}
-										else {
+										} else {
 											/** Update post meta **/
 											$product_data['product_price'] = (float)str_replace( ',', '.', $product_data['product_price'] );
 											$product_data['price_ht'] = $product_data['product_price'] / ( 1 + ($tva_array[ $product_data['tx_tva'] ] / 100) );
@@ -773,8 +752,7 @@ 
 											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['price_ht'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $price_ht_attribute_def->id, 'entity_id' => $product_variation->ID) );
 											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['product_price'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $product_price_attribute_def->id, 'entity_id' => $product_variation->ID) );
 											$wpdb->update( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array('value' => $product_data['tva'] ), array('entity_type_id' => $product_entity, 'attribute_id' => $tva_attribute_def->id, 'entity_id' => $product_variation->ID) );
-										}
-										else {
+										} else {
 											/** Update post meta **/
 											$product_data['product_price'] = (float)str_replace( ',', '.', $product_data['product_price'] );
 											$product_data['price_ht'] = $product_data['product_price'] / ( 1 + ($tva_array[ $product_data['tx_tva'] ] / 100) );
@@ -795,12 +773,10 @@ 
 
 					$result = __('Prices updated', 'wpshop');
 					$status = true;
-				}
-				else {
+				} else {
 					$result = __('No VAT rates was found', 'wpshop');
 				}
-			}
-			else {
+			} else {
 				$result = __( 'VAT rate attribute was not found', 'wpshop' );
 			}
 			return array( $status, $result );

script/wp-emulator.script.php

Doc Comments +12 added lines

@@ -110,11 +110,17 @@ 
 		echo "[+] Registering actiovation hook -> " . $file . " in " . $hooked . PHP_EOL;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	function add_filter( $name, $fn, $nbr = "")
 	{
 		echo "[+] Adding filter -> " . $name . " X" . $nbr . PHP_EOL;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	function add_shortcode( $name )
 	{
 		echo "[+] Adding shortcode -> " . $name . PHP_EOL;
@@ -150,6 +156,9 @@ 
 		echo "[+] Loading text domain" . PHP_EOL;
 	}
 
+	/**
+	 * @param string $path
+	 */
 	function plugin_dir_path($path)
 	{
 		echo "[+] Plugin path -> " . $path . PHP_EOL;
@@ -249,6 +258,9 @@ 
 		return "";
 	}
 
+	/**
+	 * @param string $str
+	 */
 	function current_time( $str )
 	{
 		$time = " 2005-08-05 10:41:13";

Indentation +3 added lines, -3 removed lines

@@ -158,12 +158,12 @@ 
 
 	function trailingslashit( $string )
 	{
-	    return untrailingslashit( $string ) . '/';
+		return untrailingslashit( $string ) . '/';
 	}
 
 	function untrailingslashit( $string )
 	{
-	        return rtrim( $string, '/\\' );
+			return rtrim( $string, '/\\' );
 	}
 
 	function site_url()
@@ -288,7 +288,7 @@ 
 		public $term_relationships = "term_relationship";
 		public $term_taxonomy = "term_taxonomy";
 
-    }
+	}
 
 	class WP_Widget
 	{

Spacing +35 added lines, -35 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 	define('ABSPATH', dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR);
-	define('WP_PLUGIN_DIR', dirname(dirname(dirname(__FILE__))) );
+	define('WP_PLUGIN_DIR', dirname(dirname(dirname(__FILE__))));
 	define('WP_LANG_DIR', 'FR');
 	define('WP_CONTENT_DIR', 'wp-content');
 
-	function __( $str )
+	function __($str)
 	{
 		$translate = "Result Testing text";
 		echo "[+] Requesting __ -> " . $str . PHP_EOL;
 		return $translate;
 	}
 
-	function add_action( $init, $object )
+	function add_action($init, $object)
 	{
 		$length = 0;
 		$hooked = "";
 		$oType = gettype($object);
-		if($oType == "object" || $oType == "array")
+		if ($oType == "object" || $oType == "array")
 		{
 			$hooked = "[";
-			foreach($object as $hook)
+			foreach ($object as $hook)
 			{
 				$length++;
 				$type = gettype($hook);
 
-				switch($type)
+				switch ($type)
 				{
 					case "integer":
 					case "boolean":
@@ -37,27 +37,27 @@ 
 						break;
 				}
 			}
-			if($length > 0) $hooked = rtrim($hooked, ",");
+			if ($length > 0) $hooked = rtrim($hooked, ",");
 			$hooked .= "]";
 		}
 		else $hooked .= $object;
 		echo "[+] Adding action -> " . $init . " in " . $hooked . PHP_EOL;
 	}
 
-	function register_activation_hook( $file , $object )
+	function register_activation_hook($file, $object)
 	{
 		$length = 0;
 		$hooked = "";
 		$oType = gettype($object);
-		if($oType == "object" || $oType == "array")
+		if ($oType == "object" || $oType == "array")
 		{
 			$hooked = "[";
-			foreach($object as $hook)
+			foreach ($object as $hook)
 			{
 				$length++;
 				$type = gettype($hook);
 
-				switch($type)
+				switch ($type)
 				{
 					case "integer":
 					case "boolean":
@@ -70,27 +70,27 @@ 
 						break;
 				}
 			}
-			if($length > 0) $hooked = rtrim($hooked, ",");
+			if ($length > 0) $hooked = rtrim($hooked, ",");
 			$hooked .= "]";
 		}
 		else $hooked .= $object;
 		echo "[+] Registering actiovation hook -> " . $file . " in " . $hooked . PHP_EOL;
 	}
 
-	function register_deactivation_hook( $file , $object )
+	function register_deactivation_hook($file, $object)
 	{
 		$length = 0;
 		$hooked = "";
 		$oType = gettype($object);
-		if($oType == "object" || $oType == "array")
+		if ($oType == "object" || $oType == "array")
 		{
 			$hooked = "[";
-			foreach($object as $hook)
+			foreach ($object as $hook)
 			{
 				$length++;
 				$type = gettype($hook);
 
-				switch($type)
+				switch ($type)
 				{
 					case "integer":
 					case "boolean":
@@ -103,29 +103,29 @@ 
 						break;
 				}
 			}
-			if($length > 0) $hooked = rtrim($hooked, ",");
+			if ($length > 0) $hooked = rtrim($hooked, ",");
 			$hooked .= "]";
 		}
 		else $hooked .= $object;
 		echo "[+] Registering actiovation hook -> " . $file . " in " . $hooked . PHP_EOL;
 	}
 
-	function add_filter( $name, $fn, $nbr = "")
+	function add_filter($name, $fn, $nbr = "")
 	{
 		echo "[+] Adding filter -> " . $name . " X" . $nbr . PHP_EOL;
 	}
 
-	function add_shortcode( $name )
+	function add_shortcode($name)
 	{
 		echo "[+] Adding shortcode -> " . $name . PHP_EOL;
 	}
 
-	function add_option( $name, $conf)
+	function add_option($name, $conf)
 	{
 		echo "[+] Adding option -> " . $name . " conf:" . $conf . PHP_EOL;
 	}
 
-	function update_option( $name, $conf)
+	function update_option($name, $conf)
 	{
 		echo "[+] Updating option -> " . $name . " conf:" . $conf . PHP_EOL;
 	}
@@ -153,17 +153,17 @@ 
 	function plugin_dir_path($path)
 	{
 		echo "[+] Plugin path -> " . $path . PHP_EOL;
-		return trailingslashit( dirname( $path ) );
+		return trailingslashit(dirname($path));
 	}
 
-	function trailingslashit( $string )
+	function trailingslashit($string)
 	{
-	    return untrailingslashit( $string ) . '/';
+	    return untrailingslashit($string) . '/';
 	}
 
-	function untrailingslashit( $string )
+	function untrailingslashit($string)
 	{
-	        return rtrim( $string, '/\\' );
+	        return rtrim($string, '/\\');
 	}
 
 	function site_url()
@@ -215,12 +215,12 @@ 
 		return $dir;
 	}
 
-	function add_theme_support( $theme )
+	function add_theme_support($theme)
 	{
 		echo "[+] Adding theme support -> " . $theme . PHP_EOL;
 	}
 
-	function add_image_size( $image, $x, $y, $bool )
+	function add_image_size($image, $x, $y, $bool)
 	{
 		echo "[+] Adding image size -> " . $image . " x:" . $x . " y:" . $y . " bool:" . $bool . PHP_EOL;
 	}
@@ -232,24 +232,24 @@ 
 		return $lang;
 	}
 
-	function load_plugin_textdomain( $name, $bool, $dir)
+	function load_plugin_textdomain($name, $bool, $dir)
 	{
 		echo "[+] Loading plugin textdomain -> " . $name . " bool:" . $bool . " dir:" . $dir . PHP_EOL;
 	}
 
-	function get_option( $name, $int = 0 )
+	function get_option($name, $int = 0)
 	{
 		echo "[+] Getting option -> " . $name . " int:" . $int . PHP_EOL;
 		return "";
 	}
 
-	function get_site_option( $name, $int = 0 )
+	function get_site_option($name, $int = 0)
 	{
 		echo "[+] Getting site option -> " . $name . " int:" . $int . PHP_EOL;
 		return "";
 	}
 
-	function current_time( $str )
+	function current_time($str)
 	{
 		$time = " 2005-08-05 10:41:13";
 		echo "[+] Requesting current_time -> " . $str . PHP_EOL;
@@ -258,17 +258,17 @@ 
 
 	class WPDB
 	{
-		function prepare( $request = "" )
+		function prepare($request = "")
 		{
 			echo "[+] Preparing -> " . $request . PHP_EOL;
 		}
 
-		public static function get_var( $request = "" )
+		public static function get_var($request = "")
 		{
 			echo "[+] Requesting get var -> " . $request . PHP_EOL;
 		}
 
-		public static function get_charset_collate( $request = "" )
+		public static function get_charset_collate($request = "")
 		{
 			echo "[+] Requesting get charset collate -> " . $request . PHP_EOL;
 		}

Braces +15 added lines, -6 removed lines

@@ -37,10 +37,13 @@ 
 						break;
 				}
 			}
-			if($length > 0) $hooked = rtrim($hooked, ",");
+			if($length > 0) {
+				$hooked = rtrim($hooked, ",");
+			}
 			$hooked .= "]";
+		} else {
+			$hooked .= $object;
 		}
-		else $hooked .= $object;
 		echo "[+] Adding action -> " . $init . " in " . $hooked . PHP_EOL;
 	}
 
@@ -70,10 +73,13 @@ 
 						break;
 				}
 			}
-			if($length > 0) $hooked = rtrim($hooked, ",");
+			if($length > 0) {
+				$hooked = rtrim($hooked, ",");
+			}
 			$hooked .= "]";
+		} else {
+			$hooked .= $object;
 		}
-		else $hooked .= $object;
 		echo "[+] Registering actiovation hook -> " . $file . " in " . $hooked . PHP_EOL;
 	}
 
@@ -103,10 +109,13 @@ 
 						break;
 				}
 			}
-			if($length > 0) $hooked = rtrim($hooked, ",");
+			if($length > 0) {
+				$hooked = rtrim($hooked, ",");
+			}
 			$hooked .= "]";
+		} else {
+			$hooked .= $object;
 		}
-		else $hooked .= $object;
 		echo "[+] Registering actiovation hook -> " . $file . " in " . $hooked . PHP_EOL;
 	}
 

script/unit.script.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 $unitList = searchFiles('.' . DIRECTORY_SEPARATOR, END_TEST);
 
 // Loop on unitList
-foreach($unitList as $test)
+foreach ($unitList as $test)
 {
 	echo "[+] Testing -> " . $test . PHP_EOL;
 	include($test);
@@ -28,7 +28,7 @@ 
 	$ite = new RecursiveIteratorIterator($dir);
 	$files = new RegexIterator($ite, $pattern, RegexIterator::GET_MATCH);
 	$fileList = array();
-	foreach($files as $file)
+	foreach ($files as $file)
 	{
 		$fileList[] = $file[0];
 	}

includes/librairies/shortcodes.class.php

Indentation +20 added lines, -20 removed lines

@@ -30,39 +30,39 @@
 	public $pageMessage = '';
 
 	/**
-	*	Get the url listing slug of the current class
-	*
-	*	@return string The table of the class
-	*/
+	 *	Get the url listing slug of the current class
+	 *
+	 *	@return string The table of the class
+	 */
 	function setMessage($message){
 		$this->pageMessage = $message;
 	}
 	/**
-	*	Get the url listing slug of the current class
-	*
-	*	@return string The table of the class
-	*/
+	 *	Get the url listing slug of the current class
+	 *
+	 *	@return string The table of the class
+	 */
 	function getListingSlug(){
 		return self::urlSlugListing;
 	}
 	/**
-	*	Get the url edition slug of the current class
-	*
-	*	@return string The table of the class
-	*/
+	 *	Get the url edition slug of the current class
+	 *
+	 *	@return string The table of the class
+	 */
 	function getEditionSlug(){
 		return self::urlSlugEdition;
 	}
 	/**
-	*	Get the database table of the current class
-	*
-	*	@return string The table of the class
-	*/
+	 *	Get the database table of the current class
+	 *
+	 *	@return string The table of the class
+	 */
 	/**
-	*	Define the title of the page
-	*
-	*	@return string $title The title of the page looking at the environnement
-	*/
+	 *	Define the title of the page
+	 *
+	 *	@return string $title The title of the page looking at the environnement
+	 */
 	function pageTitle(){
 		$action = isset($_REQUEST['action']) ? wpshop_tools::varSanitizer($_REQUEST['action']) : '';
 		$objectInEdition = isset($_REQUEST['id']) ? wpshop_tools::varSanitizer($_REQUEST['id']) : '';

Doc Comments +3 added lines

@@ -207,6 +207,9 @@
 		return $shortcodes;
 	}
 
+	/**
+	 * @param string $shortcode_code
+	 */
 	public static function output_shortcode($shortcode_code, $specific_shorcode = '', $more_class_shortcode_helper = ''){
 		$shortcode = ( empty($specific_shorcode) ? self::shortcode_definition() : $specific_shorcode );
 

Spacing +48 added lines, -48 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'));
 }
 
 class ewpshop_shortcodes
@@ -34,7 +34,7 @@ 
 	*
 	*	@return string The table of the class
 	*/
-	function setMessage($message){
+	function setMessage($message) {
 		$this->pageMessage = $message;
 	}
 	/**
@@ -42,7 +42,7 @@ 
 	*
 	*	@return string The table of the class
 	*/
-	function getListingSlug(){
+	function getListingSlug() {
 		return self::urlSlugListing;
 	}
 	/**
@@ -50,7 +50,7 @@ 
 	*
 	*	@return string The table of the class
 	*/
-	function getEditionSlug(){
+	function getEditionSlug() {
 		return self::urlSlugEdition;
 	}
 	/**
@@ -63,32 +63,32 @@ 
 	*
 	*	@return string $title The title of the page looking at the environnement
 	*/
-	function pageTitle(){
+	function pageTitle() {
 		$action = isset($_REQUEST['action']) ? wpshop_tools::varSanitizer($_REQUEST['action']) : '';
 		$objectInEdition = isset($_REQUEST['id']) ? wpshop_tools::varSanitizer($_REQUEST['id']) : '';
-		$page = !empty( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
+		$page = !empty($_GET['page']) ? sanitize_text_field($_GET['page']) : '';
 
-		$title = __(self::pageTitle, 'wpshop' );
-		if($action != ''){
-			if(($action == 'edit') || ($action == 'delete')){
+		$title = __(self::pageTitle, 'wpshop');
+		if ($action != '') {
+			if (($action == 'edit') || ($action == 'delete')) {
 				$editedItem = self::getElement($objectInEdition);
 				$title = sprintf(__(self::pageEditingTitle, 'wpshop'), str_replace("\\", "", $editedItem->frontend_label) . '&nbsp;(' . $editedItem->code . ')');
 			}
-			elseif($action == 'add'){
+			elseif ($action == 'add') {
 				$title = __(self::pageAddingTitle, 'wpshop');
 			}
 		}
-		elseif((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug())){
+		elseif ((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug())) {
 			$title = __(self::pageAddingTitle, 'wpshop');
 		}
 		return $title;
 	}
 
-	function elementAction(){
+	function elementAction() {
 
 	}
 
-	function shortcode_definition(){
+	function shortcode_definition() {
 		$shortcodes = array();
 
 		/*	Product tab	*/
@@ -187,32 +187,32 @@ 
 		return $shortcodes;
 	}
 
-	public static function output_shortcode($shortcode_code, $specific_shorcode = '', $more_class_shortcode_helper = ''){
-		$shortcode = ( empty($specific_shorcode) ? self::shortcode_definition() : $specific_shorcode );
+	public static function output_shortcode($shortcode_code, $specific_shorcode = '', $more_class_shortcode_helper = '') {
+		$shortcode = (empty($specific_shorcode) ? self::shortcode_definition() : $specific_shorcode);
 
-		$shortcode_main_title = ( !empty($shortcode[$shortcode_code]['main_title']) ? $shortcode[$shortcode_code]['main_title'] : '' );
-		$shorcode_main_code = ( !empty($shortcode[$shortcode_code]['main_code']) ? $shortcode[$shortcode_code]['main_code'] : '' );
+		$shortcode_main_title = (!empty($shortcode[$shortcode_code]['main_title']) ? $shortcode[$shortcode_code]['main_title'] : '');
+		$shorcode_main_code = (!empty($shortcode[$shortcode_code]['main_code']) ? $shortcode[$shortcode_code]['main_code'] : '');
 		$shorcode_attributes_def = ' ';
-		if(!empty($shortcode[$shortcode_code]['attrs_def'])){
-			foreach($shortcode[$shortcode_code]['attrs_def'] as $attr_name => $attr_values){
-				$shorcode_attributes_def .= $attr_name.'="'.$attr_values.'" ';
+		if (!empty($shortcode[$shortcode_code]['attrs_def'])) {
+			foreach ($shortcode[$shortcode_code]['attrs_def'] as $attr_name => $attr_values) {
+				$shorcode_attributes_def .= $attr_name . '="' . $attr_values . '" ';
 			}
 		}
 		$shorcode_attributes_def = substr($shorcode_attributes_def, 0, -1);
 		$shorcode_attributes_exemple = ' ';
-		if(!empty($shortcode[$shortcode_code]['attrs_exemple'])){
-			foreach($shortcode[$shortcode_code]['attrs_exemple'] as $attr_name => $attr_values){
-				$shorcode_attributes_exemple .= $attr_name.'="'.$attr_values.'" ';
+		if (!empty($shortcode[$shortcode_code]['attrs_exemple'])) {
+			foreach ($shortcode[$shortcode_code]['attrs_exemple'] as $attr_name => $attr_values) {
+				$shorcode_attributes_exemple .= $attr_name . '="' . $attr_values . '" ';
 			}
 		}
 		$shorcode_attributes_exemple = substr($shorcode_attributes_exemple, 0, -1);
 
-		include(WPSHOP_TEMPLATES_DIR.'admin/shortcode_help.tpl.php');
+		include(WPSHOP_TEMPLATES_DIR . 'admin/shortcode_help.tpl.php');
 	}
 
 	public static function wysiwyg_button() {
-		if ( ! current_user_can('edit_posts') && ! current_user_can('edit_pages') ) return;
-		if ( get_user_option('rich_editing') == 'true') :
+		if (!current_user_can('edit_posts') && !current_user_can('edit_pages')) return;
+		if (get_user_option('rich_editing') == 'true') :
 		add_filter('mce_external_plugins', array('wpshop_shortcodes', 'add_button_to_wysiwyg'));
 		add_filter('mce_buttons', array('wpshop_shortcodes', 'register_wysiwyg_button'));
 		endif;
@@ -221,17 +221,17 @@ 
 		$ver += 3;
 		return $ver;
 	}
-	public static function add_button_to_wysiwyg($plugin_array){
+	public static function add_button_to_wysiwyg($plugin_array) {
 		$plugin_array['wpshop_wysiwyg_shortcodes'] = WPSHOP_JS_URL . 'pages/wysiwyg_editor.js';
 		return $plugin_array;
 	}
-	public static function register_wysiwyg_button($existing_button){
+	public static function register_wysiwyg_button($existing_button) {
 		array_push($existing_button, "|", "wpshop_wysiwyg_button");
 		return $existing_button;
 	}
 
 
-	function elementList(){
+	function elementList() {
 
 		$shortcode_list = '';
 		ob_start();
@@ -247,71 +247,71 @@ 
 
 	<div id="products">
 		<div class="wpshop_admin_box wpshop_admin_box_shortcode wpshop_admin_box_shortcode_product" >
-			<h3><?php _e('Simple product','wpshop'); ?></h3>
+			<h3><?php _e('Simple product', 'wpshop'); ?></h3>
 			<?php self::output_shortcode('simple_product'); ?>
-			<h3><?php _e('Products listing','wpshop'); ?></h3>
+			<h3><?php _e('Products listing', 'wpshop'); ?></h3>
 			<?php self::output_shortcode('product_listing'); ?>
-			<h3><?php _e('Products listing specific','wpshop'); ?></h3>
+			<h3><?php _e('Products listing specific', 'wpshop'); ?></h3>
 			<?php self::output_shortcode('product_listing_specific'); ?>
-			<h3><?php _e('Products listing by attributes','wpshop'); ?></h3>
+			<h3><?php _e('Products listing by attributes', 'wpshop'); ?></h3>
 			<?php self::output_shortcode('product_by_attribute'); ?>
-			<h3><?php _e( 'Related products', 'wpshop'); ?></h3>
+			<h3><?php _e('Related products', 'wpshop'); ?></h3>
 			<?php self::output_shortcode('related_products'); ?>
 		</div>
 	</div>
 
 	<div id="category">
 		<div class="wpshop_admin_box wpshop_admin_box_shortcode wpshop_admin_box_shortcode_category" >
-			<h3><?php _e('Simple category','wpshop'); ?></h3>
+			<h3><?php _e('Simple category', 'wpshop'); ?></h3>
 			<?php self::output_shortcode('simple_category'); ?>
 		</div>
 	</div>
 
 	<div id="attributs">
 		<div class="wpshop_admin_box wpshop_admin_box_shortcode wpshop_admin_box_shortcode_attributes" >
-			<h3><?php _e('Simple attribute','wpshop'); ?></h3>
+			<h3><?php _e('Simple attribute', 'wpshop'); ?></h3>
 			<?php self::output_shortcode('simple_attribute'); ?>
-			<h3><?php _e('Attributes set','wpshop'); ?></h3>
+			<h3><?php _e('Attributes set', 'wpshop'); ?></h3>
 			<?php self::output_shortcode('attributes_set'); ?>
 		</div>
 	</div>
 
 	<div id="widgets">
 		<div class="wpshop_admin_box wpshop_admin_box_shortcode wpshop_admin_box_shortcode_widget wpshop_admin_box_shortcode_widget_cart" >
-			<h3><?php _e('Cart','wpshop'); ?></h3>
+			<h3><?php _e('Cart', 'wpshop'); ?></h3>
 			<?php self::output_shortcode('widget_cart_full'); ?>
 			<?php self::output_shortcode('widget_cart_mini'); ?>
 		</div>
 		<div class="wpshop_admin_box wpshop_admin_box_shortcode wpshop_admin_box_shortcode_widget wpshop_admin_box_shortcode_widget_checkout" >
-			<h3><?php _e('Checkout','wpshop'); ?></h3>
+			<h3><?php _e('Checkout', 'wpshop'); ?></h3>
 			<?php self::output_shortcode('widget_checkout'); ?>
 		</div>
 		<div class="wpshop_admin_box wpshop_admin_box_shortcode wpshop_admin_box_shortcode_widget wpshop_admin_box_shortcode_widget_customer_account" >
-			<h3><?php _e('Account','wpshop'); ?></h3>
+			<h3><?php _e('Account', 'wpshop'); ?></h3>
 			<?php self::output_shortcode('widget_account'); ?>
 		</div>
 		<div class="wpshop_admin_box wpshop_admin_box_shortcode wpshop_admin_box_shortcode_widget wpshop_admin_box_shortcode_widget_shop" >
-			<h3><?php _e('Shop','wpshop'); ?></h3>
+			<h3><?php _e('Shop', 'wpshop'); ?></h3>
 			<?php self::output_shortcode('widget_shop'); ?>
 		</div>
 		<div class="wpshop_admin_box wpshop_admin_box_shortcode wpshop_admin_box_shortcode_widget wpshop_admin_box_shortcode_custom_search" >
-			<h3><?php _e('Custom search','wpshop'); ?></h3>
+			<h3><?php _e('Custom search', 'wpshop'); ?></h3>
 			<?php self::output_shortcode('widget_custom_search'); ?>
 		</div>
 		<div class="wpshop_admin_box wpshop_admin_box_shortcode wpshop_admin_box_shortcode_widget wpshop_admin_box_shortcode_custom_search" >
-			<h3><?php _e('Filter Search','wpshop'); ?></h3>
+			<h3><?php _e('Filter Search', 'wpshop'); ?></h3>
 			<?php self::output_shortcode('widget_filter_search'); ?>
-			<a href="http://www.wpshop.fr/documentations/la-recherche-par-filtre/" target="_blank"><?php _e( 'Read the filter search tutorial', 'wpshop'); ?></a>
+			<a href="http://www.wpshop.fr/documentations/la-recherche-par-filtre/" target="_blank"><?php _e('Read the filter search tutorial', 'wpshop'); ?></a>
 		</div>
 		<div class="wpshop_admin_box wpshop_admin_box_shortcode wpshop_admin_box_shortcode_widget wpshop_admin_box_shortcode_custom_search" >
-			<h3><?php _e('Breadcrumb WPShop','wpshop'); ?></h3>
+			<h3><?php _e('Breadcrumb WPShop', 'wpshop'); ?></h3>
 			<?php self::output_shortcode('widget_wps_breadcrumb'); ?>
 		</div>
 	</div>
 
 	<div id="customs_emails">
 		<div class="wpshop_admin_box wpshop_admin_box_shortcode wpshop_admin_box_shortcode_emails" >
-			<h3><?php _e('Available tags for emails cutomization','wpshop'); ?></h3>
+			<h3><?php _e('Available tags for emails cutomization', 'wpshop'); ?></h3>
 			<ul >
 				<li><span class="wpshop_customer_tag_name" ><?php _e('Customer first name', 'wpshop'); ?></span><code>[customer_first_name]</code><li>
 				<li><span class="wpshop_customer_tag_name" ><?php _e('Customer last name', 'wpshop'); ?></span><code>[customer_last_name]</code><li>

Braces +8 added lines, -6 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 class wps_shortcodes_ctr
 {
@@ -68,12 +70,10 @@ 
 			if(($action == 'edit') || ($action == 'delete')){
 				$editedItem = self::getElement($objectInEdition);
 				$title = sprintf(__(self::pageEditingTitle, 'wpshop'), str_replace("\\", "", $editedItem->frontend_label) . '&nbsp;(' . $editedItem->code . ')');
-			}
-			elseif($action == 'add'){
+			} elseif($action == 'add'){
 				$title = __(self::pageAddingTitle, 'wpshop');
 			}
-		}
-		elseif((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug())){
+		} elseif((self::getEditionSlug() != self::getListingSlug()) && ($page == self::getEditionSlug())){
 			$title = __(self::pageAddingTitle, 'wpshop');
 		}
 		return $title;
@@ -232,7 +232,9 @@ 
 	}
 
 	public static function wysiwyg_button() {
-		if ( ! current_user_can('edit_posts') && ! current_user_can('edit_pages') ) return;
+		if ( ! current_user_can('edit_posts') && ! current_user_can('edit_pages') ) {
+			return;
+		}
 		if ( get_user_option('rich_editing') == 'true') :
 		add_filter('mce_external_plugins', array('wps_shortcodes_ctr', 'add_button_to_wysiwyg'));
 		add_filter('mce_buttons', array('wps_shortcodes_ctr', 'register_wysiwyg_button'));

includes/librairies/eav/wp_list_custom_attributes.class.php

Spacing +47 added lines, -47 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'));
 }
 
 
@@ -12,36 +12,36 @@ 
  * @package wpshop
  * @subpackage librairies
  */
-class wpshop_attributes_custom_List_table extends WP_List_Table{
+class wpshop_attributes_custom_List_table extends WP_List_Table {
 	var $datas;
 
 	/** ************************************************************************
 	 * REQUIRED. Set up a constructor that references the parent constructor. We
 	 * use the parent reference to set some default configs.
 	 ***************************************************************************/
-	function __construct(){
+	function __construct() {
 		global $status, $page;
 
 		//Set parent defaults
-		parent::__construct( array(
-			'singular'  => __('attribute\'s', 'wpshop'),    //singular name of the listed records
-			'plural'    => __('attributes\'', 'wpshop'),    //plural name of the listed records
+		parent::__construct(array(
+			'singular'  => __('attribute\'s', 'wpshop'), //singular name of the listed records
+			'plural'    => __('attributes\'', 'wpshop'), //plural name of the listed records
 			'ajax'     => true       //does this table support ajax?
-		) );
+		));
 	}
 
 	/*	Allows to set different listings for attributes	*/
-	function get_views(){
+	function get_views() {
 		$wpshop_attribute_links = array();
 
 		$active_nb = wpshop_attributes::getElement('', "'valid'");
 		$unactive_nb = wpshop_attributes::getElement('', "'moderated', 'notused'");
 		$deleted_nb = wpshop_attributes::getElement('', "'deleted'");
 
-		$wpshop_attribute_links['wpshop_attributes_links wpshop_attributes_links_valid'.(empty($_REQUEST['attribute_status'])?' current':'')] = '<a href="'.admin_url('admin.php?page=' . WPSHOP_URL_SLUG_ATTRIBUTE_LISTING).'" >'.__('Used attributes', 'wpshop').' ('.count($active_nb).')</a>';
-		$wpshop_attribute_links['wpshop_attributes_links wpshop_attributes_links_moderated'.(!empty($_REQUEST['attribute_status']) && ($_REQUEST['attribute_status']=='unactive')?' current':'')] = '<a href="'.admin_url('admin.php?page=' . WPSHOP_URL_SLUG_ATTRIBUTE_LISTING.'&attribute_status=unactive').'" >'.__('Unactive attributes', 'wpshop').' ('.count($unactive_nb).')</a>';
-		$wpshop_attribute_links['wpshop_attributes_links wpshop_attributes_links_deleted'.(!empty($_REQUEST['attribute_status']) && ($_REQUEST['attribute_status']=='deleted')?' current':'')] = '<a href="'.admin_url('admin.php?page=' . WPSHOP_URL_SLUG_ATTRIBUTE_LISTING.'&attribute_status=deleted').'" >'.__('Trashed attributes', 'wpshop').' ('.count($deleted_nb).')</a>';
-		$wpshop_attribute_links['unit_management_link'] = '<a href="#" id="wpshop_attribute_unit_manager_opener">'.__('Unit management', 'wpshop').'</a>';
+		$wpshop_attribute_links['wpshop_attributes_links wpshop_attributes_links_valid' . (empty($_REQUEST['attribute_status']) ? ' current' : '')] = '<a href="' . admin_url('admin.php?page=' . WPSHOP_URL_SLUG_ATTRIBUTE_LISTING) . '" >' . __('Used attributes', 'wpshop') . ' (' . count($active_nb) . ')</a>';
+		$wpshop_attribute_links['wpshop_attributes_links wpshop_attributes_links_moderated' . (!empty($_REQUEST['attribute_status']) && ($_REQUEST['attribute_status'] == 'unactive') ? ' current' : '')] = '<a href="' . admin_url('admin.php?page=' . WPSHOP_URL_SLUG_ATTRIBUTE_LISTING . '&attribute_status=unactive') . '" >' . __('Unactive attributes', 'wpshop') . ' (' . count($unactive_nb) . ')</a>';
+		$wpshop_attribute_links['wpshop_attributes_links wpshop_attributes_links_deleted' . (!empty($_REQUEST['attribute_status']) && ($_REQUEST['attribute_status'] == 'deleted') ? ' current' : '')] = '<a href="' . admin_url('admin.php?page=' . WPSHOP_URL_SLUG_ATTRIBUTE_LISTING . '&attribute_status=deleted') . '" >' . __('Trashed attributes', 'wpshop') . ' (' . count($deleted_nb) . ')</a>';
+		$wpshop_attribute_links['unit_management_link'] = '<a href="#" id="wpshop_attribute_unit_manager_opener">' . __('Unit management', 'wpshop') . '</a>';
 		$wpshop_attribute_links['unit_management_dialog'] = '<div id="wpshop_attribute_unit_manager"title="' . __('Unit management', 'wpshop') . '" class="wpshopHide" ><div class="loading_picture_container" id="product_chooser_picture" ><img src="' . WPSHOP_LOADING_ICON . '" alt="loading..." /></div></div>';
 		return $wpshop_attribute_links;
 	}
@@ -59,9 +59,9 @@ 
 	 * @see WP_List_Table::::single_row_columns()
 	 * @return array An associative array containing column information: 'slugs'=>'Visible Titles'
 	 **************************************************************************/
-	function get_columns(){
+	function get_columns() {
 		$columns = array(
-			'cb'       	=> '',//'<input type="checkbox" />', //Render a checkbox instead of text
+			'cb'       	=> '', //'<input type="checkbox" />', //Render a checkbox instead of text
 			'id'       	=> __('Id.', 'wpshop'),
 			'name'    	=> __('Name', 'wpshop'),
 			'status'    => __('Status', 'wpshop'),
@@ -92,10 +92,10 @@ 
 	 * @param array $column_name The name/slug of the column to be processed
 	 * @return string Text or HTML to be placed inside the column <td>
 	 **************************************************************************/
-	function column_default($item, $column_name){
-		switch($column_name){
+	function column_default($item, $column_name) {
+		switch ($column_name) {
 			default:
-				return print_r($item,true); //Show the whole array for troubleshooting purposes
+				return print_r($item, true); //Show the whole array for troubleshooting purposes
 		}
 	}
 
@@ -115,7 +115,7 @@ 
 	 * @param array $item A singular item (one full row's worth of data)
 	 * @return string Text to be placed inside the column <td> (movie title only)
 	 **************************************************************************/
-	function column_id($item){
+	function column_id($item) {
 		return $item['id'];
 	}
 	/** ************************************************************************
@@ -134,7 +134,7 @@ 
 	 * @param array $item A singular item (one full row's worth of data)
 	 * @return string Text to be placed inside the column <td> (movie title only)
 	 **************************************************************************/
-	function column_status($item){
+	function column_status($item) {
 		return __($item['status'], 'wpshop');
 	}
 	/** ************************************************************************
@@ -153,7 +153,7 @@ 
 	 * @param array $item A singular item (one full row's worth of data)
 	 * @return string Text to be placed inside the column <td> (movie title only)
 	 **************************************************************************/
-	function column_code($item){
+	function column_code($item) {
 		return $item['code'];
 	}
 	/** ************************************************************************
@@ -172,8 +172,8 @@ 
 	 * @param array $item A singular item (one full row's worth of data)
 	 * @return string Text to be placed inside the column <td> (movie title only)
 	 **************************************************************************/
-	function column_entity($item){
-		return __($item['entity'],'wpshop');
+	function column_entity($item) {
+		return __($item['entity'], 'wpshop');
 	}
 	/** ************************************************************************
 	 * Recommended. This is a custom column method and is responsible for what
@@ -191,27 +191,27 @@ 
 	 * @param array $item A singular item (one full row's worth of data)
 	 * @return string Text to be placed inside the column <td> (movie title only)
 	 **************************************************************************/
-	function column_name($item){
+	function column_name($item) {
 		$attribute_undeletable = unserialize(WPSHOP_ATTRIBUTE_UNDELETABLE);
 
-		$link_format = admin_url('admin.php').'?page=%2$s&amp;action=%3$s&amp;id=%4$s';
-		$default_action='edit';
-		$default_action_text=__('Edit', 'wpshop');
-		if(!empty($_REQUEST['attribute_status']) && ($_REQUEST['attribute_status']=='deleted')){
-			$default_action='activate';
-			$default_action_text=__('Restore', 'wpshop');
+		$link_format = admin_url('admin.php') . '?page=%2$s&amp;action=%3$s&amp;id=%4$s';
+		$default_action = 'edit';
+		$default_action_text = __('Edit', 'wpshop');
+		if (!empty($_REQUEST['attribute_status']) && ($_REQUEST['attribute_status'] == 'deleted')) {
+			$default_action = 'activate';
+			$default_action_text = __('Restore', 'wpshop');
 		}
 		//Build row actions
 		$actions = array(
-			'edit'     => sprintf('<a href="'.$link_format.'">'.$default_action_text.'</a>',WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_LISTING,$default_action,$item['id'])
+			'edit'     => sprintf('<a href="' . $link_format . '">' . $default_action_text . '</a>', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, $default_action, $item['id'])
 		);
-		if(empty($_REQUEST['attribute_status']) && (!in_array($item['code'], $attribute_undeletable))){
-			$actions['delete'] = sprintf('<a href="'.$link_format.'">'.__('Delete', 'wpshop').'</a>',WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_LISTING,'delete',$item['id']);
+		if (empty($_REQUEST['attribute_status']) && (!in_array($item['code'], $attribute_undeletable))) {
+			$actions['delete'] = sprintf('<a href="' . $link_format . '">' . __('Delete', 'wpshop') . '</a>', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, 'delete', $item['id']);
 		}
 
 		//Return the title contents
 		return sprintf('%1$s%2$s',
-			/*$1%s*/ sprintf('<a href="'.$link_format.'">'.__($item['name'], 'wpshop').'</a>',WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_LISTING,$default_action,$item['id']),
+			/*$1%s*/ sprintf('<a href="' . $link_format . '">' . __($item['name'], 'wpshop') . '</a>', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, $default_action, $item['id']),
 			/*$3%s*/ $this->row_actions($actions)
 		);
 	}
@@ -224,11 +224,11 @@ 
 	 * @param array $item A singular item (one full row's worth of data)
 	 * @return string Text to be placed inside the column <td> (movie title only)
 	 **************************************************************************/
-	function column_cb($item){
+	function column_cb($item) {
 		return '';
 		return sprintf(
 			'<input type="checkbox" name="%1$s[]" value="%2$s" />',
-			/*$1%s*/ $this->_args['singular'],  //Let's simply repurpose the table's singular label ("movie")
+			/*$1%s*/ $this->_args['singular'], //Let's simply repurpose the table's singular label ("movie")
 			/*$2%s*/ $item['id']             //The value of the checkbox should be the record's id
 		);
 	}
@@ -249,8 +249,8 @@ 
 	 **************************************************************************/
 	function get_sortable_columns() {
 		$sortable_columns = array(
-			'name'    => array('frontend_label',true),    //true means its already sorted
-			'status'  => array('status',true)
+			'name'    => array('frontend_label', true), //true means its already sorted
+			'status'  => array('status', true)
 		);
 		return $sortable_columns;
 	}
@@ -285,7 +285,7 @@ 
 	 **************************************************************************/
 	function process_bulk_action() {
 		//Detect when a bulk action is being triggered...
-		if( 'delete'===$this->current_action() ) {
+		if ('delete' === $this->current_action()) {
 			wp_die('Items deleted (or they would be if we had items to delete)!');
 		}
 	}
@@ -306,7 +306,7 @@ 
 	 **************************************************************************/
 	function prepare_items() {
 		/*	First, lets decide how many records per page to show	*/
-		$per_page = 10;//$this->get_items_per_page('attributes_per_page', 10);
+		$per_page = 10; //$this->get_items_per_page('attributes_per_page', 10);
 
 		/**
 		 * REQUIRED. Now we need to define our column headers. This includes a complete
@@ -364,7 +364,7 @@ 
 		 * to ensure that the data is trimmed to only the current page. We can use
 		 * array_slice() to
 		*/
-		$data = array_slice($data,(($current_page-1)*$per_page),$per_page);
+		$data = array_slice($data, (($current_page - 1) * $per_page), $per_page);
 
 		/**
 		 * REQUIRED. Now we can add our *sorted* data to the items property, where
@@ -373,10 +373,10 @@ 
 		$this->items = $data;
 
 		/*	REQUIRED. We also have to register our pagination options & calculations.	*/
-		$this->set_pagination_args( array(
-			'total_items' => $total_items,               		//WE have to calculate the total number of items
-			'per_page'    => $per_page,                 		//WE have to determine how many items to show on a page
-			'total_pages' => ceil($total_items/$per_page)   //WE have to calculate the total number of pages
-		) );
+		$this->set_pagination_args(array(
+			'total_items' => $total_items, //WE have to calculate the total number of items
+			'per_page'    => $per_page, //WE have to determine how many items to show on a page
+			'total_pages' => ceil($total_items / $per_page)   //WE have to calculate the total number of pages
+		));
 	}
 }

Indentation +8 added lines, -8 removed lines

@@ -234,7 +234,7 @@ 
 		 * to keep hidden, and a list of columns that are sortable. Each of these
 		 * can be defined in another method (as we've done here) before being
 		 * used to build the value for our _column_headers property.
-		*/
+		 */
 		$columns = $this->get_columns();
 		$hidden = array();
 		$sortable = $this->get_sortable_columns();
@@ -244,13 +244,13 @@ 
 		 * headers. The $this->_column_headers property takes an array which contains
 		 * 3 other arrays. One for all columns, one for hidden columns, and one
 		 * for sortable columns.
-		*/
+		 */
 		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		/**
 		 * Optional. You can handle your bulk actions however you see fit. In this
 		 * case, we'll handle them within our package just to keep things clean.
-		*/
+		 */
 		$this->process_bulk_action();
 
 		/**
@@ -261,14 +261,14 @@ 
 		 * our data. In a real-world implementation, you will probably want to
 		 * use sort and pagination data to build a custom query instead, as you'll
 		 * be able to use your precisely-queried data immediately.
-		*/
+		 */
 		// $data = ;
 
 		/**
 		 * REQUIRED for pagination. Let's figure out what page the user is currently
 		 * looking at. We'll need this later, so you should always include it in
 		 * your own package classes.
-		*/
+		 */
 		$current_page = $this->get_pagenum();
 
 		/**
@@ -276,20 +276,20 @@ 
 		 * In real-world use, this would be the total number of items in your database,
 		 * without filtering. We'll need this later, so you should always include it
 		 * in your own package classes.
-		*/
+		 */
 		$total_items = count($data);
 
 		/**
 		 * The WP_List_Table class does not handle pagination for us, so we need
 		 * to ensure that the data is trimmed to only the current page. We can use
 		 * array_slice() to
-		*/
+		 */
 		$data = array_slice($data,(($current_page-1)*$per_page),$per_page);
 
 		/**
 		 * REQUIRED. Now we can add our *sorted* data to the items property, where
 		 * it can be used by the rest of the class.
-		*/
+		 */
 		$this->items = $data;
 
 		/*	REQUIRED. We also have to register our pagination options & calculations.	*/

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *