Completed
Push — master ( 409d21...32c778 )
by
unknown
12:55
created
templates/frontend/confirmation/confirmation-banktransfer.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,14 +1,14 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
2
-$iban_infos = get_option( 'wpshop_paymentMethod_options' );
3
-$iban_infos = ( !empty($iban_infos) && !empty($iban_infos['banktransfer']) ) ?$iban_infos['banktransfer'] : array();
1
+<?php if (!defined('ABSPATH')) exit;
2
+$iban_infos = get_option('wpshop_paymentMethod_options');
3
+$iban_infos = (!empty($iban_infos) && !empty($iban_infos['banktransfer'])) ? $iban_infos['banktransfer'] : array();
4 4
 ?>
5 5
 <div class="wps-boxed">
6 6
 	<p><?php _e('Thank you ! Your order has been placed and you will receive a confirmation email shortly.', 'wpshop'); ?></p>
7 7
 	<p><?php _e('You have to do a bank transfer on account detailled below:', 'wpshop'); ?></p>
8
-	<p><?php _e('Bank name', 'wpshop'); ?> : <?php echo ( ( !empty($iban_infos['bank_name']) ) ? $iban_infos['bank_name'] : ''); ?><br/>
9
-	<?php _e('IBAN', 'wpshop'); ?> : <?php echo ( ( !empty($iban_infos['iban']) ) ? $iban_infos['iban'] : ''); ?><br/>
10
-	<?php _e('BIC/SWIFT', 'wpshop'); ?> : <?php echo ( ( !empty($iban_infos['bic']) ) ? $iban_infos['bic'] : ''); ?><br/>
11
-	<?php _e('Account owner name', 'wpshop'); ?> : <?php echo ( ( !empty($iban_infos['accountowner']) ) ? $iban_infos['accountowner'] : ''); ?></p>
8
+	<p><?php _e('Bank name', 'wpshop'); ?> : <?php echo ((!empty($iban_infos['bank_name'])) ? $iban_infos['bank_name'] : ''); ?><br/>
9
+	<?php _e('IBAN', 'wpshop'); ?> : <?php echo ((!empty($iban_infos['iban'])) ? $iban_infos['iban'] : ''); ?><br/>
10
+	<?php _e('BIC/SWIFT', 'wpshop'); ?> : <?php echo ((!empty($iban_infos['bic'])) ? $iban_infos['bic'] : ''); ?><br/>
11
+	<?php _e('Account owner name', 'wpshop'); ?> : <?php echo ((!empty($iban_infos['accountowner'])) ? $iban_infos['accountowner'] : ''); ?></p>
12 12
 	<p><?php _e('Your order will be shipped upon receipt of funds.', 'wpshop'); ?></p>
13 13
 </div>
14 14
 <?php
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if ( !defined( 'ABSPATH' ) ) {
2
+	exit;
3
+}
2 4
 $iban_infos = get_option( 'wpshop_paymentMethod_options' );
3 5
 $iban_infos = ( !empty($iban_infos) && !empty($iban_infos['banktransfer']) ) ?$iban_infos['banktransfer'] : array();
4 6
 ?>
Please login to merge, or discard this patch.
wps_classic_checkout/templates/frontend/confirmation/confirmation-free.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if (!defined('ABSPATH')) exit;
2 2
 ?>
3 3
 <div class="wps-boxed">
4 4
 	<p><?php _e('Thank you ! Your order has been placed and you will receive a confirmation email shortly.', 'wpshop'); ?></p>
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if ( !defined( 'ABSPATH' ) ) {
2
+	exit;
3
+}
2 4
 ?>
3 5
 <div class="wps-boxed">
4 6
 	<p><?php _e('Thank you ! Your order has been placed and you will receive a confirmation email shortly.', 'wpshop'); ?></p>
Please login to merge, or discard this patch.
templates/frontend/confirmation/confirmation_quotation.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if (!defined('ABSPATH')) exit;
2 2
 ?>
3 3
 <div><p><?php _e('Thank you ! Your quotation has been sent. We will respond to you as soon as possible.', 'wpshop'); ?></p></div>
4
-<?php wpshop_cart::empty_cart();  ?>
4
+<?php wpshop_cart::empty_cart(); ?>
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if ( !defined( 'ABSPATH' ) ) {
2
+	exit;
3
+}
2 4
 ?>
3 5
 <div><p><?php _e('Thank you ! Your quotation has been sent. We will respond to you as soon as possible.', 'wpshop'); ?></p></div>
4 6
 <?php wpshop_cart::empty_cart();  ?>
Please login to merge, or discard this patch.
templates/frontend/confirmation/confirmation-others.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if (!defined('ABSPATH')) exit;
2 2
 ?>
3 3
 <div class="wps-boxed">
4 4
 <?php
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if ( !defined( 'ABSPATH' ) ) {
2
+	exit;
3
+}
2 4
 ?>
3 5
 <div class="wps-boxed">
4 6
 <?php
Please login to merge, or discard this patch.
wps_classic_checkout/templates/frontend/classic-checkout-step-two.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,2 +1,2 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if (!defined('ABSPATH')) exit;
2 2
  echo do_shortcode('[wpshop_login]'); ?>
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,2 +1,4 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if ( !defined( 'ABSPATH' ) ) {
2
+	exit;
3
+}
2 4
  echo do_shortcode('[wpshop_login]'); ?>
Please login to merge, or discard this patch.
templates/frontend/checkout_step_indicator/checkout_step_indicator.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,31 +1,31 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if (!defined('ABSPATH')) exit;
2 2
 ?>
3 3
 <div class="wps-gridwrapper6-marged wps-checkout-steps --wps-screen">
4 4
 <?php
5 5
 	$step_finished = false;
6
-	foreach( $steps as $step_id => $step) :
6
+	foreach ($steps as $step_id => $step) :
7 7
 		$step_id += 1;
8 8
 
9 9
 		$real_step_to_display = $default_step;
10
-		if ( ( true === $no_cart ) && ( 3 == $real_step_to_display ) ) {
10
+		if ((true === $no_cart) && (3 == $real_step_to_display)) {
11 11
 			$real_step_to_display = 2;
12 12
 		}
13
-		if ( ( true === $no_shipping ) && ( 4 < $real_step_to_display ) ) {
14
-			if ( true === $no_cart ) {
13
+		if ((true === $no_shipping) && (4 < $real_step_to_display)) {
14
+			if (true === $no_cart) {
15 15
 				$real_step_to_display -= 2;
16 16
 			}
17 17
 			else {
18 18
 				$real_step_to_display -= 1;
19 19
 			}
20 20
 		}
21
-		$step_class = ( $real_step_to_display == $step_id ) ? 'wps-checkout-step --wps-current' : ( ( $real_step_to_display > $step_id) ? 'wps-checkout-step --wps-finished' : 'wps-checkout-step' ) ;
22
-		$step_finished = ( ( $real_step_to_display > $step_id ) ? true : false ) ;
23
-		require( wpshop_tools::get_template_part( WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "checkout_step_indicator/checkout_step_indicator_step") );
21
+		$step_class = ($real_step_to_display == $step_id) ? 'wps-checkout-step --wps-current' : (($real_step_to_display > $step_id) ? 'wps-checkout-step --wps-finished' : 'wps-checkout-step');
22
+		$step_finished = (($real_step_to_display > $step_id) ? true : false);
23
+		require(wpshop_tools::get_template_part(WPS_CLASSIC_CHECKOUT_DIR, $this->template_dir, "frontend", "checkout_step_indicator/checkout_step_indicator_step"));
24 24
 	endforeach;
25 25
 ?>
26 26
 </div>
27 27
 
28 28
 <div class="wps-checkout-steps --wps-touch">
29
-	<span class="wps-h3"><?php echo $steps[$real_step_to_display-1]; ?></span>
29
+	<span class="wps-h3"><?php echo $steps[$real_step_to_display - 1]; ?></span>
30 30
 	<span class="wps-checkout-steps-caption"><?php _e('Etape', 'wpshop'); ?> <?php echo $real_step_to_display; ?>/<?php echo count($steps); ?></span>
31 31
 </div>
32 32
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if ( !defined( 'ABSPATH' ) ) {
2
+	exit;
3
+}
2 4
 ?>
3 5
 <div class="wps-gridwrapper6-marged wps-checkout-steps --wps-screen">
4 6
 <?php
@@ -13,8 +15,7 @@  discard block
 block discarded – undo
13 15
 		if ( ( true === $no_shipping ) && ( 4 < $real_step_to_display ) ) {
14 16
 			if ( true === $no_cart ) {
15 17
 				$real_step_to_display -= 2;
16
-			}
17
-			else {
18
+			} else {
18 19
 				$real_step_to_display -= 1;
19 20
 			}
20 21
 		}
Please login to merge, or discard this patch.
templates/frontend/checkout_step_indicator/checkout_step_indicator_step.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if (!defined('ABSPATH')) exit;
2 2
 ?>
3 3
 <div class="<?php echo $step_class; ?>" id="wps-step-indicator-<?php echo $step_id; ?>">
4
-	<?php if( $step_finished && ( $default_step <= ( max( array_keys( $steps ) ) + 1 ) ) ) :
5
-		$url = get_permalink( wpshop_tools::get_page_id($checkout_page_id)  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step='.$step_id;
4
+	<?php if ($step_finished && ($default_step <= (max(array_keys($steps)) + 1))) :
5
+		$url = get_permalink(wpshop_tools::get_page_id($checkout_page_id)) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=' . $step_id;
6 6
 		?>
7 7
 		<a href="<?php echo $url; ?>"><i class="wps-circlerounded"><?php echo $step_id; ?></i><span><?php echo $step; ?></span></a>
8 8
 	<?php else : ?>
Please login to merge, or discard this patch.
Braces   +8 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,11 +1,16 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if ( !defined( 'ABSPATH' ) ) {
2
+	exit;
3
+}
2 4
 ?>
3 5
 <div class="<?php echo $step_class; ?>" id="wps-step-indicator-<?php echo $step_id; ?>">
4 6
 	<?php if( $step_finished && ( $default_step <= ( max( array_keys( $steps ) ) + 1 ) ) ) :
5 7
 		$url = get_permalink( wpshop_tools::get_page_id($checkout_page_id)  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step='.$step_id;
6 8
 		?>
7 9
 		<a href="<?php echo $url; ?>"><i class="wps-circlerounded"><?php echo $step_id; ?></i><span><?php echo $step; ?></span></a>
8
-	<?php else : ?>
9
-		<i class="wps-circlerounded"><?php echo $step_id; ?></i><span><?php echo $step; ?></span>
10
+	<?php else {
11
+	: ?>
12
+		<i class="wps-circlerounded"><?php echo $step_id;
13
+}
14
+?></i><span><?php echo $step; ?></span>
10 15
 	<?php endif ?>
11 16
 </div>
12 17
\ No newline at end of file
Please login to merge, or discard this patch.
includes/modules/wps_shipping/wps_shipping.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if (!defined('ABSPATH')) exit;
2 2
 
3 3
 /**
4 4
  * Cart rules bootstrap file
@@ -12,12 +12,12 @@  discard block
 block discarded – undo
12 12
 
13 13
 /** Template Global vars **/
14 14
 DEFINE('WPS_SHIPPING_MODE_DIR', basename(dirname(__FILE__)));
15
-DEFINE('WPS_SHIPPING_MODE_PATH', str_replace( "\\", "/", str_replace( WPS_SHIPPING_MODE_DIR, "", dirname( __FILE__ ) ) ) );
16
-DEFINE('WPS_SHIPPING_MODE_URL', str_replace( str_replace( "\\", "/", ABSPATH), site_url() . '/', WPS_SHIPPING_MODE_PATH ) );
15
+DEFINE('WPS_SHIPPING_MODE_PATH', str_replace("\\", "/", str_replace(WPS_SHIPPING_MODE_DIR, "", dirname(__FILE__))));
16
+DEFINE('WPS_SHIPPING_MODE_URL', str_replace(str_replace("\\", "/", ABSPATH), site_url() . '/', WPS_SHIPPING_MODE_PATH));
17 17
 
18
-include( plugin_dir_path( __FILE__ ).'/controller/wps_shipping_ctr.php' );
19
-include( plugin_dir_path( __FILE__ ).'/controller/wps_shipping_mode_ctr.php' );
20
-include( plugin_dir_path( __FILE__ ).'/controller/wps_shipping_mode_ajax_actions.php' );
18
+include(plugin_dir_path(__FILE__) . '/controller/wps_shipping_ctr.php');
19
+include(plugin_dir_path(__FILE__) . '/controller/wps_shipping_mode_ctr.php');
20
+include(plugin_dir_path(__FILE__) . '/controller/wps_shipping_mode_ajax_actions.php');
21 21
 
22 22
 
23 23
 $wps_shipping_mode_ctr = new wps_shipping_mode_ctr();
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if ( !defined( 'ABSPATH' ) ) {
2
+	exit;
3
+}
2 4
 
3 5
 /**
4 6
  * Cart rules bootstrap file
Please login to merge, or discard this patch.
includes/modules/wps_shipping/templates/frontend/shipping-infos-summary.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if (!defined('ABSPATH')) exit;
2 2
 ?>
3 3
 <div class="wps-resume-address">
4
-<?php if( !empty($shipping_content) ) : ?>
4
+<?php if (!empty($shipping_content)) : ?>
5 5
 	<div class="wps-item-resume-address">
6
-		<div class="entry-title"><?php _e( 'Shipping address', 'wpshop')?></div>
6
+		<div class="entry-title"><?php _e('Shipping address', 'wpshop')?></div>
7 7
 		<div class="entry-content">
8 8
 			<?php echo $shipping_content; ?>
9 9
 		</div>
10 10
 	</div>
11 11
 	<?php endif; ?>
12 12
 	<div class="wps-item-resume-address">
13
-		<div class="entry-title"><?php _e( 'Billing address', 'wpshop')?></div>
13
+		<div class="entry-title"><?php _e('Billing address', 'wpshop')?></div>
14 14
 		<div class="entry-content">
15 15
 			<?php echo $billing_content; ?>
16 16
 		</div>
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( !defined( 'ABSPATH' ) ) exit;
1
+<?php if ( !defined( 'ABSPATH' ) ) {
2
+	exit;
3
+}
2 4
 ?>
3 5
 <div class="wps-resume-address">
4 6
 <?php if( !empty($shipping_content) ) : ?>
Please login to merge, or discard this patch.