Eoxia / wpshop

includes/modules/wps_shipping/controller/wps_shipping_mode_ajax_actions.php

Spacing +89 added lines, -89 removed lines

@@ -1,64 +1,64 @@ 
-<?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_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_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(){
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+	function wpshop_ajax_save_shipping_rule() {
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_save_shipping_rule' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wpshop_ajax_save_shipping_rule'))
 			wp_die();
 
 		global $wpdb;
 		$wps_shipping = new wps_shipping();
 		$status = false;
 		$reponse = array();
-		$fees_data = ( !empty($_POST['fees_data']) ) ?  sanitize_text_field( $_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'])) ? sanitize_text_field($_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();
 	}
@@ -67,21 +67,21 @@ 
 	 * AJAX - Delete Custom shipping Rule
 	 */
 	function wpshop_ajax_delete_shipping_rule() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_delete_shipping_rule' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wpshop_ajax_delete_shipping_rule'))
 			wp_die();
 
 		global $wpdb;
 		$wps_shipping = new wps_shipping();
-		$fees_data = ( !empty($_POST['fees_data']) ) ? sanitize_text_field( $_POST['fees_data'] ) : null;
-		$country_and_weight =  ( !empty($_POST['country_and_weight']) ) ? (int) $_POST['country_and_weight'] : null;
+		$fees_data = (!empty($_POST['fees_data'])) ? sanitize_text_field($_POST['fees_data']) : null;
+		$country_and_weight = (!empty($_POST['country_and_weight'])) ? (int)$_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');
@@ -94,30 +94,30 @@ 
 // 			}
 // 		}
 
-		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 = '';
 		}
-		$reponse = array('status' => $status, 'reponse' => $rules );
+		$reponse = array('status' => $status, 'reponse' => $rules);
 		echo json_encode($reponse);
 		die();
 	}
@@ -125,19 +125,19 @@ 
 	/**
 	 * AJAX - Display Created custom shipping rules
 	 */
-	function wpshop_ajax_display_shipping_rules () {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+	function wpshop_ajax_display_shipping_rules() {
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_display_shipping_rules' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wpshop_ajax_display_shipping_rules'))
 			wp_die();
 
 		$status = false;
-		$fees_data = ( !empty($_POST['fees_data']) ) ? sanitize_text_field( $_POST['fees_data'] ) : null;
-		$shipping_mode_id = ( !empty($_POST['shipping_mode_id']) ) ? (int) $_POST['shipping_mode_id'] : null;
+		$fees_data = (!empty($_POST['fees_data'])) ? sanitize_text_field($_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 {
@@ -155,38 +155,38 @@ 
 	 * AJAX - Reload shippig mode interface
 	 */
 	function wps_reload_shipping_mode() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !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();
 	}
 
@@ -194,26 +194,26 @@ 
 	 * AJAX - Calculate Shipping cost
 	 */
 	function wps_calculate_shipping_cost() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !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();
 	}
 
@@ -221,71 +221,71 @@ 
 	 * AJAX - (New checkout Tunnel ) Load available shipping modes
 	 */
 	function wps_load_shipping_methods() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !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() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_add_new_shipping_mode' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_add_new_shipping_mode'))
 			wp_die();
 
 		$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();
 
@@ -293,9 +293,9 @@ 
 		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();
 	}
 }

Braces +31 added lines, -29 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_shipping_mode_ajax_actions {
 
 	function __construct() {
@@ -18,8 +20,9 @@ 
 	function wpshop_ajax_save_shipping_rule(){
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_save_shipping_rule' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_save_shipping_rule' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$wps_shipping = new wps_shipping();
@@ -48,13 +51,11 @@ 
 			}
 			if ( $existing_country && $tab_key > -1) {
 				$shipping_rules[$tab_key]['fees'][$weight_rule] = $shipping_price;
-			}
-			else {
+			} else {
 				$shipping_rules[] = array( 'destination' => $selected_country, 'rule' => 'weight', 'fees' => array($weight_rule => $shipping_price) );
 			}
 			$status = true;
-		}
-		else {
+		} else {
 			$shipping_rules = array( '0' => array('destination' => $selected_country, 'rule' => 'weight', 'fees' => array( $weight_rule => $shipping_price)) );
 			$status = true;
 		}
@@ -69,8 +70,9 @@ 
 	function wpshop_ajax_delete_shipping_rule() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_delete_shipping_rule' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_delete_shipping_rule' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$wps_shipping = new wps_shipping();
@@ -113,8 +115,7 @@ 
 
 		if ( !empty($shipping_rules) ) {
 			$rules = $wps_shipping->shipping_fees_array_2_string( $shipping_rules );
-		}
-		else {
+		} else {
 			$rules = '';
 		}
 		$reponse = array('status' => $status, 'reponse' => $rules );
@@ -128,8 +129,9 @@ 
 	function wpshop_ajax_display_shipping_rules () {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_display_shipping_rules' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_display_shipping_rules' ) ) {
+					wp_die();
+		}
 
 		$status = false;
 		$fees_data = ( !empty($_POST['fees_data']) ) ? sanitize_text_field( $_POST['fees_data'] ) : null;
@@ -139,8 +141,7 @@ 
 			$wps_shipping_mode_ctr = new wps_shipping_mode_ctr();
 			$result = $wps_shipping_mode_ctr->generate_shipping_rules_table( $fees_data, $shipping_mode_id );
 			$status = true;
-		}
-		else {
+		} else {
 			$status = true;
 			$result = __('No shipping rules are created', 'wpshop');
 		}
@@ -157,8 +158,9 @@ 
 	function wps_reload_shipping_mode() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_reload_shipping_mode' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_reload_shipping_mode' ) ) {
+					wp_die();
+		}
 
 		$status = false; $allow_order = true;
 		$result = '';
@@ -196,8 +198,9 @@ 
 	function wps_calculate_shipping_cost() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_calculate_shipping_cost' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_calculate_shipping_cost' ) ) {
+					wp_die();
+		}
 
 		$status = false;
 		$result = '';
@@ -223,8 +226,9 @@ 
 	function wps_load_shipping_methods() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_load_shipping_methods' ) )
-			wp_die();
+		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;
@@ -254,19 +258,16 @@ 
 								ob_end_clean();
 
 							}
-						}
-						else {
+						} else {
 							$response = '<div class="wps-alert-error">' .__( 'No shipping method available for your shipping address', 'wpshop' ). '</div>';
 						}
 
-					}
-					else {
+					} else {
 						$response = '<div class="wps-alert-info">' .__( 'No shipping method available', 'wpshop' ). '</div>';
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			$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) );
@@ -277,8 +278,9 @@ 
 	function wps_add_new_shipping_mode() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_add_new_shipping_mode' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_add_new_shipping_mode' ) ) {
+					wp_die();
+		}
 
 		$status = false; $reponse = '';
 

includes/modules/wps_help/controller/wps_help_bubble_ctr.php

Spacing +67 added lines, -67 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Main controller file for wpshop help
  *
@@ -19,54 +19,54 @@ 
 	 */
 	function __construct() {
 		/**	Call style for administration	*/
-		add_action( 'admin_enqueue_scripts', array( &$this, 'admin_css' ) );
+		add_action('admin_enqueue_scripts', array(&$this, 'admin_css'));
 
 		/**	Include the different javascript	*/
-		add_action( 'admin_init', array(&$this, 'admin_js') );
+		add_action('admin_init', array(&$this, 'admin_js'));
 
 		/**	Add the scripts into admin footer for future use	*/
-		add_action( 'admin_print_footer_scripts', array( &$this, 'wps_dashboard_help') );
+		add_action('admin_print_footer_scripts', array(&$this, 'wps_dashboard_help'));
 
 		/** Ajax actions **/
-		add_action( 'wp_ajax_close_wps_help_window', array( &$this, 'wps_ajax_close_wps_help_window' ) );
+		add_action('wp_ajax_close_wps_help_window', array(&$this, 'wps_ajax_close_wps_help_window'));
 	}
 
 	/**
 	 * Include stylesheets
 	 */
 	function admin_css() {
-		wp_enqueue_style( 'wp-pointer' );
+		wp_enqueue_style('wp-pointer');
 	}
 
 	/**
 	 * Load the different javascript librairies
 	 */
 	function admin_js() {
-		wp_enqueue_script( 'wp-pointer' );
+		wp_enqueue_script('wp-pointer');
 	}
 
 	/**
 	 * AJAX - Save into current user meta the different help that have to be closed next time the user will be logged in
 	 */
 	function wps_ajax_close_wps_help_window() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_ajax_close_wps_help_window' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_ajax_close_wps_help_window'))
 			wp_die();
 
 		$status = false;
 		$result = '';
-		$pointer_id = !empty( $_POST['pointer_id']) ? wpshop_tools::varSanitizer( $_POST['pointer_id'] ) : '';
-		if ( !empty($pointer_id) ) {
-			$seen_help_windows = get_user_meta( get_current_user_id(), '_wps_closed_help', true);
-			$seen_help_windows[ $pointer_id ] = true;
+		$pointer_id = !empty($_POST['pointer_id']) ? wpshop_tools::varSanitizer($_POST['pointer_id']) : '';
+		if (!empty($pointer_id)) {
+			$seen_help_windows = get_user_meta(get_current_user_id(), '_wps_closed_help', true);
+			$seen_help_windows[$pointer_id] = true;
 
-			update_user_meta( get_current_user_id(), '_wps_closed_help', $seen_help_windows);
+			update_user_meta(get_current_user_id(), '_wps_closed_help', $seen_help_windows);
 			$status = true;
 		}
 
-		$response = array( 'status' => $status, 'response' => $result );
-		wp_die( json_encode( $response ) );
+		$response = array('status' => $status, 'response' => $result);
+		wp_die(json_encode($response));
 	}
 
 	/**
@@ -79,118 +79,118 @@ 
 		/**	Get current screen in order to load messages only in required pages	*/
 		$current_screen = get_current_screen();
 		$current_screen->id = 'disable';
-		switch ( $current_screen->id ) {
+		switch ($current_screen->id) {
 			case 'toplevel_page_wpshop_dashboard':
-				$help_cases[ 'download_newsletter_contacts' ]		= array( 'edge' => 'left', 'at' => 'left bottom', 'my' => 'left top', 'pointer_id' => '#download_newsletter_contacts' );
+				$help_cases['download_newsletter_contacts'] = array('edge' => 'left', 'at' => 'left bottom', 'my' => 'left top', 'pointer_id' => '#download_newsletter_contacts');
 			break;
 
 			case 'wpshop_product':
-				$help_cases[ 'product_page_categories' ] 			= array( 'edge' => 'right',  'at' => '', 'my' => '', 'pointer_id' => '#wpshop_product_categorydiv');
-				$help_cases[ 'product_datas_configuration' ] 		= array( 'edge' => 'bottom', 'at' => 'center top', 'my' => 'bottom right', 'pointer_id' => '#wpshop_product_fixed_tab');
-				$help_cases[ 'product_display_configuration' ] 		= array( 'edge' => 'bottom', 'at' => 'right bottom', 'my' => 'bottom', 'pointer_id' => '.wpshop_product_data_display_tab' );
-				$help_cases[ 'product_variations' ] 				= array( 'edge' => 'bottom', 'at' => 'right bottom', 'my' => 'bottom', 'pointer_id' => '#wpshop_new_variation_list_button' );
-				$help_cases[ 'product_variations_configuration' ] 	= array( 'edge' => 'bottom', 'at' => 'right bottom', 'my' => 'bottom', 'pointer_id' => '#wpshop_variation_parameters_button' );
-				$help_cases[ 'add_product_automaticly_to_cart' ] 	= array( 'edge' => 'right',  'at' => '', 'my' => '', 'pointer_id' => '#wpshop_product_options' );
+				$help_cases['product_page_categories'] = array('edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_product_categorydiv');
+				$help_cases['product_datas_configuration'] = array('edge' => 'bottom', 'at' => 'center top', 'my' => 'bottom right', 'pointer_id' => '#wpshop_product_fixed_tab');
+				$help_cases['product_display_configuration'] = array('edge' => 'bottom', 'at' => 'right bottom', 'my' => 'bottom', 'pointer_id' => '.wpshop_product_data_display_tab');
+				$help_cases['product_variations'] = array('edge' => 'bottom', 'at' => 'right bottom', 'my' => 'bottom', 'pointer_id' => '#wpshop_new_variation_list_button');
+				$help_cases['product_variations_configuration'] = array('edge' => 'bottom', 'at' => 'right bottom', 'my' => 'bottom', 'pointer_id' => '#wpshop_variation_parameters_button');
+				$help_cases['add_product_automaticly_to_cart'] = array('edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_product_options');
 			break;
 
 			case 'edit-wpshop_product_category':
-				$help_cases[ 'category_filterable_attributes' ] 	= array( 'edge' => 'bottom', 'at' => 'top', 'my' => 'bottom', 'pointer_id' => '.filterable_attributes_container' );
-				$help_cases[ 'category_picture' ] 					= array( 'edge' => 'bottom', 'at' => '', 'my' => 'bottom', 'pointer_id' => '.category_new_picture_upload' );
+				$help_cases['category_filterable_attributes'] = array('edge' => 'bottom', 'at' => 'top', 'my' => 'bottom', 'pointer_id' => '.filterable_attributes_container');
+				$help_cases['category_picture'] = array('edge' => 'bottom', 'at' => '', 'my' => 'bottom', 'pointer_id' => '.category_new_picture_upload');
 			break;
 
 			case 'wpshop_shop_order':
-				$help_cases[ 'order_customer_comment' ] 			= array( 'edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_order_customer_comment' );
-				$help_cases[ 'order_notification_message' ] 		= array( 'edge' => 'bottom', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_order_private_comments' );
-				$help_cases[ 'order_shipping_box' ] 				= array( 'edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_order_shipping' );
+				$help_cases['order_customer_comment'] = array('edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_order_customer_comment');
+				$help_cases['order_notification_message'] = array('edge' => 'bottom', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_order_private_comments');
+				$help_cases['order_shipping_box'] = array('edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_order_shipping');
 			break;
 
 			case 'wpshop_shop_message':
-				$help_cases[ 'message_historic' ] 					= array( 'edge' => 'bottom', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_message_histo' );
+				$help_cases['message_historic'] = array('edge' => 'bottom', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_message_histo');
 			break;
 
 			case 'settings_page_wpshop_option':
-				$help_cases[ 'options_payment_part' ] 				= array ('edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wps_payment_mode_list_container' );
+				$help_cases['options_payment_part'] = array('edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wps_payment_mode_list_container');
 			break;
 		}
 
-		if ( !empty( $help_cases ) ) {
+		if (!empty($help_cases)) {
 			/** Get help data seen by user **/
-			$closed_help_window = get_user_meta( get_current_user_id(), '_wps_closed_help', true);
+			$closed_help_window = get_user_meta(get_current_user_id(), '_wps_closed_help', true);
 
 			/**	Read the different help cases	*/
-			foreach( $help_cases as $help_id => $help_case ) {
-				if ( empty( $closed_help_window ) || ( !empty( $closed_help_window ) && !array_key_exists( $help_id, $closed_help_window ) ) ){
-					switch( $help_id ) {
+			foreach ($help_cases as $help_id => $help_case) {
+				if (empty($closed_help_window) || (!empty($closed_help_window) && !array_key_exists($help_id, $closed_help_window))) {
+					switch ($help_id) {
 						case 'download_newsletter_contacts' :
-							$pointer_content  = '<h3>' .__( 'Customers information download', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'You can download emails of customers who accept to receive your commercials offers or your partners commercials offers by newsletter', 'wpshop'). '</p>';
+							$pointer_content  = '<h3>' . __('Customers information download', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('You can download emails of customers who accept to receive your commercials offers or your partners commercials offers by newsletter', 'wpshop') . '</p>';
 							break;
 
 						case 'product_page_categories' :
-							$pointer_content  = '<h3>' .__( 'WPShop Categories', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'You can classify your products by category.', 'wpshop'). '<br/></p>';
-							$pointer_content .= '<p><a href="' .admin_url('edit-tags.php?taxonomy=wpshop_product_category&post_type=wpshop_product'). '" class="button-primary" target="_blank">' .__('Create my WPShop categories', 'wpshop' ). '</a></p>';
+							$pointer_content  = '<h3>' . __('WPShop Categories', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('You can classify your products by category.', 'wpshop') . '<br/></p>';
+							$pointer_content .= '<p><a href="' . admin_url('edit-tags.php?taxonomy=wpshop_product_category&post_type=wpshop_product') . '" class="button-primary" target="_blank">' . __('Create my WPShop categories', 'wpshop') . '</a></p>';
 							break;
 
 						case 'product_datas_configuration' :
-							$pointer_content  = '<h3>' .__( 'Product configurations', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'Here, you can configure your product (Price, weight, reference and all attributes you want to create and affect to products', 'wpshop'). '</p>';
+							$pointer_content  = '<h3>' . __('Product configurations', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('Here, you can configure your product (Price, weight, reference and all attributes you want to create and affect to products', 'wpshop') . '</p>';
 							break;
 
 						case 'product_display_configuration' :
-							$pointer_content  = '<h3>' .__( 'Product display configurations', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'Here, you can manage what elements you want to display on your product page', 'wpshop' ). '</p>';
+							$pointer_content  = '<h3>' . __('Product display configurations', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('Here, you can manage what elements you want to display on your product page', 'wpshop') . '</p>';
 							break;
 
 						case 'product_variations' :
-							$pointer_content  = '<h3>' .__( 'Product variations', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'Here, you can generate your product variations.', 'wpshop'). '</p><br/>';
-							$pointer_content .= '<p><a href="http://www.wpshop.fr/documentations/configurer-un-produit-avec-des-options/" class="button-primary" target="_blank">' .__('Read the tutorial', 'wpshop').'</a></p>';
+							$pointer_content  = '<h3>' . __('Product variations', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('Here, you can generate your product variations.', 'wpshop') . '</p><br/>';
+							$pointer_content .= '<p><a href="http://www.wpshop.fr/documentations/configurer-un-produit-avec-des-options/" class="button-primary" target="_blank">' . __('Read the tutorial', 'wpshop') . '</a></p>';
 							break;
 
 						case 'product_variations_configuration' :
-							$pointer_content  = '<h3>' .__( 'Variations configuration', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'Here, you can manage your product variations configurations (Display "Price from", variation price priority...).', 'wpshop'). '</p>';
+							$pointer_content  = '<h3>' . __('Variations configuration', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('Here, you can manage your product variations configurations (Display "Price from", variation price priority...).', 'wpshop') . '</p>';
 							break;
 
 						case 'add_product_automaticly_to_cart' :
-							$pointer_content  = '<h3>' .__('Add product to cart', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'If you check this checkbox, this produc will be add automaticly to cart. This functionnality is helpful if you want to bill fees for example.', 'wpshop' ). '</p>';
+							$pointer_content  = '<h3>' . __('Add product to cart', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('If you check this checkbox, this produc will be add automaticly to cart. This functionnality is helpful if you want to bill fees for example.', 'wpshop') . '</p>';
 							break;
 
 						case 'category_filterable_attributes' :
-							$pointer_content  = '<h3>' .__('Filterable search', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'You can add a filter search to your WPShop, here will be display all available attributes for a filter search in this category', 'wpshop' ). '</p><br/>';
-							$pointer_content .= '<p><a href="http://www.wpshop.fr/documentations/la-recherche-par-filtre/" class="button-primary" target="_blank">' .__('Read the filter search tutorial', 'wpshop').'</a></p>';
+							$pointer_content  = '<h3>' . __('Filterable search', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('You can add a filter search to your WPShop, here will be display all available attributes for a filter search in this category', 'wpshop') . '</p><br/>';
+							$pointer_content .= '<p><a href="http://www.wpshop.fr/documentations/la-recherche-par-filtre/" class="button-primary" target="_blank">' . __('Read the filter search tutorial', 'wpshop') . '</a></p>';
 							break;
 
 						case 'category_picture' :
-							$pointer_content  = '<h3>' .__('Category image', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'You can add a picture to illustrate your category', 'wpshop' ). '</p>';
+							$pointer_content  = '<h3>' . __('Category image', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('You can add a picture to illustrate your category', 'wpshop') . '</p>';
 							break;
 
 						case 'order_customer_comment' :
-							$pointer_content  = '<h3>' .__('Order customer comment', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'Here is displayed the customer comment wrote during the order', 'wpshop' ). '</p>';
+							$pointer_content  = '<h3>' . __('Order customer comment', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('Here is displayed the customer comment wrote during the order', 'wpshop') . '</p>';
 							break;
 
 						case 'message_historic' :
-							$pointer_content  = '<h3>' .__('Message Historic', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'This is this message historic. You can check here if an automatic e-mail was send to a customer', 'wpshop' ). '</p>';
+							$pointer_content  = '<h3>' . __('Message Historic', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('This is this message historic. You can check here if an automatic e-mail was send to a customer', 'wpshop') . '</p>';
 							break;
 
 						case 'order_notification_message' :
-							$pointer_content  = '<h3>' .__('Order notification', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'You can add a private comment to the order or send an comment to customer about this order', 'wpshop' ). '</p>';
+							$pointer_content  = '<h3>' . __('Order notification', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('You can add a private comment to the order or send an comment to customer about this order', 'wpshop') . '</p>';
 							break;
 
 						case 'order_shipping_box' :
-							$pointer_content  = '<h3>' .__('Shipping actions', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'Here, you can manage your shipping actions, download the shipping slip.', 'wpshop' ). '</p>';
+							$pointer_content  = '<h3>' . __('Shipping actions', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('Here, you can manage your shipping actions, download the shipping slip.', 'wpshop') . '</p>';
 							break;
 
 						case 'options_payment_part' :
-							$pointer_content  = '<h3>' .__('Payment configuration', 'wpshop'). '</h3><p>' .__( 'You can manage your payment methods (Change name, add description, add a logo and apply configurations ). You can add others payment methods', 'wpshop' ). '</p><br/><p><a href="http://shop.eoxia.com/boutique/shop/modules-wpshop/modules-de-paiement/" class="button-primary" target="_blank">' .__('See available payment methods', 'wpshop').'</a></p>';
+							$pointer_content = '<h3>' . __('Payment configuration', 'wpshop') . '</h3><p>' . __('You can manage your payment methods (Change name, add description, add a logo and apply configurations ). You can add others payment methods', 'wpshop') . '</p><br/><p><a href="http://shop.eoxia.com/boutique/shop/modules-wpshop/modules-de-paiement/" class="button-primary" target="_blank">' . __('See available payment methods', 'wpshop') . '</a></p>';
 							break;
 
 						default :
@@ -198,7 +198,7 @@ 
 							break;
 					}
 
-					require( wpshop_tools::get_template_part( WPS_HELP_DIR, WPS_HELP_TEMPLATES_MAIN_DIR, 'backend', 'help', 'container_bubble' ) );
+					require(wpshop_tools::get_template_part(WPS_HELP_DIR, WPS_HELP_TEMPLATES_MAIN_DIR, 'backend', 'help', 'container_bubble'));
 				}
 			}
 		}

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Main controller file for wpshop help
  *
@@ -51,8 +53,9 @@ 
 	function wps_ajax_close_wps_help_window() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_ajax_close_wps_help_window' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_ajax_close_wps_help_window' ) ) {
+					wp_die();
+		}
 
 		$status = false;
 		$result = '';

includes/modules/wps_help/controller/wps_help_ctr.php

Spacing +67 added lines, -67 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Main controller file for wpshop help
  *
@@ -19,54 +19,54 @@ 
 	 */
 	function __construct() {
 		/**	Call style for administration	*/
-		add_action( 'admin_enqueue_scripts', array( &$this, 'admin_css' ) );
+		add_action('admin_enqueue_scripts', array(&$this, 'admin_css'));
 
 		/**	Include the different javascript	*/
-		add_action( 'admin_init', array(&$this, 'admin_js') );
+		add_action('admin_init', array(&$this, 'admin_js'));
 
 		/**	Add the scripts into admin footer for future use	*/
-		add_action( 'admin_print_footer_scripts', array( &$this, 'wps_dashboard_help') );
+		add_action('admin_print_footer_scripts', array(&$this, 'wps_dashboard_help'));
 
 		/** Ajax actions **/
-		add_action( 'wp_ajax_close_wps_help_window', array( &$this, 'wps_ajax_close_wps_help_window' ) );
+		add_action('wp_ajax_close_wps_help_window', array(&$this, 'wps_ajax_close_wps_help_window'));
 	}
 
 	/**
 	 * Include stylesheets
 	 */
 	function admin_css() {
-		wp_enqueue_style( 'wp-pointer' );
+		wp_enqueue_style('wp-pointer');
 	}
 
 	/**
 	 * Load the different javascript librairies
 	 */
 	function admin_js() {
-		wp_enqueue_script( 'wp-pointer' );
+		wp_enqueue_script('wp-pointer');
 	}
 
 	/**
 	 * AJAX - Save into current user meta the different help that have to be closed next time the user will be logged in
 	 */
 	function wps_ajax_close_wps_help_window() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_ajax_close_wps_help_window' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_ajax_close_wps_help_window'))
 			wp_die();
 
 		$status = false;
 		$result = '';
-		$pointer_id = !empty( $_POST['pointer_id']) ? wpshop_tools::varSanitizer( $_POST['pointer_id'] ) : '';
-		if ( !empty($pointer_id) ) {
-			$seen_help_windows = get_user_meta( get_current_user_id(), '_wps_closed_help', true);
-			$seen_help_windows[ $pointer_id ] = true;
+		$pointer_id = !empty($_POST['pointer_id']) ? wpshop_tools::varSanitizer($_POST['pointer_id']) : '';
+		if (!empty($pointer_id)) {
+			$seen_help_windows = get_user_meta(get_current_user_id(), '_wps_closed_help', true);
+			$seen_help_windows[$pointer_id] = true;
 
-			update_user_meta( get_current_user_id(), '_wps_closed_help', $seen_help_windows);
+			update_user_meta(get_current_user_id(), '_wps_closed_help', $seen_help_windows);
 			$status = true;
 		}
 
-		$response = array( 'status' => $status, 'response' => $result );
-		wp_die( json_encode( $response ) );
+		$response = array('status' => $status, 'response' => $result);
+		wp_die(json_encode($response));
 	}
 
 	/**
@@ -78,118 +78,118 @@ 
 
 		/**	Get current screen in order to load messages only in required pages	*/
 		$current_screen = get_current_screen();
-		switch ( $current_screen->id ) {
+		switch ($current_screen->id) {
 			case 'toplevel_page_wpshop_dashboard':
-				$help_cases[ 'download_newsletter_contacts' ]		= array( 'edge' => 'left', 'at' => 'left bottom', 'my' => 'left top', 'pointer_id' => '#download_newsletter_contacts' );
+				$help_cases['download_newsletter_contacts'] = array('edge' => 'left', 'at' => 'left bottom', 'my' => 'left top', 'pointer_id' => '#download_newsletter_contacts');
 			break;
 
 			case 'wpshop_product':
-				$help_cases[ 'product_page_categories' ] 			= array( 'edge' => 'right',  'at' => '', 'my' => '', 'pointer_id' => '#wpshop_product_categorydiv');
-				$help_cases[ 'product_datas_configuration' ] 		= array( 'edge' => 'bottom', 'at' => 'center top', 'my' => 'bottom right', 'pointer_id' => '#wpshop_product_fixed_tab');
-				$help_cases[ 'product_display_configuration' ] 		= array( 'edge' => 'bottom', 'at' => 'right bottom', 'my' => 'bottom', 'pointer_id' => '.wpshop_product_data_display_tab' );
-				$help_cases[ 'product_variations' ] 				= array( 'edge' => 'bottom', 'at' => 'right bottom', 'my' => 'bottom', 'pointer_id' => '#wpshop_new_variation_list_button' );
-				$help_cases[ 'product_variations_configuration' ] 	= array( 'edge' => 'bottom', 'at' => 'right bottom', 'my' => 'bottom', 'pointer_id' => '#wpshop_variation_parameters_button' );
-				$help_cases[ 'add_product_automaticly_to_cart' ] 	= array( 'edge' => 'right',  'at' => '', 'my' => '', 'pointer_id' => '#wpshop_product_options' );
+				$help_cases['product_page_categories'] = array('edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_product_categorydiv');
+				$help_cases['product_datas_configuration'] = array('edge' => 'bottom', 'at' => 'center top', 'my' => 'bottom right', 'pointer_id' => '#wpshop_product_fixed_tab');
+				$help_cases['product_display_configuration'] = array('edge' => 'bottom', 'at' => 'right bottom', 'my' => 'bottom', 'pointer_id' => '.wpshop_product_data_display_tab');
+				$help_cases['product_variations'] = array('edge' => 'bottom', 'at' => 'right bottom', 'my' => 'bottom', 'pointer_id' => '#wpshop_new_variation_list_button');
+				$help_cases['product_variations_configuration'] = array('edge' => 'bottom', 'at' => 'right bottom', 'my' => 'bottom', 'pointer_id' => '#wpshop_variation_parameters_button');
+				$help_cases['add_product_automaticly_to_cart'] = array('edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_product_options');
 			break;
 
 			case 'edit-wpshop_product_category':
-				$help_cases[ 'category_filterable_attributes' ] 	= array( 'edge' => 'bottom', 'at' => 'top', 'my' => 'bottom', 'pointer_id' => '.filterable_attributes_container' );
-				$help_cases[ 'category_picture' ] 					= array( 'edge' => 'bottom', 'at' => '', 'my' => 'bottom', 'pointer_id' => '.category_new_picture_upload' );
+				$help_cases['category_filterable_attributes'] = array('edge' => 'bottom', 'at' => 'top', 'my' => 'bottom', 'pointer_id' => '.filterable_attributes_container');
+				$help_cases['category_picture'] = array('edge' => 'bottom', 'at' => '', 'my' => 'bottom', 'pointer_id' => '.category_new_picture_upload');
 			break;
 
 			case 'wpshop_shop_order':
-				$help_cases[ 'order_customer_comment' ] 			= array( 'edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_order_customer_comment' );
-				$help_cases[ 'order_notification_message' ] 		= array( 'edge' => 'bottom', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_order_private_comments' );
-				$help_cases[ 'order_shipping_box' ] 				= array( 'edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_order_shipping' );
+				$help_cases['order_customer_comment'] = array('edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_order_customer_comment');
+				$help_cases['order_notification_message'] = array('edge' => 'bottom', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_order_private_comments');
+				$help_cases['order_shipping_box'] = array('edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_order_shipping');
 			break;
 
 			case 'wpshop_shop_message':
-				$help_cases[ 'message_historic' ] 					= array( 'edge' => 'bottom', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_message_histo' );
+				$help_cases['message_historic'] = array('edge' => 'bottom', 'at' => '', 'my' => '', 'pointer_id' => '#wpshop_message_histo');
 			break;
 
 			case 'settings_page_wpshop_option':
-				$help_cases[ 'options_payment_part' ] 				= array ('edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wps_payment_mode_list_container' );
+				$help_cases['options_payment_part'] = array('edge' => 'right', 'at' => '', 'my' => '', 'pointer_id' => '#wps_payment_mode_list_container');
 			break;
 		}
 
-		if ( !empty( $help_cases ) ) {
+		if (!empty($help_cases)) {
 			/** Get help data seen by user **/
-			$closed_help_window = get_user_meta( get_current_user_id(), '_wps_closed_help', true);
+			$closed_help_window = get_user_meta(get_current_user_id(), '_wps_closed_help', true);
 
 			/**	Read the different help cases	*/
-			foreach( $help_cases as $help_id => $help_case ) {
-				if ( empty( $closed_help_window ) || ( !empty( $closed_help_window ) && !array_key_exists( $help_id, $closed_help_window ) ) ){
-					switch( $help_id ) {
+			foreach ($help_cases as $help_id => $help_case) {
+				if (empty($closed_help_window) || (!empty($closed_help_window) && !array_key_exists($help_id, $closed_help_window))) {
+					switch ($help_id) {
 						case 'download_newsletter_contacts' :
-							$pointer_content  = '<h3>' .__( 'Customers information download', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'You can download emails of customers who accept to receive your commercials offers or your partners commercials offers by newsletter', 'wpshop'). '</p>';
+							$pointer_content  = '<h3>' . __('Customers information download', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('You can download emails of customers who accept to receive your commercials offers or your partners commercials offers by newsletter', 'wpshop') . '</p>';
 							break;
 
 						case 'product_page_categories' :
-							$pointer_content  = '<h3>' .__( 'WPShop Categories', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'You can classify your products by category.', 'wpshop'). '<br/></p>';
-							$pointer_content .= '<p><a href="' .admin_url('edit-tags.php?taxonomy=wpshop_product_category&post_type=wpshop_product'). '" class="button-primary" target="_blank">' .__('Create my WPShop categories', 'wpshop' ). '</a></p>';
+							$pointer_content  = '<h3>' . __('WPShop Categories', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('You can classify your products by category.', 'wpshop') . '<br/></p>';
+							$pointer_content .= '<p><a href="' . admin_url('edit-tags.php?taxonomy=wpshop_product_category&post_type=wpshop_product') . '" class="button-primary" target="_blank">' . __('Create my WPShop categories', 'wpshop') . '</a></p>';
 							break;
 
 						case 'product_datas_configuration' :
-							$pointer_content  = '<h3>' .__( 'Product configurations', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'Here, you can configure your product (Price, weight, reference and all attributes you want to create and affect to products', 'wpshop'). '</p>';
+							$pointer_content  = '<h3>' . __('Product configurations', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('Here, you can configure your product (Price, weight, reference and all attributes you want to create and affect to products', 'wpshop') . '</p>';
 							break;
 
 						case 'product_display_configuration' :
-							$pointer_content  = '<h3>' .__( 'Product display configurations', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'Here, you can manage what elements you want to display on your product page', 'wpshop' ). '</p>';
+							$pointer_content  = '<h3>' . __('Product display configurations', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('Here, you can manage what elements you want to display on your product page', 'wpshop') . '</p>';
 							break;
 
 						case 'product_variations' :
-							$pointer_content  = '<h3>' .__( 'Product variations', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'Here, you can generate your product variations.', 'wpshop'). '</p><br/>';
-							$pointer_content .= '<p><a href="http://www.wpshop.fr/documentations/configurer-un-produit-avec-des-options/" class="button-primary" target="_blank">' .__('Read the tutorial', 'wpshop').'</a></p>';
+							$pointer_content  = '<h3>' . __('Product variations', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('Here, you can generate your product variations.', 'wpshop') . '</p><br/>';
+							$pointer_content .= '<p><a href="http://www.wpshop.fr/documentations/configurer-un-produit-avec-des-options/" class="button-primary" target="_blank">' . __('Read the tutorial', 'wpshop') . '</a></p>';
 							break;
 
 						case 'product_variations_configuration' :
-							$pointer_content  = '<h3>' .__( 'Variations configuration', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'Here, you can manage your product variations configurations (Display "Price from", variation price priority...).', 'wpshop'). '</p>';
+							$pointer_content  = '<h3>' . __('Variations configuration', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('Here, you can manage your product variations configurations (Display "Price from", variation price priority...).', 'wpshop') . '</p>';
 							break;
 
 						case 'add_product_automaticly_to_cart' :
-							$pointer_content  = '<h3>' .__('Add product to cart', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'If you check this checkbox, this produc will be add automaticly to cart. This functionnality is helpful if you want to bill fees for example.', 'wpshop' ). '</p>';
+							$pointer_content  = '<h3>' . __('Add product to cart', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('If you check this checkbox, this produc will be add automaticly to cart. This functionnality is helpful if you want to bill fees for example.', 'wpshop') . '</p>';
 							break;
 
 						case 'category_filterable_attributes' :
-							$pointer_content  = '<h3>' .__('Filterable search', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'You can add a filter search to your WPShop, here will be display all available attributes for a filter search in this category', 'wpshop' ). '</p><br/>';
-							$pointer_content .= '<p><a href="http://www.wpshop.fr/documentations/la-recherche-par-filtre/" class="button-primary" target="_blank">' .__('Read the filter search tutorial', 'wpshop').'</a></p>';
+							$pointer_content  = '<h3>' . __('Filterable search', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('You can add a filter search to your WPShop, here will be display all available attributes for a filter search in this category', 'wpshop') . '</p><br/>';
+							$pointer_content .= '<p><a href="http://www.wpshop.fr/documentations/la-recherche-par-filtre/" class="button-primary" target="_blank">' . __('Read the filter search tutorial', 'wpshop') . '</a></p>';
 							break;
 
 						case 'category_picture' :
-							$pointer_content  = '<h3>' .__('Category image', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'You can add a picture to illustrate your category', 'wpshop' ). '</p>';
+							$pointer_content  = '<h3>' . __('Category image', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('You can add a picture to illustrate your category', 'wpshop') . '</p>';
 							break;
 
 						case 'order_customer_comment' :
-							$pointer_content  = '<h3>' .__('Order customer comment', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'Here is displayed the customer comment wrote during the order', 'wpshop' ). '</p>';
+							$pointer_content  = '<h3>' . __('Order customer comment', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('Here is displayed the customer comment wrote during the order', 'wpshop') . '</p>';
 							break;
 
 						case 'message_historic' :
-							$pointer_content  = '<h3>' .__('Message Historic', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'This is this message historic. You can check here if an automatic e-mail was send to a customer', 'wpshop' ). '</p>';
+							$pointer_content  = '<h3>' . __('Message Historic', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('This is this message historic. You can check here if an automatic e-mail was send to a customer', 'wpshop') . '</p>';
 							break;
 
 						case 'order_notification_message' :
-							$pointer_content  = '<h3>' .__('Order notification', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'You can add a private comment to the order or send an comment to customer about this order', 'wpshop' ). '</p>';
+							$pointer_content  = '<h3>' . __('Order notification', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('You can add a private comment to the order or send an comment to customer about this order', 'wpshop') . '</p>';
 							break;
 
 						case 'order_shipping_box' :
-							$pointer_content  = '<h3>' .__('Shipping actions', 'wpshop'). '</h3>';
-							$pointer_content .= '<p>' .__( 'Here, you can manage your shipping actions, download the shipping slip.', 'wpshop' ). '</p>';
+							$pointer_content  = '<h3>' . __('Shipping actions', 'wpshop') . '</h3>';
+							$pointer_content .= '<p>' . __('Here, you can manage your shipping actions, download the shipping slip.', 'wpshop') . '</p>';
 							break;
 
 						case 'options_payment_part' :
-							$pointer_content  = '<h3>' .__('Payment configuration', 'wpshop'). '</h3><p>' .__( 'You can manage your payment methods (Change name, add description, add a logo and apply configurations ). You can add others payment methods', 'wpshop' ). '</p><br/><p><a href="http://shop.eoxia.com/boutique/shop/modules-wpshop/modules-de-paiement/" class="button-primary" target="_blank">' .__('See available payment methods', 'wpshop').'</a></p>';
+							$pointer_content = '<h3>' . __('Payment configuration', 'wpshop') . '</h3><p>' . __('You can manage your payment methods (Change name, add description, add a logo and apply configurations ). You can add others payment methods', 'wpshop') . '</p><br/><p><a href="http://shop.eoxia.com/boutique/shop/modules-wpshop/modules-de-paiement/" class="button-primary" target="_blank">' . __('See available payment methods', 'wpshop') . '</a></p>';
 							break;
 
 						default :
@@ -197,7 +197,7 @@ 
 							break;
 					}
 
-					require( wpshop_tools::get_template_part( WPS_HELP_DIR, WPS_HELP_TEMPLATES_MAIN_DIR, 'backend', 'help', 'container' ) );
+					require(wpshop_tools::get_template_part(WPS_HELP_DIR, WPS_HELP_TEMPLATES_MAIN_DIR, 'backend', 'help', 'container'));
 				}
 			}
 		}

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Main controller file for wpshop help
  *
@@ -51,8 +53,9 @@ 
 	function wps_ajax_close_wps_help_window() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_ajax_close_wps_help_window' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_ajax_close_wps_help_window' ) ) {
+					wp_die();
+		}
 
 		$status = false;
 		$result = '';

includes/modules/wps-pos-addon/templates/backend/customers/metabox-selected-customer.php

Spacing +20 added lines, -20 removed lines

@@ -1,9 +1,9 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wpspos-customer-selected" >
-	<?php if ( !empty( $customer_infos ) ) : ?>
+	<?php if (!empty($customer_infos)) : ?>
 		<div class="customer_info wps-boxed">
-			<span class="wps-h4"><?php _e( 'Account', 'wpshop' ); ?></span>
+			<span class="wps-h4"><?php _e('Account', 'wpshop'); ?></span>
 			<div class="wps-form-group"><?php _e('Customer last name', 'wps-pos-i18n')?> : <?php echo $customer_infos->last_name; ?></div>
 			<div class="wps-form-group"><?php _e('Customer first name', 'wps-pos-i18n')?> : <?php echo $customer_infos->first_name; ?></div>
 			<div class="wps-form-group"><?php _e('Customer email', 'wps-pos-i18n')?> : <?php echo $customer_infos->user_email; ?></div>
@@ -11,45 +11,45 @@ 
 		</div>
 
 		<div class="customer_address wps-boxed">
-			<span class="wps-h4"><?php _e( 'Billing address', 'wpshop' ); ?></span>
+			<span class="wps-h4"><?php _e('Billing address', 'wpshop'); ?></span>
 			<?php
-				$billing_option = get_option( 'wpshop_billing_address' );
-				$addresses_customer = wps_address::get_addresses_list_no_hidden_attributes( $customer_id );
-				if( !empty($addresses_customer[$billing_option['choice']]) ) {
+				$billing_option = get_option('wpshop_billing_address');
+				$addresses_customer = wps_address::get_addresses_list_no_hidden_attributes($customer_id);
+				if (!empty($addresses_customer[$billing_option['choice']])) {
 					$billing = reset($addresses_customer[$billing_option['choice']]);
 					//echo '<strong>' . $billing['address_title']['value'] . '</strong>' . '' . '<br>';
-					echo @( __( wpshop_attributes::get_attribute_type_select_option_info($billing['civility']['value'], 'label', 'custom') ) . ' <strong>' . $billing['address_first_name']['value'] . ' ' . $billing['address_last_name']['value'] . '</strong><br>' );
-					echo @( $billing['address']['value'] . '<br>' );
-					echo @( $billing['city']['value'] . ' ' . $billing['postcode']['value'] . ' ' . $billing['country']['value'] ) . '<br>';
+					echo @(__(wpshop_attributes::get_attribute_type_select_option_info($billing['civility']['value'], 'label', 'custom')) . ' <strong>' . $billing['address_first_name']['value'] . ' ' . $billing['address_last_name']['value'] . '</strong><br>');
+					echo @($billing['address']['value'] . '<br>');
+					echo @($billing['city']['value'] . ' ' . $billing['postcode']['value'] . ' ' . $billing['country']['value']) . '<br>';
 				}
 			?>
 		</div>
 
 		<div class="order_historic wps-boxed">
 			<a href="#" class="toggle-historic dashicons dashicons-arrow-down alignright"></a>
-			<span class="wps-h4"><?php _e( 'Historic', 'wpshop' ); ?></span>
+			<span class="wps-h4"><?php _e('Historic', 'wpshop'); ?></span>
 			<?php
-				foreach( $this->get_orders_customer( 3, $customer_id ) as $order ) {
+				foreach ($this->get_orders_customer(3, $customer_id) as $order) {
 			?>
 			<div class="wps-form-group toggle-historic-group">
-				<a href="#" class="lnk_load_order" data-nonce="<?php echo wp_create_nonce( 'wps_pos_process_checkout' ); ?>" data-oid="<?php echo $order->ID; ?>" data-cid="<?php echo $customer_id; ?>">
+				<a href="#" class="lnk_load_order" data-nonce="<?php echo wp_create_nonce('wps_pos_process_checkout'); ?>" data-oid="<?php echo $order->ID; ?>" data-cid="<?php echo $customer_id; ?>">
 					<?php
-					if( $order->_order_postmeta['order_key'] ) {
-						if( $order->_order_postmeta['order_invoice_ref'] ) {
+					if ($order->_order_postmeta['order_key']) {
+						if ($order->_order_postmeta['order_invoice_ref']) {
 							$link = $order->_order_postmeta['order_invoice_ref'];
 						} else {
 							$link = $order->_order_postmeta['order_key'];
 						}
 					} else {
-						$link = __( 'Order summary ', 'wpshop' );
+						$link = __('Order summary ', 'wpshop');
 					}
 					echo $link;
 					?>
 				</a>
-				<span class="price_order"><?php echo number_format( round($order->_order_postmeta['order_grand_total'], 2), 2, '.', '') . ' ' . wpshop_tools::wpshop_get_currency( false ); ?></span>
-				<span class="date_order"><?php echo date("d/m/Y | H:i:s", strtotime( $order->_order_postmeta['order_date'] ) ); ?></span>
+				<span class="price_order"><?php echo number_format(round($order->_order_postmeta['order_grand_total'], 2), 2, '.', '') . ' ' . wpshop_tools::wpshop_get_currency(false); ?></span>
+				<span class="date_order"><?php echo date("d/m/Y | H:i:s", strtotime($order->_order_postmeta['order_date'])); ?></span>
 				<?php
-					if( $order->_order_postmeta['order_invoice_ref'] ) {
+					if ($order->_order_postmeta['order_invoice_ref']) {
 					?>
 				<span class="invoice_order">
 					<a href="<?php echo WPSHOP_TEMPLATES_URL; ?>invoice.php?order_id=<?php echo $order->ID; ?>&invoice_ref=<?php echo $order->_order_postmeta['order_invoice_ref']; ?>" target="_blank" role="button">
@@ -69,6 +69,6 @@ 
 		</div>
 
 	<?php else : ?>
-		<?php _e( 'Nothing was found for selected customer. Please check this customer account before continuing', 'wps-pos-i18n' ); ?>
+		<?php _e('Nothing was found for selected customer. Please check this customer account before continuing', 'wps-pos-i18n'); ?>
 	<?php endif; ?>
 </div>

Braces +8 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <div class="wpspos-customer-selected" >
 	<?php if ( !empty( $customer_infos ) ) : ?>
@@ -68,7 +70,10 @@ 
 			?>
 		</div>
 
-	<?php else : ?>
-		<?php _e( 'Nothing was found for selected customer. Please check this customer account before continuing', 'wps-pos-i18n' ); ?>
+	<?php else {
+	: ?>
+		<?php _e( 'Nothing was found for selected customer. Please check this customer account before continuing', 'wps-pos-i18n' );
+}
+?>
 	<?php endif; ?>
 </div>

includes/modules/wps-pos-addon/controller/wps-pos-order.ctr.php

Spacing +50 added lines, -50 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Main controller file for product into point of sale management plugin
  *
@@ -19,15 +19,15 @@ 
 	 */
 	function __construct() {
 		/**	Call dashboard metaboxes	*/
-		add_action( 'admin_init', array( $this, 'dashboard_metaboxes' ) );
+		add_action('admin_init', array($this, 'dashboard_metaboxes'));
 
 		/**	Point d'accroche AJAX / AJAX listeners	*/
 		/**	Affichage du content de la commande / Display the order content	*/
-		add_action( 'wp_ajax_wps-pos-display-order-content', array(&$this, 'wps_pos_order_content' ) );
+		add_action('wp_ajax_wps-pos-display-order-content', array(&$this, 'wps_pos_order_content'));
 		/**	Affichage du formulaire de finalisation de la commande / Display order finalization form	*/
-		add_action( 'wp_ajax_wpspos-finalize-order', array( &$this, 'wps_pos_finalize_order' ) );
+		add_action('wp_ajax_wpspos-finalize-order', array(&$this, 'wps_pos_finalize_order'));
 		/**	Save order into database	*/
-		add_action( 'wp_ajax_wpspos-finish-order', array( &$this, 'wps_pos_process_checkout' ) );
+		add_action('wp_ajax_wpspos-finish-order', array(&$this, 'wps_pos_process_checkout'));
 	}
 
 	/**
@@ -39,14 +39,14 @@ 
 		/**	Create metaboxes for left side	*/
 
 		/**	Create metaboxes for right side	*/
-		add_meta_box( 'wpspos-dashboard-order-metabox', '<span class="dashicons dashicons-cart"></span> ' . __( 'Order summary', 'wps-pos-i18n' ), array( $this, 'dashboard_order_metabox' ), 'wpspos-dashboard', 'wpspos-dashboard-right' );
+		add_meta_box('wpspos-dashboard-order-metabox', '<span class="dashicons dashicons-cart"></span> ' . __('Order summary', 'wps-pos-i18n'), array($this, 'dashboard_order_metabox'), 'wpspos-dashboard', 'wpspos-dashboard-right');
 	}
 
 	/**
 	 * WP CUSTOM METABOX - Display a custom metabox for order summary output
 	 */
 	function dashboard_order_metabox() {
-		require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/order', 'metabox', 'order' ) );
+		require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/order', 'metabox', 'order'));
 	}
 
 	/**
@@ -61,32 +61,32 @@ 
 		$result = $selected_variation_list = '';
 		$price_piloting_option = get_option('wpshop_shop_price_piloting');
 
-		$order_id = ( !empty( $_POST['order_id'] ) ) ? (int) $_POST['order_id'] : null;
+		$order_id = (!empty($_POST['order_id'])) ? (int)$_POST['order_id'] : null;
 
-		if ( !empty( $_SESSION['cart'] ) || isset( $order_id ) ) {
+		if (!empty($_SESSION['cart']) || isset($order_id)) {
 			/* if ( empty( $_SESSION[ 'cart' ][ 'customer_id' ]) ) {
 				$result = __( 'No customer selected for the order, please choose a customer from left hand side list for continue this order', 'wps-pos-i18n' );
 			}
 			else  */
-			if( isset( $order_id ) ) {
-				$order = get_post_meta( $order_id, '_order_postmeta', true );
+			if (isset($order_id)) {
+				$order = get_post_meta($order_id, '_order_postmeta', true);
 
 				/**	Get current order content	*/
 				$cart_content = $order;
 				$order_items = $order['order_items'];
 
 				/**	In case there are item into order, include the order content display	*/
-				require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/order', 'order', 'content' ) );
-			} elseif ( !empty( $_SESSION['cart']['order_items'] ) ) {
+				require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/order', 'order', 'content'));
+			} elseif (!empty($_SESSION['cart']['order_items'])) {
 				/**	Get current order content	*/
 				$cart_content = $_SESSION['cart'];
 				$order_items = $cart_content['order_items'];
 
 				/**	In case there are item into order, include the order content display	*/
-				require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/order', 'order', 'content' ) );
+				require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/order', 'order', 'content'));
 			}
 			else {
-				$result = __( 'The order is currently empty', 'wps-pos-i18n' );
+				$result = __('The order is currently empty', 'wps-pos-i18n');
 			}
 		}
 
@@ -97,32 +97,32 @@ 
 	 * AJAX - Affiche le contenu de la commande actuelle / Display current order content
 	 */
 	function wps_pos_order_content() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_pos_order_content' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_pos_order_content'))
 			wp_die();
 
-		wp_die( $this->display_wps_pos_order_content() );
+		wp_die($this->display_wps_pos_order_content());
 	}
 
 	/**
 	 * AJAX - Affiche l'interface de finalisation de commande
 	 */
 	function wps_pos_finalize_order() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_pos_finalize_order' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_pos_finalize_order'))
 			wp_die();
 
 		/**	Get current order content	*/
-		$current_order_id = ( !empty( $_GET ) && !empty( $_GET[ 'order_id' ] ) && is_int( (int)$_GET[ 'order_id' ] ) ) ? (int)$_GET[ 'order_id' ] : null;
-		if ( !empty( $current_order_id) ) {
-			$cart_content = get_post_meta( $current_order_id, '_order_postmeta', true );
+		$current_order_id = (!empty($_GET) && !empty($_GET['order_id']) && is_int((int)$_GET['order_id'])) ? (int)$_GET['order_id'] : null;
+		if (!empty($current_order_id)) {
+			$cart_content = get_post_meta($current_order_id, '_order_postmeta', true);
 		}
-		elseif( !empty( $_SESSION['cart']['order_items'] ) ) {
+		elseif (!empty($_SESSION['cart']['order_items'])) {
 			$cart_content = $_SESSION['cart'];
 		}
-		if( !empty( $cart_content['order_items'] ) ) {
+		if (!empty($cart_content['order_items'])) {
 			$order_items = $cart_content['order_items'];
 
 			/* if( !empty($_SESSION['wpspos_is_receipt']) || !empty($_SESSION['wpspos_is_quotation']) ) {
@@ -134,12 +134,12 @@ 
 				require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/order', 'finalization-no_receipt' ) );
 			} else { */
 				/**	In case there are item into order, include the order content display	*/
-				require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/order', 'finalization' ) );
+				require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/order', 'finalization'));
 			// }
 
 		}
 		else {
-			$result = __( 'The order is currently empty', 'wps-pos-i18n' );
+			$result = __('The order is currently empty', 'wps-pos-i18n');
 		}
 		wp_die();
 	}
@@ -148,49 +148,49 @@ 
 	 * AJAX - Traite la commande / Process checkout
 	 */
 	function wps_pos_process_checkout() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_pos_process_checkout' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_pos_process_checkout'))
 			wp_die();
 
 		$status = false;
 		$output = $message = '';
 
-		$order_id = ( !empty( $_POST['order_id'] ) ) ? (int) $_POST['order_id'] : null;
-		$new_order = empty( $order_id );
-		$payment_method = ( !empty( $_POST['wpspos-payment-method']) ) ? sanitize_text_field( $_POST['wpspos-payment-method'] ) : null;
-		$customer_id = ( !empty( $_POST['customer_id'] ) ) ? (int) $_POST['customer_id'] : ( !empty( $_SESSION[ 'cart' ][ 'customer_id' ] ) ) ? (int) $_SESSION[ 'cart' ][ 'customer_id' ] : null;
-		$payment_amount = ( !empty( $_POST['wps-pos-total-order-amount'] ) ) ? wpshop_tools::varSanitizer( $_POST['wps-pos-total-order-amount'] ) : null;
-		$received_payment_amount = ( !empty( $_POST['wpspos-order-received-amount'] ) ) ? wpshop_tools::varSanitizer( $_POST['wpspos-order-received-amount'] ) : $payment_amount;
+		$order_id = (!empty($_POST['order_id'])) ? (int)$_POST['order_id'] : null;
+		$new_order = empty($order_id);
+		$payment_method = (!empty($_POST['wpspos-payment-method'])) ? sanitize_text_field($_POST['wpspos-payment-method']) : null;
+		$customer_id = (!empty($_POST['customer_id'])) ? (int)$_POST['customer_id'] : (!empty($_SESSION['cart']['customer_id'])) ? (int)$_SESSION['cart']['customer_id'] : null;
+		$payment_amount = (!empty($_POST['wps-pos-total-order-amount'])) ? wpshop_tools::varSanitizer($_POST['wps-pos-total-order-amount']) : null;
+		$received_payment_amount = (!empty($_POST['wpspos-order-received-amount'])) ? wpshop_tools::varSanitizer($_POST['wpspos-order-received-amount']) : $payment_amount;
 
-		if ( !empty( $customer_id ) ) {
-				if ( empty($order_id) && !empty( $payment_method ) ) {
+		if (!empty($customer_id)) {
+				if (empty($order_id) && !empty($payment_method)) {
 					$_SESSION['shipping_method'] = 'default_shipping_mode_for_pos';
-					$order_id = wpshop_checkout::process_checkout( $payment_method, '', $customer_id, $_SESSION['billing_address'], $_SESSION['shipping_address']);
-					wp_update_post( array('ID' => $order_id, 'post_parent' => get_current_user_id() ) );
+					$order_id = wpshop_checkout::process_checkout($payment_method, '', $customer_id, $_SESSION['billing_address'], $_SESSION['shipping_address']);
+					wp_update_post(array('ID' => $order_id, 'post_parent' => get_current_user_id()));
 				}
 
-				if ( !empty( $order_id ) ) {
+				if (!empty($order_id)) {
 					$status = true;
 
-					if ( !empty( $received_payment_amount ) /* && empty($_SESSION['wpspos_is_quotation']) && empty($_SESSION['wpspos_is_receipt']) */ ) {
+					if (!empty($received_payment_amount) /* && empty($_SESSION['wpspos_is_quotation']) && empty($_SESSION['wpspos_is_receipt']) */) {
 						$params_array = array(
 							'method' 			=> $payment_method,
 							'waited_amount' 	=> $payment_amount,
-							'status' 			=> 'payment_received' ,
+							'status' 			=> 'payment_received',
 							'author' 			=> $customer_id,
 							'payment_reference' => '',
 							'date' 				=> current_time('mysql', 0),
-							'received_amount' 	=> ( ( 'money' == $payment_method ) && ( number_format( (float)$received_payment_amount, 2, '.', '') > number_format( (float)$payment_amount, 2, '.', '') ) ) ? $payment_amount : $received_payment_amount ,
+							'received_amount' 	=> (('money' == $payment_method) && (number_format((float)$received_payment_amount, 2, '.', '') > number_format((float)$payment_amount, 2, '.', ''))) ? $payment_amount : $received_payment_amount,
 						);
-						wpshop_payment::check_order_payment_total_amount( $order_id, $params_array, 'completed' );
+						wpshop_payment::check_order_payment_total_amount($order_id, $params_array, 'completed');
 					}
 
 					/**	Get order content	*/
-					$order_postmeta = get_post_meta( $order_id, '_order_postmeta', true );
+					$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 
 					ob_start();
-					require_once( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/order', 'order', 'complete') );
+					require_once(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/order', 'order', 'complete'));
 					$output = ob_get_contents();
 					ob_end_clean();
 
@@ -200,10 +200,10 @@ 
 						$wps_cart->empty_cart();
 					}*/
 
-					$message = __( 'Order have been saved', 'wps-pos-i18n' );
+					$message = __('Order have been saved', 'wps-pos-i18n');
 				}
 				else {
-					$message = __( 'No order have been found', 'wps-pos-i18n' );
+					$message = __('No order have been found', 'wps-pos-i18n');
 				}
 			/*}
 			else {
@@ -211,10 +211,10 @@ 
 			}*/
 		}
 		else {
-			$message = __( 'No customer has been selected for current order', 'wps-pos-i18n' );
+			$message = __('No customer has been selected for current order', 'wps-pos-i18n');
 		}
 
-		wp_die( json_encode( array( 'status' => $status, 'output' => $output, 'message' => $message, ) ) );
+		wp_die(json_encode(array('status' => $status, 'output' => $output, 'message' => $message,)));
 	}
 
 }

Braces +17 added lines, -17 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Main controller file for product into point of sale management plugin
  *
@@ -84,8 +86,7 @@ 
 
 				/**	In case there are item into order, include the order content display	*/
 				require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/order', 'order', 'content' ) );
-			}
-			else {
+			} else {
 				$result = __( 'The order is currently empty', 'wps-pos-i18n' );
 			}
 		}
@@ -99,8 +100,9 @@ 
 	function wps_pos_order_content() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_pos_order_content' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_pos_order_content' ) ) {
+					wp_die();
+		}
 
 		wp_die( $this->display_wps_pos_order_content() );
 	}
@@ -111,15 +113,15 @@ 
 	function wps_pos_finalize_order() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_pos_finalize_order' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_pos_finalize_order' ) ) {
+					wp_die();
+		}
 
 		/**	Get current order content	*/
 		$current_order_id = ( !empty( $_GET ) && !empty( $_GET[ 'order_id' ] ) && is_int( (int)$_GET[ 'order_id' ] ) ) ? (int)$_GET[ 'order_id' ] : null;
 		if ( !empty( $current_order_id) ) {
 			$cart_content = get_post_meta( $current_order_id, '_order_postmeta', true );
-		}
-		elseif( !empty( $_SESSION['cart']['order_items'] ) ) {
+		} elseif( !empty( $_SESSION['cart']['order_items'] ) ) {
 			$cart_content = $_SESSION['cart'];
 		}
 		if( !empty( $cart_content['order_items'] ) ) {
@@ -137,8 +139,7 @@ 
 				require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/order', 'finalization' ) );
 			// }
 
-		}
-		else {
+		} else {
 			$result = __( 'The order is currently empty', 'wps-pos-i18n' );
 		}
 		wp_die();
@@ -150,8 +151,9 @@ 
 	function wps_pos_process_checkout() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_pos_process_checkout' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_pos_process_checkout' ) ) {
+					wp_die();
+		}
 
 		$status = false;
 		$output = $message = '';
@@ -201,16 +203,14 @@ 
 					}*/
 
 					$message = __( 'Order have been saved', 'wps-pos-i18n' );
-				}
-				else {
+				} else {
 					$message = __( 'No order have been found', 'wps-pos-i18n' );
 				}
 			/*}
 			else {
 				$message = __( 'Please choose a payment method for order', 'wps-pos-i18n' );
 			}*/
-		}
-		else {
+		} else {
 			$message = __( 'No customer has been selected for current order', 'wps-pos-i18n' );
 		}
 

includes/modules/wps-pos-addon/controller/wps-pos-customer.ctr.php

Spacing +96 added lines, -96 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Fichier du controlleur pour le module client du logiciel de caisse pour WP-Shop / Main controller file for customer into point of sale management plugin
  *
@@ -25,16 +25,16 @@ 
 		$this->users = get_users();
 
 		/**	Call dashboard metaboxes	*/
-		add_action( 'admin_init', array( $this, 'dashboard_metaboxes' ) );
+		add_action('admin_init', array($this, 'dashboard_metaboxes'));
 
 		/**	Hook wordpress user search	*/
-		add_action( 'pre_user_query', array( $this, 'extended_user_search' ) );
+		add_action('pre_user_query', array($this, 'extended_user_search'));
 
 		/**	Point d'accroche AJAX / AJAX listeners	*/
 		/**	Choix d'un utilisateur comme propriatiare de la commande en cours / Set a customer as order owner	*/
-		add_action( 'wp_ajax_wpspos_set_customer_order', array( $this, 'ajax_pos_customer_choice' ) );
+		add_action('wp_ajax_wpspos_set_customer_order', array($this, 'ajax_pos_customer_choice'));
 		/**	Recherche parmis les utilisateurs existants / search into existing user list	*/
-		add_action( 'wp_ajax_wpspos-customer-search', array( $this, 'ajax_pos_customer_search' ) );
+		add_action('wp_ajax_wpspos-customer-search', array($this, 'ajax_pos_customer_search'));
 	}
 
 	/**
@@ -42,12 +42,12 @@ 
 	 *
 	 * @param WP_Object $user_query L'objet contenant la requête actuelle de recherche de client / Current user query
 	 */
-	function extended_user_search ( $user_query ) {
+	function extended_user_search($user_query) {
 		global $wps_pos_addon_menu;
 		$screen = get_current_screen();
 
-		if ( !empty( $screen ) && !empty( $screen->id ) && $screen->id == $wps_pos_addon_menu ) {
-			$user_query->query_where = str_replace( "AND (user_login LIKE", "OR (user_login LIKE", $user_query->query_where );
+		if (!empty($screen) && !empty($screen->id) && $screen->id == $wps_pos_addon_menu) {
+			$user_query->query_where = str_replace("AND (user_login LIKE", "OR (user_login LIKE", $user_query->query_where);
 		}
 	}
 
@@ -67,10 +67,10 @@ 
 
 		/**	Create metaboxes for right side	*/
 		ob_start();
-		require_once( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/customers', 'metabox_title', 'selected' ) );
+		require_once(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/customers', 'metabox_title', 'selected'));
 		$metabox_title = ob_get_contents();
 		ob_end_clean();
-		add_meta_box( 'wpspos-dashboard-order-customer-metabox', $metabox_title, array( $this, 'metabox_customer' ), 'wpspos-dashboard', 'wpspos-dashboard-right' );
+		add_meta_box('wpspos-dashboard-order-customer-metabox', $metabox_title, array($this, 'metabox_customer'), 'wpspos-dashboard', 'wpspos-dashboard-right');
 	}
 
 	/**
@@ -80,14 +80,14 @@ 
 	 *
 	 * @return array La liste des utilisateurs correspondant à la lettre donnée / The customer list corresponding to given letter
 	 */
-	function get_customer_by_alphabet( $letter ) {
+	function get_customer_by_alphabet($letter) {
 		$users_list = array();
 
 		/** Get the default customer **/
-		$default_customer_option = get_option( 'wpshop_pos_addon_default_customer_id' );
-		if ( !empty($default_customer_option) ) {
+		$default_customer_option = get_option('wpshop_pos_addon_default_customer_id');
+		if (!empty($default_customer_option)) {
 			$default_user = get_user_by('id', $default_customer_option);
-			if ( !empty($default_user) ) {
+			if (!empty($default_user)) {
 				$user_infos = array(
 					'ID' => $default_user->ID,
 					'last_name' => get_user_meta($default_user->ID, 'last_name', true),
@@ -98,28 +98,28 @@ 
 			}
 		}
 
-		if ( !empty($letter) ) {
-			foreach ( $this->users as $user ) {
-				if ( !empty( $user ) && !empty( $user->roles ) && !empty( $user->roles[0] ) && ( $user->roles[0] != 'Administrator' ) ) {
+		if (!empty($letter)) {
+			foreach ($this->users as $user) {
+				if (!empty($user) && !empty($user->roles) && !empty($user->roles[0]) && ($user->roles[0] != 'Administrator')) {
 					$user_infos = array();
 
 					/** Check the username, if last name and first name are empty we select email **/
-					$last_name_meta = get_user_meta( $user->ID, 'last_name', true);
-					$first_name_meta = get_user_meta( $user->ID, 'first_name', true);
+					$last_name_meta = get_user_meta($user->ID, 'last_name', true);
+					$first_name_meta = get_user_meta($user->ID, 'first_name', true);
 					$user_data = $user->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 {
 						$user_name = $email_data;
 					}
 
-					if ( $letter == __('ALL', 'wps-pos-i18n') || (strtolower(substr($user_name, 0, 1)) == strtolower($letter) && $user_name != __('Default', 'wps-pos-i18n') ) ) {
+					if ($letter == __('ALL', 'wps-pos-i18n') || (strtolower(substr($user_name, 0, 1)) == strtolower($letter) && $user_name != __('Default', 'wps-pos-i18n'))) {
 						$user_infos = array(
 							'ID' => $user->ID,
 							'last_name' => $last_name_meta,
@@ -142,16 +142,16 @@ 
 	 *
 	 * @return string La liste des utilisateurs sous forme HTML / HTML output for customer list
 	 */
-	function display_customer_list( $letter ) {
+	function display_customer_list($letter) {
 		$output = '';
 
-		if ( !empty($letter) ) {
-			$customer_list = $this->get_customer_by_alphabet( $letter);
+		if (!empty($letter)) {
+			$customer_list = $this->get_customer_by_alphabet($letter);
 			$tpl_component = array();
 			$element = '';
-			if ( !empty($customer_list) ) {
+			if (!empty($customer_list)) {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/customers', 'customers' ) );
+				require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/customers', 'customers'));
 				$output = ob_get_contents();
 				ob_end_clean();
 			}
@@ -165,19 +165,19 @@ 
 	 * @param integer $customer_id
 	 * @return integer billing address ID
 	 */
-	function check_customer_billing_address( $customer_id ) {
+	function check_customer_billing_address($customer_id) {
 		global $wpdb;
 		$billing_address_id = 0;
 		$billing_option = get_option('wpshop_billing_address');
-		if ( !empty($customer_id) ) {
-			$query = $wpdb->prepare('SELECT * FROM '.$wpdb->posts .' WHERE post_author = %d AND post_type = %s', $customer_id, WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS);
-			$customer_addresses = $wpdb->get_results( $query );
-			if ( !empty($customer_addresses) && is_array($customer_addresses) ) {
-				if (!empty($billing_option) && !empty($billing_option['choice']) ) {
+		if (!empty($customer_id)) {
+			$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s', $customer_id, WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS);
+			$customer_addresses = $wpdb->get_results($query);
+			if (!empty($customer_addresses) && is_array($customer_addresses)) {
+				if (!empty($billing_option) && !empty($billing_option['choice'])) {
 					$billing_address_entity_id = $billing_option['choice'];
-					foreach( $customer_addresses as $customer_address ) {
+					foreach ($customer_addresses as $customer_address) {
 						$address_post_meta = get_post_meta($customer_address->ID, '_wpshop_address_attribute_set_id', true);
-						if ( $address_post_meta == $billing_address_entity_id ) {
+						if ($address_post_meta == $billing_address_entity_id) {
 							$billing_address_id = $customer_address->ID;
 							continue;
 						}
@@ -202,9 +202,9 @@ 
 					'post_parent' => $customer_id,
 					'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS,
 				);
-				$billing_address_id = wp_insert_post( $address_post );
-				update_post_meta( $billing_address_id, '_wpshop_address_metadata', $billing_address);
-				update_post_meta($billing_address_id, '_wpshop_address_attribute_set_id', $billing_option['choice'] );
+				$billing_address_id = wp_insert_post($address_post);
+				update_post_meta($billing_address_id, '_wpshop_address_metadata', $billing_address);
+				update_post_meta($billing_address_id, '_wpshop_address_attribute_set_id', $billing_option['choice']);
 			}
 		}
 		return $billing_address_id;
@@ -215,11 +215,11 @@ 
 	 * @param integer $customer_id
 	 * @return array of objects order
 	 */
-	function get_orders_customer( $per_page, $customer_id ) {
-		if( !isset( $this->wps_orders_customer ) ) {
+	function get_orders_customer($per_page, $customer_id) {
+		if (!isset($this->wps_orders_customer)) {
 			$this->wps_orders_customer = array();
 		}
-		if( !isset( $this->wps_orders_customer[$customer_id] ) ) {
+		if (!isset($this->wps_orders_customer[$customer_id])) {
 			$args = array(
 					'posts_per_page' 	=> $per_page,
 					'post_type'			=> WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
@@ -228,28 +228,28 @@ 
 						'relation' 			=> 'AND',
 						array(
 								'key' 			=> '_order_postmeta',
-								'value' 		=> serialize( 'customer_id' ) . serialize( $customer_id ),
+								'value' 		=> serialize('customer_id') . serialize($customer_id),
 								'compare' 		=> 'LIKE',
 						),
 						array(
 							'relation' 			=> 'OR',
 							array(
 									'key'			=> '_order_postmeta',
-									'value' 		=> serialize( 'order_status' ) . serialize( 'pos' ),
+									'value' 		=> serialize('order_status') . serialize('pos'),
 									'compare' 		=> 'LIKE',
 							),
 							array(
 									'key'			=> '_order_postmeta',
-									'value' 		=> serialize( 'shipping_method' ) . serialize( 'default_shipping_mode_for_pos' ),
+									'value' 		=> serialize('shipping_method') . serialize('default_shipping_mode_for_pos'),
 									'compare' 		=> 'LIKE',
 							),
 						),
 					),
 			);
-			$query = new WP_Query( $args );
+			$query = new WP_Query($args);
 			$orders = $query->posts;
-			foreach( $orders as $order ) {
-				$order->_order_postmeta = get_post_meta( $order->ID, '_order_postmeta', true );
+			foreach ($orders as $order) {
+				$order->_order_postmeta = get_post_meta($order->ID, '_order_postmeta', true);
 			}
 			$this->wps_orders_customer[$customer_id] = $orders;
 		}
@@ -262,20 +262,20 @@ 
 	function metabox_customers() {
 		global $wpdb;
 
-		$available_letters = array();//$wpdb->get_var( $query );
+		$available_letters = array(); //$wpdb->get_var( $query );
 
 		/**	Check the first letter available for product to choose the good one when displaying default interface	*/
-		$letters_having_customers = array();//array_unique( explode( ',', $available_letters ) );
-		sort( $letters_having_customers );
+		$letters_having_customers = array(); //array_unique( explode( ',', $available_letters ) );
+		sort($letters_having_customers);
 
-		require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/customers', 'metabox', 'customers' ) );
+		require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/customers', 'metabox', 'customers'));
 	}
 
 	/**
 	 * WP CUSTOM METABOX - Affichage de la boite contant les informations du client sélectionné pour la commande / Display the metabox for displaying the selected customer for current order
 	 */
 	function metabox_customer() {
-		require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/customers', 'metabox', 'customer' ) );
+		require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/customers', 'metabox', 'customer'));
 	}
 
 	/**
@@ -283,27 +283,27 @@ 
 	 *
 	 * @param integer $customer_id L'identifiant du client que l'on souhaite afficher / The customer identifier that we want to display sumary for
 	 */
-	function display_selected_customer( $customer_id ) {
+	function display_selected_customer($customer_id) {
 		/**	Récupération des données de l'utilisateur / Get selected user account informations	*/
-		$customer_infos = get_userdata( (int) $customer_id );
+		$customer_infos = get_userdata((int)$customer_id);
 
-		$_SESSION[ 'wps-pos-addon' ] = 1;
+		$_SESSION['wps-pos-addon'] = 1;
 
-		$_SESSION[ 'billing_address' ] = $this->check_customer_billing_address( $customer_id );
-		$shipping_address_id = get_option( 'wpshop_pos_addon_shop_address' );
-		$_SESSION[ 'shipping_address' ] = ( !empty($shipping_address_id) && sanitize_key( $shipping_address_id ) ) ? $shipping_address_id : '';
+		$_SESSION['billing_address'] = $this->check_customer_billing_address($customer_id);
+		$shipping_address_id = get_option('wpshop_pos_addon_shop_address');
+		$_SESSION['shipping_address'] = (!empty($shipping_address_id) && sanitize_key($shipping_address_id)) ? $shipping_address_id : '';
 
 		/**	Inclusion du fichier d'affichage / Include the display file	*/
-		require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/customers', 'metabox-selected', 'customer' ) );
+		require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/customers', 'metabox-selected', 'customer'));
 	}
 
 	/**
 	 * AJAX - Selection et affectation du client à la commande en cours / Set selected user as new order owner
 	 */
 	function ajax_pos_customer_choice() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_pos_customer_choice' ) )
+		if (!wp_verify_nonce($_wpnonce, 'ajax_pos_customer_choice'))
 			wp_die();
 
 		$response = array(
@@ -311,42 +311,42 @@ 
 			'element_type'	=> 'customer',
 			'output'		=> '',
 		);
-		$selected_customer = ( !empty( $_POST ) && !empty( $_POST[ 'customer' ] ) && is_int( (int) $_POST[ 'customer' ] ) ) ? (int) $_POST[ 'customer' ] : null;
+		$selected_customer = (!empty($_POST) && !empty($_POST['customer']) && is_int((int)$_POST['customer'])) ? (int)$_POST['customer'] : null;
 
-		if ( !empty( $selected_customer ) ) {
-			$_SESSION[ 'cart' ][ 'customer_id' ] = $selected_customer;
-			$response[ 'status' ] = true;
+		if (!empty($selected_customer)) {
+			$_SESSION['cart']['customer_id'] = $selected_customer;
+			$response['status'] = true;
 
 			/**	Affichage du client sélectionné pour la commande courante / Display selected customer account summary	*/
 			ob_start();
-			$this->display_selected_customer( $selected_customer );
-			$response[ 'output' ] = ob_get_contents();
+			$this->display_selected_customer($selected_customer);
+			$response['output'] = ob_get_contents();
 			ob_end_clean();
 		}
 		else {
-			$response[ 'output' ] = __( 'No customer has been selected, please choose a customer or create a new one before try to create a new order', 'wps-pos-i18n' );
+			$response['output'] = __('No customer has been selected, please choose a customer or create a new one before try to create a new order', 'wps-pos-i18n');
 		}
 
-		wp_die( json_encode( $response ) );
+		wp_die(json_encode($response));
 	}
 
 	/**
 	 * AJAX - Recherche dans la liste des clients du site / Search into website customer list
 	 */
 	function ajax_pos_customer_search() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_pos_customer_search' ) )
+		if (!wp_verify_nonce($_wpnonce, 'ajax_pos_customer_search'))
 			wp_die();
 
 		global $wpdb;
-		$term = ( !empty( $_POST['term'] ) ) ? sanitize_text_field( $_POST['term'] ) : '';
+		$term = (!empty($_POST['term'])) ? sanitize_text_field($_POST['term']) : '';
 
 		/** Get the default customer **/
-		$default_customer_option = get_option( 'wpshop_pos_addon_default_customer_id' );
-		if ( !empty($default_customer_option) ) {
+		$default_customer_option = get_option('wpshop_pos_addon_default_customer_id');
+		if (!empty($default_customer_option)) {
 			$default_user = get_user_by('id', $default_customer_option);
-			if ( !empty($default_user) ) {
+			if (!empty($default_user)) {
 				$user_infos = array(
 					'ID' => $default_user->ID,
 					'last_name' => get_user_meta($default_user->ID, 'last_name', true),
@@ -357,11 +357,11 @@ 
 			}
 		}
 
-		if ( false ) {
+		if (false) {
 			/**	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',
@@ -377,19 +377,19 @@ 
 					),
 				),
 			);
-			$customer_search = new WP_User_Query( $args );
-			if ( !empty($customer_search->results) ) {
-				foreach ( $customer_search->results as $customer ) {
+			$customer_search = new WP_User_Query($args);
+			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 {
@@ -407,7 +407,7 @@ 
 		}
 		else {
 			/**	Build the customer search	*/
-			$query = $wpdb->prepare( "
+			$query = $wpdb->prepare("
 				SELECT *
 				FROM {$wpdb->users} AS U
 					LEFT JOIN {$wpdb->usermeta} AS UM ON ( UM.user_id = U.ID )
@@ -424,20 +424,20 @@ 
 						AND UM.meta_value LIKE '%%%s%%'
 					)
 				GROUP BY U.ID
-			", array( $term, $term, $term, $term, $term, ) );
-			$customer_search = $wpdb->get_results( $query );
-			if ( !empty( $customer_search ) ) {
-				foreach ( $customer_search as $customer ) {
+			", array($term, $term, $term, $term, $term,));
+			$customer_search = $wpdb->get_results($query);
+			if (!empty($customer_search)) {
+				foreach ($customer_search 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);
-					$user_data = get_userdata( $customer->ID );
+					$last_name_meta = get_user_meta($customer->ID, 'last_name', true);
+					$first_name_meta = get_user_meta($customer->ID, 'first_name', true);
+					$user_data = get_userdata($customer->ID);
 					$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 {
@@ -456,11 +456,11 @@ 
 
 		/**	Display the customer list into metabox	*/
 		ob_start();
-		require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/customers', 'customers' ) );
+		require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/customers', 'customers'));
 		$output = ob_get_contents();
 		ob_end_clean();
 
-		wp_die( $output );
+		wp_die($output);
 	}
 
 }

Braces +18 added lines, -23 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier du controlleur pour le module client du logiciel de caisse pour WP-Shop / Main controller file for customer into point of sale management plugin
  *
@@ -111,11 +113,9 @@ 
 
 					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 {
+					} else {
 						$user_name = $email_data;
 					}
 
@@ -183,8 +183,7 @@ 
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				/** Create a billing address for this customer **/
 				$user_infos = get_user_by('id', $customer_id);
 				$billing_address = array();
@@ -303,8 +302,9 @@ 
 	function ajax_pos_customer_choice() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_pos_customer_choice' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'ajax_pos_customer_choice' ) ) {
+					wp_die();
+		}
 
 		$response = array(
 			'status'		=> false,
@@ -322,8 +322,7 @@ 
 			$this->display_selected_customer( $selected_customer );
 			$response[ 'output' ] = ob_get_contents();
 			ob_end_clean();
-		}
-		else {
+		} else {
 			$response[ 'output' ] = __( 'No customer has been selected, please choose a customer or create a new one before try to create a new order', 'wps-pos-i18n' );
 		}
 
@@ -336,8 +335,9 @@ 
 	function ajax_pos_customer_search() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_pos_customer_search' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'ajax_pos_customer_search' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$term = ( !empty( $_POST['term'] ) ) ? sanitize_text_field( $_POST['term'] ) : '';
@@ -388,11 +388,9 @@ 
 
 					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 {
+					} else {
 						$user_name = $email_data;
 					}
 
@@ -404,8 +402,7 @@ 
 					);
 				}
 			}
-		}
-		else {
+		} else {
 			/**	Build the customer search	*/
 			$query = $wpdb->prepare( "
 				SELECT *
@@ -436,11 +433,9 @@ 
 
 					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 {
+					} else {
 						$user_name = $email_data;
 					}
 

includes/modules/wps-pos-addon/controller/wps-pos-product.ctr.php

Spacing +72 added lines, -72 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Main controller file for product into point of sale management plugin
  *
@@ -19,15 +19,15 @@ 
 	 */
 	function __construct() {
 		/**	Call dashboard metaboxes	*/
-		add_action( 'admin_init', array( $this, 'dashboard_metaboxes' ) );
+		add_action('admin_init', array($this, 'dashboard_metaboxes'));
 
 		/**	Point d'accroche AJAX / AJAX listeners	*/
 		/**	Vérification du type de produit avant ajout au panier / Check the product type before adding it into cart	*/
 		//add_action( 'wap_ajax_wps-pos-product-check-type', array( $this, 'ajax_pos_check_product_type' ) );
 		/**	Affiche le formulaire permettant de sélectionner la déclinaison du produit / Display the form allowing to choose product variation	*/
-		add_action( 'wp_ajax_wps-pos-product-variation-selection', array( $this, 'ajax_pos_product_variation_selection' ) );
+		add_action('wp_ajax_wps-pos-product-variation-selection', array($this, 'ajax_pos_product_variation_selection'));
 		/**	Lance la recherche de produit / Launch product search	*/
-		add_action( 'wp_ajax_wpspos-product-search', array( $this, 'ajax_pos_product_search' ) );
+		add_action('wp_ajax_wpspos-product-search', array($this, 'ajax_pos_product_search'));
 	}
 
 	/**
@@ -38,10 +38,10 @@ 
 
 		/**	Create metaboxes for left side	*/
 		ob_start();
-		require_once( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'metabox_title', 'list' ) );
+		require_once(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'metabox_title', 'list'));
 		$metabox_title = ob_get_contents();
 		ob_end_clean();
-		add_meta_box( 'wpspos-dashboard-product-metabox', $metabox_title, array( $this, 'dashboard_product_metabox' ), 'wpspos-dashboard', 'wpspos-dashboard-left' );
+		add_meta_box('wpspos-dashboard-product-metabox', $metabox_title, array($this, 'dashboard_product_metabox'), 'wpspos-dashboard', 'wpspos-dashboard-left');
 
 		/**	Create metaboxes for right side	*/
 	}
@@ -53,14 +53,14 @@ 
 		global $wpdb;
 
 		/**	Get existing product first letter to only display letter with product as selectable	*/
-		$query = $wpdb->prepare( "SELECT GROUP_CONCAT( LEFT( UPPER( post_title ), 1 ) ) AS LETTER FROM {$wpdb->posts} WHERE post_type = %s AND post_status = %s", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish' );
-		$available_letters = $wpdb->get_var( $query );
+		$query = $wpdb->prepare("SELECT GROUP_CONCAT( LEFT( UPPER( post_title ), 1 ) ) AS LETTER FROM {$wpdb->posts} WHERE post_type = %s AND post_status = %s", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish');
+		$available_letters = $wpdb->get_var($query);
 
 		/**	Check the first letter available for product to choose the good one when displaying default interface	*/
-		$letters_having_products = array_unique( explode( ',', $available_letters ) );
-		sort( $letters_having_products );
+		$letters_having_products = array_unique(explode(',', $available_letters));
+		sort($letters_having_products);
 
-		require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'metabox', 'product' ) );
+		require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'metabox', 'product'));
 	}
 
 	/**
@@ -68,15 +68,15 @@ 
 	 * @param char $letter
 	 * @return string
 	 */
-	function get_product_table_by_alphabet( $letter ) {
+	function get_product_table_by_alphabet($letter) {
 		$output = '';
 
-		if ( !empty($letter) ) {
-			$product_list = $this->get_product_list_by_letter( $letter );
+		if (!empty($letter)) {
+			$product_list = $this->get_product_list_by_letter($letter);
 			$tpl_component = array();
-			if( !empty( $product_list ) ) {
+			if (!empty($product_list)) {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'products' ) );
+				require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'products'));
 				$output = ob_get_contents();
 				ob_end_clean();
 			}
@@ -92,27 +92,27 @@ 
 	 *
 	 * @return array The list of product correspondaing to given alphabet letter
 	 */
-	function get_product_list_by_letter( $letter ) {
+	function get_product_list_by_letter($letter) {
 		/** INI SET **/
-		@set_time_limit( 120 );
+		@set_time_limit(120);
 
 		$product_list = array();
 		global $wpdb;
-		$price_piloting_option = get_option( 'wpshop_shop_price_piloting' );
-		if ( !empty( $letter) ) {
+		$price_piloting_option = get_option('wpshop_shop_price_piloting');
+		if (!empty($letter)) {
 
-			if ( $letter == __('ALL', 'wps-pos-i18n') ) {
-				$query = $wpdb->prepare( "
+			if ($letter == __('ALL', 'wps-pos-i18n')) {
+				$query = $wpdb->prepare("
 					SELECT P.ID, 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_type = %s
 						AND P.post_status = %s
 						AND PM.meta_key = %s
-					ORDER BY P.post_title", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish', '_wpshop_product_metadata' );
+					ORDER BY P.post_title", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish', '_wpshop_product_metadata');
 			}
 			else {
-				$query = $wpdb->prepare( "
+				$query = $wpdb->prepare("
 					SELECT P.ID, P.post_title, PM.meta_value
 					FROM {$wpdb->posts} AS P
 						INNER JOIN {$wpdb->postmeta} AS PM ON ( PM.post_id = P.ID )
@@ -120,20 +120,20 @@ 
 						AND P.post_status = %s
 						AND ( post_title LIKE %s OR post_title LIKE %s )
 						AND PM.meta_key = %s
-					ORDER BY P.post_title", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish', strtoupper( $letter ).'%', strtolower( $letter).'%', '_wpshop_product_metadata' );
+					ORDER BY P.post_title", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish', strtoupper($letter) . '%', strtolower($letter) . '%', '_wpshop_product_metadata');
 			}
-			$products = $wpdb->get_results( $query );
+			$products = $wpdb->get_results($query);
 
-			if ( !empty( $products ) && is_array( $products ) ) {
-				foreach ( $products as $product ) {
-					$product_post_meta = unserialize( $product->meta_value );
-					if ( !empty($product_post_meta) ) {
+			if (!empty($products) && is_array($products)) {
+				foreach ($products as $product) {
+					$product_post_meta = unserialize($product->meta_value);
+					if (!empty($product_post_meta)) {
 						//$product_variation_definition = get_post_meta( $product->ID, '_wpshop_variation_defining', true );
 						$product_list[] = array(
 							'ID' => $product->ID,
 							'product_name' => $product->post_title,
-							'product_price' => !empty( $product_post_meta ) && !empty( $product_post_meta[ 'product_price' ] ) ? number_format( (float)$product_post_meta['product_price'], 2, '.', '') : '',
-							'product_barcode' => !empty( $product_post_meta['barcode'] ) ? $product_post_meta['barcode'] : ''
+							'product_price' => !empty($product_post_meta) && !empty($product_post_meta['product_price']) ? number_format((float)$product_post_meta['product_price'], 2, '.', '') : '',
+							'product_barcode' => !empty($product_post_meta['barcode']) ? $product_post_meta['barcode'] : ''
 						);
 					}
 				}
@@ -147,37 +147,37 @@ 
 	 * AJAX - Vérifie si le produit sur le point d'être ajouté à la commande est un produit simple ou un produit composé / Check if the selected produt is a simple one or a combined one
 	 */
 	function ajax_pos_check_product_type() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_pos_check_product_type' ) )
+		if (!wp_verify_nonce($_wpnonce, 'ajax_pos_check_product_type'))
 			wp_die();
 
 		$product_type = 'simple';
 
-		$product_id = ( !empty($_POST['product_id']) ) ? (int) $_POST['product_id'] : null;
-		if ( !empty($product_id) ) {
-			$product_post_meta = get_post_meta( $product_id, '_wpshop_variation_defining', true );
-			if ( !empty( $product_post_meta ) ) {
+		$product_id = (!empty($_POST['product_id'])) ? (int)$_POST['product_id'] : null;
+		if (!empty($product_id)) {
+			$product_post_meta = get_post_meta($product_id, '_wpshop_variation_defining', true);
+			if (!empty($product_post_meta)) {
 				$product_type = 'variations';
 			}
 		}
 
-		wp_die( json_encode( array( 'product_type' => $product_type, ) ) );
+		wp_die(json_encode(array('product_type' => $product_type,)));
 	}
 
 	/**
 	 * AJAX - Affiche le formulaire permettant de sélectionner la déclinaison du produit / Display the form allowing to choose product variation
 	 */
 	function ajax_pos_product_variation_selection() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_pos_product_variation_selection' ) )
+		if (!wp_verify_nonce($_wpnonce, 'ajax_pos_product_variation_selection'))
 			wp_die();
 
 		/**	Get the product identifier to display variation chooser	*/
-		$product_id = !empty( $_GET ) && !empty( $_GET[ 'product_id' ] ) && is_int( (int)$_GET[ 'product_id' ] ) ? (int)$_GET[ 'product_id' ] : null;
+		$product_id = !empty($_GET) && !empty($_GET['product_id']) && is_int((int)$_GET['product_id']) ? (int)$_GET['product_id'] : null;
 
-		require_once( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'modal', 'variation' ) );
+		require_once(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'modal', 'variation'));
 
 		wp_die();
 	}
@@ -186,19 +186,19 @@ 
 	 * AJAX - Lance la recherche de produit / Launch product search
 	 */
 	function ajax_pos_product_search() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_pos_product_search' ) )
+		if (!wp_verify_nonce($_wpnonce, 'ajax_pos_product_search'))
 			wp_die();
 
 		global $wpdb;
 
-		$term = !empty( $_POST ) && !empty( $_POST[ 'term' ] ) ? sanitize_text_field( $_POST[ 'term' ] ) : null;
+		$term = !empty($_POST) && !empty($_POST['term']) ? sanitize_text_field($_POST['term']) : null;
 		$response = array(
 			'status' => false,
 			'action' => '',
 		);
-		if ( !empty( $term ) ) {
+		if (!empty($term)) {
 
 			$more_query = "";
 			$query_args = array();
@@ -206,66 +206,66 @@ 
 			$query_args[] = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
 			$query_args[] = $term;
 
-			$search_in = !empty( $_POST[ 'search_in' ] ) ? sanitize_text_field( $_POST[ 'search_in' ] ) : '';
+			$search_in = !empty($_POST['search_in']) ? sanitize_text_field($_POST['search_in']) : '';
 
-			if ( empty( $search_in ) || ( 'only_barcode' != $search_in ) ) {
+			if (empty($search_in) || ('only_barcode' != $search_in)) {
 				$more_query = " OR P.post_title LIKE %s";
 				$query_args[] = '%' . $term . '%';
 			}
-			$query = $wpdb->prepare( "
+			$query = $wpdb->prepare("
 				SELECT *
 				FROM {$wpdb->posts} AS P
 					LEFT JOIN {$wpdb->postmeta} AS PM ON ( PM.post_id = P.ID )
 				WHERE P.post_type = %s
 					AND ( ( PM.meta_key = '_barcode' AND PM.meta_value = %s ) " . $more_query . " )
-				GROUP BY P.ID", $query_args );
-			$results = $wpdb->get_results( $query );
-
-			if ( !empty( $results ) ) {
-				if ( 1 < count( $results ) ) {
-					foreach ( $results as $product ) {
-						$product_post_meta = get_post_meta( $product->ID, '_wpshop_product_metadata', true );
-						if ( !empty($product_post_meta) ) {
+				GROUP BY P.ID", $query_args);
+			$results = $wpdb->get_results($query);
+
+			if (!empty($results)) {
+				if (1 < count($results)) {
+					foreach ($results as $product) {
+						$product_post_meta = get_post_meta($product->ID, '_wpshop_product_metadata', true);
+						if (!empty($product_post_meta)) {
 							$product_list[] = array(
 								'ID' => $product->ID,
 								'product_name' => $product->post_title,
-								'product_price' => number_format( (float)$product_post_meta['product_price'], 2, '.', ''),
-								'product_barcode' => !empty( $product_post_meta['barcode'] ) ? $product_post_meta['barcode'] : ''
+								'product_price' => number_format((float)$product_post_meta['product_price'], 2, '.', ''),
+								'product_barcode' => !empty($product_post_meta['barcode']) ? $product_post_meta['barcode'] : ''
 							);
 						}
 					}
 
 					ob_start();
-					require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'products' ) );
+					require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'products'));
 					$output = ob_get_contents();
 					ob_end_clean();
 				}
 				else {
-					$product_post_meta = get_post_meta( $results[ 0 ]->ID, '_wpshop_variation_defining', true );
-					if ( !empty( $product_post_meta ) ) {
-						$response[ 'action' ] = 'variation_selection';
+					$product_post_meta = get_post_meta($results[0]->ID, '_wpshop_variation_defining', true);
+					if (!empty($product_post_meta)) {
+						$response['action'] = 'variation_selection';
 					}
 					else {
-						$response[ 'action' ] = 'direct_to_cart';
+						$response['action'] = 'direct_to_cart';
 					}
-					$output = $results[ 0 ]->ID;
+					$output = $results[0]->ID;
 				}
 
 				/**	Build response to send	*/
-				$response[ 'status' ] = true;
-				$response[ 'output' ] = $output;
+				$response['status'] = true;
+				$response['output'] = $output;
 			}
 			else {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'product', 'not_found' ) );
-				$response[ 'output' ] = ob_get_contents();
+				require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'product', 'not_found'));
+				$response['output'] = ob_get_contents();
 				ob_end_clean();
 			}
 		}
 
-		$response['_wpnonce'] = wp_create_nonce( 'ajax_pos_product_variation_selection' );
+		$response['_wpnonce'] = wp_create_nonce('ajax_pos_product_variation_selection');
 
-		wp_die( json_encode( $response ) );
+		wp_die(json_encode($response));
 	}
 
 }

Braces +16 added lines, -15 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Main controller file for product into point of sale management plugin
  *
@@ -110,8 +112,7 @@ 
 						AND P.post_status = %s
 						AND PM.meta_key = %s
 					ORDER BY P.post_title", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish', '_wpshop_product_metadata' );
-			}
-			else {
+			} else {
 				$query = $wpdb->prepare( "
 					SELECT P.ID, P.post_title, PM.meta_value
 					FROM {$wpdb->posts} AS P
@@ -149,8 +150,9 @@ 
 	function ajax_pos_check_product_type() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_pos_check_product_type' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'ajax_pos_check_product_type' ) ) {
+					wp_die();
+		}
 
 		$product_type = 'simple';
 
@@ -171,8 +173,9 @@ 
 	function ajax_pos_product_variation_selection() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_pos_product_variation_selection' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'ajax_pos_product_variation_selection' ) ) {
+					wp_die();
+		}
 
 		/**	Get the product identifier to display variation chooser	*/
 		$product_id = !empty( $_GET ) && !empty( $_GET[ 'product_id' ] ) && is_int( (int)$_GET[ 'product_id' ] ) ? (int)$_GET[ 'product_id' ] : null;
@@ -188,8 +191,9 @@ 
 	function ajax_pos_product_search() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_pos_product_search' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'ajax_pos_product_search' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 
@@ -239,13 +243,11 @@ 
 					require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'products' ) );
 					$output = ob_get_contents();
 					ob_end_clean();
-				}
-				else {
+				} else {
 					$product_post_meta = get_post_meta( $results[ 0 ]->ID, '_wpshop_variation_defining', true );
 					if ( !empty( $product_post_meta ) ) {
 						$response[ 'action' ] = 'variation_selection';
-					}
-					else {
+					} else {
 						$response[ 'action' ] = 'direct_to_cart';
 					}
 					$output = $results[ 0 ]->ID;
@@ -254,8 +256,7 @@ 
 				/**	Build response to send	*/
 				$response[ 'status' ] = true;
 				$response[ 'output' ] = $output;
-			}
-			else {
+			} else {
 				ob_start();
 				require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'product', 'not_found' ) );
 				$response[ 'output' ] = ob_get_contents();

includes/modules/wps-pos-addon/modules/wps_customer_quick_add/controller/wps_customer_quick_add.ctr.php

Spacing +29 added lines, -29 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Fichier du controlleur principal du module de création de client rapide / Controller file for quick customer creation
  *
@@ -19,8 +19,8 @@ 
 	 */
 	public function __construct() {
 		/**	Affiche un formulaire permettant de créer un client / Display a form allowing to add a new customer	*/
-		add_action( 'wp_ajax_wpspos-customer-quick-creation', array( $this, 'customer_creation' ) );
-		add_action( 'wp_ajax_wpspos-customer-quick-add', array( $this, 'create_customer' ) );
+		add_action('wp_ajax_wpspos-customer-quick-creation', array($this, 'customer_creation'));
+		add_action('wp_ajax_wpspos-customer-quick-add', array($this, 'create_customer'));
 	}
 
 
@@ -28,23 +28,23 @@ 
 	 * AJAX - Charge le fomulaire d'ajout rapide d'un client / Load the form for new customer quick add
 	 */
 	function customer_creation() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps-customer-quick-nonce' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps-customer-quick-nonce'))
 			wp_die();
 
 		// check_ajax_referer( 'wps-customer-quick-nonce', 'wps-nonce' );
 		global $wpdb;
 
-		$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-		$query = $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_type = %s AND post_author = %d", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, get_current_user_id() );
-		$cid = $wpdb->get_var( $query );
+		$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+		$query = $wpdb->prepare("SELECT ID FROM {$wpdb->posts} WHERE post_type = %s AND post_author = %d", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, get_current_user_id());
+		$cid = $wpdb->get_var($query);
 
-		$customer_attribute_set = !empty( $_GET ) && !empty( $_GET[ 'customer_set_id' ] ) ? (int)$_GET[ 'customer_set_id' ] : null;
+		$customer_attribute_set = !empty($_GET) && !empty($_GET['customer_set_id']) ? (int)$_GET['customer_set_id'] : null;
 
-		$customer_attributes = wpshop_attributes_set::getAttributeSetDetails( $customer_attribute_set, "'valid'");
+		$customer_attributes = wpshop_attributes_set::getAttributeSetDetails($customer_attribute_set, "'valid'");
 
-		require_once( wpshop_tools::get_template_part( WPSPOSCLTQUICK_DIR, WPSPOSCLTQUICK_TEMPLATES_MAIN_DIR, "backend", "customer", "creation" ) );
+		require_once(wpshop_tools::get_template_part(WPSPOSCLTQUICK_DIR, WPSPOSCLTQUICK_TEMPLATES_MAIN_DIR, "backend", "customer", "creation"));
 		wp_die( );
 	}
 
@@ -53,20 +53,20 @@ 
 	 * AJAX - Création d'un nouveau client / Create a new customer
 	 */
 	function create_customer() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'create_customer' ) )
+		if (!wp_verify_nonce($_wpnonce, 'create_customer'))
 			wp_die();
 
 		global $wpdb;
 		$response = array(
 			'status' => false,
-			'output' => __( 'An error occured while saving customer', 'wpshop' ),
+			'output' => __('An error occured while saving customer', 'wpshop'),
 			'customer_id' => -1,
 		);
 
 		/**	Check if a attribute set id have been sended in order to check if therer are some check to do on sended input	*/
-		$customer_attributes = wpshop_attributes_set::getAttributeSetDetails( (int)$_POST[ 'wps-customer-account-set-id' ], "'valid'");
+		$customer_attributes = wpshop_attributes_set::getAttributeSetDetails((int)$_POST['wps-customer-account-set-id'], "'valid'");
 
 		/**	Read sended values for checking	*/
 		$email_founded = false;
@@ -75,46 +75,46 @@ 
 
 
 		$data = array(
-			'attribute' => !empty( $_POST['attribute'] ) ? (array)$_POST['attribute'] : array(),
+			'attribute' => !empty($_POST['attribute']) ? (array)$_POST['attribute'] : array(),
 		);
 
-		$quick_add_customer = wps_customer_ctr::quick_add_customer( $data );
-		switch( $quick_add_customer ) {
+		$quick_add_customer = wps_customer_ctr::quick_add_customer($data);
+		switch ($quick_add_customer) {
 			case 1:
-				$response[ 'output' ] = __('An email address is required', 'wpshop');
+				$response['output'] = __('An email address is required', 'wpshop');
 				break;
 			case 2:
-				$response[ 'output' ] = __('An account is already created with this e-mail address', 'wpshop');
+				$response['output'] = __('An account is already created with this e-mail address', 'wpshop');
 				break;
 			case is_array($quick_add_customer):
 				/**	Build a response for customer first letter - Specific action (POS)	*/
-				if ( !empty($quick_add_customer['varchar']['last_name']) ) {
+				if (!empty($quick_add_customer['varchar']['last_name'])) {
 					$field_for_letter = $quick_add_customer['varchar']['last_name'];
 				}
-				elseif( !empty($quick_add_customer['varchar']['first_name']) ) {
+				elseif (!empty($quick_add_customer['varchar']['first_name'])) {
 					$field_for_letter = $quick_add_customer['varchar']['first_name'];
 				}
 				else {
 					$field_for_letter = $quick_add_customer['varchar']['user_email'];
 				}
-				$response[ 'letter' ] = substr( $field_for_letter, 0, 1);
+				$response['letter'] = substr($field_for_letter, 0, 1);
 
 				/**	Build response	*/
-				$response[ 'status' ] = true;
-				$response[ 'output' ] = __('Customer created succesfully', 'wpshop');
-				$response[ 'customer_id' ] = $quick_add_customer['integer']['ID'];
+				$response['status'] = true;
+				$response['output'] = __('Customer created succesfully', 'wpshop');
+				$response['customer_id'] = $quick_add_customer['integer']['ID'];
 
 				/** Create customer address from sended data **/
 				// $_REQUEST['user']['customer_id'] = (int)$quick_add_customer['integer']['ID'];
 				$attribute_to_save = $data['attribute'];
-				$customer_id = !empty( $_POST[ 'wps-customer-account-set-id' ] ) ? (int) $_POST[ 'wps-customer-account-set-id' ] : 0;
+				$customer_id = !empty($_POST['wps-customer-account-set-id']) ? (int)$_POST['wps-customer-account-set-id'] : 0;
 				// unset( $_POST['attribute'] );
 				// $_POST['attribute'][ (int)$_POST[ 'wps-customer-account-set-id' ] ] = $attribute_to_save;
-				wps_address::save_address_infos( $customer_id );
+				wps_address::save_address_infos($customer_id);
 				break;
 		}
 
-		wp_die( json_encode( $response ) );
+		wp_die(json_encode($response));
 	}
 
 }

Braces +11 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier du controlleur principal du module de création de client rapide / Controller file for quick customer creation
  *
@@ -30,8 +32,9 @@ 
 	function customer_creation() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps-customer-quick-nonce' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps-customer-quick-nonce' ) ) {
+					wp_die();
+		}
 
 		// check_ajax_referer( 'wps-customer-quick-nonce', 'wps-nonce' );
 		global $wpdb;
@@ -55,8 +58,9 @@ 
 	function create_customer() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'create_customer' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'create_customer' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$response = array(
@@ -90,11 +94,9 @@ 
 				/**	Build a response for customer first letter - Specific action (POS)	*/
 				if ( !empty($quick_add_customer['varchar']['last_name']) ) {
 					$field_for_letter = $quick_add_customer['varchar']['last_name'];
-				}
-				elseif( !empty($quick_add_customer['varchar']['first_name']) ) {
+				} elseif( !empty($quick_add_customer['varchar']['first_name']) ) {
 					$field_for_letter = $quick_add_customer['varchar']['first_name'];
-				}
-				else {
+				} else {
 					$field_for_letter = $quick_add_customer['varchar']['user_email'];
 				}
 				$response[ 'letter' ] = substr( $field_for_letter, 0, 1);

includes/modules/wps-pos-addon/modules/wps_product_quick_add/controller/wps_product_quick_add.ctr.php

Spacing +39 added lines, -39 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Fichier du controlleur principal du module de création de produit rapide / Controller file for quick product creation
  *
@@ -19,9 +19,9 @@ 
 	 */
 	public function __construct() {
 		/**	Affiche un formulaire permettant de créer un produit / Display a form allowing to add a new product	*/
-		add_action( 'wp_ajax_wpspos-product-quick-creation', array( $this, 'product_creation' ) );
+		add_action('wp_ajax_wpspos-product-quick-creation', array($this, 'product_creation'));
 	//	add_action( 'wap_ajax_wpspos-product-quick-add-reload-attribute-list', array( $this, 'attribute_list_reload' ) );
-		add_action( 'wp_ajax_wpspos-product-quick-add', array( $this, 'create_product' ) );
+		add_action('wp_ajax_wpspos-product-quick-add', array($this, 'create_product'));
 	}
 
 	/**
@@ -29,20 +29,20 @@ 
 	 *
 	 * @param integer $chosen_set Le groupe d'attribut dont on veut afficher les champs / Attribute set we want display input for
 	 */
-	function display_attribute( $chosen_set = 0 ) {
-		require_once( wpshop_tools::get_template_part( WPSPOSPDTQUICK_DIR, WPSPOSPDTQUICK_TEMPLATES_MAIN_DIR, "backend", "attribute", "list" ) );
+	function display_attribute($chosen_set = 0) {
+		require_once(wpshop_tools::get_template_part(WPSPOSPDTQUICK_DIR, WPSPOSPDTQUICK_TEMPLATES_MAIN_DIR, "backend", "attribute", "list"));
 	}
 
 	/**
 	 * AJAX - Charge le fomulaire d'ajout rapide d'un produit / Load the form for new product quick add
 	 */
 	function product_creation() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps-product-quick-nonce' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps-product-quick-nonce'))
 			wp_die();
 
-		require_once( wpshop_tools::get_template_part( WPSPOSPDTQUICK_DIR, WPSPOSPDTQUICK_TEMPLATES_MAIN_DIR, "backend", "product_creation" ) );
+		require_once(wpshop_tools::get_template_part(WPSPOSPDTQUICK_DIR, WPSPOSPDTQUICK_TEMPLATES_MAIN_DIR, "backend", "product_creation"));
 		wp_die( );
 	}
 
@@ -50,8 +50,8 @@ 
 	 * AJAX - Recharge la liste des attributs du groupe sélectionné par l'administratuer pour la création du nouveau produit / Reload attribute list for the selected attribute set, choosen by administrator for new product creation
 	 */
 	function attribute_list_reload() {
-		$attribute_id = !empty( $_POST['attribute_set'] ) ? (int) $_POST['attribute_set'] : 0;
-		$this->display_attribute( $attribute_id );
+		$attribute_id = !empty($_POST['attribute_set']) ? (int)$_POST['attribute_set'] : 0;
+		$this->display_attribute($attribute_id);
 		wp_die( );
 	}
 
@@ -59,9 +59,9 @@ 
 	 * AJAX - Création d'un nouveau produit / Create a new product
 	 */
 	function create_product() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'create_product' ) )
+		if (!wp_verify_nonce($_wpnonce, 'create_product'))
 			wp_die();
 
 		global $wpdb;
@@ -71,36 +71,36 @@ 
 			'pid' => -1,
 		);
 
-		$post_title = ( !empty($_POST['post_title']) ) ? sanitize_text_field( $_POST['post_title'] ) : -1;
-		$post_content = ( !empty($_POST['post_content']) ) ? sanitize_text_field( $_POST['post_content'] ) : '';
-		$attributes = ( !empty($_POST['attribute']) ) ? (array)$_POST['attribute'] : array();
-		$id_attribute_set = ( !empty($_POST['wps-product-attribute-set']) ) ? (int)$_POST['wps-product-attribute-set'] : -1;
+		$post_title = (!empty($_POST['post_title'])) ? sanitize_text_field($_POST['post_title']) : -1;
+		$post_content = (!empty($_POST['post_content'])) ? sanitize_text_field($_POST['post_content']) : '';
+		$attributes = (!empty($_POST['attribute'])) ? (array)$_POST['attribute'] : array();
+		$id_attribute_set = (!empty($_POST['wps-product-attribute-set'])) ? (int)$_POST['wps-product-attribute-set'] : -1;
 
 		$post_type = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
-		$attribute_set_list = wpshop_attributes_set::get_attribute_set_list_for_entity( wpshop_entities::get_entity_identifier_from_code( 'wpshop_product' ) );
-		foreach( $attribute_set_list as $attribute_set ) {
-			if( $id_attribute_set == $attribute_set->id && $attribute_set->slug == 'free_product' ) {
+		$attribute_set_list = wpshop_attributes_set::get_attribute_set_list_for_entity(wpshop_entities::get_entity_identifier_from_code('wpshop_product'));
+		foreach ($attribute_set_list as $attribute_set) {
+			if ($id_attribute_set == $attribute_set->id && $attribute_set->slug == 'free_product') {
 				$post_type = 'free_product';
 			}
 		}
 
-		if( ( -1 != $post_title ) && ( -1 != $id_attribute_set ) ) {
-			$new_product_id = wp_insert_post( array(
+		if (( -1 != $post_title ) && ( -1 != $id_attribute_set )) {
+			$new_product_id = wp_insert_post(array(
 				'post_type' => $post_type,
 				'post_status' => 'publish',
 				'post_title' => $post_title,
 				'post_content' => $post_content,
-			) );
+			));
 
-			if( !is_wp_error( $new_product_id ) ) {
-				update_post_meta( $new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $id_attribute_set );
-				$data_to_save['post_ID'] = $data_to_save['product_id'] = intval( $new_product_id );
-				$data_to_save['wpshop_product_attribute'] = ( !empty($attributes) ) ? $attributes : array();
+			if (!is_wp_error($new_product_id)) {
+				update_post_meta($new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $id_attribute_set);
+				$data_to_save['post_ID'] = $data_to_save['product_id'] = intval($new_product_id);
+				$data_to_save['wpshop_product_attribute'] = (!empty($attributes)) ? $attributes : array();
 				$data_to_save['user_ID'] = get_current_user_id();
 				$data_to_save['action'] = 'editpost';
 
 				// Get current barcode
-				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;
@@ -108,25 +108,25 @@ 
 					$data_to_save['wpshop_product_attribute']['varchar']['barcode'] = $barcode_value;
 				}
 
-				$response[ 'pid' ] = $new_product_id;
-				$response[ 'status' ] = false;
-				$response[ 'output' ] = __('Product created partially!', 'wpshop');
-				$response[ 'letter' ] = substr( $post_title, 0, 1);
-				if( !empty( $new_product_id ) && !empty( $data_to_save['user_ID'] ) ) {
+				$response['pid'] = $new_product_id;
+				$response['status'] = false;
+				$response['output'] = __('Product created partially!', 'wpshop');
+				$response['letter'] = substr($post_title, 0, 1);
+				if (!empty($new_product_id) && !empty($data_to_save['user_ID'])) {
 					$product_class = new wpshop_products();
-					$product_class->save_product_custom_informations( $new_product_id, $data_to_save );
-					$response[ 'status' ] = true;
-					$response[ 'output' ] = __('Product created successfully.', 'wpshop');
+					$product_class->save_product_custom_informations($new_product_id, $data_to_save);
+					$response['status'] = true;
+					$response['output'] = __('Product created successfully.', 'wpshop');
 				}
 
-				$wps_quick_creation_hook = do_action( 'wps-new-product-quick-created', $new_product_id );
-				if ( !empty( $wps_quick_creation_hook ) ) {
-					$response[ '' ] = $wps_quick_creation_hook;
+				$wps_quick_creation_hook = do_action('wps-new-product-quick-created', $new_product_id);
+				if (!empty($wps_quick_creation_hook)) {
+					$response[''] = $wps_quick_creation_hook;
 				}
 			}
 		}
 
-		wp_die( json_encode( $response ) );
+		wp_die(json_encode($response));
 	}
 
 }

Braces +9 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier du controlleur principal du module de création de produit rapide / Controller file for quick product creation
  *
@@ -39,8 +41,9 @@ 
 	function product_creation() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps-product-quick-nonce' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps-product-quick-nonce' ) ) {
+					wp_die();
+		}
 
 		require_once( wpshop_tools::get_template_part( WPSPOSPDTQUICK_DIR, WPSPOSPDTQUICK_TEMPLATES_MAIN_DIR, "backend", "product_creation" ) );
 		wp_die( );
@@ -61,8 +64,9 @@ 
 	function create_product() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'create_product' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'create_product' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$response = array(