View GitHub Repository ai-client-html

Schedule Inspection
Subscribe
Passed
Push — master ( 18cabd...152970 )
by Aimeos
03:01
created
Status
Category
Toggle Patches
client/html/templates/common/summary/detail-standard.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -243,9 +243,12 @@  discard block
 
 block discarded – undo
243 243 
 						<?php if( $product->getQuantity() > 1 ) : ?>
244 244 
 							<?php $basketParams = array( 'b_action' => 'edit', 'b_position' => $position, 'b_quantity' => $product->getQuantity() - 1 ); ?>
245 245 
 							<a class="minibutton change" href="<?= $enc->attr( $this->url( $basketTarget, $basketController, $basketAction, $basketParams, [], $basketConfig ) ); ?>">−</a>
246 
-						<?php else : ?>
246 
+						<?php else {
247 
+	: ?>
247 248 
 							&nbsp;
248 
-						<?php endif; ?>
249 
+						<?php endif;
250 
+}
251 
+?>
249 252
250 253 
 						<input class="value" type="text"
251 254 
 							name="<?= $enc->attr( $this->formparam( array( 'b_prod', $position, 'quantity' ) ) ); ?>"
 
@@ -259,8 +262,11 @@  discard block
 
 block discarded – undo
259 262 
 						<?php $basketParams = array( 'b_action' => 'edit', 'b_position' => $position, 'b_quantity' => $product->getQuantity() + 1 ); ?>
260 263 
 						<a class="minibutton change" href="<?= $enc->attr( $this->url( $basketTarget, $basketController, $basketAction, $basketParams, [], $basketConfig ) ); ?>">+</a>
261 264
262 
-					<?php else : ?>
263 
-						<?= $enc->html( $product->getQuantity() ); ?>
265 
+					<?php else {
266 
+	: ?>
267 
+						<?= $enc->html( $product->getQuantity() );
268 
+}
269 
+?>
264 270 
 					<?php endif; ?>
265 271 
 				</td>
266 272
Please login to merge, or discard this patch.
client/html/templates/email/common/text-summary-partial.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -54,7 +54,8 @@  discard block
 
 block discarded – undo
54 54 
 			array( 'addresses' => $addrItems, 'separator' => "\n" )
55 55 
 		);
56 56 
 ?>
57 
-<?php else : ?>
57 
+<?php else {
58 
+	: ?>
58 59 
 <?=		$this->translate( 'client', 'like billing address' ) ?>
59 60 
 <?php endif ?>
60 61 
 
@@ -69,6 +70,7 @@  discard block
 
 block discarded – undo
69 70 
 <?php		foreach( $service->getAttributeItems() as $attribute )
70 71 
 			{
71 72 
 				$name = ( $attribute->getName() != '' ? $attribute->getName() : $this->translate( 'client/code', $attribute->getCode() ) );
73 
+}
72 74
73 75 
 				switch( $attribute->getValue() )
74 76 
 				{
Please login to merge, or discard this patch.
client/html/templates/email/delivery/html-body-standard.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -152,7 +152,10 @@
 
 block discarded – undo
152 152 
 							$addr->getTelefax(),
153 153 
 							$addr->getWebsite(),
154 154 
 							$addr->getVatID()
155 
-						) ) ) ); ?> </div> <?php endforeach; ?> <?php else : ?> <div class="content"> <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); ?> </div> <?php endif; ?> </div></td></tr></table></div><!--[if mso | IE]></td></tr></table><![endif]--></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="common-summary-outlook common-summary-service-outlook" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div class="common-summary common-summary-service" style="Margin:0px auto;max-width:600px;"><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;"><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;vertical-align:top;"><!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="item-outlook payment-outlook" style="vertical-align:top;width:300px;" ><![endif]--><div class="mj-column-per-50 outlook-group-fix item payment" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'payment' ), $enc::TRUST ); ?></h3> <?php foreach( $this->summaryBasket->getService( 'payment' ) as $service ) : ?> <div class="content"><h4><?= $enc->html( $service->getName() ); ?></h4> <?php if( ( $attributes = $service->getAttributeItems() ) !== [] ) : ?> <ul class="attr-list"> <?php foreach( $attributes as $attribute ) : ?> <?php if( strpos( $attribute->getType(), 'hidden' ) === false ) : ?> <li class="<?= $enc->attr( 'payment-' . $attribute->getCode() ); ?>"><span class="name"><?= $enc->html( $attribute->getName() ?: $this->translate( 'client/code', $attribute->getCode() ) ); ?>:</span> <?php switch( $attribute->getValue() ) : case 'array': case 'object': ?> <?php foreach( (array) $attribute->getValue() as $value ) : ?> <span class="value"><?= $enc->html( $value ); ?></span> <?php endforeach ?> <?php break; default: ?> <span class="value"><?= $enc->html( $attribute->getValue() ); ?></span> <?php endswitch; ?> </li> <?php endif; ?> <?php endforeach; ?> </ul> <?php endif; ?> </div> <?php endforeach; ?> </div></td></tr></table></div><!--[if mso | IE]></td><td class="item-outlook delivery-outlook" style="vertical-align:top;width:300px;" ><![endif]--><div class="mj-column-per-50 outlook-group-fix item delivery" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'delivery' ), $enc::TRUST ); ?></h3> <?php foreach( $this->summaryBasket->getService( 'delivery' ) as $service ) : ?> <div class="content"><h4><?= $enc->html( $service->getName() ); ?></h4> <?php if( ( $attributes = $service->getAttributeItems() ) !== [] ) : ?> <ul class="attr-list"> <?php foreach( $attributes as $attribute ) : ?> <?php if( strpos( $attribute->getType(), 'hidden' ) === false ) : ?> <li class="<?= $enc->attr( 'delivery-' . $attribute->getCode() ); ?>"><span class="name"><?= $enc->html( $attribute->getName() ?: $this->translate( 'client/code', $attribute->getCode() ) ); ?>:</span> <?php switch( $attribute->getValue() ) : case 'array': case 'object': ?> <?php foreach( (array) $attribute->getValue() as $value ) : ?> <span class="value"><?= $enc->html( $value ); ?></span> <?php endforeach ?> <?php break; default: ?> <span class="value"><?= $enc->html( $attribute->getValue() ); ?></span> <?php endswitch; ?> </li> <?php endif; ?> <?php endforeach; ?> </ul> <?php endif; ?> </div> <?php endforeach; ?> </div></td></tr></table></div><!--[if mso | IE]></td></tr></table><![endif]--></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="common-summary-outlook common-summary-additional-outlook" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div class="common-summary common-summary-additional" style="Margin:0px auto;max-width:600px;"><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;"><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;vertical-align:top;"><!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="item-outlook coupon-outlook" style="vertical-align:top;width:200px;" ><![endif]--><div class="mj-column-per-33 outlook-group-fix item coupon" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'Coupon codes' ), $enc::TRUST ); ?></h3><div class="content"> <?php if( ( $coupons = $this->summaryBasket->getCoupons() ) !== [] ) : ?> <ul class="attr-list"> <?php foreach( $coupons as $code => $products ) : ?> <li class="attr-item"><?= $enc->html( $code ); ?></li> <?php endforeach; ?> </ul> <?php endif; ?> </div></div></td></tr></table></div><!--[if mso | IE]></td><td class="item-outlook customerref-outlook" style="vertical-align:top;width:200px;" ><![endif]--><div class="mj-column-per-33 outlook-group-fix item customerref" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'Your reference' ), $enc::TRUST ); ?></h3><div class="content"> <?= $enc->attr( $this->summaryBasket->getCustomerReference() ); ?> </div></div></td></tr></table></div><!--[if mso | IE]></td><td class="item-outlook comment-outlook" style="vertical-align:top;width:200px;" ><![endif]--><div class="mj-column-per-33 outlook-group-fix item comment" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'Your comment' ), $enc::TRUST ); ?></h3><div class="content"> <?= $enc->html( $this->summaryBasket->getComment() ); ?> </div></div></td></tr></table></div><!--[if mso | IE]></td></tr></table><![endif]--></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="common-summary-outlook common-summary-detail-outlook" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div class="common-summary common-summary-detail" style="Margin:0px auto;max-width:600px;"><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;"><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;vertical-align:top;"><!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]--><div class="mj-column-per-100 outlook-group-fix" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" class="basket" style="font-size:0px;padding:10px 25px;word-break:break-word;"><table cellpadding="0" cellspacing="0" width="100%" border="0" style="cellspacing:0;color:#000000;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;"><tr class="header"><th class="status"></th><th class="label"><?= $enc->html( $this->translate( 'client', 'Name' ), $enc::TRUST ); ?></th><th class="quantity"><?= $enc->html( $this->translate( 'client', 'Qty' ), $enc::TRUST ); ?></th><th class="price"><?= $enc->html( $this->translate( 'client', 'Sum' ), $enc::TRUST ); ?></th></tr> <?php
155 
+						) ) ) ); ?> </div> <?php endforeach; ?> <?php else {
156 
+							: ?> <div class="content"> <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST );
157 
+						}
158 
+						?> </div> <?php endif; ?> </div></td></tr></table></div><!--[if mso | IE]></td></tr></table><![endif]--></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="common-summary-outlook common-summary-service-outlook" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div class="common-summary common-summary-service" style="Margin:0px auto;max-width:600px;"><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;"><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;vertical-align:top;"><!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="item-outlook payment-outlook" style="vertical-align:top;width:300px;" ><![endif]--><div class="mj-column-per-50 outlook-group-fix item payment" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'payment' ), $enc::TRUST ); ?></h3> <?php foreach( $this->summaryBasket->getService( 'payment' ) as $service ) : ?> <div class="content"><h4><?= $enc->html( $service->getName() ); ?></h4> <?php if( ( $attributes = $service->getAttributeItems() ) !== [] ) : ?> <ul class="attr-list"> <?php foreach( $attributes as $attribute ) : ?> <?php if( strpos( $attribute->getType(), 'hidden' ) === false ) : ?> <li class="<?= $enc->attr( 'payment-' . $attribute->getCode() ); ?>"><span class="name"><?= $enc->html( $attribute->getName() ?: $this->translate( 'client/code', $attribute->getCode() ) ); ?>:</span> <?php switch( $attribute->getValue() ) : case 'array': case 'object': ?> <?php foreach( (array) $attribute->getValue() as $value ) : ?> <span class="value"><?= $enc->html( $value ); ?></span> <?php endforeach ?> <?php break; default: ?> <span class="value"><?= $enc->html( $attribute->getValue() ); ?></span> <?php endswitch; ?> </li> <?php endif; ?> <?php endforeach; ?> </ul> <?php endif; ?> </div> <?php endforeach; ?> </div></td></tr></table></div><!--[if mso | IE]></td><td class="item-outlook delivery-outlook" style="vertical-align:top;width:300px;" ><![endif]--><div class="mj-column-per-50 outlook-group-fix item delivery" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'delivery' ), $enc::TRUST ); ?></h3> <?php foreach( $this->summaryBasket->getService( 'delivery' ) as $service ) : ?> <div class="content"><h4><?= $enc->html( $service->getName() ); ?></h4> <?php if( ( $attributes = $service->getAttributeItems() ) !== [] ) : ?> <ul class="attr-list"> <?php foreach( $attributes as $attribute ) : ?> <?php if( strpos( $attribute->getType(), 'hidden' ) === false ) : ?> <li class="<?= $enc->attr( 'delivery-' . $attribute->getCode() ); ?>"><span class="name"><?= $enc->html( $attribute->getName() ?: $this->translate( 'client/code', $attribute->getCode() ) ); ?>:</span> <?php switch( $attribute->getValue() ) : case 'array': case 'object': ?> <?php foreach( (array) $attribute->getValue() as $value ) : ?> <span class="value"><?= $enc->html( $value ); ?></span> <?php endforeach ?> <?php break; default: ?> <span class="value"><?= $enc->html( $attribute->getValue() ); ?></span> <?php endswitch; ?> </li> <?php endif; ?> <?php endforeach; ?> </ul> <?php endif; ?> </div> <?php endforeach; ?> </div></td></tr></table></div><!--[if mso | IE]></td></tr></table><![endif]--></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="common-summary-outlook common-summary-additional-outlook" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div class="common-summary common-summary-additional" style="Margin:0px auto;max-width:600px;"><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;"><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;vertical-align:top;"><!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="item-outlook coupon-outlook" style="vertical-align:top;width:200px;" ><![endif]--><div class="mj-column-per-33 outlook-group-fix item coupon" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'Coupon codes' ), $enc::TRUST ); ?></h3><div class="content"> <?php if( ( $coupons = $this->summaryBasket->getCoupons() ) !== [] ) : ?> <ul class="attr-list"> <?php foreach( $coupons as $code => $products ) : ?> <li class="attr-item"><?= $enc->html( $code ); ?></li> <?php endforeach; ?> </ul> <?php endif; ?> </div></div></td></tr></table></div><!--[if mso | IE]></td><td class="item-outlook customerref-outlook" style="vertical-align:top;width:200px;" ><![endif]--><div class="mj-column-per-33 outlook-group-fix item customerref" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'Your reference' ), $enc::TRUST ); ?></h3><div class="content"> <?= $enc->attr( $this->summaryBasket->getCustomerReference() ); ?> </div></div></td></tr></table></div><!--[if mso | IE]></td><td class="item-outlook comment-outlook" style="vertical-align:top;width:200px;" ><![endif]--><div class="mj-column-per-33 outlook-group-fix item comment" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'Your comment' ), $enc::TRUST ); ?></h3><div class="content"> <?= $enc->html( $this->summaryBasket->getComment() ); ?> </div></div></td></tr></table></div><!--[if mso | IE]></td></tr></table><![endif]--></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="common-summary-outlook common-summary-detail-outlook" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div class="common-summary common-summary-detail" style="Margin:0px auto;max-width:600px;"><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;"><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;vertical-align:top;"><!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]--><div class="mj-column-per-100 outlook-group-fix" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" class="basket" style="font-size:0px;padding:10px 25px;word-break:break-word;"><table cellpadding="0" cellspacing="0" width="100%" border="0" style="cellspacing:0;color:#000000;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;"><tr class="header"><th class="status"></th><th class="label"><?= $enc->html( $this->translate( 'client', 'Name' ), $enc::TRUST ); ?></th><th class="quantity"><?= $enc->html( $this->translate( 'client', 'Qty' ), $enc::TRUST ); ?></th><th class="price"><?= $enc->html( $this->translate( 'client', 'Sum' ), $enc::TRUST ); ?></th></tr> <?php
156 159 
 				$detailTarget = $this->config( 'client/html/catalog/detail/url/target' );
157 160 
 				$detailController = $this->config( 'client/html/catalog/detail/url/controller', 'catalog' );
158 161 
 				$detailAction = $this->config( 'client/html/catalog/detail/url/action', 'detail' );
Please login to merge, or discard this patch.
client/html/templates/email/payment/html-body-standard.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -152,7 +152,10 @@
 
 block discarded – undo
152 152 
 							$addr->getTelefax(),
153 153 
 							$addr->getWebsite(),
154 154 
 							$addr->getVatID()
155 
-						) ) ) ); ?> </div> <?php endforeach; ?> <?php else : ?> <div class="content"> <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); ?> </div> <?php endif; ?> </div></td></tr></table></div><!--[if mso | IE]></td></tr></table><![endif]--></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="common-summary-outlook common-summary-service-outlook" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div class="common-summary common-summary-service" style="Margin:0px auto;max-width:600px;"><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;"><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;vertical-align:top;"><!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="item-outlook payment-outlook" style="vertical-align:top;width:300px;" ><![endif]--><div class="mj-column-per-50 outlook-group-fix item payment" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'payment' ), $enc::TRUST ); ?></h3> <?php foreach( $this->summaryBasket->getService( 'payment' ) as $service ) : ?> <div class="content"><h4><?= $enc->html( $service->getName() ); ?></h4> <?php if( ( $attributes = $service->getAttributeItems() ) !== [] ) : ?> <ul class="attr-list"> <?php foreach( $attributes as $attribute ) : ?> <?php if( strpos( $attribute->getType(), 'hidden' ) === false ) : ?> <li class="<?= $enc->attr( 'payment-' . $attribute->getCode() ); ?>"><span class="name"><?= $enc->html( $attribute->getName() ?: $this->translate( 'client/code', $attribute->getCode() ) ); ?>:</span> <?php switch( $attribute->getValue() ) : case 'array': case 'object': ?> <?php foreach( (array) $attribute->getValue() as $value ) : ?> <span class="value"><?= $enc->html( $value ); ?></span> <?php endforeach ?> <?php break; default: ?> <span class="value"><?= $enc->html( $attribute->getValue() ); ?></span> <?php endswitch; ?> </li> <?php endif; ?> <?php endforeach; ?> </ul> <?php endif; ?> </div> <?php endforeach; ?> </div></td></tr></table></div><!--[if mso | IE]></td><td class="item-outlook delivery-outlook" style="vertical-align:top;width:300px;" ><![endif]--><div class="mj-column-per-50 outlook-group-fix item delivery" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'delivery' ), $enc::TRUST ); ?></h3> <?php foreach( $this->summaryBasket->getService( 'delivery' ) as $service ) : ?> <div class="content"><h4><?= $enc->html( $service->getName() ); ?></h4> <?php if( ( $attributes = $service->getAttributeItems() ) !== [] ) : ?> <ul class="attr-list"> <?php foreach( $attributes as $attribute ) : ?> <?php if( strpos( $attribute->getType(), 'hidden' ) === false ) : ?> <li class="<?= $enc->attr( 'delivery-' . $attribute->getCode() ); ?>"><span class="name"><?= $enc->html( $attribute->getName() ?: $this->translate( 'client/code', $attribute->getCode() ) ); ?>:</span> <?php switch( $attribute->getValue() ) : case 'array': case 'object': ?> <?php foreach( (array) $attribute->getValue() as $value ) : ?> <span class="value"><?= $enc->html( $value ); ?></span> <?php endforeach ?> <?php break; default: ?> <span class="value"><?= $enc->html( $attribute->getValue() ); ?></span> <?php endswitch; ?> </li> <?php endif; ?> <?php endforeach; ?> </ul> <?php endif; ?> </div> <?php endforeach; ?> </div></td></tr></table></div><!--[if mso | IE]></td></tr></table><![endif]--></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="common-summary-outlook common-summary-additional-outlook" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div class="common-summary common-summary-additional" style="Margin:0px auto;max-width:600px;"><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;"><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;vertical-align:top;"><!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="item-outlook coupon-outlook" style="vertical-align:top;width:200px;" ><![endif]--><div class="mj-column-per-33 outlook-group-fix item coupon" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'Coupon codes' ), $enc::TRUST ); ?></h3><div class="content"> <?php if( ( $coupons = $this->summaryBasket->getCoupons() ) !== [] ) : ?> <ul class="attr-list"> <?php foreach( $coupons as $code => $products ) : ?> <li class="attr-item"><?= $enc->html( $code ); ?></li> <?php endforeach; ?> </ul> <?php endif; ?> </div></div></td></tr></table></div><!--[if mso | IE]></td><td class="item-outlook customerref-outlook" style="vertical-align:top;width:200px;" ><![endif]--><div class="mj-column-per-33 outlook-group-fix item customerref" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'Your reference' ), $enc::TRUST ); ?></h3><div class="content"> <?= $enc->attr( $this->summaryBasket->getCustomerReference() ); ?> </div></div></td></tr></table></div><!--[if mso | IE]></td><td class="item-outlook comment-outlook" style="vertical-align:top;width:200px;" ><![endif]--><div class="mj-column-per-33 outlook-group-fix item comment" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'Your comment' ), $enc::TRUST ); ?></h3><div class="content"> <?= $enc->html( $this->summaryBasket->getComment() ); ?> </div></div></td></tr></table></div><!--[if mso | IE]></td></tr></table><![endif]--></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="common-summary-outlook common-summary-detail-outlook" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div class="common-summary common-summary-detail" style="Margin:0px auto;max-width:600px;"><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;"><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;vertical-align:top;"><!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]--><div class="mj-column-per-100 outlook-group-fix" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" class="basket" style="font-size:0px;padding:10px 25px;word-break:break-word;"><table cellpadding="0" cellspacing="0" width="100%" border="0" style="cellspacing:0;color:#000000;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;"><tr class="header"><th class="status"></th><th class="label"><?= $enc->html( $this->translate( 'client', 'Name' ), $enc::TRUST ); ?></th><th class="quantity"><?= $enc->html( $this->translate( 'client', 'Qty' ), $enc::TRUST ); ?></th><th class="price"><?= $enc->html( $this->translate( 'client', 'Sum' ), $enc::TRUST ); ?></th></tr> <?php
155 
+						) ) ) ); ?> </div> <?php endforeach; ?> <?php else {
156 
+							: ?> <div class="content"> <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST );
157 
+						}
158 
+						?> </div> <?php endif; ?> </div></td></tr></table></div><!--[if mso | IE]></td></tr></table><![endif]--></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="common-summary-outlook common-summary-service-outlook" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div class="common-summary common-summary-service" style="Margin:0px auto;max-width:600px;"><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;"><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;vertical-align:top;"><!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="item-outlook payment-outlook" style="vertical-align:top;width:300px;" ><![endif]--><div class="mj-column-per-50 outlook-group-fix item payment" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'payment' ), $enc::TRUST ); ?></h3> <?php foreach( $this->summaryBasket->getService( 'payment' ) as $service ) : ?> <div class="content"><h4><?= $enc->html( $service->getName() ); ?></h4> <?php if( ( $attributes = $service->getAttributeItems() ) !== [] ) : ?> <ul class="attr-list"> <?php foreach( $attributes as $attribute ) : ?> <?php if( strpos( $attribute->getType(), 'hidden' ) === false ) : ?> <li class="<?= $enc->attr( 'payment-' . $attribute->getCode() ); ?>"><span class="name"><?= $enc->html( $attribute->getName() ?: $this->translate( 'client/code', $attribute->getCode() ) ); ?>:</span> <?php switch( $attribute->getValue() ) : case 'array': case 'object': ?> <?php foreach( (array) $attribute->getValue() as $value ) : ?> <span class="value"><?= $enc->html( $value ); ?></span> <?php endforeach ?> <?php break; default: ?> <span class="value"><?= $enc->html( $attribute->getValue() ); ?></span> <?php endswitch; ?> </li> <?php endif; ?> <?php endforeach; ?> </ul> <?php endif; ?> </div> <?php endforeach; ?> </div></td></tr></table></div><!--[if mso | IE]></td><td class="item-outlook delivery-outlook" style="vertical-align:top;width:300px;" ><![endif]--><div class="mj-column-per-50 outlook-group-fix item delivery" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'delivery' ), $enc::TRUST ); ?></h3> <?php foreach( $this->summaryBasket->getService( 'delivery' ) as $service ) : ?> <div class="content"><h4><?= $enc->html( $service->getName() ); ?></h4> <?php if( ( $attributes = $service->getAttributeItems() ) !== [] ) : ?> <ul class="attr-list"> <?php foreach( $attributes as $attribute ) : ?> <?php if( strpos( $attribute->getType(), 'hidden' ) === false ) : ?> <li class="<?= $enc->attr( 'delivery-' . $attribute->getCode() ); ?>"><span class="name"><?= $enc->html( $attribute->getName() ?: $this->translate( 'client/code', $attribute->getCode() ) ); ?>:</span> <?php switch( $attribute->getValue() ) : case 'array': case 'object': ?> <?php foreach( (array) $attribute->getValue() as $value ) : ?> <span class="value"><?= $enc->html( $value ); ?></span> <?php endforeach ?> <?php break; default: ?> <span class="value"><?= $enc->html( $attribute->getValue() ); ?></span> <?php endswitch; ?> </li> <?php endif; ?> <?php endforeach; ?> </ul> <?php endif; ?> </div> <?php endforeach; ?> </div></td></tr></table></div><!--[if mso | IE]></td></tr></table><![endif]--></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="common-summary-outlook common-summary-additional-outlook" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div class="common-summary common-summary-additional" style="Margin:0px auto;max-width:600px;"><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;"><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;vertical-align:top;"><!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="item-outlook coupon-outlook" style="vertical-align:top;width:200px;" ><![endif]--><div class="mj-column-per-33 outlook-group-fix item coupon" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'Coupon codes' ), $enc::TRUST ); ?></h3><div class="content"> <?php if( ( $coupons = $this->summaryBasket->getCoupons() ) !== [] ) : ?> <ul class="attr-list"> <?php foreach( $coupons as $code => $products ) : ?> <li class="attr-item"><?= $enc->html( $code ); ?></li> <?php endforeach; ?> </ul> <?php endif; ?> </div></div></td></tr></table></div><!--[if mso | IE]></td><td class="item-outlook customerref-outlook" style="vertical-align:top;width:200px;" ><![endif]--><div class="mj-column-per-33 outlook-group-fix item customerref" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'Your reference' ), $enc::TRUST ); ?></h3><div class="content"> <?= $enc->attr( $this->summaryBasket->getCustomerReference() ); ?> </div></div></td></tr></table></div><!--[if mso | IE]></td><td class="item-outlook comment-outlook" style="vertical-align:top;width:200px;" ><![endif]--><div class="mj-column-per-33 outlook-group-fix item comment" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" style="font-size:0px;padding:inherit;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"><h3><?= $enc->html( $this->translate( 'client', 'Your comment' ), $enc::TRUST ); ?></h3><div class="content"> <?= $enc->html( $this->summaryBasket->getComment() ); ?> </div></div></td></tr></table></div><!--[if mso | IE]></td></tr></table><![endif]--></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="common-summary-outlook common-summary-detail-outlook" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div class="common-summary common-summary-detail" style="Margin:0px auto;max-width:600px;"><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;"><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;vertical-align:top;"><!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]--><div class="mj-column-per-100 outlook-group-fix" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tr><td align="left" class="basket" style="font-size:0px;padding:10px 25px;word-break:break-word;"><table cellpadding="0" cellspacing="0" width="100%" border="0" style="cellspacing:0;color:#000000;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;"><tr class="header"><th class="status"></th><th class="label"><?= $enc->html( $this->translate( 'client', 'Name' ), $enc::TRUST ); ?></th><th class="quantity"><?= $enc->html( $this->translate( 'client', 'Qty' ), $enc::TRUST ); ?></th><th class="price"><?= $enc->html( $this->translate( 'client', 'Sum' ), $enc::TRUST ); ?></th></tr> <?php
156 159 
 				$detailTarget = $this->config( 'client/html/catalog/detail/url/target' );
157 160 
 				$detailController = $this->config( 'client/html/catalog/detail/url/controller', 'catalog' );
158 161 
 				$detailAction = $this->config( 'client/html/catalog/detail/url/action', 'detail' );
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Customer/Email/Watch/Standard.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -241,7 +241,9 @@
 
 block discarded – undo
241 241 
 					}
242 242 
 				}
243 243 
 			}
244 
-			catch( \Exception $e ) {; } // no price available
244 
+			catch( \Exception $e )
245 
+			{
246 
+; } // no price available
245 247 
 		}
246 248
247 249 
 		return $result;
Please login to merge, or discard this patch.
client/html/src/Client/Html/Checkout/Standard/Payment/Standard.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -248,7 +248,7 @@
 
 block discarded – undo
248 248 
 					catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
249 249 
 					{
250 250 
 						$view->deliveryError = $e->getErrors();
251 
-						$view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $e->getErrors());
251 
+						$view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $e->getErrors() );
252 252
253 253 
 						throw $e;
254 254 
 					}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Checkout/Standard/Process/Standard.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -303,22 +303,22 @@
 
 block discarded – undo
303 303 
 		catch( \Aimeos\Client\Html\Exception $e )
304 304 
 		{
305 305 
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
306 
-			$view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error);
306 
+			$view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error );
307 307 
 		}
308 308 
 		catch( \Aimeos\Controller\Frontend\Exception $e )
309 309 
 		{
310 310 
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
311 
-			$view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error);
311 
+			$view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error );
312 312 
 		}
313 313 
 		catch( \Aimeos\MShop\Exception $e )
314 314 
 		{
315 315 
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
316 
-			$view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error);
316 
+			$view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error );
317 317 
 		}
318 318 
 		catch( \Exception $e )
319 319 
 		{
320 320 
 			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
321 
-			$view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error);
321 
+			$view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error );
322 322 
 			$this->logException( $e );
323 323 
 		}
324 324 
 	}
Please login to merge, or discard this patch.
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -267,14 +267,12 @@  discard block
 
 block discarded – undo
267 267 
 				$orderItem = $orderCntl->add( $basket->getId(), ['order.type' => 'web'] )->store();
268 268
269 269 
 				$context->getSession()->set( 'aimeos/orderid', $orderItem->getId() );
270 
-			}
271 
-			elseif( $view->param( 'cp_payment', null ) !== null )
270 
+			} elseif( $view->param( 'cp_payment', null ) !== null )
272 271 
 			{
273 272 
 				$parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL;
274 273 
 				$orderItem = $orderCntl->get( $context->getSession()->get( 'aimeos/orderid' ), false );
275 274 
 				$basket = $basketCntl->load( $orderItem->getBaseId(), $parts, false );
276 
-			}
277 
-			else
275 
+			} else
278 276 
 			{
279 277 
 				return;
280 278 
 			}
 
@@ -286,8 +284,7 @@  discard block
 
 block discarded – undo
286 284 
 				$view->standardProcessParams = $form->getValues();
287 285 
 				$view->standardUrlExternal = $form->getExternal();
288 286 
 				$view->standardHtml = $form->getHtml();
289 
-			}
290 
-			else // no payment service available
287 
+			} else // no payment service available
291 288 
 			{
292 289 
 				$orderCntl->save( $orderItem->setPaymentStatus( \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ) );
293 290 
 				$view->standardUrlNext = $this->getUrlConfirm( $view, [], [] );
Please login to merge, or discard this patch.
client/html/src/Client/Html/Checkout/Standard/Standard.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -141,22 +141,22 @@  discard block
 
 block discarded – undo
141 141 
 		catch( \Aimeos\Client\Html\Exception $e )
142 142 
 		{
143 143 
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
144 
-			$view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error);
144 
+			$view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error );
145 145 
 		}
146 146 
 		catch( \Aimeos\Controller\Frontend\Exception $e )
147 147 
 		{
148 148 
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
149 
-			$view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error);
149 
+			$view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error );
150 150 
 		}
151 151 
 		catch( \Aimeos\MShop\Exception $e )
152 152 
 		{
153 153 
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
154 
-			$view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error);
154 
+			$view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error );
155 155 
 		}
156 156 
 		catch( \Exception $e )
157 157 
 		{
158 158 
 			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
159 
-			$view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error);
159 
+			$view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error );
160 160 
 			$this->logException( $e );
161 161 
 		}
162 162 
 
@@ -346,12 +346,12 @@  discard block
 
 block discarded – undo
346 346 
 		catch( \Aimeos\Client\Html\Exception $e )
347 347 
 		{
348 348 
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
349 
-			$view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error);
349 
+			$view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error );
350 350 
 		}
351 351 
 		catch( \Aimeos\Controller\Frontend\Exception $e )
352 352 
 		{
353 353 
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
354 
-			$view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error);
354 
+			$view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error );
355 355 
 		}
356 356 
 		catch( \Aimeos\MShop\Plugin\Provider\Exception $e )
357 357 
 		{
 
@@ -359,17 +359,17 @@  discard block
 
 block discarded – undo
359 359 
 			$errors = array_merge( $errors, $this->translatePluginErrorCodes( $e->getErrorCodes() ) );
360 360
361 361 
 			$view->summaryErrorCodes = $e->getErrorCodes();
362 
-			$view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $errors);
362 
+			$view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $errors );
363 363 
 		}
364 364 
 		catch( \Aimeos\MShop\Exception $e )
365 365 
 		{
366 366 
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
367 
-			$view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error);
367 
+			$view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error );
368 368 
 		}
369 369 
 		catch( \Exception $e )
370 370 
 		{
371 371 
 			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
372 
-			$view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error);
372 
+			$view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error );
373 373 
 			$this->logException( $e );
374 374 
 		}
375 375 
 	}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Checkout/Update/Standard.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -86,22 +86,22 @@
 
 block discarded – undo
86 86 
 		catch( \Aimeos\Client\Html\Exception $e )
87 87 
 		{
88 88 
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
89 
-			$view->updateErrorList = array_merge($view->get( 'updateErrorList', [] ), $error);
89 
+			$view->updateErrorList = array_merge( $view->get( 'updateErrorList', [] ), $error );
90 90 
 		}
91 91 
 		catch( \Aimeos\Controller\Frontend\Exception $e )
92 92 
 		{
93 93 
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
94 
-			$view->updateErrorList = array_merge($view->get( 'updateErrorList', [] ), $error);
94 
+			$view->updateErrorList = array_merge( $view->get( 'updateErrorList', [] ), $error );
95 95 
 		}
96 96 
 		catch( \Aimeos\MShop\Exception $e )
97 97 
 		{
98 98 
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
99 
-			$view->updateErrorList = array_merge($view->get( 'updateErrorList', [] ), $error);
99 
+			$view->updateErrorList = array_merge( $view->get( 'updateErrorList', [] ), $error );
100 100 
 		}
101 101 
 		catch( \Exception $e )
102 102 
 		{
103 103 
 			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
104 
-			$view->updateErrorList = array_merge($view->get( 'updateErrorList', [] ), $error);
104 
+			$view->updateErrorList = array_merge( $view->get( 'updateErrorList', [] ), $error );
105 105 
 			$this->logException( $e );
106 106 
 		}
107 107
Please login to merge, or discard this patch.