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