@@ -122,9 +122,12 @@ |
||
122 | 122 | |
123 | 123 | </ul> |
124 | 124 | |
125 | - <?php else : ?> |
|
125 | + <?php else { |
|
126 | + : ?> |
|
126 | 127 | |
127 | - <input type="hidden" value="1" name="<?= $enc->attr( $this->formparam( ['b_prod', 0, 'attrconfid', 'qty', ''] ) ); ?>" /> |
|
128 | + <input type="hidden" value="1" name="<?= $enc->attr( $this->formparam( ['b_prod', 0, 'attrconfid', 'qty', ''] ) ); |
|
129 | +} |
|
130 | +?>" /> |
|
128 | 131 | <select id="select-<?= $enc->attr( $code ) ?>" class="form-control select-list" |
129 | 132 | name="<?= $enc->attr( $this->formparam( ['b_prod', 0, 'attrconfid', 'id', ''] ) ); ?>"> |
130 | 133 |
@@ -50,8 +50,11 @@ |
||
50 | 50 | <title><?= $enc->html( sprintf( $this->translate( 'client', 'Result for "%1$s"' ), strip_tags( $search ) ) ); ?></title> |
51 | 51 | <meta name="keywords" content="<?= $enc->attr( strip_tags( $search ) ); ?>" /> |
52 | 52 | <meta name="description" content="<?= $enc->attr( strip_tags( $search ) ); ?>" /> |
53 | - <?php else : ?> |
|
54 | - <title><?= $enc->html( $this->translate( 'client', 'Our products' ) ); ?></title> |
|
53 | + <?php else { |
|
54 | + : ?> |
|
55 | + <title><?= $enc->html( $this->translate( 'client', 'Our products' ) ); |
|
56 | +} |
|
57 | +?></title> |
|
55 | 58 | <meta name="keywords" content="<?= $enc->attr( $this->translate( 'client', 'Our products' ) ); ?>" /> |
56 | 59 | <meta name="description" content="<?= $enc->attr( $this->translate( 'client', 'Our products' ) ); ?>" /> |
57 | 60 | <?php endif; ?> |
@@ -24,9 +24,12 @@ |
||
24 | 24 | |
25 | 25 | <?php if( ( $mediaItem = $productItem->getRefItems( 'media', 'default', 'default' )->first() ) !== null ) : ?> |
26 | 26 | <div class="media-item" style="background-image: url('<?= $this->content( $mediaItem->getPreview() ); ?>')"></div> |
27 | - <?php else : ?> |
|
27 | + <?php else { |
|
28 | + : ?> |
|
28 | 29 | <div class="media-item"></div> |
29 | - <?php endif; ?> |
|
30 | + <?php endif; |
|
31 | +} |
|
32 | +?> |
|
30 | 33 | |
31 | 34 | <h2 class="name"><?= $enc->html( $productItem->getName(), $enc::TRUST ); ?></h2> |
32 | 35 |
@@ -285,7 +285,7 @@ |
||
285 | 285 | $catItems = $cntl->getPath( $currentid ); |
286 | 286 | $catIds = $catItems->keys()->toArray(); |
287 | 287 | } elseif( $deep === false ) { |
288 | - $level = $cntl::LIST; |
|
288 | + $level = $cntl::list; |
|
289 | 289 | } |
290 | 290 | |
291 | 291 | $view->treeCatalogPath = $catItems; |
@@ -190,8 +190,7 @@ |
||
190 | 190 | $html = $lastSeen[$name]; |
191 | 191 | unset( $lastSeen[$name] ); |
192 | 192 | $lastSeen[$name] = $html; |
193 | - } |
|
194 | - else |
|
193 | + } else |
|
195 | 194 | { |
196 | 195 | /** client/html/catalog/session/seen/maxitems |
197 | 196 | * Maximum number of products displayed in the "last seen" section |
@@ -190,8 +190,7 @@ discard block |
||
190 | 190 | } |
191 | 191 | |
192 | 192 | $html = $view->render( $view->config( $tplconf, $default ) ); |
193 | - } |
|
194 | - else |
|
193 | + } else |
|
195 | 194 | { |
196 | 195 | $html = $this->modifyBody( $html, $uid ); |
197 | 196 | } |
@@ -261,8 +260,7 @@ discard block |
||
261 | 260 | { |
262 | 261 | $this->logException( $e ); |
263 | 262 | } |
264 | - } |
|
265 | - else |
|
263 | + } else |
|
266 | 264 | { |
267 | 265 | $html = $this->modifyHeader( $html, $uid ); |
268 | 266 | } |
@@ -60,9 +60,12 @@ discard block |
||
60 | 60 | <p class="order-notice"> |
61 | 61 | <?= $enc->html( $this->translate( 'client', 'Please enter your payment details' ), $enc::TRUST ); ?> |
62 | 62 | </p> |
63 | - <?php else : ?> |
|
63 | + <?php else { |
|
64 | + : ?> |
|
64 | 65 | <p class="order-notice"> |
65 | - <?= $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST ); ?> |
|
66 | + <?= $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST ); |
|
67 | +} |
|
68 | +?> |
|
66 | 69 | </p> |
67 | 70 | <?php endif; ?> |
68 | 71 | |
@@ -75,8 +78,11 @@ discard block |
||
75 | 78 | <input type="hidden" id="process-<?= $id; ?>" value="<?= $enc->attr( $value ); ?>" |
76 | 79 | name="<?= $enc->attr( $this->formparam( [$item->getInternalCode(), $key], $prefix ) ); ?>" |
77 | 80 | /> |
78 | - <?php else : ?> |
|
79 | - <input type="hidden" id="process-<?= $id; ?>" value="<?= $enc->attr( $value ); ?>" |
|
81 | + <?php else { |
|
82 | + : ?> |
|
83 | + <input type="hidden" id="process-<?= $id; |
|
84 | +} |
|
85 | +?>" value="<?= $enc->attr( $value ); ?>" |
|
80 | 86 | name="<?= $enc->attr( $this->formparam( $item->getInternalCode(), $prefix ) ); ?>" |
81 | 87 | /> |
82 | 88 | <?php endif; ?> |
@@ -170,10 +176,13 @@ discard block |
||
170 | 176 | <?= $enc->html( $this->translate( 'client', 'Change payment' ), $enc::TRUST ); ?> |
171 | 177 | </a> |
172 | 178 | |
173 | - <?php else : ?> |
|
179 | + <?php else { |
|
180 | + : ?> |
|
174 | 181 | |
175 | 182 | <button class="btn btn-primary btn-lg btn-action"> |
176 | - <?= $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST ); ?> |
|
183 | + <?= $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST ); |
|
184 | +} |
|
185 | +?> |
|
177 | 186 | </button> |
178 | 187 | |
179 | 188 | <?php endif; ?> |
@@ -250,9 +250,12 @@ discard block |
||
250 | 250 | <?php if( $product->getQuantity() > 1 ) : ?> |
251 | 251 | <?php $basketParams = array( 'b_action' => 'edit', 'b_position' => $position, 'b_quantity' => $product->getQuantity() - 1 ); ?> |
252 | 252 | <a class="minibutton change" href="<?= $enc->attr( $this->link( 'client/html/basket/standard/url', $basketParams ) ); ?>">−</a> |
253 | - <?php else : ?> |
|
253 | + <?php else { |
|
254 | + : ?> |
|
254 | 255 | |
255 | - <?php endif; ?> |
|
256 | + <?php endif; |
|
257 | +} |
|
258 | +?> |
|
256 | 259 | |
257 | 260 | <input class="value" type="text" |
258 | 261 | name="<?= $enc->attr( $this->formparam( array( 'b_prod', $position, 'quantity' ) ) ); ?>" |
@@ -266,8 +269,11 @@ discard block |
||
266 | 269 | <?php $basketParams = array( 'b_action' => 'edit', 'b_position' => $position, 'b_quantity' => $product->getQuantity() + 1 ); ?> |
267 | 270 | <a class="minibutton change" href="<?= $enc->attr( $this->link( 'client/html/basket/standard/url', $basketParams ) ); ?>">+</a> |
268 | 271 | |
269 | - <?php else : ?> |
|
270 | - <?= $enc->html( $product->getQuantity() ); ?> |
|
272 | + <?php else { |
|
273 | + : ?> |
|
274 | + <?= $enc->html( $product->getQuantity() ); |
|
275 | +} |
|
276 | +?> |
|
271 | 277 | <?php endif; ?> |
272 | 278 | </td> |
273 | 279 |
@@ -41,6 +41,9 @@ |
||
41 | 41 | }</style><style type="text/css">@media only screen and (max-width:480px) { |
42 | 42 | table.full-width-mobile { width: 100% !important; } |
43 | 43 | td.full-width-mobile { width: auto !important; } |
44 | - }</style><style type="text/css"><?= $this->get( 'htmlCss' ); ?></style></head><body><div class="aimeos"><!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div 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="center" class="logo" style="font-size:0px;padding:10px 25px;word-break:break-word;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;"><tbody><tr><td style="width:550px;"><img height="auto" src="<?= $this->get( 'htmlLogo' ); ?>" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;" width="550"></td></tr></tbody></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="" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div 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="email-common-salutation" 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( $this->get( 'emailIntro' ) ); ?> </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="" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div 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="email-common-intro" 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;"> <?php if( is_array( $this->extVoucherCode ) ) : ?> <?= nl2br( $enc->html( $this->translate( 'client', 'Your vouchers: ' ) ) ); ?><br> <?php foreach( $this->extVoucherCode as $code ) : ?> - <?= $code ?><br> <?php endforeach ?> <?php else : ?> <?= nl2br( $enc->html( $this->translate( 'client', 'Your voucher' ) . ': ' . $this->extVoucherCode, $enc::TRUST ) ); ?> <?php endif ?> </div></td></tr><tr><td align="left" class="email-common-body" 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;"> <?php $priceCurrency = $this->translate( 'currency', $this->extOrderProductItem->getPrice()->getCurrencyId() ); ?> <?php $value = sprintf( $priceFormat, $this->number( $this->extOrderProductItem->getPrice()->getValue() + $this->extOrderProductItem->getPrice()->getRebate(), $this->extOrderProductItem->getPrice()->getPrecision() ), $priceCurrency ); ?> <?= nl2br( $enc->html( sprintf( $this->translate( 'client', 'The value of your voucher is %1$s', 'The value of your vouchers are %1$s', count( (array) $this->extVoucherCode ) ), $value ), $enc::TRUST ) ); ?> </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="" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div 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="email-common-outro" 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( 'client', 'You can use your vouchers at any time in our online shop' ), $enc::TRUST ) ); ?> </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> |
|
44 | + }</style><style type="text/css"><?= $this->get( 'htmlCss' ); ?></style></head><body><div class="aimeos"><!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div 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="center" class="logo" style="font-size:0px;padding:10px 25px;word-break:break-word;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;"><tbody><tr><td style="width:550px;"><img height="auto" src="<?= $this->get( 'htmlLogo' ); ?>" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;" width="550"></td></tr></tbody></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="" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div 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="email-common-salutation" 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( $this->get( 'emailIntro' ) ); ?> </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="" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div 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="email-common-intro" 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;"> <?php if( is_array( $this->extVoucherCode ) ) : ?> <?= nl2br( $enc->html( $this->translate( 'client', 'Your vouchers: ' ) ) ); ?><br> <?php foreach( $this->extVoucherCode as $code ) : ?> - <?= $code ?><br> <?php endforeach ?> <?php else { |
|
45 | + : ?> <?= nl2br( $enc->html( $this->translate( 'client', 'Your voucher' ) . ': ' . $this->extVoucherCode, $enc::TRUST ) ); |
|
46 | +} |
|
47 | +?> <?php endif ?> </div></td></tr><tr><td align="left" class="email-common-body" 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;"> <?php $priceCurrency = $this->translate( 'currency', $this->extOrderProductItem->getPrice()->getCurrencyId() ); ?> <?php $value = sprintf( $priceFormat, $this->number( $this->extOrderProductItem->getPrice()->getValue() + $this->extOrderProductItem->getPrice()->getRebate(), $this->extOrderProductItem->getPrice()->getPrecision() ), $priceCurrency ); ?> <?= nl2br( $enc->html( sprintf( $this->translate( 'client', 'The value of your voucher is %1$s', 'The value of your vouchers are %1$s', count( (array) $this->extVoucherCode ) ), $value ), $enc::TRUST ) ); ?> </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="" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div 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="email-common-outro" 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( 'client', 'You can use your vouchers at any time in our online shop' ), $enc::TRUST ) ); ?> </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> |
|
45 | 48 | <?php $this->block()->stop(); ?> |
46 | 49 | <?= $this->block()->get( 'email/voucher/html' ); ?> |