@@ -29,11 +29,11 @@ discard block |
||
29 | 29 | * @param string $type Arbitrary order type (max. eight chars) |
30 | 30 | * @return \Aimeos\MShop\Order\Item\Iface Created order object |
31 | 31 | */ |
32 | - public function addItem( $baseId, $type ) |
|
32 | + public function addItem($baseId, $type) |
|
33 | 33 | { |
34 | 34 | $total = 0; |
35 | 35 | $context = $this->getContext(); |
36 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
36 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
37 | 37 | |
38 | 38 | /** controller/frontend/order/limit-seconds |
39 | 39 | * Order limitation time frame in seconds |
@@ -51,24 +51,24 @@ discard block |
||
51 | 51 | * @see controller/frontend/basket/limit-count |
52 | 52 | * @see controller/frontend/basket/limit-seconds |
53 | 53 | */ |
54 | - $seconds = $context->getConfig()->get( 'controller/frontend/order/limit-seconds', 300 ); |
|
54 | + $seconds = $context->getConfig()->get('controller/frontend/order/limit-seconds', 300); |
|
55 | 55 | |
56 | 56 | $search = $manager->createSearch(); |
57 | 57 | $expr = [ |
58 | - $search->compare( '==', 'order.baseid', $baseId ), |
|
59 | - $search->compare( '>=', 'order.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ), |
|
58 | + $search->compare('==', 'order.baseid', $baseId), |
|
59 | + $search->compare('>=', 'order.ctime', date('Y-m-d H:i:s', time() - $seconds)), |
|
60 | 60 | ]; |
61 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
62 | - $search->setSlice( 0, 0 ); |
|
61 | + $search->setConditions($search->combine('&&', $expr)); |
|
62 | + $search->setSlice(0, 0); |
|
63 | 63 | |
64 | - $manager->searchItems( $search, [], $total ); |
|
64 | + $manager->searchItems($search, [], $total); |
|
65 | 65 | |
66 | - if( $total > 0 ) { |
|
67 | - throw new \Aimeos\Controller\Frontend\Order\Exception( sprintf( 'The order has already been created' ) ); |
|
66 | + if ($total > 0) { |
|
67 | + throw new \Aimeos\Controller\Frontend\Order\Exception(sprintf('The order has already been created')); |
|
68 | 68 | } |
69 | 69 | |
70 | - $item = $manager->createItem()->setBaseId( $baseId )->setType( $type ); |
|
71 | - return $manager->saveItem( $item ); |
|
70 | + $item = $manager->createItem()->setBaseId($baseId)->setType($type); |
|
71 | + return $manager->saveItem($item); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | */ |
80 | 80 | public function createFilter() |
81 | 81 | { |
82 | - return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order' )->createSearch( true ); |
|
82 | + return \Aimeos\MShop\Factory::createManager($this->getContext(), 'order')->createSearch(true); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | |
@@ -90,30 +90,30 @@ discard block |
||
90 | 90 | * @param boolean $default Use default criteria to limit orders |
91 | 91 | * @return \Aimeos\MShop\Order\Item\Iface Order object |
92 | 92 | */ |
93 | - public function getItem( $id, $default = true ) |
|
93 | + public function getItem($id, $default = true) |
|
94 | 94 | { |
95 | 95 | $context = $this->getContext(); |
96 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
96 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
97 | 97 | |
98 | - $search = $manager->createSearch( true ); |
|
98 | + $search = $manager->createSearch(true); |
|
99 | 99 | $expr = [ |
100 | - $search->compare( '==', 'order.id', $id ), |
|
100 | + $search->compare('==', 'order.id', $id), |
|
101 | 101 | $search->getConditions(), |
102 | 102 | ]; |
103 | 103 | |
104 | - if( $default !== false ) { |
|
105 | - $expr[] = $search->compare( '==', 'order.editor', $context->getEditor() ); |
|
104 | + if ($default !== false) { |
|
105 | + $expr[] = $search->compare('==', 'order.editor', $context->getEditor()); |
|
106 | 106 | } |
107 | 107 | |
108 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
108 | + $search->setConditions($search->combine('&&', $expr)); |
|
109 | 109 | |
110 | - $items = $manager->searchItems( $search ); |
|
110 | + $items = $manager->searchItems($search); |
|
111 | 111 | |
112 | - if( ( $item = reset( $items ) ) !== false ) { |
|
112 | + if (($item = reset($items)) !== false) { |
|
113 | 113 | return $item; |
114 | 114 | } |
115 | 115 | |
116 | - throw new \Aimeos\Controller\Frontend\Order\Exception( sprintf( 'No order item for ID "%1$s" found', $id ) ); |
|
116 | + throw new \Aimeos\Controller\Frontend\Order\Exception(sprintf('No order item for ID "%1$s" found', $id)); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | |
@@ -123,10 +123,10 @@ discard block |
||
123 | 123 | * @param \Aimeos\MShop\Order\Item\Iface $item Order object |
124 | 124 | * @return \Aimeos\MShop\Order\Item\Iface Saved order item |
125 | 125 | */ |
126 | - public function saveItem( \Aimeos\MShop\Order\Item\Iface $item ) |
|
126 | + public function saveItem(\Aimeos\MShop\Order\Item\Iface $item) |
|
127 | 127 | { |
128 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order' ); |
|
129 | - return $manager->saveItem( $item ); |
|
128 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order'); |
|
129 | + return $manager->saveItem($item); |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | |
@@ -137,18 +137,18 @@ discard block |
||
137 | 137 | * @param integer|null &$total Variable that will contain the total number of available items |
138 | 138 | * @return \Aimeos\MShop\Order\Item\Iface[] Associative list of IDs as keys and order objects as values |
139 | 139 | */ |
140 | - public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null ) |
|
140 | + public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null) |
|
141 | 141 | { |
142 | 142 | $context = $this->getContext(); |
143 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
143 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
144 | 144 | |
145 | 145 | $expr = [ |
146 | 146 | $filter->getConditions(), |
147 | - $filter->compare( '==', 'order.base.customerid', $context->getUserId() ), |
|
147 | + $filter->compare('==', 'order.base.customerid', $context->getUserId()), |
|
148 | 148 | ]; |
149 | - $filter->setConditions( $filter->combine( '&&', $expr ) ); |
|
149 | + $filter->setConditions($filter->combine('&&', $expr)); |
|
150 | 150 | |
151 | - return $manager->searchItems( $filter, [], $total ); |
|
151 | + return $manager->searchItems($filter, [], $total); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | |
@@ -170,9 +170,9 @@ discard block |
||
170 | 170 | * |
171 | 171 | * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object |
172 | 172 | */ |
173 | - public function block( \Aimeos\MShop\Order\Item\Iface $orderItem ) |
|
173 | + public function block(\Aimeos\MShop\Order\Item\Iface $orderItem) |
|
174 | 174 | { |
175 | - \Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->block( $orderItem ); |
|
175 | + \Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->block($orderItem); |
|
176 | 176 | } |
177 | 177 | |
178 | 178 | |
@@ -194,9 +194,9 @@ discard block |
||
194 | 194 | * |
195 | 195 | * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object |
196 | 196 | */ |
197 | - public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem ) |
|
197 | + public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem) |
|
198 | 198 | { |
199 | - \Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->unblock( $orderItem ); |
|
199 | + \Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->unblock($orderItem); |
|
200 | 200 | } |
201 | 201 | |
202 | 202 | |
@@ -214,8 +214,8 @@ discard block |
||
214 | 214 | * |
215 | 215 | * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object |
216 | 216 | */ |
217 | - public function update( \Aimeos\MShop\Order\Item\Iface $orderItem ) |
|
217 | + public function update(\Aimeos\MShop\Order\Item\Iface $orderItem) |
|
218 | 218 | { |
219 | - \Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->update( $orderItem ); |
|
219 | + \Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->update($orderItem); |
|
220 | 220 | } |
221 | 221 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value |
31 | 31 | * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values |
32 | 32 | */ |
33 | - public function checkAttributes( $serviceId, array $attributes ); |
|
33 | + public function checkAttributes($serviceId, array $attributes); |
|
34 | 34 | |
35 | 35 | /** |
36 | 36 | * Returns the service item for the given ID |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | * @param array $ref List of domains for which the items referenced by the services should be fetched too |
40 | 40 | * @return \Aimeos\MShop\Service\Provider\Iface Service provider object |
41 | 41 | */ |
42 | - public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] ); |
|
42 | + public function getProvider($serviceId, $ref = ['media', 'price', 'text']); |
|
43 | 43 | |
44 | 44 | /** |
45 | 45 | * Returns the service providers for the given type |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | * @param array $ref List of domains for which the items referenced by the services should be fetched too |
49 | 49 | * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values |
50 | 50 | */ |
51 | - public function getProviders( $type = null, $ref = ['media', 'price', 'text'] ); |
|
51 | + public function getProviders($type = null, $ref = ['media', 'price', 'text']); |
|
52 | 52 | |
53 | 53 | /** |
54 | 54 | * Processes the service for the given order, e.g. payment and delivery services |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | * @return \Aimeos\MShop\Common\Item\Helper\Form\Iface|null Form object with URL, parameters, etc. |
62 | 62 | * or null if no form data is required |
63 | 63 | */ |
64 | - public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params ); |
|
64 | + public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params); |
|
65 | 65 | |
66 | 66 | |
67 | 67 | /** |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | * @param string $code Unique code of the service used for the current order |
73 | 73 | * @return \Psr\Http\Message\ResponseInterface Response object |
74 | 74 | */ |
75 | - public function updatePush( ServerRequestInterface $request, ResponseInterface $response, $code ); |
|
75 | + public function updatePush(ServerRequestInterface $request, ResponseInterface $response, $code); |
|
76 | 76 | |
77 | 77 | |
78 | 78 | /** |
@@ -83,5 +83,5 @@ discard block |
||
83 | 83 | * @param string $orderid ID of the order whose payment status should be updated |
84 | 84 | * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated |
85 | 85 | */ |
86 | - public function updateSync( ServerRequestInterface $request, $code, $orderid ); |
|
86 | + public function updateSync(ServerRequestInterface $request, $code, $orderid); |
|
87 | 87 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | * @param string $type Arbitrary order type (max. eight chars) |
28 | 28 | * @return \Aimeos\MShop\Order\Item\Iface Created order object |
29 | 29 | */ |
30 | - public function addItem( $baseId, $type ); |
|
30 | + public function addItem($baseId, $type); |
|
31 | 31 | |
32 | 32 | |
33 | 33 | /** |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | * @param boolean $default Use default criteria to limit orders |
46 | 46 | * @return \Aimeos\MShop\Order\Item\Iface Order object |
47 | 47 | */ |
48 | - public function getItem( $id, $default = true ); |
|
48 | + public function getItem($id, $default = true); |
|
49 | 49 | |
50 | 50 | |
51 | 51 | /** |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * @param \Aimeos\MShop\Order\Item\Iface $item Order object |
55 | 55 | * @return \Aimeos\MShop\Order\Item\Iface Saved order item |
56 | 56 | */ |
57 | - public function saveItem( \Aimeos\MShop\Order\Item\Iface $item ); |
|
57 | + public function saveItem(\Aimeos\MShop\Order\Item\Iface $item); |
|
58 | 58 | |
59 | 59 | |
60 | 60 | /** |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | * @param integer &$total|null Variable that will contain the total number of available items |
65 | 65 | * @return \Aimeos\MShop\Order\Item\Iface[] Associative list of IDs as keys and order objects as values |
66 | 66 | */ |
67 | - public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null ); |
|
67 | + public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null); |
|
68 | 68 | |
69 | 69 | |
70 | 70 | /** |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object |
87 | 87 | * @return void |
88 | 88 | */ |
89 | - public function block( \Aimeos\MShop\Order\Item\Iface $orderItem ); |
|
89 | + public function block(\Aimeos\MShop\Order\Item\Iface $orderItem); |
|
90 | 90 | |
91 | 91 | |
92 | 92 | /** |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object |
109 | 109 | * @return void |
110 | 110 | */ |
111 | - public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem ); |
|
111 | + public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem); |
|
112 | 112 | |
113 | 113 | |
114 | 114 | /** |
@@ -126,5 +126,5 @@ discard block |
||
126 | 126 | * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object |
127 | 127 | * @return void |
128 | 128 | */ |
129 | - public function update( \Aimeos\MShop\Order\Item\Iface $orderItem ); |
|
129 | + public function update(\Aimeos\MShop\Order\Item\Iface $orderItem); |
|
130 | 130 | } |
@@ -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 |
@@ -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 | } |
@@ -19,13 +19,13 @@ discard block |
||
19 | 19 | protected function setUp() |
20 | 20 | { |
21 | 21 | $this->context = \TestHelperFrontend::getContext(); |
22 | - $this->object = new \Aimeos\Controller\Frontend\Catalog\Standard( $this->context ); |
|
22 | + $this->object = new \Aimeos\Controller\Frontend\Catalog\Standard($this->context); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | |
26 | 26 | protected function tearDown() |
27 | 27 | { |
28 | - unset( $this->object, $this->context ); |
|
28 | + unset($this->object, $this->context); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
@@ -33,19 +33,19 @@ discard block |
||
33 | 33 | { |
34 | 34 | $filter = $this->object->createFilter(); |
35 | 35 | |
36 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter ); |
|
36 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | |
40 | 40 | public function testGetPath() |
41 | 41 | { |
42 | - $manager = \Aimeos\MShop\Factory::createManager( $this->context, 'catalog' ); |
|
43 | - $items = $this->object->getPath( $manager->findItem( 'cafe' )->getId() ); |
|
42 | + $manager = \Aimeos\MShop\Factory::createManager($this->context, 'catalog'); |
|
43 | + $items = $this->object->getPath($manager->findItem('cafe')->getId()); |
|
44 | 44 | |
45 | - $this->assertEquals( 3, count( $items ) ); |
|
45 | + $this->assertEquals(3, count($items)); |
|
46 | 46 | |
47 | - foreach( $items as $item ) { |
|
48 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item ); |
|
47 | + foreach ($items as $item) { |
|
48 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item); |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | |
@@ -54,10 +54,10 @@ discard block |
||
54 | 54 | { |
55 | 55 | $tree = $this->object->getTree(); |
56 | 56 | |
57 | - $this->assertEquals( 2, count( $tree->getChildren() ) ); |
|
57 | + $this->assertEquals(2, count($tree->getChildren())); |
|
58 | 58 | |
59 | - foreach( $tree->getChildren() as $item ) { |
|
60 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item ); |
|
59 | + foreach ($tree->getChildren() as $item) { |
|
60 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item); |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys |
38 | 38 | * @since 2017.03 |
39 | 39 | */ |
40 | - public function getPath( $id, array $domains = array( 'text', 'media' ) ); |
|
40 | + public function getPath($id, array $domains = array('text', 'media')); |
|
41 | 41 | |
42 | 42 | |
43 | 43 | /** |
@@ -51,6 +51,6 @@ discard block |
||
51 | 51 | * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant |
52 | 52 | * @since 2017.03 |
53 | 53 | */ |
54 | - public function getTree( $id = null, array $domains = array( 'text', 'media' ), |
|
55 | - $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null ); |
|
54 | + public function getTree($id = null, array $domains = array('text', 'media'), |
|
55 | + $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null); |
|
56 | 56 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function createFilter() |
32 | 32 | { |
33 | - return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->createSearch( true ); |
|
33 | + return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->createSearch(true); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | |
@@ -42,9 +42,9 @@ discard block |
||
42 | 42 | * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys |
43 | 43 | * @since 2017.03 |
44 | 44 | */ |
45 | - public function getPath( $id, array $domains = array( 'text', 'media' ) ) |
|
45 | + public function getPath($id, array $domains = array('text', 'media')) |
|
46 | 46 | { |
47 | - return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getPath( $id, $domains ); |
|
47 | + return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getPath($id, $domains); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | |
@@ -59,9 +59,9 @@ discard block |
||
59 | 59 | * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant |
60 | 60 | * @since 2017.03 |
61 | 61 | */ |
62 | - public function getTree( $id = null, array $domains = array( 'text', 'media' ), |
|
63 | - $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null ) |
|
62 | + public function getTree($id = null, array $domains = array('text', 'media'), |
|
63 | + $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null) |
|
64 | 64 | { |
65 | - return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getTree( $id, $domains, $level, $search ); |
|
65 | + return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getTree($id, $domains, $level, $search); |
|
66 | 66 | } |
67 | 67 | } |
@@ -121,10 +121,11 @@ discard block |
||
121 | 121 | { |
122 | 122 | $msg = $context->getI18n()->dt( 'controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"' ); |
123 | 123 | throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) ); |
124 | - } |
|
125 | - else if( ( $result = reset( $productItems ) ) !== false ) // count == 1 |
|
124 | + } else if( ( $result = reset( $productItems ) ) !== false ) { |
|
125 | + // count == 1 |
|
126 | 126 | { |
127 | 127 | $productItem = $result; |
128 | + } |
|
128 | 129 | $orderBaseProductItem->setProductCode( $productItem->getCode() ); |
129 | 130 | |
130 | 131 | $subprices = $productItem->getRefItems( 'price', 'default', 'default' ); |
@@ -150,10 +151,11 @@ discard block |
||
150 | 151 | |
151 | 152 | $attr[] = $orderAttributeItem; |
152 | 153 | } |
153 | - } |
|
154 | - else if( $requireVariant != false ) // count == 0 |
|
154 | + } else if( $requireVariant != false ) { |
|
155 | + // count == 0 |
|
155 | 156 | { |
156 | 157 | $msg = $context->getI18n()->dt( 'controller/frontend', 'No article found for selected attributes and product ID "%1$s"' ); |
158 | + } |
|
157 | 159 | throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) ); |
158 | 160 | } |
159 | 161 |
@@ -36,14 +36,14 @@ discard block |
||
36 | 36 | * @param string $stocktype Unique code of the stock type to deliver the products from |
37 | 37 | * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available |
38 | 38 | */ |
39 | - public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [], |
|
40 | - array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] ) |
|
39 | + public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [], |
|
40 | + array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = []) |
|
41 | 41 | { |
42 | 42 | $context = $this->getContext(); |
43 | - $productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' ); |
|
44 | - $productItem = $productManager->getItem( $prodid, [], true ); |
|
43 | + $productManager = \Aimeos\MShop\Factory::createManager($context, 'product'); |
|
44 | + $productItem = $productManager->getItem($prodid, [], true); |
|
45 | 45 | |
46 | - if( $productManager->getItem( $prodid, [], true )->getType() !== 'select' ) |
|
46 | + if ($productManager->getItem($prodid, [], true)->getType() !== 'select') |
|
47 | 47 | { |
48 | 48 | return $this->getController()->addProduct( |
49 | 49 | $prodid, $quantity, $stocktype, $variantAttributeIds, |
@@ -51,30 +51,30 @@ discard block |
||
51 | 51 | ); |
52 | 52 | } |
53 | 53 | |
54 | - $productItem = $productManager->getItem( $prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true ); |
|
55 | - $prices = $productItem->getRefItems( 'price', 'default', 'default' ); |
|
56 | - $hidden = $productItem->getRefItems( 'attribute', null, 'hidden' ); |
|
54 | + $productItem = $productManager->getItem($prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true); |
|
55 | + $prices = $productItem->getRefItems('price', 'default', 'default'); |
|
56 | + $hidden = $productItem->getRefItems('attribute', null, 'hidden'); |
|
57 | 57 | |
58 | - $orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem(); |
|
59 | - $orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype ); |
|
58 | + $orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem(); |
|
59 | + $orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype); |
|
60 | 60 | |
61 | - $attr = $this->getVariantDetails( $orderBaseProductItem, $productItem, $prices, $variantAttributeIds ); |
|
62 | - $hidden += $productItem->getRefItems( 'attribute', null, 'hidden' ); |
|
61 | + $attr = $this->getVariantDetails($orderBaseProductItem, $productItem, $prices, $variantAttributeIds); |
|
62 | + $hidden += $productItem->getRefItems('attribute', null, 'hidden'); |
|
63 | 63 | |
64 | 64 | $attributeMap = [ |
65 | - 'custom' => array_keys( $customAttributeValues ), |
|
66 | - 'config' => array_keys( $configAttributeIds ), |
|
65 | + 'custom' => array_keys($customAttributeValues), |
|
66 | + 'config' => array_keys($configAttributeIds), |
|
67 | 67 | ]; |
68 | - $this->checkListRef( array( $prodid, $productItem->getId() ), 'attribute', $attributeMap ); |
|
68 | + $this->checkListRef(array($prodid, $productItem->getId()), 'attribute', $attributeMap); |
|
69 | 69 | |
70 | - $custAttr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues ); |
|
71 | - $confAttr = $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds ); |
|
72 | - $attr = array_merge( $attr, $custAttr, $confAttr, $this->getOrderProductAttributes( 'hidden', array_keys( $hidden ) ) ); |
|
70 | + $custAttr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues); |
|
71 | + $confAttr = $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds); |
|
72 | + $attr = array_merge($attr, $custAttr, $confAttr, $this->getOrderProductAttributes('hidden', array_keys($hidden))); |
|
73 | 73 | |
74 | - $orderBaseProductItem->setAttributeItems( $attr ); |
|
75 | - $orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) ); |
|
74 | + $orderBaseProductItem->setAttributeItems($attr); |
|
75 | + $orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity)); |
|
76 | 76 | |
77 | - $this->getController()->get()->addProduct( $orderBaseProductItem ); |
|
77 | + $this->getController()->get()->addProduct($orderBaseProductItem); |
|
78 | 78 | $this->getController()->save(); |
79 | 79 | } |
80 | 80 | |
@@ -89,12 +89,12 @@ discard block |
||
89 | 89 | * @return \Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface[] List of order product attributes |
90 | 90 | * @throws \Aimeos\Controller\Frontend\Basket\Exception If no product variant is found |
91 | 91 | */ |
92 | - protected function getVariantDetails( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem, |
|
93 | - \Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds ) |
|
92 | + protected function getVariantDetails(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem, |
|
93 | + \Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds) |
|
94 | 94 | { |
95 | 95 | $attr = []; |
96 | 96 | $context = $this->getContext(); |
97 | - $productItems = $this->getProductVariants( $productItem, $variantAttributeIds ); |
|
97 | + $productItems = $this->getProductVariants($productItem, $variantAttributeIds); |
|
98 | 98 | |
99 | 99 | /** controller/frontend/basket/require-variant |
100 | 100 | * A variant of a selection product must be chosen |
@@ -115,47 +115,47 @@ discard block |
||
115 | 115 | * @category Developer |
116 | 116 | * @category User |
117 | 117 | */ |
118 | - $requireVariant = $context->getConfig()->get( 'controller/frontend/basket/require-variant', true ); |
|
118 | + $requireVariant = $context->getConfig()->get('controller/frontend/basket/require-variant', true); |
|
119 | 119 | |
120 | 120 | |
121 | - if( count( $productItems ) > 1 ) |
|
121 | + if (count($productItems) > 1) |
|
122 | 122 | { |
123 | - $msg = $context->getI18n()->dt( 'controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"' ); |
|
124 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) ); |
|
123 | + $msg = $context->getI18n()->dt('controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"'); |
|
124 | + throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $productItem->getId())); |
|
125 | 125 | } |
126 | - else if( ( $result = reset( $productItems ) ) !== false ) // count == 1 |
|
126 | + else if (($result = reset($productItems)) !== false) // count == 1 |
|
127 | 127 | { |
128 | 128 | $productItem = $result; |
129 | - $orderBaseProductItem->setProductCode( $productItem->getCode() ); |
|
129 | + $orderBaseProductItem->setProductCode($productItem->getCode()); |
|
130 | 130 | |
131 | - $subprices = $productItem->getRefItems( 'price', 'default', 'default' ); |
|
131 | + $subprices = $productItem->getRefItems('price', 'default', 'default'); |
|
132 | 132 | |
133 | - if( !empty( $subprices ) ) { |
|
133 | + if (!empty($subprices)) { |
|
134 | 134 | $prices = $subprices; |
135 | 135 | } |
136 | 136 | |
137 | - $submedia = $productItem->getRefItems( 'media', 'default', 'default' ); |
|
137 | + $submedia = $productItem->getRefItems('media', 'default', 'default'); |
|
138 | 138 | |
139 | - if( ( $mediaItem = reset( $submedia ) ) !== false ) { |
|
140 | - $orderBaseProductItem->setMediaUrl( $mediaItem->getPreview() ); |
|
139 | + if (($mediaItem = reset($submedia)) !== false) { |
|
140 | + $orderBaseProductItem->setMediaUrl($mediaItem->getPreview()); |
|
141 | 141 | } |
142 | 142 | |
143 | - $orderProductAttrManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product/attribute' ); |
|
144 | - $variantAttributes = $productItem->getRefItems( 'attribute', null, 'variant' ); |
|
143 | + $orderProductAttrManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product/attribute'); |
|
144 | + $variantAttributes = $productItem->getRefItems('attribute', null, 'variant'); |
|
145 | 145 | |
146 | - foreach( $this->getAttributes( array_keys( $variantAttributes ), array( 'text' ) ) as $attrItem ) |
|
146 | + foreach ($this->getAttributes(array_keys($variantAttributes), array('text')) as $attrItem) |
|
147 | 147 | { |
148 | 148 | $orderAttributeItem = $orderProductAttrManager->createItem(); |
149 | - $orderAttributeItem->copyFrom( $attrItem ); |
|
150 | - $orderAttributeItem->setType( 'variant' ); |
|
149 | + $orderAttributeItem->copyFrom($attrItem); |
|
150 | + $orderAttributeItem->setType('variant'); |
|
151 | 151 | |
152 | 152 | $attr[] = $orderAttributeItem; |
153 | 153 | } |
154 | 154 | } |
155 | - else if( $requireVariant != false ) // count == 0 |
|
155 | + else if ($requireVariant != false) // count == 0 |
|
156 | 156 | { |
157 | - $msg = $context->getI18n()->dt( 'controller/frontend', 'No article found for selected attributes and product ID "%1$s"' ); |
|
158 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) ); |
|
157 | + $msg = $context->getI18n()->dt('controller/frontend', 'No article found for selected attributes and product ID "%1$s"'); |
|
158 | + throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $productItem->getId())); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | return $attr; |
@@ -36,27 +36,27 @@ |
||
36 | 36 | * @param string $stocktype Unique code of the stock type to deliver the products from |
37 | 37 | * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available |
38 | 38 | */ |
39 | - public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [], |
|
40 | - array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] ) |
|
39 | + public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [], |
|
40 | + array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = []) |
|
41 | 41 | { |
42 | 42 | $context = $this->getContext(); |
43 | - $catalogListManager = \Aimeos\MShop\Factory::createManager( $context, 'catalog/lists' ); |
|
43 | + $catalogListManager = \Aimeos\MShop\Factory::createManager($context, 'catalog/lists'); |
|
44 | 44 | |
45 | - $search = $catalogListManager->createSearch( true ); |
|
45 | + $search = $catalogListManager->createSearch(true); |
|
46 | 46 | $expr = array( |
47 | - $search->compare( '==', 'catalog.lists.domain', 'product' ), |
|
48 | - $search->compare( '==', 'catalog.lists.refid', $prodid ), |
|
47 | + $search->compare('==', 'catalog.lists.domain', 'product'), |
|
48 | + $search->compare('==', 'catalog.lists.refid', $prodid), |
|
49 | 49 | $search->getConditions() |
50 | 50 | ); |
51 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
52 | - $search->setSlice( 0, 1 ); |
|
51 | + $search->setConditions($search->combine('&&', $expr)); |
|
52 | + $search->setSlice(0, 1); |
|
53 | 53 | |
54 | - $result = $catalogListManager->searchItems( $search ); |
|
54 | + $result = $catalogListManager->searchItems($search); |
|
55 | 55 | |
56 | - if( reset( $result ) === false ) |
|
56 | + if (reset($result) === false) |
|
57 | 57 | { |
58 | - $msg = $context->getI18n()->dt( 'controller/frontend', 'Adding product with ID "%1$s" is not allowed' ); |
|
59 | - throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $prodid ) ); |
|
58 | + $msg = $context->getI18n()->dt('controller/frontend', 'Adding product with ID "%1$s" is not allowed'); |
|
59 | + throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $prodid)); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | $this->getController()->addProduct( |