@@ -28,33 +28,33 @@ discard block |
||
28 | 28 | * @return \Aimeos\MShop\Customer\Item\Iface Customer item |
29 | 29 | * @since 2017.04 |
30 | 30 | */ |
31 | - public function addItem( array $values ) |
|
31 | + public function addItem(array $values) |
|
32 | 32 | { |
33 | 33 | $list = []; |
34 | 34 | $context = $this->getContext(); |
35 | 35 | $config = $context->getConfig(); |
36 | 36 | |
37 | 37 | // Show only generated passwords in account creation e-mails |
38 | - $pass = ( isset( $values['customer.password'] ) ? false : true ); |
|
38 | + $pass = (isset($values['customer.password']) ? false : true); |
|
39 | 39 | |
40 | - foreach( $values as $key => $val ) { |
|
41 | - $list[str_replace( 'order.base.address', 'customer', $key )] = $val; |
|
40 | + foreach ($values as $key => $val) { |
|
41 | + $list[str_replace('order.base.address', 'customer', $key)] = $val; |
|
42 | 42 | } |
43 | 43 | |
44 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
45 | - $list = $this->addItemDefaults( $list ); |
|
44 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
45 | + $list = $this->addItemDefaults($list); |
|
46 | 46 | |
47 | 47 | try |
48 | 48 | { |
49 | - $item = $manager->findItem( $list['customer.code'], [], true ); |
|
49 | + $item = $manager->findItem($list['customer.code'], [], true); |
|
50 | 50 | } |
51 | - catch( \Aimeos\MShop\Exception $e ) |
|
51 | + catch (\Aimeos\MShop\Exception $e) |
|
52 | 52 | { |
53 | - $this->checkLimit( $list ); |
|
53 | + $this->checkLimit($list); |
|
54 | 54 | |
55 | 55 | $item = $manager->createItem(); |
56 | - $item->fromArray( $list ); |
|
57 | - $item->setId( null ); |
|
56 | + $item->fromArray($list); |
|
57 | + $item->setId(null); |
|
58 | 58 | |
59 | 59 | /** controller/frontend/customer/groupids |
60 | 60 | * List of groups new customers should be assigned to |
@@ -68,13 +68,13 @@ discard block |
||
68 | 68 | * @category User |
69 | 69 | * @category Developer |
70 | 70 | */ |
71 | - $item->setGroups( (array) $config->get( 'controller/frontend/customer/groupids', [] ) ); |
|
71 | + $item->setGroups((array) $config->get('controller/frontend/customer/groupids', [])); |
|
72 | 72 | |
73 | - $item = $manager->saveItem( $item ); |
|
73 | + $item = $manager->saveItem($item); |
|
74 | 74 | |
75 | 75 | $msg = $item->toArray(); |
76 | - $msg['customer.password'] = ( $pass ? $list['customer.password'] : null ); |
|
77 | - $context->getMessageQueue( 'mq-email', 'customer/email/account' )->add( json_encode( $msg ) ); |
|
76 | + $msg['customer.password'] = ($pass ? $list['customer.password'] : null); |
|
77 | + $context->getMessageQueue('mq-email', 'customer/email/account')->add(json_encode($msg)); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | return $item; |
@@ -86,14 +86,14 @@ discard block |
||
86 | 86 | * |
87 | 87 | * @return \Aimeos\MShop\Customer\Item\Iface Customer item |
88 | 88 | */ |
89 | - public function createItem( array $values = [] ) |
|
89 | + public function createItem(array $values = []) |
|
90 | 90 | { |
91 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' ); |
|
91 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer'); |
|
92 | 92 | |
93 | 93 | $item = $manager->createItem(); |
94 | - $item->fromArray( $values ); |
|
95 | - $item->setId( null ); |
|
96 | - $item->setStatus( 1 ); |
|
94 | + $item->fromArray($values); |
|
95 | + $item->setId(null); |
|
96 | + $item->setStatus(1); |
|
97 | 97 | |
98 | 98 | return $item; |
99 | 99 | } |
@@ -105,12 +105,12 @@ discard block |
||
105 | 105 | * @param string $id Unique customer ID |
106 | 106 | * @since 2017.04 |
107 | 107 | */ |
108 | - public function deleteItem( $id ) |
|
108 | + public function deleteItem($id) |
|
109 | 109 | { |
110 | - $this->checkUser( $id ); |
|
110 | + $this->checkUser($id); |
|
111 | 111 | |
112 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' ); |
|
113 | - $manager->deleteItem( $id ); |
|
112 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer'); |
|
113 | + $manager->deleteItem($id); |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | |
@@ -122,17 +122,17 @@ discard block |
||
122 | 122 | * @return \Aimeos\MShop\Customer\Item\Iface Customer item |
123 | 123 | * @since 2017.04 |
124 | 124 | */ |
125 | - public function editItem( $id, array $values ) |
|
125 | + public function editItem($id, array $values) |
|
126 | 126 | { |
127 | - $this->checkUser( $id ); |
|
127 | + $this->checkUser($id); |
|
128 | 128 | |
129 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' ); |
|
130 | - $item = $manager->getItem( $id, ['customer/group'], true ); |
|
129 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer'); |
|
130 | + $item = $manager->getItem($id, ['customer/group'], true); |
|
131 | 131 | |
132 | - unset( $values['customer.id'] ); |
|
133 | - $item->fromArray( $values ); |
|
132 | + unset($values['customer.id']); |
|
133 | + $item->fromArray($values); |
|
134 | 134 | |
135 | - return $manager->saveItem( $item ); |
|
135 | + return $manager->saveItem($item); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | |
@@ -144,17 +144,17 @@ discard block |
||
144 | 144 | * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items |
145 | 145 | * @since 2017.04 |
146 | 146 | */ |
147 | - public function getItem( $id = null, array $domains = [] ) |
|
147 | + public function getItem($id = null, array $domains = []) |
|
148 | 148 | { |
149 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' ); |
|
149 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer'); |
|
150 | 150 | |
151 | - if( $id == null ) { |
|
152 | - return $manager->getItem( $this->getContext()->getUserId(), $domains, true ); |
|
151 | + if ($id == null) { |
|
152 | + return $manager->getItem($this->getContext()->getUserId(), $domains, true); |
|
153 | 153 | } |
154 | 154 | |
155 | - $this->checkUser( $id ); |
|
155 | + $this->checkUser($id); |
|
156 | 156 | |
157 | - return $manager->getItem( $id, $domains, true ); |
|
157 | + return $manager->getItem($id, $domains, true); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | |
@@ -168,9 +168,9 @@ discard block |
||
168 | 168 | * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items |
169 | 169 | * @since 2017.04 |
170 | 170 | */ |
171 | - public function findItem( $code, array $domains = [] ) |
|
171 | + public function findItem($code, array $domains = []) |
|
172 | 172 | { |
173 | - return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->findItem( $code, $domains, true ); |
|
173 | + return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->findItem($code, $domains, true); |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | |
@@ -180,9 +180,9 @@ discard block |
||
180 | 180 | * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item |
181 | 181 | * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID |
182 | 182 | */ |
183 | - public function saveItem( \Aimeos\MShop\Customer\Item\Iface $item ) |
|
183 | + public function saveItem(\Aimeos\MShop\Customer\Item\Iface $item) |
|
184 | 184 | { |
185 | - return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->saveItem( $item ); |
|
185 | + return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->saveItem($item); |
|
186 | 186 | } |
187 | 187 | |
188 | 188 | |
@@ -193,17 +193,17 @@ discard block |
||
193 | 193 | * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item |
194 | 194 | * @since 2017.04 |
195 | 195 | */ |
196 | - public function addAddressItem( array $values ) |
|
196 | + public function addAddressItem(array $values) |
|
197 | 197 | { |
198 | 198 | $context = $this->getContext(); |
199 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' ); |
|
199 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address'); |
|
200 | 200 | |
201 | 201 | $item = $manager->createItem(); |
202 | - $item->fromArray( $values ); |
|
203 | - $item->setId( null ); |
|
204 | - $item->setParentId( $context->getUserId() ); |
|
202 | + $item->fromArray($values); |
|
203 | + $item->setId(null); |
|
204 | + $item->setParentId($context->getUserId()); |
|
205 | 205 | |
206 | - return $manager->saveItem( $item ); |
|
206 | + return $manager->saveItem($item); |
|
207 | 207 | } |
208 | 208 | |
209 | 209 | |
@@ -212,16 +212,16 @@ discard block |
||
212 | 212 | * |
213 | 213 | * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item |
214 | 214 | */ |
215 | - public function createAddressItem( array $values = [] ) |
|
215 | + public function createAddressItem(array $values = []) |
|
216 | 216 | { |
217 | 217 | $context = $this->getContext(); |
218 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' ); |
|
218 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address'); |
|
219 | 219 | |
220 | 220 | $item = $manager->createItem(); |
221 | - $item->fromArray( $values ); |
|
222 | - $item->setId( null ); |
|
221 | + $item->fromArray($values); |
|
222 | + $item->setId(null); |
|
223 | 223 | |
224 | - $item->setParentId( $context->getUserId() ); |
|
224 | + $item->setParentId($context->getUserId()); |
|
225 | 225 | |
226 | 226 | return $item; |
227 | 227 | } |
@@ -233,13 +233,13 @@ discard block |
||
233 | 233 | * @param string $id Unique customer address ID |
234 | 234 | * @since 2017.04 |
235 | 235 | */ |
236 | - public function deleteAddressItem( $id ) |
|
236 | + public function deleteAddressItem($id) |
|
237 | 237 | { |
238 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' ); |
|
238 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address'); |
|
239 | 239 | |
240 | - $this->checkUser( $manager->getItem( $id, [], true )->getParentId() ); |
|
240 | + $this->checkUser($manager->getItem($id, [], true)->getParentId()); |
|
241 | 241 | |
242 | - $manager->deleteItem( $id ); |
|
242 | + $manager->deleteItem($id); |
|
243 | 243 | } |
244 | 244 | |
245 | 245 | |
@@ -251,17 +251,17 @@ discard block |
||
251 | 251 | * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item |
252 | 252 | * @since 2017.04 |
253 | 253 | */ |
254 | - public function editAddressItem( $id, array $values ) |
|
254 | + public function editAddressItem($id, array $values) |
|
255 | 255 | { |
256 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' ); |
|
256 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address'); |
|
257 | 257 | |
258 | - $item = $manager->getItem( $id, [], true ); |
|
259 | - $this->checkUser( $item->getParentId() ); |
|
258 | + $item = $manager->getItem($id, [], true); |
|
259 | + $this->checkUser($item->getParentId()); |
|
260 | 260 | |
261 | - unset( $values['customer.address.id'] ); |
|
262 | - $item->fromArray( $values ); |
|
261 | + unset($values['customer.address.id']); |
|
262 | + $item->fromArray($values); |
|
263 | 263 | |
264 | - return $manager->saveItem( $item ); |
|
264 | + return $manager->saveItem($item); |
|
265 | 265 | } |
266 | 266 | |
267 | 267 | |
@@ -272,12 +272,12 @@ discard block |
||
272 | 272 | * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item |
273 | 273 | * @since 2017.04 |
274 | 274 | */ |
275 | - public function getAddressItem( $id ) |
|
275 | + public function getAddressItem($id) |
|
276 | 276 | { |
277 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' ); |
|
277 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address'); |
|
278 | 278 | |
279 | - $item = $manager->getItem( $id ); |
|
280 | - $this->checkUser( $item->getParentId() ); |
|
279 | + $item = $manager->getItem($id); |
|
280 | + $this->checkUser($item->getParentId()); |
|
281 | 281 | |
282 | 282 | return $item; |
283 | 283 | } |
@@ -289,9 +289,9 @@ discard block |
||
289 | 289 | * @param \Aimeos\MShop\Customer\Item\Address\Iface $item Customer address item |
290 | 290 | * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID |
291 | 291 | */ |
292 | - public function saveAddressItem( \Aimeos\MShop\Customer\Item\Address\Iface $item ) |
|
292 | + public function saveAddressItem(\Aimeos\MShop\Customer\Item\Address\Iface $item) |
|
293 | 293 | { |
294 | - return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' )->saveItem( $item ); |
|
294 | + return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address')->saveItem($item); |
|
295 | 295 | } |
296 | 296 | |
297 | 297 | |
@@ -302,32 +302,32 @@ discard block |
||
302 | 302 | * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item |
303 | 303 | * @since 2017.06 |
304 | 304 | */ |
305 | - public function addListItem( array $values ) |
|
305 | + public function addListItem(array $values) |
|
306 | 306 | { |
307 | 307 | $context = $this->getContext(); |
308 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' ); |
|
308 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists'); |
|
309 | 309 | |
310 | - if( !isset( $values['customer.lists.typeid'] ) ) |
|
310 | + if (!isset($values['customer.lists.typeid'])) |
|
311 | 311 | { |
312 | - if( !isset( $values['customer.lists.type'] ) ) { |
|
313 | - throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists type code' ) ); |
|
312 | + if (!isset($values['customer.lists.type'])) { |
|
313 | + throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists type code')); |
|
314 | 314 | } |
315 | 315 | |
316 | - if( !isset( $values['customer.lists.domain'] ) ) { |
|
317 | - throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists domain' ) ); |
|
316 | + if (!isset($values['customer.lists.domain'])) { |
|
317 | + throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists domain')); |
|
318 | 318 | } |
319 | 319 | |
320 | - $typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' ); |
|
321 | - $typeItem = $typeManager->findItem( $values['customer.lists.type'], [], $values['customer.lists.domain'] ); |
|
320 | + $typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type'); |
|
321 | + $typeItem = $typeManager->findItem($values['customer.lists.type'], [], $values['customer.lists.domain']); |
|
322 | 322 | $values['customer.lists.typeid'] = $typeItem->getId(); |
323 | 323 | } |
324 | 324 | |
325 | 325 | $item = $manager->createItem(); |
326 | - $item->fromArray( $values ); |
|
327 | - $item->setId( null ); |
|
328 | - $item->setParentId( $context->getUserId() ); |
|
326 | + $item->fromArray($values); |
|
327 | + $item->setId(null); |
|
328 | + $item->setParentId($context->getUserId()); |
|
329 | 329 | |
330 | - return $manager->saveItem( $item ); |
|
330 | + return $manager->saveItem($item); |
|
331 | 331 | } |
332 | 332 | |
333 | 333 | |
@@ -340,10 +340,10 @@ discard block |
||
340 | 340 | public function createListsFilter() |
341 | 341 | { |
342 | 342 | $context = $this->getContext(); |
343 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' ); |
|
343 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists'); |
|
344 | 344 | |
345 | 345 | $filter = $manager->createSearch(); |
346 | - $filter->setConditions( $filter->compare( '==', 'customer.lists.parentid', $context->getUserId() ) ); |
|
346 | + $filter->setConditions($filter->compare('==', 'customer.lists.parentid', $context->getUserId())); |
|
347 | 347 | |
348 | 348 | return $filter; |
349 | 349 | } |
@@ -355,13 +355,13 @@ discard block |
||
355 | 355 | * @param string $id Unique customer address ID |
356 | 356 | * @since 2017.06 |
357 | 357 | */ |
358 | - public function deleteListItem( $id ) |
|
358 | + public function deleteListItem($id) |
|
359 | 359 | { |
360 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' ); |
|
360 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists'); |
|
361 | 361 | |
362 | - $this->checkUser( $manager->getItem( $id )->getParentId() ); |
|
362 | + $this->checkUser($manager->getItem($id)->getParentId()); |
|
363 | 363 | |
364 | - $manager->deleteItem( $id ); |
|
364 | + $manager->deleteItem($id); |
|
365 | 365 | } |
366 | 366 | |
367 | 367 | |
@@ -373,33 +373,33 @@ discard block |
||
373 | 373 | * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item |
374 | 374 | * @since 2017.06 |
375 | 375 | */ |
376 | - public function editListItem( $id, array $values ) |
|
376 | + public function editListItem($id, array $values) |
|
377 | 377 | { |
378 | 378 | $context = $this->getContext(); |
379 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' ); |
|
379 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists'); |
|
380 | 380 | |
381 | - $item = $manager->getItem( $id, [], true ); |
|
382 | - $this->checkUser( $item->getParentId() ); |
|
381 | + $item = $manager->getItem($id, [], true); |
|
382 | + $this->checkUser($item->getParentId()); |
|
383 | 383 | |
384 | - if( !isset( $values['customer.lists.typeid'] ) ) |
|
384 | + if (!isset($values['customer.lists.typeid'])) |
|
385 | 385 | { |
386 | - if( !isset( $values['customer.lists.type'] ) ) { |
|
387 | - throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists type code' ) ); |
|
386 | + if (!isset($values['customer.lists.type'])) { |
|
387 | + throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists type code')); |
|
388 | 388 | } |
389 | 389 | |
390 | - if( !isset( $values['customer.lists.domain'] ) ) { |
|
391 | - throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists domain' ) ); |
|
390 | + if (!isset($values['customer.lists.domain'])) { |
|
391 | + throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists domain')); |
|
392 | 392 | } |
393 | 393 | |
394 | - $typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' ); |
|
395 | - $typeItem = $typeManager->findItem( $values['customer.lists.type'], [], $values['customer.lists.domain'], true ); |
|
394 | + $typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type'); |
|
395 | + $typeItem = $typeManager->findItem($values['customer.lists.type'], [], $values['customer.lists.domain'], true); |
|
396 | 396 | $values['customer.lists.typeid'] = $typeItem->getId(); |
397 | 397 | } |
398 | 398 | |
399 | - unset( $values['customer.lists.id'] ); |
|
400 | - $item->fromArray( $values ); |
|
399 | + unset($values['customer.lists.id']); |
|
400 | + $item->fromArray($values); |
|
401 | 401 | |
402 | - return $manager->saveItem( $item ); |
|
402 | + return $manager->saveItem($item); |
|
403 | 403 | } |
404 | 404 | |
405 | 405 | |
@@ -410,12 +410,12 @@ discard block |
||
410 | 410 | * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item |
411 | 411 | * @since 2017.06 |
412 | 412 | */ |
413 | - public function getListItem( $id ) |
|
413 | + public function getListItem($id) |
|
414 | 414 | { |
415 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' ); |
|
416 | - $item = $manager->getItem( $id ); |
|
415 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists'); |
|
416 | + $item = $manager->getItem($id); |
|
417 | 417 | |
418 | - $this->checkUser( $item->getParentId() ); |
|
418 | + $this->checkUser($item->getParentId()); |
|
419 | 419 | |
420 | 420 | return $item; |
421 | 421 | } |
@@ -429,11 +429,11 @@ discard block |
||
429 | 429 | * @return \Aimeos\MShop\Common\Item\Lists\Iface[] Customer list items |
430 | 430 | * @since 2017.06 |
431 | 431 | */ |
432 | - public function searchListItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null ) |
|
432 | + public function searchListItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null) |
|
433 | 433 | { |
434 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' ); |
|
434 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists'); |
|
435 | 435 | |
436 | - return $manager->searchItems( $filter, [], $total ); |
|
436 | + return $manager->searchItems($filter, [], $total); |
|
437 | 437 | } |
438 | 438 | |
439 | 439 | |
@@ -443,37 +443,37 @@ discard block |
||
443 | 443 | * @param string[] $values Associative list of customer keys (e.g. "customer.label") and their values |
444 | 444 | * @return string[] Associative list of customer key/value pairs with default values set |
445 | 445 | */ |
446 | - protected function addItemDefaults( array $values ) |
|
446 | + protected function addItemDefaults(array $values) |
|
447 | 447 | { |
448 | - if( !isset( $values['customer.label'] ) || $values['customer.label'] == '' ) |
|
448 | + if (!isset($values['customer.label']) || $values['customer.label'] == '') |
|
449 | 449 | { |
450 | 450 | $label = ''; |
451 | 451 | |
452 | - if( isset( $values['customer.lastname'] ) ) { |
|
452 | + if (isset($values['customer.lastname'])) { |
|
453 | 453 | $label = $values['customer.lastname']; |
454 | 454 | } |
455 | 455 | |
456 | - if( isset( $values['customer.firstname'] ) && $values['customer.firstname'] != '' ) { |
|
456 | + if (isset($values['customer.firstname']) && $values['customer.firstname'] != '') { |
|
457 | 457 | $label = $values['customer.firstname'] . ' ' . $label; |
458 | 458 | } |
459 | 459 | |
460 | - if( isset( $values['customer.company'] ) && $values['customer.company'] != '' ) { |
|
460 | + if (isset($values['customer.company']) && $values['customer.company'] != '') { |
|
461 | 461 | $label .= ' (' . $values['customer.company'] . ')'; |
462 | 462 | } |
463 | 463 | |
464 | 464 | $values['customer.label'] = $label; |
465 | 465 | } |
466 | 466 | |
467 | - if( !isset( $values['customer.code'] ) && isset( $values['customer.email'] ) ) { |
|
467 | + if (!isset($values['customer.code']) && isset($values['customer.email'])) { |
|
468 | 468 | $values['customer.code'] = $values['customer.email']; |
469 | 469 | } |
470 | 470 | |
471 | - if( !isset( $values['customer.status'] ) ) { |
|
471 | + if (!isset($values['customer.status'])) { |
|
472 | 472 | $values['customer.status'] = 1; |
473 | 473 | } |
474 | 474 | |
475 | - if( !isset( $values['customer.password'] ) ) { |
|
476 | - $values['customer.password'] = substr( md5( microtime( true ) . getmypid() . rand() ), -8 ); |
|
475 | + if (!isset($values['customer.password'])) { |
|
476 | + $values['customer.password'] = substr(md5(microtime(true) . getmypid() . rand()), -8); |
|
477 | 477 | } |
478 | 478 | |
479 | 479 | return $values; |
@@ -486,7 +486,7 @@ discard block |
||
486 | 486 | * @param string[] $values Associative list of customer keys (e.g. "customer.label") and their values |
487 | 487 | * @throws \Aimeos\Controller\Frontend\Customer\Exception If access isn't allowed |
488 | 488 | */ |
489 | - protected function checkLimit( array $values ) |
|
489 | + protected function checkLimit(array $values) |
|
490 | 490 | { |
491 | 491 | $total = 0; |
492 | 492 | $context = $this->getContext(); |
@@ -507,7 +507,7 @@ discard block |
||
507 | 507 | * @category Developer |
508 | 508 | * @see controller/frontend/customer/limit-seconds |
509 | 509 | */ |
510 | - $count = $config->get( 'controller/frontend/customer/limit-count', 5 ); |
|
510 | + $count = $config->get('controller/frontend/customer/limit-count', 5); |
|
511 | 511 | |
512 | 512 | /** controller/frontend/customer/limit-seconds |
513 | 513 | * Customer account limitation time frame in seconds |
@@ -525,22 +525,22 @@ discard block |
||
525 | 525 | * @category Developer |
526 | 526 | * @see controller/frontend/customer/limit-count |
527 | 527 | */ |
528 | - $seconds = $config->get( 'controller/frontend/customer/limit-seconds', 300 ); |
|
528 | + $seconds = $config->get('controller/frontend/customer/limit-seconds', 300); |
|
529 | 529 | |
530 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
530 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
531 | 531 | |
532 | 532 | $search = $manager->createSearch(); |
533 | 533 | $expr = [ |
534 | - $search->compare( '==', 'customer.editor', $context->getEditor() ), |
|
535 | - $search->compare( '>=', 'customer.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ), |
|
534 | + $search->compare('==', 'customer.editor', $context->getEditor()), |
|
535 | + $search->compare('>=', 'customer.ctime', date('Y-m-d H:i:s', time() - $seconds)), |
|
536 | 536 | ]; |
537 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
538 | - $search->setSlice( 0, 0 ); |
|
537 | + $search->setConditions($search->combine('&&', $expr)); |
|
538 | + $search->setSlice(0, 0); |
|
539 | 539 | |
540 | - $manager->searchItems( $search, [], $total ); |
|
540 | + $manager->searchItems($search, [], $total); |
|
541 | 541 | |
542 | - if( $total > $count ) { |
|
543 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Temporary limit reached' ) ); |
|
542 | + if ($total > $count) { |
|
543 | + throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Temporary limit reached')); |
|
544 | 544 | } |
545 | 545 | } |
546 | 546 | |
@@ -551,12 +551,12 @@ discard block |
||
551 | 551 | * @param string $id Unique customer ID |
552 | 552 | * @throws \Aimeos\Controller\Frontend\Customer\Exception If access isn't allowed |
553 | 553 | */ |
554 | - protected function checkUser( $id ) |
|
554 | + protected function checkUser($id) |
|
555 | 555 | { |
556 | - if( $id != $this->getContext()->getUserId() ) |
|
556 | + if ($id != $this->getContext()->getUserId()) |
|
557 | 557 | { |
558 | - $msg = sprintf( 'Not allowed to access customer data for ID "%1$s"', $id ); |
|
559 | - throw new \Aimeos\Controller\Frontend\Customer\Exception( $msg ); |
|
558 | + $msg = sprintf('Not allowed to access customer data for ID "%1$s"', $id); |
|
559 | + throw new \Aimeos\Controller\Frontend\Customer\Exception($msg); |
|
560 | 560 | } |
561 | 561 | } |
562 | 562 | } |
@@ -47,8 +47,7 @@ |
||
47 | 47 | try |
48 | 48 | { |
49 | 49 | $item = $manager->findItem( $list['customer.code'], [], true ); |
50 | - } |
|
51 | - catch( \Aimeos\MShop\Exception $e ) |
|
50 | + } catch( \Aimeos\MShop\Exception $e ) |
|
52 | 51 | { |
53 | 52 | $this->checkLimit( $list ); |
54 | 53 |
@@ -33,11 +33,11 @@ discard block |
||
33 | 33 | * @param \Aimeos\MShop\Context\Item\Iface $context Object storing the required instances for manaing databases |
34 | 34 | * connections, logger, session, etc. |
35 | 35 | */ |
36 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context ) |
|
36 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context) |
|
37 | 37 | { |
38 | - parent::__construct( $context ); |
|
38 | + parent::__construct($context); |
|
39 | 39 | |
40 | - $this->domainManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' ); |
|
40 | + $this->domainManager = \Aimeos\MShop\Factory::createManager($context, 'order/base'); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | public function clear() |
50 | 50 | { |
51 | 51 | $this->baskets[$this->type] = $this->domainManager->createItem(); |
52 | - $this->domainManager->setSession( $this->baskets[$this->type], $this->type ); |
|
52 | + $this->domainManager->setSession($this->baskets[$this->type], $this->type); |
|
53 | 53 | |
54 | 54 | return $this; |
55 | 55 | } |
@@ -62,10 +62,10 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function get() |
64 | 64 | { |
65 | - if( !isset( $this->baskets[$this->type] ) ) |
|
65 | + if (!isset($this->baskets[$this->type])) |
|
66 | 66 | { |
67 | - $this->baskets[$this->type] = $this->domainManager->getSession( $this->type ); |
|
68 | - $this->checkLocale( $this->type ); |
|
67 | + $this->baskets[$this->type] = $this->domainManager->getSession($this->type); |
|
68 | + $this->checkLocale($this->type); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | return $this->baskets[$this->type]; |
@@ -79,8 +79,8 @@ discard block |
||
79 | 79 | */ |
80 | 80 | public function save() |
81 | 81 | { |
82 | - if( isset( $this->baskets[$this->type] ) && $this->baskets[$this->type]->isModified() ) { |
|
83 | - $this->domainManager->setSession( $this->baskets[$this->type], $this->type ); |
|
82 | + if (isset($this->baskets[$this->type]) && $this->baskets[$this->type]->isModified()) { |
|
83 | + $this->domainManager->setSession($this->baskets[$this->type], $this->type); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | return $this; |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | * @param string $type Basket type |
94 | 94 | * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object |
95 | 95 | */ |
96 | - public function setType( $type ) |
|
96 | + public function setType($type) |
|
97 | 97 | { |
98 | 98 | $this->type = $type; |
99 | 99 | return $this; |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | * @category Developer |
128 | 128 | * @see controller/frontend/basket/limit-seconds |
129 | 129 | */ |
130 | - $count = $config->get( 'controller/frontend/basket/limit-count', 5 ); |
|
130 | + $count = $config->get('controller/frontend/basket/limit-count', 5); |
|
131 | 131 | |
132 | 132 | /** controller/frontend/basket/limit-seconds |
133 | 133 | * Order limitation time frame in seconds |
@@ -145,30 +145,30 @@ discard block |
||
145 | 145 | * @category Developer |
146 | 146 | * @see controller/frontend/basket/limit-count |
147 | 147 | */ |
148 | - $seconds = $config->get( 'controller/frontend/basket/limit-seconds', 300 ); |
|
148 | + $seconds = $config->get('controller/frontend/basket/limit-seconds', 300); |
|
149 | 149 | |
150 | 150 | $search = $this->domainManager->createSearch(); |
151 | 151 | $expr = [ |
152 | - $search->compare( '==', 'order.base.editor', $context->getEditor() ), |
|
153 | - $search->compare( '>=', 'order.base.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ), |
|
152 | + $search->compare('==', 'order.base.editor', $context->getEditor()), |
|
153 | + $search->compare('>=', 'order.base.ctime', date('Y-m-d H:i:s', time() - $seconds)), |
|
154 | 154 | ]; |
155 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
156 | - $search->setSlice( 0, 0 ); |
|
155 | + $search->setConditions($search->combine('&&', $expr)); |
|
156 | + $search->setSlice(0, 0); |
|
157 | 157 | |
158 | - $this->domainManager->searchItems( $search, [], $total ); |
|
158 | + $this->domainManager->searchItems($search, [], $total); |
|
159 | 159 | |
160 | - if( $total > $count ) |
|
160 | + if ($total > $count) |
|
161 | 161 | { |
162 | - $msg = $context->getI18n()->dt( 'controller/frontend', 'Temporary order limit reached' ); |
|
163 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg ); |
|
162 | + $msg = $context->getI18n()->dt('controller/frontend', 'Temporary order limit reached'); |
|
163 | + throw new \Aimeos\Controller\Frontend\Basket\Exception($msg); |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | |
167 | 167 | $basket = $this->get()->finish(); |
168 | - $basket->setCustomerId( (string) $context->getUserId() ); |
|
168 | + $basket->setCustomerId((string) $context->getUserId()); |
|
169 | 169 | |
170 | 170 | $this->domainManager->begin(); |
171 | - $this->domainManager->store( $basket ); |
|
171 | + $this->domainManager->store($basket); |
|
172 | 172 | $this->domainManager->commit(); |
173 | 173 | |
174 | 174 | return $basket; |
@@ -183,9 +183,9 @@ discard block |
||
183 | 183 | * @param boolean $default True to add default criteria (user logged in), false if not |
184 | 184 | * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts |
185 | 185 | */ |
186 | - public function load( $id, $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL, $default = true ) |
|
186 | + public function load($id, $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL, $default = true) |
|
187 | 187 | { |
188 | - return $this->domainManager->load( $id, $parts, false, $default ); |
|
188 | + return $this->domainManager->load($id, $parts, false, $default); |
|
189 | 189 | } |
190 | 190 | |
191 | 191 | |
@@ -204,33 +204,33 @@ discard block |
||
204 | 204 | * @param string $stocktype Unique code of the stock type to deliver the products from |
205 | 205 | * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available |
206 | 206 | */ |
207 | - public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [], |
|
208 | - array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] ) |
|
207 | + public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [], |
|
208 | + array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = []) |
|
209 | 209 | { |
210 | 210 | $attributeMap = [ |
211 | - 'custom' => array_keys( $customAttributeValues ), |
|
212 | - 'config' => array_keys( $configAttributeIds ), |
|
211 | + 'custom' => array_keys($customAttributeValues), |
|
212 | + 'config' => array_keys($configAttributeIds), |
|
213 | 213 | 'hidden' => $hiddenAttributeIds, |
214 | 214 | ]; |
215 | - $this->checkListRef( $prodid, 'attribute', $attributeMap ); |
|
215 | + $this->checkListRef($prodid, 'attribute', $attributeMap); |
|
216 | 216 | |
217 | 217 | |
218 | 218 | $context = $this->getContext(); |
219 | - $productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' ); |
|
220 | - $productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true ); |
|
221 | - $prices = $productItem->getRefItems( 'price', 'default', 'default' ); |
|
219 | + $productManager = \Aimeos\MShop\Factory::createManager($context, 'product'); |
|
220 | + $productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true); |
|
221 | + $prices = $productItem->getRefItems('price', 'default', 'default'); |
|
222 | 222 | |
223 | - $orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem(); |
|
224 | - $orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype ); |
|
223 | + $orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem(); |
|
224 | + $orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype); |
|
225 | 225 | |
226 | - $attr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues ); |
|
227 | - $attr = array_merge( $attr, $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds ) ); |
|
228 | - $attr = array_merge( $attr, $this->getOrderProductAttributes( 'hidden', $hiddenAttributeIds ) ); |
|
226 | + $attr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues); |
|
227 | + $attr = array_merge($attr, $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds)); |
|
228 | + $attr = array_merge($attr, $this->getOrderProductAttributes('hidden', $hiddenAttributeIds)); |
|
229 | 229 | |
230 | - $orderBaseProductItem->setAttributes( $attr ); |
|
231 | - $orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) ); |
|
230 | + $orderBaseProductItem->setAttributes($attr); |
|
231 | + $orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity)); |
|
232 | 232 | |
233 | - $this->get()->addProduct( $orderBaseProductItem ); |
|
233 | + $this->get()->addProduct($orderBaseProductItem); |
|
234 | 234 | $this->save(); |
235 | 235 | } |
236 | 236 | |
@@ -240,17 +240,17 @@ discard block |
||
240 | 240 | * |
241 | 241 | * @param integer $position Position number (key) of the order product item |
242 | 242 | */ |
243 | - public function deleteProduct( $position ) |
|
243 | + public function deleteProduct($position) |
|
244 | 244 | { |
245 | - $product = $this->get()->getProduct( $position ); |
|
245 | + $product = $this->get()->getProduct($position); |
|
246 | 246 | |
247 | - if( $product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE ) |
|
247 | + if ($product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE) |
|
248 | 248 | { |
249 | - $msg = $this->getContext()->getI18n()->dt( 'controller/frontend', 'Basket item at position "%1$d" cannot be deleted manually' ); |
|
250 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $position ) ); |
|
249 | + $msg = $this->getContext()->getI18n()->dt('controller/frontend', 'Basket item at position "%1$d" cannot be deleted manually'); |
|
250 | + throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $position)); |
|
251 | 251 | } |
252 | 252 | |
253 | - $this->get()->deleteProduct( $position ); |
|
253 | + $this->get()->deleteProduct($position); |
|
254 | 254 | $this->save(); |
255 | 255 | } |
256 | 256 | |
@@ -262,32 +262,32 @@ discard block |
||
262 | 262 | * @param integer $quantity New quantiy of the product item |
263 | 263 | * @param string[] $configAttributeCodes Codes of the product config attributes that should be REMOVED |
264 | 264 | */ |
265 | - public function editProduct( $position, $quantity, array $configAttributeCodes = [] ) |
|
265 | + public function editProduct($position, $quantity, array $configAttributeCodes = []) |
|
266 | 266 | { |
267 | - $product = $this->get()->getProduct( $position ); |
|
267 | + $product = $this->get()->getProduct($position); |
|
268 | 268 | |
269 | - if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE ) |
|
269 | + if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE) |
|
270 | 270 | { |
271 | - $msg = $this->getContext()->getI18n()->dt( 'controller/frontend', 'Basket item at position "%1$d" cannot be changed' ); |
|
272 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $position ) ); |
|
271 | + $msg = $this->getContext()->getI18n()->dt('controller/frontend', 'Basket item at position "%1$d" cannot be changed'); |
|
272 | + throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $position)); |
|
273 | 273 | } |
274 | 274 | |
275 | - $product->setQuantity( $quantity ); |
|
275 | + $product->setQuantity($quantity); |
|
276 | 276 | |
277 | 277 | $attributes = $product->getAttributes(); |
278 | - foreach( $attributes as $key => $attribute ) |
|
278 | + foreach ($attributes as $key => $attribute) |
|
279 | 279 | { |
280 | - if( in_array( $attribute->getCode(), $configAttributeCodes ) ) { |
|
281 | - unset( $attributes[$key] ); |
|
280 | + if (in_array($attribute->getCode(), $configAttributeCodes)) { |
|
281 | + unset($attributes[$key]); |
|
282 | 282 | } |
283 | 283 | } |
284 | - $product->setAttributes( $attributes ); |
|
284 | + $product->setAttributes($attributes); |
|
285 | 285 | |
286 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' ); |
|
287 | - $productItem = $manager->findItem( $product->getProductCode(), array( 'price', 'text' ), true ); |
|
288 | - $product->setPrice( $this->calcPrice( $product, $productItem->getRefItems( 'price', 'default' ), $quantity ) ); |
|
286 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product'); |
|
287 | + $productItem = $manager->findItem($product->getProductCode(), array('price', 'text'), true); |
|
288 | + $product->setPrice($this->calcPrice($product, $productItem->getRefItems('price', 'default'), $quantity)); |
|
289 | 289 | |
290 | - $this->get()->editProduct( $product, $position ); |
|
290 | + $this->get()->editProduct($product, $position); |
|
291 | 291 | |
292 | 292 | $this->save(); |
293 | 293 | } |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | * @param string $code Coupon code entered by the user |
300 | 300 | * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed |
301 | 301 | */ |
302 | - public function addCoupon( $code ) |
|
302 | + public function addCoupon($code) |
|
303 | 303 | { |
304 | 304 | $context = $this->getContext(); |
305 | 305 | |
@@ -319,62 +319,62 @@ discard block |
||
319 | 319 | * @category User |
320 | 320 | * @category Developer |
321 | 321 | */ |
322 | - $allowed = $context->getConfig()->get( 'controller/frontend/basket/standard/coupon/allowed', 1 ); |
|
322 | + $allowed = $context->getConfig()->get('controller/frontend/basket/standard/coupon/allowed', 1); |
|
323 | 323 | |
324 | - if( $allowed <= count( $this->get()->getCoupons() ) ) |
|
324 | + if ($allowed <= count($this->get()->getCoupons())) |
|
325 | 325 | { |
326 | - $msg = $context->getI18n()->dt( 'controller/frontend', 'Number of coupon codes exceeds the limit' ); |
|
327 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg ); |
|
326 | + $msg = $context->getI18n()->dt('controller/frontend', 'Number of coupon codes exceeds the limit'); |
|
327 | + throw new \Aimeos\Controller\Frontend\Basket\Exception($msg); |
|
328 | 328 | } |
329 | 329 | |
330 | 330 | |
331 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' ); |
|
332 | - $codeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' ); |
|
331 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon'); |
|
332 | + $codeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code'); |
|
333 | 333 | |
334 | 334 | |
335 | - $search = $codeManager->createSearch( true ); |
|
335 | + $search = $codeManager->createSearch(true); |
|
336 | 336 | $expr = array( |
337 | - $search->compare( '==', 'coupon.code.code', $code ), |
|
337 | + $search->compare('==', 'coupon.code.code', $code), |
|
338 | 338 | $search->getConditions(), |
339 | 339 | ); |
340 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
341 | - $search->setSlice( 0, 1 ); |
|
340 | + $search->setConditions($search->combine('&&', $expr)); |
|
341 | + $search->setSlice(0, 1); |
|
342 | 342 | |
343 | - $result = $codeManager->searchItems( $search ); |
|
343 | + $result = $codeManager->searchItems($search); |
|
344 | 344 | |
345 | - if( ( $codeItem = reset( $result ) ) === false ) |
|
345 | + if (($codeItem = reset($result)) === false) |
|
346 | 346 | { |
347 | - $msg = sprintf( $context->getI18n()->dt( 'controller/frontend', 'Coupon code "%1$s" is invalid or not available any more' ), $code ); |
|
348 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg ); |
|
347 | + $msg = sprintf($context->getI18n()->dt('controller/frontend', 'Coupon code "%1$s" is invalid or not available any more'), $code); |
|
348 | + throw new \Aimeos\Controller\Frontend\Basket\Exception($msg); |
|
349 | 349 | } |
350 | 350 | |
351 | 351 | |
352 | - $search = $manager->createSearch( true ); |
|
352 | + $search = $manager->createSearch(true); |
|
353 | 353 | $expr = array( |
354 | - $search->compare( '==', 'coupon.id', $codeItem->getParentId() ), |
|
354 | + $search->compare('==', 'coupon.id', $codeItem->getParentId()), |
|
355 | 355 | $search->getConditions(), |
356 | 356 | ); |
357 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
358 | - $search->setSlice( 0, 1 ); |
|
357 | + $search->setConditions($search->combine('&&', $expr)); |
|
358 | + $search->setSlice(0, 1); |
|
359 | 359 | |
360 | - $result = $manager->searchItems( $search ); |
|
360 | + $result = $manager->searchItems($search); |
|
361 | 361 | |
362 | - if( ( $item = reset( $result ) ) === false ) |
|
362 | + if (($item = reset($result)) === false) |
|
363 | 363 | { |
364 | - $msg = sprintf( $context->getI18n()->dt( 'controller/frontend', 'Coupon for code "%1$s" is not available any more' ), $code ); |
|
365 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg ); |
|
364 | + $msg = sprintf($context->getI18n()->dt('controller/frontend', 'Coupon for code "%1$s" is not available any more'), $code); |
|
365 | + throw new \Aimeos\Controller\Frontend\Basket\Exception($msg); |
|
366 | 366 | } |
367 | 367 | |
368 | 368 | |
369 | - $provider = $manager->getProvider( $item, $codeItem->getCode() ); |
|
369 | + $provider = $manager->getProvider($item, $codeItem->getCode()); |
|
370 | 370 | |
371 | - if( $provider->isAvailable( $this->get() ) !== true ) |
|
371 | + if ($provider->isAvailable($this->get()) !== true) |
|
372 | 372 | { |
373 | - $msg = sprintf( $context->getI18n()->dt( 'controller/frontend', 'Requirements for coupon code "%1$s" aren\'t met' ), $code ); |
|
374 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg ); |
|
373 | + $msg = sprintf($context->getI18n()->dt('controller/frontend', 'Requirements for coupon code "%1$s" aren\'t met'), $code); |
|
374 | + throw new \Aimeos\Controller\Frontend\Basket\Exception($msg); |
|
375 | 375 | } |
376 | 376 | |
377 | - $provider->addCoupon( $this->get() ); |
|
377 | + $provider->addCoupon($this->get()); |
|
378 | 378 | $this->save(); |
379 | 379 | } |
380 | 380 | |
@@ -385,24 +385,24 @@ discard block |
||
385 | 385 | * @param string $code Coupon code entered by the user |
386 | 386 | * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid |
387 | 387 | */ |
388 | - public function deleteCoupon( $code ) |
|
388 | + public function deleteCoupon($code) |
|
389 | 389 | { |
390 | 390 | $context = $this->getContext(); |
391 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'coupon' ); |
|
391 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'coupon'); |
|
392 | 392 | |
393 | 393 | $search = $manager->createSearch(); |
394 | - $search->setConditions( $search->compare( '==', 'coupon.code.code', $code ) ); |
|
395 | - $search->setSlice( 0, 1 ); |
|
394 | + $search->setConditions($search->compare('==', 'coupon.code.code', $code)); |
|
395 | + $search->setSlice(0, 1); |
|
396 | 396 | |
397 | - $result = $manager->searchItems( $search ); |
|
397 | + $result = $manager->searchItems($search); |
|
398 | 398 | |
399 | - if( ( $item = reset( $result ) ) === false ) |
|
399 | + if (($item = reset($result)) === false) |
|
400 | 400 | { |
401 | - $msg = $context->getI18n()->dt( 'controller/frontend', 'Coupon code "%1$s" is invalid' ); |
|
402 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $code ) ); |
|
401 | + $msg = $context->getI18n()->dt('controller/frontend', 'Coupon code "%1$s" is invalid'); |
|
402 | + throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $code)); |
|
403 | 403 | } |
404 | 404 | |
405 | - $manager->getProvider( $item, $code )->deleteCoupon( $this->get() ); |
|
405 | + $manager->getProvider($item, $code)->deleteCoupon($this->get()); |
|
406 | 406 | $this->save(); |
407 | 407 | } |
408 | 408 | |
@@ -415,30 +415,30 @@ discard block |
||
415 | 415 | * @throws \Aimeos\Controller\Frontend\Basket\Exception If the billing or delivery address is not of any required type of |
416 | 416 | * if one of the keys is invalid when using an array with key/value pairs |
417 | 417 | */ |
418 | - public function setAddress( $type, $value ) |
|
418 | + public function setAddress($type, $value) |
|
419 | 419 | { |
420 | 420 | $context = $this->getContext(); |
421 | - $address = \Aimeos\MShop\Factory::createManager( $context, 'order/base/address' )->createItem(); |
|
422 | - $address->setType( $type ); |
|
421 | + $address = \Aimeos\MShop\Factory::createManager($context, 'order/base/address')->createItem(); |
|
422 | + $address->setType($type); |
|
423 | 423 | |
424 | - if( $value instanceof \Aimeos\MShop\Common\Item\Address\Iface ) |
|
424 | + if ($value instanceof \Aimeos\MShop\Common\Item\Address\Iface) |
|
425 | 425 | { |
426 | - $address->copyFrom( $value ); |
|
427 | - $this->get()->setAddress( $address, $type ); |
|
426 | + $address->copyFrom($value); |
|
427 | + $this->get()->setAddress($address, $type); |
|
428 | 428 | } |
429 | - else if( is_array( $value ) ) |
|
429 | + else if (is_array($value)) |
|
430 | 430 | { |
431 | - $this->setAddressFromArray( $address, $value ); |
|
432 | - $this->get()->setAddress( $address, $type ); |
|
431 | + $this->setAddressFromArray($address, $value); |
|
432 | + $this->get()->setAddress($address, $type); |
|
433 | 433 | } |
434 | - else if( $value === null ) |
|
434 | + else if ($value === null) |
|
435 | 435 | { |
436 | - $this->get()->deleteAddress( $type ); |
|
436 | + $this->get()->deleteAddress($type); |
|
437 | 437 | } |
438 | 438 | else |
439 | 439 | { |
440 | - $msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid value for address type "%1$s"' ); |
|
441 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $type ) ); |
|
440 | + $msg = $context->getI18n()->dt('controller/frontend', 'Invalid value for address type "%1$s"'); |
|
441 | + throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $type)); |
|
442 | 442 | } |
443 | 443 | |
444 | 444 | $this->save(); |
@@ -454,42 +454,42 @@ discard block |
||
454 | 454 | * entered by the customer when choosing one of the delivery or payment options |
455 | 455 | * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached |
456 | 456 | */ |
457 | - public function addService( $type, $id, array $attributes = [] ) |
|
457 | + public function addService($type, $id, array $attributes = []) |
|
458 | 458 | { |
459 | 459 | $context = $this->getContext(); |
460 | 460 | |
461 | - $serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' ); |
|
462 | - $serviceItem = $serviceManager->getItem( $id, array( 'media', 'price', 'text' ) ); |
|
461 | + $serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service'); |
|
462 | + $serviceItem = $serviceManager->getItem($id, array('media', 'price', 'text')); |
|
463 | 463 | |
464 | - $provider = $serviceManager->getProvider( $serviceItem, $serviceItem->getType() ); |
|
465 | - $result = $provider->checkConfigFE( $attributes ); |
|
466 | - $unknown = array_diff_key( $attributes, $result ); |
|
464 | + $provider = $serviceManager->getProvider($serviceItem, $serviceItem->getType()); |
|
465 | + $result = $provider->checkConfigFE($attributes); |
|
466 | + $unknown = array_diff_key($attributes, $result); |
|
467 | 467 | |
468 | - if( count( $unknown ) > 0 ) |
|
468 | + if (count($unknown) > 0) |
|
469 | 469 | { |
470 | - $msg = $context->getI18n()->dt( 'controller/frontend', 'Unknown attributes "%1$s"' ); |
|
471 | - $msg = sprintf( $msg, implode( '","', array_keys( $unknown ) ) ); |
|
472 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg ); |
|
470 | + $msg = $context->getI18n()->dt('controller/frontend', 'Unknown attributes "%1$s"'); |
|
471 | + $msg = sprintf($msg, implode('","', array_keys($unknown))); |
|
472 | + throw new \Aimeos\Controller\Frontend\Basket\Exception($msg); |
|
473 | 473 | } |
474 | 474 | |
475 | - foreach( $result as $key => $value ) |
|
475 | + foreach ($result as $key => $value) |
|
476 | 476 | { |
477 | - if( $value !== null ) { |
|
478 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( $value ); |
|
477 | + if ($value !== null) { |
|
478 | + throw new \Aimeos\Controller\Frontend\Basket\Exception($value); |
|
479 | 479 | } |
480 | 480 | } |
481 | 481 | |
482 | - $orderBaseServiceManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/service' ); |
|
482 | + $orderBaseServiceManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/service'); |
|
483 | 483 | $orderServiceItem = $orderBaseServiceManager->createItem(); |
484 | - $orderServiceItem->copyFrom( $serviceItem ); |
|
484 | + $orderServiceItem->copyFrom($serviceItem); |
|
485 | 485 | |
486 | 486 | // remove service rebate of original price |
487 | - $price = $provider->calcPrice( $this->get() )->setRebate( '0.00' ); |
|
488 | - $orderServiceItem->setPrice( $price ); |
|
487 | + $price = $provider->calcPrice($this->get())->setRebate('0.00'); |
|
488 | + $orderServiceItem->setPrice($price); |
|
489 | 489 | |
490 | - $provider->setConfigFE( $orderServiceItem, $attributes ); |
|
490 | + $provider->setConfigFE($orderServiceItem, $attributes); |
|
491 | 491 | |
492 | - $this->get()->addService( $orderServiceItem, $type ); |
|
492 | + $this->get()->addService($orderServiceItem, $type); |
|
493 | 493 | $this->save(); |
494 | 494 | } |
495 | 495 | |
@@ -499,9 +499,9 @@ discard block |
||
499 | 499 | * |
500 | 500 | * @param string $type Service type code like 'payment' or 'delivery' |
501 | 501 | */ |
502 | - public function deleteService( $type ) |
|
502 | + public function deleteService($type) |
|
503 | 503 | { |
504 | - $this->get()->deleteService( $type ); |
|
504 | + $this->get()->deleteService($type); |
|
505 | 505 | $this->save(); |
506 | 506 | } |
507 | 507 | |
@@ -514,18 +514,18 @@ discard block |
||
514 | 514 | * an address item. |
515 | 515 | * @throws \Aimeos\Controller\Frontend\Basket\Exception |
516 | 516 | */ |
517 | - protected function setAddressFromArray( \Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map ) |
|
517 | + protected function setAddressFromArray(\Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map) |
|
518 | 518 | { |
519 | - foreach( $map as $key => $value ) { |
|
520 | - $map[$key] = strip_tags( $value ); // prevent XSS |
|
519 | + foreach ($map as $key => $value) { |
|
520 | + $map[$key] = strip_tags($value); // prevent XSS |
|
521 | 521 | } |
522 | 522 | |
523 | - $errors = $address->fromArray( $map ); |
|
523 | + $errors = $address->fromArray($map); |
|
524 | 524 | |
525 | - if( count( $errors ) > 0 ) |
|
525 | + if (count($errors) > 0) |
|
526 | 526 | { |
527 | - $msg = $this->getContext()->getI18n()->dt( 'controller/frontend', 'Invalid address properties, please check your input' ); |
|
528 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg, 0, null, $errors ); |
|
527 | + $msg = $this->getContext()->getI18n()->dt('controller/frontend', 'Invalid address properties, please check your input'); |
|
528 | + throw new \Aimeos\Controller\Frontend\Basket\Exception($msg, 0, null, $errors); |
|
529 | 529 | } |
530 | 530 | } |
531 | 531 | } |