Eoxia / wpshop

includes/modules/wps_statistics/templates/backend/wps_statistics_best_customers.php

Spacing +13 added lines, -13 removed lines

@@ -1,14 +1,14 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if ( !empty($customer_recap) ) : ?>
-<?php arsort( $customer_recap ); ?>
+<?php if (!defined('ABSPATH')) exit;
+ if (!empty($customer_recap)) : ?>
+<?php arsort($customer_recap); ?>
 <canvas id="wps_best_customers" width="" height=""></canvas>
 <script type="text/javascript">
 	jQuery( document ).ready( function() {
 		var pieData = [
 						<?php 
 						$i = 0;
-						foreach( $customer_recap as $customer_id => $customer ): ?>
-						<?php if( $i < 8 ) : ?>
+						foreach ($customer_recap as $customer_id => $customer): ?>
+						<?php if ($i < 8) : ?>
 						{value:<?php echo round($customer, 2); ?>, color:"<?php echo $colors[$i]; ?>"},	
 						<?php endif; ?>
 						<?php endforeach; ?>
@@ -19,19 +19,19 @@ 
 <ul class="wps_statistics_legend">
 <?php 
 	$i = 0;
-	foreach( $customer_recap as $customer_id => $customer ):
-		if( $i < 8 ) :
-			$user_data = get_userdata( $customer_id );
-			$customer_name = ( !empty($user_data) && !empty($user_data->last_name) ) ? strtoupper( $user_data->last_name) : '';
-			$customer_name .= ( !empty($user_data) && !empty($user_data->first_name) ) ? ' '.$user_data->first_name : '';
-			$customer_email = ( !empty($user_data) && !empty($user_data->user_email) ) ? ' - '.$user_data->user_email : '';
+	foreach ($customer_recap as $customer_id => $customer):
+		if ($i < 8) :
+			$user_data = get_userdata($customer_id);
+			$customer_name = (!empty($user_data) && !empty($user_data->last_name)) ? strtoupper($user_data->last_name) : '';
+			$customer_name .= (!empty($user_data) && !empty($user_data->first_name)) ? ' ' . $user_data->first_name : '';
+			$customer_email = (!empty($user_data) && !empty($user_data->user_email)) ? ' - ' . $user_data->user_email : '';
 		?>
-			<li><div style="background : <?php echo $colors[$i]; ?>;" class="legend_indicator"></div><?php echo $customer_name.' '.$customer_email.' (' .number_format($customer, 2, '.', '').' '.wpshop_tools::wpshop_get_currency( false ); ?>)</li>
+			<li><div style="background : <?php echo $colors[$i]; ?>;" class="legend_indicator"></div><?php echo $customer_name . ' ' . $customer_email . ' (' . number_format($customer, 2, '.', '') . ' ' . wpshop_tools::wpshop_get_currency(false); ?>)</li>
 		<?php
 		endif;
 	endforeach;
 ?>
 </ul>
 <?php else : ?>
-<div class="wps-alert-info"><?php _e( 'There is no best customer for the moment', 'wpshop'); ?></div>
+<div class="wps-alert-info"><?php _e('There is no best customer for the moment', 'wpshop'); ?></div>
 <?php endif; ?>

Braces +8 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  if ( !empty($customer_recap) ) : ?>
 <?php arsort( $customer_recap ); ?>
 <canvas id="wps_best_customers" width="" height=""></canvas>
@@ -32,6 +34,9 @@ 
 	endforeach;
 ?>
 </ul>
-<?php else : ?>
-<div class="wps-alert-info"><?php _e( 'There is no best customer for the moment', 'wpshop'); ?></div>
+<?php else {
+	: ?>
+<div class="wps-alert-info"><?php _e( 'There is no best customer for the moment', 'wpshop');
+}
+?></div>
 <?php endif; ?>

includes/modules/wps_statistics/templates/backend/wps_statistics_orders_moment.php

Braces +16 added lines, -10 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 if( !empty($datadate) ) : 
 krsort($datadate);
 $tmp_array = array();
@@ -6,8 +8,7 @@ 
 	foreach( $day_data as $hour => $d ) {
 		if( empty($tmp_array[$hour]) ) {
 			$tmp_array[$hour] = $day_data[$hour];
-		}
-		else {
+		} else {
 			$tmp_array[$hour] += $day_data[$hour];
 		}
 	}
@@ -15,14 +16,16 @@ 
 
 $tmp_value = 0;
 foreach ($tmp_array as $values){
-	if ($values > $tmp_value)
-		$tmp_value = $values;
-}
+	if ($values > $tmp_value) {
+			$tmp_value = $values;
+	}
+	}
 
-if ($tmp_value / 2 >= 25)
+if ($tmp_value / 2 >= 25) {
 	$scaleStepWidth = $tmp_value / 2;
-else
+} else {
 	$scaleStepWidth = $tmp_value;
+}
 ?>
 <canvas id="wps_hourly_orders_canvas" width="<?php echo ( !empty($args['width']) ) ? $args['width'] : ''; ?>" height="<?php echo ( !empty($args['height']) ) ? $args['height'] : ''; ?>"></canvas>
 <script type="text/javascript">
@@ -56,8 +59,11 @@ 
 </script>
 
 
-<?php else : ?>
-<div class="wps-alert-info"><?php _e( 'No orders have been created', 'wpshop' ); ?></div>
+<?php else {
+	: ?>
+<div class="wps-alert-info"><?php _e( 'No orders have been created', 'wpshop' );
+}
+?></div>
 <?php endif; ?>
 <div class="wps-form-group">
 <label><?php _e( 'Choose the day', 'wpshop'); ?></label>

Spacing +18 added lines, -18 removed lines

@@ -1,10 +1,10 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
-if( !empty($datadate) ) :
+<?php if (!defined('ABSPATH')) exit;
+if (!empty($datadate)) :
 krsort($datadate);
 $tmp_array = array();
-foreach( $datadate as $day_name => $day_data ) {
-	foreach( $day_data as $hour => $d ) {
-		if( empty($tmp_array[$hour]) ) {
+foreach ($datadate as $day_name => $day_data) {
+	foreach ($day_data as $hour => $d) {
+		if (empty($tmp_array[$hour])) {
 			$tmp_array[$hour] = $day_data[$hour];
 		}
 		else {
@@ -14,7 +14,7 @@ 
 }
 
 $tmp_value = 0;
-foreach ($tmp_array as $values){
+foreach ($tmp_array as $values) {
 	if ($values > $tmp_value)
 		$tmp_value = $values;
 }
@@ -24,17 +24,17 @@ 
 else
 	$scaleStepWidth = $tmp_value;
 ?>
-<canvas id="wps_hourly_orders_canvas" width="<?php echo ( !empty($args['width']) ) ? $args['width'] : ''; ?>" height="<?php echo ( !empty($args['height']) ) ? $args['height'] : ''; ?>"></canvas>
+<canvas id="wps_hourly_orders_canvas" width="<?php echo (!empty($args['width'])) ? $args['width'] : ''; ?>" height="<?php echo (!empty($args['height'])) ? $args['height'] : ''; ?>"></canvas>
 <script type="text/javascript">
 	jQuery( document ).ready( function() {
 		var data = {labels: [
 							<?php
-							for( $i = 0; $i <= 23; $i++ ) {
-								echo '"'.( ($i < 10 ) ? '0' : '' ).$i.'",';
+							for ($i = 0; $i <= 23; $i++) {
+								echo '"' . (($i < 10) ? '0' : '') . $i . '",';
 							} ?>
 							],
 					datasets:
-						[{label : "<?php _e( 'Datas', 'wpshop' ); ?>",
+						[{label : "<?php _e('Datas', 'wpshop'); ?>",
 						  fillColor: "#9AE5F4",
 						  strokeColor: "#0074A2",
 						  pointColor: "#0074A2",
@@ -43,8 +43,8 @@ 
 						  pointHighlightStroke: "#0074A2",
 						  data : [
 							<?php
-							for( $i = 0; $i <= 23; $i++ ) {
-								echo ( !empty($tmp_array[$i]) ) ? $tmp_array[$i].',' : '0,';
+							for ($i = 0; $i <= 23; $i++) {
+								echo (!empty($tmp_array[$i])) ? $tmp_array[$i] . ',' : '0,';
 							}
 								?>
 								]
@@ -57,15 +57,15 @@ 
 
 
 <?php else : ?>
-<div class="wps-alert-info"><?php _e( 'No orders have been created', 'wpshop' ); ?></div>
+<div class="wps-alert-info"><?php _e('No orders have been created', 'wpshop'); ?></div>
 <?php endif; ?>
 <div class="wps-form-group">
-<label><?php _e( 'Choose the day', 'wpshop'); ?></label>
+<label><?php _e('Choose the day', 'wpshop'); ?></label>
 <div class="wps-form">
-<select id="wps-statistics-orders-moment-selectbox" data-nonce="<?php echo wp_create_nonce( 'wps_hourly_order_day' ); ?>">
-	<option value=""><?php _e( 'All days', 'wpshop' ); ?></option>
-	<?php foreach( $days as $day ) : ?>
-	<option value="<?php echo $day; ?>"<?php echo ( !empty($args['choosen_day']) && $args['choosen_day'] == $day ) ? ' selected' : ''; ?>><?php _e( $day, 'wpshop'); ?></option>
+<select id="wps-statistics-orders-moment-selectbox" data-nonce="<?php echo wp_create_nonce('wps_hourly_order_day'); ?>">
+	<option value=""><?php _e('All days', 'wpshop'); ?></option>
+	<?php foreach ($days as $day) : ?>
+	<option value="<?php echo $day; ?>"<?php echo (!empty($args['choosen_day']) && $args['choosen_day'] == $day) ? ' selected' : ''; ?>><?php _e($day, 'wpshop'); ?></option>
 	<?php endforeach; ?>
 </select>
 </div>

includes/modules/wps_statistics/templates/backend/wps_statistics_orders_by_month.php

Spacing +10 added lines, -10 removed lines

@@ -1,11 +1,11 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <canvas id="wps_orders_summary" width="" height=""></canvas>
-<?php if( !empty($order_recap) ) : ?>
+<?php if (!empty($order_recap)) : ?>
 <?php 
 $i = 0;
-$order_recap = array_slice( $order_recap, 0, 2, true );
-$order_recap = array_reverse( $order_recap, true );
+$order_recap = array_slice($order_recap, 0, 2, true);
+$order_recap = array_reverse($order_recap, true);
 ?>
 <script type="text/javascript">
 jQuery( document ).ready( function() {
@@ -13,14 +13,14 @@ 
 					bezierCurve : false,
 					labels : ["<?php _e('January', 'wpshop'); ?>","<?php _e('February', 'wpshop'); ?>","<?php _e('March', 'wpshop'); ?>","<?php _e('April', 'wpshop'); ?>","<?php _e('May', 'wpshop'); ?>","<?php _e('June', 'wpshop'); ?>","<?php _e('July', 'wpshop'); ?>","<?php _e('August', 'wpshop'); ?>" ,"<?php _e('September', 'wpshop'); ?>" ,"<?php _e('October', 'wpshop'); ?>","<?php _e('November', 'wpshop'); ?>","<?php _e('December', 'wpshop'); ?>"],
 					datasets : [
-								<?php foreach( $order_recap as $y => $year ) : 
-										if ( $i < 2 ) :
+								<?php foreach ($order_recap as $y => $year) : 
+										if ($i < 2) :
 								?>
 											{fillColor : "<?php echo $colors[$i][0]; ?>",pointStrokeColor : "#fff",strokeColor :"<?php echo $colors[$i][1]; ?>", pointColor :"<?php echo $colors[$i][1]; ?>",
 												data : [
-														<?php for( $j = 1; $j <= 12; $j++) { 	
-															if( !empty($year[$j]) ) :
-																echo round($year[$j]).','; 
+														<?php for ($j = 1; $j <= 12; $j++) { 	
+															if (!empty($year[$j])) :
+																echo round($year[$j]) . ','; 
 															else :
 																echo '0,';
 															endif;
@@ -38,7 +38,7 @@ 
 });
 </script>
 <?php else : ?>
-<div class="wps-alert-info"><?php _e( 'No order has been made on your shop', 'wpshop'); ?></div>
+<div class="wps-alert-info"><?php _e('No order has been made on your shop', 'wpshop'); ?></div>
 <?php endif; ?>
 
 

Braces +11 added lines, -4 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <canvas id="wps_orders_summary" width="" height=""></canvas>
 <?php if( !empty($order_recap) ) : ?>
@@ -21,8 +23,10 @@ 
 														<?php for( $j = 1; $j <= 12; $j++) { 	
 															if( !empty($year[$j]) ) :
 																echo round($year[$j]).','; 
-															else :
+															else {
+																:
 																echo '0,';
+															}
 															endif;
 														 	} ?>
 													]
@@ -37,8 +41,11 @@ 
 	var LineOrders = new Chart(document.getElementById("wps_orders_summary").getContext("2d")).Line(data);
 });
 </script>
-<?php else : ?>
-<div class="wps-alert-info"><?php _e( 'No order has been made on your shop', 'wpshop'); ?></div>
+<?php else {
+	: ?>
+<div class="wps-alert-info"><?php _e( 'No order has been made on your shop', 'wpshop');
+}
+?></div>
 <?php endif; ?>
 
 

includes/modules/wps_statistics/templates/backend/wps-statistics.php

Spacing +11 added lines, -11 removed lines

@@ -1,22 +1,22 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wrap">
-	<h2><span class="dashicons dashicons-chart-area" style="font-size : 30px; width : 30px; height : 30px"></span> <?php _e( 'WPShop Statistics', 'wpshop' )?></h2>
+	<h2><span class="dashicons dashicons-chart-area" style="font-size : 30px; width : 30px; height : 30px"></span> <?php _e('WPShop Statistics', 'wpshop')?></h2>
 	<div class="wps-boxed">
 		<form method="post" action="">
-		<span class="wps-h5"><?php _e( 'Configure your date statistics results', 'wpshop'); ?></span>
+		<span class="wps-h5"><?php _e('Configure your date statistics results', 'wpshop'); ?></span>
 		<div class="wps-gridwrapper3-padded">
 			<div>
 				<div class="wps-form_group">
-					<label><?php _e( 'Begin date', 'wpshop'); ?></label>
-					<div class="wps-form"><input type="text" id="wps_statistics_begin_date" name="begin_date" class="date" value="<?php echo ( ( !empty($_POST['begin_date']) )  ? sanitize_text_field( $_POST['begin_date'] ) : date( 'Y-m-d', strtotime( '1 months ago') ) ); ?>"/></div>
+					<label><?php _e('Begin date', 'wpshop'); ?></label>
+					<div class="wps-form"><input type="text" id="wps_statistics_begin_date" name="begin_date" class="date" value="<?php echo ((!empty($_POST['begin_date'])) ? sanitize_text_field($_POST['begin_date']) : date('Y-m-d', strtotime('1 months ago'))); ?>"/></div>
 				</div>
 			</div>
 
 			<div>
 				<div class="wps-form_group">
-					<label><?php _e( 'End date', 'wpshop'); ?></label>
-					<div class="wps-form"><input type="text" id="wps_statistics_end_date" name="end_date" class="date" value="<?php echo ( ( !empty($_POST['end_date']) )  ? sanitize_text_field( $_POST['end_date'] ) : date( 'Y-m-d') ); ?>"/></div>
+					<label><?php _e('End date', 'wpshop'); ?></label>
+					<div class="wps-form"><input type="text" id="wps_statistics_end_date" name="end_date" class="date" value="<?php echo ((!empty($_POST['end_date'])) ? sanitize_text_field($_POST['end_date']) : date('Y-m-d')); ?>"/></div>
 				</div>
 			</div>
 
@@ -24,8 +24,8 @@ 
 				<div class="wps-form_group">
 					<label><br/></label>
 					<div class="wps-form">
-						<!--  <button class="wps-bton-mini-first-rounded" id="wps_change_statistics_date"><?php _e( 'Reload statistics', 'wpshop'); ?></button> -->
-						<input type="submit" class="wps-bton-mini-first-rounded" value="<?php _e( 'Reload statistics', 'wpshop'); ?>" />
+						<!--  <button class="wps-bton-mini-first-rounded" id="wps_change_statistics_date"><?php _e('Reload statistics', 'wpshop'); ?></button> -->
+						<input type="submit" class="wps-bton-mini-first-rounded" value="<?php _e('Reload statistics', 'wpshop'); ?>" />
 					</div>
 				</div>
 			</div>
@@ -34,8 +34,8 @@ 
 	</div>
 
 	<div class="wps-gridwrapper2-padded metabox-holder wps-statistics-container" >
-		<div><?php do_meta_boxes('wpshop_statistics','left_column', ''); ?></div>
-		<div><?php do_meta_boxes('wpshop_statistics','right_column', ''); ?></div>
+		<div><?php do_meta_boxes('wpshop_statistics', 'left_column', ''); ?></div>
+		<div><?php do_meta_boxes('wpshop_statistics', 'right_column', ''); ?></div>
 	</div>
 
 </div>

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_statistics/model/wps_statisticsmdl.php

Spacing +65 added lines, -65 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 	/** Get hourly orders ***/
 	class wps_statistics_mdl {
 		private $wps_orders_all = null;
@@ -12,8 +12,8 @@ 
 		function wps_most_viewed_products_datas() {
 			global $wpdb;
 			$output = '';
-			$query = $wpdb->prepare( 'SELECT post_id, meta_value FROM '. $wpdb->postmeta .', ' .$wpdb->posts. ' WHERE post_id = ID AND post_status = %s AND meta_key = %s ORDER BY CAST( meta_value AS SIGNED ) DESC LIMIT 8', 'publish', '_wpshop_product_view_nb');
-			$products = $wpdb->get_results( $query );
+			$query = $wpdb->prepare('SELECT post_id, meta_value FROM ' . $wpdb->postmeta . ', ' . $wpdb->posts . ' WHERE post_id = ID AND post_status = %s AND meta_key = %s ORDER BY CAST( meta_value AS SIGNED ) DESC LIMIT 8', 'publish', '_wpshop_product_view_nb');
+			$products = $wpdb->get_results($query);
 			return $products;
 		}
 		
@@ -21,10 +21,10 @@ 
 		 * Returns all orders and save in variable
 		 */
 		function wps_orders_all() {
-			if( !isset( $this->wps_orders_all ) ) {
-				$orders = get_posts( array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'post_status' => 'publish') );
-				foreach( $orders as $order ) {
-					$order->_order_postmeta = get_post_meta( $order->ID, '_order_postmeta', true );
+			if (!isset($this->wps_orders_all)) {
+				$orders = get_posts(array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'post_status' => 'publish'));
+				foreach ($orders as $order) {
+					$order->_order_postmeta = get_post_meta($order->ID, '_order_postmeta', true);
 				}
 				$this->wps_orders_all = $orders;
 			}
@@ -37,24 +37,24 @@ 
 		 * @param string $enddate
 		 * @return array
 		 */
-		function wps_best_sales_datas( $begindate, $enddate) {
-			$begindate = new DateTime( $begindate.' 00:00:00' );
-			$enddate = new DateTime( $enddate.' 23:59:59' );
+		function wps_best_sales_datas($begindate, $enddate) {
+			$begindate = new DateTime($begindate . ' 00:00:00');
+			$enddate = new DateTime($enddate . ' 23:59:59');
 			$orders = $this->wps_orders_all();
-			if ( !empty($orders) ) {
+			if (!empty($orders)) {
 				$products = array();
-				foreach( $orders as $order ) {
-					$date_order = new DateTime( $order->post_date );
-					if( $begindate <= $date_order && $date_order <= $enddate ) {
+				foreach ($orders as $order) {
+					$date_order = new DateTime($order->post_date);
+					if ($begindate <= $date_order && $date_order <= $enddate) {
 						$order_meta = $order->_order_postmeta;
-						if( !empty($order_meta) && !empty($order_meta['order_items']) ) {
-							foreach( $order_meta['order_items'] as $item_id => $item ) {
-								if( !empty($item) && !empty($item['item_qty']) && !empty($item['item_id'])  ) {
-									if( !empty($products[ $item['item_id'] ]) ) {
-										$products[ $item['item_id'] ] += $item['item_qty'];
+						if (!empty($order_meta) && !empty($order_meta['order_items'])) {
+							foreach ($order_meta['order_items'] as $item_id => $item) {
+								if (!empty($item) && !empty($item['item_qty']) && !empty($item['item_id'])) {
+									if (!empty($products[$item['item_id']])) {
+										$products[$item['item_id']] += $item['item_qty'];
 									}
 									else {
-										$products[ $item['item_id'] ] = $item['item_qty'];
+										$products[$item['item_id']] = $item['item_qty'];
 									}
 								}
 							}
@@ -73,20 +73,20 @@ 
 			$output = '';
 			$order_recap = array();
 			$orders = $this->wps_orders_all();
-			if ( !empty($orders) ) {
-				foreach( $orders as $order ) {
-					$order_year = date( 'Y', strtotime( $order->post_date) );
-					$order_month = date( 'n', strtotime( $order->post_date) );
-					if ( empty($order_recap[$order_year]) ) {
+			if (!empty($orders)) {
+				foreach ($orders as $order) {
+					$order_year = date('Y', strtotime($order->post_date));
+					$order_month = date('n', strtotime($order->post_date));
+					if (empty($order_recap[$order_year])) {
 						$order_recap[$order_year] = array();
 					}
 					$order_meta = $order->_order_postmeta;
-					if ( !empty($order_meta) && !empty($order_meta['order_grand_total']) ) {
-						if ( empty($order_recap[$order_year][ $order_month ]) ) {
-							$order_recap[$order_year][ $order_month ] = $order_meta['order_grand_total'];
+					if (!empty($order_meta) && !empty($order_meta['order_grand_total'])) {
+						if (empty($order_recap[$order_year][$order_month])) {
+							$order_recap[$order_year][$order_month] = $order_meta['order_grand_total'];
 						}
 						else {
-							$order_recap[$order_year][ $order_month ] += $order_meta['order_grand_total'];
+							$order_recap[$order_year][$order_month] += $order_meta['order_grand_total'];
 						}
 					}
 				}
@@ -99,24 +99,24 @@ 
 		 * Orders Status
 		 * @return Array
 		 */
-		function wps_order_status( $begin_date, $end_date ) {
-			$begin_date = new DateTime( $begin_date.' 00:00:00' );
-			$end_date = new DateTime( $end_date.' 23:59:59' );
+		function wps_order_status($begin_date, $end_date) {
+			$begin_date = new DateTime($begin_date . ' 00:00:00');
+			$end_date = new DateTime($end_date . ' 23:59:59');
 			$output = '';
 			$orders = $this->wps_orders_all();
-			if ( !empty($orders) ) {
+			if (!empty($orders)) {
 				$orders_status = array();
 				/** Collect datas **/
-				foreach( $orders as $order ) {
-					$date_order = new DateTime( $order->post_date );
-					if( $begin_date <= $date_order && $date_order <= $end_date ) {
+				foreach ($orders as $order) {
+					$date_order = new DateTime($order->post_date);
+					if ($begin_date <= $date_order && $date_order <= $end_date) {
 						$order_meta = $order->_order_postmeta;
-						if ( !empty($order_meta) && !empty($order_meta['order_status']) ) {
-							if ( !empty($orders_status[ $order_meta['order_status'] ]) ) {
-								$orders_status[ $order_meta['order_status'] ]++;
+						if (!empty($order_meta) && !empty($order_meta['order_status'])) {
+							if (!empty($orders_status[$order_meta['order_status']])) {
+								$orders_status[$order_meta['order_status']]++;
 							}
 							else {
-								$orders_status[ $order_meta['order_status'] ] = 1;
+								$orders_status[$order_meta['order_status']] = 1;
 							}
 						}
 					}
@@ -131,32 +131,32 @@ 
 		 * @param string $end_date
 		 * @return array
 		 */
-		function wps_best_customers( $begin_date, $end_date ) {
+		function wps_best_customers($begin_date, $end_date) {
 				$output = '';
 				$customer_recap = array();
 				
-				$begin_date = new DateTime( $begin_date.' 00:00:00' );
-				$end_date = new DateTime( $end_date.' 23:59:59' );
+				$begin_date = new DateTime($begin_date . ' 00:00:00');
+				$end_date = new DateTime($end_date . ' 23:59:59');
 				$orders = $this->wps_orders_all();
 		
-				if ( !empty($orders) ) {
-					foreach( $orders as $order ) {
-						$date_order = new DateTime( $order->post_date );
-						if( $begin_date <= $date_order && $date_order <= $end_date ) {
+				if (!empty($orders)) {
+					foreach ($orders as $order) {
+						$date_order = new DateTime($order->post_date);
+						if ($begin_date <= $date_order && $date_order <= $end_date) {
 							$order_meta = $order->_order_postmeta;
-							if ( !empty($order_meta) && !empty($order_meta['customer_id']) && !empty($order_meta['order_grand_total']) ) {
+							if (!empty($order_meta) && !empty($order_meta['customer_id']) && !empty($order_meta['order_grand_total'])) {
 								/** Check if user is administrator **/
-								$user_def = get_user_by( 'id', $order_meta['customer_id'] );
-								$wps_statistics_exclude_customer = get_user_meta( $order_meta['customer_id'], 'wps_statistics_exclude_customer', true );
-								$excluded_from_statistics = ( !empty($wps_statistics_exclude_customer) ) ? true : false;
+								$user_def = get_user_by('id', $order_meta['customer_id']);
+								$wps_statistics_exclude_customer = get_user_meta($order_meta['customer_id'], 'wps_statistics_exclude_customer', true);
+								$excluded_from_statistics = (!empty($wps_statistics_exclude_customer)) ? true : false;
 		
 		
-								if ( !empty($user_def) && !empty($user_def->caps) && is_array($user_def->caps) && array_key_exists( 'customer', $user_def->caps) && $excluded_from_statistics === false ) {
-									if ( empty($customer_recap[ $order_meta['customer_id'] ] ) ) {
-										$customer_recap[ $order_meta['customer_id'] ] = $order_meta['order_grand_total'];
+								if (!empty($user_def) && !empty($user_def->caps) && is_array($user_def->caps) && array_key_exists('customer', $user_def->caps) && $excluded_from_statistics === false) {
+									if (empty($customer_recap[$order_meta['customer_id']])) {
+										$customer_recap[$order_meta['customer_id']] = $order_meta['order_grand_total'];
 									}
 									else {
-										$customer_recap[ $order_meta['customer_id'] ] += $order_meta['order_grand_total'];
+										$customer_recap[$order_meta['customer_id']] += $order_meta['order_grand_total'];
 									}
 								}
 							}
@@ -169,22 +169,22 @@ 
 		
 		
 		
-		function wps_get_orders_by_hours( $begindate, $enddate, $choosenday = '', $ajax_origin = false ) {
-			$begin_date = new DateTime( $begindate.' 00:00:00' );
-			$end_date = new DateTime( $enddate.' 23:59:59' );
+		function wps_get_orders_by_hours($begindate, $enddate, $choosenday = '', $ajax_origin = false) {
+			$begin_date = new DateTime($begindate . ' 00:00:00');
+			$end_date = new DateTime($enddate . ' 23:59:59');
 			$resultarray = $this->wps_orders_all();
 			
 			$datadate = array();
-			foreach ($resultarray as $array){
-				$date = new DateTime( $array->post_date );
-				if( $begin_date <= $date && $date <= $end_date ) {
+			foreach ($resultarray as $array) {
+				$date = new DateTime($array->post_date);
+				if ($begin_date <= $date && $date <= $end_date) {
 					$day = $date->format('l');
 					$day = strtolower($day);
 					$choosenday = strtolower($choosenday);
-					if( empty($choosenday) || ( !empty($choosenday) && $choosenday ==  $day ) ) {
+					if (empty($choosenday) || (!empty($choosenday) && $choosenday == $day)) {
 						$hour = $date->format('G');
-						if ( empty($datadate[$day])){
-							if	(empty($datadate[$day][$hour])){
+						if (empty($datadate[$day])) {
+							if (empty($datadate[$day][$hour])) {
 								$datadate[$day][$hour] = 1;	
 							}
 							else {
@@ -192,7 +192,7 @@ 
 							}
 						}
 						else {
-							if	(empty($datadate[$day][$hour])){
+							if (empty($datadate[$day][$hour])) {
 								$datadate[$day][$hour] = 1;	
 							}
 							else {

Braces +10 added lines, -15 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 	/** Get hourly orders ***/
 	class wps_statistics_mdl {
 		private $wps_orders_all = null;
@@ -52,8 +54,7 @@ 
 								if( !empty($item) && !empty($item['item_qty']) && !empty($item['item_id'])  ) {
 									if( !empty($products[ $item['item_id'] ]) ) {
 										$products[ $item['item_id'] ] += $item['item_qty'];
-									}
-									else {
+									} else {
 										$products[ $item['item_id'] ] = $item['item_qty'];
 									}
 								}
@@ -84,8 +85,7 @@ 
 					if ( !empty($order_meta) && !empty($order_meta['order_grand_total']) ) {
 						if ( empty($order_recap[$order_year][ $order_month ]) ) {
 							$order_recap[$order_year][ $order_month ] = $order_meta['order_grand_total'];
-						}
-						else {
+						} else {
 							$order_recap[$order_year][ $order_month ] += $order_meta['order_grand_total'];
 						}
 					}
@@ -114,8 +114,7 @@ 
 						if ( !empty($order_meta) && !empty($order_meta['order_status']) ) {
 							if ( !empty($orders_status[ $order_meta['order_status'] ]) ) {
 								$orders_status[ $order_meta['order_status'] ]++;
-							}
-							else {
+							} else {
 								$orders_status[ $order_meta['order_status'] ] = 1;
 							}
 						}
@@ -154,8 +153,7 @@ 
 								if ( !empty($user_def) && !empty($user_def->caps) && is_array($user_def->caps) && array_key_exists( 'customer', $user_def->caps) && $excluded_from_statistics === false ) {
 									if ( empty($customer_recap[ $order_meta['customer_id'] ] ) ) {
 										$customer_recap[ $order_meta['customer_id'] ] = $order_meta['order_grand_total'];
-									}
-									else {
+									} else {
 										$customer_recap[ $order_meta['customer_id'] ] += $order_meta['order_grand_total'];
 									}
 								}
@@ -186,16 +184,13 @@ 
 						if ( empty($datadate[$day])){
 							if	(empty($datadate[$day][$hour])){
 								$datadate[$day][$hour] = 1;	
-							}
-							else {
+							} else {
 								$datadate[$day][$hour] += 1;
 							}
-						}
-						else {
+						} else {
 							if	(empty($datadate[$day][$hour])){
 								$datadate[$day][$hour] = 1;	
-							}
-							else {
+							} else {
 								$datadate[$day][$hour] += 1;
 							}
 						}

includes/modules/wps-pos-addon/controller/wps-pos-bank-deposit.php

Spacing +23 added lines, -23 removed lines

@@ -1,15 +1,15 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_pos_addon_bank_deposit {
 	public function __construct() {
 		/**	Call metaboxes	*/
-		add_action( 'admin_init', array( $this, 'metaboxes' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'vars_js' ), 11 );
+		add_action('admin_init', array($this, 'metaboxes'));
+		add_action('admin_enqueue_scripts', array($this, 'vars_js'), 11);
 	}
 	public function metaboxes() {
-		add_meta_box( 'wpspos-bank-deposit-metabox', __( 'Create your bank deposit', 'wps-pos-i18n' ), array( $this, 'metabox' ), 'wpspos-bank-deposit', 'wpspos-bank-deposit-left' );
+		add_meta_box('wpspos-bank-deposit-metabox', __('Create your bank deposit', 'wps-pos-i18n'), array($this, 'metabox'), 'wpspos-bank-deposit', 'wpspos-bank-deposit-left');
 	}
 	public function metabox() {
-		require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/bank_deposit', 'metabox', 'bank_deposit' ) );
+		require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/bank_deposit', 'metabox', 'bank_deposit'));
 	}
 	public function get_payments() {
 		$args = array(
@@ -17,41 +17,41 @@ 
 				'post_type'			=> WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
 				'post_status' 		=> 'publish',
 				'meta_key'			=> '_order_postmeta',
-				'meta_value'		=> serialize( 'received' ) . serialize( array() ),
+				'meta_value'		=> serialize('received') . serialize(array()),
 				'meta_compare'		=> 'NOT LIKE',
 		);
-		$query = new WP_Query( $args );
+		$query = new WP_Query($args);
 		
 		$orders = $query->posts;
 		$payments = array();
 		
-		foreach( $orders as $order ) {
-			$order->_order_postmeta = get_post_meta( $order->ID, '_order_postmeta', true );
-			foreach( $order->_order_postmeta['order_payment']['received'] as $payment_received ) {
-				if( isset( $payment_received['status'] ) && $payment_received['status'] == 'payment_received' ) {
+		foreach ($orders as $order) {
+			$order->_order_postmeta = get_post_meta($order->ID, '_order_postmeta', true);
+			foreach ($order->_order_postmeta['order_payment']['received'] as $payment_received) {
+				if (isset($payment_received['status']) && $payment_received['status'] == 'payment_received') {
 					$payments[] = '';
-					end( $payments );
-					$id = key( $payments );
-					$payments[$id] = $this->row_model( $id, isset( $order->_order_postmeta['order_key'] ) ?	$order->_order_postmeta['order_key'] : $order->_order_postmeta['order_temporary_key'], $payment_received['date'], isset( $order->_order_postmeta['cart']['order_items'] ) ? $order->_order_postmeta['cart']['order_items'] : ( isset( $order->_order_postmeta['order_items'] ) ? $order->_order_postmeta['order_items'] : array() ), $payment_received['received_amount'], $payment_received['method'] );
+					end($payments);
+					$id = key($payments);
+					$payments[$id] = $this->row_model($id, isset($order->_order_postmeta['order_key']) ? $order->_order_postmeta['order_key'] : $order->_order_postmeta['order_temporary_key'], $payment_received['date'], isset($order->_order_postmeta['cart']['order_items']) ? $order->_order_postmeta['cart']['order_items'] : (isset($order->_order_postmeta['order_items']) ? $order->_order_postmeta['order_items'] : array()), $payment_received['received_amount'], $payment_received['method']);
 				}
 			}
 		}
 		
 		return $payments;
 	}
-	public function row_model( $id, $order_key, $date, $products, $amount, $method ) {
+	public function row_model($id, $order_key, $date, $products, $amount, $method) {
 		$products_simplified = array();
-		if( !empty( $products ) && is_array( $products ) ) {
-			foreach( $products as $product ) {
-				if( isset( $product['item_meta']['variations'] ) ) {
-					foreach( $product['item_meta']['variations'] as $key => $value ) {
+		if (!empty($products) && is_array($products)) {
+			foreach ($products as $product) {
+				if (isset($product['item_meta']['variations'])) {
+					foreach ($product['item_meta']['variations'] as $key => $value) {
 						$id_variation = $key;
 						break;
 					}
 					$first = true;
 					$title = $product['item_name'] . ' - ';
-					foreach( $product['item_meta']['variations'][$id_variation]['item_meta']['variation_definition'] as $variation ) {
-						if( $first ) {
+					foreach ($product['item_meta']['variations'][$id_variation]['item_meta']['variation_definition'] as $variation) {
+						if ($first) {
 							$first = false;
 						} else {
 							$title .= ', ';
@@ -64,9 +64,9 @@ 
 				}
 			}			
 		}
-		return array( 'id' => $id, 'order_key' => $order_key, 'date' => $date, 'products' => $products_simplified, 'amount' => $amount, 'method' => $method );
+		return array('id' => $id, 'order_key' => $order_key, 'date' => $date, 'products' => $products_simplified, 'amount' => $amount, 'method' => $method);
 	}
 	public function vars_js() {
-		wp_localize_script( 'wpspos-backend-bank-deposit-js', 'payments', $this->get_payments() );
+		wp_localize_script('wpspos-backend-bank-deposit-js', 'payments', $this->get_payments());
 	}
 }
\ No newline at end of file

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-pos-addon/templates/backend/products/products.php

Spacing +5 added lines, -5 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <table class="table table-striped wps-pos-element-table">
 	<tr>
@@ -6,9 +6,9 @@ 
 		<th><?php _e('Product price', 'wps-pos-i18n'); ?></th>
 		<th><?php _e('Action', 'wps-pos-i18n'); ?></th>
 	</tr>
-	<?php foreach ( $product_list as $product ) : ?>
-		<?php $product_data = wpshop_products::get_product_data( $product['ID'] ); ?>
-		<?php $product_variation_definition = wpshop_products::get_variation( $product['ID'] );?>
-		<?php require( wpshop_tools::get_template_part( WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'product' ) ); ?>
+	<?php foreach ($product_list as $product) : ?>
+		<?php $product_data = wpshop_products::get_product_data($product['ID']); ?>
+		<?php $product_variation_definition = wpshop_products::get_variation($product['ID']); ?>
+		<?php require(wpshop_tools::get_template_part(WPSPOS_DIR, WPSPOS_TEMPLATES_MAIN_DIR, 'backend/products', 'product')); ?>
 	<?php endforeach; ?>
 </table>
\ No newline at end of file

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-pos-addon/templates/backend/products/modal-variation.php

Spacing +5 added lines, -5 removed lines

@@ -1,9 +1,9 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if ( !empty( $product_id ) ) : ?>
-	<?php echo wpshop_products::wpshop_variation( $product_id ); ?>
+<?php if (!defined('ABSPATH')) exit;
+ if (!empty($product_id)) : ?>
+	<?php echo wpshop_products::wpshop_variation($product_id); ?>
 	<div class="wpspos-product-variation-selector" >
-		<button class="wps-bton-first-mini-rounded alignRight" id="wpspos-product-with-variation-add-to-cart" ><?php _e( 'Add product', 'wpshop'); ?></button>
+		<button class="wps-bton-first-mini-rounded alignRight" id="wpspos-product-with-variation-add-to-cart" ><?php _e('Add product', 'wpshop'); ?></button>
 	</div>
 <?php else : ?>
-	<?php _e( 'We are unable to detect the product you want to add to order', 'wps-pos-i18n' ); ?>
+	<?php _e('We are unable to detect the product you want to add to order', 'wps-pos-i18n'); ?>
 <?php endif; ?>
\ No newline at end of file

Braces +8 added lines, -3 removed lines

@@ -1,9 +1,14 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  if ( !empty( $product_id ) ) : ?>
 	<?php echo wpshop_products::wpshop_variation( $product_id ); ?>
 	<div class="wpspos-product-variation-selector" >
 		<button class="wps-bton-first-mini-rounded alignRight" id="wpspos-product-with-variation-add-to-cart" ><?php _e( 'Add product', 'wpshop'); ?></button>
 	</div>
-<?php else : ?>
-	<?php _e( 'We are unable to detect the product you want to add to order', 'wps-pos-i18n' ); ?>
+<?php else {
+	: ?>
+	<?php _e( 'We are unable to detect the product you want to add to order', 'wps-pos-i18n' );
+}
+?>
 <?php endif; ?>
\ No newline at end of file

includes/modules/wps-pos-addon/templates/backend/customers/customer-not_found.php

Spacing +10 added lines, -10 removed lines

@@ -1,23 +1,23 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
-	$billing_option = get_option( 'wpshop_billing_address' );
-	if( !empty( $billing_option ) && is_array( $billing_option ) ) {
+<?php if (!defined('ABSPATH')) exit;
+	$billing_option = get_option('wpshop_billing_address');
+	if (!empty($billing_option) && is_array($billing_option)) {
 		$attribute_set_id = $billing_option['choice'];
 	} else {
 		global $wpdb;
-		$query = $wpdb->prepare( "SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE name = %s", __( 'Billing address', 'wpshop' ) );
-		$attribute_set_id = $wpdb->get_var( $query );
-		if( empty( $attribute_set_id ) ) {
+		$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE name = %s", __('Billing address', 'wpshop'));
+		$attribute_set_id = $wpdb->get_var($query);
+		if (empty($attribute_set_id)) {
 			global $wpdb;
-			$query = $wpdb->prepare( "SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE name = %s", 'Billing address' );
-			$attribute_set_id = $wpdb->get_var( $query );
+			$query = $wpdb->prepare("SELECT id FROM " . WPSHOP_DBT_ATTRIBUTE_SET . " WHERE name = %s", 'Billing address');
+			$attribute_set_id = $wpdb->get_var($query);
 		}
 	}
 ?>
 	<tr>
 		<td>
-			<?php _e( 'No user has been found for current search.', 'wps-pos-i18n' ); ?>
+			<?php _e('No user has been found for current search.', 'wps-pos-i18n'); ?>
 		</td>
 		<td>
-			<a class="thickbox wps-bton-third-rounded" title="<?php _e( 'New customer creation', 'wps-pos-i18n' ); ?>" href="<?php echo admin_url( 'admin-ajax.php?action=wps-customer-quick-creation&wps-nonce=' . wp_create_nonce( 'wps-customer-quick-nonce' ) . '&width=550&height=600&customer_set_id=' . $attribute_set_id ); ?>"><?php _e('Create a customer', 'wps-pos-i18n'); ?></a>
+			<a class="thickbox wps-bton-third-rounded" title="<?php _e('New customer creation', 'wps-pos-i18n'); ?>" href="<?php echo admin_url('admin-ajax.php?action=wps-customer-quick-creation&wps-nonce=' . wp_create_nonce('wps-customer-quick-nonce') . '&width=550&height=600&customer_set_id=' . $attribute_set_id); ?>"><?php _e('Create a customer', 'wps-pos-i18n'); ?></a>
 		</td>
 	</tr>
\ No newline at end of file

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
  *