Eoxia / wpshop

includes/librairies/purchase/checkout.class.php

Spacing +87 added lines, -87 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -25,11 +25,11 @@ 
 	/** Constructor of the class
 	* @return void
 	*/
-	function __construct () {
+	function __construct() {
 	}
 
 
-	public static function process_checkout($paymentMethod='paypal', $order_id = 0, $customer_id = 0, $customer_billing_address_id = 0, $customer_shipping_address_id = 0) {
+	public static function process_checkout($paymentMethod = 'paypal', $order_id = 0, $customer_id = 0, $customer_billing_address_id = 0, $customer_shipping_address_id = 0) {
 
 		global $wpdb, $wpshop, $wpshop_cart;
 		$wps_message = new wps_message_ctr();
@@ -38,22 +38,22 @@ 
 		if (is_user_logged_in()) :
 			$user_id = get_current_user_id();
 
-		if ( $customer_id != 0 ) {
+		if ($customer_id != 0) {
 			$user_id = $customer_id;
 		}
 
 			// If the order is already created in the db
-			if(!empty($order_id) && is_numeric($order_id)) {
+			if (!empty($order_id) && is_numeric($order_id)) {
 				$order = get_post_meta($order_id, '_order_postmeta', true);
 
-				if(!empty($order)) {
-					if($order['customer_id'] == $user_id) {
+				if (!empty($order)) {
+					if ($order['customer_id'] == $user_id) {
 						$order['payment_method'] = $paymentMethod;
-						$_SESSION['order_id'] = (int) $order_id;
+						$_SESSION['order_id'] = (int)$order_id;
 						// Store cart in session
 						//wpshop_cart::store_cart_in_session($order);
 						// Add a payment
-						$order['order_payment']['received'][] = array( 'method' => $paymentMethod, 'waited_amount' => $order['order_amount_to_pay_now'], 'status' => 'waiting_payment', 'author' => get_current_user_id() );
+						$order['order_payment']['received'][] = array('method' => $paymentMethod, 'waited_amount' => $order['order_amount_to_pay_now'], 'status' => 'waiting_payment', 'author' => get_current_user_id());
 
 						// On enregistre la commande
 						update_post_meta($order_id, '_order_postmeta', $order);
@@ -63,12 +63,12 @@ 
 				}
 				else $wpshop->add_error(__('The order doesn\'t exist.', 'wpshop'));
 			}
-			else{
+			else {
 				$order_data = array(
 					'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
-					'post_title' => sprintf(__('Order - %s','wpshop'), mysql2date('d M Y\, H:i:s', current_time('mysql', 0), true)),
+					'post_title' => sprintf(__('Order - %s', 'wpshop'), mysql2date('d M Y\, H:i:s', current_time('mysql', 0), true)),
 					'post_status' => 'publish',
-					'post_excerpt' => !empty($_POST['wps-customer-comment']) ? sanitize_text_field( $_POST['wps-customer-comment'] ) : '',
+					'post_excerpt' => !empty($_POST['wps-customer-comment']) ? sanitize_text_field($_POST['wps-customer-comment']) : '',
 					'post_author' => $user_id,
 					'comment_status' => 'closed'
 				);
@@ -78,7 +78,7 @@ 
 				$order_tva = array();
 
 				//$cart = (array)$wpshop_cart->cart;
-				if ( !empty($_SESSION['cart']) && !empty( $_SESSION['cart']['shipping_method']) ) {
+				if (!empty($_SESSION['cart']) && !empty($_SESSION['cart']['shipping_method'])) {
 					$_SESSION['cart']['shipping_method'] = __('Standard shipping method', 'wpshop');
 				}
 				$cart = (array)$_SESSION['cart'];
@@ -90,35 +90,35 @@ 
 				$_SESSION['order_id'] = $order_id;
 
 				// Cr�ation des codes de t�l�chargement si il y a des produits t�l�chargeable dans le panier
-				if ( !empty( $cart['order_items'] ) ) {
-					foreach($cart['order_items'] as $c) {
+				if (!empty($cart['order_items'])) {
+					foreach ($cart['order_items'] as $c) {
 						$product_id = $c['item_id'];
 						$product = null;
-						if( isset( $c['item_meta']['variations'] ) ) {
-							foreach ( $c['item_meta']['variations'] as $variation_id => $variation ) {
-								if( isset( $variation['item_meta']['is_downloadable_'] ) ) {
+						if (isset($c['item_meta']['variations'])) {
+							foreach ($c['item_meta']['variations'] as $variation_id => $variation) {
+								if (isset($variation['item_meta']['is_downloadable_'])) {
 									$product_id = $c['item_id'] . '__' . $variation_id;
-									$product = wpshop_products::get_product_data( $product_id );
+									$product = wpshop_products::get_product_data($product_id);
 								}
 							}
 						}
-						if( !isset( $product ) ) {
-							$product = wpshop_products::get_product_data( $c['item_id'] );
+						if (!isset($product)) {
+							$product = wpshop_products::get_product_data($c['item_id']);
 							$product_id = $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_'])) {
+						if (!empty($product['is_downloadable_'])) {
 							$download_codes[$product_id] = array('item_id' => $product_id, 'download_code' => uniqid('', true));
 						}
 					}
 				}
-				if(!empty($download_codes)) update_user_meta($user_id, '_order_download_codes_'.$order_id, $download_codes);
+				if (!empty($download_codes)) update_user_meta($user_id, '_order_download_codes_' . $order_id, $download_codes);
 
 				// Informations de commande � stocker
 				$currency = wpshop_tools::wpshop_get_currency(true);
@@ -133,12 +133,12 @@ 
 					'order_payment' 		=> array(
 					'customer_choice' 		=> array('method' => $paymentMethod),
 					'received'				=> array('0' => array('method' => $paymentMethod, 'waited_amount' => $cart['order_amount_to_pay_now'], 'status' =>  'waiting_payment', 'author' => $user_id)),
-					'shipping_method'       => ( ( !empty( $_SESSION['shipping_method']) ) ? wpshop_tools::varSanitizer( $_SESSION['shipping_method']) : __('Standard shipping method', 'wpshop') )
+					'shipping_method'       => ((!empty($_SESSION['shipping_method'])) ? wpshop_tools::varSanitizer($_SESSION['shipping_method']) : __('Standard shipping method', 'wpshop'))
 					),
 				), $cart);
 
 				// Si c'est un devis
-				if ( $paymentMethod == 'quotation' ) {
+				if ($paymentMethod == 'quotation') {
 					$order['order_temporary_key'] = wpshop_orders::get_new_pre_order_reference();
 				}
 				else {
@@ -146,9 +146,9 @@ 
 				}
 
 				//Round final amount
-				$order['order_grand_total'] = number_format( round($order['order_grand_total'], 2), 2, '.', '');
-				$order['order_total_ttc'] = number_format( round($order['order_total_ttc'], 2), 2, '.', '');
-				$order['order_amount_to_pay_now'] = number_format( round($order['order_amount_to_pay_now'], 2), 2, '.', '');
+				$order['order_grand_total'] = number_format(round($order['order_grand_total'], 2), 2, '.', '');
+				$order['order_total_ttc'] = number_format(round($order['order_total_ttc'], 2), 2, '.', '');
+				$order['order_amount_to_pay_now'] = number_format(round($order['order_amount_to_pay_now'], 2), 2, '.', '');
 
 				/** On enregistre la commande	*/
 				update_post_meta($order_id, '_order_postmeta', $order);
@@ -157,75 +157,75 @@ 
 				update_post_meta($order_id, '_wpshop_order_status', $order['order_status']);
 
 
-				do_action( 'wps_order_extra_save', $order_id );
+				do_action('wps_order_extra_save', $order_id);
 
 				//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 );
+				$args = array('order_id' => $order_id, 'posted_data' => $_REQUEST);
+				wpshop_tools::create_custom_hook('wps_order_extra_save_action', $args);
 
 				/**	Set custmer information for the order	*/
-				$shipping_address =  ( !empty($shipping_address_option) && !empty($shipping_address_option['activate']) ) ? ( ( !empty($_SESSION['shipping_address']) ) ? wpshop_tools::varSanitizer($_SESSION['shipping_address']) : $customer_shipping_address_id ) : '';
-				$billing_address =  ( !empty($_SESSION['billing_address']) ) ? wpshop_tools::varSanitizer($_SESSION['billing_address']) : $customer_billing_address_id;
+				$shipping_address = (!empty($shipping_address_option) && !empty($shipping_address_option['activate'])) ? ((!empty($_SESSION['shipping_address'])) ? wpshop_tools::varSanitizer($_SESSION['shipping_address']) : $customer_shipping_address_id) : '';
+				$billing_address = (!empty($_SESSION['billing_address'])) ? wpshop_tools::varSanitizer($_SESSION['billing_address']) : $customer_billing_address_id;
 
 
-				if ( !empty( $billing_address) ) {
+				if (!empty($billing_address)) {
 					wpshop_orders::set_order_customer_addresses($user_id, $order_id, $shipping_address, $billing_address);
 				}
 
-				if ( !empty($_SESSION['shipping_address_to_save']) ) {
+				if (!empty($_SESSION['shipping_address_to_save'])) {
 					$order_infos_postmeta = get_post_meta($order_id, '_order_info', true);
 					$order_infos_postmeta['shipping']['address'] = $_SESSION['shipping_address_to_save'];
 					$order_infos_postmeta['shipping']['address_id'] = '';
 					update_post_meta($order_id, '_order_info', $order_infos_postmeta);
-					unset( $_SESSION['shipping_address_to_save'] );
+					unset($_SESSION['shipping_address_to_save']);
 				}
 
 
 				/** Save Coupon use **/
-				if ( !empty($_SESSION['cart']['coupon_id']) ) {
+				if (!empty($_SESSION['cart']['coupon_id'])) {
 					$wps_coupon_mdl = new wps_coupon_model();
-					$wps_coupon_mdl->save_coupon_use( $_SESSION['cart']['coupon_id'] );
+					$wps_coupon_mdl->save_coupon_use($_SESSION['cart']['coupon_id']);
 				}
 
 				/**	Notify the customer as the case	*/
 				$user_info = get_userdata($user_id);
 				$email = $user_info->user_email;
-				$first_name = $user_info->user_firstname ;
+				$first_name = $user_info->user_firstname;
 				$last_name = $user_info->user_lastname;
 
 				// Envoie du message de confirmation de commande au client
-				$order_meta = get_post_meta( $order_id, '_order_postmeta', true);
+				$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 
-				$shipping_mode_option = get_option( 'wps_shipping_mode' );
-				$shipping_method = ( !empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ( (!empty($order_meta['order_payment']['shipping_method']) ) ? $order_meta['order_payment']['shipping_method'] : '' );
+				$shipping_mode_option = get_option('wps_shipping_mode');
+				$shipping_method = (!empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ((!empty($order_meta['order_payment']['shipping_method'])) ? $order_meta['order_payment']['shipping_method'] : '');
 
-				if ( !empty($order_meta) && !empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation' && empty($order_meta['order_key']) ) {
-					$wps_message->wpshop_prepared_email($email, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_date' => current_time('mysql', 0), 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '') );
+				if (!empty($order_meta) && !empty($order_meta['cart_type']) && $order_meta['cart_type'] == 'quotation' && empty($order_meta['order_key'])) {
+					$wps_message->wpshop_prepared_email($email, 'WPSHOP_QUOTATION_CONFIRMATION_MESSAGE', array('order_id' => $order_id, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_date' => current_time('mysql', 0), 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => ''));
 				}
 				else {
-					$email_option = get_option( 'wpshop_emails' );
-					if ( empty($email_option['send_confirmation_order_message']) ) {
-						$payment_method_option = get_option( 'wps_payment_mode' );
-						$order_payment_method = ( !empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_meta['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])  ) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
+					$email_option = get_option('wpshop_emails');
+					if (empty($email_option['send_confirmation_order_message'])) {
+						$payment_method_option = get_option('wps_payment_mode');
+						$order_payment_method = (!empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_meta['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
 
-						$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ( ( !empty($order_meta['order_key']) ) ? $order_meta['order_key'] : ''),'order_date' => current_time('mysql', 0),  'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '',  'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '' ) );
+						$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ((!empty($order_meta['order_key'])) ? $order_meta['order_key'] : ''), 'order_date' => current_time('mysql', 0), 'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => ''));
 					}
 				}
 
-				if ( empty($_SESSION['wps-pos-addon']) ) {
+				if (empty($_SESSION['wps-pos-addon'])) {
 					$email_option = get_option('wpshop_emails');
-					if( empty($email_option) || ( !empty($email_option) && empty($email_option['send_confirmation_order_message']) ) ){
-						self::send_order_email_to_administrator( $order_id, $user_info );
+					if (empty($email_option) || (!empty($email_option) && empty($email_option['send_confirmation_order_message']))) {
+						self::send_order_email_to_administrator($order_id, $user_info);
 					}
 				}
 
 
 				/** IF Order amount is 0, Finish the Order **/
-				if ( $cart['order_amount_to_pay_now'] == 0 ) {
+				if ($cart['order_amount_to_pay_now'] == 0) {
 					$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 					$payment_status = 'completed';
-					$params_array = array (
+					$params_array = array(
 						'method' =>'free',
 						'waited_amount' => $order_meta['order_amount_to_pay_now'],
 						'status' =>  'payment_received',
@@ -236,14 +236,14 @@ 
 					);
 					wpshop_payment::check_order_payment_total_amount($order_id, $params_array, $payment_status);
 				}
-				apply_filters( 'wpshop_finish_order_extra_actions', $order_id);
+				apply_filters('wpshop_finish_order_extra_actions', $order_id);
 			}
 		endif;
 		return $order_id;
 	}
 
-	public static function send_order_email_to_administrator ( $order_id, $customer_infos = ''  ) {
-		if ( !empty($order_id) ) {
+	public static function send_order_email_to_administrator($order_id, $customer_infos = '') {
+		if (!empty($order_id)) {
 			$wps_message = new wps_message_ctr();
 			$order_infos = get_post_meta($order_id, '_order_postmeta', true);
 			//Send email to administrator(s)
@@ -251,11 +251,11 @@ 
 			$shop_admin_email = $shop_admin_email_option['contact_email'];
 			$order_tmp_key = '';
 
-			$shipping_mode_option = get_option( 'wps_shipping_mode' );
-			$shipping_method = ( !empty($order_infos['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_infos['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_infos['order_payment']['shipping_method']]['name'] : ( (!empty($order_infos['order_payment']['shipping_method']) ) ? $order_infos['order_payment']['shipping_method'] : '' );
+			$shipping_mode_option = get_option('wps_shipping_mode');
+			$shipping_method = (!empty($order_infos['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_infos['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_infos['order_payment']['shipping_method']]['name'] : ((!empty($order_infos['order_payment']['shipping_method'])) ? $order_infos['order_payment']['shipping_method'] : '');
 
 
-			if( !empty( $order_infos ) && !empty($order_infos['cart_type']) && $order_infos['cart_type'] == 'normal' && !empty($order_infos['order_key']) ){
+			if (!empty($order_infos) && !empty($order_infos['cart_type']) && $order_infos['cart_type'] == 'normal' && !empty($order_infos['order_key'])) {
 				$message_type = 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE';
 			}
 			else {
@@ -263,12 +263,12 @@ 
 				$order_tmp_key = $order_infos['order_temporary_key'];
 			}
 
-			$payment_method_option = get_option( 'wps_payment_mode' );
-			$order_payment_method = ( !empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_infos['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']])  ) ? $payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']]['name'] : $order_infos['order_payment']['customer_choice']['method'];
+			$payment_method_option = get_option('wps_payment_mode');
+			$order_payment_method = (!empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_infos['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']])) ? $payment_method_option['mode'][$order_infos['order_payment']['customer_choice']['method']]['name'] : $order_infos['order_payment']['customer_choice']['method'];
 
-			$data_to_send = array('order_id' => $order_id, 'order_key' => $order_infos['order_key'], 'customer_email' => ( !empty($customer_infos) && !empty($customer_infos->user_email) ) ? $customer_infos->user_email : '' , 'customer_last_name' => ( !empty($customer_infos) && !empty($customer_infos->user_lastname) ) ? $customer_infos->user_lastname : '', 'customer_first_name' => ( !empty($customer_infos) && !empty($customer_infos->user_firstname) ) ? $customer_infos->user_firstname : '', 'order_date' => $order_infos['order_date'], 'order_payment_method' => $order_payment_method, 'order_temporary_key' => $order_tmp_key, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '','order_shipping_method' => $shipping_method, 'order_personnal_informations' => '' );
+			$data_to_send = array('order_id' => $order_id, 'order_key' => $order_infos['order_key'], 'customer_email' => (!empty($customer_infos) && !empty($customer_infos->user_email)) ? $customer_infos->user_email : '', 'customer_last_name' => (!empty($customer_infos) && !empty($customer_infos->user_lastname)) ? $customer_infos->user_lastname : '', 'customer_first_name' => (!empty($customer_infos) && !empty($customer_infos->user_firstname)) ? $customer_infos->user_firstname : '', 'order_date' => $order_infos['order_date'], 'order_payment_method' => $order_payment_method, 'order_temporary_key' => $order_tmp_key, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method, 'order_personnal_informations' => '');
 
-			$wps_message->wpshop_prepared_email( $shop_admin_email, $message_type, $data_to_send, array('object_type' => 'order', 'object_id' => $order_id));
+			$wps_message->wpshop_prepared_email($shop_admin_email, $message_type, $data_to_send, array('object_type' => 'order', 'object_id' => $order_id));
 		}
 	}
 
@@ -279,13 +279,13 @@ 
 	 * @param mixed $data Array or false.
 	 * @return void
 	 */
-	public static function wps_direct_payment_link( $data = false ) {
-		$data = empty( $data ) ? self::wps_direct_payment_link_verify_token() : $data;
-		if ( (bool) $data ) {
-			wps_orders_ctr::pay_quotation( $data['oid'] );
-			wpshop_tools::wpshop_safe_redirect( get_permalink( wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) ) ) . '?order_step=5' );
+	public static function wps_direct_payment_link($data = false) {
+		$data = empty($data) ? self::wps_direct_payment_link_verify_token() : $data;
+		if ((bool)$data) {
+			wps_orders_ctr::pay_quotation($data['oid']);
+			wpshop_tools::wpshop_safe_redirect(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'))) . '?order_step=5');
 		} else {
-			wpshop_tools::wpshop_safe_redirect( get_permalink( wpshop_tools::get_page_id( get_option( 'wpshop_myaccount_page_id' ) ) ) );
+			wpshop_tools::wpshop_safe_redirect(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))));
 		}
 	}
 	/**
@@ -295,12 +295,12 @@ 
 	 * @param mixed $data Array or false.
 	 * @return void
 	 */
-	public static function wps_direct_payment_link_nopriv( $data = false ) {
-		$data = empty( $data ) ? self::wps_direct_payment_link_verify_token() : $data;
-		if ( (bool) $data ) {
-			wp_set_auth_cookie( $data['cid'], true, is_ssl() );
+	public static function wps_direct_payment_link_nopriv($data = false) {
+		$data = empty($data) ? self::wps_direct_payment_link_verify_token() : $data;
+		if ((bool)$data) {
+			wp_set_auth_cookie($data['cid'], true, is_ssl());
 		}
-		self::wps_direct_payment_link( $data );
+		self::wps_direct_payment_link($data);
 	}
 	/**
 	 * Verify token in request.
@@ -309,11 +309,11 @@ 
 	 * @return mixed Customer id or false.
 	 */
 	public static function wps_direct_payment_link_verify_token() {
-		$token = ! empty( $_GET['token'] ) ? sanitize_text_field( $_GET['token'] ) : '';
-		$order_id = ! empty( $_GET['order_id'] ) ? (int) $_GET['order_id'] : '';
-		$order_metadata = get_post_meta( $order_id, '_order_postmeta', true );
-		$customer_id = ! empty( $order_metadata['customer_id'] ) ? (int) $order_metadata['customer_id'] : false;
-		return ( (bool) $customer_id && wps_orders_ctr::wps_verify_token_order( $token, (int) $order_id ) ) ? array( 'oid' => $order_id, 'cid' => $customer_id ) : false;
+		$token = !empty($_GET['token']) ? sanitize_text_field($_GET['token']) : '';
+		$order_id = !empty($_GET['order_id']) ? (int)$_GET['order_id'] : '';
+		$order_metadata = get_post_meta($order_id, '_order_postmeta', true);
+		$customer_id = !empty($order_metadata['customer_id']) ? (int)$order_metadata['customer_id'] : false;
+		return ((bool)$customer_id && wps_orders_ctr::wps_verify_token_order($token, (int)$order_id)) ? array('oid' => $order_id, 'cid' => $customer_id) : false;
 	}
 	/**
 	 * Get URL for wps_direct_link.
@@ -322,7 +322,7 @@ 
 	 * @param  int $order_id OrderID.
 	 * @return string Url or empty string.
 	 */
-	public static function wps_direct_payment_link_url( $order_id ) {
-		return ( (bool) ( $token = wps_orders_ctr::wps_token_order_customer( (int) $order_id ) ) ) ? admin_url( 'admin-post.php?action=wps_direct_payment_link&token=' . $token . '&amp;order_id=' . (int) $order_id ) : '';
+	public static function wps_direct_payment_link_url($order_id) {
+		return ((bool)($token = wps_orders_ctr::wps_token_order_customer((int)$order_id))) ? admin_url('admin-post.php?action=wps_direct_payment_link&token=' . $token . '&amp;order_id=' . (int)$order_id) : '';
 	}
 }

includes/librairies/purchase/orders.class.php

Spacing +134 added lines, -134 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Products management method file
  *
@@ -10,8 +10,8 @@ 
  */
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -70,7 +70,7 @@ 
 		/**	Add action button	*/
 		add_meta_box(
 			'wpshop_order_actions',
-			'<span class="dashicons dashicons-info"></span> '.__('Actions on order', 'wpshop'),
+			'<span class="dashicons dashicons-info"></span> ' . __('Actions on order', 'wpshop'),
 			array('wpshop_orders', 'order_actions'),
 				WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'side', 'high'
 		);
@@ -110,7 +110,7 @@ 
 	 *
 	 * @param object $order The current order being edited
 	 */
-	public static function order_actions( $order ) {
+	public static function order_actions($order) {
 		$output = '';
 
 		$order_status = unserialize(WPSHOP_ORDER_STATUS);
@@ -118,37 +118,37 @@ 
 
 		$tpl_component = array();
 
-		$delete_button = wpshop_display::display_template_element('wpshop_admin_order_action_del_button', array('ADMIN_ORDER_DELETE_LINK' => esc_url( get_delete_post_link($order->ID) ) , 'ADMIN_ORDER_DELETE_TEXT' => (!EMPTY_TRASH_DAYS ? __('Delete Permanently', 'wpshop') :  __('Move to Trash', 'wpshop'))), array(), 'admin');
-		$tpl_component['ADMIN_ORDER_DELETE_ORDER'] = current_user_can( "delete_post", $order->ID ) ? $delete_button : '';
+		$delete_button = wpshop_display::display_template_element('wpshop_admin_order_action_del_button', array('ADMIN_ORDER_DELETE_LINK' => esc_url(get_delete_post_link($order->ID)), 'ADMIN_ORDER_DELETE_TEXT' => (!EMPTY_TRASH_DAYS ? __('Delete Permanently', 'wpshop') : __('Move to Trash', 'wpshop'))), array(), 'admin');
+		$tpl_component['ADMIN_ORDER_DELETE_ORDER'] = current_user_can("delete_post", $order->ID) ? $delete_button : '';
 
 		/**	Add an action list	*/
 		$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] = '';
 
 		/**	Display main information about the order	*/
 		$order_main_info = '';
-		if(!empty($order_postmeta['order_date'])){
-			$order_main_info .=  '<div class="wps-product-section"><span class="dashicons dashicons-calendar-alt"></span> <strong>'.__('Order date','wpshop').' : </strong><br/>'.mysql2date('d F Y H:i:s', $order_postmeta['order_date'], true).'</div>';
+		if (!empty($order_postmeta['order_date'])) {
+			$order_main_info .= '<div class="wps-product-section"><span class="dashicons dashicons-calendar-alt"></span> <strong>' . __('Order date', 'wpshop') . ' : </strong><br/>' . mysql2date('d F Y H:i:s', $order_postmeta['order_date'], true) . '</div>';
 		}
 		$order_main_info .= '<div class="wps-product-section">';
-		if(empty($order_postmeta['order_date']) || (empty($order_postmeta['order_key']) && empty($order_postmeta['order_temporary_key']) && empty($order_postmeta['order_invoice_ref']))){
-			$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Temporary quotation reference','wpshop').': </strong>'.self::get_new_pre_order_reference(false).'<br/>';
+		if (empty($order_postmeta['order_date']) || (empty($order_postmeta['order_key']) && empty($order_postmeta['order_temporary_key']) && empty($order_postmeta['order_invoice_ref']))) {
+			$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Temporary quotation reference', 'wpshop') . ': </strong>' . self::get_new_pre_order_reference(false) . '<br/>';
 		}
-		else{
-			if(!empty($order_postmeta['order_key'])){
-				$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Order reference','wpshop').' : </strong>'.$order_postmeta['order_key'].'<br/>';
+		else {
+			if (!empty($order_postmeta['order_key'])) {
+				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Order reference', 'wpshop') . ' : </strong>' . $order_postmeta['order_key'] . '<br/>';
 			}
-			if(!empty($order_postmeta['order_temporary_key'])){
-				$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Pre-order reference','wpshop').': </strong>'.$order_postmeta['order_temporary_key'].'<br/>';
-				$post_ID = !empty( $_GET['post'] ) ? (int) $_GET['post'] : 0;
-				$order_main_info .= '<a href="' .admin_url( 'admin-post.php?action=wps_invoice&order_id=' . $post_ID . '&mode=pdf' ) . '">' .__('Download the quotation', 'wpshop'). '</a><br />';
+			if (!empty($order_postmeta['order_temporary_key'])) {
+				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Pre-order reference', 'wpshop') . ': </strong>' . $order_postmeta['order_temporary_key'] . '<br/>';
+				$post_ID = !empty($_GET['post']) ? (int)$_GET['post'] : 0;
+				$order_main_info .= '<a href="' . admin_url('admin-post.php?action=wps_invoice&order_id=' . $post_ID . '&mode=pdf') . '">' . __('Download the quotation', 'wpshop') . '</a><br />';
 			}
-			if(!empty($order_postmeta['order_invoice_ref'])){
+			if (!empty($order_postmeta['order_invoice_ref'])) {
 				$sub_tpl_component = array();
 				$sub_tpl_component['ADMIN_ORDER_RECEIVED_PAYMENT_INVOICE_REF'] = $order_postmeta['order_invoice_ref'];
 				$sub_tpl_component['ADMIN_ORDER_PAYMENT_RECEIVED_LINE_CLASSES'] = '';
-				$sub_tpl_component['ADMIN_ORDER_INVOICE_DOWNLOAD_LINK'] = admin_url( 'admin-post.php?action=wps_invoice&order_id=' . $order->ID );
+				$sub_tpl_component['ADMIN_ORDER_INVOICE_DOWNLOAD_LINK'] = admin_url('admin-post.php?action=wps_invoice&order_id=' . $order->ID);
 				$order_invoice_download = wpshop_display::display_template_element('wpshop_admin_order_payment_received_invoice_download_links', $sub_tpl_component, array(), 'admin');
-				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>'. __('Invoice number','wpshop').': </strong>'.$order_postmeta['order_invoice_ref'].'<br/>' . $order_invoice_download . '';
+				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>' . __('Invoice number', 'wpshop') . ': </strong>' . $order_postmeta['order_invoice_ref'] . '<br/>' . $order_invoice_download . '';
 			}
 			else {
 				$order_main_info .= wpshop_display::display_template_element('wpshop_admin_order_generate_invoice_button', array(), array(), 'admin');
@@ -158,7 +158,7 @@ 
 
 
 		/*Add the current order status in display**/
-			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= ( !empty($order_postmeta['order_status']) ) ? (sprintf('<span class="order_status_' . $order->ID . ' wpshop_order_status_container wpshop_order_status_%1$s ">%2$s</span>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop')) ) : '';
+			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= (!empty($order_postmeta['order_status'])) ? (sprintf('<span class="order_status_' . $order->ID . ' wpshop_order_status_container wpshop_order_status_%1$s ">%2$s</span>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop'))) : '';
 
 			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= $order_main_info;
 
@@ -176,8 +176,8 @@ 
 			</div>';
 		}*/
 
-		if( ( ( !empty($order_postmeta['cart_type']) && $order_postmeta['cart_type'] == 'quotation' ) || !empty( $order_postmeta['order_temporary_key'] ) ) && in_array( $order_postmeta['order_status'], array( 'awaiting_payment', 'partially_paid' ) ) && (float) $order_postmeta['order_amount_to_pay_now'] != (float) 0 ) {
-			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= self::display_customer_pay_quotation( isset( $order_postmeta['pay_quotation'] ), $order->ID );
+		if (((!empty($order_postmeta['cart_type']) && $order_postmeta['cart_type'] == 'quotation') || !empty($order_postmeta['order_temporary_key'])) && in_array($order_postmeta['order_status'], array('awaiting_payment', 'partially_paid')) && (float)$order_postmeta['order_amount_to_pay_now'] != (float)0) {
+			$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= self::display_customer_pay_quotation(isset($order_postmeta['pay_quotation']), $order->ID);
 		}
 
 		/**
@@ -188,18 +188,18 @@ 
 		}*/
 
 		/*Add the button regarding the order status**/
-		if ( !empty($order_postmeta['order_status']) ) {
-			if( $order_postmeta['order_status'] == 'awaiting_payment' ) {
-				$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><button class="wps-bton-second-mini-rounded markAsCanceled order_'.$order->ID.'" >'.__('Cancel this order', 'wpshop').'</button><input type="hidden" id="markascanceled_order_hidden_indicator" name="markascanceled_order_hidden_indicator" /></div>';
+		if (!empty($order_postmeta['order_status'])) {
+			if ($order_postmeta['order_status'] == 'awaiting_payment') {
+				$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section"><button class="wps-bton-second-mini-rounded markAsCanceled order_' . $order->ID . '" >' . __('Cancel this order', 'wpshop') . '</button><input type="hidden" id="markascanceled_order_hidden_indicator" name="markascanceled_order_hidden_indicator" /></div>';
 			}
-			$credit_meta = get_post_meta( $order->ID, '_wps_order_credit', true );
+			$credit_meta = get_post_meta($order->ID, '_wps_order_credit', true);
 
-			if ( empty($credit_meta) ) {
-				if( $order_postmeta['order_status'] == 'refunded') {
-					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container">' .__('Credit Slip number', 'wpshop'). ' : <strong>'. ( (!empty($order_postmeta) && !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['refunded_action']) && !empty($order_postmeta['order_payment']['refunded_action']['credit_slip_ref']) ) ? '<a href="' .admin_url( 'admin-post.php?action=wps_invoice&order_id=' .$order->ID. '&amp;invoice_ref=' .$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'&credit_slip=ok' ). '" target="_blank">'.$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'</a>' : '') .'</strong></div>';
+			if (empty($credit_meta)) {
+				if ($order_postmeta['order_status'] == 'refunded') {
+					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container">' . __('Credit Slip number', 'wpshop') . ' : <strong>' . ((!empty($order_postmeta) && !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['refunded_action']) && !empty($order_postmeta['order_payment']['refunded_action']['credit_slip_ref'])) ? '<a href="' . admin_url('admin-post.php?action=wps_invoice&order_id=' . $order->ID . '&amp;invoice_ref=' . $order_postmeta['order_payment']['refunded_action']['credit_slip_ref'] . '&credit_slip=ok') . '" target="_blank">' . $order_postmeta['order_payment']['refunded_action']['credit_slip_ref'] . '</a>' : '') . '</strong></div>';
 				}
 				else {
-					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container" ><button class="wps-bton-second-mini-rounded markAsRefunded order_' .$order->ID. '">' .__('Refund this order', 'wpshop'). '</button><input type="hidden" id="markasrefunded_order_hidden_indicator" name="markasrefunded_order_hidden_indicator" /></div>';
+					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container" ><button class="wps-bton-second-mini-rounded markAsRefunded order_' . $order->ID . '">' . __('Refund this order', 'wpshop') . '</button><input type="hidden" id="markasrefunded_order_hidden_indicator" name="markasrefunded_order_hidden_indicator" /></div>';
 				}
 			}
 		}
@@ -211,7 +211,7 @@ 
 	function order_container_in_admin() {
 		global $post;
 		$output  = '<div id="wps_order_content_container">';
-		$output .= self::order_content( $post );
+		$output .= self::order_content($post);
 		$output .= '</div>';
 		echo $output;
 	}
@@ -222,13 +222,13 @@ 
 	 *
 	 * @param order $post The complete order content
 	 */
-	function order_content( $post ) {
+	function order_content($post) {
 		$order_content = '';
 
 		$order = get_post_meta($post->ID, '_order_postmeta', true);
 
 		$order_content .= '<div id="order_product_container" class="order_product_container wpshop_cls" >';
-		if($order){/*	Read the order content if the order has product	*/
+		if ($order) {/*	Read the order content if the order has product	*/
 			$order_content .= '<input type="hidden" value="" name="order_products_to_delete" id="order_products_to_delete" />' . wpshop_cart::display_cart(true, $order, 'admin');
 			if (empty($order['order_invoice_ref'])) {
 				$order_content .= '<div id="order_refresh_button_container" class="wpshop_clear_block" ><input type="button" class="button-primary alignright wpshopHide" id="wpshop_admin_order_recalculate" value="' . __('Refresh order informations', 'wpshop') . '" /></div>';
@@ -246,18 +246,18 @@ 
 	/** Generate the billing reference regarding the order $order_id
 	 * @return void
 	*/
-	function order_generate_billing_number($order_id, $force_invoicing = false){
+	function order_generate_billing_number($order_id, $force_invoicing = false) {
 		global $wpdb, $wpshop_modules_billing;
 
 		// Get the order from the db
 		$order = get_post_meta($order_id, '_order_postmeta', true);
 
 		// If the payment is completed
-		if(($order['order_status']=='completed') || $force_invoicing) {
+		if (($order['order_status'] == 'completed') || $force_invoicing) {
 
 			// If the reference hasn't been generated yet
-			if(empty($order['order_invoice_ref'])) {
-				$order['order_invoice_ref'] = $wpshop_modules_billing->generate_invoice_number( $order_id );
+			if (empty($order['order_invoice_ref'])) {
+				$order['order_invoice_ref'] = $wpshop_modules_billing->generate_invoice_number($order_id);
 
 				update_post_meta($order_id, '_order_postmeta', $order);
 			}
@@ -268,45 +268,45 @@ 
 	/** Renvoi une nouvelle r�f�rence unique pour une commande
 	* @return int
 	*/
-	public static function get_new_order_reference(){
+	public static function get_new_order_reference() {
 		$number_figures = get_option('wpshop_order_number_figures', false);
 		/* If the number doesn't exist, we create a default one */
-		if(!$number_figures){
+		if (!$number_figures) {
 			$number_figures = 5;
 			update_option('wpshop_order_number_figures', $number_figures);
 		}
 
 		$order_current_number = get_option('wpshop_order_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
+		if (!$order_current_number) { $order_current_number = 1; }
 		else { $order_current_number++; }
 		update_option('wpshop_order_current_number', $order_current_number);
 
-		$order_ref = (string)sprintf('%0'.$number_figures.'d', $order_current_number);
-		return WPSHOP_ORDER_REFERENCE_PREFIX.$order_ref;
+		$order_ref = (string)sprintf('%0' . $number_figures . 'd', $order_current_number);
+		return WPSHOP_ORDER_REFERENCE_PREFIX . $order_ref;
 	}
 
 	/** Renvoi une nouvelle r�f�rence unique pour un devis
 	* @return int
 	*/
-	public static function get_new_pre_order_reference($save = true){
+	public static function get_new_pre_order_reference($save = true) {
 		$number_figures = get_option('wpshop_order_number_figures', false);
 		/* If the number doesn't exist, we create a default one */
-		if(!$number_figures){
+		if (!$number_figures) {
 			$number_figures = 5;
 			update_option('wpshop_order_number_figures', $number_figures);
 		}
 
 		$order_current_number = get_option('wpshop_preorder_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
+		if (!$order_current_number) { $order_current_number = 1; }
 		else { $order_current_number++; }
-		if($save){
+		if ($save) {
 			update_option('wpshop_preorder_current_number', $order_current_number);
 		}
 
-		$order_ref = (string)sprintf('%0'.$number_figures.'d', $order_current_number);
-		return WPSHOP_PREORDER_REFERENCE_PREFIX.$order_ref;
+		$order_ref = (string)sprintf('%0' . $number_figures . 'd', $order_current_number);
+		return WPSHOP_PREORDER_REFERENCE_PREFIX . $order_ref;
 	}
 
 
@@ -321,24 +321,24 @@ 
 	 *
 	 *	@return void
 	 */
-	public static function set_order_customer_addresses($user_id, $order_id, $shipping_address_id='', $billing_address_id=''){
+	public static function set_order_customer_addresses($user_id, $order_id, $shipping_address_id = '', $billing_address_id = '') {
 		/**	Get order informations	*/
 		$billing_info['id'] = get_post_meta($billing_address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
-		$billing_info['address'] = get_post_meta($billing_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
-		$billing_info['address_id'] = ( !empty($_SESSION['billing_address']) ) ? intval( $_SESSION['billing_address'] ) : '';
-		if ( !empty($_SESSION['shipping_partner_id']) ) {
-			$partner_address_id = get_post_meta( $_SESSION['shipping_partner_id'], '_wpshop_attached_address', true);
+		$billing_info['address'] = get_post_meta($billing_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
+		$billing_info['address_id'] = (!empty($_SESSION['billing_address'])) ? intval($_SESSION['billing_address']) : '';
+		if (!empty($_SESSION['shipping_partner_id'])) {
+			$partner_address_id = get_post_meta($_SESSION['shipping_partner_id'], '_wpshop_attached_address', true);
 			if (!empty($partner_address_id)) {
-				foreach( $partner_address_id as $address_id ) {
+				foreach ($partner_address_id as $address_id) {
 					$shipping_info['id'] = get_post_meta($address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
-					$shipping_info['address'] = get_post_meta( $address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
+					$shipping_info['address'] = get_post_meta($address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
 				}
 			}
 		}
 		else {
 			$shipping_info['id'] = get_post_meta($shipping_address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
-			$shipping_info['address'] = get_post_meta($shipping_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
-			$shipping_info['address_id'] = ( !empty($_SESSION['shipping_address']) ) ? intval( $_SESSION['shipping_address'] ) : '';
+			$shipping_info['address'] = get_post_meta($shipping_address_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS . '_metadata', true);
+			$shipping_info['address_id'] = (!empty($_SESSION['shipping_address'])) ? intval($_SESSION['shipping_address']) : '';
 		}
 
 		$order_info = array('billing' => $billing_info, 'shipping' => $shipping_info);
@@ -351,7 +351,7 @@ 
 	/** Set the custom colums
 	 * @return array
 	*/
-	static function orders_edit_columns($columns){
+	static function orders_edit_columns($columns) {
 	  $columns = array(
 		'cb' => '<input type="checkbox" />',
 		'order_identifier' => __('Identifiers', 'wpshop'),
@@ -371,42 +371,42 @@ 
 	 * @return array
 	*/
 	public static function orders_custom_columns($column, $post_id) {
-		if ( get_post_type( $post_id ) == WPSHOP_NEWTYPE_IDENTIFIER_ORDER ) {
+		if (get_post_type($post_id) == WPSHOP_NEWTYPE_IDENTIFIER_ORDER) {
 			global $civility, $order_status;
 
 			$metadata = get_post_custom();
 
-			$order_postmeta = isset($metadata['_order_postmeta'][0])?unserialize($metadata['_order_postmeta'][0]):'';
-			$addresses = get_post_meta($post_id,'_order_info', true);
+			$order_postmeta = isset($metadata['_order_postmeta'][0]) ? unserialize($metadata['_order_postmeta'][0]) : '';
+			$addresses = get_post_meta($post_id, '_order_info', true);
 
-			switch($column){
+			switch ($column) {
 				case "order_identifier":
-					if( !empty( $order_postmeta['order_key'] ) ) {
+					if (!empty($order_postmeta['order_key'])) {
 						echo '<b>' . $order_postmeta['order_key'] . '</b><br>';
 					}
-					if( !empty( $order_postmeta['order_invoice_ref'] ) ) {
+					if (!empty($order_postmeta['order_invoice_ref'])) {
 						echo '<i>' . $order_postmeta['order_invoice_ref'] . '</i>';
-					} elseif( !empty($order_postmeta['order_temporary_key'] ) ) {
+					} elseif (!empty($order_postmeta['order_temporary_key'])) {
 						echo '<b>' . $order_postmeta['order_temporary_key'] . '</b>';
 					}
 				break;
 
 				case "order_status":
-					echo !empty($order_postmeta['order_status']) ? sprintf('<mark class="%s" id="order_status_'.$post_id.'">%s</mark>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop')) : __('Unknown Status', 'wpshop');
+					echo !empty($order_postmeta['order_status']) ? sprintf('<mark class="%s" id="order_status_' . $post_id . '">%s</mark>', sanitize_title(strtolower($order_postmeta['order_status'])), __($order_status[strtolower($order_postmeta['order_status'])], 'wpshop')) : __('Unknown Status', 'wpshop');
 				break;
 
 				case "order_billing":
-					if ( !empty($addresses['billing']) && !empty($addresses['billing']['address']) && is_array($addresses['billing']['address']) ) {
+					if (!empty($addresses['billing']) && !empty($addresses['billing']['address']) && is_array($addresses['billing']['address'])) {
 						$billing = $addresses['billing']['address'];
 					}
-					else if ( !empty($addresses['billing']) ) {
+					else if (!empty($addresses['billing'])) {
 						$billing = $addresses['billing'];
 					}
-					if ( !empty($billing) ) {
-						echo (!empty($billing['civility']) ? __(wpshop_attributes::get_attribute_type_select_option_info($billing['civility'], 'label', 'custom'), 'wpshop') : null).' <strong>'.(!empty($billing['address_first_name']) ? $billing['address_first_name'] : null).' '.(!empty($billing['address_last_name']) ? $billing['address_last_name'] : null).'</strong>';
-						echo empty($billing['company'])?'<br />':', <i>'.$billing['company'].'</i><br />';
-						echo (!empty($billing['address']) ? $billing['address'] : null).'<br />';
-						echo (!empty($billing['postcode']) ? $billing['postcode'] : null).' '.(!empty($billing['city']) ? $billing['city'] : null).', '.(!empty($billing['country']) ? $billing['country'] : null);
+					if (!empty($billing)) {
+						echo (!empty($billing['civility']) ? __(wpshop_attributes::get_attribute_type_select_option_info($billing['civility'], 'label', 'custom'), 'wpshop') : null) . ' <strong>' . (!empty($billing['address_first_name']) ? $billing['address_first_name'] : null) . ' ' . (!empty($billing['address_last_name']) ? $billing['address_last_name'] : null) . '</strong>';
+						echo empty($billing['company']) ? '<br />' : ', <i>' . $billing['company'] . '</i><br />';
+						echo (!empty($billing['address']) ? $billing['address'] : null) . '<br />';
+						echo (!empty($billing['postcode']) ? $billing['postcode'] : null) . ' ' . (!empty($billing['city']) ? $billing['city'] : null) . ', ' . (!empty($billing['country']) ? $billing['country'] : null);
 						echo (!empty($billing['phone']) ? '<br />' . $billing['phone'] : '');
 					}
 					else {
@@ -415,33 +415,33 @@ 
 				break;
 
 				case "order_shipping":
-					if ( !empty($addresses['shipping']) && !empty($addresses['shipping']['address']) && is_array($addresses['shipping']['address']) ) {
+					if (!empty($addresses['shipping']) && !empty($addresses['shipping']['address']) && is_array($addresses['shipping']['address'])) {
 						$shipping = $addresses['shipping']['address'];
 					}
-					else if ( !empty($addresses['shipping']) ) {
+					else if (!empty($addresses['shipping'])) {
 						$shipping = $addresses['shipping'];
 					}
-					if ( !empty($shipping) ) {
-						echo '<strong>'.(!empty($shipping['address_first_name']) ? $shipping['address_first_name'] : null).' '.(!empty($shipping['address_last_name']) ? $shipping['address_last_name'] : null).'</strong>';
-						echo empty($shipping['company'])?'<br />':', <i>'.$shipping['company'].'</i><br />';
-						echo (!empty($shipping['address']) ? $shipping['address'] : null).'<br />';
-						echo (!empty($shipping['postcode']) ? $shipping['postcode'] : null).' '.(!empty($shipping['city']) ? $shipping['city'] : null).', '.(!empty($shipping['country']) ? $shipping['country'] : null);
+					if (!empty($shipping)) {
+						echo '<strong>' . (!empty($shipping['address_first_name']) ? $shipping['address_first_name'] : null) . ' ' . (!empty($shipping['address_last_name']) ? $shipping['address_last_name'] : null) . '</strong>';
+						echo empty($shipping['company']) ? '<br />' : ', <i>' . $shipping['company'] . '</i><br />';
+						echo (!empty($shipping['address']) ? $shipping['address'] : null) . '<br />';
+						echo (!empty($shipping['postcode']) ? $shipping['postcode'] : null) . ' ' . (!empty($shipping['city']) ? $shipping['city'] : null) . ', ' . (!empty($shipping['country']) ? $shipping['country'] : null);
 					}
-					else{
+					else {
 						echo __('No information available for user shipping', 'wpshop');
 					}
 				break;
 
 				case "order_type":
-						echo '<a href="'.admin_url('post.php?post='.$post_id.'&action=edit').'">'.(!empty($order_postmeta['order_temporary_key']) ? __('Quotation','wpshop') :  __('Basic order','wpshop')).'</a>';
+						echo '<a href="' . admin_url('post.php?post=' . $post_id . '&action=edit') . '">' . (!empty($order_postmeta['order_temporary_key']) ? __('Quotation', 'wpshop') : __('Basic order', 'wpshop')) . '</a>';
 						$buttons = '<p class="row-actions">';
 						// Voir la commande
-						$buttons .= '<a class="button button-small" href="'.admin_url('post.php?post='.$post_id.'&action=edit').'">'.__('View', 'wpshop').'</a>';
+						$buttons .= '<a class="button button-small" href="' . admin_url('post.php?post=' . $post_id . '&action=edit') . '">' . __('View', 'wpshop') . '</a>';
 						// Marquer comme envoy�
 						if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'completed')) {
-							$buttons .= '<a data-id="' . $post_id . '" class="wps-bton-second-mini-rounded markAsShipped order_'.$post_id.' wps-bton-loader">'.__('Mark as shipped', 'wpshop').'</a> ';
+							$buttons .= '<a data-id="' . $post_id . '" class="wps-bton-second-mini-rounded markAsShipped order_' . $post_id . ' wps-bton-loader">' . __('Mark as shipped', 'wpshop') . '</a> ';
 						}
-						else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment' )) {
+						else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment')) {
 							//		$buttons .= '<a class="button markAsCompleted order_'.$post_id.' alignleft" >'.__('Payment received', 'wpshop').'</a>' . wpshop_payment::display_payment_receiver_interface($post_id) . ' ';
 						}
 						$buttons .= '</p>';
@@ -454,7 +454,7 @@ 
 
 				case "order_total":
 					$currency = !empty($order_postmeta['order_currency']) ? $order_postmeta['order_currency'] : get_option('wpshop_shop_default_currency');
-					echo isset( $order_postmeta['order_grand_total'] ) ? number_format( $order_postmeta['order_grand_total'], 2, '.', '' ).' '.  wpshop_tools::wpshop_get_sigle($currency) : 'NaN';
+					echo isset($order_postmeta['order_grand_total']) ? number_format($order_postmeta['order_grand_total'], 2, '.', '') . ' ' . wpshop_tools::wpshop_get_sigle($currency) : 'NaN';
 				break;
 
 				/*case "order_actions":
@@ -482,10 +482,10 @@ 
 	}
 
 	public static function list_table_filters() {
-		$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';
-		$entity_filter = !empty( $_GET['entity_filter'] ) ? sanitize_text_field( $_GET['entity_filter'] ) : '';
-		$entity_filter_btpf = !empty( $_GET['entity_filter_btpf'] ) ? sanitize_text_field( $_GET['entity_filter_btpf'] ) : '';
-		$entity_filter_btps = !empty( $_GET['entity_filter_btps'] ) ? sanitize_text_field( $_GET['entity_filter_btps'] ) : '';
+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+		$entity_filter = !empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : '';
+		$entity_filter_btpf = !empty($_GET['entity_filter_btpf']) ? sanitize_text_field($_GET['entity_filter_btpf']) : '';
+		$entity_filter_btps = !empty($_GET['entity_filter_btps']) ? sanitize_text_field($_GET['entity_filter_btps']) : '';
 
 		if (isset($post_type)) {
 			if (post_type_exists($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER)) {
@@ -497,23 +497,23 @@ 
 				echo wpshop_form::form_input_select('entity_filter', 'entity_filter', $filter_possibilities, $entity_filter, '', 'index');
 				$min = $entity_filter_btpf;
 				$max = $entity_filter_btps;
-				echo ' <label for="entity_filter_btpf">'.__('Between two prices', 'wpshop').'</label> ';
-				echo wpshop_form::form_input('entity_filter_btpf', 'entity_filter_btpf', $min, 'text', 'placeholder="'.__('Minimum price', 'wpshop').'"', null);
-				echo wpshop_form::form_input('entity_filter_btps', 'entity_filter_btps', $max, 'text', 'placeholder="'.__('Maximum price', 'wpshop').'"', null);
+				echo ' <label for="entity_filter_btpf">' . __('Between two prices', 'wpshop') . '</label> ';
+				echo wpshop_form::form_input('entity_filter_btpf', 'entity_filter_btpf', $min, 'text', 'placeholder="' . __('Minimum price', 'wpshop') . '"', null);
+				echo wpshop_form::form_input('entity_filter_btps', 'entity_filter_btps', $max, 'text', 'placeholder="' . __('Maximum price', 'wpshop') . '"', null);
 			}
 		}
 	}
 
 	public static function list_table_filter_parse_query($query) {
 		global $pagenow, $wpdb;
-		$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';
-		$entity_filter = !empty( $_GET['entity_filter'] ) ? sanitize_text_field( $_GET['entity_filter'] ) : '';
-		$entity_filter_btpf = !empty( $_GET['entity_filter_btpf'] ) ? sanitize_text_field( $_GET['entity_filter_btpf'] ) : '';
-		$entity_filter_btps = !empty( $_GET['entity_filter_btps'] ) ? sanitize_text_field( $_GET['entity_filter_btps'] ) : '';
+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+		$entity_filter = !empty($_GET['entity_filter']) ? sanitize_text_field($_GET['entity_filter']) : '';
+		$entity_filter_btpf = !empty($_GET['entity_filter_btpf']) ? sanitize_text_field($_GET['entity_filter_btpf']) : '';
+		$entity_filter_btps = !empty($_GET['entity_filter_btps']) ? sanitize_text_field($_GET['entity_filter_btps']) : '';
 
-		if ( is_admin() && ($pagenow == 'edit.php') && !empty( $post_type ) && ( $post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER ) && !empty( $entity_filter ) ) {
+		if (is_admin() && ($pagenow == 'edit.php') && !empty($post_type) && ($post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER) && !empty($entity_filter)) {
 			$check = null;
-			switch ( $entity_filter ) {
+			switch ($entity_filter) {
 				case 'all':
 					$sql_query = $wpdb->prepare(
 						"SELECT ID
@@ -577,27 +577,27 @@ 
 						break;
 			}
 
-			if ( !empty( $check ) ) {
-				if( !empty($no_btp) && $no_btp == 'yes' ) {
+			if (!empty($check)) {
+				if (!empty($no_btp) && $no_btp == 'yes') {
 					$min = 'minimum';
 					$max = 'maximum';
 				} else {
-					$min = ( !empty($_GET['entity_filter_btpf']) && is_numeric($_GET['entity_filter_btpf']) ) ? sanitize_text_field( $_GET['entity_filter_btpf'] ) : 'minimum';
-					$max = ( !empty($_GET['entity_filter_btps']) && is_numeric($_GET['entity_filter_btps']) ) ? sanitize_text_field( $_GET['entity_filter_btps'] ) : 'maximum';
+					$min = (!empty($_GET['entity_filter_btpf']) && is_numeric($_GET['entity_filter_btpf'])) ? sanitize_text_field($_GET['entity_filter_btpf']) : 'minimum';
+					$max = (!empty($_GET['entity_filter_btps']) && is_numeric($_GET['entity_filter_btps'])) ? sanitize_text_field($_GET['entity_filter_btps']) : 'maximum';
 				}
 				$results = $wpdb->get_results($sql_query);
 				$post_id_list = array();
 				$i = 0;
-				foreach($results as $item){
+				foreach ($results as $item) {
 					$meta_value = get_post_meta($item->ID, '_order_postmeta');
-					$price = ( !empty( $meta_value[0]['order_grand_total'] ) ) ? $meta_value[0]['order_grand_total'] : '';
-					if( $price >= $min || $min == 'minimum' ) {
-						if( $price <= $max || $max == 'maximum' ) {
+					$price = (!empty($meta_value[0]['order_grand_total'])) ? $meta_value[0]['order_grand_total'] : '';
+					if ($price >= $min || $min == 'minimum') {
+						if ($price <= $max || $max == 'maximum') {
 							$post_id_list[] = $item->ID;
 						}
 					}
 				}
-				if( empty($post_id_list) ) {
+				if (empty($post_id_list)) {
 					$post_id_list[] = 'no_result';
 				}
 				$query->query_vars[$check] = $post_id_list;
@@ -608,66 +608,66 @@ 
 
 
 
-	function latest_products_ordered ( $orders ) {
+	function latest_products_ordered($orders) {
 		global $wpdb;
 		$product_id = $output = '';
 		$products = array();
 		$display_option = get_option('wpshop_display_option');
-		if ( !empty($orders) && !empty($display_option) && !empty($display_option['latest_products_ordered']) ) {
-			foreach( $orders as $order ) {
-				$order_content = get_post_meta( $order->ID, '_order_postmeta', true );
-				if ( !empty($order_content) && !empty( $order_content['order_items']) ) {
+		if (!empty($orders) && !empty($display_option) && !empty($display_option['latest_products_ordered'])) {
+			foreach ($orders as $order) {
+				$order_content = get_post_meta($order->ID, '_order_postmeta', true);
+				if (!empty($order_content) && !empty($order_content['order_items'])) {
 
-					foreach( $order_content['order_items'] as $item ) {
-						if ( count( $products) >= $display_option['latest_products_ordered'] ) {
+					foreach ($order_content['order_items'] as $item) {
+						if (count($products) >= $display_option['latest_products_ordered']) {
 							continue;
 						}
 						$product_id = $item['item_id'];
-						if ( !empty( $item) && !empty($item['item_meta']) && !empty($item['item_meta']['variation_definition']) ) {
-							$parent_def = wpshop_products::get_parent_variation( $item['item_id'] );
-							if ( !empty( $parent_def ) ) {
+						if (!empty($item) && !empty($item['item_meta']) && !empty($item['item_meta']['variation_definition'])) {
+							$parent_def = wpshop_products::get_parent_variation($item['item_id']);
+							if (!empty($parent_def)) {
 								$parent_post = $parent_def['parent_post'];
 								$product_id = $parent_post->ID;
 							}
 						}
 
-						if ( !in_array($product_id, $products) ) {
+						if (!in_array($product_id, $products)) {
 							$products[] = $product_id;
 						}
 					}
 				}
 			}
-			if ( !empty($products) ) {
+			if (!empty($products)) {
 				$products_id = implode(",", $products);
-				$output = wpshop_display::display_template_element('latest_products_ordered', array('LATEST_PRODUCTS_ORDERED' => do_shortcode('[wpshop_products pid="' .$products_id. '"]')) );
+				$output = wpshop_display::display_template_element('latest_products_ordered', array('LATEST_PRODUCTS_ORDERED' => do_shortcode('[wpshop_products pid="' . $products_id . '"]')));
 			}
 		}
 		return $output;
 	}
 
-	function get_order_list_for_customer( $customer_id ) {
+	function get_order_list_for_customer($customer_id) {
 		global $wpdb;
 		$output = '';
 
-		if( !empty($customer_id) ) {
-			 $query = $wpdb->prepare( 'SELECT *
-							 		   FROM ' .$wpdb->posts. '
+		if (!empty($customer_id)) {
+			 $query = $wpdb->prepare('SELECT *
+							 		   FROM ' .$wpdb->posts . '
 							 		   WHERE post_author = %d
-							 		   AND post_type = %s', $customer_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-			 $orders = $wpdb->get_results( $query );
+							 		   AND post_type = %s', $customer_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+			 $orders = $wpdb->get_results($query);
 
-			 foreach( $orders as $order ) {
+			 foreach ($orders as $order) {
 
 			 }
 		}
 
 		return $output;
 	}
-	static function display_customer_pay_quotation( $state, $oid ) {
-		$btn = '<div class="wps-product-section"><a role="button" data-nonce="' . wp_create_nonce( 'wps_quotation_is_payable_by_customer' ) . '" class="wps-bton-' . ( ( $state ) ? 'third' : 'second' ) . '-mini-rounded quotation_is_payable_by_customer" href="#" >'.__('Customer can pay', 'wpshop').'</a>';
-		if( $state ) {
+	static function display_customer_pay_quotation($state, $oid) {
+		$btn = '<div class="wps-product-section"><a role="button" data-nonce="' . wp_create_nonce('wps_quotation_is_payable_by_customer') . '" class="wps-bton-' . (($state) ? 'third' : 'second') . '-mini-rounded quotation_is_payable_by_customer" href="#" >' . __('Customer can pay', 'wpshop') . '</a>';
+		if ($state) {
 			//$btn .= '<a target="_blank" href="' . admin_url( 'admin-ajax.php?action=wps_checkout_quotation&order_id=' . $oid . '&is_link=link' ) . '">' . __( 'Pay link', 'wpshop' ) . '</a>';
-			$btn .= '<input id="wps_direct_link_url" type="text" value="' . wpshop_checkout::wps_direct_payment_link_url( $oid ) . '"/><a class="wps-bton-second-mini-rounded" data-copy-target="#wps_direct_link_url" title="' . __( 'Copy', 'wpshop' ) . '"><span class="dashicons dashicons-editor-paste-text"></span></a><a data-nonce="' . wp_create_nonce( 'wps_send_direct_payment_link' ) . '" role="button" class="wps-bton-second-mini-rounded send_direct_payment_link" href="#" title="' . __( 'Send by mail', 'wpshop' ) . '"><span class="dashicons dashicons-email"></span></a><p>' . sprintf( __( 'Link is valid until %s', 'wpshop' ), mysql2date( get_option( 'date_format' ), date_format( date_create( date('Y-m') . ' + 2month - 1day' ), 'Y-m-d H:i:s' ), true ) ) . '</p>';
+			$btn .= '<input id="wps_direct_link_url" type="text" value="' . wpshop_checkout::wps_direct_payment_link_url($oid) . '"/><a class="wps-bton-second-mini-rounded" data-copy-target="#wps_direct_link_url" title="' . __('Copy', 'wpshop') . '"><span class="dashicons dashicons-editor-paste-text"></span></a><a data-nonce="' . wp_create_nonce('wps_send_direct_payment_link') . '" role="button" class="wps-bton-second-mini-rounded send_direct_payment_link" href="#" title="' . __('Send by mail', 'wpshop') . '"><span class="dashicons dashicons-email"></span></a><p>' . sprintf(__('Link is valid until %s', 'wpshop'), mysql2date(get_option('date_format'), date_format(date_create(date('Y-m') . ' + 2month - 1day'), 'Y-m-d H:i:s'), true)) . '</p>';
 		}
 		return $btn . '</div>';
 	}

Braces +14 added lines, -23 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Products management method file
  *
@@ -132,8 +134,7 @@ 
 		$order_main_info .= '<div class="wps-product-section">';
 		if(empty($order_postmeta['order_date']) || (empty($order_postmeta['order_key']) && empty($order_postmeta['order_temporary_key']) && empty($order_postmeta['order_invoice_ref']))){
 			$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Temporary quotation reference','wpshop').': </strong>'.self::get_new_pre_order_reference(false).'<br/>';
-		}
-		else{
+		} else{
 			if(!empty($order_postmeta['order_key'])){
 				$order_main_info .=  '<span class="dashicons dashicons-arrow-right"></span> <strong>'.__('Order reference','wpshop').' : </strong>'.$order_postmeta['order_key'].'<br/>';
 			}
@@ -149,8 +150,7 @@ 
 				$sub_tpl_component['ADMIN_ORDER_INVOICE_DOWNLOAD_LINK'] = admin_url( 'admin-post.php?action=wps_invoice&order_id=' . $order->ID );
 				$order_invoice_download = wpshop_display::display_template_element('wpshop_admin_order_payment_received_invoice_download_links', $sub_tpl_component, array(), 'admin');
 				$order_main_info .= '<span class="dashicons dashicons-arrow-right"></span> <strong>'. __('Invoice number','wpshop').': </strong>'.$order_postmeta['order_invoice_ref'].'<br/>' . $order_invoice_download . '';
-			}
-			else {
+			} else {
 				$order_main_info .= wpshop_display::display_template_element('wpshop_admin_order_generate_invoice_button', array(), array(), 'admin');
 			}
 		}
@@ -197,8 +197,7 @@ 
 			if ( empty($credit_meta) ) {
 				if( $order_postmeta['order_status'] == 'refunded') {
 					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container">' .__('Credit Slip number', 'wpshop'). ' : <strong>'. ( (!empty($order_postmeta) && !empty($order_postmeta['order_payment']) && !empty($order_postmeta['order_payment']['refunded_action']) && !empty($order_postmeta['order_payment']['refunded_action']['credit_slip_ref']) ) ? '<a href="' .admin_url( 'admin-post.php?action=wps_invoice&order_id=' .$order->ID. '&amp;invoice_ref=' .$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'&credit_slip=ok' ). '" target="_blank">'.$order_postmeta['order_payment']['refunded_action']['credit_slip_ref'].'</a>' : '') .'</strong></div>';
-				}
-				else {
+				} else {
 					$tpl_component['ADMIN_ORDER_ACTIONS_LIST'] .= '<div class="wps-product-section wps_markAsRefunded_container" ><button class="wps-bton-second-mini-rounded markAsRefunded order_' .$order->ID. '">' .__('Refund this order', 'wpshop'). '</button><input type="hidden" id="markasrefunded_order_hidden_indicator" name="markasrefunded_order_hidden_indicator" /></div>';
 				}
 			}
@@ -278,8 +277,7 @@ 
 
 		$order_current_number = get_option('wpshop_order_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
-		else { $order_current_number++; }
+		if(!$order_current_number) { $order_current_number = 1; } else { $order_current_number++; }
 		update_option('wpshop_order_current_number', $order_current_number);
 
 		$order_ref = (string)sprintf('%0'.$number_figures.'d', $order_current_number);
@@ -299,8 +297,7 @@ 
 
 		$order_current_number = get_option('wpshop_preorder_current_number', false);
 		/* If the counter doesn't exist, we initiate it */
-		if(!$order_current_number) { $order_current_number = 1; }
-		else { $order_current_number++; }
+		if(!$order_current_number) { $order_current_number = 1; } else { $order_current_number++; }
 		if($save){
 			update_option('wpshop_preorder_current_number', $order_current_number);
 		}
@@ -334,8 +331,7 @@ 
 					$shipping_info['address'] = get_post_meta( $address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
 				}
 			}
-		}
-		else {
+		} else {
 			$shipping_info['id'] = get_post_meta($shipping_address_id, WPSHOP_ADDRESS_ATTRIBUTE_SET_ID_META_KEY, true);
 			$shipping_info['address'] = get_post_meta($shipping_address_id, '_'.WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS.'_metadata', true);
 			$shipping_info['address_id'] = ( !empty($_SESSION['shipping_address']) ) ? intval( $_SESSION['shipping_address'] ) : '';
@@ -398,8 +394,7 @@ 
 				case "order_billing":
 					if ( !empty($addresses['billing']) && !empty($addresses['billing']['address']) && is_array($addresses['billing']['address']) ) {
 						$billing = $addresses['billing']['address'];
-					}
-					else if ( !empty($addresses['billing']) ) {
+					} else if ( !empty($addresses['billing']) ) {
 						$billing = $addresses['billing'];
 					}
 					if ( !empty($billing) ) {
@@ -408,8 +403,7 @@ 
 						echo (!empty($billing['address']) ? $billing['address'] : null).'<br />';
 						echo (!empty($billing['postcode']) ? $billing['postcode'] : null).' '.(!empty($billing['city']) ? $billing['city'] : null).', '.(!empty($billing['country']) ? $billing['country'] : null);
 						echo (!empty($billing['phone']) ? '<br />' . $billing['phone'] : '');
-					}
-					else {
+					} else {
 						echo __('No information available for user billing', 'wpshop');
 					}
 				break;
@@ -417,8 +411,7 @@ 
 				case "order_shipping":
 					if ( !empty($addresses['shipping']) && !empty($addresses['shipping']['address']) && is_array($addresses['shipping']['address']) ) {
 						$shipping = $addresses['shipping']['address'];
-					}
-					else if ( !empty($addresses['shipping']) ) {
+					} else if ( !empty($addresses['shipping']) ) {
 						$shipping = $addresses['shipping'];
 					}
 					if ( !empty($shipping) ) {
@@ -426,8 +419,7 @@ 
 						echo empty($shipping['company'])?'<br />':', <i>'.$shipping['company'].'</i><br />';
 						echo (!empty($shipping['address']) ? $shipping['address'] : null).'<br />';
 						echo (!empty($shipping['postcode']) ? $shipping['postcode'] : null).' '.(!empty($shipping['city']) ? $shipping['city'] : null).', '.(!empty($shipping['country']) ? $shipping['country'] : null);
-					}
-					else{
+					} else{
 						echo __('No information available for user shipping', 'wpshop');
 					}
 				break;
@@ -440,8 +432,7 @@ 
 						// Marquer comme envoy�
 						if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'completed')) {
 							$buttons .= '<a data-id="' . $post_id . '" class="wps-bton-second-mini-rounded markAsShipped order_'.$post_id.' wps-bton-loader">'.__('Mark as shipped', 'wpshop').'</a> ';
-						}
-						else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment' )) {
+						} else if (!empty($order_postmeta['order_status']) && ($order_postmeta['order_status'] == 'awaiting_payment' )) {
 							//		$buttons .= '<a class="button markAsCompleted order_'.$post_id.' alignleft" >'.__('Payment received', 'wpshop').'</a>' . wpshop_payment::display_payment_receiver_interface($post_id) . ' ';
 						}
 						$buttons .= '</p>';

includes/modules/wps_orders/controller/wps_orders_ctr.php

Spacing +160 added lines, -160 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined( 'ABSPATH' ) ) { exit;
+<?php if (!defined('ABSPATH')) { exit;
 }
 class wps_orders_ctr {
 
@@ -20,24 +20,24 @@ 
 
 		/** Template Load */
 		// add_filter( 'wpshop_custom_template', array( &$this, 'custom_template_load' ) );
-		add_shortcode( 'order_customer_informations', array( &$this, 'display_order_customer_informations' ) );
-		add_shortcode( 'wps_orders_in_customer_account', array( $this, 'display_orders_in_account' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'wps_orders_scripts' ) );
+		add_shortcode('order_customer_informations', array(&$this, 'display_order_customer_informations'));
+		add_shortcode('wps_orders_in_customer_account', array($this, 'display_orders_in_account'));
+		add_action('wp_enqueue_scripts', array($this, 'wps_orders_scripts'));
 		/**	Include the different javascript	*/
-		add_action( 'admin_init', array( &$this, 'admin_js' ) );
+		add_action('admin_init', array(&$this, 'admin_js'));
 
 		/** Ajax Actions */
 		// add_action( 'wp_ajax_wps_add_product_to_quotation', array( &$this, 'wps_add_product_to_quotation') );
 		// add_action( 'wap_ajax_wps_change_product_list', array( &$this, 'wps_change_product_list') );
 		// add_action( 'wap_ajax_wps_orders_load_variations_container', array( &$this, 'wps_orders_load_variations_container') );
 		// add_action( 'wap_ajax_wps_order_refresh_in_admin', array( &$this, 'wps_order_refresh_in_admin') );
-		add_action( 'wp_ajax_wps_orders_load_details', array( $this, 'wps_orders_load_details' ) );
+		add_action('wp_ajax_wps_orders_load_details', array($this, 'wps_orders_load_details'));
 		// Add a product sale historic in administration product panel
-		add_action( 'wp_ajax_wps_order_choose_customer', array( $this, 'wps_order_choose_customer' ) );
+		add_action('wp_ajax_wps_order_choose_customer', array($this, 'wps_order_choose_customer'));
 		/** For delete order */
-		add_action( 'wp_ajax_wps_delete_order', array( $this, 'wps_delete_order' ) );
+		add_action('wp_ajax_wps_delete_order', array($this, 'wps_delete_order'));
 		/** Invoice Page */
-		add_action( 'admin_post_wps_invoice', array( $this, 'wps_invoice_output' ) );
+		add_action('admin_post_wps_invoice', array($this, 'wps_invoice_output'));
 	}
 
 		/**
@@ -54,7 +54,7 @@ 
 		 */
 	function wps_orders_scripts() {
 
-		wp_enqueue_script( 'wps_orders_fronend', WPS_ORDERS_URL . WPS_ORDERS_DIR . '/assets/frontend/js/wps_orders.js' );
+		wp_enqueue_script('wps_orders_fronend', WPS_ORDERS_URL . WPS_ORDERS_DIR . '/assets/frontend/js/wps_orders.js');
 	}
 
 	function display_order_customer_informations() {
@@ -62,23 +62,23 @@ 
 		global $post_id;
 		global $wpdb;
 		$output = '';
-		if ( ! empty( $post_id ) ) {
-			$order_postmeta = get_post_meta( $post_id, '_order_postmeta', true );
-			$order_info = get_post_meta( $post_id, '_order_info', true );
+		if (!empty($post_id)) {
+			$order_postmeta = get_post_meta($post_id, '_order_postmeta', true);
+			$order_info = get_post_meta($post_id, '_order_info', true);
 			/** Check the order status */
-			if ( ! empty( $order_postmeta ) ) {
-				if ( ! empty( $order_postmeta['order_status'] )  && $order_postmeta['order_status'] != 'awaiting_payment' ) {
-					$output = wps_address::display_an_address( $order_info['billing']['address'] );
-					$output .= wps_address::display_an_address( $order_info['shipping']['address'] );
+			if (!empty($order_postmeta)) {
+				if (!empty($order_postmeta['order_status']) && $order_postmeta['order_status'] != 'awaiting_payment') {
+					$output = wps_address::display_an_address($order_info['billing']['address']);
+					$output .= wps_address::display_an_address($order_info['shipping']['address']);
 				} else {
-					$output = wps_address::display_an_address( $order_info['billing']['address'] );
+					$output = wps_address::display_an_address($order_info['billing']['address']);
 				}
 			}
 		} else {
 			/** Display  "Choose customer or create one" Interface */
 			$tpl_component = array();
 			$args = array(
-			'show_option_all' => __( 'Choose a customer', 'wpshop' ),
+			'show_option_all' => __('Choose a customer', 'wpshop'),
 			'orderby' => 'display_name',
 			'order' => 'ASC',
 			'include' => null, // string
@@ -92,10 +92,10 @@ 
 						'id' => null, // integer
 						'class' => 'chosen_select', // string
 						'blog_id' => $GLOBALS['blog_id'],
-			'who' => null,// string
+			'who' => null, // string
 			);
-			$tpl_component['CUSTOMERS_LIST'] = wp_dropdown_users( $args );
-			$output = wpshop_display::display_template_element( 'wps_orders_choose_customer_interface', $tpl_component, array(), 'admin' );
+			$tpl_component['CUSTOMERS_LIST'] = wp_dropdown_users($args);
+			$output = wpshop_display::display_template_element('wps_orders_choose_customer_interface', $tpl_component, array(), 'admin');
 		}
 		return $output;
 	}
@@ -106,16 +106,16 @@ 
 		 * @param integer $customer_id
 		 * @return string
 		 */
-	function display_orders_in_account( $customer_id = '' ) {
+	function display_orders_in_account($customer_id = '') {
 
 		$output = '';
-		$customer_id = ( ! empty( $customer_id ) ) ? $customer_id : get_current_user_id();
-		$from_admin = ( ! empty( $customer_id ) ) ? true : false;
+		$customer_id = (!empty($customer_id)) ? $customer_id : get_current_user_id();
+		$from_admin = (!empty($customer_id)) ? true : false;
 		$wps_orders_mdl = new wps_orders_mdl();
-		$orders = $wps_orders_mdl->get_customer_orders( $customer_id );
+		$orders = $wps_orders_mdl->get_customer_orders($customer_id);
 		// Display orders
 		ob_start();
-		require_once( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, 'frontend', 'orders_list_in_account' ) );
+		require_once(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, 'frontend', 'orders_list_in_account'));
 		$output = ob_get_contents();
 		ob_end_clean();
 		return $output;
@@ -128,102 +128,102 @@ 
 		 *
 		 *	@return array $item_list The item to add to order
 		 */
-	function add_product_to_order( $product ) {
+	function add_product_to_order($product) {
 
 		global $wpdb;
-		if ( ! empty( $product ) && empty( $product['price_ttc_before_discount'] ) && empty( $product['price_ht_before_discount'] ) ) {
-			$price_infos = wpshop_prices::check_product_price( $product, true );
-			$product['price_ht'] = ( ! empty( $price_infos['discount'] ) && ! empty( $price_infos['discount']['discount_exist'] ) && $price_infos['discount']['discount_exist']) ?  $price_infos['discount']['discount_et_price'] : $price_infos['et'];
-			$product['product_price'] = ( ! empty( $price_infos['discount'] ) && ! empty( $price_infos['discount']['discount_exist'] ) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_ati_price'] : $price_infos['ati'];
-			$product['tva'] = ( ! empty( $price_infos['discount'] ) && ! empty( $price_infos['discount']['discount_exist'] ) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_tva'] : $price_infos['tva'];
+		if (!empty($product) && empty($product['price_ttc_before_discount']) && empty($product['price_ht_before_discount'])) {
+			$price_infos = wpshop_prices::check_product_price($product, true);
+			$product['price_ht'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_et_price'] : $price_infos['et'];
+			$product['product_price'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_ati_price'] : $price_infos['ati'];
+			$product['tva'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_tva'] : $price_infos['tva'];
 		}
 
-		$price_piloting = get_option( 'wpshop_shop_price_piloting' );
-		if ( ! empty( $price_piloting ) && $price_piloting == 'HT' ) {
+		$price_piloting = get_option('wpshop_shop_price_piloting');
+		if (!empty($price_piloting) && $price_piloting == 'HT') {
 			$total_ht = $product['price_ht'] * $product['product_qty'];
-			$tva_total_amount = $total_ht * ( $product['tx_tva'] / 100 );
+			$tva_total_amount = $total_ht * ($product['tx_tva'] / 100);
 			$total_ttc = $total_ht + $tva_total_amount;
 		} else {
 			$total_ttc = $product['product_price'] * $product['product_qty'];
-			$total_ht  = $total_ttc / ( 1 + ( $product['tx_tva'] / 100 ) );
+			$total_ht  = $total_ttc / (1 + ($product['tx_tva'] / 100));
 			$tva_total_amount = $total_ttc - $total_ht;
 		}
 
-		$tva = ! empty( $product[ WPSHOP_PRODUCT_PRICE_TAX ] ) ? $product[ WPSHOP_PRODUCT_PRICE_TAX ] : null;
+		$tva = !empty($product[WPSHOP_PRODUCT_PRICE_TAX]) ? $product[WPSHOP_PRODUCT_PRICE_TAX] : null;
 		$item_discount_type = $item_discount_value = $item_discount_amount = 0;
-		$d_amount = ! empty( $product ) && ! empty( $product['discount_amount'] ) ? wpshop_tools::formate_number( $product['discount_amount'] ) : null;
-		$d_rate = ! empty( $product ) && ! empty( $product['discount_rate'] ) ? wpshop_tools::formate_number( $product['discount_rate'] ) : null;
-		$d_special = ! empty( $product ) && ! empty( $product['special_price'] ) ? wpshop_tools::formate_number( $product['special_price'] ) : null;
-		if ( ! empty( $d_amount ) ) {
+		$d_amount = !empty($product) && !empty($product['discount_amount']) ? wpshop_tools::formate_number($product['discount_amount']) : null;
+		$d_rate = !empty($product) && !empty($product['discount_rate']) ? wpshop_tools::formate_number($product['discount_rate']) : null;
+		$d_special = !empty($product) && !empty($product['special_price']) ? wpshop_tools::formate_number($product['special_price']) : null;
+		if (!empty($d_amount)) {
 			$item_discount_type = 'discount_amount';
 			$item_discount_amount = $product['discount_amount'];
 			$item_discount_value = $product['discount_amount'];
-		} elseif ( ! empty( $d_rate ) ) {
+		} elseif (!empty($d_rate)) {
 			$item_discount_type = 'discount_rate';
 			$item_discount_amount = $product['discount_rate'];
 			$item_discount_value = $product['discount_rate'];
-		} elseif ( ! empty( $d_special ) ) {
+		} elseif (!empty($d_special)) {
 			$item_discount_type = 'special_price';
 			$item_discount_amount = $product['special_price'];
 			$item_discount_value = $product['special_price'];
 		}
 
-		$item = array( 'item_id' => $product['product_id'], 'item_ref' => ! empty( $product['product_reference'] ) ? $product['product_reference'] : null, 'item_name' => ! empty( $product['product_name'] ) ? $product['product_name'] : 'wpshop_product_' . $product['product_id'], 'item_qty' => $product['product_qty'], 'item_pu_ht' => $product['price_ht'], 'item_pu_ttc' => $product['product_price'], 'item_ecotaxe_ht' => 0, 'item_ecotaxe_tva' => 19.6, 'item_ecotaxe_ttc' => 0, 'item_discount_type' => $item_discount_type, 'item_discount_value' => $item_discount_value, 'item_discount_amount' => $item_discount_amount, 'item_tva_rate' => $tva, 'item_tva_amount' => $product['tva'], 'item_total_ht' => $total_ht, 'item_tva_total_amount' => $tva_total_amount, 'item_total_ttc' => $total_ttc, 'item_meta' => ! empty( $product['item_meta'] ) ? $product['item_meta'] : array() );
-		$array_not_to_do = array( WPSHOP_PRODUCT_PRICE_HT, WPSHOP_PRODUCT_PRICE_TTC, WPSHOP_PRODUCT_PRICE_TAX_AMOUNT, 'product_qty', WPSHOP_PRODUCT_PRICE_TAX, 'product_id', 'product_reference', 'product_name', 'variations' );
-		if ( ! empty( $product['item_meta'] ) ) {
-			foreach ( $product['item_meta'] as $key => $value ) {
-				if ( ! isset( $item[ 'item_' . $key ] ) && ! in_array( $key, $array_not_to_do ) && ! empty( $product[ $key ] ) ) {
-					$item[ 'item_' . $key ] = $product[ $key ];
+		$item = array('item_id' => $product['product_id'], 'item_ref' => !empty($product['product_reference']) ? $product['product_reference'] : null, 'item_name' => !empty($product['product_name']) ? $product['product_name'] : 'wpshop_product_' . $product['product_id'], 'item_qty' => $product['product_qty'], 'item_pu_ht' => $product['price_ht'], 'item_pu_ttc' => $product['product_price'], 'item_ecotaxe_ht' => 0, 'item_ecotaxe_tva' => 19.6, 'item_ecotaxe_ttc' => 0, 'item_discount_type' => $item_discount_type, 'item_discount_value' => $item_discount_value, 'item_discount_amount' => $item_discount_amount, 'item_tva_rate' => $tva, 'item_tva_amount' => $product['tva'], 'item_total_ht' => $total_ht, 'item_tva_total_amount' => $tva_total_amount, 'item_total_ttc' => $total_ttc, 'item_meta' => !empty($product['item_meta']) ? $product['item_meta'] : array());
+		$array_not_to_do = array(WPSHOP_PRODUCT_PRICE_HT, WPSHOP_PRODUCT_PRICE_TTC, WPSHOP_PRODUCT_PRICE_TAX_AMOUNT, 'product_qty', WPSHOP_PRODUCT_PRICE_TAX, 'product_id', 'product_reference', 'product_name', 'variations');
+		if (!empty($product['item_meta'])) {
+			foreach ($product['item_meta'] as $key => $value) {
+				if (!isset($item['item_' . $key]) && !in_array($key, $array_not_to_do) && !empty($product[$key])) {
+					$item['item_' . $key] = $product[$key];
 				}
 			}
 		}
 
 		/** Check if it's a variation product */
-		if ( ! empty( $product ) && ! empty( $product['item_meta'] ) && ! empty( $product['item_meta']['variations'] ) ) {
-			foreach ( $product['item_meta']['variations'] as $k => $variation ) {
-				$product_variation_def = get_post_meta( $k, '_wpshop_variations_attribute_def', true );
-				if ( ! empty( $product_variation_def ) ) {
-					foreach ( $product_variation_def as $attribute_code => $variation_id ) {
-						$variation_attribute_def = wpshop_attributes::getElement( $attribute_code, '"valid"', 'code' );
-						if ( ! empty( $variation_attribute_def ) ) {
-							$item['item_meta']['variation_definition'][ $attribute_code ]['NAME'] = $variation_attribute_def->frontend_label;
-							if ( $variation_attribute_def->data_type_to_use == 'custom' ) {
-								$query = $wpdb->prepare( 'SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id=%d', $variation_id );
-								$variation_name = $wpdb->get_var( $query );
+		if (!empty($product) && !empty($product['item_meta']) && !empty($product['item_meta']['variations'])) {
+			foreach ($product['item_meta']['variations'] as $k => $variation) {
+				$product_variation_def = get_post_meta($k, '_wpshop_variations_attribute_def', true);
+				if (!empty($product_variation_def)) {
+					foreach ($product_variation_def as $attribute_code => $variation_id) {
+						$variation_attribute_def = wpshop_attributes::getElement($attribute_code, '"valid"', 'code');
+						if (!empty($variation_attribute_def)) {
+							$item['item_meta']['variation_definition'][$attribute_code]['NAME'] = $variation_attribute_def->frontend_label;
+							if ($variation_attribute_def->data_type_to_use == 'custom') {
+								$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id=%d', $variation_id);
+								$variation_name = $wpdb->get_var($query);
 							} else {
-								$variation_post = get_post( $variation_id );
+								$variation_post = get_post($variation_id);
 								$variation_name = $variation_post->post_title;
 							}
-							$item['item_meta']['variation_definition'][ $attribute_code ]['UNSTYLED_VALUE'] = $variation_name;
-							$item['item_meta']['variation_definition'][ $attribute_code ]['VALUE'] = $variation_name;
+							$item['item_meta']['variation_definition'][$attribute_code]['UNSTYLED_VALUE'] = $variation_name;
+							$item['item_meta']['variation_definition'][$attribute_code]['VALUE'] = $variation_name;
 						}
 					}
 				}
 			}
 		} else {
 				/** Check if it's product with one variation */
-				$product_variation_def = get_post_meta( $product['product_id'], '_wpshop_variations_attribute_def', true );
-			if ( ! empty( $product_variation_def ) ) {
-				foreach ( $product_variation_def as $attribute_code => $variation_id ) {
-					$variation_attribute_def = wpshop_attributes::getElement( $attribute_code, '"valid"', 'code' );
-					if ( ! empty( $variation_attribute_def ) ) {
-							$item['item_meta']['variation_definition'][ $attribute_code ]['NAME'] = $variation_attribute_def->frontend_label;
-						if ( $variation_attribute_def->data_type_to_use == 'custom' ) {
-								$query = $wpdb->prepare( 'SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id=%d', $variation_id );
-							$variation_name = $wpdb->get_var( $query );
+				$product_variation_def = get_post_meta($product['product_id'], '_wpshop_variations_attribute_def', true);
+			if (!empty($product_variation_def)) {
+				foreach ($product_variation_def as $attribute_code => $variation_id) {
+					$variation_attribute_def = wpshop_attributes::getElement($attribute_code, '"valid"', 'code');
+					if (!empty($variation_attribute_def)) {
+							$item['item_meta']['variation_definition'][$attribute_code]['NAME'] = $variation_attribute_def->frontend_label;
+						if ($variation_attribute_def->data_type_to_use == 'custom') {
+								$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id=%d', $variation_id);
+							$variation_name = $wpdb->get_var($query);
 						} else {
-							$variation_post = get_post( $variation_id );
+							$variation_post = get_post($variation_id);
 							$variation_name = $variation_post->post_title;
 						}
-						$item['item_meta']['variation_definition'][ $attribute_code ]['UNSTYLED_VALUE'] = $variation_name;
-						$item['item_meta']['variation_definition'][ $attribute_code ]['VALUE'] = $variation_name;
+						$item['item_meta']['variation_definition'][$attribute_code]['UNSTYLED_VALUE'] = $variation_name;
+						$item['item_meta']['variation_definition'][$attribute_code]['VALUE'] = $variation_name;
 					}
 				}
 			}
 		}
 
 		/**	On ajoute la possibilité d'étendre les données produits ajoutées dans le panier / Add possibility to extends product data saved into cart	*/
-		$item = apply_filters( 'wpshop-add-product-to-order', $item, $product );
+		$item = apply_filters('wpshop-add-product-to-order', $item, $product);
 		return $item;
 	}
 
@@ -232,40 +232,40 @@ 
 		 */
 	function wps_invoice_output() {
 
-		$order_id = ( ! empty( $_GET['order_id'] )) ? (int) $_GET['order_id'] : null;
-		$invoice_ref = ( ! empty( $_GET['invoice_ref'] )) ? sanitize_text_field( $_GET['invoice_ref'] ) : null;
-		$mode = ( ! empty( $_GET['mode'] )) ? sanitize_text_field( $_GET['mode'] ) : 'html';
-		$is_credit_slip = ( ! empty( $_GET['credit_slip'] )) ? sanitize_text_field( $_GET['credit_slip'] ) : null;
+		$order_id = (!empty($_GET['order_id'])) ? (int)$_GET['order_id'] : null;
+		$invoice_ref = (!empty($_GET['invoice_ref'])) ? sanitize_text_field($_GET['invoice_ref']) : null;
+		$mode = (!empty($_GET['mode'])) ? sanitize_text_field($_GET['mode']) : 'html';
+		$is_credit_slip = (!empty($_GET['credit_slip'])) ? sanitize_text_field($_GET['credit_slip']) : null;
 		$user_id = get_current_user_id();
-		if ( ! empty( $order_id ) && $user_id != 0 ) {
+		if (!empty($order_id) && $user_id != 0) {
 			/**	Order reading	*/
-			$order_postmeta = get_post_meta( $order_id, '_order_postmeta', true );
+			$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 			/**	Start invoice display	*/
-			if ( ! empty( $is_credit_slip ) ) {
-				$html_content = wpshop_modules_billing::generate_html_invoice( $order_id, $invoice_ref, 'credit_slip' );
+			if (!empty($is_credit_slip)) {
+				$html_content = wpshop_modules_billing::generate_html_invoice($order_id, $invoice_ref, 'credit_slip');
 			} else {
-				$html_content = wpshop_modules_billing::generate_html_invoice( $order_id, $invoice_ref );
+				$html_content = wpshop_modules_billing::generate_html_invoice($order_id, $invoice_ref);
 			}
 
-			if ( $mode == 'pdf' ) {
-				require_once( WPSHOP_LIBRAIRIES_DIR . 'HTML2PDF/html2pdf.class.php' );
+			if ($mode == 'pdf') {
+				require_once(WPSHOP_LIBRAIRIES_DIR . 'HTML2PDF/html2pdf.class.php');
 				try {
 					// $html_content = wpshop_display::display_template_element('invoice_print_page_content_css', array(), array(), 'common') . '<page>' . $html_content . '</page>';
-					$html_content = wpshop_display::display_template_element( 'invoice_page_content_css', array(), array(), 'common' ) . '<page>' . $html_content . '</page>';
-					$html2pdf = new HTML2PDF( 'P', 'A4', 'fr' );
-					$html2pdf->setDefaultFont( 'Arial' );
-					$html2pdf->writeHTML( $html_content );
-					$html2pdf->Output( 'order_' . $order_id . '.pdf', 'D' );
+					$html_content = wpshop_display::display_template_element('invoice_page_content_css', array(), array(), 'common') . '<page>' . $html_content . '</page>';
+					$html2pdf = new HTML2PDF('P', 'A4', 'fr');
+					$html2pdf->setDefaultFont('Arial');
+					$html2pdf->writeHTML($html_content);
+					$html2pdf->Output('order_' . $order_id . '.pdf', 'D');
 				} catch (HTML2PDF_exception $e) {
 					echo $e;
 					exit;
 				}
 			} else {
-				$order_invoice_ref = ( ! empty( $order_postmeta['order_invoice_ref'] ) ) ? $order_postmeta['order_invoice_ref'] : '';
-				$tpl_component['INVOICE_CSS'] = wpshop_display::display_template_element( 'invoice_page_content_css', array(), array(), 'common' );
+				$order_invoice_ref = (!empty($order_postmeta['order_invoice_ref'])) ? $order_postmeta['order_invoice_ref'] : '';
+				$tpl_component['INVOICE_CSS'] = wpshop_display::display_template_element('invoice_page_content_css', array(), array(), 'common');
 				$tpl_component['INVOICE_MAIN_PAGE'] = $html_content;
-				$tpl_component['INVOICE_TITLE_PAGE'] = sprintf( __( 'Invoice %1$s for order %3$s (#%2$s)', 'wpshop' ), $order_invoice_ref, $order_id, $order_postmeta['order_key'] );
-				echo wpshop_display::display_template_element( 'invoice_page', $tpl_component, array(), 'common' );
+				$tpl_component['INVOICE_TITLE_PAGE'] = sprintf(__('Invoice %1$s for order %3$s (#%2$s)', 'wpshop'), $order_invoice_ref, $order_id, $order_postmeta['order_key']);
+				echo wpshop_display::display_template_element('invoice_page', $tpl_component, array(), 'common');
 			}
 		}
 		die();
@@ -277,21 +277,21 @@ 
 		 */
 	function wps_orders_load_details() {
 
-		check_ajax_referer( 'wps_orders_load_details' );
-		$order_id = ( ! empty( $_POST['order_id'] ) ) ? wpshop_tools::varSanitizer( $_POST['order_id'] ) : '';
+		check_ajax_referer('wps_orders_load_details');
+		$order_id = (!empty($_POST['order_id'])) ? wpshop_tools::varSanitizer($_POST['order_id']) : '';
 		$user_id = get_current_user_id();
 		$status = false;
 		$result = '';
-		if ( ! empty( $order_id ) ) {
-			$order = get_post( $order_id );
-			$order_infos = get_post_meta( $order_id, '_order_postmeta', true );
-			$order_key = ( ! empty( $order_infos['order_key'] ) ) ? $order_infos['order_key'] : '-';
-			if ( ! empty( $order ) && ! empty( $user_id ) && $order->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER && $order->post_author == $user_id ) {
-				$result = do_shortcode( '[wps_cart cart_type="summary" oid="' . $order_id . '"]' );
+		if (!empty($order_id)) {
+			$order = get_post($order_id);
+			$order_infos = get_post_meta($order_id, '_order_postmeta', true);
+			$order_key = (!empty($order_infos['order_key'])) ? $order_infos['order_key'] : '-';
+			if (!empty($order) && !empty($user_id) && $order->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER && $order->post_author == $user_id) {
+				$result = do_shortcode('[wps_cart cart_type="summary" oid="' . $order_id . '"]');
 				$status = true;
 			}
 		}
-		echo json_encode( array( 'status' => $status, 'title' => sprintf( __( 'Order n° %s details', 'wpshop' ), $order_key ), 'content' => $result ) );
+		echo json_encode(array('status' => $status, 'title' => sprintf(__('Order n° %s details', 'wpshop'), $order_key), 'content' => $result));
 		wp_die();
 	}
 
@@ -300,60 +300,60 @@ 
 		 */
 	function wps_order_choose_customer() {
 
-		$_wpnonce = ! empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
-		if ( ! wp_verify_nonce( $_wpnonce, 'wps_order_choose_customer' ) ) {
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
+		if (!wp_verify_nonce($_wpnonce, 'wps_order_choose_customer')) {
 				wp_die();
 		}
 
 		$status = false;
 		$billing_data = $shipping_data = '';
-		$customer_id = ( ! empty( $_POST['customer_id'] ) ) ? intval( $_POST['customer_id'] ): null;
-		if ( ! empty( $customer_id ) ) {
+		$customer_id = (!empty($_POST['customer_id'])) ? intval($_POST['customer_id']) : null;
+		if (!empty($customer_id)) {
 			$wps_address = new wps_address();
-			$billing_option = get_option( 'wpshop_billing_address' );
-			$shipping_option = get_option( 'wpshop_shipping_address_choice' );
+			$billing_option = get_option('wpshop_billing_address');
+			$shipping_option = get_option('wpshop_shipping_address_choice');
 			$billing_option = $billing_option['choice'];
-			$customer_addresses_list = wps_address::get_addresses_list( $customer_id );
+			$customer_addresses_list = wps_address::get_addresses_list($customer_id);
 			$status = true;
-			$billing_data = '<div class="wps-alert-info">' . sprintf( __( 'No Billing address created, <a href="%s" title="' . __( 'Create a new billing address', 'wpshop' ) . '" class="thickbox">create one</a>', 'wpshop' ),admin_url( 'admin-ajax.php' ) . '?action=wps-add-an-address-in-admin&address_type=' . $billing_option . '&customer_id=' . $customer_id . '&height=600' ) . '</div>';
-			if ( ! empty( $shipping_option ) && ! empty( $shipping_option['activate'] ) ) {
+			$billing_data = '<div class="wps-alert-info">' . sprintf(__('No Billing address created, <a href="%s" title="' . __('Create a new billing address', 'wpshop') . '" class="thickbox">create one</a>', 'wpshop'), admin_url('admin-ajax.php') . '?action=wps-add-an-address-in-admin&address_type=' . $billing_option . '&customer_id=' . $customer_id . '&height=600') . '</div>';
+			if (!empty($shipping_option) && !empty($shipping_option['activate'])) {
 				$shipping_option = $shipping_option['choice'];
-				$shipping_data = '<div class="wps-alert-info">' . sprintf( __( 'No shipping address created, <a href="%s" title="' . __( 'Create a new shipping address', 'wpshop' ) . '" class="thickbox">create one</a>', 'wpshop' ),admin_url( 'admin-ajax.php' ) . '?action=wps-add-an-address-in-admin&address_type=' . $shipping_option . '&customer_id=' . $customer_id . '&height=600' ) . '</div>';
+				$shipping_data = '<div class="wps-alert-info">' . sprintf(__('No shipping address created, <a href="%s" title="' . __('Create a new shipping address', 'wpshop') . '" class="thickbox">create one</a>', 'wpshop'), admin_url('admin-ajax.php') . '?action=wps-add-an-address-in-admin&address_type=' . $shipping_option . '&customer_id=' . $customer_id . '&height=600') . '</div>';
 			}
 
-			if ( ! empty( $customer_addresses_list ) ) {
-				foreach ( $customer_addresses_list as $address_type => $customer_addresses ) {
-					if ( $billing_option == $address_type ) {
-						$billing_data = $wps_address->display_address_in_administration( $customer_addresses, $address_type );
+			if (!empty($customer_addresses_list)) {
+				foreach ($customer_addresses_list as $address_type => $customer_addresses) {
+					if ($billing_option == $address_type) {
+						$billing_data = $wps_address->display_address_in_administration($customer_addresses, $address_type);
 					} else {
-						$shipping_data = $wps_address->display_address_in_administration( $customer_addresses, $address_type );
+						$shipping_data = $wps_address->display_address_in_administration($customer_addresses, $address_type);
 					}
 				}
 			}
 		}
-		echo json_encode( array( 'status' => $status, 'billing_data' => $billing_data, 'shipping_data' => $shipping_data ) );
+		echo json_encode(array('status' => $status, 'billing_data' => $billing_data, 'shipping_data' => $shipping_data));
 		wp_die();
 	}
 
-	static function pay_quotation( $order_id ) {
+	static function pay_quotation($order_id) {
 
 		$status = true;
-		$order_id = (int) $order_id;
-		$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
-		$order_info = get_post_meta( $order_id, '_order_info', true );
-		$_SESSION['shipping_method'] = isset( $order_meta['order_payment']['shipping_method'] ) ? $order_meta['order_payment']['shipping_method'] : 'No Shipping method required';
-		if ( isset( $order_info['billing']['address_id'] ) ) {
+		$order_id = (int)$order_id;
+		$order_meta = get_post_meta($order_id, '_order_postmeta', true);
+		$order_info = get_post_meta($order_id, '_order_info', true);
+		$_SESSION['shipping_method'] = isset($order_meta['order_payment']['shipping_method']) ? $order_meta['order_payment']['shipping_method'] : 'No Shipping method required';
+		if (isset($order_info['billing']['address_id'])) {
 			$_SESSION['billing_address'] = $order_info['billing']['address_id'];
 			$_SESSION['cart'] = $order_meta;
 			$_SESSION['cart']['order_id'] = $order_id;
     		$_SESSION['cart']['cart_type'] = 'cart';
 			$_SESSION['cart']['order_shipping_cost_fixe'] = 'on';
-			$permalink = get_permalink( get_option( 'wpshop_cart_page_id' ) ) . '?order_step=5';
+			$permalink = get_permalink(get_option('wpshop_cart_page_id')) . '?order_step=5';
 		} else {
-			$status = self::add_order_to_session( $order_id );
-			$permalink = get_permalink( wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) ) );
+			$status = self::add_order_to_session($order_id);
+			$permalink = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id')));
 		}
-		return array( 'status' => $status, 'permalink' => $permalink );
+		return array('status' => $status, 'permalink' => $permalink);
 	}
 
 	/**
@@ -362,54 +362,54 @@ 
 	 * @method add_order_to_session
 	 * @param  int $order_id Id of order.
 	 */
-	public static function add_order_to_session( $order_id ) {
+	public static function add_order_to_session($order_id) {
 
-		$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
-		if ( $order_meta != false ) {
+		$order_meta = get_post_meta($order_id, '_order_postmeta', true);
+		if ($order_meta != false) {
 			$_SESSION['cart'] = array();
 			$_SESSION['cart']['order_amount_to_pay_now'] = $order_meta['order_amount_to_pay_now'];
 			$_SESSION['cart']['order_items'] = array();
-			if ( ! empty( $order_meta ) && ! empty( $order_meta['order_items'] ) ) {
+			if (!empty($order_meta) && !empty($order_meta['order_items'])) {
 				$wpshop_cart_type = 'cart';
-				foreach ( $order_meta['order_items'] as $item ) {
-					$_SESSION['cart']['order_items'][ $item['item_id'] ] = $item;
+				foreach ($order_meta['order_items'] as $item) {
+					$_SESSION['cart']['order_items'][$item['item_id']] = $item;
 				}
 				$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);
 			}
 			$_SESSION['order_id'] = $order_id;
 		}
-		return (bool) ($order_meta != false);
+		return (bool)($order_meta != false);
 	}
 	/**
 	 * AJAX - Delete order by order_id
 	 */
 	public function wps_delete_order() {
 
-		$_wpnonce = ! empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
-		if ( ! wp_verify_nonce( $_wpnonce, 'wps_delete_order' ) ) {
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
+		if (!wp_verify_nonce($_wpnonce, 'wps_delete_order')) {
 				wp_die();
 		}
 
 		$status = false;
 		$output = '';
-		$order_id = ! empty( $_POST['order_id'] ) ? (int) $_POST['order_id'] : 0;
-		if ( $order_id ) {
-			$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
+		$order_id = !empty($_POST['order_id']) ? (int)$_POST['order_id'] : 0;
+		if ($order_id) {
+			$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 			$wps_credit = new wps_credit();
-			$wps_credit->create_an_credit( $order_id );
+			$wps_credit->create_an_credit($order_id);
 			$order_meta['order_status'] = 'canceled';
-			$order_meta['order_payment']['refunded_action']['refunded_date'] = current_time( 'mysql', 0 );
+			$order_meta['order_payment']['refunded_action']['refunded_date'] = current_time('mysql', 0);
 			$order_meta['order_payment']['refunded_action']['author'] = get_current_user_id();
-			update_post_meta( $order_id, '_order_postmeta', $order_meta );
+			update_post_meta($order_id, '_order_postmeta', $order_meta);
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, 'frontend', 'order_row_in_account' ) );
+			require(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, 'frontend', 'order_row_in_account'));
 			$output = ob_get_contents();
 			ob_end_clean();
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status, 'row' => $output ) );
+		echo json_encode(array('status' => $status, 'row' => $output));
 		wp_die();
 	}
 
@@ -420,13 +420,13 @@ 
 	 * @param  int $order_id OrderID.
 	 * @return mixed sha1 or false.
 	 */
-	public static function wps_token_order_customer( $order_id, $date = null ) {
-		$date = isset( $date ) ? $date : date( 'Ym' );
-		$order_metadata = get_post_meta( $order_id, '_order_postmeta', true );
-		if ( ! isset( $order_metadata['customer_id'] ) ) {
+	public static function wps_token_order_customer($order_id, $date = null) {
+		$date = isset($date) ? $date : date('Ym');
+		$order_metadata = get_post_meta($order_id, '_order_postmeta', true);
+		if (!isset($order_metadata['customer_id'])) {
 			return false;
 		}
-		return sha1( site_url() . '_' . $order_id . '_' . $order_metadata['customer_id'] . '_' . $date );
+		return sha1(site_url() . '_' . $order_id . '_' . $order_metadata['customer_id'] . '_' . $date);
 	}
 
 	/**
@@ -437,9 +437,9 @@ 
 	 * @param	int    $order_id	OrderID.
 	 * @return	boolean
 	 */
-	public static function wps_verify_token_order( $token, $order_id ) {
-		$current_month = self::wps_token_order_customer( $order_id );
-		$last_month = self::wps_token_order_customer( $order_id, date_format( date_create( date( 'Y-m' ) . ' - 1month' ), 'Ym' ) );
-		return (bool) ( (bool) $current_month && (bool) $last_month && ( $token === $current_month || $token === $last_month ) );
+	public static function wps_verify_token_order($token, $order_id) {
+		$current_month = self::wps_token_order_customer($order_id);
+		$last_month = self::wps_token_order_customer($order_id, date_format(date_create(date('Y-m') . ' - 1month'), 'Ym'));
+		return (bool)((bool)$current_month && (bool)$last_month && ($token === $current_month || $token === $last_month));
 	}
 }

wpshop.php

Spacing +30 added lines, -30 removed lines

@@ -20,18 +20,18 @@ 
 ini_set('memory_limit', '512M');
 
 /**	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'ABSPATH' ) ) {
-	die( 'Access is not allowed by this way' );
+if (!defined('ABSPATH')) {
+	die('Access is not allowed by this way');
 }
 
 /**	Allows to refresh css and js file in final user browser	*/
 DEFINE('WPSHOP_VERSION', '1.4.3.1');
 
 /**	Allows to avoid problem with theme not supporting thumbnail for post	*/
-add_theme_support( 'post-thumbnails' );
-add_image_size( 'wpshop-product-galery', 270, 270, true );
-add_image_size( 'wps-categorie-mini-display', 80, 80, true );
-add_image_size( 'wps-categorie-display', 480, 340, true );
+add_theme_support('post-thumbnails');
+add_image_size('wpshop-product-galery', 270, 270, true);
+add_image_size('wps-categorie-mini-display', 80, 80, true);
+add_image_size('wps-categorie-display', 480, 340, true);
 
 /**	First thing we define the main directory for our plugin in a super global var	*/
 DEFINE('WPSHOP_PLUGIN_DIR', basename(dirname(__FILE__)));
@@ -39,26 +39,26 @@ 
 /**	Get the current language to translate the different text in plugin	*/
 $locale = get_locale();
 global $wpdb;
-if ( defined("ICL_LANGUAGE_CODE") ) {
+if (defined("ICL_LANGUAGE_CODE")) {
 	$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", ICL_LANGUAGE_CODE);
 	$local = $wpdb->get_var($query);
 	$locale = !empty($local) ? $local : $locale;
 }
 DEFINE('WPSHOP_CURRENT_LOCALE', $locale);
 /**	Load plugin translation	*/
-load_plugin_textdomain( 'wpshop', false,  dirname( plugin_basename( __FILE__ ) ) . '/languages/');
+load_plugin_textdomain('wpshop', false, dirname(plugin_basename(__FILE__)) . '/languages/');
 
 /**	Include the config file	*/
 require(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/includes/config.php');
 
 /** Allow to get errors back when debug mode is set to true	*/
-if ( WPSHOP_DEBUG_MODE && (in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP)) ) ) {
+if (WPSHOP_DEBUG_MODE && (in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP)))) {
 	ini_set('display_errors', true);
 	error_reporting(E_ALL);
 }
 
 include_once(WPSHOP_LIBRAIRIES_DIR . 'init.class.php');
-$current_installation_step = get_option( 'wps-installation-current-step', 1 );
+$current_installation_step = get_option('wps-installation-current-step', 1);
 
 /**	Get current plugin version	*/
 $current_db_version = get_option('wpshop_db_options', 0);
@@ -76,32 +76,32 @@ 
 
 /**	Call function to create the main left menu	*/
 //if ( ( WPSINSTALLER_STEPS_COUNT <= $current_installation_step ) || ( !empty( $current_db_version ) && !empty( $current_db_version[ 'db_version' ] ) && ( 51 < $current_db_version[ 'db_version' ] ) ) || ( !empty( $_GET ) && !empty( $_GET[ 'installation_state' ] ) && ( "ignored" == $_GET[ 'installation_state' ] ) ) ) {
-	add_action('admin_menu', array( 'wpshop_init', 'admin_menu' ) );
-	add_action( 'menu_order', array( 'wpshop_init', 'admin_menu_order' ) );
-	add_action( 'custom_menu_order', array( 'wpshop_init', 'admin_custom_menu_order' ) );
+	add_action('admin_menu', array('wpshop_init', 'admin_menu'));
+	add_action('menu_order', array('wpshop_init', 'admin_menu_order'));
+	add_action('custom_menu_order', array('wpshop_init', 'admin_custom_menu_order'));
 
 	/*	Call function for new wordpress element creating [term (product_category) / post (product)]	*/
-	add_action( 'init', array( 'wpshop_init', 'add_new_wp_type' ) );
+	add_action('init', array('wpshop_init', 'add_new_wp_type'));
 
 	/*	Call function allowing to change element front output	*/
-	add_action( 'the_content', array( 'wpshop_display', 'products_page' ), 1 );
+	add_action('the_content', array('wpshop_display', 'products_page'), 1);
 	// add_action('archive_template', array('wpshop_categories', 'category_template_switcher'));
 //}
 
 /**	On plugin activation create the default parameters to use the ecommerce	*/
-register_activation_hook( __FILE__ , array('wpshop_install', 'install_on_activation') );
+register_activation_hook(__FILE__, array('wpshop_install', 'install_on_activation'));
 
 /**	On plugin deactivation call the function to clean the wordpress installation	*/
-register_deactivation_hook( __FILE__ , array('wpshop_install', 'uninstall_wpshop') );
+register_deactivation_hook(__FILE__, array('wpshop_install', 'uninstall_wpshop'));
 
 /**	Get current plugin version	*/
 $current_db_version = get_option('wpshop_db_options', 0);
 
 /**	Add the database content	*/
 add_action('admin_init', array('wpshop_install', 'update_wpshop'));
-if ( ( defined( 'WPSINSTALLER_STEPS_COUNT' ) && ( WPSINSTALLER_STEPS_COUNT <= $current_installation_step ) ) || ( !empty( $current_db_version ) && !empty( $current_db_version[ 'db_version' ] ) && ( 51 < $current_db_version[ 'db_version' ] ) ) || ( !empty( $current_db_version ) && !empty( $current_db_version[ 'installation_state' ] ) && ( "ignore" == $current_db_version[ 'installation_state' ] ) ) ) {
-	if ( in_array( long2ip( ip2long($_SERVER['REMOTE_ADDR'] ) ), unserialize( WPSHOP_DEBUG_MODE_ALLOWED_IP ) ) ) {
-		add_action( 'admin_init', array( 'wpshop_install', 'update_wpshop_dev' ) );
+if ((defined('WPSINSTALLER_STEPS_COUNT') && (WPSINSTALLER_STEPS_COUNT <= $current_installation_step)) || (!empty($current_db_version) && !empty($current_db_version['db_version']) && (51 < $current_db_version['db_version'])) || (!empty($current_db_version) && !empty($current_db_version['installation_state']) && ("ignore" == $current_db_version['installation_state']))) {
+	if (in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP))) {
+		add_action('admin_init', array('wpshop_install', 'update_wpshop_dev'));
 	}
 }
 // Start session
@@ -138,24 +138,24 @@ 
 /** Add specific messages for wpshop elements management	*/
 // add_filter('post_updated_messages', array('wpshop_messages', 'update_wp_message_list'));
 
-$file   = basename( __FILE__ );
-$folder = basename( dirname( __FILE__ ) );
+$file   = basename(__FILE__);
+$folder = basename(dirname(__FILE__));
 $hook = "in_plugin_update_message-{$folder}/{$file}";
-add_action( $hook, 'wps_update_message', 10, 2 ); // 10:priority, 2:arguments #
-function wps_update_message( $currentPluginMetadata, $newPluginMetadata){
+add_action($hook, 'wps_update_message', 10, 2); // 10:priority, 2:arguments #
+function wps_update_message($currentPluginMetadata, $newPluginMetadata) {
 	$message = '';
 
-	if ( '1.4.1.6' == $currentPluginMetadata[ 'Version' ] ) {
-		$message = sprintf( __( 'For security reason %splease read this post%s', 'wpshop' ), '<a href="" >', '</a>');
+	if ('1.4.1.6' == $currentPluginMetadata['Version']) {
+		$message = sprintf(__('For security reason %splease read this post%s', 'wpshop'), '<a href="" >', '</a>');
 	}
 
 	// check "upgrade_notice"
-  if (isset( $newPluginMetadata->upgrade_notice) && strlen(trim($newPluginMetadata->upgrade_notice)) > 0 ) {
-  	$message = esc_html( $newPluginMetadata->upgrade_notice );
+  if (isset($newPluginMetadata->upgrade_notice) && strlen(trim($newPluginMetadata->upgrade_notice)) > 0) {
+  	$message = esc_html($newPluginMetadata->upgrade_notice);
 	}
 
-	if ( !empty( $message ) ) {
-  	echo '<p style="background-color: #d54e21; padding: 10px; color: #f9f9f9; margin-top: 10px"><strong>' . __( 'Important upgrade notice', 'wpshop' ) . ': </strong>' . $message . '</p>';
+	if (!empty($message)) {
+  	echo '<p style="background-color: #d54e21; padding: 10px; color: #f9f9f9; margin-top: 10px"><strong>' . __('Important upgrade notice', 'wpshop') . ': </strong>' . $message . '</p>';
 	}
 }