@@ -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 ); |
@@ -23,7 +23,7 @@ |
||
23 | 23 | $first = ( $offset > 0 ? 0 : null ); |
24 | 24 | $prev = ( $offset - $limit >= 0 ? $offset - $limit : null ); |
25 | 25 | $next = ( $offset + $limit < $total ? $offset + $limit : null ); |
26 | -$last = ( ((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null ); |
|
26 | +$last = ( ( (int) ( $total / $limit ) ) * $limit > $offset ? ( (int) ( $total / $limit ) ) * $limit : null ); |
|
27 | 27 | |
28 | 28 | |
29 | 29 | $ref = array( 'resource', 'id', 'related', 'relatedid', 'filter', 'page', 'sort', 'include', 'fields' ); |
@@ -287,7 +287,7 @@ |
||
287 | 287 | { |
288 | 288 | $total = 0; |
289 | 289 | $map = []; |
290 | - $direction = '+'; |
|
290 | + $direction = '+'; |
|
291 | 291 | |
292 | 292 | $ref = $view->param( 'include', [] ); |
293 | 293 | $size = $view->param( 'page/limit', 48 ); |
@@ -46,13 +46,11 @@ discard block |
||
46 | 46 | } |
47 | 47 | |
48 | 48 | $status = 200; |
49 | - } |
|
50 | - catch( \Aimeos\MShop\Exception $e ) |
|
49 | + } catch( \Aimeos\MShop\Exception $e ) |
|
51 | 50 | { |
52 | 51 | $status = 404; |
53 | 52 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
54 | - } |
|
55 | - catch( \Exception $e ) |
|
53 | + } catch( \Exception $e ) |
|
56 | 54 | { |
57 | 55 | $status = 500; |
58 | 56 | $view->errors = $this->getErrorDetails( $e ); |
@@ -81,8 +79,7 @@ discard block |
||
81 | 79 | */ |
82 | 80 | $tplconf = 'client/jsonapi/product/standard/template-aggregate'; |
83 | 81 | $default = 'aggregate-standard.php'; |
84 | - } |
|
85 | - else |
|
82 | + } else |
|
86 | 83 | { |
87 | 84 | /** client/jsonapi/product/standard/template |
88 | 85 | * Relative path to the product JSON API template |
@@ -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 ); |
@@ -44,13 +44,11 @@ |
||
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 = $this->getErrorDetails( $e, 'mshop' ); |
52 | - } |
|
53 | - catch( \Exception $e ) |
|
51 | + } catch( \Exception $e ) |
|
54 | 52 | { |
55 | 53 | $status = 500; |
56 | 54 | $view->errors = $this->getErrorDetails( $e ); |
@@ -43,8 +43,7 @@ discard block |
||
43 | 43 | { |
44 | 44 | $view->items = $cntl->getItem( $id ); |
45 | 45 | $view->total = 1; |
46 | - } |
|
47 | - else |
|
46 | + } else |
|
48 | 47 | { |
49 | 48 | $total = 0; |
50 | 49 | $filter = $cntl->createFilter(); |
@@ -55,18 +54,15 @@ discard block |
||
55 | 54 | } |
56 | 55 | |
57 | 56 | $status = 200; |
58 | - } |
|
59 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
57 | + } catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
60 | 58 | { |
61 | 59 | $status = 403; |
62 | 60 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
63 | - } |
|
64 | - catch( \Aimeos\MShop\Exception $e ) |
|
61 | + } catch( \Aimeos\MShop\Exception $e ) |
|
65 | 62 | { |
66 | 63 | $status = 404; |
67 | 64 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
68 | - } |
|
69 | - catch( \Exception $e ) |
|
65 | + } catch( \Exception $e ) |
|
70 | 66 | { |
71 | 67 | $status = 500; |
72 | 68 | $view->errors = $this->getErrorDetails( $e ); |
@@ -107,23 +103,19 @@ discard block |
||
107 | 103 | $view->total = 1; |
108 | 104 | |
109 | 105 | $status = 201; |
110 | - } |
|
111 | - catch( \Aimeos\Client\JsonApi\Exception $e ) |
|
106 | + } catch( \Aimeos\Client\JsonApi\Exception $e ) |
|
112 | 107 | { |
113 | 108 | $status = $e->getCode(); |
114 | 109 | $view->errors = $this->getErrorDetails( $e, 'client/jsonapi' ); |
115 | - } |
|
116 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
110 | + } catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
117 | 111 | { |
118 | 112 | $status = 403; |
119 | 113 | $view->errors = $this->getErrorDetails( $e, 'controller/frontend' ); |
120 | - } |
|
121 | - catch( \Aimeos\MShop\Exception $e ) |
|
114 | + } catch( \Aimeos\MShop\Exception $e ) |
|
122 | 115 | { |
123 | 116 | $status = 404; |
124 | 117 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
125 | - } |
|
126 | - catch( \Exception $e ) |
|
118 | + } catch( \Exception $e ) |
|
127 | 119 | { |
128 | 120 | $status = 500; |
129 | 121 | $view->errors = $this->getErrorDetails( $e ); |
@@ -58,8 +58,7 @@ discard block |
||
58 | 58 | $view->items = $provider->getServiceItem(); |
59 | 59 | $view->total = 1; |
60 | 60 | } |
61 | - } |
|
62 | - else |
|
61 | + } else |
|
63 | 62 | { |
64 | 63 | $attributes = $prices = $items = []; |
65 | 64 | $type = $view->param( 'filter/cs_type' ); |
@@ -81,13 +80,11 @@ discard block |
||
81 | 80 | } |
82 | 81 | |
83 | 82 | $status = 200; |
84 | - } |
|
85 | - catch( \Aimeos\MShop\Exception $e ) |
|
83 | + } catch( \Aimeos\MShop\Exception $e ) |
|
86 | 84 | { |
87 | 85 | $status = 404; |
88 | 86 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
89 | - } |
|
90 | - catch( \Exception $e ) |
|
87 | + } catch( \Exception $e ) |
|
91 | 88 | { |
92 | 89 | $status = 500; |
93 | 90 | $view->errors = $this->getErrorDetails( $e ); |
@@ -78,8 +78,7 @@ discard block |
||
78 | 78 | |
79 | 79 | $this->controller->setAddress( $entry->id, null ); |
80 | 80 | } |
81 | - } |
|
82 | - else |
|
81 | + } else |
|
83 | 82 | { |
84 | 83 | $this->controller->setAddress( $relId, null ); |
85 | 84 | } |
@@ -87,13 +86,11 @@ discard block |
||
87 | 86 | |
88 | 87 | $view->item = $this->controller->get(); |
89 | 88 | $status = 200; |
90 | - } |
|
91 | - catch( \Aimeos\MShop\Exception $e ) |
|
89 | + } catch( \Aimeos\MShop\Exception $e ) |
|
92 | 90 | { |
93 | 91 | $status = 404; |
94 | 92 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
95 | - } |
|
96 | - catch( \Exception $e ) |
|
93 | + } catch( \Exception $e ) |
|
97 | 94 | { |
98 | 95 | $status = 500; |
99 | 96 | $view->errors = $this->getErrorDetails( $e ); |
@@ -139,13 +136,11 @@ discard block |
||
139 | 136 | |
140 | 137 | $view->item = $this->controller->get(); |
141 | 138 | $status = 201; |
142 | - } |
|
143 | - catch( \Aimeos\MShop\Exception $e ) |
|
139 | + } catch( \Aimeos\MShop\Exception $e ) |
|
144 | 140 | { |
145 | 141 | $status = 404; |
146 | 142 | $view->errors = $this->getErrorDetails( $e, 'mshop' ); |
147 | - } |
|
148 | - catch( \Exception $e ) |
|
143 | + } catch( \Exception $e ) |
|
149 | 144 | { |
150 | 145 | $status = 500; |
151 | 146 | $view->errors = $this->getErrorDetails( $e ); |