Eoxia / wpshop

includes/modules/wps_classic_checkout/templates/frontend/classic-checkout-step-three.php

Spacing +6 added lines, -6 removed lines

@@ -1,19 +1,19 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wps-checkout-wrapper">
 	<div class="wps-checkout-content">
 		<?php echo do_shortcode('[wps_addresses]'); ?>
 
 		<div id="wps-checkout-step-errors"></div>
-		<?php if( !empty( $_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' ) : ?>
-		<div class="wps"><button class="wps-bton-first-alignRight-rounded" data-nonce="<?php echo wp_create_nonce( 'wps_checkout_valid_step_three' ); ?>" id="wps-checkout-valid-step-three"><?php _e( 'Validate my quotation', 'wpshop' ); ?></button></div>
+		<?php if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') : ?>
+		<div class="wps"><button class="wps-bton-first-alignRight-rounded" data-nonce="<?php echo wp_create_nonce('wps_checkout_valid_step_three'); ?>" id="wps-checkout-valid-step-three"><?php _e('Validate my quotation', 'wpshop'); ?></button></div>
 		<?php else : ?>
-		<div class="wps"><button class="wps-bton-first-alignRight-rounded" data-nonce="<?php echo wp_create_nonce( 'wps_checkout_valid_step_three' ); ?>" id="wps-checkout-valid-step-three"><?php _e( 'Order', 'wpshop' ); ?></button></div>
+		<div class="wps"><button class="wps-bton-first-alignRight-rounded" data-nonce="<?php echo wp_create_nonce('wps_checkout_valid_step_three'); ?>" id="wps-checkout-valid-step-three"><?php _e('Order', 'wpshop'); ?></button></div>
 		<?php endif; ?>
 	</div>
 	<div class="wps-sidebar-resume">
 		<input type="hidden" name="action" value="wps-checkout_valid_step_five"/>
-		<?php wp_nonce_field( 'wps_checkout_valid_step_five' ); ?>
-		<?php echo do_shortcode( '[wps_resume_cart]' ); ?>
+		<?php wp_nonce_field('wps_checkout_valid_step_five'); ?>
+		<?php echo do_shortcode('[wps_resume_cart]'); ?>
 	</div>
 </div>

Braces +8 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <div class="wps-checkout-wrapper">
 	<div class="wps-checkout-content">
@@ -7,8 +9,11 @@ 
 		<div id="wps-checkout-step-errors"></div>
 		<?php if( !empty( $_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' ) : ?>
 		<div class="wps"><button class="wps-bton-first-alignRight-rounded" data-nonce="<?php echo wp_create_nonce( 'wps_checkout_valid_step_three' ); ?>" id="wps-checkout-valid-step-three"><?php _e( 'Validate my quotation', 'wpshop' ); ?></button></div>
-		<?php else : ?>
-		<div class="wps"><button class="wps-bton-first-alignRight-rounded" data-nonce="<?php echo wp_create_nonce( 'wps_checkout_valid_step_three' ); ?>" id="wps-checkout-valid-step-three"><?php _e( 'Order', 'wpshop' ); ?></button></div>
+		<?php else {
+	: ?>
+		<div class="wps"><button class="wps-bton-first-alignRight-rounded" data-nonce="<?php echo wp_create_nonce( 'wps_checkout_valid_step_three' );
+}
+?>" id="wps-checkout-valid-step-three"><?php _e( 'Order', 'wpshop' ); ?></button></div>
 		<?php endif; ?>
 	</div>
 	<div class="wps-sidebar-resume">

includes/modules/wps_classic_checkout/wps_classic_checkout.php

Spacing +190 added lines, -190 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * WP Shop Classic Checkout bootstrap file
  * @author Jérôme ALLEGRE - Eoxia dev team <dev@eoxia.com>
@@ -8,12 +8,12 @@ 
  *
  */
 
-if ( !class_exists("wps_classic_checkout") ) {
+if (!class_exists("wps_classic_checkout")) {
 
 	/** Template Global vars **/
 	DEFINE('WPS_CLASSIC_CHECKOUT_DIR', basename(dirname(__FILE__)));
-	DEFINE('WPS_CLASSIC_CHECKOUT_PATH', str_replace( "\\", "/", str_replace( WPS_CLASSIC_CHECKOUT_DIR, "", dirname( __FILE__ ) ) ) );
-	DEFINE('WPS_CLASSIC_CHECKOUT_URL', str_replace( str_replace( "\\", "/", ABSPATH), site_url() . '/', WPS_CLASSIC_CHECKOUT_PATH ) );
+	DEFINE('WPS_CLASSIC_CHECKOUT_PATH', str_replace("\\", "/", str_replace(WPS_CLASSIC_CHECKOUT_DIR, "", dirname(__FILE__))));
+	DEFINE('WPS_CLASSIC_CHECKOUT_URL', str_replace(str_replace("\\", "/", ABSPATH), site_url() . '/', WPS_CLASSIC_CHECKOUT_PATH));
 
 
 	class wps_classic_checkout {
@@ -35,18 +35,18 @@ 
 			$this->template_dir = WPS_CLASSIC_CHECKOUT_PATH . WPS_CLASSIC_CHECKOUT_DIR . "/templates/";
 
 			/** Classic Checkout Shortcode **/
-			add_shortcode( 'wps_checkout', array( &$this, 'show_classic_checkout') );
-			add_shortcode( 'wpshop_checkout', array( &$this, 'show_classic_checkout') );
+			add_shortcode('wps_checkout', array(&$this, 'show_classic_checkout'));
+			add_shortcode('wpshop_checkout', array(&$this, 'show_classic_checkout'));
 			/** Checkout Step indicator **/
-			add_shortcode('wps_checkout_step_indicator', array(&$this, 'get_checkout_step_indicator') );
+			add_shortcode('wps_checkout_step_indicator', array(&$this, 'get_checkout_step_indicator'));
 
 			// Add scripts
-			add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts') );
+			add_action('wp_enqueue_scripts', array($this, 'add_scripts'));
 
 			/** Ajax Actions **/
-			add_action( 'wp_ajax_wps-checkout_valid_step_three', array( &$this, 'wps_checkout_valid_step_three') );
-			add_action( 'wp_ajax_wps-checkout_valid_step_four', array( &$this, 'wps_checkout_valid_step_four') );
-			add_action( 'wp_ajax_wps-checkout_valid_step_five', array( &$this, 'wps_checkout_valid_step_five') );
+			add_action('wp_ajax_wps-checkout_valid_step_three', array(&$this, 'wps_checkout_valid_step_three'));
+			add_action('wp_ajax_wps-checkout_valid_step_four', array(&$this, 'wps_checkout_valid_step_four'));
+			add_action('wp_ajax_wps-checkout_valid_step_five', array(&$this, 'wps_checkout_valid_step_five'));
 		}
 
 		/**
@@ -54,151 +54,151 @@ 
 		 */
 		function add_scripts() {
 			wp_enqueue_script('jquery');
-			wp_enqueue_script( 'wps_classic_checkout', plugins_url('templates/frontend/js/wps_classic_checkout.js', __FILE__) );
+			wp_enqueue_script('wps_classic_checkout', plugins_url('templates/frontend/js/wps_classic_checkout.js', __FILE__));
 		}
 
 		/**
 		 * Display Classic Checkout
 		 */
 		function show_classic_checkout() {
-			$action = !empty( $_GET['action'] ) ? sanitize_text_field( $_GET['action'] ) : '';
-			$token = !empty( $_GET['token'] ) ? sanitize_text_field( $_GET['token'] ) : '';
-			$login = !empty( $_GET['login'] ) ? sanitize_text_field( $_GET['login'] ) : '';
-			$order_id = !empty( $_GET['order_id'] ) ? (int) $_GET['order_id'] : '';;
+			$action = !empty($_GET['action']) ? sanitize_text_field($_GET['action']) : '';
+			$token = !empty($_GET['token']) ? sanitize_text_field($_GET['token']) : '';
+			$login = !empty($_GET['login']) ? sanitize_text_field($_GET['login']) : '';
+			$order_id = !empty($_GET['order_id']) ? (int)$_GET['order_id'] : ''; ;
 
-			if( !empty($action) && $action == 'direct_payment_link') {
-				wpshop_checkout::direct_payment_link( $token, $order_id, $login);
+			if (!empty($action) && $action == 'direct_payment_link') {
+				wpshop_checkout::direct_payment_link($token, $order_id, $login);
 			}
 
-			$wpshop_cart_option = get_option( 'wpshop_cart_option' );
-			$current_step = !empty( $_GET[ 'order_step' ] ) && is_int( (int)$_GET[ 'order_step' ] ) ? (int)$_GET[ 'order_step' ] : null;
+			$wpshop_cart_option = get_option('wpshop_cart_option');
+			$current_step = !empty($_GET['order_step']) && is_int((int)$_GET['order_step']) ? (int)$_GET['order_step'] : null;
 
 			/**	Cas spécial lorsqu'il n'y a qu'un seul produit autorisé dans le panier / Special case when there is only one product allowed into cart	*/
-			if ( ( empty( $current_step ) || ( 1 == $current_step ) ) && ( !empty( $wpshop_cart_option ) && !empty( $wpshop_cart_option[ 'total_nb_of_item_allowed' ] ) && ( 'yes' === $wpshop_cart_option[ 'total_nb_of_item_allowed' ][0] ) ) ) {
-				if( empty($_SESSION) || empty($_SESSION['cart']) || empty($_SESSION['cart']['order_items']) ) {
-					$product_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_product_page_id' ) );
-					$url = get_permalink( $product_page_id );
-					wpshop_tools::wpshop_safe_redirect( $url );
+			if ((empty($current_step) || (1 == $current_step)) && (!empty($wpshop_cart_option) && !empty($wpshop_cart_option['total_nb_of_item_allowed']) && ('yes' === $wpshop_cart_option['total_nb_of_item_allowed'][0]))) {
+				if (empty($_SESSION) || empty($_SESSION['cart']) || empty($_SESSION['cart']['order_items'])) {
+					$product_page_id = wpshop_tools::get_page_id(get_option('wpshop_product_page_id'));
+					$url = get_permalink($product_page_id);
+					wpshop_tools::wpshop_safe_redirect($url);
 				}
 				else {
 					$current_step = 2;
 				}
 			}
 
-			$checkout_step_indicator = do_shortcode( '[wps_checkout_step_indicator]');
+			$checkout_step_indicator = do_shortcode('[wps_checkout_step_indicator]');
 			$checkout_content = '';
 
-			if ( !empty($current_step) ) {
-				switch( $current_step) {
+			if (!empty($current_step)) {
+				switch ($current_step) {
 					case 1 :
 						ob_start();
-						require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-one") );
+						require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-one"));
 						$checkout_content .= ob_get_contents();
 						ob_end_clean();
 					break;
 					case 2 :
-						if ( get_current_user_id() != 0 ) {
-							$permalink_option = get_option( 'permalink_structure' );
-							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-							$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=3';
-							wpshop_tools::wpshop_safe_redirect( $url );
+						if (get_current_user_id() != 0) {
+							$permalink_option = get_option('permalink_structure');
+							$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+							$url = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=3';
+							wpshop_tools::wpshop_safe_redirect($url);
 						}
 						else {
 							ob_start();
-							require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-two") );
+							require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-two"));
 							$checkout_content .= ob_get_contents();
 							ob_end_clean();
 						}
 					break;
 					case 3 :
-						if ( get_current_user_id() == 0 ) {
-							$permalink_option = get_option( 'permalink_structure' );
-							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-							$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=2';
-							wpshop_tools::wpshop_safe_redirect( $url );
+						if (get_current_user_id() == 0) {
+							$permalink_option = get_option('permalink_structure');
+							$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+							$url = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=2';
+							wpshop_tools::wpshop_safe_redirect($url);
 						}
 						else {
-							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( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-three") );
+								require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-three"));
 								$checkout_content .= ob_get_contents();
 								ob_end_clean();
-								$url = apply_filters('wps_extra_signup_actions', ( isset( $url ) ? $url : '' ) );
-								if(!empty($url)) {
-									wpshop_tools::wpshop_safe_redirect( $url );
+								$url = apply_filters('wps_extra_signup_actions', (isset($url) ? $url : ''));
+								if (!empty($url)) {
+									wpshop_tools::wpshop_safe_redirect($url);
 								}
 							}
 							else {
-								$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-								$url = get_permalink( $checkout_page_id  );
-								wpshop_tools::wpshop_safe_redirect( $url );
+								$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+								$url = get_permalink($checkout_page_id);
+								wpshop_tools::wpshop_safe_redirect($url);
 							}
 						}
 					break;
 					case 4 :
-						if ( get_current_user_id() == 0 ) {
-							$permalink_option = get_option( 'permalink_structure' );
-							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-							$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=2';
-							wpshop_tools::wpshop_safe_redirect( $url );
+						if (get_current_user_id() == 0) {
+							$permalink_option = get_option('permalink_structure');
+							$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+							$url = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=2';
+							wpshop_tools::wpshop_safe_redirect($url);
 						}
 						else {
-							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( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-four") );
+								require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-four"));
 								$checkout_content .= ob_get_contents();
 								ob_end_clean();
 							}
 							else {
-								$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-								$url = get_permalink( $checkout_page_id  );
-								wpshop_tools::wpshop_safe_redirect( $url );
+								$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+								$url = get_permalink($checkout_page_id);
+								wpshop_tools::wpshop_safe_redirect($url);
 							}
 						}
 					break;
 					case 5 :
-						if ( get_current_user_id() == 0 ) {
-							$permalink_option = get_option( 'permalink_structure' );
-							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-							$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=2';
-							wpshop_tools::wpshop_safe_redirect( $url );
+						if (get_current_user_id() == 0) {
+							$permalink_option = get_option('permalink_structure');
+							$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+							$url = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=2';
+							wpshop_tools::wpshop_safe_redirect($url);
 						}
 						else {
 							$wps_cart = new wps_cart();
-							$order = $wps_cart->calcul_cart_information( array() );
+							$order = $wps_cart->calcul_cart_information(array());
 							$wps_cart->store_cart_in_session($order);
-							$shipping_option = get_option( 'wpshop_shipping_address_choice' );
-							if ( !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) && ( ( !empty($shipping_option) && !empty($shipping_option['activate']) && !empty($_SESSION['shipping_method']) ) || ( !empty($shipping_option) && empty($shipping_option['activate']) )  ) ) {
-								$order_id = ( !empty($_SESSION['cart']['order_id']) ) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0;
+							$shipping_option = get_option('wpshop_shipping_address_choice');
+							if (!empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) && ((!empty($shipping_option) && !empty($shipping_option['activate']) && !empty($_SESSION['shipping_method'])) || (!empty($shipping_option) && empty($shipping_option['activate'])))) {
+								$order_id = (!empty($_SESSION['cart']['order_id'])) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0;
 								ob_start();
-								require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-five") );
+								require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-five"));
 								$checkout_content .= ob_get_contents();
 								ob_end_clean();
-								$checkout_content = apply_filters( 'classic_checkout_step_six_extra_content', $checkout_content );
+								$checkout_content = apply_filters('classic_checkout_step_six_extra_content', $checkout_content);
 							}
 							else {
-								$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-								$url = get_permalink( $checkout_page_id  );
-								wpshop_tools::wpshop_safe_redirect( $url );
+								$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+								$url = get_permalink($checkout_page_id);
+								wpshop_tools::wpshop_safe_redirect($url);
 							}
 						}
 					break;
 					case 6 :
 
-						if ( !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) ){
+						if (!empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
 						 	$wps_marketing_tools_ctr = new wps_marketing_tools_ctr();
-						 	$checkout_content .=  $wps_marketing_tools_ctr->display_ecommerce_ga_tracker( $_SESSION['order_id'] );
+						 	$checkout_content .= $wps_marketing_tools_ctr->display_ecommerce_ga_tracker($_SESSION['order_id']);
 						 	$checkout_content .= $this->wps_classic_confirmation_message();
 						}
 						else {
-							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-							$url = get_permalink( $checkout_page_id  );
-							wpshop_tools::wpshop_safe_redirect( $url );
+							$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+							$url = get_permalink($checkout_page_id);
+							wpshop_tools::wpshop_safe_redirect($url);
 						}
 					break;
 					default :
 						ob_start();
-						require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-one") );
+						require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-one"));
 						$checkout_content .= ob_get_contents();
 						ob_end_clean();
 					break;
@@ -209,7 +209,7 @@ 
 				$checkout_content = do_shortcode('[wps_cart]');
 			}
 
-			require_once( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic_checkout") );
+			require_once(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic_checkout"));
 
 		}
 
@@ -220,10 +220,10 @@ 
 		function wps_classic_confirmation_message() {
 			$output = '';
 			$wps_cart = new wps_cart();
-			$available_templates = array( 'banktransfer', 'checks', 'free', 'paypal', 'cic', 'quotation', 'cash_on_delivery' );
-			$payment_method = ( !empty($_SESSION['payment_method']) && in_array($_SESSION['payment_method'], $available_templates) ) ? $_SESSION['payment_method'] : 'others';
+			$available_templates = array('banktransfer', 'checks', 'free', 'paypal', 'cic', 'quotation', 'cash_on_delivery');
+			$payment_method = (!empty($_SESSION['payment_method']) && in_array($_SESSION['payment_method'], $available_templates)) ? $_SESSION['payment_method'] : 'others';
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir,"frontend", "confirmation/confirmation", $payment_method) );
+			require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "confirmation/confirmation", $payment_method));
 			$output .= ob_get_contents();
 			ob_end_clean();
 			return $output;
@@ -234,17 +234,17 @@ 
 		 * @return String
 		 */
 		function get_checkout_step_indicator() {
-			$default_step = ( !empty( $_GET['order_step'] ) ) ? wpshop_tools::varSanitizer( $_GET['order_step'] ) : 1;
+			$default_step = (!empty($_GET['order_step'])) ? wpshop_tools::varSanitizer($_GET['order_step']) : 1;
 			$steps = array();
 
-			$shipping_address_option = get_option( 'wpshop_shipping_address_choice' );
-			$wpshop_cart_option = get_option( 'wpshop_cart_option' );
-			$permalink_option = get_option( 'permalink_structure' );
-			$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
+			$shipping_address_option = get_option('wpshop_shipping_address_choice');
+			$wpshop_cart_option = get_option('wpshop_cart_option');
+			$permalink_option = get_option('permalink_structure');
+			$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
 
 
 			$no_cart = false;
-			if ( empty( $wpshop_cart_option ) || empty( $wpshop_cart_option[ 'total_nb_of_item_allowed' ] ) || ( 'no' === $wpshop_cart_option[ 'total_nb_of_item_allowed' ] ) ) {
+			if (empty($wpshop_cart_option) || empty($wpshop_cart_option['total_nb_of_item_allowed']) || ('no' === $wpshop_cart_option['total_nb_of_item_allowed'])) {
 				$steps[] = __('Cart', 'wpshop');
 			}
 			else {
@@ -255,7 +255,7 @@ 
 			$steps[] = __('Addresses', 'wpshop');
 
 			$no_shipping = false;
-			if ( !empty( $shipping_address_option ) && !empty( $shipping_address_option[ 'activate' ] ) && !empty( $shipping_address_option[ 'choice' ] ) ) {
+			if (!empty($shipping_address_option) && !empty($shipping_address_option['activate']) && !empty($shipping_address_option['choice'])) {
 				$steps[] = __('Shipping Mode', 'wpshop');
 			}
 			else {
@@ -264,7 +264,7 @@ 
 
 			$no_payment = false;
 			$partial_payment_for_quotation = get_option('wpshop_payment_partial', array('for_quotation' => array()));
-			if( !empty($_SESSION) && !empty( $_SESSION['cart'] ) && ( ( !empty($_SESSION['cart']['order_amount_to_pay_now']) && number_format( $_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '' ) == '0.00' ) || ( !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' && isset( $partial_payment_for_quotation['for_quotation']['activate'] ) ) ) ) {
+			if (!empty($_SESSION) && !empty($_SESSION['cart']) && ((!empty($_SESSION['cart']['order_amount_to_pay_now']) && number_format($_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '') == '0.00') || (!empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' && isset($partial_payment_for_quotation['for_quotation']['activate'])))) {
 				$no_payment = true;
 			}
 			else {
@@ -275,45 +275,45 @@ 
 
 			$steps = apply_filters('wps_extra_action_checkout_indicator', $steps);
 
-			require_once( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir,"frontend", "checkout_step_indicator/checkout_step_indicator") );
+			require_once(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "checkout_step_indicator/checkout_step_indicator"));
 		}
 
 		/**
 		 * AJAX - Valid Checkout Step three
 		 */
 		function wps_checkout_valid_step_three() {
-			$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+			$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_valid_step_three' ) )
+			if (!wp_verify_nonce($_wpnonce, 'wps_checkout_valid_step_three'))
 				wp_die();
 
 			$response = ''; $status = true;
 
-			$shipping_address = ( !empty($_POST['shipping_address_id']) ) ? wpshop_tools::varSanitizer( $_POST['shipping_address_id'] ): null;
-			$billing_address = ( !empty($_POST['billing_address_id']) ) ? wpshop_tools::varSanitizer( $_POST['billing_address_id'] ): null;
+			$shipping_address = (!empty($_POST['shipping_address_id'])) ? wpshop_tools::varSanitizer($_POST['shipping_address_id']) : null;
+			$billing_address = (!empty($_POST['billing_address_id'])) ? wpshop_tools::varSanitizer($_POST['billing_address_id']) : null;
 
 			$user_id = get_current_user_id();
 
 			$response = '<div class="wps-alert-error"><ul>';
 
-			if( $user_id != 0 ) {
-				$shipping_option = get_option( 'wpshop_shipping_address_choice' );
-				$billing_option = get_option( 'wpshop_billing_address' );
-				$user_addresses = wps_address::get_addresses_list( $user_id );
+			if ($user_id != 0) {
+				$shipping_option = get_option('wpshop_shipping_address_choice');
+				$billing_option = get_option('wpshop_billing_address');
+				$user_addresses = wps_address::get_addresses_list($user_id);
 
 				// Check if is only downloadable else display address
 				$cart_is_downloadable = false;
-				if ( !empty( $_SESSION['cart'] ) && !empty( $_SESSION['cart']['order_items'] ) ) {
-					foreach( $_SESSION['cart']['order_items'] as $c ) {
-						$product = wpshop_products::get_product_data( $c['item_id'] );
+				if (!empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
+					foreach ($_SESSION['cart']['order_items'] as $c) {
+						$product = wpshop_products::get_product_data($c['item_id']);
 						/** Check if it's a variation and check the parent product **/
-						if ( get_post_type( $c['item_id'] ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-							$parent_def = wpshop_products::get_parent_variation( $c['item_id'] );
-							if ( !empty($parent_def) && !empty($parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['is_downloadable_']) ) {
+						if (get_post_type($c['item_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+							$parent_def = wpshop_products::get_parent_variation($c['item_id']);
+							if (!empty($parent_def) && !empty($parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['is_downloadable_'])) {
 								$product['is_downloadable_'] = $parent_def['parent_post_meta']['is_downloadable_'];
 							}
 						}
-						if( !empty($product['is_downloadable_']) && ( __( $product['is_downloadable_'], 'wpshop') == __('Yes', 'wpshop') || __( $product['is_downloadable_'], 'wpshop') == __('yes', 'wpshop') ) ) {
+						if (!empty($product['is_downloadable_']) && (__($product['is_downloadable_'], 'wpshop') == __('Yes', 'wpshop') || __($product['is_downloadable_'], 'wpshop') == __('yes', 'wpshop'))) {
 							$cart_is_downloadable = true;
 						} else {
 							$cart_is_downloadable = false;
@@ -322,90 +322,90 @@ 
 					}
 				}
 
-				if( !empty($shipping_option) && !empty($shipping_option['activate']) && !$cart_is_downloadable ) {
+				if (!empty($shipping_option) && !empty($shipping_option['activate']) && !$cart_is_downloadable) {
 					/** Check Shipping address **/
-					if ( empty($shipping_address) ) {
+					if (empty($shipping_address)) {
 						$status = false;
 						/** Check if user have already create a shipping address **/
-						if ( !empty($shipping_option['choice']) && !empty($user_addresses) && !empty($user_addresses[ $shipping_option['choice'] ]) ){
-							$response .= '<li>'.__( 'You must select a shipping address', 'wpshop' ).'</li>';
+						if (!empty($shipping_option['choice']) && !empty($user_addresses) && !empty($user_addresses[$shipping_option['choice']])) {
+							$response .= '<li>' . __('You must select a shipping address', 'wpshop') . '</li>';
 						}
 						else {
-							$response .= '<li>'.__( 'You must create a shipping address', 'wpshop' ).'</li>';
+							$response .= '<li>' . __('You must create a shipping address', 'wpshop') . '</li>';
 						}
 					}
 
 				}
 				/** Check Billing address **/
-				if( empty($billing_address) ) {
+				if (empty($billing_address)) {
 					$status = false;
-					if ( !empty($billing_option['choice']) && !empty($user_addresses) && !empty($user_addresses[ $billing_option['choice'] ]) ){
-						$response .= '<li>'.__( 'You must select a billing address', 'wpshop' ).'</li>';
+					if (!empty($billing_option['choice']) && !empty($user_addresses) && !empty($user_addresses[$billing_option['choice']])) {
+						$response .= '<li>' . __('You must select a billing address', 'wpshop') . '</li>';
 					}
 					else {
-						$response .= '<li>'.__( 'You must create a billing address', 'wpshop' ).'</li>';
+						$response .= '<li>' . __('You must create a billing address', 'wpshop') . '</li>';
 					}
 				}
 			}
 			else {
 				$status = false;
-				$response .= '<li>'.__( 'You must be logged to pass to next step', 'wpshop' ).'</li>';
+				$response .= '<li>' . __('You must be logged to pass to next step', 'wpshop') . '</li>';
 			}
 			$response .= '</ul></div>';
 
 			/** If no error **/
-			if( $status ) {
+			if ($status) {
 				$_SESSION['shipping_address'] = $shipping_address;
 				$_SESSION['billing_address'] = $billing_address;
 
-				$permalink_option = get_option( 'permalink_structure' );
-				$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
+				$permalink_option = get_option('permalink_structure');
+				$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
 				/** Checking if no shipping method is required and it is a quotation or a free order **/
-				$shipping_option = get_option( 'wps_shipping_mode' );
+				$shipping_option = get_option('wps_shipping_mode');
 				$available_shipping_method = false;
-				if( !empty($shipping_option) && !empty($shipping_option['modes']) && !$cart_is_downloadable ) {
-					foreach( $shipping_option['modes'] as $shipping_mode_id => $shipping_mode ) {
-						if( !empty($shipping_mode['active']) && $shipping_mode['active'] == 'on' ) {
+				if (!empty($shipping_option) && !empty($shipping_option['modes']) && !$cart_is_downloadable) {
+					foreach ($shipping_option['modes'] as $shipping_mode_id => $shipping_mode) {
+						if (!empty($shipping_mode['active']) && $shipping_mode['active'] == 'on') {
 							$available_shipping_method = true;
 						}
 					}
 				}
 
-				if( !$available_shipping_method ) {
+				if (!$available_shipping_method) {
 					$_SESSION['shipping_method'] = 'No Shipping method required';
-					$order_id = ( !empty($_SESSION['cart']['order_id']) ) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0;
+					$order_id = (!empty($_SESSION['cart']['order_id'])) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0;
 
-					if ( !empty($_SESSION) && !empty( $_SESSION['cart'] ) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') {
+					if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') {
 						$status = true;
 						$payment_method = $_SESSION['payment_method'] = 'quotation';
-						$order_id = wpshop_checkout::process_checkout( $payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address'] );
-						$response = get_permalink( wpshop_tools::get_page_id( $checkout_page_id )  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=6';
+						$order_id = wpshop_checkout::process_checkout($payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address']);
+						$response = get_permalink(wpshop_tools::get_page_id($checkout_page_id)) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=6';
 					}
-					elseif( !empty($_SESSION) && !empty( $_SESSION['cart'] ) && isset($_SESSION['cart']['order_amount_to_pay_now']) && number_format( $_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '' ) == '0.00' ) {
+					elseif (!empty($_SESSION) && !empty($_SESSION['cart']) && isset($_SESSION['cart']['order_amount_to_pay_now']) && number_format($_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '') == '0.00') {
 						$status = true;
 						$payment_method = $_SESSION['payment_method'] = 'free';
-						$order_id = wpshop_checkout::process_checkout( $payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address'] );
-						$permalink_option = get_option( 'permalink_structure' );
-						$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-						$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=6';
+						$order_id = wpshop_checkout::process_checkout($payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address']);
+						$permalink_option = get_option('permalink_structure');
+						$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+						$url = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=6';
 // 						wpshop_tools::wpshop_safe_redirect( $url );
 						$response = $url;
 					}
 					else {
 						$status = true;
-						$response = get_permalink( wpshop_tools::get_page_id( $checkout_page_id )  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=5';
+						$response = get_permalink(wpshop_tools::get_page_id($checkout_page_id)) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=5';
 					}
 				}
 				else {
 					$status = true;
-					$response = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=4';
+					$response = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=4';
 				}
 			}
 			//Stock checking verification
 			$this->checking_stock();
 
 
-			echo json_encode( array( 'status' => $status, 'response' => $response ) );
+			echo json_encode(array('status' => $status, 'response' => $response));
 			die();
 		}
 
@@ -413,51 +413,51 @@ 
 		 * AJAX - Valid Checkout step four
 		 */
 		function wps_checkout_valid_step_four() {
-			$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+			$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_valid_step_four' ) )
+			if (!wp_verify_nonce($_wpnonce, 'wps_checkout_valid_step_four'))
 				wp_die();
 
-			$shipping_method = ( !empty($_POST['shipping_mode']) ) ? wpshop_tools::varSanitizer($_POST['shipping_mode']) : null;
+			$shipping_method = (!empty($_POST['shipping_mode'])) ? wpshop_tools::varSanitizer($_POST['shipping_mode']) : null;
 			$status = false;
 			$response = '';
-			$permalink_option = get_option( 'permalink_structure' );
-			$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-			if ( !empty($shipping_method) ) {
+			$permalink_option = get_option('permalink_structure');
+			$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+			if (!empty($shipping_method)) {
 				$status = true;
 				$_SESSION['shipping_method'] = $shipping_method;
-				$order_id = ( !empty($_SESSION['cart']['order_id']) ) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0;
-				if ( !empty($_SESSION) && !empty( $_SESSION['cart'] ) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') {
+				$order_id = (!empty($_SESSION['cart']['order_id'])) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0;
+				if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') {
 					$partial_payment_for_quotation = get_option('wpshop_payment_partial', array('for_quotation' => array()));
-					if( isset( $partial_payment_for_quotation['for_quotation']['activate'] ) ) {
+					if (isset($partial_payment_for_quotation['for_quotation']['activate'])) {
 						$step = '5';
 					} else {
 						$payment_method = $_SESSION['payment_method'] = 'quotation';
-						$order_id = wpshop_checkout::process_checkout( $payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address'] );
+						$order_id = wpshop_checkout::process_checkout($payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address']);
 						$step = '6';
 					}
-					$response = get_permalink( wpshop_tools::get_page_id( $checkout_page_id )  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step='.$step;
+					$response = get_permalink(wpshop_tools::get_page_id($checkout_page_id)) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=' . $step;
 				}
-				elseif( !empty($_SESSION) && !empty( $_SESSION['cart'] ) && !empty($_SESSION['cart']['order_amount_to_pay_now']) && number_format( $_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '' ) == '0.00' ) {
+				elseif (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_amount_to_pay_now']) && number_format($_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '') == '0.00') {
 					$payment_method = $_SESSION['payment_method'] = 'free';
-					$order_id = wpshop_checkout::process_checkout( $payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address'] );
-					$permalink_option = get_option( 'permalink_structure' );
-					$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-					$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=6';
+					$order_id = wpshop_checkout::process_checkout($payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address']);
+					$permalink_option = get_option('permalink_structure');
+					$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+					$url = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=6';
 					$response = $url;
 				}
 				else {
-					$response = get_permalink( wpshop_tools::get_page_id( $checkout_page_id )  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=5';
+					$response = get_permalink(wpshop_tools::get_page_id($checkout_page_id)) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=5';
 				}
 			}
 			else {
-				$response .= '<div class="wps-alert-error">'.__( 'You must select a shipping method', 'wpshop' ).'</div>';
+				$response .= '<div class="wps-alert-error">' . __('You must select a shipping method', 'wpshop') . '</div>';
 			}
 
 			//Stock checking verification
 			$this->checking_stock();
 
-			echo json_encode( array( 'status' => $status, 'response' => $response) );
+			echo json_encode(array('status' => $status, 'response' => $response));
 			die();
 		}
 
@@ -465,45 +465,45 @@ 
 		 * AJAX - Valid Checkout step four
 		 */
 		function wps_checkout_valid_step_five() {
-			$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+			$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_valid_step_five' ) )
+			if (!wp_verify_nonce($_wpnonce, 'wps_checkout_valid_step_five'))
 				wp_die();
 
 			$status = false; $response = '';
-			$payment_method = ( !empty($_POST['wps-payment-method']) ) ? wpshop_tools::varSanitizer( $_POST['wps-payment-method'] ): null;
-			$order_id = ( !empty($_SESSION['cart']['order_id']) ) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0;
-			$customer_comment = ( !empty($_POST['wps-customer-comment']) ) ? wpshop_tools::varSanitizer( $_POST['wps-customer-comment'] ) : null;
-			$terms_of_sale_indicator = !empty( $_POST['terms_of_sale_indicator'] ) ? sanitize_text_field( $_POST['terms_of_sale_indicator'] ) : '';
-			$terms_of_sale = !empty( $_POST['terms_of_sale'] ) ? sanitize_text_field( $_POST['terms_of_sale'] ) : '';
+			$payment_method = (!empty($_POST['wps-payment-method'])) ? wpshop_tools::varSanitizer($_POST['wps-payment-method']) : null;
+			$order_id = (!empty($_SESSION['cart']['order_id'])) ? wpshop_tools::varSanitizer($_SESSION['cart']['order_id']) : 0;
+			$customer_comment = (!empty($_POST['wps-customer-comment'])) ? wpshop_tools::varSanitizer($_POST['wps-customer-comment']) : null;
+			$terms_of_sale_indicator = !empty($_POST['terms_of_sale_indicator']) ? sanitize_text_field($_POST['terms_of_sale_indicator']) : '';
+			$terms_of_sale = !empty($_POST['terms_of_sale']) ? sanitize_text_field($_POST['terms_of_sale']) : '';
 
-			$terms_of_sale_checking = ( ( isset($terms_of_sale_indicator) && !empty($terms_of_sale) ) || ( !empty($terms_of_sale) ) || ( !isset($terms_of_sale_indicator) && empty($terms_of_sale) ) ) ? true : false;
+			$terms_of_sale_checking = ((isset($terms_of_sale_indicator) && !empty($terms_of_sale)) || (!empty($terms_of_sale)) || (!isset($terms_of_sale_indicator) && empty($terms_of_sale))) ? true : false;
 
 			if ($terms_of_sale_checking) {
-				if ( !empty($payment_method) ) {
+				if (!empty($payment_method)) {
 					/** Check if the payment method exist for the shop **/
-					$payment_option = get_option( 'wps_payment_mode' );
+					$payment_option = get_option('wps_payment_mode');
 
-					if( !empty($payment_option) && !empty($payment_option['mode']) && array_key_exists( $payment_method, $payment_option['mode']) && !empty($payment_option['mode'][$payment_method]['active']) ) {
-						if( !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' ) {
+					if (!empty($payment_option) && !empty($payment_option['mode']) && array_key_exists($payment_method, $payment_option['mode']) && !empty($payment_option['mode'][$payment_method]['active'])) {
+						if (!empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') {
 							$new_payment_method = $payment_method;
 							$payment_method = 'quotation';
 							$is_quotation = true;
 						} else {
 							$is_quotation = false;
 						}
-						$order_id = wpshop_checkout::process_checkout( $payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address'] );
-						if( !empty($order_id) && !empty($customer_comment) ) {
-							wp_update_post( array('ID' => $order_id, 'post_excerpt' => $customer_comment) );
+						$order_id = wpshop_checkout::process_checkout($payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address']);
+						if (!empty($order_id) && !empty($customer_comment)) {
+							wp_update_post(array('ID' => $order_id, 'post_excerpt' => $customer_comment));
 						}
-						$permalink_option = get_option( 'permalink_structure' );
-						$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-						$response = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=6';
-						if( $is_quotation ) {
-							$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
-							$params = array( 'method' => $new_payment_method, 'waited_amount' => $order_meta['order_partial_payment'], 'status' => 'waiting_payment', 'author' => get_current_user_id() );
+						$permalink_option = get_option('permalink_structure');
+						$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+						$response = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=6';
+						if ($is_quotation) {
+							$order_meta = get_post_meta($order_id, '_order_postmeta', true);
+							$params = array('method' => $new_payment_method, 'waited_amount' => $order_meta['order_partial_payment'], 'status' => 'waiting_payment', 'author' => get_current_user_id());
 							$order_meta['order_payment']['received'][0] = $params;
-							update_post_meta( $order_id, '_order_postmeta', $order_meta );
+							update_post_meta($order_id, '_order_postmeta', $order_meta);
 							$_SESSION['payment_method'] = $new_payment_method;
 						} else {
 							$_SESSION['payment_method'] = $payment_method;
@@ -512,21 +512,21 @@ 
 						//Add an action to extra actions on order save
 						// @TODO : REQUEST
 						// $args = array( 'order_id' => $order_id, 'posted_data' => $_REQUEST);
-						wpshop_tools::create_custom_hook( 'wps_order_extra_save_action', $args );
+						wpshop_tools::create_custom_hook('wps_order_extra_save_action', $args);
 					}
 					else {
-						$response = '<div class="wps-alert-error">' .__( 'This payment method is unavailable', 'wpshop' ).'</div>';
+						$response = '<div class="wps-alert-error">' . __('This payment method is unavailable', 'wpshop') . '</div>';
 					}
 				}
 				else {
-					$response = '<div class="wps-alert-error">' .__( 'You must choose a payment method', 'wpshop' ).'</div>';
+					$response = '<div class="wps-alert-error">' . __('You must choose a payment method', 'wpshop') . '</div>';
 				}
 			}
 			else {
-				$response = '<div class="wps-alert-error">' .__( 'You must accept the terms of sale to order', 'wpshop' ).'</div>';
+				$response = '<div class="wps-alert-error">' . __('You must accept the terms of sale to order', 'wpshop') . '</div>';
 			}
 
-			echo json_encode( array('status' => $status, 'response' => $response) );
+			echo json_encode(array('status' => $status, 'response' => $response));
 			die();
 		}
 
@@ -534,15 +534,15 @@ 
 		 * Checking stock in differents checkout steps
 		 */
 		function checking_stock() {
-			if( !empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) ) {
-				foreach( $_SESSION['cart']['order_items'] as $item_id => $item ) {
+			if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
+				foreach ($_SESSION['cart']['order_items'] as $item_id => $item) {
 					$wps_product = new wps_product_ctr();
-					$checking = $wps_product->check_stock( $item['item_id'], $item['item_qty'], $item_id );
-					if( $checking !== true ) {
-						unset(  $_SESSION['cart']['order_items'][$item_id] );
+					$checking = $wps_product->check_stock($item['item_id'], $item['item_qty'], $item_id);
+					if ($checking !== true) {
+						unset($_SESSION['cart']['order_items'][$item_id]);
 						$wps_cart_ctr = new wps_cart();
-						$order = $wps_cart_ctr->calcul_cart_information( array() );
-						$wps_cart_ctr->store_cart_in_session( $order );
+						$order = $wps_cart_ctr->calcul_cart_information(array());
+						$wps_cart_ctr->store_cart_in_session($order);
 					}
 				}
 			}
@@ -550,6 +550,6 @@ 
 
 	}
 }
-if ( class_exists("wps_classic_checkout") ) {
+if (class_exists("wps_classic_checkout")) {
 	$wps_classic_checkout = new wps_classic_checkout();
 }

Braces +37 added lines, -57 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * WP Shop Classic Checkout bootstrap file
  * @author Jérôme ALLEGRE - Eoxia dev team <dev@eoxia.com>
@@ -79,8 +81,7 @@ 
 					$product_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_product_page_id' ) );
 					$url = get_permalink( $product_page_id );
 					wpshop_tools::wpshop_safe_redirect( $url );
-				}
-				else {
+				} else {
 					$current_step = 2;
 				}
 			}
@@ -102,8 +103,7 @@ 
 							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
 							$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=3';
 							wpshop_tools::wpshop_safe_redirect( $url );
-						}
-						else {
+						} else {
 							ob_start();
 							require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-two") );
 							$checkout_content .= ob_get_contents();
@@ -116,8 +116,7 @@ 
 							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
 							$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=2';
 							wpshop_tools::wpshop_safe_redirect( $url );
-						}
-						else {
+						} else {
 							if( !empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) ) {
 								ob_start();
 								require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-three") );
@@ -127,8 +126,7 @@ 
 								if(!empty($url)) {
 									wpshop_tools::wpshop_safe_redirect( $url );
 								}
-							}
-							else {
+							} else {
 								$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
 								$url = get_permalink( $checkout_page_id  );
 								wpshop_tools::wpshop_safe_redirect( $url );
@@ -141,15 +139,13 @@ 
 							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
 							$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=2';
 							wpshop_tools::wpshop_safe_redirect( $url );
-						}
-						else {
+						} else {
 							if( !empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items']) ) {
 								ob_start();
 								require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "classic-checkout", "step-four") );
 								$checkout_content .= ob_get_contents();
 								ob_end_clean();
-							}
-							else {
+							} else {
 								$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
 								$url = get_permalink( $checkout_page_id  );
 								wpshop_tools::wpshop_safe_redirect( $url );
@@ -162,8 +158,7 @@ 
 							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
 							$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=2';
 							wpshop_tools::wpshop_safe_redirect( $url );
-						}
-						else {
+						} else {
 							$wps_cart = new wps_cart();
 							$order = $wps_cart->calcul_cart_information( array() );
 							$wps_cart->store_cart_in_session($order);
@@ -175,8 +170,7 @@ 
 								$checkout_content .= ob_get_contents();
 								ob_end_clean();
 								$checkout_content = apply_filters( 'classic_checkout_step_six_extra_content', $checkout_content );
-							}
-							else {
+							} else {
 								$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
 								$url = get_permalink( $checkout_page_id  );
 								wpshop_tools::wpshop_safe_redirect( $url );
@@ -189,8 +183,7 @@ 
 						 	$wps_marketing_tools_ctr = new wps_marketing_tools_ctr();
 						 	$checkout_content .=  $wps_marketing_tools_ctr->display_ecommerce_ga_tracker( $_SESSION['order_id'] );
 						 	$checkout_content .= $this->wps_classic_confirmation_message();
-						}
-						else {
+						} else {
 							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
 							$url = get_permalink( $checkout_page_id  );
 							wpshop_tools::wpshop_safe_redirect( $url );
@@ -204,8 +197,7 @@ 
 					break;
 				}
 
-			}
-			else {
+			} else {
 				$checkout_content = do_shortcode('[wps_cart]');
 			}
 
@@ -246,8 +238,7 @@ 
 			$no_cart = false;
 			if ( empty( $wpshop_cart_option ) || empty( $wpshop_cart_option[ 'total_nb_of_item_allowed' ] ) || ( 'no' === $wpshop_cart_option[ 'total_nb_of_item_allowed' ] ) ) {
 				$steps[] = __('Cart', 'wpshop');
-			}
-			else {
+			} else {
 				$no_cart = true;
 			}
 
@@ -257,8 +248,7 @@ 
 			$no_shipping = false;
 			if ( !empty( $shipping_address_option ) && !empty( $shipping_address_option[ 'activate' ] ) && !empty( $shipping_address_option[ 'choice' ] ) ) {
 				$steps[] = __('Shipping Mode', 'wpshop');
-			}
-			else {
+			} else {
 				$no_shipping = true;
 			}
 
@@ -266,8 +256,7 @@ 
 			$partial_payment_for_quotation = get_option('wpshop_payment_partial', array('for_quotation' => array()));
 			if( !empty($_SESSION) && !empty( $_SESSION['cart'] ) && ( ( !empty($_SESSION['cart']['order_amount_to_pay_now']) && number_format( $_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '' ) == '0.00' ) || ( !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' && isset( $partial_payment_for_quotation['for_quotation']['activate'] ) ) ) ) {
 				$no_payment = true;
-			}
-			else {
+			} else {
 				$steps[] = __('Payment', 'wpshop');
 			}
 
@@ -284,8 +273,9 @@ 
 		function wps_checkout_valid_step_three() {
 			$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_valid_step_three' ) )
-				wp_die();
+			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_valid_step_three' ) ) {
+							wp_die();
+			}
 
 			$response = ''; $status = true;
 
@@ -329,8 +319,7 @@ 
 						/** Check if user have already create a shipping address **/
 						if ( !empty($shipping_option['choice']) && !empty($user_addresses) && !empty($user_addresses[ $shipping_option['choice'] ]) ){
 							$response .= '<li>'.__( 'You must select a shipping address', 'wpshop' ).'</li>';
-						}
-						else {
+						} else {
 							$response .= '<li>'.__( 'You must create a shipping address', 'wpshop' ).'</li>';
 						}
 					}
@@ -341,13 +330,11 @@ 
 					$status = false;
 					if ( !empty($billing_option['choice']) && !empty($user_addresses) && !empty($user_addresses[ $billing_option['choice'] ]) ){
 						$response .= '<li>'.__( 'You must select a billing address', 'wpshop' ).'</li>';
-					}
-					else {
+					} else {
 						$response .= '<li>'.__( 'You must create a billing address', 'wpshop' ).'</li>';
 					}
 				}
-			}
-			else {
+			} else {
 				$status = false;
 				$response .= '<li>'.__( 'You must be logged to pass to next step', 'wpshop' ).'</li>';
 			}
@@ -380,8 +367,7 @@ 
 						$payment_method = $_SESSION['payment_method'] = 'quotation';
 						$order_id = wpshop_checkout::process_checkout( $payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address'] );
 						$response = get_permalink( wpshop_tools::get_page_id( $checkout_page_id )  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=6';
-					}
-					elseif( !empty($_SESSION) && !empty( $_SESSION['cart'] ) && isset($_SESSION['cart']['order_amount_to_pay_now']) && number_format( $_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '' ) == '0.00' ) {
+					} elseif( !empty($_SESSION) && !empty( $_SESSION['cart'] ) && isset($_SESSION['cart']['order_amount_to_pay_now']) && number_format( $_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '' ) == '0.00' ) {
 						$status = true;
 						$payment_method = $_SESSION['payment_method'] = 'free';
 						$order_id = wpshop_checkout::process_checkout( $payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address'] );
@@ -390,13 +376,11 @@ 
 						$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=6';
 // 						wpshop_tools::wpshop_safe_redirect( $url );
 						$response = $url;
-					}
-					else {
+					} else {
 						$status = true;
 						$response = get_permalink( wpshop_tools::get_page_id( $checkout_page_id )  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=5';
 					}
-				}
-				else {
+				} else {
 					$status = true;
 					$response = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=4';
 				}
@@ -415,8 +399,9 @@ 
 		function wps_checkout_valid_step_four() {
 			$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_valid_step_four' ) )
-				wp_die();
+			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_valid_step_four' ) ) {
+							wp_die();
+			}
 
 			$shipping_method = ( !empty($_POST['shipping_mode']) ) ? wpshop_tools::varSanitizer($_POST['shipping_mode']) : null;
 			$status = false;
@@ -437,20 +422,17 @@ 
 						$step = '6';
 					}
 					$response = get_permalink( wpshop_tools::get_page_id( $checkout_page_id )  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step='.$step;
-				}
-				elseif( !empty($_SESSION) && !empty( $_SESSION['cart'] ) && !empty($_SESSION['cart']['order_amount_to_pay_now']) && number_format( $_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '' ) == '0.00' ) {
+				} elseif( !empty($_SESSION) && !empty( $_SESSION['cart'] ) && !empty($_SESSION['cart']['order_amount_to_pay_now']) && number_format( $_SESSION['cart']['order_amount_to_pay_now'], 2, '.', '' ) == '0.00' ) {
 					$payment_method = $_SESSION['payment_method'] = 'free';
 					$order_id = wpshop_checkout::process_checkout( $payment_method, $order_id, get_current_user_id(), $_SESSION['billing_address'], $_SESSION['shipping_address'] );
 					$permalink_option = get_option( 'permalink_structure' );
 					$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
 					$url = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=6';
 					$response = $url;
-				}
-				else {
+				} else {
 					$response = get_permalink( wpshop_tools::get_page_id( $checkout_page_id )  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=5';
 				}
-			}
-			else {
+			} else {
 				$response .= '<div class="wps-alert-error">'.__( 'You must select a shipping method', 'wpshop' ).'</div>';
 			}
 
@@ -467,8 +449,9 @@ 
 		function wps_checkout_valid_step_five() {
 			$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_valid_step_five' ) )
-				wp_die();
+			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_valid_step_five' ) ) {
+							wp_die();
+			}
 
 			$status = false; $response = '';
 			$payment_method = ( !empty($_POST['wps-payment-method']) ) ? wpshop_tools::varSanitizer( $_POST['wps-payment-method'] ): null;
@@ -513,16 +496,13 @@ 
 						// @TODO : REQUEST
 						// $args = array( 'order_id' => $order_id, 'posted_data' => $_REQUEST);
 						wpshop_tools::create_custom_hook( 'wps_order_extra_save_action', $args );
-					}
-					else {
+					} else {
 						$response = '<div class="wps-alert-error">' .__( 'This payment method is unavailable', 'wpshop' ).'</div>';
 					}
-				}
-				else {
+				} else {
 					$response = '<div class="wps-alert-error">' .__( 'You must choose a payment method', 'wpshop' ).'</div>';
 				}
-			}
-			else {
+			} else {
 				$response = '<div class="wps-alert-error">' .__( 'You must accept the terms of sale to order', 'wpshop' ).'</div>';
 			}
 

includes/modules/wps_media_manager/controller/wps_media_manager_backend_ctr.php

Spacing +31 added lines, -31 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_media_manager_backend_ctr {
 	/** Define the main directory containing the template for the current plugin
 	 * @var string
@@ -9,27 +9,27 @@ 
 		$this->template_dir = WPS_MEDIA_MANAGER_PATH . WPS_MEDIA_MANAGER_DIR . "/templates/";
 
 		// Add action to create custom type and custom taxonomy
-		add_action( 'add_meta_boxes', array($this, 'add_meta_box') );
-		add_action( 'save_post', array($this, 'save_post_actions') );
+		add_action('add_meta_boxes', array($this, 'add_meta_box'));
+		add_action('save_post', array($this, 'save_post_actions'));
 
 		// Add Scripts
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_backend' ) );
+		add_action('admin_enqueue_scripts', array($this, 'add_scripts_backend'));
 
 		// Ajax Actions
-		add_action( 'wp_ajax_display_pictures_in_backend', array( $this, 'wp_ajax_display_pictures_in_backend' ) );
+		add_action('wp_ajax_display_pictures_in_backend', array($this, 'wp_ajax_display_pictures_in_backend'));
 	}
 
 	/**
 	 * Add JAvascript and CSS files in Backend
 	 */
 	function add_scripts_backend() {
-		wp_enqueue_script( 'jquery');
-		wp_enqueue_script( 'jquery-ui');
-		wp_enqueue_script( 'jquery-ui-sortable');
-		wp_enqueue_script( 'wps_media_manager_backend', WPS_MEDIA_MANAGER_URL . WPS_MEDIA_MANAGER_DIR .'/assets/js/wps_media_manager_backend.js');
+		wp_enqueue_script('jquery');
+		wp_enqueue_script('jquery-ui');
+		wp_enqueue_script('jquery-ui-sortable');
+		wp_enqueue_script('wps_media_manager_backend', WPS_MEDIA_MANAGER_URL . WPS_MEDIA_MANAGER_DIR . '/assets/js/wps_media_manager_backend.js');
 
-		wp_register_style( 'wps_media_manager_css_backend', WPS_MEDIA_MANAGER_URL . WPS_MEDIA_MANAGER_DIR .'/assets/css/wps_media_manager_backend.css' );
-		wp_enqueue_style( 'wps_media_manager_css_backend' );
+		wp_register_style('wps_media_manager_css_backend', WPS_MEDIA_MANAGER_URL . WPS_MEDIA_MANAGER_DIR . '/assets/css/wps_media_manager_backend.css');
+		wp_enqueue_style('wps_media_manager_css_backend');
 
 	}
 
@@ -37,7 +37,7 @@ 
 	 * Display meta Box in Project Custom Type
 	 */
 	function add_meta_box() {
-		add_meta_box('wps_media_manager', __('Media Manager', 'wpshop' ),array( $this, 'meta_box' ), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal','low');
+		add_meta_box('wps_media_manager', __('Media Manager', 'wpshop'), array($this, 'meta_box'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'low');
 	}
 
 	/**
@@ -46,51 +46,51 @@ 
 	function meta_box() {
 		global $post;
 		$media = '';
-		$media_id_data = get_post_meta( $post->ID, '_wps_product_media', true );
-		if( !empty($media_id_data) ) {
-			$media_id = explode( ',', $media_id_data );
+		$media_id_data = get_post_meta($post->ID, '_wps_product_media', true);
+		if (!empty($media_id_data)) {
+			$media_id = explode(',', $media_id_data);
 			ob_start();
-			require_once( wpshop_tools::get_template_part( WPS_MEDIA_MANAGER_DIR, $this->template_dir, "backend", "media_list") );
+			require_once(wpshop_tools::get_template_part(WPS_MEDIA_MANAGER_DIR, $this->template_dir, "backend", "media_list"));
 			$media = ob_get_contents();
 			ob_end_clean();
 		}
-		require_once( wpshop_tools::get_template_part( WPS_MEDIA_MANAGER_DIR, $this->template_dir, "backend", "meta_box") );
+		require_once(wpshop_tools::get_template_part(WPS_MEDIA_MANAGER_DIR, $this->template_dir, "backend", "meta_box"));
 	}
 
 	/**
 	 * AJAX - Display pictures in backend panel
 	 */
 	function wp_ajax_display_pictures_in_backend() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wp_ajax_display_pictures_in_backend' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wp_ajax_display_pictures_in_backend'))
 			wp_die();
 
 		$status = true; $response = '';
 		$media_indicator = !empty($_POST['media_id']) ? (int)$_POST['media_id'] : null;
-		if( !empty($media_indicator) ) {
-			$media_id = explode( ',', $media_indicator );
-			if( !empty($media_id) ) {
+		if (!empty($media_indicator)) {
+			$media_id = explode(',', $media_indicator);
+			if (!empty($media_id)) {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_MEDIA_MANAGER_DIR, $this->template_dir, "backend", "media_list") );
+				require(wpshop_tools::get_template_part(WPS_MEDIA_MANAGER_DIR, $this->template_dir, "backend", "media_list"));
 				$response = ob_get_contents();
 				ob_end_clean();
 			}
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 
 	// @TODO: NONCE et vérifier product_media
 	function save_post_actions() {
-		$post_type = !empty( $_POST['post_type'] ) ? sanitize_text_field( $_POST['post_type'] ) : '';
-		$product_media_form = !empty( $_POST['product_media_form'] ) ? sanitize_text_field( $_POST['product_media_form'] ) : '';
-		$action = !empty( $_POST['action'] ) ? sanitize_text_field( $_POST['action'] ) : '';
-		$product_media = !empty( $_POST['product_media'] ) ? sanitize_text_field( $_POST['product_media'] ) : '';
-		$post_ID = !empty( $_POST['post_ID'] ) ? (int) $_POST['post_ID'] : 0;
+		$post_type = !empty($_POST['post_type']) ? sanitize_text_field($_POST['post_type']) : '';
+		$product_media_form = !empty($_POST['product_media_form']) ? sanitize_text_field($_POST['product_media_form']) : '';
+		$action = !empty($_POST['action']) ? sanitize_text_field($_POST['action']) : '';
+		$product_media = !empty($_POST['product_media']) ? sanitize_text_field($_POST['product_media']) : '';
+		$post_ID = !empty($_POST['post_ID']) ? (int)$_POST['post_ID'] : 0;
 
-		if ( !empty($post_type) && !empty($product_media_form) && $product_media_form == 'post' && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT && !empty( $action ) && $action != 'autosave' ) {
-			update_post_meta( $post_ID, '_wps_product_media', $product_media );
+		if (!empty($post_type) && !empty($product_media_form) && $product_media_form == 'post' && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT && !empty($action) && $action != 'autosave') {
+			update_post_meta($post_ID, '_wps_product_media', $product_media);
 		}
 	}
 

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_media_manager_backend_ctr {
 	/** Define the main directory containing the template for the current plugin
 	 * @var string
@@ -63,8 +65,9 @@ 
 	function wp_ajax_display_pictures_in_backend() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wp_ajax_display_pictures_in_backend' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wp_ajax_display_pictures_in_backend' ) ) {
+					wp_die();
+		}
 
 		$status = true; $response = '';
 		$media_indicator = !empty($_POST['media_id']) ? (int)$_POST['media_id'] : null;

includes/modules/wps_quotation/templates/backend/add_free_product_bton_tpl.php

Spacing +2 added lines, -2 removed lines

@@ -1,2 +1,2 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit; ?>
-<a href="<?php print wp_nonce_url( admin_url( 'admin-ajax.php?width=600&height=550&action=wps_free_product_form_page_tpl&oid='.$order_id ), 'wps_free_product_form_page_tpl', '_wpnonce' ); ?>" class="wps-bton-second-mini-rounded alignRight thickbox" title="<?php _e( 'Add free product', 'wpshop' ); ?>" id="add_free_product_bton"><?php _e( 'Add free product', 'wpshop' ); ?></a>
+<?php if (!defined('ABSPATH')) exit; ?>
+<a href="<?php print wp_nonce_url(admin_url('admin-ajax.php?width=600&height=550&action=wps_free_product_form_page_tpl&oid=' . $order_id), 'wps_free_product_form_page_tpl', '_wpnonce'); ?>" class="wps-bton-second-mini-rounded alignRight thickbox" title="<?php _e('Add free product', 'wpshop'); ?>" id="add_free_product_bton"><?php _e('Add free product', 'wpshop'); ?></a>

Braces +4 added lines, -1 removed lines

@@ -1,4 +1,7 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit; ?>
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
+?>
 <form id="wps_create_free_product" method="post" action="<?php echo admin_url('admin-ajax.php'); ?>">
 
 	<input type="hidden" name="action" value="wps_create_new_free_product">

includes/modules/wps_quotation/controller/wps_quotation_backend_ctr.php

Spacing +72 added lines, -72 removed lines

@@ -1,21 +1,21 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_quotation_backend_ctr {
 	/*
 	 * Declare filter and actions
 	 */
 	public function __construct() {
 		/**	Appel des styles pour l'administration / Call style for administration	*/
-		add_action( 'admin_enqueue_scripts', array( &$this, 'admin_assets' ) );
+		add_action('admin_enqueue_scripts', array(&$this, 'admin_assets'));
 
 		/**	Définition du filtre permettant le champs d'activation du module avec un code obtenu sur la boutique / Define the filter allowing to display an input for module activation with a given code from the shop	*/
-		add_filter( 'wps-addon-extra-info', array( $this, 'display_addon_activation_form' ) );
+		add_filter('wps-addon-extra-info', array($this, 'display_addon_activation_form'));
 		/**	Déclaration de la requête Ajax permettant de vérifier le code d'activation et d'activer le module le cas échéant / Declare ajax request allowing to check the code and activate addon in case the code is correct	*/
-		add_action( 'wp_ajax_check_code_for_activation', array( $this, 'check_code_for_activation' ) );
+		add_action('wp_ajax_check_code_for_activation', array($this, 'check_code_for_activation'));
 
-		add_filter( 'wps-filter-free-product-bton-tpl', array( $this, 'wps_free_product_bton_tpl' ) );
-		add_action( 'wp_ajax_wps_free_product_form_page_tpl', array( $this, 'wps_free_product_form_page_tpl' ) );
-		add_action( 'wp_ajax_wps_create_new_free_product', array( $this, 'wps_create_new_free_product' ) );
-		add_action( 'init', array( $this, 'wps_free_product_post_status' ) );
+		add_filter('wps-filter-free-product-bton-tpl', array($this, 'wps_free_product_bton_tpl'));
+		add_action('wp_ajax_wps_free_product_form_page_tpl', array($this, 'wps_free_product_form_page_tpl'));
+		add_action('wp_ajax_wps_create_new_free_product', array($this, 'wps_create_new_free_product'));
+		add_action('init', array($this, 'wps_free_product_post_status'));
 	}
 
 
@@ -23,7 +23,7 @@ 
 	 * Inclusion des feuilles de styles pour l'administration / Admin css enqueue
 	 */
 	function admin_assets() {
-		wp_enqueue_script( 'wps_quotation_admin_js', WPS_QUOTATION_URL . '/assets/js/backend.js', array( 'jquery', ), WPSHOP_VERSION );
+		wp_enqueue_script('wps_quotation_admin_js', WPS_QUOTATION_URL . '/assets/js/backend.js', array('jquery',), WPSHOP_VERSION);
 	}
 
 
@@ -31,36 +31,36 @@ 
 	/*
 	 * Create a new post status for free products
 	 */
-	function wps_free_product_post_status(){
-		register_post_status( 'free_product', array(
-			'label'                     => __( 'Free product', 'wpshop' ),
+	function wps_free_product_post_status() {
+		register_post_status('free_product', array(
+			'label'                     => __('Free product', 'wpshop'),
 			'public'                    => false,
 			'exclude_from_search'       => true,
 			'show_in_admin_all_list'    => false,
 			'show_in_admin_status_list' => false,
-		) );
+		));
 	}
 	/*
 	 * Template for display button - Filter : 'wps_orders\templates\backend\product-listing\wps_orders_product_listing.php'
 	 * @param integer $order_id ID of order
 	 */
 	public function wps_free_product_bton_tpl($order_id) {
-		$order_post_meta = get_post_meta( $order_id, '_wpshop_order_status', true );
-		if ( 'completed' != $order_post_meta ) {
-			require ( wpshop_tools::get_template_part( WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "add_free_product_bton_tpl") );
+		$order_post_meta = get_post_meta($order_id, '_wpshop_order_status', true);
+		if ('completed' != $order_post_meta) {
+			require (wpshop_tools::get_template_part(WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "add_free_product_bton_tpl"));
 		}
 	}
 	/*
 	 * Template for display form (AjaxForm) - Call from : Line 3 'templates\backend\add_free_product_form_page_tpl.php'
 	 */
 	public function wps_free_product_form_page_tpl() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_free_product_form_page_tpl' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_free_product_form_page_tpl'))
 			wp_die();
 
-		$order_id = ( !empty($_GET['oid']) ) ? intval( $_GET['oid']) : null;
-		require ( wpshop_tools::get_template_part( WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "add_free_product_form_page_tpl") );
+		$order_id = (!empty($_GET['oid'])) ? intval($_GET['oid']) : null;
+		require (wpshop_tools::get_template_part(WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "add_free_product_form_page_tpl"));
 		wp_die();
 	}
 	/*
@@ -70,9 +70,9 @@ 
 	 * @return integer $pid Product ID
 	 */
 	public function wps_create_new_free_product() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_create_new_free_product' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_create_new_free_product'))
 			wp_die();
 
 		global $wpdb;
@@ -80,43 +80,43 @@ 
 		$output = __('Error at product creation!', 'wpshop');
 		$new_product_id = -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();
+		$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();
 
-		if( $post_title != -1 ) {
-			$new_product_id = wp_insert_post( array(
+		if ($post_title != -1) {
+			$new_product_id = wp_insert_post(array(
 				'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
 				'post_status' => 'free_product',
 				'post_title' => $post_title,
 				'post_content' => $post_content,
-			) );
-			if( !is_object( $new_product_id ) ) {
+			));
+			if (!is_object($new_product_id)) {
 				$attribute_set_list = wpshop_attributes_set::get_attribute_set_list_for_entity(wpshop_entities::get_entity_identifier_from_code('wpshop_product'));
 				$id_attribute_set = null;
-				foreach( $attribute_set_list as $attribute_set ) {
-					if( $attribute_set->slug == 'free_product' ) {
+				foreach ($attribute_set_list as $attribute_set) {
+					if ($attribute_set->slug == 'free_product') {
 						$id_attribute_set = $attribute_set->id;
 						break;
 					}
 				}
-				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();
+				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';
 				$status = false;
 				$output = __('Product created partially!', 'wpshop');
-				if( !empty($new_product_id) && !empty( $data_to_save['user_ID'] ) ) {
+				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 );
+					$product_class->save_product_custom_informations($new_product_id, $data_to_save);
 					$status = true;
 					$output = __('Product created successfully.', 'wpshop');
 				}
 			}
 		}
 
-		echo json_encode( array( 'status' => $status, 'message' => $output, 'pid' => $new_product_id ) );
+		echo json_encode(array('status' => $status, 'message' => $output, 'pid' => $new_product_id));
 		wp_die();
 	}
 
@@ -126,78 +126,78 @@ 
 	 *
 	 * @param string $module Le nom du module en cours d'affichage et pour lequel il faut afficher le champs/ The module being displayed and to add input for
 	 */
-	function display_addon_activation_form( $module ) {
-		if ( WPS_QUOTATION_DIR == $module ) {
+	function display_addon_activation_form($module) {
+		if (WPS_QUOTATION_DIR == $module) {
 
 			/** Récupération du statut du module devis / Get current quotation addon state */
-			$addon_option = get_option( 'wpshop_addons' );
+			$addon_option = get_option('wpshop_addons');
 
-			if ( empty( $addon_option ) || ( !empty( $addon_option[ 'WPSHOP_ADDONS_QUOTATION' ] ) && ( false === ( $addon_option['WPSHOP_ADDONS_QUOTATION']['activate'] ) ) ) ) {
-				$quotation_module_def = get_plugin_data( WPS_QUOTATION_PATH . '/wps_quotation.php' );
-				require ( wpshop_tools::get_template_part( WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "addon", "activation" ) );
+			if (empty($addon_option) || (!empty($addon_option['WPSHOP_ADDONS_QUOTATION']) && (false === ($addon_option['WPSHOP_ADDONS_QUOTATION']['activate'])))) {
+				$quotation_module_def = get_plugin_data(WPS_QUOTATION_PATH . '/wps_quotation.php');
+				require (wpshop_tools::get_template_part(WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "addon", "activation"));
 			}
-			else if ( !empty( $addon_option[ 'WPSHOP_ADDONS_QUOTATION' ] ) && ( true === ( $addon_option['WPSHOP_ADDONS_QUOTATION']['activate'] ) ) ) {
-				require ( wpshop_tools::get_template_part( WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "addon", "activated" ) );
+			else if (!empty($addon_option['WPSHOP_ADDONS_QUOTATION']) && (true === ($addon_option['WPSHOP_ADDONS_QUOTATION']['activate']))) {
+				require (wpshop_tools::get_template_part(WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "addon", "activated"));
 			}
 		}
 	}
 
 	function check_code_for_activation() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'check_code_for_activation' ) )
+		if (!wp_verify_nonce($_wpnonce, 'check_code_for_activation'))
 			wp_die();
 
 		$response = array(
 			'status' => false,
-			'message' => __( 'Activation code for quotation addon is invalid, please check it and try again.', 'wpshop' ),
+			'message' => __('Activation code for quotation addon is invalid, please check it and try again.', 'wpshop'),
 		);
-		$required_code = wpshop_tools::get_plugin_validation_code( WPS_QUOTATION_DIR, site_url() );
-		$code = sanitize_text_field( $_POST[ 'code' ] );
-		if ( $code === $required_code ) {
+		$required_code = wpshop_tools::get_plugin_validation_code(WPS_QUOTATION_DIR, site_url());
+		$code = sanitize_text_field($_POST['code']);
+		if ($code === $required_code) {
 			$this->action_to_do_to_activate();
 			$response = array(
 				'status' => true,
-				'message' => __( 'Quotation addon have been successfully activated.', 'wpshop' ),
+				'message' => __('Quotation addon have been successfully activated.', 'wpshop'),
 			);
 		}
 
-		wp_die( json_encode( $response ) );
+		wp_die(json_encode($response));
 	}
 
 	/**
 	 * Action to do when the activation code is OK
 	 */
-	function action_to_do_to_activate(){
+	function action_to_do_to_activate() {
 		global $wpdb;
 		/** Activate the plug in **/
-		$addon_option = get_option( 'wpshop_addons' );
+		$addon_option = get_option('wpshop_addons');
 		$addon_option['WPSHOP_ADDONS_QUOTATION']['activate'] = true;
 		$addon_option['WPSHOP_ADDONS_QUOTATION']['activation_date'] = current_time('mysql', 0);
 
-		update_option( 'wpshop_addons', $addon_option );
+		update_option('wpshop_addons', $addon_option);
 
 		/** Activate the Quotation attribute **/
-		$wpdb->update( WPSHOP_DBT_ATTRIBUTE, array('status' => 'valid'), array('code' => 'quotation_allowed') );
+		$wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('status' => 'valid'), array('code' => 'quotation_allowed'));
 
-		$attribute_def = wpshop_attributes::getElement( 'quotation_allowed', '"valid"', 'code' );
+		$attribute_def = wpshop_attributes::getElement('quotation_allowed', '"valid"', 'code');
 
 		/** Add the attribute in attributes groups section **/
-		$query = $wpdb->prepare('SELECT id, attribute_set_id FROM ' .WPSHOP_DBT_ATTRIBUTE_GROUP. ' WHERE code = %s', 'general');
-		$attribute_set_sections = $wpdb->get_results( $query );
-
-		if ( !empty($attribute_set_sections) ) {
-			$entity_type_def = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
-			if ( !empty( $entity_type_def) ) {
-				foreach ( $attribute_set_sections as $attribute_set_section ) {
-					$query = $wpdb->prepare('SELECT COUNT(*) AS count_attribute_affectation FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d AND attribute_id = %d', $entity_type_def, $attribute_set_section->attribute_set_id, $attribute_set_section->id, $attribute_def->id);
-					$count_attribute_affectation = $wpdb->get_var( $query );
-
-					if ( $count_attribute_affectation == 0 ) {
-						$query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', $entity_type_def, $attribute_set_section->attribute_set_id, $attribute_set_section->id);
-						$max_position = $wpdb->get_var( $query );
+		$query = $wpdb->prepare('SELECT id, attribute_set_id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE code = %s', 'general');
+		$attribute_set_sections = $wpdb->get_results($query);
+
+		if (!empty($attribute_set_sections)) {
+			$entity_type_def = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			if (!empty($entity_type_def)) {
+				foreach ($attribute_set_sections as $attribute_set_section) {
+					$query = $wpdb->prepare('SELECT COUNT(*) AS count_attribute_affectation FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d AND attribute_id = %d', $entity_type_def, $attribute_set_section->attribute_set_id, $attribute_set_section->id, $attribute_def->id);
+					$count_attribute_affectation = $wpdb->get_var($query);
+
+					if ($count_attribute_affectation == 0) {
+						$query = $wpdb->prepare('SELECT MAX(position) AS max_position FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', $entity_type_def, $attribute_set_section->attribute_set_id, $attribute_set_section->id);
+						$max_position = $wpdb->get_var($query);
 						/** Insert attribute detail **/
-						$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_type_def, 'attribute_set_id' =>  $attribute_set_section->attribute_set_id, 'attribute_group_id' => $attribute_set_section->id, 'attribute_id' => $attribute_def->id, 'position' => (int)$max_position + 1) );
+						$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_DETAILS, array('status' => 'valid', 'creation_date' => current_time('mysql', 0), 'entity_type_id' => $entity_type_def, 'attribute_set_id' =>  $attribute_set_section->attribute_set_id, 'attribute_group_id' => $attribute_set_section->id, 'attribute_id' => $attribute_def->id, 'position' => (int)$max_position + 1));
 					}
 				}
 			}

Braces +13 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_quotation_backend_ctr {
 	/*
 	 * Declare filter and actions
@@ -56,8 +58,9 @@ 
 	public function wps_free_product_form_page_tpl() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_free_product_form_page_tpl' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_free_product_form_page_tpl' ) ) {
+					wp_die();
+		}
 
 		$order_id = ( !empty($_GET['oid']) ) ? intval( $_GET['oid']) : null;
 		require ( wpshop_tools::get_template_part( WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "add_free_product_form_page_tpl") );
@@ -72,8 +75,9 @@ 
 	public function wps_create_new_free_product() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_create_new_free_product' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_create_new_free_product' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$status = false;
@@ -135,8 +139,7 @@ 
 			if ( empty( $addon_option ) || ( !empty( $addon_option[ 'WPSHOP_ADDONS_QUOTATION' ] ) && ( false === ( $addon_option['WPSHOP_ADDONS_QUOTATION']['activate'] ) ) ) ) {
 				$quotation_module_def = get_plugin_data( WPS_QUOTATION_PATH . '/wps_quotation.php' );
 				require ( wpshop_tools::get_template_part( WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "addon", "activation" ) );
-			}
-			else if ( !empty( $addon_option[ 'WPSHOP_ADDONS_QUOTATION' ] ) && ( true === ( $addon_option['WPSHOP_ADDONS_QUOTATION']['activate'] ) ) ) {
+			} else if ( !empty( $addon_option[ 'WPSHOP_ADDONS_QUOTATION' ] ) && ( true === ( $addon_option['WPSHOP_ADDONS_QUOTATION']['activate'] ) ) ) {
 				require ( wpshop_tools::get_template_part( WPS_QUOTATION_DIR, WPS_QUOTATION_TEMPLATES_MAIN_DIR, "backend", "addon", "activated" ) );
 			}
 		}
@@ -145,8 +148,9 @@ 
 	function check_code_for_activation() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'check_code_for_activation' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'check_code_for_activation' ) ) {
+					wp_die();
+		}
 
 		$response = array(
 			'status' => false,