@@ -155,7 +155,8 @@ discard block |
||
155 | 155 | |
156 | 156 | </ul> |
157 | 157 | |
158 | - <?php else : ?> |
|
158 | + <?php else { |
|
159 | + : ?> |
|
159 | 160 | |
160 | 161 | <input type="hidden" value="1" name="<?= $enc->attr( $this->formparam( ['b_prod', 0, 'attrconfid', 'qty', ''] ) ) ?>"> |
161 | 162 | <select id="select-<?= $enc->attr( $this->productItem->getId() . '-' . $code ) ?>" class="form-control select-list" |
@@ -205,7 +206,9 @@ discard block |
||
205 | 206 | value="<?= $enc->attr( $price->getValue() ) ?>" |
206 | 207 | <?php endif ?> |
207 | 208 | > |
208 | - <?php break; case 'date': ?> |
|
209 | + <?php break; |
|
210 | +} |
|
211 | +case 'date': ?> |
|
209 | 212 | <input id="select-<?= $enc->attr( $this->productItem->getId() . '-' . $key ) ?>" class="form-control" type="date" name="<?= $enc->attr( $this->formparam( ['b_prod', 0, 'attrcustid', $id] ) ) ?>"> |
210 | 213 | <?php break; default: ?> |
211 | 214 | <input id="select-<?= $enc->attr( $this->productItem->getId() . '-' . $key ) ?>" class="form-control" type="text" name="<?= $enc->attr( $this->formparam( ['b_prod', 0, 'attrcustid', $id] ) ) ?>"> |
@@ -268,14 +268,12 @@ discard block |
||
268 | 268 | $orderItem = $orderCntl->add( $basket->getId(), ['order.type' => 'web'] )->store(); |
269 | 269 | |
270 | 270 | $context->getSession()->set( 'aimeos/orderid', $orderItem->getId() ); |
271 | - } |
|
272 | - elseif( $view->param( 'cp_payment', null ) !== null ) |
|
271 | + } elseif( $view->param( 'cp_payment', null ) !== null ) |
|
273 | 272 | { |
274 | 273 | $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL; |
275 | 274 | $orderItem = $orderCntl->get( $context->getSession()->get( 'aimeos/orderid' ), false ); |
276 | 275 | $basket = $basketCntl->load( $orderItem->getBaseId(), $parts, false ); |
277 | - } |
|
278 | - else |
|
276 | + } else |
|
279 | 277 | { |
280 | 278 | return; |
281 | 279 | } |
@@ -288,8 +286,7 @@ discard block |
||
288 | 286 | $orderCntl->save( $orderItem->setStatusPayment( \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ) ); |
289 | 287 | $view->standardUrlNext = $this->getUrlConfirm( $view, $args, ['absoluteUri' => true] ); |
290 | 288 | $view->standardMethod = 'POST'; |
291 | - } |
|
292 | - else // no payment service available |
|
289 | + } else // no payment service available |
|
293 | 290 | { |
294 | 291 | $view = $this->addFormData( $view, $form ); |
295 | 292 | } |
@@ -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 | ]; |