@@ -136,8 +136,7 @@ |
||
136 | 136 | if( ( $client = @call_user_func_array( array( $factory, 'createClient' ), $args ) ) === false ) { |
137 | 137 | throw new \Aimeos\Client\JsonApi\Exception( sprintf( 'Invalid factory "%1$s"', $factory ), 400 ); |
138 | 138 | } |
139 | - } |
|
140 | - else |
|
139 | + } else |
|
141 | 140 | { |
142 | 141 | $client = self::createClientRoot( $context, $view, $templatePaths, $path, $name ); |
143 | 142 | } |
@@ -44,16 +44,14 @@ |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | $status = 200; |
47 | - } |
|
48 | - catch( \Aimeos\MShop\Exception $e ) |
|
47 | + } catch( \Aimeos\MShop\Exception $e ) |
|
49 | 48 | { |
50 | 49 | $status = 404; |
51 | 50 | $view->errors = array( array( |
52 | 51 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
53 | 52 | 'detail' => $e->getTraceAsString(), |
54 | 53 | ) ); |
55 | - } |
|
56 | - catch( \Exception $e ) |
|
54 | + } catch( \Exception $e ) |
|
57 | 55 | { |
58 | 56 | $status = 500; |
59 | 57 | $view->errors = array( array( |
@@ -44,16 +44,14 @@ |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | $status = 200; |
47 | - } |
|
48 | - catch( \Aimeos\MShop\Exception $e ) |
|
47 | + } catch( \Aimeos\MShop\Exception $e ) |
|
49 | 48 | { |
50 | 49 | $status = 404; |
51 | 50 | $view->errors = array( array( |
52 | 51 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
53 | 52 | 'detail' => $e->getTraceAsString(), |
54 | 53 | ) ); |
55 | - } |
|
56 | - catch( \Exception $e ) |
|
54 | + } catch( \Exception $e ) |
|
57 | 55 | { |
58 | 56 | $status = 500; |
59 | 57 | $view->errors = array( array( |
@@ -83,8 +83,7 @@ |
||
83 | 83 | foreach( $items as $localeItem ) { |
84 | 84 | $data[] = $entryFcn( $localeItem ); |
85 | 85 | } |
86 | - } |
|
87 | - else |
|
86 | + } else |
|
88 | 87 | { |
89 | 88 | $data = $entryFcn( $items ); |
90 | 89 | } |
@@ -268,7 +268,7 @@ |
||
268 | 268 | $baseManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' ); |
269 | 269 | |
270 | 270 | $search = $baseManager->createSearch(); |
271 | - $search->setConditions( $search->compare( '==', 'order.base.price', '672.00') ); |
|
271 | + $search->setConditions( $search->compare( '==', 'order.base.price', '672.00' ) ); |
|
272 | 272 | |
273 | 273 | $items = $baseManager->searchItems( $search ); |
274 | 274 |
@@ -60,16 +60,14 @@ discard block |
||
60 | 60 | $type = $view->param( 'id', 'default' ); |
61 | 61 | $view->items = $this->controller->setType( $type )->clear()->get(); |
62 | 62 | $view->total = 1; |
63 | - } |
|
64 | - catch( \Aimeos\MShop\Exception $e ) |
|
63 | + } catch( \Aimeos\MShop\Exception $e ) |
|
65 | 64 | { |
66 | 65 | $status = 404; |
67 | 66 | $view->errors = array( array( |
68 | 67 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
69 | 68 | 'detail' => $e->getTraceAsString(), |
70 | 69 | ) ); |
71 | - } |
|
72 | - catch( \Exception $e ) |
|
70 | + } catch( \Exception $e ) |
|
73 | 71 | { |
74 | 72 | $status = 500; |
75 | 73 | $view->errors = array( array( |
@@ -100,8 +98,7 @@ discard block |
||
100 | 98 | try |
101 | 99 | { |
102 | 100 | $view->items = $this->controller->load( $id, $this->getParts( $view ) ); |
103 | - } |
|
104 | - catch( \Aimeos\MShop\Exception $e ) |
|
101 | + } catch( \Aimeos\MShop\Exception $e ) |
|
105 | 102 | { |
106 | 103 | $view->items = $this->controller->setType( $id )->get(); |
107 | 104 | $allow = true; |
@@ -109,16 +106,14 @@ discard block |
||
109 | 106 | |
110 | 107 | $view->total = 1; |
111 | 108 | $status = 200; |
112 | - } |
|
113 | - catch( \Aimeos\MShop\Exception $e ) |
|
109 | + } catch( \Aimeos\MShop\Exception $e ) |
|
114 | 110 | { |
115 | 111 | $status = 404; |
116 | 112 | $view->errors = array( array( |
117 | 113 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
118 | 114 | 'detail' => $e->getTraceAsString(), |
119 | 115 | ) ); |
120 | - } |
|
121 | - catch( \Exception $e ) |
|
116 | + } catch( \Exception $e ) |
|
122 | 117 | { |
123 | 118 | $status = 500; |
124 | 119 | $view->errors = array( array( |
@@ -157,16 +152,14 @@ discard block |
||
157 | 152 | $view->total = 1; |
158 | 153 | |
159 | 154 | $status = 200; |
160 | - } |
|
161 | - catch( \Aimeos\MShop\Exception $e ) |
|
155 | + } catch( \Aimeos\MShop\Exception $e ) |
|
162 | 156 | { |
163 | 157 | $status = 404; |
164 | 158 | $view->errors = array( array( |
165 | 159 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
166 | 160 | 'detail' => $e->getTraceAsString(), |
167 | 161 | ) ); |
168 | - } |
|
169 | - catch( \Exception $e ) |
|
162 | + } catch( \Exception $e ) |
|
170 | 163 | { |
171 | 164 | $status = 500; |
172 | 165 | $view->errors = array( array( |
@@ -198,16 +191,14 @@ discard block |
||
198 | 191 | $view->total = 1; |
199 | 192 | |
200 | 193 | $status = 200; |
201 | - } |
|
202 | - catch( \Aimeos\MShop\Exception $e ) |
|
194 | + } catch( \Aimeos\MShop\Exception $e ) |
|
203 | 195 | { |
204 | 196 | $status = 404; |
205 | 197 | $view->errors = array( array( |
206 | 198 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
207 | 199 | 'detail' => $e->getTraceAsString(), |
208 | 200 | ) ); |
209 | - } |
|
210 | - catch( \Exception $e ) |
|
201 | + } catch( \Exception $e ) |
|
211 | 202 | { |
212 | 203 | $status = 500; |
213 | 204 | $view->errors = array( array( |
@@ -99,8 +99,7 @@ |
||
99 | 99 | foreach( $items as $pos => $orderProductItem ) { |
100 | 100 | $data[] = $entryFcn( $orderProductItem, $pos ); |
101 | 101 | } |
102 | - } |
|
103 | - else |
|
102 | + } else |
|
104 | 103 | { |
105 | 104 | $data = $entryFcn( $items ); |
106 | 105 | } |
@@ -199,6 +199,9 @@ |
||
199 | 199 | } |
200 | 200 | |
201 | 201 | |
202 | + /** |
|
203 | + * @param string $code |
|
204 | + */ |
|
202 | 205 | protected function addProduct( $code ) |
203 | 206 | { |
204 | 207 | $prodId = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( $code )->getId(); |
@@ -78,8 +78,7 @@ discard block |
||
78 | 78 | |
79 | 79 | $this->controller->deleteCoupon( $entry->id ); |
80 | 80 | } |
81 | - } |
|
82 | - else |
|
81 | + } else |
|
83 | 82 | { |
84 | 83 | $this->controller->deleteCoupon( $relId ); |
85 | 84 | } |
@@ -89,16 +88,14 @@ discard block |
||
89 | 88 | $view->total = 1; |
90 | 89 | |
91 | 90 | $status = 200; |
92 | - } |
|
93 | - catch( \Aimeos\MShop\Exception $e ) |
|
91 | + } catch( \Aimeos\MShop\Exception $e ) |
|
94 | 92 | { |
95 | 93 | $status = 404; |
96 | 94 | $view->errors = array( array( |
97 | 95 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
98 | 96 | 'detail' => $e->getTraceAsString(), |
99 | 97 | ) ); |
100 | - } |
|
101 | - catch( \Exception $e ) |
|
98 | + } catch( \Exception $e ) |
|
102 | 99 | { |
103 | 100 | $status = 500; |
104 | 101 | $view->errors = array( array( |
@@ -149,16 +146,14 @@ discard block |
||
149 | 146 | $view->total = 1; |
150 | 147 | |
151 | 148 | $status = 201; |
152 | - } |
|
153 | - catch( \Aimeos\MShop\Exception $e ) |
|
149 | + } catch( \Aimeos\MShop\Exception $e ) |
|
154 | 150 | { |
155 | 151 | $status = 404; |
156 | 152 | $view->errors = array( array( |
157 | 153 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
158 | 154 | 'detail' => $e->getTraceAsString(), |
159 | 155 | ) ); |
160 | - } |
|
161 | - catch( \Exception $e ) |
|
156 | + } catch( \Exception $e ) |
|
162 | 157 | { |
163 | 158 | $status = 500; |
164 | 159 | $view->errors = array( array( |