Eoxia / wpshop

includes/modules/wps_export/model/wps_export_mdl.php

Doc Comments +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 	/**
 	 * Get customers with a term: all, newsletters_site, newsletters_site_partners, date(between 2 dates) or if order is higher than.
 	 * @param string $term
-	 * @param price/date $dt1 may be null
+	 * @param string|boolean $dt1 may be null
 	 * @param date $dt2 may be null
 	 * @return array
 	 */

Spacing +68 added lines, -68 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_export_mdl {
 
 	/**
@@ -8,88 +8,88 @@ 
 	 * @param date $dt2 may be null
 	 * @return array
 	 */
-	function get_customers($term, $dt1=null, $dt2=null) {
+	function get_customers($term, $dt1 = null, $dt2 = null) {
 		global $wpdb;
 		$users;
 		switch ($term) {
 			case 'users_all':
-				$query = $wpdb->prepare( "SELECT ID AS USER_ID, '' AS POST_ID FROM {$wpdb->users} WHERE %d", 1);
+				$query = $wpdb->prepare("SELECT ID AS USER_ID, '' AS POST_ID FROM {$wpdb->users} WHERE %d", 1);
 				$list_users = $wpdb->get_results($query, OBJECT);
 				break;
 			case 'customers_all':
-				$query = $wpdb->prepare( "SELECT us.ID AS USER_ID, GROUP_CONCAT( ps.ID ) AS POST_ID FROM {$wpdb->users} us JOIN {$wpdb->posts} ps ON us.ID = ps.post_author AND ps.post_type = %s GROUP BY USER_ID", WPSHOP_NEWTYPE_IDENTIFIER_ORDER );
+				$query = $wpdb->prepare("SELECT us.ID AS USER_ID, GROUP_CONCAT( ps.ID ) AS POST_ID FROM {$wpdb->users} us JOIN {$wpdb->posts} ps ON us.ID = ps.post_author AND ps.post_type = %s GROUP BY USER_ID", WPSHOP_NEWTYPE_IDENTIFIER_ORDER);
 				$list_users = $wpdb->get_results($query, OBJECT);
 				break;
 			case 'newsletters_site':
-				$query = $wpdb->prepare( "SELECT user_id AS USER_ID, GROUP_CONCAT( ID ) AS POST_ID FROM {$wpdb->usermeta} JOIN {$wpdb->posts} ON post_author = user_id AND post_type = %s WHERE meta_key = %s AND ( meta_value LIKE ('%%%s%%') || meta_value LIKE ('%%%s%%') ) GROUP BY USER_ID", WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'user_preferences', 's:16:"newsletters_site";i:1;', 's:16:"newsletters_site";b:1;' );
+				$query = $wpdb->prepare("SELECT user_id AS USER_ID, GROUP_CONCAT( ID ) AS POST_ID FROM {$wpdb->usermeta} JOIN {$wpdb->posts} ON post_author = user_id AND post_type = %s WHERE meta_key = %s AND ( meta_value LIKE ('%%%s%%') || meta_value LIKE ('%%%s%%') ) GROUP BY USER_ID", WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'user_preferences', 's:16:"newsletters_site";i:1;', 's:16:"newsletters_site";b:1;');
 				$list_users = $wpdb->get_results($query, OBJECT);
 				break;
 			case 'newsletters_site_partners':
-				$query = $wpdb->prepare( "SELECT user_id AS USER_ID, GROUP_CONCAT( ID ) AS POST_ID FROM {$wpdb->usermeta} JOIN {$wpdb->posts} ON post_author = user_id AND post_type = %s WHERE meta_key = %s AND ( meta_value LIKE ('%%%s%%') || meta_value LIKE ('%%%s%%') ) GROUP BY USER_ID", WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'user_preferences', 's:25:"newsletters_site_partners";i:1;', 's:25:"newsletters_site_partners";b:1;' );
+				$query = $wpdb->prepare("SELECT user_id AS USER_ID, GROUP_CONCAT( ID ) AS POST_ID FROM {$wpdb->usermeta} JOIN {$wpdb->posts} ON post_author = user_id AND post_type = %s WHERE meta_key = %s AND ( meta_value LIKE ('%%%s%%') || meta_value LIKE ('%%%s%%') ) GROUP BY USER_ID", WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'user_preferences', 's:25:"newsletters_site_partners";i:1;', 's:25:"newsletters_site_partners";b:1;');
 				$list_users = $wpdb->get_results($query, OBJECT);
 				break;
 			case 'date':
-				$query = $wpdb->prepare( "SELECT us.`ID` AS USER_ID, GROUP_CONCAT( ps.`ID` ) AS POST_ID FROM {$wpdb->users} us JOIN {$wpdb->posts} ps ON `post_author` = us.`ID` AND `post_type` = %s WHERE `user_registered` >= %s AND `user_registered` <= %s GROUP BY USER_ID", WPSHOP_NEWTYPE_IDENTIFIER_ORDER, date("Y-m-j", strtotime($dt1)), date("Y-m-j", strtotime("+1 day", strtotime($dt2))) );
+				$query = $wpdb->prepare("SELECT us.`ID` AS USER_ID, GROUP_CONCAT( ps.`ID` ) AS POST_ID FROM {$wpdb->users} us JOIN {$wpdb->posts} ps ON `post_author` = us.`ID` AND `post_type` = %s WHERE `user_registered` >= %s AND `user_registered` <= %s GROUP BY USER_ID", WPSHOP_NEWTYPE_IDENTIFIER_ORDER, date("Y-m-j", strtotime($dt1)), date("Y-m-j", strtotime("+1 day", strtotime($dt2))));
 				$list_users = $wpdb->get_results($query, OBJECT);
 				break;
 			case 'orders':
-				$query = $wpdb->prepare( "SELECT us.ID AS USER_ID, GROUP_CONCAT( ps.ID ) AS POST_ID FROM {$wpdb->users} us JOIN {$wpdb->posts} ps ON us.ID = ps.post_author AND ps.post_type = %s GROUP BY USER_ID", WPSHOP_NEWTYPE_IDENTIFIER_ORDER );
+				$query = $wpdb->prepare("SELECT us.ID AS USER_ID, GROUP_CONCAT( ps.ID ) AS POST_ID FROM {$wpdb->users} us JOIN {$wpdb->posts} ps ON us.ID = ps.post_author AND ps.post_type = %s GROUP BY USER_ID", WPSHOP_NEWTYPE_IDENTIFIER_ORDER);
 				$list_users = $wpdb->get_results($query, OBJECT);
 				break;
 		}
 		$users_array = array();
 		$users_array[] = array(
-				'name' => __( 'Name', 'wps_export' ),
-				'first_name' => __( 'First name', 'wps_export' ),
-				'email' => __( 'Mail', 'wps_export' ),
-				'tel' => __( 'Phone', 'wps_export' ),
-				'registered' => __( 'Registered', 'wps_export' )
+				'name' => __('Name', 'wps_export'),
+				'first_name' => __('First name', 'wps_export'),
+				'email' => __('Mail', 'wps_export'),
+				'tel' => __('Phone', 'wps_export'),
+				'registered' => __('Registered', 'wps_export')
 				);
-		if ( !empty( $list_users ) ) {
+		if (!empty($list_users)) {
 			$billing_address_indicator = get_option('wpshop_billing_address');
 			$billing_address_indicator = $billing_address_indicator['choice'];
-			foreach( $list_users as $user_post ) {
-				if($term == 'orders') {
+			foreach ($list_users as $user_post) {
+				if ($term == 'orders') {
 					$vuser = false;
 				}
-				$user = get_userdata( $user_post->USER_ID );
+				$user = get_userdata($user_post->USER_ID);
 				$tmp_array = array();
-				$last_name = get_user_meta( $user->ID, 'last_name', true );
-				$first_name = get_user_meta( $user->ID, 'first_name', true );
-				if( empty($last_name) )
+				$last_name = get_user_meta($user->ID, 'last_name', true);
+				$first_name = get_user_meta($user->ID, 'first_name', true);
+				if (empty($last_name))
 					$last_name = $user->display_name;
-				if( empty($first_name) )
+				if (empty($first_name))
 					$first_name = '-';
 				$tmp_array['name'] = $last_name;
 				$tmp_array['first_name'] = $first_name;
 				$tmp_array['email'] = $user->user_email;
 				$tmp_array['tel'] = '';
 				$result = wps_address::get_addresses_list($user->ID);
-				if( !empty($result) && !empty($result[$billing_address_indicator]) ) {
-					foreach($result[$billing_address_indicator] as $address_id => $address_data) {
-						if( !empty($address_data['phone']) ) {
+				if (!empty($result) && !empty($result[$billing_address_indicator])) {
+					foreach ($result[$billing_address_indicator] as $address_id => $address_data) {
+						if (!empty($address_data['phone'])) {
 							$tmp_array['tel'] = $address_data['phone'];
 						}
 					}
 				}
 				$tmp_array['registered'] = date('d M Y H:i', strtotime($user->user_registered));
 				$posts_id = explode(',', $user_post->POST_ID);
-				$orders = get_posts( array(
+				$orders = get_posts(array(
 						'include'			=>	$posts_id,
 						'post_type'			=>	WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
 						'posts_per_page'	=>	-1
 					));
-				foreach( $orders as $order ) {
-					if($term == 'orders') {
-						$command = get_post_meta( $order->ID, '_order_postmeta', true );
-						if( ( !empty($dt1) && !empty($command['order_grand_total']) && $command['order_grand_total'] >= $dt1 ) || ( !empty($dt2) && $dt2===true && $command['order_payment']['customer_choice']['method'] == 'free' ) ) {
+				foreach ($orders as $order) {
+					if ($term == 'orders') {
+						$command = get_post_meta($order->ID, '_order_postmeta', true);
+						if ((!empty($dt1) && !empty($command['order_grand_total']) && $command['order_grand_total'] >= $dt1) || (!empty($dt2) && $dt2 === true && $command['order_payment']['customer_choice']['method'] == 'free')) {
 							$vuser = true;
 						}
 					}
 				}
-				if($term != 'orders') {
+				if ($term != 'orders') {
 					$users_array[] = $tmp_array;
-				} elseif($vuser) {
+				} elseif ($vuser) {
 					$users_array[] = $tmp_array;
 				}
 			}
@@ -104,66 +104,66 @@ 
 	 * @param date $dt2
 	 * @return array
 	 */
-	function get_orders($term, $dt1=null, $dt2=null) {
+	function get_orders($term, $dt1 = null, $dt2 = null) {
 		$commands_array = array();
 		$commands_array[] = array(
-				'order_type' => __( 'Order type', 'wps_export' ),
-				'order_invoice_ref' => __( 'Identifier', 'wps_export' ),
-				'name' => __( 'Name', 'wps_export' ),
-				'first_name' => __( 'First name', 'wps_export' ),
-				'email' => __( 'Mail', 'wps_export' ),
-				'tel' => __( 'Phone', 'wps_export' ),
-				'date_order' => __( 'Order date', 'wps_export' ),
-				'order_total_et' => __( 'Products ET', 'wps_export' ),
-				'order_shipping_cost_et' => __( 'Shipping ET', 'wps_export' ),
-				'order_shipping_cost_ati' => __( 'Shipping ATI', 'wps_export' ),
-				'order_discount_amount' => __( 'Order discount', 'wps_export' ),
-				'order_grand_total' => __( 'Order ATI', 'wps_export' )
+				'order_type' => __('Order type', 'wps_export'),
+				'order_invoice_ref' => __('Identifier', 'wps_export'),
+				'name' => __('Name', 'wps_export'),
+				'first_name' => __('First name', 'wps_export'),
+				'email' => __('Mail', 'wps_export'),
+				'tel' => __('Phone', 'wps_export'),
+				'date_order' => __('Order date', 'wps_export'),
+				'order_total_et' => __('Products ET', 'wps_export'),
+				'order_shipping_cost_et' => __('Shipping ET', 'wps_export'),
+				'order_shipping_cost_ati' => __('Shipping ATI', 'wps_export'),
+				'order_discount_amount' => __('Order discount', 'wps_export'),
+				'order_grand_total' => __('Order ATI', 'wps_export')
 				);
-		$orders = get_posts( array(
+		$orders = get_posts(array(
 			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
 			'posts_per_page' => -1
-		) );
-		if ( !empty( $orders ) ) {
-			foreach( $orders as $order ) {
-				if( !empty($dt1) && strtotime($dt1) <= strtotime($order->post_date) && strtotime($order->post_date) <= strtotime("+1 day", strtotime($dt2)) ) {
+		));
+		if (!empty($orders)) {
+			foreach ($orders as $order) {
+				if (!empty($dt1) && strtotime($dt1) <= strtotime($order->post_date) && strtotime($order->post_date) <= strtotime("+1 day", strtotime($dt2))) {
 					$user = get_userdata($order->post_author);
 					$tmp_array = array();
-					$order_postmeta = get_post_meta( $order->ID, '_order_postmeta', true);
-					$tmp_array['order_type'] = ( !empty($order_postmeta['order_invoice_ref']) ) ? __( 'Invoice', 'wps_export' ) : ( ( !empty($order_postmeta['order_key']) ) ? __( 'Order', 'wps_export' ) : __( 'Quotation', 'wps_export' ) );
-					$tmp_array['order_invoice_ref'] = ( !empty($order_postmeta['order_invoice_ref']) ) ? $order_postmeta['order_invoice_ref'] : ( ( !empty($order_postmeta['order_key']) ) ? $order_postmeta['order_key'] : $order_postmeta['order_temporary_key'] );
-					$tmp_array['name'] = ( !empty($user->ID) ) ? get_user_meta( $user->ID, 'last_name', true ) : '';
-					$tmp_array['first_name'] = ( !empty($user->ID) ) ? get_user_meta( $user->ID, 'first_name', true ) : '';
-					$tmp_array['email'] = ( !empty($user->user_email) ) ? $user->user_email : '';
+					$order_postmeta = get_post_meta($order->ID, '_order_postmeta', true);
+					$tmp_array['order_type'] = (!empty($order_postmeta['order_invoice_ref'])) ? __('Invoice', 'wps_export') : ((!empty($order_postmeta['order_key'])) ? __('Order', 'wps_export') : __('Quotation', 'wps_export'));
+					$tmp_array['order_invoice_ref'] = (!empty($order_postmeta['order_invoice_ref'])) ? $order_postmeta['order_invoice_ref'] : ((!empty($order_postmeta['order_key'])) ? $order_postmeta['order_key'] : $order_postmeta['order_temporary_key']);
+					$tmp_array['name'] = (!empty($user->ID)) ? get_user_meta($user->ID, 'last_name', true) : '';
+					$tmp_array['first_name'] = (!empty($user->ID)) ? get_user_meta($user->ID, 'first_name', true) : '';
+					$tmp_array['email'] = (!empty($user->user_email)) ? $user->user_email : '';
 					$tmp_array['tel'] = '';
-					$order_info = get_post_meta( $order->ID, '_order_info', true);
-					if( !empty($order_info) && !empty($order_info['billing']['address']['phone']) ) {
+					$order_info = get_post_meta($order->ID, '_order_info', true);
+					if (!empty($order_info) && !empty($order_info['billing']['address']['phone'])) {
 						$tmp_array['tel'] .= $order_info['billing']['address']['phone'];
 					}
 					$tmp_array['date_order'] = '';
-					if( !empty($order->post_date) ) {
-						$tmp_array['date_order'] = mysql2date( get_option( 'date_format' ), $order->post_date, true );
+					if (!empty($order->post_date)) {
+						$tmp_array['date_order'] = mysql2date(get_option('date_format'), $order->post_date, true);
 					}
-					$tmp_array['order_total_et'] = number_format( ( !empty($order_postmeta['order_total_ht']) ) ? $order_postmeta['order_total_ht'] : 0, 2, '.', '' );
+					$tmp_array['order_total_et'] = number_format((!empty($order_postmeta['order_total_ht'])) ? $order_postmeta['order_total_ht'] : 0, 2, '.', '');
 					//$tmp_array['order_total_ati'] = number_format( ( !empty($order_postmeta['order_total_ttc']) ) ? $order_postmeta['order_total_ttc'] : 0, 2, '.', '' );
-					$order_shipping_cost = ( !empty($order_postmeta['order_shipping_cost']) ) ? $order_postmeta['order_shipping_cost'] : 0;
-					$price_piloting_option = get_option( 'wpshop_shop_price_piloting' );
-					if( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) {
+					$order_shipping_cost = (!empty($order_postmeta['order_shipping_cost'])) ? $order_postmeta['order_shipping_cost'] : 0;
+					$price_piloting_option = get_option('wpshop_shop_price_piloting');
+					if (!empty($price_piloting_option) && $price_piloting_option == 'HT') {
 						$shipati = $order_shipping_cost * 1.2;
 						$shipet = $order_shipping_cost;
 					} else {
 						$shipet = $order_shipping_cost / 1.2;
 						$shipati = $order_shipping_cost;
 					}
-					$tmp_array['order_shipping_cost_et'] = number_format( $shipet, 2, '.', '' );
-					$tmp_array['order_shipping_cost_ati'] = number_format( $shipati, 2, '.', '' );
-					$tmp_array['order_discount_amount'] = number_format( ( !empty($order_postmeta['order_discount_amount_total_cart']) ) ? $order_postmeta['order_discount_amount_total_cart'] : 0, 2, '.', '' );
-					$tmp_array['order_grand_total'] = number_format( ( !empty($order_postmeta['order_grand_total']) ) ? $order_postmeta['order_grand_total'] : 0, 2, '.', '' );
+					$tmp_array['order_shipping_cost_et'] = number_format($shipet, 2, '.', '');
+					$tmp_array['order_shipping_cost_ati'] = number_format($shipati, 2, '.', '');
+					$tmp_array['order_discount_amount'] = number_format((!empty($order_postmeta['order_discount_amount_total_cart'])) ? $order_postmeta['order_discount_amount_total_cart'] : 0, 2, '.', '');
+					$tmp_array['order_grand_total'] = number_format((!empty($order_postmeta['order_grand_total'])) ? $order_postmeta['order_grand_total'] : 0, 2, '.', '');
 					$commands_array[] = $tmp_array;
 				}
 			}
 		}
-		$commands_array = apply_filters( 'wps_order_export_filter', $commands_array, $orders, $dt1, $dt2 );
+		$commands_array = apply_filters('wps_order_export_filter', $commands_array, $orders, $dt1, $dt2);
 		return $commands_array;
 	}
 

includes/modules/wps_product/model/wps_product_mdl.php

Doc Comments +1 added lines

@@ -61,6 +61,7 @@
 
 	/**
 	 * Return Products by a search
+	 * @param string $search
 	 */
 	function get_products_by_title_or_barcode( $search, $only_barcode = false ) {
 		global $wpdb;

Spacing +18 added lines, -18 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Main controller file for product mass modification module
  *
@@ -21,18 +21,18 @@ 
 	 *
 	 * @return array
 	 */
-	function get_product_atts_def( $product_id ) {
-		$product_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
-		$element_atribute_list = wpshop_attributes::getElementWithAttributeAndValue( $product_entity_id, $product_id, WPSHOP_CURRENT_LOCALE, '', 'frontend' );
+	function get_product_atts_def($product_id) {
+		$product_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+		$element_atribute_list = wpshop_attributes::getElementWithAttributeAndValue($product_entity_id, $product_id, WPSHOP_CURRENT_LOCALE, '', 'frontend');
 
 		$one_product = get_post_meta($product_id, WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, true);
-		if(!empty($one_product)) {
+		if (!empty($one_product)) {
 			$array1 = (!empty($one_product['attribute_set_section'])) ? $one_product['attribute_set_section'] : array();
 			$array2 = $element_atribute_list[$product_id];
 			unset($element_atribute_list);
-			foreach($array2 as $key => $attribute_set_section) {
-				foreach($array1 as $code1 => $value){
-					if($code1 == $attribute_set_section['code']) {
+			foreach ($array2 as $key => $attribute_set_section) {
+				foreach ($array1 as $code1 => $value) {
+					if ($code1 == $attribute_set_section['code']) {
 						$element_atribute_list[$product_id][$key] = $attribute_set_section;
 					}
 				}
@@ -47,38 +47,38 @@ 
 	 * @param integer $letter
 	 * @return array
 	 */
-	function get_products_by_letter( $letter = 'a' ) {
+	function get_products_by_letter($letter = 'a') {
 		global $wpdb;
-		if ( $letter == 'all' ) {
-			$query = $wpdb->prepare( 'SELECT ID, post_title FROM ' .$wpdb->posts. ' WHERE post_status = %s AND post_type = %s ORDER BY post_title ASC', 'publish', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
+		if ($letter == 'all') {
+			$query = $wpdb->prepare('SELECT ID, post_title FROM ' . $wpdb->posts . ' WHERE post_status = %s AND post_type = %s ORDER BY post_title ASC', 'publish', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
 		}
 		else {
-			$query = $wpdb->prepare( 'SELECT ID, post_title FROM ' .$wpdb->posts. ' WHERE post_status = %s AND post_type = %s AND post_title LIKE %s ORDER BY post_title ASC', 'publish', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $letter.'%');
+			$query = $wpdb->prepare('SELECT ID, post_title FROM ' . $wpdb->posts . ' WHERE post_status = %s AND post_type = %s AND post_title LIKE %s ORDER BY post_title ASC', 'publish', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $letter . '%');
 		}
-		$products = $wpdb->get_results( $query );
+		$products = $wpdb->get_results($query);
 		return $products;
 	}
 
 	/**
 	 * Return Products by a search
 	 */
-	function get_products_by_title_or_barcode( $search, $only_barcode = false ) {
+	function get_products_by_title_or_barcode($search, $only_barcode = false) {
 		global $wpdb;
 		$more_query = "";
 		$query_args = array();
 		$query_args[] = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
 		$query_args[] = $search;
-		if ( !( (bool) $only_barcode ) ) {
+		if (!((bool)$only_barcode)) {
 			$more_query = " OR P.post_title LIKE %s";
 			$query_args[] = '%' . $search . '%';
 		}
-		$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 );
-		return $wpdb->get_results( $query );
+			GROUP BY P.ID", $query_args);
+		return $wpdb->get_results($query);
 	}
 }

includes/modules/wps_orders/templates/backend/product-listing/wps_orders_product_listing_table.php

Spacing +23 added lines, -23 removed lines

@@ -1,50 +1,50 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- $order_post_meta = !empty($post) ? get_post_meta( $post->ID, '_wpshop_order_status', true ) : ""; ?>
+<?php if (!defined('ABSPATH')) exit;
+ $order_post_meta = !empty($post) ? get_post_meta($post->ID, '_wpshop_order_status', true) : ""; ?>
 <div class="wps-table">
 	<div class="wps-table-header wps-table-row">
-		<div class="wps-table-cell"><?php _e( 'Picture', 'wpshop'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Product reference', 'wpshop'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Product name', 'wpshop'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Price', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Picture', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Product reference', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Product name', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Price', 'wpshop'); ?></div>
 
-		<?php if ( 'completed' != $order_post_meta ) : ?>
-			<div class="wps-table-cell"><?php _e( 'Quantity', 'wpshop'); ?></div>
-			<div class="wps-table-cell"><?php _e( 'Add to order', 'wpshop'); ?></div>
+		<?php if ('completed' != $order_post_meta) : ?>
+			<div class="wps-table-cell"><?php _e('Quantity', 'wpshop'); ?></div>
+			<div class="wps-table-cell"><?php _e('Add to order', 'wpshop'); ?></div>
 		<?php endif; ?>
 	</div>
-	<?php if( !empty($products) ) : ?>
-	<?php foreach ( $products as $product ) :
+	<?php if (!empty($products)) : ?>
+	<?php foreach ($products as $product) :
 	$pid = $product->ID;
 	?>
-	<?php $product_metadata = get_post_meta( $product->ID, '_wpshop_product_metadata', true ); ?>
+	<?php $product_metadata = get_post_meta($product->ID, '_wpshop_product_metadata', true); ?>
 	<div class="wps-table-content wps-table-row">
-		<div class="wps-table-cell  wps-cart-item-img"><?php echo get_the_post_thumbnail( $product->ID, 'thumbnail' ); ?></div>
-		<div class="wps-table-cell"><?php echo ( !empty( $product_metadata) && $product_metadata['product_reference']) ? $product_metadata['product_reference'] : ''; ?></div>
+		<div class="wps-table-cell  wps-cart-item-img"><?php echo get_the_post_thumbnail($product->ID, 'thumbnail'); ?></div>
+		<div class="wps-table-cell"><?php echo (!empty($product_metadata) && $product_metadata['product_reference']) ? $product_metadata['product_reference'] : ''; ?></div>
 		<div class="wps-table-cell"><?php echo $product->post_title; ?></div>
 		<div class="wps-table-cell">
 		<?php
 			$product = wpshop_products::get_product_data($product->ID);
-			echo wpshop_prices::get_product_price($product, 'price_display', array('mini_output', 'grid') );
+			echo wpshop_prices::get_product_price($product, 'price_display', array('mini_output', 'grid'));
 		?>
 		</div>
-		<?php if ( 'completed' != $order_post_meta ) : ?>
+		<?php if ('completed' != $order_post_meta) : ?>
 			<div class="wps-table-cell">
-				<a class="wps-bton-icon-minus-small wps-cart-reduce-product-qty" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_set_qty_for_product_into_cart' ); ?>" href=""></a>
+				<a class="wps-bton-icon-minus-small wps-cart-reduce-product-qty" data-nonce="<?php echo wp_create_nonce('ajax_wpshop_set_qty_for_product_into_cart'); ?>" href=""></a>
 				<input id="wps-cart-product-qty-<?php echo $pid; ?>" class="wps-cart-product-qty" type="text" value="1" name="french-hens" size="3" style="text-align : center">
-				<a class="wps-bton-icon-plus-small wps-cart-add-product-qty" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_set_qty_for_product_into_cart' ); ?>" href=""></a>
+				<a class="wps-bton-icon-plus-small wps-cart-add-product-qty" data-nonce="<?php echo wp_create_nonce('ajax_wpshop_set_qty_for_product_into_cart'); ?>" href=""></a>
 			</div>
 			<div class="wps-table-cell">
-				<a href="#" data-nonce="<?php echo wp_create_nonce( 'wps_add_product_to_order_admin' ); ?>" class="wps-bton-first-mini-rounded wps-order-add-product" id="wps-order-add-product-<?php echo $pid; ?>"><i class="wps-icon-basket"></i> <?php _e( 'Add to order', 'wpshop'); ?></a>
+				<a href="#" data-nonce="<?php echo wp_create_nonce('wps_add_product_to_order_admin'); ?>" class="wps-bton-first-mini-rounded wps-order-add-product" id="wps-order-add-product-<?php echo $pid; ?>"><i class="wps-icon-basket"></i> <?php _e('Add to order', 'wpshop'); ?></a>
 			</div>
 		<?php endif; ?>
 	</div>
 	<?php endforeach; ?>
 	<?php else :
-		if( !empty( $research ) ) : ?>
-		<div class="wps-alert-info"><?php printf( __( 'No products corresponds to the search <strong>"%s"</strong>', 'wpshop'), $research ); ?></div>
+		if (!empty($research)) : ?>
+		<div class="wps-alert-info"><?php printf(__('No products corresponds to the search <strong>"%s"</strong>', 'wpshop'), $research); ?></div>
 	<?php else :
-			$letter_display = ( strtoupper( $current_letter ) != 'ALL' ) ? $current_letter : __('ALL', 'wpshop' ); ?>
-			<div class="wps-alert-info"><?php printf( __( 'No products corresponds to the letter <strong>"%s"</strong> search', 'wpshop'), strtoupper( $letter_display ) ); ?></div>
+			$letter_display = (strtoupper($current_letter) != 'ALL') ? $current_letter : __('ALL', 'wpshop'); ?>
+			<div class="wps-alert-info"><?php printf(__('No products corresponds to the letter <strong>"%s"</strong> search', 'wpshop'), strtoupper($letter_display)); ?></div>
 	<?php endif;
 		endif; ?>
 </div>

Braces +13 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  $order_post_meta = !empty($post) ? get_post_meta( $post->ID, '_wpshop_order_status', true ) : ""; ?>
 <div class="wps-table">
 	<div class="wps-table-header wps-table-row">
@@ -39,11 +41,17 @@ 
 		<?php endif; ?>
 	</div>
 	<?php endforeach; ?>
-	<?php else :
+	<?php else {
+	:
 		if( !empty( $research ) ) : ?>
-		<div class="wps-alert-info"><?php printf( __( 'No products corresponds to the search <strong>"%s"</strong>', 'wpshop'), $research ); ?></div>
-	<?php else :
-			$letter_display = ( strtoupper( $current_letter ) != 'ALL' ) ? $current_letter : __('ALL', 'wpshop' ); ?>
+		<div class="wps-alert-info"><?php printf( __( 'No products corresponds to the search <strong>"%s"</strong>', 'wpshop'), $research );
+}
+?></div>
+	<?php else {
+	:
+			$letter_display = ( strtoupper( $current_letter ) != 'ALL' ) ? $current_letter : __('ALL', 'wpshop' );
+}
+?>
 			<div class="wps-alert-info"><?php printf( __( 'No products corresponds to the letter <strong>"%s"</strong> search', 'wpshop'), strtoupper( $letter_display ) ); ?></div>
 	<?php endif;
 		endif; ?>

includes/modules/wps_orders/templates/backend/product-listing/wps_orders_product_listing.php

Spacing +6 added lines, -6 removed lines

@@ -1,13 +1,13 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wps-boxed">
-<span class="wps-h5"><span class="dashicons dashicons-search"></span> <input type="text" placeholder="<?php _e( 'Search products by letter', 'wpshop' ); ?>" id="search_product_by_title_or_barcode" size="50"><a href="#" data-nonce="<?php echo wp_create_nonce( 'refresh_product_list_all' ); ?>" class="wps-bton-second-mini-rounded search_product_by_title_or_barcode"><?php _e('Search', 'wpshop'); ?></a></span>
-<?php echo apply_filters( 'wps-filter-free-product-bton-tpl', $post->ID );
-foreach( $letters as $letter ) : ?>
-<a href="#" data-nonce="<?php echo wp_create_nonce( 'refresh_product_list_'.strtolower($letter) ); ?>" class="wps-bton-second-mini-rounded <?php echo ( strtoupper( $current_letter ) == strtoupper( $letter ) ) ? 'third' : ''; ?> search_product_by_letter" id="<?php echo $letter; ?>"><?php echo ( $letter != 'ALL' ) ? $letter : __('ALL', 'wpshop' ); ?></a>
+<span class="wps-h5"><span class="dashicons dashicons-search"></span> <input type="text" placeholder="<?php _e('Search products by letter', 'wpshop'); ?>" id="search_product_by_title_or_barcode" size="50"><a href="#" data-nonce="<?php echo wp_create_nonce('refresh_product_list_all'); ?>" class="wps-bton-second-mini-rounded search_product_by_title_or_barcode"><?php _e('Search', 'wpshop'); ?></a></span>
+<?php echo apply_filters('wps-filter-free-product-bton-tpl', $post->ID);
+foreach ($letters as $letter) : ?>
+<a href="#" data-nonce="<?php echo wp_create_nonce('refresh_product_list_' . strtolower($letter)); ?>" class="wps-bton-second-mini-rounded <?php echo (strtoupper($current_letter) == strtoupper($letter)) ? 'third' : ''; ?> search_product_by_letter" id="<?php echo $letter; ?>"><?php echo ($letter != 'ALL') ? $letter : __('ALL', 'wpshop'); ?></a>
 <?php endforeach; ?>
 </div>
 
 <div id="wps_orders_product_listing_table">
-<?php require( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "backend", "product-listing/wps_orders_product_listing_table") ); ?>
+<?php require(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "backend", "product-listing/wps_orders_product_listing_table")); ?>
 </div>

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <div class="wps-boxed">
 <span class="wps-h5"><span class="dashicons dashicons-search"></span> <input type="text" placeholder="<?php _e( 'Search products by letter', 'wpshop' ); ?>" id="search_product_by_title_or_barcode" size="50"><a href="#" data-nonce="<?php echo wp_create_nonce( 'refresh_product_list_all' ); ?>" class="wps-bton-second-mini-rounded search_product_by_title_or_barcode"><?php _e('Search', 'wpshop'); ?></a></span>

includes/modules/wps_orders/controller/wps_orders_in_back_office.php

Spacing +199 added lines, -199 removed lines

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

Braces +27 added lines, -21 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_orders_in_back_office {
 
 	function __construct() {
@@ -31,8 +33,9 @@ 
 	 */
 	function wps_orders_scripts() {
 		global $current_screen;
-		if( ! in_array( $current_screen->post_type, array( WPSHOP_NEWTYPE_IDENTIFIER_ORDER ), true ) )
-			return;
+		if( ! in_array( $current_screen->post_type, array( WPSHOP_NEWTYPE_IDENTIFIER_ORDER ), true ) ) {
+					return;
+		}
 
 		wp_enqueue_script( 'wps_orders_backend', WPS_ORDERS_URL.WPS_ORDERS_DIR.'/assets/backend/js/wps_orders.js' );
 	}
@@ -307,8 +310,7 @@ 
 								'order_shipping_address' => ''
 								)
 						);
-			}
-			else {
+			} else {
 				$wps_message->wpshop_prepared_email(
 						$email,
 						'WPSHOP_ORDER_UPDATE_MESSAGE',
@@ -333,8 +335,9 @@ 
 	function wpshop_add_private_comment_to_order() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_add_private_comment_to_order' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_add_private_comment_to_order' ) ) {
+					wp_die();
+		}
 
 		$status = false; $result = '';
 		$order_id = ( !empty($_POST['oid']) ) ? intval($_POST['oid']) : null;
@@ -354,8 +357,7 @@ 
 				ob_end_clean();
 				$status = true;
 			}
-		}
-		else {
+		} else {
 			$result = __('An error was occured', 'wpshop');
 		}
 
@@ -372,8 +374,9 @@ 
 		$letter = ( !empty($_POST['letter']) ) ? sanitize_title( $_POST['letter'] ) : '';
 		$research = !empty( $_POST['research'] ) ? sanitize_text_field( $_POST['research'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'refresh_product_list_'.strtolower($letter) ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'refresh_product_list_'.strtolower($letter) ) ) {
+					wp_die();
+		}
 
 		$status = false; $response = '';
 		$oid = !empty( $_POST['oid'] ) ? (int) $_POST['oid'] : 0;
@@ -418,8 +421,7 @@ 
 			$have_variations_checking = wpshop_products::get_variation( $product_id );
 			if( !empty($have_variations_checking) ) {
 				$product_have_variations = true;
-			}
-			else {
+			} else {
 				// Get Metadatas
 				$order_metadata = get_post_meta( $order_id, '_order_postmeta', true );
 				// Calcul cart informations
@@ -504,8 +506,9 @@ 
 	function wps_order_load_product_variations() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_order_load_product_variations' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_order_load_product_variations' ) ) {
+					wp_die();
+		}
 
 		$product_id = ( !empty($_GET['pid']) ) ? intval( $_GET['pid']) : null;
 		$order_id = ( !empty($_GET['oid']) ) ? intval( $_GET['oid']) : null;
@@ -520,8 +523,9 @@ 
 	function wps_orders_update_cart_informations() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_orders_update_cart_informations' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_orders_update_cart_informations' ) ) {
+					wp_die();
+		}
 
 		$status = false;
 		$order_id = ( !empty($_POST['order_id']) ) ? intval($_POST['order_id']) : '';
@@ -552,14 +556,16 @@ 
 	function wps_reverify_payment_invoice_ref() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_reverify_payment_invoice_ref' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_reverify_payment_invoice_ref' ) ) {
+					wp_die();
+		}
 
 		$status = true;
 		$inputs = !empty( $_POST['inputs'] ) ? (array) $_POST['inputs'] : false;
 
-		if (!$inputs)
-			$status = false;
+		if (!$inputs) {
+					$status = false;
+		}
 
 		if( $status ) {
 			$inputs_clone = $inputs;

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

Spacing +137 added lines, -137 removed lines

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

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

 

 /**

  * Fichier du controlleur principal de l'extension de caisse pour WP-Shop / Main controller file for point of sale management plugin

@@ -20,55 +20,55 @@ 
 	 */

 	function __construct() {

 		/**	Declaration des sessions / Call session utilities on init	*/

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

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

 

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

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

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

-		if ( $action == 'wps_bank_deposit' ) {

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

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

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

+		if ($action == 'wps_bank_deposit') {

 			$tab = 'bank_deposit';

 		}

-		if( /* !empty( $page ) && ( 'wps-pos' == $page ) && */ ( empty( $tab ) || $tab == 'dashboard' ) ) {

+		if ( /* !empty( $page ) && ( 'wps-pos' == $page ) && */ (empty($tab) || $tab == 'dashboard') ) {

 			/** Inclusion des différents composants / Include plugin components */

-			require_once( WPSPOS_PATH . 'controller/wps-pos-customer.ctr.php' );

-			require_once( WPSPOS_PATH . 'controller/wps-pos-product.ctr.php' );

-			require_once( WPSPOS_PATH . 'controller/wps-pos-order.ctr.php' );

+			require_once(WPSPOS_PATH . 'controller/wps-pos-customer.ctr.php');

+			require_once(WPSPOS_PATH . 'controller/wps-pos-product.ctr.php');

+			require_once(WPSPOS_PATH . 'controller/wps-pos-order.ctr.php');

 

 			/**	Instanciation des différents composants du logiciel de caisse / Instanciate the different component for POS addon	*/

 			$this->wps_pos_customer = new wps_pos_addon_customer();

 			$this->wps_pos_product = new wps_pos_addon_product();

 			$this->wps_pos_order = new wps_pos_addon_order();

-		} elseif( ( $action == 'wps_bank_deposit' ) || ( $tab == 'bank_deposit' ) ) {

+		} elseif (($action == 'wps_bank_deposit') || ($tab == 'bank_deposit')) {

 

 			/** Inclusion des différents composants / Include plugin components */

-			require_once( WPSPOS_PATH . 'controller/wps-pos-bank-deposit.php' );

-			require_once( WPSPOS_PATH . 'controller/wps-pos-bank-deposit-histo.php' );

+			require_once(WPSPOS_PATH . 'controller/wps-pos-bank-deposit.php');

+			require_once(WPSPOS_PATH . 'controller/wps-pos-bank-deposit-histo.php');

 

 			$this->wps_pos_addon_bank_deposit = new wps_pos_addon_bank_deposit();

 			$this->wps_pos_addon_bank_deposit_histo = new wps_pos_addon_bank_deposit_histo();

 

 			/** AJAX Bank Deposit **/

-			add_action( 'wp_ajax_save_historic_query', array( $this->wps_pos_addon_bank_deposit_histo, 'save_historic_ajax' ) );

+			add_action('wp_ajax_save_historic_query', array($this->wps_pos_addon_bank_deposit_histo, 'save_historic_ajax'));

 		}

 

 		/**	Appel des scripts et styles pour le logiciel de caisse / Include styles and scripts for backend	*/

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

-		add_action( 'admin_print_scripts', array( &$this, 'print_js') );

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

+		add_action('admin_print_scripts', array(&$this, 'print_js'));

 

 		/**	Appel du point d'accroche de création de menu dans l'administration et redéfinition de l'ordre des menus / Define the administration menu with some arrangements for displaying the created menu under wpshop menu	*/

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

-		add_action( 'menu_order', array( $this, 'admin_menu_order' ), 11 );

-		add_action( 'custom_menu_order', array( $this, 'admin_custom_menu_order' ) );

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

+		add_action('menu_order', array($this, 'admin_menu_order'), 11);

+		add_action('custom_menu_order', array($this, 'admin_custom_menu_order'));

 

 		/**	AJAX Definition	*/

 		/**	Recharge la liste d'un élément donné ( client ou produit ) pour une lettre donnée / Load element list corresponding to a given letter	*/

-		add_action( 'wp_ajax_wpspos_load_element_from_letter', array( $this, 'ajax_load_element_from_letter' ) );

-		add_action( 'wp_ajax_wpspos_save_config_barcode_only', array( $this, 'ajax_save_config_barcode_only' ) );

+		add_action('wp_ajax_wpspos_load_element_from_letter', array($this, 'ajax_load_element_from_letter'));

+		add_action('wp_ajax_wpspos_save_config_barcode_only', array($this, 'ajax_save_config_barcode_only'));

 		// add_action( 'wap_ajax_wpspos_state_is_quotation', array( $this, 'ajax_wpspos_state_is_quotation' ) );

 		// add_action( 'wap_ajax_wpspos_state_is_receipt', array( $this, 'ajax_wpspos_state_is_receipt' ) );

 

 		/** Bank deposit Page **/

-		add_action( 'admin_post_wps_bank_deposit', array( 'wps_pos_addon_bank_deposit', 'wps_pos_bank_deposit_output' ) );

+		add_action('admin_post_wps_bank_deposit', array('wps_pos_addon_bank_deposit', 'wps_pos_bank_deposit_output'));

 	}

 

 	/**

@@ -81,17 +81,17 @@ 
 	function admin_assets() {

 		global $wps_pos_addon_menu;

 		$screen = get_current_screen();

-		if ( $screen->id == $wps_pos_addon_menu ) {

-			wp_register_style( 'wpspos-common-styles', WPSPOS_URL . 'assets/css/backend.css', '', WPSPOS_VERSION );

-			wp_enqueue_style( 'wpspos-common-styles' );

+		if ($screen->id == $wps_pos_addon_menu) {

+			wp_register_style('wpspos-common-styles', WPSPOS_URL . 'assets/css/backend.css', '', WPSPOS_VERSION);

+			wp_enqueue_style('wpspos-common-styles');

 

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

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

 

-			if( !empty( $tab ) && $tab == 'bank_deposit' ) {

-				wp_enqueue_script('wpspos-backend-bank-deposit-js',  WPSPOS_URL . 'assets/js/backend_bank_deposit.js', array( 'jquery-ui-datepicker' ), WPSPOS_VERSION);

+			if (!empty($tab) && $tab == 'bank_deposit') {

+				wp_enqueue_script('wpspos-backend-bank-deposit-js', WPSPOS_URL . 'assets/js/backend_bank_deposit.js', array('jquery-ui-datepicker'), WPSPOS_VERSION);

 			} else {

-				wp_enqueue_script('wpspos-backend-js',  WPSPOS_URL . 'assets/js/backend.js', array( 'jquery-form' ), WPSPOS_VERSION);

-				wp_enqueue_script('wpshop_jquery_chosen',  WPSHOP_JS_URL . 'jquery-libs/chosen.jquery.min.js', '', WPSHOP_VERSION);

+				wp_enqueue_script('wpspos-backend-js', WPSPOS_URL . 'assets/js/backend.js', array('jquery-form'), WPSPOS_VERSION);

+				wp_enqueue_script('wpshop_jquery_chosen', WPSHOP_JS_URL . 'jquery-libs/chosen.jquery.min.js', '', WPSHOP_VERSION);

 			}

 		}

 	}

@@ -103,8 +103,8 @@ 
 		global $wps_pos_addon_menu;

 		$screen = get_current_screen();

 

-		if ( $screen->id == $wps_pos_addon_menu ) {

-			require_once( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_PATH . 'assets/', 'js', 'header.js' ) );

+		if ($screen->id == $wps_pos_addon_menu) {

+			require_once(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_PATH . 'assets/', 'js', 'header.js'));

 		}

 	}

 

@@ -114,7 +114,7 @@ 
 	function admin_menu() {

 		global $wps_pos_addon_menu;

 

-		$wps_pos_addon_menu = add_menu_page( __( 'WP-Shop point of sale interface', 'wps-pos-i18n' ), __( 'WP-Shop POS', 'wps-pos-i18n' ), 'manage_options', 'wps-pos', array( $this, 'display_pos' ), 'dashicons-store' );

+		$wps_pos_addon_menu = add_menu_page(__('WP-Shop point of sale interface', 'wps-pos-i18n'), __('WP-Shop POS', 'wps-pos-i18n'), 'manage_options', 'wps-pos', array($this, 'display_pos'), 'dashicons-store');

 	}

 

 	/**

@@ -124,19 +124,19 @@ 
 	 *

 	 * @return array The new admin menu order with the POS addon placed

 	 */

-	function admin_menu_order( $current_menu_order ) {

+	function admin_menu_order($current_menu_order) {

 		/**	Create a new menu order	*/

 		$wps_pos_menu_ordered = array();

 

 		/**	Read the current existing menu order for rearrange it	*/

-		foreach ( $current_menu_order as $menu_item ) {

-			if ( 'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER == $menu_item ) {

+		foreach ($current_menu_order as $menu_item) {

+			if ('edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER == $menu_item) {

 				$wps_pos_menu_ordered[] = 'wps-pos';

 				$wps_pos_menu_ordered[] = 'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER;

 

-				unset( $current_menu_order[ array_search( 'wps-pos', $current_menu_order ) ] );

+				unset($current_menu_order[array_search('wps-pos', $current_menu_order)]);

 			}

-			else if ( 'wps-pos' != $menu_item ) {

+			else if ('wps-pos' != $menu_item) {

 				$wps_pos_menu_ordered[] = $menu_item;

 			}

 		}

@@ -150,7 +150,7 @@ 
 	 * @return boolean A boolean var defining if we apply admin menu reorder for current user

 	 */

 	function admin_custom_menu_order() {

-		return current_user_can( 'manage_options' );

+		return current_user_can('manage_options');

 	}

 

 	/**

@@ -158,35 +158,35 @@ 
 	 */

 	function wps_pos_addon_session() {

 		$session_status = false;

-		if ( function_exists( 'session_status' ) ) {

-			$session_status = ( session_status() !== PHP_SESSION_NONE ? true : false );

+		if (function_exists('session_status')) {

+			$session_status = (session_status() !== PHP_SESSION_NONE ? true : false);

 		}

-		else if ( session_id() == '' ) {

+		else if (session_id() == '') {

 			$session_status = true;

 		}

-		if ( false === $session_status ) {

+		if (false === $session_status) {

 			@session_start();

 		}

 

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

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

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

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

 

-		if ( 'yes' == $new_order ) {

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

-			unset( $_SESSION[ 'wps-pos-addon' ] );

-			delete_user_meta( get_current_user_id(), '_wpshop_persistent_cart' );

+		if ('yes' == $new_order) {

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

+			unset($_SESSION['wps-pos-addon']);

+			delete_user_meta(get_current_user_id(), '_wpshop_persistent_cart');

 			session_destroy();

 

-			wp_safe_redirect( admin_url( 'admin.php?page=wps-pos' ) );

+			wp_safe_redirect(admin_url('admin.php?page=wps-pos'));

 		}

 

-		if( empty( $page ) || ( 'wps-pos' != $page ) ) {

-			unset( $_SESSION[ 'wps-pos-addon' ] );

+		if (empty($page) || ('wps-pos' != $page)) {

+			unset($_SESSION['wps-pos-addon']);

 		}

 

-		add_option( 'wps_pos_options',  array(

+		add_option('wps_pos_options', array(

 			'only_barcode' => 'checked',

-		) );

+		));

 	}

 

 	/**

@@ -196,45 +196,45 @@ 
 		global $wpdb;

 

 		/** Activate Barcode attribute **/

-		if ( false ) {

-			$wpdb->update( WPSHOP_DBT_ATTRIBUTE, array( 'status' => 'valid' ), array( 'code' => 'barcode' ) );

+		if (false) {

+			$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('status' => 'valid'), array('code' => 'barcode'));

 

 			/** Get the product entity id **/

-			$query = $wpdb->prepare( 'SELECT ID FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_name = %s', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);

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

+			$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_name = %s', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);

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

 

 			/** Check the barcode attribute id **/

-			$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE code = %s', 'barcode');

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

+			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s', 'barcode');

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

 

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

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

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

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

 			/** For each attributes groups used for product configuration **/

-			foreach( $products_groups as $products_group ) {

-				$query = $wpdb->prepare( 'SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_GROUP. ' WHERE attribute_set_id = %d AND code = %s', $products_group->id, 'general');

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

-				foreach( $attributes_set_sections as $attributes_set_section ) {

-					$query = $wpdb->prepare( 'SELECT MAX(position) AS max_position FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', $product_entity_id, $products_group->id, $attributes_set_section->id);

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

-

-					$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d AND attribute_id = %d', $product_entity_id, $products_group->id, $attributes_set_section->id, $attribute_barcode_id);

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

+			foreach ($products_groups as $products_group) {

+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d AND code = %s', $products_group->id, 'general');

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

+				foreach ($attributes_set_sections as $attributes_set_section) {

+					$query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', $product_entity_id, $products_group->id, $attributes_set_section->id);

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

+

+					$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d AND attribute_id = %d', $product_entity_id, $products_group->id, $attributes_set_section->id, $attribute_barcode_id);

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

 					/** Insert the barcode attribute details **/

-					if ( !empty ($max_position) && empty($exist_barcode_details_definition) ) {

-						$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $product_entity_id, 'attribute_set_id' => $products_group->id, 'attribute_group_id' => $attributes_set_section->id, 'attribute_id' => $attribute_barcode_id, 'position' => (int)$max_position +1) );

+					if (!empty ($max_position) && empty($exist_barcode_details_definition)) {

+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $product_entity_id, 'attribute_set_id' => $products_group->id, 'attribute_group_id' => $attributes_set_section->id, 'attribute_id' => $attribute_barcode_id, 'position' => (int)$max_position + 1));

 					}

 				}

 			}

 		}

 

 		/** Activate Barcode for search **/

-		$wpdb->update( WPSHOP_DBT_ATTRIBUTE, array('is_used_for_sort_by' => 'yes', 'is_used_in_quick_add_form' => 'yes'), array('code' => 'barcode') );

+		$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_for_sort_by' => 'yes', 'is_used_in_quick_add_form' => 'yes'), array('code' => 'barcode'));

 

 		/** Activate attribute for the product quick add form **/

-		$price_piloting_option = get_option( 'wpshop_shop_price_piloting' );

-		$code = ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? 'price_ht' : 'product_price';

-		$wpdb->update( WPSHOP_DBT_ATTRIBUTE, array( 'is_used_in_quick_add_form' => 'yes'), array('code' => $code)  );

-		$wpdb->update( WPSHOP_DBT_ATTRIBUTE, array( 'is_used_in_quick_add_form' => 'yes'), array('code' => 'tx_tva' )  );

+		$price_piloting_option = get_option('wpshop_shop_price_piloting');

+		$code = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? 'price_ht' : 'product_price';

+		$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_quick_add_form' => 'yes'), array('code' => $code));

+		$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('is_used_in_quick_add_form' => 'yes'), array('code' => 'tx_tva'));

 

 		/** Check If Shop Customer attribute set exist - Deprecated **/

 		/* $customer_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS );

@@ -243,7 +243,7 @@ 
 

 		$exist_attribute_group = 'Nope';

 

-		if ( empty($exist_attribute_group) ) {

+		if (empty($exist_attribute_group)) {

 			/** Create a Attributes Group for POS Customer infos **/

 			$wpdb->insert(

 				WPSHOP_DBT_ATTRIBUTE_SET,

@@ -265,7 +265,7 @@ 
 					'creation_date' => current_time('mysql', 0),

 					'last_update_date' => current_time('mysql', 0),

 					'attribute_set_id' => $attribute_set_id,

-					'code' => sanitize_title( __('Shop Customer main infos', 'wps-pos-i18n') ),

+					'code' => sanitize_title(__('Shop Customer main infos', 'wps-pos-i18n')),

 					'name' => __('Shop Customer main infos', 'wps-pos-i18n')

 				)

 			);

@@ -277,17 +277,17 @@ 
 					'creation_date' => current_time('mysql', 0),

 					'last_update_date' => current_time('mysql', 0),

 					'attribute_set_id' => $attribute_set_id,

-					'code' => sanitize_title( __('Shop Customer address infos', 'wps-pos-i18n') ),

+					'code' => sanitize_title(__('Shop Customer address infos', 'wps-pos-i18n')),

 					'name' => __('Shop Customer address infos', 'wps-pos-i18n')

 				)

 			);

 			$address_set_id = $wpdb->insert_id;

 			/** Affect Attributes **/

-			$attributes = array( 'last_name' => $main_set_id, 'first_name' => $main_set_id, 'address_last_name' => $main_set_id, 'address_first_name' => $main_set_id, 'address_user_email' => $main_set_id, 'address' => $address_set_id, 'postcode' => $address_set_id, 'city' => $address_set_id, 'phone' => $address_set_id);

+			$attributes = array('last_name' => $main_set_id, 'first_name' => $main_set_id, 'address_last_name' => $main_set_id, 'address_first_name' => $main_set_id, 'address_user_email' => $main_set_id, 'address' => $address_set_id, 'postcode' => $address_set_id, 'city' => $address_set_id, 'phone' => $address_set_id);

 			$i = 1;

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

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

-				if ( !empty($attribute_def) ) {

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

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

+				if (!empty($attribute_def)) {

 					$wpdb->insert(

 						WPSHOP_DBT_ATTRIBUTE_DETAILS,

 						array(

@@ -307,32 +307,32 @@ 
 		}

 

 		$user_name = 'default_customer';

-		$user_id = username_exists( $user_name );

-		if ( !$user_id ) {

-			$random_password = wp_generate_password( $length = 12, $include_standard_special_chars=false );

-			$user_id = wp_create_user( $user_name, $random_password, 'client_defaut@wpshop.fr' );

-

-			if ( !empty($user_id) ) {

-				update_user_meta($user_id, 'last_name', __('Default', 'wps-pos-i18n') );

-				update_user_meta($user_id, 'first_name', __('Customer', 'wps-pos-i18n') );

+		$user_id = username_exists($user_name);

+		if (!$user_id) {

+			$random_password = wp_generate_password($length = 12, $include_standard_special_chars = false);

+			$user_id = wp_create_user($user_name, $random_password, 'client_defaut@wpshop.fr');

+

+			if (!empty($user_id)) {

+				update_user_meta($user_id, 'last_name', __('Default', 'wps-pos-i18n'));

+				update_user_meta($user_id, 'first_name', __('Customer', 'wps-pos-i18n'));

 				/** Add the default customer id in Option table **/

 				update_option('wpshop_pos_addon_default_customer_id', $user_id);

 			}

 		}

 

 		/** Get post of user id */

-		$customers_associated_to_user = get_posts( array (

+		$customers_associated_to_user = get_posts(array(

 			'post_status' => 'draft',

 			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS,

 			'author' => $user_id,

-		) );

-		$customer_id = !empty( $customers_associated_to_user ) && !empty( $customers_associated_to_user[ 0 ] ) && !empty( $customers_associated_to_user[ 0 ]->ID ) ? $customers_associated_to_user[ 0 ]->ID : null;

+		));

+		$customer_id = !empty($customers_associated_to_user) && !empty($customers_associated_to_user[0]) && !empty($customers_associated_to_user[0]->ID) ? $customers_associated_to_user[0]->ID : null;

 

 		$customer_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);

 

-		if ( !empty( $customer_id ) ) {

+		if (!empty($customer_id)) {

 			/** Insert attribute data */

-			wpshop_attributes::saveAttributeForEntity( array(

+			wpshop_attributes::saveAttributeForEntity(array(

 				'varchar' => array(

 					'last_name' => __('Default', 'wps-pos-i18n'),

 					'first_name' => __('Customer', 'wps-pos-i18n'),

@@ -345,7 +345,7 @@ 
 					'city' => __('Default city'),

 					'phone' => '0000000042',

 				),

-			),  $customer_entity_id, $customer_id );

+			), $customer_entity_id, $customer_id);

 		}

 	}

 

@@ -357,14 +357,14 @@ 
 		$module_folder = WPSPOS_PATH . 'modules/';

 

 		/**	Check if the defined directory exists for reading and including the different modules	*/

-		if( is_dir( $module_folder ) ) {

-			$parent_folder_content = scandir( $module_folder );

-			foreach ( $parent_folder_content as $folder ) {

-				if ( $folder && substr( $folder, 0, 1) != '.' && is_dir( $module_folder . $folder ) ) {

-					$child_folder_content = scandir( $module_folder . $folder );

-					if ( file_exists( $module_folder . $folder . '/' . $folder . '.php') ) {

-						$f =  $module_folder . $folder . '/' . $folder . '.php';

-						include( $f );

+		if (is_dir($module_folder)) {

+			$parent_folder_content = scandir($module_folder);

+			foreach ($parent_folder_content as $folder) {

+				if ($folder && substr($folder, 0, 1) != '.' && is_dir($module_folder . $folder)) {

+					$child_folder_content = scandir($module_folder . $folder);

+					if (file_exists($module_folder . $folder . '/' . $folder . '.php')) {

+						$f = $module_folder . $folder . '/' . $folder . '.php';

+						include($f);

 					}

 				}

 			}

@@ -376,25 +376,25 @@ 
 	 */

 	function display_pos() {

 		/**	Define the current step for current order	*/

-		$default_customer_id = get_option( 'wpshop_pos_addon_default_customer_id' );

+		$default_customer_id = get_option('wpshop_pos_addon_default_customer_id');

 		$default_user_exists = false;

-		if ( !empty( $default_customer_id ) ) {

-			$default_user = get_user_by( 'id', $default_customer_id );

-			if ( false !== $default_user ) {

+		if (!empty($default_customer_id)) {

+			$default_user = get_user_by('id', $default_customer_id);

+			if (false !== $default_user) {

 				$default_user_exists = true;

 			}

 		}

 

-		if ( !empty( $default_user_exists ) ) {

+		if (!empty($default_user_exists)) {

 			$current_step = 2;

-			$_SESSION[ 'cart' ][ 'customer_id' ] = $default_customer_id;

+			$_SESSION['cart']['customer_id'] = $default_customer_id;

 		}

 		else {

 			$current_step = 0;

-			$_SESSION[ 'cart' ][ 'customer_id' ] = null;

+			$_SESSION['cart']['customer_id'] = null;

 		}

 

-		require_once( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend', 'pos' ) );

+		require_once(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend', 'pos'));

 	}

 

 	/**

@@ -402,9 +402,9 @@ 
 	 */

 	function ajax_load_element_from_letter() {

 

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

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

 

-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_load_element_from_letter' ) )

+		if (!wp_verify_nonce($_wpnonce, 'ajax_load_element_from_letter'))

 			wp_die();

 

 		$response = array(

@@ -412,37 +412,37 @@ 
 			'output' => __('An error occured', 'wps-pos-i18n'),

 		);

 

-		$alphabet = unserialize( WPSPOS_ALPHABET_LETTERS );

-		$letter = !empty( $_POST['term'] ) && in_array( $_POST['term'], $alphabet )	? sanitize_text_field( $_POST['term'] ) : null;

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

-		$response[ 'element_type' ] = $element_type;

+		$alphabet = unserialize(WPSPOS_ALPHABET_LETTERS);

+		$letter = !empty($_POST['term']) && in_array($_POST['term'], $alphabet) ? sanitize_text_field($_POST['term']) : null;

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

+		$response['element_type'] = $element_type;

 

-		if ( !empty( $letter ) ) {

+		if (!empty($letter)) {

 			$error_message = '';

-			switch ( $element_type ) {

+			switch ($element_type) {

 				case 'customer':

-					$result = $this->wps_pos_customer->display_customer_list( $letter );

+					$result = $this->wps_pos_customer->display_customer_list($letter);

 					break;

 				case 'product':

 					$wps_pos_product = new wps_pos_addon_product();

-					$result = $this->wps_pos_product->get_product_table_by_alphabet( $letter );

+					$result = $this->wps_pos_product->get_product_table_by_alphabet($letter);

 					break;

 			}

 

-			if ( empty( $result ) ) {

-				$response[ 'output' ] = sprintf( __( 'Nothing found in %s for letter %s', 'wps-pos-i18n' ), __( $element_type, 'wps-pos-i18n' ), $letter);

+			if (empty($result)) {

+				$response['output'] = sprintf(__('Nothing found in %s for letter %s', 'wps-pos-i18n'), __($element_type, 'wps-pos-i18n'), $letter);

 			}

 			else {

-				$response[ 'status' ] = true;

-				$response[ 'output' ] = $result;

+				$response['status'] = true;

+				$response['output'] = $result;

 			}

 

 		}

 		else {

-			$response[ 'output' ] = sprintf( __( 'THe requested term (%s) to search is invalid. Please check your request and try again', 'wps-pos-i18n' ), $letter );

+			$response['output'] = sprintf(__('THe requested term (%s) to search is invalid. Please check your request and try again', 'wps-pos-i18n'), $letter);

 		}

 

-		wp_die( json_encode( $response ) );

+		wp_die(json_encode($response));

 	}

 

 	/**

@@ -450,16 +450,16 @@ 
 	 */

 	function ajax_save_config_barcode_only() {

 

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

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

 

-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_save_config_barcode_only' ) )

+		if (!wp_verify_nonce($_wpnonce, 'ajax_save_config_barcode_only'))

 			wp_die();

 

 		$option = 'wps_pos_options';

-		$values = get_option( $option );

-		if ( !empty( $values['only_barcode'] ) ) {

-			$values['only_barcode'] = !empty( $_POST['value_checkbox'] ) ? sanitize_text_field( $_POST['value_checkbox' ] ) : '';

-	  	update_option( $option, $values );

+		$values = get_option($option);

+		if (!empty($values['only_barcode'])) {

+			$values['only_barcode'] = !empty($_POST['value_checkbox']) ? sanitize_text_field($_POST['value_checkbox']) : '';

+	  	update_option($option, $values);

 		}

 		wp_die();

 	}

Braces +14 added lines, -15 removed lines

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

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

 /**

  * Fichier du controlleur principal de l'extension de caisse pour WP-Shop / Main controller file for point of sale management plugin

@@ -135,8 +137,7 @@ 
 				$wps_pos_menu_ordered[] = 'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER;

 

 				unset( $current_menu_order[ array_search( 'wps-pos', $current_menu_order ) ] );

-			}

-			else if ( 'wps-pos' != $menu_item ) {

+			} else if ( 'wps-pos' != $menu_item ) {

 				$wps_pos_menu_ordered[] = $menu_item;

 			}

 		}

@@ -160,8 +161,7 @@ 
 		$session_status = false;

 		if ( function_exists( 'session_status' ) ) {

 			$session_status = ( session_status() !== PHP_SESSION_NONE ? true : false );

-		}

-		else if ( session_id() == '' ) {

+		} else if ( session_id() == '' ) {

 			$session_status = true;

 		}

 		if ( false === $session_status ) {

@@ -388,8 +388,7 @@ 
 		if ( !empty( $default_user_exists ) ) {

 			$current_step = 2;

 			$_SESSION[ 'cart' ][ 'customer_id' ] = $default_customer_id;

-		}

-		else {

+		} else {

 			$current_step = 0;

 			$_SESSION[ 'cart' ][ 'customer_id' ] = null;

 		}

@@ -404,8 +403,9 @@ 
 

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

 

-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_load_element_from_letter' ) )

-			wp_die();

+		if ( !wp_verify_nonce( $_wpnonce, 'ajax_load_element_from_letter' ) ) {
+					wp_die();
+		}
 

 		$response = array(

 			'status' => false,

@@ -431,14 +431,12 @@ 
 

 			if ( empty( $result ) ) {

 				$response[ 'output' ] = sprintf( __( 'Nothing found in %s for letter %s', 'wps-pos-i18n' ), __( $element_type, 'wps-pos-i18n' ), $letter);

-			}

-			else {

+			} else {

 				$response[ 'status' ] = true;

 				$response[ 'output' ] = $result;

 			}

 

-		}

-		else {

+		} else {

 			$response[ 'output' ] = sprintf( __( 'THe requested term (%s) to search is invalid. Please check your request and try again', 'wps-pos-i18n' ), $letter );

 		}

 

@@ -452,8 +450,9 @@ 
 

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

 

-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_save_config_barcode_only' ) )

-			wp_die();

+		if ( !wp_verify_nonce( $_wpnonce, 'ajax_save_config_barcode_only' ) ) {
+					wp_die();
+		}
 

 		$option = 'wps_pos_options';

 		$values = get_option( $option );

includes/modules/wps-pos-addon/controller/wps-pos-product.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 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,34 +147,34 @@ 
 	 * 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() {

-		check_ajax_referer( 'ajax_pos_product_variation_selection' );

+		check_ajax_referer('ajax_pos_product_variation_selection');

 

 		/**	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();

 	}

 

@@ -182,67 +182,67 @@ 
 	 * 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();

 

-		$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 ) ) {

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

+		if (!empty($term)) {

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

 

 			$wps_product_mdl = new wps_product_mdl();

-			$results = $wps_product_mdl->get_products_by_title_or_barcode( $term, !empty( $search_in ) && 'only_barcode' == $search_in );

+			$results = $wps_product_mdl->get_products_by_title_or_barcode($term, !empty($search_in) && 'only_barcode' == $search_in);

 

-			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) ) {

+			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 +13 added lines, -13 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';

 

@@ -184,8 +186,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();
+		}
 

 		$term = !empty( $_POST ) && !empty( $_POST[ 'term' ] ) ? sanitize_text_field( $_POST[ 'term' ] ) : null;

 		$response = array(

@@ -216,13 +219,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;

@@ -231,8 +232,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_help/controller/wps_help_bubble_ctr.php

Spacing +66 added lines, -66 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Main controller file for wpshop help
  *
@@ -19,45 +19,45 @@ 
 	 */
 	function __construct() {
 		/**	Call style & javascript for administration	*/
-		add_action( 'admin_enqueue_scripts', array( &$this, 'admin_scripts' ) );
+		add_action('admin_enqueue_scripts', array(&$this, 'admin_scripts'));
 
 		/**	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_scripts() {
-		wp_enqueue_style( 'wp-pointer' );
-		wp_enqueue_script( 'wp-pointer' );
+		wp_enqueue_style('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));
 	}
 
 	/**
@@ -70,118 +70,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_NEWTYPE_IDENTIFIER_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 :
@@ -189,7 +189,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'));
 				}
 			}
 		}

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_NEWTYPE_IDENTIFIER_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'));
 				}
 			}
 		}