@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | $this->pdf->setFont( 'dejavusans', '', 10 ); |
20 | 20 | |
21 | 21 | $vmargin = [ |
22 | - 'h1' => [ // HTML tag |
|
22 | + 'h1' => [// HTML tag |
|
23 | 23 | 0 => ['h' => 1.5, 'n' => 0], // space before = h * n |
24 | 24 | 1 => ['h' => 1.5, 'n' => 3] // space after = h * n |
25 | 25 | ], |
@@ -92,14 +92,14 @@ discard block |
||
92 | 92 | $data = [ |
93 | 93 | 'BCD', // required |
94 | 94 | '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) |
95 | - 1, // UTF-8 (required) |
|
95 | + 1, // UTF-8 (required) |
|
96 | 96 | 'SCT', // SEPA Credit Transfer (required) |
97 | - '', // BIC (optional) |
|
98 | - '', // Name of recipient (required, name of your company) |
|
99 | - '', // IBAN (required) |
|
100 | - $this->summaryBasket->getPrice()->getCurrencyId() . $total, // Currency and value (required) |
|
101 | - '', // Purpose (optional, 4 char code, https://wiki.windata.de/index.php?title=Purpose-SEPA-Codes) |
|
102 | - '', // ISO 11649 RF Creditor Reference (optional, 35 characters structured code) |
|
97 | + '', // BIC (optional) |
|
98 | + '', // Name of recipient (required, name of your company) |
|
99 | + '', // IBAN (required) |
|
100 | + $this->summaryBasket->getPrice()->getCurrencyId() . $total, // Currency and value (required) |
|
101 | + '', // Purpose (optional, 4 char code, https://wiki.windata.de/index.php?title=Purpose-SEPA-Codes) |
|
102 | + '', // ISO 11649 RF Creditor Reference (optional, 35 characters structured code) |
|
103 | 103 | $this->translate( 'controller/jobs', 'Order' ) . ' ' . $this->orderItem->getOrderNumber(), // Reference of order and other data (optional, max. 140 characters) |
104 | 104 | $this->summaryBasket->getCustomerReference(), // Notice to the customer (optional, max. 70 characters) |
105 | 105 | ]; |
@@ -22,11 +22,14 @@ |
||
22 | 22 | <?php foreach( $this->voucher as $code ) : ?> |
23 | 23 | - <?= $code ?> |
24 | 24 | <?php endforeach ?> |
25 | -<?php else : ?> |
|
25 | +<?php else { |
|
26 | + : ?> |
|
26 | 27 | <?= wordwrap( strip_tags( $this->translate( 'controller/jobs', 'Your voucher' ) . ': ' . $this->voucher ) ) ?> |
27 | 28 | <?php endif ?> |
28 | 29 | |
29 | -<?php $price = $this->orderProductItem->getPrice(); $priceCurrency = $this->translate( 'currency', $price->getCurrencyId() ) ?> |
|
30 | +<?php $price = $this->orderProductItem->getPrice(); |
|
31 | +} |
|
32 | +$priceCurrency = $this->translate( 'currency', $price->getCurrencyId() ) ?> |
|
30 | 33 | <?php $value = sprintf( $priceFormat, $this->number( $price->getValue() + $price->getRebate(), $price->getPrecision() ), $priceCurrency ) ?> |
31 | 34 | <?= wordwrap( strip_tags( sprintf( $this->translate( 'controller/jobs', 'The value of your voucher is %1$s', 'The value of your vouchers are %1$s', count( (array) $this->voucher ) ), $value ) ) ) ?> |
32 | 35 |
@@ -109,7 +109,8 @@ discard block |
||
109 | 109 | ) ) ) ) |
110 | 110 | ?> |
111 | 111 | <?php endforeach ?> |
112 | -<?php else : ?> |
|
112 | +<?php else { |
|
113 | + : ?> |
|
113 | 114 | <?= $this->translate( 'controller/jobs', 'like billing address' ) ?> |
114 | 115 | <?php endif ?> |
115 | 116 | |
@@ -124,6 +125,7 @@ discard block |
||
124 | 125 | <?php foreach( $service->getAttributeItems() as $attribute ) |
125 | 126 | { |
126 | 127 | $name = ( $attribute->getName() != '' ? $attribute->getName() : $this->translate( 'controller/jobs', $attribute->getCode() ) ); |
128 | +} |
|
127 | 129 | |
128 | 130 | switch( $attribute->getValue() ) |
129 | 131 | { |
@@ -84,8 +84,7 @@ discard block |
||
84 | 84 | foreach( $manager->search( $search ) as $item ) { |
85 | 85 | $this->listTypes[$item->getCode()] = $item->getCode(); |
86 | 86 | } |
87 | - } |
|
88 | - else |
|
87 | + } else |
|
89 | 88 | { |
90 | 89 | $this->listTypes = array_flip( $this->listTypes ); |
91 | 90 | } |
@@ -153,8 +152,7 @@ discard block |
||
153 | 152 | $listItem = $listMap[$url][$type][$langId][$listtype]; |
154 | 153 | $refItem = $listItem->getRefItem(); |
155 | 154 | unset( $listItems[$listItem->getId()] ); |
156 | - } |
|
157 | - else |
|
155 | + } else |
|
158 | 156 | { |
159 | 157 | $listItem = $manager->createListItem()->setType( $listtype ); |
160 | 158 | $refItem = $refManager->create()->setType( $type ); |
@@ -81,8 +81,7 @@ |
||
81 | 81 | foreach( $manager->search( $search ) as $item ) { |
82 | 82 | $this->listTypes[$item->getCode()] = $item->getCode(); |
83 | 83 | } |
84 | - } |
|
85 | - else |
|
84 | + } else |
|
86 | 85 | { |
87 | 86 | $this->listTypes = array_flip( $this->listTypes ); |
88 | 87 | } |
@@ -81,8 +81,7 @@ |
||
81 | 81 | foreach( $manager->search( $search ) as $item ) { |
82 | 82 | $this->listTypes[$item->getCode()] = $item->getCode(); |
83 | 83 | } |
84 | - } |
|
85 | - else |
|
84 | + } else |
|
86 | 85 | { |
87 | 86 | $this->listTypes = array_flip( $this->listTypes ); |
88 | 87 | } |
@@ -81,8 +81,7 @@ |
||
81 | 81 | foreach( $manager->search( $search ) as $item ) { |
82 | 82 | $this->listTypes[$item->getCode()] = $item->getCode(); |
83 | 83 | } |
84 | - } |
|
85 | - else |
|
84 | + } else |
|
86 | 85 | { |
87 | 86 | $this->listTypes = array_flip( $this->listTypes ); |
88 | 87 | } |
@@ -65,8 +65,7 @@ |
||
65 | 65 | { |
66 | 66 | $item = $propMap[$value][$type]; |
67 | 67 | $items->remove( $item->getId() ); |
68 | - } |
|
69 | - else |
|
68 | + } else |
|
70 | 69 | { |
71 | 70 | $item = $manager->create()->setType( $type ); |
72 | 71 | } |
@@ -82,8 +82,7 @@ discard block |
||
82 | 82 | foreach( $manager->search( $search ) as $item ) { |
83 | 83 | $this->listTypes[$item->getCode()] = $item->getCode(); |
84 | 84 | } |
85 | - } |
|
86 | - else |
|
85 | + } else |
|
87 | 86 | { |
88 | 87 | $this->listTypes = array_flip( $this->listTypes ); |
89 | 88 | } |
@@ -147,8 +146,7 @@ discard block |
||
147 | 146 | { |
148 | 147 | $listItem = $listMap[$code][$attrType][$listtype]; |
149 | 148 | unset( $listItems[$listItem->getId()] ); |
150 | - } |
|
151 | - else |
|
149 | + } else |
|
152 | 150 | { |
153 | 151 | $listItem = $manager->createListItem()->setType( $listtype ); |
154 | 152 | } |