Eoxia / wpshop

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","draft","future"');
-        $is_used_in_variation = wpshop_attributes::getElement('yes', "'valid', 'notused'", 'is_used_in_variation', true);
-        $attribute_list = array();
-        foreach ($is_used_in_variation as $attribute) {
-            if (in_array($attribute->backend_input, array('multiple-select', 'select', 'radio', 'checkbox'), true)) {
-                $values = wpshop_attributes::get_select_output($attribute);
-                if (!empty($values['possible_value'])) {
-                    $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","draft","future"');
+		$is_used_in_variation = wpshop_attributes::getElement('yes', "'valid', 'notused'", 'is_used_in_variation', true);
+		$attribute_list = array();
+		foreach ($is_used_in_variation as $attribute) {
+			if (in_array($attribute->backend_input, array('multiple-select', 'select', 'radio', 'checkbox'), true)) {
+				$values = wpshop_attributes::get_select_output($attribute);
+				if (!empty($values['possible_value'])) {
+					$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_shipping/controller/wps_shipping_mode_ctr.php

Spacing +110 added lines, -110 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'), 10, 2 );
+		add_action('add_meta_boxes', array($this, 'add_meta_box'), 10, 2);
 	}
 
-	function add_meta_box( $post_type, $post ) {
-		if ( WPSHOP_NEWTYPE_IDENTIFIER_ORDER == $post_type ) {
+	function add_meta_box($post_type, $post) {
+		if (WPSHOP_NEWTYPE_IDENTIFIER_ORDER == $post_type) {
 			/**	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'] && ( is_array( $order_meta ) && 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'] && (is_array($order_meta) && 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;