Eoxia / wpshop

includes/modules/wps_product/modules/wps_product_mass_interface/controller/wps_product_mass_interface_ctr.php

Doc Comments +4 added lines

@@ -158,6 +158,7 @@ 
 	/**
 	 * Display pagination
 	 *
+	 * @param integer $current_page
 	 * @return string
 	 */
 	function get_products_pagination( $current_page, $attribute_set_id = 1 ) {
@@ -201,6 +202,9 @@ 
 			return $output;
 			}
 
+	/**
+	 * @param integer $product_id
+	 */
 	function wps_product_attached_files( $product_id ) {
 		global $wpdb;
 		$output = '';

Spacing +143 added lines, -143 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Main controller file for product mass modification module
  *
@@ -19,47 +19,47 @@ 
 	 */
 	function __construct() {
 		// Add submenu
-		add_action('admin_menu', array( $this, 'register_mass_products_edit_submenu' ), 350 );
+		add_action('admin_menu', array($this, 'register_mass_products_edit_submenu'), 350);
 
 		// Declare Styles and JS Files
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_admin_scripts') );
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_css' ) );
-		add_action( 'admin_print_scripts', array( $this, 'admin_print_scripts' ) );
+		add_action('admin_enqueue_scripts', array($this, 'add_admin_scripts'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_css'));
+		add_action('admin_print_scripts', array($this, 'admin_print_scripts'));
 
 		// Trigger ajax action
-		add_action( 'wp_ajax_wps_mass_edit_change_page', array( $this, 'wps_mass_edit_change_page') );
-		add_action( 'wp_ajax_wps_mass_edit_product_save_action', array( $this, 'wps_save_product_quick_interface') );
-		add_action( 'wp_ajax_wps_mass_interface_new_product_creation', array( $this, 'wps_mass_interface_new_product_creation' ) );
-		add_action( 'wp_ajax_wps_mass_delete_file', array( $this, 'wps_mass_delete_file' ) );
-		add_action( 'wp_ajax_wps_mass_edit_update_files_list', array( $this, 'wps_mass_edit_update_files_list' ) );
+		add_action('wp_ajax_wps_mass_edit_change_page', array($this, 'wps_mass_edit_change_page'));
+		add_action('wp_ajax_wps_mass_edit_product_save_action', array($this, 'wps_save_product_quick_interface'));
+		add_action('wp_ajax_wps_mass_interface_new_product_creation', array($this, 'wps_mass_interface_new_product_creation'));
+		add_action('wp_ajax_wps_mass_delete_file', array($this, 'wps_mass_delete_file'));
+		add_action('wp_ajax_wps_mass_edit_update_files_list', array($this, 'wps_mass_edit_update_files_list'));
 		// add_action( 'wap_ajax_wps_mass_delete_post', array( $this, 'wps_mass_delete_post' ) );
 	}
 
 	function register_mass_products_edit_submenu() {
-		add_submenu_page( 'edit.php?post_type=wpshop_product', __('Mass product edit', 'wpshop' ), __('Mass product edit', 'wpshop'), 'manage_options', 'mass_edit_interface', array($this, 'wps_display_mass_edit_interface'));
+		add_submenu_page('edit.php?post_type=wpshop_product', __('Mass product edit', 'wpshop'), __('Mass product edit', 'wpshop'), 'manage_options', 'mass_edit_interface', array($this, 'wps_display_mass_edit_interface'));
 	}
 
 	/**
 	 * Define the aministration pat styles
 	 */
 	function admin_css() {
-		wp_enqueue_style( 'wps-mass-product-update', WPS_PDCT_MASS_URL.'/assets/css/backend.css', '', WPS_PDCT_MASS_VERSION);
+		wp_enqueue_style('wps-mass-product-update', WPS_PDCT_MASS_URL . '/assets/css/backend.css', '', WPS_PDCT_MASS_VERSION);
 	}
 
 	/**
 	 * Add javascript to administration
 	 */
 	function add_admin_scripts() {
-		wp_enqueue_script( 'admin_product_js', WPS_PDCT_MASS_URL.'/assets/js/backend.js', '', WPS_PDCT_MASS_VERSION, true);
+		wp_enqueue_script('admin_product_js', WPS_PDCT_MASS_URL . '/assets/js/backend.js', '', WPS_PDCT_MASS_VERSION, true);
 		wp_enqueue_media();
 	}
 
 	function admin_print_scripts() {
 		$output = '<script type="text/javascript">';
-		$output .= 'var WPS_MASS_ERROR_INIT = "' .__( 'An error has occured, the page cannot be initialized', 'wpshop' ). '";';
-		$output .= 'var WPS_MASS_ERROR_PRODUCT_CREATION = "' .__( 'An error was occured, the new product cannot be created', 'wpshop' ). '";';
-		$output .= 'var WPS_MASS_ERROR_PRODUCT_SAVE = "' .__( 'You must select product to save', 'wpshop' ). '";';
-		$output .= 'var WPS_MASS_CONFIRMATION_NEW_PRODUCT = "' .__( 'You will save selected products, are you sure to continue ?', 'wpshop' ). '";';
+		$output .= 'var WPS_MASS_ERROR_INIT = "' . __('An error has occured, the page cannot be initialized', 'wpshop') . '";';
+		$output .= 'var WPS_MASS_ERROR_PRODUCT_CREATION = "' . __('An error was occured, the new product cannot be created', 'wpshop') . '";';
+		$output .= 'var WPS_MASS_ERROR_PRODUCT_SAVE = "' . __('You must select product to save', 'wpshop') . '";';
+		$output .= 'var WPS_MASS_CONFIRMATION_NEW_PRODUCT = "' . __('You will save selected products, are you sure to continue ?', 'wpshop') . '";';
 		$output .= '</script>';
 		echo $output;
 	}
@@ -71,15 +71,15 @@ 
 	 *
 	 * @return array
 	 */
-	function check_attribute_to_display_for_quick_add( $attribute_list, $quick_add_form_attributes = array() ) {
-
-		if ( !empty( $attribute_list ) ) {
-			foreach( $attribute_list as $attributes_group ) {
-				foreach( $attributes_group as $attributes_sections ) {
-					if( !empty($attributes_sections) && !empty($attributes_sections['attributes']) ) {
-						foreach( $attributes_sections['attributes'] as $attribute_id => $att_def ) {
-							if( !empty($att_def) && !empty($att_def['is_used_in_quick_add_form']) && $att_def['is_used_in_quick_add_form'] == 'yes' ) {
-								$quick_add_form_attributes[ $attribute_id ] = $att_def;
+	function check_attribute_to_display_for_quick_add($attribute_list, $quick_add_form_attributes = array()) {
+
+		if (!empty($attribute_list)) {
+			foreach ($attribute_list as $attributes_group) {
+				foreach ($attributes_group as $attributes_sections) {
+					if (!empty($attributes_sections) && !empty($attributes_sections['attributes'])) {
+						foreach ($attributes_sections['attributes'] as $attribute_id => $att_def) {
+							if (!empty($att_def) && !empty($att_def['is_used_in_quick_add_form']) && $att_def['is_used_in_quick_add_form'] == 'yes') {
+								$quick_add_form_attributes[$attribute_id] = $att_def;
 							}
 						}
 					}
@@ -96,29 +96,29 @@ 
 	 * @param integer $page
 	 * @return string
 	 */
-	function display_products_list( $default = 1, $page = 0  ) {
+	function display_products_list($default = 1, $page = 0) {
 		global $wpdb;
 		// Product entity
-		$product_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
+		$product_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
 
 		$user_id = get_current_user_id();
 		// Check product limit
-		$product_limit = get_user_meta( $user_id, 'edit_wpshop_product_per_page', true );
-		$product_limit = ( !empty($product_limit) ) ? $product_limit : 20;
+		$product_limit = get_user_meta($user_id, 'edit_wpshop_product_per_page', true);
+		$product_limit = (!empty($product_limit)) ? $product_limit : 20;
 
 		// Get products for the current page
 		$wps_product_mass_interface_mdl = new wps_product_mass_interface_mdl();
-		$products = $wps_product_mass_interface_mdl->get_quick_interface_products( $default, $page, $product_limit );
+		$products = $wps_product_mass_interface_mdl->get_quick_interface_products($default, $page, $product_limit);
 
 		// Construct Table Head Data
 		$quick_add_form_attributes = array();
 		$get_attributes_quick_add_form = $wps_product_mass_interface_mdl->get_attributes_quick_add_form();
-		foreach( $get_attributes_quick_add_form as $quick_add_form_attribute ) {
+		foreach ($get_attributes_quick_add_form as $quick_add_form_attribute) {
 			$quick_add_form_attributes[$quick_add_form_attribute['id']] = $quick_add_form_attribute;
 		}
 
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "product_list" ) );
+		require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "product_list"));
 		$output = ob_get_contents();
 		ob_end_clean();
 		return $output;
@@ -134,25 +134,25 @@ 
 		$products_attributes_groups = $wps_product_mass_interface_mdl->get_product_attributes_sets();
 
 		$default = '';
-		if( !empty($products_attributes_groups) ) {
-			foreach( $products_attributes_groups as $key => $products_attributes_group ) {
-				if( $products_attributes_group->slug == 'free_product' ) {
-					unset( $products_attributes_groups[$key] );
+		if (!empty($products_attributes_groups)) {
+			foreach ($products_attributes_groups as $key => $products_attributes_group) {
+				if ($products_attributes_group->slug == 'free_product') {
+					unset($products_attributes_groups[$key]);
 				}
-				if( !empty($products_attributes_group->default_set) && $products_attributes_group->default_set == 'yes' ) {
+				if (!empty($products_attributes_group->default_set) && $products_attributes_group->default_set == 'yes') {
 					$default = $products_attributes_group->id;
 				}
 			}
 		}
 		// Check page
-		$page = ( !empty( $_GET[ 'page' ] ) && is_int( (int)$_GET[ 'page' ] ) && $_GET[ 'page' ] > 0 ) ? (int)($_GET[ 'page' ] - 1) : 0;
+		$page = (!empty($_GET['page']) && is_int((int)$_GET['page']) && $_GET['page'] > 0) ? (int)($_GET['page'] - 1) : 0;
 		// Display product tab
-		$product_list_interface = $this->display_products_list( $default, $page );
+		$product_list_interface = $this->display_products_list($default, $page);
 
 		// Get pagination
-		$pagination = $this->get_products_pagination( $page, $default );
+		$pagination = $this->get_products_pagination($page, $default);
 
-		require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface" ) );
+		require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface"));
 	}
 
 	/**
@@ -160,13 +160,13 @@ 
 	 *
 	 * @return string
 	 */
-	function get_products_pagination( $current_page, $attribute_set_id = 1 ) {
+	function get_products_pagination($current_page, $attribute_set_id = 1) {
 		global $wpdb;
 		$user_id = get_current_user_id();
 		$output = '';
 		/**	Define the element number per page. If the user change the default value, take this value	*/
-		$one_page_limit = get_user_meta( $user_id, 'edit_wpshop_product_per_page', true );
-		$one_page_limit = ( !empty($one_page_limit) ) ? $one_page_limit : 20;
+		$one_page_limit = get_user_meta($user_id, 'edit_wpshop_product_per_page', true);
+		$one_page_limit = (!empty($one_page_limit)) ? $one_page_limit : 20;
 
 		/**	Count the number of product existing in the shop	*/
 		$query = $wpdb->prepare(
@@ -178,37 +178,37 @@ 
 				AND meta_value = %s
 				AND post_status IN ( 'publish', 'draft' )",
 				WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, '_wpshop_product_attribute_set_id', $attribute_set_id);
-		$products = $wpdb->get_var( $query );
+		$products = $wpdb->get_var($query);
 
-			if( !empty($products) ) {
+			if (!empty($products)) {
 			$args = array(
 			'base' => '%_%',
-			'format' => admin_url( 'admin-ajax.php?action=wps_add_quick_interface&page=%#%' ),
-					'current' => ( $current_page + 1 ),
-					'total' => ceil( $products / $one_page_limit ),
+			'format' => admin_url('admin-ajax.php?action=wps_add_quick_interface&page=%#%'),
+					'current' => ($current_page + 1),
+					'total' => ceil($products / $one_page_limit),
 						'type' => 'array',
 						'prev_next' => false,
 						'show_all' => true,
 			);
-			$paginate = paginate_links( $args );
+			$paginate = paginate_links($args);
 
 				$wps_product_ctr = new wps_product_ctr();
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface_pagination" ) );
+				require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface_pagination"));
 				$output = ob_get_contents();
 			ob_end_clean();
 			}
 			return $output;
 			}
 
-	function wps_product_attached_files( $product_id ) {
+	function wps_product_attached_files($product_id) {
 		global $wpdb;
 		$output = '';
-		$query = $wpdb->prepare( 'SELECT * FROM ' .$wpdb->posts. ' WHERE post_parent = %d AND post_type = %s AND post_mime_type LIKE %s', $product_id, 'attachment', 'application%' );
-		$files = $wpdb->get_results( $query );
-		if( !empty($files) ) {
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_parent = %d AND post_type = %s AND post_mime_type LIKE %s', $product_id, 'attachment', 'application%');
+		$files = $wpdb->get_results($query);
+		if (!empty($files)) {
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "attached_files_list" ) );
+			require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "attached_files_list"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -220,23 +220,23 @@ 
 	 * AJAX - Change page action on mass edit product interface
 	 */
 	function wps_mass_edit_change_page() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_change_page' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_edit_change_page'))
 			wp_die();
 
 		$status = false; $response = '';
-		$page = ( !empty($_POST['page_id']) ) ? intval( $_POST['page_id'] ) - 1 : 0;
-		$attribute_set_id = ( !empty($_POST['att_set_id']) ) ? intval( $_POST['att_set_id'] ) : 1;
-		if( !empty($attribute_set_id) ) {
+		$page = (!empty($_POST['page_id'])) ? intval($_POST['page_id']) - 1 : 0;
+		$attribute_set_id = (!empty($_POST['att_set_id'])) ? intval($_POST['att_set_id']) : 1;
+		if (!empty($attribute_set_id)) {
 			// Get tab
-			$response = $this->display_products_list( $attribute_set_id, $page );
-			$pagination = $this->get_products_pagination( $page, $attribute_set_id );
-			if( !empty($response) ) {
+			$response = $this->display_products_list($attribute_set_id, $page);
+			$pagination = $this->get_products_pagination($page, $attribute_set_id);
+			if (!empty($response)) {
 				$status = true;
 			}
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response, 'pagination' => $pagination ) );
+		echo json_encode(array('status' => $status, 'response' => $response, 'pagination' => $pagination));
 		wp_die();
 	}
 
@@ -244,30 +244,30 @@ 
 	 * AJAX - Create a draft product and display the line allowing to edit informations for this product
 	 */
 	function wps_mass_interface_new_product_creation() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_interface_new_product_creation' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_interface_new_product_creation'))
 			wp_die();
 
 		global $wpdb;
 		$output = $pagination = '';
 		$status = false;
 
-		$new_product_id = wp_insert_post( array(
+		$new_product_id = wp_insert_post(array(
 				'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
 				'post_status' => 'publish',
-				'post_title' => __( 'New product', 'wpshop' ),
-		) );
+				'post_title' => __('New product', 'wpshop'),
+		));
 
-		if( !is_object($new_product_id) ) {
+		if (!is_object($new_product_id)) {
 			$status = true;
 		}
-		if ( !empty( $new_product_id ) ) {
-			$product_attribute_set_id = ( !empty($_POST['attributes_set']) ) ? intval( $_POST['attributes_set'] ) : 1;
-			update_post_meta( $new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $product_attribute_set_id );
+		if (!empty($new_product_id)) {
+			$product_attribute_set_id = (!empty($_POST['attributes_set'])) ? intval($_POST['attributes_set']) : 1;
+			update_post_meta($new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $product_attribute_set_id);
 		}
 
-		echo json_encode( array( 'status' => $status, 'response' => $output, 'pagination' => $pagination ) );
+		echo json_encode(array('status' => $status, 'response' => $output, 'pagination' => $pagination));
 		wp_die();
 	}
 
@@ -275,32 +275,32 @@ 
 	 * AJAX - Save datas
 	 */
 	function wps_save_product_quick_interface() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_save_product_quick_interface' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_save_product_quick_interface'))
 			wp_die();
 
 		global $wpdb;
 		$response = ''; $status = false;
 		$count_products_to_update = 0; $total_updated_products = 0;
 
-		$wps_product_quick_save = !empty( $_REQUEST['wps_product_quick_save'] ) ? (array) $_REQUEST['wps_product_quick_save'] : array();
-		$wps_mass_interface = !empty( $_REQUEST['wps_mass_interface'] ) ? (array) $_REQUEST['wps_mass_interface'] : array();
-		$wpshop_product_attribute = !empty( $_REQUEST['wpshop_product_attribute'] ) ? (array) $_REQUEST['wpshop_product_attribute'] : array();
+		$wps_product_quick_save = !empty($_REQUEST['wps_product_quick_save']) ? (array)$_REQUEST['wps_product_quick_save'] : array();
+		$wps_mass_interface = !empty($_REQUEST['wps_mass_interface']) ? (array)$_REQUEST['wps_mass_interface'] : array();
+		$wpshop_product_attribute = !empty($_REQUEST['wpshop_product_attribute']) ? (array)$_REQUEST['wpshop_product_attribute'] : array();
 
 		// ------------------------------------------------------------------------------------------------------
 
-		foreach( $_REQUEST['concur'] as $post_id => $columns ) {
+		foreach ($_REQUEST['concur'] as $post_id => $columns) {
 			$concur = array();
-			for( $i = $count = 0; $i <= $count; $i++ ) {
-				foreach( $columns as $key => $rows ) {
-					$count = count( $rows )-1;
+			for ($i = $count = 0; $i <= $count; $i++) {
+				foreach ($columns as $key => $rows) {
+					$count = count($rows) - 1;
 					$concur[$i][$key] = $rows[$i];
 				}
-				if( empty( $concur[$i]['is_row'] ) ) {
-					unset( $concur[$i] );
+				if (empty($concur[$i]['is_row'])) {
+					unset($concur[$i]);
 				} else {
-					unset( $concur[$i]['is_row'] );
+					unset($concur[$i]['is_row']);
 
 					$dotPos = strrpos($concur[$i]['price'], '.');
 					$commaPos = strrpos($concur[$i]['price'], ',');
@@ -310,7 +310,7 @@ 
 					} else {
 						$concur[$i]['price'] = floatval(
 							preg_replace("/[^0-9]/", "", substr($concur[$i]['price'], 0, $sep)) . '.' .
-							preg_replace("/[^0-9]/", "", substr($concur[$i]['price'], $sep+1, strlen($concur[$i]['price'])))
+							preg_replace("/[^0-9]/", "", substr($concur[$i]['price'], $sep + 1, strlen($concur[$i]['price'])))
 						);
 					}
 
@@ -318,51 +318,51 @@ 
 					$concur[$i]['price'] = $concur[$i]['price'];
 				}
 			}
-			update_post_meta( $post_id, '_concur', $concur );
+			update_post_meta($post_id, '_concur', $concur);
 		}
 
 		// ------------------------------------------------------------------------------------------------------
 
-		if( !empty($wps_product_quick_save) ) {
-			$count_products_to_update = count( $wps_product_quick_save );
-			foreach( $wps_product_quick_save as $product_to_save ) {
+		if (!empty($wps_product_quick_save)) {
+			$count_products_to_update = count($wps_product_quick_save);
+			foreach ($wps_product_quick_save as $product_to_save) {
 				$data_to_save = array();
 				// Update post
-				$updated_post = wp_update_post( array( 'ID' => $product_to_save,
-						'post_title' => sanitize_text_field( $wps_mass_interface[$product_to_save]['post_title'] ),
-						'post_content' => sanitize_text_field( $wps_mass_interface[$product_to_save]['post_content'] ),
+				$updated_post = wp_update_post(array('ID' => $product_to_save,
+						'post_title' => sanitize_text_field($wps_mass_interface[$product_to_save]['post_title']),
+						'post_content' => sanitize_text_field($wps_mass_interface[$product_to_save]['post_content']),
 						)
 				);
 				// Update attributes
-				if( !empty($updated_post) ) {
+				if (!empty($updated_post)) {
 					// Update Featured picture
-					if( !empty($wps_mass_interface[$product_to_save]['picture']) ) {
-						$thumbnail_exist = get_post_meta( $updated_post, '_thumbnail_id', true );
-						if($wps_mass_interface[$product_to_save]['picture'] != 'deleted') {
-							wp_update_post( array('ID' => (int)$wps_mass_interface[$product_to_save]['picture'], 'post_parent' => $updated_post) );
-							update_post_meta( $updated_post, '_thumbnail_id', (int)$wps_mass_interface[$product_to_save]['picture'] );
+					if (!empty($wps_mass_interface[$product_to_save]['picture'])) {
+						$thumbnail_exist = get_post_meta($updated_post, '_thumbnail_id', true);
+						if ($wps_mass_interface[$product_to_save]['picture'] != 'deleted') {
+							wp_update_post(array('ID' => (int)$wps_mass_interface[$product_to_save]['picture'], 'post_parent' => $updated_post));
+							update_post_meta($updated_post, '_thumbnail_id', (int)$wps_mass_interface[$product_to_save]['picture']);
 						}
-						elseif($wps_mass_interface[$product_to_save]['picture'] == 'deleted' && !empty($thumbnail_exist)) {
-							delete_post_meta( $updated_post, '_thumbnail_id' );
+						elseif ($wps_mass_interface[$product_to_save]['picture'] == 'deleted' && !empty($thumbnail_exist)) {
+							delete_post_meta($updated_post, '_thumbnail_id');
 						}
 					}
 
 					// Update files datas
-					if( !empty($wps_mass_interface[$product_to_save]['files']) ) {
-						$files_data = explode( ',', sanitize_text_field( $_REQUEST['wps_mass_interface'][$product_to_save]['files'] ) );
-						if( !empty($files_data) && is_array($files_data) ) {
-							foreach( $files_data as $file_id ) {
-								if( !empty($file_id) ) {
-									wp_update_post( array('ID' => $file_id, 'post_parent' => $updated_post) );
+					if (!empty($wps_mass_interface[$product_to_save]['files'])) {
+						$files_data = explode(',', sanitize_text_field($_REQUEST['wps_mass_interface'][$product_to_save]['files']));
+						if (!empty($files_data) && is_array($files_data)) {
+							foreach ($files_data as $file_id) {
+								if (!empty($file_id)) {
+									wp_update_post(array('ID' => $file_id, 'post_parent' => $updated_post));
 								}
 							}
 						}
 					}
 
-					$data_to_save['post_ID'] = $data_to_save['product_id'] = intval( $product_to_save );
-					$data_to_save['wpshop_product_attribute'] = ( !empty($wpshop_product_attribute[ $product_to_save ]) ) ? $wpshop_product_attribute[ $product_to_save ] : array();
+					$data_to_save['post_ID'] = $data_to_save['product_id'] = intval($product_to_save);
+					$data_to_save['wpshop_product_attribute'] = (!empty($wpshop_product_attribute[$product_to_save])) ? $wpshop_product_attribute[$product_to_save] : array();
 
-					if(empty($data_to_save['wpshop_product_attribute']['varchar']['barcode'])) {
+					if (empty($data_to_save['wpshop_product_attribute']['varchar']['barcode'])) {
 						// Get current barcode
 						$wps_product_mdl = new wps_product_mdl();
 						$attid = wpshop_attributes::getElement('barcode', "'valid'", 'code')->id;
@@ -373,34 +373,34 @@ 
 					$data_to_save['user_ID'] = get_current_user_id();
 					$data_to_save['action'] = 'editpost';
 
-					if( !empty($wps_mass_interface[$product_to_save]['post_delete']) && $wps_mass_interface[$product_to_save]['post_delete'] == "true" ) {
-						wp_trash_post( $product_to_save );
+					if (!empty($wps_mass_interface[$product_to_save]['post_delete']) && $wps_mass_interface[$product_to_save]['post_delete'] == "true") {
+						wp_trash_post($product_to_save);
 					}
 
-					if( !empty($product_to_save) && !empty( $data_to_save['user_ID'] ) ) {
+					if (!empty($product_to_save) && !empty($data_to_save['user_ID'])) {
 						$product_class = new wpshop_products();
-						$product_class->save_product_custom_informations( $product_to_save, $data_to_save );
+						$product_class->save_product_custom_informations($product_to_save, $data_to_save);
 						$total_updated_products++;
 					}
 				}
 			}
 		}
 		// Checking status
-		$status = ( $total_updated_products == $count_products_to_update ) ? true : false;
+		$status = ($total_updated_products == $count_products_to_update) ? true : false;
 
-		if( $status ) {
-			$response = sprintf( __( '%d products have been successfully updated', 'wpshop'), $total_updated_products );
+		if ($status) {
+			$response = sprintf(__('%d products have been successfully updated', 'wpshop'), $total_updated_products);
 		}
 		else {
-			if( !empty($total_updated_products) ) {
-				$response = sprintf( __( 'All selected products do not be updated. %d on %d products have been successfully updated', 'wpshop'), $total_updated_products, $count_products_to_update );
+			if (!empty($total_updated_products)) {
+				$response = sprintf(__('All selected products do not be updated. %d on %d products have been successfully updated', 'wpshop'), $total_updated_products, $count_products_to_update);
 			}
 			else {
-				$response = __( 'No product have been updated', 'wpshop');
+				$response = __('No product have been updated', 'wpshop');
 			}
 		}
 
-		echo json_encode( array('status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 
@@ -408,18 +408,18 @@ 
 	* Delete product list
 	**/
 	function wps_mass_delete_file() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_delete_file' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_delete_file'))
 			wp_die();
 
 		$status = false;
-		$file_id = (!empty($_POST['file_id']) ) ? intval($_POST['file_id']) : null;
-		if( !empty($file_id) ) {
-			wp_update_post( array('ID' => $file_id, 'post_parent' => 0) );
+		$file_id = (!empty($_POST['file_id'])) ? intval($_POST['file_id']) : null;
+		if (!empty($file_id)) {
+			wp_update_post(array('ID' => $file_id, 'post_parent' => 0));
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status ) );
+		echo json_encode(array('status' => $status));
 		wp_die();
 	}
 
@@ -427,32 +427,32 @@ 
 	* Update product files list
 	*/
 	function wps_mass_edit_update_files_list() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_update_files_list' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_edit_update_files_list'))
 			wp_die();
 
 		$status = false; $response = '';
-		$product_id = ( !empty($_POST['product_id']) ) ? intval($_POST['product_id']) : null;
-		$files = ( !empty($_POST['files']) ) ? intval($_POST['files']) : null;
-		if( !empty($product_id ) ) {
+		$product_id = (!empty($_POST['product_id'])) ? intval($_POST['product_id']) : null;
+		$files = (!empty($_POST['files'])) ? intval($_POST['files']) : null;
+		if (!empty($product_id)) {
 			// Update files datas
-			if( !empty($files) ) {
-				$files_data = explode( ',', $files );
-				if( !empty($files_data) && is_array($files_data) ) {
-					foreach( $files_data as $file_id ) {
-						if( !empty($file_id) ) {
-							wp_update_post( array('ID' => $file_id, 'post_parent' => $product_id) );
+			if (!empty($files)) {
+				$files_data = explode(',', $files);
+				if (!empty($files_data) && is_array($files_data)) {
+					foreach ($files_data as $file_id) {
+						if (!empty($file_id)) {
+							wp_update_post(array('ID' => $file_id, 'post_parent' => $product_id));
 						}
 					}
 				}
 			}
 
 
-			$response = $this->wps_product_attached_files( $product_id );
+			$response = $this->wps_product_attached_files($product_id);
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 

includes/modules/billing/billing.php

Spacing +328 added lines, -328 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Billing module bootstrap file
  *
@@ -9,7 +9,7 @@ 
  */
 
 /**	Check if billing class does not exist before creating the class	*/
-if ( !class_exists("wpshop_modules_billing") ) {
+if (!class_exists("wpshop_modules_billing")) {
 	/**
 	 * Billing module utilities definition
 	 *
@@ -24,15 +24,15 @@ 
 		 */
 		function __construct() {
 			/**	Add custom template for current module	*/
-			add_filter( 'wpshop_custom_template', array( &$this, 'custom_template_load' ) );
+			add_filter('wpshop_custom_template', array(&$this, 'custom_template_load'));
 
 			/**	In case wpshop is set on sale mode and not on view catalog only, Ad billign options	*/
-			if ( WPSHOP_DEFINED_SHOP_TYPE == 'sale' ) {
-				$wpshop_shop_type = !empty( $_POST['wpshop_shop_type'] ) ? sanitize_text_field( $_POST['wpshop_shop_type'] ) : '';
-				$old_wpshop_shop_type = !empty( $_POST['old_wpshop_shop_type'] ) ? sanitize_text_field( $_POST['old_wpshop_shop_type'] ) : '';
+			if (WPSHOP_DEFINED_SHOP_TYPE == 'sale') {
+				$wpshop_shop_type = !empty($_POST['wpshop_shop_type']) ? sanitize_text_field($_POST['wpshop_shop_type']) : '';
+				$old_wpshop_shop_type = !empty($_POST['old_wpshop_shop_type']) ? sanitize_text_field($_POST['old_wpshop_shop_type']) : '';
 
-				if ( ( $wpshop_shop_type == '' || $wpshop_shop_type != 'presentation' )
-					&& ( $old_wpshop_shop_type == '' || $old_wpshop_shop_type != 'presentation' ) ) {
+				if (($wpshop_shop_type == '' || $wpshop_shop_type != 'presentation')
+					&& ($old_wpshop_shop_type == '' || $old_wpshop_shop_type != 'presentation')) {
 						/**	Add module option to wpshop general options	*/
 						add_filter('wpshop_options', array(&$this, 'add_options'), 9);
 						add_action('wsphop_options', array(&$this, 'declare_options'), 8);
@@ -40,7 +40,7 @@ 
 			}
 
 			// Filter
-			add_filter( 'wps_order_saving_admin_extra_action', array( $this, 'force_invoice_generation_on_order'), 50, 2 );
+			add_filter('wps_order_saving_admin_extra_action', array($this, 'force_invoice_generation_on_order'), 50, 2);
 		}
 
 		/**
@@ -50,17 +50,17 @@ 
 		 *
 		 * @return array The template with new elements
 		 */
-		function custom_template_load( $templates ) {
+		function custom_template_load($templates) {
 			include('templates/common/main_elements.tpl.php');
 			$wpshop_template = $tpl_element;
 			/*	Get custom frontend template	*/
-			if ( is_file(get_stylesheet_directory() . '/wpshop/common/main_elements.tpl.php') ) {
+			if (is_file(get_stylesheet_directory() . '/wpshop/common/main_elements.tpl.php')) {
 				require_once(get_stylesheet_directory() . '/wpshop/common/main_elements.tpl.php');
 				if (!empty($tpl_element))
-					$wpshop_template['common']['custom'] = ($tpl_element);unset($tpl_element);
+					$wpshop_template['common']['custom'] = ($tpl_element); unset($tpl_element);
 			}
 			$wpshop_display = new wpshop_display();
-			$templates = $wpshop_display->add_modules_template_to_internal( $wpshop_template, $templates );
+			$templates = $wpshop_display->add_modules_template_to_internal($wpshop_template, $templates);
 
 			unset($tpl_element);
 
@@ -70,9 +70,9 @@ 
 		/**
 		 * Declare option groups for the module
 		 */
-		function add_options( $option_group ) {
+		function add_options($option_group) {
 			$option_group['wpshop_billing_info'] =
-				array(	'label' => __('Billing', 'wpshop'),
+				array('label' => __('Billing', 'wpshop'),
 						'subgroups' => array(
 							'wpshop_billing_info' => array('class' => ' wpshop_admin_box_options_billing'),
 						),
@@ -85,7 +85,7 @@ 
 		 * Declare the different options in groups for the module
 		 */
 		function declare_options() {
-			add_settings_section('wpshop_billing_info','<span class="dashicons dashicons-admin-generic"></span>'. __('Billing settings', 'wpshop'), array(&$this, 'billing_options_main_explanation'), 'wpshop_billing_info');
+			add_settings_section('wpshop_billing_info', '<span class="dashicons dashicons-admin-generic"></span>' . __('Billing settings', 'wpshop'), array(&$this, 'billing_options_main_explanation'), 'wpshop_billing_info');
 
 			register_setting('wpshop_options', 'wpshop_billing_number_figures', array(&$this, 'wpshop_options_validate_billing_number_figures'));
 			add_settings_field('wpshop_billing_number_figures', __('Number of figures', 'wpshop'), array(&$this, 'wpshop_billing_number_figures_field'), 'wpshop_billing_info', 'wpshop_billing_info');
@@ -94,30 +94,30 @@ 
 			add_settings_field('wpshop_billing_address_choice', __('Billing address choice', 'wpshop'), array(&$this, 'wpshop_billing_address_choice_field'), 'wpshop_billing_info', 'wpshop_billing_info');
 			add_settings_field('wpshop_billing_address_include_into_register', '', array(&$this, 'wpshop_billing_address_include_into_register_field'), 'wpshop_billing_info', 'wpshop_billing_info');
 
-			$quotation_option = get_option( 'wpshop_addons' );
-			if ( !empty($quotation_option) && !empty($quotation_option['WPSHOP_ADDONS_QUOTATION']) && !empty($quotation_option['WPSHOP_ADDONS_QUOTATION']['activate']) ) {
-				add_settings_section('wpshop_quotation_info', '<span class="dashicons dashicons-clipboard"></span>' .__('Quotation settings', 'wpshop'), array(&$this, 'quotation_options_main_explanation'), 'wpshop_billing_info');
+			$quotation_option = get_option('wpshop_addons');
+			if (!empty($quotation_option) && !empty($quotation_option['WPSHOP_ADDONS_QUOTATION']) && !empty($quotation_option['WPSHOP_ADDONS_QUOTATION']['activate'])) {
+				add_settings_section('wpshop_quotation_info', '<span class="dashicons dashicons-clipboard"></span>' . __('Quotation settings', 'wpshop'), array(&$this, 'quotation_options_main_explanation'), 'wpshop_billing_info');
 
 				register_setting('wpshop_options', 'wpshop_quotation_validate_time', array(&$this, 'wpshop_options_validate_quotation_validate_time'));
 				add_settings_field('wpshop_quotation_validate_time', __('Quotation validate time', 'wpshop'), array(&$this, 'wpshop_quotation_validate_time_field'), 'wpshop_billing_info', 'wpshop_quotation_info');
 				$payment_option = get_option('wps_payment_mode');
-				if ( !empty($payment_option) && !empty($payment_option['mode']) && !empty($payment_option['mode']['banktransfer']) && !empty($payment_option['mode']['banktransfer']['active']) ) {
+				if (!empty($payment_option) && !empty($payment_option['mode']) && !empty($payment_option['mode']['banktransfer']) && !empty($payment_option['mode']['banktransfer']['active'])) {
 					register_setting('wpshop_options', 'wpshop_paymentMethod_options[banktransfer][add_in_quotation]', array(&$this, 'wpshop_options_validate_wpshop_bic_to_quotation'));
 					add_settings_field('wpshop_paymentMethod_options[banktransfer][add_in_quotation]', __('Add your BIC to your quotations', 'wpshop'), array(&$this, 'wpshop_bic_to_quotation_field'), 'wpshop_billing_info', 'wpshop_quotation_info');
 				}
 				register_setting('wpshop_options', 'wpshop_payment_partial', array(&$this, 'wpshop_quotation_payment_partial_validation'));
-				add_settings_field('wpshop_payment_partial', __( 'Quotation partial payment'), array(&$this, 'wpshop_quotation_payment_partial'), 'wpshop_billing_info', 'wpshop_quotation_info');
+				add_settings_field('wpshop_payment_partial', __('Quotation partial payment'), array(&$this, 'wpshop_quotation_payment_partial'), 'wpshop_billing_info', 'wpshop_quotation_info');
 			}
 
 		}
 
-		function wpshop_options_validate_wpshop_bic_to_quotation ($input) {
+		function wpshop_options_validate_wpshop_bic_to_quotation($input) {
 			return $input;
 		}
 
-		function wpshop_bic_to_quotation_field () {
+		function wpshop_bic_to_quotation_field() {
 			$add_quotation_option = get_option('wpshop_paymentMethod_options');
-			$output = '<input type="checkbox" name="wpshop_paymentMethod_options[banktransfer][add_in_quotation]" id="wpshop_paymentMethod_options[banktransfer][add_in_quotation]"  ' .( ( !empty($add_quotation_option) && !empty($add_quotation_option['banktransfer']) && !empty($add_quotation_option['banktransfer']['add_in_quotation']) ) ? 'checked="checked"' : ''). ' />';
+			$output = '<input type="checkbox" name="wpshop_paymentMethod_options[banktransfer][add_in_quotation]" id="wpshop_paymentMethod_options[banktransfer][add_in_quotation]"  ' . ((!empty($add_quotation_option) && !empty($add_quotation_option['banktransfer']) && !empty($add_quotation_option['banktransfer']['add_in_quotation'])) ? 'checked="checked"' : '') . ' />';
 			echo $output;
 		}
 
@@ -128,44 +128,44 @@ 
 
 		}
 
-		function wpshop_options_validate_quotation_validate_time ($input) {
+		function wpshop_options_validate_quotation_validate_time($input) {
 			return $input;
 		}
 
 		function wpshop_billing_number_figures_field() {
 			$wpshop_billing_number_figures = get_option('wpshop_billing_number_figures');
-			$readonly = !empty($wpshop_billing_number_figures) ? 'readonly="readonly"': null;
-			if(empty($wpshop_billing_number_figures)) $wpshop_billing_number_figures=5;
+			$readonly = !empty($wpshop_billing_number_figures) ? 'readonly="readonly"' : null;
+			if (empty($wpshop_billing_number_figures)) $wpshop_billing_number_figures = 5;
 
-			echo '<input name="wpshop_billing_number_figures" type="text" value="'.$wpshop_billing_number_figures.'" '.$readonly.' />
-		<a href="#" title="'.__('Number of figures to make appear on invoices','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+			echo '<input name="wpshop_billing_number_figures" type="text" value="' . $wpshop_billing_number_figures . '" ' . $readonly . ' />
+		<a href="#" title="'.__('Number of figures to make appear on invoices', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 		}
 
-		function wpshop_options_validate_billing_number_figures( $input ) {
+		function wpshop_options_validate_billing_number_figures($input) {
 			return $input;
 		}
 
-		function wpshop_billing_address_validator( $input ){
+		function wpshop_billing_address_validator($input) {
 			global $wpdb;
-			$t = wps_address::get_addresss_form_fields_by_type ( $input['choice'] );
+			$t = wps_address::get_addresss_form_fields_by_type($input['choice']);
 
 			$the_code = '';
-			foreach( $t[$input['choice']] as $group_id => $group_def ) {
-				if ( !empty($input['integrate_into_register_form_matching_field']) && !empty($input['integrate_into_register_form_matching_field']['user_email']) && array_key_exists( $input['integrate_into_register_form_matching_field']['user_email'], $group_def['content']) ) {
+			foreach ($t[$input['choice']] as $group_id => $group_def) {
+				if (!empty($input['integrate_into_register_form_matching_field']) && !empty($input['integrate_into_register_form_matching_field']['user_email']) && array_key_exists($input['integrate_into_register_form_matching_field']['user_email'], $group_def['content'])) {
 					$the_code = $group_def['content'][$input['integrate_into_register_form_matching_field']['user_email']]['name'];
 					continue;
 				}
 			}
 			$the_code;
 
-			if ( !empty($input['integrate_into_register_form']) && $input['integrate_into_register_form'] == 'yes' ) {
-				if ( !empty($input['integrate_into_register_form_matching_field']) && !empty($input['integrate_into_register_form_matching_field']['user_email']) && $the_code == 'address_user_email') {
+			if (!empty($input['integrate_into_register_form']) && $input['integrate_into_register_form'] == 'yes') {
+				if (!empty($input['integrate_into_register_form_matching_field']) && !empty($input['integrate_into_register_form_matching_field']['user_email']) && $the_code == 'address_user_email') {
 					$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('_need_verification' => 'no'), array('code' => $the_code));
 				}
 			}
 
-			$billing_option = get_option( 'wpshop_billing_address' );
-			if( !empty($billing_option) && !empty( $billing_option['display_model'] ) ) {
+			$billing_option = get_option('wpshop_billing_address');
+			if (!empty($billing_option) && !empty($billing_option['display_model'])) {
 				$input['display_model'] = $billing_option['display_model'];
 			}
 
@@ -178,10 +178,10 @@ 
 
 			$wpshop_billing_address = get_option('wpshop_billing_address');
 
-			$query = $wpdb->prepare('SELECT ID FROM ' .$wpdb->posts. ' WHERE post_name = "%s" AND post_type = "%s"', WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES);
+			$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_name = "%s" AND post_type = "%s"', WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES);
 			$entity_id = $wpdb->get_var($query);
 
-			$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d', $entity_id);
+			$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
 			$content = $wpdb->get_results($query);
 
 			/*	Field for billing address type choice	*/
@@ -190,21 +190,21 @@ 
 			$input_def['possible_value'] = $content;
 			$input_def['type'] = 'select';
 			$input_def['value'] = $wpshop_billing_address['choice'];
-			$output .= '<div>' .wpshop_form::check_input_type($input_def). '</div>';
+			$output .= '<div>' . wpshop_form::check_input_type($input_def) . '</div>';
 
 			/*	Field for integrate billign form into register form	*/
 			$input_def = array();
 			$input_def['name'] = 'wpshop_billing_address[integrate_into_register_form]';
 			$input_def['id'] = 'wpshop_billing_address_integrate_into_register_form';
-			$input_def['possible_value'] = array( 'yes' => __('Integrate billing form into register form', 'wpshop') );
+			$input_def['possible_value'] = array('yes' => __('Integrate billing form into register form', 'wpshop'));
 			$input_def['valueToPut'] = 'index';
 			$input_def['options_label']['original'] = true;
 			$input_def['option'] = ' class="wpshop_billing_address_integrate_into_register_form" ';
 			$input_def['type'] = 'checkbox';
-			$input_def['value'] = array( !empty($wpshop_billing_address['integrate_into_register_form']) ? $wpshop_billing_address['integrate_into_register_form'] : '' );
+			$input_def['value'] = array(!empty($wpshop_billing_address['integrate_into_register_form']) ? $wpshop_billing_address['integrate_into_register_form'] : '');
 			$output .= '
 <div class="wpshop_include_billing_form_into_register_container" >
-	' .wpshop_form::check_input_type($input_def). '
+	' .wpshop_form::check_input_type($input_def) . '
 	<input type="hidden" name="wpshop_ajax_integrate_billin_into_register" id="wpshop_ajax_integrate_billin_into_register" value="' . wp_create_nonce('wpshop_ajax_integrate_billin_into_register') . '" />
 	<input type="hidden" name="wpshop_include_billing_form_into_register_where_value" id="wpshop_include_billing_form_into_register_where_value" value="' . (!empty($wpshop_billing_address['integrate_into_register_form_after_field']) ? $wpshop_billing_address['integrate_into_register_form_after_field'] : '') . '" />
 	<div class="wpshop_include_billing_form_into_register_where" ></div>
@@ -217,13 +217,13 @@ 
 
 		}
 
-		function wpshop_quotation_validate_time_field () {
+		function wpshop_quotation_validate_time_field() {
 			$quotation_option = get_option('wpshop_quotation_validate_time');
-			$output  = '<input type="text" name="wpshop_quotation_validate_time[number]" id="wpshop_quotation_validate_time[number]" style="width:50px;" value="' .( ( !empty($quotation_option) && !empty($quotation_option['number']) ) ? $quotation_option['number'] : null ). '" />';
+			$output  = '<input type="text" name="wpshop_quotation_validate_time[number]" id="wpshop_quotation_validate_time[number]" style="width:50px;" value="' . ((!empty($quotation_option) && !empty($quotation_option['number'])) ? $quotation_option['number'] : null) . '" />';
 			$output .= '<select name="wpshop_quotation_validate_time[time_type]" id="wpshop_quotation_validate_time[time_type]">';
-			$output .= '<option value="day" ' .( (  !empty($quotation_option) && !empty($quotation_option['time_type']) &&  $quotation_option['time_type'] == 'day') ? 'selected="selected"' : ''). '>' .__('Days', 'wpshop'). '</option>';
-			$output .= '<option value="month" ' .( (  !empty($quotation_option) && !empty($quotation_option['time_type']) &&  $quotation_option['time_type'] == 'month') ? 'selected="selected"' : ''). '>' .__('Months', 'wpshop'). '</option>';
-			$output .= '<option value="year" ' .( (  !empty($quotation_option) && !empty($quotation_option['time_type']) &&  $quotation_option['time_type'] == 'year') ? 'selected="selected"' : ''). '>' .__('Years', 'wpshop'). '</option>';
+			$output .= '<option value="day" ' . ((!empty($quotation_option) && !empty($quotation_option['time_type']) && $quotation_option['time_type'] == 'day') ? 'selected="selected"' : '') . '>' . __('Days', 'wpshop') . '</option>';
+			$output .= '<option value="month" ' . ((!empty($quotation_option) && !empty($quotation_option['time_type']) && $quotation_option['time_type'] == 'month') ? 'selected="selected"' : '') . '>' . __('Months', 'wpshop') . '</option>';
+			$output .= '<option value="year" ' . ((!empty($quotation_option) && !empty($quotation_option['time_type']) && $quotation_option['time_type'] == 'year') ? 'selected="selected"' : '') . '>' . __('Years', 'wpshop') . '</option>';
 			$output .= '</select>';
 
 			echo $output;
@@ -236,19 +236,19 @@ 
 		 *
 		 * @return string The new invoice number
 		 */
-		public static function generate_invoice_number( $order_id ) {
+		public static function generate_invoice_number($order_id) {
 			/**	Get configuration about the number of figure dor invoice number	*/
 
 			$number_figures = get_option('wpshop_billing_number_figures', false);
 
 			/** If the number doesn't exist, we create a default one */
-			if(!$number_figures) {
+			if (!$number_figures) {
 				update_option('wpshop_billing_number_figures', 5);
 			}
 
 			/** sleep my script, SLEEP I SAY ! **/
-			$rand_time = rand( 1000, 200000 );
-			usleep( $rand_time );
+			$rand_time = rand(1000, 200000);
+			usleep($rand_time);
 			/** GET UP !! **/
 
 			/**	Get last invoice number	*/
@@ -264,14 +264,14 @@ 
 
 			/** Check if number exists **/
 			$billing_current_number_checking = get_option('wpshop_billing_current_number', false);
-			if ( $billing_current_number_checking == $billing_current_number ) {
+			if ($billing_current_number_checking == $billing_current_number) {
 				$billing_current_number++;
 			}
 
 			update_option('wpshop_billing_current_number', $billing_current_number);
 
 			/**	Create the new invoice number with all parameters viewed above	*/
-			$invoice_ref = WPSHOP_BILLING_REFERENCE_PREFIX . ((string)sprintf('%0'.$number_figures.'d', $billing_current_number));
+			$invoice_ref = WPSHOP_BILLING_REFERENCE_PREFIX . ((string)sprintf('%0' . $number_figures . 'd', $billing_current_number));
 
 			return $invoice_ref;
 		}
@@ -285,67 +285,67 @@ 
 		 *
 		 * @return string The invoice output in case no error is found. The error in other case
 		 */
-		public static function generate_html_invoice( $order_id, $invoice_ref ) {
+		public static function generate_html_invoice($order_id, $invoice_ref) {
 			global $wpdb;
 
-			$date_output_format = get_option( 'date_format' ) . ' ' . get_option( 'time_format' );
+			$date_output_format = get_option('date_format') . ' ' . get_option('time_format');
 			$count_products = 0;
 
-			if ( !empty($order_id) ) {
+			if (!empty($order_id)) {
 				$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 
 				$discounts_exists = false;
 
-				$is_quotation = ( empty($order_postmeta['order_key']) && !empty($order_postmeta['order_temporary_key']) && $invoice_ref == null ) ? true : false;
+				$is_quotation = (empty($order_postmeta['order_key']) && !empty($order_postmeta['order_temporary_key']) && $invoice_ref == null) ? true : false;
 				/** Check if it's a partial payment bill **/
 				$is_partial_payment = false;
-				if( isset( $order_postmeta['order_payment']['received'] ) && !empty($invoice_ref) && $order_postmeta['order_status'] == 'partially_paid' ) {
-					foreach( $order_postmeta['order_payment']['received'] as $key => $payment ) {
-						if( isset( $payment['invoice_ref'] ) && $payment['invoice_ref'] == $invoice_ref ) {
+				if (isset($order_postmeta['order_payment']['received']) && !empty($invoice_ref) && $order_postmeta['order_status'] == 'partially_paid') {
+					foreach ($order_postmeta['order_payment']['received'] as $key => $payment) {
+						if (isset($payment['invoice_ref']) && $payment['invoice_ref'] == $invoice_ref) {
 							$is_partial_payment = true;
 							break;
 						}
 					}
-				} elseif( !empty($invoice_ref) && !empty($order_postmeta['order_invoice_ref'])  && $order_postmeta['order_invoice_ref'] != $invoice_ref ) {
+				} elseif (!empty($invoice_ref) && !empty($order_postmeta['order_invoice_ref']) && $order_postmeta['order_invoice_ref'] != $invoice_ref) {
 					$is_partial_payment = true;
-				} elseif( empty($invoice_ref) && $order_postmeta['order_status'] == 'partially_paid' ) {
+				} elseif (empty($invoice_ref) && $order_postmeta['order_status'] == 'partially_paid') {
 					$is_partial_payment = true;
 				}
 
 				/** Check it is a shipping slip **/
-				$bon_colisage = !empty( $_GET['bon_colisage'] ) ? sanitize_key( $_GET['bon_colisage'] ) : false;
-				if ( $bon_colisage ) $bon_colisage = true;
+				$bon_colisage = !empty($_GET['bon_colisage']) ? sanitize_key($_GET['bon_colisage']) : false;
+				if ($bon_colisage) $bon_colisage = true;
 
-				if ( !empty($order_postmeta) ) {
+				if (!empty($order_postmeta)) {
 					$tpl_component = array();
 
 					/** Billing Header **/
 					//Logo
 					$logo_options = get_option('wpshop_logo');
-					$tpl_component['INVOICE_LOGO'] = ( !empty($logo_options) ) ? '<img src="' .str_replace( 'https', 'http', $logo_options ) .'" alt="" />' : '';
+					$tpl_component['INVOICE_LOGO'] = (!empty($logo_options)) ? '<img src="' . str_replace('https', 'http', $logo_options) . '" alt="" />' : '';
 
 					// Title
-					$tpl_component['INVOICE_TITLE'] = ($is_partial_payment) ? __('Bill payment', 'wpshop') : ( ( $is_quotation ) ?  __('Quotation', 'wpshop') : __('Invoice', 'wpshop') );
+					$tpl_component['INVOICE_TITLE'] = ($is_partial_payment) ? __('Bill payment', 'wpshop') : (($is_quotation) ? __('Quotation', 'wpshop') : __('Invoice', 'wpshop'));
 
 // 					if ( empty($order_postmeta['order_invoice_ref']) ) {
 // 						$tpl_component['INVOICE_TITLE'] = __('Bill payment', 'wpshop');
 // 						$is_partial_payment = true;
 // 					}
 
-					if ( $bon_colisage ) {
-						$tpl_component['INVOICE_TITLE'] = __( 'Products List', 'wpshop' );
+					if ($bon_colisage) {
+						$tpl_component['INVOICE_TITLE'] = __('Products List', 'wpshop');
 					}
 
-					$tpl_component['INVOICE_ORDER_INVOICE_REF'] = ( !empty($invoice_ref) ) ? $invoice_ref : (!empty($order_postmeta['order_invoice_ref']) ? $order_postmeta['order_invoice_ref'] : null);
-					if ( $bon_colisage ) {
+					$tpl_component['INVOICE_ORDER_INVOICE_REF'] = (!empty($invoice_ref)) ? $invoice_ref : (!empty($order_postmeta['order_invoice_ref']) ? $order_postmeta['order_invoice_ref'] : null);
+					if ($bon_colisage) {
 						$tpl_component['INVOICE_ORDER_INVOICE_REF'] = '';
 					}
-					$tpl_component['INVOICE_ORDER_KEY_INDICATION'] = ( $is_quotation ) ? sprintf( __('Ref. %s', 'wpshop'),$order_postmeta['order_temporary_key']) : sprintf( __('Order n. %s', 'wpshop'), $order_postmeta['order_key'] );
-					$tpl_component['INVOICE_ORDER_DATE_INDICATION'] = ( $is_quotation ) ? sprintf( __('Quotation date %s', 'wpshop'), mysql2date($date_output_format ,$order_postmeta['order_date'], true) ) : sprintf( __('Order date %s', 'wpshop'), mysql2date($date_output_format ,$order_postmeta['order_date'], true) );
+					$tpl_component['INVOICE_ORDER_KEY_INDICATION'] = ($is_quotation) ? sprintf(__('Ref. %s', 'wpshop'), $order_postmeta['order_temporary_key']) : sprintf(__('Order n. %s', 'wpshop'), $order_postmeta['order_key']);
+					$tpl_component['INVOICE_ORDER_DATE_INDICATION'] = ($is_quotation) ? sprintf(__('Quotation date %s', 'wpshop'), mysql2date($date_output_format, $order_postmeta['order_date'], true)) : sprintf(__('Order date %s', 'wpshop'), mysql2date($date_output_format, $order_postmeta['order_date'], true));
 
 					/** Validate period for Quotation **/
-					if ( $is_quotation ) {
-						$quotation_validate_period = self::quotation_validate_period( $order_postmeta['order_date'] );
+					if ($is_quotation) {
+						$quotation_validate_period = self::quotation_validate_period($order_postmeta['order_date']);
 					}
 					else {
 						$tpl_component['INVOICE_VALIDATE_TIME'] = '';
@@ -353,22 +353,22 @@ 
 
 					$tpl_component['INVOICE_VALIDATE_TIME'] = empty($tpl_component['INVOICE_VALIDATE_TIME']) ? '' : $tpl_component['INVOICE_VALIDATE_TIME'];
 
-					$tpl_component['AMOUNT_INFORMATION'] = ( !$bon_colisage ) ? sprintf( __('Amount are shown in %s', 'wpshop'), wpshop_tools::wpshop_get_currency( true ) ) : '';
+					$tpl_component['AMOUNT_INFORMATION'] = (!$bon_colisage) ? sprintf(__('Amount are shown in %s', 'wpshop'), wpshop_tools::wpshop_get_currency(true)) : '';
 
 
 
 					// Sender & receiver addresses
 					$tpl_component['INVOICE_SENDER'] = self::generate_invoice_sender_part( );
-					$tpl_component['INVOICE_RECEIVER'] = self::generate_receiver_part( $order_id, $bon_colisage );
+					$tpl_component['INVOICE_RECEIVER'] = self::generate_receiver_part($order_id, $bon_colisage);
 
 					$tpl_component['INVOICE_TRACKING'] = '';
 					$first = false;
-					if( !empty($order_postmeta['order_trackingNumber']) ) {
+					if (!empty($order_postmeta['order_trackingNumber'])) {
 						$tpl_component['INVOICE_TRACKING'] = __('Tracking : ', 'wpshop') . $order_postmeta['order_trackingNumber'];
 						$first = true;
 					}
-					if( !empty($order_postmeta['order_trackingLink']) ) {
-						if( !$first ) {
+					if (!empty($order_postmeta['order_trackingLink'])) {
+						if (!$first) {
 							$tpl_component['INVOICE_TRACKING'] = __('Tracking : ', 'wpshop') . $order_postmeta['order_trackingLink'];
 						} else {
 							$tpl_component['INVOICE_TRACKING'] .= ' - ' . $order_postmeta['order_trackingLink'];
@@ -378,22 +378,22 @@ 
 
 					/** Items Tab **/
 					$order_tva = array();
-					if ( $bon_colisage ) {
+					if ($bon_colisage) {
 						$tpl_component['INVOICE_HEADER'] = wpshop_display::display_template_element('bon_colisage_row_header', array(), array(), 'common');
 					}
 					else {
 						$tpl_component['INVOICE_HEADER'] = wpshop_display::display_template_element('invoice_row_header', array(), array(), 'common');
 						//if ( !$is_quotation ) {
 							/** Check if products have discounts **/
-							if ( !empty($order_postmeta['order_items']) && !$is_partial_payment ) {
-								foreach( $order_postmeta['order_items'] as $item_id => $item ) {
-									if ( !empty($item['item_global_discount_value']) || !empty($item['item_unit_discount_value']) ) {
+							if (!empty($order_postmeta['order_items']) && !$is_partial_payment) {
+								foreach ($order_postmeta['order_items'] as $item_id => $item) {
+									if (!empty($item['item_global_discount_value']) || !empty($item['item_unit_discount_value'])) {
 										$discounts_exists = true;
 									}
 								}
 							}
 
-							if ( $discounts_exists ) {
+							if ($discounts_exists) {
 								$tpl_component['INVOICE_HEADER'] = wpshop_display::display_template_element('invoice_row_header_with_discount', array(), array(), 'common');
 							}
 
@@ -403,119 +403,119 @@ 
 					$total_discounted = 0;
 					$tpl_component['INVOICE_ROWS'] = '';
 
-					if( !$is_partial_payment ) {
-						if ( !empty($order_postmeta['order_items']) ) {
-							foreach( $order_postmeta['order_items'] as $item_id => $item ) {
+					if (!$is_partial_payment) {
+						if (!empty($order_postmeta['order_items'])) {
+							foreach ($order_postmeta['order_items'] as $item_id => $item) {
 								$sub_tpl_component = array();
 								$count_products += $item['item_qty'];
-								$barcode = get_post_meta( $item['item_id'], '_barcode', true );
-								if ( empty($barcode) ) {
-									$product_metadata = get_post_meta( $item['item_id'], '_wpshop_product_metadata', true );
-									$barcode = ( !empty($product_metadata) && !empty($product_metadata['barcode']) ) ? $product_metadata['barcode'] : '';
-
-									if( empty($barcode) ) {
-										$product_entity = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
-										$att_def = wpshop_attributes::getElement( 'barcode', '"valid"', 'code' );
-										$query = $wpdb->prepare( 'SELECT value FROM ' .$wpdb->prefix. 'wpshop__attribute_value_'.$att_def->data_type. ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d AND value != ""', $product_entity, $att_def->id, $item['item_id'] );
-										$barcode = $wpdb->get_var( $query );
+								$barcode = get_post_meta($item['item_id'], '_barcode', true);
+								if (empty($barcode)) {
+									$product_metadata = get_post_meta($item['item_id'], '_wpshop_product_metadata', true);
+									$barcode = (!empty($product_metadata) && !empty($product_metadata['barcode'])) ? $product_metadata['barcode'] : '';
+
+									if (empty($barcode)) {
+										$product_entity = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+										$att_def = wpshop_attributes::getElement('barcode', '"valid"', 'code');
+										$query = $wpdb->prepare('SELECT value FROM ' . $wpdb->prefix . 'wpshop__attribute_value_' . $att_def->data_type . ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d AND value != ""', $product_entity, $att_def->id, $item['item_id']);
+										$barcode = $wpdb->get_var($query);
 									}
 								}
-								$sub_tpl_component['INVOICE_ROW_ITEM_BARCODE'] = ( !empty($barcode) ) ? $barcode : '-';
+								$sub_tpl_component['INVOICE_ROW_ITEM_BARCODE'] = (!empty($barcode)) ? $barcode : '-';
 
-								$sub_tpl_component['INVOICE_ROW_ITEM_REF'] = ( !empty($barcode) ) ? $barcode : $item['item_ref'];
+								$sub_tpl_component['INVOICE_ROW_ITEM_REF'] = (!empty($barcode)) ? $barcode : $item['item_ref'];
 
 								/** Item name **/
 								$is_variation = false;
-								if( get_post_type( $item['item_id'] ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
+								if (get_post_type($item['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
 									$is_variation = true;
-									$parent_def = wpshop_products::get_parent_variation( $item['item_id'] );
-									if( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
+									$parent_def = wpshop_products::get_parent_variation($item['item_id']);
+									if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
 										$parent_post = $parent_def['parent_post'];
 										$item_parent_id = $parent_post->ID;
-										$item_title =  $parent_post->post_title;
+										$item_title = $parent_post->post_title;
 									}
 								} else {
 									$item_title = $item['item_name'];
 								}
 								$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = $item_title;
 								/**	Get attribute order for current product	*/
-								$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails( get_post_meta($item['item_id'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true)  ) ;
+								$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($item['item_id'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
 								$output_order = array();
-								if ( count($product_attribute_order_detail) > 0 && is_array($product_attribute_order_detail) ) {
-									foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
-										foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-											if ( !empty($attribute_def->code) )
+								if (count($product_attribute_order_detail) > 0 && is_array($product_attribute_order_detail)) {
+									foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
+										foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
+											if (!empty($attribute_def->code))
 												$output_order[$attribute_def->code] = $position;
 										}
 									}
 								}
-								$variation_attribute_ordered = wpshop_products::get_selected_variation_display( $item['item_meta'], $output_order, 'invoice_print', 'common');
+								$variation_attribute_ordered = wpshop_products::get_selected_variation_display($item['item_meta'], $output_order, 'invoice_print', 'common');
 								ksort($variation_attribute_ordered['attribute_list']);
 								$detail_tpl_component['CART_PRODUCT_MORE_INFO'] = '';
-								foreach ( $variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output ) {
+								foreach ($variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output) {
 									$detail_tpl_component['CART_PRODUCT_MORE_INFO'] .= $attribute_variation_to_output;
 								}
-								if( /*get_post_status( $item['item_id'] ) == 'free_product' &&*/ ! empty( get_post_field( 'post_content', $item['item_id'] ) ) ) {
-									if ( ! empty( $detail_tpl_component['CART_PRODUCT_MORE_INFO'] ) ) {
+								if ( /*get_post_status( $item['item_id'] ) == 'free_product' &&*/ !empty(get_post_field('post_content', $item['item_id'])) ) {
+									if (!empty($detail_tpl_component['CART_PRODUCT_MORE_INFO'])) {
 										//$detail_tpl_component['CART_PRODUCT_MORE_INFO'] .= '<br>';
 									}
-									$detail_tpl_component['CART_PRODUCT_MORE_INFO'] .= '<span id="wpshop_cart_description_line">' . nl2br( get_post_field( 'post_content', $item['item_id'] ) ) . '</span>';
+									$detail_tpl_component['CART_PRODUCT_MORE_INFO'] .= '<span id="wpshop_cart_description_line">' . nl2br(get_post_field('post_content', $item['item_id'])) . '</span>';
 								}
 								$sub_tpl_component['INVOICE_ROW_ITEM_DETAIL'] = !empty($detail_tpl_component['CART_PRODUCT_MORE_INFO']) ? wpshop_display::display_template_element('invoice_row_item_detail', $detail_tpl_component, array(), 'common') : '';
-								unset( $detail_tpl_component );
+								unset($detail_tpl_component);
 
 								$sub_tpl_component['INVOICE_ROW_ITEM_QTY'] = $item['item_qty'];
-								$sub_tpl_component['INVOICE_ROW_ITEM_PU_TTC'] = ( ( !empty($item['item_pu_ttc_before_discount']) ) ? number_format( $item['item_pu_ttc_before_discount'], 2, '.', '' ) : number_format( $item['item_pu_ttc'], 2, '.', '' ) );
-								$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = ( ( !empty($item['item_pu_ht_before_discount']) ) ? number_format( $item['item_pu_ht_before_discount'], 2, '.', '' ) : number_format( $item['item_pu_ht'], 2, '.', '' ) );
-								$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] =  ( !empty($item['item_discount_value']) )  ?  number_format($item['item_discount_value'], 2, '.', '') : number_format(0, 2, '.', '' );
-								$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] =  number_format( ($item['item_pu_ht'] * $item['item_qty']), 2, '.', '' );
+								$sub_tpl_component['INVOICE_ROW_ITEM_PU_TTC'] = ((!empty($item['item_pu_ttc_before_discount'])) ? number_format($item['item_pu_ttc_before_discount'], 2, '.', '') : number_format($item['item_pu_ttc'], 2, '.', ''));
+								$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = ((!empty($item['item_pu_ht_before_discount'])) ? number_format($item['item_pu_ht_before_discount'], 2, '.', '') : number_format($item['item_pu_ht'], 2, '.', ''));
+								$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] = (!empty($item['item_discount_value'])) ? number_format($item['item_discount_value'], 2, '.', '') : number_format(0, 2, '.', '');
+								$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] = number_format(($item['item_pu_ht'] * $item['item_qty']), 2, '.', '');
 								/** TVA **/
-								$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format($item['item_tva_total_amount'], 2, '.', '' );
+								$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format($item['item_tva_total_amount'], 2, '.', '');
 								$sub_tpl_component['INVOICE_ROW_ITEM_TVA_RATE'] = $item['item_tva_rate'];
 
 
-								$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = number_format( $item['item_total_ttc'], 2, '.', '' );
+								$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = number_format($item['item_total_ttc'], 2, '.', '');
 
 
 								/** Checking Rate amount **/
-								if ( !$bon_colisage ) {
-								 $checking = self::check_product_price( $item['item_total_ht'],  $item['item_total_ttc'], $item['item_tva_total_amount'], $item['item_tva_rate'], $item['item_id'], $invoice_ref, $order_id );
-								 if( !$checking ) {
+								if (!$bon_colisage) {
+								 $checking = self::check_product_price($item['item_total_ht'], $item['item_total_ttc'], $item['item_tva_total_amount'], $item['item_tva_rate'], $item['item_id'], $invoice_ref, $order_id);
+								 if (!$checking) {
 								 	return __('Invoice cannot be generate because an error was found. The website administrator has been warned.', 'wpshop');
 								 }
 								}
 
-								if ( $bon_colisage ) {
+								if ($bon_colisage) {
 									$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('bon_colisage_row', $sub_tpl_component, array(), 'common');
 								}
 								else {
-									if ( $discounts_exists ) {
+									if ($discounts_exists) {
 										$discounted_total_per_item = $item['item_total_ht'];
 										/** Unit Discount **/
-										if ( !empty($item['item_unit_discount_amount']) && !empty($item['item_unit_discount_value']) ) {
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format( $item['item_unit_discount_amount'], 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format( $item['item_unit_discount_value'], 2, '.', '');
+										if (!empty($item['item_unit_discount_amount']) && !empty($item['item_unit_discount_value'])) {
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format($item['item_unit_discount_amount'], 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format($item['item_unit_discount_value'], 2, '.', '');
 											$discounted_total_per_item = $discounted_total_per_item - $item['item_unit_discount_amount'];
 										}
 										else {
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format( 0, 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format( 0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format(0, 2, '.', '');
 										}
 
 										/** Global Discount **/
-										if ( !empty($item['item_global_discount_amount']) && !empty($item['item_global_discount_value']) ) {
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format( $item['item_global_discount_amount'], 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format( $item['item_global_discount_value'], 2, '.', '');
+										if (!empty($item['item_global_discount_amount']) && !empty($item['item_global_discount_value'])) {
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format($item['item_global_discount_amount'], 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format($item['item_global_discount_value'], 2, '.', '');
 											$discounted_total_per_item = $discounted_total_per_item - $item['item_global_discount_amount'];
 										}
 										else {
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format( 0, 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format( 0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format(0, 2, '.', '');
 										}
 
 										$total_discounted += $discounted_total_per_item;
 										/** Total HT Discounted **/
-										$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNTED_HT_TOTAL'] = number_format( $discounted_total_per_item, 2, '.', '');
+										$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNTED_HT_TOTAL'] = number_format($discounted_total_per_item, 2, '.', '');
 
 										$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row_with_discount', $sub_tpl_component, array(), 'common');
 									}
@@ -523,14 +523,14 @@ 
 										$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row', $sub_tpl_component, array(), 'common');
 									}
 								}
-								unset( $sub_tpl_component );
+								unset($sub_tpl_component);
 
 								/** Check TVA **/
-								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'];
 								}
 
 							}
@@ -541,33 +541,33 @@ 
 
 						/** Display Partials payments **/
 						$total_partial_payment = 0; $last_payment = 0;
-						$order_invoice_ref = ( !empty($order_postmeta['order_invoice_ref']) ) ? $order_postmeta['order_invoice_ref'] : '';
-						if ( !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) && !$bon_colisage ) {
-							foreach( $order_postmeta['order_payment']['received'] as $received_payment ) {
-								if ( !empty($received_payment['invoice_ref']) && $received_payment['invoice_ref'] != $order_invoice_ref ) {
-									if ( intval( substr($received_payment['invoice_ref'], 2) ) == intval( substr($tpl_component['INVOICE_ORDER_INVOICE_REF'], 2) )) {
+						$order_invoice_ref = (!empty($order_postmeta['order_invoice_ref'])) ? $order_postmeta['order_invoice_ref'] : '';
+						if (!empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) && !$bon_colisage) {
+							foreach ($order_postmeta['order_payment']['received'] as $received_payment) {
+								if (!empty($received_payment['invoice_ref']) && $received_payment['invoice_ref'] != $order_invoice_ref) {
+									if (intval(substr($received_payment['invoice_ref'], 2)) == intval(substr($tpl_component['INVOICE_ORDER_INVOICE_REF'], 2))) {
 										$sub_tpl_component = array();
 										$sub_tpl_component['INVOICE_ROW_ITEM_REF'] = $received_payment['invoice_ref'];
 
 										/** Item name **/
-										$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = sprintf( __('Partial payment on order %1$s', 'wpshop'), $order_postmeta['order_key'], __( $received_payment['method'], 'wpshop'), $received_payment['payment_reference']);
+										$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = sprintf(__('Partial payment on order %1$s', 'wpshop'), $order_postmeta['order_key'], __($received_payment['method'], 'wpshop'), $received_payment['payment_reference']);
 										$sub_tpl_component['INVOICE_ROW_ITEM_DETAIL'] = '';
 										$sub_tpl_component['INVOICE_ROW_ITEM_QTY'] = 1;
-										$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = '-' . number_format( $received_payment['received_amount'], 2, '.', '' );
-										$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] =  number_format(0, 2, '.', '' );
-										$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] = '-' . number_format( $received_payment['received_amount'], 2, '.', '' );
+										$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = '-' . number_format($received_payment['received_amount'], 2, '.', '');
+										$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+										$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] = '-' . number_format($received_payment['received_amount'], 2, '.', '');
 
 										/** TVA **/
-										$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format(0, 2, '.', '' );
+										$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format(0, 2, '.', '');
 										$sub_tpl_component['INVOICE_ROW_ITEM_TVA_RATE'] = 0;
-										$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = '-' . number_format( $received_payment['received_amount'], 2, '.', '' );
+										$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = '-' . number_format($received_payment['received_amount'], 2, '.', '');
 
-										if ( $discounts_exists ) {
-											$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNTED_HT_TOTAL'] = '-'.number_format( $received_payment['received_amount'], 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format( 0, 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format( 0, 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format( 0, 2, '.', '');
-											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format( 0, 2, '.', '');
+										if ($discounts_exists) {
+											$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNTED_HT_TOTAL'] = '-' . number_format($received_payment['received_amount'], 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_UNIT_DISCOUNT_VALUE'] = number_format(0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+											$sub_tpl_component['INVOICE_ROW_ITEM_GLOBAL_DISCOUNT_VALUE'] = number_format(0, 2, '.', '');
 
 											$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row_with_discount', $sub_tpl_component, array(), 'common');
 										}
@@ -576,11 +576,11 @@ 
 										}
 									}
 
-									unset( $sub_tpl_component );
-									$total_partial_payment += ( !empty($received_payment['received_amount']) ) ? $received_payment['received_amount'] : 0;
+									unset($sub_tpl_component);
+									$total_partial_payment += (!empty($received_payment['received_amount'])) ? $received_payment['received_amount'] : 0;
 								}
-								else if( 'payment_received' == $received_payment[ 'status' ] ) {
-									$last_payment += ( !empty($received_payment['received_amount']) ) ? $received_payment['received_amount'] : 0;
+								else if ('payment_received' == $received_payment['status']) {
+									$last_payment += (!empty($received_payment['received_amount'])) ? $received_payment['received_amount'] : 0;
 								}
 
 							}
@@ -589,24 +589,24 @@ 
 					else {
 						/** Display Partials payments **/
 						$total_partial_payment = 0; $last_payment = 0;
-						if ( !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) && !$bon_colisage ) {
-							foreach( $order_postmeta['order_payment']['received'] as $key => $received_payment ) {
-								if ( !empty($received_payment['invoice_ref']) && !empty($invoice_ref) && $received_payment['invoice_ref'] == $invoice_ref ) {
+						if (!empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) && !$bon_colisage) {
+							foreach ($order_postmeta['order_payment']['received'] as $key => $received_payment) {
+								if (!empty($received_payment['invoice_ref']) && !empty($invoice_ref) && $received_payment['invoice_ref'] == $invoice_ref) {
 									$sub_tpl_component = array();
 									$sub_tpl_component['INVOICE_ROW_ITEM_REF'] = $received_payment['invoice_ref'];
 									/** Item name **/
-									$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = sprintf( __('Partial payment %4$d on order %1$s', 'wpshop'), $order_postmeta['order_key'], __( $received_payment['method'], 'wpshop'), $received_payment['payment_reference'], $key+1);
+									$sub_tpl_component['INVOICE_ROW_ITEM_NAME'] = sprintf(__('Partial payment %4$d on order %1$s', 'wpshop'), $order_postmeta['order_key'], __($received_payment['method'], 'wpshop'), $received_payment['payment_reference'], $key + 1);
 									$sub_tpl_component['INVOICE_ROW_ITEM_DETAIL'] = '';
 									$sub_tpl_component['INVOICE_ROW_ITEM_QTY'] = 1;
-									$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = number_format( $received_payment['received_amount'], 2, '.', '' );
-									$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '' );
-									$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] = number_format( $received_payment['received_amount'], 2, '.', '' );
+									$sub_tpl_component['INVOICE_ROW_ITEM_PU_HT'] = number_format($received_payment['received_amount'], 2, '.', '');
+									$sub_tpl_component['INVOICE_ROW_ITEM_DISCOUNT_AMOUNT'] = number_format(0, 2, '.', '');
+									$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_HT'] = number_format($received_payment['received_amount'], 2, '.', '');
 									/** TVA **/
-									$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format(0, 2, '.', '' );
+									$sub_tpl_component['INVOICE_ROW_ITEM_TVA_TOTAL_AMOUNT'] = number_format(0, 2, '.', '');
 									$sub_tpl_component['INVOICE_ROW_ITEM_TVA_RATE'] = 0;
-									$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = number_format( $received_payment['received_amount'], 2, '.', '' );
+									$sub_tpl_component['INVOICE_ROW_ITEM_TOTAL_TTC'] = number_format($received_payment['received_amount'], 2, '.', '');
 									$tpl_component['INVOICE_ROWS'] .= wpshop_display::display_template_element('invoice_row', $sub_tpl_component, array(), 'common');
-									unset( $sub_tpl_component );
+									unset($sub_tpl_component);
 									$total_partial_payment += $received_payment['received_amount'];
 								}
 							}
@@ -619,126 +619,126 @@ 
 					/** Summary of order **/
 					$summary_tpl_component = array();
 					$tpl_component['INVOICE_SUMMARY_PART'] = $summary_tpl_component['INVOICE_SUMMARY_TAXES'] = '';
-					if ( !$bon_colisage ) {
-						if ( !empty( $order_tva ) ) {
-							foreach( $order_tva as $tax_rate => $tax_amount ) {
-								if ( $tax_amount > 0 ) {
-									$tax_rate = ( !empty($tax_rate) && $tax_rate == 'VAT_shipping_cost' ) ?  __('on Shipping cost', 'wpshop').' '.WPSHOP_VAT_ON_SHIPPING_COST : $tax_rate;
-									$sub_tpl_component['SUMMARY_ROW_TITLE'] = sprintf( __('Total taxes amount %1$s', 'wpshop'), $tax_rate . '%' );
+					if (!$bon_colisage) {
+						if (!empty($order_tva)) {
+							foreach ($order_tva as $tax_rate => $tax_amount) {
+								if ($tax_amount > 0) {
+									$tax_rate = (!empty($tax_rate) && $tax_rate == 'VAT_shipping_cost') ? __('on Shipping cost', 'wpshop') . ' ' . WPSHOP_VAT_ON_SHIPPING_COST : $tax_rate;
+									$sub_tpl_component['SUMMARY_ROW_TITLE'] = sprintf(__('Total taxes amount %1$s', 'wpshop'), $tax_rate . '%');
 									$sub_tpl_component['SUMMARY_ROW_VALUE'] = wpshop_display::format_field_output('wpshop_product_price', $tax_amount) . ' ' . wpshop_tools::wpshop_get_currency();
 									$summary_tpl_component['INVOICE_SUMMARY_TAXES'] .= wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
-									unset( $sub_tpl_component );
+									unset($sub_tpl_component);
 								}
-								elseif( $is_partial_payment ) {
+								elseif ($is_partial_payment) {
 									$tax_rate = 0;
-									$tax_amount = number_format( 0, 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency();
-									$sub_tpl_component['SUMMARY_ROW_TITLE'] = sprintf( __('Total taxes amount %1$s', 'wpshop'), $tax_rate . '%' );
+									$tax_amount = number_format(0, 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency();
+									$sub_tpl_component['SUMMARY_ROW_TITLE'] = sprintf(__('Total taxes amount %1$s', 'wpshop'), $tax_rate . '%');
 									$sub_tpl_component['SUMMARY_ROW_VALUE'] = wpshop_display::format_field_output('wpshop_product_price', $tax_amount) . ' ' . wpshop_tools::wpshop_get_currency();
 									$summary_tpl_component['INVOICE_SUMMARY_TAXES'] .= wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
-									unset( $sub_tpl_component );
+									unset($sub_tpl_component);
 								}
 							}
 						}
 
 						/** If Discount Exist **/
 						// Checking Discounts on order
-						if( !empty($order_postmeta['order_discount_type']) && $order_postmeta['order_discount_value'] ) {
+						if (!empty($order_postmeta['order_discount_type']) && $order_postmeta['order_discount_value']) {
 							$discounts_exists = true;
 							// Calcul discount on Order
-							switch( $order_postmeta['order_discount_type'] ) {
+							switch ($order_postmeta['order_discount_type']) {
 								case 'amount':
-									$total_discounted += number_format( str_replace( ',', '.', $order_postmeta['order_discount_value'] ), 2, '.', '' );
+									$total_discounted += number_format(str_replace(',', '.', $order_postmeta['order_discount_value']), 2, '.', '');
 									break;
 								case 'percent':
-									$total_discounted += number_format( $order_postmeta['order_grand_total_before_discount'], 2, '.', '') * ( number_format( str_replace( ',', '.', $order_postmeta['order_discount_value']), 2, '.', '') / 100 );
+									$total_discounted += number_format($order_postmeta['order_grand_total_before_discount'], 2, '.', '') * (number_format(str_replace(',', '.', $order_postmeta['order_discount_value']), 2, '.', '') / 100);
 									break;
 							}
 						}
-						if ( !empty($total_discounted) && $discounts_exists ) {
+						if (!empty($total_discounted) && $discounts_exists) {
 							$sub_tpl_component['SUMMARY_ROW_TITLE'] = __('Discounted Total', 'wpshop');
-							$sub_tpl_component['SUMMARY_ROW_VALUE'] = number_format( $total_discounted, 2, '.', '') . ' ' . wpshop_tools::wpshop_get_currency();
+							$sub_tpl_component['SUMMARY_ROW_VALUE'] = number_format($total_discounted, 2, '.', '') . ' ' . wpshop_tools::wpshop_get_currency();
 							$summary_tpl_component['INVOICE_SUMMARY_TOTAL_DISCOUNTED'] = wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
-							unset( $sub_tpl_component );
+							unset($sub_tpl_component);
 						}
 						else {
 							$summary_tpl_component['INVOICE_SUMMARY_TOTAL_DISCOUNTED'] = '';
 						}
 
 						$shipping_cost = 0;
-						if ( !$is_partial_payment ) {
-							if( !empty($order_postmeta['order_shipping_cost']) ) {
+						if (!$is_partial_payment) {
+							if (!empty($order_postmeta['order_shipping_cost'])) {
 								$shipping_cost = $order_postmeta['order_shipping_cost'];
 							}
 						}
-						$price_piloting = get_option( 'wpshop_shop_price_piloting', 'TTC' );
-						$shipping_taxes = 'HT' == $price_piloting ? ( WPSHOP_VAT_ON_SHIPPING_COST / 100 ) * $shipping_cost : $shipping_cost - ( $shipping_cost / ( 1 + WPSHOP_VAT_ON_SHIPPING_COST / 100 ) );
-						$summary_tpl_component['INVOICE_ORDER_SHIPPING_COST'] = number_format( $shipping_cost, 2, ',', '' );
-						$summary_tpl_component['INVOICE_ORDER_SHIPPING_COST_TAXES'] = number_format( $shipping_taxes, 2, ',', '' );
+						$price_piloting = get_option('wpshop_shop_price_piloting', 'TTC');
+						$shipping_taxes = 'HT' == $price_piloting ? (WPSHOP_VAT_ON_SHIPPING_COST / 100) * $shipping_cost : $shipping_cost - ($shipping_cost / (1 + WPSHOP_VAT_ON_SHIPPING_COST / 100));
+						$summary_tpl_component['INVOICE_ORDER_SHIPPING_COST'] = number_format($shipping_cost, 2, ',', '');
+						$summary_tpl_component['INVOICE_ORDER_SHIPPING_COST_TAXES'] = number_format($shipping_taxes, 2, ',', '');
 						//$summary_tpl_component['INVOICE_ORDER_SHIPPING_COST'] = ( $is_partial_payment ) ? number_format( 0, 2, ',', '') : number_format( ( (!empty($order_postmeta['order_shipping_cost']) ) ? $order_postmeta['order_shipping_cost'] : 0 ), 2, ',', '' );
 
-						$summary_tpl_component['INVOICE_ORDER_GRAND_TOTAL'] = ( $is_partial_payment ) ?  number_format(0, 2, ',', '' ) : number_format( $order_postmeta['order_grand_total'], 2, ',', ''); // - $total_partial_payment , 2, ',', '' );
-						$summary_tpl_component['INVOICE_ORDER_TOTAL_HT'] = ( $is_partial_payment ) ?  number_format(0, 2, ',', '' ) : number_format( $order_postmeta['order_total_ht'], 2, ',', '' );
+						$summary_tpl_component['INVOICE_ORDER_GRAND_TOTAL'] = ($is_partial_payment) ? number_format(0, 2, ',', '') : number_format($order_postmeta['order_grand_total'], 2, ',', ''); // - $total_partial_payment , 2, ',', '' );
+						$summary_tpl_component['INVOICE_ORDER_TOTAL_HT'] = ($is_partial_payment) ? number_format(0, 2, ',', '') : number_format($order_postmeta['order_total_ht'], 2, ',', '');
 
 						$summary_tpl_component['TOTAL_BEFORE_DISCOUNT'] = number_format($order_postmeta['order_grand_total_before_discount'], 2, ',', '');
 
 						$total_payment = 0;
 
 						/** Amount paid **/
-						if ( empty($order_postmeta['order_invoice_ref']) ) {
+						if (empty($order_postmeta['order_invoice_ref'])) {
 							foreach ($order_postmeta['order_payment']['received'] as $key => $value) {
-								if ( !empty($value['invoice_ref']) && $value['invoice_ref'] === $tpl_component['INVOICE_ORDER_INVOICE_REF'] ) {
+								if (!empty($value['invoice_ref']) && $value['invoice_ref'] === $tpl_component['INVOICE_ORDER_INVOICE_REF']) {
 									$total_payment = number_format($value['received_amount'], 2, ',', '');
 								}
 							}
 						}
 						else {
-							$total_payment = ( ($total_partial_payment+$last_payment) !== $order_postmeta['order_grand_total'] ) ? number_format($total_partial_payment+$last_payment, 2, ',', '') : $order_postmeta['order_grand_total'];
+							$total_payment = (($total_partial_payment + $last_payment) !== $order_postmeta['order_grand_total']) ? number_format($total_partial_payment + $last_payment, 2, ',', '') : $order_postmeta['order_grand_total'];
 						}
 
 						$sub_tpl_component['SUMMARY_ROW_TITLE'] = __('Amount already paid', 'wpshop');
-						$sub_tpl_component['SUMMARY_ROW_VALUE'] = ( !$is_partial_payment ) ? number_format( $last_payment, 2, ',', '') .' ' . wpshop_tools::wpshop_get_currency() : $total_payment .' ' . wpshop_tools::wpshop_get_currency();
+						$sub_tpl_component['SUMMARY_ROW_VALUE'] = (!$is_partial_payment) ? number_format($last_payment, 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency() : $total_payment . ' ' . wpshop_tools::wpshop_get_currency();
 						//$sub_tpl_component['SUMMARY_ROW_VALUE'] = ( $is_partial_payment ) ?  number_format($total_partial_payment, 2, ',', '' ). ' ' . wpshop_tools::wpshop_get_currency() : number_format($order_postmeta['order_grand_total'], 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency();
 						$summary_tpl_component['INVOICE_SUMMARY_MORE'] = wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
-						unset( $sub_tpl_component );
+						unset($sub_tpl_component);
 
 						$sub_tpl_component['SUMMARY_ROW_TITLE'] = __('Number of products', 'wpshop');
 						$sub_tpl_component['SUMMARY_ROW_VALUE'] = $count_products;
 						$summary_tpl_component['INVOICE_SUMMARY_MORE'] .= wpshop_display::display_template_element('invoice_summary_row', $sub_tpl_component, array(), 'common');
-						unset( $sub_tpl_component );
+						unset($sub_tpl_component);
 
 
 						/** If Discount Exist **/
-						if ( !empty($order_postmeta['coupon_id']) && !empty($order_postmeta['order_discount_value']) ) {
+						if (!empty($order_postmeta['coupon_id']) && !empty($order_postmeta['order_discount_value'])) {
 							$tpl_discount_component = array();
 							$tpl_discount_component['DISCOUNT_VALUE'] = ($order_postmeta['order_discount_type'] == 'percent') ? number_format($order_postmeta['order_discount_amount_total_cart'], 2, ',', '') : number_format($order_postmeta['order_discount_value'], 2, ',', '');
 
 							$tpl_discount_component['TOTAL_BEFORE_DISCOUNT'] = number_format($order_postmeta['order_grand_total_before_discount'], 2, ',', '');
 							$summary_tpl_component['INVOICE_ORDER_DISCOUNT'] = wpshop_display::display_template_element('invoice_discount_part', $tpl_discount_component, array(), 'common');
-							unset( $tpl_discount_component );
+							unset($tpl_discount_component);
 						}
 						else {
 							$summary_tpl_component['INVOICE_ORDER_DISCOUNT'] = '';
 						}
 
-						$summary_tpl_component[ 'PRICE_PILOTING' ] = 'HT' == $price_piloting ? __( 'ET', 'wpshop' ) : __( 'ATI', 'wpshop' );
+						$summary_tpl_component['PRICE_PILOTING'] = 'HT' == $price_piloting ? __('ET', 'wpshop') : __('ATI', 'wpshop');
 
 						$tpl_component['INVOICE_SUMMARY_PART'] = wpshop_display::display_template_element('invoice_summary_part', $summary_tpl_component, array(), 'common');
-						unset( $summary_tpl_component );
+						unset($summary_tpl_component);
 					}
 
 
 					/** IBAN Include on quotation **/
-					if ( $is_quotation ) {
+					if ($is_quotation) {
 						/** If admin want to include his IBAN to quotation */
 						$iban_options = get_option('wpshop_paymentMethod_options');
 						$payment_options = get_option('wps_payment_mode');
-						if ( !empty($payment_options) && !empty($payment_options['mode']) && !empty($payment_options['mode']['banktransfer']) && !empty($payment_options['mode']['banktransfer']['active']) && $payment_options['mode']['banktransfer']['active'] == 'on' ) {
-							if ( !empty($iban_options) && !empty($iban_options['banktransfer']) /*&& !empty($iban_options['banktransfer']['add_in_quotation'])*/ ) {
-								$tpl_component['IBAN_INFOS']  = __('Payment by Bank Transfer on this bank account', 'wpshop'). ' : <br/>';
-								$tpl_component['IBAN_INFOS'] .= __('Bank name', 'wpshop'). ' : '.( (!empty($iban_options['banktransfer']['bank_name']) ) ? $iban_options['banktransfer']['bank_name'] : ''). '<br/>';
-								$tpl_component['IBAN_INFOS'] .= __('IBAN', 'wpshop'). ' : '.( (!empty($iban_options['banktransfer']['iban']) ) ? $iban_options['banktransfer']['iban'] : ''). '<br/>';
-								$tpl_component['IBAN_INFOS'] .= __('BIC/SWIFT', 'wpshop'). ' : '.( (!empty($iban_options['banktransfer']['bic']) ) ? $iban_options['banktransfer']['bic'] : ''). '<br/>';
-								$tpl_component['IBAN_INFOS'] .= __('Account owner name', 'wpshop'). ' : '.( (!empty($iban_options['banktransfer']['accountowner']) ) ? $iban_options['banktransfer']['accountowner'] : ''). '<br/>';
+						if (!empty($payment_options) && !empty($payment_options['mode']) && !empty($payment_options['mode']['banktransfer']) && !empty($payment_options['mode']['banktransfer']['active']) && $payment_options['mode']['banktransfer']['active'] == 'on') {
+							if (!empty($iban_options) && !empty($iban_options['banktransfer']) /*&& !empty($iban_options['banktransfer']['add_in_quotation'])*/) {
+								$tpl_component['IBAN_INFOS']  = __('Payment by Bank Transfer on this bank account', 'wpshop') . ' : <br/>';
+								$tpl_component['IBAN_INFOS'] .= __('Bank name', 'wpshop') . ' : ' . ((!empty($iban_options['banktransfer']['bank_name'])) ? $iban_options['banktransfer']['bank_name'] : '') . '<br/>';
+								$tpl_component['IBAN_INFOS'] .= __('IBAN', 'wpshop') . ' : ' . ((!empty($iban_options['banktransfer']['iban'])) ? $iban_options['banktransfer']['iban'] : '') . '<br/>';
+								$tpl_component['IBAN_INFOS'] .= __('BIC/SWIFT', 'wpshop') . ' : ' . ((!empty($iban_options['banktransfer']['bic'])) ? $iban_options['banktransfer']['bic'] : '') . '<br/>';
+								$tpl_component['IBAN_INFOS'] .= __('Account owner name', 'wpshop') . ' : ' . ((!empty($iban_options['banktransfer']['accountowner'])) ? $iban_options['banktransfer']['accountowner'] : '') . '<br/>';
 							}
 						}
 						else {
@@ -751,8 +751,8 @@ 
 
 
 					/** Received payements **/
-					if ( !$is_partial_payment && !$bon_colisage  && !empty($order_postmeta['order_invoice_ref']) ) {
-						$tpl_component['RECEIVED_PAYMENT'] = self::generate_received_payment_part( $order_id );
+					if (!$is_partial_payment && !$bon_colisage && !empty($order_postmeta['order_invoice_ref'])) {
+						$tpl_component['RECEIVED_PAYMENT'] = self::generate_received_payment_part($order_id);
 					}
 					else {
 						$tpl_component['RECEIVED_PAYMENT'] = '';
@@ -765,11 +765,11 @@ 
 					$output = wpshop_display::display_template_element('invoice_page_content', $tpl_component, array(), 'common');
 				}
 				else {
-					$output =  __('No order information has been found', 'wpshop');
+					$output = __('No order information has been found', 'wpshop');
 				}
 			}
 			else {
-				$output =  __('You requested a page that does not exist anymore. Please verify your request or ask the site administrator', 'wpshop');
+				$output = __('You requested a page that does not exist anymore. Please verify your request or ask the site administrator', 'wpshop');
 			}
 			return $output;
 		}
@@ -780,61 +780,61 @@ 
 		 * @param integer $order_id
 		 * @return string
 		 */
-		public static function generate_received_payment_part( $order_id ) {
-			$date_ouput_format = get_option( 'date_format' ) . ' ' . get_option( 'time_format' );
+		public static function generate_received_payment_part($order_id) {
+			$date_ouput_format = get_option('date_format') . ' ' . get_option('time_format');
 			$output = '';
 			$tpl_component = array();
 			$tpl_component['ORDER_RECEIVED_PAYMENT_ROWS'] = '';
-			if ( !empty($order_id) ) {
+			if (!empty($order_id)) {
 				$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
-				if ( !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received']) ) {
-					$wps_payment_option = get_option( 'wps_payment_mode' );
-					foreach( $order_postmeta['order_payment']['received'] as $payment ) {
-						if ( ! empty( $payment ) && ! in_array( $payment['method'], array( 'quotation' ), true ) && ! empty( $payment['received_amount'] ) ) {
+				if (!empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['received'])) {
+					$wps_payment_option = get_option('wps_payment_mode');
+					foreach ($order_postmeta['order_payment']['received'] as $payment) {
+						if (!empty($payment) && !in_array($payment['method'], array('quotation'), true) && !empty($payment['received_amount'])) {
 							$sub_tpl_component = array();
-							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_RECEIVED_AMOUNT'] = ( !empty($payment['received_amount']) ) ? number_format( $payment['received_amount'], 2, ',', '' ).' '.wpshop_tools::wpshop_get_currency() : 0;
-							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_DATE'] = (!empty($payment['date']) ) ? mysql2date($date_ouput_format, $payment['date'], true) : '';
-							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_METHOD'] = ( ( !empty( $payment[ 'method' ] ) && is_array( $wps_payment_option ) && array_key_exists( strtolower( $payment['method'] ), $wps_payment_option[ 'mode' ] ) && !empty( $wps_payment_option[ 'mode' ][ strtolower( $payment['method'] ) ][ 'name' ] ) ) ? $wps_payment_option[ 'mode' ][ strtolower( $payment['method'] ) ][ 'name' ] : ( !empty( $payment[ 'method' ] ) ? __( $payment[ 'method' ], 'wpshop' ) : '' ) );
-							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_PAYMENT_REFERENCE'] = ( !empty($payment['payment_reference']) ) ? $payment['payment_reference'] : '';
-							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_INVOICE_REF'] = ( !empty($payment['invoice_ref']) ) ? $payment['invoice_ref'] : '';
+							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_RECEIVED_AMOUNT'] = (!empty($payment['received_amount'])) ? number_format($payment['received_amount'], 2, ',', '') . ' ' . wpshop_tools::wpshop_get_currency() : 0;
+							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_DATE'] = (!empty($payment['date'])) ? mysql2date($date_ouput_format, $payment['date'], true) : '';
+							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_METHOD'] = ((!empty($payment['method']) && is_array($wps_payment_option) && array_key_exists(strtolower($payment['method']), $wps_payment_option['mode']) && !empty($wps_payment_option['mode'][strtolower($payment['method'])]['name'])) ? $wps_payment_option['mode'][strtolower($payment['method'])]['name'] : (!empty($payment['method']) ? __($payment['method'], 'wpshop') : ''));
+							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_PAYMENT_REFERENCE'] = (!empty($payment['payment_reference'])) ? $payment['payment_reference'] : '';
+							$sub_tpl_component['INVOICE_RECEIVED_PAYMENT_INVOICE_REF'] = (!empty($payment['invoice_ref'])) ? $payment['invoice_ref'] : '';
 							$tpl_component['ORDER_RECEIVED_PAYMENT_ROWS'] .= wpshop_display::display_template_element('received_payment_row', $sub_tpl_component, array('type' => 'invoice_line', 'id' => 'partial_payment'), 'common');
 						}
 					}
 				}
 				$output = wpshop_display::display_template_element('received_payment', $tpl_component, array('type' => 'invoice_line', 'id' => 'partial_payment'), 'common');
-				unset( $tpl_component );
+				unset($tpl_component);
 			}
 			return $output;
 		}
 
 
 		/** Return the validity period of a quotation **/
-		public static function quotation_validate_period( $quotation_date ) {
+		public static function quotation_validate_period($quotation_date) {
 			$quotation_options = get_option('wpshop_quotation_validate_time');
-			if ( !empty($quotation_options) && !empty($quotation_options['number']) && !empty($quotation_options['time_type']) ) {
+			if (!empty($quotation_options) && !empty($quotation_options['number']) && !empty($quotation_options['time_type'])) {
 				$timestamp_quotation = strtotime($quotation_date);
 				$timestamp_validity_date_quotation = 0;
 				$query = '';
 				$date = '';
 				global $wpdb;
-				switch ( $quotation_options['time_type'] ) {
+				switch ($quotation_options['time_type']) {
 					case 'day' :
-						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " .$quotation_options['number']. " DAY) ");
+						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " . $quotation_options['number'] . " DAY) ");
 						break;
 					case 'month' :
-						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " .$quotation_options['number']. " MONTH) ");
+						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " . $quotation_options['number'] . " MONTH) ");
 						break;
 					case 'year' :
-						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " .$quotation_options['number']. " YEAR) ");
+						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL " . $quotation_options['number'] . " YEAR) ");
 						break;
 					default :
 						$query = $wpdb->prepare("SELECT DATE_ADD('" . $quotation_date . "', INTERVAL 15 DAY) ");
 						break;
 				}
-				if ( $query != null) {
+				if ($query != null) {
 					$date = mysql2date('d F Y', $wpdb->get_var($query), true);
 				}
-				return  sprintf( __('Quotation validity date %s', 'wpshop'), $date ) ;
+				return  sprintf(__('Quotation validity date %s', 'wpshop'), $date);
 			}
 		}
 
@@ -844,19 +844,19 @@ 
 		 * @param string $invoice_ref
 		 * @return string
 		 */
-		public static function generate_invoice_for_email ( $order_id, $invoice_ref = '' ) {
+		public static function generate_invoice_for_email($order_id, $invoice_ref = '') {
 			/** Generate the PDF file for the invoice **/
 			$is_ok = false;
-			if ( !empty($invoice_ref) ) {
-				require_once(WPSHOP_LIBRAIRIES_DIR.'HTML2PDF/html2pdf.class.php');
+			if (!empty($invoice_ref)) {
+				require_once(WPSHOP_LIBRAIRIES_DIR . 'HTML2PDF/html2pdf.class.php');
 				try {
-					$html_content =  wpshop_modules_billing::generate_html_invoice( $order_id, $invoice_ref );
+					$html_content = wpshop_modules_billing::generate_html_invoice($order_id, $invoice_ref);
 					$html_content = wpshop_display::display_template_element('invoice_page_content_css', array(), array(), 'common') . '<page>' . $html_content . '</page>';
 					$html2pdf = new HTML2PDF('P', 'A4', 'fr');
 
 					$html2pdf->setDefaultFont('Arial');
 					$html2pdf->writeHTML($html_content);
-					$html2pdf->Output(WPSHOP_UPLOAD_DIR.$invoice_ref.'.pdf', 'F');
+					$html2pdf->Output(WPSHOP_UPLOAD_DIR . $invoice_ref . '.pdf', 'F');
 					$is_ok = true;
 				}
 				catch (HTML2PDF_exception $e) {
@@ -864,7 +864,7 @@ 
 					exit;
 				}
 			}
-			return ( $is_ok ) ? WPSHOP_UPLOAD_DIR.$invoice_ref.'.pdf' : '';
+			return ($is_ok) ? WPSHOP_UPLOAD_DIR . $invoice_ref . '.pdf' : '';
 		}
 
 		/**
@@ -872,38 +872,38 @@ 
 		 * @return Ambigous <string, string>
 		 */
 		public static function generate_invoice_sender_part() {
-			$output ='';
+			$output = '';
 			$company = get_option('wpshop_company_info', array());
 			$emails = get_option('wpshop_emails', array());
-			if ( !empty($company) ) {
-				$tpl_component['COMPANY_EMAIL'] = ( !empty($emails) && !empty($emails['contact_email']) ) ? $emails['contact_email'] : '';
+			if (!empty($company)) {
+				$tpl_component['COMPANY_EMAIL'] = (!empty($emails) && !empty($emails['contact_email'])) ? $emails['contact_email'] : '';
 				$tpl_component['COMPANY_WEBSITE'] = get_option('siteurl');
-				foreach ( $company as $company_info_key => $company_info_value ) {
+				foreach ($company as $company_info_key => $company_info_value) {
 					switch ($company_info_key) {
 						case 'company_rcs' :
-							$data = ( !empty($company_info_value) ) ? __('RCS', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('RCS', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_capital' :
-							$data = ( !empty($company_info_value) ) ? __('Capital', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('Capital', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_siren' :
-							$data = ( !empty($company_info_value) ) ? __('SIREN', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('SIREN', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_siret' :
-							$data = ( !empty($company_info_value) ) ? __('SIRET', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('SIRET', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_tva_intra' :
-							$data = ( !empty($company_info_value) ) ? __('TVA Intracommunautaire', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('TVA Intracommunautaire', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_legal_statut' :
 							$array_state_compagny = wpshop_company_options::get_legal_status();
-							$data = ( !empty( $array_state_compagny ) && !empty( $array_state_compagny[$company_info_value] ) ) ? $array_state_compagny[$company_info_value] : __( 'Auto-Entrepreneur', 'wpshop' ) ;
+							$data = (!empty($array_state_compagny) && !empty($array_state_compagny[$company_info_value])) ? $array_state_compagny[$company_info_value] : __('Auto-Entrepreneur', 'wpshop');
 							break;
 						default :
 							$data = $company_info_value;
 							break;
 					}
-					$tpl_component[ strtoupper( $company_info_key) ] = $data;
+					$tpl_component[strtoupper($company_info_key)] = $data;
 				}
 				$output = wpshop_display::display_template_element('invoice_sender_formatted_address', $tpl_component, array(), 'common');
 			}
@@ -916,57 +916,57 @@ 
 		 * @param unknown_type $bon_colisage
 		 * @return Ambigous <string, string>
 		 */
-		public static function generate_receiver_part( $order_id, $bon_colisage = false ) {
+		public static function generate_receiver_part($order_id, $bon_colisage = false) {
 			$output = '';
 			$order_customer_postmeta = get_post_meta($order_id, '_order_info', true);
-			$order_postmeta = get_post_meta( $order_id, '_order_postmeta', true );
+			$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 
-			if( $bon_colisage && !empty($order_customer_postmeta['shipping']) && !empty($order_customer_postmeta['shipping']['address']) && is_array($order_customer_postmeta['shipping']['address']) ) {
+			if ($bon_colisage && !empty($order_customer_postmeta['shipping']) && !empty($order_customer_postmeta['shipping']['address']) && is_array($order_customer_postmeta['shipping']['address'])) {
 				$address_info = $order_customer_postmeta['shipping']['address'];
 			} else {
-				if( !empty($order_customer_postmeta['billing']) && !empty($order_customer_postmeta['billing']['address']) && is_array($order_customer_postmeta['billing']['address']) ) {
+				if (!empty($order_customer_postmeta['billing']) && !empty($order_customer_postmeta['billing']['address']) && is_array($order_customer_postmeta['billing']['address'])) {
 					$address_info = $order_customer_postmeta['billing']['address'];
 				} else {
 					$address_info = array();
 				}
 			}
 
-			if ( !empty($order_customer_postmeta) && !empty($address_info) ) {
+			if (!empty($order_customer_postmeta) && !empty($address_info)) {
 				$default_address_attributes = array('CIVILITY', 'ADDRESS_LAST_NAME', 'ADDRESS_FIRST_NAME', 'ADDRESS', 'POSTCODE', 'CITY', 'STATE', 'COUNTRY', 'PHONE', 'ADDRESS_USER_EMAIL', 'COMPANY');
-				foreach ( $default_address_attributes as $default_address_attribute ) {
+				foreach ($default_address_attributes as $default_address_attribute) {
 					$tpl_component[$default_address_attribute] = '';
 				}
 
-				foreach ( $address_info as $order_customer_info_key => $order_customer_info_value ) {
+				foreach ($address_info as $order_customer_info_key => $order_customer_info_value) {
 					$tpl_component[strtoupper($order_customer_info_key)] = '';
-					if ( $order_customer_info_key == 'civility') {
+					if ($order_customer_info_key == 'civility') {
 						global $wpdb;
-						$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id= %d', $order_customer_info_value);
+						$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id= %d', $order_customer_info_value);
 						$civility = $wpdb->get_row($query);
-						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($civility) ) ? (!empty($civility->label)) ? $civility->label : __($civility->value, 'wpshop') : '';
+						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($civility)) ? (!empty($civility->label)) ? $civility->label : __($civility->value, 'wpshop') : '';
 					}
-					else if( $order_customer_info_key == 'country') {
+					else if ($order_customer_info_key == 'country') {
 						foreach (unserialize(WPSHOP_COUNTRY_LIST) as $key=>$value) {
-							if ( $order_customer_info_value == $key) {
+							if ($order_customer_info_value == $key) {
 								$tpl_component[strtoupper($order_customer_info_key)] = $value;
 							}
 						}
 					}
-					elseif( $order_customer_info_key == 'phone' ){
-						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($order_customer_info_value) ) ? __('Phone', 'wpshop').' : '.$order_customer_info_value : '';
+					elseif ($order_customer_info_key == 'phone') {
+						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($order_customer_info_value)) ? __('Phone', 'wpshop') . ' : ' . $order_customer_info_value : '';
 					}
 					else {
-						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($order_customer_info_value) ) ? $order_customer_info_value : '';
+						$tpl_component[strtoupper($order_customer_info_key)] = (!empty($order_customer_info_value)) ? $order_customer_info_value : '';
 					}
 				}
 
-				if ( empty($tpl_component['PHONE']) ) {
-					$tpl_component['PHONE'] = ( !empty( $order_customer_postmeta['billing']['address']['phone']) ) ? __('Phone', 'wpshop').' : '.$order_customer_postmeta['billing']['address']['phone'] : '';
+				if (empty($tpl_component['PHONE'])) {
+					$tpl_component['PHONE'] = (!empty($order_customer_postmeta['billing']['address']['phone'])) ? __('Phone', 'wpshop') . ' : ' . $order_customer_postmeta['billing']['address']['phone'] : '';
 				}
 
-				if ( empty($tpl_component['ADDRESS_USER_EMAIL']) || ( empty($tpl_component['ADDRESS_USER_EMAIL']) && $bon_colisage ) ){
-					$user_info = get_userdata( $order_postmeta['customer_id'] );
-					$tpl_component['ADDRESS_USER_EMAIL'] = ( !empty($user_info) && !empty($user_info->user_email) ) ? $user_info->user_email : '';
+				if (empty($tpl_component['ADDRESS_USER_EMAIL']) || (empty($tpl_component['ADDRESS_USER_EMAIL']) && $bon_colisage)) {
+					$user_info = get_userdata($order_postmeta['customer_id']);
+					$tpl_component['ADDRESS_USER_EMAIL'] = (!empty($user_info) && !empty($user_info->user_email)) ? $user_info->user_email : '';
 				}
 
 
@@ -980,36 +980,36 @@ 
 		 * Genrate Footer invoice
 		 * @return Ambigous <string, string>
 		 */
-		public static function generate_footer_invoice(){
-			$output ='';
+		public static function generate_footer_invoice() {
+			$output = '';
 			$company = get_option('wpshop_company_info', array());
 			$emails = get_option('wpshop_emails', array());
-			if ( !empty($company) ) {
-				$tpl_component['COMPANY_EMAIL'] = ( !empty($emails) && !empty($emails['contact_email']) ) ? $emails['contact_email'] : '';
+			if (!empty($company)) {
+				$tpl_component['COMPANY_EMAIL'] = (!empty($emails) && !empty($emails['contact_email'])) ? $emails['contact_email'] : '';
 				$tpl_component['COMPANY_WEBSITE'] = site_url();
-				foreach ( $company as $company_info_key => $company_info_value ) {
+				foreach ($company as $company_info_key => $company_info_value) {
 
 					switch ($company_info_key) {
 						case 'company_rcs' :
-							$data = ( !empty($company_info_value) ) ? __('RCS', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('RCS', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_capital' :
-							$data = ( !empty($company_info_value) ) ? __('Capital', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('Capital', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_siren' :
-							$data = ( !empty($company_info_value) ) ? __('SIREN', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('SIREN', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_siret' :
-							$data = ( !empty($company_info_value) ) ? __('SIRET', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('SIRET', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						case 'company_tva_intra' :
-							$data = ( !empty($company_info_value) ) ? __('TVA Intracommunautaire', 'wpshop').' : '.$company_info_value : '';
+							$data = (!empty($company_info_value)) ? __('TVA Intracommunautaire', 'wpshop') . ' : ' . $company_info_value : '';
 							break;
 						default :
 							$data = $company_info_value;
 							break;
 					}
-					$tpl_component[ strtoupper( $company_info_key) ] = $data;
+					$tpl_component[strtoupper($company_info_key)] = $data;
 				}
 				$output = wpshop_display::display_template_element('invoice_footer', $tpl_component, array(), 'common');
 			}
@@ -1025,33 +1025,33 @@ 
 		 * @param id $product_id
 		 * @param string $invoice_ref
 		 */
-		public static function check_product_price( $price_ht, $price_ati, $tva_amount, $tva_rate, $product_id, $invoice_ref, $order_id ) {
+		public static function check_product_price($price_ht, $price_ati, $tva_amount, $tva_rate, $product_id, $invoice_ref, $order_id) {
 			$checking = true;
-			$error_percent =  1;
+			$error_percent = 1;
 
 			/** Check VAT Amount **/
-			$formatted_tva_amount = number_format( $tva_amount, 2, '.', '' );
-			$formatted_price_ht = number_format( $price_ht, 2, '.', '' );
-			$formatted_price_ati = number_format( $price_ati, 2, '.', '' );
-			$calculated_price_excluding_tax = $price_ati / ( 1 + ($tva_rate / 100) );
+			$formatted_tva_amount = number_format($tva_amount, 2, '.', '');
+			$formatted_price_ht = number_format($price_ht, 2, '.', '');
+			$formatted_price_ati = number_format($price_ati, 2, '.', '');
+			$calculated_price_excluding_tax = $price_ati / (1 + ($tva_rate / 100));
 			$unformatted = $formatted_price_ati - $calculated_price_excluding_tax;
-			$checked_tva_amount = number_format( $unformatted, 2, '.', '' );
+			$checked_tva_amount = number_format($unformatted, 2, '.', '');
 
-			if ( ( $checked_tva_amount < ($formatted_tva_amount / ( 1 + ($error_percent / 100) ) ) ) || ( $checked_tva_amount > ($formatted_tva_amount * (1 + ($error_percent / 100) ) ) )  ) {
+			if (($checked_tva_amount < ($formatted_tva_amount / (1 + ($error_percent / 100)))) || ($checked_tva_amount > ($formatted_tva_amount * (1 + ($error_percent / 100))))) {
 				$error_infos = array();
-				$error_infos['real_datas']['price_ati'] =  $formatted_price_ati;
-				$error_infos['real_datas']['price_ht'] =  $formatted_price_ht;
-				$error_infos['real_datas']['tva_amount'] =  $formatted_tva_amount;
+				$error_infos['real_datas']['price_ati'] = $formatted_price_ati;
+				$error_infos['real_datas']['price_ht'] = $formatted_price_ht;
+				$error_infos['real_datas']['tva_amount'] = $formatted_tva_amount;
 
 				$error_infos['corrected_data'] = $checked_tva_amount;
-				self::invoice_error_check_administrator( $invoice_ref, __('VAT error', 'wpshop'), $product_id, $order_id, $error_infos );
+				self::invoice_error_check_administrator($invoice_ref, __('VAT error', 'wpshop'), $product_id, $order_id, $error_infos);
 				$checking = false;
 			}
 
 			/** Check price ati **/
-			$checked_price_ati =  $formatted_price_ht * ( 1 + ( $tva_rate / 100) );
-			if ( ( $checked_price_ati < ($formatted_price_ati /( 1 + ($error_percent / 100) ) ) ) || ( $checked_price_ati > ($formatted_price_ati * (1 + ($error_percent / 100)) ) )  ) {
-				self::invoice_error_check_administrator( $invoice_ref, __('ATI Price error', 'wpshop'), $product_id, $order_id );
+			$checked_price_ati = $formatted_price_ht * (1 + ($tva_rate / 100));
+			if (($checked_price_ati < ($formatted_price_ati / (1 + ($error_percent / 100)))) || ($checked_price_ati > ($formatted_price_ati * (1 + ($error_percent / 100))))) {
+				self::invoice_error_check_administrator($invoice_ref, __('ATI Price error', 'wpshop'), $product_id, $order_id);
 				$checking = false;
 			}
 
@@ -1064,29 +1064,29 @@ 
 		 * @param string $object
 		 * @param unknown_type $product_id
 		 */
-		function invoice_error_check_administrator( $invoice_ref, $object, $product_id, $order_id, $errors_infos = array() ) {
-			$wpshop_email_option = get_option( 'wpshop_emails');
-			if ( !empty($wpshop_email_option) && !empty($wpshop_email_option['contact_email']) ) {
+		function invoice_error_check_administrator($invoice_ref, $object, $product_id, $order_id, $errors_infos = array()) {
+			$wpshop_email_option = get_option('wpshop_emails');
+			if (!empty($wpshop_email_option) && !empty($wpshop_email_option['contact_email'])) {
 				$headers = "MIME-Version: 1.0\r\n";
 				$headers .= "Content-type: text/html; charset=UTF-8\r\n";
-				$headers .= 'From: '.get_bloginfo('name').' <'.$wpshop_email_option['noreply_email'].'>' . "\r\n";
-				$message  = '<b>'.__('Error type', 'wpshop').' : </b>'.$object.'<br/>';
-				$message .= '<b>'.__( 'Product', 'wpshop').' : </b>'.get_the_title(  $product_id ).'<br/>';
-				$message .= '<b>'.__( 'Invoice ref', 'wpshop').' : </b>'.$invoice_ref.'<br/>';
-				$message .= '<b>'.__( 'Order ID', 'wpshop').' : </b>'.$order_id.'<br/>';
-
-				if ( !empty($errors_infos) && !empty($errors_infos['real_datas']) ) {
-					$message .='<b>' .__( 'Bad datas', 'wpshop').' :</b> <ul>';
-					foreach( $errors_infos['real_datas'] as $k => $errors_info ) {
-						$message .= '<li><b>'.$k.' : </b>'.$errors_info.'</li>';
+				$headers .= 'From: ' . get_bloginfo('name') . ' <' . $wpshop_email_option['noreply_email'] . '>' . "\r\n";
+				$message  = '<b>' . __('Error type', 'wpshop') . ' : </b>' . $object . '<br/>';
+				$message .= '<b>' . __('Product', 'wpshop') . ' : </b>' . get_the_title($product_id) . '<br/>';
+				$message .= '<b>' . __('Invoice ref', 'wpshop') . ' : </b>' . $invoice_ref . '<br/>';
+				$message .= '<b>' . __('Order ID', 'wpshop') . ' : </b>' . $order_id . '<br/>';
+
+				if (!empty($errors_infos) && !empty($errors_infos['real_datas'])) {
+					$message .= '<b>' . __('Bad datas', 'wpshop') . ' :</b> <ul>';
+					foreach ($errors_infos['real_datas'] as $k => $errors_info) {
+						$message .= '<li><b>' . $k . ' : </b>' . $errors_info . '</li>';
 					}
 					$message .= '</ul>';
-					if ( !empty($errors_infos['corrected_data']) ) {
-						$message .= '<b>' . __( 'Good value', 'wpshop' ) . ' : </b>' . $errors_infos['corrected_data'];
+					if (!empty($errors_infos['corrected_data'])) {
+						$message .= '<b>' . __('Good value', 'wpshop') . ' : </b>' . $errors_infos['corrected_data'];
 					}
 				}
 
-				wp_mail( $wpshop_email_option['contact_email'], __('Error on invoice generation', 'wpshop') , $message, $headers);
+				wp_mail($wpshop_email_option['contact_email'], __('Error on invoice generation', 'wpshop'), $message, $headers);
 			}
 		}
 
@@ -1096,9 +1096,9 @@ 
 		 * @param array $posted_datas
 		 * @return string
 		 */
-		function force_invoice_generation_on_order( $order_metadata, $posted_datas ) {
-			if ( !empty ($posted_datas['action_triggered_from']) && $posted_datas['action_triggered_from'] == 'generate_invoice') {
-				$order_metadata['order_invoice_ref'] = $this->generate_invoice_number( $posted_datas['post_ID'] );
+		function force_invoice_generation_on_order($order_metadata, $posted_datas) {
+			if (!empty ($posted_datas['action_triggered_from']) && $posted_datas['action_triggered_from'] == 'generate_invoice') {
+				$order_metadata['order_invoice_ref'] = $this->generate_invoice_number($posted_datas['post_ID']);
 			}
 			return $order_metadata;
 		}
@@ -1113,12 +1113,12 @@ 
 		$partial_payment_current_config = get_option('wpshop_payment_partial', array('for_quotation' => array()));
 
 		$partial_for_quotation_is_activate = false;
-		if ( !empty($partial_payment_current_config) && !empty($partial_payment_current_config['for_quotation']) && !empty($partial_payment_current_config['for_quotation']['activate']) ) {
+		if (!empty($partial_payment_current_config) && !empty($partial_payment_current_config['for_quotation']) && !empty($partial_payment_current_config['for_quotation']['activate'])) {
 			$partial_for_quotation_is_activate = true;
 		}
 
 		$output .= '
-			<input type="checkbox" name="wpshop_payment_partial[for_quotation][activate]"' . ($partial_for_quotation_is_activate ? ' checked="checked"' : '') . ' id="wpshop_payment_partial_on_quotation_activation_state" /> <label for="wpshop_payment_partial_on_quotation_activation_state" >' . __('Activate partial command for quotations', 'wpshop') . '</label><a href="#" title="'.__('If you want that customer pay a part o f total amount of there order, check this box then fill fields below','wpshop').'" class="wpshop_infobulle_marker">?</a>
+			<input type="checkbox" name="wpshop_payment_partial[for_quotation][activate]"' . ($partial_for_quotation_is_activate ? ' checked="checked"' : '') . ' id="wpshop_payment_partial_on_quotation_activation_state" /> <label for="wpshop_payment_partial_on_quotation_activation_state" >' . __('Activate partial command for quotations', 'wpshop') . '</label><a href="#" title="' . __('If you want that customer pay a part o f total amount of there order, check this box then fill fields below', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>
 			<div class="wpshop_partial_payment_quotation_config_container' . ($partial_for_quotation_is_activate ? '' : ' wpshopHide') . '" id="wpshop_partial_payment_quotation_config_container" >
 				<div class="alignleft" >
 					' . __('Value of partial payment', 'wpshop') . '<br/>
@@ -1140,6 +1140,6 @@ 
 }
 
 /**	Instanciate the module utilities if not	*/
-if ( class_exists("wpshop_modules_billing") ) {
+if (class_exists("wpshop_modules_billing")) {
 	$wpshop_modules_billing = new wpshop_modules_billing();
 }

includes/modules/wps_product/modules/wps_product_mass_interface/templates/backend/quick_add_interface-product_line.php

Spacing +27 added lines, -27 removed lines

@@ -1,21 +1,21 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <tr class="<?php echo $class; ?>" id="trPid_<?php echo $product['post_datas']->ID; ?>">
 	<td class="wps-mass-interface-line-selector"><div class="wps-form-group"><div class="wps-form"><center><input type="checkbox" class="wps-save-product-checkbox" name="wps_product_quick_save[]" value="<?php echo $product['post_datas']->ID; ?>" /></center></div></div></td>
 
 	<td class="wps_mass_interface_line">
-		<span class="wps_mass_interface_picture_container" id="wps_mass_interface_picture_container_<?php echo $product['post_datas']->ID; ?>"><?php echo get_the_post_thumbnail( $product['post_datas']->ID, 'thumbnail'); ?></span>
+		<span class="wps_mass_interface_picture_container" id="wps_mass_interface_picture_container_<?php echo $product['post_datas']->ID; ?>"><?php echo get_the_post_thumbnail($product['post_datas']->ID, 'thumbnail'); ?></span>
 		<input type="hidden" value="" name="wps_mass_interface[<?php echo $product['post_datas']->ID; ?>][picture]" />
 		<?php
-			if( has_post_thumbnail($product['post_datas']->ID) ) {
+			if (has_post_thumbnail($product['post_datas']->ID)) {
 				$has_thumb = true;
 			} else {
 				$has_thumb = false;
 			}
 		?>
-		<a href="#" style="display: <?php echo ( $has_thumb ) ? 'none' : 'inline-block'; ?>;" class="wps-bton-second-mini-rounded wps_add_picture_to_product_in_mass_interface" id="wps_add_picture_to_product_in_mass_interface_<?php echo $product['post_datas']->ID; ?>"><?php _e( 'Add a picture', 'wpshop'); ?></a>
+		<a href="#" style="display: <?php echo ($has_thumb) ? 'none' : 'inline-block'; ?>;" class="wps-bton-second-mini-rounded wps_add_picture_to_product_in_mass_interface" id="wps_add_picture_to_product_in_mass_interface_<?php echo $product['post_datas']->ID; ?>"><?php _e('Add a picture', 'wpshop'); ?></a>
 		<div class="row-actions">
-			<center><a href="#" class="wps_del_picture_to_product_in_mass_interface" style="display: <?php echo ( !$has_thumb ) ? 'none' : 'inline-block'; ?>;" id="wps_del_picture_to_product_in_mass_interface_<?php echo $product['post_datas']->ID; ?>"><?php _e( 'Delete picture', 'wpshop'); ?></a></center>
+			<center><a href="#" class="wps_del_picture_to_product_in_mass_interface" style="display: <?php echo (!$has_thumb) ? 'none' : 'inline-block'; ?>;" id="wps_del_picture_to_product_in_mass_interface_<?php echo $product['post_datas']->ID; ?>"><?php _e('Delete picture', 'wpshop'); ?></a></center>
 		</div>
 	</td>
 
@@ -26,7 +26,7 @@ 
 				<input type="text" name="wps_mass_interface[<?php echo $product['post_datas']->ID; ?>][post_title]"  value="<?php echo $product['post_datas']->post_title; ?>" />
 			</div>
 			<div class="row-actions">
-				<a href="<?php echo get_edit_post_link( $product['post_datas']->ID ); ?>" target="_blank"><?php _e('Edit This')?></a> |
+				<a href="<?php echo get_edit_post_link($product['post_datas']->ID); ?>" target="_blank"><?php _e('Edit This')?></a> |
 				<span class="trash"><a id="wps_mass_interface_post_delete_<?php echo $product['post_datas']->ID; ?>" class="submitdelete" href="#"><?php _e('Trash')?></a><input id="wps_mass_interface_post_delete_input_<?php echo $product['post_datas']->ID; ?>" type="hidden" name="wps_mass_interface[<?php echo $product['post_datas']->ID; ?>][post_delete]"  value="false" /></span> |
 				<a href="<?php echo get_permalink($product['post_datas']->ID); ?>" target="_blank"><?php _e('View product', 'wpshop')?></a>
 
@@ -38,7 +38,7 @@ 
 		<div class="wps-form-group">
 			<?php /*<label><?php _e( 'Product description', 'wpshop'); ?> :</label>*/ ?>
 			<div class="wps-form">
-				<textarea id="wps_product_description_<?php echo $product['post_datas']->ID; ?>" name="wps_mass_interface[<?php echo $product['post_datas']->ID; ?>][post_content]"><?php echo nl2br( $product['post_datas']->post_content );?></textarea>
+				<textarea id="wps_product_description_<?php echo $product['post_datas']->ID; ?>" name="wps_mass_interface[<?php echo $product['post_datas']->ID; ?>][post_content]"><?php echo nl2br($product['post_datas']->post_content); ?></textarea>
 			</div>
 		</div>
 	</td>
@@ -49,43 +49,43 @@ 
 		<center><a class="wps-bton-first-mini-rounded wps_add_files_to_product_in_mass_interface" id="wps_add_files_to_product_in_mass_interface_<?php echo $product['post_datas']->ID; ?>"><?php _e( 'Add files', 'wpshop'); ?></a></center>
 	</td>*/ ?>
 
-	<?php if( !empty($quick_add_form_attributes) ) :
+	<?php if (!empty($quick_add_form_attributes)) :
 			$i = 0; ?>
-		<?php foreach( $quick_add_form_attributes as $attribute_id => $att_def ) :
+		<?php foreach ($quick_add_form_attributes as $attribute_id => $att_def) :
 
 			$att = null;
-			$query = $wpdb->prepare( 'SELECT * FROM '. WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE attribute_set_id = %d AND attribute_id = %d AND status = %s', $default, $attribute_id, 'valid' );
-			$checking_display_att = $wpdb->get_results( $query );
+			$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE attribute_set_id = %d AND attribute_id = %d AND status = %s', $default, $attribute_id, 'valid');
+			$checking_display_att = $wpdb->get_results($query);
 
-			if( !empty($checking_display_att) ) :
-				$current_value = wpshop_attributes::getAttributeValueForEntityInSet( $att_def['data_type'], $attribute_id, $product_entity_id, $product['post_datas']->ID );
-				$output_specs =  array(
+			if (!empty($checking_display_att)) :
+				$current_value = wpshop_attributes::getAttributeValueForEntityInSet($att_def['data_type'], $attribute_id, $product_entity_id, $product['post_datas']->ID);
+				$output_specs = array(
 					'page_code' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
 					'element_identifier' => $product['post_datas']->ID,
-					'field_id' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'_'.$product['post_datas']->ID. '_',
-					'current_value' => ( !empty($current_value->value) ? $current_value->value : '' )
+					'field_id' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_' . $product['post_datas']->ID . '_',
+					'current_value' => (!empty($current_value->value) ? $current_value->value : '')
 				);
-				$att = wpshop_attributes::display_attribute( $att_def['code'], 'admin', $output_specs );
+				$att = wpshop_attributes::display_attribute($att_def['code'], 'admin', $output_specs);
 			endif;
 			?>
 			<td class="wps_mass_interface_line">
 				<div class="wps-form-group">
 					<?php /*<label><?php  _e( $att['field_definition']['label'], 'wpshop' ); ?></label>*/ ?>
-					<div class="wps-form"><?php echo str_replace( 'name="wpshop_product_attribute', 'name="wpshop_product_attribute[' .$product['post_datas']->ID. ']', $att['field_definition']['output'] ); ?></div>
+					<div class="wps-form"><?php echo str_replace('name="wpshop_product_attribute', 'name="wpshop_product_attribute[' . $product['post_datas']->ID . ']', $att['field_definition']['output']); ?></div>
 				</div>
 			</td>
 		<?php $i++;
 		endforeach; ?>
 	<?php endif; ?>
 
-	<td class="wps_mass_interface_line_deleted" colspan="<?php echo 3 + $i;?>" style="display: none;">
-		<?php printf( __( '%s will be deleted.', 'wpshop' ), $product['post_datas']->post_title); ?> <a class="wps_mass_interface_post_deleted_cancel" id="wps_mass_interface_post_delete_cancel_<?php echo $product['post_datas']->ID; ?>" href="#">Annuler</a>
+	<td class="wps_mass_interface_line_deleted" colspan="<?php echo 3 + $i; ?>" style="display: none;">
+		<?php printf(__('%s will be deleted.', 'wpshop'), $product['post_datas']->post_title); ?> <a class="wps_mass_interface_post_deleted_cancel" id="wps_mass_interface_post_delete_cancel_<?php echo $product['post_datas']->ID; ?>" href="#">Annuler</a>
 	</td>
 </tr>
 <?php // ------------------------------------------------------------------------------------------------------ ?>
 <?php
-	$concurs = get_post_meta( $product['post_datas']->ID, '_concur', true );
-	if ( empty( $concurs ) ) {
+	$concurs = get_post_meta($product['post_datas']->ID, '_concur', true);
+	if (empty($concurs)) {
 		$concurs = array();
 	}
 	foreach ($concurs as $key => $concur) {
@@ -102,22 +102,22 @@ 
 	</td>
 	<td><input type="text" placeholder="Prix" name="concur[<?php echo $product['post_datas']->ID; ?>][price][]" value="<?php echo $concur['price']; ?>"></td>
 	<td class="del_concur" style="color: red; cursor: pointer;">Supprimer</td>
-	<?php for ($j=0; $j < $i-2; $j++) {
+	<?php for ($j = 0; $j < $i - 2; $j++) {
 		echo '<td></td>';
 	} ?>
 </tr>
 <?php
 	}
-	$output_specs = array( 'page_code' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'element_identifier' => $product['post_datas']->ID, 'field_id' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'_'.$product['post_datas']->ID. '_%ID%' );
+	$output_specs = array('page_code' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'element_identifier' => $product['post_datas']->ID, 'field_id' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_' . $product['post_datas']->ID . '_%ID%');
 ?>
 <tr class="<?php echo $class; ?> concurs cloner" style="display:none" data-id="<?php echo $product['post_datas']->ID; ?>">
 	<td><input type="hidden" class="is_row" name="concur[<?php echo $product['post_datas']->ID; ?>][is_row][]" value="0"></td>
 	<td><input type="text" placeholder="Date" class="datepicker_concur" value="<?php echo current_time('Y-m-d'); ?>" name="concur[<?php echo $product['post_datas']->ID; ?>][date][]"></td>
 	<td><input type="text" placeholder="Lien" name="concur[<?php echo $product['post_datas']->ID; ?>][link][]"></td>
-	<td><?php $att = wpshop_attributes::display_attribute( 'concurents_', 'backend', $output_specs ); echo preg_replace( '/name=".*?"/i', 'name="concur[' .$product['post_datas']->ID. '][name][]"', preg_replace( '/class=".*?"/i', 'class="wpshop_product_attribute_concurents_ chosen_select_concur"', $att['field_definition']['output'] ) ); ?></td>
+	<td><?php $att = wpshop_attributes::display_attribute('concurents_', 'backend', $output_specs); echo preg_replace('/name=".*?"/i', 'name="concur[' . $product['post_datas']->ID . '][name][]"', preg_replace('/class=".*?"/i', 'class="wpshop_product_attribute_concurents_ chosen_select_concur"', $att['field_definition']['output'])); ?></td>
 	<td><input type="text" placeholder="Prix" name="concur[<?php echo $product['post_datas']->ID; ?>][price][]"></td>
 	<td class="del_concur" style="color: red; cursor: pointer;">Supprimer</td>
-	<?php for ($j=0; $j < $i-2; $j++) {
+	<?php for ($j = 0; $j < $i - 2; $j++) {
 		echo '<td></td>';
 	} ?>
 </tr>
@@ -127,7 +127,7 @@ 
 	<td></td>
 	<td></td>
 	<td class="add_concur" style="color: #0073aa; cursor: pointer;">Ajouter un concurrent</td>
-	<?php for ($j=0; $j < $i-1; $j++) {
+	<?php for ($j = 0; $j < $i - 1; $j++) {
 		echo '<td></td>';
 	} ?>
 </tr>

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

Indentation +167 added lines, -167 removed lines

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

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

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <div id="wps_variations_summary">
-	<div data-view-model="wps_variations_options_summary" id="wps_variations_summary_display"><b>%summary%</b></div><a id="wps_variations_parameters" href="<?php print wp_nonce_url(get_edit_post_link($post->ID) . '&wps_variation_interface=false', 'wps_remove_variation_interface');?>" title="<?php _e('Back to old interface', 'wpshop'); ?>"><span class="dashicons dashicons-admin-generic"></span></a>
+	<div data-view-model="wps_variations_options_summary" id="wps_variations_summary_display"><b>%summary%</b></div><a id="wps_variations_parameters" href="<?php print wp_nonce_url(get_edit_post_link($post->ID) . '&wps_variation_interface=false', 'wps_remove_variation_interface'); ?>" title="<?php _e('Back to old interface', 'wpshop'); ?>"><span class="dashicons dashicons-admin-generic"></span></a>
 </div>
 <div id="wps_variations_options">
 	<ul id="wps_variations_options_title">
@@ -54,7 +54,7 @@ 
 		<li class="wps_variations_price_vat_col">%vat%%currency%</li>
 		<li class="wps_variations_price_stock_col"><input type="text" pattern="[0-9]*" onchange="wps_variations_price_option_raw.control.stock(this)" name="wps_pdt_variations[%ID%][attribute][decimal][product_stock]" align="right" value="%stock%"></li>
 		<li class="wps_variations_price_weight_col"><input type="text" pattern="[0-9]+(\.[0-9][0-9]?)?" onchange="wps_variations_price_option_raw.control.weight(this)" name="wps_pdt_variations[%ID%][attribute][decimal][product_weight]" align="right" value="%weight%"></li>
-		<li class="wps_variations_price_file_col" data-view-model="wps_variations_price_option_file_%ID%"><?php echo apply_filters('wpshop_new_interface_variation_download_file_dialog', '<span class="wps_variations_price_option_price_file" onclick="wps_variations_price_option_raw.control.file(this)">%link%</span><input style="display: none;" type="file" name="wpshop_file" id="wpshop_file" onchange="wps_variations_price_option_raw.control.link(event, this)">' . wp_nonce_field('ajax_wpshop_upload_downloadable_file_action', 'wpshop_file_nonce') . '<a class="wps_variations_price_option_price_download_file" href="%path%" target="_blank" download="" style="display: %download%"><span class="dashicons dashicons-download"></span></a>' ); ?></li>
+		<li class="wps_variations_price_file_col" data-view-model="wps_variations_price_option_file_%ID%"><?php echo apply_filters('wpshop_new_interface_variation_download_file_dialog', '<span class="wps_variations_price_option_price_file" onclick="wps_variations_price_option_raw.control.file(this)">%link%</span><input style="display: none;" type="file" name="wpshop_file" id="wpshop_file" onchange="wps_variations_price_option_raw.control.link(event, this)">' . wp_nonce_field('ajax_wpshop_upload_downloadable_file_action', 'wpshop_file_nonce') . '<a class="wps_variations_price_option_price_download_file" href="%path%" target="_blank" download="" style="display: %download%"><span class="dashicons dashicons-download"></span></a>'); ?></li>
 		<li class="wps_variations_price_active_col"><input name="wps_pdt_variations[%ID%][status]" onclick="wps_variations_price_option_raw.control.activate(this)" type="checkbox" %price_option_activate%></li>
 	</ul>
 </div>

includes/modules/wps_cart/templates/frontend/resume-cart/resume-cart-content.php

Spacing +30 added lines, -30 removed lines

@@ -1,64 +1,64 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
-<!-- <h3 class="wps-h3"><?php _e( 'Cart summary', 'wpshop' ); ?></h3> -->
+<!-- <h3 class="wps-h3"><?php _e('Cart summary', 'wpshop'); ?></h3> -->
 <ul class="wps-cart-resume-list">
-	<?php foreach( $cart_items as $item_id => $item ) :
+	<?php foreach ($cart_items as $item_id => $item) :
 			$product_key = $item_id;
-			$item_post_type = get_post_type( $item_id );
+			$item_post_type = get_post_type($item_id);
 
 			$variations_indicator = '';
-			$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails( get_post_meta($item['item_id'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true)  ) ;
+			$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($item['item_id'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
 			$output_order = array();
-			if ( count($product_attribute_order_detail) > 0  && is_array($product_attribute_order_detail) ) {
-				foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
-					foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-						if ( !empty($attribute_def->code) )
+			if (count($product_attribute_order_detail) > 0 && is_array($product_attribute_order_detail)) {
+				foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
+					foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
+						if (!empty($attribute_def->code))
 							$output_order[$attribute_def->code] = $position;
 					}
 				}
 			}
-			$variation_attribute_ordered = wpshop_products::get_selected_variation_display( $item['item_meta'], $output_order, 'cart' );
+			$variation_attribute_ordered = wpshop_products::get_selected_variation_display($item['item_meta'], $output_order, 'cart');
 			ksort($variation_attribute_ordered['attribute_list']);
-			if( !empty($variation_attribute_ordered['attribute_list']) ) {
+			if (!empty($variation_attribute_ordered['attribute_list'])) {
 				$variations_indicator .= '<ul class="wps-cart-item-variations" >';
-				foreach ( $variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output ) {
-					if ( !empty($attribute_variation_to_output) ) {
+				foreach ($variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output) {
+					if (!empty($attribute_variation_to_output)) {
 						$variations_indicator .= $attribute_variation_to_output;
 					}
 				}
-				$variations_indicator = apply_filters( 'wps_cart_item_variation_list', $variations_indicator, $variation_attribute_ordered, $item, 0 );
+				$variations_indicator = apply_filters('wps_cart_item_variation_list', $variations_indicator, $variation_attribute_ordered, $item, 0);
 				$variations_indicator .= '</ul>';
 			}
 
-			if ( $item_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-				$parent_def = wpshop_products::get_parent_variation( $item_id );
+			if ($item_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+				$parent_def = wpshop_products::get_parent_variation($item_id);
 				$parent_post = $parent_def['parent_post'];
 				$item_id = $parent_post->ID;
-				$item_title =  $parent_post->post_title;
+				$item_title = $parent_post->post_title;
 			} else {
 				$item_title = $item['item_name'];
 			}
 			?>
 			<li data-id="<?php echo $product_key; ?>" >
 				<div class="wps-cart-item-img">
-					<a href="<?php echo get_permalink( $item_id ); ?>" title="<?php echo $item_title; ?>">
-						<?php echo get_the_post_thumbnail( $item_id, 'thumbnail' ); ?>
+					<a href="<?php echo get_permalink($item_id); ?>" title="<?php echo $item_title; ?>">
+						<?php echo get_the_post_thumbnail($item_id, 'thumbnail'); ?>
 					</a>
 				</div>
 				<div class="wps-cart-item-content">
-					<a class="wps-cart-item-title" href="<?php echo get_permalink( $item_id ); ?>" title="<?php echo $item_title; ?>">
+					<a class="wps-cart-item-title" href="<?php echo get_permalink($item_id); ?>" title="<?php echo $item_title; ?>">
 						<?php echo $item_title; ?>
 					</a>
 					<?php echo $variations_indicator; ?>
 					<div class="wps-productQtyForm ">
 						<a href="" class="wps-cart-reduce-product-qty"><i class="wps-icon-minus"></i></a>
-						<input type="text" name="french-hens" id="wps-cart-product-qty-<?php echo $product_key; ?>" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_set_qty_for_product_into_cart' ); ?>" value="<?php echo $item['item_qty']; ?>" class="wps-circlerounded wps-cart-product-qty">
+						<input type="text" name="french-hens" id="wps-cart-product-qty-<?php echo $product_key; ?>" data-nonce="<?php echo wp_create_nonce('ajax_wpshop_set_qty_for_product_into_cart'); ?>" value="<?php echo $item['item_qty']; ?>" class="wps-circlerounded wps-cart-product-qty">
 						<a href="" class="wps-cart-add-product-qty"><i class="wps-icon-plus"></i></a>
 			    	</div>
 				</div>
 				<div class="wps-cart-item-price">
-			    	<span class="wps-price"><?php echo wpshop_tools::formate_number( $item['item_total_ttc'] ); ?> <span><?php echo $currency; ?></span></span>
-			    	<span class="wps-tva"><?php _e( 'ATI', 'wpshop'); ?></span><br>
+			    	<span class="wps-price"><?php echo wpshop_tools::formate_number($item['item_total_ttc']); ?> <span><?php echo $currency; ?></span></span>
+			    	<span class="wps-tva"><?php _e('ATI', 'wpshop'); ?></span><br>
 				</div>
 			</li>
 	<?php endforeach; ?>
@@ -68,15 +68,15 @@ 
 		<?php echo do_shortcode('[wps_apply_coupon]'); ?>
 	</div>
 	<div class="wps-cart-total">
-		<p><?php _e( 'Shipping cost ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $shipping_cost_ati ); ?></strong><?php echo $currency; ?></span></p>
-		<?php if ( !empty( $cart_content['coupon_id']) ) : ?>
-			<p><?php _e( 'Total ATI before discount', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $order_total_before_discount ); ?></strong><?php echo $currency; ?></span></p>
-			<p><?php _e( 'Discount', 'wpshop'); ?><span class="wps-inline-alignRight"><strong><?php echo wpshop_tools::formate_number( $coupon_value ); ?></strong><?php echo $currency; ?></span></p>
+		<p><?php _e('Shipping cost ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($shipping_cost_ati); ?></strong><?php echo $currency; ?></span></p>
+		<?php if (!empty($cart_content['coupon_id'])) : ?>
+			<p><?php _e('Total ATI before discount', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($order_total_before_discount); ?></strong><?php echo $currency; ?></span></p>
+			<p><?php _e('Discount', 'wpshop'); ?><span class="wps-inline-alignRight"><strong><?php echo wpshop_tools::formate_number($coupon_value); ?></strong><?php echo $currency; ?></span></p>
 		<?php endif; ?>
 		<p class="wps-hightlight">
-			<?php _e( 'Total ATI', 'wpshop'); ?>
+			<?php _e('Total ATI', 'wpshop'); ?>
 			<span class="wps-inline-alignRight">
-				<strong><?php echo wpshop_tools::formate_number( $total_ati ); ?></strong>
+				<strong><?php echo wpshop_tools::formate_number($total_ati); ?></strong>
 				<?php echo $currency; ?>
 			</span>
 		</p>
@@ -84,7 +84,7 @@ 
 </div><!-- wps-cart-cartouche -->
 
 <?php $wps_payment_mode = get_option('wps_payment_mode'); ?>
-<?php if( isset( $wps_payment_mode['mode']['paypal']['active'] ) ): ?>
+<?php if (isset($wps_payment_mode['mode']['paypal']['active'])): ?>
 	<div class="wps-secured-logos">
 		<span class="wps-logo-paypal"></span>
 		<span class="wps-logo-visa"></span>

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <!-- <h3 class="wps-h3"><?php _e( 'Cart summary', 'wpshop' ); ?></h3> -->
 <ul class="wps-cart-resume-list">
@@ -12,8 +14,9 @@ 
 			if ( count($product_attribute_order_detail) > 0  && is_array($product_attribute_order_detail) ) {
 				foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
 					foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-						if ( !empty($attribute_def->code) )
-							$output_order[$attribute_def->code] = $position;
+						if ( !empty($attribute_def->code) ) {
+													$output_order[$attribute_def->code] = $position;
+						}
 					}
 				}
 			}

includes/modules/wps_customer/controller/wps_customer_ctr.php

Spacing +203 added lines, -203 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;

+<?php if (!defined('ABSPATH')) exit;

 /**

  * Manage Customer general and front-end functions

  * @author ALLEGRE Jérôme - EOXIA

@@ -8,29 +8,29 @@ 
 

 	function __construct() {

 		/**	Create customer entity type on wordpress initilisation*/

-		add_action( 'init', array( $this, 'create_customer_entity' ) );

+		add_action('init', array($this, 'create_customer_entity'));

 

 		/**	Call style for administration	*/

-		add_action( 'admin_enqueue_scripts', array( &$this, 'admin_css' ) );

+		add_action('admin_enqueue_scripts', array(&$this, 'admin_css'));

 

-		add_action( 'admin_init', array( $this, 'customer_action_on_plugin_init' ) );

-		add_action( 'admin_init', array( $this, 'redirect_new_user' ) );

-		add_action( 'admin_menu', array( $this, 'customer_action_on_menu' ) );

+		add_action('admin_init', array($this, 'customer_action_on_plugin_init'));

+		add_action('admin_init', array($this, 'redirect_new_user'));

+		add_action('admin_menu', array($this, 'customer_action_on_menu'));

 

 		/**	When a wordpress user is created, create a customer (post type)	*/

-		add_action( 'user_register', array( $this, 'create_entity_customer_when_user_is_created') );

-		add_action( 'edit_user_profile_update', array( $this, 'update_entity_customer_when_profile_user_is_update' ) );

+		add_action('user_register', array($this, 'create_entity_customer_when_user_is_created'));

+		add_action('edit_user_profile_update', array($this, 'update_entity_customer_when_profile_user_is_update'));

 

 		/** When save customer update */

-		add_action( 'save_post', array( $this, 'save_entity_customer' ), 10, 2 );

+		add_action('save_post', array($this, 'save_entity_customer'), 10, 2);

 		//add_action( 'admin_notices', array( $this, 'notice_save_post_customer_informations' ) );

 

 		/**	Add filters for customer list	*/

-		add_filter( 'bulk_actions-edit-' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, array( $this, 'customer_list_table_bulk_actions' ) );

-		add_filter( 'manage_edit-' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . '_columns', array( $this, 'list_table_header' ) );

-		add_action( 'manage_' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . '_posts_custom_column' , array( $this, 'list_table_column_content' ), 10, 2 );

-		add_action( 'restrict_manage_posts', array(&$this, 'list_table_filters') );

-		add_filter( 'parse_query', array(&$this, 'list_table_filter_parse_query') );

+		add_filter('bulk_actions-edit-' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, array($this, 'customer_list_table_bulk_actions'));

+		add_filter('manage_edit-' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . '_columns', array($this, 'list_table_header'));

+		add_action('manage_' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS . '_posts_custom_column', array($this, 'list_table_column_content'), 10, 2);

+		add_action('restrict_manage_posts', array(&$this, 'list_table_filters'));

+		add_filter('parse_query', array(&$this, 'list_table_filter_parse_query'));

 

 		/**	Filter search for customers	*/

 		//add_filter( 'pre_get_posts', array( $this, 'customer_search' ) );

@@ -43,12 +43,12 @@ 
 	 * Customer options for the shop

 	 */

 	public static function declare_options() {

-		if ( WPSHOP_DEFINED_SHOP_TYPE == 'sale' ) {

-			$wpshop_shop_type = !empty( $_POST['wpshop_shop_type'] ) ? sanitize_text_field( $_POST['wpshop_shop_type'] ) : '';

-			$old_wpshop_shop_type = !empty( $_POST['old_wpshop_shop_type'] ) ? sanitize_text_field( $_POST['old_wpshop_shop_type'] ) : '';

+		if (WPSHOP_DEFINED_SHOP_TYPE == 'sale') {

+			$wpshop_shop_type = !empty($_POST['wpshop_shop_type']) ? sanitize_text_field($_POST['wpshop_shop_type']) : '';

+			$old_wpshop_shop_type = !empty($_POST['old_wpshop_shop_type']) ? sanitize_text_field($_POST['old_wpshop_shop_type']) : '';

 

-			if ( ( $wpshop_shop_type == '' || $wpshop_shop_type != 'presentation' )

-				&& ( $old_wpshop_shop_type == '' || $old_wpshop_shop_type != 'presentation' ) ) {

+			if (($wpshop_shop_type == '' || $wpshop_shop_type != 'presentation')

+				&& ($old_wpshop_shop_type == '' || $old_wpshop_shop_type != 'presentation')) {

 					/**	Add module option to wpshop general options	*/

 					register_setting('wpshop_options', 'wpshop_cart_option', array('wps_customer_ctr', 'wpshop_options_validate_customers_newsleters'));

 					add_settings_field('display_newsletters_subscriptions', __('Display newsletters subscriptions', 'wpshop'), array('wps_customer_ctr', 'display_newsletters_subscriptions'), 'wpshop_cart_info', 'wpshop_cart_info');

@@ -62,7 +62,7 @@ 
 	 * @param unknown_type $input

 	 * @return unknown

 	 */

-	public static function wpshop_options_validate_customers_newsleters( $input ) {

+	public static function wpshop_options_validate_customers_newsleters($input) {

 		return $input;

 	}

 

@@ -77,7 +77,7 @@ 
 		$input_def['valueToPut'] = 'index';

 		$input_def['value'] = !empty($cart_option['display_newsletter']['site_subscription']) ? $cart_option['display_newsletter']['site_subscription'][0] : 'no';

 		$input_def['possible_value'] = 'yes';

-		$output .= wpshop_form::check_input_type($input_def, 'wpshop_cart_option[display_newsletter][site_subscription]') . '<label for="' . $input_def['id'] . '">' . __( 'Newsletters of the site', 'wpshop' ) . '</label>' . '<a href="#" title="'.__('Check this box if you want display newsletter site subscription','wpshop').'" class="wpshop_infobulle_marker">?</a>' . '<br>';

+		$output .= wpshop_form::check_input_type($input_def, 'wpshop_cart_option[display_newsletter][site_subscription]') . '<label for="' . $input_def['id'] . '">' . __('Newsletters of the site', 'wpshop') . '</label>' . '<a href="#" title="' . __('Check this box if you want display newsletter site subscription', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>' . '<br>';

 

 		$input_def = array();

 		$input_def['name'] = '';

@@ -86,7 +86,7 @@ 
 		$input_def['valueToPut'] = 'index';

 		$input_def['value'] = !empty($cart_option['display_newsletter']['partner_subscription']) ? $cart_option['display_newsletter']['partner_subscription'][0] : 'no';

 		$input_def['possible_value'] = 'yes';

-		$output .= wpshop_form::check_input_type($input_def, 'wpshop_cart_option[display_newsletter][partner_subscription]') . '<label for="' . $input_def['id'] . '">' . __( 'Newsletters of the partners', 'wpshop' ) . '</label>' . '<a href="#" title="'.__('Check this box if you want display newsletter partners subscription','wpshop').'" class="wpshop_infobulle_marker">?</a>' . '<br>';

+		$output .= wpshop_form::check_input_type($input_def, 'wpshop_cart_option[display_newsletter][partner_subscription]') . '<label for="' . $input_def['id'] . '">' . __('Newsletters of the partners', 'wpshop') . '</label>' . '<a href="#" title="' . __('Check this box if you want display newsletter partners subscription', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>' . '<br>';

 

 		echo $output;

 	}

@@ -95,8 +95,8 @@ 
 	 * Include stylesheets

 	 */

 	function admin_css() {

-		wp_register_style( 'wpshop-modules-customer-backend-styles', WPS_ACCOUNT_URL . '/' . WPS_ACCOUNT_DIR . '/assets/backend/css/backend.css', '', WPSHOP_VERSION );

-		wp_enqueue_style( 'wpshop-modules-customer-backend-styles' );

+		wp_register_style('wpshop-modules-customer-backend-styles', WPS_ACCOUNT_URL . '/' . WPS_ACCOUNT_DIR . '/assets/backend/css/backend.css', '', WPSHOP_VERSION);

+		wp_enqueue_style('wpshop-modules-customer-backend-styles');

 	}

 

 	/**

@@ -115,27 +115,27 @@ 
 		$wps_customer_mdl = new wps_customer_mdl();

 		$users = $wps_customer_mdl->getUserList();

 		$select_users = '';

-		if( !empty($users) ) {

-			foreach($users as $user) {

+		if (!empty($users)) {

+			foreach ($users as $user) {

 				if ($user->ID != 1) {

-					$lastname = get_user_meta( $user->ID, 'last_name', true );

-					$firstname = get_user_meta( $user->ID, 'first_name', true );

-					if ( ! empty( $customer_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ) ) && ! empty( $company_attr = $wpdb->get_row( $wpdb->prepare( 'SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE entity_id = %s AND code = %s AND status = %s', $customer_entity_id, 'company_customer', 'valid' ) ) ) ) {

-						$query = $wpdb->prepare( 'SELECT value  FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.strtolower($company_attr->data_type). ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d ', $customer_entity_id, $company_attr->id, wps_customer_ctr::get_customer_id_by_author_id( $user->ID ) );

-						$company_value = $wpdb->get_var( $query );

+					$lastname = get_user_meta($user->ID, 'last_name', true);

+					$firstname = get_user_meta($user->ID, 'first_name', true);

+					if (!empty($customer_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS)) && !empty($company_attr = $wpdb->get_row($wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE entity_id = %s AND code = %s AND status = %s', $customer_entity_id, 'company_customer', 'valid')))) {

+						$query = $wpdb->prepare('SELECT value  FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . strtolower($company_attr->data_type) . ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d ', $customer_entity_id, $company_attr->id, wps_customer_ctr::get_customer_id_by_author_id($user->ID));

+						$company_value = $wpdb->get_var($query);

 					}

 					ob_start(); ?>

-					<option value="<?php echo $user->ID; ?>" <?php echo ( ( !$multiple ) && ( $selected_user == $user->ID ) ) ? ' selected="selected"' : ''; ?>>

-						<?php echo $lastname; ?> <?php echo $firstname; ?> (<?php echo $user->user_email; ?>)<?php echo isset( $company_value ) ? ' : ' . $company_value : ''; ?>

+					<option value="<?php echo $user->ID; ?>" <?php echo ((!$multiple) && ($selected_user == $user->ID)) ? ' selected="selected"' : ''; ?>>

+						<?php echo $lastname; ?> <?php echo $firstname; ?> (<?php echo $user->user_email; ?>)<?php echo isset($company_value) ? ' : ' . $company_value : ''; ?>

 					</option>

 					<?php

 					$select_users .= ob_get_clean();

 				}

 			}

 			$content_output = '

-			<select name="' . $customer_list_params['name'] . '" id="' . $customer_list_params['id'] . '" data-placeholder="' . __('Choose a customer', 'wpshop') . '" class="chosen_select"' . ( $multiple ? ' multiple="multiple" ' : '') . '' . ( $disabled ? ' disabled="disabled" ' : '') . '>

+			<select name="' . $customer_list_params['name'] . '" id="' . $customer_list_params['id'] . '" data-placeholder="' . __('Choose a customer', 'wpshop') . '" class="chosen_select"' . ($multiple ? ' multiple="multiple" ' : '') . '' . ($disabled ? ' disabled="disabled" ' : '') . '>

 				<option value="0" ></option>

-				'.$select_users.'

+				'.$select_users . '

 			</select>';

 		}

 		return $content_output;

@@ -153,26 +153,26 @@ 
 	 */

 	function create_customer_entity() {

 		global $wpdb;

-		$query = $wpdb->prepare( "SELECT P.post_title, PM.meta_value FROM {$wpdb->posts} AS P INNER JOIN {$wpdb->postmeta} AS PM ON (PM.post_id = P.ID) WHERE P.post_name = %s AND PM.meta_key = %s", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, '_wpshop_entity_params' );

-		$customer_entity_definition = $wpdb->get_row( $query );

-		$current_entity_params = !empty( $customer_entity_definition ) && !empty( $customer_entity_definition->meta_value ) ? unserialize( $customer_entity_definition->meta_value ) : null;

+		$query = $wpdb->prepare("SELECT P.post_title, PM.meta_value FROM {$wpdb->posts} AS P INNER JOIN {$wpdb->postmeta} AS PM ON (PM.post_id = P.ID) WHERE P.post_name = %s AND PM.meta_key = %s", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, '_wpshop_entity_params');

+		$customer_entity_definition = $wpdb->get_row($query);

+		$current_entity_params = !empty($customer_entity_definition) && !empty($customer_entity_definition->meta_value) ? unserialize($customer_entity_definition->meta_value) : null;

 

 		$post_type_params = array(

 			'labels' => array(

-				'name'					=> __( 'Customers' , 'wpshop' ),

-				'singular_name' 		=> __( 'Customer', 'wpshop' ),

-				'add_new_item' 			=> __( 'New customer', 'wpshop' ),

-				'add_new' 				=> __( 'New customer', 'wpshop' ),

-				'edit_item' 			=> __( 'Edit customer', 'wpshop' ),

-				'new_item' 				=> __( 'New customer', 'wpshop' ),

-				'view_item' 			=> __( 'View customer', 'wpshop' ),

-				'search_items' 			=> __( 'Search in customers', 'wpshop' ),

-				'not_found' 			=> __( 'No customer found', 'wpshop' ),

-				'not_found_in_trash' 	=> __( 'No customer founded in trash', 'wpshop' ),

+				'name'					=> __('Customers', 'wpshop'),

+				'singular_name' 		=> __('Customer', 'wpshop'),

+				'add_new_item' 			=> __('New customer', 'wpshop'),

+				'add_new' 				=> __('New customer', 'wpshop'),

+				'edit_item' 			=> __('Edit customer', 'wpshop'),

+				'new_item' 				=> __('New customer', 'wpshop'),

+				'view_item' 			=> __('View customer', 'wpshop'),

+				'search_items' 			=> __('Search in customers', 'wpshop'),

+				'not_found' 			=> __('No customer found', 'wpshop'),

+				'not_found_in_trash' 	=> __('No customer founded in trash', 'wpshop'),

 				'parent_item_colon' 	=> '',

 			),

 			'description'         	=> '',

-			'supports'            	=> !empty($current_entity_params['support']) ? $current_entity_params['support'] : array( 'title' ),

+			'supports'            	=> !empty($current_entity_params['support']) ? $current_entity_params['support'] : array('title'),

 			'hierarchical'        	=> false,

 			'public'              	=> false,

 			'show_ui'             	=> true,

@@ -196,7 +196,7 @@ 
 				'delete_posts'			 => 'delete_product'

 	        )

 		);

-		register_post_type( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $post_type_params );

+		register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $post_type_params);

 	}

 

 	/**

@@ -210,30 +210,30 @@ 
 	/**

 	 * Redirect when create new customer in admin

 	 */

-	public function redirect_new_user(){

+	public function redirect_new_user() {

 		global $pagenow;

 

 		/* Check current admin page. */

-		if( $pagenow != 'user-new.php' && isset( $_SESSION['redirect_to_customer'] ) ) {

+		if ($pagenow != 'user-new.php' && isset($_SESSION['redirect_to_customer'])) {

 			$redirect = $_SESSION['redirect_to_customer'];

-			unset( $_SESSION['redirect_to_customer'] );

-			if( $pagenow == 'users.php' ) {

-				wp_redirect( admin_url( $redirect, 'http' ) );

+			unset($_SESSION['redirect_to_customer']);

+			if ($pagenow == 'users.php') {

+				wp_redirect(admin_url($redirect, 'http'));

 				exit;

 			}

 		}

 

 		/* Redirect to new user */

-		$post_type = !empty(  $_GET['post_type'] ) ? sanitize_text_field(  $_GET['post_type'] ) : '';

-		if( $pagenow == 'post-new.php' && isset( $post_type ) && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ) {

+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';

+		if ($pagenow == 'post-new.php' && isset($post_type) && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS) {

 			$_SESSION['redirect_to_customer'] = 'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS;

-			wp_redirect( admin_url('user-new.php', 'http' ), 301 );

+			wp_redirect(admin_url('user-new.php', 'http'), 301);

 			exit;

 		}

 

 		/* Include JS on new user customer */

-		if( $pagenow == 'user-new.php' && isset( $_SESSION['redirect_to_customer'] ) ) {

-			add_action( 'admin_print_scripts', array( $this, 'admin_user_customer_js' ), 20 );

+		if ($pagenow == 'user-new.php' && isset($_SESSION['redirect_to_customer'])) {

+			add_action('admin_print_scripts', array($this, 'admin_user_customer_js'), 20);

 		}

 	}

 	/* JS to select customer in place of suscriber */

@@ -249,23 +249,23 @@ 
 	 *

 	 * @param integer $user_id

 	 */

-	public static function create_entity_customer_when_user_is_created( $user_id ) {

-		$user_data = get_userdata( $user_id );

-		$user_info = array_merge( get_object_vars( $user_data->data ), array_map( 'self::array_map_create_entity_customer_when_user_is_created', get_user_meta( $user_id ) ) );

-		$customer_post_ID = wp_insert_post( array( 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'post_author' => $user_id, 'post_title' => $user_data->user_nicename ) );

-		self::save_customer_synchronize( $customer_post_ID, $user_id, $user_info );

+	public static function create_entity_customer_when_user_is_created($user_id) {

+		$user_data = get_userdata($user_id);

+		$user_info = array_merge(get_object_vars($user_data->data), array_map('self::array_map_create_entity_customer_when_user_is_created', get_user_meta($user_id)));

+		$customer_post_ID = wp_insert_post(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, 'post_author' => $user_id, 'post_title' => $user_data->user_nicename));

+		self::save_customer_synchronize($customer_post_ID, $user_id, $user_info);

 

 		/** Change metabox Hidden Nav Menu Definition to display WPShop categories' metabox **/

-		$usermeta = get_post_meta( $user_id, 'metaboxhidden_nav-menus', true);

-		if ( !empty($usermeta) && is_array($usermeta) ) {

+		$usermeta = get_post_meta($user_id, 'metaboxhidden_nav-menus', true);

+		if (!empty($usermeta) && is_array($usermeta)) {

 			$data_to_delete = array_search('add-wpshop_product_category', $usermeta);

-			if ( $data_to_delete !== false ) {

-				unset( $usermeta[$data_to_delete] );

+			if ($data_to_delete !== false) {

+				unset($usermeta[$data_to_delete]);

 				update_user_meta($user_id, 'metaboxhidden_nav-menus', $usermeta);

 			}

 		}

 	}

-	private static function array_map_create_entity_customer_when_user_is_created( $a ) {

+	private static function array_map_create_entity_customer_when_user_is_created($a) {

 		return $a[0];

 	}

 

@@ -274,13 +274,13 @@ 
 	 *

 	 * @param integer $user_id

 	 */

-	public static function update_entity_customer_when_profile_user_is_update( $user_id ) {

-		$user_data = get_userdata( $user_id );

-		$user_info = array_merge( get_object_vars( $user_data->data ), array_map( 'self::array_map_create_entity_customer_when_user_is_created', get_user_meta( $user_id ) ) );

-		$customer_post_ID = self::get_customer_id_by_author_id( $user_id );

-		self::save_customer_synchronize( $customer_post_ID, $user_id, $user_info );

+	public static function update_entity_customer_when_profile_user_is_update($user_id) {

+		$user_data = get_userdata($user_id);

+		$user_info = array_merge(get_object_vars($user_data->data), array_map('self::array_map_create_entity_customer_when_user_is_created', get_user_meta($user_id)));

+		$customer_post_ID = self::get_customer_id_by_author_id($user_id);

+		self::save_customer_synchronize($customer_post_ID, $user_id, $user_info);

 	}

-	private static function array_map_update_entity_customer_when_profile_user_is_update( $a ) {

+	private static function array_map_update_entity_customer_when_profile_user_is_update($a) {

 		return $a[0];

 	}

 

@@ -290,53 +290,53 @@ 
 	 * @param integer $post_id

 	 * @param WP_Post $post

 	 */

-	public static function save_entity_customer( $customer_post_ID, $post ) {

-		if( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS != $post->post_type || $post->post_status == 'auto-draft' || wp_is_post_revision( $customer_post_ID ) ) {

+	public static function save_entity_customer($customer_post_ID, $post) {

+		if (WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS != $post->post_type || $post->post_status == 'auto-draft' || wp_is_post_revision($customer_post_ID)) {

 			return;

 		}

 		$user_id = $post->post_author;

 		$user_info = array();

-		$attribute = !empty( $_POST['attribute'] ) ? (array)$_POST['attribute'] : array();

-		if( !empty( $attribute ) ) {

-			foreach( $attribute as $type => $attributes ) {

-				foreach( $attributes as $meta => $attribute ) {

-					$user_info[$meta] = sanitize_text_field( $attribute );

+		$attribute = !empty($_POST['attribute']) ? (array)$_POST['attribute'] : array();

+		if (!empty($attribute)) {

+			foreach ($attribute as $type => $attributes) {

+				foreach ($attributes as $meta => $attribute) {

+					$user_info[$meta] = sanitize_text_field($attribute);

 				}

 			}

 		}

-		self::save_customer_synchronize( $customer_post_ID, $user_id, $user_info );

+		self::save_customer_synchronize($customer_post_ID, $user_id, $user_info);

 		/** Update newsletter user preferences **/

 		$newsletter_preferences = array();

-		$newsletter_site = !empty( $_POST['newsletters_site'] ) ? sanitize_text_field( $_POST['newsletters_site'] ) : '';

-		if( !empty($newsletter_site) ) {

+		$newsletter_site = !empty($_POST['newsletters_site']) ? sanitize_text_field($_POST['newsletters_site']) : '';

+		if (!empty($newsletter_site)) {

 			$newsletter_preferences['newsletters_site'] = 1;

 		}

-		$newsletters_site_partners = !empty( $_POST['newsletters_site_partners'] ) ? sanitize_text_field( $_POST['newsletters_site_partners'] ) : '';

-		if( !empty($newsletters_site_partners) ) {

+		$newsletters_site_partners = !empty($_POST['newsletters_site_partners']) ? sanitize_text_field($_POST['newsletters_site_partners']) : '';

+		if (!empty($newsletters_site_partners)) {

 			$newsletter_preferences['newsletters_site_partners'] = 1;

 		}

-		update_user_meta( $user_id, 'user_preferences', $newsletter_preferences);

+		update_user_meta($user_id, 'user_preferences', $newsletter_preferences);

 		return;

 	}

 

-	public static function save_customer_synchronize( $customer_post_ID, $user_id, $user_info ) {

+	public static function save_customer_synchronize($customer_post_ID, $user_id, $user_info) {

 		global $wpdb;

 		global $wpshop;

-		$exclude_user_meta = array( 'user_login', 'user_nicename', 'user_email', 'user_pass', 'user_url', 'user_registered', 'user_activation_key', 'user_status', 'display_name' );

+		$exclude_user_meta = array('user_login', 'user_nicename', 'user_email', 'user_pass', 'user_url', 'user_registered', 'user_activation_key', 'user_status', 'display_name');

 		$wps_entities = new wpshop_entities();

-		$element_id = $wps_entities->get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );

-		$query = $wpdb->prepare( 'SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $element_id );

-		$attribute_set_id = $wpdb->get_var( $query );

+		$element_id = $wps_entities->get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);

+		$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $element_id);

+		$attribute_set_id = $wpdb->get_var($query);

 		$attributes_default = array();

-		if ( !empty( $attribute_set_id ) ) {

-			$group  = wps_address::get_addresss_form_fields_by_type( $attribute_set_id );

-			foreach ( $group as $attribute_sets ) {

-				foreach ( $attribute_sets as $attribute_set_field ) {

-					foreach( $attribute_set_field['content'] as $attribute ) {

-						if( isset( $attribute['value'] ) ) {

-							if( is_serialized( $attribute['value'] ) ) {

-								$unserialized_value = unserialize( $attribute['value'] );

-								if( isset( $unserialized_value['default_value'] ) ) {

+		if (!empty($attribute_set_id)) {

+			$group = wps_address::get_addresss_form_fields_by_type($attribute_set_id);

+			foreach ($group as $attribute_sets) {

+				foreach ($attribute_sets as $attribute_set_field) {

+					foreach ($attribute_set_field['content'] as $attribute) {

+						if (isset($attribute['value'])) {

+							if (is_serialized($attribute['value'])) {

+								$unserialized_value = unserialize($attribute['value']);

+								if (isset($unserialized_value['default_value'])) {

 									$attributes_default[$attribute['name']] = $unserialized_value['default_value'];

 								}

 							} else {

@@ -347,30 +347,30 @@ 
 				}

 			}

 		}

-		$user_info = array_merge( $attributes_default, $user_info );

-		foreach( $user_info as $user_meta => $user_meta_value ) {

-			$attribute_def = wpshop_attributes::getElement( $user_meta, "'valid'", 'code' );

-			if( !empty( $attribute_def ) ){

+		$user_info = array_merge($attributes_default, $user_info);

+		foreach ($user_info as $user_meta => $user_meta_value) {

+			$attribute_def = wpshop_attributes::getElement($user_meta, "'valid'", 'code');

+			if (!empty($attribute_def)) {

 				//Save data in user meta

-				if( in_array( $user_meta, $exclude_user_meta ) ) {

-					if( $user_meta == 'user_pass' ) {

-						$new_password = wpshop_tools::varSanitizer( $user_meta_value );

-						if( wp_hash_password( $new_password ) == get_user_meta( $user_id, $user_meta, true ) ) {

+				if (in_array($user_meta, $exclude_user_meta)) {

+					if ($user_meta == 'user_pass') {

+						$new_password = wpshop_tools::varSanitizer($user_meta_value);

+						if (wp_hash_password($new_password) == get_user_meta($user_id, $user_meta, true)) {

 							continue;

 						}

 					}

-					wp_update_user( array('ID' => $user_id, $user_meta => wpshop_tools::varSanitizer( $user_meta_value ) ) );

+					wp_update_user(array('ID' => $user_id, $user_meta => wpshop_tools::varSanitizer($user_meta_value)));

 				} else {

-					update_user_meta( $user_id, $user_meta, wpshop_tools::varSanitizer( $user_meta_value ) );

+					update_user_meta($user_id, $user_meta, wpshop_tools::varSanitizer($user_meta_value));

 				}

 				//Save data in attribute tables, ckeck first if exist to know if Insert or Update

-				$query = $wpdb->prepare( 'SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . strtolower( $attribute_def->data_type ) . ' WHERE entity_type_id = %d AND entity_id = %d AND attribute_id = %d', $element_id, $customer_post_ID, $attribute_def->id );

-				$checking_attribute_exist = $wpdb->get_results( $query );

-				if( !empty( $checking_attribute_exist ) ) {

+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . strtolower($attribute_def->data_type) . ' WHERE entity_type_id = %d AND entity_id = %d AND attribute_id = %d', $element_id, $customer_post_ID, $attribute_def->id);

+				$checking_attribute_exist = $wpdb->get_results($query);

+				if (!empty($checking_attribute_exist)) {

 					$wpdb->update(

-						WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . strtolower( $attribute_def->data_type ),

+						WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . strtolower($attribute_def->data_type),

 						array(

-							'value' => wpshop_tools::varSanitizer( $user_meta_value ) ),

+							'value' => wpshop_tools::varSanitizer($user_meta_value) ),

 						array(

 							'entity_type_id' => $element_id,

 							'entity_id' => $customer_post_ID,

@@ -380,15 +380,15 @@ 
 				}

 				else {

 					$wpdb->insert(

-						WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . strtolower( $attribute_def->data_type ),

+						WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . strtolower($attribute_def->data_type),

 						array(

 							'entity_type_id' => $element_id,

 							'attribute_id' => $attribute_def->id,

 							'entity_id' => $customer_post_ID,

 							'user_id' => $user_id,

-							'creation_date_value' => current_time( 'mysql', 0 ),

+							'creation_date_value' => current_time('mysql', 0),

 							'language' => 'fr_FR',

-							'value' => wpshop_tools::varSanitizer( $user_meta_value )

+							'value' => wpshop_tools::varSanitizer($user_meta_value)

 						)

 					);

 				}

@@ -400,14 +400,14 @@ 
 	 * Notice for errors on admin

 	 */

 	function notice_save_post_customer_informations() {

-		$errors = isset( $_SESSION['save_post_customer_informations_errors'] ) ? $_SESSION['save_post_customer_informations_errors'] : '';

-		if( !empty( $errors ) ) {

-			foreach( $errors as $error ) {

+		$errors = isset($_SESSION['save_post_customer_informations_errors']) ? $_SESSION['save_post_customer_informations_errors'] : '';

+		if (!empty($errors)) {

+			foreach ($errors as $error) {

 				$class = "error";

 				$message = $error;

 				echo"<div class=\"$class\"> <p>$message</p></div>";

 			}

-			unset( $_SESSION['save_post_customer_informations_errors'] );

+			unset($_SESSION['save_post_customer_informations_errors']);

 		}

 	}

 

@@ -418,16 +418,16 @@ 
 	 *

 	 * @return array The new header to display

 	 */

-	function list_table_header( $current_header ) {

-		unset( $current_header['title'] );

-		unset( $current_header['date'] );

+	function list_table_header($current_header) {

+		unset($current_header['title']);

+		unset($current_header['date']);

 

-		$current_header['customer_identifier'] = __( 'Customer ID', 'wpshop' );

-		$current_header['customer_name'] = '<span class="wps-customer-last_name" >' . __( 'Last-name', 'wpshop' ) . '</span><span class="wps-customer-first_name" >' . __( 'First-name', 'wpshop' ) . '</span>';

-		$current_header['customer_email'] = __( 'E-mail', 'wpshop' );

-		$current_header['customer_orders'] = __( 'Customer\'s orders', 'wpshop' );

-		$current_header['customer_date_subscription'] = __( 'Subscription', 'wpshop' );

-		$current_header['customer_date_lastlogin'] = __( 'Last login date', 'wpshop' );

+		$current_header['customer_identifier'] = __('Customer ID', 'wpshop');

+		$current_header['customer_name'] = '<span class="wps-customer-last_name" >' . __('Last-name', 'wpshop') . '</span><span class="wps-customer-first_name" >' . __('First-name', 'wpshop') . '</span>';

+		$current_header['customer_email'] = __('E-mail', 'wpshop');

+		$current_header['customer_orders'] = __('Customer\'s orders', 'wpshop');

+		$current_header['customer_date_subscription'] = __('Subscription', 'wpshop');

+		$current_header['customer_date_lastlogin'] = __('Last login date', 'wpshop');

 

 		return $current_header;

 	}

@@ -438,44 +438,44 @@ 
 	 * @param string $column THe column identifier to modify output for

 	 * @param integer $post_id The current post identifier

 	 */

-	function list_table_column_content( $column, $post_id ) {

+	function list_table_column_content($column, $post_id) {

 		global $wpdb;

 		/**	Get wp_users idenfifier from customer id	*/

-		$current_user_id_in_list = self::get_author_id_by_customer_id( $post_id );

+		$current_user_id_in_list = self::get_author_id_by_customer_id($post_id);

 

 		/**	Get current post informations	*/

-		$customer_post = get_post( $post_id );

+		$customer_post = get_post($post_id);

 

 		/**	Get user data	*/

-		$current_user_datas = get_userdata( $current_user_id_in_list );

+		$current_user_datas = get_userdata($current_user_id_in_list);

 

 		/**	Switch current column for custom case	*/

 		$use_template = true;

-		switch ( $column ) {

+		switch ($column) {

 			case 'customer_identifier':

 				echo $post_id;

 				$use_template = false;

 			break;

 			case 'customer_date_subscription':

-				echo mysql2date( get_option( 'date_format' ), $current_user_datas->user_registered, true );

+				echo mysql2date(get_option('date_format'), $current_user_datas->user_registered, true);

 				$use_template = false;

 			break;

 			case 'customer_date_lastlogin':

-				$last_login = get_user_meta( $current_user_id_in_list, 'last_login_time', true );

-				if ( !empty( $last_login ) ) :

-					echo mysql2date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ) , $last_login, true );

+				$last_login = get_user_meta($current_user_id_in_list, 'last_login_time', true);

+				if (!empty($last_login)) :

+					echo mysql2date(get_option('date_format') . ' ' . get_option('time_format'), $last_login, true);

 				else:

-					_e( 'Never logged in', 'wpshop' );

+					_e('Never logged in', 'wpshop');

 				endif;

 				$use_template = false;

 			break;

 		}

 

 		/**	Require the template for displaying the current column	*/

-		if ( $use_template ) {

-			$template = wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, WPS_ACCOUNT_PATH . WPS_ACCOUNT_DIR . '/templates/', 'backend', 'customer_listtable/' . $column );

-			if ( is_file( $template ) ) {

-				require( $template );

+		if ($use_template) {

+			$template = wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, WPS_ACCOUNT_PATH . WPS_ACCOUNT_DIR . '/templates/', 'backend', 'customer_listtable/' . $column);

+			if (is_file($template)) {

+				require($template);

 			}

 		}

 	}

@@ -487,33 +487,33 @@ 
 	 *

 	 * @return array The new action list to use into customer list table

 	 */

-	function customer_list_table_bulk_actions( $actions ){

-		unset( $actions[ 'edit' ] );

-		unset( $actions[ 'trash' ] );

+	function customer_list_table_bulk_actions($actions) {

+		unset($actions['edit']);

+		unset($actions['trash']);

 

 		return $actions;

 	}

 

 	function list_table_filters() {

-		$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';

+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';

 		if (isset($post_type)) {

 			if (post_type_exists($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS)) {

 				$filter_possibilities = array();

 				$filter_possibilities[''] = __('-- Select Filter --', 'wpshop');

 				$filter_possibilities['orders'] = __('List customers with orders', 'wpshop');

 				$filter_possibilities['no_orders'] = __('List customers without orders', 'wpshop');

-				echo wpshop_form::form_input_select('entity_filter', 'entity_filter', $filter_possibilities, (!empty($_GET['entity_filter']) ? sanitize_text_field( $_GET['entity_filter'] ) : ''), '', 'index');

+				echo wpshop_form::form_input_select('entity_filter', 'entity_filter', $filter_possibilities, (!empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : ''), '', 'index');

 			}

 		}

 	}

 

 	function list_table_filter_parse_query($query) {

 		global $pagenow, $wpdb;

-		$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';

-		$entity_filter = !empty( $_GET['entity_filter'] ) ? sanitize_text_field( $_GET['entity_filter'] ) : '';

-		if ( is_admin() && ($pagenow == 'edit.php') && !empty( $post_type ) && ( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ) && !empty( $entity_filter ) ) {

+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';

+		$entity_filter = !empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : '';

+		if (is_admin() && ($pagenow == 'edit.php') && !empty($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS) && !empty($entity_filter)) {

 			$check = null;

-			switch ( $entity_filter ) {

+			switch ($entity_filter) {

 				case 'orders':

 					$sql_query = $wpdb->prepare(

 						"SELECT ID

@@ -550,13 +550,13 @@ 
 					break;

 			}

 

-			if ( !empty( $check ) ) {

+			if (!empty($check)) {

 				$results = $wpdb->get_results($sql_query);

 				$user_id_list = array();

-				foreach($results as $item){

+				foreach ($results as $item) {

 					$user_id_list[] = $item->ID;

 				}

-				if( empty($post_id_list) ) {

+				if (empty($post_id_list)) {

 					$post_id_list[] = 'no_result';

 				}

 				$query->query_vars[$check] = $user_id_list;

@@ -571,11 +571,11 @@ 
 	 *

 	 * @return array

 	 */

-	public static function get_all_customer( $post_status = 'publish' ) {

+	public static function get_all_customer($post_status = 'publish') {

 		global $wpdb;

 

-		$query = $wpdb->prepare( "SELECT * FROM {$wpdb->posts} WHERE post_type = %s AND post_status = %s", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $post_status );

-		$list_customer 	= $wpdb->get_results( $query );

+		$query = $wpdb->prepare("SELECT * FROM {$wpdb->posts} WHERE post_type = %s AND post_status = %s", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $post_status);

+		$list_customer = $wpdb->get_results($query);

 

 		return $list_customer;

 	}

@@ -586,11 +586,11 @@ 
 	 * @param int $author_id

 	 * @return int $customer_id

 	 */

-	public static function get_customer_id_by_author_id( $author_id ) {

+	public static function get_customer_id_by_author_id($author_id) {

 		global $wpdb;

 

-		$query		 = $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_author = %d AND post_type = %s", $author_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );

-		$customer_id = $wpdb->get_var( $query );

+		$query = $wpdb->prepare("SELECT ID FROM {$wpdb->posts} WHERE post_author = %d AND post_type = %s", $author_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);

+		$customer_id = $wpdb->get_var($query);

 

 		return $customer_id;

 	}

@@ -602,10 +602,10 @@ 
 	 * @param  int $customer_id ID in wpshop_customers type.

 	 * @return int

 	 */

-	public static function get_author_id_by_customer_id( $customer_id ) {

+	public static function get_author_id_by_customer_id($customer_id) {

 		global $wpdb;

 

-		$author_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_author FROM {$wpdb->posts} WHERE ID = %d", $customer_id ) );

+		$author_id = $wpdb->get_var($wpdb->prepare("SELECT post_author FROM {$wpdb->posts} WHERE ID = %d", $customer_id));

 

 		return $author_id;

 	}

@@ -616,30 +616,30 @@ 
 	 * @param array $form Passer directement le $_POST pour créer un client.

 	 * @return array ou int : 1 = Aucun mail, 2 = L'utilisateur existe déjà

 	 */

-	public static function quick_add_customer( $form ) {

+	public static function quick_add_customer($form) {

 		$return = 1;

-		if ( !empty( $form ) ) {

+		if (!empty($form)) {

 			global $wpdb;

-			$customer_type_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );

-			$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_SET.' WHERE entity_id = %d', $customer_type_id);

-			$customer_entity_id = $wpdb->get_var( $query );

+			$customer_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);

+			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $customer_type_id);

+			$customer_entity_id = $wpdb->get_var($query);

 			$attributes_set = wpshop_attributes_set::getElement($customer_entity_id);

-			$account_attributes = wpshop_attributes_set::getAttributeSetDetails( ( !empty($attributes_set->id) ) ? $attributes_set->id : '', "'valid'");

+			$account_attributes = wpshop_attributes_set::getAttributeSetDetails((!empty($attributes_set->id)) ? $attributes_set->id : '', "'valid'");

 

 			$customer_attributes_to_save = $customer_attributes_to_save_temp = array();

 

-			foreach ( $form[ 'attribute' ] as $attribute_type => $attributes ) {

-				foreach ( $attributes as $attribute_code => $attribute_value ) {

+			foreach ($form['attribute'] as $attribute_type => $attributes) {

+				foreach ($attributes as $attribute_code => $attribute_value) {

 					$customer_attributes_compare[$attribute_code] = $attribute_type;

 				}

 			}

 

-			foreach( $account_attributes as $account_attribute_group ) {

-				foreach ( $account_attribute_group[ 'attribut' ] as $attribute ) {

-					foreach( preg_grep ( '/' . $attribute->code . '/' , array_keys( $customer_attributes_compare ) ) as $codeForm ) {

-						if( $customer_attributes_compare[$codeForm] == $attribute->data_type ) {

-							$user[ $attribute->code ] = array( 'attribute_id' => $attribute->id, 'data_type' => $attribute->data_type, 'value' => sanitize_text_field( $_POST[ 'attribute' ][ $attribute->data_type ][ $codeForm ] ) );

-							if( $attribute->code == 'user_email' ) {

+			foreach ($account_attributes as $account_attribute_group) {

+				foreach ($account_attribute_group['attribut'] as $attribute) {

+					foreach (preg_grep('/' . $attribute->code . '/', array_keys($customer_attributes_compare)) as $codeForm) {

+						if ($customer_attributes_compare[$codeForm] == $attribute->data_type) {

+							$user[$attribute->code] = array('attribute_id' => $attribute->id, 'data_type' => $attribute->data_type, 'value' => sanitize_text_field($_POST['attribute'][$attribute->data_type][$codeForm]));

+							if ($attribute->code == 'user_email') {

 								$email_founded = true;

 							}

 						}

@@ -647,22 +647,22 @@ 
 				}

 			}

 

-			if ( $email_founded && is_email( $user['user_email']['value'] ) ) {

-				$user_id = username_exists( $user['user_email']['value'] );

-				if ( empty( $user_id ) ) {

-					$user_name = isset( $user['user_login']['value'] ) ? $user['user_login']['value'] : $user['user_email']['value'];

-					$user_pass = isset( $user['user_pass']['value'] ) ? $user['user_pass']['value'] : wp_generate_password( 12, false );

-					$user_id = wp_create_user( $user_name, $user_pass, $user['user_email']['value'] );

+			if ($email_founded && is_email($user['user_email']['value'])) {

+				$user_id = username_exists($user['user_email']['value']);

+				if (empty($user_id)) {

+					$user_name = isset($user['user_login']['value']) ? $user['user_login']['value'] : $user['user_email']['value'];

+					$user_pass = isset($user['user_pass']['value']) ? $user['user_pass']['value'] : wp_generate_password(12, false);

+					$user_id = wp_create_user($user_name, $user_pass, $user['user_email']['value']);

 

-					if ( !is_wp_error( $user_id ) ) {

-						$customer_entity_request = $wpdb->prepare( 'SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id);

-						$customer_entity_id = $wpdb->get_var( $customer_entity_request );

+					if (!is_wp_error($user_id)) {

+						$customer_entity_request = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id);

+						$customer_entity_id = $wpdb->get_var($customer_entity_request);

 						$return = array();

 						$return['integer']['ID'] = $user_id;

 

-						foreach( $user as $meta_key => $meta_values ) {

-							update_user_meta( $user_id, $meta_key, $meta_values['value'] );

-							$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.strtolower( $meta_values['data_type'] ), array( 'entity_type_id' => $customer_type_id, 'attribute_id' => $meta_values['attribute_id'], 'entity_id' => $customer_entity_id, 'user_id' => $user_id, 'creation_date_value' => current_time( 'mysql', 0), 'language' => 'fr_FR', 'value' => $meta_values['value'] ) );

+						foreach ($user as $meta_key => $meta_values) {

+							update_user_meta($user_id, $meta_key, $meta_values['value']);

+							$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . strtolower($meta_values['data_type']), array('entity_type_id' => $customer_type_id, 'attribute_id' => $meta_values['attribute_id'], 'entity_id' => $customer_entity_id, 'user_id' => $user_id, 'creation_date_value' => current_time('mysql', 0), 'language' => 'fr_FR', 'value' => $meta_values['value']));

 							$return[$meta_values['data_type']][$meta_key] = $meta_values['value'];

 						}

 					}

@@ -680,13 +680,13 @@ 
 	 *

 	 * @param string $term The term we have to search into database for getting existing users / Le terme qu'il faut rechercher pour retrouver les utilisateurs dans la base de données

 	 */

-	public function search_customer( $term ) {

+	public function search_customer($term) {

 		global $wpdb;

 

 		/**	Build the customer search	*/

 		$args = array(

 			'search'			=> "*" . $term . "*",

-			'search_columns'	=> array( 'user_login', 'user_email', 'user_nicename', ),

+			'search_columns'	=> array('user_login', 'user_email', 'user_nicename',),

 			'meta_query'		=> array(

 				'relation'	=> 'OR',

 				array(

@@ -701,21 +701,21 @@ 
 				),

 			),

 		);

-		$customer_search = new WP_User_Query( $args );

+		$customer_search = new WP_User_Query($args);

 

 		$customer_list = array();

-		if ( !empty($customer_search->results) ) {

-			foreach ( $customer_search->results as $customer ) {

+		if (!empty($customer_search->results)) {

+			foreach ($customer_search->results as $customer) {

 				/** Check the username, if last name and first name are empty we select email **/

-				$last_name_meta = get_user_meta( $customer->ID, 'last_name', true);

-				$first_name_meta = get_user_meta( $customer->ID, 'first_name', true);

+				$last_name_meta = get_user_meta($customer->ID, 'last_name', true);

+				$first_name_meta = get_user_meta($customer->ID, 'first_name', true);

 				$user_data = $customer->data;

 				$email_data = $user_data->user_email;

 

-				if ( !empty($last_name_meta) ) {

+				if (!empty($last_name_meta)) {

 					$user_name = $last_name_meta;

 				}

-				elseif( !empty( $first_name_meta)) {

+				elseif (!empty($first_name_meta)) {

 					$user_name = $first_name_meta;

 				}

 				else {

includes/modules/wps_shipping/controller/wps_shipping_mode_ajax_actions.php

Spacing +93 added lines, -93 removed lines

@@ -1,62 +1,62 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_shipping_mode_ajax_actions {
 
 	function __construct() {
 		/** Ajax Actions **/
-		add_action('wp_ajax_save_shipping_rule',array( $this, 'wpshop_ajax_save_shipping_rule'));
-		add_action('wp_ajax_display_shipping_rules',array( $this, 'wpshop_ajax_display_shipping_rules'));
-		add_action('wp_ajax_delete_shipping_rule',array( $this, 'wpshop_ajax_delete_shipping_rule'));
-		add_action('wp_ajax_wps_add_new_shipping_mode',array( $this, 'wps_add_new_shipping_mode'));
-		add_action('wp_ajax_wps_delete_shipping_mode',array( $this, 'wps_delete_shipping_mode'));
-		add_action('wp_ajax_wps_reload_shipping_mode',array( $this, 'wps_reload_shipping_mode'));
-		add_action('wp_ajax_wps_calculate_shipping_cost',array( $this, 'wps_calculate_shipping_cost'));
-		add_action( 'wp_ajax_wps_load_shipping_methods', array(&$this, 'wps_load_shipping_methods') );
+		add_action('wp_ajax_save_shipping_rule', array($this, 'wpshop_ajax_save_shipping_rule'));
+		add_action('wp_ajax_display_shipping_rules', array($this, 'wpshop_ajax_display_shipping_rules'));
+		add_action('wp_ajax_delete_shipping_rule', array($this, 'wpshop_ajax_delete_shipping_rule'));
+		add_action('wp_ajax_wps_add_new_shipping_mode', array($this, 'wps_add_new_shipping_mode'));
+		add_action('wp_ajax_wps_delete_shipping_mode', array($this, 'wps_delete_shipping_mode'));
+		add_action('wp_ajax_wps_reload_shipping_mode', array($this, 'wps_reload_shipping_mode'));
+		add_action('wp_ajax_wps_calculate_shipping_cost', array($this, 'wps_calculate_shipping_cost'));
+		add_action('wp_ajax_wps_load_shipping_methods', array(&$this, 'wps_load_shipping_methods'));
 	}
 
 	/**
 	 * AJAX - Save custom Rules
 	 **/
-	function wpshop_ajax_save_shipping_rule(){
-		check_ajax_referer( 'wpshop_ajax_save_shipping_rule' );
+	function wpshop_ajax_save_shipping_rule() {
+		check_ajax_referer('wpshop_ajax_save_shipping_rule');
 
 		global $wpdb;
 		$wps_shipping = new wps_shipping();
 		$status = false;
 		$reponse = array();
-		$fees_data = ( !empty($_POST['fees_data']) ) ?  ( $_POST['fees_data'] ) : null;
-		$weight_rule = ( !empty($_POST['weight_rule']) ) ? wpshop_tools::varSanitizer( $_POST['weight_rule'] ) : null;
-		$shipping_price = ( !empty($_POST['shipping_price']) ) ? wpshop_tools::varSanitizer( $_POST['shipping_price'] ) : 0;
-		$selected_country = ( !empty($_POST['selected_country']) ) ? wpshop_tools::varSanitizer( $_POST['selected_country'] ) : null;
-		$shipping_rules = $wps_shipping->shipping_fees_string_2_array( stripslashes($fees_data) );
+		$fees_data = (!empty($_POST['fees_data'])) ? ($_POST['fees_data']) : null;
+		$weight_rule = (!empty($_POST['weight_rule'])) ? wpshop_tools::varSanitizer($_POST['weight_rule']) : null;
+		$shipping_price = (!empty($_POST['shipping_price'])) ? wpshop_tools::varSanitizer($_POST['shipping_price']) : 0;
+		$selected_country = (!empty($_POST['selected_country'])) ? wpshop_tools::varSanitizer($_POST['selected_country']) : null;
+		$shipping_rules = $wps_shipping->shipping_fees_string_2_array(stripslashes($fees_data));
 
-		$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);
 
-		$weight_rule = ( !empty($unity) && $unity == 'kg' ) ? $weight_rule * 1000 : $weight_rule;
+		$weight_rule = (!empty($unity) && $unity == 'kg') ? $weight_rule * 1000 : $weight_rule;
 		//Check if this shipping rule (same country and same weight) already exist in the shipping rules definition
-		if( !empty($shipping_rules) ) {
+		if (!empty($shipping_rules)) {
 			$existing_country = false;
 			$tab_key = -1;
-			foreach ( $shipping_rules as $key=>$shipping_rule) {
-				if ( $shipping_rule['destination'] == $selected_country) {
+			foreach ($shipping_rules as $key=>$shipping_rule) {
+				if ($shipping_rule['destination'] == $selected_country) {
 					$existing_country = true;
 					$tab_key = $key;
 				}
 			}
-			if ( $existing_country && $tab_key > -1) {
+			if ($existing_country && $tab_key > -1) {
 				$shipping_rules[$tab_key]['fees'][$weight_rule] = $shipping_price;
 			}
 			else {
-				$shipping_rules[] = array( 'destination' => $selected_country, 'rule' => 'weight', 'fees' => array($weight_rule => $shipping_price) );
+				$shipping_rules[] = array('destination' => $selected_country, 'rule' => 'weight', 'fees' => array($weight_rule => $shipping_price));
 			}
 			$status = true;
 		}
 		else {
-			$shipping_rules = array( '0' => array('destination' => $selected_country, 'rule' => 'weight', 'fees' => array( $weight_rule => $shipping_price)) );
+			$shipping_rules = array('0' => array('destination' => $selected_country, 'rule' => 'weight', 'fees' => array($weight_rule => $shipping_price)));
 			$status = true;
 		}
-		$reponse = array('status' => $status, 'reponse' => $wps_shipping->shipping_fees_array_2_string( $shipping_rules ) );
+		$reponse = array('status' => $status, 'reponse' => $wps_shipping->shipping_fees_array_2_string($shipping_rules));
 		echo json_encode($reponse);
 		die();
 	}
@@ -65,18 +65,18 @@ 
 	 * AJAX - Delete Custom shipping Rule
 	 */
 	function wpshop_ajax_delete_shipping_rule() {
-		check_ajax_referer( 'wpshop_ajax_delete_shipping_rule' );
+		check_ajax_referer('wpshop_ajax_delete_shipping_rule');
 
 		global $wpdb;
 		$wps_shipping = new wps_shipping();
-		$fees_data = ( !empty($_POST['fees_data']) ) ? ( $_POST['fees_data'] ) : null;
-		$country_and_weight =  ( !empty($_POST['country_and_weight']) ) ? sanitize_text_field( $_POST['country_and_weight'] ) : null;
+		$fees_data = (!empty($_POST['fees_data'])) ? ($_POST['fees_data']) : null;
+		$country_and_weight = (!empty($_POST['country_and_weight'])) ? sanitize_text_field($_POST['country_and_weight']) : null;
 		$datas = explode("|", $country_and_weight);
 		$country = $datas[0];
 		$weight = $datas[1];
 		$shipping_mode_id = $datas[2];
 
-		$shipping_rules = $wps_shipping->shipping_fees_string_2_array( stripslashes($fees_data) );
+		$shipping_rules = $wps_shipping->shipping_fees_string_2_array(stripslashes($fees_data));
 
 		/** Check the default weight unity **/
 // 		$weight_unity_id = get_option('wpshop_shop_default_weight_unity');
@@ -89,46 +89,46 @@ 
 // 			}
 // 		}
 
-		if ( array_key_exists($country, $shipping_rules) ) {
-			if ( array_key_exists((string)$weight, $shipping_rules[$country]['fees']) ) {
+		if (array_key_exists($country, $shipping_rules)) {
+			if (array_key_exists((string)$weight, $shipping_rules[$country]['fees'])) {
 				unset($shipping_rules[$country]['fees'][$weight]);
 			}
-			if ( empty($shipping_rules[$country]['fees']) ) {
+			if (empty($shipping_rules[$country]['fees'])) {
 				unset($shipping_rules[$country]);
 			}
 
 		}
-		foreach ( $shipping_rules as $k=>$shipping_rule ) {
-			if ( !isset($shipping_rule['fees']) ) {
+		foreach ($shipping_rules as $k=>$shipping_rule) {
+			if (!isset($shipping_rule['fees'])) {
 				unset($shipping_rules[$k]);
 			}
 		}
 
 		$status = true;
 
-		if ( !empty( $shipping_rules ) ) {
-			$rules = $wps_shipping->shipping_fees_array_2_string( $shipping_rules );
+		if (!empty($shipping_rules)) {
+			$rules = $wps_shipping->shipping_fees_array_2_string($shipping_rules);
 		}
 		else {
 			$rules = '';
 		}
 
-		wp_die( json_encode( array( 'status' => $status, 'reponse' => $rules, ) ) );
+		wp_die(json_encode(array('status' => $status, 'reponse' => $rules,)));
 	}
 
 	/**
 	 * AJAX - Display Created custom shipping rules
 	 */
-	function wpshop_ajax_display_shipping_rules () {
-		check_ajax_referer( 'wpshop_ajax_display_shipping_rules' );
+	function wpshop_ajax_display_shipping_rules() {
+		check_ajax_referer('wpshop_ajax_display_shipping_rules');
 
 		$status = false;
-		$fees_data = ( !empty($_POST['fees_data']) ) ? ( $_POST['fees_data'] ) : null;
-		$shipping_mode_id = ( !empty($_POST['shipping_mode_id']) ) ? (int) $_POST['shipping_mode_id'] : null;
+		$fees_data = (!empty($_POST['fees_data'])) ? ($_POST['fees_data']) : null;
+		$shipping_mode_id = (!empty($_POST['shipping_mode_id'])) ? (int)$_POST['shipping_mode_id'] : null;
 		$result = '';
-		if( !empty($fees_data) ) {
+		if (!empty($fees_data)) {
 			$wps_shipping_mode_ctr = new wps_shipping_mode_ctr();
-			$result = $wps_shipping_mode_ctr->generate_shipping_rules_table( $fees_data, $shipping_mode_id );
+			$result = $wps_shipping_mode_ctr->generate_shipping_rules_table($fees_data, $shipping_mode_id);
 			$status = true;
 		}
 		else {
@@ -146,38 +146,38 @@ 
 	 * AJAX - Reload shippig mode interface
 	 */
 	function wps_reload_shipping_mode() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_reload_shipping_mode' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_reload_shipping_mode'))
 			wp_die();
 
 		$status = false; $allow_order = true;
 		$result = '';
-		$address_id = !empty( $_POST['address_id'] ) ? (int) $_POST['address_id'] : 0;
-		if ( !empty($address_id) ) {
+		$address_id = !empty($_POST['address_id']) ? (int)$_POST['address_id'] : 0;
+		if (!empty($address_id)) {
 			$_SESSION['shipping_address'] = $address_id;
 		}
-		$shipping_address_id = ( !empty($_SESSION['shipping_address']) ) ? $_SESSION['shipping_address'] : '';
-		if ( !empty($shipping_address_id) ) {
+		$shipping_address_id = (!empty($_SESSION['shipping_address'])) ? $_SESSION['shipping_address'] : '';
+		if (!empty($shipping_address_id)) {
 			//$result = self::generate_shipping_mode_for_an_address();
 			$wps_shipping_mode_ctr = new wps_shipping_mode_ctr();
 // 			$shipping_modes = $wps_shipping_mode_ctr->generate_shipping_mode_for_an_address( intval($_POST['address_id']) );
 
 			$status = $allow_order = $shipping_modes[0];
-			if( empty( $shipping_modes[0]) || $shipping_modes[0] == false ) {
+			if (empty($shipping_modes[0]) || $shipping_modes[0] == false) {
 				$status = false;
 			}
 
 			$result = $shipping_modes[1];
 
-			if ( $status == false ) {
+			if ($status == false) {
 				$allow_order = false;
-				$result = '<div class="error_bloc">' .__('Sorry ! You can\'t order on this shop, because we don\'t ship in your country.', 'wpshop' ). '</div>';
+				$result = '<div class="error_bloc">' . __('Sorry ! You can\'t order on this shop, because we don\'t ship in your country.', 'wpshop') . '</div>';
 			}
 
 		}
-		$response = array('status' => $status, 'response' => $result, 'allow_order' => $allow_order );
-		echo json_encode( $response );
+		$response = array('status' => $status, 'response' => $result, 'allow_order' => $allow_order);
+		echo json_encode($response);
 		die();
 	}
 
@@ -185,26 +185,26 @@ 
 	 * AJAX - Calculate Shipping cost
 	 */
 	function wps_calculate_shipping_cost() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_calculate_shipping_cost' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_calculate_shipping_cost'))
 			wp_die();
 
 		$status = false;
 		$result = '';
 		$chosen_method = !empty($_POST['chosen_method']) ? wpshop_tools::varSanitizer($_POST['chosen_method']) : null;
 
-		if( !empty($chosen_method) ) {
+		if (!empty($chosen_method)) {
 			$_SESSION['shipping_method'] = $chosen_method;
 			$wps_cart = new wps_cart();
-			$order = $wps_cart->calcul_cart_information( array() );
+			$order = $wps_cart->calcul_cart_information(array());
 			$wps_cart->store_cart_in_session($order);
 
 			$status = true;
 		}
 
-		$response = array('status' => $status );
-		echo json_encode( $response );
+		$response = array('status' => $status);
+		echo json_encode($response);
 		die();
 	}
 
@@ -212,68 +212,68 @@ 
 	 * AJAX - (New checkout Tunnel ) Load available shipping modes
 	 */
 	function wps_load_shipping_methods() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_load_shipping_methods' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_load_shipping_methods'))
 			wp_die();
 
 		$status = true; $response = '';
-		$shipping_address_id = ( !empty($_POST['shipping_address']) ) ? intval( $_POST['shipping_address'] ) : null;
-		if ( !empty($shipping_address_id) ) {
+		$shipping_address_id = (!empty($_POST['shipping_address'])) ? intval($_POST['shipping_address']) : null;
+		if (!empty($shipping_address_id)) {
 			// Check if element is an address
 			$check_address_type = get_post($shipping_address_id);
-			if ( !empty($check_address_type) && $check_address_type->post_author == get_current_user_id() && $check_address_type->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS ) {
+			if (!empty($check_address_type) && $check_address_type->post_author == get_current_user_id() && $check_address_type->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS) {
 				// Get address metadatas
-				$address_metadata = get_post_meta( $shipping_address_id, '_wpshop_address_metadata', true );
-				if( !empty($address_metadata) && !empty($address_metadata['country']) ) {
+				$address_metadata = get_post_meta($shipping_address_id, '_wpshop_address_metadata', true);
+				if (!empty($address_metadata) && !empty($address_metadata['country'])) {
 					$country = $address_metadata['country'];
 					$postcode = $address_metadata['postcode'];
-					$shipping_methods = get_option( 'wps_shipping_mode' );
+					$shipping_methods = get_option('wps_shipping_mode');
 					$available_shipping_methods = array();
-					if( !empty($shipping_methods) && !empty($shipping_methods['modes']) ) {
+					if (!empty($shipping_methods) && !empty($shipping_methods['modes'])) {
 						// Check all shipping methods
-						foreach( $shipping_methods['modes'] as $shipping_method_id => $shipping_method ){
-							if ( empty($shipping_method['limit_destination']) || ( empty($shipping_method['limit_destination']['country']) || ( !empty($shipping_method['limit_destination']['country']) && in_array($country, $shipping_method['limit_destination']['country']) ) ) ) {
-								$available_shipping_methods[ $shipping_method_id ] = $shipping_method;
+						foreach ($shipping_methods['modes'] as $shipping_method_id => $shipping_method) {
+							if (empty($shipping_method['limit_destination']) || (empty($shipping_method['limit_destination']['country']) || (!empty($shipping_method['limit_destination']['country']) && in_array($country, $shipping_method['limit_destination']['country'])))) {
+								$available_shipping_methods[$shipping_method_id] = $shipping_method;
 							}
 						}
-						if( !empty($available_shipping_methods) ) {
-							foreach( $available_shipping_methods as $shipping_mode_id => $shipping_mode ) {
+						if (!empty($available_shipping_methods)) {
+							foreach ($available_shipping_methods as $shipping_mode_id => $shipping_mode) {
 								ob_start();
-								require( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, WPS_SHIPPING_MODE_PATH . WPS_SHIPPING_MODE_DIR . "/templates/","frontend", "shipping-mode", "element") );
+								require(wpshop_tools::get_template_part(WPS_SHIPPING_MODE_DIR, WPS_SHIPPING_MODE_PATH . WPS_SHIPPING_MODE_DIR . "/templates/", "frontend", "shipping-mode", "element"));
 								$response .= ob_get_contents();
 								ob_end_clean();
 
 							}
 						}
 						else {
-							$response = '<div class="wps-alert-error">' .__( 'No shipping method available for your shipping address', 'wpshop' ). '</div>';
+							$response = '<div class="wps-alert-error">' . __('No shipping method available for your shipping address', 'wpshop') . '</div>';
 						}
 
 					}
 					else {
-						$response = '<div class="wps-alert-info">' .__( 'No shipping method available', 'wpshop' ). '</div>';
+						$response = '<div class="wps-alert-info">' . __('No shipping method available', 'wpshop') . '</div>';
 					}
 				}
 			}
 		}
 		else {
-			$response = '<div class="wps-alert-info">' .__( 'Please select a shipping address to choose a shipping method', 'wpshop' ). '</div>';
+			$response = '<div class="wps-alert-info">' . __('Please select a shipping address to choose a shipping method', 'wpshop') . '</div>';
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		die();
 	}
 
 
 	function wps_add_new_shipping_mode() {
-		check_ajax_referer( 'wps_add_new_shipping_mode' );
+		check_ajax_referer('wps_add_new_shipping_mode');
 
 		$status = false; $reponse = '';
 
-		$k = 'wps_custom_shipping_mode_'.time();
+		$k = 'wps_custom_shipping_mode_' . time();
 		$shipping_mode = array();
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, WPS_SHIPPING_MODE_PATH . WPS_SHIPPING_MODE_DIR . "/templates/", "backend", "shipping-mode") );
+		require(wpshop_tools::get_template_part(WPS_SHIPPING_MODE_DIR, WPS_SHIPPING_MODE_PATH . WPS_SHIPPING_MODE_DIR . "/templates/", "backend", "shipping-mode"));
 		$response .= ob_get_contents();
 		ob_end_clean();
 
@@ -281,23 +281,23 @@ 
 		jQuery("select.chosen_select").chosen( WPSHOP_CHOSEN_ATTRS );
 	} );</script>';
 
-		$status = ( !empty($response) ) ? true : false;
+		$status = (!empty($response)) ? true : false;
 
-		echo json_encode( array( 'status' => $status, 'response' => $response) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 
 	function wps_delete_shipping_mode() {
-		check_ajax_referer( 'wps_delete_shipping_mode' );
-		$shipping_mode = ! empty( $_POST['shipping_mode'] ) ? sanitize_text_field( $_POST['shipping_mode'] ) : null;
-		$wps_shipping_mode = get_option( 'wps_shipping_mode' );
-		if ( ! empty( $wps_shipping_mode['modes'] ) && array_key_exists( $shipping_mode, $wps_shipping_mode['modes'] ) ) {
-			unset( $wps_shipping_mode['modes'][ $shipping_mode ] );
-			if ( ! empty( $wps_shipping_mode['default_choice'] ) && $wps_shipping_mode['default_choice'] === $shipping_mode ) {
+		check_ajax_referer('wps_delete_shipping_mode');
+		$shipping_mode = !empty($_POST['shipping_mode']) ? sanitize_text_field($_POST['shipping_mode']) : null;
+		$wps_shipping_mode = get_option('wps_shipping_mode');
+		if (!empty($wps_shipping_mode['modes']) && array_key_exists($shipping_mode, $wps_shipping_mode['modes'])) {
+			unset($wps_shipping_mode['modes'][$shipping_mode]);
+			if (!empty($wps_shipping_mode['default_choice']) && $wps_shipping_mode['default_choice'] === $shipping_mode) {
 				$wps_shipping_mode['default_choice'] = 'default_shipping_mode';
 			}
 		}
-		update_option( 'wps_shipping_mode', $wps_shipping_mode );
+		update_option('wps_shipping_mode', $wps_shipping_mode);
 		wp_send_json_success();
 	}
 }

includes/modules/wps_shipping/controller/wps_shipping_mode_ctr.php

Spacing +108 added lines, -108 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,29 +58,29 @@ 
 	 */
 	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);
 	}
 
 	/**
 	 * Add JS and CSS files in back-office
 	 */
-	function add_scripts_in_admin( $hook ) {
+	function add_scripts_in_admin($hook) {
 		global $current_screen;
-		if ( ! in_array( $current_screen->post_type, array( WPSHOP_NEWTYPE_IDENTIFIER_ORDER ), true ) && $hook !== 'settings_page_wpshop_option' )
+		if (!in_array($current_screen->post_type, array(WPSHOP_NEWTYPE_IDENTIFIER_ORDER), true) && $hook !== 'settings_page_wpshop_option')
 			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;

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_shipping_mode_ctr {
 
 	/**
@@ -70,8 +72,9 @@ 
 	 */
 	function add_scripts_in_admin( $hook ) {
 		global $current_screen;
-		if ( ! in_array( $current_screen->post_type, array( WPSHOP_NEWTYPE_IDENTIFIER_ORDER ), true ) && $hook !== 'settings_page_wpshop_option' )
-			return;
+		if ( ! in_array( $current_screen->post_type, array( WPSHOP_NEWTYPE_IDENTIFIER_ORDER ), true ) && $hook !== 'settings_page_wpshop_option' ) {
+					return;
+		}
 
 		add_thickbox();
 		wp_enqueue_script('jquery');