Eoxia / wpshop

includes/librairies/payments/payment.class.php

Spacing +183 added lines, -183 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -20,29 +20,29 @@ 
 
 		$wpshop_paypal = new wpshop_paypal();
 		// If the CIC payment method is active
-		$wpshop_paymentMethod = get_option( 'wps_payment_mode' );
-		if(WPSHOP_PAYMENT_METHOD_CIC && ( !empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']) && !empty($wpshop_paymentMethod['mode']['cic']['active']) ) ) {
+		$wpshop_paymentMethod = get_option('wps_payment_mode');
+		if (WPSHOP_PAYMENT_METHOD_CIC && (!empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']) && !empty($wpshop_paymentMethod['mode']['cic']['active']))) {
 			$wpshop_cic = new wpshop_CIC();
 		}
-		wpshop_tools::create_custom_hook ('wpshop_bankserver_reponse');
+		wpshop_tools::create_custom_hook('wpshop_bankserver_reponse');
 
 	}
 
 	public static function get_success_payment_url() {
-		$url = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_payment_return_page_id') ) );
+		$url = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_payment_return_page_id')));
 		return self::construct_url_parameters($url, 'paymentResult', 'success');
 	}
 
 	public static function get_cancel_payment_url() {
-		$url = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_payment_return_nok_page_id') ) );
+		$url = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_payment_return_nok_page_id')));
 		return $url;
 	}
 
 	public static function construct_url_parameters($url, $param, $value) {
 		$interoguation_marker_pos = strpos($url, '?');
-		if($interoguation_marker_pos===false)
-			return $url.'?'.$param.'='.$value;
-		else return $url.'&'.$param.'='.$value;
+		if ($interoguation_marker_pos === false)
+			return $url . '?' . $param . '=' . $value;
+		else return $url . '&' . $param . '=' . $value;
 	}
 
 	/**
@@ -51,23 +51,23 @@ 
 	public static function wpshop_payment_result() {
 		global $wpdb;
 		$user_ID = get_current_user_id();
-		$query = $wpdb->prepare('SELECT MAX(ID) FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_ORDER, $user_ID);
-		$order_post_id = $wpdb->get_var( $query );
-		if ( !empty($order_post_id) ) {
-			$order_postmeta = get_post_meta($order_post_id , '_wpshop_order_status', true);
-			if ( !empty($order_postmeta) ) {
-				switch ( $order_postmeta ) {
+		$query = $wpdb->prepare('SELECT MAX(ID) FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_ORDER, $user_ID);
+		$order_post_id = $wpdb->get_var($query);
+		if (!empty($order_post_id)) {
+			$order_postmeta = get_post_meta($order_post_id, '_wpshop_order_status', true);
+			if (!empty($order_postmeta)) {
+				switch ($order_postmeta) {
 					case 'awaiting_payment':
-						echo __('We wait your payment.','wpshop');
+						echo __('We wait your payment.', 'wpshop');
 					break;
 					case 'completed':
-						echo __('Thank you ! Your payment has been recorded.','wpshop');
+						echo __('Thank you ! Your payment has been recorded.', 'wpshop');
 					break;
 					case 'partially_paid':
-						echo __('Thank you ! Your first payment has been recorded.','wpshop');
+						echo __('Thank you ! Your first payment has been recorded.', 'wpshop');
 					break;
 					default:
-						echo __('Your payment and your order has been cancelled.','wpshop');
+						echo __('Your payment and your order has been cancelled.', 'wpshop');
 					break;
 				}
 			}
@@ -88,56 +88,56 @@ 
 	 * @param integer $order_id The order id if existing - Useful when user does not finish its order and want to validateit later
 	 * @return string The different payment method
 	 */
-	function __display_payment_methods_choice_form($order_id=0, $cart_type = 'cart') {
+	function __display_payment_methods_choice_form($order_id = 0, $cart_type = 'cart') {
 		$output = '';
 		/**	Get available payment method	*/
 		$paymentMethod = get_option('wpshop_paymentMethod', array());
 
-		if(!empty($order_id) && is_numeric($order_id)) {
-			$output .= '<input type="hidden" name="order_id" value="'.$order_id.'" />';
+		if (!empty($order_id) && is_numeric($order_id)) {
+			$output .= '<input type="hidden" name="order_id" value="' . $order_id . '" />';
 		}
 
 		if ($cart_type == 'cart') {
 			$payment_methods = array();
-			if(!empty($paymentMethod['paypal'])) {
+			if (!empty($paymentMethod['paypal'])) {
 				$payment_methods['paypal'] = array('payment_method_name' => __('CB with Paypal', 'wpshop'),
 														'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/paypal.png',
-														'payment_method_explanation' => __('<strong>Tips</strong> : If you have a Paypal account, by choosing this payment method, you will be redirected to the secure payment site Paypal to make your payment. Debit your PayPal account, immediate booking products.','wpshop')
+														'payment_method_explanation' => __('<strong>Tips</strong> : If you have a Paypal account, by choosing this payment method, you will be redirected to the secure payment site Paypal to make your payment. Debit your PayPal account, immediate booking products.', 'wpshop')
 								 );
 			}
-			if(!empty($paymentMethod['checks'])) {
+			if (!empty($paymentMethod['checks'])) {
 				$payment_methods['check'] = array('payment_method_name' => __('Check', 'wpshop'),
 						'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/cheque.png',
-						'payment_method_explanation' => __('Reservation of products upon receipt of the check.','wpshop')
+						'payment_method_explanation' => __('Reservation of products upon receipt of the check.', 'wpshop')
 				);
 			}
-			if(!empty($paymentMethod['banktransfer'])) {
+			if (!empty($paymentMethod['banktransfer'])) {
 				$payment_methods['banktransfer'] = array('payment_method_name' => __('Bank transfer', 'wpshop'),
 						'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/cheque.png',
-						'payment_method_explanation' =>__('Reservation of product receipt of payment.','wpshop')
+						'payment_method_explanation' =>__('Reservation of product receipt of payment.', 'wpshop')
 				);
 			}
-			if(WPSHOP_PAYMENT_METHOD_CIC || !empty($paymentMethod['cic'])) {
+			if (WPSHOP_PAYMENT_METHOD_CIC || !empty($paymentMethod['cic'])) {
 				$payment_methods['cic'] = array('payment_method_name' =>__('Credit card', 'wpshop'),
 						'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/cic_payment_logo.jpg',
-						'payment_method_explanation' =>__('Reservation of products upon confirmation of payment.','wpshop')
+						'payment_method_explanation' =>__('Reservation of products upon confirmation of payment.', 'wpshop')
 				);
 			}
 			$payment_methods = apply_filters('wpshop_payment_method', $payment_methods);
 
 			$payment_method_table = array();
 
-			if ( !empty( $paymentMethod['display_position'] ) ) {
+			if (!empty($paymentMethod['display_position'])) {
 				$position_determinated = false;
-				foreach ( $paymentMethod['display_position'] as $key => $position) {
-					if ( $position != null) {
+				foreach ($paymentMethod['display_position'] as $key => $position) {
+					if ($position != null) {
 						$position_determinated = true;
 					}
 				}
-				if ( $position_determinated ) {
-					for ( $i = 1; $i < count( $paymentMethod['display_position'] ) + 1; $i++) {
-						foreach ( $paymentMethod['display_position'] as $key => $position ) {
-							if ( $position == $i  && !empty($paymentMethod[$key])) {
+				if ($position_determinated) {
+					for ($i = 1; $i < count($paymentMethod['display_position']) + 1; $i++) {
+						foreach ($paymentMethod['display_position'] as $key => $position) {
+							if ($position == $i && !empty($paymentMethod[$key])) {
 								if ($key == 'checks') {
 									$key = 'check';
 								}
@@ -148,16 +148,16 @@ 
 					$payment_methods = $payment_method_table;
 				}
 			}
-			if (!empty($payment_methods) ) {
+			if (!empty($payment_methods)) {
 
-				foreach( $payment_methods as  $payment_method_identifier =>  $payment_method_def ) {
+				foreach ($payment_methods as  $payment_method_identifier =>  $payment_method_def) {
 					$tpl_component = array();
 					$checked = $active = '';
 					$payment_identifier_for_test = $payment_method_identifier;
 					if ($payment_method_identifier == 'check') {
 						$payment_identifier_for_test = 'checks';
 					}
-					if ( !empty($paymentMethod['default_method']) && $paymentMethod['default_method'] == $payment_identifier_for_test) {
+					if (!empty($paymentMethod['default_method']) && $paymentMethod['default_method'] == $payment_identifier_for_test) {
 						$checked = ' checked="checked"';
 						$active = ' active';
 
@@ -165,11 +165,11 @@ 
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_STATE_CLASS'] = $active;
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_INPUT_STATE'] = $checked;
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_IDENTIFIER'] = $payment_method_identifier;
-					if ( !empty($payment_mode['logo']) && (int)$payment_mode['logo'] != 0 ) {
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? wp_get_attachment_image( $payment_method_def['payment_method_icon'], 'thumbnail', false, array('class' => 'wps_shipping_mode_logo') ) : '';
+					if (!empty($payment_mode['logo']) && (int)$payment_mode['logo'] != 0) {
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_method_def['payment_method_icon'])) ? wp_get_attachment_image($payment_method_def['payment_method_icon'], 'thumbnail', false, array('class' => 'wps_shipping_mode_logo')) : '';
 					}
 					else {
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? '<img src="' .$payment_method_def['payment_method_icon']. '" alt="" />' : '';
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_method_def['payment_method_icon'])) ? '<img src="' . $payment_method_def['payment_method_icon'] . '" alt="" />' : '';
 					}
 					//$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = $payment_method_def['payment_method_icon'];
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = $payment_method_def['payment_method_name'];
@@ -180,32 +180,32 @@ 
 			}
 		}
 
-		return array( $output, $paymentMethod['mode'] );
+		return array($output, $paymentMethod['mode']);
 	}
 
 
-	public static function display_payment_methods_choice_form($order_id=0, $cart_type = 'cart') {
-		$payment_option = get_option( 'wps_payment_mode' );
+	public static function display_payment_methods_choice_form($order_id = 0, $cart_type = 'cart') {
+		$payment_option = get_option('wps_payment_mode');
 		$output = '';
-		if(!empty($order_id) && is_numeric($order_id)) {
-			$output .= '<input type="hidden" name="order_id" value="'.$order_id.'" />';
+		if (!empty($order_id) && is_numeric($order_id)) {
+			$output .= '<input type="hidden" name="order_id" value="' . $order_id . '" />';
 		}
-		if( $cart_type == 'cart' ) {
-			if ( !empty($payment_option) && !empty($payment_option['mode']) ) {
-				foreach( $payment_option['mode'] as $payment_id => $payment_config ) {
-					if( !empty($payment_config['active']) ) {
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_STATE_CLASS'] = ( ( !empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id ) ? ' active' : '');
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_INPUT_STATE'] = ( ( !empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id ) ? 'checked="checked"' : '');
+		if ($cart_type == 'cart') {
+			if (!empty($payment_option) && !empty($payment_option['mode'])) {
+				foreach ($payment_option['mode'] as $payment_id => $payment_config) {
+					if (!empty($payment_config['active'])) {
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_STATE_CLASS'] = ((!empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id) ? ' active' : '');
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_INPUT_STATE'] = ((!empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id) ? 'checked="checked"' : '');
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_IDENTIFIER'] = $payment_id;
 
-						if ( !empty($payment_config['logo']) && (int)$payment_config['logo'] != 0 ) {
-							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? wp_get_attachment_image( $payment_config['logo'], 'thumbnail', false ) : '';
+						if (!empty($payment_config['logo']) && (int)$payment_config['logo'] != 0) {
+							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_config['logo'])) ? wp_get_attachment_image($payment_config['logo'], 'thumbnail', false) : '';
 						}
 						else {
-							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? '<img src="' .$payment_config['logo']. '" alt="' .$payment_config['name']. '" />' : '';
+							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_config['logo'])) ? '<img src="' . $payment_config['logo'] . '" alt="' . $payment_config['name'] . '" />' : '';
 						}
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = ( !empty($payment_config['name']) ) ? $payment_config['name'] : '';
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_EXPLANATION'] = ( !empty($payment_config['description']) ) ? $payment_config['description'] : '';
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = (!empty($payment_config['name'])) ? $payment_config['name'] : '';
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_EXPLANATION'] = (!empty($payment_config['description'])) ? $payment_config['description'] : '';
 						$output .= wpshop_display::display_template_element('wpshop_checkout_page_payment_method_bloc', $tpl_component, array('type' => 'payment_method', 'id' => $payment_id));
 						unset($tpl_component);
 					}
@@ -227,13 +227,13 @@ 
 
 		$wps_message = new wps_message_ctr();
 
-		if(!empty($order) && !empty($order_info) && empty($order['order_invoice_ref'])) {
-			$email = (!empty($order_info['billing']['address']['address_user_email']) ? $order_info['billing']['address']['address_user_email'] : '' );
-			$first_name = ( !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '' );
-			$last_name = ( !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '' );
+		if (!empty($order) && !empty($order_info) && empty($order['order_invoice_ref'])) {
+			$email = (!empty($order_info['billing']['address']['address_user_email']) ? $order_info['billing']['address']['address_user_email'] : '');
+			$first_name = (!empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '');
+			$last_name = (!empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '');
 
 			// Envoie du message de confirmation de paiement au client
-			switch($order['payment_method']) {
+			switch ($order['payment_method']) {
 				case 'check':
 					$wps_message->wpshop_prepared_email($email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order['order_date']));
 				break;
@@ -250,24 +250,24 @@ 
 	}
 
 
-	function setOrderPaymentStatus( $order_id, $payment_status ) {
+	function setOrderPaymentStatus($order_id, $payment_status) {
 		/**	Get order main information	*/
 		$order = get_post_meta($order_id, '_order_postmeta', true);
 		$send_email = false;
 
-		if ( !empty($order) ) {
+		if (!empty($order)) {
 			/**	Change order status to given status	*/
 			$order['order_status'] = strtolower($payment_status);
 			/**	Put order status into a single meta, allowing to use it easily later	*/
 			update_post_meta($order_id, '_wpshop_order_status', $order['order_status']);
 
 			/**	In case the set status is completed, make specific treatment: add the completed date	*/
-			if ( $payment_status == 'completed' ) {
+			if ($payment_status == 'completed') {
 				/**	Read order items list, if not empty and check if each item is set to manage stock or not */
 				if (!empty($order['order_items'])) {
 					foreach ($order['order_items'] as $o) {
-						$product = wpshop_products::get_product_data( $o['item_id'] );
-						if (!empty($product) && !empty($product['manage_stock']) && __($product['manage_stock'], 'wpshop') == __('Yes', 'wpshop') ) {
+						$product = wpshop_products::get_product_data($o['item_id']);
+						if (!empty($product) && !empty($product['manage_stock']) && __($product['manage_stock'], 'wpshop') == __('Yes', 'wpshop')) {
 							wpshop_products::reduce_product_stock_qty($o['item_id'], $o['item_qty']);
 						}
 					}
@@ -281,7 +281,7 @@ 
 			}
 
 			/**	Send email to customer when specific case need it	*/
-			if ( $send_email ) {
+			if ($send_email) {
 				/**	Get information about customer that make the order	*/
 				$order_info = get_post_meta($order_id, '_order_info', true);
 				$mail_tpl_component = array('order_key' => $order['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order['order_date']);
@@ -295,25 +295,25 @@ 
 	/**
 	* Get payment method
 	*/
-	function get_payment_method($post_id){
-		$pm = __('Nc','wpshop');
+	function get_payment_method($post_id) {
+		$pm = __('Nc', 'wpshop');
 		$order_postmeta = get_post_meta($post_id, '_order_postmeta', true);
-		if ( !empty($order_postmeta['payment_method']) ) {
-			switch($order_postmeta['payment_method']){
+		if (!empty($order_postmeta['payment_method'])) {
+			switch ($order_postmeta['payment_method']) {
 				case 'check':
-					$pm = __('Check','wpshop');
+					$pm = __('Check', 'wpshop');
 				break;
 				case 'paypal':
-					$pm = __('Paypal','wpshop');
+					$pm = __('Paypal', 'wpshop');
 				break;
 				case 'banktransfer':
-					$pm = __('Bank transfer','wpshop');
+					$pm = __('Bank transfer', 'wpshop');
 				break;
 				case 'cic':
-					$pm = __('Credit card','wpshop');
+					$pm = __('Credit card', 'wpshop');
 				break;
 				default:
-					$pm = __('Nc','wpshop');
+					$pm = __('Nc', 'wpshop');
 				break;
 			}
 		}
@@ -333,38 +333,38 @@ 
 
 		$paymentMethod = $paymentMethod['mode'];
 		$payment_validation .= '
-<div id="order_payment_method_'.$post_id.'" class="wpshop_cls wpshopHide" >
-	<input type="hidden" id="used_method_payment_'.$post_id.'" value="' . (!empty($order_postmeta['payment_method']) ? $order_postmeta['payment_method'] : 'no_method') . '"/>
-	<input type="hidden" id="used_method_payment_transaction_id_'.$post_id.'" value="' . (!empty($transaction_indentifier) ? $transaction_indentifier : 0) . '"/>';
+<div id="order_payment_method_'.$post_id . '" class="wpshop_cls wpshopHide" >
+	<input type="hidden" id="used_method_payment_'.$post_id . '" value="' . (!empty($order_postmeta['payment_method']) ? $order_postmeta['payment_method'] : 'no_method') . '"/>
+	<input type="hidden" id="used_method_payment_transaction_id_'.$post_id . '" value="' . (!empty($transaction_indentifier) ? $transaction_indentifier : 0) . '"/>';
 
-		if(!empty($order_postmeta['payment_method'])){
+		if (!empty($order_postmeta['payment_method'])) {
 			$payment_validation .= sprintf(__('Selected payment method: %s', 'wpshop'), __($order_postmeta['payment_method'], 'wpshop')) . '<br/>';
 		}
 
-		if(!empty($paymentMethod['paypal']) && empty($order_postmeta['payment_method'])) {
+		if (!empty($paymentMethod['paypal']) && empty($order_postmeta['payment_method'])) {
 			$payment_validation .= '<input type="radio" class="payment_method" name="payment_method" value="paypal" id="payment_method_paypal" /><label for="payment_method_paypal" >' . __('Paypal', 'wpshop') . '</label><br/>';
 			$display_button = true;
 		}
 
-		if(!empty($paymentMethod['checks']) && empty($order_postmeta['payment_method'])) {
+		if (!empty($paymentMethod['checks']) && empty($order_postmeta['payment_method'])) {
 			$payment_validation .= '<input type="radio" class="payment_method" name="payment_method" value="check" id="payment_method_check" /><label for="payment_method_check" >' . __('Check', 'wpshop') . '</label><br/>';
 			$display_button = true;
 		}
 
-		$wpshop_paymentMethod = get_option( 'wps_payment_mode' );
-		if((WPSHOP_PAYMENT_METHOD_CIC || (!empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic'])) ) && empty($order_postmeta['payment_method'])) {
+		$wpshop_paymentMethod = get_option('wps_payment_mode');
+		if ((WPSHOP_PAYMENT_METHOD_CIC || (!empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']))) && empty($order_postmeta['payment_method'])) {
 			$payment_validation .= '<input type="radio" class="payment_method" name="payment_method" value="cb" id="payment_method_cb" /><label for="payment_method_cb" >' . __('Credit card', 'wpshop') . '</label><br/>';
 			$display_button = true;
 		}
 
-		if(empty($payment_transaction)){
-			$payment_validation .= '<hr/>' . __('Transaction number', 'wpshop') . '&nbsp;:&nbsp;<input type="text" value="" name="payment_method_transaction_number" id="payment_method_transaction_number_'.$post_id.'" />';
+		if (empty($payment_transaction)) {
+			$payment_validation .= '<hr/>' . __('Transaction number', 'wpshop') . '&nbsp;:&nbsp;<input type="text" value="" name="payment_method_transaction_number" id="payment_method_transaction_number_' . $post_id . '" />';
 			$display_button = true;
 		}
 
-		if($display_button){
+		if ($display_button) {
 			$payment_validation .= '
-		<br/><br/><a class="button payment_method_validate order_'.$post_id.' wpshop_clear" >'.__('Validate payment method', 'wpshop').'</a>';
+		<br/><br/><a class="button payment_method_validate order_'.$post_id . ' wpshop_clear" >' . __('Validate payment method', 'wpshop') . '</a>';
 		}
 
 		$payment_validation .= '
@@ -379,21 +379,21 @@ 
 	 * @param float $current_order_total The current order total to pay before partial amount calcul
 	 * @return array The amount to pay / A html output with amount to pay and different information
 	 */
-	function partial_payment_calcul( $current_order_total, $for = 'for_all' ) {
+	function partial_payment_calcul($current_order_total, $for = 'for_all') {
 		$output = '';
 		$tpl_component = array();
 
 		/**	Get current configuration	*/
 		$partial_payment_configuration = get_option('wpshop_payment_partial', array($for => array(), 'for_quotation' => array()));
-		if ( !empty($partial_payment_configuration[$for]) && (!empty($partial_payment_configuration[$for]['activate'])) && ($partial_payment_configuration[$for]['activate'] == 'on') ) {
+		if (!empty($partial_payment_configuration[$for]) && (!empty($partial_payment_configuration[$for]['activate'])) && ($partial_payment_configuration[$for]['activate'] == 'on')) {
 			$amount_of_partial_payment = 0;
-			if ( !empty($partial_payment_configuration[$for]['value']) && !empty($partial_payment_configuration[$for]['activate']) ) {
+			if (!empty($partial_payment_configuration[$for]['value']) && !empty($partial_payment_configuration[$for]['activate'])) {
 				$amount_of_partial_payment = $partial_payment_configuration[$for]['value'];
 			}
 
 			$partial_amount_to_pay = 0;
 			$type_of_partial_payment = null;
-			if (!empty($partial_payment_configuration[$for]) && !empty($partial_payment_configuration[$for]['type']) ) {
+			if (!empty($partial_payment_configuration[$for]) && !empty($partial_payment_configuration[$for]['type'])) {
 				switch ($partial_payment_configuration[$for]['type']) {
 					case 'percentage':
 						$type_of_partial_payment = '%';
@@ -453,7 +453,7 @@ 
 	function set_payment_transaction_number($order_id, $transaction_number) {
 		$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 
-		if ( !empty($order_postmeta['order_payment']['received']) ) {
+		if (!empty($order_postmeta['order_payment']['received'])) {
 			if (count($order_postmeta['order_payment']['received']) == 1) {
 				$order_postmeta['order_payment']['received'][0]['payment_reference'] = $transaction_number;
 			}
@@ -467,10 +467,10 @@ 
 	 *
 	 * @param integer $order_id
 	 */
-	function save_payment_return_data( $order_id ) {
+	function save_payment_return_data($order_id) {
 		$data = wpshop_tools::getMethode();
 
-		$current_payment_return = get_post_meta( $order_id, '_wpshop_payment_return_data', true);
+		$current_payment_return = get_post_meta($order_id, '_wpshop_payment_return_data', true);
 		$current_payment_return[] = $data;
 
 		update_post_meta($order_id, '_wpshop_payment_return_data', $current_payment_return);
@@ -484,23 +484,23 @@ 
 	 * @param array $params : infos sended by the bank, array structure : ('method', 'waited amount', 'status', 'author', 'payment reference', 'date', 'received amount')
 	 * @return array The order new meta informations
 	 */
-	public static function add_new_payment_to_order( $order_id, $order_meta, $payment_index, $params, $bank_response ) {
-
-		$order_meta['order_payment']['received'][$payment_index]['method'] = ( !empty($params['method']) ) ? $params['method'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['waited_amount'] = ( !empty($params['waited_amount']) ) ? $params['waited_amount'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['status'] = ( !empty($params['status']) ) ? $params['status'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['author'] = ( !empty($params['author']) ) ? $params['author'] : get_current_user_id();
-		$order_meta['order_payment']['received'][$payment_index]['payment_reference'] =( !empty($params['payment_reference']) ) ? $params['payment_reference'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['date'] = ( !empty($params['date']) ) ? $params['date'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['received_amount'] = ( !empty($params['received_amount']) ) ? $params['received_amount'] : null;
+	public static function add_new_payment_to_order($order_id, $order_meta, $payment_index, $params, $bank_response) {
+
+		$order_meta['order_payment']['received'][$payment_index]['method'] = (!empty($params['method'])) ? $params['method'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['waited_amount'] = (!empty($params['waited_amount'])) ? $params['waited_amount'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['status'] = (!empty($params['status'])) ? $params['status'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['author'] = (!empty($params['author'])) ? $params['author'] : get_current_user_id();
+		$order_meta['order_payment']['received'][$payment_index]['payment_reference'] = (!empty($params['payment_reference'])) ? $params['payment_reference'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['date'] = (!empty($params['date'])) ? $params['date'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['received_amount'] = (!empty($params['received_amount'])) ? $params['received_amount'] : null;
 		$order_meta['order_payment']['received'][$payment_index]['comment'] = '';
 
 		$order_info = get_post_meta($order_id, '_order_info', true);
-		if(!empty($order_meta) && !empty($order_info) && ($bank_response == 'completed')) {
+		if (!empty($order_meta) && !empty($order_info) && ($bank_response == 'completed')) {
 
 			/**	Generate an invoice number for the current payment. Check if the payment is complete or not	*/
-			if ( empty($order_meta['order_invoice_ref']) ) {
-				$order_meta['order_payment']['received'][$payment_index]['invoice_ref'] = wpshop_modules_billing::generate_invoice_number( $order_id );
+			if (empty($order_meta['order_invoice_ref'])) {
+				$order_meta['order_payment']['received'][$payment_index]['invoice_ref'] = wpshop_modules_billing::generate_invoice_number($order_id);
 			}
 		}
 
@@ -513,13 +513,13 @@ 
 	 * @param string $payment_method
 	 * @return integer $key : array id of [order_payment][received] in the order postmeta
 	 */
-	public static function get_order_waiting_payment_array_id ( $oid, $payment_method ) {
+	public static function get_order_waiting_payment_array_id($oid, $payment_method) {
 		$key = 0;
-		$order_meta = get_post_meta( $oid, '_order_postmeta', true);
-		if ( !empty($order_meta) ) {
-			$key = count( $order_meta['order_payment']['received'] );
-			foreach ( $order_meta['order_payment']['received'] as $k => $payment_test) {
-				if ( !array_key_exists('received_amount', $payment_test) /* && $order_meta['order_payment']['received'][$k]['method'] == $payment_method */ ) {
+		$order_meta = get_post_meta($oid, '_order_postmeta', true);
+		if (!empty($order_meta)) {
+			$key = count($order_meta['order_payment']['received']);
+			foreach ($order_meta['order_payment']['received'] as $k => $payment_test) {
+				if (!array_key_exists('received_amount', $payment_test) /* && $order_meta['order_payment']['received'][$k]['method'] == $payment_method */) {
 					$key = $k;
 				}
 			}
@@ -534,52 +534,52 @@ 
 	 * @param array $params_array
 	 * @return string
 	 */
-	public static function check_order_payment_total_amount($order_id, $params_array, $bank_response, $order_meta = array(), $save_metadata = true ) {
+	public static function check_order_payment_total_amount($order_id, $params_array, $bank_response, $order_meta = array(), $save_metadata = true) {
 		global $wpshop_payment; global $wpdb;
-		$order_meta = ( !empty($order_meta) ) ? $order_meta : get_post_meta( $order_id, '_order_postmeta', true);
+		$order_meta = (!empty($order_meta)) ? $order_meta : get_post_meta($order_id, '_order_postmeta', true);
 
 		$wps_message = new wps_message_ctr();
-		if ( !empty($order_meta) ) {
+		if (!empty($order_meta)) {
 			$order_info = get_post_meta($order_id, '_order_info', true);
-			$user_data = get_userdata( $order_meta['customer_id'] );
-			$email = ( !empty($user_data) && !empty($user_data->user_email) ) ? $user_data->user_email : '';
+			$user_data = get_userdata($order_meta['customer_id']);
+			$email = (!empty($user_data) && !empty($user_data->user_email)) ? $user_data->user_email : '';
 // 			$email = ( !empty($order_info) &&  !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_user_email']) ) ? $order_info['billing']['address']['address_user_email'] : '' ;
-			$first_name = (!empty($order_info) && !empty($order_info['billing']) &&  !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '' );
-			$last_name = ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '' );
+			$first_name = (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '');
+			$last_name = (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '');
 
-			$key = self::get_order_waiting_payment_array_id( $order_id, $params_array['method']);
+			$key = self::get_order_waiting_payment_array_id($order_id, $params_array['method']);
 			$order_grand_total = $order_meta['order_grand_total'];
-			$total_received = ( ( !empty($params_array['status']) && ( $params_array['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($params_array['received_amount']) ) ? $params_array['received_amount'] : 0 );
-			foreach ( $order_meta['order_payment']['received'] as $received ) {
-				$total_received += ( ( !empty($received['status']) && ( $received['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($received['received_amount']) ) ? $received['received_amount'] : 0 );
+			$total_received = ((!empty($params_array['status']) && ($params_array['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($params_array['received_amount'])) ? $params_array['received_amount'] : 0);
+			foreach ($order_meta['order_payment']['received'] as $received) {
+				$total_received += ((!empty($received['status']) && ($received['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($received['received_amount'])) ? $received['received_amount'] : 0);
 			}
 			$order_meta['order_amount_to_pay_now'] = $order_grand_total - $total_received;
-			$order_meta['order_payment']['received'][$key] = self::add_new_payment_to_order( $order_id, $order_meta, $key, $params_array, $bank_response );
+			$order_meta['order_payment']['received'][$key] = self::add_new_payment_to_order($order_id, $order_meta, $key, $params_array, $bank_response);
 
 			if ($bank_response == 'completed') {
 
-				if ( number_format((float)$total_received, 2, '.', '') >= number_format((float)$order_grand_total,2, '.', '') ) {
+				if (number_format((float)$total_received, 2, '.', '') >= number_format((float)$order_grand_total, 2, '.', '')) {
 					$payment_status = 'completed';
 
-					$order_meta['order_invoice_ref'] = ( empty ($order_meta['order_invoice_ref'] ) && !empty($order_meta['order_payment']['received'][$key]) && !empty($order_meta['order_payment']['received'][$key]['invoice_ref']) ) ? $order_meta['order_payment']['received'][$key]['invoice_ref'] : ( empty($order_meta['order_invoice_ref']) ? null : $order_meta['order_invoice_ref'] ) ;
+					$order_meta['order_invoice_ref'] = (empty ($order_meta['order_invoice_ref']) && !empty($order_meta['order_payment']['received'][$key]) && !empty($order_meta['order_payment']['received'][$key]['invoice_ref'])) ? $order_meta['order_payment']['received'][$key]['invoice_ref'] : (empty($order_meta['order_invoice_ref']) ? null : $order_meta['order_invoice_ref']);
 					$order_meta['order_invoice_date'] = current_time('mysql', 0);
 
 					if (!empty($order_meta['order_items'])) {
 						foreach ($order_meta['order_items'] as $item_id => $o) {
 							$pid = $o['item_id'];
-							if (strpos($item_id,'__') !== false) {
-								$product_data_id = explode( '__', $item_id );
-								$pid = ( !empty($product_data_id) && !empty($product_data_id[1]) ) ? $product_data_id[1] : $pid;
+							if (strpos($item_id, '__') !== false) {
+								$product_data_id = explode('__', $item_id);
+								$pid = (!empty($product_data_id) && !empty($product_data_id[1])) ? $product_data_id[1] : $pid;
 							}
-							$product = wpshop_products::get_product_data( $pid );
-							if ( get_post_type( $pid ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-								$parent_def = wpshop_products::get_parent_variation ( $pid );
+							$product = wpshop_products::get_product_data($pid);
+							if (get_post_type($pid) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+								$parent_def = wpshop_products::get_parent_variation($pid);
 								$parent_post = $parent_def['parent_post'];
-								$product = wpshop_products::get_product_data( $parent_post->ID );
+								$product = wpshop_products::get_product_data($parent_post->ID);
 							}
 
-							if (!empty($product) && !empty($product['manage_stock']) && strtolower( __($product['manage_stock'], 'wpshop') ) == strtolower( __('Yes', 'wpshop') ) ) {
-								wpshop_products::reduce_product_stock_qty($product['product_id'], $o['item_qty'], $pid );
+							if (!empty($product) && !empty($product['manage_stock']) && strtolower(__($product['manage_stock'], 'wpshop')) == strtolower(__('Yes', 'wpshop'))) {
+								wpshop_products::reduce_product_stock_qty($product['product_id'], $o['item_qty'], $pid);
 							}
 						}
 					}
@@ -588,15 +588,15 @@ 
 					update_post_meta($order_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '_completed_date', current_time('mysql', 0));
 
 					// Send confirmation e-mail to administrator
-					if ( empty($_SESSION['wps-pos-addon']) ) {
+					if (empty($_SESSION['wps-pos-addon'])) {
 						$email_option = get_option('wpshop_emails');
-						if(  !empty($email_option) && !empty($email_option['send_confirmation_order_message']) ){
-							wpshop_checkout::send_order_email_to_administrator( $order_id, $user_data );
+						if (!empty($email_option) && !empty($email_option['send_confirmation_order_message'])) {
+							wpshop_checkout::send_order_email_to_administrator($order_id, $user_data);
 						}
 					}
 
 					// POS Status
-					if( !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['shipping_method']) && $order_meta['order_payment']['shipping_method'] == 'default_shipping_mode_for_pos' ) {
+					if (!empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['shipping_method']) && $order_meta['order_payment']['shipping_method'] == 'default_shipping_mode_for_pos') {
 						$payment_status = 'pos';
 					}
 				}
@@ -605,27 +605,27 @@ 
 				}
 
 				$order_meta['order_status'] = $payment_status;
-				update_post_meta( $order_id, '_order_postmeta', $order_meta);
+				update_post_meta($order_id, '_order_postmeta', $order_meta);
 				$save_metadata = false;
 
-				$allow_send_invoice = get_option( 'wpshop_send_invoice' );
-				$invoice_attachment_file = ( !empty($allow_send_invoice) ) ? wpshop_modules_billing::generate_invoice_for_email( $order_id, empty( $order_meta['order_payment']['received'][$key]['invoice_ref'] ) ? $order_meta['order_invoice_ref'] : $order_meta['order_payment']['received'][$key]['invoice_ref'] ) : '';
+				$allow_send_invoice = get_option('wpshop_send_invoice');
+				$invoice_attachment_file = (!empty($allow_send_invoice)) ? wpshop_modules_billing::generate_invoice_for_email($order_id, empty($order_meta['order_payment']['received'][$key]['invoice_ref']) ? $order_meta['order_invoice_ref'] : $order_meta['order_payment']['received'][$key]['invoice_ref']) : '';
 
-				$email_option = get_option( 'wpshop_emails' );
+				$email_option = get_option('wpshop_emails');
 
-				$shipping_mode_option = get_option( 'wps_shipping_mode' );
-				$shipping_method = ( !empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ( (!empty($order_meta['order_payment']['shipping_method']) ) ? $order_meta['order_payment']['shipping_method'] : '' );
+				$shipping_mode_option = get_option('wps_shipping_mode');
+				$shipping_method = (!empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ((!empty($order_meta['order_payment']['shipping_method'])) ? $order_meta['order_payment']['shipping_method'] : '');
 
-				$payment_method_option = get_option( 'wps_payment_mode' );
-				$order_payment_method = ( !empty($payment_method_option) && !empty($payment_method_option['mode'])  && !empty($order_meta['order_payment']['customer_choice']['method'])  && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])  ) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
+				$payment_method_option = get_option('wps_payment_mode');
+				$order_payment_method = (!empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_meta['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
 
-				if ( !empty( $email_option ) && !empty( $email_option['send_confirmation_order_message'] ) && $payment_status == 'completed'
-						&& ( !isset( $params_array[ 'send_received_payment_email' ] ) || ( true == $params_array[ 'send_received_payment_email' ] ) ) ) {
-					$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ( ( !empty($order_meta['order_key']) ) ? $order_meta['order_key'] : ''),'order_date' => current_time('mysql', 0),  'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '',  'order_shipping_method' => $shipping_method ) );
+				if (!empty($email_option) && !empty($email_option['send_confirmation_order_message']) && $payment_status == 'completed'
+						&& (!isset($params_array['send_received_payment_email']) || (true == $params_array['send_received_payment_email']))) {
+					$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ((!empty($order_meta['order_key'])) ? $order_meta['order_key'] : ''), 'order_date' => current_time('mysql', 0), 'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method));
 				}
 
-				if ( !isset( $params_array[ 'send_received_payment_email' ] ) || ( true == $params_array[ 'send_received_payment_email' ] ) ) {
-					$wps_message->wpshop_prepared_email( $email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'order_shipping_method' => $shipping_method), array(), $invoice_attachment_file);
+				if (!isset($params_array['send_received_payment_email']) || (true == $params_array['send_received_payment_email'])) {
+					$wps_message->wpshop_prepared_email($email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'order_shipping_method' => $shipping_method), array(), $invoice_attachment_file);
 				}
 			}
 			else {
@@ -634,15 +634,15 @@ 
 
 			$order_meta['order_status'] = $payment_status;
 
-			if( !$save_metadata ) {
+			if (!$save_metadata) {
 				return 	$order_meta;
 			}
 			else {
-				update_post_meta( $order_id, '_order_postmeta', $order_meta);
+				update_post_meta($order_id, '_order_postmeta', $order_meta);
 			}
-			update_post_meta( $order_id, '_wpshop_order_status', $payment_status);
+			update_post_meta($order_id, '_wpshop_order_status', $payment_status);
 		}
-		do_action( 'wps_after_check_order_payment_total_amount', $order_id );
+		do_action('wps_after_check_order_payment_total_amount', $order_id);
 	}
 
 	/**
@@ -653,11 +653,11 @@ 
 	 * @param integer $order_id The order identifier we want to get the old transaction reference for
 	 * @return integer
 	 */
-	public static function get_payment_transaction_number_old_way($order_id){
+	public static function get_payment_transaction_number_old_way($order_id) {
 		$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 		$transaction_indentifier = 0;
-		if(!empty($order_postmeta['payment_method'])){
-			switch($order_postmeta['payment_method']){
+		if (!empty($order_postmeta['payment_method'])) {
+			switch ($order_postmeta['payment_method']) {
 				case 'check':
 					$transaction_indentifier = get_post_meta($order_id, '_order_check_number', true);
 					break;
@@ -676,26 +676,26 @@ 
 		return $transaction_indentifier;
 	}
 
-	public static function reverify_payment_invoice_ref( $order_id, $index_payment ) {
+	public static function reverify_payment_invoice_ref($order_id, $index_payment) {
 		$status = false;
-		$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
-		if( !empty( $order_meta ) && !empty( $order_meta['order_payment'] ) && !empty( $order_meta['order_payment']['received'] ) && !empty( $order_meta['order_payment']['received'][$index_payment] ) && empty( $order_meta['order_payment']['received'][$index_payment]['invoice_ref'] ) ) {
+		$order_meta = get_post_meta($order_id, '_order_postmeta', true);
+		if (!empty($order_meta) && !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['received']) && !empty($order_meta['order_payment']['received'][$index_payment]) && empty($order_meta['order_payment']['received'][$index_payment]['invoice_ref'])) {
 			$order_invoice = $invoice_ref = false;
 
-			end( $order_meta['order_payment']['received'] );
-			$last_payment = key( $order_meta['order_payment']['received'] );
-			if( $last_payment == $index_payment ) {
+			end($order_meta['order_payment']['received']);
+			$last_payment = key($order_meta['order_payment']['received']);
+			if ($last_payment == $index_payment) {
 				$payments = 0;
-				foreach( $order_meta['order_payment']['received'] as $payment ) {
-					$payments += ( $payment['status'] == 'payment_received' ) ? $payment['received_amount'] : 0;
+				foreach ($order_meta['order_payment']['received'] as $payment) {
+					$payments += ($payment['status'] == 'payment_received') ? $payment['received_amount'] : 0;
 				}
-				if( $order_meta['order_grand_total'] <= $payments ) {
-					if( $order_meta['order_status'] == 'partially_paid' ) {
-						$order_status_meta = get_post_meta( $order_id, '_wpshop_order_status', true );
+				if ($order_meta['order_grand_total'] <= $payments) {
+					if ($order_meta['order_status'] == 'partially_paid') {
+						$order_status_meta = get_post_meta($order_id, '_wpshop_order_status', true);
 						$order_meta['order_status'] = 'completed';
-						$status = (bool)update_post_meta( $order_id, '_wpshop_order_status', 'completed' );
+						$status = (bool)update_post_meta($order_id, '_wpshop_order_status', 'completed');
 					}
-					if( !empty( $order_meta['order_invoice_ref'] ) ) {
+					if (!empty($order_meta['order_invoice_ref'])) {
 						$invoice_ref = $order_meta['order_invoice_ref'];
 						$status = true;
 					} else {
@@ -706,16 +706,16 @@ 
 				$status = true;
 			}
 
-			if( $status ) {
-				if( empty( $invoice_ref ) ) {
-					$invoice_ref = wpshop_modules_billing::generate_invoice_number( $order_id );
-					if( $order_invoice ) {
+			if ($status) {
+				if (empty($invoice_ref)) {
+					$invoice_ref = wpshop_modules_billing::generate_invoice_number($order_id);
+					if ($order_invoice) {
 						$order_meta['order_invoice_ref'] = $invoice_ref;
 					}
 				}
 
 				$order_meta['order_payment']['received'][$index_payment]['invoice_ref'] = $invoice_ref;
-				$status = (bool)update_post_meta( $order_id, '_order_postmeta', $order_meta );
+				$status = (bool)update_post_meta($order_id, '_order_postmeta', $order_meta);
 			}
 		}
 		return $status;

Braces +13 added lines, -14 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -40,9 +42,11 @@ 
 
 	public static function construct_url_parameters($url, $param, $value) {
 		$interoguation_marker_pos = strpos($url, '?');
-		if($interoguation_marker_pos===false)
-			return $url.'?'.$param.'='.$value;
-		else return $url.'&'.$param.'='.$value;
+		if($interoguation_marker_pos===false) {
+					return $url.'?'.$param.'='.$value;
+		} else {
+			return $url.'&'.$param.'='.$value;
+		}
 	}
 
 	/**
@@ -167,8 +171,7 @@ 
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_IDENTIFIER'] = $payment_method_identifier;
 					if ( !empty($payment_mode['logo']) && (int)$payment_mode['logo'] != 0 ) {
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? wp_get_attachment_image( $payment_method_def['payment_method_icon'], 'thumbnail', false, array('class' => 'wps_shipping_mode_logo') ) : '';
-					}
-					else {
+					} else {
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? '<img src="' .$payment_method_def['payment_method_icon']. '" alt="" />' : '';
 					}
 					//$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = $payment_method_def['payment_method_icon'];
@@ -200,8 +203,7 @@ 
 
 						if ( !empty($payment_config['logo']) && (int)$payment_config['logo'] != 0 ) {
 							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? wp_get_attachment_image( $payment_config['logo'], 'thumbnail', false ) : '';
-						}
-						else {
+						} else {
 							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? '<img src="' .$payment_config['logo']. '" alt="' .$payment_config['name']. '" />' : '';
 						}
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = ( !empty($payment_config['name']) ) ? $payment_config['name'] : '';
@@ -599,8 +601,7 @@ 
 					if( !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['shipping_method']) && $order_meta['order_payment']['shipping_method'] == 'default_shipping_mode_for_pos' ) {
 						$payment_status = 'pos';
 					}
-				}
-				else {
+				} else {
 					$payment_status = 'partially_paid';
 				}
 
@@ -627,8 +628,7 @@ 
 				if ( !isset( $params_array[ 'send_received_payment_email' ] ) || ( true == $params_array[ 'send_received_payment_email' ] ) ) {
 					$wps_message->wpshop_prepared_email( $email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'order_shipping_method' => $shipping_method), array(), $invoice_attachment_file);
 				}
-			}
-			else {
+			} else {
 				$payment_status = $bank_response;
 			}
 
@@ -636,8 +636,7 @@ 
 
 			if( !$save_metadata ) {
 				return 	$order_meta;
-			}
-			else {
+			} else {
 				update_post_meta( $order_id, '_order_postmeta', $order_meta);
 			}
 			update_post_meta( $order_id, '_wpshop_order_status', $payment_status);

includes/modules/wps_customer/templates/common/account/account-form.php

Spacing +21 added lines, -21 removed lines

@@ -9,41 +9,41 @@ 
  * @version 1.4.4.3
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 ?>
-<?php if ( ! empty( $signup_form_section ) ) : ?>
-	<?php foreach ( $signup_form_section as $signup_section_name => $signup_fields ) : ?>
-	<span class="wps-h4"><?php echo esc_html( $signup_section_name, 'wpshop' ); ?></span>
+<?php if (!empty($signup_form_section)) : ?>
+	<?php foreach ($signup_form_section as $signup_section_name => $signup_fields) : ?>
+	<span class="wps-h4"><?php echo esc_html($signup_section_name, 'wpshop'); ?></span>
 	<div class="customer-account-detail-group" >
-	<?php foreach ( $signup_fields as $signup_field ) : ?>
+	<?php foreach ($signup_fields as $signup_field) : ?>
 		<?php
-		if ( isset( $signup_field->code ) && ( 'is_provider' === $signup_field->code ) ) :
+		if (isset($signup_field->code) && ('is_provider' === $signup_field->code)) :
 				continue;
 		endif;
-		$query = $wpdb->prepare( 'SELECT value  FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.strtolower($signup_field->data_type). ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d ', $customer_entity_type_id, $signup_field->id, $cid );
-		$value = $wpdb->get_var( $query );
-		$attribute_output_def = wpshop_attributes::get_attribute_field_definition( $signup_field, $value, array( 'from' => 'frontend', array( 'options' => array( 'original' => true, ), ) ) );
+		$query = $wpdb->prepare('SELECT value  FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . strtolower($signup_field->data_type) . ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d ', $customer_entity_type_id, $signup_field->id, $cid);
+		$value = $wpdb->get_var($query);
+		$attribute_output_def = wpshop_attributes::get_attribute_field_definition($signup_field, $value, array('from' => 'frontend', array('options' => array('original' => true,),)));
 		?>
 		<div class="wps-form-group">
-			<label for="<?php echo esc_attr( $signup_field->code ); ?>"><?php  _e( stripslashes($signup_field->frontend_label), 'wpshop'); ?> <?php echo ( ( !empty($attribute_output_def['required']) && $attribute_output_def['required'] == 'yes' ) ? '<em>*</em>' : '' ); ?></label>
-			<div id="<?php echo esc_attr( $signup_field->code ); ?>" class="wps-form"><?php
-				echo ( $attribute_output_def['output'] ); // WPCS: XSS ok.
-				echo ( $attribute_output_def['options'] ); // WPCS: XSS ok.
+			<label for="<?php echo esc_attr($signup_field->code); ?>"><?php  _e(stripslashes($signup_field->frontend_label), 'wpshop'); ?> <?php echo ((!empty($attribute_output_def['required']) && $attribute_output_def['required'] == 'yes') ? '<em>*</em>' : ''); ?></label>
+			<div id="<?php echo esc_attr($signup_field->code); ?>" class="wps-form"><?php
+				echo ($attribute_output_def['output']); // WPCS: XSS ok.
+				echo ($attribute_output_def['options']); // WPCS: XSS ok.
 			?></div>
 		</div>
 		<?php
 		/** Check confirmation field **/
-		if ( 'yes' === $signup_field->_need_verification  ) :
+		if ('yes' === $signup_field->_need_verification) :
 			$signup_field->code = $signup_field->code . '2';
-			$attribute_output_def = wpshop_attributes::get_attribute_field_definition( $signup_field, $value, array( 'from' => 'frontend' ) );
+			$attribute_output_def = wpshop_attributes::get_attribute_field_definition($signup_field, $value, array('from' => 'frontend'));
 		?>
 		<div class="wps-form-group">
-			<label for="<?php echo esc_attr( $signup_field->code ); ?>"><?php printf( __('Confirm %s', 'wpshop'), stripslashes( strtolower(__( $signup_field->frontend_label, 'wpshop')) ) ); ?> <?php echo ( ( !empty($attribute_output_def['required']) && $attribute_output_def['required'] == 'yes' ) ? '<em>*</em>' : '' ); ?></label>
-			<div id="<?php echo esc_attr( $signup_field->code ); ?>" class="wps-form"><?php
-				echo ( $attribute_output_def['output'] );
-				echo ( $attribute_output_def['options'] );
+			<label for="<?php echo esc_attr($signup_field->code); ?>"><?php printf(__('Confirm %s', 'wpshop'), stripslashes(strtolower(__($signup_field->frontend_label, 'wpshop')))); ?> <?php echo ((!empty($attribute_output_def['required']) && $attribute_output_def['required'] == 'yes') ? '<em>*</em>' : ''); ?></label>
+			<div id="<?php echo esc_attr($signup_field->code); ?>" class="wps-form"><?php
+				echo ($attribute_output_def['output']);
+				echo ($attribute_output_def['options']);
 			?></div>
 		</div>
 		<?php endif; ?>
@@ -53,9 +53,9 @@ 
 <?php endif;
 $content = '';
 ob_start();
-do_action( 'signup_extra_fields' );
+do_action('signup_extra_fields');
 $content = ob_get_clean();
-if ( ! empty( $content ) ) {
+if (!empty($content)) {
 	?>
 	<div class="wps-form-group">
 		<?php echo $content; ?>

includes/modules/wps_customer/controller/wps_customer_ctr.php

Spacing +154 added lines, -154 removed lines

@@ -6,7 +6,7 @@ 
  * @subpackage Customer
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -29,32 +29,32 @@ 
 	 */
 	public function __construct() {
 		/** Create customer entity type on wordpress initilisation */
-		add_action( 'init', array( $this, 'create_customer_entity' ) );
+		add_action('init', array($this, 'create_customer_entity'));
 
 		// Redirection vers la page d'édition d'un utilisateur après sa création.
-		add_filter( 'wp_redirect', array( $this, 'wp_redirect_after_user_new' ), 1 );
+		add_filter('wp_redirect', array($this, 'wp_redirect_after_user_new'), 1);
 
-		add_filter( 'wp_redirect', array( $this, 'wp_redirect_after_user_new' ), 1 );
+		add_filter('wp_redirect', array($this, 'wp_redirect_after_user_new'), 1);
 
 		/** When a wordpress user is created, create a customer (post type) */
-		add_action( 'user_register', array( $this, 'create_entity_customer_when_user_is_created' ) );
-		add_action( 'edit_user_profile_update', array( $this, 'update_entity_customer_when_profile_user_is_update' ) );
+		add_action('user_register', array($this, 'create_entity_customer_when_user_is_created'));
+		add_action('edit_user_profile_update', array($this, 'update_entity_customer_when_profile_user_is_update'));
 
 		/** Add filters for customer list */
-		add_filter( 'bulk_actions-edit-' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, array( $this, 'customer_list_table_bulk_actions' ) );
-		add_filter( 'manage_edit-' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . '_columns', array( $this, 'list_table_header' ) );
-		add_action( 'manage_' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . '_posts_custom_column', array( $this, 'list_table_column_content' ), 10, 2 );
-		add_action( 'restrict_manage_posts', array( &$this, 'list_table_filters' ) );
-		add_filter( 'parse_query', array( &$this, 'list_table_filter_parse_query' ) );
+		add_filter('bulk_actions-edit-' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, array($this, 'customer_list_table_bulk_actions'));
+		add_filter('manage_edit-' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . '_columns', array($this, 'list_table_header'));
+		add_action('manage_' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . '_posts_custom_column', array($this, 'list_table_column_content'), 10, 2);
+		add_action('restrict_manage_posts', array(&$this, 'list_table_filters'));
+		add_filter('parse_query', array(&$this, 'list_table_filter_parse_query'));
 
 		/** Filter search for customers */
 		//add_filter( 'pre_get_posts', array( $this, 'customer_search' ) );
 
 		/** Customer options for the shop */
-		add_action( 'wsphop_options', array( &$this, 'declare_options' ), 8 );
-		add_action( 'wp_ajax_wps_customer_search', array( $this, 'ajax_search_customer' ) );
+		add_action('wsphop_options', array(&$this, 'declare_options'), 8);
+		add_action('wp_ajax_wps_customer_search', array($this, 'ajax_search_customer'));
 
-		add_action( 'wp_login', array( $this, 'hook_login_for_setting_customer_id' ), 10, 2 );
+		add_action('wp_login', array($this, 'hook_login_for_setting_customer_id'), 10, 2);
 	}
 
 	/**
@@ -66,13 +66,13 @@ 
 	 *
 	 * @return string L'affichage de la lsite déroulanet contenant les clients de la boutique / THe select list of customers
 	 */
-	public static function customer_select( $selected_user = 0, $multiple = false, $disabled = false ) {
+	public static function customer_select($selected_user = 0, $multiple = false, $disabled = false) {
 		$content_output = '';
 
 		$wps_customer_mdl = new wps_customer_mdl();
 		$customers = $wps_customer_mdl->get_customer_list( -1 );
 
-		require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, 'common', 'customer', 'select' ) );
+		require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_TPL, 'common', 'customer', 'select'));
 
 		return $content_output;
 	}
@@ -83,26 +83,26 @@ 
 	 * @param	string    $user_login le nom d'utilisateur de l'utilisateur actuellement connecté / Username of current connected user.
 	 * @param	WP_Object $user			  l'objet WP_User correspond à l'utilisateur actuellement connecté / Current connected user WP_Object definition.
 	 */
-	public function hook_login_for_setting_customer_id( $user_login, $user ) {
-		$customer_id = wps_customer_ctr::get_customer_id_by_author_id( $user->ID );
-		if ( empty( $customer_id ) ) {
-			$query = $GLOBALS['wpdb']->prepare( "SELECT post_id FROM {$GLOBALS['wpdb']->postmeta} WHERE meta_key = %s AND meta_value LIKE %s ORDER BY meta_id LIMIT 1", '_wpscrm_associated_user', "%;i:$user->ID;%" );
-			$customer_id = $GLOBALS['wpdb']->get_var( $query );
+	public function hook_login_for_setting_customer_id($user_login, $user) {
+		$customer_id = wps_customer_ctr::get_customer_id_by_author_id($user->ID);
+		if (empty($customer_id)) {
+			$query = $GLOBALS['wpdb']->prepare("SELECT post_id FROM {$GLOBALS['wpdb']->postmeta} WHERE meta_key = %s AND meta_value LIKE %s ORDER BY meta_id LIMIT 1", '_wpscrm_associated_user', "%;i:$user->ID;%");
+			$customer_id = $GLOBALS['wpdb']->get_var($query);
 		}
 
-		setcookie( 'wps_current_connected_customer', $customer_id, strtotime( '+30 days' ), SITECOOKIEPATH, COOKIE_DOMAIN, is_ssl() );
+		setcookie('wps_current_connected_customer', $customer_id, strtotime('+30 days'), SITECOOKIEPATH, COOKIE_DOMAIN, is_ssl());
 	}
 
 	/**
 	 * AJAX callback for customer search
 	 */
 	public function ajax_search_customer() {
-		check_ajax_referer( 'wps_customer_search' );
+		check_ajax_referer('wps_customer_search');
 
-		$term = ! empty( $_GET ) && ! empty( $_GET['term'] ) && is_string( (string) $_GET['term'] ) ? (string) $_GET['term'] : $term;
-		$list = $this->search_customer( $term );
+		$term = !empty($_GET) && !empty($_GET['term']) && is_string((string)$_GET['term']) ? (string)$_GET['term'] : $term;
+		$list = $this->search_customer($term);
 
-		wp_die( wp_json_encode( $list ) );
+		wp_die(wp_json_encode($list));
 	}
 
 	/**
@@ -110,23 +110,23 @@ 
 	 *
 	 * @param string $term The term we have to search into database for getting existing users / Le terme qu'il faut rechercher pour retrouver les utilisateurs dans la base de données.
 	 */
-	public function search_customer( $term ) {
+	public function search_customer($term) {
 		$users = array();
-		$search_users = new WP_User_Query( array(
-			'search'				 => '*' . esc_attr( $term ) . '*',
-			'search_columns' => array( 'user_login', 'user_url', 'user_email', 'user_nicename', 'display_name' ),
-		) );
+		$search_users = new WP_User_Query(array(
+			'search'				 => '*' . esc_attr($term) . '*',
+			'search_columns' => array('user_login', 'user_url', 'user_email', 'user_nicename', 'display_name'),
+		));
 		$user_query_results = $search_users->get_results();
-		if ( ! empty( $user_query_results ) ) {
-			foreach ( $user_query_results as $user ) {
-				$users[ $user->ID ]['id'] = $user->ID;
-				$users[ $user->ID ]['display_name'] = $user->display_name;
-				$users[ $user->ID ]['email'] = $user->user_email;
-				$users[ $user->ID ]['last_name'] = $user->last_name;
-				$users[ $user->ID ]['first_name'] = $user->first_name;
+		if (!empty($user_query_results)) {
+			foreach ($user_query_results as $user) {
+				$users[$user->ID]['id'] = $user->ID;
+				$users[$user->ID]['display_name'] = $user->display_name;
+				$users[$user->ID]['email'] = $user->user_email;
+				$users[$user->ID]['last_name'] = $user->last_name;
+				$users[$user->ID]['first_name'] = $user->first_name;
 			}
 		}
-		$search_users_in_meta = new WP_User_Query( array(
+		$search_users_in_meta = new WP_User_Query(array(
 			'meta_query'		 => array(
 				'relation' => 'OR',
 				array(
@@ -140,21 +140,21 @@ 
 					'compare' => 'LIKE',
 				),
 			),
-		) );
+		));
 		$user_query_results_2 = $search_users_in_meta->get_results();
-		if ( ! empty( $user_query_results_2 ) ) {
-			foreach ( $user_query_results_2 as $user ) {
-				$users[ $user->ID ]['id'] = $user->ID;
-				$users[ $user->ID ]['display_name'] = $user->display_name;
-				$users[ $user->ID ]['email'] = $user->user_email;
-				$users[ $user->ID ]['last_name'] = $user->last_name;
-				$users[ $user->ID ]['first_name'] = $user->first_name;
+		if (!empty($user_query_results_2)) {
+			foreach ($user_query_results_2 as $user) {
+				$users[$user->ID]['id'] = $user->ID;
+				$users[$user->ID]['display_name'] = $user->display_name;
+				$users[$user->ID]['email'] = $user->user_email;
+				$users[$user->ID]['last_name'] = $user->last_name;
+				$users[$user->ID]['first_name'] = $user->first_name;
 			}
 		}
-		if ( empty( $users ) ) {
+		if (empty($users)) {
 			$users[] = array(
 				'id'		=> null,
-				'label'	=> __( 'Create a new user', 'wpshop' ),
+				'label'	=> __('Create a new user', 'wpshop'),
 			);
 		}
 
@@ -168,13 +168,13 @@ 
 	 *
 	 * @return int $customer_id
 	 */
-	public static function get_customer_id_by_author_id( $author_id ) {
-		if ( ! isset( self::$customer_user_identifier_cache[ $author_id ] ) ) {
-			$query = $GLOBALS['wpdb']->prepare( "SELECT ID FROM {$GLOBALS['wpdb']->posts} WHERE post_author = %d AND post_type = %s ORDER BY ID ASC", $author_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-			self::$customer_user_identifier_cache[ $author_id ] = $GLOBALS['wpdb']->get_var( $query );
+	public static function get_customer_id_by_author_id($author_id) {
+		if (!isset(self::$customer_user_identifier_cache[$author_id])) {
+			$query = $GLOBALS['wpdb']->prepare("SELECT ID FROM {$GLOBALS['wpdb']->posts} WHERE post_author = %d AND post_type = %s ORDER BY ID ASC", $author_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+			self::$customer_user_identifier_cache[$author_id] = $GLOBALS['wpdb']->get_var($query);
 		}
 
-		return self::$customer_user_identifier_cache[ $author_id ];
+		return self::$customer_user_identifier_cache[$author_id];
 	}
 
 	/**
@@ -185,15 +185,15 @@ 
 	 *
 	 * @return int
 	 */
-	public static function get_author_id_by_customer_id( $customer_id ) {
-		$flipped = ! empty( self::$customer_user_identifier_cache ) ? array_flip( self::$customer_user_identifier_cache ) : '';
-		if ( ! isset( $flipped[ $customer_id ] ) ) {
-			$author_id = $GLOBALS['wpdb']->get_var( $GLOBALS['wpdb']->prepare( "SELECT post_author FROM {$GLOBALS['wpdb']->posts} WHERE ID = %d", $customer_id ) );
-			self::$customer_user_identifier_cache[ $author_id ] = $customer_id;
-			$flipped[ $customer_id ] = $author_id;
+	public static function get_author_id_by_customer_id($customer_id) {
+		$flipped = !empty(self::$customer_user_identifier_cache) ? array_flip(self::$customer_user_identifier_cache) : '';
+		if (!isset($flipped[$customer_id])) {
+			$author_id = $GLOBALS['wpdb']->get_var($GLOBALS['wpdb']->prepare("SELECT post_author FROM {$GLOBALS['wpdb']->posts} WHERE ID = %d", $customer_id));
+			self::$customer_user_identifier_cache[$author_id] = $customer_id;
+			$flipped[$customer_id] = $author_id;
 		}
 
-		return $flipped[ $customer_id ];
+		return $flipped[$customer_id];
 	}
 
 	/**
@@ -201,26 +201,26 @@ 
 	 */
 	public function create_customer_entity() {
 		global $wpdb;
-		$query = $wpdb->prepare( "SELECT P.post_title, PM.meta_value FROM {$wpdb->posts} AS P INNER JOIN {$wpdb->postmeta} AS PM ON (PM.post_id = P.ID) WHERE P.post_name = %s AND PM.meta_key = %s", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, '_wpshop_entity_params' );
-		$customer_entity_definition = $wpdb->get_row( $query ); // WPCS: unprepared sql ok.
-		$current_entity_params = ! empty( $customer_entity_definition ) && ! empty( $customer_entity_definition->meta_value ) ? unserialize( $customer_entity_definition->meta_value ) : null;
+		$query = $wpdb->prepare("SELECT P.post_title, PM.meta_value FROM {$wpdb->posts} AS P INNER JOIN {$wpdb->postmeta} AS PM ON (PM.post_id = P.ID) WHERE P.post_name = %s AND PM.meta_key = %s", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, '_wpshop_entity_params');
+		$customer_entity_definition = $wpdb->get_row($query); // WPCS: unprepared sql ok.
+		$current_entity_params = !empty($customer_entity_definition) && !empty($customer_entity_definition->meta_value) ? unserialize($customer_entity_definition->meta_value) : null;
 
 		$post_type_params = array(
 			'labels' => array(
-				'name' => __( 'Customers', 'wpshop' ),
-				'singular_name' => __( 'Customer', 'wpshop' ),
-				'add_new_item' => __( 'New customer', 'wpshop' ),
-				'add_new' => __( 'New customer', 'wpshop' ),
-				'edit_item' => __( 'Edit customer', 'wpshop' ),
-				'new_item' => __( 'New customer', 'wpshop' ),
-				'view_item' => __( 'View customer', 'wpshop' ),
-				'search_items' => __( 'Search in customers', 'wpshop' ),
-				'not_found' => __( 'No customer found', 'wpshop' ),
-				'not_found_in_trash' => __( 'No customer founded in trash', 'wpshop' ),
+				'name' => __('Customers', 'wpshop'),
+				'singular_name' => __('Customer', 'wpshop'),
+				'add_new_item' => __('New customer', 'wpshop'),
+				'add_new' => __('New customer', 'wpshop'),
+				'edit_item' => __('Edit customer', 'wpshop'),
+				'new_item' => __('New customer', 'wpshop'),
+				'view_item' => __('View customer', 'wpshop'),
+				'search_items' => __('Search in customers', 'wpshop'),
+				'not_found' => __('No customer found', 'wpshop'),
+				'not_found_in_trash' => __('No customer founded in trash', 'wpshop'),
 				'parent_item_colon' => '',
 			),
 			'description' => '',
-			'supports' => ! empty( $current_entity_params['support'] ) ? $current_entity_params['support'] : array( 'title' ),
+			'supports' => !empty($current_entity_params['support']) ? $current_entity_params['support'] : array('title'),
 			'hierarchical' => false,
 			'public' => false,
 			'show_ui' => true,
@@ -245,22 +245,22 @@ 
 			),
 		);
 
-		register_post_type( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $post_type_params );
+		register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $post_type_params);
 	}
 
 	/**
 	 * Customer options for the shop
 	 */
 	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_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_customer_ctr', 'wpshop_options_validate_customers_newsleters' ) );
-					add_settings_field( 'display_newsletters_subscriptions', __( 'Display newsletters subscriptions', 'wpshop' ), array( 'wps_customer_ctr', 'display_newsletters_subscriptions' ), 'wpshop_cart_info', 'wpshop_cart_info' );
+					register_setting('wpshop_options', 'wpshop_cart_option', array('wps_customer_ctr', 'wpshop_options_validate_customers_newsleters'));
+					add_settings_field('display_newsletters_subscriptions', __('Display newsletters subscriptions', 'wpshop'), array('wps_customer_ctr', 'display_newsletters_subscriptions'), 'wpshop_cart_info', 'wpshop_cart_info');
 			}
 		}
 	}
@@ -272,7 +272,7 @@ 
 	 *
 	 * @return array Les réglages des clients qui ont été vérifiés
 	 */
-	public static function wpshop_options_validate_customers_newsleters( $input ) {
+	public static function wpshop_options_validate_customers_newsleters($input) {
 			return $input;
 	}
 
@@ -280,7 +280,7 @@ 
 	 * Affichage des champs permettant les réglages concernant les newsletters des clients dans les réglages de la boutique
 	 */
 	public static function display_newsletters_subscriptions() {
-		$cart_option = get_option( 'wpshop_cart_option', array() );
+		$cart_option = get_option('wpshop_cart_option', array());
 		$output = '';
 
 		$input_def = array();
@@ -288,18 +288,18 @@ 
 		$input_def['id'] = 'wpshop_cart_option_display_newsletter_site_subscription';
 		$input_def['type'] = 'checkbox';
 		$input_def['valueToPut'] = 'index';
-		$input_def['value'] = ! empty( $cart_option['display_newsletter']['site_subscription'] ) ? $cart_option['display_newsletter']['site_subscription'][0] : 'no';
+		$input_def['value'] = !empty($cart_option['display_newsletter']['site_subscription']) ? $cart_option['display_newsletter']['site_subscription'][0] : 'no';
 		$input_def['possible_value'] = 'yes';
-		$output .= wpshop_form::check_input_type( $input_def, 'wpshop_cart_option[display_newsletter][site_subscription]' ) . '<label for="' . $input_def['id'] . '">' . __( 'Newsletters of the site', 'wpshop' ) . '</label><a href="#" title="' . __( 'Check this box if you want display newsletter site subscription', 'wpshop' ) . '" class="wpshop_infobulle_marker">?</a><br>';
+		$output .= wpshop_form::check_input_type($input_def, 'wpshop_cart_option[display_newsletter][site_subscription]') . '<label for="' . $input_def['id'] . '">' . __('Newsletters of the site', 'wpshop') . '</label><a href="#" title="' . __('Check this box if you want display newsletter site subscription', 'wpshop') . '" class="wpshop_infobulle_marker">?</a><br>';
 
 		$input_def = array();
 		$input_def['name'] = '';
 		$input_def['id'] = 'wpshop_cart_option_display_newsletter_partner_subscription';
 		$input_def['type'] = 'checkbox';
 		$input_def['valueToPut'] = 'index';
-		$input_def['value'] = ! empty( $cart_option['display_newsletter']['partner_subscription'] ) ? $cart_option['display_newsletter']['partner_subscription'][0] : 'no';
+		$input_def['value'] = !empty($cart_option['display_newsletter']['partner_subscription']) ? $cart_option['display_newsletter']['partner_subscription'][0] : 'no';
 		$input_def['possible_value'] = 'yes';
-		$output .= wpshop_form::check_input_type( $input_def, 'wpshop_cart_option[display_newsletter][partner_subscription]' ) . '<label for="' . $input_def['id'] . '">' . __( 'Newsletters of the partners', 'wpshop' ) . '</label><a href="#" title="' . __( 'Check this box if you want display newsletter partners subscription', 'wpshop' ) . '" class="wpshop_infobulle_marker">?</a><br>';
+		$output .= wpshop_form::check_input_type($input_def, 'wpshop_cart_option[display_newsletter][partner_subscription]') . '<label for="' . $input_def['id'] . '">' . __('Newsletters of the partners', 'wpshop') . '</label><a href="#" title="' . __('Check this box if you want display newsletter partners subscription', 'wpshop') . '" class="wpshop_infobulle_marker">?</a><br>';
 
 		echo $output; // WPCS: XSS ok.
 	}
@@ -313,15 +313,15 @@ 
 	 *
 	 * @return string           La nouvelle url pour la redirection.
 	 */
-	public function wp_redirect_after_user_new( $location ) {
+	public function wp_redirect_after_user_new($location) {
 		global $pagenow;
 
-		if ( is_admin() && $pagenow === 'user-new.php' ) {
-			$user_details = get_user_by( 'email', $_REQUEST[ 'email' ] );
+		if (is_admin() && $pagenow === 'user-new.php') {
+			$user_details = get_user_by('email', $_REQUEST['email']);
 			$user_id = $user_details->ID;
 
-			if( $location == 'users.php?update=add&id=' . $user_id )
-			return add_query_arg( array( 'user_id' => $user_id ), 'user-edit.php' );
+			if ($location == 'users.php?update=add&id=' . $user_id)
+			return add_query_arg(array('user_id' => $user_id), 'user-edit.php');
 		}
 
 		return $location;
@@ -339,25 +339,25 @@ 
 	 *
 	 * @param integer $user_id L'identifiant de l'utilisateur qui vient d'être créé et pour qui on va créer le client.
 	 */
-	public static function create_entity_customer_when_user_is_created( $user_id ) {
-		if ( ! is_admin() || strpos( $_SERVER['REQUEST_URI'], 'admin-ajax.php' )  ) {
-			$user_data = get_userdata( $user_id );
-			$user_info = array_merge( get_object_vars( $user_data->data ), array_map( 'self::array_map_create_entity_customer_when_user_is_created', get_user_meta( $user_id ) ) );
-			$customer_post_ID = wp_insert_post( array( 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'post_author' => $user_id, 'post_title' => $user_data->user_nicename ) );
-			self::save_customer_synchronize( $customer_post_ID, $user_id, $user_info );
+	public static function create_entity_customer_when_user_is_created($user_id) {
+		if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {
+			$user_data = get_userdata($user_id);
+			$user_info = array_merge(get_object_vars($user_data->data), array_map('self::array_map_create_entity_customer_when_user_is_created', get_user_meta($user_id)));
+			$customer_post_ID = wp_insert_post(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'post_author' => $user_id, 'post_title' => $user_data->user_nicename));
+			self::save_customer_synchronize($customer_post_ID, $user_id, $user_info);
 
 			/** Change metabox Hidden Nav Menu Definition to display WPShop categories' metabox */
-			$usermeta = get_post_meta( $user_id, 'metaboxhidden_nav-menus', true );
-			if ( ! empty( $usermeta ) && is_array( $usermeta ) ) {
-				$data_to_delete = array_search( 'add-wpshop_product_category', $usermeta );
-				if ( false !== $data_to_delete ) {
-					unset( $usermeta[ $data_to_delete ] );
-					update_user_meta( $user_id, 'metaboxhidden_nav-menus', $usermeta );
+			$usermeta = get_post_meta($user_id, 'metaboxhidden_nav-menus', true);
+			if (!empty($usermeta) && is_array($usermeta)) {
+				$data_to_delete = array_search('add-wpshop_product_category', $usermeta);
+				if (false !== $data_to_delete) {
+					unset($usermeta[$data_to_delete]);
+					update_user_meta($user_id, 'metaboxhidden_nav-menus', $usermeta);
 				}
 			}
 		}
 	}
-	private static function array_map_create_entity_customer_when_user_is_created( $a ) {
+	private static function array_map_create_entity_customer_when_user_is_created($a) {
 		return $a[0];
 	}
 
@@ -366,8 +366,8 @@ 
 	 *
 	 * @param integer $user_id
 	 */
-	public static function update_entity_customer_when_profile_user_is_update( $user_id ) {
-		if ( ! is_admin() || strpos( $_SERVER['REQUEST_URI'], 'admin-ajax.php' )  ) {
+	public static function update_entity_customer_when_profile_user_is_update($user_id) {
+		if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {
 			$user_data = get_userdata($user_id);
 			$user_info = array_merge(get_object_vars($user_data->data), array_map('self::array_map_create_entity_customer_when_user_is_created', get_user_meta($user_id)));
 			$customer_post_ID = self::get_customer_id_by_author_id($user_id);
@@ -380,7 +380,7 @@ 
 		return false;
 	}
 
-	public static function save_customer_synchronize( $customer_post_ID, $user_id, $user_info ) {
+	public static function save_customer_synchronize($customer_post_ID, $user_id, $user_info) {
 		global $wpdb;
 		global $wpshop;
 		$exclude_user_meta = array('user_login', 'user_nicename', 'user_email', 'user_pass', 'user_url', 'user_registered', 'user_activation_key', 'user_status', 'display_name');
@@ -389,7 +389,7 @@ 
 		$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $element_id);
 		$attribute_set_id = $wpdb->get_var($query);
 		$attributes_default = array();
-		if (! empty($attribute_set_id)) {
+		if (!empty($attribute_set_id)) {
 			$group = wps_address::get_addresss_form_fields_by_type($attribute_set_id);
 			foreach ($group as $attribute_sets) {
 				foreach ($attribute_sets as $attribute_set_field) {
@@ -409,10 +409,10 @@ 
 			}
 		}
 		$user_info = array_merge($attributes_default, $user_info);
-		add_filter( 'send_password_change_email', array( get_class(), 'prevent_send_mail_from_wordpress' ) );
+		add_filter('send_password_change_email', array(get_class(), 'prevent_send_mail_from_wordpress'));
 		foreach ($user_info as $user_meta => $user_meta_value) {
 			$attribute_def = wpshop_attributes::getElement($user_meta, "'valid'", 'code');
-			if (! empty($attribute_def)) {
+			if (!empty($attribute_def)) {
 				//Save data in user meta
 				if (in_array($user_meta, $exclude_user_meta)) {
 					if ($user_meta == 'user_pass') {
@@ -428,7 +428,7 @@ 
 				//Save data in attribute tables, ckeck first if exist to know if Insert or Update
 				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . strtolower($attribute_def->data_type) . ' WHERE entity_type_id = %d AND entity_id = %d AND attribute_id = %d', $element_id, $customer_post_ID, $attribute_def->id);
 				$checking_attribute_exist = $wpdb->get_results($query);
-				if (! empty($checking_attribute_exist)) {
+				if (!empty($checking_attribute_exist)) {
 					$wpdb->update(
 						WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . strtolower($attribute_def->data_type),
 						array(
@@ -455,7 +455,7 @@ 
 				}
 			}
 		}
-		remove_filter( 'send_password_change_email', array( get_class(), 'prevent_send_mail_from_wordpress' ) );
+		remove_filter('send_password_change_email', array(get_class(), 'prevent_send_mail_from_wordpress'));
 	}
 
 	/**
@@ -465,17 +465,17 @@ 
 	 *
 	 * @return array The new header to display
 	 */
-	public function list_table_header( $current_header ) {
-		unset( $current_header['title'] );
-		unset( $current_header['date'] );
+	public function list_table_header($current_header) {
+		unset($current_header['title']);
+		unset($current_header['date']);
 
-		$current_header['customer_identifier'] = __( 'Customer ID', 'wpshop' );
-		$current_header['customer-name'] = __( 'Customer name', 'wpshop' );
+		$current_header['customer_identifier'] = __('Customer ID', 'wpshop');
+		$current_header['customer-name'] = __('Customer name', 'wpshop');
 		// $current_header['customer_name'] = '<span class="wps-customer-last_name" >' . __('Last-name', 'wpshop') . '</span><span class="wps-customer-first_name" >' . __('First-name', 'wpshop') . '</span>';
 		// $current_header['customer_email'] = __('E-mail', 'wpshop');
-		$current_header['customer-contacts'] = __( 'Contacts', 'wpshop' );
-		$current_header['customer-orders'] = __( 'Customer last order', 'wpshop' );
-		$current_header['customer_date_subscription'] = __( 'Subscription', 'wpshop' );
+		$current_header['customer-contacts'] = __('Contacts', 'wpshop');
+		$current_header['customer-orders'] = __('Customer last order', 'wpshop');
+		$current_header['customer_date_subscription'] = __('Subscription', 'wpshop');
 		// $current_header['customer_date_lastlogin'] = __( 'Last login date', 'wpshop' );
 
 		return $current_header;
@@ -487,43 +487,43 @@ 
 	 * @param string  $column THe column identifier to modify output for.
 	 * @param integer $post_id The current post identifier.
 	 */
-	public function list_table_column_content( $column, $post_id ) {
+	public function list_table_column_content($column, $post_id) {
 		global $wpdb;
 
 		/**		Get wp_users identifier from customer id		*/
-		$customer_post_author = self::get_author_id_by_customer_id( $post_id );
+		$customer_post_author = self::get_author_id_by_customer_id($post_id);
 
 		/**		Get current post informations		*/
-		$customer_post = get_post( $post_id );
+		$customer_post = get_post($post_id);
 
 		/**		Switch current column for custom case		*/
 		$use_template = true;
-		switch ( $column ) {
+		switch ($column) {
 			case 'customer_identifier' :
 				echo $post_id;
 				$use_template = false;
 			break;
 
 			case 'customer_date_subscription' :
-				echo mysql2date( get_option( 'date_format' ), $customer_post->post_date, true );
+				echo mysql2date(get_option('date_format'), $customer_post->post_date, true);
 				$use_template = false;
 			break;
 
 			case 'customer_date_lastlogin' :
-				$last_login = get_user_meta( $customer_post_author, 'last_login_time', true );
-				if ( ! empty( $last_login ) ) :
-					echo mysql2date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $last_login, true );
+				$last_login = get_user_meta($customer_post_author, 'last_login_time', true);
+				if (!empty($last_login)) :
+					echo mysql2date(get_option('date_format') . ' ' . get_option('time_format'), $last_login, true);
 				else :
-					_e( 'Never logged in', 'wpshop' );
+					_e('Never logged in', 'wpshop');
 				endif;
 				$use_template = false;
 			break;
 		}
 
 		/**		Require the template for displaying the current column		*/
-		if ( $use_template ) {
-			$template = wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, WPS_ACCOUNT_PATH . WPS_ACCOUNT_DIR . '/templates/', 'backend', 'customer_listtable/' . $column );
-			if ( is_file( $template ) ) {
+		if ($use_template) {
+			$template = wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_PATH . WPS_ACCOUNT_DIR . '/templates/', 'backend', 'customer_listtable/' . $column);
+			if (is_file($template)) {
 				require $template;
 			}
 		}
@@ -536,33 +536,33 @@ 
 	 *
 	 * @return array The new action list to use into customer list table
 	 */
-	public function customer_list_table_bulk_actions( $actions ) {
-		unset( $actions['edit'] );
-		unset( $actions['trash'] );
+	public function customer_list_table_bulk_actions($actions) {
+		unset($actions['edit']);
+		unset($actions['trash']);
 
 		return $actions;
 	}
 
 	public function list_table_filters() {
-		$post_type = ! empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
 		if (isset($post_type)) {
 			if (post_type_exists($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS)) {
 				$filter_possibilities = array();
 				$filter_possibilities[''] = __('-- Select Filter --', 'wpshop');
 				$filter_possibilities['orders'] = __('List customers with orders', 'wpshop');
 				$filter_possibilities['no_orders'] = __('List customers without orders', 'wpshop');
-				echo wpshop_form::form_input_select('entity_filter', 'entity_filter', $filter_possibilities, (! empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : ''), '', 'index');
+				echo wpshop_form::form_input_select('entity_filter', 'entity_filter', $filter_possibilities, (!empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : ''), '', 'index');
 			}
 		}
 	}
 
-	public function list_table_filter_parse_query( $query ) {
+	public function list_table_filter_parse_query($query) {
 		global $pagenow, $wpdb;
-		$post_type = ! empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';
-		$entity_filter = ! empty( $_GET['entity_filter'] ) ? sanitize_text_field( $_GET['entity_filter'] ) : '';
-		if ( is_admin() && ( $pagenow == 'edit.php' ) && ! empty( $post_type ) && ( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ) && ! empty( $entity_filter ) ) {
+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+		$entity_filter = !empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : '';
+		if (is_admin() && ($pagenow == 'edit.php') && !empty($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS) && !empty($entity_filter)) {
 			$check = null;
-			switch ( $entity_filter ) {
+			switch ($entity_filter) {
 				case 'orders':
 					$sql_query = $wpdb->prepare(
 						"SELECT ID
@@ -591,16 +591,16 @@ 
 				break;
 			}
 
-			if ( ! empty( $check ) ) {
-				$results = $wpdb->get_results( $sql_query );
+			if (!empty($check)) {
+				$results = $wpdb->get_results($sql_query);
 				$user_id_list = array();
-				foreach ( $results as $item ) {
+				foreach ($results as $item) {
 					$user_id_list[] = $item->ID;
 				}
-				if ( empty( $post_id_list ) ) {
+				if (empty($post_id_list)) {
 					$post_id_list[] = 'no_result';
 				}
-				$query->query_vars[ $check ] = $user_id_list;
+				$query->query_vars[$check] = $user_id_list;
 			}
 			$query->query_vars['post_type'] = WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS;
 			$query->query_vars['post_status'] = 'any';
@@ -612,7 +612,7 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_all_customer( $post_status = 'publish' ) {
+	public static function get_all_customer($post_status = 'publish') {
 		global $wpdb;
 
 		$query = $wpdb->prepare("SELECT * FROM {$wpdb->posts} WHERE post_type = %s AND post_status = %s", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $post_status);
@@ -627,15 +627,15 @@ 
 	 * @param array $form Passer directement le $_POST pour créer un client.
 	 * @return array ou int : 1 = Aucun mail, 2 = L'utilisateur existe déjà
 	 */
-	public static function quick_add_customer( $form ) {
+	public static function quick_add_customer($form) {
 		$return = 1;
-		if ( ! empty( $form ) ) {
+		if (!empty($form)) {
 			global $wpdb;
 			$customer_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $customer_type_id);
 			$customer_entity_id = $wpdb->get_var($query);
 			$attributes_set = wpshop_attributes_set::getElement($customer_entity_id);
-			$account_attributes = wpshop_attributes_set::getAttributeSetDetails((! empty($attributes_set->id)) ? $attributes_set->id : '', "'valid'");
+			$account_attributes = wpshop_attributes_set::getAttributeSetDetails((!empty($attributes_set->id)) ? $attributes_set->id : '', "'valid'");
 
 			$customer_attributes_to_save = $customer_attributes_to_save_temp = array();
 

includes/modules/wps_installer/templates/backend/about-introduction.php

Spacing +30 added lines, -30 removed lines

@@ -1,62 +1,62 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="changelog" >
 
 	<div class="feature-section changelog three-col">
 		<div class="col">
-			<img src="<?php echo WPS_INSTALLER_URL . WPS_INSTALLER_DIR . '/assets/medias/paiement.jpg'; ?>" alt="<?php _e( 'Payment methods', 'wpshop'); ?>" title="<?php _e( 'Payment methods', 'wpshop'); ?>" />
-			<h3><?php _e( 'Payment methods', 'wpshop'); ?></h3>
-			<p><?php printf( __( 'When installing WPShop you will have included by default, checks and paypal payment gateway. However there are more %spayment method%s developped for WPShop. If you are interested by a non existant payment method. You can contact us on our %sforum%s', 'wpshop'), '<a href="http://www.wpshop.fr/boutique/extensions/paiement/" target="_wps_about_extra">', '</a>', '<a href="http://forums.eoxia.com/" target="_eoxia_form">', '</a>' ); ?></p>
-			<a href="<?php echo admin_url( 'options-general.php?page=wpshop_option#wpshop_payments_option' ); ?>" class="button button-large button-primary"><?php _e( 'Manage payment methods', 'wpshop'); ?></a>
+			<img src="<?php echo WPS_INSTALLER_URL . WPS_INSTALLER_DIR . '/assets/medias/paiement.jpg'; ?>" alt="<?php _e('Payment methods', 'wpshop'); ?>" title="<?php _e('Payment methods', 'wpshop'); ?>" />
+			<h3><?php _e('Payment methods', 'wpshop'); ?></h3>
+			<p><?php printf(__('When installing WPShop you will have included by default, checks and paypal payment gateway. However there are more %spayment method%s developped for WPShop. If you are interested by a non existant payment method. You can contact us on our %sforum%s', 'wpshop'), '<a href="http://www.wpshop.fr/boutique/extensions/paiement/" target="_wps_about_extra">', '</a>', '<a href="http://forums.eoxia.com/" target="_eoxia_form">', '</a>'); ?></p>
+			<a href="<?php echo admin_url('options-general.php?page=wpshop_option#wpshop_payments_option'); ?>" class="button button-large button-primary"><?php _e('Manage payment methods', 'wpshop'); ?></a>
 		</div>
 		<div class="col">
-			<img src="<?php echo WPS_INSTALLER_URL . WPS_INSTALLER_DIR . '/assets/medias/livraison.jpg'; ?>" alt="<?php _e( 'Shipping methods', 'wpshop'); ?>" title="<?php _e( 'Shipping methods', 'wpshop'); ?>" />
-			<h3><?php _e( 'Shipping methods', 'wpshop'); ?></h3>
-			<p><?php printf( __( 'By default you have one shipping method available into WPShop. You can create as much as you want using %ssettings interface%s. You will also find on our %swebsite%s additionnals shipping methods. You can contact us on our %sforum%s', 'wpshop'), '<a href="' . admin_url( 'options-general.php?page=wpshop_option#wpshop_shipping_option' ) . '" target="_wps_settings_interface" >', '</a>', '<a href="http://www.wpshop.fr/shop-theme/" target="_wps_about_extra" >', '</a>',  '<a href="http://forums.eoxia.com/" target="_eoxia_form">', '</a>' ); ?></p>
-			<a href="<?php echo admin_url( 'options-general.php?page=wpshop_option#wpshop_shipping_option' ); ?>" class="button button-large button-primary"><?php _e( 'Manage shipping methods', 'wpshop'); ?></a>
+			<img src="<?php echo WPS_INSTALLER_URL . WPS_INSTALLER_DIR . '/assets/medias/livraison.jpg'; ?>" alt="<?php _e('Shipping methods', 'wpshop'); ?>" title="<?php _e('Shipping methods', 'wpshop'); ?>" />
+			<h3><?php _e('Shipping methods', 'wpshop'); ?></h3>
+			<p><?php printf(__('By default you have one shipping method available into WPShop. You can create as much as you want using %ssettings interface%s. You will also find on our %swebsite%s additionnals shipping methods. You can contact us on our %sforum%s', 'wpshop'), '<a href="' . admin_url('options-general.php?page=wpshop_option#wpshop_shipping_option') . '" target="_wps_settings_interface" >', '</a>', '<a href="http://www.wpshop.fr/shop-theme/" target="_wps_about_extra" >', '</a>', '<a href="http://forums.eoxia.com/" target="_eoxia_form">', '</a>'); ?></p>
+			<a href="<?php echo admin_url('options-general.php?page=wpshop_option#wpshop_shipping_option'); ?>" class="button button-large button-primary"><?php _e('Manage shipping methods', 'wpshop'); ?></a>
 		</div>
 		<div class="col last-feature">
-			<img src="<?php echo WPS_INSTALLER_URL . WPS_INSTALLER_DIR . '/assets/medias/produit.jpg'; ?>" alt="<?php _e( 'Create products', 'wpshop'); ?>" title="<?php _e( 'Create products', 'wpshop'); ?>" />
-			<h3><?php _e( 'Create products', 'wpshop'); ?></h3>
-			<p><?php _e( 'With WPshop plugin you can now create your product catalog on WordPress and market them. A catalog and clear product information, easy to create and fully customizable through shortcodes.', 'wpshop'); ?></p>
-			<a href="<?php echo admin_url( 'edit.php?post_type=wpshop_product' ); ?>" class="button button-large button-primary wpshop-about-btn-create-products"><?php _e( 'Create products', 'wpshop'); ?></a>
+			<img src="<?php echo WPS_INSTALLER_URL . WPS_INSTALLER_DIR . '/assets/medias/produit.jpg'; ?>" alt="<?php _e('Create products', 'wpshop'); ?>" title="<?php _e('Create products', 'wpshop'); ?>" />
+			<h3><?php _e('Create products', 'wpshop'); ?></h3>
+			<p><?php _e('With WPshop plugin you can now create your product catalog on WordPress and market them. A catalog and clear product information, easy to create and fully customizable through shortcodes.', 'wpshop'); ?></p>
+			<a href="<?php echo admin_url('edit.php?post_type=wpshop_product'); ?>" class="button button-large button-primary wpshop-about-btn-create-products"><?php _e('Create products', 'wpshop'); ?></a>
 		</div>
 	</div>
 
 	<div class="feature-section col three-col">
 		<div class="col">
-			<img src="<?php echo WPS_INSTALLER_URL . WPS_INSTALLER_DIR . '/assets/medias/commande.jpg'; ?>" alt="<?php _e( 'Manage orders', 'wpshop'); ?>" title="<?php _e( 'Manage orders', 'wpshop'); ?>" />
-			<h3><?php _e( 'Manage orders', 'wpshop'); ?></h3>
-			<p><?php _e( 'You can manage all your orders and stay in touch with your customers. The dashboard controls will allow you to quickly view your most visited pages , static of your orders ...', 'wpshop'); ?></p>
-			<a href="<?php echo admin_url( 'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER ); ?>" class="button button-large button-primary"><?php _e( 'Manage orders', 'wpshop'); ?></a>
+			<img src="<?php echo WPS_INSTALLER_URL . WPS_INSTALLER_DIR . '/assets/medias/commande.jpg'; ?>" alt="<?php _e('Manage orders', 'wpshop'); ?>" title="<?php _e('Manage orders', 'wpshop'); ?>" />
+			<h3><?php _e('Manage orders', 'wpshop'); ?></h3>
+			<p><?php _e('You can manage all your orders and stay in touch with your customers. The dashboard controls will allow you to quickly view your most visited pages , static of your orders ...', 'wpshop'); ?></p>
+			<a href="<?php echo admin_url('edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER); ?>" class="button button-large button-primary"><?php _e('Manage orders', 'wpshop'); ?></a>
 		</div>
 		<div class="col">
-			<img src="<?php echo WPS_INSTALLER_URL . WPS_INSTALLER_DIR . '/assets/medias/reglage-boutique.jpg'; ?>" alt="<?php _e( 'Configure my shop', 'wpshop'); ?>" title="<?php _e( 'Configure my shop', 'wpshop'); ?>" />
-			<h3><?php _e( 'Configure my shop', 'wpshop'); ?></h3>
-			<p><?php printf( __( 'We update WPShop in order to improve speed, accessibility and mobile usage. Go on %smain settings interface%s in order to configure your new shop, payment gateways or shipping methods', 'wpshop'), '<a href="' . admin_url( 'options-general.php?page=wpshop_option' ) . '" target="_wps_settings_interface" >', '</a>' ); ?></p>
-			<a href="<?php echo admin_url( 'options-general.php?page=wpshop_option' ); ?>" class="button button-large button-primary"><?php _e( 'Configure my shop', 'wpshop'); ?></a>
+			<img src="<?php echo WPS_INSTALLER_URL . WPS_INSTALLER_DIR . '/assets/medias/reglage-boutique.jpg'; ?>" alt="<?php _e('Configure my shop', 'wpshop'); ?>" title="<?php _e('Configure my shop', 'wpshop'); ?>" />
+			<h3><?php _e('Configure my shop', 'wpshop'); ?></h3>
+			<p><?php printf(__('We update WPShop in order to improve speed, accessibility and mobile usage. Go on %smain settings interface%s in order to configure your new shop, payment gateways or shipping methods', 'wpshop'), '<a href="' . admin_url('options-general.php?page=wpshop_option') . '" target="_wps_settings_interface" >', '</a>'); ?></p>
+			<a href="<?php echo admin_url('options-general.php?page=wpshop_option'); ?>" class="button button-large button-primary"><?php _e('Configure my shop', 'wpshop'); ?></a>
 		</div>
 		<div class="col last-feature">
-			<img src="<?php echo WPS_INSTALLER_URL . WPS_INSTALLER_DIR . '/assets/medias/contenu.jpg'; ?>" alt="<?php _e( 'Full content customization', 'wpshop'); ?>" title="<?php _e( 'Full content customization', 'wpshop'); ?>" />
-			<h3><?php _e( 'Full content customization', 'wpshop'); ?></h3>
-			<p><?php printf( __( 'You can design all you %stransactionnal emails%s, change the different %spage layout%s (as cart page, checkout page, and so on)', 'wpshop'), '<a href="' . admin_url( 'edit.php?post_type=wpshop_shop_message' ) . '" target="_wps_settings_interface" >', '</a>', '<a href="' . admin_url( 'edit.php?post_type=page' ) . '" target="_wps_settings_interface" >', '</a>' ); ?></p>
+			<img src="<?php echo WPS_INSTALLER_URL . WPS_INSTALLER_DIR . '/assets/medias/contenu.jpg'; ?>" alt="<?php _e('Full content customization', 'wpshop'); ?>" title="<?php _e('Full content customization', 'wpshop'); ?>" />
+			<h3><?php _e('Full content customization', 'wpshop'); ?></h3>
+			<p><?php printf(__('You can design all you %stransactionnal emails%s, change the different %spage layout%s (as cart page, checkout page, and so on)', 'wpshop'), '<a href="' . admin_url('edit.php?post_type=wpshop_shop_message') . '" target="_wps_settings_interface" >', '</a>', '<a href="' . admin_url('edit.php?post_type=page') . '" target="_wps_settings_interface" >', '</a>'); ?></p>
 		</div>
 	</div>
 
-	<h2 class="about-headline-callout"><?php _e( 'Extend default WPShop functionnalities', 'wpshop'); ?></h2>
+	<h2 class="about-headline-callout"><?php _e('Extend default WPShop functionnalities', 'wpshop'); ?></h2>
 	<div class="feature-section col two-col">
 		<div class="col">
-			<h3><?php _e( 'External addons', 'wpshop'); ?></h3>
-			<p><?php printf( __( 'Need a theme? or a payment gateway? or a shipping addons? Anythong else? Check %sour website%s in order to find the addons for WPShop that you need. If you don\'t find it please contact us through the forum with the link below.', 'wpshop'), '<a href="http://www.wpshop.fr/shop-theme/" >', '</a>' ); ?></p>
+			<h3><?php _e('External addons', 'wpshop'); ?></h3>
+			<p><?php printf(__('Need a theme? or a payment gateway? or a shipping addons? Anythong else? Check %sour website%s in order to find the addons for WPShop that you need. If you don\'t find it please contact us through the forum with the link below.', 'wpshop'), '<a href="http://www.wpshop.fr/shop-theme/" >', '</a>'); ?></p>
 		</div>
 		<div class="col last-feature">
-			<h3><?php _e( 'Custom hooks', 'wpshop'); ?></h3>
-			<p><?php printf( __( 'We inserted some custom hook through WPShop code. That will give you some possibilities to add functionnalities when it is already planned.', 'wpshop') ); ?></p>
+			<h3><?php _e('Custom hooks', 'wpshop'); ?></h3>
+			<p><?php printf(__('We inserted some custom hook through WPShop code. That will give you some possibilities to add functionnalities when it is already planned.', 'wpshop')); ?></p>
 		</div>
 	</div>
 
 	<?php // <h3 class="about-headline-callout"><?php printf( __( 'A question ? A comment ? A need ? Join us on %sWPShop forum%s', 'wpshop'), '<a href="http://forums.eoxia.com/login" taget="_wpshop_forums" >', '</a>' ); </h3> ?>
 
 	<hr>
-	<div class="return-to-dashboard"><a href="<?php echo admin_url( 'admin.php?page=wpshop_dashboard' ); ?>"><?php _e( 'Go to your shop dashboard', 'wpshop'); ?></a></div>
+	<div class="return-to-dashboard"><a href="<?php echo admin_url('admin.php?page=wpshop_dashboard'); ?>"><?php _e('Go to your shop dashboard', 'wpshop'); ?></a></div>
 </div>

includes/modules/wps_download_file/controller/wps_download_file_ctr.php

Spacing +66 added lines, -66 removed lines

@@ -1,24 +1,24 @@ 
-<?php if ( ! defined( 'ABSPATH' ) ) {
+<?php if (!defined('ABSPATH')) {
 	exit;
 }
 
 class wps_download_file_ctr {
 
 	public function __construct() {
-		add_action( 'admin_post_wps_download_file', array( $this, 'wps_download_file' ) );
-		add_action( 'admin_post_nopriv_wps_download_file', array( $this, 'wps_download_file' ) );
-		add_action( 'wps_after_check_order_payment_total_amount', array( $this, 'wps_after_check_order_payment_total_amount' ) );
+		add_action('admin_post_wps_download_file', array($this, 'wps_download_file'));
+		add_action('admin_post_nopriv_wps_download_file', array($this, 'wps_download_file'));
+		add_action('wps_after_check_order_payment_total_amount', array($this, 'wps_after_check_order_payment_total_amount'));
 	}
 
-	public static function get_product_download_link( $oid, $item ) {
+	public static function get_product_download_link($oid, $item) {
 		global $wpdb;
 
 		$parent_def = array();
 		$item_id = $item['item_id'];
-		$item_post_type = get_post_type( $item['item_id'] );
-		if ( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION === $item_post_type ) {
-			$parent_def = wpshop_products::get_parent_variation( $item['item_id'] );
-			if ( ! empty( $parent_def ) && ! empty( $parent_def['parent_post'] ) ) {
+		$item_post_type = get_post_type($item['item_id']);
+		if (WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION === $item_post_type) {
+			$parent_def = wpshop_products::get_parent_variation($item['item_id']);
+			if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
 				$parent_post = $parent_def['parent_post'];
 				$item_id = $parent_post->ID;
 				$item_title = $parent_post->post_title;
@@ -28,50 +28,50 @@ 
 		$download_link = false;
 		$item_id_for_download = null;
 		/** Check if the product or the head product is a download product  */
-		if ( ! empty( $parent_def ) ) {
+		if (!empty($parent_def)) {
 			$parent_meta = $parent_def['parent_post_meta'];
-			if ( ! empty( $parent_meta['is_downloadable_'] ) ) {
-				$query = $wpdb->prepare( 'SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $parent_meta['is_downloadable_'] );
-				$downloadable_option_value = $wpdb->get_var( $query );
-				if ( empty( $downloadable_option_value ) ) {
+			if (!empty($parent_meta['is_downloadable_'])) {
+				$query = $wpdb->prepare('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $parent_meta['is_downloadable_']);
+				$downloadable_option_value = $wpdb->get_var($query);
+				if (empty($downloadable_option_value)) {
 					$item['item_is_downloadable_'] = 'No';
 				} else {
 					$item['item_is_downloadable_'] = $downloadable_option_value;
 				}
 			}
 		}
-		if ( empty( $item['item_is_downloadable_'] ) ) {
-			$product_data = wpshop_products::get_product_data( $item['item_id'] );
-			if ( empty( $product_data['is_downloadable_'] ) ) {
+		if (empty($item['item_is_downloadable_'])) {
+			$product_data = wpshop_products::get_product_data($item['item_id']);
+			if (empty($product_data['is_downloadable_'])) {
 				$item['item_is_downloadable_'] = 'No';
 			} else {
 				$item['item_is_downloadable_'] = $product_data['is_downloadable_'];
 			}
 		}
-		if ( strtolower( __( $item['item_is_downloadable_'], 'wpshop' ) ) === strtolower( __( 'Yes', 'wpshop' ) ) ) {
+		if (strtolower(__($item['item_is_downloadable_'], 'wpshop')) === strtolower(__('Yes', 'wpshop'))) {
 			$item_id_for_download = $item_id;
 		}
-		if ( isset( $item['item_meta']['variations'] ) ) {
-			foreach ( $item['item_meta']['variations'] as $variation_id => $variation ) {
-				if ( isset( $variation['item_meta']['is_downloadable_'] ) ) {
+		if (isset($item['item_meta']['variations'])) {
+			foreach ($item['item_meta']['variations'] as $variation_id => $variation) {
+				if (isset($variation['item_meta']['is_downloadable_'])) {
 					$item_id_for_download = $item_id . '__' . $variation_id;
 				}
 			}
 		}
 		/** In case there is a item identifier defined for download */
-		if ( null !== $item_id_for_download ) {
-			$download_codes = get_user_meta( get_current_user_id(), '_order_download_codes_' . $oid, true );
+		if (null !== $item_id_for_download) {
+			$download_codes = get_user_meta(get_current_user_id(), '_order_download_codes_' . $oid, true);
 			/** Check if the current product exist into download code list, if not check if there is a composition between parent product and children product  */
-			if ( empty( $download_codes[ $item_id_for_download ] ) ) {
-				$item_id_component = explode( '__', $item_id_for_download );
-				if ( ! empty( $item_id_component ) && ( $item_id_component[0] !== $item_id_for_download ) ) {
+			if (empty($download_codes[$item_id_for_download])) {
+				$item_id_component = explode('__', $item_id_for_download);
+				if (!empty($item_id_component) && ($item_id_component[0] !== $item_id_for_download)) {
 					$item_id_for_download = $item_id_component[0];
-				} elseif ( ! empty( $download_codes[ $item['item_id'] ] ) ) {
+				} elseif (!empty($download_codes[$item['item_id']])) {
 					$item_id_for_download = $item['item_id'];
 				}
 			}
-			if ( ! empty( $download_codes ) && ! empty( $download_codes[ $item_id_for_download ] ) && ! empty( $download_codes[ $item_id_for_download ]['download_code'] ) ) {
-				$download_link = admin_url( 'admin-post.php?action=wps_download_file&amp;oid=' . $oid . '&amp;download=' . $download_codes[ $item_id_for_download ]['download_code'] );
+			if (!empty($download_codes) && !empty($download_codes[$item_id_for_download]) && !empty($download_codes[$item_id_for_download]['download_code'])) {
+				$download_link = admin_url('admin-post.php?action=wps_download_file&amp;oid=' . $oid . '&amp;download=' . $download_codes[$item_id_for_download]['download_code']);
 			}
 		}
 
@@ -79,34 +79,34 @@ 
 	}
 
 	public function wps_download_file() {
-		$download = ! empty( $_GET['download'] ) ? sanitize_text_field( $_GET['download'] ) : '';
-		$oid = ! empty( $_GET['oid'] ) ? (int) $_GET['oid'] : 0;
+		$download = !empty($_GET['download']) ? sanitize_text_field($_GET['download']) : '';
+		$oid = !empty($_GET['oid']) ? (int)$_GET['oid'] : 0;
 
-		if ( ! empty( $download ) && ! empty( $oid ) ) {
+		if (!empty($download) && !empty($oid)) {
 			$variation_id = '';
-			$order = get_post_meta( $oid, '_order_postmeta', true );
-			if ( ! empty( $order ) && ! empty( $order['customer_id'] ) ) {
-				$download_codes = get_user_meta( $order['customer_id'], '_order_download_codes_' . $oid, true );
-				if ( ! empty( $download_codes ) && is_array( $download_codes ) ) {
-					foreach ( $download_codes as $downloadable_product_id => $d ) {
+			$order = get_post_meta($oid, '_order_postmeta', true);
+			if (!empty($order) && !empty($order['customer_id'])) {
+				$download_codes = get_user_meta($order['customer_id'], '_order_download_codes_' . $oid, true);
+				if (!empty($download_codes) && is_array($download_codes)) {
+					foreach ($download_codes as $downloadable_product_id => $d) {
 						$is_encrypted = false;
-						if ( $d['download_code'] === $download ) {
+						if ($d['download_code'] === $download) {
 							 wpshop_tools::create_custom_hook('encrypt_actions_for_downloadable_product', array(
 								 'order_id' => $oid,
 								 'download_product_id' => $downloadable_product_id,
 
-							 ) );
+							 ));
 
-							if ( get_post_type( $downloadable_product_id ) === WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-								$parent_def = wpshop_products::get_parent_variation( $downloadable_product_id );
-								if ( ! empty( $parent_def ) && ! empty( $parent_def['parent_post'] ) ) {
+							if (get_post_type($downloadable_product_id) === WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+								$parent_def = wpshop_products::get_parent_variation($downloadable_product_id);
+								if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
 									$parent_post = $parent_def['parent_post'];
 									$variation_id = $downloadable_product_id;
 									$downloadable_product_id = $parent_post->ID;
 								}
 							} else {
-								  $downloadable_product_id = explode( '__', $downloadable_product_id );
-								 $downloadable_product_id = isset( $downloadable_product_id[1] ) ? $downloadable_product_id[1] : $downloadable_product_id[0];
+								  $downloadable_product_id = explode('__', $downloadable_product_id);
+								 $downloadable_product_id = isset($downloadable_product_id[1]) ? $downloadable_product_id[1] : $downloadable_product_id[0];
 							}
 
 							$link = wpshop_attributes::get_attribute_option_output(
@@ -117,50 +117,50 @@ 
 								'is_downloadable_', 'file_url', $order
 							);
 
-							if ( false !== $link ) {
+							if (false !== $link) {
 								$uploads = wp_upload_dir();
 								$basedir = $uploads['basedir'];
-								$pos = strpos( $link, 'uploads' );
-								$link = $basedir . substr( $link,$pos + 7 );
+								$pos = strpos($link, 'uploads');
+								$link = $basedir . substr($link, $pos + 7);
 								/** If plugin is encrypted */
-								$encrypted_plugin_path = get_post_meta( $oid, '_download_file_path_' . $oid . '_' . ( ( ! empty( $variation_id ) && get_post_type( $variation_id ) === WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) ? $variation_id : $downloadable_product_id ), true );
-								if ( ! empty( $encrypted_plugin_path ) ) {
+								$encrypted_plugin_path = get_post_meta($oid, '_download_file_path_' . $oid . '_' . ((!empty($variation_id) && get_post_type($variation_id) === WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) ? $variation_id : $downloadable_product_id), true);
+								if (!empty($encrypted_plugin_path)) {
 									$link = WPSHOP_UPLOAD_DIR . $encrypted_plugin_path;
 									$is_encrypted = true;
 								}
 
-								$overload_force_download = apply_filters( 'wps_download_file_overload_force_download', false );
-								if ( ! $overload_force_download ) {
-									wpshop_tools::forceDownload( $link, $is_encrypted );
+								$overload_force_download = apply_filters('wps_download_file_overload_force_download', false);
+								if (!$overload_force_download) {
+									wpshop_tools::forceDownload($link, $is_encrypted);
 								} else {
-									wpshop_tools::wpshop_safe_redirect( str_replace( WP_CONTENT_DIR, WP_CONTENT_URL, $link ) );
+									wpshop_tools::wpshop_safe_redirect(str_replace(WP_CONTENT_DIR, WP_CONTENT_URL, $link));
 								}
 							}
 						}// End if().
 					}// End foreach().
 				}// End if().
 			} else {
-				wp_redirect( get_permalink( wpshop_tools::get_page_id( get_option( 'wpshop_myaccount_page_id' ) ) ) );
+				wp_redirect(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))));
 			}// End if().
 		}// End if().
-		esc_html_e( 'Impossible to download the file you requested', 'wpshop' );
+		esc_html_e('Impossible to download the file you requested', 'wpshop');
 	}
 
-	public function wps_after_check_order_payment_total_amount( $order_id ) {
-		$order_meta = ( ! empty( $order_meta ) ) ? false : get_post_meta( $order_id, '_order_postmeta', true );
+	public function wps_after_check_order_payment_total_amount($order_id) {
+		$order_meta = (!empty($order_meta)) ? false : get_post_meta($order_id, '_order_postmeta', true);
 		/** Check if the order content a downloadable product **/
-		if ( ! empty( $order_meta ) && ! empty( $order_meta['order_items'] ) && ! empty( $order_meta['order_status'] ) && 'completed' === $order_meta['order_status'] ) {
-			foreach ( $order_meta['order_items'] as $key_value => $item ) {
-				$link = self::get_product_download_link( $order_id, $item );
-				if ( false === $link ) {
+		if (!empty($order_meta) && !empty($order_meta['order_items']) && !empty($order_meta['order_status']) && 'completed' === $order_meta['order_status']) {
+			foreach ($order_meta['order_items'] as $key_value => $item) {
+				$link = self::get_product_download_link($order_id, $item);
+				if (false === $link) {
 					\eoxia\log_class::exec(
 						get_class(),
 						get_class(),
 						sprintf(
-							__( 'Failure returned at order link generation. UserID : <b>%1$d</b>, ProductID : <b>%2$d</d>, UserMeta : <pre>%3$s</pre>', 'wpshop' ),
-							(int) get_current_user_id(),
-							(int) $item['item_id'],
-							get_user_meta( get_current_user_id(), '_order_download_codes_' . $order_id, true )
+							__('Failure returned at order link generation. UserID : <b>%1$d</b>, ProductID : <b>%2$d</d>, UserMeta : <pre>%3$s</pre>', 'wpshop'),
+							(int)get_current_user_id(),
+							(int)$item['item_id'],
+							get_user_meta(get_current_user_id(), '_order_download_codes_' . $order_id, true)
 						),
 						array(
 							'object_id' => $order_id,
@@ -168,7 +168,7 @@ 
 						0
 					);
 				} else {
-					$link = '<a href="' . esc_url( $link ) . '" target="_blank">' . __( 'Download the product', 'wpshop' ) . '</a>';
+					$link = '<a href="' . esc_url($link) . '" target="_blank">' . __('Download the product', 'wpshop') . '</a>';
 					$wps_message->wpshop_prepared_email(
 						$email,
 						'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE',

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

Spacing +29 added lines, -29 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
 				$id1 = uniqid();
 			?>
-			<input id="question_combine_options_<?php echo intval( $id1 ); ?>" name="question_combine_options" type="radio" value="combine">
-			<label for="question_combine_options_<?php echo intval( $id1 ); ?>"><?php esc_html_e( 'Combined options', 'wpshop' ); ?></label>
+			<input id="question_combine_options_<?php echo intval($id1); ?>" name="question_combine_options" type="radio" value="combine">
+			<label for="question_combine_options_<?php echo intval($id1); ?>"><?php esc_html_e('Combined options', 'wpshop'); ?></label>
 			<?php
 				$id2 = uniqid();
 			?>
-			<input id="question_combine_options_<?php echo intval( $id2 ); ?>" name="question_combine_options" type="radio" value="single">
-			<label for="question_combine_options_<?php echo intval( $id2 ); ?>"><?php esc_html_e( 'Distinct options', 'wpshop' ); ?></label>
+			<input id="question_combine_options_<?php echo intval($id2); ?>" name="question_combine_options" type="radio" value="single">
+			<label for="question_combine_options_<?php echo intval($id2); ?>"><?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 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 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">
@@ -98,7 +98,7 @@ 
 			<input type="text" pattern="[0-9]+(\.[0-9][0-9]?)?" onchange="wps_variations_price_option_raw.control.price(this)" align="right" value="%price_value%">
 		</li>
 		<li class="wps_variations_price_final_col">
-			<input type="hidden" name="wps_pdt_variations[%ID%][attribute][decimal][<?php echo (!empty($price_piloting) && $price_piloting != 'HT') ? 'product_price' : 'price_ht' ; ?>]" value="%price_option%">
+			<input type="hidden" name="wps_pdt_variations[%ID%][attribute][decimal][<?php echo (!empty($price_piloting) && $price_piloting != 'HT') ? 'product_price' : 'price_ht'; ?>]" value="%price_option%">
 			<b>%price_option%%currency%</b> %piloting%
 		</li>
 		<li class="wps_variations_price_vat_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 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 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 apply_filters( 'wps_filters_product_variation_extra_columns_content', '' ); ?>
+		<?php echo 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>