Eoxia / wpshop

includes/librairies/payments/payment.class.php

Doc Comments +10 added lines, -2 removed lines

@@ -38,6 +38,10 @@ 
 		return $url;
 	}
 
+	/**
+	 * @param string $param
+	 * @param string $value
+	 */
 	public static function construct_url_parameters($url, $param, $value) {
 		$interoguation_marker_pos = strpos($url, '?');
 		if($interoguation_marker_pos===false)
@@ -86,7 +90,7 @@ 
 	 * Display the list of payment methods available
 	 *
 	 * @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
+	 * @return string[] The different payment method
 	 */
 	function __display_payment_methods_choice_form($order_id=0, $cart_type = 'cart') {
 		$output = '';
@@ -250,6 +254,9 @@ 
 	}
 
 
+	/**
+	 * @param string|null $payment_status
+	 */
 	function setOrderPaymentStatus( $order_id, $payment_status ) {
 		/**	Get order main information	*/
 		$order = get_post_meta($order_id, '_order_postmeta', true);
@@ -377,7 +384,7 @@ 
 	 * Allows to inform customer that he would pay a partial amount on this order
 	 *
 	 * @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
+	 * @return string The amount to pay / A html output with amount to pay and different information
 	 */
 	function partial_payment_calcul( $current_order_total, $for = 'for_all' ) {
 		$output = '';
@@ -482,6 +489,7 @@ 
 	 * @param array $order_meta The complete order meta informations
 	 * @param integer $payment_index The payment to add/update data for
 	 * @param array $params : infos sended by the bank, array structure : ('method', 'waited amount', 'status', 'author', 'payment reference', 'date', 'received amount')
+	 * @param integer $order_id
 	 * @return array The order new meta informations
 	 */
 	public static function add_new_payment_to_order( $order_id, $order_meta, $payment_index, $params, $bank_response ) {

Spacing +188 added lines, -188 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,26 +588,26 @@ 
 					update_post_meta($order_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '_completed_date', current_time('mysql', 0));
 
 					/** Check if the order content a downloadable product **/
-					if ( ! empty( $order_meta['order_items'] ) ) {
-						foreach ( $order_meta['order_items'] as $key_value => $item ) {
-							$link = wps_download_file_ctr::get_product_download_link( $order_id, $item );
-							if ( false !== $link ) {
-								$link = '<a href="' . $link . '" target="_blank">' . __( 'Download the product', 'wpshop' ) . '</a>';
-								$wps_message->wpshop_prepared_email( $email, 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE', array( 'order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'download_product_link' => $link ), array() );
+					if (!empty($order_meta['order_items'])) {
+						foreach ($order_meta['order_items'] as $key_value => $item) {
+							$link = wps_download_file_ctr::get_product_download_link($order_id, $item);
+							if (false !== $link) {
+								$link = '<a href="' . $link . '" target="_blank">' . __('Download the product', 'wpshop') . '</a>';
+								$wps_message->wpshop_prepared_email($email, 'WPSHOP_DOWNLOADABLE_FILE_IS_AVAILABLE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'download_product_link' => $link), array());
 							}
 						}
 					}
 
 					// 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';
 					}
 				}
@@ -616,27 +616,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 {
@@ -644,13 +644,13 @@ 
 			}
 
 			$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);
 		}
 	}
 
@@ -662,11 +662,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;
@@ -685,26 +685,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 {
@@ -715,16 +715,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;

includes/modules/wps_download_file/controller/wps_download_file_ctr.php

Doc Comments +4 added lines

@@ -7,6 +7,10 @@
 	}
 
 	// Function to find download link by
+
+	/**
+	 * @param integer $oid
+	 */
 	public static function get_product_download_link( $oid, $item ) {
 		$parent_def = array();
 		$item_id = $item['item_id'];

Spacing +47 added lines, -47 removed lines

@@ -1,19 +1,19 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?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('admin_post_wps_download_file', array($this, 'wps_download_file'));
+		add_action('admin_post_nopriv_wps_download_file', array($this, 'wps_download_file'));
 	}
 
 	// Function to find download link by
-	public static function get_product_download_link( $oid, $item ) {
+	public static function get_product_download_link($oid, $item) {
 		$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;
 			}
@@ -22,20 +22,20 @@ 
 		$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_'] ) ) {
-				$downloadable_option_value = $wpdb->get_var( $wpdb->prepare( 'SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $parent_meta['is_downloadable_'] ) );
-				if ( ! empty( $downloadable_option_value ) ) {
+			if (!empty($parent_meta['is_downloadable_'])) {
+				$downloadable_option_value = $wpdb->get_var($wpdb->prepare('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $parent_meta['is_downloadable_']));
+				if (!empty($downloadable_option_value)) {
 					$item['item_is_downloadable_'] = $downloadable_option_value;
 				}
 			}
 		}
-		if ( ! empty( $item ) && ! empty( $item['item_is_downloadable_'] ) && ( strtolower( __( $item['item_is_downloadable_'], 'wpshop' ) ) === strtolower( __( 'Yes', 'wpshop' ) ) ) ) {
+		if (!empty($item) && !empty($item['item_is_downloadable_']) && (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;
 					}
 				}
@@ -43,20 +43,20 @@ 
 		}
 
 		/** 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']);
 			}
 		}
 		return $download_link;
@@ -64,31 +64,31 @@ 
 
 	// Download product downloadable
 	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( /*wps_customer_ctr::get_author_id_by_customer_id(*/ $order['customer_id'] /*)*/, '_order_download_codes_'.$oid, true);
-				if ( !empty($download_codes) && is_array($download_codes) ) {
-					foreach ( $download_codes as $downloadable_product_id => $d ) {
+			if (!empty($order) && !empty($order['customer_id'])) {
+				$download_codes = get_user_meta( /*wps_customer_ctr::get_author_id_by_customer_id(*/ $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 ) {
-							wpshop_tools::create_custom_hook ('encrypt_actions_for_downloadable_product', array( 'order_id' => $oid, 'download_product_id' => $downloadable_product_id ) );
+						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(
@@ -96,24 +96,24 @@ 
 								'is_downloadable_', 'file_url', $order
 							);
 
-							if ( $link !== false ) {
+							if ($link !== false) {
 								$uploads = wp_upload_dir();
 								$basedir = $uploads['basedir'];
 								$pos = strpos($link, 'uploads');
-								$link = $basedir.substr($link,$pos+7);
+								$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) ) {
-									$link = WPSHOP_UPLOAD_DIR.$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 ) {
+								$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));
 								}
 							}
 						}
@@ -121,7 +121,7 @@ 
 				}
 			}
 			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'))));
 			}
 		}
 		echo __('Impossible to download the file you requested', 'wpshop');

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

Spacing +32 added lines, -32 removed lines

@@ -1,91 +1,91 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <li class="wps-clearfix" id="wps_product_<?php echo $product_key; ?>">
 	<div class="wps-cart-item-img">
-		<?php if ( !$auto_added_product ) : ?><a href="<?php echo get_permalink( $item_id ); ?>" title="<?php echo $item_title; ?>"><?php endif; ?>
-			<?php echo get_the_post_thumbnail($item['item_id'], 'thumbnail' ); ?>
-		<?php if ( !$auto_added_product ) : ?></a><?php endif; ?>
+		<?php if (!$auto_added_product) : ?><a href="<?php echo get_permalink($item_id); ?>" title="<?php echo $item_title; ?>"><?php endif; ?>
+			<?php echo get_the_post_thumbnail($item['item_id'], 'thumbnail'); ?>
+		<?php if (!$auto_added_product) : ?></a><?php endif; ?>
 	</div>
 	<div class="wps-cart-item-content">
-		<?php if ( !$auto_added_product && get_post_status( $item_id ) != 'free_product' ) : ?><a href="<?php echo get_permalink( $item_id ); ?>" title="<?php echo $item_title; ?>"><?php endif; ?>
+		<?php if (!$auto_added_product && get_post_status($item_id) != 'free_product') : ?><a href="<?php echo get_permalink($item_id); ?>" title="<?php echo $item_title; ?>"><?php endif; ?>
 			<?php echo $item_title; ?>
-		<?php if ( !$auto_added_product && get_post_status( $item_id ) != 'free_product' ) : ?></a><?php endif; ?>
+		<?php if (!$auto_added_product && get_post_status($item_id) != 'free_product') : ?></a><?php endif; ?>
 
 		<?php echo $variations_indicator; ?>
 
-		<?php if ( !empty( $cart_content ) && !empty( $cart_content[ 'order_status' ] ) && ( 'completed' == $cart_content[ 'order_status' ] ) && ( empty($cart_type) || ( !empty($cart_type) && $cart_type == 'summary' ) ) ) : ?>
+		<?php if (!empty($cart_content) && !empty($cart_content['order_status']) && ('completed' == $cart_content['order_status']) && (empty($cart_type) || (!empty($cart_type) && $cart_type == 'summary'))) : ?>
 			<?php echo $download_link; ?>
 		<?php endif; ?>
 
-		<?php echo apply_filters( 'wps_order_item_content_column', '', $item, $oid, $cart_content ); ?>
+		<?php echo apply_filters('wps_order_item_content_column', '', $item, $oid, $cart_content); ?>
 	</div>
 
-	<?php if( $cart_option == 'simplified_et' ) : ?>
+	<?php if ($cart_option == 'simplified_et') : ?>
 	<div class="wps-cart-item-unit-price">
 		<span class="wps-price">
 			<?php
 				$price_ati_to_display = $item['item_pu_ttc'];
-				if ( !empty( $item[ 'item_amount_to_pay_now' ] ) ) {
-					$price_ati_to_display = $item[ 'item_amount_to_pay_now' ];
+				if (!empty($item['item_amount_to_pay_now'])) {
+					$price_ati_to_display = $item['item_amount_to_pay_now'];
 				}
 			?>
-		 <?php echo wpshop_tools::formate_number( $price_ati_to_display ); ?><span><?php echo $currency; ?></span>
+		 <?php echo wpshop_tools::formate_number($price_ati_to_display); ?><span><?php echo $currency; ?></span>
 		</span>
 	</div>
 	<?php endif; ?>
 
-	<?php if( $cart_option == 'full_cart' ) : ?>
+	<?php if ($cart_option == 'full_cart') : ?>
 	<div class="wps-cart-item-unit-price wps-cart-item-unit-price-et">
-		<span class="wps-price"> <?php echo wpshop_tools::formate_number( $item['item_pu_ht'] ); ?><span><?php echo $currency; ?></span></span>
+		<span class="wps-price"> <?php echo wpshop_tools::formate_number($item['item_pu_ht']); ?><span><?php echo $currency; ?></span></span>
 	</div>
 	<?php endif; ?>
 
-	<?php if( $cart_option == 'full_cart' || $cart_option == 'simplified_ati' ) : ?>
-	<div class="wps-cart-item-unit-price<?php echo ( $cart_option == 'full_cart' ) ? " wps-cart-item-unit-price-ati" : ""; ?>">
-		<span class="wps-price"> <?php echo wpshop_tools::formate_number( $item['item_pu_ttc'] ); ?><span><?php echo $currency; ?></span></span>
+	<?php if ($cart_option == 'full_cart' || $cart_option == 'simplified_ati') : ?>
+	<div class="wps-cart-item-unit-price<?php echo ($cart_option == 'full_cart') ? " wps-cart-item-unit-price-ati" : ""; ?>">
+		<span class="wps-price"> <?php echo wpshop_tools::formate_number($item['item_pu_ttc']); ?><span><?php echo $currency; ?></span></span>
 	</div>
 	<?php endif; ?>
 
 	<div class="wps-cart-item-quantity wps-productQtyForm">
-		<?php if ( ( empty($cart_type) || ( !empty($cart_type) ) ) && !$auto_added_product  ) : ?>
-			<?php if(  $cart_type != 'summary'  && ( $cart_type != 'admin-panel' || ( $cart_type == 'admin-panel' && ( empty( $cart_content['order_status'] ) || $cart_content['order_status'] == 'awaiting_payment' ) ) ) ) : ?>
+		<?php if ((empty($cart_type) || (!empty($cart_type))) && !$auto_added_product) : ?>
+			<?php if ($cart_type != 'summary' && ($cart_type != 'admin-panel' || ($cart_type == 'admin-panel' && (empty($cart_content['order_status']) || $cart_content['order_status'] == 'awaiting_payment')))) : ?>
 				<a href="" class="wps-cart-reduce-product-qty"><i class="wps-icon-minus"></i></a>
-				<input type="text" name="french-hens" id="wps-cart-product-qty-<?php echo $product_key; ?>" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_set_qty_for_product_into_cart' ); ?>" value="<?php echo $item['item_qty']; ?>" class="wps-circlerounded wps-cart-product-qty">
+				<input type="text" name="french-hens" id="wps-cart-product-qty-<?php echo $product_key; ?>" data-nonce="<?php echo wp_create_nonce('ajax_wpshop_set_qty_for_product_into_cart'); ?>" value="<?php echo $item['item_qty']; ?>" class="wps-circlerounded wps-cart-product-qty">
 				<a href="" class="wps-cart-add-product-qty"><i class="wps-icon-plus"></i></a>
 				<?php else : ?>
 					<?php echo $item['item_qty']; ?>
-				<?php endif;?>
-		<?php elseif ( $auto_added_product ) : ?>
+				<?php endif; ?>
+		<?php elseif ($auto_added_product) : ?>
 			1
 		<?php else : ?>
 			<?php echo $item['item_qty']; ?>
 		<?php endif; ?>
 	</div>
 
-	<?php if( $cart_option == 'full_cart' || $cart_option == 'simplified_et' ) : ?>
+	<?php if ($cart_option == 'full_cart' || $cart_option == 'simplified_et') : ?>
 	<div class="wps-cart-item-price">
-    	<span class="wps-price"> <?php echo wpshop_tools::formate_number( $item['item_total_ht'] ); ?><span><?php echo $currency; ?></span></span>
-    	<span class="wps-tva"><?php _e( 'ET', 'wpshop'); ?></span>
+    	<span class="wps-price"> <?php echo wpshop_tools::formate_number($item['item_total_ht']); ?><span><?php echo $currency; ?></span></span>
+    	<span class="wps-tva"><?php _e('ET', 'wpshop'); ?></span>
 	</div>
 	<?php endif; ?>
 
-	<?php if( $cart_option == 'full_cart' || $cart_option == 'simplified_ati' ) : ?>
+	<?php if ($cart_option == 'full_cart' || $cart_option == 'simplified_ati') : ?>
 	<div class="wps-cart-item-price">
 			<?php
 				$price_total_to_display = $item['item_total_ttc'];
-				if ( !empty( $item[ 'item_amount_to_pay_now' ] ) ) {
-					$price_total_to_display = $item[ 'item_amount_to_pay_now' ] * $item['item_qty'];
+				if (!empty($item['item_amount_to_pay_now'])) {
+					$price_total_to_display = $item['item_amount_to_pay_now'] * $item['item_qty'];
 				}
 			?>
-    	<span class="wps-price"> <?php echo wpshop_tools::formate_number( $price_total_to_display ); ?><span><?php echo $currency; ?></span></span>
+    	<span class="wps-price"> <?php echo wpshop_tools::formate_number($price_total_to_display); ?><span><?php echo $currency; ?></span></span>
 	</div>
 	<?php endif; ?>
 
 
-	<?php if ( empty($cart_type) || ( !empty($cart_type) && $cart_type != 'summary' ) ) : ?>
+	<?php if (empty($cart_type) || (!empty($cart_type) && $cart_type != 'summary')) : ?>
 	<div class="wps-cart-item-close">
-		<?php if( $cart_type != 'admin-panel' || ( $cart_type == 'admin-panel' && ( empty( $cart_content['order_status'] ) || $cart_content['order_status'] == 'awaiting_payment' ) ) ) : ?>
-		<?php if ( !$auto_added_product ) : ?><button type="button" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_set_qty_for_product_into_cart' ); ?>" class="wps-bton-icon wps_cart_delete_product" id="wps-close-<?php echo $product_key; ?>"><i class="wps-icon-close"></i></button><?php endif; ?>
+		<?php if ($cart_type != 'admin-panel' || ($cart_type == 'admin-panel' && (empty($cart_content['order_status']) || $cart_content['order_status'] == 'awaiting_payment'))) : ?>
+		<?php if (!$auto_added_product) : ?><button type="button" data-nonce="<?php echo wp_create_nonce('ajax_wpshop_set_qty_for_product_into_cart'); ?>" class="wps-bton-icon wps_cart_delete_product" id="wps-close-<?php echo $product_key; ?>"><i class="wps-icon-close"></i></button><?php endif; ?>
 		<?php endif; ?>
 	</div>
 	<?php endif; ?>

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

Spacing +39 added lines, -39 removed lines

@@ -1,97 +1,97 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if( !$account_origin ) : ?>
+<?php if (!defined('ABSPATH')) exit;
+ if (!$account_origin) : ?>
 <div id="wps_cart_error_container" class="wps-alert-error"></div>
 <?php endif; ?>
 <ul class="wps-fullcart">
 	<li class="wps-clearfix cart_header">
 		<div class="wps-cart-item-img"></div>
 
-		<div class="wps-cart-item-content"><?php _e( 'Product name', 'wpshop'); ?></div>
+		<div class="wps-cart-item-content"><?php _e('Product name', 'wpshop'); ?></div>
 
-		<?php if( $cart_option == 'full_cart' || $cart_option == 'simplified_ati' ) : ?>
-		<div class="wps-cart-item-unit-price"><?php _e( 'P.U', 'wpshop' ); ?></div>
+		<?php if ($cart_option == 'full_cart' || $cart_option == 'simplified_ati') : ?>
+		<div class="wps-cart-item-unit-price"><?php _e('P.U', 'wpshop'); ?></div>
 		<?php endif; ?>
-		<?php if( $cart_option == 'simplified_et' ) : ?>
-		<div class="wps-cart-item-unit-price"><?php _e( 'Unit price ET', 'wpshop' ); ?></div>
+		<?php if ($cart_option == 'simplified_et') : ?>
+		<div class="wps-cart-item-unit-price"><?php _e('Unit price ET', 'wpshop'); ?></div>
 		<?php endif; ?>
 
-		<div class="wps-cart-item-quantity"><?php _e( 'Qty', 'wpshop'); ?></div>
+		<div class="wps-cart-item-quantity"><?php _e('Qty', 'wpshop'); ?></div>
 
-		<?php if( $cart_option == 'full_cart' || $cart_option == 'simplified_ati' ) : ?>
-		<div class="wps-cart-item-price"><?php _e( 'Total', 'wpshop' ); ?></div>
+		<?php if ($cart_option == 'full_cart' || $cart_option == 'simplified_ati') : ?>
+		<div class="wps-cart-item-price"><?php _e('Total', 'wpshop'); ?></div>
 		<?php endif; ?>
-		<?php if( $cart_option == 'simplified_et' ) : ?>
-		<div class="wps-cart-item-price"><?php _e( 'Total ET', 'wpshop' ); ?></div>
+		<?php if ($cart_option == 'simplified_et') : ?>
+		<div class="wps-cart-item-price"><?php _e('Total ET', 'wpshop'); ?></div>
 		<?php endif; ?>
-		<?php if ( empty($cart_type) || ( !empty($cart_type) && $cart_type != 'summary' ) ) : ?>
+		<?php if (empty($cart_type) || (!empty($cart_type) && $cart_type != 'summary')) : ?>
 		<div class="wps-cart-item-close"></div>
 		<?php endif; ?>
 	</li>
 
 	<?php
-		foreach( $cart_items as $item_id => $item ) :
+		foreach ($cart_items as $item_id => $item) :
 			$product_key = $item_id;
 			/** Check if it's a product or a variation **/
-			$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails( get_post_meta($item['item_id'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true)  ) ;
+			$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($item['item_id'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
 			$output_order = array();
-			if ( count($product_attribute_order_detail) > 0  && is_array($product_attribute_order_detail) ) {
-				foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
-					foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-						if ( !empty($attribute_def->code) )
+			if (count($product_attribute_order_detail) > 0 && is_array($product_attribute_order_detail)) {
+				foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
+					foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
+						if (!empty($attribute_def->code))
 							$output_order[$attribute_def->code] = $position;
 					}
 				}
 			}
-			$variation_attribute_ordered = wpshop_products::get_selected_variation_display( $item['item_meta'], $output_order, 'cart' );
+			$variation_attribute_ordered = wpshop_products::get_selected_variation_display($item['item_meta'], $output_order, 'cart');
 			ksort($variation_attribute_ordered['attribute_list']);
 			$variations_indicator = '';
-			if( !empty($variation_attribute_ordered['attribute_list']) ) {
+			if (!empty($variation_attribute_ordered['attribute_list'])) {
 
 				$variations_indicator .= '<ul class="wps-cart-item-variations" >';
-				foreach ( $variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output ) {
-					if ( !empty($attribute_variation_to_output) ) {
+				foreach ($variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output) {
+					if (!empty($attribute_variation_to_output)) {
 						$variations_indicator .= $attribute_variation_to_output;
 					}
 				}
-				$variations_indicator = apply_filters( 'wps_cart_item_variation_list', $variations_indicator, $variation_attribute_ordered, $item, $oid );
+				$variations_indicator = apply_filters('wps_cart_item_variation_list', $variations_indicator, $variation_attribute_ordered, $item, $oid);
 				$variations_indicator .= '</ul>';
 
 			}
 
 			$item_title = $item['item_name'];
-			$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;
 				}
 			}
 
-			$download_link = wps_download_file_ctr::get_product_download_link( $oid, $item );
-			if ( false === $download_link ) {
+			$download_link = wps_download_file_ctr::get_product_download_link($oid, $item);
+			if (false === $download_link) {
 				$download_link = '';
 			} else {
-				$download_link = '<a href="' . $download_link . '" target="_blank" class="wps-bton-fourth-mini-rounded">' . __( 'Download the product', 'wpshop' ) . '</a>';
+				$download_link = '<a href="' . $download_link . '" target="_blank" class="wps-bton-fourth-mini-rounded">' . __('Download the product', 'wpshop') . '</a>';
 			}
 
 			/**	Check if product is an auto added product : don't display link to product, quantity and remover 	*/
 			$auto_added_product = false;
-			$item_options = get_post_meta( $item_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', true );
-			if ( ! empty( $item_options['cart'] ) && ! empty( $item_options['cart']['auto_add'] ) && ( $item_options['cart']['auto_add'] == 'yes' ) ) :
+			$item_options = get_post_meta($item_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', true);
+			if (!empty($item_options['cart']) && !empty($item_options['cart']['auto_add']) && ($item_options['cart']['auto_add'] == 'yes')) :
 				$auto_added_product = true;
 			endif;
 
-			require( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR,"frontend", "cart/cart", "item") );
+			require(wpshop_tools::get_template_part(WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "cart/cart", "item"));
 		endforeach;
 	?>
 </ul>
-<?php if( ! is_admin() ) {
-	require_once( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR,"frontend", "cart/cart", "total") );
+<?php if (!is_admin()) {
+	require_once(wpshop_tools::get_template_part(WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "cart/cart", "total"));
 } else {
-	require_once( WPS_CART_TPL_DIR . "frontend/cart/cart-total.php" );
+	require_once(WPS_CART_TPL_DIR . "frontend/cart/cart-total.php");
 } ?>
-<?php if ( empty($cart_type) || ( !empty($cart_type) && $cart_type != 'summary' ) ) : ?>
-<?php echo apply_filters( 'wps_cart_footer_extra_content', ''); ?>
+<?php if (empty($cart_type) || (!empty($cart_type) && $cart_type != 'summary')) : ?>
+<?php echo apply_filters('wps_cart_footer_extra_content', ''); ?>
 <?php endif?>

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  if( !$account_origin ) : ?>
 <div id="wps_cart_error_container" class="wps-alert-error"></div>
 <?php endif; ?>
@@ -37,8 +39,9 @@ 
 			if ( count($product_attribute_order_detail) > 0  && is_array($product_attribute_order_detail) ) {
 				foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
 					foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-						if ( !empty($attribute_def->code) )
-							$output_order[$attribute_def->code] = $position;
+						if ( !empty($attribute_def->code) ) {
+													$output_order[$attribute_def->code] = $position;
+						}
 					}
 				}
 			}