Completed
Push — master ( ea7c09...15cf0d )
by Aimeos
06:26
created
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.
client/html/src/Client/Html/Checkout/Standard/Payment/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/Locale/Select/Standard.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -82,23 +82,19 @@  discard block
 block discarded – undo
82 82
 				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
83 83
 			}
84 84
 			$view->watchBody = $html;
85
-		}
86
-		catch( \Aimeos\Client\Html\Exception $e )
85
+		} catch( \Aimeos\Client\Html\Exception $e )
87 86
 		{
88 87
 			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
89 88
 			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
90
-		}
91
-		catch( \Aimeos\Controller\Frontend\Exception $e )
89
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
92 90
 		{
93 91
 			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
94 92
 			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
95
-		}
96
-		catch( \Aimeos\MShop\Exception $e )
93
+		} catch( \Aimeos\MShop\Exception $e )
97 94
 		{
98 95
 			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
99 96
 			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
100
-		}
101
-		catch( \Exception $e )
97
+		} catch( \Exception $e )
102 98
 		{
103 99
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
104 100
 
@@ -178,8 +174,7 @@  discard block
 block discarded – undo
178 174
 			$default = 'account/watch/header-default.php';
179 175
 
180 176
 			return $view->render( $view->config( $tplconf, $default ) );
181
-		}
182
-		catch( \Exception $e )
177
+		} catch( \Exception $e )
183 178
 		{
184 179
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
185 180
 		}
Please login to merge, or discard this patch.