Eoxia / wpshop

includes/modules/wps_orders/model/wps_back_office_orders_mdl.php

Spacing +13 added lines, -13 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_back_office_orders_mdl {
 	function __construct() {
 
@@ -12,25 +12,25 @@ 
 		$order_meta = get_post_meta($oid, '_order_postmeta', true);
 
 		// Send email is checked
-		if( !empty($send_email) ) {
+		if (!empty($send_email)) {
 			// New object wps_message_ctr
 			$wps_message = new wps_message_ctr();
 
 			// Get order current content
 			$user = get_post_meta($oid, '_order_info', true);
 			
-			$email = isset($user['billing']['address']['address_user_email']) ? $user['billing']['address']['address_user_email'] :'';
+			$email = isset($user['billing']['address']['address_user_email']) ? $user['billing']['address']['address_user_email'] : '';
 			
 			/** Si pas d'email trouvé, utilises l'adresse email par défault du client */
-			if(empty($email)) {
-				$customer_id = get_post_meta( $oid, '_wpshop_order_customer_id', true );
+			if (empty($email)) {
+				$customer_id = get_post_meta($oid, '_wpshop_order_customer_id', true);
 				$user_info = get_userdata($customer_id);
 				$email = $user_info->user_email;
 			}
-			$first_name = isset($user['billing']['address']['address_first_name'])?$user['billing']['address']['address_first_name']:'';
-			$last_name = isset($user['billing']['address']['address_last_name'])?$user['billing']['address']['address_last_name']:'';
+			$first_name = isset($user['billing']['address']['address_first_name']) ? $user['billing']['address']['address_first_name'] : '';
+			$last_name = isset($user['billing']['address']['address_last_name']) ? $user['billing']['address']['address_last_name'] : '';
 
-			$object = array('object_type'=>'order','object_id'=>$oid);
+			$object = array('object_type'=>'order', 'object_id'=>$oid);
 			/* Envoie du message de confirmation de commande au client	*/
 			$wps_message->wpshop_prepared_email(
 					$email,
@@ -39,13 +39,13 @@ 
 					$object
 			);
 			// Copy to Administrator
-			if ( !empty($copy_to_administrator) ) {
-				$email = get_option( 'wpshop_emails' );
+			if (!empty($copy_to_administrator)) {
+				$email = get_option('wpshop_emails');
 				$email = $email['contact_email'];
 				$wps_message->wpshop_prepared_email(
 						$email,
 						'WPSHOP_ORDER_UPDATE_PRIVATE_MESSAGE',
-						array( 'order_id' => $oid, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_key' => $order_meta['order_key'], 'message' => $comment, 'order_addresses' => '', 'order_billing_address' => '', 'order_shipping_address' => ''),
+						array('order_id' => $oid, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_key' => $order_meta['order_key'], 'message' => $comment, 'order_addresses' => '', 'order_billing_address' => '', 'order_shipping_address' => ''),
 						$object
 				);
 			}
@@ -53,14 +53,14 @@ 
 
 		// Private comment informations
 		$order_private_comments[] = array(
-				'comment_date' => current_time('mysql',0),
+				'comment_date' => current_time('mysql', 0),
 				'send_email' => $send_email,
 				'send_sms' => $send_sms,
 				'comment' => $comment,
 				'author' => get_current_user_id()
 		);
 		// Save it
-		if(is_array($order_private_comments)) {
+		if (is_array($order_private_comments)) {
 			update_post_meta($oid, '_order_private_comments', $order_private_comments);
 			return true;
 		}

Braces +5 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_back_office_orders_mdl {
 	function __construct() {
 
@@ -63,7 +65,8 @@ 
 		if(is_array($order_private_comments)) {
 			update_post_meta($oid, '_order_private_comments', $order_private_comments);
 			return true;
+		} else {
+			return false;
 		}
-		else return false;
 	}
 }
\ No newline at end of file

includes/modules/wps_orders/model/wps_orders_mdl.php

Spacing +5 added lines, -5 removed lines

@@ -1,14 +1,14 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
-class wps_orders_mdl{
+<?php if (!defined('ABSPATH')) exit;
+class wps_orders_mdl {
 
 	function __construct() {
 
 	}
 
-	function get_customer_orders( $customer_id ) {
+	function get_customer_orders($customer_id) {
 		global $wpdb;
-		$query = $wpdb->prepare( 'SELECT * FROM '.$wpdb->posts. ' WHERE post_author = %d AND post_type = %s AND post_status != %s AND post_status != %s ORDER BY ID DESC', $customer_id, WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'auto-draft', 'trash' );
-		$orders = $wpdb->get_results( $query );
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s AND post_status != %s AND post_status != %s ORDER BY ID DESC', $customer_id, WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'auto-draft', 'trash');
+		$orders = $wpdb->get_results($query);
 
 		return $orders;
 	}

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/modules/wps_export/wps_export.php

Spacing +7 added lines, -7 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /**
  * Bootstrap file
@@ -6,13 +6,13 @@ 
  * @version 1.0
  */
 
-DEFINE('WPS_EXPORT_DIR', basename(dirname(__FILE__)) );
-DEFINE('WPS_EXPORT_PATH', str_replace( "\\", "/", str_replace( WPS_EXPORT_DIR, "", dirname( __FILE__ ) ) ) );
-DEFINE('WPS_EXPORT_URL', str_replace( str_replace( "\\", "/", ABSPATH), site_url() . '/', WPS_EXPORT_PATH ) );
+DEFINE('WPS_EXPORT_DIR', basename(dirname(__FILE__)));
+DEFINE('WPS_EXPORT_PATH', str_replace("\\", "/", str_replace(WPS_EXPORT_DIR, "", dirname(__FILE__))));
+DEFINE('WPS_EXPORT_URL', str_replace(str_replace("\\", "/", ABSPATH), site_url() . '/', WPS_EXPORT_PATH));
 
-load_plugin_textdomain( 'wps_export', false, dirname(plugin_basename( __FILE__ )).'/languages/' );
+load_plugin_textdomain('wps_export', false, dirname(plugin_basename(__FILE__)) . '/languages/');
 
-include( plugin_dir_path( __FILE__ ).'/controller/wps_export_ctr.php' );
-include( plugin_dir_path( __FILE__ ).'/model/wps_export_mdl.php' );
+include(plugin_dir_path(__FILE__) . '/controller/wps_export_ctr.php');
+include(plugin_dir_path(__FILE__) . '/model/wps_export_mdl.php');
 
 $wps_export = new wps_export_ctr();

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/modules/wps_export/model/wps_export_mdl.php

Spacing +68 added lines, -68 removed lines

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

Braces +9 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_export_mdl {
 
 	/**
@@ -56,10 +58,12 @@ 
 				$tmp_array = array();
 				$last_name = get_user_meta( $user->ID, 'last_name', true );
 				$first_name = get_user_meta( $user->ID, 'first_name', true );
-				if( empty($last_name) )
-					$last_name = $user->display_name;
-				if( empty($first_name) )
-					$first_name = '-';
+				if( empty($last_name) ) {
+									$last_name = $user->display_name;
+				}
+				if( empty($first_name) ) {
+									$first_name = '-';
+				}
 				$tmp_array['name'] = $last_name;
 				$tmp_array['first_name'] = $first_name;
 				$tmp_array['email'] = $user->user_email;

Doc Comments +1 added lines, -1 removed lines

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

includes/modules/wps_marketing_tools/wps_marketing_tools.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /**
  * @author ALLEGRE Jérôme - Eoxia dev team <dev@eoxia.com>
@@ -9,12 +9,12 @@ 
 
 /** Template Global vars **/
 DEFINE('WPS_MARKETING_TOOLS_DIR', basename(dirname(__FILE__)));
-DEFINE('WPS_MARKETING_TOOLS_PATH', str_replace( "\\", "/", str_replace( WPS_MARKETING_TOOLS_DIR, "", dirname( __FILE__ ) ) ) );
-DEFINE('WPS_MARKETING_TOOLS_URL', str_replace( str_replace( "\\", "/", ABSPATH), site_url() . '/', WPS_MARKETING_TOOLS_PATH ) );
+DEFINE('WPS_MARKETING_TOOLS_PATH', str_replace("\\", "/", str_replace(WPS_MARKETING_TOOLS_DIR, "", dirname(__FILE__))));
+DEFINE('WPS_MARKETING_TOOLS_URL', str_replace(str_replace("\\", "/", ABSPATH), site_url() . '/', WPS_MARKETING_TOOLS_PATH));
 
 
 
-include( plugin_dir_path( __FILE__ ).'/controller/wps_marketing_tools_ctr.php' );
+include(plugin_dir_path(__FILE__) . '/controller/wps_marketing_tools_ctr.php');
 // include( plugin_dir_path( __FILE__ ).'/model/wps_message_mdl.php' );
 
 $wps_marketing_tools = new wps_marketing_tools_ctr();

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/modules/wps_marketing_tools/controller/wps_marketing_tools_ctr.php

Spacing +54 added lines, -54 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_marketing_tools_ctr {
 	/** Define the main directory containing the template for the current plugin
 	 * @var string
@@ -14,25 +14,25 @@ 
 		// Template loading...
 		$this->template_dir = WPS_MARKETING_TOOLS_PATH . WPS_MARKETING_TOOLS_DIR . "/templates/";
 
-		add_action('wsphop_options', array( $this, 'declare_options'), 8);
-		add_action('wpshop_free_shipping_cost_alert', array( $this, 'display_free_shipping_cost_alert'));
-		add_shortcode('display_save_money_message', array( $this, 'display_save_money_message'));
+		add_action('wsphop_options', array($this, 'declare_options'), 8);
+		add_action('wpshop_free_shipping_cost_alert', array($this, 'display_free_shipping_cost_alert'));
+		add_shortcode('display_save_money_message', array($this, 'display_save_money_message'));
 
-		add_shortcode( 'wps_low_stock_alert', array($this, 'display_alert_stock_message' ) );
+		add_shortcode('wps_low_stock_alert', array($this, 'display_alert_stock_message'));
 	}
 
 	/**
 	 * OPTIONS - Declare options
 	 */
-	function declare_options () {
-		if ( WPSHOP_DEFINED_SHOP_TYPE == 'sale' ) {
-			$wpshop_shop_type = !empty( $_POST['wpshop_shop_type'] ) ? sanitize_text_field( $_POST['wpshop_shop_type'] ) : '';
-			$old_wpshop_shop_type = !empty( $_POST['old_wpshop_shop_type'] ) ? sanitize_text_field( $_POST['old_wpshop_shop_type'] ) : '';
+	function declare_options() {
+		if (WPSHOP_DEFINED_SHOP_TYPE == 'sale') {
+			$wpshop_shop_type = !empty($_POST['wpshop_shop_type']) ? sanitize_text_field($_POST['wpshop_shop_type']) : '';
+			$old_wpshop_shop_type = !empty($_POST['old_wpshop_shop_type']) ? sanitize_text_field($_POST['old_wpshop_shop_type']) : '';
 
-			if ( ( $wpshop_shop_type == '' || $wpshop_shop_type != 'presentation' )
-				&& ( $old_wpshop_shop_type == '' && $old_wpshop_shop_type != 'presentation' ) ) {
+			if (($wpshop_shop_type == '' || $wpshop_shop_type != 'presentation')
+				&& ($old_wpshop_shop_type == '' && $old_wpshop_shop_type != 'presentation')) {
 					register_setting('wpshop_options', 'wpshop_cart_option', array($this, 'wpshop_options_validate_free_shipping_cost_alert'));
-					add_settings_field('wpshop_free_shipping_cost_alert', __('Display a free shipping cost alert in the cart', 'wpshop'), array( $this, 'wpshop_free_shipping_cost_alert_field'), 'wpshop_cart_info', 'wpshop_cart_info');
+					add_settings_field('wpshop_free_shipping_cost_alert', __('Display a free shipping cost alert in the cart', 'wpshop'), array($this, 'wpshop_free_shipping_cost_alert_field'), 'wpshop_cart_info', 'wpshop_cart_info');
 					// Low stock alert option
 					register_setting('wpshop_options', 'wpshop_low_stock_alert_options', array($this, 'wpshop_low_stock_alert_validator'));
 					add_settings_field('wpshop_display_low_stock', __('Display Low stock Alert message', 'wpshop'), array($this, 'wpshop_display_low_stock_alert_interface'), 'wpshop_display_option', 'wpshop_display_options_sections');
@@ -44,7 +44,7 @@ 
 	/**
 	 * OPTIONS - Display Free Shipping alert option field
 	 */
-	function wpshop_free_shipping_cost_alert_field () {
+	function wpshop_free_shipping_cost_alert_field() {
 		$cart_option = get_option('wpshop_cart_option');
 		$input_def = array();
 		$input_def['name'] = '';
@@ -53,7 +53,7 @@ 
 		$input_def['valueToPut'] = 'index';
 		$input_def['value'] = !empty($cart_option['free_shipping_cost_alert']) ? $cart_option['free_shipping_cost_alert'][0] : '';
 		$input_def['possible_value'] = 'yes';
-		$output = wpshop_form::check_input_type($input_def, 'wpshop_cart_option[free_shipping_cost_alert]') . '<a href="#" title="'.__('Check this box if you want to display an free shipping cost in the mini-cart','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		$output = wpshop_form::check_input_type($input_def, 'wpshop_cart_option[free_shipping_cost_alert]') . '<a href="#" title="' . __('Check this box if you want to display an free shipping cost in the mini-cart', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 
 		echo $output;
 	}
@@ -63,7 +63,7 @@ 
 	 * @param unknown_type $input
 	 * @return unknown
 	 */
-	function wpshop_options_validate_free_shipping_cost_alert ($input) {
+	function wpshop_options_validate_free_shipping_cost_alert($input) {
 		return $input;
 	}
 
@@ -72,7 +72,7 @@ 
 	 * @param string $input
 	 * @return string
 	 */
-	function wpshop_low_stock_alert_validator ($input) {
+	function wpshop_low_stock_alert_validator($input) {
 		return $input;
 	}
 
@@ -81,48 +81,48 @@ 
 	 */
 	function wpshop_display_low_stock_alert_interface() {
 		$low_stock_option = get_option('wpshop_low_stock_alert_options');
-		$activate_low_stock_alert = ( (!empty($low_stock_option) && !empty($low_stock_option['active']) && $low_stock_option['active'] == 'on') ? 'checked="checked"' : null);
-		$based_on_stock = ( !empty($low_stock_option) && !empty($low_stock_option['based_on_stock']) && $low_stock_option['based_on_stock'] == 'yes') ? 'checked="checked"' : null;
-		$not_based_on_stock = ( !empty($low_stock_option) && !empty($low_stock_option['based_on_stock']) && $low_stock_option['based_on_stock'] == 'no') ? 'checked="checked"' : null;
-		$alert_limit = ( !empty($low_stock_option) && !empty($low_stock_option['alert_limit']) ) ? $low_stock_option['alert_limit'] : '';
+		$activate_low_stock_alert = ((!empty($low_stock_option) && !empty($low_stock_option['active']) && $low_stock_option['active'] == 'on') ? 'checked="checked"' : null);
+		$based_on_stock = (!empty($low_stock_option) && !empty($low_stock_option['based_on_stock']) && $low_stock_option['based_on_stock'] == 'yes') ? 'checked="checked"' : null;
+		$not_based_on_stock = (!empty($low_stock_option) && !empty($low_stock_option['based_on_stock']) && $low_stock_option['based_on_stock'] == 'no') ? 'checked="checked"' : null;
+		$alert_limit = (!empty($low_stock_option) && !empty($low_stock_option['alert_limit'])) ? $low_stock_option['alert_limit'] : '';
 
-		require( wpshop_tools::get_template_part( WPS_MARKETING_TOOLS_DIR, $this->template_dir, "backend", "wps_low_stock_alert_configuration_interface") );
+		require(wpshop_tools::get_template_part(WPS_MARKETING_TOOLS_DIR, $this->template_dir, "backend", "wps_low_stock_alert_configuration_interface"));
 	}
 
 	/**
 	 * Display a free Shipping cost alert in cart and shop
 	 */
-	function display_free_shipping_cost_alert () {
+	function display_free_shipping_cost_alert() {
 		global $wpdb;
 
 		$output = '';
-		$cart = ( !empty($_SESSION['cart']) && is_array($_SESSION['cart']) ) ? $_SESSION['cart'] : null;
+		$cart = (!empty($_SESSION['cart']) && is_array($_SESSION['cart'])) ? $_SESSION['cart'] : null;
 		$cart_option = get_option('wpshop_cart_option');
 		$price_piloting_option = get_option('wpshop_shop_price_piloting');
 
 		// Get a shipping mode, in order : selected, else default, else first, else shipping_rules.
-		$shipping_modes = get_option( 'wps_shipping_mode' );
-		if( !empty($shipping_modes) && !empty($shipping_modes['modes']) ) {
-			if( !empty($shipping_modes['default_choice']) && !empty( $shipping_modes['modes'][$shipping_modes['default_choice']] ) ) {
+		$shipping_modes = get_option('wps_shipping_mode');
+		if (!empty($shipping_modes) && !empty($shipping_modes['modes'])) {
+			if (!empty($shipping_modes['default_choice']) && !empty($shipping_modes['modes'][$shipping_modes['default_choice']])) {
 				$shipping_rules_option = $shipping_modes['modes'][$shipping_modes['default_choice']];
-			} elseif( !empty($shipping_modes['modes']['default_shipping_mode']) ) {
+			} elseif (!empty($shipping_modes['modes']['default_shipping_mode'])) {
 				$shipping_rules_option = $shipping_modes['modes']['default_shipping_mode'];
 			} else {
-				$shipping_rules_option = reset( $shipping_modes['modes'] );
+				$shipping_rules_option = reset($shipping_modes['modes']);
 			}
 		} else {
-			$shipping_rules_option = get_option( 'wpshop_shipping_rules' );
+			$shipping_rules_option = get_option('wpshop_shipping_rules');
 		}
 
-		if ( !empty($shipping_rules_option) && !empty($shipping_rules_option['free_from']) && $shipping_rules_option['free_from'] > 0 )
+		if (!empty($shipping_rules_option) && !empty($shipping_rules_option['free_from']) && $shipping_rules_option['free_from'] > 0)
 			$free_shipping_cost_limit = $shipping_rules_option['free_from'];
-		if ( !empty($cart_option) && !empty($cart_option['free_shipping_cost_alert']) ) {
-			if ( !empty($cart['order_items']) && !empty($cart['order_grand_total'])) {
-				$order_amount = ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? number_format((float)$cart['order_total_ht'], 2, '.', '') : number_format((float)$cart['order_total_ttc'], 2, '.', '');
-				if ( $order_amount  < $free_shipping_cost_limit ) {
+		if (!empty($cart_option) && !empty($cart_option['free_shipping_cost_alert'])) {
+			if (!empty($cart['order_items']) && !empty($cart['order_grand_total'])) {
+				$order_amount = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? number_format((float)$cart['order_total_ht'], 2, '.', '') : number_format((float)$cart['order_total_ttc'], 2, '.', '');
+				if ($order_amount < $free_shipping_cost_limit) {
 					$free_in = number_format((float)($free_shipping_cost_limit - $order_amount), 2, '.', '');
 					$currency = wpshop_tools::wpshop_get_currency();
-					$output = sprintf(__('Free shipping cost in %s', 'wpshop'), $free_in. ' ' . $currency);
+					$output = sprintf(__('Free shipping cost in %s', 'wpshop'), $free_in . ' ' . $currency);
 				}
 				else {
 					$output = __('Free shipping cost', 'wpshop');
@@ -137,14 +137,14 @@ 
 	 * @param string $price_infos
 	 * @return string
 	 */
-	function display_message_you_save_money ( $price_infos ) {
+	function display_message_you_save_money($price_infos) {
 		$output = '';
-		if ( !empty($price_infos) ) {
-			if ( !empty($price_infos) && !empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) ) {
+		if (!empty($price_infos)) {
+			if (!empty($price_infos) && !empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist'])) {
 				$tax_piloting_option = get_option('wpshop_shop_price_piloting');
-				$save_amount = ( !empty($tax_piloting_option) && $tax_piloting_option == 'HT') ? ( $price_infos['et'] - $price_infos['discount']['discount_et_price'] ) : ( $price_infos['ati'] - $price_infos['discount']['discount_ati_price'] );
+				$save_amount = (!empty($tax_piloting_option) && $tax_piloting_option == 'HT') ? ($price_infos['et'] - $price_infos['discount']['discount_et_price']) : ($price_infos['ati'] - $price_infos['discount']['discount_ati_price']);
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_MARKETING_TOOLS_DIR, $this->template_dir, "frontend", "wps_marketing_save_money_message") );
+				require(wpshop_tools::get_template_part(WPS_MARKETING_TOOLS_DIR, $this->template_dir, "frontend", "wps_marketing_save_money_message"));
 				$message .= ob_get_contents();
 				ob_end_clean();
 			}
@@ -157,16 +157,16 @@ 
 	 * @param integer $order_id
 	 * @return string
 	 */
-	function display_ecommerce_ga_tracker( $order_id ) {
+	function display_ecommerce_ga_tracker($order_id) {
 		global $wpdb;
 		$tracker = '';
-		if( !empty($order_id) ) {
+		if (!empty($order_id)) {
 			$ga_account_id = get_option('wpshop_ga_account_id');
-			$order_meta = get_post_meta( $order_id, '_order_postmeta', true);
-			$order_info = get_post_meta( $order_id, '_order_info', true);
-			if( !empty($ga_account_id) && !empty($order_meta) && !empty($order_info) ) {
+			$order_meta = get_post_meta($order_id, '_order_postmeta', true);
+			$order_info = get_post_meta($order_id, '_order_info', true);
+			if (!empty($ga_account_id) && !empty($order_meta) && !empty($order_info)) {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_MARKETING_TOOLS_DIR, $this->template_dir, "backend", "wps_ga_order_tracker") );
+				require(wpshop_tools::get_template_part(WPS_MARKETING_TOOLS_DIR, $this->template_dir, "backend", "wps_ga_order_tracker"));
 				$message .= ob_get_contents();
 				ob_end_clean();
 			}
@@ -179,20 +179,20 @@ 
 	 * @param string $args
 	 * @return string
 	 */
-	function display_alert_stock_message( $args ) {
+	function display_alert_stock_message($args) {
 		$message = '';
-		$post_ID = ( !empty($args) && !empty($args['id']) ) ? $args['id'] : '';
-		$low_stock_alert_option  = get_option('wpshop_low_stock_alert_options');
+		$post_ID = (!empty($args) && !empty($args['id'])) ? $args['id'] : '';
+		$low_stock_alert_option = get_option('wpshop_low_stock_alert_options');
 
-		if ( !empty( $low_stock_alert_option  ) && !empty($low_stock_alert_option['active']) && !empty($post_ID) ) {
-			$product = wpshop_products::get_product_data( $post_ID );
+		if (!empty($low_stock_alert_option) && !empty($low_stock_alert_option['active']) && !empty($post_ID)) {
+			$product = wpshop_products::get_product_data($post_ID);
 
 			$product_stock = $product['product_stock'];
-			$manage_product_stock = (!empty($product['manage_stock']) && ( strtolower(__($product['manage_stock'], 'wpshop')) == strtolower(__('Yes', 'wpshop')) )) ? true : false;
+			$manage_product_stock = (!empty($product['manage_stock']) && (strtolower(__($product['manage_stock'], 'wpshop')) == strtolower(__('Yes', 'wpshop')))) ? true : false;
 
-			if ( ( $product_stock > 0 ) && ( empty( $low_stock_alert_option['based_on_stock'] ) || ( ('no' == $low_stock_alert_option['based_on_stock'] ) || ( ( 'yes' == $low_stock_alert_option['based_on_stock'] ) && ( $low_stock_alert_option[ 'alert_limit' ] >= $product_stock ) ) ) ) ) {
+			if (($product_stock > 0) && (empty($low_stock_alert_option['based_on_stock']) || (('no' == $low_stock_alert_option['based_on_stock']) || (('yes' == $low_stock_alert_option['based_on_stock']) && ($low_stock_alert_option['alert_limit'] >= $product_stock))))) {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_MARKETING_TOOLS_DIR, $this->template_dir, "frontend", "wps_low_stock_alert_message") );
+				require(wpshop_tools::get_template_part(WPS_MARKETING_TOOLS_DIR, $this->template_dir, "frontend", "wps_low_stock_alert_message"));
 				$message .= ob_get_contents();
 				ob_end_clean();
 			}

Braces +7 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_marketing_tools_ctr {
 	/** Define the main directory containing the template for the current plugin
 	 * @var string
@@ -114,8 +116,9 @@ 
 			$shipping_rules_option = get_option( 'wpshop_shipping_rules' );
 		}
 
-		if ( !empty($shipping_rules_option) && !empty($shipping_rules_option['free_from']) && $shipping_rules_option['free_from'] > 0 )
-			$free_shipping_cost_limit = $shipping_rules_option['free_from'];
+		if ( !empty($shipping_rules_option) && !empty($shipping_rules_option['free_from']) && $shipping_rules_option['free_from'] > 0 ) {
+					$free_shipping_cost_limit = $shipping_rules_option['free_from'];
+		}
 		if ( !empty($cart_option) && !empty($cart_option['free_shipping_cost_alert']) ) {
 			if ( !empty($cart['order_items']) && !empty($cart['order_grand_total'])) {
 				$order_amount = ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? number_format((float)$cart['order_total_ht'], 2, '.', '') : number_format((float)$cart['order_total_ttc'], 2, '.', '');
@@ -123,8 +126,7 @@ 
 					$free_in = number_format((float)($free_shipping_cost_limit - $order_amount), 2, '.', '');
 					$currency = wpshop_tools::wpshop_get_currency();
 					$output = sprintf(__('Free shipping cost in %s', 'wpshop'), $free_in. ' ' . $currency);
-				}
-				else {
+				} else {
 					$output = __('Free shipping cost', 'wpshop');
 				}
 			}

includes/modules/wps_marketing_tools/templates/frontend/wps_marketing_save_money_message.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <span class="wpshop_save_money_message wps-label-vert">
-	<?php _e('Saving', 'wpshop'); ?> <?php echo number_format($save_amount,2); ?> <?php echo wpshop_tools::wpshop_get_currency(); ?>
+	<?php _e('Saving', 'wpshop'); ?> <?php echo number_format($save_amount, 2); ?> <?php echo wpshop_tools::wpshop_get_currency(); ?>
 </span>

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/modules/wps_marketing_tools/templates/frontend/wps_low_stock_alert_message.php

Spacing +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 $extradata = '';
-if ( !empty($low_stock_alert_option['based_on_stock']) && $low_stock_alert_option['based_on_stock'] == 'yes' && !empty( $low_stock_alert_option['alert_limit']) ) : ?>
-	<?php if ( $product_stock <= $low_stock_alert_option['alert_limit'] ) : 
-		$extradata = ', '. sprintf( __('%s products in stock', 'wpshop'), number_format( $product_stock, 0 ) );
+if (!empty($low_stock_alert_option['based_on_stock']) && $low_stock_alert_option['based_on_stock'] == 'yes' && !empty($low_stock_alert_option['alert_limit'])) : ?>
+	<?php if ($product_stock <= $low_stock_alert_option['alert_limit']) : 
+		$extradata = ', ' . sprintf(__('%s products in stock', 'wpshop'), number_format($product_stock, 0));
 	 endif; ?>
 <?php endif; ?>
 <div class="wps-product-section">

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/modules/wps_marketing_tools/templates/backend/wps_ga_order_tracker.php

Spacing +20 added lines, -20 removed lines

@@ -1,34 +1,34 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- $company_infos = get_option( 'wpshop_company_info' ); ?>
+<?php if (!defined('ABSPATH')) exit;
+ $company_infos = get_option('wpshop_company_info'); ?>
 <script type="text/javascript">
 	var _gaq = _gaq || [];
 	_gaq.push( ['_setAccount', '<?php echo $ga_account_id; ?>'] );
 	_gaq.push( ['_trackPageview'] );
 	_gaq.push(['_addTrans',
 	       	'<?php echo $order_id; ?>',
-	       	'<?php echo ( !empty($company_infos) && !empty($company_infos['company_name']) ? $company_infos['company_name'] : ''  ) ; ?>',
+	       	'<?php echo (!empty($company_infos) && !empty($company_infos['company_name']) ? $company_infos['company_name'] : ''); ?>',
 	       	'<?php echo number_format($order_meta['order_grand_total'], 2, '.', ''); ?>', '<?php echo number_format($total_tva, 2, '.', ''); ?>',
-	       	'<?php echo ( ( !empty($order_meta['order_shipping_cost']) ) ? $order_meta['order_shipping_cost'] : 0); ?>',
-	       	'<?php echo ( ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['city']) ) ? $order_info['billing']['address']['city'] : ''); ?>',
-	       	'<?php echo ( ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['state']) ) ? $order_info['billing']['address']['state'] : ''); ?>',
-	       	'<?php echo ( ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['country']) ) ? $order_info['billing']['address']['country'] : ''); ?>']);
+	       	'<?php echo ((!empty($order_meta['order_shipping_cost'])) ? $order_meta['order_shipping_cost'] : 0); ?>',
+	       	'<?php echo ((!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['city'])) ? $order_info['billing']['address']['city'] : ''); ?>',
+	       	'<?php echo ((!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['state'])) ? $order_info['billing']['address']['state'] : ''); ?>',
+	       	'<?php echo ((!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['country'])) ? $order_info['billing']['address']['country'] : ''); ?>']);
 
-	<?php if ( !empty( $order_meta['order_items'] ) && is_array( $order_meta['order_items'] ) ) : ?>
-		<?php foreach( $order_meta['order_items'] as $item ) :
+	<?php if (!empty($order_meta['order_items']) && is_array($order_meta['order_items'])) : ?>
+		<?php foreach ($order_meta['order_items'] as $item) :
 				 /** Variation **/
 				$variation = '';
-				$variation_definition = get_post_meta( $item['item_id'], '_wpshop_variations_attribute_def', true);
-				if ( !empty($variation_definition) && is_array($variation_definition) ) :
-					foreach( $variation_definition as $k => $value ) :
-						$attribute_def = wpshop_attributes::getElement( $k, '"valid"', 'code' );
-						if ( !empty($attribute_def) ) :
-							$variation .= $attribute_def->frontend_label.' : ';
-							if ( $attribute_def->data_type_to_use == 'custom' ) :
-								$query = $wpdb->prepare( 'SELECT label FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d', $value );
-								$variation .= $wpdb->get_var( $query );
+				$variation_definition = get_post_meta($item['item_id'], '_wpshop_variations_attribute_def', true);
+				if (!empty($variation_definition) && is_array($variation_definition)) :
+					foreach ($variation_definition as $k => $value) :
+						$attribute_def = wpshop_attributes::getElement($k, '"valid"', 'code');
+						if (!empty($attribute_def)) :
+							$variation .= $attribute_def->frontend_label . ' : ';
+							if ($attribute_def->data_type_to_use == 'custom') :
+								$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $value);
+								$variation .= $wpdb->get_var($query);
 
 							else :
-								$variation .= get_the_title( $value );
+								$variation .= get_the_title($value);
 							endif;
 						endif;
 					endforeach;
@@ -37,7 +37,7 @@ 
 		?>
 		_gaq.push(['_addItem',
 		   		'<?php echo  $order_id; ?>',
-		   		'<?php echo ( (!empty($item_meta) && !empty($item_meta['barcode']) ) ? $item_meta['barcode'] : ''); ?>',
+		   		'<?php echo ((!empty($item_meta) && !empty($item_meta['barcode'])) ? $item_meta['barcode'] : ''); ?>',
 		   		'<?php echo $item['item_name']; ?>',
 		   		'<?php echo $variation; ?>',
 		   		'<?php echo $item['item_pu_ttc']; ?>',

Braces +6 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  $company_infos = get_option( 'wpshop_company_info' ); ?>
 <script type="text/javascript">
 	var _gaq = _gaq || [];
@@ -27,8 +29,10 @@ 
 								$query = $wpdb->prepare( 'SELECT label FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d', $value );
 								$variation .= $wpdb->get_var( $query );
 
-							else :
+							else {
+								:
 								$variation .= get_the_title( $value );
+							}
 							endif;
 						endif;
 					endforeach;