Passed
Push — master ( 150377...c18077 )
by Aimeos
02:57
created
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.
client/html/src/Client/Html/Account/Subscription/Standard.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -107,22 +107,22 @@  discard block
 block discarded – undo
107 107
 		catch( \Aimeos\Client\Html\Exception $e )
108 108
 		{
109 109
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
110
-			$view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error);
110
+			$view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error );
111 111
 		}
112 112
 		catch( \Aimeos\Controller\Frontend\Exception $e )
113 113
 		{
114 114
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
115
-			$view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error);
115
+			$view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error );
116 116
 		}
117 117
 		catch( \Aimeos\MShop\Exception $e )
118 118
 		{
119 119
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
120
-			$view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error);
120
+			$view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error );
121 121
 		}
122 122
 		catch( \Exception $e )
123 123
 		{
124 124
 			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
125
-			$view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error);
125
+			$view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error );
126 126
 			$this->logException( $e );
127 127
 		}
128 128
 
@@ -312,22 +312,22 @@  discard block
 block discarded – undo
312 312
 		catch( \Aimeos\MShop\Exception $e )
313 313
 		{
314 314
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
315
-			$view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error);
315
+			$view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error );
316 316
 		}
317 317
 		catch( \Aimeos\Controller\Frontend\Exception $e )
318 318
 		{
319 319
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
320
-			$view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error);
320
+			$view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error );
321 321
 		}
322 322
 		catch( \Aimeos\Client\Html\Exception $e )
323 323
 		{
324 324
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
325
-			$view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error);
325
+			$view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error );
326 326
 		}
327 327
 		catch( \Exception $e )
328 328
 		{
329 329
 			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
330
-			$view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error);
330
+			$view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error );
331 331
 			$this->logException( $e );
332 332
 		}
333 333
 	}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Account/Favorite/Standard.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -86,22 +86,22 @@  discard block
 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->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
89
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $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->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
94
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error );
95 95
 		}
96 96
 		catch( \Aimeos\MShop\Exception $e )
97 97
 		{
98 98
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
99
-			$view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
99
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $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->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
104
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error );
105 105
 			$this->logException( $e );
106 106
 		}
107 107
 
@@ -302,22 +302,22 @@  discard block
 block discarded – undo
302 302
 		catch( \Aimeos\MShop\Exception $e )
303 303
 		{
304 304
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
305
-			$view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
305
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error );
306 306
 		}
307 307
 		catch( \Aimeos\Controller\Frontend\Exception $e )
308 308
 		{
309 309
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
310
-			$view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
310
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error );
311 311
 		}
312 312
 		catch( \Aimeos\Client\Html\Exception $e )
313 313
 		{
314 314
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
315
-			$view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
315
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error );
316 316
 		}
317 317
 		catch( \Exception $e )
318 318
 		{
319 319
 			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
320
-			$view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
320
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error );
321 321
 			$this->logException( $e );
322 322
 		}
323 323
 	}
Please login to merge, or discard this patch.