Eoxia / wpshop

includes/modules/wps_classic_checkout/templates/frontend/checkout_step_indicator/checkout_step_indicator_step.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="<?php echo $step_class; ?>" id="wps-step-indicator-<?php echo $step_id; ?>">
-	<?php if( $step_finished && ( $default_step <= ( max( array_keys( $steps ) ) + 1 ) ) ) :
-		$url = get_permalink( wpshop_tools::get_page_id($checkout_page_id)  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step='.$step_id;
+	<?php if ($step_finished && ($default_step <= (max(array_keys($steps)) + 1))) :
+		$url = get_permalink(wpshop_tools::get_page_id($checkout_page_id)) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=' . $step_id;
 		?>
 		<a href="<?php echo $url; ?>"><i class="wps-circlerounded"><?php echo $step_id; ?></i><span><?php echo $step; ?></span></a>
 	<?php else : ?>

Braces +8 added lines, -3 removed lines

@@ -1,11 +1,16 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <div class="<?php echo $step_class; ?>" id="wps-step-indicator-<?php echo $step_id; ?>">
 	<?php if( $step_finished && ( $default_step <= ( max( array_keys( $steps ) ) + 1 ) ) ) :
 		$url = get_permalink( wpshop_tools::get_page_id($checkout_page_id)  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step='.$step_id;
 		?>
 		<a href="<?php echo $url; ?>"><i class="wps-circlerounded"><?php echo $step_id; ?></i><span><?php echo $step; ?></span></a>
-	<?php else : ?>
-		<i class="wps-circlerounded"><?php echo $step_id; ?></i><span><?php echo $step; ?></span>
+	<?php else {
+	: ?>
+		<i class="wps-circlerounded"><?php echo $step_id;
+}
+?></i><span><?php echo $step; ?></span>
 	<?php endif ?>
 </div>
\ No newline at end of file

includes/modules/wps_shipping/wps_shipping.php

Spacing +6 added lines, -6 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /**
  * Cart rules bootstrap file
@@ -12,12 +12,12 @@ 
 
 /** Template Global vars **/
 DEFINE('WPS_SHIPPING_MODE_DIR', basename(dirname(__FILE__)));
-DEFINE('WPS_SHIPPING_MODE_PATH', str_replace( "\\", "/", str_replace( WPS_SHIPPING_MODE_DIR, "", dirname( __FILE__ ) ) ) );
-DEFINE('WPS_SHIPPING_MODE_URL', str_replace( str_replace( "\\", "/", ABSPATH), site_url() . '/', WPS_SHIPPING_MODE_PATH ) );
+DEFINE('WPS_SHIPPING_MODE_PATH', str_replace("\\", "/", str_replace(WPS_SHIPPING_MODE_DIR, "", dirname(__FILE__))));
+DEFINE('WPS_SHIPPING_MODE_URL', str_replace(str_replace("\\", "/", ABSPATH), site_url() . '/', WPS_SHIPPING_MODE_PATH));
 
-include( plugin_dir_path( __FILE__ ).'/controller/wps_shipping_ctr.php' );
-include( plugin_dir_path( __FILE__ ).'/controller/wps_shipping_mode_ctr.php' );
-include( plugin_dir_path( __FILE__ ).'/controller/wps_shipping_mode_ajax_actions.php' );
+include(plugin_dir_path(__FILE__) . '/controller/wps_shipping_ctr.php');
+include(plugin_dir_path(__FILE__) . '/controller/wps_shipping_mode_ctr.php');
+include(plugin_dir_path(__FILE__) . '/controller/wps_shipping_mode_ajax_actions.php');
 
 
 $wps_shipping_mode_ctr = new wps_shipping_mode_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_shipping/templates/frontend/shipping-infos-summary.php

Spacing +4 added lines, -4 removed lines

@@ -1,16 +1,16 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wps-resume-address">
-<?php if( !empty($shipping_content) ) : ?>
+<?php if (!empty($shipping_content)) : ?>
 	<div class="wps-item-resume-address">
-		<div class="entry-title"><?php _e( 'Shipping address', 'wpshop')?></div>
+		<div class="entry-title"><?php _e('Shipping address', 'wpshop')?></div>
 		<div class="entry-content">
 			<?php echo $shipping_content; ?>
 		</div>
 	</div>
 	<?php endif; ?>
 	<div class="wps-item-resume-address">
-		<div class="entry-title"><?php _e( 'Billing address', 'wpshop')?></div>
+		<div class="entry-title"><?php _e('Billing address', 'wpshop')?></div>
 		<div class="entry-content">
 			<?php echo $billing_content; ?>
 		</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_shipping/templates/frontend/shipping-mode-element.php

Braces +7 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  if( !empty( $shipping_mode['active'] ) ) : ?>
 	<?php
 	$checked = $class = '';
@@ -10,17 +12,14 @@ 
 	if( !empty($selected_shipping_method) && $shipping_mode_id == $selected_shipping_method ) {
 		$class = 'wps-activ';
 		$checked = 'checked="checked"';
-	}
-	else {
+	} else {
 		if( empty($selected_shipping_method) && ( !empty($shipping_modes) && !empty($shipping_modes['default_choice']) && $shipping_mode_id == $shipping_modes['default_choice'] )  ) {
 			$checked = 'checked="checked"';
 			$class = 'wps-activ';
-		}
-		else if( $count == 0 && empty($selected_shipping_method) ) {
+		} else if( $count == 0 && empty($selected_shipping_method) ) {
 			$checked = 'checked="checked"';
 			$class = 'wps-activ';
-		}
-		else {
+		} else {
 			$checked = $class = '';
 		}
 	}
@@ -43,8 +42,7 @@ 
 		if ( $order_amount  < $shipping_mode['free_from'] ) {
 			$free_in = ($shipping_mode['free_from'] - $order_amount);
 			$shipping_cost .= ' ' . sprintf(__('Free in %s', 'wpshop'), $free_in. ' ' . $currency);
-		}
-		else {
+		} else {
 			$shipping_cost = '<span class="wps-badge-vert">'.__('Free shipping cost', 'wpshop').'</span>';
 			$shipping_cost_are_free = true;
 		}

Spacing +29 added lines, -29 removed lines

@@ -1,22 +1,22 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if( !empty( $shipping_mode['active'] ) ) : ?>
+<?php if (!defined('ABSPATH')) exit;
+ if (!empty($shipping_mode['active'])) : ?>
 	<?php
 	$checked = $class = '';
 
-	$selected_shipping_method = ( !empty($_SESSION['shipping_method']) ) ? $_SESSION['shipping_method'] : '';
+	$selected_shipping_method = (!empty($_SESSION['shipping_method'])) ? $_SESSION['shipping_method'] : '';
 
-	$count = count( $shipping_modes );
-	$shipping_modes = get_option( 'wps_shipping_mode' );
-	if( !empty($selected_shipping_method) && $shipping_mode_id == $selected_shipping_method ) {
+	$count = count($shipping_modes);
+	$shipping_modes = get_option('wps_shipping_mode');
+	if (!empty($selected_shipping_method) && $shipping_mode_id == $selected_shipping_method) {
 		$class = 'wps-activ';
 		$checked = 'checked="checked"';
 	}
 	else {
-		if( empty($selected_shipping_method) && ( !empty($shipping_modes) && !empty($shipping_modes['default_choice']) && $shipping_mode_id == $shipping_modes['default_choice'] )  ) {
+		if (empty($selected_shipping_method) && (!empty($shipping_modes) && !empty($shipping_modes['default_choice']) && $shipping_mode_id == $shipping_modes['default_choice'])) {
 			$checked = 'checked="checked"';
 			$class = 'wps-activ';
 		}
-		else if( $count == 0 && empty($selected_shipping_method) ) {
+		else if ($count == 0 && empty($selected_shipping_method)) {
 			$checked = 'checked="checked"';
 			$class = 'wps-activ';
 		}
@@ -28,24 +28,24 @@ 
 	$shipping_cost_are_free = false;
 	$free_shipping_cost_alert = '';
 	$currency = wpshop_tools::wpshop_get_currency();
-	$cart_items = ( !empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])  ) ? $_SESSION['cart']['order_items'] : '';
-	$price_piloting = get_option( 'wpshop_shop_price_piloting' );
-	if( !empty($cart_items) ) {
+	$cart_items = (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) ? $_SESSION['cart']['order_items'] : '';
+	$price_piloting = get_option('wpshop_shop_price_piloting');
+	if (!empty($cart_items)) {
 		$wps_shipping = new wps_shipping();
-		$cart_weight = $wps_shipping->calcul_cart_weight( $cart_items );
-		$total_cart_ht_or_ttc_regarding_config = ( !empty($price_piloting) && $price_piloting == 'HT' )  ? $_SESSION['cart']['order_total_ht'] : $_SESSION['cart']['order_total_ttc'];
-		$total_shipping_cost_for_products = $wps_shipping->calcul_cart_items_shipping_cost( $cart_items );
-		$shipping_cost = $wps_shipping->get_shipping_cost( count( $cart_items ), $total_cart_ht_or_ttc_regarding_config, $total_shipping_cost_for_products, $cart_weight, $shipping_mode_id ).' '.$currency;
+		$cart_weight = $wps_shipping->calcul_cart_weight($cart_items);
+		$total_cart_ht_or_ttc_regarding_config = (!empty($price_piloting) && $price_piloting == 'HT') ? $_SESSION['cart']['order_total_ht'] : $_SESSION['cart']['order_total_ttc'];
+		$total_shipping_cost_for_products = $wps_shipping->calcul_cart_items_shipping_cost($cart_items);
+		$shipping_cost = $wps_shipping->get_shipping_cost(count($cart_items), $total_cart_ht_or_ttc_regarding_config, $total_shipping_cost_for_products, $cart_weight, $shipping_mode_id) . ' ' . $currency;
 	}
 
-	if (  !empty($shipping_mode['free_from']) ) {
-		$order_amount = ( !empty($price_piloting_option) && $price_piloting_option == 'HT' ) ? number_format((float)$_SESSION['cart']['order_total_ht'], 2, '.', '') : number_format((float)$_SESSION['cart']['order_total_ttc'], 2, '.', '');
-		if ( $order_amount  < $shipping_mode['free_from'] ) {
+	if (!empty($shipping_mode['free_from'])) {
+		$order_amount = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? number_format((float)$_SESSION['cart']['order_total_ht'], 2, '.', '') : number_format((float)$_SESSION['cart']['order_total_ttc'], 2, '.', '');
+		if ($order_amount < $shipping_mode['free_from']) {
 			$free_in = ($shipping_mode['free_from'] - $order_amount);
-			$shipping_cost .= ' ' . sprintf(__('Free in %s', 'wpshop'), $free_in. ' ' . $currency);
+			$shipping_cost .= ' ' . sprintf(__('Free in %s', 'wpshop'), $free_in . ' ' . $currency);
 		}
 		else {
-			$shipping_cost = '<span class="wps-badge-vert">'.__('Free shipping cost', 'wpshop').'</span>';
+			$shipping_cost = '<span class="wps-badge-vert">' . __('Free shipping cost', 'wpshop') . '</span>';
 			$shipping_cost_are_free = true;
 		}
 	}
@@ -55,24 +55,24 @@ 
 
 
 	<li class="<?php echo $class; ?> wps-bloc-loader">
-			<span><input type="radio" name="wps-shipping-method" data-nonce="<?php echo wp_create_nonce( 'wps_calculate_shipping_cost' ); ?>" value="<?php echo $shipping_mode_id; ?>" id="<?php echo $shipping_mode_id ; ?>" <?php echo $checked; ?> /> <?php apply_filters( 'wps-extra-fields-'.$shipping_mode_id, '' ); ?></span>
+			<span><input type="radio" name="wps-shipping-method" data-nonce="<?php echo wp_create_nonce('wps_calculate_shipping_cost'); ?>" value="<?php echo $shipping_mode_id; ?>" id="<?php echo $shipping_mode_id; ?>" <?php echo $checked; ?> /> <?php apply_filters('wps-extra-fields-' . $shipping_mode_id, ''); ?></span>
 
-			<?php echo ( !empty($shipping_mode['logo']) ? '<span class="wps-shipping-method-logo">'.wp_get_attachment_image( $shipping_mode['logo'], 'thumbnail' ).'</span>': '' ); ?>
+			<?php echo (!empty($shipping_mode['logo']) ? '<span class="wps-shipping-method-logo">' . wp_get_attachment_image($shipping_mode['logo'], 'thumbnail') . '</span>' : ''); ?>
 
-			<span class="wps-shipping-method-name"><strong><?php _e( $shipping_mode['name'], 'wpshop' ); ?></strong></span>
+			<span class="wps-shipping-method-name"><strong><?php _e($shipping_mode['name'], 'wpshop'); ?></strong></span>
 			<span class="alignright">
-				<?php if ( false === $shipping_cost_are_free ) : _e('Cost of postage ', 'wpshop'); endif; ?>
+				<?php if (false === $shipping_cost_are_free) : _e('Cost of postage ', 'wpshop'); endif; ?>
 				<?php echo $shipping_cost; ?>
-				<?php if ( false === $shipping_cost_are_free ) : echo $price_piloting; endif; ?>
+				<?php if (false === $shipping_cost_are_free) : echo $price_piloting; endif; ?>
 			</span>
 
-			<div class="wps-shipping-method-explanation"><?php if( !empty( $shipping_mode['explanation'] ) ) :
-				_e( $shipping_mode['explanation'], 'wpshop' );
+			<div class="wps-shipping-method-explanation"><?php if (!empty($shipping_mode['explanation'])) :
+				_e($shipping_mode['explanation'], 'wpshop');
 			endif; ?></div>
-			<div id="container_<?php echo $shipping_mode_id ; ?>" >
+			<div id="container_<?php echo $shipping_mode_id; ?>" >
 			<?php
 				$result_filter = apply_filters('wps_shipping_mode_additional_content', $shipping_mode_id);
-				if($result_filter != $shipping_mode_id) {
+				if ($result_filter != $shipping_mode_id) {
 					echo $result_filter;
 				}
 			?></div>

includes/modules/wps_shipping/templates/backend/shipping-modes.php

Braces +8 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  if( !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) ) : ?>
 <div class="wps-alert-error" id="wps_shipping_config_save_message" style="display : none"><span class="dashicons dashicons-info"></span> <?php _e( 'Process saving, please wait...', 'wpshop'); ?></div>
 <div class="wps-alert-info"><span class="dashicons dashicons-lightbulb"></span> <?php printf( __( 'Offer a new shipping service to your customer with <a href="%s" target="_blank">So Colissimo or another shipping mode</a>', 'wpshop'), 'http://shop.eoxia.com/boutique/shop/modules-wpshop/modules-de-livraison/'); ?></div>
@@ -18,6 +20,9 @@ 
 	endforeach; ?>
 </div>
 <div><a class="wps-bton-mini-rounded-fourth wps_create_new_shipping_mode"><i class="wps-icon-pencil"></i> <?php _e( 'Add a new shipping mode', 'wpshop'); ?></a></div>
-<?php else : ?>
-	<div class="wps-alert-info"><?php _e( 'No shipping mode available', 'wpshop'); ?></div>
+<?php else {
+	: ?>
+	<div class="wps-alert-info"><?php _e( 'No shipping mode available', 'wpshop');
+}
+?></div>
 <?php endif; ?>

Spacing +14 added lines, -14 removed lines

@@ -1,23 +1,23 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if( !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) ) : ?>
-<div class="wps-alert-error" id="wps_shipping_config_save_message" style="display : none"><span class="dashicons dashicons-info"></span> <?php _e( 'Process saving, please wait...', 'wpshop'); ?></div>
-<div class="wps-alert-info"><span class="dashicons dashicons-lightbulb"></span> <?php printf( __( 'Offer a new shipping service to your customer with <a href="%s" target="_blank">So Colissimo or another shipping mode</a>', 'wpshop'), 'http://shop.eoxia.com/boutique/shop/modules-wpshop/modules-de-livraison/'); ?></div>
+<?php if (!defined('ABSPATH')) exit;
+ if (!empty($shipping_mode_option) && !empty($shipping_mode_option['modes'])) : ?>
+<div class="wps-alert-error" id="wps_shipping_config_save_message" style="display : none"><span class="dashicons dashicons-info"></span> <?php _e('Process saving, please wait...', 'wpshop'); ?></div>
+<div class="wps-alert-info"><span class="dashicons dashicons-lightbulb"></span> <?php printf(__('Offer a new shipping service to your customer with <a href="%s" target="_blank">So Colissimo or another shipping mode</a>', 'wpshop'), 'http://shop.eoxia.com/boutique/shop/modules-wpshop/modules-de-livraison/'); ?></div>
 <div class="wps-table" id="wps_shipping_mode_list_container">
 	<div class="wps-table-header wps-table-row" >
 			<div class="wps-table-cell"></div>
-			<div class="wps-table-cell"><?php _e( 'Logo', 'wpshop'); ?></div>
-			<div class="wps-table-cell"><?php _e( 'Shipping mode Name', 'wpshop'); ?></div>
-			<div class="wps-table-cell"><?php _e( 'Configure', 'wpshop'); ?></div>
-			<div class="wps-table-cell"><?php _e( 'Activate', 'wpshop'); ?></div>
-			<div class="wps-table-cell"><?php _e( 'Default shipping mode', 'wpshop'); ?></div>
+			<div class="wps-table-cell"><?php _e('Logo', 'wpshop'); ?></div>
+			<div class="wps-table-cell"><?php _e('Shipping mode Name', 'wpshop'); ?></div>
+			<div class="wps-table-cell"><?php _e('Configure', 'wpshop'); ?></div>
+			<div class="wps-table-cell"><?php _e('Activate', 'wpshop'); ?></div>
+			<div class="wps-table-cell"><?php _e('Default shipping mode', 'wpshop'); ?></div>
 	</div>
-	<?php foreach( $shipping_mode_option['modes'] as $k => $shipping_mode ) :
-		if( $k != 'default_choice' ) :
-			require( wpshop_tools::get_template_part( WPS_SHIPPING_MODE_DIR, $this->template_dir, "backend", "shipping-mode") );
+	<?php foreach ($shipping_mode_option['modes'] as $k => $shipping_mode) :
+		if ($k != 'default_choice') :
+			require(wpshop_tools::get_template_part(WPS_SHIPPING_MODE_DIR, $this->template_dir, "backend", "shipping-mode"));
 		endif;
 	endforeach; ?>
 </div>
-<div><a data-nonce="<?php echo wp_create_nonce( 'wps_add_new_shipping_mode' ); ?>" class="wps-bton-mini-rounded-fourth wps_create_new_shipping_mode"><i class="wps-icon-pencil"></i> <?php _e( 'Add a new shipping mode', 'wpshop'); ?></a></div>
+<div><a data-nonce="<?php echo wp_create_nonce('wps_add_new_shipping_mode'); ?>" class="wps-bton-mini-rounded-fourth wps_create_new_shipping_mode"><i class="wps-icon-pencil"></i> <?php _e('Add a new shipping mode', 'wpshop'); ?></a></div>
 <?php else : ?>
-	<div class="wps-alert-info"><?php _e( 'No shipping mode available', 'wpshop'); ?></div>
+	<div class="wps-alert-info"><?php _e('No shipping mode available', 'wpshop'); ?></div>
 <?php endif; ?>

includes/modules/wps_shipping/templates/backend/order-shipping-infos.php

Spacing +10 added lines, -10 removed lines

@@ -1,26 +1,26 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
- if( !empty($shipping_method_name) ) : ?>
-	<div class="wps-alert-info"><strong><?php _e( 'Selected shipping method', 'wpshop'); ?></strong> : <?php echo $shipping_method_name; ?></div>
+<?php if (!defined('ABSPATH')) exit;
+ if (!empty($shipping_method_name)) : ?>
+	<div class="wps-alert-info"><strong><?php _e('Selected shipping method', 'wpshop'); ?></strong> : <?php echo $shipping_method_name; ?></div>
 <?php else : ?>
-	<div class="wps-alert-info"><?php _e( 'No selected shipping method', 'wpshop'); ?></div>
+	<div class="wps-alert-info"><?php _e('No selected shipping method', 'wpshop'); ?></div>
 <?php endif; ?>
 
 <div class="wps-boxed">
-	<span class="wps-h5"><?php _e( 'Shipping informations', 'wpshop');?></span>
-	<?php if ( !empty($order_postmeta['order_status']) && $order_postmeta['order_status'] != 'shipped' ) : ?>
+	<span class="wps-h5"><?php _e('Shipping informations', 'wpshop'); ?></span>
+	<?php if (!empty($order_postmeta['order_status']) && $order_postmeta['order_status'] != 'shipped') : ?>
 			<div><a data-id="<?php echo $order->ID; ?>" class="wps-bton-first-mini-rounded markAsShipped order_<?php echo $order->ID; ?>"><?php _e('Mark as shipped', 'wpshop'); ?></a></div>
 			<ul id="wps-order-shipping-informations"></ul>
 	<?php else : ?>
 		<div>
 			<ul id="wps-order-shipping-informations">
-				<li><strong><?php _e('Order shipping date','wpshop') ?> :</strong><?php echo ( empty($order_postmeta['order_shipping_date']) ? __('Unknow','wpshop') : mysql2date('d F Y H:i:s', $order_postmeta['order_shipping_date'],true) ); ?></li>
-				<li><strong><?php _e('Tracking number','wpshop'); ?> :</strong> <?php echo ( !empty($order_postmeta['order_trackingNumber']) ) ? $order_postmeta['order_trackingNumber'] : __('Unknow','wpshop'); ?></li>
-				<li><strong><?php _e('Tracking link','wpshop'); ?> :</strong> <?php echo ( !empty($order_postmeta['order_trackingLink']) ) ? $order_postmeta['order_trackingLink'] : __('Unknow','wpshop'); ?></li>
+				<li><strong><?php _e('Order shipping date', 'wpshop') ?> :</strong><?php echo (empty($order_postmeta['order_shipping_date']) ? __('Unknow', 'wpshop') : mysql2date('d F Y H:i:s', $order_postmeta['order_shipping_date'], true)); ?></li>
+				<li><strong><?php _e('Tracking number', 'wpshop'); ?> :</strong> <?php echo (!empty($order_postmeta['order_trackingNumber'])) ? $order_postmeta['order_trackingNumber'] : __('Unknow', 'wpshop'); ?></li>
+				<li><strong><?php _e('Tracking link', 'wpshop'); ?> :</strong> <?php echo (!empty($order_postmeta['order_trackingLink'])) ? $order_postmeta['order_trackingLink'] : __('Unknow', 'wpshop'); ?></li>
 			</ul>
 		</div>
 <?php endif; ?>
 
-<?php if ( !empty($order_postmeta['order_invoice_ref']) ) : ?>
+<?php if (!empty($order_postmeta['order_invoice_ref'])) : ?>
 	<div><a href="<?php echo WPSHOP_TEMPLATES_URL; ?>invoice.php?order_id=<?php echo $order->ID; ?>&invoice_ref=<?php echo $order_postmeta['order_invoice_ref']; ?>&bon_colisage=ok&mode=pdf" target="_blank" class="wps-bton-second-mini-rounded" ><?php _e('Download the product list', 'wpshop'); ?></a></div>
 <?php endif; ?>
 </div>

Braces +13 added lines, -5 removed lines

@@ -1,8 +1,13 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
  if( !empty($shipping_method_name) ) : ?>
 	<div class="wps-alert-info"><strong><?php _e( 'Selected shipping method', 'wpshop'); ?></strong> : <?php echo $shipping_method_name; ?></div>
-<?php else : ?>
-	<div class="wps-alert-info"><?php _e( 'No selected shipping method', 'wpshop'); ?></div>
+<?php else {
+	: ?>
+	<div class="wps-alert-info"><?php _e( 'No selected shipping method', 'wpshop');
+}
+?></div>
 <?php endif; ?>
 
 <div class="wps-boxed">
@@ -10,10 +15,13 @@ 
 	<?php if ( !empty($order_postmeta['order_status']) && $order_postmeta['order_status'] != 'shipped' ) : ?>
 			<div><a data-id="<?php echo $order->ID; ?>" class="wps-bton-first-mini-rounded markAsShipped order_<?php echo $order->ID; ?>"><?php _e('Mark as shipped', 'wpshop'); ?></a></div>
 			<ul id="wps-order-shipping-informations"></ul>
-	<?php else : ?>
+	<?php else {
+	: ?>
 		<div>
 			<ul id="wps-order-shipping-informations">
-				<li><strong><?php _e('Order shipping date','wpshop') ?> :</strong><?php echo ( empty($order_postmeta['order_shipping_date']) ? __('Unknow','wpshop') : mysql2date('d F Y H:i:s', $order_postmeta['order_shipping_date'],true) ); ?></li>
+				<li><strong><?php _e('Order shipping date','wpshop') ?> :</strong><?php echo ( empty($order_postmeta['order_shipping_date']) ? __('Unknow','wpshop') : mysql2date('d F Y H:i:s', $order_postmeta['order_shipping_date'],true) );
+}
+?></li>
 				<li><strong><?php _e('Tracking number','wpshop'); ?> :</strong> <?php echo ( !empty($order_postmeta['order_trackingNumber']) ) ? $order_postmeta['order_trackingNumber'] : __('Unknow','wpshop'); ?></li>
 				<li><strong><?php _e('Tracking link','wpshop'); ?> :</strong> <?php echo ( !empty($order_postmeta['order_trackingLink']) ) ? $order_postmeta['order_trackingLink'] : __('Unknow','wpshop'); ?></li>
 			</ul>

includes/modules/wps_shipping/templates/backend/shipping-mode.php

Spacing +10 added lines, -10 removed lines

@@ -1,26 +1,26 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wps-table-content wps-table-row wps_shipping_mode_container">
 		<div class="wps-table-cell wps-cart-item-img">
 			<div id="wps_shipping_mode_logo_container_<?php echo $k; ?>">
-				<?php echo ( !empty($shipping_mode['logo']) ? ( (strstr($shipping_mode['logo'], 'http://') === FALSE ) ? wp_get_attachment_image( $shipping_mode['logo'], 'thumbnail') : '<img src="' .$shipping_mode['logo']. '" alt="" />' ) : '' ); ?>
+				<?php echo (!empty($shipping_mode['logo']) ? ((strstr($shipping_mode['logo'], 'http://') === FALSE) ? wp_get_attachment_image($shipping_mode['logo'], 'thumbnail') : '<img src="' . $shipping_mode['logo'] . '" alt="" />') : ''); ?>
 			</div>
 		</div>
 		<div class="wps-table-cell">
-			<a class="wps-bton-first-mini-rounded add_logo_to_shipping_mode" id="add_logo_to_shipping_mode_<?php echo $k; ?>" href="#"><?php _e( 'Add a logo', 'wpshop'); ?></a>
-			<input type="hidden" name="wps_shipping_mode[modes][<?php echo $k; ?>][logo]"  id="wps_shipping_mode_logo_<?php echo $k; ?>" value="<?php echo ( !empty($shipping_mode['logo']) ) ? $shipping_mode['logo'] : ''; ?>" />
+			<a class="wps-bton-first-mini-rounded add_logo_to_shipping_mode" id="add_logo_to_shipping_mode_<?php echo $k; ?>" href="#"><?php _e('Add a logo', 'wpshop'); ?></a>
+			<input type="hidden" name="wps_shipping_mode[modes][<?php echo $k; ?>][logo]"  id="wps_shipping_mode_logo_<?php echo $k; ?>" value="<?php echo (!empty($shipping_mode['logo'])) ? $shipping_mode['logo'] : ''; ?>" />
 		</div>
 		<div class="wps-table-cell">
-			<input type="text" name="wps_shipping_mode[modes][<?php echo $k; ?>][name]" id="wps_shipping_mode_configuration_<?php echo $k; ?>_name" value="<?php echo ( !empty($shipping_mode['name']) ) ? $shipping_mode['name'] : ''; ?>" />
+			<input type="text" name="wps_shipping_mode[modes][<?php echo $k; ?>][name]" id="wps_shipping_mode_configuration_<?php echo $k; ?>_name" value="<?php echo (!empty($shipping_mode['name'])) ? $shipping_mode['name'] : ''; ?>" />
 		</div>
-		<div class="wps-table-cell"><a href="#TB_inline?width=780&amp;height=700&amp;inlineId=<?php echo $k; ?>_shipping_configuration_interface" class="thickbox wps-bton-first-mini-rounded" title="<?php _e('Configure the shipping mode', 'wpshop'); ?>" ><?php _e( 'Configure', 'wpshop'); ?></a></div>
-		<div class="wps-table-cell"><input type="checkbox" id="wps_shipping_mode_<?php echo $k; ?>" class="wps_shipping_mode_active" name="wps_shipping_mode[modes][<?php echo $k; ?>][active]" <?php echo ( (!empty($shipping_mode) && !empty($shipping_mode['active']) ) ? 'checked="checked"' : '' ); ?> /></div>
-		<?php $shipping_mode_option = get_option( 'wps_shipping_mode' ); ?>
-		<div class="wps-table-cell"><input type="radio" id="wps_shipping_mode_<?php echo $k; ?>_radio_default" name="wps_shipping_mode[default_choice]" value="<?php echo $k; ?>" <?php echo ( !empty( $shipping_mode_option['default_choice'] ) && $shipping_mode_option['default_choice'] == $k ) ? 'checked="checked"' : ''; echo ( (!empty($shipping_mode) && !empty($shipping_mode['active']) ) ? '' : 'disabled="disabled"' ); ?> /></div>
+		<div class="wps-table-cell"><a href="#TB_inline?width=780&amp;height=700&amp;inlineId=<?php echo $k; ?>_shipping_configuration_interface" class="thickbox wps-bton-first-mini-rounded" title="<?php _e('Configure the shipping mode', 'wpshop'); ?>" ><?php _e('Configure', 'wpshop'); ?></a></div>
+		<div class="wps-table-cell"><input type="checkbox" id="wps_shipping_mode_<?php echo $k; ?>" class="wps_shipping_mode_active" name="wps_shipping_mode[modes][<?php echo $k; ?>][active]" <?php echo ((!empty($shipping_mode) && !empty($shipping_mode['active'])) ? 'checked="checked"' : ''); ?> /></div>
+		<?php $shipping_mode_option = get_option('wps_shipping_mode'); ?>
+		<div class="wps-table-cell"><input type="radio" id="wps_shipping_mode_<?php echo $k; ?>_radio_default" name="wps_shipping_mode[default_choice]" value="<?php echo $k; ?>" <?php echo (!empty($shipping_mode_option['default_choice']) && $shipping_mode_option['default_choice'] == $k) ? 'checked="checked"' : ''; echo ((!empty($shipping_mode) && !empty($shipping_mode['active'])) ? '' : 'disabled="disabled"'); ?> /></div>
 		<!-- Configuration interface -->
 		<div id="<?php echo $k; ?>_shipping_configuration_interface" style="display : none">	
 			<?php 
 			$wps_shipping_mode_ctr = new wps_shipping_mode_ctr();
-			echo $wps_shipping_mode_ctr->generate_shipping_mode_interface( $k, $shipping_mode ); ?>
+			echo $wps_shipping_mode_ctr->generate_shipping_mode_interface($k, $shipping_mode); ?>
 		</div>
 </div>
\ 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-modal/wps-modal.php

Indentation +2 added lines, -2 removed lines

@@ -14,8 +14,8 @@
 
 	class wps_modal {
 		/** Define the main directory containing the template for the current plugin
-		* @var string
-		*/
+		 * @var string
+		 */
 		private $template_dir;
 		/**
 		 * Define the directory name for the module in order to check into frontend

Spacing +10 added lines, -10 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /**
  * Bootstrap file
@@ -6,11 +6,11 @@ 
  * @version 1.0
  */
 
-if ( !class_exists('wps_modal') ) {
+if (!class_exists('wps_modal')) {
 	/** Template Global vars **/
 	DEFINE('WPS_MODAL_DIR', basename(dirname(__FILE__)));
-	DEFINE('WPS_MODAL_PATH', str_replace( "\\", "/", str_replace( WPS_MODAL_DIR, "", dirname( __FILE__ ) ) ) );
-	DEFINE('WPS_MODAL_URL', str_replace( str_replace( "\\", "/", ABSPATH), site_url() . '/', WPS_MODAL_PATH ) );
+	DEFINE('WPS_MODAL_PATH', str_replace("\\", "/", str_replace(WPS_MODAL_DIR, "", dirname(__FILE__))));
+	DEFINE('WPS_MODAL_URL', str_replace(str_replace("\\", "/", ABSPATH), site_url() . '/', WPS_MODAL_PATH));
 
 	class wps_modal {
 		/** Define the main directory containing the template for the current plugin
@@ -26,19 +26,19 @@ 
 		function __construct() {
 			/** Template Load **/
 			$this->template_dir = WPS_MODAL_PATH . WPS_MODAL_DIR . "/templates/";
-			add_action('wp_enqueue_scripts', array( $this, 'add_scripts') );
-			add_action( 'wp_footer', array( $this, 'display_modal') );
+			add_action('wp_enqueue_scripts', array($this, 'add_scripts'));
+			add_action('wp_footer', array($this, 'display_modal'));
 		}
 
 		function add_scripts() {
-			wp_enqueue_script( 'jquery' );
-			wp_enqueue_script( 'wps_modal_script', plugins_url( 'assets/js/wps_modal.js' , __FILE__ ) );
+			wp_enqueue_script('jquery');
+			wp_enqueue_script('wps_modal_script', plugins_url('assets/js/wps_modal.js', __FILE__));
 		}
 
 		function display_modal() {
 			$output = '';
 			ob_start();
-			require_once( wpshop_tools::get_template_part( WPS_MODAL_DIR, $this->template_dir, "frontend", "modal") );
+			require_once(wpshop_tools::get_template_part(WPS_MODAL_DIR, $this->template_dir, "frontend", "modal"));
 			$output = ob_get_contents();
 			ob_end_clean();
 			echo $output;
@@ -46,6 +46,6 @@ 
 	}
 
 }
-if ( class_exists('wps_modal') ) {
+if (class_exists('wps_modal')) {
 	$wps_modal = new wps_modal();
 }

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_dashboard/config/config.php

Spacing +6 added lines, -6 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Main plugin configuration file
  *
@@ -9,16 +9,16 @@ 
  */
 
 /** Check if the plugin version is defined. If not defined script will be stopped here	*/
-if ( !defined( 'WPS_DASHBOARD_VERSION' ) ) {
-	die( __("You are not allowed to use this service.", 'wps_installer') );
+if (!defined('WPS_DASHBOARD_VERSION')) {
+	die(__("You are not allowed to use this service.", 'wps_installer'));
 }
 
 /** Define librairies directory */
-DEFINE( 'WPSDASHBOARD_LIBS_DIR', plugin_dir_path( __FILE__ ) . '/' . WPS_DASHBOARD_DIR . '/');
+DEFINE('WPSDASHBOARD_LIBS_DIR', plugin_dir_path(__FILE__) . '/' . WPS_DASHBOARD_DIR . '/');
 
 /** Define template directory */
-DEFINE( 'WPSDASHBOARD_TPL_DIR', WPS_DASHBOARD_PATH . WPS_DASHBOARD_DIR . '/templates/');
-DEFINE( 'WPSDASHBOARD_TPL_URL', WPS_DASHBOARD_URL . WPS_DASHBOARD_DIR . '/templates/');
+DEFINE('WPSDASHBOARD_TPL_DIR', WPS_DASHBOARD_PATH . WPS_DASHBOARD_DIR . '/templates/');
+DEFINE('WPSDASHBOARD_TPL_URL', WPS_DASHBOARD_URL . WPS_DASHBOARD_DIR . '/templates/');
 
 
 ?>
\ 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
  *