Eoxia / wpshop

core/wps_utils/wps_utils.php

Spacing +109 added lines, -109 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Main controller file for product mass modification module
  *
@@ -30,56 +30,56 @@ 
 	 *
 	 * @return string The template file path to use
 	 */
-	public static function get_template_part( $plugin_dir_name, $main_template_dir, $side, $slug, $name=null, $debug = null ) {
+	public static function get_template_part($plugin_dir_name, $main_template_dir, $side, $slug, $name = null, $debug = null) {
 		$path = '';
 
 		$templates = array();
 		$name = (string)$name;
-		if ( '' !== $name )
+		if ('' !== $name)
 			$templates[] = "{$side}/{$slug}-{$name}.php";
 		$templates[] = "{$side}/{$slug}.php";
 
 		/**	Check if required template exists into current theme	*/
 		$check_theme_template = array();
-		foreach ( $templates as $template ) {
+		foreach ($templates as $template) {
 			$check_theme_template = $plugin_dir_name . "/" . $template;
-			$path = locate_template( $check_theme_template, false );
-			if( !empty($path) ) {
+			$path = locate_template($check_theme_template, false);
+			if (!empty($path)) {
 				break;
 			}
 		}
 
 		/**	Allow debugging	*/
-		if ( !empty( $debug ) ) {
+		if (!empty($debug)) {
 			echo '--- Debug mode ON - Start ---<br/>';
 			echo __FILE__ . '<br/>';
 			echo 'Debug for display method<br/>';
 			echo 'Asked path ' . $path . '<br/>';
 		}
 
-		if ( empty( $path ) ) {
-			foreach ( (array) $templates as $template_name ) {
-				if ( !$template_name )
+		if (empty($path)) {
+			foreach ((array)$templates as $template_name) {
+				if (!$template_name)
 					continue;
 
-				if ( !empty( $debug ) ) {
+				if (!empty($debug)) {
 					echo __LINE__ . ' - ' . $main_template_dir . $template_name . '<hr/>';
 				}
 
-				$file_exists = file_exists( $main_template_dir . $template_name );
-				if ( $file_exists ) {
+				$file_exists = file_exists($main_template_dir . $template_name);
+				if ($file_exists) {
 					$path = $main_template_dir . $template_name;
 					break;
 				}
 
-				if ( !empty( $debug ) ) {
+				if (!empty($debug)) {
 					echo __LINE__ . ' - ' . (bool)$file_exists . '<hr/>';
 				}
 			}
 		}
 
 		/**	Allow debugging	*/
-		if ( !empty( $debug ) ) {
+		if (!empty($debug)) {
 			echo '--- Debug mode ON - END ---<br/><br/>';
 		}
 
@@ -103,7 +103,7 @@ 
 	 *	@return mixed $sanitizedVar The var after treatment
 	 */
 	public static function varSanitizer($varToSanitize, $varDefaultValue = '', $varType = '') {
-		$sanitizedVar = is_string( $varToSanitize ) && (trim(strip_tags(stripslashes($varToSanitize))) != '') ? trim(strip_tags(stripslashes(($varToSanitize)))) : $varDefaultValue ;
+		$sanitizedVar = is_string($varToSanitize) && (trim(strip_tags(stripslashes($varToSanitize))) != '') ? trim(strip_tags(stripslashes(($varToSanitize)))) : $varDefaultValue;
 
 		return $sanitizedVar;
 	}
@@ -116,7 +116,7 @@ 
 	public static function forceDownload($Fichier_a_telecharger, $delete_after_download = false) {
 
 		$nom_fichier = basename($Fichier_a_telecharger);
-		switch(strrchr($nom_fichier, ".")) {
+		switch (strrchr($nom_fichier, ".")) {
 			case ".gz": $type = "application/x-gzip"; break;
 			case ".tgz": $type = "application/x-gzip"; break;
 			case ".zip": $type = "application/zip"; break;
@@ -133,14 +133,14 @@ 
 		header("Content-disposition: attachment; filename=$nom_fichier");
 		header("Content-Type: application/force-download");
 		header("Content-Transfer-Encoding: $type\n"); // Surtout ne pas enlever le \n
-		header("Content-Length: ".filesize($Fichier_a_telecharger));
+		header("Content-Length: " . filesize($Fichier_a_telecharger));
 		header("Pragma: no-cache");
 		header("Cache-Control: must-revalidate, post-check=0, pre-check=0, public");
 		header("Expires: 0");
 		ob_end_clean();
 		readfile($Fichier_a_telecharger);
-		if ( $delete_after_download ) {
-			unlink( $Fichier_a_telecharger );
+		if ($delete_after_download) {
+			unlink($Fichier_a_telecharger);
 		}
 		exit;
 	}
@@ -150,7 +150,7 @@ 
 	 * @return boolean
 	 */
 	public static function is_sendsms_actived() {
-		if(is_plugin_active('wordpress-send-sms/Send-SMS.php')) {
+		if (is_plugin_active('wordpress-send-sms/Send-SMS.php')) {
 			$configOption = get_option('sendsms_config', '');
 			$ligne = unserialize($configOption);
 			$nicOVH = $ligne['nicOVH'];
@@ -167,7 +167,7 @@ 
 	 * @param unknown_type $input
 	 * @return Ambigous <multitype:, multitype:multitype:unknown  >
 	 */
-	public static function search_all_possibilities( $input ) {
+	public static function search_all_possibilities($input) {
 		$result = array();
 
 		while (list($key, $values) = each($input)) {
@@ -176,17 +176,17 @@ 
 			}
 
 			if (empty($result)) {
-				foreach($values as $value) {
+				foreach ($values as $value) {
 					$result[] = array($key => $value);
 				}
 			}
 			else {
 				$append = array();
-				foreach($result as &$product) {
+				foreach ($result as &$product) {
 					$product[$key] = array_shift($values);
 					$copy = $product;
 
-					foreach($values as $item) {
+					foreach ($values as $item) {
 						$copy[$key] = $item;
 						$append[] = $copy;
 					}
@@ -206,16 +206,16 @@ 
 	 * @param boolean $code : false return sigle, true return code (€ or EUR)
 	 * @return string currency code or sigle
 	 */
-	public static function wpshop_get_currency($code=false) {
+	public static function wpshop_get_currency($code = false) {
 		// Currency
-		if( is_null( self::$currency_cache ) ) {
+		if (is_null(self::$currency_cache)) {
 			global $wpdb;
 			$current_currency = get_option('wpshop_shop_default_currency');
-			$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id =%d ', $current_currency );
-			self::$currency_cache = $wpdb->get_row( $query );
+			$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id =%d ', $current_currency);
+			self::$currency_cache = $wpdb->get_row($query);
 		}
-		if ( !empty(self::$currency_cache) ) {
-			$code = ($code) ?  self::$currency_cache->name : self::$currency_cache->unit;
+		if (!empty(self::$currency_cache)) {
+			$code = ($code) ? self::$currency_cache->name : self::$currency_cache->unit;
 			return $code;
 		}
 		else {
@@ -231,11 +231,11 @@ 
 	public static function wpshop_get_sigle($code, $column_to_return = "unit") {
 		$tmp_code = (int)$code;
 		$key_to_get = 'name';
-		if ( is_int($tmp_code) && !empty($tmp_code) ) {
+		if (is_int($tmp_code) && !empty($tmp_code)) {
 			$key_to_get = 'id';
 		}
 		$old_way_currencies = unserialize(WPSHOP_SHOP_CURRENCIES);
-		if ( array_key_exists( $code, $old_way_currencies)) {
+		if (array_key_exists($code, $old_way_currencies)) {
 			$code = $old_way_currencies[$code];
 			$key_to_get = 'name';
 		}
@@ -250,7 +250,7 @@ 
 	 * @param string $var : variable to clean
 	 * @return string
 	 */
-	public static function wpshop_clean( $var ) {
+	public static function wpshop_clean($var) {
 		return trim(strip_tags(stripslashes($var)));
 	}
 
@@ -259,8 +259,8 @@ 
 	 * @param   string	phone number
 	 * @return  boolean
 	 */
-	public static function is_phone( $phone ) {
-		return preg_match( '/(?=.*[0-9])([ 0-9\-\+\(\)]+)/', $phone );
+	public static function is_phone($phone) {
+		return preg_match('/(?=.*[0-9])([ 0-9\-\+\(\)]+)/', $phone);
 	}
 
 	/**
@@ -268,8 +268,8 @@ 
 	 * @param   string	postcode
 	 * @return  boolean
 	 */
-	public static function is_postcode( $postcode ) {
-		return preg_match( '/(?=.*[0-9A-Za-z])([ \-A-Za-z0-9]+)/', $postcode );
+	public static function is_postcode($postcode) {
+		return preg_match('/(?=.*[0-9A-Za-z])([ \-A-Za-z0-9]+)/', $postcode);
 	}
 
 	/**
@@ -279,14 +279,14 @@ 
 	 *
 	 *	@return string $type The form input type to use for the given field
 	 */
-	public static function defineFieldType($dataFieldType, $input_type, $frontend_verification){
+	public static function defineFieldType($dataFieldType, $input_type, $frontend_verification) {
 		$type = 'text';
 
-		if ( $dataFieldType == 'datetime' ) {
+		if ($dataFieldType == 'datetime') {
 			$type = 'text';
 		}
 		else {
-			switch ( $frontend_verification ) {
+			switch ($frontend_verification) {
 				case 'phone':
 					$type = 'tel';
 					break;
@@ -306,7 +306,7 @@ 
 	 *
 	 * @return array The different element send by request method
 	 */
-	public static function getMethode(){
+	public static function getMethode() {
 		$request_method = null;
 		if ($_SERVER["REQUEST_METHOD"] == "GET") {
 			$request_method = (array)$_GET;
@@ -315,7 +315,7 @@ 
 			$request_method = (array)$_POST;
 		}
 
-		if ( null === $request_method ) {
+		if (null === $request_method) {
 			die ('Invalid REQUEST_METHOD (not GET, not POST).');
 		}
 		else {
@@ -331,36 +331,36 @@ 
 	 *
 	 *	@return string $slugified The input string that was slugified with the selected method
 	 */
-	public static function slugify($toSlugify, $slugifyType){
+	public static function slugify($toSlugify, $slugifyType) {
 		$slugified = '';
 
-		if($toSlugify != '')
+		if ($toSlugify != '')
 		{
 			$slugified = $toSlugify;
-			foreach($slugifyType as $type)
+			foreach ($slugifyType as $type)
 			{
-				if($type == 'noAccent')
+				if ($type == 'noAccent')
 				{
-					$pattern = array("/&eacute;/", "/&egrave;/", "/&ecirc;/", "/&ccedil;/", "/&agrave;/", "/&acirc;/", "/&icirc;/", "/&iuml;/", "/&ucirc;/", "/&ocirc;/", "/&Egrave;/", "/&Eacute;/", "/&Ecirc;/", "/&Euml;/", "/&Igrave;/", "/&Iacute;/", "/&Icirc;/", "/&Iuml;/", "/&Ouml;/", "/&Ugrave;/", "/&Ucirc;/", "/&Uuml;/","/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/");
-					$rep_pat = array("e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U","e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U");
+					$pattern = array("/&eacute;/", "/&egrave;/", "/&ecirc;/", "/&ccedil;/", "/&agrave;/", "/&acirc;/", "/&icirc;/", "/&iuml;/", "/&ucirc;/", "/&ocirc;/", "/&Egrave;/", "/&Eacute;/", "/&Ecirc;/", "/&Euml;/", "/&Igrave;/", "/&Iacute;/", "/&Icirc;/", "/&Iuml;/", "/&Ouml;/", "/&Ugrave;/", "/&Ucirc;/", "/&Uuml;/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/");
+					$rep_pat = array("e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U", "e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U");
 				}
-				elseif($type == 'noSpaces')
+				elseif ($type == 'noSpaces')
 				{
 					$pattern = array('/\s/');
 					$rep_pat = array('_');
 					$slugified = trim($slugified);
 				}
-				elseif($type == 'lowerCase')
+				elseif ($type == 'lowerCase')
 				{
 					$slugified = strtolower($slugified);
 				}
-				elseif($type == 'noPunctuation')
+				elseif ($type == 'noPunctuation')
 				{
 					$pattern = array("/#/", "/\{/", "/\[/", "/\(/", "/\)/", "/\]/", "/\}/", "/&/", "/~/", "/�/", "/`/", "/\^/", "/@/", "/=/", "/�/", "/�/", "/%/", "/�/", "/!/", "/�/", "/:/", "/\$/", "/;/", "/\./", "/,/", "/\?/", "/\\\/", "/\//");
 					$rep_pat = array("_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_");
 				}
 
-				if(is_array($pattern) && is_array($rep_pat))
+				if (is_array($pattern) && is_array($rep_pat))
 				{
 					$slugified = preg_replace($pattern, $rep_pat, utf8_decode($slugified));
 				}
@@ -379,17 +379,17 @@ 
 	 *	@return string $string The output string that was trunk if necessary
 	 */
 	public static function trunk($string, $maxlength) {
-		if(strlen($string)>$maxlength+3)
-			return substr($string,0,$maxlength).'...';
+		if (strlen($string) > $maxlength + 3)
+			return substr($string, 0, $maxlength) . '...';
 		else return $string;
 	}
 
 	/**
 	 * Run a safe redirect in javascript
 	 */
-	public static function wpshop_safe_redirect($url='') {
-		$url = empty($url) ? admin_url('admin.php?page='.WPSHOP_URL_SLUG_DASHBOARD) : $url;
-		echo '<script type="text/javascript">window.top.location.href = "'.$url.'"</script>';
+	public static function wpshop_safe_redirect($url = '') {
+		$url = empty($url) ? admin_url('admin.php?page=' . WPSHOP_URL_SLUG_DASHBOARD) : $url;
+		echo '<script type="text/javascript">window.top.location.href = "' . $url . '"</script>';
 		exit;
 	}
 
@@ -399,9 +399,9 @@ 
 	 * @param array $args : Hook arguments
 	 * @return string
 	 */
-	public static function create_custom_hook ($hook_name, $args = '') {
+	public static function create_custom_hook($hook_name, $args = '') {
 		ob_start();
-		if ( !empty($args) ) {
+		if (!empty($args)) {
 			do_action($hook_name, $args);
 		}
 		else {
@@ -420,16 +420,16 @@ 
 	 */
 	public static function get_plugin_validation_code($plugin_name, $encrypt_base_attribute) {
 		$code = '';
-		if ( !function_exists( 'get_plugin_data') )
-			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-		$plug = get_plugin_data( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/wpshop.php' );
+		if (!function_exists('get_plugin_data'))
+			require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+		$plug = get_plugin_data(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/wpshop.php');
 		$code_part = array();
-		$code_part[] = substr(hash ( "sha256" , $plugin_name ), WPSHOP_ADDONS_KEY_IS, 5);
-		$code_part[] = substr(hash ( "sha256" , $plug['Name'] ), WPSHOP_ADDONS_KEY_IS, 5);
-		$code_part[] = substr(hash ( "sha256" , 'addons' ), WPSHOP_ADDONS_KEY_IS, 5);
+		$code_part[] = substr(hash("sha256", $plugin_name), WPSHOP_ADDONS_KEY_IS, 5);
+		$code_part[] = substr(hash("sha256", $plug['Name']), WPSHOP_ADDONS_KEY_IS, 5);
+		$code_part[] = substr(hash("sha256", 'addons'), WPSHOP_ADDONS_KEY_IS, 5);
 		$code = $code_part[1] . '-' . $code_part[2] . '-' . $code_part[0];
 		$att = $encrypt_base_attribute;
-		$code .= '-' . substr(hash ( "sha256" , $att ),  WPSHOP_ADDONS_KEY_IS, 5);
+		$code .= '-' . substr(hash("sha256", $att), WPSHOP_ADDONS_KEY_IS, 5);
 
 		return $code;
 	}
@@ -440,15 +440,15 @@ 
 	 * @param string $encrypt_base_attribute
 	 * @return boolean
 	 */
-	public static function check_plugin_activation_code( $plugin_name, $encrypt_base_attribute, $from = 'file') {
+	public static function check_plugin_activation_code($plugin_name, $encrypt_base_attribute, $from = 'file') {
 		$is_valid = false;
 		$valid_activation_code = self::get_plugin_validation_code($plugin_name, $encrypt_base_attribute);
-		$activation_code_filename = WP_PLUGIN_DIR .'/'. $plugin_name.'/encoder.txt';
-		if ( is_file($activation_code_filename) ) {
-			$activation_code_file = fopen($activation_code_filename, 'r' );
-			if ( $activation_code_file !== false) {
-				$activation_code = fread( $activation_code_file, filesize($activation_code_filename));
-				if ( $activation_code == $valid_activation_code ) {
+		$activation_code_filename = WP_PLUGIN_DIR . '/' . $plugin_name . '/encoder.txt';
+		if (is_file($activation_code_filename)) {
+			$activation_code_file = fopen($activation_code_filename, 'r');
+			if ($activation_code_file !== false) {
+				$activation_code = fread($activation_code_file, filesize($activation_code_filename));
+				if ($activation_code == $valid_activation_code) {
 					$is_valid = true;
 				}
 			}
@@ -461,12 +461,12 @@ 
 	 * @param unknown_type $number
 	 * @return string
 	 */
-	public static function formate_number( $number ) {
-		$number = number_format( $number, 2, '.', '' );
-		$exploded_number = explode( '.', $number );
+	public static function formate_number($number) {
+		$number = number_format($number, 2, '.', '');
+		$exploded_number = explode('.', $number);
 		$number = $exploded_number[0];
-		if( $exploded_number[1] != '00' ) {
-			$number .= '<span class="wps_number_cents">,' . $exploded_number[1]. '</span>';
+		if ($exploded_number[1] != '00') {
+			$number .= '<span class="wps_number_cents">,' . $exploded_number[1] . '</span>';
 		}
 		return $number;
 	}
@@ -476,12 +476,12 @@ 
 	 * @param int $page_id
 	 * @return int
 	 */
-	public static function get_page_id( $page_id ) {
-		if( !empty($page_id) ) {
-			if ( function_exists( 'icl_object_id' ) && defined('ICL_LANGUAGE_CODE') ) {
-				$element_post_type = get_post_type( $page_id );
-				$translated_element_id = icl_object_id( $page_id, $element_post_type, true, ICL_LANGUAGE_CODE );
-				if( !empty($translated_element_id) ) {
+	public static function get_page_id($page_id) {
+		if (!empty($page_id)) {
+			if (function_exists('icl_object_id') && defined('ICL_LANGUAGE_CODE')) {
+				$element_post_type = get_post_type($page_id);
+				$translated_element_id = icl_object_id($page_id, $element_post_type, true, ICL_LANGUAGE_CODE);
+				if (!empty($translated_element_id)) {
 					$page_id = $translated_element_id;
 				}
 			}
@@ -489,65 +489,65 @@ 
 		return $page_id;
 	}
 
-	public static function minutes_to_time( $minutes, $format = '%hh %imin' ) {
-		$dtF = new \DateTime( '@0' );
-		$dtT = new \DateTime( '@' . ( $minutes * 60 ) );
-		return $dtF->diff($dtT)->format( $format );
+	public static function minutes_to_time($minutes, $format = '%hh %imin') {
+		$dtF = new \DateTime('@0');
+		$dtT = new \DateTime('@' . ($minutes * 60));
+		return $dtF->diff($dtT)->format($format);
 	}
 
 	public static function number_format_hack($n) {
 		return number_format($n, 5, '.', '');
 	}
-	public static function is_serialized( $data, $strict = true ) {
-		if ( ! is_string( $data ) ) {
+	public static function is_serialized($data, $strict = true) {
+		if (!is_string($data)) {
 			return false;
 		}
-		$data = trim( $data );
-		if ( 'N;' == $data ) {
+		$data = trim($data);
+		if ('N;' == $data) {
 			return true;
 		}
-		if ( strlen( $data ) < 4 ) {
+		if (strlen($data) < 4) {
 			return false;
 		}
-		if ( ':' !== $data[1] ) {
+		if (':' !== $data[1]) {
 			return false;
 		}
-		if ( $strict ) {
-			$lastc = substr( $data, -1 );
-			if ( ';' !== $lastc && '}' !== $lastc ) {
+		if ($strict) {
+			$lastc = substr($data, -1);
+			if (';' !== $lastc && '}' !== $lastc) {
 				return false;
 			}
 		} else {
-			$semicolon = strpos( $data, ';' );
-			$brace = strpos( $data, '}' );
-			if ( false === $semicolon && false === $brace ) {
+			$semicolon = strpos($data, ';');
+			$brace = strpos($data, '}');
+			if (false === $semicolon && false === $brace) {
 				return false;
 			}
-			if ( false !== $semicolon && $semicolon < 3 ) {
+			if (false !== $semicolon && $semicolon < 3) {
 				return false;
 			}
-			if ( false !== $brace && $brace < 4 ) {
+			if (false !== $brace && $brace < 4) {
 				return false;
 			}
 		}
 		$token = $data[0];
-		switch ( $token ) {
+		switch ($token) {
 			case 's' :
-				if ( $strict ) {
-					if ( '"' !== substr( $data, -2, 1 ) ) {
+				if ($strict) {
+					if ('"' !== substr($data, -2, 1)) {
 						return false;
 					}
-				} elseif ( false === strpos( $data, '"' ) ) {
+				} elseif (false === strpos($data, '"')) {
 					return false;
 				}
 			case 'a' :
 			case 'O' :
-				return (bool) preg_match( "/^{$token}:[0-9]+:/s", $data );
+				return (bool)preg_match("/^{$token}:[0-9]+:/s", $data);
 			case 'b' :
 			case 'i' :
 			case 'd' :
 				$end = $strict ? '$' : '';
-				return (bool) preg_match( "/^{$token}:[0-9.E-]+;$end/", $data );
+				return (bool)preg_match("/^{$token}:[0-9.E-]+;$end/", $data);
 		}
 		return false;
 	}

includes/modules/wps_orders/templates/backend/product-listing/wps_orders_product_listing_table.php

Spacing +33 added lines, -33 removed lines

@@ -1,78 +1,78 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- $order_post_meta = !empty($post) ? get_post_meta( $post->ID, '_wpshop_order_status', true ) : ""; ?>
+<?php if (!defined('ABSPATH')) exit;
+ $order_post_meta = !empty($post) ? get_post_meta($post->ID, '_wpshop_order_status', true) : ""; ?>
 <div class="wps-table">
 	<div class="wps-table-header wps-table-row">
-		<div class="wps-table-cell"><?php _e( 'Picture', 'wpshop'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Product reference', 'wpshop'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Product name', 'wpshop'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Price', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Picture', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Product reference', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Product name', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Price', 'wpshop'); ?></div>
 
-		<?php if ( 'completed' != $order_post_meta ) : ?>
-			<div class="wps-table-cell"><?php _e( 'Quantity', 'wpshop'); ?></div>
-			<div class="wps-table-cell"><?php _e( 'Add to order', 'wpshop'); ?></div>
+		<?php if ('completed' != $order_post_meta) : ?>
+			<div class="wps-table-cell"><?php _e('Quantity', 'wpshop'); ?></div>
+			<div class="wps-table-cell"><?php _e('Add to order', 'wpshop'); ?></div>
 		<?php endif; ?>
 	</div>
-	<?php if( !empty($products) ) :
-		$total_products = count( $products );
+	<?php if (!empty($products)) :
+		$total_products = count($products);
 		$i = 0;
 		$elements_per_page = 20;
-		$paged = absint( isset( $_REQUEST['paged_order'] ) ? $_REQUEST['paged_order'] : 1 );
-		$paginate_links = paginate_links( array(
+		$paged = absint(isset($_REQUEST['paged_order']) ? $_REQUEST['paged_order'] : 1);
+		$paginate_links = paginate_links(array(
 			'base' => '%_%',
 			'format' => '?paged_order=%#%',
 			'current' => $paged,
-			'total' => ceil( $total_products / $elements_per_page )
-		) );
-		foreach ( $products as $product ) :
-			if( ( $elements_per_page * ( $paged - 1 ) ) > $i ) {
+			'total' => ceil($total_products / $elements_per_page)
+		));
+		foreach ($products as $product) :
+			if (($elements_per_page * ($paged - 1)) > $i) {
 				$i++;
 				continue;
-			} elseif ( ( $elements_per_page * $paged ) <= $i ) {
+			} elseif (($elements_per_page * $paged) <= $i) {
 				break;
 			}
 			$i++;
 			$pid = $product->ID;
 	?>
-	<?php $product_metadata = get_post_meta( $product->ID, '_wpshop_product_metadata', true ); ?>
+	<?php $product_metadata = get_post_meta($product->ID, '_wpshop_product_metadata', true); ?>
 	<div class="wps-table-content wps-table-row">
-		<div class="wps-table-cell  wps-cart-item-img"><?php echo get_the_post_thumbnail( $product->ID, 'thumbnail' ); ?></div>
-		<div class="wps-table-cell"><?php echo ( !empty( $product_metadata) && $product_metadata['product_reference']) ? $product_metadata['product_reference'] : ''; ?></div>
+		<div class="wps-table-cell  wps-cart-item-img"><?php echo get_the_post_thumbnail($product->ID, 'thumbnail'); ?></div>
+		<div class="wps-table-cell"><?php echo (!empty($product_metadata) && $product_metadata['product_reference']) ? $product_metadata['product_reference'] : ''; ?></div>
 		<div class="wps-table-cell"><?php echo $product->post_title; ?></div>
 		<div class="wps-table-cell">
 		<?php
 			$product = wpshop_products::get_product_data($product->ID);
-			echo wpshop_prices::get_product_price($product, 'price_display', array('mini_output', 'grid') );
+			echo wpshop_prices::get_product_price($product, 'price_display', array('mini_output', 'grid'));
 		?>
 		</div>
-		<?php if ( 'completed' != $order_post_meta ) : ?>
+		<?php if ('completed' != $order_post_meta) : ?>
 			<div class="wps-table-cell">
-				<a class="wps-bton-icon-minus-small wps-cart-reduce-product-qty" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_set_qty_for_product_into_cart' ); ?>" href=""></a>
+				<a class="wps-bton-icon-minus-small wps-cart-reduce-product-qty" data-nonce="<?php echo wp_create_nonce('ajax_wpshop_set_qty_for_product_into_cart'); ?>" href=""></a>
 				<input id="wps-cart-product-qty-<?php echo $pid; ?>" class="wps-cart-product-qty" type="text" value="1" name="french-hens" size="3" style="text-align : center">
-				<a class="wps-bton-icon-plus-small wps-cart-add-product-qty" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_set_qty_for_product_into_cart' ); ?>" href=""></a>
+				<a class="wps-bton-icon-plus-small wps-cart-add-product-qty" data-nonce="<?php echo wp_create_nonce('ajax_wpshop_set_qty_for_product_into_cart'); ?>" href=""></a>
 			</div>
 			<div class="wps-table-cell">
-				<a href="#" data-nonce="<?php echo wp_create_nonce( 'wps_add_product_to_order_admin' ); ?>" class="wps-bton-first-mini-rounded wps-order-add-product" id="wps-order-add-product-<?php echo $pid; ?>"><i class="wps-icon-basket"></i> <?php _e( 'Add to order', 'wpshop'); ?></a>
+				<a href="#" data-nonce="<?php echo wp_create_nonce('wps_add_product_to_order_admin'); ?>" class="wps-bton-first-mini-rounded wps-order-add-product" id="wps-order-add-product-<?php echo $pid; ?>"><i class="wps-icon-basket"></i> <?php _e('Add to order', 'wpshop'); ?></a>
 			</div>
 		<?php endif; ?>
 	</div>
 	<?php endforeach;
 	else :
-		if( !empty( $research ) ) : ?>
-		<div class="wps-alert-info"><?php printf( __( 'No products corresponds to the search <strong>"%s"</strong>', 'wpshop'), $research ); ?></div>
+		if (!empty($research)) : ?>
+		<div class="wps-alert-info"><?php printf(__('No products corresponds to the search <strong>"%s"</strong>', 'wpshop'), $research); ?></div>
 	<?php else :
-			$letter_display = ( strtoupper( $current_letter ) != 'ALL' ) ? $current_letter : __('ALL', 'wpshop' ); ?>
-			<div class="wps-alert-info"><?php printf( __( 'No products corresponds to the letter <strong>"%s"</strong> search', 'wpshop'), strtoupper( $letter_display ) ); ?></div>
+			$letter_display = (strtoupper($current_letter) != 'ALL') ? $current_letter : __('ALL', 'wpshop'); ?>
+			<div class="wps-alert-info"><?php printf(__('No products corresponds to the letter <strong>"%s"</strong> search', 'wpshop'), strtoupper($letter_display)); ?></div>
 	<?php endif;
 		endif; ?>
 </div>
 <?php
-if( !empty($products) && $total_products > $elements_per_page ) :
+if (!empty($products) && $total_products > $elements_per_page) :
 	echo $paginate_links;
 	?>
 	<input type="hidden" name="last_query[oid]" value="<?php echo $post->ID; ?>">
-	<input type="hidden" name="last_query[letter]" value="<?php echo strtoupper( $current_letter ); ?>">
+	<input type="hidden" name="last_query[letter]" value="<?php echo strtoupper($current_letter); ?>">
 	<input type="hidden" name="last_query[research]" value="<?php echo $research; ?>">
-	<input type="hidden" name="last_query[_wpnonce]" value="<?php echo wp_create_nonce( 'refresh_product_list_'.strtolower($current_letter) ); ?>">
+	<input type="hidden" name="last_query[_wpnonce]" value="<?php echo wp_create_nonce('refresh_product_list_' . strtolower($current_letter)); ?>">
 	<?php
 endif;
 ?>

includes/modules/wps_payment_mode/templates/frontend/payment-modes.php

Spacing +12 added lines, -12 removed lines

@@ -1,12 +1,12 @@ 
-<?php if ( ! defined( 'ABSPATH' ) ) { exit;
+<?php if (!defined('ABSPATH')) { exit;
 }
 ?>
-<div><span class="wps-h2"><?php _e( 'Payment mode choice', 'wpshop' ); ?> :</span></div>
-<?php if ( ! empty( $payment_modes ) ) : ?>
-<?php $count_payment_mode = count( $payment_modes ); ?>
-<ul class="wps-itemList" id="wps-shipping-method-list-container" data-nonce="<?php echo wp_create_nonce( 'wps_load_shipping_methods' ); ?>">
-	<?php foreach ( $payment_modes as $payment_mode_id => $payment_mode ) : ?>
-		<?php if ( $default_choice == $payment_mode_id ) :
+<div><span class="wps-h2"><?php _e('Payment mode choice', 'wpshop'); ?> :</span></div>
+<?php if (!empty($payment_modes)) : ?>
+<?php $count_payment_mode = count($payment_modes); ?>
+<ul class="wps-itemList" id="wps-shipping-method-list-container" data-nonce="<?php echo wp_create_nonce('wps_load_shipping_methods'); ?>">
+	<?php foreach ($payment_modes as $payment_mode_id => $payment_mode) : ?>
+		<?php if ($default_choice == $payment_mode_id) :
 			$class = 'wps-activ';
 			$checked = 'checked="checked"';
 else :
@@ -14,18 +14,18 @@ 
 endif; ?>
 		<li class="<?php echo $class; ?> wps-bloc-loader">
 			<label>
-				<span><input type="radio" name="wps-payment-method" value="<?php echo $payment_mode_id; ?>" id="<?php echo $payment_mode_id ; ?>" <?php echo $checked; ?> /></span>
+				<span><input type="radio" name="wps-payment-method" value="<?php echo $payment_mode_id; ?>" id="<?php echo $payment_mode_id; ?>" <?php echo $checked; ?> /></span>
 				<span class="wps-shipping-method-logo">
-					<?php echo ( ! empty( $payment_mode['logo'] ) ? ( (strstr( $payment_mode['logo'], 'http://' ) === false ) ? wp_get_attachment_image( $payment_mode['logo'], 'full' ) : '<img src="' . $payment_mode['logo'] . '" alt="" />' ) : '' ); ?>
+					<?php echo (!empty($payment_mode['logo']) ? ((strstr($payment_mode['logo'], 'http://') === false) ? wp_get_attachment_image($payment_mode['logo'], 'full') : '<img src="' . $payment_mode['logo'] . '" alt="" />') : ''); ?>
 				</span>
-				<span class="wps-shipping-method-name"><strong><?php _e( $payment_mode['name'], 'wpshop' ); ?></strong></span>
+				<span class="wps-shipping-method-name"><strong><?php _e($payment_mode['name'], 'wpshop'); ?></strong></span>
 			</label>
 			<div class="wps-itemList-content">
-				<?php _e( $payment_mode['description'], 'wpshop' ); ?>
+				<?php _e($payment_mode['description'], 'wpshop'); ?>
 			</div>
 		</li>
 	<?php endforeach; ?>
 </ul>
 <?php else : ?>
-	<div class="wps-alert-info"><?php _e( 'No payment mode available', 'wpshop' ); ?>	</div>
+	<div class="wps-alert-info"><?php _e('No payment mode available', 'wpshop'); ?>	</div>
 <?php endif; ?>

includes/modules/wps_cart/controller/wps_cart_ctr.php

Spacing +306 added lines, -306 removed lines

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

includes/modules/wps_cart/templates/frontend/mini-cart/fixed-mini-cart-content.php

Spacing +29 added lines, -29 removed lines

@@ -1,16 +1,16 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
-<!-- <span class="wps-mini-cart-body-title"><strong><?php echo $total_cart_item; ?></strong><?php _e( 'item(s)', 'wpshop'); ?><span><strong><?php echo number_format( $total_cart, 2, '.', ''); ?></strong> <?php echo $currency; ?></span></span>-->
+<!-- <span class="wps-mini-cart-body-title"><strong><?php echo $total_cart_item; ?></strong><?php _e('item(s)', 'wpshop'); ?><span><strong><?php echo number_format($total_cart, 2, '.', ''); ?></strong> <?php echo $currency; ?></span></span>-->
 <div>
 	<ul>
-		<?php foreach( $cart_items as $item_id => $item ) : ?>
+		<?php foreach ($cart_items as $item_id => $item) : ?>
 		<?php
-			$item_post_type = get_post_type( $item_id );
-			if ( $item_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-				$parent_def = wpshop_products::get_parent_variation( $item_id );
+			$item_post_type = get_post_type($item_id);
+			if ($item_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+				$parent_def = wpshop_products::get_parent_variation($item_id);
 				$parent_post = $parent_def['parent_post'];
 				$item_id = $parent_post->ID;
-				$item_title =  $parent_post->post_title;
+				$item_title = $parent_post->post_title;
 			}
 			else {
 				$item_title = $item['item_name'];
@@ -18,8 +18,8 @@ 
 		?>
 		<li id="wps_product_<?php echo $item_id; ?>">
 			<div class="wps-cart-item-img">
-				<a href="<?php echo get_permalink( $item_id ); ?>" title="">
-					<?php echo get_the_post_thumbnail( $item_id, 'thumbnail' ); ?>
+				<a href="<?php echo get_permalink($item_id); ?>" title="">
+					<?php echo get_the_post_thumbnail($item_id, 'thumbnail'); ?>
 				</a>
 			</div>
 			<div class="wps-cart-item-content">
@@ -28,49 +28,49 @@ 
 				</a>
 				<?php
 				$variations_indicator = '';
-				$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails( get_post_meta($item['item_id'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true)  ) ;
+				$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($item['item_id'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
 				$output_order = array();
-				if ( count($product_attribute_order_detail) > 0  && is_array($product_attribute_order_detail) ) {
-					foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
-						foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-							if ( !empty($attribute_def->code) )
+				if (count($product_attribute_order_detail) > 0 && is_array($product_attribute_order_detail)) {
+					foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
+						foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
+							if (!empty($attribute_def->code))
 								$output_order[$attribute_def->code] = $position;
 						}
 					}
 				}
-				$variation_attribute_ordered = wpshop_products::get_selected_variation_display( $item['item_meta'], $output_order, 'cart' );
+				$variation_attribute_ordered = wpshop_products::get_selected_variation_display($item['item_meta'], $output_order, 'cart');
 				ksort($variation_attribute_ordered['attribute_list']);
-				if( !empty($variation_attribute_ordered['attribute_list']) ) {
+				if (!empty($variation_attribute_ordered['attribute_list'])) {
 					$variations_indicator .= '<ul class="wps-cart-item-variations" >';
-					foreach ( $variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output ) {
-						if ( !empty($attribute_variation_to_output) ) {
+					foreach ($variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output) {
+						if (!empty($attribute_variation_to_output)) {
 							$variations_indicator .= $attribute_variation_to_output;
 						}
 					}
-					$variations_indicator = apply_filters( 'wps_cart_item_variation_list', $variations_indicator, $variation_attribute_ordered, $item, 0 );
+					$variations_indicator = apply_filters('wps_cart_item_variation_list', $variations_indicator, $variation_attribute_ordered, $item, 0);
 					$variations_indicator .= '</ul>';
 				}
 				echo $variations_indicator;
 				?>
 			</div>
 			<div class="wps-cart-item-price">
-			   	<span class="wps-price"><?php echo wpshop_tools::formate_number( $item['item_total_ttc'] ); ?><span> <?php echo $currency; ?></span></span>
-			   	<span class="wps-tva"><?php _e( 'ATI', 'wpshop'); ?></span><br>
+			   	<span class="wps-price"><?php echo wpshop_tools::formate_number($item['item_total_ttc']); ?><span> <?php echo $currency; ?></span></span>
+			   	<span class="wps-tva"><?php _e('ATI', 'wpshop'); ?></span><br>
 			</div>
 			<div class="wps-cart-item-close">
-				<button type="button" class="wps-bton-icon wps_cart_delete_product" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_set_qty_for_product_into_cart' ); ?>"><i class="wps-icon-trash"></i></button>
+				<button type="button" class="wps-bton-icon wps_cart_delete_product" data-nonce="<?php echo wp_create_nonce('ajax_wpshop_set_qty_for_product_into_cart'); ?>"><i class="wps-icon-trash"></i></button>
 			</div>
 		</li>
 		<?php endforeach; ?>
 	</ul>
 </div>
-<p><?php _e( 'Shipping cost', 'wpshop' ); ?><span class="wps-inline-alignRight"><strong><?php echo wpshop_tools::formate_number( $shipping_cost_ati ); ?></strong>€</span></p>
+<p><?php _e('Shipping cost', 'wpshop'); ?><span class="wps-inline-alignRight"><strong><?php echo wpshop_tools::formate_number($shipping_cost_ati); ?></strong>€</span></p>
 
-<?php if ( !empty( $cart_content['coupon_id']) ) : ?>
-	<p><?php _e( 'Total ATI before discount', 'wpshop' ); ?><span class="wps-inline-alignRight"><strong><?php echo wpshop_tools::formate_number( $order_total_before_discount ); ?></strong> <?php echo $currency; ?></span></p>
-	<p><?php _e( 'Discount', 'wpshop' ); ?><span class="wps-inline-alignRight"><strong><?php echo wpshop_tools::formate_number( $coupon_value ); ?></strong> <?php echo $currency; ?></span></p>
+<?php if (!empty($cart_content['coupon_id'])) : ?>
+	<p><?php _e('Total ATI before discount', 'wpshop'); ?><span class="wps-inline-alignRight"><strong><?php echo wpshop_tools::formate_number($order_total_before_discount); ?></strong> <?php echo $currency; ?></span></p>
+	<p><?php _e('Discount', 'wpshop'); ?><span class="wps-inline-alignRight"><strong><?php echo wpshop_tools::formate_number($coupon_value); ?></strong> <?php echo $currency; ?></span></p>
 <?php endif; ?>
 
-<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop'); ?><span class="wps-inline-alignRight"><strong><?php echo wpshop_tools::formate_number( $total_ati ); ?></strong> <?php echo $currency; ?></span></p>
-<button class="wps-bton-second-halfwidth wpsjq-closeFixedCart"><i class="wps-icon-arrowleft"></i><?php _e( 'Return', 'wpshop'); ?></button>
-<a href="<?php echo get_permalink( wpshop_tools::get_page_id( get_option('wpshop_cart_page_id') ) ); ?>" class="wps-bton-first-halfwidth" role="button"><i class="wps-icon-paiement"></i><?php _e( 'Order', 'wpshop'); ?></a>
+<p class="wps-hightlight"><?php _e('Total ATI', 'wpshop'); ?><span class="wps-inline-alignRight"><strong><?php echo wpshop_tools::formate_number($total_ati); ?></strong> <?php echo $currency; ?></span></p>
+<button class="wps-bton-second-halfwidth wpsjq-closeFixedCart"><i class="wps-icon-arrowleft"></i><?php _e('Return', 'wpshop'); ?></button>
+<a href="<?php echo get_permalink(wpshop_tools::get_page_id(get_option('wpshop_cart_page_id'))); ?>" class="wps-bton-first-halfwidth" role="button"><i class="wps-icon-paiement"></i><?php _e('Order', 'wpshop'); ?></a>

includes/modules/wps_message/controller/wps_message_ctr.php

Spacing +202 added lines, -202 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined( 'ABSPATH' ) ) { exit;
+<?php if (!defined('ABSPATH')) { exit;
 }
 class wps_message_ctr {
 
@@ -18,19 +18,19 @@ 
 	function __construct() {
 
 		/** Js */
-		add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
+		add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
 		// End if().
 		$this->template_dir = WPS_MESSAGE_PATH . WPS_MESSAGE_DIR . '/templates/';
 		// WP General actions
-		add_action( 'admin_init', array( $this, 'wps_messages_init_actions' ) );
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ) );
-		add_action( 'manage_' . WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE . '_posts_custom_column',  array( $this, 'messages_custom_columns' ) );
-		add_filter( 'manage_edit-' . WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE . '_columns', array( $this, 'messages_edit_columns' ) );
+		add_action('admin_init', array($this, 'wps_messages_init_actions'));
+		add_action('add_meta_boxes', array($this, 'add_meta_boxes'));
+		add_action('manage_' . WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE . '_posts_custom_column', array($this, 'messages_custom_columns'));
+		add_filter('manage_edit-' . WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE . '_columns', array($this, 'messages_edit_columns'));
 		// Shortcodes
-		add_shortcode( 'wps_message_histo', array( $this, 'display_message_histo_per_customer' ) );
-		add_shortcode( 'order_customer_personnal_informations', array( $this, 'order_personnal_informations' ) );
+		add_shortcode('wps_message_histo', array($this, 'display_message_histo_per_customer'));
+		add_shortcode('order_customer_personnal_informations', array($this, 'order_personnal_informations'));
 		/** Ajax */
-		add_action( 'wp_ajax_get_content_message', array( $this, 'get_content_message' ) );
+		add_action('wp_ajax_get_content_message', array($this, 'get_content_message'));
 	}
 
 	/**
@@ -40,10 +40,10 @@ 
 
 		/** Css */
 		add_thickbox();
-		wp_register_style( 'wpeo-message-css', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/css/frontend.css', '', WPS_MESSAGE_VERSION );
-		wp_enqueue_style( 'wpeo-message-css' );
+		wp_register_style('wpeo-message-css', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/css/frontend.css', '', WPS_MESSAGE_VERSION);
+		wp_enqueue_style('wpeo-message-css');
 		/** My js */
-		wp_enqueue_script( 'wps-message-js', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/js/frontend.js', array( 'jquery', 'thickbox' ), WPS_MESSAGE_VERSION );
+		wp_enqueue_script('wps-message-js', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/js/frontend.js', array('jquery', 'thickbox'), WPS_MESSAGE_VERSION);
 	}
 
 	/**
@@ -59,23 +59,23 @@ 
 	 */
 	function create_message_type() {
 
-		register_post_type( WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, array(
+		register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, array(
 			'labels' => array(
-				'name' => __( 'Message', 'wpshop' ),
-				'singular_name' => __( 'message', 'wpshop' ),
-				'add_new' => __( 'Add message', 'wpshop' ),
-				'add_new_item' => __( 'Add New message', 'wpshop' ),
-				'edit' => __( 'Edit', 'wpshop' ),
-				'edit_item' => __( 'Edit message', 'wpshop' ),
-				'new_item' => __( 'New message', 'wpshop' ),
-				'view' => __( 'View message', 'wpshop' ),
-				'view_item' => __( 'View message', 'wpshop' ),
-				'search_items' => __( 'Search messages', 'wpshop' ),
-				'not_found' => __( 'No message found', 'wpshop' ),
-				'not_found_in_trash' => __( 'No message found in trash', 'wpshop' ),
+				'name' => __('Message', 'wpshop'),
+				'singular_name' => __('message', 'wpshop'),
+				'add_new' => __('Add message', 'wpshop'),
+				'add_new_item' => __('Add New message', 'wpshop'),
+				'edit' => __('Edit', 'wpshop'),
+				'edit_item' => __('Edit message', 'wpshop'),
+				'new_item' => __('New message', 'wpshop'),
+				'view' => __('View message', 'wpshop'),
+				'view_item' => __('View message', 'wpshop'),
+				'search_items' => __('Search messages', 'wpshop'),
+				'not_found' => __('No message found', 'wpshop'),
+				'not_found_in_trash' => __('No message found in trash', 'wpshop'),
 				'parent-item-colon' => '',
 			),
-			'description' => __( 'This is where store messages are stored.', 'wpshop' ),
+			'description' => __('This is where store messages are stored.', 'wpshop'),
 			'public' => true,
 			'show_ui' => true,
 			'capability_type' => 'post',
@@ -86,9 +86,9 @@ 
 			'show_in_nav_menus' => false,
 			'rewrite' => false,
 			'query_var' => true,
-			'supports' => array( 'title', 'editor' ),
+			'supports' => array('title', 'editor'),
 			'has_archive' => false,
-		) );
+		));
 	}
 
 	/**
@@ -97,10 +97,10 @@ 
 	function add_meta_boxes() {
 
 		// Add message sending historic meta box
-		add_meta_box( 'wpshop_message_histo',
-			__( 'Message historic', 'wpshop' ),
-			array( $this, 'message_histo_box' ),
-		WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, 'normal', 'high' );
+		add_meta_box('wpshop_message_histo',
+			__('Message historic', 'wpshop'),
+			array($this, 'message_histo_box'),
+		WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, 'normal', 'high');
 	}
 
 	/**
@@ -109,10 +109,10 @@ 
 	 * @param unknown_type $post
 	 * @param unknown_type $params
 	 */
-	function message_histo_box( $post, $params ) {
+	function message_histo_box($post, $params) {
 
 		$output  = '<div id="message_histo_container">';
-		$output .= $this->get_historic_message_by_type( $post->ID );
+		$output .= $this->get_historic_message_by_type($post->ID);
 		$output .= '</div>';
 		echo $output;
 	}
@@ -123,39 +123,39 @@ 
 	 * @param  integer $message_type_id : Message type ID
 	 * @return string
 	 */
-	function get_historic_message_by_type( $message_type_id ) {
+	function get_historic_message_by_type($message_type_id) {
 
 		global $wpdb;
 		$output = '';
-		if ( ! empty( $message_type_id ) ) {
+		if (!empty($message_type_id)) {
 			// Recover all sended messages
 			$wps_message_mdl = new wps_message_mdl();
-			$messages = $wps_message_mdl->get_messages_histo( $message_type_id );
+			$messages = $wps_message_mdl->get_messages_histo($message_type_id);
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'backend', 'message_historic' ) );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'backend', 'message_historic'));
 			$output .= ob_get_contents();
 			ob_end_clean();
 		}
 		return $output;
 	}
 
-	public static function get_xml_messages( $code = null ) {
-		if ( is_null( self::$xml_messages ) ) {
-			$xml_default_emails = file_get_contents( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_emails.xml' );
-			$default_emails = new SimpleXMLElement( $xml_default_emails );
+	public static function get_xml_messages($code = null) {
+		if (is_null(self::$xml_messages)) {
+			$xml_default_emails = file_get_contents(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_emails.xml');
+			$default_emails = new SimpleXMLElement($xml_default_emails);
 			self::$xml_messages = array();
-			foreach ( $default_emails->xpath( '//emails/email' ) as $email ) {
-				self::$xml_messages[ (string) $email->attributes()->code ] = array(
-					'shop_type' => (string) $email->attributes()->shop_type,
-					'object' => (string) $email->subject,
-					'message' => (string) $email->content,
+			foreach ($default_emails->xpath('//emails/email') as $email) {
+				self::$xml_messages[(string)$email->attributes()->code] = array(
+					'shop_type' => (string)$email->attributes()->shop_type,
+					'object' => (string)$email->subject,
+					'message' => (string)$email->content,
 				);
 			}
 		}
-		if ( is_null( $code ) ) {
+		if (is_null($code)) {
 			return self::$xml_messages;
-		} elseif ( isset( self::$xml_messages[ $code ] ) ) {
-			return self::$xml_messages[ $code ];
+		} elseif (isset(self::$xml_messages[$code])) {
+			return self::$xml_messages[$code];
 		} else {
 			return false;
 		}
@@ -165,9 +165,9 @@ 
 	 */
 	public static function create_default_message() {
 		// Read default emails for options creation
-		foreach ( self::get_xml_messages() as $code => $email ) {
-			if ( ( WPSHOP_DEFINED_SHOP_TYPE == $email['shop_type'] ) || ( 'sale' == WPSHOP_DEFINED_SHOP_TYPE ) ) {
-				self::createMessage( $code, $email['object'], $email['message'] );
+		foreach (self::get_xml_messages() as $code => $email) {
+			if ((WPSHOP_DEFINED_SHOP_TYPE == $email['shop_type']) || ('sale' == WPSHOP_DEFINED_SHOP_TYPE)) {
+				self::createMessage($code, $email['object'], $email['message']);
 			}
 		}
 	}
@@ -180,23 +180,23 @@ 
 	 * @param string $message : Message content
 	 * @return integer message ID
 	 */
-	public static function createMessage( $code, $object = '', $message = '' ) {
+	public static function createMessage($code, $object = '', $message = '') {
 
 		$id = 0;
-		$xml_message = self::get_xml_messages( $code );
-		$object = empty( $object ) ? $xml_message['object'] : $object;
-		$message = empty( $message ) ? $xml_message['message'] : $message;
-		$message_option = get_option( $code, null );
-		if ( empty( $message_option ) && ! empty( $object ) && ! empty( $message ) ) {
+		$xml_message = self::get_xml_messages($code);
+		$object = empty($object) ? $xml_message['object'] : $object;
+		$message = empty($message) ? $xml_message['message'] : $message;
+		$message_option = get_option($code, null);
+		if (empty($message_option) && !empty($object) && !empty($message)) {
 			$new_message = array(
-				'post_title' => __( $object , 'wpshop' ),
-				'post_content' => self::customize_message( __( $message, 'wpshop' ) ),
+				'post_title' => __($object, 'wpshop'),
+				'post_content' => self::customize_message(__($message, 'wpshop')),
 				'post_status' => 'publish',
 				'post_author' => 1,
 				'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE,
 			);
-			$id = wp_insert_post( $new_message );
-			update_option( $code, $id );
+			$id = wp_insert_post($new_message);
+			update_option($code, $id);
 		} else {
 			$id = $message_option;
 		}
@@ -209,17 +209,17 @@ 
 	 *
 	 * @return array
 	 */
-	function messages_custom_columns( $column ) {
+	function messages_custom_columns($column) {
 
 		global $post;
 		$metadata = get_post_custom();
-		switch ( $column ) {
+		switch ($column) {
 			case 'extract':
-				echo wp_trim_words( $post->post_content, 55 );
+				echo wp_trim_words($post->post_content, 55);
 		break;
 			case 'last_dispatch_date':
-				if ( ! empty( $metadata['wpshop_message_last_dispatch_date'][0] ) ) {
-					echo mysql2date( 'd F Y, H:i:s',$metadata['wpshop_message_last_dispatch_date'][0], true );
+				if (!empty($metadata['wpshop_message_last_dispatch_date'][0])) {
+					echo mysql2date('d F Y, H:i:s', $metadata['wpshop_message_last_dispatch_date'][0], true);
 				} else { echo '-';
 				}
 		break;
@@ -231,14 +231,14 @@ 
 	 *
 	 * @return array
 	 */
-	function messages_edit_columns( $columns ) {
+	function messages_edit_columns($columns) {
 
 		$columns = array(
 			'cb' => '<input type="checkbox" />',
-			'title' => __( 'Name', 'wpshop' ),
-			'extract' => __( 'Extract from the message','wpshop' ),
-			'date' => __( 'Creation date','wpshop' ),
-			'last_dispatch_date' => __( 'Last dispatch date','wpshop' ),
+			'title' => __('Name', 'wpshop'),
+			'extract' => __('Extract from the message', 'wpshop'),
+			'date' => __('Creation date', 'wpshop'),
+			'last_dispatch_date' => __('Last dispatch date', 'wpshop'),
 		);
 		return $columns;
 	}
@@ -249,17 +249,17 @@ 
 	 * @param integer $current
 	 * @return string
 	 */
-	function getMessageListOption( $current = 0 ) {
+	function getMessageListOption($current = 0) {
 
-		$posts = query_posts( array(
+		$posts = query_posts(array(
 			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE,
 			'posts_per_page' => '-1',
-		) );
+		));
 		$options = '';
-		if ( ! empty( $posts ) ) {
-			$options = '<option value="0">' . __( 'Select values from list', 'wpshop' ) . '</option>';
-			foreach ( $posts as $p ) {
-				$selected = $p->ID == $current ? ' selected="selected"': '';
+		if (!empty($posts)) {
+			$options = '<option value="0">' . __('Select values from list', 'wpshop') . '</option>';
+			foreach ($posts as $p) {
+				$selected = $p->ID == $current ? ' selected="selected"' : '';
 				$options .= '<option value="' . $p->ID . '"' . $selected . '>' . $p->post_title . '</option>';
 			}
 		}
@@ -274,13 +274,13 @@ 
 	 * @param integer $customer_id : ID to identifiate the customer
 	 * @return string
 	 */
-	function display_message_histo_per_customer( $args, $customer_id = '' ) {
+	function display_message_histo_per_customer($args, $customer_id = '') {
 
-		$customer_id = ( ! empty( $customer_id ) ) ? $customer_id : get_current_user_id();
-		$message_id = ( ! empty( $args ) && ! empty( $args['message_id'] ) ) ? $args['message_id'] : '';
+		$customer_id = (!empty($customer_id)) ? $customer_id : get_current_user_id();
+		$message_id = (!empty($args) && !empty($args['message_id'])) ? $args['message_id'] : '';
 		$message_elements = '';
 		$wps_message_mdl = new wps_message_mdl();
-		$messages_data = $wps_message_mdl->get_messages_histo( $message_id, $customer_id );
+		$messages_data = $wps_message_mdl->get_messages_histo($message_id, $customer_id);
 
 		// ob_start();
 		// require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, "frontend", "messages") );
@@ -288,22 +288,22 @@ 
 		// ob_end_clean();
 		/**	Order emails	*/
 		$messages_histo = array();
-		foreach ( $messages_data as $meta_id => $messages ) :
+		foreach ($messages_data as $meta_id => $messages) :
 			$i = 0;
-			foreach ( $messages as $message ) :
-				$messages_histo[ $message['mess_dispatch_date'][0] ][ $i ]['title'] = $message['mess_title'];
-				$messages_histo[ $message['mess_dispatch_date'][0] ][ $i ]['message'] = $message['mess_message'];
-				$messages_histo[ $message['mess_dispatch_date'][0] ][ $i ]['dates'] = $message['mess_dispatch_date'];
-				if ( ! empty( $message['mess_object_id'] ) ) {
-					$messages_histo[ $message['mess_dispatch_date'][0] ][ $i ]['object'] = $message['mess_object_id'];
+			foreach ($messages as $message) :
+				$messages_histo[$message['mess_dispatch_date'][0]][$i]['title'] = $message['mess_title'];
+				$messages_histo[$message['mess_dispatch_date'][0]][$i]['message'] = $message['mess_message'];
+				$messages_histo[$message['mess_dispatch_date'][0]][$i]['dates'] = $message['mess_dispatch_date'];
+				if (!empty($message['mess_object_id'])) {
+					$messages_histo[$message['mess_dispatch_date'][0]][$i]['object'] = $message['mess_object_id'];
 				}
 				$i++;
 		endforeach;
 endforeach;
-		ksort( $messages_histo );
-		$messages_histo = array_reverse( $messages_histo );
+		ksort($messages_histo);
+		$messages_histo = array_reverse($messages_histo);
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'frontend', 'customer', 'messages' ) );
+		require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'frontend', 'customer', 'messages'));
 		$output = ob_get_contents();
 		ob_end_clean();
 		return $output;
@@ -315,11 +315,11 @@ 
 	 * @param string $message : message content
 	 * @return string
 	 */
-	public static function customize_message( $message ) {
+	public static function customize_message($message) {
 
-		if ( ! empty( $message ) ) {
+		if (!empty($message)) {
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, WPS_MESSAGE_PATH . WPS_MESSAGE_DIR . '/templates/', 'backend', 'message_html_structure' ) );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, WPS_MESSAGE_PATH . WPS_MESSAGE_DIR . '/templates/', 'backend', 'message_html_structure'));
 			$message = ob_get_contents();
 			ob_end_clean();
 		}
@@ -330,15 +330,15 @@ 
 	 *
 	 * @return boolean
 	 */
-	function add_message( $recipient_id = 0, $email, $title, $message, $model_id, $object, $date = null ) {
+	function add_message($recipient_id = 0, $email, $title, $message, $model_id, $object, $date = null) {
 
-		$date = empty( $date ) ? current_time( 'mysql', 0 ) : $date;
+		$date = empty($date) ? current_time('mysql', 0) : $date;
 		$object_empty = array(
 			'object_type' => '',
 			'object_id' => 0,
 		);
-		$object = array_merge( $object_empty, $object );
-		$historic = get_post_meta( $recipient_id, '_wpshop_messages_histo_' . $model_id . '_' . substr( $date, 0, 7 ), true );
+		$object = array_merge($object_empty, $object);
+		$historic = get_post_meta($recipient_id, '_wpshop_messages_histo_' . $model_id . '_' . substr($date, 0, 7), true);
 		$data_to_insert = array(
 			'mess_user_id' => $recipient_id,
 			'mess_user_email' => $email,
@@ -346,10 +346,10 @@ 
 			'mess_object_id' => $object['object_id'],
 			'mess_title' => $title,
 			'mess_message' => $message,
-			'mess_dispatch_date' => array( $date ),
+			'mess_dispatch_date' => array($date),
 		);
 		$historic[] = $data_to_insert;
-		update_post_meta( $recipient_id, '_wpshop_messages_histo_' . $model_id . '_' . substr( $date, 0, 7 ), $historic );
+		update_post_meta($recipient_id, '_wpshop_messages_histo_' . $model_id . '_' . substr($date, 0, 7), $historic);
 	}
 
 	/**
@@ -361,49 +361,49 @@ 
 	 * @param boolean $duplicate_message : Duplicate a light message for historic storage
 	 * @return string
 	 */
-	function customMessage( $string, $data, $model_name = '', $duplicate_message = false ) {
+	function customMessage($string, $data, $model_name = '', $duplicate_message = false) {
 
 		$avant = array();
 		$apres = array();
-		$logo_option = get_option( 'wpshop_logo' );
+		$logo_option = get_option('wpshop_logo');
 
-		$data['your_shop_logo'] = ( ! empty( $logo_option ) ) ? '<img src="' . $logo_option . '" alt="' . get_bloginfo( 'name' ) . '" />' : '';
+		$data['your_shop_logo'] = (!empty($logo_option)) ? '<img src="' . $logo_option . '" alt="' . get_bloginfo('name') . '" />' : '';
 
-		foreach ( $data as $key => $value ) {
+		foreach ($data as $key => $value) {
 			$avant[] = '[' . $key . ']';
-			switch ( $key ) {
+			switch ($key) {
 				case 'order_content' :
-					$apres[] = ( $duplicate_message ) ? '[order_content]' : $this->order_content_template_for_mail( $data['order_id'] );
+					$apres[] = ($duplicate_message) ? '[order_content]' : $this->order_content_template_for_mail($data['order_id']);
 					break;
 				case 'order_addresses' :
-					$apres[] = ( $duplicate_message ) ? '[order_addresses]' : $this->order_addresses_template_for_mail( $data['order_id'] );
+					$apres[] = ($duplicate_message) ? '[order_addresses]' : $this->order_addresses_template_for_mail($data['order_id']);
 					break;
 
 				case 'order_billing_address' :
-					$apres[] = ( $duplicate_message ) ? '[order_billing_address]' : $this->order_addresses_template_for_mail( $data['order_id'], 'billing' );
+					$apres[] = ($duplicate_message) ? '[order_billing_address]' : $this->order_addresses_template_for_mail($data['order_id'], 'billing');
 					break;
 
 				case 'order_shipping_address' :
-					$apres[] = ( $duplicate_message ) ? '[order_shipping_address]' : $this->order_addresses_template_for_mail( $data['order_id'], 'shipping' );
+					$apres[] = ($duplicate_message) ? '[order_shipping_address]' : $this->order_addresses_template_for_mail($data['order_id'], 'shipping');
 					break;
 
 				case 'order_customer_comments' :
-					$apres[] = ( $duplicate_message ) ? '[order_customer_comments]' : $this->order_customer_comment_template_for_mail( $data['order_id'] );
+					$apres[] = ($duplicate_message) ? '[order_customer_comments]' : $this->order_customer_comment_template_for_mail($data['order_id']);
 					break;
 				case 'order_personnal_informations' :
-					$apres[] = ( $duplicate_message ) ? '[order_personnal_informations]' : $this->order_personnal_informations();
+					$apres[] = ($duplicate_message) ? '[order_personnal_informations]' : $this->order_personnal_informations();
 					break;
 				default :
 					$apres[] = $value;
 					break;
 			}
 		}
-		$string = str_replace( $avant, $apres, $string );
+		$string = str_replace($avant, $apres, $string);
 
-		$string = apply_filters( 'wps_more_customized_message', $string, $data, $duplicate_message );
+		$string = apply_filters('wps_more_customized_message', $string, $data, $duplicate_message);
 
-		if ( ($model_name != 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE') ) {
-			$string = preg_replace( '/\[(.*)\]/Usi', '', $string );
+		if (($model_name != 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE')) {
+			$string = preg_replace('/\[(.*)\]/Usi', '', $string);
 		}
 
 		return $string;
@@ -418,22 +418,22 @@ 
 	 * @param string $object : message object
 	 * @param file   $attached_file : File to attached to e-mail
 	 */
-	function wpshop_prepared_email( $email, $model_name, $data = array(), $object = array(), $attached_file = '' ) {
+	function wpshop_prepared_email($email, $model_name, $data = array(), $object = array(), $attached_file = '') {
 		global $wpdb;
-		$data = apply_filters( 'wps_extra_data_to_send_in_email', $data );
-		$model_id = get_option( $model_name, 0 );
-		$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->posts . ' WHERE ID = %s', $model_id );
-		$post_message = $wpdb->get_row( $query );
+		$data = apply_filters('wps_extra_data_to_send_in_email', $data);
+		$model_id = get_option($model_name, 0);
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE ID = %s', $model_id);
+		$post_message = $wpdb->get_row($query);
 		$duplicate_message = '';
-		if ( ! empty( $post_message ) ) {
-			$title = $this->customMessage( $post_message->post_title, $data, $model_name );
-			$message = $this->customMessage( $post_message->post_content, $data, $model_name );
+		if (!empty($post_message)) {
+			$title = $this->customMessage($post_message->post_title, $data, $model_name);
+			$message = $this->customMessage($post_message->post_content, $data, $model_name);
 			// End if().
-			if ( array_key_exists( 'order_content', $data ) || array_key_exists( 'order_addresses', $data ) || array_key_exists( 'order_customer_comments', $data ) ) {
-				$duplicate_message = $this->customMessage( $post_message->post_content, $data, $model_name, true );
+			if (array_key_exists('order_content', $data) || array_key_exists('order_addresses', $data) || array_key_exists('order_customer_comments', $data)) {
+				$duplicate_message = $this->customMessage($post_message->post_content, $data, $model_name, true);
 			}
-			if ( ! empty( $email ) ) {
-				$this->wpshop_email( $email, $title, $message, true, $model_id, $object, $attached_file, $duplicate_message );
+			if (!empty($email)) {
+				$this->wpshop_email($email, $title, $message, true, $model_id, $object, $attached_file, $duplicate_message);
 			}
 		}
 	}
@@ -450,37 +450,37 @@ 
 	 * @param file    $attachments : File to attached to e-mail
 	 * @param string  $duplicate_message : lighter message to store
 	 */
-	function wpshop_email( $email, $title, $message, $save = true, $model_id, $object = array(), $attachments = '', $duplicate_message = '' ) {
+	function wpshop_email($email, $title, $message, $save = true, $model_id, $object = array(), $attachments = '', $duplicate_message = '') {
 		global $wpdb;
 		// Sauvegarde
-		if ( $save ) {
-			$user = $wpdb->get_row( 'SELECT ID FROM ' . $wpdb->users . ' WHERE user_email="' . $email . '";' );
+		if ($save) {
+			$user = $wpdb->get_row('SELECT ID FROM ' . $wpdb->users . ' WHERE user_email="' . $email . '";');
 			$user_id = $user ? $user->ID : get_current_user_id();
-			$query = $wpdb->prepare( 'SELECT ID FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s ', $user_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-			$user_post_id = $wpdb->get_var( $query );
+			$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s ', $user_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+			$user_post_id = $wpdb->get_var($query);
 
-			if ( ! empty( $duplicate_message ) ) {
-				$this->add_message( $user_post_id, $email, $title, $duplicate_message, $model_id, $object );
+			if (!empty($duplicate_message)) {
+				$this->add_message($user_post_id, $email, $title, $duplicate_message, $model_id, $object);
 			} else {
-				$this->add_message( $user_post_id, $email, $title, $message, $model_id, $object );
+				$this->add_message($user_post_id, $email, $title, $message, $model_id, $object);
 			}
 		}
 
-		$emails = get_option( 'wpshop_emails', array() );
+		$emails = get_option('wpshop_emails', array());
 		$noreply_email = $emails['noreply_email'];
 		// Split the email to get the name
-		$vers_nom = substr( $email, 0, strpos( $email,'@' ) );
+		$vers_nom = substr($email, 0, strpos($email, '@'));
 
 		// Headers du mail
 		$headers = "MIME-Version: 1.0\r\n";
 		$headers .= "Content-type: text/html; charset=UTF-8\r\n";
-		$headers .= 'From: ' . get_bloginfo( 'name' ) . ' <' . $noreply_email . '>' . "\r\n";
+		$headers .= 'From: ' . get_bloginfo('name') . ' <' . $noreply_email . '>' . "\r\n";
 
 		// Mail en HTML
-		@wp_mail( $email, $title, $message, $headers, $attachments );
+		@wp_mail($email, $title, $message, $headers, $attachments);
 
-		if ( ! empty( $attachments ) ) {
-			unlink( $attachments );
+		if (!empty($attachments)) {
+			unlink($attachments);
 		}
 	}
 
@@ -490,13 +490,13 @@ 
 	 * @param integer $order_id : Order ID
 	 * @return string
 	 */
-	function order_content_template_for_mail( $order_id ) {
+	function order_content_template_for_mail($order_id) {
 		$message = '';
-		if ( ! empty( $order_id ) ) {
-			$currency_code = wpshop_tools::wpshop_get_currency( false );
-			$orders_infos = get_post_meta( $order_id, '_order_postmeta', true );
+		if (!empty($order_id)) {
+			$currency_code = wpshop_tools::wpshop_get_currency(false);
+			$orders_infos = get_post_meta($order_id, '_order_postmeta', true);
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_content_mail_template' ) );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_content_mail_template'));
 			$message .= ob_get_contents();
 			ob_end_clean();
 		}
@@ -510,44 +510,44 @@ 
 	 * @param integer $address_type : Address type ID
 	 * @return string
 	 */
-	function order_addresses_template_for_mail( $order_id, $address_type = '' ) {
+	function order_addresses_template_for_mail($order_id, $address_type = '') {
 		global $wpdb;
-		$shipping_option = get_option( 'wpshop_shipping_address_choice' );
-		$display_shipping = ( ! empty( $shipping_option ) && ! empty( $shipping_option['activate'] ) ) ? true : false;
+		$shipping_option = get_option('wpshop_shipping_address_choice');
+		$display_shipping = (!empty($shipping_option) && !empty($shipping_option['activate'])) ? true : false;
 		$message = '';
-		if ( ! empty( $order_id ) ) {
-			$order_addresses = get_post_meta( $order_id, '_order_info', true );
-			if ( ! empty( $order_addresses ) ) {
-				foreach ( $order_addresses as $key => $order_address ) {
-					if ( ! empty( $order_address ) && ( empty( $address_type ) || $address_type == $key ) ) {
-
-						if ( $key != 'shipping' || ($key == 'shipping' && $display_shipping) ) {
-							$address_type_title = ( ! empty( $key ) && $key == 'billing' ) ? __( 'Billing address', 'wpshop' ) : __( 'Shipping address', 'wpshop' );
+		if (!empty($order_id)) {
+			$order_addresses = get_post_meta($order_id, '_order_info', true);
+			if (!empty($order_addresses)) {
+				foreach ($order_addresses as $key => $order_address) {
+					if (!empty($order_address) && (empty($address_type) || $address_type == $key)) {
+
+						if ($key != 'shipping' || ($key == 'shipping' && $display_shipping)) {
+							$address_type_title = (!empty($key) && $key == 'billing') ? __('Billing address', 'wpshop') : __('Shipping address', 'wpshop');
 							$civility = '';
-							if ( ! empty( $order_address['address']['civility'] ) ) {
-								$query = $wpdb->prepare( 'SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $order_address['address']['civility'] );
-								$civility = $wpdb->get_var( $query );
+							if (!empty($order_address['address']['civility'])) {
+								$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $order_address['address']['civility']);
+								$civility = $wpdb->get_var($query);
 							}
 
 							// Address informations
-							$customer_last_name = ( ! empty( $order_address['address']['address_last_name'] ) ) ? $order_address['address']['address_last_name'] : '';
-							$customer_firtsname = ( ! empty( $order_address['address']['address_first_name'] ) ) ? $order_address['address']['address_first_name'] : '';
-							$customer_company = ( ! empty( $order_address['address']['company'] ) ) ? $order_address['address']['company'] : '';
-							$customer_address = ( ! empty( $order_address['address']['address'] ) ) ? $order_address['address']['address'] : '';
-							$customer_zip_code = ( ! empty( $order_address['address']['postcode'] ) ) ? $order_address['address']['postcode'] : '';
-							$customer_city = ( ! empty( $order_address['address']['city'] ) ) ? $order_address['address']['city'] : '';
-							$customer_state = ( ! empty( $order_address['address']['state'] ) ) ? $order_address['address']['state'] : '';
-							$customer_phone = ( ! empty( $order_address['address']['phone'] ) ) ? ' Tel. : ' . $order_address['address']['phone'] : '';
+							$customer_last_name = (!empty($order_address['address']['address_last_name'])) ? $order_address['address']['address_last_name'] : '';
+							$customer_firtsname = (!empty($order_address['address']['address_first_name'])) ? $order_address['address']['address_first_name'] : '';
+							$customer_company = (!empty($order_address['address']['company'])) ? $order_address['address']['company'] : '';
+							$customer_address = (!empty($order_address['address']['address'])) ? $order_address['address']['address'] : '';
+							$customer_zip_code = (!empty($order_address['address']['postcode'])) ? $order_address['address']['postcode'] : '';
+							$customer_city = (!empty($order_address['address']['city'])) ? $order_address['address']['city'] : '';
+							$customer_state = (!empty($order_address['address']['state'])) ? $order_address['address']['state'] : '';
+							$customer_phone = (!empty($order_address['address']['phone'])) ? ' Tel. : ' . $order_address['address']['phone'] : '';
 							$country = '';
-							foreach ( unserialize( WPSHOP_COUNTRY_LIST ) as $key => $value ) {
-								if ( ! empty( $order_address['address']['country'] ) && $key == $order_address['address']['country'] ) {
+							foreach (unserialize(WPSHOP_COUNTRY_LIST) as $key => $value) {
+								if (!empty($order_address['address']['country']) && $key == $order_address['address']['country']) {
 									$country = $value;
 								}
 							}
 							$customer_country = $country;
 
 							ob_start();
-							require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_addresses_template_for_mail' ) );
+							require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_addresses_template_for_mail'));
 							$message .= ob_get_contents();
 							ob_end_clean();
 						}
@@ -564,20 +564,20 @@ 
 	 * @param integer $order_id : Order ID
 	 * @return string
 	 */
-	function order_customer_comment_template_for_mail( $order_id ) {
+	function order_customer_comment_template_for_mail($order_id) {
 		global $wpdb;
 		$message = '';
-		if ( ! empty( $order_id ) ) {
-			$query = $wpdb->prepare( 'SELECT post_excerpt FROM ' . $wpdb->posts . ' WHERE ID = %d', $order_id );
-			$comment = $wpdb->get_var( $query );
-			$order_infos = get_post_meta( $order_id, '_order_postmeta', true );
-			if ( ! empty( $order_infos['order_key'] ) ) {
-				$comment_title = __( 'Comments about the order', 'wpshop' );
+		if (!empty($order_id)) {
+			$query = $wpdb->prepare('SELECT post_excerpt FROM ' . $wpdb->posts . ' WHERE ID = %d', $order_id);
+			$comment = $wpdb->get_var($query);
+			$order_infos = get_post_meta($order_id, '_order_postmeta', true);
+			if (!empty($order_infos['order_key'])) {
+				$comment_title = __('Comments about the order', 'wpshop');
 			} else {
-				$comment_title = __( 'Comments about the quotation', 'wpshop' );
+				$comment_title = __('Comments about the quotation', 'wpshop');
 			}
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_email_customer_comments' ) );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_email_customer_comments'));
 			$message .= ob_get_contents();
 			ob_end_clean();
 		}
@@ -593,15 +593,15 @@ 
 		global $wpdb;
 		$user_id = get_current_user_id();
 		$message = '';
-		$customer_entity = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-		if ( ! empty( $customer_entity ) ) {
+		$customer_entity = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+		if (!empty($customer_entity)) {
 
-			$query = $wpdb->prepare( 'SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d AND status = %s', $customer_entity, 'valid' );
-			$attributes_sets = $wpdb->get_results( $query );
+			$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d AND status = %s', $customer_entity, 'valid');
+			$attributes_sets = $wpdb->get_results($query);
 
-			if ( ! empty( $attributes_sets ) ) {
+			if (!empty($attributes_sets)) {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_personnal_informations_template_for_mail' ) );
+				require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, 'backend/mails', 'order_personnal_informations_template_for_mail'));
 				$message .= ob_get_contents();
 				ob_end_clean();
 			}
@@ -614,17 +614,17 @@ 
 	 */
 	function wpshop_messages_historic_correction() {
 		global $wpdb;
-		$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s', '_wpshop_messages_histo_%' );
-		$messages_histo = $wpdb->get_results( $query );
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s', '_wpshop_messages_histo_%');
+		$messages_histo = $wpdb->get_results($query);
 
-		foreach ( $messages_histo as $message ) {
-			$query_user = $wpdb->prepare( 'SELECT ID FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s',  $message->post_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-			$user_post_id = $wpdb->get_var( $query_user );
-			$wpdb->update( $wpdb->postmeta, array(
+		foreach ($messages_histo as $message) {
+			$query_user = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s', $message->post_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+			$user_post_id = $wpdb->get_var($query_user);
+			$wpdb->update($wpdb->postmeta, array(
 				'post_id' => $user_post_id,
 				), array(
 				'meta_id' => $message->meta_id,
-			) );
+			));
 		}
 	}
 
@@ -633,20 +633,20 @@ 
 	 * Récupères le contenu du message
 	 */
 	public function get_content_message() {
-		$_wpnonce = ! empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( ! wp_verify_nonce( $_wpnonce, 'get_content_message' ) ) {
+		if (!wp_verify_nonce($_wpnonce, 'get_content_message')) {
 			wp_die();
 		}
 
 		global $wpdb;
-		$meta_id = (int) $_GET['meta_id'];
+		$meta_id = (int)$_GET['meta_id'];
 
-		$result = $wpdb->get_results( $wpdb->prepare( 'SELECT meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_id=%d', array( ($meta_id) ) ) );
-		$result = unserialize( $result[0]->meta_value );
+		$result = $wpdb->get_results($wpdb->prepare('SELECT meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_id=%d', array(($meta_id))));
+		$result = unserialize($result[0]->meta_value);
 		$result = $result[0]['mess_message'];
 
-		wp_die( $result );
+		wp_die($result);
 	}
 
 }

includes/modules/wps_product/modules/wps_product_variation_interface/controller/wps_product_variation_interface.ctr.php

Spacing +78 added lines, -78 removed lines

@@ -13,10 +13,10 @@ 
 	 * Call hooks.
 	 */
 	public function __construct() {
-		add_action( 'init', array( $this, 'init' ) );
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ), 11, 2 );
-		add_action( 'save_post', array( $this, 'save_post' ), 10, 2 );
-		add_filter( 'wpshop_attribute_output_def', array( $this, 'wpshop_attribute_output_def' ), 10, 2 );
+		add_action('init', array($this, 'init'));
+		add_action('add_meta_boxes', array($this, 'add_meta_boxes'), 11, 2);
+		add_action('save_post', array($this, 'save_post'), 10, 2);
+		add_filter('wpshop_attribute_output_def', array($this, 'wpshop_attribute_output_def'), 10, 2);
 	}
 	/**
 	 * Call private functions if class is activate.
@@ -25,10 +25,10 @@ 
 	 * @param  array  $arguments  Array of arguments to pass.
 	 * @return mixed             Return of real function called.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( method_exists( $this, $name ) ) {
-			if ( $this->is_activate() ) {
-				return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if (method_exists($this, $name)) {
+			if ($this->is_activate()) {
+				return call_user_func_array(array($this, $name), $arguments);
 			}
 		}
 	}
@@ -39,10 +39,10 @@ 
 	 * @return void
 	 */
 	public function init() {
-		$_wpnonce = ! empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['_wpnonce'] ) ) : ''; // Input var okay.
-		$wps_variation_interface = ! empty( $_GET['wps_variation_interface'] ) ? filter_var( wp_unslash( $_GET['wps_variation_interface'] ), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE ) : null; // Input var okay.
-		if ( wp_verify_nonce( $_wpnonce, 'wps_remove_variation_interface' ) && null !== $wps_variation_interface ) {
-			$this->is_activate( $wps_variation_interface );
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field(wp_unslash($_REQUEST['_wpnonce'])) : ''; // Input var okay.
+		$wps_variation_interface = !empty($_GET['wps_variation_interface']) ? filter_var(wp_unslash($_GET['wps_variation_interface']), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) : null; // Input var okay.
+		if (wp_verify_nonce($_wpnonce, 'wps_remove_variation_interface') && null !== $wps_variation_interface) {
+			$this->is_activate($wps_variation_interface);
 		}
 	}
 	/**
@@ -51,17 +51,17 @@ 
 	 * @param  boolean $new_val If set & db is different, save it.
 	 * @return boolean          Actual state of module.
 	 */
-	public function is_activate( $new_val = null ) {
-	    if ( ! isset( $this->is_active ) ) {
-	        $option = get_option( 'wps_variation_interface_display', null );
-	        if ( is_null( $option ) ) {
+	public function is_activate($new_val = null) {
+	    if (!isset($this->is_active)) {
+	        $option = get_option('wps_variation_interface_display', null);
+	        if (is_null($option)) {
 	            $new_val = true;
 	            $option = false;
 	        }
-	        $this->is_active = (bool) $option;
+	        $this->is_active = (bool)$option;
 	    }
-	    if ( isset( $new_val ) && $this->is_active !== $new_val ) {
-	        update_option( 'wps_variation_interface_display', $new_val );
+	    if (isset($new_val) && $this->is_active !== $new_val) {
+	        update_option('wps_variation_interface_display', $new_val);
 	        $this->is_active = $new_val;
 	    }
 	    return $this->is_active;
@@ -72,11 +72,11 @@ 
 	 * @param  array $element Direct array attribute of db.
 	 * @return void          It set directly in variable class.
 	 */
-	private function get_variations( $element ) {
-		if ( ! isset( $this->variations ) ) {
-			$variations = wpshop_attributes::get_variation_available_attribute( $element );
-			$this->variations = (array) array_merge( ( isset( $variations['available'] ) ? $variations['available'] : array()), ( isset( $variations['unavailable'] ) ? $variations['unavailable'] : array() ) );
-			unset( $variations );
+	private function get_variations($element) {
+		if (!isset($this->variations)) {
+			$variations = wpshop_attributes::get_variation_available_attribute($element);
+			$this->variations = (array)array_merge((isset($variations['available']) ? $variations['available'] : array()), (isset($variations['unavailable']) ? $variations['unavailable'] : array()));
+			unset($variations);
 		}
 	}
 	/**
@@ -86,13 +86,13 @@ 
 	 * @param  string  $post_status Generated by WP.
 	 * @param  WP_Post $post Generated by WP.
 	 */
-	public function add_meta_boxes( $post_status, $post ) {
+	public function add_meta_boxes($post_status, $post) {
 		global $pagenow;
-		if ( $this->is_activate() ) {
-			$this->get_variations( $post->ID );
-			remove_meta_box( 'wpshop_wpshop_variations', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal' );
-			if ( 'post-new.php' !== $pagenow && ! empty( $this->variations ) ) {
-				add_meta_box( 'wpshop_wpshop_variations', __( 'Product variation', 'wpshop' ), array( $this, 'meta_box_variation' ), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'default' );
+		if ($this->is_activate()) {
+			$this->get_variations($post->ID);
+			remove_meta_box('wpshop_wpshop_variations', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal');
+			if ('post-new.php' !== $pagenow && !empty($this->variations)) {
+				add_meta_box('wpshop_wpshop_variations', __('Product variation', 'wpshop'), array($this, 'meta_box_variation'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'default');
 			}
 		}
 	}
@@ -102,49 +102,49 @@ 
 	 * @param  object $post Given by WordPress.
 	 * @return void       Display directly.
 	 */
-	private function meta_box_variation( $post ) {
-		$this->get_variations( $post->ID );
+	private function meta_box_variation($post) {
+		$this->get_variations($post->ID);
 		global $wpdb;
 		$ids = array();
-		foreach ( $this->variations as $key => $variation ) {
-			$available = wpshop_attributes::get_select_output( $variation['attribute_complete_def'] );
-			$this->variations[ $key ]['available'] = array_keys( $available['possible_value'] );
-			$ids = array_merge( $ids, array_keys( $available['possible_value'] ) );
+		foreach ($this->variations as $key => $variation) {
+			$available = wpshop_attributes::get_select_output($variation['attribute_complete_def']);
+			$this->variations[$key]['available'] = array_keys($available['possible_value']);
+			$ids = array_merge($ids, array_keys($available['possible_value']));
 		}
-		$sql = 'SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id IN (\'' . implode( '\', \'', $ids ) . '\') AND status = %s';
-		$query = call_user_func( array( $wpdb, 'prepare' ), $sql, 'valid' );
-		$product = wpshop_products::get_product_data( $post->ID, false, '"publish","draft","future"' );
-		$is_used_in_variation = wpshop_attributes::getElement( 'yes', "'valid', 'notused'", 'is_used_in_variation', true );
+		$sql = 'SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id IN (\'' . implode('\', \'', $ids) . '\') AND status = %s';
+		$query = call_user_func(array($wpdb, 'prepare'), $sql, 'valid');
+		$product = wpshop_products::get_product_data($post->ID, false, '"publish","draft","future"');
+		$is_used_in_variation = wpshop_attributes::getElement('yes', "'valid', 'notused'", 'is_used_in_variation', true);
 		$attribute_list = array();
-		foreach ( $is_used_in_variation as $attribute ) {
-			if ( in_array( $attribute->backend_input, array( 'multiple-select', 'select', 'radio', 'checkbox' ), true ) ) {
-				$values = wpshop_attributes::get_select_output( $attribute );
-				if ( ! empty( $values['possible_value'] ) ) {
+		foreach ($is_used_in_variation as $attribute) {
+			if (in_array($attribute->backend_input, array('multiple-select', 'select', 'radio', 'checkbox'), true)) {
+				$values = wpshop_attributes::get_select_output($attribute);
+				if (!empty($values['possible_value'])) {
 					$attribute->possible_value = $values['possible_value'];
 				}
 			}
-			$attribute_list[ $attribute->code ] = $attribute;
+			$attribute_list[$attribute->code] = $attribute;
 		}
-		$variation_defining = get_post_meta( $post->ID, '_wpshop_variation_defining', true );
-		$variations_saved = wpshop_products::get_variation( $post->ID );
-		if ( ! empty( $variations_saved ) ) {
-			foreach ( $variations_saved as $variation_id => $variation ) {
-				$downloadable = get_post_meta( $variation_id, 'attribute_option_is_downloadable_', true );
-				if ( ! empty( $downloadable['file_url'] ) ) {
-					$variations_saved[ $variation_id ]['file']['path'] = $downloadable['file_url'];
-					$variations_saved[ $variation_id ]['file']['name'] = basename( $downloadable['file_url'] );
+		$variation_defining = get_post_meta($post->ID, '_wpshop_variation_defining', true);
+		$variations_saved = wpshop_products::get_variation($post->ID);
+		if (!empty($variations_saved)) {
+			foreach ($variations_saved as $variation_id => $variation) {
+				$downloadable = get_post_meta($variation_id, 'attribute_option_is_downloadable_', true);
+				if (!empty($downloadable['file_url'])) {
+					$variations_saved[$variation_id]['file']['path'] = $downloadable['file_url'];
+					$variations_saved[$variation_id]['file']['name'] = basename($downloadable['file_url']);
 				}
 			}
 		}
-		$price_piloting = get_option( 'wpshop_shop_price_piloting' );
+		$price_piloting = get_option('wpshop_shop_price_piloting');
 		$product_currency = wpshop_tools::wpshop_get_currency();
-		wp_enqueue_style( 'wps-product-variation-interface-style', WPSPDTVARIATION_INTERFACE_ASSETS_MAIN_DIR . '/css/style-backend.css' );
-		wp_enqueue_script( 'wps-product-variation-interface-script', WPSPDTVARIATION_INTERFACE_ASSETS_MAIN_DIR . '/js/script-backend.js' );
-		wp_enqueue_script( 'wps-product-variation-interface-script-utils', WPSPDTVARIATION_INTERFACE_ASSETS_MAIN_DIR . '/js/script-backend-utils.js' );
-		wp_localize_script( 'wps-product-variation-interface-script', 'wps_product_variation_interface', apply_filters( 'wps_filters_product_variation_extra_columns_product_definition', array(
+		wp_enqueue_style('wps-product-variation-interface-style', WPSPDTVARIATION_INTERFACE_ASSETS_MAIN_DIR . '/css/style-backend.css');
+		wp_enqueue_script('wps-product-variation-interface-script', WPSPDTVARIATION_INTERFACE_ASSETS_MAIN_DIR . '/js/script-backend.js');
+		wp_enqueue_script('wps-product-variation-interface-script-utils', WPSPDTVARIATION_INTERFACE_ASSETS_MAIN_DIR . '/js/script-backend-utils.js');
+		wp_localize_script('wps-product-variation-interface-script', 'wps_product_variation_interface', apply_filters('wps_filters_product_variation_extra_columns_product_definition', array(
 			'variation' => $this->variations,
-			'nonce_delete' => wp_create_nonce( 'wpshop_variation_management' ),
-			'variation_value' => call_user_func( array( $wpdb, 'get_results' ), $query ),
+			'nonce_delete' => wp_create_nonce('wpshop_variation_management'),
+			'variation_value' => call_user_func(array($wpdb, 'get_results'), $query),
 			'product_price' => $product['product_price'],
 			'tx_tva' => $product['tx_tva'],
 			'attribute_in_variation' => $attribute_list,
@@ -152,9 +152,9 @@ 
 			'price_piloting' => $price_piloting,
 			'currency' => $product_currency,
 			'variation_defining' => $variation_defining,
-			'label_file' => __( 'Click to add file', 'wpshop' ),
-		) ) );
-		require_once wpshop_tools::get_template_part( WPSPDTVARIATION_INTERFACE_DIR, WPSPDTVARIATION_INTERFACE_TEMPLATES_MAIN_DIR, 'backend', 'meta_box_variation' );
+			'label_file' => __('Click to add file', 'wpshop'),
+		)));
+		require_once wpshop_tools::get_template_part(WPSPDTVARIATION_INTERFACE_DIR, WPSPDTVARIATION_INTERFACE_TEMPLATES_MAIN_DIR, 'backend', 'meta_box_variation');
 	}
 	/**
 	 * Save other values out of old variation interface.
@@ -163,24 +163,24 @@ 
 	 * @param  object $post    WP_Post of WordPress.
 	 * @return void
 	 */
-	private function save_post( $post_id, $post ) {
-		if ( wp_is_post_revision( $post_id ) || WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT !== $post->post_type || ! isset( $_REQUEST['wpshop_variation_defining']['options'] ) || ! isset( $_REQUEST['wps_pdt_variations'] ) ) { // Input var okay.
+	private function save_post($post_id, $post) {
+		if (wp_is_post_revision($post_id) || WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT !== $post->post_type || !isset($_REQUEST['wpshop_variation_defining']['options']) || !isset($_REQUEST['wps_pdt_variations'])) { // Input var okay.
 			return;
 		}
-		wpshop_products::variation_parameters_save( $post_id, $_REQUEST['wpshop_variation_defining']['options'] ); // Input var okay.
-		remove_action( 'save_post', array( $this, 'save_post' ) );
-		foreach ( $_REQUEST['wps_pdt_variations'] as $variation_id => $data ) { // Input var okay.
+		wpshop_products::variation_parameters_save($post_id, $_REQUEST['wpshop_variation_defining']['options']); // Input var okay.
+		remove_action('save_post', array($this, 'save_post'));
+		foreach ($_REQUEST['wps_pdt_variations'] as $variation_id => $data) { // Input var okay.
 			$variation = array(
 				'ID' => $variation_id,
 			);
-			if ( isset( $data['status'] ) && 'on' === $data['status'] ) {
+			if (isset($data['status']) && 'on' === $data['status']) {
 				$variation['post_status'] = 'publish';
 			} else {
 				$variation['post_status'] = 'draft';
 			}
-			wp_update_post( $variation );
+			wp_update_post($variation);
 		}
-		add_action( 'save_post', array( $this, 'save_post' ), 10, 2 );
+		add_action('save_post', array($this, 'save_post'), 10, 2);
 	}
 	/**
 	 * Delete display in attributes products always in metabox.
@@ -189,10 +189,10 @@ 
 	 * @param  array $element Direct array attribute of db.
 	 * @return array          SAme array $output modified.
 	 */
-	public function wpshop_attribute_output_def( $output, $element ) {
-		if ( $this->is_activate() ) {
-			$this->get_variations( $element );
-			if ( ! empty( $this->variations ) && in_array( $output['field_definition']['name'], array_keys( $this->variations ), true ) ) {
+	public function wpshop_attribute_output_def($output, $element) {
+		if ($this->is_activate()) {
+			$this->get_variations($element);
+			if (!empty($this->variations) && in_array($output['field_definition']['name'], array_keys($this->variations), true)) {
 				$output['field'] = '';
 			}
 		}
@@ -205,7 +205,7 @@ 
 	 * @return void
 	 */
 	public function wpshop_download_file_dialog_active() {
-		add_filter( 'wps_filters_product_variation_file', array( $this, 'wps_filters_product_variation_file' ), 0, 1 );
+		add_filter('wps_filters_product_variation_file', array($this, 'wps_filters_product_variation_file'), 0, 1);
 	}
 	/**
 	 * Add old upload box for custom php dsiplay.
@@ -214,7 +214,7 @@ 
 	 * @param  string $string Input filter.
 	 * @return string The div for box.
 	 */
-	public function wps_filters_product_variation_file( $string ) {
-		return '<div style="display: none" onclick="open_dialog_box(this, %ID%, \'' . esc_html_e( 'Send the downloadable file', 'wpshop' ) . '\')"><div class="is_downloadable_statut_%ID%"></div></div>';
+	public function wps_filters_product_variation_file($string) {
+		return '<div style="display: none" onclick="open_dialog_box(this, %ID%, \'' . esc_html_e('Send the downloadable file', 'wpshop') . '\')"><div class="is_downloadable_statut_%ID%"></div></div>';
 	}
 }

includes/modules/wps_product/modules/wps_product_variation_interface/templates/backend/meta_box_variation.php

Spacing +28 added lines, -28 removed lines

@@ -2,18 +2,18 @@ 
 	<div data-view-model="wps_variations_options_summary" id="wps_variations_summary_display">
 		<b>%summary%</b>
 	</div>
-	<a id="wps_variations_parameters" title="<?php esc_html_e( 'Edit possibilities', 'wpshop' ); ?>" href="#">
+	<a id="wps_variations_parameters" title="<?php esc_html_e('Edit possibilities', 'wpshop'); ?>" href="#">
 		<?php // href=">?php print wp_nonce_url( get_edit_post_link( $post->ID ) . '&wps_variation_interface=false', 'wps_remove_variation_interface' );?<">. ?>
 		<span class="dashicons dashicons-admin-generic"></span>
 	</a>
 </div>
 <div id="wps_variations_options">
 	<ul id="wps_variations_options_title">
-		<li><?php esc_html_e( 'Generate option', 'wpshop' ); ?></li>
-		<li><?php esc_html_e( 'Option', 'wpshop' ); ?></li>
-		<li><?php esc_html_e( 'Requiered', 'wpshop' ); ?></li>
-		<li><?php esc_html_e( 'Possibilities', 'wpshop' ); ?></li>
-		<li><?php esc_html_e( 'Default', 'wpshop' ); ?></li>
+		<li><?php esc_html_e('Generate option', 'wpshop'); ?></li>
+		<li><?php esc_html_e('Option', 'wpshop'); ?></li>
+		<li><?php esc_html_e('Requiered', 'wpshop'); ?></li>
+		<li><?php esc_html_e('Possibilities', 'wpshop'); ?></li>
+		<li><?php esc_html_e('Default', 'wpshop'); ?></li>
 	</ul>
 	<ul data-view-model="wps_variations_options_raw" class="wps_variations_options_raw">
 		<li class="wps_variations_generate_col">
@@ -44,42 +44,42 @@ 
 </div>
 <div id="wps_variations_questions">
 	<ul>
-		<li class="wps_variations_questions_question_col"><?php esc_html_e( 'Do you want to manage each options singly or combine them ?', 'wpshop' ); ?></li>
+		<li class="wps_variations_questions_question_col"><?php esc_html_e('Do you want to manage each options singly or combine them ?', 'wpshop'); ?></li>
 		<li class="wps_variations_questions_answers_col">
 			<?php
 				$id = uniqid();
 			?>
-			<input id="question_combine_options_<?php echo intval( $id ); ?>" name="question_combine_options" type="radio" value="combine">
-			<label for="question_combine_options_<?php echo intval( $id ); ?>"><?php esc_html_e( 'Combined options', 'wpshop' ); ?></label>
+			<input id="question_combine_options_<?php echo intval($id); ?>" name="question_combine_options" type="radio" value="combine">
+			<label for="question_combine_options_<?php echo intval($id); ?>"><?php esc_html_e('Combined options', 'wpshop'); ?></label>
 			<?php
 				$id = uniqid();
 			?>
-			<input id="question_combine_options_<?php echo intval( $id ); ?>" name="question_combine_options" type="radio" value="single">
-			<label for="question_combine_options_<?php echo intval( $id ); ?>"><?php esc_html_e( 'Distinct options', 'wpshop' ); ?></label>
+			<input id="question_combine_options_<?php echo intval($id); ?>" name="question_combine_options" type="radio" value="single">
+			<label for="question_combine_options_<?php echo intval($id); ?>"><?php esc_html_e('Distinct options', 'wpshop'); ?></label>
 		</li>
 	</ul>
 </div>
 <div id="wps_variations_tabs">
 	<ul>
-		<li data-tab="wps_variations_price_option_tab" class="disabled"><?php esc_html_e( 'Options prices', 'wpshop' ); ?></li>
-		<li id="wps_variations_apply_btn" data-nonce="<?php echo esc_attr( wp_create_nonce( 'wpshop_variation_management' ) ); ?>">
-			<?php esc_html_e( 'Apply modifications', 'wpshop' ); ?>
+		<li data-tab="wps_variations_price_option_tab" class="disabled"><?php esc_html_e('Options prices', 'wpshop'); ?></li>
+		<li id="wps_variations_apply_btn" data-nonce="<?php echo esc_attr(wp_create_nonce('wpshop_variation_management')); ?>">
+			<?php esc_html_e('Apply modifications', 'wpshop'); ?>
 		</li>
 	</ul>
 </div>
 <div id="wps_variations_price_option_tab" class="wps_variations_tabs">
 	<ul id="wps_variations_price_option_tab_title">
-		<li class="wps_variations_price_id_col"><?php esc_html_e( 'ID', 'wpshop' ); ?></li>
-		<li class="wps_variations_price_name_col"><?php esc_html_e( 'Options', 'wpshop' ); ?></li>
-		<li class="wps_variations_price_config_col"><?php esc_html_e( 'Prices', 'wpshop' ); ?></li>
-		<li class="wps_variations_price_final_col"><?php esc_html_e( 'Final prices', 'wpshop' ); ?></li>
-		<li class="wps_variations_price_vat_col"><?php esc_html_e( 'VAT', 'wpshop' ); ?></li>
-		<li class="wps_variations_price_stock_col"><?php esc_html_e( 'Stock', 'wpshop' ); ?></li>
-		<li class="wps_variations_price_weight_col"><?php esc_html_e( 'Weight', 'wpshop' ); ?></li>
-		<li class="wps_variations_price_reference_col"><?php esc_html_e( 'Ref. product', 'wpshop' ); ?></li>
-		<li class="wps_variations_price_file_col"><?php esc_html_e( 'Link download', 'wpshop' ); ?></li>
-		<?php echo esc_html( apply_filters( 'wps_filters_product_variation_extra_columns_title', '' ) ); ?>
-		<li class="wps_variations_price_active_col"><?php esc_html_e( 'Activate', 'wpshop' ); ?></li>
+		<li class="wps_variations_price_id_col"><?php esc_html_e('ID', 'wpshop'); ?></li>
+		<li class="wps_variations_price_name_col"><?php esc_html_e('Options', 'wpshop'); ?></li>
+		<li class="wps_variations_price_config_col"><?php esc_html_e('Prices', 'wpshop'); ?></li>
+		<li class="wps_variations_price_final_col"><?php esc_html_e('Final prices', 'wpshop'); ?></li>
+		<li class="wps_variations_price_vat_col"><?php esc_html_e('VAT', 'wpshop'); ?></li>
+		<li class="wps_variations_price_stock_col"><?php esc_html_e('Stock', 'wpshop'); ?></li>
+		<li class="wps_variations_price_weight_col"><?php esc_html_e('Weight', 'wpshop'); ?></li>
+		<li class="wps_variations_price_reference_col"><?php esc_html_e('Ref. product', 'wpshop'); ?></li>
+		<li class="wps_variations_price_file_col"><?php esc_html_e('Link download', 'wpshop'); ?></li>
+		<?php echo esc_html(apply_filters('wps_filters_product_variation_extra_columns_title', '')); ?>
+		<li class="wps_variations_price_active_col"><?php esc_html_e('Activate', 'wpshop'); ?></li>
 	</ul>
 	<ul data-view-model="wps_variations_price_option_raw">
 		<li class="wps_variations_price_id_col">
@@ -118,13 +118,13 @@ 
 		</li>
 		<li class="wps_variations_price_file_col" data-view-model="wps_variations_price_option_file_%ID%">
 			<span class="wps_variations_price_option_price_file" onclick="wps_variations_price_option_raw.control.file(this)">%link%</span>
-			<?php echo esc_html( apply_filters( 'wps_filters_product_variation_file', '<input style="display: none;" type="file" name="wpshop_file" id="wpshop_file" onchange="wps_variations_price_option_raw.control.link(event, this)">' ) ); ?>
-			<?php wp_nonce_field( 'ajax_wpshop_upload_downloadable_file_action', 'wpshop_file_nonce' );?>
+			<?php echo esc_html(apply_filters('wps_filters_product_variation_file', '<input style="display: none;" type="file" name="wpshop_file" id="wpshop_file" onchange="wps_variations_price_option_raw.control.link(event, this)">')); ?>
+			<?php wp_nonce_field('ajax_wpshop_upload_downloadable_file_action', 'wpshop_file_nonce'); ?>
 			<a class="wps_variations_price_option_price_download_file" href="%path%" target="_blank" download="" style="display: %download%">
 				<span class="dashicons dashicons-download"></span>
 			</a>
 		</li>
-		<?php echo esc_html( apply_filters( 'wps_filters_product_variation_extra_columns_content', '' ) ); ?>
+		<?php echo esc_html(apply_filters('wps_filters_product_variation_extra_columns_content', '')); ?>
 		<li class="wps_variations_price_active_col">
 			<input name="wps_pdt_variations[%ID%][status]" onclick="wps_variations_price_option_raw.control.activate(this)" type="checkbox" %price_option_activate%>
 		</li>

includes/modules/wps_classic_checkout/wps_classic_checkout.php

Spacing +188 added lines, -188 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * WP Shop Classic Checkout bootstrap file
  * @author Jérôme ALLEGRE - Eoxia dev team <dev@eoxia.com>
@@ -8,12 +8,12 @@ 
  *
  */
 
-if ( !class_exists("wps_classic_checkout") ) {
+if (!class_exists("wps_classic_checkout")) {
 
 	/** Template Global vars **/
 	DEFINE('WPS_CLASSIC_CHECKOUT_DIR', basename(dirname(__FILE__)));
-	DEFINE('WPS_CLASSIC_CHECKOUT_PATH', str_replace( "\\", "/", str_replace( WPS_CLASSIC_CHECKOUT_DIR, "", dirname( __FILE__ ) ) ) );
-	DEFINE('WPS_CLASSIC_CHECKOUT_URL', str_replace( str_replace( "\\", "/", ABSPATH), site_url() . '/', WPS_CLASSIC_CHECKOUT_PATH ) );
+	DEFINE('WPS_CLASSIC_CHECKOUT_PATH', str_replace("\\", "/", str_replace(WPS_CLASSIC_CHECKOUT_DIR, "", dirname(__FILE__))));
+	DEFINE('WPS_CLASSIC_CHECKOUT_URL', str_replace(str_replace("\\", "/", ABSPATH), site_url() . '/', WPS_CLASSIC_CHECKOUT_PATH));
 
 
 	class wps_classic_checkout {
@@ -35,21 +35,21 @@ 
 			$this->template_dir = WPS_CLASSIC_CHECKOUT_PATH . WPS_CLASSIC_CHECKOUT_DIR . "/templates/";
 
 			/** Classic Checkout Shortcode **/
-			add_shortcode( 'wps_checkout', array( &$this, 'show_classic_checkout') );
-			add_shortcode( 'wpshop_checkout', array( &$this, 'show_classic_checkout') );
+			add_shortcode('wps_checkout', array(&$this, 'show_classic_checkout'));
+			add_shortcode('wpshop_checkout', array(&$this, 'show_classic_checkout'));
 			/** Checkout Step indicator **/
-			add_shortcode('wps_checkout_step_indicator', array(&$this, 'get_checkout_step_indicator') );
+			add_shortcode('wps_checkout_step_indicator', array(&$this, 'get_checkout_step_indicator'));
 
 			// Add scripts
-			add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts') );
+			add_action('wp_enqueue_scripts', array($this, 'add_scripts'));
 
 			/** Ajax Actions **/
-			add_action( 'wp_ajax_wps-checkout_valid_step_three', array( &$this, 'wps_checkout_valid_step_three') );
-			add_action( 'wp_ajax_wps-checkout_valid_step_four', array( &$this, 'wps_checkout_valid_step_four') );
-			add_action( 'wp_ajax_wps-checkout_valid_step_five', array( &$this, 'wps_checkout_valid_step_five') );
+			add_action('wp_ajax_wps-checkout_valid_step_three', array(&$this, 'wps_checkout_valid_step_three'));
+			add_action('wp_ajax_wps-checkout_valid_step_four', array(&$this, 'wps_checkout_valid_step_four'));
+			add_action('wp_ajax_wps-checkout_valid_step_five', array(&$this, 'wps_checkout_valid_step_five'));
 
-			add_action( 'admin_post_wps_direct_payment_link', array( 'wpshop_checkout', 'wps_direct_payment_link' ) );
-			add_action( 'admin_post_nopriv_wps_direct_payment_link', array( 'wpshop_checkout', 'wps_direct_payment_link_nopriv' ) );
+			add_action('admin_post_wps_direct_payment_link', array('wpshop_checkout', 'wps_direct_payment_link'));
+			add_action('admin_post_nopriv_wps_direct_payment_link', array('wpshop_checkout', 'wps_direct_payment_link_nopriv'));
 		}
 
 		/**
@@ -57,145 +57,145 @@ 
 		 */
 		function add_scripts() {
 			wp_enqueue_script('jquery');
-			wp_enqueue_script( 'wps_classic_checkout', plugins_url('templates/frontend/js/wps_classic_checkout.js', __FILE__) );
+			wp_enqueue_script('wps_classic_checkout', plugins_url('templates/frontend/js/wps_classic_checkout.js', __FILE__));
 		}
 
 		/**
 		 * Display Classic Checkout
 		 */
 		function show_classic_checkout() {
-			$order_id = !empty( $_GET['order_id'] ) ? (int) $_GET['order_id'] : '';
+			$order_id = !empty($_GET['order_id']) ? (int)$_GET['order_id'] : '';
 
-			$wpshop_cart_option = get_option( 'wpshop_cart_option' );
-			$current_step = !empty( $_GET[ 'order_step' ] ) && is_int( (int)$_GET[ 'order_step' ] ) ? (int)$_GET[ 'order_step' ] : null;
+			$wpshop_cart_option = get_option('wpshop_cart_option');
+			$current_step = !empty($_GET['order_step']) && is_int((int)$_GET['order_step']) ? (int)$_GET['order_step'] : null;
 
 			/**	Cas spécial lorsqu'il n'y a qu'un seul produit autorisé dans le panier / Special case when there is only one product allowed into cart	*/
-			if ( ( empty( $current_step ) || ( 1 == $current_step ) ) && ( !empty( $wpshop_cart_option ) && !empty( $wpshop_cart_option[ 'total_nb_of_item_allowed' ] ) && ( 1 == $wpshop_cart_option[ 'total_nb_of_item_allowed' ][0] ) ) ) {
-				if( empty($_SESSION) || empty($_SESSION['cart']) || empty($_SESSION['cart']['order_items']) ) {
-					$product_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_product_page_id' ) );
-					$url = get_permalink( $product_page_id );
-					wpshop_tools::wpshop_safe_redirect( $url );
+			if ((empty($current_step) || (1 == $current_step)) && (!empty($wpshop_cart_option) && !empty($wpshop_cart_option['total_nb_of_item_allowed']) && (1 == $wpshop_cart_option['total_nb_of_item_allowed'][0]))) {
+				if (empty($_SESSION) || empty($_SESSION['cart']) || empty($_SESSION['cart']['order_items'])) {
+					$product_page_id = wpshop_tools::get_page_id(get_option('wpshop_product_page_id'));
+					$url = get_permalink($product_page_id);
+					wpshop_tools::wpshop_safe_redirect($url);
 				}
 				else {
 					$current_step = 2;
 				}
 			}
 
-			$checkout_step_indicator = do_shortcode( '[wps_checkout_step_indicator]');
+			$checkout_step_indicator = do_shortcode('[wps_checkout_step_indicator]');
 			$checkout_content = '';
 
-			if ( !empty($current_step) ) {
-				switch( $current_step) {
+			if (!empty($current_step)) {
+				switch ($current_step) {
 					case 1 :
 						ob_start();
-						require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-one") );
+						require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-one"));
 						$checkout_content .= ob_get_contents();
 						ob_end_clean();
 					break;
 					case 2 :
-						if ( get_current_user_id() != 0 ) {
-							$permalink_option = get_option( 'permalink_structure' );
-							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-							$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=3';
-							wpshop_tools::wpshop_safe_redirect( $url );
+						if (get_current_user_id() != 0) {
+							$permalink_option = get_option('permalink_structure');
+							$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+							$url = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=3';
+							wpshop_tools::wpshop_safe_redirect($url);
 						}
 						else {
 							ob_start();
-							require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-two") );
+							require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-two"));
 							$checkout_content .= ob_get_contents();
 							ob_end_clean();
 						}
 					break;
 					case 3 :
-						if ( get_current_user_id() == 0 ) {
-							$permalink_option = get_option( 'permalink_structure' );
-							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-							$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=2';
-							wpshop_tools::wpshop_safe_redirect( $url );
+						if (get_current_user_id() == 0) {
+							$permalink_option = get_option('permalink_structure');
+							$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+							$url = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=2';
+							wpshop_tools::wpshop_safe_redirect($url);
 						}
 						else {
-							if( !empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) ) {
+							if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
 								ob_start();
-								require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-three") );
+								require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-three"));
 								$checkout_content .= ob_get_contents();
 								ob_end_clean();
-								$url = apply_filters('wps_extra_signup_actions', ( isset( $url ) ? $url : '' ) );
-								if(!empty($url)) {
-									wpshop_tools::wpshop_safe_redirect( $url );
+								$url = apply_filters('wps_extra_signup_actions', (isset($url) ? $url : ''));
+								if (!empty($url)) {
+									wpshop_tools::wpshop_safe_redirect($url);
 								}
 							}
 							else {
-								$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-								$url = get_permalink( $checkout_page_id  );
-								wpshop_tools::wpshop_safe_redirect( $url );
+								$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+								$url = get_permalink($checkout_page_id);
+								wpshop_tools::wpshop_safe_redirect($url);
 							}
 						}
 					break;
 					case 4 :
-						if ( get_current_user_id() == 0 ) {
-							$permalink_option = get_option( 'permalink_structure' );
-							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-							$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=2';
-							wpshop_tools::wpshop_safe_redirect( $url );
+						if (get_current_user_id() == 0) {
+							$permalink_option = get_option('permalink_structure');
+							$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+							$url = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=2';
+							wpshop_tools::wpshop_safe_redirect($url);
 						}
 						else {
-							if( !empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) ) {
+							if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
 								ob_start();
-								require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-four") );
+								require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-four"));
 								$checkout_content .= ob_get_contents();
 								ob_end_clean();
 							}
 							else {
-								$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-								$url = get_permalink( $checkout_page_id  );
-								wpshop_tools::wpshop_safe_redirect( $url );
+								$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+								$url = get_permalink($checkout_page_id);
+								wpshop_tools::wpshop_safe_redirect($url);
 							}
 						}
 					break;
 					case 5 :
-						if ( get_current_user_id() == 0 ) {
-							$permalink_option = get_option( 'permalink_structure' );
-							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-							$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=2';
-							wpshop_tools::wpshop_safe_redirect( $url );
+						if (get_current_user_id() == 0) {
+							$permalink_option = get_option('permalink_structure');
+							$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+							$url = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=2';
+							wpshop_tools::wpshop_safe_redirect($url);
 						}
 						else {
 							$wps_cart = new wps_cart();
-							$order = $wps_cart->calcul_cart_information( array() );
+							$order = $wps_cart->calcul_cart_information(array());
 							$wps_cart->store_cart_in_session($order);
-							$shipping_option = get_option( 'wpshop_shipping_address_choice' );
-							if ( !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) && ( ( !empty($shipping_option) && !empty($shipping_option['activate']) && !empty($_SESSION['shipping_method']) ) || ( !empty($shipping_option) && empty($shipping_option['activate']) )  ) ) {
-								$order_id = ( !empty($_SESSION['cart']['order_id']) ) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0;
+							$shipping_option = get_option('wpshop_shipping_address_choice');
+							if (!empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) && ((!empty($shipping_option) && !empty($shipping_option['activate']) && !empty($_SESSION['shipping_method'])) || (!empty($shipping_option) && empty($shipping_option['activate'])))) {
+								$order_id = (!empty($_SESSION['cart']['order_id'])) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0;
 								ob_start();
-								require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-five") );
+								require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-five"));
 								$checkout_content .= ob_get_contents();
 								ob_end_clean();
-								$checkout_content = apply_filters( 'classic_checkout_step_six_extra_content', $checkout_content );
+								$checkout_content = apply_filters('classic_checkout_step_six_extra_content', $checkout_content);
 							}
 							else {
-								$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-								$url = get_permalink( $checkout_page_id  );
-								wpshop_tools::wpshop_safe_redirect( $url );
+								$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+								$url = get_permalink($checkout_page_id);
+								wpshop_tools::wpshop_safe_redirect($url);
 							}
 						}
 					break;
 					case 6 :
 
-						if ( !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) ){
+						if (!empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
 						 	$wps_marketing_tools_ctr = new wps_marketing_tools_ctr();
-						 	$checkout_content .=  $wps_marketing_tools_ctr->display_ecommerce_ga_tracker( $_SESSION['order_id'] );
+						 	$checkout_content .= $wps_marketing_tools_ctr->display_ecommerce_ga_tracker($_SESSION['order_id']);
 						 	$checkout_content .= $this->wps_classic_confirmation_message();
 						 	$checkout_content .= $this->wps_summary_order();
 						}
 						else {
-							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-							$url = get_permalink( $checkout_page_id  );
-							wpshop_tools::wpshop_safe_redirect( $url );
+							$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+							$url = get_permalink($checkout_page_id);
+							wpshop_tools::wpshop_safe_redirect($url);
 						}
 					break;
 					default :
 						ob_start();
-						require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-one") );
+						require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-one"));
 						$checkout_content .= ob_get_contents();
 						ob_end_clean();
 					break;
@@ -206,7 +206,7 @@ 
 				$checkout_content = do_shortcode('[wps_cart]');
 			}
 
-			require_once( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic_checkout") );
+			require_once(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic_checkout"));
 
 		}
 
@@ -217,10 +217,10 @@ 
 		function wps_classic_confirmation_message() {
 			$output = '';
 			$wps_cart = new wps_cart();
-			$available_templates = array( 'banktransfer', 'checks', 'free', 'paypal', 'cic', 'quotation', 'cash_on_delivery' );
-			$payment_method = ( !empty($_SESSION['payment_method']) && in_array($_SESSION['payment_method'], $available_templates) ) ? $_SESSION['payment_method'] : 'others';
+			$available_templates = array('banktransfer', 'checks', 'free', 'paypal', 'cic', 'quotation', 'cash_on_delivery');
+			$payment_method = (!empty($_SESSION['payment_method']) && in_array($_SESSION['payment_method'], $available_templates)) ? $_SESSION['payment_method'] : 'others';
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir,"frontend", "confirmation/confirmation", $payment_method) );
+			require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "confirmation/confirmation", $payment_method));
 			$output .= ob_get_contents();
 			ob_end_clean();
 			return $output;
@@ -228,7 +228,7 @@ 
 
 		function wps_summary_order() {
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir,"frontend", "confirmation/confirmation-summary") );
+			require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "confirmation/confirmation-summary"));
 			$output = ob_get_contents();
 			ob_end_clean();
 			return $output;
@@ -239,17 +239,17 @@ 
 		 * @return String
 		 */
 		function get_checkout_step_indicator() {
-			$default_step = ( !empty( $_GET['order_step'] ) ) ? wpshop_tools::varSanitizer( $_GET['order_step'] ) : 1;
+			$default_step = (!empty($_GET['order_step'])) ? wpshop_tools::varSanitizer($_GET['order_step']) : 1;
 			$steps = array();
 
-			$shipping_address_option = get_option( 'wpshop_shipping_address_choice' );
-			$wpshop_cart_option = get_option( 'wpshop_cart_option' );
-			$permalink_option = get_option( 'permalink_structure' );
-			$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
+			$shipping_address_option = get_option('wpshop_shipping_address_choice');
+			$wpshop_cart_option = get_option('wpshop_cart_option');
+			$permalink_option = get_option('permalink_structure');
+			$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
 
 
 			$no_cart = false;
-			if ( empty( $wpshop_cart_option ) || empty( $wpshop_cart_option[ 'total_nb_of_item_allowed' ] ) || ( 1 != (int) $wpshop_cart_option[ 'total_nb_of_item_allowed' ][0] ) ) {
+			if (empty($wpshop_cart_option) || empty($wpshop_cart_option['total_nb_of_item_allowed']) || (1 != (int)$wpshop_cart_option['total_nb_of_item_allowed'][0])) {
 				$steps[] = __('Cart', 'wpshop');
 			}
 			else {
@@ -260,7 +260,7 @@ 
 			$steps[] = __('Addresses', 'wpshop');
 
 			$no_shipping = false;
-			if ( !empty( $shipping_address_option ) && !empty( $shipping_address_option[ 'activate' ] ) && !empty( $shipping_address_option[ 'choice' ] ) ) {
+			if (!empty($shipping_address_option) && !empty($shipping_address_option['activate']) && !empty($shipping_address_option['choice'])) {
 				$steps[] = __('Shipping Mode', 'wpshop');
 			}
 			else {
@@ -269,7 +269,7 @@ 
 
 			$no_payment = false;
 			$partial_payment_for_quotation = get_option('wpshop_payment_partial', array('for_quotation' => array()));
-			if( !empty($_SESSION) && !empty( $_SESSION['cart'] ) && ( ( !empty($_SESSION['cart']['order_amount_to_pay_now']) && number_format( $_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '' ) == '0.00' ) || ( !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' && isset( $partial_payment_for_quotation['for_quotation']['activate'] ) ) ) ) {
+			if (!empty($_SESSION) && !empty($_SESSION['cart']) && ((!empty($_SESSION['cart']['order_amount_to_pay_now']) && number_format($_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '') == '0.00') || (!empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' && isset($partial_payment_for_quotation['for_quotation']['activate'])))) {
 				$no_payment = true;
 			}
 			else {
@@ -280,45 +280,45 @@ 
 
 			$steps = apply_filters('wps_extra_action_checkout_indicator', $steps);
 
-			require_once( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir,"frontend", "checkout_step_indicator/checkout_step_indicator") );
+			require_once(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "checkout_step_indicator/checkout_step_indicator"));
 		}
 
 		/**
 		 * AJAX - Valid Checkout Step three
 		 */
 		function wps_checkout_valid_step_three() {
-			$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+			$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_valid_step_three' ) )
+			if (!wp_verify_nonce($_wpnonce, 'wps_checkout_valid_step_three'))
 				wp_die();
 
 			$response = ''; $status = true;
 
-			$shipping_address = ( !empty($_POST['shipping_address_id']) ) ? wpshop_tools::varSanitizer( $_POST['shipping_address_id'] ): null;
-			$billing_address = ( !empty($_POST['billing_address_id']) ) ? wpshop_tools::varSanitizer( $_POST['billing_address_id'] ): null;
+			$shipping_address = (!empty($_POST['shipping_address_id'])) ? wpshop_tools::varSanitizer($_POST['shipping_address_id']) : null;
+			$billing_address = (!empty($_POST['billing_address_id'])) ? wpshop_tools::varSanitizer($_POST['billing_address_id']) : null;
 
 			$user_id = get_current_user_id();
 
 			$response = '<div class="wps-alert-error"><ul>';
 
-			if( $user_id != 0 ) {
-				$shipping_option = get_option( 'wpshop_shipping_address_choice' );
-				$billing_option = get_option( 'wpshop_billing_address' );
-				$user_addresses = wps_address::get_addresses_list( $user_id );
+			if ($user_id != 0) {
+				$shipping_option = get_option('wpshop_shipping_address_choice');
+				$billing_option = get_option('wpshop_billing_address');
+				$user_addresses = wps_address::get_addresses_list($user_id);
 
 				// Check if is only downloadable else display address
 				$cart_is_downloadable = false;
-				if ( !empty( $_SESSION['cart'] ) && !empty( $_SESSION['cart']['order_items'] ) ) {
-					foreach( $_SESSION['cart']['order_items'] as $c ) {
-						$product = wpshop_products::get_product_data( $c['item_id'] );
+				if (!empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
+					foreach ($_SESSION['cart']['order_items'] as $c) {
+						$product = wpshop_products::get_product_data($c['item_id']);
 						/** Check if it's a variation and check the parent product **/
-						if ( get_post_type( $c['item_id'] ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-							$parent_def = wpshop_products::get_parent_variation( $c['item_id'] );
-							if ( !empty($parent_def) && !empty($parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['is_downloadable_']) ) {
+						if (get_post_type($c['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+							$parent_def = wpshop_products::get_parent_variation($c['item_id']);
+							if (!empty($parent_def) && !empty($parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['is_downloadable_'])) {
 								$product['is_downloadable_'] = $parent_def['parent_post_meta']['is_downloadable_'];
 							}
 						}
-						if( !empty($product['is_downloadable_']) && ( __( $product['is_downloadable_'], 'wpshop') == __('Yes', 'wpshop') || __( $product['is_downloadable_'], 'wpshop') == __('yes', 'wpshop') ) ) {
+						if (!empty($product['is_downloadable_']) && (__($product['is_downloadable_'], 'wpshop') == __('Yes', 'wpshop') || __($product['is_downloadable_'], 'wpshop') == __('yes', 'wpshop'))) {
 							$cart_is_downloadable = true;
 						} else {
 							$cart_is_downloadable = false;
@@ -327,144 +327,144 @@ 
 					}
 				}
 
-				if( !empty($shipping_option) && !empty($shipping_option['activate']) && !$cart_is_downloadable ) {
+				if (!empty($shipping_option) && !empty($shipping_option['activate']) && !$cart_is_downloadable) {
 					/** Check Shipping address **/
-					if ( empty($shipping_address) ) {
+					if (empty($shipping_address)) {
 						$status = false;
 						/** Check if user have already create a shipping address **/
-						if ( !empty($shipping_option['choice']) && !empty($user_addresses) && !empty($user_addresses[ $shipping_option['choice'] ]) ){
-							$response .= '<li>'.__( 'You must select a shipping address', 'wpshop' ).'</li>';
+						if (!empty($shipping_option['choice']) && !empty($user_addresses) && !empty($user_addresses[$shipping_option['choice']])) {
+							$response .= '<li>' . __('You must select a shipping address', 'wpshop') . '</li>';
 						}
 						else {
-							$response .= '<li>'.__( 'You must create a shipping address', 'wpshop' ).'</li>';
+							$response .= '<li>' . __('You must create a shipping address', 'wpshop') . '</li>';
 						}
 					}
 
 				}
 				/** Check Billing address **/
-				if( empty($billing_address) ) {
+				if (empty($billing_address)) {
 					$status = false;
-					if ( !empty($billing_option['choice']) && !empty($user_addresses) && !empty($user_addresses[ $billing_option['choice'] ]) ){
-						$response .= '<li>'.__( 'You must select a billing address', 'wpshop' ).'</li>';
+					if (!empty($billing_option['choice']) && !empty($user_addresses) && !empty($user_addresses[$billing_option['choice']])) {
+						$response .= '<li>' . __('You must select a billing address', 'wpshop') . '</li>';
 					}
 					else {
-						$response .= '<li>'.__( 'You must create a billing address', 'wpshop' ).'</li>';
+						$response .= '<li>' . __('You must create a billing address', 'wpshop') . '</li>';
 					}
 				}
 			}
 			else {
 				$status = false;
-				$response .= '<li>'.__( 'You must be logged to pass to next step', 'wpshop' ).'</li>';
+				$response .= '<li>' . __('You must be logged to pass to next step', 'wpshop') . '</li>';
 			}
 			$response .= '</ul></div>';
 
 			/** If no error **/
-			if( $status ) {
+			if ($status) {
 				$_SESSION['shipping_address'] = $shipping_address;
 				$_SESSION['billing_address'] = $billing_address;
 
-				$permalink_option = get_option( 'permalink_structure' );
-				$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
+				$permalink_option = get_option('permalink_structure');
+				$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
 				/** Checking if no shipping method is required and it is a quotation or a free order **/
-				$shipping_option = get_option( 'wps_shipping_mode' );
+				$shipping_option = get_option('wps_shipping_mode');
 
 				/** Quotation, no shipping, no payment */
-				if ( !empty($_SESSION) && !empty( $_SESSION['cart'] ) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') {
+				if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') {
 					$status = true;
 					$_SESSION['shipping_method'] = 'No Shipping method required';
 					$payment_method = $_SESSION['payment_method'] = 'quotation';
-					$order_id = wpshop_checkout::process_checkout( $payment_method, ( !empty($_SESSION['cart']['order_id']) ) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address'] );
-					$response = get_permalink( wpshop_tools::get_page_id( $checkout_page_id )  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=6';
+					$order_id = wpshop_checkout::process_checkout($payment_method, (!empty($_SESSION['cart']['order_id'])) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address']);
+					$response = get_permalink(wpshop_tools::get_page_id($checkout_page_id)) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=6';
 				} else {
 					$available_shipping_method = false;
-					if( !empty($shipping_option) && !empty($shipping_option['modes']) && !$cart_is_downloadable ) {
-						foreach( $shipping_option['modes'] as $shipping_mode_id => $shipping_mode ) {
-							if( !empty($shipping_mode['active']) && $shipping_mode['active'] == 'on' ) {
+					if (!empty($shipping_option) && !empty($shipping_option['modes']) && !$cart_is_downloadable) {
+						foreach ($shipping_option['modes'] as $shipping_mode_id => $shipping_mode) {
+							if (!empty($shipping_mode['active']) && $shipping_mode['active'] == 'on') {
 								$available_shipping_method = true;
 							}
 						}
 					}
 
-					if( !$available_shipping_method ) {
+					if (!$available_shipping_method) {
 						$_SESSION['shipping_method'] = 'No Shipping method required';
-						$order_id = ( !empty($_SESSION['cart']['order_id']) ) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0;
+						$order_id = (!empty($_SESSION['cart']['order_id'])) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0;
 
-						if( !empty($_SESSION) && !empty( $_SESSION['cart'] ) && isset($_SESSION['cart']['order_amount_to_pay_now']) && number_format( $_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '' ) == '0.00' ) {
+						if (!empty($_SESSION) && !empty($_SESSION['cart']) && isset($_SESSION['cart']['order_amount_to_pay_now']) && number_format($_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '') == '0.00') {
 							$status = true;
 							$payment_method = $_SESSION['payment_method'] = 'free';
-							$order_id = wpshop_checkout::process_checkout( $payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address'] );
-							$permalink_option = get_option( 'permalink_structure' );
-							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-							$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=6';
+							$order_id = wpshop_checkout::process_checkout($payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address']);
+							$permalink_option = get_option('permalink_structure');
+							$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+							$url = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=6';
 	// 						wpshop_tools::wpshop_safe_redirect( $url );
 							$response = $url;
 						}
 						else {
 							$status = true;
-							$response = get_permalink( wpshop_tools::get_page_id( $checkout_page_id )  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=5';
+							$response = get_permalink(wpshop_tools::get_page_id($checkout_page_id)) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=5';
 						}
 					}
 					else {
 						$status = true;
-						$response = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=4';
+						$response = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=4';
 					}
 				}
 			}
 			//Stock checking verification
 			$this->checking_stock();
 
-			wp_die( json_encode( array( 'status' => $status, 'response' => $response ) ) );
+			wp_die(json_encode(array('status' => $status, 'response' => $response)));
 		}
 
 		/**
 		 * AJAX - Valid Checkout step four
 		 */
 		function wps_checkout_valid_step_four() {
-			$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+			$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_valid_step_four' ) )
+			if (!wp_verify_nonce($_wpnonce, 'wps_checkout_valid_step_four'))
 				wp_die();
 
-			$shipping_method = ( !empty($_POST['shipping_mode']) ) ? wpshop_tools::varSanitizer($_POST['shipping_mode']) : null;
+			$shipping_method = (!empty($_POST['shipping_mode'])) ? wpshop_tools::varSanitizer($_POST['shipping_mode']) : null;
 			$status = false;
 			$response = '';
-			$permalink_option = get_option( 'permalink_structure' );
-			$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-			if ( !empty($shipping_method) ) {
+			$permalink_option = get_option('permalink_structure');
+			$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+			if (!empty($shipping_method)) {
 				$status = true;
 				$_SESSION['shipping_method'] = $shipping_method;
-				$order_id = ( !empty($_SESSION['cart']['order_id']) ) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0;
-				if ( !empty($_SESSION) && !empty( $_SESSION['cart'] ) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') {
+				$order_id = (!empty($_SESSION['cart']['order_id'])) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0;
+				if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') {
 					$partial_payment_for_quotation = get_option('wpshop_payment_partial', array('for_quotation' => array()));
-					if( isset( $partial_payment_for_quotation['for_quotation']['activate'] ) ) {
+					if (isset($partial_payment_for_quotation['for_quotation']['activate'])) {
 						$step = '5';
 					} else {
 						$payment_method = $_SESSION['payment_method'] = 'quotation';
-						$order_id = wpshop_checkout::process_checkout( $payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address'] );
+						$order_id = wpshop_checkout::process_checkout($payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address']);
 						$step = '6';
 					}
-					$response = get_permalink( wpshop_tools::get_page_id( $checkout_page_id )  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step='.$step;
+					$response = get_permalink(wpshop_tools::get_page_id($checkout_page_id)) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=' . $step;
 				}
-				elseif( !empty($_SESSION) && !empty( $_SESSION['cart'] ) && !empty($_SESSION['cart']['order_amount_to_pay_now']) && number_format( $_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '' ) == '0.00' ) {
+				elseif (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_amount_to_pay_now']) && number_format($_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '') == '0.00') {
 					$payment_method = $_SESSION['payment_method'] = 'free';
-					$order_id = wpshop_checkout::process_checkout( $payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address'] );
-					$permalink_option = get_option( 'permalink_structure' );
-					$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-					$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=6';
+					$order_id = wpshop_checkout::process_checkout($payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address']);
+					$permalink_option = get_option('permalink_structure');
+					$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+					$url = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=6';
 					$response = $url;
 				}
 				else {
-					$response = get_permalink( wpshop_tools::get_page_id( $checkout_page_id )  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=5';
+					$response = get_permalink(wpshop_tools::get_page_id($checkout_page_id)) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=5';
 				}
 			}
 			else {
-				$response .= '<div class="wps-alert-error">'.__( 'You must select a shipping method', 'wpshop' ).'</div>';
+				$response .= '<div class="wps-alert-error">' . __('You must select a shipping method', 'wpshop') . '</div>';
 			}
 
 			//Stock checking verification
 			$this->checking_stock();
 
-			echo json_encode( array( 'status' => $status, 'response' => $response) );
+			echo json_encode(array('status' => $status, 'response' => $response));
 			die();
 		}
 
@@ -472,46 +472,46 @@ 
 		 * AJAX - Valid Checkout step four
 		 */
 		function wps_checkout_valid_step_five() {
-			$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_valid_step_five' ) )
+			$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
+			if (!wp_verify_nonce($_wpnonce, 'wps_checkout_valid_step_five'))
 				wp_die();
 
 			$status = false;
 			$response = '';
-			$payment_method = ( !empty($_POST['wps-payment-method']) ) ? wpshop_tools::varSanitizer( $_POST['wps-payment-method'] ): null;
-			$order_id = ( !empty($_SESSION['cart']['order_id']) ) ? (int) $_SESSION['cart']['order_id'] : 0;
-			$customer_comment = ( !empty($_POST['wps-customer-comment']) ) ? wpshop_tools::varSanitizer( $_POST['wps-customer-comment'] ) : null;
+			$payment_method = (!empty($_POST['wps-payment-method'])) ? wpshop_tools::varSanitizer($_POST['wps-payment-method']) : null;
+			$order_id = (!empty($_SESSION['cart']['order_id'])) ? (int)$_SESSION['cart']['order_id'] : 0;
+			$customer_comment = (!empty($_POST['wps-customer-comment'])) ? wpshop_tools::varSanitizer($_POST['wps-customer-comment']) : null;
 
-			$terms_of_sale_required = isset( $_POST['terms_of_sale_indicator'] ) && !empty( $_POST['terms_of_sale_indicator'] ) ? (bool)$_POST['terms_of_sale_indicator'] : (bool)false;
-			$terms_of_sale_checked = isset( $_POST['terms_of_sale'] ) && !empty( $_POST['terms_of_sale'] ) ? (bool)$_POST['terms_of_sale_indicator'] : (bool)false;
+			$terms_of_sale_required = isset($_POST['terms_of_sale_indicator']) && !empty($_POST['terms_of_sale_indicator']) ? (bool)$_POST['terms_of_sale_indicator'] : (bool)false;
+			$terms_of_sale_checked = isset($_POST['terms_of_sale']) && !empty($_POST['terms_of_sale']) ? (bool)$_POST['terms_of_sale_indicator'] : (bool)false;
 
-			if ( ( $terms_of_sale_required && $terms_of_sale_checked ) || !$terms_of_sale_required ) {
-				if ( !empty($payment_method) ) {
+			if (($terms_of_sale_required && $terms_of_sale_checked) || !$terms_of_sale_required) {
+				if (!empty($payment_method)) {
 					/** Check if the payment method exist for the shop **/
-					$payment_option = get_option( 'wps_payment_mode' );
+					$payment_option = get_option('wps_payment_mode');
 
-					if( !empty($payment_option) && !empty($payment_option['mode']) && array_key_exists( $payment_method, $payment_option['mode']) && !empty($payment_option['mode'][$payment_method]['active']) ) {
-						if( !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' ) {
+					if (!empty($payment_option) && !empty($payment_option['mode']) && array_key_exists($payment_method, $payment_option['mode']) && !empty($payment_option['mode'][$payment_method]['active'])) {
+						if (!empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') {
 							$new_payment_method = $payment_method;
 							$payment_method = 'quotation';
 							$is_quotation = true;
 						} else {
 							$is_quotation = false;
 						}
-						$order_id = wpshop_checkout::process_checkout( $payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address'] );
-						if( !empty($order_id) && !empty($customer_comment) ) {
+						$order_id = wpshop_checkout::process_checkout($payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address']);
+						if (!empty($order_id) && !empty($customer_comment)) {
 							$wps_back_office_orders_mdl = new wps_back_office_orders_mdl();
 							$wps_back_office_orders_mdl->add_private_comment($order_id, $customer_comment);
 							//wp_update_post( array('ID' => $order_id, 'post_excerpt' => $customer_comment) );
 						}
-						$permalink_option = get_option( 'permalink_structure' );
-						$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-						$response = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=6';
-						if( $is_quotation ) {
-							$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
-							$params = array( 'method' => $new_payment_method, 'waited_amount' => $order_meta['order_partial_payment'], 'status' => 'waiting_payment', 'author' => get_current_user_id() );
+						$permalink_option = get_option('permalink_structure');
+						$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+						$response = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=6';
+						if ($is_quotation) {
+							$order_meta = get_post_meta($order_id, '_order_postmeta', true);
+							$params = array('method' => $new_payment_method, 'waited_amount' => $order_meta['order_partial_payment'], 'status' => 'waiting_payment', 'author' => get_current_user_id());
 							$order_meta['order_payment']['received'][0] = $params;
-							update_post_meta( $order_id, '_order_postmeta', $order_meta );
+							update_post_meta($order_id, '_order_postmeta', $order_meta);
 							$_SESSION['payment_method'] = $new_payment_method;
 						} else {
 							$_SESSION['payment_method'] = $payment_method;
@@ -519,22 +519,22 @@ 
 						$status = true;
 						//Add an action to extra actions on order save
 						// @TODO : REQUEST
-						$args = array( 'order_id' => $order_id, 'posted_data' => $_REQUEST);
-						wpshop_tools::create_custom_hook( 'wps_order_extra_save_action', $args );
+						$args = array('order_id' => $order_id, 'posted_data' => $_REQUEST);
+						wpshop_tools::create_custom_hook('wps_order_extra_save_action', $args);
 					}
 					else {
-						$response = '<div class="wps-alert-error">' .__( 'This payment method is unavailable', 'wpshop' ).'</div>';
+						$response = '<div class="wps-alert-error">' . __('This payment method is unavailable', 'wpshop') . '</div>';
 					}
 				}
 				else {
-					$response = '<div class="wps-alert-error">' .__( 'You must choose a payment method', 'wpshop' ).'</div>';
+					$response = '<div class="wps-alert-error">' . __('You must choose a payment method', 'wpshop') . '</div>';
 				}
 			}
 			else {
-				$response = '<div class="wps-alert-error">' .__( 'You must accept the terms of sale to order', 'wpshop' ).'</div>';
+				$response = '<div class="wps-alert-error">' . __('You must accept the terms of sale to order', 'wpshop') . '</div>';
 			}
 
-			echo json_encode( array('status' => $status, 'response' => $response) );
+			echo json_encode(array('status' => $status, 'response' => $response));
 			die();
 		}
 
@@ -542,15 +542,15 @@ 
 		 * Checking stock in differents checkout steps
 		 */
 		function checking_stock() {
-			if( !empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) ) {
-				foreach( $_SESSION['cart']['order_items'] as $item_id => $item ) {
+			if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
+				foreach ($_SESSION['cart']['order_items'] as $item_id => $item) {
 					$wps_product = new wps_product_ctr();
-					$checking = $wps_product->check_stock( $item['item_id'], $item['item_qty'], $item_id );
-					if( $checking !== true ) {
-						unset(  $_SESSION['cart']['order_items'][$item_id] );
+					$checking = $wps_product->check_stock($item['item_id'], $item['item_qty'], $item_id);
+					if ($checking !== true) {
+						unset($_SESSION['cart']['order_items'][$item_id]);
 						$wps_cart_ctr = new wps_cart();
-						$order = $wps_cart_ctr->calcul_cart_information( array() );
-						$wps_cart_ctr->store_cart_in_session( $order );
+						$order = $wps_cart_ctr->calcul_cart_information(array());
+						$wps_cart_ctr->store_cart_in_session($order);
 					}
 				}
 			}
@@ -558,6 +558,6 @@ 
 
 	}
 }
-if ( class_exists("wps_classic_checkout") ) {
+if (class_exists("wps_classic_checkout")) {
 	$wps_classic_checkout = new wps_classic_checkout();
 }