Eoxia / wpshop

includes/modules/wps_orders/templates/backend/wps_order_customer_informations.php

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
-if( !empty($order_metadata) ) : 
+<?php if (!defined('ABSPATH')) exit;
+if (!empty($order_metadata)) : 
 ?>
 <div class="wps-gridwrapper3-padded">
 	<div>
@@ -9,13 +9,13 @@ 
 
 	<div>
 		<div class="wps-boxed summary_shipping_boxed">
-			<div class="wps-h5"><?php _e( 'Billing address', 'wpshop')?></div>
+			<div class="wps-h5"><?php _e('Billing address', 'wpshop')?></div>
 			<?php 
-			if( !empty($billing_address_content) ) : 
+			if (!empty($billing_address_content)) : 
 				echo $billing_address_content; 
 			else : 
 			?>
-				<div class="wps-alert-error"><?php _e( 'No billing address informations are found', 'wpshop'); ?></div>
+				<div class="wps-alert-error"><?php _e('No billing address informations are found', 'wpshop'); ?></div>
 			<?php 
 			endif;
 			?>
@@ -23,13 +23,13 @@ 
 	</div>
 	<div>
 		<div class="wps-boxed summary_shipping_boxed">
-			<div class="wps-h5"><?php _e( 'Shipping address', 'wpshop')?></div>
+			<div class="wps-h5"><?php _e('Shipping address', 'wpshop')?></div>
 			<?php 
-			if( !empty($shipping_address_content) ) : 
+			if (!empty($shipping_address_content)) : 
 				echo $shipping_address_content; 
 			else : 
 			?>
-				<div class="wps-alert-error"><?php _e( 'No shipping address informations are found', 'wpshop'); ?></div>
+				<div class="wps-alert-error"><?php _e('No shipping address informations are found', 'wpshop'); ?></div>
 			<?php 
 			endif;
 			?>
@@ -41,7 +41,7 @@ 
 <?php 
 else :
 ?>
-<div class="wps-alert-info"><?php _e( 'Please choose a customer or create one', 'wpshop'); ?></div>
+<div class="wps-alert-info"><?php _e('Please choose a customer or create one', 'wpshop'); ?></div>
 <?php 
 endif;
 ?>

Braces +18 added lines, -7 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 if( !empty($order_metadata) ) : 
 ?>
 <div class="wps-gridwrapper3-padded">
@@ -13,9 +15,12 @@ 
 			<?php 
 			if( !empty($billing_address_content) ) : 
 				echo $billing_address_content; 
-			else : 
+			else {
+				: 
 			?>
-				<div class="wps-alert-error"><?php _e( 'No billing address informations are found', 'wpshop'); ?></div>
+				<div class="wps-alert-error"><?php _e( 'No billing address informations are found', 'wpshop');
+			}
+			?></div>
 			<?php 
 			endif;
 			?>
@@ -27,9 +32,12 @@ 
 			<?php 
 			if( !empty($shipping_address_content) ) : 
 				echo $shipping_address_content; 
-			else : 
+			else {
+				: 
 			?>
-				<div class="wps-alert-error"><?php _e( 'No shipping address informations are found', 'wpshop'); ?></div>
+				<div class="wps-alert-error"><?php _e( 'No shipping address informations are found', 'wpshop');
+			}
+			?></div>
 			<?php 
 			endif;
 			?>
@@ -39,9 +47,12 @@ 
 </div>
 
 <?php 
-else :
+else {
+	:
 ?>
-<div class="wps-alert-info"><?php _e( 'Please choose a customer or create one', 'wpshop'); ?></div>
+<div class="wps-alert-info"><?php _e( 'Please choose a customer or create one', 'wpshop');
+}
+?></div>
 <?php 
 endif;
 ?>

includes/modules/wps_orders/templates/backend/customer_comment_on_order_box.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if( !empty($comment) ) : ?>
+<?php if (!defined('ABSPATH')) exit;
+ if (!empty($comment)) : ?>
 	<div class="wps-boxed"><?php echo $comment; ?></div>
 <?php else : ?>
 	<div class="wps-alert-info">

Braces +8 added lines, -3 removed lines

@@ -1,9 +1,14 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  if( !empty($comment) ) : ?>
 	<div class="wps-boxed"><?php echo $comment; ?></div>
-<?php else : ?>
+<?php else {
+	: ?>
 	<div class="wps-alert-info">
-		<?php _e('No comment for this order', 'wpshop'); ?>
+		<?php _e('No comment for this order', 'wpshop');
+}
+?>
 	</div>
 <?php endif; ?>
 

includes/modules/wps_orders/templates/backend/wps_order_payment_box.php

Braces +18 added lines, -7 removed lines

@@ -1,11 +1,16 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  if ( !empty($order_postmeta['order_payment']) ) :
 $total_amount = ( !empty($order_postmeta['order_grand_total']) ) ? $order_postmeta['order_grand_total'] : '';
 $waited_amount_sum = $received_amount_sum = $i = 0;
 ?>
 	<?php $payment_modes = get_option( 'wps_payment_mode' ); ?>
-	<?php if( !empty( $order_postmeta['order_payment']['customer_choice'] ) && !empty( $order_postmeta['order_payment']['customer_choice']['method'] ) )?>
-		<div class="wps-alert-info"><strong><?php _e( 'Payment method customer select', 'wpshop'); ?> : </strong><br/>
+	<?php if( !empty( $order_postmeta['order_payment']['customer_choice'] ) && !empty( $order_postmeta['order_payment']['customer_choice']['method'] ) ) {
+	?>
+		<div class="wps-alert-info"><strong><?php _e( 'Payment method customer select', 'wpshop');
+}
+?> : </strong><br/>
 		<?php echo ( !empty( $order_postmeta ) &&  !empty(  $order_postmeta['order_payment']['customer_choice']['method'] ) && !empty( $payment_modes['mode'][ strtolower( (string)$order_postmeta['order_payment']['customer_choice']['method'] ) ][ 'name' ] ) ?  $payment_modes['mode'][ strtolower( (string)$order_postmeta['order_payment']['customer_choice']['method'] ) ]['name'] : sprintf( __( 'Unknow (%s)', 'wpshop'), strtolower( (string)$order_postmeta['order_payment']['customer_choice']['method'] ) ) ); ?></div>
 
 	<?php
@@ -43,8 +48,11 @@ 
 							<span class="wps-label-orange"><?php _e( 'Incorrect amount', 'wpshop'); ?></span>
 						<?php elseif( $received_payment['status'] == 'waiting_payment') : ?>
 							<span class="wps-label-rouge"><?php _e( 'Waiting payment', 'wpshop'); ?></span>
-						<?php else : ?>
-							<span class="wps-label-rouge"><?php echo $received_payment['status']; ?></span>
+						<?php else {
+	: ?>
+							<span class="wps-label-rouge"><?php echo $received_payment['status'];
+}
+?></span>
 						<?php endif; ?>
 					</div>
 				</div>
@@ -144,6 +152,9 @@ 
 		<div class="wps-alert-<?php echo ( ( ($order_postmeta['order_amount_to_pay_now']) <= 0 ) ? 'success': 'warning' ); ?>"><u><?php _e( 'Due amount for this order', 'wpshop'); ?></u> : <span class="alignright"><strong><?php echo $order_postmeta['order_amount_to_pay_now'];?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong></span></div>
 
 	<?php endif; ?>
-<?php else: ?>
-	<div class="wps-alert-info"><?php _e('No information available for this order payment', 'wpshop'); ?></div>
+<?php else {
+	: ?>
+	<div class="wps-alert-info"><?php _e('No information available for this order payment', 'wpshop');
+}
+?></div>
 <?php endif;?>

Spacing +46 added lines, -46 removed lines

@@ -1,91 +1,91 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if ( !empty($order_postmeta['order_payment']) ) :
-$total_amount = ( !empty($order_postmeta['order_grand_total']) ) ? $order_postmeta['order_grand_total'] : '';
+<?php if (!defined('ABSPATH')) exit;
+ if (!empty($order_postmeta['order_payment'])) :
+$total_amount = (!empty($order_postmeta['order_grand_total'])) ? $order_postmeta['order_grand_total'] : '';
 $waited_amount_sum = $received_amount_sum = $i = 0;
 ?>
-	<?php $payment_modes = get_option( 'wps_payment_mode' ); ?>
-	<?php if( !empty( $order_postmeta['order_payment']['customer_choice'] ) && !empty( $order_postmeta['order_payment']['customer_choice']['method'] ) )?>
-		<div class="wps-alert-info"><strong><?php _e( 'Payment method customer select', 'wpshop'); ?> : </strong><br/>
-		<?php echo ( !empty( $order_postmeta ) &&  !empty(  $order_postmeta['order_payment']['customer_choice']['method'] ) && !empty( $payment_modes['mode'][ strtolower( (string)$order_postmeta['order_payment']['customer_choice']['method'] ) ][ 'name' ] ) ?  $payment_modes['mode'][ strtolower( (string)$order_postmeta['order_payment']['customer_choice']['method'] ) ]['name'] : sprintf( __( 'Unknow (%s)', 'wpshop'), strtolower( (string)$order_postmeta['order_payment']['customer_choice']['method'] ) ) ); ?></div>
+	<?php $payment_modes = get_option('wps_payment_mode'); ?>
+	<?php if (!empty($order_postmeta['order_payment']['customer_choice']) && !empty($order_postmeta['order_payment']['customer_choice']['method']))?>
+		<div class="wps-alert-info"><strong><?php _e('Payment method customer select', 'wpshop'); ?> : </strong><br/>
+		<?php echo (!empty($order_postmeta) && !empty($order_postmeta['order_payment']['customer_choice']['method']) && !empty($payment_modes['mode'][strtolower((string)$order_postmeta['order_payment']['customer_choice']['method'])]['name']) ? $payment_modes['mode'][strtolower((string)$order_postmeta['order_payment']['customer_choice']['method'])]['name'] : sprintf(__('Unknow (%s)', 'wpshop'), strtolower((string)$order_postmeta['order_payment']['customer_choice']['method']))); ?></div>
 
 	<?php
-		$payment_method_filter = apply_filters( 'wps_administration_order_payment_informations', $order->ID );
-		if ( $order->ID != $payment_method_filter ) {
+		$payment_method_filter = apply_filters('wps_administration_order_payment_informations', $order->ID);
+		if ($order->ID != $payment_method_filter) {
 			echo $payment_method_filter;
 		}
 	?>
 
-	<?php if( !empty( $order_postmeta['order_payment']['received'] ) ) : ?>
+	<?php if (!empty($order_postmeta['order_payment']['received'])) : ?>
 		<div class="wps-boxed">
-			<div class="wps-h2"><?php _e( 'Received payments', 'wpshop'); ?></div>
-		<?php foreach( $order_postmeta['order_payment']['received'] as $index_payment => $received_payment ) :
-				if( !empty( $received_payment['method'] ) ) :
+			<div class="wps-h2"><?php _e('Received payments', 'wpshop'); ?></div>
+		<?php foreach ($order_postmeta['order_payment']['received'] as $index_payment => $received_payment) :
+				if (!empty($received_payment['method'])) :
 				$i++;
 		?>
 			<?php
-			if ( !empty($received_payment['waited_amount']) ) {
+			if (!empty($received_payment['waited_amount'])) {
 				$waited_amount_sum += $received_payment['waited_amount'];
 			}
-			if ( !empty($received_payment['received_amount']) && ($received_payment['status'] == 'payment_received') ) {
+			if (!empty($received_payment['received_amount']) && ($received_payment['status'] == 'payment_received')) {
 				$received_amount_sum += $received_payment['received_amount'];
 			}
 			?>
 			<div>
-				<div class="wps-h5"><span class="dashicons dashicons-arrow-right"></span><strong><?php echo ( !empty( $received_payment ) &&  !empty(  $received_payment['method'] ) && !empty( $payment_modes['mode'][ strtolower( $received_payment['method'] ) ] ) && !empty( $payment_modes['mode'][ strtolower( $received_payment['method'] ) ][ 'name' ] ) ?  $payment_modes['mode'][ strtolower( $received_payment['method'] ) ]['name'] : sprintf( __( 'Unknow (%s)', 'wpshop'), strtolower( $received_payment['method'] ) ) ); ?></strong></div>
+				<div class="wps-h5"><span class="dashicons dashicons-arrow-right"></span><strong><?php echo (!empty($received_payment) && !empty($received_payment['method']) && !empty($payment_modes['mode'][strtolower($received_payment['method'])]) && !empty($payment_modes['mode'][strtolower($received_payment['method'])]['name']) ? $payment_modes['mode'][strtolower($received_payment['method'])]['name'] : sprintf(__('Unknow (%s)', 'wpshop'), strtolower($received_payment['method']))); ?></strong></div>
 				<div class="wps-product-section">
-					<div><strong><?php _e( 'Payment date', 'wpshop'); ?> :</strong> <?php echo ( !empty( $received_payment ) && !empty($received_payment['date']) ) ? mysql2date('d F Y H:i', $received_payment['date'], true) : __( 'Unknow', 'wpshop'); ?></div>
-					<div><strong><?php _e( 'Payment reference', 'wpshop'); ?> :</strong> <?php echo ( !empty( $received_payment ) && !empty($received_payment['payment_reference']) ) ? $received_payment['payment_reference'] : __( 'Unknow', 'wpshop'); ?></div>
-					<div><strong><?php _e( 'Amount', 'wpshop'); ?> :</strong> <?php echo ( !empty( $received_payment ) && !empty($received_payment['received_amount']) ) ? $received_payment['received_amount'].' '.wpshop_tools::wpshop_get_currency() : __( 'Unknow', 'wpshop'); ?></div>
-					<div><strong><?php _e( 'Status', 'wpshop'); ?> :</strong>
-						<?php if( !empty($received_payment['status']) && $received_payment['status'] == 'payment_received' ) : ?>
-							<span class="wps-label-vert"><?php _e( 'Received payment', 'wpshop'); ?></span>
-						<?php elseif( $received_payment['status'] == 'incorrect_amount' )  : ?>
-							<span class="wps-label-orange"><?php _e( 'Incorrect amount', 'wpshop'); ?></span>
-						<?php elseif( $received_payment['status'] == 'waiting_payment') : ?>
-							<span class="wps-label-rouge"><?php _e( 'Waiting payment', 'wpshop'); ?></span>
+					<div><strong><?php _e('Payment date', 'wpshop'); ?> :</strong> <?php echo (!empty($received_payment) && !empty($received_payment['date'])) ? mysql2date('d F Y H:i', $received_payment['date'], true) : __('Unknow', 'wpshop'); ?></div>
+					<div><strong><?php _e('Payment reference', 'wpshop'); ?> :</strong> <?php echo (!empty($received_payment) && !empty($received_payment['payment_reference'])) ? $received_payment['payment_reference'] : __('Unknow', 'wpshop'); ?></div>
+					<div><strong><?php _e('Amount', 'wpshop'); ?> :</strong> <?php echo (!empty($received_payment) && !empty($received_payment['received_amount'])) ? $received_payment['received_amount'] . ' ' . wpshop_tools::wpshop_get_currency() : __('Unknow', 'wpshop'); ?></div>
+					<div><strong><?php _e('Status', 'wpshop'); ?> :</strong>
+						<?php if (!empty($received_payment['status']) && $received_payment['status'] == 'payment_received') : ?>
+							<span class="wps-label-vert"><?php _e('Received payment', 'wpshop'); ?></span>
+						<?php elseif ($received_payment['status'] == 'incorrect_amount')  : ?>
+							<span class="wps-label-orange"><?php _e('Incorrect amount', 'wpshop'); ?></span>
+						<?php elseif ($received_payment['status'] == 'waiting_payment') : ?>
+							<span class="wps-label-rouge"><?php _e('Waiting payment', 'wpshop'); ?></span>
 						<?php else : ?>
 							<span class="wps-label-rouge"><?php echo $received_payment['status']; ?></span>
 						<?php endif; ?>
 					</div>
 				</div>
-				<?php if( !empty( $received_payment ) && !empty($received_payment['invoice_ref']) ) { ?>
+				<?php if (!empty($received_payment) && !empty($received_payment['invoice_ref'])) { ?>
 					<div>
-					<div class="wps-product-section"><a href="<?php echo WPSHOP_TEMPLATES_URL; ?>invoice.php?order_id=<?php echo $order->ID; ?>&invoice_ref=<?php echo $received_payment['invoice_ref']; ?>&mode=pdf" target="_blank" class="wps-bton-second-mini-rounded" role="button"><i class="dashicons dashicons-download"></i><?php _e( 'Download invoice', 'wpshop' ); ?></a></div>
-					<div class="wps-product-section"><a href="<?php echo WPSHOP_TEMPLATES_URL; ?>invoice.php?order_id=<?php echo $order->ID; ?>&invoice_ref=<?php echo $received_payment['invoice_ref']; ?>" target="_blank" class="wps-bton-fourth-mini-third" role="button"><i class="dashicons dashicons-welcome-view-site"></i><?php _e( 'Watch invoice', 'wpshop' ); ?></a></div>
+					<div class="wps-product-section"><a href="<?php echo WPSHOP_TEMPLATES_URL; ?>invoice.php?order_id=<?php echo $order->ID; ?>&invoice_ref=<?php echo $received_payment['invoice_ref']; ?>&mode=pdf" target="_blank" class="wps-bton-second-mini-rounded" role="button"><i class="dashicons dashicons-download"></i><?php _e('Download invoice', 'wpshop'); ?></a></div>
+					<div class="wps-product-section"><a href="<?php echo WPSHOP_TEMPLATES_URL; ?>invoice.php?order_id=<?php echo $order->ID; ?>&invoice_ref=<?php echo $received_payment['invoice_ref']; ?>" target="_blank" class="wps-bton-fourth-mini-third" role="button"><i class="dashicons dashicons-welcome-view-site"></i><?php _e('Watch invoice', 'wpshop'); ?></a></div>
 					</div>
-				<?php } elseif( !empty( $received_payment ) && empty( $received_payment['invoice_ref'] ) && $received_payment['status'] == 'payment_received' ) { ?>
+				<?php } elseif (!empty($received_payment) && empty($received_payment['invoice_ref']) && $received_payment['status'] == 'payment_received') { ?>
 					<div>
 					<input type="hidden" name="order_id" class="wps-regerate-invoice-payment-input<?php $idregen = uniqid(); echo $idregen; ?>" value="<?php echo $order->ID; ?>">
 					<input type="hidden" name="index_payment" class="wps-regerate-invoice-payment-input<?php echo $idregen; ?>" value="<?php echo $index_payment; ?>">
-					<div class="wps-product-section"><button data-nonce="<?php echo wp_create_nonce( 'wps_reverify_payment_invoice_ref' ); ?>" id="wps-regerate-invoice-payment-btn" class="wps-bton-fourth-mini-third" data-class="<?php echo $idregen; ?>"><i class="dashicons dashicons-controls-repeat"></i><?php _e( 'Regerate invoice payment', 'wpshop' ); ?></button></div>
+					<div class="wps-product-section"><button data-nonce="<?php echo wp_create_nonce('wps_reverify_payment_invoice_ref'); ?>" id="wps-regerate-invoice-payment-btn" class="wps-bton-fourth-mini-third" data-class="<?php echo $idregen; ?>"><i class="dashicons dashicons-controls-repeat"></i><?php _e('Regerate invoice payment', 'wpshop'); ?></button></div>
 					</div>
 				<?php } ?>
 				<br/>
 			</div>
 		<?php
 			endif;
-		endforeach;?>
+		endforeach; ?>
 
-		<?php if( $i == 0 ) : ?>
-			<div class="wps-alert-info"><?php _e( 'No received payment for the moment', 'wpshop'); ?></div>
-		<?php endif;?>
+		<?php if ($i == 0) : ?>
+			<div class="wps-alert-info"><?php _e('No received payment for the moment', 'wpshop'); ?></div>
+		<?php endif; ?>
 		</div>
 
-		<?php if ( ( ($total_amount - $received_amount_sum ) > 0) && ($order_postmeta['order_grand_total'] > 0) ) : ?>
+		<?php if ((($total_amount - $received_amount_sum) > 0) && ($order_postmeta['order_grand_total'] > 0)) : ?>
 		<div class="wps-boxed">
-			<div class="wps-h5"><?php _e( 'Add a new payment', 'wpshop'); ?></div>
+			<div class="wps-h5"><?php _e('Add a new payment', 'wpshop'); ?></div>
 			<div class="wps-gridwrapper2-padded">
 				<div class="wps-form-group">
 					<label><?php _e('Method', 'wpshop'); ?> :</label>
 					<div class="wps-form">
 						<select name="wpshop_admin_order_payment_received[method]">
-							<?php if(!empty( $payment_modes ) && !empty($payment_modes['mode'])  ) : ?>
-								<?php foreach( $payment_modes['mode'] as $mode_id => $mode ) : ?>
-									<?php if( !empty($mode['active']) ) : ?>
+							<?php if (!empty($payment_modes) && !empty($payment_modes['mode'])) : ?>
+								<?php foreach ($payment_modes['mode'] as $mode_id => $mode) : ?>
+									<?php if (!empty($mode['active'])) : ?>
 										<option value="<?php echo $mode_id; ?>"><?php echo $mode['name']; ?></option>
-									<?php endif;?>
+									<?php endif; ?>
 								<?php endforeach; ?>
-							<?php endif;?>
+							<?php endif; ?>
 						</select>
 					</div>
 				</div>
@@ -115,9 +115,9 @@ 
 				</div>
 
 			</div>
-			<input type="hidden" value="<?php echo ($waited_amount_sum - $received_amount_sum ); ?>" id="wpshop_admin_order_due_amount" />
+			<input type="hidden" value="<?php echo ($waited_amount_sum - $received_amount_sum); ?>" id="wpshop_admin_order_due_amount" />
 			<input type="hidden" value="" id="action_triggered_from" name="action_triggered_from" />
-			<div><button class="wps-bton-first-mini-rounded" id="wpshop_order_arrived_payment_amount_add_button"><?php _e( 'Add the payment', 'wpshop' ); ?></button></div>
+			<div><button class="wps-bton-first-mini-rounded" id="wpshop_order_arrived_payment_amount_add_button"><?php _e('Add the payment', 'wpshop'); ?></button></div>
 		</div>
 
 		<script type="text/javascript" >
@@ -141,9 +141,9 @@ 
 
 
 		<?php endif; ?>
-		<div class="wps-alert-<?php echo ( ( ($order_postmeta['order_amount_to_pay_now']) <= 0 ) ? 'success': 'warning' ); ?>"><u><?php _e( 'Due amount for this order', 'wpshop'); ?></u> : <span class="alignright"><strong><?php echo $order_postmeta['order_amount_to_pay_now'];?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong></span></div>
+		<div class="wps-alert-<?php echo ((($order_postmeta['order_amount_to_pay_now']) <= 0) ? 'success' : 'warning'); ?>"><u><?php _e('Due amount for this order', 'wpshop'); ?></u> : <span class="alignright"><strong><?php echo $order_postmeta['order_amount_to_pay_now']; ?> <?php echo wpshop_tools::wpshop_get_currency(); ?></strong></span></div>
 
 	<?php endif; ?>
 <?php else: ?>
 	<div class="wps-alert-info"><?php _e('No information available for this order payment', 'wpshop'); ?></div>
-<?php endif;?>
+<?php endif; ?>

includes/modules/wps_orders/templates/backend/product_order_historic.php

Spacing +12 added lines, -12 removed lines

@@ -1,24 +1,24 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if( !empty($sales_informations) ): ?>
+<?php if (!defined('ABSPATH')) exit;
+ if (!empty($sales_informations)): ?>
 <div class="wps-table">
 	<div class="wps-table-header wps-table-row">
-		<div class="wps-table-cell"><?php _e( 'Date', 'wpshop'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Order ID', 'wpshop'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Customer', 'wpshop'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Order Status', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Date', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Order ID', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Customer', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Order Status', 'wpshop'); ?></div>
 		<div class="wps-table-cell"></div>
 	</div>
-	<?php foreach( $sales_informations as $sale_informations) : ?>
+	<?php foreach ($sales_informations as $sale_informations) : ?>
 		<div class="wps-table-content wps-table-row">
-			<div class="wps-table-cell"><?php echo mysql2date('d F Y, H:i:s',$sale_informations['order_date'], true);?></div>
+			<div class="wps-table-cell"><?php echo mysql2date('d F Y, H:i:s', $sale_informations['order_date'], true); ?></div>
 			<div class="wps-table-cell"><?php echo $sale_informations['order_key']; ?></div>
-			<div class="wps-table-cell"><?php echo $sale_informations['customer_name']. ' '.$sale_informations['customer_firstname'].' ('.$sale_informations['customer_email'].')'; ?></div>
-			<div class="wps-table-cell"><span class="wps-label-<?php echo $color_label[ strtolower($sale_informations['order_status']) ]; ?>"><?php _e( $order_status[ strtolower($sale_informations['order_status']) ], 'wpshop' ); ?></span></div>
-			<div class="wps-table-cell"><a href="<?php echo admin_url('post.php?post=' .$sale_informations['order_id']. '&action=edit'); ?>" class="wps-bton-mini-rounded-first" target="_blank"><?php _e( 'See the order', 'wpshop'); ?></a></div>
+			<div class="wps-table-cell"><?php echo $sale_informations['customer_name'] . ' ' . $sale_informations['customer_firstname'] . ' (' . $sale_informations['customer_email'] . ')'; ?></div>
+			<div class="wps-table-cell"><span class="wps-label-<?php echo $color_label[strtolower($sale_informations['order_status'])]; ?>"><?php _e($order_status[strtolower($sale_informations['order_status'])], 'wpshop'); ?></span></div>
+			<div class="wps-table-cell"><a href="<?php echo admin_url('post.php?post=' . $sale_informations['order_id'] . '&action=edit'); ?>" class="wps-bton-mini-rounded-first" target="_blank"><?php _e('See the order', 'wpshop'); ?></a></div>
 		</div>
 	<?php endforeach; ?>
 </div>
 <?php else : ?>
-	<div class="wps-alert-info"><?php _e( 'This product has never been ordered', 'wpshop'); ?></div>
+	<div class="wps-alert-info"><?php _e('This product has never been ordered', '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($sales_informations) ): ?>
 <div class="wps-table">
 	<div class="wps-table-header wps-table-row">
@@ -18,7 +20,10 @@ 
 		</div>
 	<?php endforeach; ?>
 </div>
-<?php else : ?>
-	<div class="wps-alert-info"><?php _e( 'This product has never been ordered', 'wpshop'); ?></div>
+<?php else {
+	: ?>
+	<div class="wps-alert-info"><?php _e( 'This product has never been ordered', 'wpshop');
+}
+?></div>
 <?php endif; ?>
 

includes/modules/wps_orders/templates/backend/order-private-comments/wps_orders_sended_private_comments.php

Spacing +9 added lines, -9 removed lines

@@ -1,19 +1,19 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- $order_private_comments = get_post_meta( $oid, '_order_private_comments', true); ?>
-<?php if( !empty($order_private_comments) ) : ?>
+<?php if (!defined('ABSPATH')) exit;
+ $order_private_comments = get_post_meta($oid, '_order_private_comments', true); ?>
+<?php if (!empty($order_private_comments)) : ?>
 <?php $order_private_comments = array_reverse($order_private_comments); 
 ?>
-	<?php foreach($order_private_comments as $order_private_comment ) : ?>
+	<?php foreach ($order_private_comments as $order_private_comment) : ?>
 	<div class="wps_private_comment">
 		<div class="wps_private_comment_avatar">
-			<?php $user_id = ( !empty($order_private_comment) && !empty($order_private_comment['author']) ) ? $order_private_comment['author'] : get_current_user_id() ; ?>
-			<?php echo get_avatar( $user_id, 30 ); ?>
-			<?php $user_data = get_userdata( $user_id ); ?>
+			<?php $user_id = (!empty($order_private_comment) && !empty($order_private_comment['author'])) ? $order_private_comment['author'] : get_current_user_id(); ?>
+			<?php echo get_avatar($user_id, 30); ?>
+			<?php $user_data = get_userdata($user_id); ?>
 		</div>
 		<div class="wps_private_comment_author_informations">
 			<span class="wps_private_comment_author">
-			<?php echo ( !empty($order_private_comment['send_email']) && $order_private_comment['send_email'] === true ) ? '<span class="dashicons dashicons-email-alt"></span>' : ''; ?> 
-			<?php printf( __( '%s says on', 'wpshop'), $user_data->user_login ); ?></span> 
+			<?php echo (!empty($order_private_comment['send_email']) && $order_private_comment['send_email'] === true) ? '<span class="dashicons dashicons-email-alt"></span>' : ''; ?> 
+			<?php printf(__('%s says on', 'wpshop'), $user_data->user_login); ?></span> 
 			<span class="wps_private_comment_date"><?php echo mysql2date('d F Y H:i:s', $order_private_comment['comment_date'], true); ?></span>
 		</div>
 		<div class="wps_private_comment_message"><?php echo $order_private_comment['comment']; ?></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_orders/templates/backend/product-listing/wps_orders_product_listing_table.php

Braces +8 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  $order_post_meta = !empty($post) ? get_post_meta( $post->ID, '_wpshop_order_status', true ) : ""; ?>
 <div class="wps-table">
 	<div class="wps-table-header wps-table-row">
@@ -39,8 +41,11 @@ 
 		<?php endif; ?>
 	</div>
 	<?php endforeach; ?>
-	<?php else :
-	$letter_display = ( strtoupper( $current_letter ) != 'ALL' ) ? $current_letter : __('ALL', 'wpshop' ); ?>
+	<?php else {
+	:
+	$letter_display = ( strtoupper( $current_letter ) != 'ALL' ) ? $current_letter : __('ALL', 'wpshop' );
+}
+?>
 	<div class="wps-alert-info"><?php printf( __( 'No products corresponds to the letter <strong>"%s"</strong> search', 'wpshop'), strtoupper( $letter_display ) ); ?></div>
 	<?php endif; ?>
 </div>

Spacing +21 added lines, -21 removed lines

@@ -1,46 +1,46 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- $order_post_meta = !empty($post) ? get_post_meta( $post->ID, '_wpshop_order_status', true ) : ""; ?>
+<?php if (!defined('ABSPATH')) exit;
+ $order_post_meta = !empty($post) ? get_post_meta($post->ID, '_wpshop_order_status', true) : ""; ?>
 <div class="wps-table">
 	<div class="wps-table-header wps-table-row">
-		<div class="wps-table-cell"><?php _e( 'Picture', 'wpshop'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Product reference', 'wpshop'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Product name', 'wpshop'); ?></div>
-		<div class="wps-table-cell"><?php _e( 'Price', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Picture', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Product reference', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Product name', 'wpshop'); ?></div>
+		<div class="wps-table-cell"><?php _e('Price', 'wpshop'); ?></div>
 
-		<?php if ( 'completed' != $order_post_meta ) : ?>
-			<div class="wps-table-cell"><?php _e( 'Quantity', 'wpshop'); ?></div>
-			<div class="wps-table-cell"><?php _e( 'Add to order', 'wpshop'); ?></div>
+		<?php if ('completed' != $order_post_meta) : ?>
+			<div class="wps-table-cell"><?php _e('Quantity', 'wpshop'); ?></div>
+			<div class="wps-table-cell"><?php _e('Add to order', 'wpshop'); ?></div>
 		<?php endif; ?>
 	</div>
-	<?php if( !empty($products) ) : ?>
-	<?php foreach ( $products as $product ) :
+	<?php if (!empty($products)) : ?>
+	<?php foreach ($products as $product) :
 	$pid = $product->ID;
 	?>
-	<?php $product_metadata = get_post_meta( $product->ID, '_wpshop_product_metadata', true ); ?>
+	<?php $product_metadata = get_post_meta($product->ID, '_wpshop_product_metadata', true); ?>
 	<div class="wps-table-content wps-table-row">
-		<div class="wps-table-cell  wps-cart-item-img"><?php echo get_the_post_thumbnail( $product->ID, 'thumbnail' ); ?></div>
-		<div class="wps-table-cell"><?php echo ( !empty( $product_metadata) && $product_metadata['product_reference']) ? $product_metadata['product_reference'] : ''; ?></div>
+		<div class="wps-table-cell  wps-cart-item-img"><?php echo get_the_post_thumbnail($product->ID, 'thumbnail'); ?></div>
+		<div class="wps-table-cell"><?php echo (!empty($product_metadata) && $product_metadata['product_reference']) ? $product_metadata['product_reference'] : ''; ?></div>
 		<div class="wps-table-cell"><?php echo $product->post_title; ?></div>
 		<div class="wps-table-cell">
 		<?php
 			$product = wpshop_products::get_product_data($product->ID);
-			echo wpshop_prices::get_product_price($product, 'price_display', array('mini_output', 'grid') );
+			echo wpshop_prices::get_product_price($product, 'price_display', array('mini_output', 'grid'));
 		?>
 		</div>
-		<?php if ( 'completed' != $order_post_meta ) : ?>
+		<?php if ('completed' != $order_post_meta) : ?>
 			<div class="wps-table-cell">
-				<a class="wps-bton-icon-minus-small wps-cart-reduce-product-qty" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_set_qty_for_product_into_cart' ); ?>" href=""></a>
+				<a class="wps-bton-icon-minus-small wps-cart-reduce-product-qty" data-nonce="<?php echo wp_create_nonce('ajax_wpshop_set_qty_for_product_into_cart'); ?>" href=""></a>
 				<input id="wps-cart-product-qty-<?php echo $pid; ?>" class="wps-cart-product-qty" type="text" value="1" name="french-hens" size="3" style="text-align : center">
-				<a class="wps-bton-icon-plus-small wps-cart-add-product-qty" data-nonce="<?php echo wp_create_nonce( 'ajax_wpshop_set_qty_for_product_into_cart' ); ?>" href=""></a>
+				<a class="wps-bton-icon-plus-small wps-cart-add-product-qty" data-nonce="<?php echo wp_create_nonce('ajax_wpshop_set_qty_for_product_into_cart'); ?>" href=""></a>
 			</div>
 			<div class="wps-table-cell">
-				<a href="#" data-nonce="<?php echo wp_create_nonce( 'wps_add_product_to_order_admin' ); ?>" class="wps-bton-first-mini-rounded wps-order-add-product" id="wps-order-add-product-<?php echo $pid; ?>"><i class="wps-icon-basket"></i> <?php _e( 'Add to order', 'wpshop'); ?></a>
+				<a href="#" data-nonce="<?php echo wp_create_nonce('wps_add_product_to_order_admin'); ?>" class="wps-bton-first-mini-rounded wps-order-add-product" id="wps-order-add-product-<?php echo $pid; ?>"><i class="wps-icon-basket"></i> <?php _e('Add to order', 'wpshop'); ?></a>
 			</div>
 		<?php endif; ?>
 	</div>
 	<?php endforeach; ?>
 	<?php else :
-	$letter_display = ( strtoupper( $current_letter ) != 'ALL' ) ? $current_letter : __('ALL', 'wpshop' ); ?>
-	<div class="wps-alert-info"><?php printf( __( 'No products corresponds to the letter <strong>"%s"</strong> search', 'wpshop'), strtoupper( $letter_display ) ); ?></div>
+	$letter_display = (strtoupper($current_letter) != 'ALL') ? $current_letter : __('ALL', 'wpshop'); ?>
+	<div class="wps-alert-info"><?php printf(__('No products corresponds to the letter <strong>"%s"</strong> search', 'wpshop'), strtoupper($letter_display)); ?></div>
 	<?php endif; ?>
 </div>

includes/modules/wps_orders/wps_orders.php

Switch Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 DEFINE('WPS_ORDERS_DIR', basename(dirname(__FILE__)));

 DEFINE('WPS_ORDERS_PATH', str_replace( "\\", "/", str_replace( WPS_ORDERS_DIR, "", dirname( __FILE__ ) ) ) );

 DEFINE('WPS_ORDERS_URL', str_replace( str_replace( "\\", "/", ABSPATH), site_url() . '/', WPS_ORDERS_PATH ) );

-
DEFINE( 'WPS_ORDERS_BASE', plugin_dir_path( __FILE__ ) );


+

DEFINE( 'WPS_ORDERS_BASE', plugin_dir_path( __FILE__ ) );


 include( plugin_dir_path( __FILE__ ).'/controller/wps_orders_ctr.php' );
include( plugin_dir_path( __FILE__ ).'/controller/wps_orders_in_back_office.php' );

 include( plugin_dir_path( __FILE__ ).'/model/wps_orders_mdl.php' );
include( plugin_dir_path( __FILE__ ).'/model/wps_back_office_orders_mdl.php' );


 $wps_orders_in_back_office = new wps_orders_in_back_office();

Spacing +6 added lines, -6 removed lines

@@ -1,9 +1,9 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;


+<?php if (!defined('ABSPATH')) exit;


 DEFINE('WPS_ORDERS_DIR', basename(dirname(__FILE__)));

-DEFINE('WPS_ORDERS_PATH', str_replace( "\\", "/", str_replace( WPS_ORDERS_DIR, "", dirname( __FILE__ ) ) ) );

-DEFINE('WPS_ORDERS_URL', str_replace( str_replace( "\\", "/", ABSPATH), site_url() . '/', WPS_ORDERS_PATH ) );

-
DEFINE( 'WPS_ORDERS_BASE', plugin_dir_path( __FILE__ ) );


-include( plugin_dir_path( __FILE__ ).'/controller/wps_orders_ctr.php' );
include( plugin_dir_path( __FILE__ ).'/controller/wps_orders_in_back_office.php' );

-include( plugin_dir_path( __FILE__ ).'/model/wps_orders_mdl.php' );
include( plugin_dir_path( __FILE__ ).'/model/wps_back_office_orders_mdl.php' );


+DEFINE('WPS_ORDERS_PATH', str_replace("\\", "/", str_replace(WPS_ORDERS_DIR, "", dirname(__FILE__))));

+DEFINE('WPS_ORDERS_URL', str_replace(str_replace("\\", "/", ABSPATH), site_url() . '/', WPS_ORDERS_PATH));

+
DEFINE('WPS_ORDERS_BASE', plugin_dir_path(__FILE__));


+include(plugin_dir_path(__FILE__) . '/controller/wps_orders_ctr.php'); include(plugin_dir_path(__FILE__) . '/controller/wps_orders_in_back_office.php');

+include(plugin_dir_path(__FILE__) . '/model/wps_orders_mdl.php'); include(plugin_dir_path(__FILE__) . '/model/wps_back_office_orders_mdl.php');


 $wps_orders_in_back_office = new wps_orders_in_back_office();

 $wps_orders = new wps_orders_ctr();

\ 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;
+}
 DEFINE('WPS_ORDERS_DIR', basename(dirname(__FILE__)));

 DEFINE('WPS_ORDERS_PATH', str_replace( "\\", "/", str_replace( WPS_ORDERS_DIR, "", dirname( __FILE__ ) ) ) );

 DEFINE('WPS_ORDERS_URL', str_replace( str_replace( "\\", "/", ABSPATH), site_url() . '/', WPS_ORDERS_PATH ) );

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
  *