@@ -319,7 +319,9 @@ |
||
319 | 319 | $view->addressPaymentItem = $paymentAddressItem; |
320 | 320 | $view->addressDeliveryItems = $deliveryAddressItems; |
321 | 321 | } |
322 | - catch( \Exception $e ) {} // customer has no account yet |
|
322 | + catch( \Exception $e ) |
|
323 | + { |
|
324 | +} // customer has no account yet |
|
323 | 325 | |
324 | 326 | |
325 | 327 | $localeManager = \Aimeos\MShop::create( $context, 'locale' ); |
@@ -536,7 +536,7 @@ |
||
536 | 536 | * @see client/html/checkout/standard/address/billing/mandatory |
537 | 537 | * @see client/html/checkout/standard/address/billing/optional |
538 | 538 | * @see client/html/checkout/standard/address/billing/hidden |
539 | - */ |
|
539 | + */ |
|
540 | 540 | $disable = $view->config( 'client/html/checkout/standard/address/billing/disable-new', false ); |
541 | 541 | $type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT; |
542 | 542 |
@@ -540,9 +540,11 @@ discard block |
||
540 | 540 | $disable = $view->config( 'client/html/checkout/standard/address/billing/disable-new', false ); |
541 | 541 | $type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT; |
542 | 542 | |
543 | - if( ( $option = $view->param( 'ca_billingoption', 'null' ) ) === 'null' && $disable === false ) // new address |
|
543 | + if( ( $option = $view->param( 'ca_billingoption', 'null' ) ) === 'null' && $disable === false ) { |
|
544 | + // new address |
|
544 | 545 | { |
545 | 546 | $params = $view->param( 'ca_billing', [] ); |
547 | + } |
|
546 | 548 | |
547 | 549 | if( ( $invalid = $this->checkFields( $params ) ) !== [] ) |
548 | 550 | { |
@@ -551,8 +553,7 @@ discard block |
||
551 | 553 | } |
552 | 554 | |
553 | 555 | $basketCtrl->setAddress( $type, $params ); |
554 | - } |
|
555 | - else // existing address |
|
556 | + } else // existing address |
|
556 | 557 | { |
557 | 558 | $list = []; |
558 | 559 | $params = $view->param( 'ca_billing_' . $option, [] ); |
@@ -588,9 +589,12 @@ discard block |
||
588 | 589 | $context = $this->getContext(); |
589 | 590 | $basketCntl = \Aimeos\Controller\Frontend::create( $context, 'basket' ); |
590 | 591 | |
591 | - try { |
|
592 | + try |
|
593 | + { |
|
592 | 594 | $langid = $basketCntl->get()->getAddress( 'payment' )->getLanguageId(); |
593 | - } catch( \Exception $e ) { |
|
595 | + } |
|
596 | + catch( \Exception $e ) |
|
597 | + { |
|
594 | 598 | $langid = $view->param( 'ca_billing/order.base.address.languageid', $context->getLocale()->getLanguageId() ); |
595 | 599 | } |
596 | 600 | $view->billingLanguage = $langid; |
@@ -769,8 +773,7 @@ discard block |
||
769 | 773 | $invalid[$key] = $name; |
770 | 774 | unset( $params[$key] ); |
771 | 775 | } |
772 | - } |
|
773 | - else |
|
776 | + } else |
|
774 | 777 | { |
775 | 778 | unset( $params[$key] ); |
776 | 779 | } |
@@ -533,7 +533,7 @@ discard block |
||
533 | 533 | * @see client/html/checkout/standard/url/target |
534 | 534 | * @see client/html/checkout/standard/url/action |
535 | 535 | * @see client/html/checkout/standard/url/config |
536 | - */ |
|
536 | + */ |
|
537 | 537 | $cCntl = $view->config( 'client/html/checkout/standard/url/controller', 'checkout' ); |
538 | 538 | |
539 | 539 | /** client/html/checkout/standard/url/action |
@@ -549,7 +549,7 @@ discard block |
||
549 | 549 | * @see client/html/checkout/standard/url/target |
550 | 550 | * @see client/html/checkout/standard/url/controller |
551 | 551 | * @see client/html/checkout/standard/url/config |
552 | - */ |
|
552 | + */ |
|
553 | 553 | $cAction = $view->config( 'client/html/checkout/standard/url/action', 'index' ); |
554 | 554 | |
555 | 555 | /** client/html/checkout/standard/url/config |
@@ -572,7 +572,7 @@ discard block |
||
572 | 572 | * @see client/html/checkout/standard/url/controller |
573 | 573 | * @see client/html/checkout/standard/url/action |
574 | 574 | * @see client/html/url/config |
575 | - */ |
|
575 | + */ |
|
576 | 576 | $cConfig = $view->config( 'client/html/checkout/standard/url/config', [] ); |
577 | 577 | |
578 | 578 |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | $basketCntl = \Aimeos\Controller\Frontend::create( $context, 'basket' ); |
260 | 260 | |
261 | 261 | |
262 | - if ( $view->param( 'cs_order', null ) !== null ) |
|
262 | + if( $view->param( 'cs_order', null ) !== null ) |
|
263 | 263 | { |
264 | 264 | parent::process(); |
265 | 265 | |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | |
270 | 270 | $context->getSession()->set( 'aimeos/orderid', $orderItem->getId() ); |
271 | 271 | } |
272 | - elseif ( $view->param( 'cp_payment', null ) !== null ) |
|
272 | + elseif( $view->param( 'cp_payment', null ) !== null ) |
|
273 | 273 | { |
274 | 274 | $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL; |
275 | 275 | $orderItem = $orderCntl->getItem( $context->getSession()->get( 'aimeos/orderid' ) ); |
@@ -268,14 +268,12 @@ discard block |
||
268 | 268 | $orderCntl->block( $orderItem ); |
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->getItem( $context->getSession()->get( 'aimeos/orderid' ) ); |
276 | 275 | $basket = $basketCntl->load( $orderItem->getBaseId(), $parts, false ); |
277 | - } |
|
278 | - else |
|
276 | + } else |
|
279 | 277 | { |
280 | 278 | return; |
281 | 279 | } |
@@ -289,8 +287,7 @@ discard block |
||
289 | 287 | $orderCntl = \Aimeos\Controller\Frontend::create( $context, 'order' ); |
290 | 288 | $orderCntl->saveItem( $orderItem ); |
291 | 289 | |
292 | - } |
|
293 | - elseif( ( $form = $this->processPayment( $basket, $orderItem ) ) !== null ) |
|
290 | + } elseif( ( $form = $this->processPayment( $basket, $orderItem ) ) !== null ) |
|
294 | 291 | { |
295 | 292 | $view->standardUrlNext = $form->getUrl(); |
296 | 293 | $view->standardMethod = $form->getMethod(); |
@@ -323,7 +323,7 @@ |
||
323 | 323 | $orderItem = $orderCntl->getItem( $orderid ); |
324 | 324 | } |
325 | 325 | |
326 | - $orderCntl->update( $orderItem ); // update stock, coupons, etc. |
|
326 | + $orderCntl->update( $orderItem ); // update stock, coupons, etc. |
|
327 | 327 | |
328 | 328 | parent::process(); |
329 | 329 |
@@ -1,272 +1,272 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | return array( |
4 | - 'html' => array( |
|
5 | - 'catalog' => array( |
|
6 | - 'lists' => array( |
|
7 | - 'items' => array( |
|
8 | - 'standard' => array( |
|
9 | - 'template-body-list' => 'catalog/lists/items-body-list', |
|
10 | - ), |
|
11 | - ), |
|
12 | - ), |
|
13 | - ), |
|
14 | - 'checkout' => array( |
|
15 | - 'standard' => array( |
|
16 | - 'address' => array( |
|
17 | - 'countries' => array( |
|
18 | - 'AD', // Andorra |
|
19 | - 'AE', // United Arab Emirates |
|
20 | - 'AF', // Afghanistan |
|
21 | - 'AG', // Antigua and Barbuda |
|
22 | - 'AI', // Anguilla |
|
23 | - 'AL', // Albania |
|
24 | - 'AM', // Armenia |
|
25 | - 'AO', // Angola |
|
26 | - 'AQ', // Antarctica |
|
27 | - 'AR', // Argentina |
|
28 | - 'AS', // American Samoa |
|
29 | - 'AT', // Austria |
|
30 | - 'AU', // Australia |
|
31 | - 'AW', // Aruba |
|
32 | - 'AX', // Åland Islands |
|
33 | - 'AZ', // Azerbaijan |
|
34 | - 'BA', // Bosnia and Herzegovina |
|
35 | - 'BB', // Barbados |
|
36 | - 'BD', // Bangladesh |
|
37 | - 'BE', // Belgium |
|
38 | - 'BF', // Burkina Faso |
|
39 | - 'BG', // Bulgaria |
|
40 | - 'BH', // Bahrain |
|
41 | - 'BI', // Burundi |
|
42 | - 'BJ', // Benin |
|
43 | - 'BL', // Saint Barthélemy |
|
44 | - 'BM', // Bermuda |
|
45 | - 'BN', // Brunei Darussalam |
|
46 | - 'BO', // Bolivia, Plurinational State of |
|
47 | - 'BQ', // Bonaire, Sint Eustatius and Saba |
|
48 | - 'BR', // Brazil |
|
49 | - 'BS', // Bahamas |
|
50 | - 'BT', // Bhutan |
|
51 | - 'BV', // Bouvet Island |
|
52 | - 'BW', // Botswana |
|
53 | - 'BY', // Belarus |
|
54 | - 'BZ', // Belize |
|
55 | - 'CA', // Canada |
|
56 | - 'CC', // Cocos (Keeling) Islands |
|
57 | - 'CD', // Congo, the Democratic Republic of the |
|
58 | - 'CF', // Central African Republic |
|
59 | - 'CG', // Congo |
|
60 | - 'CH', // Switzerland |
|
61 | - 'CI', // Côte d'Ivoire |
|
62 | - 'CK', // Cook Islands |
|
63 | - 'CL', // Chile |
|
64 | - 'CM', // Cameroon |
|
65 | - 'CN', // China |
|
66 | - 'CO', // Colombia |
|
67 | - 'CR', // Costa Rica |
|
68 | - 'CU', // Cuba |
|
69 | - 'CV', // Cape Verde |
|
70 | - 'CW', // Curaçao |
|
71 | - 'CX', // Christmas Island |
|
72 | - 'CY', // Cyprus |
|
73 | - 'CZ', // Czech Republic |
|
74 | - 'DE', // Germany |
|
75 | - 'DJ', // Djibouti |
|
76 | - 'DK', // Denmark |
|
77 | - 'DM', // Dominica |
|
78 | - 'DO', // Dominican Republic |
|
79 | - 'DZ', // Algeria |
|
80 | - 'EC', // Ecuador |
|
81 | - 'EE', // Estonia |
|
82 | - 'EG', // Egypt |
|
83 | - 'EH', // Western Sahara |
|
84 | - 'ER', // Eritrea |
|
85 | - 'ES', // Spain |
|
86 | - 'ET', // Ethiopia |
|
87 | - 'FI', // Finland |
|
88 | - 'FJ', // Fiji |
|
89 | - 'FK', // Falkland Islands (Malvinas) |
|
90 | - 'FM', // Micronesia, Federated States of |
|
91 | - 'FO', // Faroe Islands |
|
92 | - 'FR', // France |
|
93 | - 'GA', // Gabon |
|
94 | - 'GB', // United Kingdom |
|
95 | - 'GD', // Grenada |
|
96 | - 'GE', // Georgia |
|
97 | - 'GF', // French Guiana |
|
98 | - 'GG', // Guernsey |
|
99 | - 'GH', // Ghana |
|
100 | - 'GI', // Gibraltar |
|
101 | - 'GL', // Greenland |
|
102 | - 'GM', // Gambia |
|
103 | - 'GN', // Guinea |
|
104 | - 'GP', // Guadeloupe |
|
105 | - 'GQ', // Equatorial Guinea |
|
106 | - 'GR', // Greece |
|
107 | - 'GS', // South Georgia and the South Sandwich Islands |
|
108 | - 'GT', // Guatemala |
|
109 | - 'GU', // Guam |
|
110 | - 'GW', // Guinea-Bissau |
|
111 | - 'GY', // Guyana |
|
112 | - 'HK', // Hong Kong |
|
113 | - 'HM', // Heard Island and McDonald Islands |
|
114 | - 'HN', // Honduras |
|
115 | - 'HR', // Croatia |
|
116 | - 'HT', // Haiti |
|
117 | - 'HU', // Hungary |
|
118 | - 'ID', // Indonesia |
|
119 | - 'IE', // Ireland |
|
120 | - 'IL', // Israel |
|
121 | - 'IM', // Isle of Man |
|
122 | - 'IN', // India |
|
123 | - 'IO', // British Indian Ocean Territory |
|
124 | - 'IQ', // Iraq |
|
125 | - 'IR', // Iran, Islamic Republic of |
|
126 | - 'IS', // Iceland |
|
127 | - 'IT', // Italy |
|
128 | - 'JE', // Jersey |
|
129 | - 'JM', // Jamaica |
|
130 | - 'JO', // Jordan |
|
131 | - 'JP', // Japan |
|
132 | - 'KE', // Kenya |
|
133 | - 'KG', // Kyrgyzstan |
|
134 | - 'KH', // Cambodia |
|
135 | - 'KI', // Kiribati |
|
136 | - 'KM', // Comoros |
|
137 | - 'KN', // Saint Kitts and Nevis |
|
138 | - 'KP', // Korea, Democratic People's Republic of |
|
139 | - 'KR', // Korea, Republic of |
|
140 | - 'KW', // Kuwait |
|
141 | - 'KY', // Cayman Islands |
|
142 | - 'KZ', // Kazakhstan |
|
143 | - 'LA', // Lao People's Democratic Republic |
|
144 | - 'LB', // Lebanon |
|
145 | - 'LC', // Saint Lucia |
|
146 | - 'LI', // Liechtenstein |
|
147 | - 'LK', // Sri Lanka |
|
148 | - 'LR', // Liberia |
|
149 | - 'LS', // Lesotho |
|
150 | - 'LT', // Lithuania |
|
151 | - 'LU', // Luxembourg |
|
152 | - 'LV', // Latvia |
|
153 | - 'LY', // Libya |
|
154 | - 'MA', // Morocco |
|
155 | - 'MC', // Monaco |
|
156 | - 'MD', // Moldova, Republic of |
|
157 | - 'ME', // Montenegro |
|
158 | - 'MF', // Saint Martin (French part) |
|
159 | - 'MG', // Madagascar |
|
160 | - 'MH', // Marshall Islands |
|
161 | - 'MK', // Macedonia |
|
162 | - 'ML', // Mali |
|
163 | - 'MM', // Myanmar |
|
164 | - 'MN', // Mongolia |
|
165 | - 'MO', // Macao |
|
166 | - 'MP', // Northern Mariana Islands |
|
167 | - 'MQ', // Martinique |
|
168 | - 'MR', // Mauritania |
|
169 | - 'MS', // Montserrat |
|
170 | - 'MT', // Malta |
|
171 | - 'MU', // Mauritius |
|
172 | - 'MV', // Maldives |
|
173 | - 'MW', // Malawi |
|
174 | - 'MX', // Mexico |
|
175 | - 'MY', // Malaysia |
|
176 | - 'MZ', // Mozambique |
|
177 | - 'NA', // Namibia |
|
178 | - 'NC', // New Caledonia |
|
179 | - 'NE', // Niger |
|
180 | - 'NF', // Norfolk Island |
|
181 | - 'NG', // Nigeria |
|
182 | - 'NI', // Nicaragua |
|
183 | - 'NL', // Netherlands |
|
184 | - 'NO', // Norway |
|
185 | - 'NP', // Nepal |
|
186 | - 'NR', // Nauru |
|
187 | - 'NU', // Niue |
|
188 | - 'NZ', // New Zealand |
|
189 | - 'OM', // Oman |
|
190 | - 'PA', // Panama |
|
191 | - 'PE', // Peru |
|
192 | - 'PF', // French Polynesia |
|
193 | - 'PG', // Papua New Guinea |
|
194 | - 'PH', // Philippines |
|
195 | - 'PK', // Pakistan |
|
196 | - 'PL', // Poland |
|
197 | - 'PM', // Saint Pierre and Miquelon |
|
198 | - 'PN', // Pitcairn |
|
199 | - 'PR', // Puerto Rico |
|
200 | - 'PS', // Palestine, State of |
|
201 | - 'PT', // Portugal |
|
202 | - 'PW', // Palau |
|
203 | - 'PY', // Paraguay |
|
204 | - 'QA', // Qatar |
|
205 | - 'RE', // Réunion |
|
206 | - 'RO', // Romania |
|
207 | - 'RS', // Serbia |
|
208 | - 'RU', // Russian Federation |
|
209 | - 'RW', // Rwanda |
|
210 | - 'SA', // Saudi Arabia |
|
211 | - 'SB', // Solomon Islands |
|
212 | - 'SC', // Seychelles |
|
213 | - 'SD', // Sudan |
|
214 | - 'SE', // Sweden |
|
215 | - 'SG', // Singapore |
|
216 | - 'SH', // Saint Helena, Ascension and Tristan da Cunha |
|
217 | - 'SI', // Slovenia |
|
218 | - 'SJ', // Svalbard and Jan Mayen |
|
219 | - 'SK', // Slovakia |
|
220 | - 'SL', // Sierra Leone |
|
221 | - 'SM', // San Marino |
|
222 | - 'SN', // Senegal |
|
223 | - 'SO', // Somalia |
|
224 | - 'SR', // Suriname |
|
225 | - 'SS', // South Sudan |
|
226 | - 'ST', // Sao Tome and Principe |
|
227 | - 'SV', // El Salvador |
|
228 | - 'SX', // Sint Maarten (Dutch part) |
|
229 | - 'SY', // Syrian Arab Republic |
|
230 | - 'SZ', // Swaziland |
|
231 | - 'TC', // Turks and Caicos Islands |
|
232 | - 'TD', // Chad |
|
233 | - 'TF', // French Southern Territories |
|
234 | - 'TG', // Togo |
|
235 | - 'TH', // Thailand |
|
236 | - 'TJ', // Tajikistan |
|
237 | - 'TK', // Tokelau |
|
238 | - 'TL', // Timor-Leste |
|
239 | - 'TM', // Turkmenistan |
|
240 | - 'TN', // Tunisia |
|
241 | - 'TO', // Tonga |
|
242 | - 'TR', // Turkey |
|
243 | - 'TT', // Trinidad and Tobago |
|
244 | - 'TV', // Tuvalu |
|
245 | - 'TW', // Taiwan |
|
246 | - 'TZ', // Tanzania, United Republic of |
|
247 | - 'UA', // Ukraine |
|
248 | - 'UG', // Uganda |
|
249 | - 'UM', // United States Minor Outlying Islands |
|
250 | - 'US', // United States |
|
251 | - 'UY', // Uruguay |
|
252 | - 'UZ', // Uzbekistan |
|
253 | - 'VA', // Vatican City State (Holy See) |
|
254 | - 'VC', // Saint Vincent and the Grenadines |
|
255 | - 'VE', // Venezuela, Bolivarian Republic of |
|
256 | - 'VG', // Virgin Islands, British |
|
257 | - 'VI', // Virgin Islands, U.S. |
|
258 | - 'VN', // Viet Nam |
|
259 | - 'VU', // Vanuatu |
|
260 | - 'WF', // Wallis and Futuna |
|
261 | - 'WS', // Samoa |
|
262 | - 'YE', // Yemen |
|
263 | - 'YT', // Mayotte |
|
264 | - 'ZA', // South Africa |
|
265 | - 'ZM', // Zambia |
|
266 | - 'ZW', // Zimbabwe |
|
267 | - ), |
|
268 | - ), |
|
269 | - ), |
|
270 | - ), |
|
271 | - ), |
|
4 | + 'html' => array( |
|
5 | + 'catalog' => array( |
|
6 | + 'lists' => array( |
|
7 | + 'items' => array( |
|
8 | + 'standard' => array( |
|
9 | + 'template-body-list' => 'catalog/lists/items-body-list', |
|
10 | + ), |
|
11 | + ), |
|
12 | + ), |
|
13 | + ), |
|
14 | + 'checkout' => array( |
|
15 | + 'standard' => array( |
|
16 | + 'address' => array( |
|
17 | + 'countries' => array( |
|
18 | + 'AD', // Andorra |
|
19 | + 'AE', // United Arab Emirates |
|
20 | + 'AF', // Afghanistan |
|
21 | + 'AG', // Antigua and Barbuda |
|
22 | + 'AI', // Anguilla |
|
23 | + 'AL', // Albania |
|
24 | + 'AM', // Armenia |
|
25 | + 'AO', // Angola |
|
26 | + 'AQ', // Antarctica |
|
27 | + 'AR', // Argentina |
|
28 | + 'AS', // American Samoa |
|
29 | + 'AT', // Austria |
|
30 | + 'AU', // Australia |
|
31 | + 'AW', // Aruba |
|
32 | + 'AX', // Åland Islands |
|
33 | + 'AZ', // Azerbaijan |
|
34 | + 'BA', // Bosnia and Herzegovina |
|
35 | + 'BB', // Barbados |
|
36 | + 'BD', // Bangladesh |
|
37 | + 'BE', // Belgium |
|
38 | + 'BF', // Burkina Faso |
|
39 | + 'BG', // Bulgaria |
|
40 | + 'BH', // Bahrain |
|
41 | + 'BI', // Burundi |
|
42 | + 'BJ', // Benin |
|
43 | + 'BL', // Saint Barthélemy |
|
44 | + 'BM', // Bermuda |
|
45 | + 'BN', // Brunei Darussalam |
|
46 | + 'BO', // Bolivia, Plurinational State of |
|
47 | + 'BQ', // Bonaire, Sint Eustatius and Saba |
|
48 | + 'BR', // Brazil |
|
49 | + 'BS', // Bahamas |
|
50 | + 'BT', // Bhutan |
|
51 | + 'BV', // Bouvet Island |
|
52 | + 'BW', // Botswana |
|
53 | + 'BY', // Belarus |
|
54 | + 'BZ', // Belize |
|
55 | + 'CA', // Canada |
|
56 | + 'CC', // Cocos (Keeling) Islands |
|
57 | + 'CD', // Congo, the Democratic Republic of the |
|
58 | + 'CF', // Central African Republic |
|
59 | + 'CG', // Congo |
|
60 | + 'CH', // Switzerland |
|
61 | + 'CI', // Côte d'Ivoire |
|
62 | + 'CK', // Cook Islands |
|
63 | + 'CL', // Chile |
|
64 | + 'CM', // Cameroon |
|
65 | + 'CN', // China |
|
66 | + 'CO', // Colombia |
|
67 | + 'CR', // Costa Rica |
|
68 | + 'CU', // Cuba |
|
69 | + 'CV', // Cape Verde |
|
70 | + 'CW', // Curaçao |
|
71 | + 'CX', // Christmas Island |
|
72 | + 'CY', // Cyprus |
|
73 | + 'CZ', // Czech Republic |
|
74 | + 'DE', // Germany |
|
75 | + 'DJ', // Djibouti |
|
76 | + 'DK', // Denmark |
|
77 | + 'DM', // Dominica |
|
78 | + 'DO', // Dominican Republic |
|
79 | + 'DZ', // Algeria |
|
80 | + 'EC', // Ecuador |
|
81 | + 'EE', // Estonia |
|
82 | + 'EG', // Egypt |
|
83 | + 'EH', // Western Sahara |
|
84 | + 'ER', // Eritrea |
|
85 | + 'ES', // Spain |
|
86 | + 'ET', // Ethiopia |
|
87 | + 'FI', // Finland |
|
88 | + 'FJ', // Fiji |
|
89 | + 'FK', // Falkland Islands (Malvinas) |
|
90 | + 'FM', // Micronesia, Federated States of |
|
91 | + 'FO', // Faroe Islands |
|
92 | + 'FR', // France |
|
93 | + 'GA', // Gabon |
|
94 | + 'GB', // United Kingdom |
|
95 | + 'GD', // Grenada |
|
96 | + 'GE', // Georgia |
|
97 | + 'GF', // French Guiana |
|
98 | + 'GG', // Guernsey |
|
99 | + 'GH', // Ghana |
|
100 | + 'GI', // Gibraltar |
|
101 | + 'GL', // Greenland |
|
102 | + 'GM', // Gambia |
|
103 | + 'GN', // Guinea |
|
104 | + 'GP', // Guadeloupe |
|
105 | + 'GQ', // Equatorial Guinea |
|
106 | + 'GR', // Greece |
|
107 | + 'GS', // South Georgia and the South Sandwich Islands |
|
108 | + 'GT', // Guatemala |
|
109 | + 'GU', // Guam |
|
110 | + 'GW', // Guinea-Bissau |
|
111 | + 'GY', // Guyana |
|
112 | + 'HK', // Hong Kong |
|
113 | + 'HM', // Heard Island and McDonald Islands |
|
114 | + 'HN', // Honduras |
|
115 | + 'HR', // Croatia |
|
116 | + 'HT', // Haiti |
|
117 | + 'HU', // Hungary |
|
118 | + 'ID', // Indonesia |
|
119 | + 'IE', // Ireland |
|
120 | + 'IL', // Israel |
|
121 | + 'IM', // Isle of Man |
|
122 | + 'IN', // India |
|
123 | + 'IO', // British Indian Ocean Territory |
|
124 | + 'IQ', // Iraq |
|
125 | + 'IR', // Iran, Islamic Republic of |
|
126 | + 'IS', // Iceland |
|
127 | + 'IT', // Italy |
|
128 | + 'JE', // Jersey |
|
129 | + 'JM', // Jamaica |
|
130 | + 'JO', // Jordan |
|
131 | + 'JP', // Japan |
|
132 | + 'KE', // Kenya |
|
133 | + 'KG', // Kyrgyzstan |
|
134 | + 'KH', // Cambodia |
|
135 | + 'KI', // Kiribati |
|
136 | + 'KM', // Comoros |
|
137 | + 'KN', // Saint Kitts and Nevis |
|
138 | + 'KP', // Korea, Democratic People's Republic of |
|
139 | + 'KR', // Korea, Republic of |
|
140 | + 'KW', // Kuwait |
|
141 | + 'KY', // Cayman Islands |
|
142 | + 'KZ', // Kazakhstan |
|
143 | + 'LA', // Lao People's Democratic Republic |
|
144 | + 'LB', // Lebanon |
|
145 | + 'LC', // Saint Lucia |
|
146 | + 'LI', // Liechtenstein |
|
147 | + 'LK', // Sri Lanka |
|
148 | + 'LR', // Liberia |
|
149 | + 'LS', // Lesotho |
|
150 | + 'LT', // Lithuania |
|
151 | + 'LU', // Luxembourg |
|
152 | + 'LV', // Latvia |
|
153 | + 'LY', // Libya |
|
154 | + 'MA', // Morocco |
|
155 | + 'MC', // Monaco |
|
156 | + 'MD', // Moldova, Republic of |
|
157 | + 'ME', // Montenegro |
|
158 | + 'MF', // Saint Martin (French part) |
|
159 | + 'MG', // Madagascar |
|
160 | + 'MH', // Marshall Islands |
|
161 | + 'MK', // Macedonia |
|
162 | + 'ML', // Mali |
|
163 | + 'MM', // Myanmar |
|
164 | + 'MN', // Mongolia |
|
165 | + 'MO', // Macao |
|
166 | + 'MP', // Northern Mariana Islands |
|
167 | + 'MQ', // Martinique |
|
168 | + 'MR', // Mauritania |
|
169 | + 'MS', // Montserrat |
|
170 | + 'MT', // Malta |
|
171 | + 'MU', // Mauritius |
|
172 | + 'MV', // Maldives |
|
173 | + 'MW', // Malawi |
|
174 | + 'MX', // Mexico |
|
175 | + 'MY', // Malaysia |
|
176 | + 'MZ', // Mozambique |
|
177 | + 'NA', // Namibia |
|
178 | + 'NC', // New Caledonia |
|
179 | + 'NE', // Niger |
|
180 | + 'NF', // Norfolk Island |
|
181 | + 'NG', // Nigeria |
|
182 | + 'NI', // Nicaragua |
|
183 | + 'NL', // Netherlands |
|
184 | + 'NO', // Norway |
|
185 | + 'NP', // Nepal |
|
186 | + 'NR', // Nauru |
|
187 | + 'NU', // Niue |
|
188 | + 'NZ', // New Zealand |
|
189 | + 'OM', // Oman |
|
190 | + 'PA', // Panama |
|
191 | + 'PE', // Peru |
|
192 | + 'PF', // French Polynesia |
|
193 | + 'PG', // Papua New Guinea |
|
194 | + 'PH', // Philippines |
|
195 | + 'PK', // Pakistan |
|
196 | + 'PL', // Poland |
|
197 | + 'PM', // Saint Pierre and Miquelon |
|
198 | + 'PN', // Pitcairn |
|
199 | + 'PR', // Puerto Rico |
|
200 | + 'PS', // Palestine, State of |
|
201 | + 'PT', // Portugal |
|
202 | + 'PW', // Palau |
|
203 | + 'PY', // Paraguay |
|
204 | + 'QA', // Qatar |
|
205 | + 'RE', // Réunion |
|
206 | + 'RO', // Romania |
|
207 | + 'RS', // Serbia |
|
208 | + 'RU', // Russian Federation |
|
209 | + 'RW', // Rwanda |
|
210 | + 'SA', // Saudi Arabia |
|
211 | + 'SB', // Solomon Islands |
|
212 | + 'SC', // Seychelles |
|
213 | + 'SD', // Sudan |
|
214 | + 'SE', // Sweden |
|
215 | + 'SG', // Singapore |
|
216 | + 'SH', // Saint Helena, Ascension and Tristan da Cunha |
|
217 | + 'SI', // Slovenia |
|
218 | + 'SJ', // Svalbard and Jan Mayen |
|
219 | + 'SK', // Slovakia |
|
220 | + 'SL', // Sierra Leone |
|
221 | + 'SM', // San Marino |
|
222 | + 'SN', // Senegal |
|
223 | + 'SO', // Somalia |
|
224 | + 'SR', // Suriname |
|
225 | + 'SS', // South Sudan |
|
226 | + 'ST', // Sao Tome and Principe |
|
227 | + 'SV', // El Salvador |
|
228 | + 'SX', // Sint Maarten (Dutch part) |
|
229 | + 'SY', // Syrian Arab Republic |
|
230 | + 'SZ', // Swaziland |
|
231 | + 'TC', // Turks and Caicos Islands |
|
232 | + 'TD', // Chad |
|
233 | + 'TF', // French Southern Territories |
|
234 | + 'TG', // Togo |
|
235 | + 'TH', // Thailand |
|
236 | + 'TJ', // Tajikistan |
|
237 | + 'TK', // Tokelau |
|
238 | + 'TL', // Timor-Leste |
|
239 | + 'TM', // Turkmenistan |
|
240 | + 'TN', // Tunisia |
|
241 | + 'TO', // Tonga |
|
242 | + 'TR', // Turkey |
|
243 | + 'TT', // Trinidad and Tobago |
|
244 | + 'TV', // Tuvalu |
|
245 | + 'TW', // Taiwan |
|
246 | + 'TZ', // Tanzania, United Republic of |
|
247 | + 'UA', // Ukraine |
|
248 | + 'UG', // Uganda |
|
249 | + 'UM', // United States Minor Outlying Islands |
|
250 | + 'US', // United States |
|
251 | + 'UY', // Uruguay |
|
252 | + 'UZ', // Uzbekistan |
|
253 | + 'VA', // Vatican City State (Holy See) |
|
254 | + 'VC', // Saint Vincent and the Grenadines |
|
255 | + 'VE', // Venezuela, Bolivarian Republic of |
|
256 | + 'VG', // Virgin Islands, British |
|
257 | + 'VI', // Virgin Islands, U.S. |
|
258 | + 'VN', // Viet Nam |
|
259 | + 'VU', // Vanuatu |
|
260 | + 'WF', // Wallis and Futuna |
|
261 | + 'WS', // Samoa |
|
262 | + 'YE', // Yemen |
|
263 | + 'YT', // Mayotte |
|
264 | + 'ZA', // South Africa |
|
265 | + 'ZM', // Zambia |
|
266 | + 'ZW', // Zimbabwe |
|
267 | + ), |
|
268 | + ), |
|
269 | + ), |
|
270 | + ), |
|
271 | + ), |
|
272 | 272 | ); |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | |
79 | 79 | foreach( $subItems as $attrId => $attrItem ) |
80 | 80 | { |
81 | - $attrMap[ $attrItem->getType() ][ $attrId ] = $attrItem; |
|
82 | - $subAttrDeps[ $attrId ][] = $subProdId; |
|
81 | + $attrMap[$attrItem->getType()][$attrId] = $attrItem; |
|
82 | + $subAttrDeps[$attrId][] = $subProdId; |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | $propItems = array_merge( $propItems, $subProduct->getPropertyItems() ); |
@@ -88,8 +88,8 @@ discard block |
||
88 | 88 | |
89 | 89 | foreach( $propItems as $propId => $propItem ) |
90 | 90 | { |
91 | - $propMap[ $propItem->getType() ][ $propId ] = $propItem; |
|
92 | - $subPropDeps[ $propId ][] = $propItem->getParentId(); |
|
91 | + $propMap[$propItem->getType()][$propId] = $propItem; |
|
92 | + $subPropDeps[$propId][] = $propItem->getParentId(); |
|
93 | 93 | } |
94 | 94 | } |
95 | 95 | |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | <table class="attributes"> |
384 | 384 | <tbody> |
385 | 385 | <?php foreach( $this->detailProductItem->getRefItems( 'attribute', null, 'default' ) as $attrId => $attrItem ) : ?> |
386 | - <?php if( isset( $attrItems[ $attrId ] ) ) { $attrItem = $attrItems[ $attrId ]; } ?> |
|
386 | + <?php if( isset( $attrItems[$attrId] ) ) { $attrItem = $attrItems[$attrId]; } ?> |
|
387 | 387 | <tr class="item"> |
388 | 388 | <td class="name"><?= $enc->html( $this->translate( 'client/code', $attrItem->getType() ), $enc::TRUST ); ?></td> |
389 | 389 | <td class="value"> |
@@ -410,10 +410,10 @@ discard block |
||
410 | 410 | <?php foreach( $attrMap as $type => $attrItems ) : ?> |
411 | 411 | <?php foreach( $attrItems as $attrItem ) : $classes = ""; ?> |
412 | 412 | <?php |
413 | - if( isset( $subAttrDeps[ $attrItem->getId() ] ) ) |
|
413 | + if( isset( $subAttrDeps[$attrItem->getId()] ) ) |
|
414 | 414 | { |
415 | 415 | $classes .= ' subproduct'; |
416 | - foreach( $subAttrDeps[ $attrItem->getId() ] as $prodid ) { |
|
416 | + foreach( $subAttrDeps[$attrItem->getId()] as $prodid ) { |
|
417 | 417 | $classes .= ' subproduct-' . $prodid; |
418 | 418 | } |
419 | 419 | } |
@@ -458,10 +458,10 @@ discard block |
||
458 | 458 | <?php foreach( $propItems as $propertyItem ) : $classes = ''; ?> |
459 | 459 | <?php |
460 | 460 | if( $propertyItem->getParentId() != $this->detailProductItem->getId() |
461 | - && isset( $subPropDeps[ $propertyItem->getId() ] ) |
|
461 | + && isset( $subPropDeps[$propertyItem->getId()] ) |
|
462 | 462 | ) { |
463 | 463 | $classes .= ' subproduct'; |
464 | - foreach( $subPropDeps[ $propertyItem->getId() ] as $prodid ) { |
|
464 | + foreach( $subPropDeps[$propertyItem->getId()] as $prodid ) { |
|
465 | 465 | $classes .= ' subproduct-' . $prodid; |
466 | 466 | } |
467 | 467 | } |
@@ -24,9 +24,12 @@ |
||
24 | 24 | |
25 | 25 | <?php if( ( $mediaItem = reset( $mediaItems ) ) !== false ) : ?> |
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 | <h3 class="name"><?= $enc->html( $productItem->getName(), $enc::TRUST ); ?></h3> |
32 | 35 |
@@ -71,9 +71,12 @@ |
||
71 | 71 | </a> |
72 | 72 | </li> |
73 | 73 | <?php endforeach; ?> |
74 | - <?php else : ?> |
|
74 | + <?php else { |
|
75 | + : ?> |
|
75 | 76 | <li> |
76 | - <a href="<?= $enc->attr( $this->url( $listTarget, $listController, $listAction, $params, [], $listConfig ) ); ?>"> |
|
77 | + <a href="<?= $enc->attr( $this->url( $listTarget, $listController, $listAction, $params, [], $listConfig ) ); |
|
78 | +} |
|
79 | +?>"> |
|
77 | 80 | <?= $enc->html( $this->translate( 'client', 'Your search result' ), $enc::TRUST ); ?> |
78 | 81 | </a> |
79 | 82 | </li> |