@@ -29,8 +29,7 @@ discard block |
||
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | |
| 32 | -$entryFcn = function( \Aimeos\MShop\Locale\Item\Site\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) |
|
| 33 | -{ |
|
| 32 | +$entryFcn = function( \Aimeos\MShop\Locale\Item\Site\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) { |
|
| 34 | 33 | if( $item->isAvailable() === false ) { |
| 35 | 34 | return []; |
| 36 | 35 | } |
@@ -67,8 +66,7 @@ discard block |
||
| 67 | 66 | }; |
| 68 | 67 | |
| 69 | 68 | |
| 70 | -$siteFcn = function( \Aimeos\MShop\Locale\Item\Site\Iface $item, array $entry ) use ( $target, $cntl, $action, $config ) |
|
| 71 | -{ |
|
| 69 | +$siteFcn = function( \Aimeos\MShop\Locale\Item\Site\Iface $item, array $entry ) use ( $target, $cntl, $action, $config ) { |
|
| 72 | 70 | $params = ['resource' => 'site', 'id' => $item->getId()]; |
| 73 | 71 | $entry['links'] = [ |
| 74 | 72 | 'self' => [ |
@@ -112,8 +110,7 @@ discard block |
||
| 112 | 110 | foreach( $items as $item ) { |
| 113 | 111 | $data[] = $entryFcn( $item ); |
| 114 | 112 | } |
| 115 | - } |
|
| 116 | - else |
|
| 113 | + } else |
|
| 117 | 114 | { |
| 118 | 115 | $data = $entryFcn( $items ); |
| 119 | 116 | } |
@@ -27,8 +27,7 @@ discard block |
||
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | |
| 30 | -$entryFcn = function( \Aimeos\MShop\Customer\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) |
|
| 31 | -{ |
|
| 30 | +$entryFcn = function( \Aimeos\MShop\Customer\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) { |
|
| 32 | 31 | $id = $item->getId(); |
| 33 | 32 | $type = $item->getResourceType(); |
| 34 | 33 | $params = array( 'resource' => $type, 'id' => $id ); |
@@ -91,8 +90,7 @@ discard block |
||
| 91 | 90 | }; |
| 92 | 91 | |
| 93 | 92 | |
| 94 | -$custAddrFcn = function( \Aimeos\MShop\Customer\Item\Address\Iface $item, array $entry ) use ( $target, $cntl, $action, $config ) |
|
| 95 | -{ |
|
| 93 | +$custAddrFcn = function( \Aimeos\MShop\Customer\Item\Address\Iface $item, array $entry ) use ( $target, $cntl, $action, $config ) { |
|
| 96 | 94 | $params = ['resource' => 'customer', 'id' => $item->getParentId(), 'related' => 'address', 'relatedid' => $item->getId()]; |
| 97 | 95 | $basketParams = ['resource' => 'basket', 'id' => 'default', 'related' => 'address', 'relatedid' => 'payment']; |
| 98 | 96 | |
@@ -111,8 +109,7 @@ discard block |
||
| 111 | 109 | }; |
| 112 | 110 | |
| 113 | 111 | |
| 114 | -$custPropFcn = function( \Aimeos\MShop\Common\Item\Property\Iface $item, array $entry ) use ( $target, $cntl, $action, $config ) |
|
| 115 | -{ |
|
| 112 | +$custPropFcn = function( \Aimeos\MShop\Common\Item\Property\Iface $item, array $entry ) use ( $target, $cntl, $action, $config ) { |
|
| 116 | 113 | $params = ['resource' => 'customer', 'id' => $item->getParentId(), 'related' => 'property', 'relatedid' => $item->getId()]; |
| 117 | 114 | |
| 118 | 115 | $entry['links'] = [ |
@@ -28,8 +28,7 @@ discard block |
||
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | |
| 31 | -$entryFcn = function( \Aimeos\MShop\Order\Item\Base\Iface $item, $basketId ) use ( $fields, $target, $cntl, $action, $config ) |
|
| 32 | -{ |
|
| 31 | +$entryFcn = function( \Aimeos\MShop\Order\Item\Base\Iface $item, $basketId ) use ( $fields, $target, $cntl, $action, $config ) { |
|
| 33 | 32 | $allow = array( 'GET' ); |
| 34 | 33 | $attributes = $item->toArray(); |
| 35 | 34 | $params = ['resource' => 'basket', 'id' => $basketId]; |
@@ -101,8 +100,7 @@ discard block |
||
| 101 | 100 | }; |
| 102 | 101 | |
| 103 | 102 | |
| 104 | -$productFcn = function( \Aimeos\MShop\Order\Item\Base\Iface $item, $basketId ) use ( $fields, $target, $cntl, $action, $config ) |
|
| 105 | -{ |
|
| 103 | +$productFcn = function( \Aimeos\MShop\Order\Item\Base\Iface $item, $basketId ) use ( $fields, $target, $cntl, $action, $config ) { |
|
| 106 | 104 | $result = []; |
| 107 | 105 | |
| 108 | 106 | foreach( $item->getProducts() as $position => $orderProduct ) |
@@ -153,8 +151,7 @@ discard block |
||
| 153 | 151 | }; |
| 154 | 152 | |
| 155 | 153 | |
| 156 | -$serviceFcn = function( \Aimeos\MShop\Order\Item\Base\Iface $item, $basketId ) use ( $fields, $target, $cntl, $action, $config ) |
|
| 157 | -{ |
|
| 154 | +$serviceFcn = function( \Aimeos\MShop\Order\Item\Base\Iface $item, $basketId ) use ( $fields, $target, $cntl, $action, $config ) { |
|
| 158 | 155 | $result = []; |
| 159 | 156 | |
| 160 | 157 | foreach( $item->getServices() as $type => $list ) |
@@ -197,8 +194,7 @@ discard block |
||
| 197 | 194 | }; |
| 198 | 195 | |
| 199 | 196 | |
| 200 | -$addressFcn = function( \Aimeos\MShop\Order\Item\Base\Iface $item, $basketId ) use ( $fields, $target, $cntl, $action, $config ) |
|
| 201 | -{ |
|
| 197 | +$addressFcn = function( \Aimeos\MShop\Order\Item\Base\Iface $item, $basketId ) use ( $fields, $target, $cntl, $action, $config ) { |
|
| 202 | 198 | $list = []; |
| 203 | 199 | |
| 204 | 200 | foreach( $item->getAddresses() as $type => $addresses ) |
@@ -231,8 +227,7 @@ discard block |
||
| 231 | 227 | }; |
| 232 | 228 | |
| 233 | 229 | |
| 234 | -$couponFcn = function( \Aimeos\MShop\Order\Item\Base\Iface $item, $basketId ) use ( $fields, $target, $cntl, $action, $config ) |
|
| 235 | -{ |
|
| 230 | +$couponFcn = function( \Aimeos\MShop\Order\Item\Base\Iface $item, $basketId ) use ( $fields, $target, $cntl, $action, $config ) { |
|
| 236 | 231 | $coupons = []; |
| 237 | 232 | |
| 238 | 233 | foreach( $item->getCoupons() as $code => $list ) |
@@ -257,8 +252,7 @@ discard block |
||
| 257 | 252 | }; |
| 258 | 253 | |
| 259 | 254 | |
| 260 | -$customerFcn = function( \Aimeos\MShop\Order\Item\Base\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) |
|
| 261 | -{ |
|
| 255 | +$customerFcn = function( \Aimeos\MShop\Order\Item\Base\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) { |
|
| 262 | 256 | $result = []; |
| 263 | 257 | $customer = $this->item->getCustomerItem(); |
| 264 | 258 | |
@@ -326,10 +320,13 @@ discard block |
||
| 326 | 320 | "href": "<?= $this->url( $target, $cntl, $action, ['resource' => 'basket', 'id' => $basketId, 'related' => 'coupon'], [], $config ); ?>", |
| 327 | 321 | "allow": ["DELETE", "POST"] |
| 328 | 322 | } |
| 329 | - <?php else : ?> |
|
| 323 | + <?php else { |
|
| 324 | + : ?> |
|
| 330 | 325 | , |
| 331 | 326 | "order": { |
| 332 | - "href": "<?= $this->url( $target, $cntl, $action, ['resource' => 'order'], [], $config ); ?>", |
|
| 327 | + "href": "<?= $this->url( $target, $cntl, $action, ['resource' => 'order'], [], $config ); |
|
| 328 | +} |
|
| 329 | +?>", |
|
| 333 | 330 | "allow": ["POST"] |
| 334 | 331 | } |
| 335 | 332 | <?php endif; ?> |
@@ -158,9 +158,11 @@ |
||
| 158 | 158 | $params = $view->param( 'filter', [] ); |
| 159 | 159 | $prodIds = (array) $view->param( 'filter/s_prodid', [] ); |
| 160 | 160 | |
| 161 | - if( isset( $params['s_prodcode'] ) ) // backwards compatibility |
|
| 161 | + if( isset( $params['s_prodcode'] ) ) { |
|
| 162 | + // backwards compatibility |
|
| 162 | 163 | { |
| 163 | 164 | $manager = \Aimeos\MShop::create( $this->context(), 'product' ); |
| 165 | + } |
|
| 164 | 166 | $filter = $manager->filter() |
| 165 | 167 | ->slice( 0, count( (array) $params['s_prodcode'] ) ) |
| 166 | 168 | ->add( ['product.code' => $view->param( 'filter/s_prodcode' )] ); |
@@ -103,8 +103,7 @@ discard block |
||
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | |
| 106 | -$entryFcn = function( \Aimeos\MShop\Product\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) |
|
| 107 | -{ |
|
| 106 | +$entryFcn = function( \Aimeos\MShop\Product\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) { |
|
| 108 | 107 | $id = $item->getId(); |
| 109 | 108 | $attributes = $item->toArray(); |
| 110 | 109 | $type = $item->getResourceType(); |
@@ -166,8 +165,7 @@ discard block |
||
| 166 | 165 | }; |
| 167 | 166 | |
| 168 | 167 | |
| 169 | -$includeFcn = function( \Aimeos\MShop\Product\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) |
|
| 170 | -{ |
|
| 168 | +$includeFcn = function( \Aimeos\MShop\Product\Item\Iface $item ) use ( $fields, $target, $cntl, $action, $config ) { |
|
| 171 | 169 | $result = []; |
| 172 | 170 | |
| 173 | 171 | foreach( $item->getStockItems() as $id => $stockItem ) |
@@ -242,8 +240,7 @@ discard block |
||
| 242 | 240 | $data[] = $entryFcn( $item ); |
| 243 | 241 | $included = array_replace_recursive( $included, $includeFcn( $item ) ); |
| 244 | 242 | } |
| 245 | - } |
|
| 246 | - else |
|
| 243 | + } else |
|
| 247 | 244 | { |
| 248 | 245 | $data = $entryFcn( $items ); |
| 249 | 246 | $included = array_replace_recursive( $included, $includeFcn( $items ) ); |