Eoxia / wpshop

includes/librairies/purchase/orders.class.php

Doc Comments +6 added lines, -2 removed lines

@@ -261,7 +261,7 @@ 
 
 
 	/** Renvoi une nouvelle r�f�rence unique pour une commande
-	* @return int
+	* @return string
 	*/
 	public static function get_new_order_reference(){
 		$number_figures = get_option('wpshop_order_number_figures', false);
@@ -282,7 +282,7 @@ 
 	}
 
 	/** Renvoi une nouvelle r�f�rence unique pour un devis
-	* @return int
+	* @return string
 	*/
 	public static function get_new_pre_order_reference($save = true){
 		$number_figures = get_option('wpshop_order_number_figures', false);
@@ -662,6 +662,10 @@ 
 
 		return $output;
 	}
+
+	/**
+	 * @param boolean $state
+	 */
 	static function display_customer_pay_quotation( $state, $oid ) {
 		$btn = '<p><a role="button" data-nonce="' . wp_create_nonce( 'wps_quotation_is_payable_by_customer' ) . '" class="wps-bton-' . ( ( $state ) ? 'third' : 'second' ) . '-mini-rounded quotation_is_payable_by_customer" href="#" >'.__('Valid quotation', 'wpshop').'</a></p>';
 		if( $state ) {

Spacing +137 added lines, -137 removed lines

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

includes/modules/wps_orders/controller/wps_orders_in_back_office.php

Spacing +196 added lines, -196 removed lines

@@ -1,26 +1,26 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_orders_in_back_office {
 
 	function __construct() {
 		// Template loading
 		$this->template_dir = WPS_ORDERS_PATH . WPS_ORDERS_DIR . "/templates/";
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes') );
+		add_action('add_meta_boxes', array($this, 'add_meta_boxes'));
 
 		// Ajax actions
-		add_action('wp_ajax_wpshop_add_private_comment_to_order', array( $this, 'wpshop_add_private_comment_to_order' ) );
-		add_action('wp_ajax_wps_order_refresh_product_listing', array( $this, 'refresh_product_list' ) );
-		add_action('wp_ajax_wps_add_product_to_order_admin', array( $this, 'wps_add_product_to_order_admin' ) );
-		add_action('wp_ajax_wps_refresh_cart_order', array( $this, 'refresh_cart_order' ) );
-		add_action('wp_ajax_wps_refresh_payments_order', array( $this, 'refresh_payments_order' ) );
-		add_action('wp_ajax_wps_update_product_qty_in_admin', array( $this, 'wps_update_product_qty_in_admin' ) );
-		add_action('wp_ajax_wps_order_load_product_variations', array( $this, 'wps_order_load_product_variations' ) );
-		add_action('wp_ajax_wps-orders-update-cart-informations', array( $this, 'wps_orders_update_cart_informations' ) );
-		add_action('wp_ajax_wps_reverify_payment_invoice_ref', array( $this, 'wps_reverify_payment_invoice_ref' ) );
+		add_action('wp_ajax_wpshop_add_private_comment_to_order', array($this, 'wpshop_add_private_comment_to_order'));
+		add_action('wp_ajax_wps_order_refresh_product_listing', array($this, 'refresh_product_list'));
+		add_action('wp_ajax_wps_add_product_to_order_admin', array($this, 'wps_add_product_to_order_admin'));
+		add_action('wp_ajax_wps_refresh_cart_order', array($this, 'refresh_cart_order'));
+		add_action('wp_ajax_wps_refresh_payments_order', array($this, 'refresh_payments_order'));
+		add_action('wp_ajax_wps_update_product_qty_in_admin', array($this, 'wps_update_product_qty_in_admin'));
+		add_action('wp_ajax_wps_order_load_product_variations', array($this, 'wps_order_load_product_variations'));
+		add_action('wp_ajax_wps-orders-update-cart-informations', array($this, 'wps_orders_update_cart_informations'));
+		add_action('wp_ajax_wps_reverify_payment_invoice_ref', array($this, 'wps_reverify_payment_invoice_ref'));
 
 		// WP General actions
-		add_action( 'admin_enqueue_scripts', array( $this, 'wps_orders_scripts') );
-		add_action( 'admin_enqueue_scripts', array( $this, 'wps_orders_scripts_texts' ), 20 );
-		add_action('save_post', array( $this, 'save_order_custom_informations'));
+		add_action('admin_enqueue_scripts', array($this, 'wps_orders_scripts'));
+		add_action('admin_enqueue_scripts', array($this, 'wps_orders_scripts_texts'), 20);
+		add_action('save_post', array($this, 'save_order_custom_informations'));
 
 		// WP Filters
 		//add_filter( 'wps_order_saving_admin_extra_action', array( $this, 'wps_notif_user_on_order_saving'), 100, 2 );
@@ -31,51 +31,51 @@ 
 	 */
 	function wps_orders_scripts() {
 		global $current_screen;
-		if( ! in_array( $current_screen->post_type, array( WPSHOP_NEWTYPE_IDENTIFIER_ORDER ), true ) )
+		if (!in_array($current_screen->post_type, array(WPSHOP_NEWTYPE_IDENTIFIER_ORDER), true))
 			return;
 
-		wp_enqueue_script( 'wps_orders_backend', WPS_ORDERS_URL.WPS_ORDERS_DIR.'/assets/backend/js/wps_orders.js' );
+		wp_enqueue_script('wps_orders_backend', WPS_ORDERS_URL . WPS_ORDERS_DIR . '/assets/backend/js/wps_orders.js');
 	}
 
 	function wps_orders_scripts_texts() {
-		wp_localize_script( 'wps_orders_backend', 'message_confirm_reload', __( 'Are you sure you want to refresh your browser?', 'wpshop' ) );
-		wp_localize_script( 'wps_orders_backend', 'message_error_reverify_payment_invoice_ref', __( 'Error detected.', 'wpshop' ) );
+		wp_localize_script('wps_orders_backend', 'message_confirm_reload', __('Are you sure you want to refresh your browser?', 'wpshop'));
+		wp_localize_script('wps_orders_backend', 'message_error_reverify_payment_invoice_ref', __('Error detected.', 'wpshop'));
 	}
 	/**
 	 * Add meta boxes
 	 */
 	function add_meta_boxes() {
 		global $post;
-		$order_meta = get_post_meta( $post->ID, '_order_postmeta', true );
+		$order_meta = get_post_meta($post->ID, '_order_postmeta', true);
 		/** Box  Order Payments **/
-		if( !in_array( $post->post_status, array( 'auto-draft' ) ) ) {
-			add_meta_box('wpshop_order_payment', '<span class="dashicons dashicons-money"></span> '.__('Order payment', 'wpshop'),array($this, 'display_order_payments_box'),WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'side', 'low');
+		if (!in_array($post->post_status, array('auto-draft'))) {
+			add_meta_box('wpshop_order_payment', '<span class="dashicons dashicons-money"></span> ' . __('Order payment', 'wpshop'), array($this, 'display_order_payments_box'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'side', 'low');
 		}
 		/**	Box for customer order comment */
-		if ( ! empty( $post->post_excerpt ) ) {
-			add_meta_box('wpshop_order_customer_comment', '<span class="dashicons dashicons-format-status"></span> '.__('Order customer comment', 'wpshop'),array( $this, 'order_customer_comment_box'),WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'side', 'low');
+		if (!empty($post->post_excerpt)) {
+			add_meta_box('wpshop_order_customer_comment', '<span class="dashicons dashicons-format-status"></span> ' . __('Order customer comment', 'wpshop'), array($this, 'order_customer_comment_box'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'side', 'low');
 		}
 		/** Historic sales **/
-		add_meta_box('wpshop_product_order_historic', __('Sales informations', 'wpshop'), array( $this, 'meta_box_product_sale_informations'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'low');
+		add_meta_box('wpshop_product_order_historic', __('Sales informations', 'wpshop'), array($this, 'meta_box_product_sale_informations'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'low');
 		/**	Box with the complete order content	*/
 		$payment_started = false;
-		if ( ! empty( $order_meta['order_payment'] ) && ! empty( $order_meta['order_payment']['received'] ) ) {
-			foreach ( $order_meta['order_payment']['received'] as $received ) {
-				if ( empty( $received['received_amount'] ) ) {
+		if (!empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['received'])) {
+			foreach ($order_meta['order_payment']['received'] as $received) {
+				if (empty($received['received_amount'])) {
 					continue;
 				}
 				$payment_started = true;
 				break;
 			}
 		}
-		if ( ! $payment_started ) {
-			add_meta_box( 'wpshop_product_list', '<span class="dashicons dashicons-archive"></span> ' . __( 'Product List', 'wpshop' ), array( $this, 'wps_products_listing_for_quotation' ), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'normal', 'low' );
+		if (!$payment_started) {
+			add_meta_box('wpshop_product_list', '<span class="dashicons dashicons-archive"></span> ' . __('Product List', 'wpshop'), array($this, 'wps_products_listing_for_quotation'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'normal', 'low');
 		}
 		/**	Box with the complete order content	*/
-		add_meta_box( 'wpshop_order_content', '<span class="dashicons dashicons-cart"></span> '.__('Order content', 'wpshop'), array( $this, 'meta_box_order_content'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'normal', 'low');
+		add_meta_box('wpshop_order_content', '<span class="dashicons dashicons-cart"></span> ' . __('Order content', 'wpshop'), array($this, 'meta_box_order_content'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'normal', 'low');
 		/** Box Private order comments **/
-		if( !in_array( $post->post_status, array( 'auto-draft' ) ) ) {
-			add_meta_box('wpshop_order_private_comments', '<span class="dashicons dashicons-format-chat"></span> '.__('Comments', 'wpshop'), array( $this, 'meta_box_private_comment'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'normal', 'low');
+		if (!in_array($post->post_status, array('auto-draft'))) {
+			add_meta_box('wpshop_order_private_comments', '<span class="dashicons dashicons-format-chat"></span> ' . __('Comments', 'wpshop'), array($this, 'meta_box_private_comment'), WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'normal', 'low');
 		}
 	}
 
@@ -83,65 +83,65 @@ 
 	 * METABOX CONTENT - Display Customer comments on order in administration panel
 	 * @param object $order
 	 */
-	function order_customer_comment_box( $order ) {
-		if ( !empty($order) && !empty($order->ID) ) {
-			require_once( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "customer_comment_on_order_box") );
+	function order_customer_comment_box($order) {
+		if (!empty($order) && !empty($order->ID)) {
+			require_once(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "customer_comment_on_order_box"));
 		}
 	}
 
 	/**
 	 * METABOX CONTENT - Display an order historic of product in administration product panel
 	 */
-	function meta_box_product_sale_informations () {
+	function meta_box_product_sale_informations() {
 		global $post;
 		$product_id = $post->ID;
-		$variations = wpshop_products::get_variation( $product_id );
-		$order_status = unserialize( WPSHOP_ORDER_STATUS );
-		$color_label = array( 'awaiting_payment' => 'jaune', 'canceled' => 'rouge', 'partially_paid' => 'orange', 'incorrect_amount' => 'orange', 'denied' => 'rouge', 'shipped' => 'bleu', 'payment_refused' => 'rouge', 'completed' => 'vert', 'refunded' => 'rouge', 'pos' => 'bleu');
+		$variations = wpshop_products::get_variation($product_id);
+		$order_status = unserialize(WPSHOP_ORDER_STATUS);
+		$color_label = array('awaiting_payment' => 'jaune', 'canceled' => 'rouge', 'partially_paid' => 'orange', 'incorrect_amount' => 'orange', 'denied' => 'rouge', 'shipped' => 'bleu', 'payment_refused' => 'rouge', 'completed' => 'vert', 'refunded' => 'rouge', 'pos' => 'bleu');
 		// Get datas
 		$sales_informations = array();
 		/** Query **/
-		$data_to_compare = '"item_id";s:' .strlen($product_id). ':"' .$product_id. '";';
-		$query_args = array( 'posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'meta_query' => array( array('key' => '_order_postmeta', 'value' => $data_to_compare, 'compare' => 'LIKE') ) );
-		$orders = new WP_Query( $query_args );
-		if ( !empty($orders) && !empty($orders->posts) ) {
-			foreach( $orders->posts as $order ) {
-				$order_meta = get_post_meta( $order->ID, '_order_postmeta', true );
-				$order_info = get_post_meta( $order->ID, '_order_info', true );
+		$data_to_compare = '"item_id";s:' . strlen($product_id) . ':"' . $product_id . '";';
+		$query_args = array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'meta_query' => array(array('key' => '_order_postmeta', 'value' => $data_to_compare, 'compare' => 'LIKE')));
+		$orders = new WP_Query($query_args);
+		if (!empty($orders) && !empty($orders->posts)) {
+			foreach ($orders->posts as $order) {
+				$order_meta = get_post_meta($order->ID, '_order_postmeta', true);
+				$order_info = get_post_meta($order->ID, '_order_info', true);
 				$sales_informations[] = array(
-						'order_key' => ( !empty($order_meta) && !empty($order_meta['order_key']) ) ? $order_meta['order_key'] : '',
-						'order_date' => ( !empty($order_meta) && !empty($order_meta['order_date']) ) ? $order_meta['order_date'] : '',
-						'customer_firstname' => ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_first_name']) ) ? $order_info['billing']['address']['address_first_name'] : '',
-						'customer_name' => ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_last_name']) ) ? $order_info['billing']['address']['address_last_name'] : '',
-						'customer_email' => ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_user_email']) ) ? $order_info['billing']['address']['address_user_email'] : '',
+						'order_key' => (!empty($order_meta) && !empty($order_meta['order_key'])) ? $order_meta['order_key'] : '',
+						'order_date' => (!empty($order_meta) && !empty($order_meta['order_date'])) ? $order_meta['order_date'] : '',
+						'customer_firstname' => (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_first_name'])) ? $order_info['billing']['address']['address_first_name'] : '',
+						'customer_name' => (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_last_name'])) ? $order_info['billing']['address']['address_last_name'] : '',
+						'customer_email' => (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_user_email'])) ? $order_info['billing']['address']['address_user_email'] : '',
 						'order_id' => $order->ID,
 						'order_status' => $order_meta['order_status']
 				);
 			}
 		}
 		// Display results
-		require_once( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "product_order_historic") );
+		require_once(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "product_order_historic"));
 	}
 
 	/**
 	 * METABOX CONTENT - Payments Box in Orders panel
 	 * @param string $order
 	 */
-	function display_order_payments_box( $order ) {
+	function display_order_payments_box($order) {
 		$order_status = unserialize(WPSHOP_ORDER_STATUS);
 		$order_postmeta = get_post_meta($order->ID, '_order_postmeta', true);
-		require( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "wps_order_payment_box") );
+		require(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "wps_order_payment_box"));
 	}
 
 	/**
 	 * METABOX CONTENT - Display an lsiting of products to make quotation in backend
 	 */
 	function wps_products_listing_for_quotation($post) {
-		$letters = array( 'ALL', 'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z');
-		$current_letter = sanitize_title( $letters[1] );
+		$letters = array('ALL', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z');
+		$current_letter = sanitize_title($letters[1]);
 		$wps_product_mdl = new wps_product_mdl();
-		$products = $wps_product_mdl->get_products_by_letter( $current_letter );
-		require( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "product-listing/wps_orders_product_listing") );
+		$products = $wps_product_mdl->get_products_by_letter($current_letter);
+		require(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "product-listing/wps_orders_product_listing"));
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 */
 	function meta_box_private_comment() {
 		global $post;
-		require( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "order-private-comments/wps_orders_private_comments") );
+		require(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "order-private-comments/wps_orders_private_comments"));
 	}
 
 	/**
@@ -157,8 +157,8 @@ 
 	 */
 	function meta_box_order_content() {
 		global $post_id;
-		unset( $_SESSION['cart'] );
-		echo do_shortcode( '[wps_cart oid="' .$post_id. '" cart_type="admin-panel"]');
+		unset($_SESSION['cart']);
+		echo do_shortcode('[wps_cart oid="' . $post_id . '" cart_type="admin-panel"]');
 	}
 
 
@@ -168,68 +168,68 @@ 
 	function save_order_custom_informations() {
 		global $wpdb;
 
-		$post_ID = !empty( $_REQUEST['post_ID'] ) ? (int) $_REQUEST['post_ID'] : 0;
+		$post_ID = !empty($_REQUEST['post_ID']) ? (int)$_REQUEST['post_ID'] : 0;
 		// Check if it is an order save action
-		if ( !empty($post_ID) && ( get_post_type($post_ID) == WPSHOP_NEWTYPE_IDENTIFIER_ORDER) ) {
+		if (!empty($post_ID) && (get_post_type($post_ID) == WPSHOP_NEWTYPE_IDENTIFIER_ORDER)) {
 			//Define Customer ID
-			$user_id = ( !empty( $_REQUEST['wps_customer_id'] ) ) ? (int) $_REQUEST['wps_customer_id'] : get_current_user_id();
+			$user_id = (!empty($_REQUEST['wps_customer_id'])) ? (int)$_REQUEST['wps_customer_id'] : get_current_user_id();
 
 			// Order MetaData
-			$order_meta = get_post_meta( $post_ID, '_order_postmeta', true);
+			$order_meta = get_post_meta($post_ID, '_order_postmeta', true);
 
 			// Save General information of order's attached customer
-			$wpdb->update( $wpdb->posts, array('post_author' => $user_id, 'post_parent' => $user_id, 'post_status' => 'publish'),  array('ID' => $post_ID) );
-			update_post_meta( $post_ID, '_wpshop_order_customer_id', $user_id );
+			$wpdb->update($wpdb->posts, array('post_author' => $user_id, 'post_parent' => $user_id, 'post_status' => 'publish'), array('ID' => $post_ID));
+			update_post_meta($post_ID, '_wpshop_order_customer_id', $user_id);
 			$order_meta['customer_id'] = $user_id;
-			if ( empty($order_meta['order_key']) ) {
-				$order_meta['order_key'] = !empty($order_meta['order_key']) ? $order_meta['order_key'] : (!empty($order_meta['order_status']) && ($order_meta['order_status']!='awaiting_payment') ? wpshop_orders::get_new_order_reference() : '');
+			if (empty($order_meta['order_key'])) {
+				$order_meta['order_key'] = !empty($order_meta['order_key']) ? $order_meta['order_key'] : (!empty($order_meta['order_status']) && ($order_meta['order_status'] != 'awaiting_payment') ? wpshop_orders::get_new_order_reference() : '');
 				$order_meta['order_temporary_key'] = (isset($order_meta['order_temporary_key']) && ($order_meta['order_temporary_key'] != '')) ? $order_meta['order_temporary_key'] : wpshop_orders::get_new_pre_order_reference();
 			}
 			$order_meta['order_status'] = (isset($order_meta['order_status']) && ($order_meta['order_status'] != '')) ? $order_meta['order_status'] : 'awaiting_payment';
 			$order_meta['order_date'] = (isset($order_meta['order_date']) && ($order_meta['order_date'] != '')) ? $order_meta['order_date'] : current_time('mysql', 0);
 			$order_meta['order_currency'] = wpshop_tools::wpshop_get_currency(true);
 
-			$billing_adress_id = ( !empty( $_REQUEST['wps_order_selected_address'] ) && !empty( $_REQUEST['wps_order_selected_address']['billing'] ) ) ? (int) $_REQUEST['wps_order_selected_address']['billing'] : 0;
+			$billing_adress_id = (!empty($_REQUEST['wps_order_selected_address']) && !empty($_REQUEST['wps_order_selected_address']['billing'])) ? (int)$_REQUEST['wps_order_selected_address']['billing'] : 0;
 
 			// Order Attached Addresses save
-			if( !empty( $billing_adress_id ) ) {
+			if (!empty($billing_adress_id)) {
 				// Informations
-				$order_informations = get_post_meta( $post_ID, '_order_info', true );
-				$order_informations = ( !empty($order_informations) ) ? $order_informations : array();
-				$billing_address_option = get_option( 'wpshop_billing_address' );
-				$billing_address_option = ( !empty($billing_address_option) && !empty( $billing_address_option['choice'] ) ) ? $billing_address_option['choice'] : '';
+				$order_informations = get_post_meta($post_ID, '_order_info', true);
+				$order_informations = (!empty($order_informations)) ? $order_informations : array();
+				$billing_address_option = get_option('wpshop_billing_address');
+				$billing_address_option = (!empty($billing_address_option) && !empty($billing_address_option['choice'])) ? $billing_address_option['choice'] : '';
 
 				// Billing datas
-				$order_informations['billing'] = array( 'id' => $billing_address_option,
+				$order_informations['billing'] = array('id' => $billing_address_option,
 						'address_id' => $billing_adress_id,
-						'address' => get_post_meta( $billing_adress_id, '_wpshop_address_metadata', true )
+						'address' => get_post_meta($billing_adress_id, '_wpshop_address_metadata', true)
 				);
 				// Shipping datas
-				$shipping_adress_id = ( !empty( $_REQUEST['wps_order_selected_address'] ) && !empty( $_REQUEST['wps_order_selected_address']['shipping'] ) ) ? (int) $_REQUEST['wps_order_selected_address']['shipping'] : 0;
+				$shipping_adress_id = (!empty($_REQUEST['wps_order_selected_address']) && !empty($_REQUEST['wps_order_selected_address']['shipping'])) ? (int)$_REQUEST['wps_order_selected_address']['shipping'] : 0;
 
-				if( !empty( $shipping_adress_id ) ) {
-					$shipping_address_option = get_option( 'wpshop_shipping_address_choice' );
-					$shipping_address_option = ( !empty($shipping_address_option) && !empty($shipping_address_option['choice']) ) ? $shipping_address_option['choice'] : '';
-					$order_informations['shipping'] = array( 'id' => $shipping_address_option,
+				if (!empty($shipping_adress_id)) {
+					$shipping_address_option = get_option('wpshop_shipping_address_choice');
+					$shipping_address_option = (!empty($shipping_address_option) && !empty($shipping_address_option['choice'])) ? $shipping_address_option['choice'] : '';
+					$order_informations['shipping'] = array('id' => $shipping_address_option,
 							'address_id' => $shipping_adress_id,
-							'address' => get_post_meta( $shipping_adress_id, '_wpshop_address_metadata', true )
+							'address' => get_post_meta($shipping_adress_id, '_wpshop_address_metadata', true)
 					);
 				}
-				update_post_meta( $post_ID, '_order_info', $order_informations );
+				update_post_meta($post_ID, '_order_info', $order_informations);
 			}
 
-			$wpshop_admin_order_payment_received = !empty( $_REQUEST['wpshop_admin_order_payment_received'] ) ? (array)$_REQUEST['wpshop_admin_order_payment_received'] : array();
-			$wpshop_admin_order_payment_received['method'] = !empty( $wpshop_admin_order_payment_received['method'] ) ? sanitize_text_field( $wpshop_admin_order_payment_received['method'] ) : '';
-			$wpshop_admin_order_payment_received['payment_reference'] = !empty( $wpshop_admin_order_payment_received['payment_reference'] ) ? sanitize_text_field( $wpshop_admin_order_payment_received['payment_reference'] ) : '';
-			$wpshop_admin_order_payment_received['date'] = !empty( $wpshop_admin_order_payment_received['date'] ) ? sanitize_text_field( $wpshop_admin_order_payment_received['date'] ) : '';
-			$wpshop_admin_order_payment_received['received_amount'] = !empty( $wpshop_admin_order_payment_received['received_amount'] ) ? sanitize_text_field( $wpshop_admin_order_payment_received['received_amount'] ) : '';
-			$action_triggered_from = !empty( $_REQUEST['action_triggered_from'] ) ? sanitize_text_field( $_REQUEST['action_triggered_from'] ) : '';
-			$wshop_admin_order_payment_reference = !empty( $_REQUEST['wpshop_admin_order_payment_reference'] ) ? sanitize_text_field( $_REQUEST['wpshop_admin_order_payment_reference'] ) : '';
+			$wpshop_admin_order_payment_received = !empty($_REQUEST['wpshop_admin_order_payment_received']) ? (array)$_REQUEST['wpshop_admin_order_payment_received'] : array();
+			$wpshop_admin_order_payment_received['method'] = !empty($wpshop_admin_order_payment_received['method']) ? sanitize_text_field($wpshop_admin_order_payment_received['method']) : '';
+			$wpshop_admin_order_payment_received['payment_reference'] = !empty($wpshop_admin_order_payment_received['payment_reference']) ? sanitize_text_field($wpshop_admin_order_payment_received['payment_reference']) : '';
+			$wpshop_admin_order_payment_received['date'] = !empty($wpshop_admin_order_payment_received['date']) ? sanitize_text_field($wpshop_admin_order_payment_received['date']) : '';
+			$wpshop_admin_order_payment_received['received_amount'] = !empty($wpshop_admin_order_payment_received['received_amount']) ? sanitize_text_field($wpshop_admin_order_payment_received['received_amount']) : '';
+			$action_triggered_from = !empty($_REQUEST['action_triggered_from']) ? sanitize_text_field($_REQUEST['action_triggered_from']) : '';
+			$wshop_admin_order_payment_reference = !empty($_REQUEST['wpshop_admin_order_payment_reference']) ? sanitize_text_field($_REQUEST['wpshop_admin_order_payment_reference']) : '';
 
 			// Add a Payment to Order MetaData
-			if ( !empty($wpshop_admin_order_payment_received) && !empty($wpshop_admin_order_payment_received['method'])
+			if (!empty($wpshop_admin_order_payment_received) && !empty($wpshop_admin_order_payment_received['method'])
 					&& !empty($wpshop_admin_order_payment_received['date']) && !empty($wpshop_admin_order_payment_received['received_amount']) &&
-					( $action_triggered_from == 'add_payment' || !empty($wshop_admin_order_payment_reference) ) ) {
+					($action_triggered_from == 'add_payment' || !empty($wshop_admin_order_payment_reference))) {
 
 				$received_payment_amount = $wpshop_admin_order_payment_received['received_amount'];
 				// Payment Params
@@ -242,36 +242,36 @@ 
 						'date' 				=> current_time('mysql', 0),
 						'received_amount' 	=> $received_payment_amount
 				);
-				$order_meta = wpshop_payment::check_order_payment_total_amount($post_ID, $params_array, 'completed', $order_meta, false );
+				$order_meta = wpshop_payment::check_order_payment_total_amount($post_ID, $params_array, 'completed', $order_meta, false);
 			}
 
 			//Round final amount
-			$order_meta['order_grand_total'] = number_format( round($order_meta['order_grand_total'], 2), 2, '.', '');
-			$order_meta['order_total_ttc'] = number_format( round($order_meta['order_total_ttc'], 2), 2, '.', '');
-			$order_meta['order_amount_to_pay_now'] = number_format( round($order_meta['order_amount_to_pay_now'], 2), 2, '.', '');
+			$order_meta['order_grand_total'] = number_format(round($order_meta['order_grand_total'], 2), 2, '.', '');
+			$order_meta['order_total_ttc'] = number_format(round($order_meta['order_total_ttc'], 2), 2, '.', '');
+			$order_meta['order_amount_to_pay_now'] = number_format(round($order_meta['order_amount_to_pay_now'], 2), 2, '.', '');
 
 			// Payment Pre-Fill
-			if ( empty( $order_meta['order_payment'] ) ) {
+			if (empty($order_meta['order_payment'])) {
 				$order_meta['order_payment']['customer_choice']['method'] = '';
-				$order_meta['order_payment']['received'][] = array('waited_amount' => ( !empty($order_meta) && !empty($order_meta['order_grand_total']) ) ? number_format($order_meta['order_grand_total'],2,'.', '') : 0 );
+				$order_meta['order_payment']['received'][] = array('waited_amount' => (!empty($order_meta) && !empty($order_meta['order_grand_total'])) ? number_format($order_meta['order_grand_total'], 2, '.', '') : 0);
 			}
 
-			$data['post_ID'] = !empty( $_REQUEST['post_ID'] ) ? (int) $_REQUEST['post_ID'] : 0;
-			$data['markascanceled_order_hidden_indicator'] = !empty( $_REQUEST['markascanceled_order_hidden_indicator' ] ) ? sanitize_text_field( $_REQUEST['markascanceled_order_hidden_indicator'] ) : '';
-			$data['resendordertocustomer_order_hidden_indicator'] = !empty( $_REQUEST['resendordertocustomer_order_hidden_indicator' ] ) ? sanitize_text_field( $_REQUEST['resendordertocustomer_order_hidden_indicator'] ) : '';
-			$data['action_triggered_from'] = !empty( $_REQUEST['action_triggered_from' ] ) ? sanitize_text_field( $_REQUEST['action_triggered_from'] ) : '';
-			$data['notif_the_customer'] = !empty( $_REQUEST['notif_the_customer' ] ) ? sanitize_text_field( $_REQUEST['notif_the_customer'] ) : '';
+			$data['post_ID'] = !empty($_REQUEST['post_ID']) ? (int)$_REQUEST['post_ID'] : 0;
+			$data['markascanceled_order_hidden_indicator'] = !empty($_REQUEST['markascanceled_order_hidden_indicator']) ? sanitize_text_field($_REQUEST['markascanceled_order_hidden_indicator']) : '';
+			$data['resendordertocustomer_order_hidden_indicator'] = !empty($_REQUEST['resendordertocustomer_order_hidden_indicator']) ? sanitize_text_field($_REQUEST['resendordertocustomer_order_hidden_indicator']) : '';
+			$data['action_triggered_from'] = !empty($_REQUEST['action_triggered_from']) ? sanitize_text_field($_REQUEST['action_triggered_from']) : '';
+			$data['notif_the_customer'] = !empty($_REQUEST['notif_the_customer']) ? sanitize_text_field($_REQUEST['notif_the_customer']) : '';
 			// Apply a filter to make credit, notificate the customer and generate billing actions
-			$order_meta = apply_filters( 'wps_order_saving_admin_extra_action', $order_meta, $data );
+			$order_meta = apply_filters('wps_order_saving_admin_extra_action', $order_meta, $data);
 
 			// Save Shipping informations & Order status
-			if ( isset( $order_meta['order_shipping_date'] ) ) {
-				update_post_meta( $post_ID, '_wpshop_order_shipping_date', $order_meta['order_shipping_date']);
+			if (isset($order_meta['order_shipping_date'])) {
+				update_post_meta($post_ID, '_wpshop_order_shipping_date', $order_meta['order_shipping_date']);
 			}
-			update_post_meta( $post_ID, '_wpshop_order_status', $order_meta['order_status']);
+			update_post_meta($post_ID, '_wpshop_order_status', $order_meta['order_status']);
 
 			// Save Metadata
-			update_post_meta( $post_ID, '_order_postmeta', $order_meta);
+			update_post_meta($post_ID, '_order_postmeta', $order_meta);
 		}
 	}
 
@@ -282,8 +282,8 @@ 
 	 * @param array $posted_datas
 	 * @return array
 	 */
-	function wps_notif_user_on_order_saving( $order_metadata, $posted_datas ) {
-		if( !empty($posted_datas['notif_the_customer']) && $posted_datas['notif_the_customer']=='on' ) {
+	function wps_notif_user_on_order_saving($order_metadata, $posted_datas) {
+		if (!empty($posted_datas['notif_the_customer']) && $posted_datas['notif_the_customer'] == 'on') {
 			$wps_message = new wps_message_ctr();
 			/*	Get order current content	*/
 			$user = get_post_meta($posted_datas['post_ID'], '_order_info', true);
@@ -292,12 +292,12 @@ 
 			$first_name = $user['billing']['address']['address_first_name'];
 			$last_name = $user['billing']['address']['address_last_name'];
 
-			$object = array('object_type'=>'order','object_id'=>(int)$_REQUEST['post_ID']);
+			$object = array('object_type'=>'order', 'object_id'=>(int)$_REQUEST['post_ID']);
 			/* Envoie du message de confirmation de commande au client	*/
-			if ( empty( $order_metadata['order_key'] ) ) {
+			if (empty($order_metadata['order_key'])) {
 				$wps_message->wpshop_prepared_email($email,
 						'WPSHOP_QUOTATION_UPDATE_MESSAGE',
-						array(  'order_id' => $object['object_id'],
+						array('order_id' => $object['object_id'],
 							    'customer_first_name' => $first_name,
 								'customer_last_name' => $last_name,
 								'order_date' => current_time('mysql', 0),
@@ -312,7 +312,7 @@ 
 				$wps_message->wpshop_prepared_email(
 						$email,
 						'WPSHOP_ORDER_UPDATE_MESSAGE',
-						array(  'customer_first_name' => $first_name,
+						array('customer_first_name' => $first_name,
 								'customer_last_name' => $last_name,
 								'order_key' => $order_metadata['order_key'],
 								'order_billing_address' => '',
@@ -320,7 +320,7 @@ 
 								'order_addresses' => '',
 								'order_addresses' => '',
 								'order_billing_address' => '',
-								'order_shipping_address' => '' ),
+								'order_shipping_address' => ''),
 						$object);
 			}
 		}
@@ -331,25 +331,25 @@ 
 	 * AJAX - Add a private comment to order
 	 */
 	function wpshop_add_private_comment_to_order() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_add_private_comment_to_order' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wpshop_add_private_comment_to_order'))
 			wp_die();
 
 		$status = false; $result = '';
-		$order_id = ( !empty($_POST['oid']) ) ? intval($_POST['oid']) : null;
-		$comment = ( !empty($_POST['comment']) ) ? wpshop_tools::varSanitizer($_POST['comment']) : null;
-		$send_email = ( !empty($_POST['send_email']) ) ? wpshop_tools::varSanitizer($_POST['send_email']) : null;
-		$copy_to_administrator = ( !empty($_POST['copy_to_administrator']) ) ? wpshop_tools::varSanitizer($_POST['copy_to_administrator']) : null;
+		$order_id = (!empty($_POST['oid'])) ? intval($_POST['oid']) : null;
+		$comment = (!empty($_POST['comment'])) ? wpshop_tools::varSanitizer($_POST['comment']) : null;
+		$send_email = (!empty($_POST['send_email'])) ? wpshop_tools::varSanitizer($_POST['send_email']) : null;
+		$copy_to_administrator = (!empty($_POST['copy_to_administrator'])) ? wpshop_tools::varSanitizer($_POST['copy_to_administrator']) : null;
 
-		if ( !empty($comment) && !empty($order_id) ) {
+		if (!empty($comment) && !empty($order_id)) {
 			$wps_back_office_orders_mdl = new wps_back_office_orders_mdl();
-			$new_comment = $wps_back_office_orders_mdl->add_private_comment($order_id, $comment, $send_email, false, $copy_to_administrator );
-			if($new_comment) {
-				$order_private_comment = get_post_meta( $order_id, '_order_private_comments', true );
+			$new_comment = $wps_back_office_orders_mdl->add_private_comment($order_id, $comment, $send_email, false, $copy_to_administrator);
+			if ($new_comment) {
+				$order_private_comment = get_post_meta($order_id, '_order_private_comments', true);
 				$oid = $order_id;
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "order-private-comments/wps_orders_sended_private_comments") );
+				require(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "order-private-comments/wps_orders_sended_private_comments"));
 				$result = ob_get_contents();
 				ob_end_clean();
 				$status = true;
@@ -359,8 +359,8 @@ 
 			$result = __('An error was occured', 'wpshop');
 		}
 
-		$response = array( 'status' => $status, 'response' => $result );
-		echo json_encode( $response );
+		$response = array('status' => $status, 'response' => $result);
+		echo json_encode($response);
 		wp_die();
 	}
 
@@ -368,29 +368,29 @@ 
 	 * AJAX - Refresh product listing in order back-office
 	 */
 	function refresh_product_list() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
-		$letter = ( !empty($_POST['letter']) ) ? sanitize_title( $_POST['letter'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
+		$letter = (!empty($_POST['letter'])) ? sanitize_title($_POST['letter']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'refresh_product_list_'.strtolower($letter) ) )
+		if (!wp_verify_nonce($_wpnonce, 'refresh_product_list_' . strtolower($letter)))
 			wp_die();
 
 		$status = false; $response = '';
-		$oid = !empty( $_POST['oid'] ) ? (int) $_POST['oid'] : 0;
+		$oid = !empty($_POST['oid']) ? (int)$_POST['oid'] : 0;
 
-		if( !empty($oid) ) {
-			$post = get_post( $oid );
+		if (!empty($oid)) {
+			$post = get_post($oid);
 		}
-		if( !empty($letter) ) {
+		if (!empty($letter)) {
 			$current_letter = $letter;
 			$wps_product_mdl = new wps_product_mdl();
-			$products = $wps_product_mdl->get_products_by_letter( $letter );
+			$products = $wps_product_mdl->get_products_by_letter($letter);
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "product-listing/wps_orders_product_listing_table") );
+			require(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "product-listing/wps_orders_product_listing_table"));
 			$response = ob_get_contents();
 			ob_end_clean();
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 
@@ -398,38 +398,38 @@ 
 	 * AJAX - Add product to order in back-office panel
 	 */
 	function wps_add_product_to_order_admin() {
-		check_ajax_referer( 'wps_add_product_to_order_admin' );
+		check_ajax_referer('wps_add_product_to_order_admin');
 
 		$status = false; $response = ''; $product_have_variations = false;
 		// Sended vars
-		$product_id = ( !empty($_POST['pid']) ) ? intval( $_POST['pid']) : null;
-		$order_id = ( !empty($_POST['oid']) ) ? intval( $_POST['oid']) : null;
-		$product_qty = ( !empty($_POST['qty']) ) ? intval( $_POST['qty']) : 1;
+		$product_id = (!empty($_POST['pid'])) ? intval($_POST['pid']) : null;
+		$order_id = (!empty($_POST['oid'])) ? intval($_POST['oid']) : null;
+		$product_qty = (!empty($_POST['qty'])) ? intval($_POST['qty']) : 1;
 
-		if( !empty($order_id) && !empty($product_id) ) {
+		if (!empty($order_id) && !empty($product_id)) {
 			$wps_orders = new wps_orders_ctr();
 			$product_datas = wpshop_products::get_product_data($product_id, false, '"publish", "free_product"');
 			// Check if product have variations
-			$have_variations_checking = wpshop_products::get_variation( $product_id );
-			if( !empty($have_variations_checking) ) {
+			$have_variations_checking = wpshop_products::get_variation($product_id);
+			if (!empty($have_variations_checking)) {
 				$product_have_variations = true;
 			}
 			else {
 				// Get Metadatas
-				$order_metadata = get_post_meta( $order_id, '_order_postmeta', true );
+				$order_metadata = get_post_meta($order_id, '_order_postmeta', true);
 				// Calcul cart informations
 				$wps_cart = new wps_cart();
-				$order_metadata = $wps_cart->calcul_cart_information( array( $product_id => array( 'product_id' => $product_id, 'product_qty' => $product_qty ) ), '', $order_metadata, true, false );
+				$order_metadata = $wps_cart->calcul_cart_information(array($product_id => array('product_id' => $product_id, 'product_qty' => $product_qty)), '', $order_metadata, true, false);
 				// Update Metadatas
-				update_post_meta( $order_id, '_order_postmeta', $order_metadata );
+				update_post_meta($order_id, '_order_postmeta', $order_metadata);
 				$status = true;
 			}
 			$status = true;
 		}
 
-		$_wpnonce = wp_create_nonce( 'wps_order_load_product_variations' );
+		$_wpnonce = wp_create_nonce('wps_order_load_product_variations');
 
-		echo json_encode( array( '_wpnonce' => $_wpnonce, 'status' => $status, 'response' => $response, 'variations_exist' => $product_have_variations ) );
+		echo json_encode(array('_wpnonce' => $_wpnonce, 'status' => $status, 'response' => $response, 'variations_exist' => $product_have_variations));
 		wp_die();
 	}
 
@@ -437,15 +437,15 @@ 
 	 * AJAX - Refresh cart in administration
 	 */
 	function refresh_cart_order() {
-		check_ajax_referer( 'wps_reload_cart' );
+		check_ajax_referer('wps_reload_cart');
 
 		$status = false; $response = '';
-		$order_id = ( !empty($_POST['order_id']) ) ? intval($_POST['order_id']) : null;
-		if( !empty($order_id) ) {
-			$response = do_shortcode( '[wps_cart oid="' .$order_id. '" cart_type="admin-panel"]');
+		$order_id = (!empty($_POST['order_id'])) ? intval($_POST['order_id']) : null;
+		if (!empty($order_id)) {
+			$response = do_shortcode('[wps_cart oid="' . $order_id . '" cart_type="admin-panel"]');
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 
@@ -453,17 +453,17 @@ 
 	 * AJAX - Refresh cart in administration
 	 */
 	function refresh_payments_order() {
-		check_ajax_referer( 'wps_reload_cart' );
+		check_ajax_referer('wps_reload_cart');
 		$status = false; $response = '';
-		$order_id = ( !empty($_POST['order_id']) ) ? intval($_POST['order_id']) : null;
-		if( !empty($order_id) ) {
+		$order_id = (!empty($_POST['order_id'])) ? intval($_POST['order_id']) : null;
+		if (!empty($order_id)) {
 			ob_start();
-			echo $this->display_order_payments_box( get_post( $order_id ) );
+			echo $this->display_order_payments_box(get_post($order_id));
 			$response = ob_get_contents();
 			ob_end_clean();
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 
@@ -471,25 +471,25 @@ 
 	 * AJAX - Update product Quantity in Back-office Panel
 	 */
 	function wps_update_product_qty_in_admin() {
-		check_ajax_referer( 'wps_reload_cart' );
+		check_ajax_referer('wps_reload_cart');
 
 		$status = false; $response = '';
-		$product_id = ( !empty($_POST['product_id']) ) ? wpshop_tools::varSanitizer( $_POST['product_id'] ) : null;
-		$order_id = ( !empty($_POST['order_id']) ) ? intval( $_POST['order_id'] ) : null;
-		$product_qty = ( !empty($_POST['qty']) ) ? intval( $_POST['qty'] ) : 0;
+		$product_id = (!empty($_POST['product_id'])) ? wpshop_tools::varSanitizer($_POST['product_id']) : null;
+		$order_id = (!empty($_POST['order_id'])) ? intval($_POST['order_id']) : null;
+		$product_qty = (!empty($_POST['qty'])) ? intval($_POST['qty']) : 0;
 
-		if( !empty($product_id) && !empty($order_id) ) {
+		if (!empty($product_id) && !empty($order_id)) {
 			// Get Metadatas
-			$order_metadata = get_post_meta( $order_id, '_order_postmeta', true );
+			$order_metadata = get_post_meta($order_id, '_order_postmeta', true);
 			// Calcul cart informations
 			$wps_cart = new wps_cart();
-			$order_metadata = $wps_cart->calcul_cart_information( array( $product_id => array( 'product_id' => $product_id, 'product_qty' => $product_qty ) ), '', $order_metadata, true, false );
+			$order_metadata = $wps_cart->calcul_cart_information(array($product_id => array('product_id' => $product_id, 'product_qty' => $product_qty)), '', $order_metadata, true, false);
 			// Update Metadatas
-			update_post_meta( $order_id, '_order_postmeta', $order_metadata );
+			update_post_meta($order_id, '_order_postmeta', $order_metadata);
 			$status = true;
 		}
 
-		echo json_encode( array( 'status' => $status ) );
+		echo json_encode(array('status' => $status));
 		wp_die();
 	}
 
@@ -497,15 +497,15 @@ 
 	 * AJAX - Load Product Variations in ThickBox on Add product to order action
 	 */
 	function wps_order_load_product_variations() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_order_load_product_variations' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_order_load_product_variations'))
 			wp_die();
 
-		$product_id = ( !empty($_GET['pid']) ) ? intval( $_GET['pid']) : null;
-		$order_id = ( !empty($_GET['oid']) ) ? intval( $_GET['oid']) : null;
-		$qty = ( !empty($_GET['qty']) ) ? intval( $_GET['qty']) : 1;
-		echo '<div class="wps-boxed"><span class="wps-h5">'.__( 'Select your variations', 'wpshop' ).'</span>'.wpshop_products::wpshop_variation($product_id, true, $order_id, $qty ).'<a href="#" class="wps-bton-first-mini-rounded alignRight wps-orders-add_variation_product"><i class="wps-icon-basket"></i> ' .__( 'Add to cart', 'wpshop' ). '</a>'.'</div>';
+		$product_id = (!empty($_GET['pid'])) ? intval($_GET['pid']) : null;
+		$order_id = (!empty($_GET['oid'])) ? intval($_GET['oid']) : null;
+		$qty = (!empty($_GET['qty'])) ? intval($_GET['qty']) : 1;
+		echo '<div class="wps-boxed"><span class="wps-h5">' . __('Select your variations', 'wpshop') . '</span>' . wpshop_products::wpshop_variation($product_id, true, $order_id, $qty) . '<a href="#" class="wps-bton-first-mini-rounded alignRight wps-orders-add_variation_product"><i class="wps-icon-basket"></i> ' . __('Add to cart', 'wpshop') . '</a>' . '</div>';
 		wp_die();
 	}
 
@@ -513,67 +513,67 @@ 
 	 * AJAX - Update cart informations
 	 */
 	function wps_orders_update_cart_informations() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_orders_update_cart_informations' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_orders_update_cart_informations'))
 			wp_die();
 
 		$status = false;
-		$order_id = ( !empty($_POST['order_id']) ) ? intval($_POST['order_id']) : '';
+		$order_id = (!empty($_POST['order_id'])) ? intval($_POST['order_id']) : '';
 		$shipping_cost = isset($_POST['shipping_cost']) ? wpshop_tools::varSanitizer($_POST['shipping_cost']) : '';
 		$discount_value = isset($_POST['discount_amount']) ? wpshop_tools::varSanitizer($_POST['discount_amount']) : '';
 		$discount_type = isset($_POST['discount_type']) ? wpshop_tools::varSanitizer($_POST['discount_type']) : '';
 
 
-		if( !empty($order_id) ) {
-			$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
+		if (!empty($order_id)) {
+			$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 			$order_meta['order_shipping_cost'] = $shipping_cost;
 
 			//Add discounts if exists
-			if( isset($discount_value) && !empty($discount_type) ) {
+			if (isset($discount_value) && !empty($discount_type)) {
 				$order_meta['order_discount_type'] = $discount_type;
 				$order_meta['order_discount_value'] = $discount_value;
 			}
 			$wps_cart = new wps_cart();
-			$order_meta = $wps_cart->calcul_cart_information( array(), '', $order_meta, true );
-			update_post_meta( $order_id, '_order_postmeta', $order_meta );
+			$order_meta = $wps_cart->calcul_cart_information(array(), '', $order_meta, true);
+			update_post_meta($order_id, '_order_postmeta', $order_meta);
 			$status = true;
 		}
 
-		echo json_encode( array( 'status' => $status) );
+		echo json_encode(array('status' => $status));
 		wp_die();
 	}
 
 	function wps_reverify_payment_invoice_ref() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_reverify_payment_invoice_ref' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_reverify_payment_invoice_ref'))
 			wp_die();
 
 		$status = true;
-		$inputs = !empty( $_POST['inputs'] ) ? (array) $_POST['inputs'] : false;
+		$inputs = !empty($_POST['inputs']) ? (array)$_POST['inputs'] : false;
 
 		if (!$inputs)
 			$status = false;
 
-		if( $status ) {
+		if ($status) {
 			$inputs_clone = $inputs;
 			$inputs = array();
-			foreach( $inputs_clone as $var ) {
-				if( isset( $var['key'] ) && isset( $var['value'] ) ) {
+			foreach ($inputs_clone as $var) {
+				if (isset($var['key']) && isset($var['value'])) {
 					$inputs[$var['key']] = $var['value'];
 				}
 			}
 
-			( isset( $inputs['order_id'] ) ) ? $order_id = $inputs['order_id'] : $status = $order_id = false;
-			( isset( $inputs['index_payment'] ) ) ? $index_payment = $inputs['index_payment'] : $status = $index_payment = false;
+			(isset($inputs['order_id'])) ? $order_id = $inputs['order_id'] : $status = $order_id = false;
+			(isset($inputs['index_payment'])) ? $index_payment = $inputs['index_payment'] : $status = $index_payment = false;
 		}
 
-		if( $status ) {
-			$status = wpshop_payment::reverify_payment_invoice_ref( $order_id, $index_payment );
+		if ($status) {
+			$status = wpshop_payment::reverify_payment_invoice_ref($order_id, $index_payment);
 		}
 
-		echo json_encode( array( 'status' => $status ) );
+		echo json_encode(array('status' => $status));
 		wp_die();
 	}
 

includes/modules/wps_cart/controller/wps_cart_ctr.php

Spacing +302 added lines, -302 removed lines

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

includes/modules/wps_shipping/controller/wps_shipping_mode_ctr.php

Spacing +107 added lines, -107 removed lines

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