Completed
Push — master ( 33a95e...daccbb )
by Aimeos
09:31
created
client/html/templates/common/partials/attribute-default.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,8 +69,11 @@
 block discarded – undo
69 69
 <?php			$currency = $this->translate( 'client/currency', $priceItem->getCurrencyId() ); ?>
70 70
 <?php			/// Configurable product attribute name (%1$s) with sign (%4$s, +/-), price value (%2$s) and currency (%3$s) ?>
71 71
 <?php			echo $enc->html( sprintf( $this->translate( 'client', '%1$s ( %4$s%2$s%3$s )' ), $attribute->getName(), $this->number( abs( $value ) ), $currency, ( $value < 0 ? '−' : '+' ) ), $enc::TRUST ); ?>
72
-<?php		else : ?>
73
-<?php			echo $enc->html( $attribute->getName(), $enc::TRUST ); ?>
72
+<?php		else {
73
+    : ?>
74
+<?php			echo $enc->html( $attribute->getName(), $enc::TRUST );
75
+}
76
+?>
74 77
 <?php		endif; ?>
75 78
 				</option>
76 79
 <?php	endforeach; ?>
Please login to merge, or discard this patch.
client/html/templates/checkout/standard/process-body-default.php 1 patch
Braces   +11 added lines, -6 removed lines patch added patch discarded remove patch
@@ -10,8 +10,7 @@  discard block
 block discarded – undo
10 10
 	$namefcn = function( $view, $key ) {
11 11
 		return $key;
12 12
 	};
13
-}
14
-else
13
+} else
15 14
 {
16 15
 	$namefcn = function( $view, $key ) {
17 16
 		return $view->formparam( array( $key ) );
@@ -77,8 +76,11 @@  discard block
 block discarded – undo
77 76
 	<p class="order-notice"><?php echo $enc->html( $this->translate( 'client', 'Processing the payment failed' ), $enc::TRUST ); ?></p>
78 77
 <?php elseif( !empty( $public ) ) : ?>
79 78
 	<p class="order-notice"><?php echo $enc->html( $this->translate( 'client', 'Please enter your payment details' ), $enc::TRUST ); ?></p>
80
-<?php else : ?>
81
-	<p class="order-notice"><?php echo $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST ); ?></p>
79
+<?php else {
80
+    : ?>
81
+	<p class="order-notice"><?php echo $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST );
82
+}
83
+?></p>
82 84
 <?php endif; ?>
83 85
 <?php foreach( $hidden as $key => $item ) : ?>
84 86
 	<input name="<?php echo $enc->attr( $namefcn( $this, $item->getInternalCode() ) ); ?>" type="hidden" value="<?php echo $enc->attr( $item->getDefault() ); ?>" />
@@ -114,8 +116,11 @@  discard block
 block discarded – undo
114 116
 <?php elseif( !empty( $public ) ) : ?>
115 117
 		<a class="standardbutton" href="<?php echo $enc->attr( $this->standardUrlPayment ); ?>"><?php echo $enc->html( $this->translate( 'client', 'Change payment' ), $enc::TRUST ); ?></a>
116 118
 		<button class="standardbutton btn-action"><?php echo $enc->html( $this->translate( 'client', 'Pay now' ), $enc::TRUST ); ?></button>
117
-<?php else : ?>
118
-		<button class="standardbutton btn-action"><?php echo $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST ); ?></button>
119
+<?php else {
120
+    : ?>
121
+		<button class="standardbutton btn-action"><?php echo $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST );
122
+}
123
+?></button>
119 124
 <?php endif; ?>
120 125
 	</div>
121 126
 </div>
Please login to merge, or discard this patch.
client/html/templates/checkout/standard/delivery-body-default.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -16,8 +16,7 @@  discard block
 block discarded – undo
16 16
 {
17 17
 	$orderService = $this->standardBasket->getService( 'delivery' );
18 18
 	$orderServiceId = $orderService->getServiceId();
19
-}
20
-catch( Exception $e )
19
+} catch( Exception $e )
21 20
 {
22 21
 	$orderService = null;
23 22
 	$orderServiceId = null;
@@ -50,8 +49,11 @@  discard block
 block discarded – undo
50 49
 <?php		$currency = $this->translate( 'client/currency', $servicePrices[$id]->getCurrencyId() ); ?>
51 50
 <?php		if( $servicePrices[$id]->getValue() > 0 ) : /// Service fee value (%1$s) and shipping cost value (%2$s) with currency (%3$s) ?>
52 51
 			<span class="price-value"><?php echo $enc->html( sprintf( $this->translate( 'client', '%1$s%3$s + %2$s%3$s' ), $this->number( $servicePrices[$id]->getValue() ), $this->number( $servicePrices[$id]->getCosts() ), $currency ) ); ?></span>
53
-<?php		else : ?>
54
-			<span class="price-value"><?php echo $enc->html( sprintf( $priceFormat, $this->number( $servicePrices[$id]->getCosts() ), $currency ) ); ?></span>
52
+<?php		else {
53
+    : ?>
54
+			<span class="price-value"><?php echo $enc->html( sprintf( $priceFormat, $this->number( $servicePrices[$id]->getCosts() ), $currency ) );
55
+}
56
+?></span>
55 57
 <?php		endif; ?>
56 58
 <?php	endif; ?>
57 59
 			<div class="icons">
Please login to merge, or discard this patch.
client/html/templates/checkout/standard/payment-body-default.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,8 +16,7 @@
 block discarded – undo
16 16
 {
17 17
 	$orderService = $this->standardBasket->getService( 'payment' );
18 18
 	$orderServiceId = $orderService->getServiceId();
19
-}
20
-catch( Exception $e )
19
+} catch( Exception $e )
21 20
 {
22 21
 	$orderService = null;
23 22
 	$orderServiceId = null;
Please login to merge, or discard this patch.
html/tests/Client/Html/Checkout/Standard/Address/Delivery/StandardTest.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -132,8 +132,7 @@  discard block
 block discarded – undo
132 132
 		try
133 133
 		{
134 134
 			$this->object->process();
135
-		}
136
-		catch( \Aimeos\Client\Html\Exception $e )
135
+		} catch( \Aimeos\Client\Html\Exception $e )
137 136
 		{
138 137
 			$this->assertEquals( 2, count( $view->deliveryError ) );
139 138
 			$this->assertArrayHasKey( 'order.base.address.salutation', $view->deliveryError );
@@ -203,8 +202,7 @@  discard block
 block discarded – undo
203 202
 		try
204 203
 		{
205 204
 			$this->object->process();
206
-		}
207
-		catch( \Aimeos\Client\Html\Exception $e )
205
+		} catch( \Aimeos\Client\Html\Exception $e )
208 206
 		{
209 207
 			$this->assertEquals( 1, count( $view->deliveryError ) );
210 208
 			$this->assertArrayHasKey( 'order.base.address.postal', $view->deliveryError );
Please login to merge, or discard this patch.
client/html/src/Client/Html/Checkout/Standard/Order/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -303,8 +303,7 @@
 block discarded – undo
303 303
 				$view->standardStepActive = 'address';
304 304
 				return false;
305 305
 			}
306
-		}
307
-		catch( \Exception $e )
306
+		} catch( \Exception $e )
308 307
 		{
309 308
 			$this->getView()->standardStepActive = 'address';
310 309
 			throw $e;
Please login to merge, or discard this patch.
client/html/src/Client/Html/Checkout/Standard/Order/Address/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -303,8 +303,7 @@
 block discarded – undo
303 303
 				$view->standardStepActive = 'address';
304 304
 				return false;
305 305
 			}
306
-		}
307
-		catch( \Exception $e )
306
+		} catch( \Exception $e )
308 307
 		{
309 308
 			$this->getView()->standardStepActive = 'address';
310 309
 			throw $e;
Please login to merge, or discard this patch.
client/html/src/Client/Html/Checkout/Standard/Delivery/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -303,8 +303,7 @@
 block discarded – undo
303 303
 				$view->standardStepActive = 'address';
304 304
 				return false;
305 305
 			}
306
-		}
307
-		catch( \Exception $e )
306
+		} catch( \Exception $e )
308 307
 		{
309 308
 			$this->getView()->standardStepActive = 'address';
310 309
 			throw $e;
Please login to merge, or discard this patch.
client/html/src/Client/Html/Checkout/Standard/Summary/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -303,8 +303,7 @@
 block discarded – undo
303 303
 				$view->standardStepActive = 'address';
304 304
 				return false;
305 305
 			}
306
-		}
307
-		catch( \Exception $e )
306
+		} catch( \Exception $e )
308 307
 		{
309 308
 			$this->getView()->standardStepActive = 'address';
310 309
 			throw $e;
Please login to merge, or discard this patch.