Eoxia / wpshop

includes/modules/wps_customer/modules/wps_customer_quick_add/controller/wps_customer_quick_add.ctr.php

Spacing +46 added lines, -46 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Fichier du controlleur principal du module de création de client rapide / Controller file for quick customer creation
  *
@@ -19,8 +19,8 @@ 
 	 */
 	public function __construct() {
 		/**	Affiche un formulaire permettant de créer un client / Display a form allowing to add a new customer	*/
-		add_action( 'wp_ajax_wps-customer-quick-creation', array( $this, 'customer_creation' ) );
-		add_action( 'wp_ajax_wps-customer-quick-add', array( $this, 'create_customer' ) );
+		add_action('wp_ajax_wps-customer-quick-creation', array($this, 'customer_creation'));
+		add_action('wp_ajax_wps-customer-quick-add', array($this, 'create_customer'));
 	}
 
 
@@ -28,20 +28,20 @@ 
 	 * AJAX - Charge le fomulaire d'ajout rapide d'un client / Load the form for new customer quick add
 	 */
 	function customer_creation() {
-		$_wpnonce = sanitize_key( $_REQUEST['wps-nonce'] );
-		if ( !wp_verify_nonce( $_wpnonce, 'wps-customer-quick-nonce' ) )
+		$_wpnonce = sanitize_key($_REQUEST['wps-nonce']);
+		if (!wp_verify_nonce($_wpnonce, 'wps-customer-quick-nonce'))
 			wp_die();
 		global $wpdb;
 
-		$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-		$query = $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_type = %s AND post_author = %d", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, get_current_user_id() );
-		$cid = $wpdb->get_var( $query );
+		$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+		$query = $wpdb->prepare("SELECT ID FROM {$wpdb->posts} WHERE post_type = %s AND post_author = %d", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, get_current_user_id());
+		$cid = $wpdb->get_var($query);
 
-		$customer_attribute_set = !empty( $_GET ) && !empty( $_GET[ 'customer_set_id' ] ) ? (int)$_GET[ 'customer_set_id' ] : null;
+		$customer_attribute_set = !empty($_GET) && !empty($_GET['customer_set_id']) ? (int)$_GET['customer_set_id'] : null;
 
-		$customer_attributes = wpshop_attributes_set::getAttributeSetDetails( $customer_attribute_set, "'valid'");
+		$customer_attributes = wpshop_attributes_set::getAttributeSetDetails($customer_attribute_set, "'valid'");
 
-		require_once( wpshop_tools::get_template_part( WPSCLTQUICK_DIR, WPSCLTQUICK_TEMPLATES_MAIN_DIR, "backend", "customer", "creation" ) );
+		require_once(wpshop_tools::get_template_part(WPSCLTQUICK_DIR, WPSCLTQUICK_TEMPLATES_MAIN_DIR, "backend", "customer", "creation"));
 		wp_die( );
 	}
 
@@ -50,41 +50,41 @@ 
 	 * AJAX - Création d'un nouveau client / Create a new customer
 	 */
 	function create_customer() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'create_customer' ) )
+		if (!wp_verify_nonce($_wpnonce, 'create_customer'))
 			wp_die();
 
 
 		global $wpdb;
 		$response = array(
 			'status' => false,
-			'output' => __( 'An error occured while saving customer', 'wpshop' ),
+			'output' => __('An error occured while saving customer', 'wpshop'),
 			'customer_id' => -1,
 		);
 
 		/**	Check if a attribute set id have been sended in order to check if therer are some check to do on sended input	*/
-		$customer_attributes = wpshop_attributes_set::getAttributeSetDetails( (int)$_POST[ 'wps-customer-account-set-id' ], "'valid'");
-		$attribute = !empty( $_POST['attribute'] ) ? (array)$_POST['attribute'] : array();
+		$customer_attributes = wpshop_attributes_set::getAttributeSetDetails((int)$_POST['wps-customer-account-set-id'], "'valid'");
+		$attribute = !empty($_POST['attribute']) ? (array)$_POST['attribute'] : array();
 		/**	Read sended values for checking	*/
 		$email_founded = false;
 		$email_field = $last_name_field = $first_name_field = '';
 
-		foreach ( $attribute as $attribute_type => $attributes ) {
-			foreach ( $attributes as $attribute_code => $attribute_value ) {
-				$query = $wpdb->prepare( "SELECT frontend_verification FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s", $attribute_code );
-				$current_attribute = $wpdb->get_var( $query );
+		foreach ($attribute as $attribute_type => $attributes) {
+			foreach ($attributes as $attribute_code => $attribute_value) {
+				$query = $wpdb->prepare("SELECT frontend_verification FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code = %s", $attribute_code);
+				$current_attribute = $wpdb->get_var($query);
 
-				if ( 'email' == $current_attribute ) {
+				if ('email' == $current_attribute) {
 					$email_founded = true;
 					$email_field = $attribute_code;
 					$email_field_type = $attribute_type;
 				}
-				else if ( strpos( $attribute_code, 'last_name')) {
+				else if (strpos($attribute_code, 'last_name')) {
 					$last_name_field = $attribute_code;
 					$last_name_field_type = $attribute_type;
 				}
-				else if ( strpos( $attribute_code, 'first_name')) {
+				else if (strpos($attribute_code, 'first_name')) {
 					$first_name_field = $attribute_code;
 					$first_name_field_type = $attribute_type;
 				}
@@ -92,57 +92,57 @@ 
 		}
 
 		/**	Define customer email field value	*/
-		$customer_email = sanitize_email( $attribute[ $email_field_type ][ $email_field ] );
-		$customer_last_name = !empty( $attribute ) && !empty( $attribute[ $last_name_field_type ] ) && !empty( $attribute[ $last_name_field_type ][ $last_name_field ] ) ? sanitize_text_field( $attribute[ $last_name_field_type ][ $last_name_field ] ) : '';
-		$customer_first_name = !empty( $attribute ) && !empty( $attribute[ $first_name_field_type ] ) && !empty( $attribute[ $first_name_field_type ][ $first_name_field ] ) ? sanitize_text_field( $attribute[ $first_name_field_type ][ $first_name_field ] ) : '';
+		$customer_email = sanitize_email($attribute[$email_field_type][$email_field]);
+		$customer_last_name = !empty($attribute) && !empty($attribute[$last_name_field_type]) && !empty($attribute[$last_name_field_type][$last_name_field]) ? sanitize_text_field($attribute[$last_name_field_type][$last_name_field]) : '';
+		$customer_first_name = !empty($attribute) && !empty($attribute[$first_name_field_type]) && !empty($attribute[$first_name_field_type][$first_name_field]) ? sanitize_text_field($attribute[$first_name_field_type][$first_name_field]) : '';
 
-		if ( $email_founded && is_email( $customer_email ) ) {
+		if ($email_founded && is_email($customer_email)) {
 			/**	Check if current e-mail address does not already exists	*/
-			$user_id = username_exists( $customer_email );
-			if ( empty( $user_id ) ) {
+			$user_id = username_exists($customer_email);
+			if (empty($user_id)) {
 
 				/**	Create the user with a random password	*/
-				$random_password = wp_generate_password( 12, false );
-				$user_id = wp_create_user( $customer_email, $random_password, $customer_email );
+				$random_password = wp_generate_password(12, false);
+				$user_id = wp_create_user($customer_email, $random_password, $customer_email);
 
-				if ( !is_wp_error( $user_id ) ) {
-					update_user_meta( $user_id, 'last_name', $customer_last_name );
-					update_user_meta( $user_id, 'first_name', $customer_first_name );
+				if (!is_wp_error($user_id)) {
+					update_user_meta($user_id, 'last_name', $customer_last_name);
+					update_user_meta($user_id, 'first_name', $customer_first_name);
 
 					/**	Build a response for customer first letter - Specific action (POS)	*/
-					if ( !empty($customer_last_name) ) {
+					if (!empty($customer_last_name)) {
 						$field_for_letter = $customer_last_name;
 					}
-					elseif( !empty($customer_first_name)  ) {
+					elseif (!empty($customer_first_name)) {
 						$field_for_letter = $customer_first_name;
 					}
 					else {
 						$field_for_letter = $customer_email;
 					}
-					$response[ 'letter' ] = substr( $field_for_letter, 0, 1);
+					$response['letter'] = substr($field_for_letter, 0, 1);
 
 					/**	Build response	*/
-					$response[ 'status' ] = true;
-					$response[ 'output' ] = __('Customer created succesfully', 'wpshop');
+					$response['status'] = true;
+					$response['output'] = __('Customer created succesfully', 'wpshop');
 
 					/** Create customer address from sended data **/
 					// $_REQUEST['user']['customer_id'] = (int)$user_id;
 					$attribute_to_save = $attribute;
-					$wps_customer_account_set_id = !empty( $_POST[ 'wps-customer-account-set-id' ] ) ? (int) $_POST[ 'wps-customer-account-set-id' ] : 0;
-					$attribute[ $wps_customer_account_set_id ] = $attribute_to_save;
-					wps_address::save_address_infos( $wps_customer_account_set_id );
+					$wps_customer_account_set_id = !empty($_POST['wps-customer-account-set-id']) ? (int)$_POST['wps-customer-account-set-id'] : 0;
+					$attribute[$wps_customer_account_set_id] = $attribute_to_save;
+					wps_address::save_address_infos($wps_customer_account_set_id);
 				}
 			}
 			else {
-				$response[ 'output' ] = __('An account is already created with this e-mail address', 'wpshop');
+				$response['output'] = __('An account is already created with this e-mail address', 'wpshop');
 			}
-			$response[ 'customer_id' ] = $user_id;
+			$response['customer_id'] = $user_id;
 		}
 		else {
-			$response[ 'output' ] = __('An email address is required', 'wpshop');
+			$response['output'] = __('An email address is required', 'wpshop');
 		}
 
-		wp_die( json_encode( $response ) );
+		wp_die(json_encode($response));
 	}
 
 }

Braces +15 added lines, -17 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier du controlleur principal du module de création de client rapide / Controller file for quick customer creation
  *
@@ -29,8 +31,9 @@ 
 	 */
 	function customer_creation() {
 		$_wpnonce = sanitize_key( $_REQUEST['wps-nonce'] );
-		if ( !wp_verify_nonce( $_wpnonce, 'wps-customer-quick-nonce' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps-customer-quick-nonce' ) ) {
+					wp_die();
+		}
 		global $wpdb;
 
 		$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
@@ -52,8 +55,9 @@ 
 	function create_customer() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'create_customer' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'create_customer' ) ) {
+					wp_die();
+		}
 
 
 		global $wpdb;
@@ -79,12 +83,10 @@ 
 					$email_founded = true;
 					$email_field = $attribute_code;
 					$email_field_type = $attribute_type;
-				}
-				else if ( strpos( $attribute_code, 'last_name')) {
+				} else if ( strpos( $attribute_code, 'last_name')) {
 					$last_name_field = $attribute_code;
 					$last_name_field_type = $attribute_type;
-				}
-				else if ( strpos( $attribute_code, 'first_name')) {
+				} else if ( strpos( $attribute_code, 'first_name')) {
 					$first_name_field = $attribute_code;
 					$first_name_field_type = $attribute_type;
 				}
@@ -112,11 +114,9 @@ 
 					/**	Build a response for customer first letter - Specific action (POS)	*/
 					if ( !empty($customer_last_name) ) {
 						$field_for_letter = $customer_last_name;
-					}
-					elseif( !empty($customer_first_name)  ) {
+					} elseif( !empty($customer_first_name)  ) {
 						$field_for_letter = $customer_first_name;
-					}
-					else {
+					} else {
 						$field_for_letter = $customer_email;
 					}
 					$response[ 'letter' ] = substr( $field_for_letter, 0, 1);
@@ -132,13 +132,11 @@ 
 					$attribute[ $wps_customer_account_set_id ] = $attribute_to_save;
 					wps_address::save_address_infos( $wps_customer_account_set_id );
 				}
-			}
-			else {
+			} else {
 				$response[ 'output' ] = __('An account is already created with this e-mail address', 'wpshop');
 			}
 			$response[ 'customer_id' ] = $user_id;
-		}
-		else {
+		} else {
 			$response[ 'output' ] = __('An email address is required', 'wpshop');
 		}
 

includes/modules/wps_address/templates/frontend/address-first.php

Spacing +5 added lines, -5 removed lines

@@ -1,15 +1,15 @@
-<div class="wps-<?php echo $address_type; ?>-address" <?php if ( !empty( $first_address_checking ) && !$is_from_admin && $type == 'billing' ) { echo 'style="display: none;"'; } ?> data-nonce="<?php echo wp_create_nonce( 'wps_reload_address_interface' ); ?>" id="wps-address-container-<?php echo $address_type_id; ?>">
+<div class="wps-<?php echo $address_type; ?>-address" <?php if (!empty($first_address_checking) && !$is_from_admin && $type == 'billing') { echo 'style="display: none;"'; } ?> data-nonce="<?php echo wp_create_nonce('wps_reload_address_interface'); ?>" id="wps-address-container-<?php echo $address_type_id; ?>">
 	<div id="wps_address_error_container" ></div>
-	<form id="wps_address_form_save_first_address" action="<?php echo admin_url( 'admin-ajax.php' ); ?>" method="post">
+	<form id="wps_address_form_save_first_address" action="<?php echo admin_url('admin-ajax.php'); ?>" method="post">
 <?php
-		echo self::display_form_fields( $address_type_id, '', '', '', array(), array(), array(), get_current_user_id() );
+		echo self::display_form_fields($address_type_id, '', '', '', array(), array(), array(), get_current_user_id());
 
 	/** Check if a billing address is already save **/
-	if ( $address_type_id != $billing_option['choice'] ) :
+	if ($address_type_id != $billing_option['choice']) :
 ?>
 		<label class="wps-form" >
 			<input name="wps-shipping-to-billing" id="wps-shipping_to_billing" checked="checked" type="checkbox" />
-			<?php _e( 'Use the same address for billing', 'wpshop' ); ?>
+			<?php _e('Use the same address for billing', 'wpshop'); ?>
 		</label>
 <?php endif; ?>
 

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

Spacing +40 added lines, -40 removed lines

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

Braces +12 added lines, -7 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier du controlleur principal du module de création de produit rapide / Controller file for quick product creation
  *
@@ -39,8 +41,9 @@ 
 	 */
 	function product_creation() {
 		$_wpnonce = !empty( $_POST['wps-nonce'] ) ? sanitize_text_field( $_POST['wps-nonce'] ) : '';
-		if ( !wp_verify_nonce( $_wpnonce, 'wps-product-quick-nonce' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps-product-quick-nonce' ) ) {
+					wp_die();
+		}
 
 		require_once( wpshop_tools::get_template_part( WPSPDTQUICK_DIR, WPSPDTQUICK_TEMPLATES_MAIN_DIR, "backend", "product_creation" ) );
 		wp_die( );
@@ -52,8 +55,9 @@ 
 	function attribute_list_reload() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'attribute_list_reload' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'attribute_list_reload' ) ) {
+					wp_die();
+		}
 
 		$attribute_set = !empty( $_POST['attribute_set'] ) ? (int) $_POST['attribute_set'] : 0;
 		$this->display_attribute( $attribute_set );
@@ -66,8 +70,9 @@ 
 	function create_product() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'create_product' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'create_product' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$response = array(

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

Spacing +19 added lines, -19 removed lines

@@ -1,27 +1,27 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if( !empty($products) ) : ?>
+<?php if (!defined('ABSPATH')) exit;
+ if (!empty($products)) : ?>
 	<?php $tab_def = array(); ?>
 	<?php
-		foreach( $quick_add_form_attributes as $id_att => $att ) {
+		foreach ($quick_add_form_attributes as $id_att => $att) {
 			$tab_def[$id_att]['name'] = $att['frontend_label'];
 		}
 	?>
 
-	<form method="post" id="wps_mass_edit_product_form" action="<?php echo admin_url( 'admin-ajax.php' ); ?>">
+	<form method="post" id="wps_mass_edit_product_form" action="<?php echo admin_url('admin-ajax.php'); ?>">
 		<input type="hidden" name="action" value="wps_mass_edit_product_save_action" />
-    <?php wp_nonce_field( 'wps_save_product_quick_interface' ); ?>
+    <?php wp_nonce_field('wps_save_product_quick_interface'); ?>
 		<table class="wp-list-table widefat wps-product-mass-interface-table">
 			<thead>
 				<tr>
 					<th class="check-column manage-column column-cb check-column">
 						<input type="checkbox" class="wps-save-product-checkbox" name="wps_product_quick_save_checkbox_column" />
 					</th>
-					<th><?php _e( 'Picture', 'wpshop'); ?></th>
-					<th class="title"><?php _e( 'Title', 'wpshop'); ?></th>
-					<th class="description"><?php _e( 'Description', 'wpshop'); ?></th>
+					<th><?php _e('Picture', 'wpshop'); ?></th>
+					<th class="title"><?php _e('Title', 'wpshop'); ?></th>
+					<th class="description"><?php _e('Description', 'wpshop'); ?></th>
 					<?php /*<th width="80"><?php _e( 'Files', 'wpshop'); ?></th>*/ ?>
-					<?php if( !empty($tab_def) ) : ?>
-					<?php foreach( $tab_def as $col ) : ?>
+					<?php if (!empty($tab_def)) : ?>
+					<?php foreach ($tab_def as $col) : ?>
 						<th ><?php echo $col['name']; ?></th>
 					<?php endforeach; ?>
 					<?php endif; ?>
@@ -31,12 +31,12 @@ 
 
 			<?php
 				$i = 1;
-				foreach( $products as $product ) :
-					$product_attribute_set_id = get_post_meta( $product['post_datas']->ID, '_wpshop_product_attribute_set_id', true );
+				foreach ($products as $product) :
+					$product_attribute_set_id = get_post_meta($product['post_datas']->ID, '_wpshop_product_attribute_set_id', true);
 					$class = ($i % 2) ? 'alternate' : '';
 			?>
 
-			<?php require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "product_line" ) ); ?>
+			<?php require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "product_line")); ?>
 
 			<?php
 				$i++;
@@ -47,12 +47,12 @@ 
 					<th class="check-column manage-column column-cb check-column">
 						<input type="checkbox" class="wps-save-product-checkbox" name="wps_product_quick_save_checkbox_column" />
 					</th>
-					<th><?php _e( 'Picture', 'wpshop'); ?></th>
-					<th><?php _e( 'Title', 'wpshop'); ?></th>
-					<th><?php _e( 'Description', 'wpshop'); ?></th>
+					<th><?php _e('Picture', 'wpshop'); ?></th>
+					<th><?php _e('Title', 'wpshop'); ?></th>
+					<th><?php _e('Description', 'wpshop'); ?></th>
 					<?php /*<th width="80"><?php _e( 'Files', 'wpshop'); ?></th>*/ ?>
-					<?php if( !empty($tab_def) ) : ?>
-					<?php foreach( $tab_def as $col ) : ?>
+					<?php if (!empty($tab_def)) : ?>
+					<?php foreach ($tab_def as $col) : ?>
 						<th><?php echo $col['name']; ?></th>
 					<?php endforeach; ?>
 					<?php endif; ?>
@@ -64,5 +64,5 @@ 
 		jQuery("select.chosen_select").chosen( WPSHOP_CHOSEN_ATTRS );
 	} );</script>
 <?php else: ?>
-	<div class="wps-alert-info"><?php _e( 'You don\'t have any product for the moment', 'wpshop' ); ?></div>
+	<div class="wps-alert-info"><?php _e('You don\'t have any product for the moment', 'wpshop'); ?></div>
 <?php endif; ?>

Braces +8 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  if( !empty($products) ) : ?>
 	<?php $tab_def = array(); ?>
 	<?php
@@ -63,6 +65,9 @@ 
 	<script type="text/javascript" >jQuery( document ).ready( function(){
 		jQuery("select.chosen_select").chosen( WPSHOP_CHOSEN_ATTRS );
 	} );</script>
-<?php else: ?>
-	<div class="wps-alert-info"><?php _e( 'You don\'t have any product for the moment', 'wpshop' ); ?></div>
+<?php else {
+	: ?>
+	<div class="wps-alert-info"><?php _e( 'You don\'t have any product for the moment', 'wpshop' );
+}
+?></div>
 <?php endif; ?>

includes/modules/wps_cart/templates/frontend/cart/cart-total.php

Spacing +75 added lines, -75 removed lines

@@ -1,29 +1,29 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wps-cart-cartouche">
 	<div class="wps-cart-message">
-		<?php if( $cart_type != 'admin-panel' ) : ?>
-			<?php if ( !empty($cart_type) && $cart_type == 'summary' && !$account_origin ) : ?>
-				<?php $url_step_one = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_checkout_page_id') ) ); ?>
-				<?php printf( __( 'You have forget an item ? <a href="%s">Modify your cart !</a>', 'wpshop'), $url_step_one ); ?>
+		<?php if ($cart_type != 'admin-panel') : ?>
+			<?php if (!empty($cart_type) && $cart_type == 'summary' && !$account_origin) : ?>
+				<?php $url_step_one = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'))); ?>
+				<?php printf(__('You have forget an item ? <a href="%s">Modify your cart !</a>', 'wpshop'), $url_step_one); ?>
 			<?php else : ?>
-				<?php if( !$account_origin ) :
+				<?php if (!$account_origin) :
 							echo do_shortcode('[wps_apply_coupon]');
 						else : ?>
-					<button id="<?php echo $oid; ?>" class="wps-bton-first-mini-rounded make_order_again"><?php _e( 'Make this order again', 'wpshop'); ?></button>
+					<button id="<?php echo $oid; ?>" class="wps-bton-first-mini-rounded make_order_again"><?php _e('Make this order again', 'wpshop'); ?></button>
 				<?php endif; ?>
-				<?php if( !empty($tracking) ) : ?>
+				<?php if (!empty($tracking)) : ?>
 					<p><br />
-					<?php if( !empty($tracking['number']) ) : ?>
-						<strong><?php _e('Tracking number','wpshop'); ?> :</strong> <?php _e($tracking['number']); ?><br />
+					<?php if (!empty($tracking['number'])) : ?>
+						<strong><?php _e('Tracking number', 'wpshop'); ?> :</strong> <?php _e($tracking['number']); ?><br />
 					<?php endif; ?>
-					<?php if( !empty($tracking['link']) ) : ?>
+					<?php if (!empty($tracking['link'])) : ?>
 						<?php /** Check if http:// it's found in the link */
 						$url = $tracking['link'];
-						if('http://' != substr($url, 0, 7))
+						if ('http://' != substr($url, 0, 7))
 							$url = 'http://' . $url;
 						?>
-						<a class="wps-bton-fourth-mini-rounded" href="<?php echo $url; ?>" target="_blank"><?php _e('Tracking link','wpshop'); ?></a>
+						<a class="wps-bton-fourth-mini-rounded" href="<?php echo $url; ?>" target="_blank"><?php _e('Tracking link', 'wpshop'); ?></a>
 					<?php endif; ?>
 					</p>
 				<?php endif; ?>
@@ -31,99 +31,99 @@ 
 		<?php endif; ?>
 	</div><!-- wps-cart-message -->
 	<div class="wps-cart-total">
-		<?php $shipping_price_from = get_option( 'wpshop_shipping_cost_from' ); ?>
+		<?php $shipping_price_from = get_option('wpshop_shipping_cost_from'); ?>
 
 		<!--	Recap shipping	-->
 
-		<?php if( $cart_option == 'full_cart' || $cart_option == 'simplified_et' || $price_piloting == 'HT' ) : ?>
+		<?php if ($cart_option == 'full_cart' || $cart_option == 'simplified_et' || $price_piloting == 'HT') : ?>
 			<p>
-				<?php _e( 'Shipping cost ET', 'wpshop'); ?> <?php echo ( ( !empty($shipping_price_from) && empty( $_SESSION['shipping_address'] ) ) ? '<br/><i>('.__( 'From', 'wpshop').')</i>' : '' ); ?>
+				<?php _e('Shipping cost ET', 'wpshop'); ?> <?php echo ((!empty($shipping_price_from) && empty($_SESSION['shipping_address'])) ? '<br/><i>(' . __('From', 'wpshop') . ')</i>' : ''); ?>
 				<span class="wps-alignRight">
-					<?php if( $cart_type != 'admin-panel' ) : ?>
-						<strong><?php echo wpshop_tools::formate_number( $shipping_cost_et ); ?></strong> <?php echo $currency; ?>
+					<?php if ($cart_type != 'admin-panel') : ?>
+						<strong><?php echo wpshop_tools::formate_number($shipping_cost_et); ?></strong> <?php echo $currency; ?>
 					<?php else : ?>
-						<?php if( ( empty( $cart_content['order_status'] ) || ( $cart_content['order_status'] == 'awaiting_payment' ) || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) && $price_piloting == 'HT' ) : ?>
+						<?php if ((empty($cart_content['order_status']) || ($cart_content['order_status'] == 'awaiting_payment') || ((!empty($cart_content['cart_type']) && $cart_content['cart_type'] == 'quotation') && $cart_content['order_status'] != 'completed')) && $price_piloting == 'HT') : ?>
 							<span class="wps-form-group">
 								<span class="wps-form">
-									<input type="text" size="5" value="<?php echo number_format( $shipping_cost_et, 2 ); ?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
+									<input type="text" size="5" value="<?php echo number_format($shipping_cost_et, 2); ?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
 								</span>
 							</span>
 						<?php else : ?>
-							<strong><?php echo wpshop_tools::formate_number( $shipping_cost_et ); ?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
+							<strong><?php echo wpshop_tools::formate_number($shipping_cost_et); ?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
 						<?php endif; ?>
 					<?php endif; ?>
 				</span>
 			</p>
 		<?php endif; ?>
 
-		<?php if( $cart_option == 'full_cart' ) : ?>
+		<?php if ($cart_option == 'full_cart') : ?>
 			<p>
-				<?php _e( 'VAT on Shipping cost', 'wpshop'); ?>
+				<?php _e('VAT on Shipping cost', 'wpshop'); ?>
 				<span class="wps-alignRight">
-					<strong><?php echo wpshop_tools::formate_number( $shipping_cost_vat ); ?></strong> <?php echo $currency; ?>
+					<strong><?php echo wpshop_tools::formate_number($shipping_cost_vat); ?></strong> <?php echo $currency; ?>
 				</span>
 			</p>
 		<?php endif; ?>
 
-		<?php if( $cart_option == 'full_cart' || $cart_option == 'simplified_ati' || $price_piloting == 'TTC' ) : ?>
+		<?php if ($cart_option == 'full_cart' || $cart_option == 'simplified_ati' || $price_piloting == 'TTC') : ?>
 			<p>
-				<?php _e( 'Shipping cost', 'wpshop'); ?> <?php echo ( ( !empty($shipping_price_from) && empty( $_SESSION['shipping_address'] ) ) ? '<br/><i>('.__( 'From', 'wpshop').')</i>' : '' ); ?>
+				<?php _e('Shipping cost', 'wpshop'); ?> <?php echo ((!empty($shipping_price_from) && empty($_SESSION['shipping_address'])) ? '<br/><i>(' . __('From', 'wpshop') . ')</i>' : ''); ?>
 				<span class="wps-alignRight">
-					<?php if( $cart_type != 'admin-panel' ) : ?>
-						<strong><?php echo wpshop_tools::formate_number( $shipping_cost_ati ); ?></strong> <?php echo $currency; ?>
+					<?php if ($cart_type != 'admin-panel') : ?>
+						<strong><?php echo wpshop_tools::formate_number($shipping_cost_ati); ?></strong> <?php echo $currency; ?>
 					<?php else : ?>
-						<?php if( ( empty( $cart_content['order_status'] ) || ( $cart_content['order_status'] == 'awaiting_payment' ) || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) && $price_piloting == 'TTC' ) : ?>
+						<?php if ((empty($cart_content['order_status']) || ($cart_content['order_status'] == 'awaiting_payment') || ((!empty($cart_content['cart_type']) && $cart_content['cart_type'] == 'quotation') && $cart_content['order_status'] != 'completed')) && $price_piloting == 'TTC') : ?>
 							<span class="wps-form-group">
 								<span class="wps-form">
-									<input type="text" size="5" value="<?php echo number_format( $shipping_cost_ati, 2 ); ?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
+									<input type="text" size="5" value="<?php echo number_format($shipping_cost_ati, 2); ?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
 								</span>
 							</span>
 						<?php else : ?>
-							<strong><?php echo wpshop_tools::formate_number( $shipping_cost_ati ); ?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
+							<strong><?php echo wpshop_tools::formate_number($shipping_cost_ati); ?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
 						<?php endif; ?>
 					<?php endif; ?>
 				</span>
 			</p>
 		<?php endif; ?>
 
-		<?php if( $cart_option == 'full_cart' && !empty($cart_content['order_tva']) ) : ?>
-		<?php foreach( $cart_content['order_tva'] as $order_vat_rate => $order_vat_value ) :
-				if( $order_vat_rate != 'VAT_shipping_cost') :
+		<?php if ($cart_option == 'full_cart' && !empty($cart_content['order_tva'])) : ?>
+		<?php foreach ($cart_content['order_tva'] as $order_vat_rate => $order_vat_value) :
+				if ($order_vat_rate != 'VAT_shipping_cost') :
 					?>
 					<p>
-						<?php printf( __( 'VAT (%s %%)', 'wpshop'), $order_vat_rate); ?>
+						<?php printf(__('VAT (%s %%)', 'wpshop'), $order_vat_rate); ?>
 						<span class="wps-alignRight">
-							<strong><?php echo wpshop_tools::formate_number( $order_vat_value ); ?></strong> <?php echo $currency; ?>
+							<strong><?php echo wpshop_tools::formate_number($order_vat_value); ?></strong> <?php echo $currency; ?>
 						</span>
 					</p>
 					<?php
 				endif;
 		endforeach; ?>
 		<?php endif; ?>
-			<?php if( $cart_type == 'admin-panel' ) : ?>
+			<?php if ($cart_type == 'admin-panel') : ?>
 				<p>
-					<?php _e( 'Discount', 'wpshop'); ?>
+					<?php _e('Discount', 'wpshop'); ?>
 					<span class="wps-alignRight">
-						<?php if( empty( $cart_content['order_status'] ) || $cart_content['order_status'] == 'awaiting_payment' || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) : ?>
-							<span class="wps-form-group"><span class="wps-form"><input type="text" id="wps-orders-discount-value" size="5" style="text-align : right" value="<?php echo ( !empty($cart_content['order_discount_value']) ) ? $cart_content['order_discount_value'] : ''; ?>"/></span></span>
+						<?php if (empty($cart_content['order_status']) || $cart_content['order_status'] == 'awaiting_payment' || ((!empty($cart_content['cart_type']) && $cart_content['cart_type'] == 'quotation') && $cart_content['order_status'] != 'completed')) : ?>
+							<span class="wps-form-group"><span class="wps-form"><input type="text" id="wps-orders-discount-value" size="5" style="text-align : right" value="<?php echo (!empty($cart_content['order_discount_value'])) ? $cart_content['order_discount_value'] : ''; ?>"/></span></span>
 						<?php else : ?>
-							<?php if( !empty($cart_content['order_discount_value']) ) : ?>
-								<strong><?php echo $cart_content['order_discount_value']; ?> <?php echo ( !empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'percent' ) ? '%' : wpshop_tools::wpshop_get_currency(); ?></strong>
+							<?php if (!empty($cart_content['order_discount_value'])) : ?>
+								<strong><?php echo $cart_content['order_discount_value']; ?> <?php echo (!empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'percent') ? '%' : wpshop_tools::wpshop_get_currency(); ?></strong>
 							<?php else : ?>
 								0 <?php echo wpshop_tools::wpshop_get_currency(); ?>
 							<?php endif; ?>
 						<?php endif; ?>
 					</span>
 				</p>
-				<?php if( empty( $cart_content['order_status'] ) || $cart_content['order_status'] == 'awaiting_payment' || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) : ?>
+				<?php if (empty($cart_content['order_status']) || $cart_content['order_status'] == 'awaiting_payment' || ((!empty($cart_content['cart_type']) && $cart_content['cart_type'] == 'quotation') && $cart_content['order_status'] != 'completed')) : ?>
 					<p>
-						<?php _e( 'Discount type', 'wpshop'); ?>
+						<?php _e('Discount type', 'wpshop'); ?>
 						<span class="wps-alignRight">
 							<span class="wps-form-group">
 								<span class="wps-form">
 									<select id="wps-orders-discount-type">
-										<option value="percent" <?php echo ( !empty($cart_content) && !empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'percent' ) ? 'selected="selected"' : ''; ?>>%</option>
-										<option value="amount" <?php echo ( !empty($cart_content) && !empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'amount' ) ? 'selected="selected"' : ''; ?>><?php echo wpshop_tools::wpshop_get_currency(); ?></option>
+										<option value="percent" <?php echo (!empty($cart_content) && !empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'percent') ? 'selected="selected"' : ''; ?>>%</option>
+										<option value="amount" <?php echo (!empty($cart_content) && !empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'amount') ? 'selected="selected"' : ''; ?>><?php echo wpshop_tools::wpshop_get_currency(); ?></option>
 									</select>
 								</span>
 							</span>
@@ -132,52 +132,52 @@ 
 				<?php endif; ?>
 			<?php endif; ?>
 
-			<?php if ( !empty( $cart_content['coupon_id']) ) : ?>
-			<p><?php _e( 'Total ATI before discount', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $order_totla_before_discount ); ?></strong> <?php echo $currency; ?></span></p>
-			<p><?php _e( 'Discount', 'wpshop'); ?> (<?php echo $coupon_title; ?>) <span class="wps-alignRight"><strong><?php echo $coupon_value; ?></strong><?php echo $currency; ?></span></p>
+			<?php if (!empty($cart_content['coupon_id'])) : ?>
+			<p><?php _e('Total ATI before discount', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($order_totla_before_discount); ?></strong> <?php echo $currency; ?></span></p>
+			<p><?php _e('Discount', 'wpshop'); ?> (<?php echo $coupon_title; ?>) <span class="wps-alignRight"><strong><?php echo $coupon_value; ?></strong><?php echo $currency; ?></span></p>
 			<?php endif; ?>
 
-			<?php if( !empty($_SESSION['cart']['order_partial_payment']) ) :
-				$wps_partial_payment_data = get_option( 'wpshop_payment_partial' );
-				if( !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' ) {
+			<?php if (!empty($_SESSION['cart']['order_partial_payment'])) :
+				$wps_partial_payment_data = get_option('wpshop_payment_partial');
+				if (!empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') {
 					$partial_payment_informations = $wps_partial_payment_data['for_quotation'];
 				} else {
 					$partial_payment_informations = $wps_partial_payment_data['for_all'];
 				}
-				$partial_payment_amount =  $_SESSION['cart']['order_partial_payment'];
+				$partial_payment_amount = $_SESSION['cart']['order_partial_payment'];
 			?>
-				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $cart_content['order_grand_total'] ); ?></strong> <?php echo $currency; ?></span></p>
+				<p class="wps-hightlight"><?php _e('Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($cart_content['order_grand_total']); ?></strong> <?php echo $currency; ?></span></p>
 				<p class="wps-hightlight">
-				<?php printf(__('Payable now %s','wpshop'), '(' . $partial_payment_informations['value'] . ( ( !empty($partial_payment_informations['type']) && $partial_payment_informations['type'] == 'percentage' ) ? '%': wpshop_tools::wpshop_get_currency( false ) ) . ')'); ?>
-				<span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $partial_payment_amount ); ?></strong> <?php echo $currency; ?>
+				<?php printf(__('Payable now %s', 'wpshop'), '(' . $partial_payment_informations['value'] . ((!empty($partial_payment_informations['type']) && $partial_payment_informations['type'] == 'percentage') ? '%' : wpshop_tools::wpshop_get_currency(false)) . ')'); ?>
+				<span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($partial_payment_amount); ?></strong> <?php echo $currency; ?>
 				</span></p>
-			<?php elseif ( !empty( $cart_content ) && !empty( $cart_content[ 'order_status'] ) && ( 'partially_paid' == $cart_content[ 'order_status' ] ) && !empty( $cart_content[ 'order_payment' ] ) && !empty( $cart_content[ 'order_payment' ][ 'received' ] ) ) : ?>
-				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $cart_content['order_grand_total'] ); ?></strong> <?php echo $currency; ?></span></p>
+			<?php elseif (!empty($cart_content) && !empty($cart_content['order_status']) && ('partially_paid' == $cart_content['order_status']) && !empty($cart_content['order_payment']) && !empty($cart_content['order_payment']['received'])) : ?>
+				<p class="wps-hightlight"><?php _e('Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($cart_content['order_grand_total']); ?></strong> <?php echo $currency; ?></span></p>
 				<?php $allready_received_amount = 0; ?>
-				<?php foreach ( $cart_content[ 'order_payment' ][ 'received' ] as $payment ) : ?>
-					<?php if ( 'payment_received' == $payment[ 'status' ] ) : ?>
-						<?php $allready_received_amount += $payment[ 'received_amount' ]; ?>
+				<?php foreach ($cart_content['order_payment']['received'] as $payment) : ?>
+					<?php if ('payment_received' == $payment['status']) : ?>
+						<?php $allready_received_amount += $payment['received_amount']; ?>
 					<?php endif; ?>
 				<?php endforeach; ?>
-				<p><?php _e( 'Already paid', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $allready_received_amount ); ?></strong> <?php echo $currency; ?></span></p>
-				<p class="wps-hightlight"><?php _e( 'Due amount for this order', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $cart_content['order_grand_total'] - $allready_received_amount ); ?></strong> <?php echo $currency; ?></span></p>
+				<p><?php _e('Already paid', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($allready_received_amount); ?></strong> <?php echo $currency; ?></span></p>
+				<p class="wps-hightlight"><?php _e('Due amount for this order', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($cart_content['order_grand_total'] - $allready_received_amount); ?></strong> <?php echo $currency; ?></span></p>
 			<?php else : ?>
-				<?php if ( isset( $_SESSION[ 'cart' ][ 'order_product_partial_payment' ]) ) : ?>
-				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $_SESSION['cart']['order_amount_to_pay_now'] ); ?></strong> <?php echo $currency; ?></span></p>
+				<?php if (isset($_SESSION['cart']['order_product_partial_payment'])) : ?>
+				<p class="wps-hightlight"><?php _e('Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($_SESSION['cart']['order_amount_to_pay_now']); ?></strong> <?php echo $currency; ?></span></p>
 				<?php else: ?>
-				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $total_ati ); ?></strong> <?php echo $currency; ?></span></p>
+				<p class="wps-hightlight"><?php _e('Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number($total_ati); ?></strong> <?php echo $currency; ?></span></p>
 				<?php endif; ?>
 			<?php endif; ?>
 	</div><!-- wps-cart-total -->
 </div><!-- wps-cart-cartouche -->
 
-<?php if ( empty($cart_type) || ( !empty($cart_type) && $cart_type != 'summary' && $cart_type != 'admin-panel')  ) : ?>
+<?php if (empty($cart_type) || (!empty($cart_type) && $cart_type != 'summary' && $cart_type != 'admin-panel')) : ?>
 <div class="wps-checkout-actions">
-	<button data-nonce="<?php echo wp_create_nonce( 'wps_empty_cart' ); ?>" class="wps-bton-second emptyCart"><?php _e( 'Empty the cart', 'wpshop' ); ?></button>
-	<?php if( !empty( $_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' ) : ?>
-		<button class="wps-bton-first" data-nonce="<?php echo wp_create_nonce( 'wps_cart_pass_to_step_two' ); ?>" id="wps-cart-order-action"><?php _e( 'Validate my quotation', 'wpshop' ); ?></button>
+	<button data-nonce="<?php echo wp_create_nonce('wps_empty_cart'); ?>" class="wps-bton-second emptyCart"><?php _e('Empty the cart', 'wpshop'); ?></button>
+	<?php if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') : ?>
+		<button class="wps-bton-first" data-nonce="<?php echo wp_create_nonce('wps_cart_pass_to_step_two'); ?>" id="wps-cart-order-action"><?php _e('Validate my quotation', 'wpshop'); ?></button>
 	<?php else : ?>
-		<button class="wps-bton-first" data-nonce="<?php echo wp_create_nonce( 'wps_cart_pass_to_step_two' ); ?>" id="wps-cart-order-action"><?php _e( 'Order', 'wpshop' ); ?></button>
+		<button class="wps-bton-first" data-nonce="<?php echo wp_create_nonce('wps_cart_pass_to_step_two'); ?>" id="wps-cart-order-action"><?php _e('Order', 'wpshop'); ?></button>
 	<?php endif; ?>
 </div>
 <div class="wps-cart-notices">
@@ -187,14 +187,14 @@ 
 </div>
 <?php endif; ?>
 
-<?php if( !empty($cart_type) && $cart_type == 'admin-panel' && ( empty( $cart_content['order_status'] ) || $cart_content['order_status'] == 'awaiting_payment' || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) ) : ?>
-	<button class="wps-bton-second-rounded alignRight" data-nonce="<?php echo wp_create_nonce( 'wps_orders_update_cart_informations' ); ?>" id="wps-orders-update-cart-informations">
+<?php if (!empty($cart_type) && $cart_type == 'admin-panel' && (empty($cart_content['order_status']) || $cart_content['order_status'] == 'awaiting_payment' || ((!empty($cart_content['cart_type']) && $cart_content['cart_type'] == 'quotation') && $cart_content['order_status'] != 'completed'))) : ?>
+	<button class="wps-bton-second-rounded alignRight" data-nonce="<?php echo wp_create_nonce('wps_orders_update_cart_informations'); ?>" id="wps-orders-update-cart-informations">
 		<i class="dashicons dashicons-update"></i>
-		<?php _e( 'Update order informations', 'wpshop'); ?>
+		<?php _e('Update order informations', 'wpshop'); ?>
 	</button>
 <?php endif; ?>
 <?php $wps_payment_mode = get_option('wps_payment_mode'); ?>
-<?php if( isset( $wps_payment_mode['mode']['paypal']['active'] ) ): ?>
+<?php if (isset($wps_payment_mode['mode']['paypal']['active'])): ?>
 	<div class="wps-secured-logos">
 		<span class="wps-logo-paypal"></span>
 		<span class="wps-logo-visa"></span>

Braces +59 added lines, -24 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <div class="wps-cart-cartouche">
 	<div class="wps-cart-message">
@@ -6,11 +8,16 @@ 
 			<?php if ( !empty($cart_type) && $cart_type == 'summary' && !$account_origin ) : ?>
 				<?php $url_step_one = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_checkout_page_id') ) ); ?>
 				<?php printf( __( 'You have forget an item ? <a href="%s">Modify your cart !</a>', 'wpshop'), $url_step_one ); ?>
-			<?php else : ?>
+			<?php else {
+	: ?>
 				<?php if( !$account_origin ) :
 							echo do_shortcode('[wps_apply_coupon]');
-						else : ?>
-					<button id="<?php echo $oid; ?>" class="wps-bton-first-mini-rounded make_order_again"><?php _e( 'Make this order again', 'wpshop'); ?></button>
+}
+						else {
+							: ?>
+					<button id="<?php echo $oid;
+						}
+						?>" class="wps-bton-first-mini-rounded make_order_again"><?php _e( 'Make this order again', 'wpshop'); ?></button>
 				<?php endif; ?>
 				<?php if( !empty($tracking) ) : ?>
 					<p><br />
@@ -20,8 +27,9 @@ 
 					<?php if( !empty($tracking['link']) ) : ?>
 						<?php /** Check if http:// it's found in the link */
 						$url = $tracking['link'];
-						if('http://' != substr($url, 0, 7))
-							$url = 'http://' . $url;
+						if('http://' != substr($url, 0, 7)) {
+													$url = 'http://' . $url;
+						}
 						?>
 						<a class="wps-bton-fourth-mini-rounded" href="<?php echo $url; ?>" target="_blank"><?php _e('Tracking link','wpshop'); ?></a>
 					<?php endif; ?>
@@ -41,15 +49,21 @@ 
 				<span class="wps-alignRight">
 					<?php if( $cart_type != 'admin-panel' ) : ?>
 						<strong><?php echo wpshop_tools::formate_number( $shipping_cost_et ); ?></strong> <?php echo $currency; ?>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<?php if( ( empty( $cart_content['order_status'] ) || ( $cart_content['order_status'] == 'awaiting_payment' ) || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) && $price_piloting == 'HT' ) : ?>
 							<span class="wps-form-group">
 								<span class="wps-form">
-									<input type="text" size="5" value="<?php echo number_format( $shipping_cost_et, 2 ); ?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
+									<input type="text" size="5" value="<?php echo number_format( $shipping_cost_et, 2 );
+}
+?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
 								</span>
 							</span>
-						<?php else : ?>
-							<strong><?php echo wpshop_tools::formate_number( $shipping_cost_et ); ?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
+						<?php else {
+	: ?>
+							<strong><?php echo wpshop_tools::formate_number( $shipping_cost_et );
+}
+?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
 						<?php endif; ?>
 					<?php endif; ?>
 				</span>
@@ -71,15 +85,21 @@ 
 				<span class="wps-alignRight">
 					<?php if( $cart_type != 'admin-panel' ) : ?>
 						<strong><?php echo wpshop_tools::formate_number( $shipping_cost_ati ); ?></strong> <?php echo $currency; ?>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<?php if( ( empty( $cart_content['order_status'] ) || ( $cart_content['order_status'] == 'awaiting_payment' ) || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) && $price_piloting == 'TTC' ) : ?>
 							<span class="wps-form-group">
 								<span class="wps-form">
-									<input type="text" size="5" value="<?php echo number_format( $shipping_cost_ati, 2 ); ?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
+									<input type="text" size="5" value="<?php echo number_format( $shipping_cost_ati, 2 );
+}
+?>" id="wps-orders-shipping-cost" class="wps-error" style="text-align : right" />
 								</span>
 							</span>
-						<?php else : ?>
-							<strong><?php echo wpshop_tools::formate_number( $shipping_cost_ati ); ?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
+						<?php else {
+	: ?>
+							<strong><?php echo wpshop_tools::formate_number( $shipping_cost_ati );
+}
+?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong>
 						<?php endif; ?>
 					<?php endif; ?>
 				</span>
@@ -106,11 +126,17 @@ 
 					<span class="wps-alignRight">
 						<?php if( empty( $cart_content['order_status'] ) || $cart_content['order_status'] == 'awaiting_payment' || ( ( !empty( $cart_content['cart_type'] ) && $cart_content['cart_type'] == 'quotation' ) && $cart_content['order_status'] != 'completed' ) ) : ?>
 							<span class="wps-form-group"><span class="wps-form"><input type="text" id="wps-orders-discount-value" size="5" style="text-align : right" value="<?php echo ( !empty($cart_content['order_discount_value']) ) ? $cart_content['order_discount_value'] : ''; ?>"/></span></span>
-						<?php else : ?>
+						<?php else {
+	: ?>
 							<?php if( !empty($cart_content['order_discount_value']) ) : ?>
-								<strong><?php echo $cart_content['order_discount_value']; ?> <?php echo ( !empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'percent' ) ? '%' : wpshop_tools::wpshop_get_currency(); ?></strong>
-							<?php else : ?>
-								0 <?php echo wpshop_tools::wpshop_get_currency(); ?>
+								<strong><?php echo $cart_content['order_discount_value'];
+}
+?> <?php echo ( !empty($cart_content['order_discount_type']) && $cart_content['order_discount_type'] == 'percent' ) ? '%' : wpshop_tools::wpshop_get_currency(); ?></strong>
+							<?php else {
+	: ?>
+								0 <?php echo wpshop_tools::wpshop_get_currency();
+}
+?>
 							<?php endif; ?>
 						<?php endif; ?>
 					</span>
@@ -161,11 +187,17 @@ 
 				<?php endforeach; ?>
 				<p><?php _e( 'Already paid', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $allready_received_amount ); ?></strong> <?php echo $currency; ?></span></p>
 				<p class="wps-hightlight"><?php _e( 'Due amount for this order', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $cart_content['order_grand_total'] - $allready_received_amount ); ?></strong> <?php echo $currency; ?></span></p>
-			<?php else : ?>
+			<?php else {
+	: ?>
 				<?php if ( isset( $_SESSION[ 'cart' ][ 'order_product_partial_payment' ]) ) : ?>
-				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $_SESSION['cart']['order_amount_to_pay_now'] ); ?></strong> <?php echo $currency; ?></span></p>
-				<?php else: ?>
-				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop'); ?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $total_ati ); ?></strong> <?php echo $currency; ?></span></p>
+				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop');
+}
+?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $_SESSION['cart']['order_amount_to_pay_now'] ); ?></strong> <?php echo $currency; ?></span></p>
+				<?php else {
+	: ?>
+				<p class="wps-hightlight"><?php _e( 'Total ATI', 'wpshop');
+}
+?><span class="wps-alignRight"><strong><?php echo wpshop_tools::formate_number( $total_ati ); ?></strong> <?php echo $currency; ?></span></p>
 				<?php endif; ?>
 			<?php endif; ?>
 	</div><!-- wps-cart-total -->
@@ -176,8 +208,11 @@ 
 	<button data-nonce="<?php echo wp_create_nonce( 'wps_empty_cart' ); ?>" class="wps-bton-second emptyCart"><?php _e( 'Empty the cart', 'wpshop' ); ?></button>
 	<?php if( !empty( $_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' ) : ?>
 		<button class="wps-bton-first" data-nonce="<?php echo wp_create_nonce( 'wps_cart_pass_to_step_two' ); ?>" id="wps-cart-order-action"><?php _e( 'Validate my quotation', 'wpshop' ); ?></button>
-	<?php else : ?>
-		<button class="wps-bton-first" data-nonce="<?php echo wp_create_nonce( 'wps_cart_pass_to_step_two' ); ?>" id="wps-cart-order-action"><?php _e( 'Order', 'wpshop' ); ?></button>
+	<?php else {
+	: ?>
+		<button class="wps-bton-first" data-nonce="<?php echo wp_create_nonce( 'wps_cart_pass_to_step_two' );
+}
+?>" id="wps-cart-order-action"><?php _e( 'Order', 'wpshop' ); ?></button>
 	<?php endif; ?>
 </div>
 <div class="wps-cart-notices">

includes/modules/wps_cart/controller/wps_cart_ctr.php

Spacing +299 added lines, -299 removed lines

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

Braces +60 added lines, -68 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_cart {
 
 	function __construct() {
@@ -151,12 +153,10 @@ 
 				require( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "cart/cart") );
 				$output = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				return '<div class="wps-alert-info">' .__( 'Your cart is empty', 'wpshop' ).'</div>';;
 			}
-		}
-		else {
+		} else {
 			return '<div class="wps-alert-info">' .__( 'Your cart is empty', 'wpshop' ).'</div>';;
 		}
 		return $output;
@@ -174,15 +174,13 @@ 
 			/** Count items **/
 			$total_cart_item = self::total_cart_items( $cart_items );
 			$mini_cart_body = self::mini_cart_content( $type );
-		}
-		else {
+		} else {
 			$mini_cart_body = __( 'Your cart is empty', 'wpshop' );
 		}
 		ob_start();
 		if( !empty($type) && $type == 'fixed' ) {
 			require(wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/fixed-mini-cart") );
-		}
-		else {
+		} else {
 			require( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/mini-cart") );
 		}
 
@@ -210,18 +208,15 @@ 
 				ob_start();
 				if( !empty($type) && $type == 'fixed' ) {
 					require( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/fixed-mini-cart", "content") );
-				}
-				else {
+				} else {
 					require( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "mini-cart/mini-cart", "content") );
 				}
 				$output = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				$output = '<div class="wps-alert-info">' .__( 'Your cart is empty', 'wpshop' ).'</div>';
 			}
-		}
-		else {
+		} else {
 			$output = '<div class="wps-alert-info">' . __( 'Your cart is empty', 'wpshop' ).'</div>';
 		}
 		return $output;
@@ -256,12 +251,10 @@ 
 				require_once( wpshop_tools::get_template_part( WPS_CART_DIR, WPS_CART_TPL_DIR, "frontend", "resume-cart/resume-cart", "content") );
 				$output = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				$resume_cart_body = '<div class="wps-alert-info">' .__( 'Your cart is empty', 'wpshop' ).'</div>';
 			}
-		}
-		else {
+		} else {
 			$resume_cart_body ='<div class="wps-alert-info">' .__( 'Your cart is empty', 'wpshop' ).'</div>';
 		}
 		return $output;
@@ -298,8 +291,9 @@ 
 	 * @return array()
 	 */
 	function get_persistent_cart() {
-		if(get_current_user_id())
-			$cart = get_user_meta(get_current_user_id(), '_wpshop_persistent_cart', true);
+		if(get_current_user_id()) {
+					$cart = get_user_meta(get_current_user_id(), '_wpshop_persistent_cart', true);
+		}
 		return empty($cart) ? array() : $cart;
 	}
 
@@ -314,10 +308,11 @@ 
 	 * Save the persistent cart when updated
 	 */
 	function persistent_cart_update() {
-		if(get_current_user_id())
-			update_user_meta( get_current_user_id(), '_wpshop_persistent_cart', array(
+		if(get_current_user_id()) {
+					update_user_meta( get_current_user_id(), '_wpshop_persistent_cart', array(
 					'cart' => $_SESSION['cart'],
 			));
+		}
 	}
 
 	/**
@@ -372,8 +367,7 @@ 
 				// Check Parent ID
 				if( get_post_type($cart['order_items'][ $product_id ]['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) {
 					$parent_product_id = $cart['order_items'][ $product_id ]['item_id'];
-				}
-				else {
+				} else {
 					$parent_data = wpshop_products::get_parent_variation( $cart['order_items'][ $product_id ]['item_id'] );
 					$parent_post = $parent_data['parent_post'];
 					$parent_product_id = $parent_post->ID;
@@ -388,8 +382,7 @@ 
 							}
 						}
 					}
-				}
-				else {
+				} else {
 					$selected_variations = get_post_meta( $product_id, '_wpshop_variations_attribute_def', true );
 				}
 			}
@@ -399,8 +392,7 @@ 
 			$new_pid = $product_id;
 			$return = $this->add_to_cart( $product_to_add_to_cart, array( $new_pid => $quantity ), $wpshop_cart_type, array(), $from_admin, $cart, $order_id );
 			return $return;
-		}
-		else {
+		} else {
 			return __('This product does not exist in the cart.', 'wpshop');
 		}
 	}
@@ -416,8 +408,7 @@ 
 		if ( empty( $from_admin ) ){
 			if(isset($_SESSION['cart']['cart_type']) && $type != $_SESSION['cart']['cart_type'] ) {
 				return __('You have another element type into your cart. Please finalize it by going to cart page.', 'wpshop');
-			}
-			else {
+			} else {
 				$_SESSION['cart']['cart_type'] = $type;
 			}
 			$order_meta = $_SESSION['cart'];
@@ -428,22 +419,27 @@ 
 
 		foreach ($product_list as $pid => $product_more_content) {
 			if ( count($product_list) == 1 ) {
-				if ( !isset( $quantity[$pid] ) ) $quantity[$pid] = 1;
+				if ( !isset( $quantity[$pid] ) ) {
+					$quantity[$pid] = 1;
+				}
 				$product = wpshop_products::get_product_data($product_more_content['id'], false, '"publish"');
 				/** Check if the selected product exist	*/
-				if ( $product === false ) return __('This product does not exist', 'wpshop');
+				if ( $product === false ) {
+					return __('This product does not exist', 'wpshop');
+				}
 
 				/** Get information about the product price	*/
 				$product_price_check = wpshop_prices::get_product_price($product, 'check_only');
-				if ( $product_price_check !== true ) return $product_price_check;
+				if ( $product_price_check !== true ) {
+					return $product_price_check;
+				}
 
 				$the_quantity = 1;
 
 				if ( !empty($product_more_content['defined_variation_priority']) && $product_more_content['defined_variation_priority'] == 'combined' && !empty($product_more_content['variations']) && !empty($product_more_content['variations'][0]) ) {
 					/** Get the asked quantity for each product and check if there is enough stock	*/
 					$the_quantity = $quantity[$pid];
-				}
-				else {
+				} else {
 					/** Get the asked quantity for each product and check if there is enough stock	*/
 					$the_quantity = $quantity[$pid];
 				}
@@ -486,8 +482,7 @@ 
 			if ( get_current_user_id() ) {
 				$this->persistent_cart_update();
 			}
-		}
-		else {
+		} else {
 			update_post_meta($order_id, '_order_postmeta', $order );
 
 		}
@@ -631,8 +626,7 @@ 
 					if( empty( $d['product_qty'] ) ) {
 						unset( $cart_items[$product_key] );
 						unset( $cart_infos['order_items'][$product_key] );
-					}
-					else {
+					} else {
 						$wps_orders = new wps_orders_ctr();
 						$cart_items[$product_key] = $wps_orders->add_product_to_order($the_product);
 					}
@@ -651,8 +645,7 @@ 
 				if ( !empty( $item[ 'item_amount_to_pay_now' ] ) ) {
 					$cart_has_special_product = true;
 					$cart_infos['order_amount_to_pay_now'] += ( $item[ 'item_amount_to_pay_now' ] * $item[ 'item_qty' ] );
-				}
-				else {
+				} else {
 					$cart_infos['order_amount_to_pay_now'] += $item['item_total_ttc'];
 				}
 
@@ -661,13 +654,11 @@ 
 				// VAT
 				if( !empty($order_tva[ $item['item_tva_rate'] ]) ) {
 					$order_tva[ $item['item_tva_rate'] ] += $item['item_tva_total_amount'];
-				}
-				else {
+				} else {
 					$order_tva[ $item['item_tva_rate'] ] = $item['item_tva_total_amount'];
 				}
 			}
-		}
-		else {
+		} else {
 			return array();
 		}
 
@@ -765,16 +756,14 @@ 
 		$wpshop_payment = new wpshop_payment();
 		if( !empty($cart_infos['cart_type']) && $cart_infos['cart_type'] == 'quotation' ) {
 			$partial_payment = $wpshop_payment->partial_payment_calcul( $cart_infos['order_grand_total'], 'for_quotation' );
-		}
-		else {
+		} else {
 			$partial_payment = $wpshop_payment->partial_payment_calcul( $cart_infos['order_grand_total'] );
 		}
 		if ( !empty($partial_payment['amount_to_pay']) && ( empty( $cart_infos['order_status'] ) || $cart_infos['order_status'] == 'awaiting_payment' ) && ( empty( $product_partial_payment_amount ) ) ) {
 			unset($partial_payment['display']);
 			$cart_infos['order_partial_payment'] = number_format( str_replace( ',', '.', $partial_payment['amount_to_pay'] ), 2, '.', '');
 			$cart_infos['order_amount_to_pay_now'] = number_format( str_replace( ',', '.', $partial_payment['amount_to_pay'] ), 2, '.', '');
-		}
-		else if( !empty( $cart_has_special_product ) ) {
+		} else if( !empty( $cart_has_special_product ) ) {
 			$cart_infos['order_amount_to_pay_now'] = number_format( str_replace( ',', '.', $cart_infos['order_amount_to_pay_now'] ), 2, '.', '');
 			$cart_infos['order_product_partial_payment'] = 'subscription';
 		}
@@ -822,8 +811,9 @@ 
 	public static function wps_reload_cart() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_reload_cart' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_reload_cart' ) ) {
+					wp_die();
+		}
 
 		$wps_cart = new wps_cart();
 		$result = $wps_cart->cart_content();
@@ -836,8 +826,9 @@ 
 	public static function wps_reload_mini_cart() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_reload_mini_cart' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_reload_mini_cart' ) ) {
+					wp_die();
+		}
 
 		$wps_cart = new wps_cart();
 		$result = $wps_cart->mini_cart_content( sanitize_title( $_POST['type']) );
@@ -893,8 +884,9 @@ 
 	public static function wps_reload_summary_cart() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_reload_summary_cart' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_reload_summary_cart' ) ) {
+					wp_die();
+		}
 
 		$wps_cart = new wps_cart();
 		$result = $wps_cart->resume_cart_content();
@@ -920,8 +912,9 @@ 
 	function wps_apply_coupon() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_apply_coupon' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_apply_coupon' ) ) {
+					wp_die();
+		}
 
 		$status = false; $response = '';
 		$coupon = ( !empty($_POST['coupon_code']) ) ? wpshop_tools::varSanitizer( $_POST['coupon_code']) : null;
@@ -933,12 +926,10 @@ 
 				$this->store_cart_in_session($order);
 				$status = true;
 				$response = '<div class="wps-alert-success">' .__( 'The coupon has been applied', 'wpshop' ). '</div>';
-			}
-			else {
+			} else {
 				$response = '<div class="wps-alert-error">' .$result['message']. '</div>';
 			}
-		}
-		else {
+		} else {
 			$response = '<div class="wps-alert-error">'.__( 'A coupon code is required', 'wpshop'). '</div>';
 		}
 		echo json_encode( array( 'status' => $status, 'response' => $response ) );
@@ -952,8 +943,9 @@ 
 	public static function wps_cart_pass_to_step_two() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_cart_pass_to_step_two' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_cart_pass_to_step_two' ) ) {
+					wp_die();
+		}
 
 		$status = false; $response = '';
 		$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
@@ -963,8 +955,7 @@ 
 			$response = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step='.$step;
 			$response = apply_filters('wps_extra_signup_actions', $response);
 			$status = true;
-		}
-		else {
+		} else {
 			$response = '<div class="wps-alert-error">' .__( 'An error was occured, please retry later or contact the website administrator', 'wpshop' ). '</div>';
 		}
 		echo json_encode( array( 'status' => $status, 'response' => $response));
@@ -978,8 +969,9 @@ 
 	function wps_empty_cart() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_empty_cart' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_empty_cart' ) ) {
+					wp_die();
+		}
 
 
 		$this->empty_cart();

includes/modules/wps_installer/controller/wps_installer_ctr.php

Spacing +59 added lines, -59 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * File for installer control class definition
  *
@@ -25,63 +25,63 @@ 
 	function __construct() {
 
 		/**	Call administration style definition	*/
-		add_action( 'admin_init', array( &$this, 'admin_css' ) );
+		add_action('admin_init', array(&$this, 'admin_css'));
 
 		/**	Call administration scripts	*/
-		add_action( 'admin_init', array( &$this, 'admin_js' ));
+		add_action('admin_init', array(&$this, 'admin_js'));
 
-		$current_step = ( !empty( $_GET['wps-installation-step'] ) ) ? sanitize_title( $_GET['wps-installation-step'] ) : $this->current_installation_step;
+		$current_step = (!empty($_GET['wps-installation-step'])) ? sanitize_title($_GET['wps-installation-step']) : $this->current_installation_step;
 
 		/**	Instanciate datas saver components */
 		$wps_installer_model = new wps_installer_model();
 
-		$action = !empty( $_POST[ 'action' ] ) ? sanitize_text_field( $_POST[ 'action' ] ) : '';
+		$action = !empty($_POST['action']) ? sanitize_text_field($_POST['action']) : '';
 		/**	Call datas saver	*/
-		if ( !empty( $current_step ) && !empty( $action ) && ( "wps-installation" == $action ) ) {
+		if (!empty($current_step) && !empty($action) && ("wps-installation" == $action)) {
 			$step_to_save = $current_step - 1;
-			$wps_installer_model->save_step( $step_to_save );
-			if ( WPSINSTALLER_STEPS_COUNT == $current_step ) {
-				add_action( 'init', array( &$this, 'go_to_wpshop_about' ) );
+			$wps_installer_model->save_step($step_to_save);
+			if (WPSINSTALLER_STEPS_COUNT == $current_step) {
+				add_action('init', array(&$this, 'go_to_wpshop_about'));
 			}
 		}
 
 		/**	Set the current installatino step	*/
-		$this->current_installation_step = get_option( 'wps-installation-current-step', 1 );
+		$this->current_installation_step = get_option('wps-installation-current-step', 1);
 
 		/**	Get current version for wpshop plugin	*/
-		$wps_current_db_version = get_option( 'wpshop_db_options', 0 );
+		$wps_current_db_version = get_option('wpshop_db_options', 0);
 
 		/**	Check the configuration state	*/
-		$installation_state = !empty( $_GET[ 'installation_state' ] ) ? sanitize_text_field( $_GET[ 'installation_state' ] ) : '';
-		if ( isset( $installation_state ) && !empty( $installation_state ) && !empty( $wps_current_db_version )
-		&& (empty( $wps_current_db_version[ 'installation_state' ] ) || ( $wps_current_db_version[ 'installation_state' ] != 'completed' ) ) ) {
-			$wps_current_db_version = $wps_installer_model->installer_state_saver( $installation_state, $wps_current_db_version );
+		$installation_state = !empty($_GET['installation_state']) ? sanitize_text_field($_GET['installation_state']) : '';
+		if (isset($installation_state) && !empty($installation_state) && !empty($wps_current_db_version)
+		&& (empty($wps_current_db_version['installation_state']) || ($wps_current_db_version['installation_state'] != 'completed'))) {
+			$wps_current_db_version = $wps_installer_model->installer_state_saver($installation_state, $wps_current_db_version);
 		}
 
 		/**	Do verification for shop who are configured for being sale shop	*/
-		$current_page = strstr( $_SERVER[ "REQUEST_URI" ], 'wps-about');
-		if ( isset( $wps_current_db_version['installation_state'] ) && ( $wps_current_db_version[ 'installation_state' ] == 'completed' ) && ( WPSHOP_DEFINED_SHOP_TYPE == 'sale' ) && empty( $current_page ) ) {
-			add_action( 'admin_notices', array( 'wpshop_notices' , 'sale_shop_notice' ) );
+		$current_page = strstr($_SERVER["REQUEST_URI"], 'wps-about');
+		if (isset($wps_current_db_version['installation_state']) && ($wps_current_db_version['installation_state'] == 'completed') && (WPSHOP_DEFINED_SHOP_TYPE == 'sale') && empty($current_page)) {
+			add_action('admin_notices', array('wpshop_notices', 'sale_shop_notice'));
 		}
 
 		/**	Create an administration menu	*/
-		add_action( 'admin_menu', array( $this, 'admin_menu' ), 10 );
-		add_action( 'admin_head', array( $this, 'admin_head' ), 11 );
+		add_action('admin_menu', array($this, 'admin_menu'), 10);
+		add_action('admin_head', array($this, 'admin_head'), 11);
 
 		/**	In case that configuration have not been done and that instalation is not asked to be ignored	*/
-		if ( empty( $wps_current_db_version ) || empty( $wps_current_db_version[ 'installation_state' ] ) || ( !empty( $wps_current_db_version[ 'installation_state' ] ) && !in_array( $wps_current_db_version[ 'installation_state' ], array( 'completed', 'ignored' ) ) ) ) {
+		if (empty($wps_current_db_version) || empty($wps_current_db_version['installation_state']) || (!empty($wps_current_db_version['installation_state']) && !in_array($wps_current_db_version['installation_state'], array('completed', 'ignored')))) {
 			/*	Check the db installation state for admin message output	*/
-			$current_page = strstr( $_SERVER[ "REQUEST_URI" ], 'wps-installer');
-			if( ( WPSINSTALLER_STEPS_COUNT > $this->current_installation_step ) && ( empty( $current_page ) ) ) {
-				add_action( 'admin_notices', array( &$this, 'install_admin_notice' ) );
+			$current_page = strstr($_SERVER["REQUEST_URI"], 'wps-installer');
+			if ((WPSINSTALLER_STEPS_COUNT > $this->current_installation_step) && (empty($current_page))) {
+				add_action('admin_notices', array(&$this, 'install_admin_notice'));
 			}
 		}
 
 		/**	Hook wpshop dashboard in order to display the notice banner with quick links - wordpress like	*/
-		add_filter( 'wps-dashboard-notice', array( $this, 'wps_dashboard_notice' ), 10, 1 );
+		add_filter('wps-dashboard-notice', array($this, 'wps_dashboard_notice'), 10, 1);
 
 		/**	Hook ajax action when clicking on hide welcome banner on wpshop dashboard	*/
-		add_action( 'wp_ajax_wps-hide-welcome-panel', array( $this, 'wps_hide_welcome_panel' ) );
+		add_action('wp_ajax_wps-hide-welcome-panel', array($this, 'wps_hide_welcome_panel'));
 	}
 
 
@@ -98,7 +98,7 @@ 
 	 */
 	function admin_head() {
 		// remove_menu_page( 'wps-about' );
-		remove_menu_page( 'wps-installer' );
+		remove_menu_page('wps-installer');
 	}
 
 	/**
@@ -106,11 +106,11 @@ 
 	 */
 	function admin_menu() {
 		/**	Get current version for wpshop plugin	*/
-		$wps_current_db_version = get_option( 'wpshop_db_options', 0 );
+		$wps_current_db_version = get_option('wpshop_db_options', 0);
 
 		// About WPShop called in wps_help
 		// add_menu_page( __( 'About WPShop', 'wpshop' ), __( 'WPShop - about', 'wpshop' ), 'manage_options', 'wps-about', array( &$this, 'wps_about_page' ) );
-		add_menu_page( __( 'Install WPShop', 'wpshop' ), __( 'WPShop - install', 'wpshop' ), 'manage_options', 'wps-installer', array( &$this, 'installer_main_page' ) );
+		add_menu_page(__('Install WPShop', 'wpshop'), __('WPShop - install', 'wpshop'), 'manage_options', 'wps-installer', array(&$this, 'installer_main_page'));
 		/*if ( empty( $wps_current_db_version ) || empty( $wps_current_db_version[ 'installation_state' ] ) || ( !empty( $wps_current_db_version[ 'installation_state' ] ) && !in_array( $wps_current_db_version[ 'installation_state' ], array( 'completed', 'ignored' ) ) ) ) {
 			add_menu_page( __( 'Wpshop installer', 'wpshop'), __( 'Wpshop', 'wpshop'), 'wpshop_view_dashboard', 'wps-installer', array( &$this, 'installer_main_page'), WPSHOP_MEDIAS_URL . "icones/wpshop_menu_icons.png", 34 );
 		}*/
@@ -120,23 +120,23 @@ 
 	 * Enqueue scripts definition
 	 */
 	function admin_js() {
-		wp_enqueue_script( 'wps-installer-admin-scripts', WPS_INSTALLER_URL . WPS_INSTALLER_DIR . '/assets/js/backend-scripts.js', array( 'jquery' ), WPS_INSTALLER_VERSION);
+		wp_enqueue_script('wps-installer-admin-scripts', WPS_INSTALLER_URL . WPS_INSTALLER_DIR . '/assets/js/backend-scripts.js', array('jquery'), WPS_INSTALLER_VERSION);
 	}
 
 	/**
 	 * Display the installer interface
 	 */
 	function installer_main_page() {
-		$current_step = ( !empty( $_GET['wps-installation-step'] ) ) ? wpshop_tools::varSanitizer( $_GET['wps-installation-step'] ) : $this->current_installation_step;
-		$steps = unserialize( WPSINSTALLER_STEPS );
+		$current_step = (!empty($_GET['wps-installation-step'])) ? wpshop_tools::varSanitizer($_GET['wps-installation-step']) : $this->current_installation_step;
+		$steps = unserialize(WPSINSTALLER_STEPS);
 
 		/**	Get the defined shop type in order to display the different element to	*/
-		$wps_shop_type = get_option( 'wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE );
+		$wps_shop_type = get_option('wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE);
 
 		/** Check the current step to display */
 		$current_step_output = '';
 		$the_step_file = '';
-		switch( $current_step ) {
+		switch ($current_step) {
 			case 2:
 				$the_step_file = 'step_two';
 				break;
@@ -148,25 +148,25 @@ 
 
 		/**	Create display for current step	*/
 		ob_start();
-		require_once( wpshop_tools::get_template_part( WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", $the_step_file ) );
+		require_once(wpshop_tools::get_template_part(WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", $the_step_file));
 		$current_step_output = ob_get_contents();
 		ob_end_clean();
 
-		require_once( wpshop_tools::get_template_part( WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", "installer" ) );
+		require_once(wpshop_tools::get_template_part(WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", "installer"));
 	}
 
 	/**
 	 * Create a notice for admin user when plugin is activated and not yet configured
 	 */
 	function install_admin_notice() {
-		require_once( wpshop_tools::get_template_part( WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", "notice" ) );
+		require_once(wpshop_tools::get_template_part(WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", "notice"));
 	}
 
 	/**
 	 * Redirect the user automatically to the wpshop about page
 	 */
 	function go_to_wpshop_about() {
-		wp_redirect( admin_url( 'admin.php?page=wpshop_about' ) );
+		wp_redirect(admin_url('admin.php?page=wpshop_about'));
 		exit();
 	}
 
@@ -174,26 +174,26 @@ 
 	 * DISPLAY - Output the about page for wpshop
 	 */
 	function wps_about_page() {
-		require_once( wpshop_tools::get_template_part( WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", "about" ) );
+		require_once(wpshop_tools::get_template_part(WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", "about"));
 	}
 
 	/**
 	 * DISPLAY - Display a banner on wpshop dashboard
 	 */
 	function wps_dashboard_notice() {
-		$user_pref = get_user_meta( get_current_user_id(), '_wps_hide_notice_messages_indicator', true );
+		$user_pref = get_user_meta(get_current_user_id(), '_wps_hide_notice_messages_indicator', true);
 
-		if ( empty( $user_pref ) || empty( $user_pref[ 'welcome-banner' ] ) ) {
+		if (empty($user_pref) || empty($user_pref['welcome-banner'])) {
 			/**	Get current shop type	*/
-			$shop_type = get_option( 'wpshop_shop_type' );
+			$shop_type = get_option('wpshop_shop_type');
 
 			/**	Get the current number of product created	*/
 			$nb_products = 0;
-			$created_products = wp_count_posts( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
-			if ( !empty( $created_products ) ) {
-				foreach ( $created_products as $created_product_type => $created_product_nb) {
+			$created_products = wp_count_posts(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			if (!empty($created_products)) {
+				foreach ($created_products as $created_product_type => $created_product_nb) {
 					/**	Don't count product that are automatically created and not accessible through amin interface	*/
-					if ( !in_array( $created_product_type, array( 'auto-draft', 'inherit' ) ) ) {
+					if (!in_array($created_product_type, array('auto-draft', 'inherit'))) {
 						$nb_products += $created_product_nb;
 					}
 				}
@@ -201,18 +201,18 @@ 
 
 			/**	Get configuration about payment method 	*/
 			$no_payment_mode_configurated = true;
-			if ( !empty($paymentMethod ) && !empty($paymentMethod['mode']) ) {
-				foreach( $paymentMethod['mode'] as $k => $pm ) {
-					if ( !empty($pm['active'] ) ) {
+			if (!empty($paymentMethod) && !empty($paymentMethod['mode'])) {
+				foreach ($paymentMethod['mode'] as $k => $pm) {
+					if (!empty($pm['active'])) {
 						$no_payment_mode_configurated = false;
 					}
 				}
 			}
 
 			/**	Get configuration about emails 	*/
-			$emails = get_option('wpshop_emails', array() );
+			$emails = get_option('wpshop_emails', array());
 
-			require_once( wpshop_tools::get_template_part( WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", "welcome" ) );
+			require_once(wpshop_tools::get_template_part(WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", "welcome"));
 		}
 	}
 
@@ -220,24 +220,24 @@ 
 	 * AJAX - Launch ajax action allowing to hide welcome panel for current user
 	 */
 	function wps_hide_welcome_panel() {
-		$wpshop_ajax_nonce = !empty( $_REQUEST['wpshop_ajax_nonce'] ) ? sanitize_text_field( $_REQUEST['wpshop_ajax_nonce'] ) : '';
+		$wpshop_ajax_nonce = !empty($_REQUEST['wpshop_ajax_nonce']) ? sanitize_text_field($_REQUEST['wpshop_ajax_nonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps-installer-welcome-panel-close' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps-installer-welcome-panel-close'))
 			wp_die();
 
-		$user_pref = get_user_meta( get_current_user_id(), '_wps_hide_notice_messages_indicator', true );
-		$user_pref[ 'welcome-banner' ] = true;
+		$user_pref = get_user_meta(get_current_user_id(), '_wps_hide_notice_messages_indicator', true);
+		$user_pref['welcome-banner'] = true;
 
 		$response = array(
 			'status' => false,
 		);
 
-		$user_pref = update_user_meta( get_current_user_id(), '_wps_hide_notice_messages_indicator', $user_pref );
-		if ( false !== $user_pref ) {
-			$response[ 'status' ] = true;
+		$user_pref = update_user_meta(get_current_user_id(), '_wps_hide_notice_messages_indicator', $user_pref);
+		if (false !== $user_pref) {
+			$response['status'] = true;
 		}
 
-		wp_die( json_encode( $response ) );
+		wp_die(json_encode($response));
 	}
 }
 

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * File for installer control class definition
  *
@@ -222,8 +224,9 @@ 
 	function wps_hide_welcome_panel() {
 		$wpshop_ajax_nonce = !empty( $_REQUEST['wpshop_ajax_nonce'] ) ? sanitize_text_field( $_REQUEST['wpshop_ajax_nonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps-installer-welcome-panel-close' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps-installer-welcome-panel-close' ) ) {
+					wp_die();
+		}
 
 		$user_pref = get_user_meta( get_current_user_id(), '_wps_hide_notice_messages_indicator', true );
 		$user_pref[ 'welcome-banner' ] = true;

includes/modules/wpshop_cart_rules/wpshop_cart_rules.php

Spacing +113 added lines, -113 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /**
  * Cart rules bootstrap file
@@ -9,29 +9,29 @@ 
  *
  */
 
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __("You are not allowed to use this service.", 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__("You are not allowed to use this service.", 'wpshop'));
 }
-if ( !class_exists("wpshop_cart_rules") ) {
+if (!class_exists("wpshop_cart_rules")) {
 	class wpshop_cart_rules {
 
-		function __construct () {
+		function __construct() {
 			/**	Add module option to wpshop general options	*/
 			add_filter('wpshop_options', array(&$this, 'add_options'), 9);
 			add_action('wsphop_options', array(&$this, 'declare_options'));
 
-			add_filter( 'wpshop_custom_template', array( &$this, 'custom_template_load' ) );
+			add_filter('wpshop_custom_template', array(&$this, 'custom_template_load'));
 
 			/**	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( 'init', array(&$this, 'frontend_js') );
-			add_action( 'admin_init', array(&$this, 'admin_js') );
+			add_action('init', array(&$this, 'frontend_js'));
+			add_action('admin_init', array(&$this, 'admin_js'));
 
 			/** AJAX actions **/
-			add_action('wp_ajax_save_cart_rule',array( $this, 'wpshop_ajax_save_cart_rule'));
-			add_action('wp_ajax_delete_cart_rule',array( $this, 'wpshop_ajax_delete_cart_rule'));
+			add_action('wp_ajax_save_cart_rule', array($this, 'wpshop_ajax_save_cart_rule'));
+			add_action('wp_ajax_delete_cart_rule', array($this, 'wpshop_ajax_delete_cart_rule'));
 		}
 
 		/**
@@ -39,9 +39,9 @@ 
 		 */
 		function admin_css() {
 			/** CSS Include **/
-			if ( is_admin() ) {
-				wp_register_style( 'wpshop_cart_rules_css', plugins_url('templates/backend/css/wpshop_cart_rules.css', __FILE__) );
-				wp_enqueue_style( 'wpshop_cart_rules_css' );
+			if (is_admin()) {
+				wp_register_style('wpshop_cart_rules_css', plugins_url('templates/backend/css/wpshop_cart_rules.css', __FILE__));
+				wp_enqueue_style('wpshop_cart_rules_css');
 			}
 		}
 
@@ -58,18 +58,18 @@ 
 		function admin_js() {
 			/** JS Include **/
 			wp_enqueue_script("jquery");
-			if ( is_admin() ) {
-				wp_enqueue_script( 'wpshop_cart_rules', plugins_url('templates/backend/js/wpshop_cart_rules.js', __FILE__) );
+			if (is_admin()) {
+				wp_enqueue_script('wpshop_cart_rules', plugins_url('templates/backend/js/wpshop_cart_rules.js', __FILE__));
 			}
 		}
 
 		/** Load the module template **/
-		function custom_template_load( $templates ) {
+		function custom_template_load($templates) {
 			include('templates/backend/main_elements.tpl.php');
 
-			foreach ( $tpl_element as $template_part => $template_part_content) {
-				foreach ( $template_part_content as $template_type => $template_type_content) {
-					foreach ( $template_type_content as $template_key => $template) {
+			foreach ($tpl_element as $template_part => $template_part_content) {
+				foreach ($template_part_content as $template_type => $template_type_content) {
+					foreach ($template_type_content as $template_key => $template) {
 						$templates[$template_part][$template_type][$template_key] = $template;
 					}
 				}
@@ -80,14 +80,14 @@ 
 		}
 
 		/** Declare options for this module **/
-		function declare_options () {
-			if ( WPSHOP_DEFINED_SHOP_TYPE == 'sale' ) {
-				$wpshop_shop_type = !empty( $_POST['wpshop_shop_type'] ) ? sanitize_text_field( $_POST['wpshop_shop_type'] ) : '';
-				$old_wpshop_shop_type = !empty( $_POST['old_wpshop_shop_type'] ) ? sanitize_text_field( $_POST['old_wpshop_shop_type'] ) : '';
-
-				if ( ( $wpshop_shop_type == '' || $wpshop_shop_type != 'presentation' )
-					&& ( $old_wpshop_shop_type == '' && $old_wpshop_shop_type != 'presentation' ) ) {
-						add_settings_section('wpshop_cart_rules_option', '<span class="dashicons dashicons-cart"></span>'.__('Cart Rules', 'wpshop'), array(&$this, 'cart_rules_section_text'), 'wpshop_cart_rules_option');
+		function declare_options() {
+			if (WPSHOP_DEFINED_SHOP_TYPE == 'sale') {
+				$wpshop_shop_type = !empty($_POST['wpshop_shop_type']) ? sanitize_text_field($_POST['wpshop_shop_type']) : '';
+				$old_wpshop_shop_type = !empty($_POST['old_wpshop_shop_type']) ? sanitize_text_field($_POST['old_wpshop_shop_type']) : '';
+
+				if (($wpshop_shop_type == '' || $wpshop_shop_type != 'presentation')
+					&& ($old_wpshop_shop_type == '' && $old_wpshop_shop_type != 'presentation')) {
+						add_settings_section('wpshop_cart_rules_option', '<span class="dashicons dashicons-cart"></span>' . __('Cart Rules', 'wpshop'), array(&$this, 'cart_rules_section_text'), 'wpshop_cart_rules_option');
 						register_setting('wpshop_options', 'wpshop_cart_rules_option', array(&$this, 'validate_cart_rules_options'));
 						add_settings_field('wpshop_cart_rules_option', __('Activate cart rules', 'wpshop'), array(&$this, 'wpshop_cart_rules_field'), 'wpshop_cart_rules_option', 'wpshop_cart_rules_option');
 
@@ -96,63 +96,63 @@ 
 		}
 
 		/** Add a section for option display **/
-		function add_options( $option_group ) {
+		function add_options($option_group) {
 			$option_group['wpshop_cart_option']['subgroups']['wpshop_cart_rules_option']['class'] = ' wpshop_admin_box_options_cart_rules';
 			return $option_group;
 		}
 
-		function cart_rules_section_text () {
+		function cart_rules_section_text() {
 
 		}
 
 		/** Option cart rules configuuration interface **/
-		function wpshop_cart_rules_field () {
+		function wpshop_cart_rules_field() {
 			global $wpdb;
 			$cart_rules_options = get_option('wpshop_cart_rules_option');
-			$cart_rules = ( !empty($cart_rules_options) ) ? $cart_rules_options['rules'] : '';
+			$cart_rules = (!empty($cart_rules_options)) ? $cart_rules_options['rules'] : '';
 
 			$wpshop_customer_groups = get_option('wp_user_roles');
 
-			$tpl_component['CART_RULES_CUSTOMERS_GROUPS'] = '<option value="">' .__('All customers groups' , 'wpshop'). '</option>';
-			if ( !empty($wpshop_customer_groups) ) {
-				foreach ( $wpshop_customer_groups as $k =>  $wpshop_customer_group) {
-					$tpl_component['CART_RULES_CUSTOMERS_GROUPS'] .= '<option value="' .$k. '">' .$wpshop_customer_group['name']. '</option>';
+			$tpl_component['CART_RULES_CUSTOMERS_GROUPS'] = '<option value="">' . __('All customers groups', 'wpshop') . '</option>';
+			if (!empty($wpshop_customer_groups)) {
+				foreach ($wpshop_customer_groups as $k =>  $wpshop_customer_group) {
+					$tpl_component['CART_RULES_CUSTOMERS_GROUPS'] .= '<option value="' . $k . '">' . $wpshop_customer_group['name'] . '</option>';
 				}
 			}
 
-			$tpl_component['CART_RULES_DATA'] = ( !empty($cart_rules) ) ? $cart_rules : '';
-			$tpl_component['ACTIVE_CART_RULES'] = ( (!empty($cart_rules_options) && !empty($cart_rules_options['activate']) ) ? 'checked="checked"' : '');
+			$tpl_component['CART_RULES_DATA'] = (!empty($cart_rules)) ? $cart_rules : '';
+			$tpl_component['ACTIVE_CART_RULES'] = ((!empty($cart_rules_options) && !empty($cart_rules_options['activate'])) ? 'checked="checked"' : '');
 
-			$tpl_component['ALL_CART_RULES'] = (!empty($cart_rules) ) ? wpshop_cart_rules::display_cart_rules( $cart_rules ) : '';
+			$tpl_component['ALL_CART_RULES'] = (!empty($cart_rules)) ? wpshop_cart_rules::display_cart_rules($cart_rules) : '';
 			$tpl_component['MEDIAS_ICON_URL'] = WPSHOP_MEDIAS_ICON_URL;
 			/** Product list **/
-			$query = $wpdb->prepare('SELECT ID, post_title, post_type FROM '.$wpdb->posts.' WHERE (post_type = %s OR post_type = %s) AND (post_status = %s OR post_status = %s)', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'draft', 'publish');
+			$query = $wpdb->prepare('SELECT ID, post_title, post_type FROM ' . $wpdb->posts . ' WHERE (post_type = %s OR post_type = %s) AND (post_status = %s OR post_status = %s)', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'draft', 'publish');
 			$products = $wpdb->get_results($query);
 			$tpl_component['PRODUCTS_LIST_FOR_GIFT'] = '';
-			if ( !empty($products) ) {
-				foreach($products as $product) {
-					if ( $product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-						$parent_product_infos = wpshop_products::get_parent_variation ( $product->ID );
-						if ( !empty($parent_product_infos) && !empty($parent_product_infos['parent_post']) ) {
+			if (!empty($products)) {
+				foreach ($products as $product) {
+					if ($product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+						$parent_product_infos = wpshop_products::get_parent_variation($product->ID);
+						if (!empty($parent_product_infos) && !empty($parent_product_infos['parent_post'])) {
 							$parent_post_infos = $parent_product_infos['parent_post'];
 							$product_title = $parent_post_infos->post_title;
 
 							$product_options = get_post_meta($product->ID, '_wpshop_variations_attribute_def', true);
-							if ( !empty($product_options) && is_array($product_options) ) {
+							if (!empty($product_options) && is_array($product_options)) {
 								$option_name = '';
-								foreach( $product_options as $k=>$product_option) {
-									$query = $wpdb->prepare('SELECT frontend_label FROM '.WPSHOP_DBT_ATTRIBUTE.' WHERE code = %s', $k);
-									$option_name .= $wpdb->get_var($query).' ';
-									$query = $wpdb->prepare('SELECT label FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS.' WHERE id= %d', $product_option);
-									$option_name .=  $wpdb->get_var($query).' ';
+								foreach ($product_options as $k=>$product_option) {
+									$query = $wpdb->prepare('SELECT frontend_label FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s', $k);
+									$option_name .= $wpdb->get_var($query) . ' ';
+									$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id= %d', $product_option);
+									$option_name .= $wpdb->get_var($query) . ' ';
 								}
-								$tpl_component['PRODUCTS_LIST_FOR_GIFT'] .= '<option value="'.$product->ID. '" >'. $product_title .' (' .$option_name. ')</option>';
+								$tpl_component['PRODUCTS_LIST_FOR_GIFT'] .= '<option value="' . $product->ID . '" >' . $product_title . ' (' . $option_name . ')</option>';
 							}
 
 						}
 					}
 					else {
-						$tpl_component['PRODUCTS_LIST_FOR_GIFT'] .= '<option value="'.$product->ID. '" >' .$product->post_title. '</option>';
+						$tpl_component['PRODUCTS_LIST_FOR_GIFT'] .= '<option value="' . $product->ID . '" >' . $product->post_title . '</option>';
 					}
 				}
 			}
@@ -162,28 +162,28 @@ 
 			echo $output;
 		}
 
-		function validate_cart_rules_options ($input) {
+		function validate_cart_rules_options($input) {
 			return $input;
 		}
 
 		/** Save the cart rule **/
-		function wpshop_ajax_save_cart_rule () {
-			$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		function wpshop_ajax_save_cart_rule() {
+			$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_save_cart_rule' ) )
+			if (!wp_verify_nonce($_wpnonce, 'wpshop_ajax_save_cart_rule'))
 				wp_die();
 
-			$cart_limen = ( !empty($_POST['cart_limen']) ) ? wpshop_tools::varSanitizer($_POST['cart_limen']) : null;
-			$discount_type = ( !empty($_POST['discount_type']) ) ? wpshop_tools::varSanitizer($_POST['discount_type']) : null;
-			$discount_value = ( !empty($_POST['discount_value']) ) ? wpshop_tools::varSanitizer($_POST['discount_value']) : null;
+			$cart_limen = (!empty($_POST['cart_limen'])) ? wpshop_tools::varSanitizer($_POST['cart_limen']) : null;
+			$discount_type = (!empty($_POST['discount_type'])) ? wpshop_tools::varSanitizer($_POST['discount_type']) : null;
+			$discount_value = (!empty($_POST['discount_value'])) ? wpshop_tools::varSanitizer($_POST['discount_value']) : null;
 			$customer_groups = wpshop_tools::varSanitizer($_POST['customer_groups']);
 
 			$status = false;
 			$response = array();
-			$cart_rules = ( !empty($_POST['cart_rules']) ) ? sanitize_text_field( $_POST['cart_rules'] ) : null;
+			$cart_rules = (!empty($_POST['cart_rules'])) ? sanitize_text_field($_POST['cart_rules']) : null;
 
-			if ( !empty($cart_limen) && !empty($discount_type) && !empty($discount_value) ) {
-				if ( !empty($cart_rules) ) {
+			if (!empty($cart_limen) && !empty($discount_type) && !empty($discount_value)) {
+				if (!empty($cart_rules)) {
 					$cart_rules = unserialize(stripslashes($cart_rules));
 					$cart_rules[$cart_limen] = array('discount_type' => $discount_type, 'discount_value' => $discount_value, 'customer_group' => $customer_groups);
 
@@ -203,21 +203,21 @@ 
 		}
 
 		/** Save the cart rule **/
-		function wpshop_ajax_delete_cart_rule () {
-			$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		function wpshop_ajax_delete_cart_rule() {
+			$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_delete_cart_rule' ) )
+			if (!wp_verify_nonce($_wpnonce, 'wpshop_ajax_delete_cart_rule'))
 				wp_die();
 
-			$cart_rule_id = ( !empty($_POST['cart_rule_id']) ) ? wpshop_tools::varSanitizer($_POST['cart_rule_id']) : null;
+			$cart_rule_id = (!empty($_POST['cart_rule_id'])) ? wpshop_tools::varSanitizer($_POST['cart_rule_id']) : null;
 
 			$status = false;
 			$response = array();
-			$cart_rules = ( !empty($_POST['cart_rules']) ) ? sanitize_text_field( $_POST['cart_rules'] ) : null;
+			$cart_rules = (!empty($_POST['cart_rules'])) ? sanitize_text_field($_POST['cart_rules']) : null;
 
 			$cart_rule_id = str_replace('_', '.', $cart_rule_id);
 
-			if ( !empty($cart_rule_id) ) {
+			if (!empty($cart_rule_id)) {
 				$cart_rules = unserialize(stripslashes($cart_rules));
 				unset($cart_rules[$cart_rule_id]);
 				$cart_rules = serialize($cart_rules);
@@ -232,42 +232,42 @@ 
 		}
 
 		/** Display all cart rules **/
-		function display_cart_rules( $rules ) {
+		function display_cart_rules($rules) {
 			global $wpdb;
 			$output = '';
-			if ( !empty($rules) ) {
+			if (!empty($rules)) {
 				$tpl_component['MEDIAS_ICON_URL'] = WPSHOP_MEDIAS_ICON_URL;
 				$tpl_component['CART_RULES_LINE'] = '';
-				foreach( unserialize($rules) as $k => $rule ) {
+				foreach (unserialize($rules) as $k => $rule) {
 					$sub_tpl_component['CART_RULE_LINE_CART_LIMEN'] = $k;
 					switch ($rule['discount_type']) {
 						case 'absolute_discount' :
 							$discount_type = __('Absolute discount', 'wpshop');
-							$discount_value = $rule['discount_value'].' '.wpshop_tools::wpshop_get_currency();
+							$discount_value = $rule['discount_value'] . ' ' . wpshop_tools::wpshop_get_currency();
 						break;
 						case 'percent_discount' :
 							$discount_type = __('Percent discount', 'wpshop');
-							$discount_value = $rule['discount_value'].' %';
+							$discount_value = $rule['discount_value'] . ' %';
 						break;
 						case 'gift_product' :
 							$discount_type = __('Product gift', 'wpshop');
-							$product = get_post( $rule['discount_value'] );
-							if ( $product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-								$parent_product_infos = wpshop_products::get_parent_variation ( $product->ID );
-								if ( !empty($parent_product_infos) && !empty($parent_product_infos['parent_post']) ) {
+							$product = get_post($rule['discount_value']);
+							if ($product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+								$parent_product_infos = wpshop_products::get_parent_variation($product->ID);
+								if (!empty($parent_product_infos) && !empty($parent_product_infos['parent_post'])) {
 									$parent_post_infos = $parent_product_infos['parent_post'];
 									$product_title = $parent_post_infos->post_title;
 
 									$product_options = get_post_meta($product->ID, '_wpshop_variations_attribute_def', true);
-									if ( !empty($product_options) && is_array($product_options) ) {
+									if (!empty($product_options) && is_array($product_options)) {
 										$option_name = '';
-										foreach( $product_options as $k=>$product_option) {
-											$query = $wpdb->prepare('SELECT frontend_label FROM '.WPSHOP_DBT_ATTRIBUTE.' WHERE code = %s', $k);
-											$option_name .= $wpdb->get_var($query).' ';
-											$query = $wpdb->prepare('SELECT label FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS.' WHERE id= %d', $product_option);
-											$option_name .=  $wpdb->get_var($query).' ';
+										foreach ($product_options as $k=>$product_option) {
+											$query = $wpdb->prepare('SELECT frontend_label FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s', $k);
+											$option_name .= $wpdb->get_var($query) . ' ';
+											$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id= %d', $product_option);
+											$option_name .= $wpdb->get_var($query) . ' ';
 										}
-										$discount_value = $product_title .' (' .$option_name. ')';
+										$discount_value = $product_title . ' (' . $option_name . ')';
 									}
 
 								}
@@ -283,7 +283,7 @@ 
 					}
 					$sub_tpl_component['CART_RULE_LINE_DISCOUNT_TYPE'] = $discount_type;
 					$sub_tpl_component['CART_RULE_LINE_DISCOUNT_VALUE'] = $discount_value;
-					$sub_tpl_component['CART_RULE_LINE_CUSTOMER_GROUP'] = (!empty($rule['customer_group']) ) ? $rule['customer_group'] : __('All customers groups', 'wpshop');
+					$sub_tpl_component['CART_RULE_LINE_CUSTOMER_GROUP'] = (!empty($rule['customer_group'])) ? $rule['customer_group'] : __('All customers groups', 'wpshop');
 					$sub_tpl_component['CART_RULE_ID'] = str_replace('.', '_', $sub_tpl_component['CART_RULE_LINE_CART_LIMEN']);
 					$sub_tpl_component['MEDIAS_ICON_URL'] = WPSHOP_MEDIAS_ICON_URL;
 					$tpl_component['CART_RULES_LINE'] .= wpshop_display::display_template_element('cart_rules_line', $sub_tpl_component, array(), 'admin');
@@ -299,31 +299,31 @@ 
 		 * @param integer_type $cart_amount
 		 * @return array
 		 */
-		function get_cart_rule ($cart_amount) {
+		function get_cart_rule($cart_amount) {
 			$cart_rule_info = array();
 			$cart_rule_exist = false;
-			if ( !empty($cart_amount) ) {
+			if (!empty($cart_amount)) {
 				$cart_rules_option = get_option('wpshop_cart_rules_option');
-				if ( !empty($cart_rules_option) && !empty($cart_rules_option['activate']) && !empty($cart_rules_option['rules']) ) {
+				if (!empty($cart_rules_option) && !empty($cart_rules_option['activate']) && !empty($cart_rules_option['rules'])) {
 					$cart_rules = unserialize($cart_rules_option['rules']);
-					if ( is_array($cart_rules) ) {
+					if (is_array($cart_rules)) {
 						$cart_rule_id = 0;
-						foreach( $cart_rules as $k => $cart_rule ) {
-							if ( $cart_amount >= $k ) {
+						foreach ($cart_rules as $k => $cart_rule) {
+							if ($cart_amount >= $k) {
 								$cart_rule_id = $k;
-								if ( $cart_rule_id != 0 ) {
+								if ($cart_rule_id != 0) {
 									/** Check if there is a customer group limit **/
-									if ( empty($cart_rules[$cart_rule_id]['customer_group']) ) {
+									if (empty($cart_rules[$cart_rule_id]['customer_group'])) {
 										$cart_rule_exist = true;
 										$cart_rule_info['discount_type'] = $cart_rules[$cart_rule_id]['discount_type'];
 										$cart_rule_info['discount_value'] = $cart_rules[$cart_rule_id]['discount_value'];
 									}
 									else {
-										if ( get_current_user_id() != 0 ) {
-											$user_meta = get_user_meta( get_current_user_id(), 'wp_capabilities', true );
-											if ( !empty($user_meta)  ) {
+										if (get_current_user_id() != 0) {
+											$user_meta = get_user_meta(get_current_user_id(), 'wp_capabilities', true);
+											if (!empty($user_meta)) {
 												foreach ($user_meta as $k => $user) {
-													if ( $k == $cart_rules[$cart_rule_id]['customer_group'] ) {
+													if ($k == $cart_rules[$cart_rule_id]['customer_group']) {
 														$cart_rule_exist = true;
 														$cart_rule_info['discount_type'] = $cart_rules[$cart_rule_id]['discount_type'];
 														$cart_rule_info['discount_value'] = $cart_rules[$cart_rule_id]['discount_value'];
@@ -342,27 +342,27 @@ 
 			return array('cart_rule_exist' => $cart_rule_exist, 'cart_rule_info' => $cart_rule_info);
 		}
 
-		function add_gift_product_to_cart ( $cartContent, $order ) {
+		function add_gift_product_to_cart($cartContent, $order) {
 			global $wpdb;
-			if ( !empty($order['cart_rule']) && !empty($order['cart_rule']['discount_value']) && !empty($order['cart_rule']['discount_type']) &&  $order['cart_rule']['discount_type'] == 'gift_product') {
-				$product = get_post( $order['cart_rule']['discount_value'] );
+			if (!empty($order['cart_rule']) && !empty($order['cart_rule']['discount_value']) && !empty($order['cart_rule']['discount_type']) && $order['cart_rule']['discount_type'] == 'gift_product') {
+				$product = get_post($order['cart_rule']['discount_value']);
 				$option_name = '';
-				if ( $product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-					$parent_product_infos = wpshop_products::get_parent_variation ( $product->ID );
-					if ( !empty($parent_product_infos) && !empty($parent_product_infos['parent_post']) ) {
+				if ($product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+					$parent_product_infos = wpshop_products::get_parent_variation($product->ID);
+					if (!empty($parent_product_infos) && !empty($parent_product_infos['parent_post'])) {
 						$parent_post_infos = $parent_product_infos['parent_post'];
 						$product_title = $parent_post_infos->post_title;
 
 						$product_options = get_post_meta($product->ID, '_wpshop_variations_attribute_def', true);
-						if ( !empty($product_options) && is_array($product_options) ) {
+						if (!empty($product_options) && is_array($product_options)) {
 							$option_name = '';
-							foreach( $product_options as $k=>$product_option) {
-								$query = $wpdb->prepare('SELECT frontend_label FROM '.WPSHOP_DBT_ATTRIBUTE.' WHERE code = %s', $k);
-								$option_name .= $wpdb->get_var($query).' ';
-								$query = $wpdb->prepare('SELECT label FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS.' WHERE id= %d', $product_option);
-								$option_name .=  $wpdb->get_var($query).' ';
+							foreach ($product_options as $k=>$product_option) {
+								$query = $wpdb->prepare('SELECT frontend_label FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s', $k);
+								$option_name .= $wpdb->get_var($query) . ' ';
+								$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id= %d', $product_option);
+								$option_name .= $wpdb->get_var($query) . ' ';
 							}
-							$discount_value = $product_title ;
+							$discount_value = $product_title;
 						}
 
 					}
@@ -380,7 +380,7 @@ 
 
 				$tpl_component['CART_LINE_ITEM_QTY_'] = 1;
 				$tpl_component['CART_LINE_ITEM_REMOVER'] = '';
-				$tpl_component['CART_PRODUCT_NAME'] = $discount_value .' ('.__('Gift product', 'wpshop').')';
+				$tpl_component['CART_PRODUCT_NAME'] = $discount_value . ' (' . __('Gift product', 'wpshop') . ')';
 
 
 				$cartContent .= wpshop_display::display_template_element('cart_line', $tpl_component);
@@ -391,6 +391,6 @@ 
 	}
 }
 /**	Instanciate the module utilities if not	*/
-if ( class_exists("wpshop_cart_rules") ) {
+if (class_exists("wpshop_cart_rules")) {
 	$wpshop_cart_rules = new wpshop_cart_rules();
 }

Braces +14 added lines, -15 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Cart rules bootstrap file
@@ -150,8 +152,7 @@ 
 							}
 
 						}
-					}
-					else {
+					} else {
 						$tpl_component['PRODUCTS_LIST_FOR_GIFT'] .= '<option value="'.$product->ID. '" >' .$product->post_title. '</option>';
 					}
 				}
@@ -170,8 +171,9 @@ 
 		function wpshop_ajax_save_cart_rule () {
 			$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_save_cart_rule' ) )
-				wp_die();
+			if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_save_cart_rule' ) ) {
+							wp_die();
+			}
 
 			$cart_limen = ( !empty($_POST['cart_limen']) ) ? wpshop_tools::varSanitizer($_POST['cart_limen']) : null;
 			$discount_type = ( !empty($_POST['discount_type']) ) ? wpshop_tools::varSanitizer($_POST['discount_type']) : null;
@@ -187,8 +189,7 @@ 
 					$cart_rules = unserialize(stripslashes($cart_rules));
 					$cart_rules[$cart_limen] = array('discount_type' => $discount_type, 'discount_value' => $discount_value, 'customer_group' => $customer_groups);
 
-				}
-				else {
+				} else {
 					$cart_rules = array();
 					$cart_rules[$cart_limen] = array('discount_type' => $discount_type, 'discount_value' => $discount_value, 'customer_group' => $customer_groups);
 				}
@@ -206,8 +207,9 @@ 
 		function wpshop_ajax_delete_cart_rule () {
 			$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_delete_cart_rule' ) )
-				wp_die();
+			if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_delete_cart_rule' ) ) {
+							wp_die();
+			}
 
 			$cart_rule_id = ( !empty($_POST['cart_rule_id']) ) ? wpshop_tools::varSanitizer($_POST['cart_rule_id']) : null;
 
@@ -271,8 +273,7 @@ 
 									}
 
 								}
-							}
-							else {
+							} else {
 								$discount_value = $product->post_title;
 							}
 						break;
@@ -317,8 +318,7 @@ 
 										$cart_rule_exist = true;
 										$cart_rule_info['discount_type'] = $cart_rules[$cart_rule_id]['discount_type'];
 										$cart_rule_info['discount_value'] = $cart_rules[$cart_rule_id]['discount_value'];
-									}
-									else {
+									} else {
 										if ( get_current_user_id() != 0 ) {
 											$user_meta = get_user_meta( get_current_user_id(), 'wp_capabilities', true );
 											if ( !empty($user_meta)  ) {
@@ -366,8 +366,7 @@ 
 						}
 
 					}
-				}
-				else {
+				} else {
 					$discount_value = $product->post_title;
 				}
 

includes/modules/wps_shipping/templates/frontend/shipping-mode-container.php

Spacing +10 added lines, -10 removed lines

@@ -1,24 +1,24 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- do_action( 'wpshop_account_custom_hook'); ?>
+<?php if (!defined('ABSPATH')) exit;
+ do_action('wpshop_account_custom_hook'); ?>
 <div class="wps-gridwrapper">
-	<span class="wps-h3"><?php _e( 'Shipping method', 'wpshop'); ?></span>
+	<span class="wps-h3"><?php _e('Shipping method', 'wpshop'); ?></span>
 </div>
 <div>
-	<?php if( $no_shipping_mode_for_area ) : ?>
-		<div class="wps-alert-error"><?php _e( 'Sorry ! You can\'t order on this shop, because we don\'t ship in your area', 'wpshop' ); ?>	</div>
+	<?php if ($no_shipping_mode_for_area) : ?>
+		<div class="wps-alert-error"><?php _e('Sorry ! You can\'t order on this shop, because we don\'t ship in your area', 'wpshop'); ?>	</div>
 	<?php else : ?>
-		<?php if( !empty($shipping_modes) && !empty($shipping_modes['modes']) ) : ?>
-		<ul class="wps-itemList" id="wps-shipping-method-list-container" data-nonce="<?php echo wp_create_nonce( 'wps_load_shipping_methods' ); ?>">
+		<?php if (!empty($shipping_modes) && !empty($shipping_modes['modes'])) : ?>
+		<ul class="wps-itemList" id="wps-shipping-method-list-container" data-nonce="<?php echo wp_create_nonce('wps_load_shipping_methods'); ?>">
 			<?php
 			$i = 0;
-			foreach( $shipping_modes['modes'] as $shipping_mode_id => $shipping_mode ) :
-				require( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, $this->template_dir, "frontend", "shipping-mode", "element") );
+			foreach ($shipping_modes['modes'] as $shipping_mode_id => $shipping_mode) :
+				require(wpshop_tools::get_template_part(WPS_SHIPPING_MODE_DIR, $this->template_dir, "frontend", "shipping-mode", "element"));
 			endforeach;
 
 			?>
 		</ul>
 		<?php else : ?>
-		<div class="wps-alert-info"><?php _e( 'No shipping mode available', 'wpshop' ); ?>	</div>
+		<div class="wps-alert-info"><?php _e('No shipping mode available', 'wpshop'); ?>	</div>
 		<?php endif; ?>
 	<?php endif; ?>
 </div>

Braces +13 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  do_action( 'wpshop_account_custom_hook'); ?>
 <div class="wps-gridwrapper">
 	<span class="wps-h3"><?php _e( 'Shipping method', 'wpshop'); ?></span>
@@ -6,9 +8,12 @@ 
 <div>
 	<?php if( $no_shipping_mode_for_area ) : ?>
 		<div class="wps-alert-error"><?php _e( 'Sorry ! You can\'t order on this shop, because we don\'t ship in your area', 'wpshop' ); ?>	</div>
-	<?php else : ?>
+	<?php else {
+	: ?>
 		<?php if( !empty($shipping_modes) && !empty($shipping_modes['modes']) ) : ?>
-		<ul class="wps-itemList" id="wps-shipping-method-list-container" data-nonce="<?php echo wp_create_nonce( 'wps_load_shipping_methods' ); ?>">
+		<ul class="wps-itemList" id="wps-shipping-method-list-container" data-nonce="<?php echo wp_create_nonce( 'wps_load_shipping_methods' );
+}
+?>">
 			<?php
 			$i = 0;
 			foreach( $shipping_modes['modes'] as $shipping_mode_id => $shipping_mode ) :
@@ -17,8 +22,11 @@ 
 
 			?>
 		</ul>
-		<?php else : ?>
-		<div class="wps-alert-info"><?php _e( 'No shipping mode available', 'wpshop' ); ?>	</div>
+		<?php else {
+	: ?>
+		<div class="wps-alert-info"><?php _e( 'No shipping mode available', 'wpshop' );
+}
+?>	</div>
 		<?php endif; ?>
 	<?php endif; ?>
 </div>