Passed
Push — master ( 3052c0...a438df )
by Aimeos
15:16 queued 11:14
created
src/Controller/Jobs/Catalog/Import/Csv/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -592,8 +592,7 @@
 block discarded – undo
592 592
 					{
593 593
 						$manager->move( $item->getId(), $item->getParentId(), $parentid );
594 594
 						$item = $manager->save( $item );
595
-					}
596
-					else
595
+					} else
597 596
 					{
598 597
 						$item = $manager->insert( $item, $parentid );
599 598
 					}
Please login to merge, or discard this patch.
src/Controller/Jobs/Customer/Email/Watch/Standard.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@
 block discarded – undo
155 155
 					}
156 156
 				}
157 157
 			}
158
-			catch( \Exception $e ) { ; } // no price available
158
+			catch( \Exception $e ) {; } // no price available
159 159
 		}
160 160
 
161 161
 		return $result;
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -155,7 +155,9 @@
 block discarded – undo
155 155
 					}
156 156
 				}
157 157
 			}
158
-			catch( \Exception $e ) { ; } // no price available
158
+			catch( \Exception $e )
159
+			{
160
+; } // no price available
159 161
 		}
160 162
 
161 163
 		return $result;
Please login to merge, or discard this patch.
src/Controller/Jobs.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -270,8 +270,7 @@
 block discarded – undo
270 270
 				$subList = self::createControllers( $it, $context, $aimeos, $pref );
271 271
 
272 272
 				$list = array_merge( $list, $subList );
273
-			}
274
-			else if( $prefix !== '' && $entry->getType() === 'file'
273
+			} else if( $prefix !== '' && $entry->getType() === 'file'
275 274
 				&& !in_array( $entry->getBaseName( '.php' ), ['Base'] ) )
276 275
 			{
277 276
 				$list[$prefix] = self::create( $context, $aimeos, $prefix );
Please login to merge, or discard this patch.
src/Controller/Jobs/Media/Scale/Standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -227,9 +227,12 @@
 block discarded – undo
227 227
 
228 228
 		foreach( $items as $item )
229 229
 		{
230
-			try {
230
+			try
231
+			{
231 232
 				$manager->save( $manager->scale( $item, $force ) );
232
-			} catch( \Exception $e ) {
233
+			}
234
+			catch( \Exception $e )
235
+			{
233 236
 				$msg = sprintf( 'Scaling media item "%1$s" failed: %2$s', $item->getId(), $e->getMessage() );
234 237
 				$logger->error( $msg, 'media/scale' );
235 238
 			}
Please login to merge, or discard this patch.
tests/Controller/Jobs/Admin/Log/StandardTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
 
64 64
 		$this->object->run();
65 65
 
66
-		$expected = dirname( __DIR__, 4) . '/tmp/logs/aimeos_' . date( 'Y-m-d' ) . '.log';
66
+		$expected = dirname( __DIR__, 4 ) . '/tmp/logs/aimeos_' . date( 'Y-m-d' ) . '.log';
67 67
 		$this->assertFileExists( $expected );
68 68
 
69 69
 		unlink( $expected );
Please login to merge, or discard this patch.
src/Controller/Jobs/Catalog/Import/Xml/Standard.php 1 patch
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -327,7 +327,9 @@  discard block
 block discarded – undo
327 327
 
328 328
 				return $currentid;
329 329
 			}
330
-			catch( \Aimeos\MShop\Exception $e ) {} // not found, create new
330
+			catch( \Aimeos\MShop\Exception $e )
331
+			{
332
+} // not found, create new
331 333
 		}
332 334
 
333 335
 		$item = $this->process( $manager->create(), $node );
@@ -365,13 +367,11 @@  discard block
 block discarded – undo
365 367
 
366 368
 				$currentid = $this->importNode( $node, $domains, $parentid, $childMap );
367 369
 				$total++;
368
-			}
369
-			elseif( $xml->nodeType === \XMLReader::ELEMENT && $xml->name === 'catalog' )
370
+			} elseif( $xml->nodeType === \XMLReader::ELEMENT && $xml->name === 'catalog' )
370 371
 			{
371 372
 				$this->importTree( $xml, $domains, $currentid, $childMap );
372 373
 				$childMap = [];
373
-			}
374
-			elseif( $xml->nodeType === \XMLReader::END_ELEMENT && $xml->name === 'catalog' )
374
+			} elseif( $xml->nodeType === \XMLReader::END_ELEMENT && $xml->name === 'catalog' )
375 375
 			{
376 376
 				\Aimeos\MShop::create( $this->context(), 'catalog' )->delete( $map );
377 377
 				break;
Please login to merge, or discard this patch.
src/Controller/Jobs/Order/Email/Payment/Standard.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -362,10 +362,18 @@
 block discarded – undo
362 362
 			private ?\Closure $headerFcn = null;
363 363
 			private ?\Closure $footerFcn = null;
364 364
 
365
-			public function Footer() { return ( $fcn = $this->footerFcn ) ? $fcn( $this ) : null; }
366
-			public function Header() { return ( $fcn = $this->headerFcn ) ? $fcn( $this ) : null; }
367
-			public function setFooterFunction( \Closure $fcn ) { $this->footerFcn = $fcn; }
368
-			public function setHeaderFunction( \Closure $fcn ) { $this->headerFcn = $fcn; }
365
+			public function Footer()
366
+			{
367
+return ( $fcn = $this->footerFcn ) ? $fcn( $this ) : null; }
368
+			public function Header()
369
+			{
370
+return ( $fcn = $this->headerFcn ) ? $fcn( $this ) : null; }
371
+			public function setFooterFunction( \Closure $fcn )
372
+			{
373
+$this->footerFcn = $fcn; }
374
+			public function setHeaderFunction( \Closure $fcn )
375
+			{
376
+$this->headerFcn = $fcn; }
369 377
 		};
370 378
 		$pdf->setCreator( PDF_CREATOR );
371 379
 		$pdf->setAuthor( 'Aimeos' );
Please login to merge, or discard this patch.
src/Controller/Jobs/Order/Email/Voucher/Standard.php 1 patch
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -362,10 +362,18 @@
 block discarded – undo
362 362
 			private ?\Closure $headerFcn = null;
363 363
 			private ?\Closure $footerFcn = null;
364 364
 
365
-			public function Footer() { return ( $fcn = $this->footerFcn ) ? $fcn( $this ) : null; }
366
-			public function Header() { return ( $fcn = $this->headerFcn ) ? $fcn( $this ) : null; }
367
-			public function setFooterFunction( \Closure $fcn ) { $this->footerFcn = $fcn; }
368
-			public function setHeaderFunction( \Closure $fcn ) { $this->headerFcn = $fcn; }
365
+			public function Footer()
366
+			{
367
+return ( $fcn = $this->footerFcn ) ? $fcn( $this ) : null; }
368
+			public function Header()
369
+			{
370
+return ( $fcn = $this->headerFcn ) ? $fcn( $this ) : null; }
371
+			public function setFooterFunction( \Closure $fcn )
372
+			{
373
+$this->footerFcn = $fcn; }
374
+			public function setHeaderFunction( \Closure $fcn )
375
+			{
376
+$this->headerFcn = $fcn; }
369 377
 		};
370 378
 		$pdf->setCreator( PDF_CREATOR );
371 379
 		$pdf->setAuthor( 'Aimeos' );
Please login to merge, or discard this patch.
templates/controller/jobs/order/email/delivery/html.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -127,6 +127,9 @@
 block discarded – undo
127 127
 							$addr->getTelefax(),
128 128
 							$addr->getWebsite(),
129 129
 							$addr->getVatID()
130
-						) ) ) ) ?> </div> <?php endforeach ?> <?php else : ?> <div class="content"> <?= $enc->html( $this->translate( 'controller/jobs', '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( 'controller/jobs', '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() )->isEmpty() ) : ?> <ul class="attr-list"> <?php foreach( $attributes as $attribute ) : ?> <?php if( in_array( $attribute->getType(), ['', 'hidden', 'tx'] ) ) : ?> <li class="<?= $enc->attr( 'payment-' . $attribute->getCode() ) ?>"><span class="name"><?= $enc->html( $attribute->getName() ?: $this->translate( 'controller/jobs', $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( 'controller/jobs', '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() )->isEmpty() ) : ?> <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( 'controller/jobs', $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( 'controller/jobs', 'Coupon codes' ), $enc::TRUST ) ?></h3><div class="content"> <?php if( !( $coupons = $this->summaryBasket->getCoupons() )->isEmpty() ) : ?> <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( 'controller/jobs', '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( 'controller/jobs', '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( 'controller/jobs', 'Name' ), $enc::TRUST ) ?></th><th class="quantity"><?= $enc->html( $this->translate( 'controller/jobs', 'Qty' ), $enc::TRUST ) ?></th><th class="price"><?= $enc->html( $this->translate( 'controller/jobs', 'Sum' ), $enc::TRUST ) ?></th></tr> <?php $totalQty = 0 ?> <?php foreach( $this->summaryBasket->getProducts() as $product ) : $totalQty += $product->getQuantity() ?> <tr class="body product"><td class="status"> <?php if( ( $status = $product->getStatusDelivery() ) >= 0 ) : $key = 'stat:' . $status ?> <?= $enc->html( $this->translate( 'mshop/code', $key ) ) ?> <?php endif ?> </td><td class="label"> <?php $params = array_merge( $this->param(), ['d_name' => $product->getName( 'url' ), 'd_prodid' => $product->getParentProductId() ?: $product->getProductId(), 'd_pos' => ''] ) ?> <span class="product-name"><?= $enc->html( $product->getName(), $enc::TRUST ) ?></span><p class="code"><span class="name"><?= $enc->html( $this->translate( 'controller/jobs', 'Article no.' ), $enc::TRUST ) ?>: </span><span class="value"><?= $product->getProductCode() ?></span></p> <?php if( ( $desc = $product->getDescription() ) !== '' ) : ?> <p class="product-description"><?= $enc->html( $desc ) ?></p> <?php endif ?> <?php foreach( ['variant', 'config', 'custom'] as $attrType ) : ?> <?php if( !( $attributes = $product->getAttributeItems( $attrType ) )->isEmpty() ) : ?> <ul class="attr-list attr-type-<?= $enc->attr( $attrType ) ?>"> <?php foreach( $attributes as $attribute ) : ?> <li class="attr-item attr-code-<?= $enc->attr( $attribute->getCode() ) ?>"><span class="name"><?= $enc->html( $this->translate( 'controller/jobs', $attribute->getCode() ) ) ?>:</span> <span class="value"> <?php if( $attribute->getQuantity() > 1 ) : ?> <?= $enc->html( $attribute->getQuantity() ) ?>× <?php endif ?> <?= $enc->html( $attrType !== 'custom' && $attribute->getName() ? $attribute->getName() : $attribute->getValue() ) ?> </span></li> <?php endforeach ?> </ul> <?php endif ?> <?php endforeach ?> <?php if( $this->orderItem->getStatusPayment() >= \Aimeos\MShop\Order\Item\Base::PAY_RECEIVED
130
+						) ) ) ) ?> </div> <?php endforeach ?> <?php else {
131
+							: ?> <div class="content"> <?= $enc->html( $this->translate( 'controller/jobs', '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( 'controller/jobs', '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() )->isEmpty() ) : ?> <ul class="attr-list"> <?php foreach( $attributes as $attribute ) : ?> <?php if( in_array( $attribute->getType(), ['', 'hidden', 'tx'] ) ) : ?> <li class="<?= $enc->attr( 'payment-' . $attribute->getCode() ) ?>"><span class="name"><?= $enc->html( $attribute->getName() ?: $this->translate( 'controller/jobs', $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;
132
+						}
133
+						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( 'controller/jobs', '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() )->isEmpty() ) : ?> <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( 'controller/jobs', $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( 'controller/jobs', 'Coupon codes' ), $enc::TRUST ) ?></h3><div class="content"> <?php if( !( $coupons = $this->summaryBasket->getCoupons() )->isEmpty() ) : ?> <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( 'controller/jobs', '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( 'controller/jobs', '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( 'controller/jobs', 'Name' ), $enc::TRUST ) ?></th><th class="quantity"><?= $enc->html( $this->translate( 'controller/jobs', 'Qty' ), $enc::TRUST ) ?></th><th class="price"><?= $enc->html( $this->translate( 'controller/jobs', 'Sum' ), $enc::TRUST ) ?></th></tr> <?php $totalQty = 0 ?> <?php foreach( $this->summaryBasket->getProducts() as $product ) : $totalQty += $product->getQuantity() ?> <tr class="body product"><td class="status"> <?php if( ( $status = $product->getStatusDelivery() ) >= 0 ) : $key = 'stat:' . $status ?> <?= $enc->html( $this->translate( 'mshop/code', $key ) ) ?> <?php endif ?> </td><td class="label"> <?php $params = array_merge( $this->param(), ['d_name' => $product->getName( 'url' ), 'd_prodid' => $product->getParentProductId() ?: $product->getProductId(), 'd_pos' => ''] ) ?> <span class="product-name"><?= $enc->html( $product->getName(), $enc::TRUST ) ?></span><p class="code"><span class="name"><?= $enc->html( $this->translate( 'controller/jobs', 'Article no.' ), $enc::TRUST ) ?>: </span><span class="value"><?= $product->getProductCode() ?></span></p> <?php if( ( $desc = $product->getDescription() ) !== '' ) : ?> <p class="product-description"><?= $enc->html( $desc ) ?></p> <?php endif ?> <?php foreach( ['variant', 'config', 'custom'] as $attrType ) : ?> <?php if( !( $attributes = $product->getAttributeItems( $attrType ) )->isEmpty() ) : ?> <ul class="attr-list attr-type-<?= $enc->attr( $attrType ) ?>"> <?php foreach( $attributes as $attribute ) : ?> <li class="attr-item attr-code-<?= $enc->attr( $attribute->getCode() ) ?>"><span class="name"><?= $enc->html( $this->translate( 'controller/jobs', $attribute->getCode() ) ) ?>:</span> <span class="value"> <?php if( $attribute->getQuantity() > 1 ) : ?> <?= $enc->html( $attribute->getQuantity() ) ?>× <?php endif ?> <?= $enc->html( $attrType !== 'custom' && $attribute->getName() ? $attribute->getName() : $attribute->getValue() ) ?> </span></li> <?php endforeach ?> </ul> <?php endif ?> <?php endforeach ?> <?php if( $this->orderItem->getStatusPayment() >= \Aimeos\MShop\Order\Item\Base::PAY_RECEIVED
131 134
 								&& ( $product->getStatusPayment() < 0 || $product->getStatusPayment() >= \Aimeos\MShop\Order\Item\Base::PAY_RECEIVED )
132 135
 								&& ( $attribute = $product->getAttributeItem( 'download', 'hidden' ) ) ) : ?> <ul class="attr-list attr-list-hidden"><li class="attr-item attr-code-<?= $enc->attr( $attribute->getCode() ) ?>"><span class="name"><?= $enc->html( $this->translate( 'controller/jobs', $attribute->getCode() ) ) ?></span><span class="value"><a href="<?= $enc->attr( $this->link( 'client/html/account/download/url', ['dl_id' => $attribute->getId()], ['absoluteUri' => 1] ) ) ?>"> <?= $enc->html( $attribute->getName() ) ?> </a></span></li></ul> <?php endif ?> <?php if( ( $timeframe = $product->getTimeframe() ) !== '' ) : ?> <p class="timeframe"><span class="name"><?= $enc->html( $this->translate( 'controller/jobs', 'Delivery within' ) ) ?>: </span><span class="value"><?= $enc->html( $timeframe ) ?></span></p> <?php endif ?> </td><td class="quantity"> <?= $enc->html( $product->getQuantity() ) ?> </td><td class="price"> <?= $enc->html( sprintf( $pricefmt, $this->number( $product->getPrice()->getValue() * $product->getQuantity(), $product->getPrice()->getPrecision() ), $this->translate( 'currency', $product->getPrice()->getCurrencyId() ) ) ) ?> </td></tr> <?php endforeach ?> <?php foreach( $this->summaryBasket->getService( 'delivery' ) as $service ) : ?> <?php if( $service->getPrice()->getValue() > 0 ) : $priceItem = $service->getPrice() ?> <tr class="body delivery"><td class="status"></td><td class="label"><?= $enc->html( $service->getName() ) ?></td><td class="quantity">1</td><td class="price"><?= $enc->html( sprintf( $pricefmt, $this->number( $priceItem->getValue(), $priceItem->getPrecision() ), $this->translate( 'currency', $priceItem->getCurrencyId() ) ) ) ?></td></tr> <?php endif ?> <?php endforeach ?> <?php foreach( $this->summaryBasket->getService( 'payment' ) as $service ) : ?> <?php if( $service->getPrice()->getValue() > 0 ) : $priceItem = $service->getPrice() ?> <tr class="body payment"><td class="status"></td><td class="label"><?= $enc->html( $service->getName() ) ?></td><td class="quantity">1</td><td class="price"><?= $enc->html( sprintf( $pricefmt, $this->number( $priceItem->getValue(), $priceItem->getPrecision() ), $this->translate( 'currency', $priceItem->getCurrencyId() ) ) ) ?></td></tr> <?php endif ?> <?php endforeach ?> <?php if( $this->summaryBasket->getPrice()->getCosts() > 0 || $this->summaryBasket->getPrice()->getTaxFlag() === false ) : ?> <tr class="footer subtotal"><td class="status"></td><td class="label"><?= $enc->html( $this->translate( 'controller/jobs', 'Sub-total' ) ) ?></td><td class="quantity"></td><td class="price"><?= $enc->html( sprintf( $pricefmt, $this->number( $this->summaryBasket->getPrice()->getValue(), $this->summaryBasket->getPrice()->getPrecision() ), $this->translate( 'currency', $this->summaryBasket->getPrice()->getCurrencyId() ) ) ) ?></td></tr> <?php endif ?> <?php if( ( $costs = $this->summaryBasket->getCosts() ) > 0 ) : ?> <tr class="footer delivery"><td class="status"></td><td class="label"><?= $enc->html( $this->translate( 'controller/jobs', '+ Shipping' ) ) ?></td><td class="quantity"></td><td class="price"><?= $enc->html( sprintf( $pricefmt, $this->number( $costs, $this->summaryBasket->getPrice()->getPrecision() ), $this->translate( 'currency', $this->summaryBasket->getPrice()->getCurrencyId() ) ) ) ?></td></tr> <?php endif ?> <?php if( ( $costs = $this->summaryBasket->getCosts( 'payment' ) ) > 0 ) : ?> <tr class="footer payment"><td class="status"></td><td class="label"><?= $enc->html( $this->translate( 'controller/jobs', '+ Payment costs' ) ) ?></td><td class="quantity"></td><td class="price"><?= $enc->html( sprintf( $pricefmt, $this->number( $costs, $this->summaryBasket->getPrice()->getPrecision() ), $this->translate( 'currency', $this->summaryBasket->getPrice()->getCurrencyId() ) ) ) ?></td></tr> <?php endif ?> <?php if( $this->summaryBasket->getPrice()->getTaxFlag() === true ) : ?> <tr class="footer total"><td class="status"></td><td class="label"><?= $enc->html( $this->translate( 'controller/jobs', 'Total' ) ) ?></td><td class="quantity"><?= $enc->html( $totalQty ) ?></td><td class="price"><?= $enc->html( sprintf( $pricefmt, $this->number( $this->summaryBasket->getPrice()->getValue() + $this->summaryBasket->getPrice()->getCosts(), $this->summaryBasket->getPrice()->getPrecision() ), $this->translate( 'currency', $this->summaryBasket->getPrice()->getCurrencyId() ) ) ) ?></td></tr> <?php endif ?> <?php foreach( $this->summaryBasket->getTaxes() as $taxName => $map ) : ?> <?php foreach( $map as $taxRate => $priceItem ) : ?> <?php if( ( $taxValue = $priceItem->getTaxValue() ) > 0 ) : ?> <tr class="footer tax"><td class="status"></td><td class="label"><?= $enc->html( sprintf( $priceItem->getTaxFlag() ? $this->translate( 'controller/jobs', 'Incl. %1$s%% %2$s' ) : $this->translate( 'controller/jobs', '+ %1$s%% %2$s' ), $this->number( $taxRate ), $this->translate( 'controller/jobs', $taxName ) ) ) ?></td><td class="quantity"></td><td class="price"><?= $enc->html( sprintf( $pricefmt, $this->number( $taxValue, $priceItem->getPrecision() ), $this->translate( 'currency', $priceItem->getCurrencyId() ) ) ) ?></td></tr> <?php endif ?> <?php endforeach ?> <?php endforeach ?> <?php if( $this->summaryBasket->getPrice()->getTaxFlag() === false ) : ?> <tr class="footer total"><td class="status"></td><td class="label"><?= $enc->html( $this->translate( 'controller/jobs', 'Total' ) ) ?></td><td class="quantity"><?= $enc->html( $totalQty ) ?></td><td class="price"><?= $enc->html( sprintf( $pricefmt, $this->number( $this->summaryBasket->getPrice()->getValue() + $this->summaryBasket->getPrice()->getCosts() + $this->summaryBasket->getPrice()->getTaxValue(), $this->summaryBasket->getPrice()->getPrecision() ), $this->translate( 'currency', $this->summaryBasket->getPrice()->getCurrencyId() ) ) ) ?></td></tr> <?php endif ?> <?php if( $this->summaryBasket->getPrice()->getRebate() > 0 ) : ?> <tr class="footer rebate"><td class="status"></td><td class="label"><?= $enc->html( $this->translate( 'controller/jobs', 'Included rebates' ) ) ?></td><td class="quantity"></td><td class="price"><?= $enc->html( sprintf( $pricefmt, $this->number( $this->summaryBasket->getPrice()->getRebate(), $this->summaryBasket->getPrice()->getPrecision() ), $this->translate( 'currency', $this->summaryBasket->getPrice()->getCurrencyId() ) ) ) ?></td></tr> <?php endif ?> </table></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="email-common-outro-outlook" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div class="email-common-outro" 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" style="font-size:0px;padding:10px 25px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"> <?= $enc->html( nl2br( $this->translate( 'controller/jobs', 'If you have any questions, please reply to this e-mail' ) ) ) ?> </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="email-common-legal-outlook" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div class="email-common-legal" 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" style="font-size:0px;padding:10px 25px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#000000;"> <?= nl2br( $enc->html( $this->translate( 'controller/jobs', 'All orders are subject to our terms and conditions.' ) ) ) ?> </div></td></tr></table></div><!--[if mso | IE]></td></tr></table><![endif]--></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><![endif]--></div></body></html>
133 136
\ No newline at end of file
Please login to merge, or discard this patch.