@@ -21,8 +21,7 @@ discard block |
||
21 | 21 | } |
22 | 22 | |
23 | 23 | |
24 | -$build = function( \Aimeos\MShop\Locale\Item\Site\Iface $item ) use ( $fields ) |
|
25 | -{ |
|
24 | +$build = function( \Aimeos\MShop\Locale\Item\Site\Iface $item ) use ( $fields ) { |
|
26 | 25 | $id = $item->getId(); |
27 | 26 | $type = $item->getResourceType(); |
28 | 27 | $params = array( 'resource' => $type, 'id' => $id ); |
@@ -66,12 +65,10 @@ discard block |
||
66 | 65 | foreach( $data as $item ) { |
67 | 66 | $response[] = $build( $item ); |
68 | 67 | } |
69 | -} |
|
70 | -elseif( $data !== null ) |
|
68 | +} elseif( $data !== null ) |
|
71 | 69 | { |
72 | 70 | $response = $build( $data ); |
73 | -} |
|
74 | -else |
|
71 | +} else |
|
75 | 72 | { |
76 | 73 | $response = null; |
77 | 74 | } |
@@ -21,8 +21,7 @@ discard block |
||
21 | 21 | } |
22 | 22 | |
23 | 23 | |
24 | -$build = function( array $attrItems, $id ) use ( $fields ) |
|
25 | -{ |
|
24 | +$build = function( array $attrItems, $id ) use ( $fields ) { |
|
26 | 25 | $result = []; |
27 | 26 | $type = 'criteria/attribute'; |
28 | 27 | |
@@ -58,8 +57,11 @@ discard block |
||
58 | 57 | <?php if( isset( $this->errors ) ) : ?> |
59 | 58 | , "errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard' ), array( 'errors' => $this->errors ) ); ?> |
60 | 59 | |
61 | - <?php else : ?> |
|
62 | - , "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options ); ?> |
|
60 | + <?php else { |
|
61 | + : ?> |
|
62 | + , "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options ); |
|
63 | +} |
|
64 | +?> |
|
63 | 65 | |
64 | 66 | <?php endif; ?> |
65 | 67 | } |
@@ -21,8 +21,7 @@ discard block |
||
21 | 21 | } |
22 | 22 | |
23 | 23 | |
24 | -$build = function( \Aimeos\MShop\Common\Item\Iface $item, \Aimeos\Map $childItems, \Aimeos\Map $listItems ) use ( $fields ) |
|
25 | -{ |
|
24 | +$build = function( \Aimeos\MShop\Common\Item\Iface $item, \Aimeos\Map $childItems, \Aimeos\Map $listItems ) use ( $fields ) { |
|
26 | 25 | $id = strtoupper( $item->getId() ); |
27 | 26 | $type = $item->getResourceType(); |
28 | 27 | $params = array( 'resource' => $type, 'id' => $id ); |
@@ -89,12 +88,10 @@ discard block |
||
89 | 88 | foreach( $data as $item ) { |
90 | 89 | $response[] = $build( $item, $childItems, $listItems ); |
91 | 90 | } |
92 | -} |
|
93 | -elseif( $data !== null ) |
|
91 | +} elseif( $data !== null ) |
|
94 | 92 | { |
95 | 93 | $response = $build( $data, $childItems, $listItems ); |
96 | -} |
|
97 | -else |
|
94 | +} else |
|
98 | 95 | { |
99 | 96 | $response = null; |
100 | 97 | } |
@@ -21,8 +21,7 @@ discard block |
||
21 | 21 | } |
22 | 22 | |
23 | 23 | |
24 | -$build = function( \Aimeos\MShop\Catalog\Item\Iface $item, \Aimeos\Map $listItems ) use ( $fields ) |
|
25 | -{ |
|
24 | +$build = function( \Aimeos\MShop\Catalog\Item\Iface $item, \Aimeos\Map $listItems ) use ( $fields ) { |
|
26 | 25 | $id = $item->getId(); |
27 | 26 | $type = $item->getResourceType(); |
28 | 27 | $params = array( 'resource' => $type, 'id' => $id ); |
@@ -85,12 +84,10 @@ discard block |
||
85 | 84 | foreach( $data as $item ) { |
86 | 85 | $response[] = $build( $item, $listItems ); |
87 | 86 | } |
88 | -} |
|
89 | -elseif( $data !== null ) |
|
87 | +} elseif( $data !== null ) |
|
90 | 88 | { |
91 | 89 | $response = $build( $data, $listItems ); |
92 | -} |
|
93 | -else |
|
90 | +} else |
|
94 | 91 | { |
95 | 92 | $response = null; |
96 | 93 | } |
@@ -21,8 +21,7 @@ |
||
21 | 21 | } |
22 | 22 | |
23 | 23 | |
24 | -$build = function( \Aimeos\Map $items ) use ( $fields ) |
|
25 | -{ |
|
24 | +$build = function( \Aimeos\Map $items ) use ( $fields ) { |
|
26 | 25 | $list = []; |
27 | 26 | |
28 | 27 | $target = $this->config( 'admin/jsonadm/url/target' ); |
@@ -21,8 +21,7 @@ discard block |
||
21 | 21 | } |
22 | 22 | |
23 | 23 | |
24 | -$build = function( \Aimeos\MShop\Order\Item\Iface $item, \Aimeos\Map $childItems ) use ( $fields ) |
|
25 | -{ |
|
24 | +$build = function( \Aimeos\MShop\Order\Item\Iface $item, \Aimeos\Map $childItems ) use ( $fields ) { |
|
26 | 25 | $id = $item->getId(); |
27 | 26 | $baseId = $item->getBaseId(); |
28 | 27 | $type = $item->getResourceType(); |
@@ -79,12 +78,10 @@ discard block |
||
79 | 78 | foreach( $data as $item ) { |
80 | 79 | $response[] = $build( $item, $childItems ); |
81 | 80 | } |
82 | -} |
|
83 | -elseif( $data !== null ) |
|
81 | +} elseif( $data !== null ) |
|
84 | 82 | { |
85 | 83 | $response = $build( $data, $childItems ); |
86 | -} |
|
87 | -else |
|
84 | +} else |
|
88 | 85 | { |
89 | 86 | $response = null; |
90 | 87 | } |
@@ -21,8 +21,7 @@ discard block |
||
21 | 21 | } |
22 | 22 | |
23 | 23 | |
24 | -$build = function( \Aimeos\MShop\Order\Item\Base\Iface $item, \Aimeos\Map $childItems ) use ( $fields ) |
|
25 | -{ |
|
24 | +$build = function( \Aimeos\MShop\Order\Item\Base\Iface $item, \Aimeos\Map $childItems ) use ( $fields ) { |
|
26 | 25 | $id = $item->getId(); |
27 | 26 | $type = $item->getResourceType(); |
28 | 27 | $params = array( 'resource' => $type, 'id' => $id ); |
@@ -76,12 +75,10 @@ discard block |
||
76 | 75 | foreach( $data as $item ) { |
77 | 76 | $response[] = $build( $item, $childItems ); |
78 | 77 | } |
79 | -} |
|
80 | -elseif( $data !== null ) |
|
78 | +} elseif( $data !== null ) |
|
81 | 79 | { |
82 | 80 | $response = $build( $data, $childItems ); |
83 | -} |
|
84 | -else |
|
81 | +} else |
|
85 | 82 | { |
86 | 83 | $response = null; |
87 | 84 | } |
@@ -129,8 +129,7 @@ discard block |
||
129 | 129 | $view->total = count( $payload->data ); |
130 | 130 | $view->data = $payload->data; |
131 | 131 | $id = $payload->data; |
132 | - } |
|
133 | - else |
|
132 | + } else |
|
134 | 133 | { |
135 | 134 | $view->total = 1; |
136 | 135 | $view->data = $id; |
@@ -223,8 +222,7 @@ discard block |
||
223 | 222 | { |
224 | 223 | $response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' ); |
225 | 224 | $ids = $payload->data; |
226 | - } |
|
227 | - else |
|
225 | + } else |
|
228 | 226 | { |
229 | 227 | $ids = [$payload->data]; |
230 | 228 | } |
@@ -163,8 +163,7 @@ discard block |
||
163 | 163 | */ |
164 | 164 | $tplconf = 'admin/jsonadm/template-aggregate'; |
165 | 165 | $default = 'aggregate-standard'; |
166 | - } |
|
167 | - else |
|
166 | + } else |
|
168 | 167 | { |
169 | 168 | /** admin/jsonadm/template-get |
170 | 169 | * Relative path to the JSON API template for GET requests |
@@ -519,8 +518,7 @@ discard block |
||
519 | 518 | $ids = map( $payload->data )->col( 'id' ); |
520 | 519 | $manager->delete( $ids->toArray() ); |
521 | 520 | $view->total = count( $ids ); |
522 | - } |
|
523 | - else |
|
521 | + } else |
|
524 | 522 | { |
525 | 523 | $manager->delete( $id ); |
526 | 524 | $view->total = 1; |
@@ -558,8 +556,7 @@ discard block |
||
558 | 556 | $view->data = $manager->search( $search, $include, $total ); |
559 | 557 | $view->childItems = $this->getChildItems( $view->data, $include ); |
560 | 558 | $view->listItems = $this->getListItems( $view->data, $include ); |
561 | - } |
|
562 | - else |
|
559 | + } else |
|
563 | 560 | { |
564 | 561 | $view->data = $manager->get( $id, $include ); |
565 | 562 | $view->childItems = $this->getChildItems( map( [$id => $view->data] ), $include ); |
@@ -599,16 +596,14 @@ discard block |
||
599 | 596 | $view->data = $data; |
600 | 597 | $view->total = count( $data ); |
601 | 598 | $response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' ); |
602 | - } |
|
603 | - elseif( ( $id = $view->param( 'id' ) ) != null ) |
|
599 | + } elseif( ( $id = $view->param( 'id' ) ) != null ) |
|
604 | 600 | { |
605 | 601 | $payload->data->id = $id; |
606 | 602 | $data = $this->saveEntry( $manager, $payload->data ); |
607 | 603 | |
608 | 604 | $view->data = $data; |
609 | 605 | $view->total = 1; |
610 | - } |
|
611 | - else |
|
606 | + } else |
|
612 | 607 | { |
613 | 608 | throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 ); |
614 | 609 | } |
@@ -647,8 +642,7 @@ discard block |
||
647 | 642 | $view->data = $data; |
648 | 643 | $view->total = count( $data ); |
649 | 644 | $response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' ); |
650 | - } |
|
651 | - else |
|
645 | + } else |
|
652 | 646 | { |
653 | 647 | $payload->data->id = null; |
654 | 648 | $data = $this->saveEntry( $manager, $payload->data ); |