@@ -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 | } |
@@ -91,8 +91,7 @@ |
||
| 91 | 91 | foreach( $items as $addrItem ) { |
| 92 | 92 | $data[] = $entryFcn( $addrItem ); |
| 93 | 93 | } |
| 94 | - } |
|
| 95 | - else |
|
| 94 | + } else |
|
| 96 | 95 | { |
| 97 | 96 | $data = $entryFcn( $items ); |
| 98 | 97 | } |
@@ -156,8 +156,7 @@ |
||
| 156 | 156 | $data[] = $entryFcn( $item, $prices, $feConfig ); |
| 157 | 157 | $included = array_merge( $included, $refFcn( $item ) ); |
| 158 | 158 | } |
| 159 | - } |
|
| 160 | - else |
|
| 159 | + } else |
|
| 161 | 160 | { |
| 162 | 161 | $data = $entryFcn( $this->items, $prices, $feConfig ); |
| 163 | 162 | $included = $refFcn( $this->items ); |
@@ -101,8 +101,7 @@ |
||
| 101 | 101 | foreach( $items as $item ) { |
| 102 | 102 | $data[] = $entryFcn( $item ); |
| 103 | 103 | } |
| 104 | - } |
|
| 105 | - else |
|
| 104 | + } else |
|
| 106 | 105 | { |
| 107 | 106 | $data = $entryFcn( $items ); |
| 108 | 107 | } |
@@ -244,8 +244,7 @@ |
||
| 244 | 244 | $data[] = $entryFcn( $item ); |
| 245 | 245 | $included = array_merge( $included, $refFcn( $item ) ); |
| 246 | 246 | } |
| 247 | - } |
|
| 248 | - else |
|
| 247 | + } else |
|
| 249 | 248 | { |
| 250 | 249 | $data = $entryFcn( $items ); |
| 251 | 250 | $included = $refFcn( $items ); |
@@ -145,8 +145,7 @@ |
||
| 145 | 145 | $data[] = $entryFcn( $attrItem ); |
| 146 | 146 | $included = array_merge( $included, $refFcn( $attrItem ) ); |
| 147 | 147 | } |
| 148 | - } |
|
| 149 | - else |
|
| 148 | + } else |
|
| 150 | 149 | { |
| 151 | 150 | $data = $entryFcn( $items ); |
| 152 | 151 | $included = $refFcn( $items ); |
@@ -262,10 +262,13 @@ |
||
| 262 | 262 | "href": "<?= $this->url( $target, $cntl, $action, ['resource' => 'basket', 'id' => $basketId, 'related' => 'coupon'], [], $config ); ?>", |
| 263 | 263 | "allow": ["POST"] |
| 264 | 264 | } |
| 265 | - <?php else : ?> |
|
| 265 | + <?php else { |
|
| 266 | + : ?> |
|
| 266 | 267 | , |
| 267 | 268 | "order": { |
| 268 | - "href": "<?= $this->url( $target, $cntl, $action, ['resource' => 'order'], [], $config ); ?>", |
|
| 269 | + "href": "<?= $this->url( $target, $cntl, $action, ['resource' => 'order'], [], $config ); |
|
| 270 | +} |
|
| 271 | +?>", |
|
| 269 | 272 | "allow": ["POST"] |
| 270 | 273 | } |
| 271 | 274 | <?php endif; ?> |
@@ -28,9 +28,12 @@ |
||
| 28 | 28 | |
| 29 | 29 | "errors": <?= json_encode( $this->errors, JSON_PRETTY_PRINT ); ?> |
| 30 | 30 | |
| 31 | - <?php else : ?> |
|
| 31 | + <?php else { |
|
| 32 | + : ?> |
|
| 32 | 33 | |
| 33 | - "data": <?= json_encode( $entries ); ?> |
|
| 34 | + "data": <?= json_encode( $entries ); |
|
| 35 | +} |
|
| 36 | +?> |
|
| 34 | 37 | |
| 35 | 38 | <?php endif; ?> |
| 36 | 39 | } |
@@ -39,13 +39,11 @@ |
||
| 39 | 39 | { |
| 40 | 40 | $response = $this->getItem( $view, $request, $response ); |
| 41 | 41 | $status = 200; |
| 42 | - } |
|
| 43 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 42 | + } catch( \Aimeos\MShop\Exception $e ) |
|
| 44 | 43 | { |
| 45 | 44 | $status = 404; |
| 46 | 45 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
| 47 | - } |
|
| 48 | - catch( \Exception $e ) |
|
| 46 | + } catch( \Exception $e ) |
|
| 49 | 47 | { |
| 50 | 48 | $status = 500; |
| 51 | 49 | $view->errors = $this->getErrorDetails( $e ); |