@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $this->pdf->setFont( 'dejavusans', '', 10 ); |
25 | 25 | |
26 | 26 | $vmargin = [ |
27 | - 'h1' => [ // HTML tag |
|
27 | + 'h1' => [// HTML tag |
|
28 | 28 | 0 => ['h' => 1.5, 'n' => 0], // space before = h * n |
29 | 29 | 1 => ['h' => 1.5, 'n' => 3] // space after = h * n |
30 | 30 | ], |
@@ -97,14 +97,14 @@ discard block |
||
97 | 97 | $data = [ |
98 | 98 | 'BCD', // required |
99 | 99 | '002', // Version 2 (required, 1=UTF-8, 2=ISO 8859-1, 3=ISO 8859-2, 4=ISO 8859-4, 5=ISO 8859-5, 6=ISO 8859-7, 7=ISO 8859-10, 8=ISO 8859-15) |
100 | - 1, // UTF-8 (required) |
|
100 | + 1, // UTF-8 (required) |
|
101 | 101 | 'SCT', // SEPA Credit Transfer (required) |
102 | - '', // BIC (optional) |
|
103 | - '', // Name of recipient (required, name of your company) |
|
104 | - '', // IBAN (required) |
|
105 | - $this->summaryBasket->getPrice()->getCurrencyId() . $total, // Currency and value (required) |
|
106 | - '', // Purpose (optional, 4 char code, https://wiki.windata.de/index.php?title=Purpose-SEPA-Codes) |
|
107 | - '', // ISO 11649 RF Creditor Reference (optional, 35 characters structured code) |
|
102 | + '', // BIC (optional) |
|
103 | + '', // Name of recipient (required, name of your company) |
|
104 | + '', // IBAN (required) |
|
105 | + $this->summaryBasket->getPrice()->getCurrencyId() . $total, // Currency and value (required) |
|
106 | + '', // Purpose (optional, 4 char code, https://wiki.windata.de/index.php?title=Purpose-SEPA-Codes) |
|
107 | + '', // ISO 11649 RF Creditor Reference (optional, 35 characters structured code) |
|
108 | 108 | $this->translate( 'client', 'Order' ) . ' ' . $this->extOrderItem->getOrderNumber(), // Reference of order and other data (optional, max. 140 characters) |
109 | 109 | $this->extOrderBaseItem->getCustomerReference(), // Notice to the customer (optional, max. 70 characters) |
110 | 110 | ]; |
@@ -240,22 +240,22 @@ |
||
240 | 240 | } |
241 | 241 | |
242 | 242 | /** client/html/catalog/session/pinned/maxitems |
243 | - * Maximum number of products displayed in the "pinned" section |
|
244 | - * |
|
245 | - * This option limits the number of products that are shown in the |
|
246 | - * "pinned" section after the users added the product to their list |
|
247 | - * of pinned products. It must be a positive integer value greater |
|
248 | - * than 0. |
|
249 | - * |
|
250 | - * Note: The higher the value is the more data has to be transfered |
|
251 | - * to the client each time the user loads a page with the list of |
|
252 | - * pinned products. |
|
253 | - * |
|
254 | - * @param integer Number of products |
|
255 | - * @since 2014.09 |
|
256 | - * @category User |
|
257 | - * @category Developer |
|
258 | - */ |
|
243 | + * Maximum number of products displayed in the "pinned" section |
|
244 | + * |
|
245 | + * This option limits the number of products that are shown in the |
|
246 | + * "pinned" section after the users added the product to their list |
|
247 | + * of pinned products. It must be a positive integer value greater |
|
248 | + * than 0. |
|
249 | + * |
|
250 | + * Note: The higher the value is the more data has to be transfered |
|
251 | + * to the client each time the user loads a page with the list of |
|
252 | + * pinned products. |
|
253 | + * |
|
254 | + * @param integer Number of products |
|
255 | + * @since 2014.09 |
|
256 | + * @category User |
|
257 | + * @category Developer |
|
258 | + */ |
|
259 | 259 | $max = $context->getConfig()->get( 'client/html/catalog/session/pinned/maxitems', 50 ); |
260 | 260 | |
261 | 261 | $pinned = array_slice( $pinned, -$max, $max, true ); |
@@ -60,7 +60,8 @@ 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 | 66 | <?= $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST ) ?> |
66 | 67 | </p> |
@@ -103,7 +104,9 @@ discard block |
||
103 | 104 | <?php endforeach ?> |
104 | 105 | </select> |
105 | 106 | |
106 | - <?php break; case 'container': ?> |
|
107 | + <?php break; |
|
108 | +} |
|
109 | +case 'container': ?> |
|
107 | 110 | <div id="process-<?= $key ?>"></div> |
108 | 111 | |
109 | 112 | <?php break; case 'boolean': ?> |
@@ -267,14 +267,12 @@ discard block |
||
267 | 267 | |
268 | 268 | $context->getSession()->set( 'aimeos/orderid', $orderItem->getId() ); |
269 | 269 | parent::process(); |
270 | - } |
|
271 | - elseif( ( $orderid = $context->getSession()->get( 'aimeos/orderid' ) ) !== null ) |
|
270 | + } elseif( ( $orderid = $context->getSession()->get( 'aimeos/orderid' ) ) !== null ) |
|
272 | 271 | { |
273 | 272 | $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL; |
274 | 273 | $orderItem = $orderCntl->get( $orderid, false ); |
275 | 274 | $basket = $basketCntl->load( $orderItem->getBaseId(), $parts, false ); |
276 | - } |
|
277 | - else |
|
275 | + } else |
|
278 | 276 | { |
279 | 277 | return; |
280 | 278 | } |
@@ -287,8 +285,7 @@ discard block |
||
287 | 285 | $orderCntl->save( $orderItem->setStatusPayment( \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ) ); |
288 | 286 | $view->standardUrlNext = $this->getUrlConfirm( $view, $args, ['absoluteUri' => true] ); |
289 | 287 | $view->standardMethod = 'POST'; |
290 | - } |
|
291 | - else // no payment service available |
|
288 | + } else // no payment service available |
|
292 | 289 | { |
293 | 290 | $view = $this->addFormData( $view, $form ); |
294 | 291 | } |