@@ -36,13 +36,13 @@ discard block |
||
| 36 | 36 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 37 | 37 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 38 | 38 | */ |
| 39 | - public function deleteAction( ServerRequestInterface $request ) |
|
| 39 | + public function deleteAction(ServerRequestInterface $request) |
|
| 40 | 40 | { |
| 41 | - if( config( 'shop.authorize', true ) ) { |
|
| 42 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
|
| 41 | + if (config('shop.authorize', true)) { |
|
| 42 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - return $this->createClient()->delete( $request, new Response() ); |
|
| 45 | + return $this->createClient()->delete($request, new Response()); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | |
@@ -52,13 +52,13 @@ discard block |
||
| 52 | 52 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 53 | 53 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 54 | 54 | */ |
| 55 | - public function getAction( ServerRequestInterface $request ) |
|
| 55 | + public function getAction(ServerRequestInterface $request) |
|
| 56 | 56 | { |
| 57 | - if( config( 'shop.authorize', true ) ) { |
|
| 58 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] ); |
|
| 57 | + if (config('shop.authorize', true)) { |
|
| 58 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - return $this->createClient()->get( $request, new Response() ); |
|
| 61 | + return $this->createClient()->get($request, new Response()); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | |
@@ -68,13 +68,13 @@ discard block |
||
| 68 | 68 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 69 | 69 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 70 | 70 | */ |
| 71 | - public function patchAction( ServerRequestInterface $request ) |
|
| 71 | + public function patchAction(ServerRequestInterface $request) |
|
| 72 | 72 | { |
| 73 | - if( config( 'shop.authorize', true ) ) { |
|
| 74 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
|
| 73 | + if (config('shop.authorize', true)) { |
|
| 74 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - return $this->createClient()->patch( $request, new Response() ); |
|
| 77 | + return $this->createClient()->patch($request, new Response()); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | |
@@ -84,13 +84,13 @@ discard block |
||
| 84 | 84 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 85 | 85 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 86 | 86 | */ |
| 87 | - public function postAction( ServerRequestInterface $request ) |
|
| 87 | + public function postAction(ServerRequestInterface $request) |
|
| 88 | 88 | { |
| 89 | - if( config( 'shop.authorize', true ) ) { |
|
| 90 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
|
| 89 | + if (config('shop.authorize', true)) { |
|
| 90 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - return $this->createClient()->post( $request, new Response() ); |
|
| 93 | + return $this->createClient()->post($request, new Response()); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | |
@@ -100,13 +100,13 @@ discard block |
||
| 100 | 100 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 101 | 101 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 102 | 102 | */ |
| 103 | - public function putAction( ServerRequestInterface $request ) |
|
| 103 | + public function putAction(ServerRequestInterface $request) |
|
| 104 | 104 | { |
| 105 | - if( config( 'shop.authorize', true ) ) { |
|
| 106 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
|
| 105 | + if (config('shop.authorize', true)) { |
|
| 106 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - return $this->createClient()->put( $request, new Response() ); |
|
| 109 | + return $this->createClient()->put($request, new Response()); |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | |
@@ -116,13 +116,13 @@ discard block |
||
| 116 | 116 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
| 117 | 117 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
| 118 | 118 | */ |
| 119 | - public function optionsAction( ServerRequestInterface $request ) |
|
| 119 | + public function optionsAction(ServerRequestInterface $request) |
|
| 120 | 120 | { |
| 121 | - if( config( 'shop.authorize', true ) ) { |
|
| 122 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] ); |
|
| 121 | + if (config('shop.authorize', true)) { |
|
| 122 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - return $this->createClient()->options( $request, new Response() ); |
|
| 125 | + return $this->createClient()->options($request, new Response()); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | |
@@ -133,18 +133,18 @@ discard block |
||
| 133 | 133 | */ |
| 134 | 134 | protected function createClient() |
| 135 | 135 | { |
| 136 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
| 137 | - $lang = Input::get( 'locale', config( 'app.locale', 'en' ) ); |
|
| 138 | - $resource = Route::input( 'resource' ); |
|
| 136 | + $site = Route::input('site', Input::get('site', 'default')); |
|
| 137 | + $lang = Input::get('locale', config('app.locale', 'en')); |
|
| 138 | + $resource = Route::input('resource'); |
|
| 139 | 139 | |
| 140 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 141 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' ); |
|
| 140 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 141 | + $templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates'); |
|
| 142 | 142 | |
| 143 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); |
|
| 144 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) ); |
|
| 145 | - $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); |
|
| 146 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) ); |
|
| 143 | + $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
| 144 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en'))); |
|
| 145 | + $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); |
|
| 146 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang)); |
|
| 147 | 147 | |
| 148 | - return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $aimeos, $resource ); |
|
| 148 | + return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, $resource); |
|
| 149 | 149 | } |
| 150 | 150 | } |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | * |
| 39 | 39 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
| 40 | 40 | */ |
| 41 | - public function __construct( \Illuminate\Contracts\Config\Repository $config ) |
|
| 41 | + public function __construct(\Illuminate\Contracts\Config\Repository $config) |
|
| 42 | 42 | { |
| 43 | 43 | $this->config = $config; |
| 44 | 44 | } |
@@ -50,25 +50,25 @@ discard block |
||
| 50 | 50 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 51 | 51 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
| 52 | 52 | */ |
| 53 | - public function get( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 53 | + public function get(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 54 | 54 | { |
| 55 | - if( $this->locale === null ) |
|
| 55 | + if ($this->locale === null) |
|
| 56 | 56 | { |
| 57 | - $site = Input::get( 'site', 'default' ); |
|
| 58 | - $currency = Input::get( 'currency', '' ); |
|
| 59 | - $lang = Input::get( 'locale', '' ); |
|
| 57 | + $site = Input::get('site', 'default'); |
|
| 58 | + $currency = Input::get('currency', ''); |
|
| 59 | + $lang = Input::get('locale', ''); |
|
| 60 | 60 | |
| 61 | - if( Route::current() ) |
|
| 61 | + if (Route::current()) |
|
| 62 | 62 | { |
| 63 | - $site = Route::input( 'site', $site ); |
|
| 64 | - $currency = Route::input( 'currency', $currency ); |
|
| 65 | - $lang = Route::input( 'locale', $lang ); |
|
| 63 | + $site = Route::input('site', $site); |
|
| 64 | + $currency = Route::input('currency', $currency); |
|
| 65 | + $lang = Route::input('locale', $lang); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - $disableSites = $this->config->get( 'shop.disableSites', true ); |
|
| 68 | + $disableSites = $this->config->get('shop.disableSites', true); |
|
| 69 | 69 | |
| 70 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 71 | - $this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites ); |
|
| 70 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 71 | + $this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | return $this->locale; |
@@ -82,13 +82,13 @@ discard block |
||
| 82 | 82 | * @param string $site Unique site code |
| 83 | 83 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
| 84 | 84 | */ |
| 85 | - public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
| 85 | + public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
| 86 | 86 | { |
| 87 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
| 87 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
| 88 | 88 | |
| 89 | 89 | try { |
| 90 | - $localeItem = $localeManager->bootstrap( $site, '', '', false, null, true ); |
|
| 91 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 90 | + $localeItem = $localeManager->bootstrap($site, '', '', false, null, true); |
|
| 91 | + } catch (\Aimeos\MShop\Exception $e) { |
|
| 92 | 92 | $localeItem = $localeManager->createItem(); |
| 93 | 93 | } |
| 94 | 94 | |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css" /> |
| 10 | 10 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" /> |
| 11 | 11 | <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" /> |
| 12 | - <link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'css' ) ); ?>" /> |
|
| 12 | + <link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'css')); ?>" /> |
|
| 13 | 13 | </head> |
| 14 | 14 | <body> |
| 15 | 15 | <div class="app-menu" style="text-align: right; margin: 0 2.5%;"> |
@@ -33,6 +33,6 @@ discard block |
||
| 33 | 33 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.9.1/adapters/jquery.js"></script> |
| 34 | 34 | <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"></script> |
| 35 | 35 | <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script> |
| 36 | - <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'js' ) ); ?>"></script> |
|
| 36 | + <script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'js')); ?>"></script> |
|
| 37 | 37 | </body> |
| 38 | 38 | </html> |
@@ -10,16 +10,16 @@ discard block |
||
| 10 | 10 | 'uploaddir' => '/', |
| 11 | 11 | |
| 12 | 12 | 'page' => array( |
| 13 | - 'account-index' => array( 'account/profile','account/subscription','account/history','account/favorite','account/watch','basket/mini','catalog/session' ), |
|
| 14 | - 'basket-index' => array( 'basket/standard','basket/related' ), |
|
| 15 | - 'catalog-count' => array( 'catalog/count' ), |
|
| 16 | - 'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ), |
|
| 17 | - 'catalog-list' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ), |
|
| 18 | - 'catalog-stock' => array( 'catalog/stock' ), |
|
| 19 | - 'catalog-suggest' => array( 'catalog/suggest' ), |
|
| 20 | - 'checkout-confirm' => array( 'checkout/confirm' ), |
|
| 21 | - 'checkout-index' => array( 'checkout/standard' ), |
|
| 22 | - 'checkout-update' => array( 'checkout/update'), |
|
| 13 | + 'account-index' => array('account/profile', 'account/subscription', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'), |
|
| 14 | + 'basket-index' => array('basket/standard', 'basket/related'), |
|
| 15 | + 'catalog-count' => array('catalog/count'), |
|
| 16 | + 'catalog-detail' => array('basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'), |
|
| 17 | + 'catalog-list' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'), |
|
| 18 | + 'catalog-stock' => array('catalog/stock'), |
|
| 19 | + 'catalog-suggest' => array('catalog/suggest'), |
|
| 20 | + 'checkout-confirm' => array('checkout/confirm'), |
|
| 21 | + 'checkout-index' => array('checkout/standard'), |
|
| 22 | + 'checkout-update' => array('checkout/update'), |
|
| 23 | 23 | ), |
| 24 | 24 | |
| 25 | 25 | 'resource' => array( |
@@ -37,22 +37,22 @@ discard block |
||
| 37 | 37 | 'fs' => array( |
| 38 | 38 | 'adapter' => 'Standard', |
| 39 | 39 | 'basedir' => public_path(), |
| 40 | - 'tempdir' => storage_path( 'tmp' ), |
|
| 40 | + 'tempdir' => storage_path('tmp'), |
|
| 41 | 41 | ), |
| 42 | 42 | 'fs-admin' => array( |
| 43 | 43 | 'adapter' => 'Standard', |
| 44 | - 'basedir' => storage_path( 'admin' ), |
|
| 45 | - 'tempdir' => storage_path( 'tmp' ), |
|
| 44 | + 'basedir' => storage_path('admin'), |
|
| 45 | + 'tempdir' => storage_path('tmp'), |
|
| 46 | 46 | ), |
| 47 | 47 | 'fs-import' => array( |
| 48 | 48 | 'adapter' => 'Standard', |
| 49 | - 'basedir' => storage_path( 'import' ), |
|
| 50 | - 'tempdir' => storage_path( 'tmp' ), |
|
| 49 | + 'basedir' => storage_path('import'), |
|
| 50 | + 'tempdir' => storage_path('tmp'), |
|
| 51 | 51 | ), |
| 52 | 52 | 'fs-secure' => array( |
| 53 | 53 | 'adapter' => 'Standard', |
| 54 | - 'basedir' => storage_path( 'secure' ), |
|
| 55 | - 'tempdir' => storage_path( 'tmp' ), |
|
| 54 | + 'basedir' => storage_path('secure'), |
|
| 55 | + 'tempdir' => storage_path('tmp'), |
|
| 56 | 56 | ), |
| 57 | 57 | 'mq' => array( |
| 58 | 58 | 'adapter' => 'Standard', |
@@ -169,10 +169,10 @@ discard block |
||
| 169 | 169 | ), |
| 170 | 170 | 'common' => array( |
| 171 | 171 | 'content' => array( |
| 172 | - 'baseurl' => config( 'app.url' ) . '/', |
|
| 172 | + 'baseurl' => config('app.url').'/', |
|
| 173 | 173 | ), |
| 174 | 174 | 'template' => array( |
| 175 | - 'baseurl' => public_path( 'packages/aimeos/shop/themes/elegance' ), |
|
| 175 | + 'baseurl' => public_path('packages/aimeos/shop/themes/elegance'), |
|
| 176 | 176 | ), |
| 177 | 177 | ), |
| 178 | 178 | 'basket' => array( |
@@ -219,8 +219,8 @@ discard block |
||
| 219 | 219 | ), |
| 220 | 220 | ), |
| 221 | 221 | 'email' => [ |
| 222 | - 'from-email' => config( 'mail.from.address' ), |
|
| 223 | - 'from-name' => config( 'mail.from.name' ), |
|
| 222 | + 'from-email' => config('mail.from.address'), |
|
| 223 | + 'from-name' => config('mail.from.name'), |
|
| 224 | 224 | ], |
| 225 | 225 | 'locale' => array( |
| 226 | 226 | 'select' => array( |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | # in the "maxwidth" parameter |
| 298 | 298 | # 'maxheight' => 280, |
| 299 | 299 | ), |
| 300 | - 'tempdir' => storage_path( 'aimeos' ), |
|
| 300 | + 'tempdir' => storage_path('aimeos'), |
|
| 301 | 301 | ), |
| 302 | 302 | ), |
| 303 | 303 | ), |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | * @param \Aimeos\Shop\Base\Context $context Context provider |
| 45 | 45 | * @param \Aimeos\Shop\Base\Locale $locale Locale provider |
| 46 | 46 | */ |
| 47 | - public function __construct( \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale ) |
|
| 47 | + public function __construct(\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale) |
|
| 48 | 48 | { |
| 49 | 49 | $this->context = $context; |
| 50 | 50 | $this->locale = $locale; |
@@ -58,29 +58,29 @@ discard block |
||
| 58 | 58 | * @param string|array $groupcodes Unique user/customer group codes that are allowed |
| 59 | 59 | * @return boolean True if user is part of the group, false if not |
| 60 | 60 | */ |
| 61 | - public function checkUserGroup( \Illuminate\Foundation\Auth\User $user, $groupcodes ) |
|
| 61 | + public function checkUserGroup(\Illuminate\Foundation\Auth\User $user, $groupcodes) |
|
| 62 | 62 | { |
| 63 | - $groups = ( is_array( $groupcodes ) ? implode( ',', $groupcodes ) : $groupcodes ); |
|
| 63 | + $groups = (is_array($groupcodes) ? implode(',', $groupcodes) : $groupcodes); |
|
| 64 | 64 | |
| 65 | - if( isset( $this->cache[$user->id][$groups] ) ) { |
|
| 65 | + if (isset($this->cache[$user->id][$groups])) { |
|
| 66 | 66 | return $this->cache[$user->id][$groups]; |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | $this->cache[$user->id][$groups] = false; |
| 70 | - $context = $this->context->get( false ); |
|
| 70 | + $context = $this->context->get(false); |
|
| 71 | 71 | |
| 72 | 72 | try { |
| 73 | - $site = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' )->getItem( $user->siteid )->getCode(); |
|
| 74 | - } catch( \Exception $e ) { |
|
| 75 | - $site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' ); |
|
| 73 | + $site = \Aimeos\MShop\Factory::createManager($context, 'locale/site')->getItem($user->siteid)->getCode(); |
|
| 74 | + } catch (\Exception $e) { |
|
| 75 | + $site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default'); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - $context->setLocale( $this->locale->getBackend( $context, $site ) ); |
|
| 78 | + $context->setLocale($this->locale->getBackend($context, $site)); |
|
| 79 | 79 | |
| 80 | - foreach( array_reverse( $context->getLocale()->getSitePath() ) as $siteid ) |
|
| 80 | + foreach (array_reverse($context->getLocale()->getSitePath()) as $siteid) |
|
| 81 | 81 | { |
| 82 | - if( (string) $user->siteid === (string) $siteid ) { |
|
| 83 | - $this->cache[$user->id][$groups] = $this->checkGroups( $context, $user->id, $groupcodes ); |
|
| 82 | + if ((string) $user->siteid === (string) $siteid) { |
|
| 83 | + $this->cache[$user->id][$groups] = $this->checkGroups($context, $user->id, $groupcodes); |
|
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | |
@@ -96,20 +96,20 @@ discard block |
||
| 96 | 96 | * @return boolean True if user is part of the group, false if not |
| 97 | 97 | * @deprecated Use checkUserGroup() instead |
| 98 | 98 | */ |
| 99 | - public function checkGroup( $userid, $groupcodes ) |
|
| 99 | + public function checkGroup($userid, $groupcodes) |
|
| 100 | 100 | { |
| 101 | - $groups = ( is_array( $groupcodes ) ? implode( ',', $groupcodes ) : $groupcodes ); |
|
| 101 | + $groups = (is_array($groupcodes) ? implode(',', $groupcodes) : $groupcodes); |
|
| 102 | 102 | |
| 103 | - if( isset( $this->cache[$userid][$groups] ) ) { |
|
| 103 | + if (isset($this->cache[$userid][$groups])) { |
|
| 104 | 104 | return $this->cache[$userid][$groups]; |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - $site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' ); |
|
| 107 | + $site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default'); |
|
| 108 | 108 | |
| 109 | - $context = $this->context->get( false ); |
|
| 110 | - $context->setLocale( $this->locale->getBackend( $context, $site ) ); |
|
| 109 | + $context = $this->context->get(false); |
|
| 110 | + $context->setLocale($this->locale->getBackend($context, $site)); |
|
| 111 | 111 | |
| 112 | - return $this->cache[$userid][$groups] = $this->checkGroups( $context, $userid, $groupcodes ); |
|
| 112 | + return $this->cache[$userid][$groups] = $this->checkGroups($context, $userid, $groupcodes); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | |
@@ -119,15 +119,15 @@ discard block |
||
| 119 | 119 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item |
| 120 | 120 | * @return string[] List of group codes |
| 121 | 121 | */ |
| 122 | - public function getGroups( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 122 | + public function getGroups(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 123 | 123 | { |
| 124 | 124 | $list = array(); |
| 125 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' ); |
|
| 125 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group'); |
|
| 126 | 126 | |
| 127 | 127 | $search = $manager->createSearch(); |
| 128 | - $search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) ); |
|
| 128 | + $search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds())); |
|
| 129 | 129 | |
| 130 | - foreach( $manager->searchItems( $search ) as $item ) { |
|
| 130 | + foreach ($manager->searchItems($search) as $item) { |
|
| 131 | 131 | $list[] = $item->getCode(); |
| 132 | 132 | } |
| 133 | 133 | |
@@ -143,26 +143,26 @@ discard block |
||
| 143 | 143 | * @param string[] $groupcodes List of group codes to check against |
| 144 | 144 | * @return boolean True if the user is in one of the groups, false if not |
| 145 | 145 | */ |
| 146 | - protected function checkGroups( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupcodes ) |
|
| 146 | + protected function checkGroups(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupcodes) |
|
| 147 | 147 | { |
| 148 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' ); |
|
| 148 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group'); |
|
| 149 | 149 | |
| 150 | 150 | $search = $manager->createSearch(); |
| 151 | - $search->setConditions( $search->compare( '==', 'customer.group.code', (array) $groupcodes ) ); |
|
| 152 | - $groupItems = $manager->searchItems( $search ); |
|
| 151 | + $search->setConditions($search->compare('==', 'customer.group.code', (array) $groupcodes)); |
|
| 152 | + $groupItems = $manager->searchItems($search); |
|
| 153 | 153 | |
| 154 | 154 | |
| 155 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' ); |
|
| 155 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists'); |
|
| 156 | 156 | |
| 157 | 157 | $search = $manager->createSearch(); |
| 158 | 158 | $expr = array( |
| 159 | - $search->compare( '==', 'customer.lists.parentid', $userid ), |
|
| 160 | - $search->compare( '==', 'customer.lists.refid', array_keys( $groupItems ) ), |
|
| 161 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), |
|
| 159 | + $search->compare('==', 'customer.lists.parentid', $userid), |
|
| 160 | + $search->compare('==', 'customer.lists.refid', array_keys($groupItems)), |
|
| 161 | + $search->compare('==', 'customer.lists.domain', 'customer/group'), |
|
| 162 | 162 | ); |
| 163 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 164 | - $search->setSlice( 0, 1 ); |
|
| 163 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 164 | + $search->setSlice(0, 1); |
|
| 165 | 165 | |
| 166 | - return (bool) count( $manager->searchItems( $search ) ); |
|
| 166 | + return (bool) count($manager->searchItems($search)); |
|
| 167 | 167 | } |
| 168 | 168 | } |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | Route::group(config('shop.routes.login', ['prefix' => 'admin', 'middleware' => ['web']]), function() { |
| 4 | 4 | |
| 5 | - Route::match( array( 'GET' ), '', array( |
|
| 5 | + Route::match(array('GET'), '', array( |
|
| 6 | 6 | 'as' => 'aimeos_shop_admin', |
| 7 | 7 | 'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction' |
| 8 | 8 | )); |
@@ -12,112 +12,112 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | Route::group(config('shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']]), function() { |
| 14 | 14 | |
| 15 | - Route::match( array( 'GET' ), 'file/{type}', array( |
|
| 15 | + Route::match(array('GET'), 'file/{type}', array( |
|
| 16 | 16 | 'as' => 'aimeos_shop_jqadm_file', |
| 17 | 17 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@fileAction' |
| 18 | 18 | )); |
| 19 | 19 | |
| 20 | - Route::match( array( 'GET', 'POST' ), 'copy/{resource}/{id}', array( |
|
| 20 | + Route::match(array('GET', 'POST'), 'copy/{resource}/{id}', array( |
|
| 21 | 21 | 'as' => 'aimeos_shop_jqadm_copy', |
| 22 | 22 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction' |
| 23 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
| 23 | + ))->where(array('resource' => '[a-z\/]+')); |
|
| 24 | 24 | |
| 25 | - Route::match( array( 'GET', 'POST' ), 'create/{resource}', array( |
|
| 25 | + Route::match(array('GET', 'POST'), 'create/{resource}', array( |
|
| 26 | 26 | 'as' => 'aimeos_shop_jqadm_create', |
| 27 | 27 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction' |
| 28 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
| 28 | + ))->where(array('resource' => '[a-z\/]+')); |
|
| 29 | 29 | |
| 30 | - Route::match( array( 'GET', 'POST' ), 'delete/{resource}/{id}', array( |
|
| 30 | + Route::match(array('GET', 'POST'), 'delete/{resource}/{id}', array( |
|
| 31 | 31 | 'as' => 'aimeos_shop_jqadm_delete', |
| 32 | 32 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction' |
| 33 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
| 33 | + ))->where(array('resource' => '[a-z\/]+')); |
|
| 34 | 34 | |
| 35 | - Route::match( array( 'GET', 'POST' ), 'export/{resource}', array( |
|
| 35 | + Route::match(array('GET', 'POST'), 'export/{resource}', array( |
|
| 36 | 36 | 'as' => 'aimeos_shop_jqadm_export', |
| 37 | 37 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@exportAction' |
| 38 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
| 38 | + ))->where(array('resource' => '[a-z\/]+')); |
|
| 39 | 39 | |
| 40 | - Route::match( array( 'GET' ), 'get/{resource}/{id}', array( |
|
| 40 | + Route::match(array('GET'), 'get/{resource}/{id}', array( |
|
| 41 | 41 | 'as' => 'aimeos_shop_jqadm_get', |
| 42 | 42 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction' |
| 43 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
| 43 | + ))->where(array('resource' => '[a-z\/]+')); |
|
| 44 | 44 | |
| 45 | - Route::match( array( 'POST' ), 'save/{resource}', array( |
|
| 45 | + Route::match(array('POST'), 'save/{resource}', array( |
|
| 46 | 46 | 'as' => 'aimeos_shop_jqadm_save', |
| 47 | 47 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction' |
| 48 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
| 48 | + ))->where(array('resource' => '[a-z\/]+')); |
|
| 49 | 49 | |
| 50 | - Route::match( array( 'GET', 'POST' ), 'search/{resource}', array( |
|
| 50 | + Route::match(array('GET', 'POST'), 'search/{resource}', array( |
|
| 51 | 51 | 'as' => 'aimeos_shop_jqadm_search', |
| 52 | 52 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction' |
| 53 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
| 53 | + ))->where(array('resource' => '[a-z\/]+')); |
|
| 54 | 54 | |
| 55 | 55 | }); |
| 56 | 56 | |
| 57 | 57 | |
| 58 | 58 | Route::group(config('shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']]), function() { |
| 59 | 59 | |
| 60 | - Route::match( array( 'DELETE' ), '{resource}/{id?}', array( |
|
| 60 | + Route::match(array('DELETE'), '{resource}/{id?}', array( |
|
| 61 | 61 | 'as' => 'aimeos_shop_jsonadm_delete', |
| 62 | 62 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction' |
| 63 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
| 63 | + ))->where(array('resource' => '[a-z\/]+')); |
|
| 64 | 64 | |
| 65 | - Route::match( array( 'GET' ), '{resource}/{id?}', array( |
|
| 65 | + Route::match(array('GET'), '{resource}/{id?}', array( |
|
| 66 | 66 | 'as' => 'aimeos_shop_jsonadm_get', |
| 67 | 67 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction' |
| 68 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
| 68 | + ))->where(array('resource' => '[a-z\/]+')); |
|
| 69 | 69 | |
| 70 | - Route::match( array( 'PATCH' ), '{resource}/{id?}', array( |
|
| 70 | + Route::match(array('PATCH'), '{resource}/{id?}', array( |
|
| 71 | 71 | 'as' => 'aimeos_shop_jsonadm_patch', |
| 72 | 72 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction' |
| 73 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
| 73 | + ))->where(array('resource' => '[a-z\/]+')); |
|
| 74 | 74 | |
| 75 | - Route::match( array( 'POST' ), '{resource}/{id?}', array( |
|
| 75 | + Route::match(array('POST'), '{resource}/{id?}', array( |
|
| 76 | 76 | 'as' => 'aimeos_shop_jsonadm_post', |
| 77 | 77 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction' |
| 78 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
| 78 | + ))->where(array('resource' => '[a-z\/]+')); |
|
| 79 | 79 | |
| 80 | - Route::match( array( 'PUT' ), '{resource}/{id?}', array( |
|
| 80 | + Route::match(array('PUT'), '{resource}/{id?}', array( |
|
| 81 | 81 | 'as' => 'aimeos_shop_jsonadm_put', |
| 82 | 82 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction' |
| 83 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
| 83 | + ))->where(array('resource' => '[a-z\/]+')); |
|
| 84 | 84 | |
| 85 | - Route::match( array( 'OPTIONS' ), '{resource?}', array( |
|
| 85 | + Route::match(array('OPTIONS'), '{resource?}', array( |
|
| 86 | 86 | 'as' => 'aimeos_shop_jsonadm_options', |
| 87 | 87 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction' |
| 88 | - ))->where( array( 'resource' => '[a-z\/]*' ) ); |
|
| 88 | + ))->where(array('resource' => '[a-z\/]*')); |
|
| 89 | 89 | |
| 90 | 90 | }); |
| 91 | 91 | |
| 92 | 92 | |
| 93 | 93 | Route::group(config('shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']]), function() { |
| 94 | 94 | |
| 95 | - Route::match( array( 'DELETE' ), '{resource}', array( |
|
| 95 | + Route::match(array('DELETE'), '{resource}', array( |
|
| 96 | 96 | 'as' => 'aimeos_shop_jsonapi_delete', |
| 97 | 97 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@deleteAction' |
| 98 | 98 | )); |
| 99 | 99 | |
| 100 | - Route::match( array( 'GET' ), '{resource}', array( |
|
| 100 | + Route::match(array('GET'), '{resource}', array( |
|
| 101 | 101 | 'as' => 'aimeos_shop_jsonapi_get', |
| 102 | 102 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@getAction' |
| 103 | 103 | )); |
| 104 | 104 | |
| 105 | - Route::match( array( 'PATCH' ), '{resource}', array( |
|
| 105 | + Route::match(array('PATCH'), '{resource}', array( |
|
| 106 | 106 | 'as' => 'aimeos_shop_jsonapi_patch', |
| 107 | 107 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@patchAction' |
| 108 | 108 | )); |
| 109 | 109 | |
| 110 | - Route::match( array( 'POST' ), '{resource}', array( |
|
| 110 | + Route::match(array('POST'), '{resource}', array( |
|
| 111 | 111 | 'as' => 'aimeos_shop_jsonapi_post', |
| 112 | 112 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@postAction' |
| 113 | 113 | )); |
| 114 | 114 | |
| 115 | - Route::match( array( 'PUT' ), '{resource}', array( |
|
| 115 | + Route::match(array('PUT'), '{resource}', array( |
|
| 116 | 116 | 'as' => 'aimeos_shop_jsonapi_put', |
| 117 | 117 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@putAction' |
| 118 | 118 | )); |
| 119 | 119 | |
| 120 | - Route::match( array( 'OPTIONS' ), '{resource?}', array( |
|
| 120 | + Route::match(array('OPTIONS'), '{resource?}', array( |
|
| 121 | 121 | 'as' => 'aimeos_shop_jsonapi_options', |
| 122 | 122 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@optionsAction' |
| 123 | 123 | )); |
@@ -127,22 +127,22 @@ discard block |
||
| 127 | 127 | |
| 128 | 128 | Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() { |
| 129 | 129 | |
| 130 | - Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
| 130 | + Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
| 131 | 131 | 'as' => 'aimeos_shop_account_favorite', |
| 132 | 132 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
| 133 | 133 | )); |
| 134 | 134 | |
| 135 | - Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
| 135 | + Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
| 136 | 136 | 'as' => 'aimeos_shop_account_watch', |
| 137 | 137 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
| 138 | 138 | )); |
| 139 | 139 | |
| 140 | - Route::match( array( 'GET', 'POST' ), 'myaccount/download/{dl_id}', array( |
|
| 140 | + Route::match(array('GET', 'POST'), 'myaccount/download/{dl_id}', array( |
|
| 141 | 141 | 'as' => 'aimeos_shop_account_download', |
| 142 | 142 | 'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction' |
| 143 | 143 | )); |
| 144 | 144 | |
| 145 | - Route::match( array( 'GET', 'POST' ), 'myaccount', array( |
|
| 145 | + Route::match(array('GET', 'POST'), 'myaccount', array( |
|
| 146 | 146 | 'as' => 'aimeos_shop_account', |
| 147 | 147 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
| 148 | 148 | )); |
@@ -152,47 +152,47 @@ discard block |
||
| 152 | 152 | |
| 153 | 153 | Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() { |
| 154 | 154 | |
| 155 | - Route::match( array( 'GET', 'POST' ), 'count', array( |
|
| 155 | + Route::match(array('GET', 'POST'), 'count', array( |
|
| 156 | 156 | 'as' => 'aimeos_shop_count', |
| 157 | 157 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction' |
| 158 | 158 | )); |
| 159 | 159 | |
| 160 | - Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array( |
|
| 160 | + Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array( |
|
| 161 | 161 | 'as' => 'aimeos_shop_detail', |
| 162 | 162 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
| 163 | 163 | )); |
| 164 | 164 | |
| 165 | - Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
| 165 | + Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
| 166 | 166 | 'as' => 'aimeos_shop_session_pinned', |
| 167 | 167 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
| 168 | 168 | )); |
| 169 | 169 | |
| 170 | - Route::match( array( 'GET', 'POST' ), 'list', array( |
|
| 170 | + Route::match(array('GET', 'POST'), 'list', array( |
|
| 171 | 171 | 'as' => 'aimeos_shop_list', |
| 172 | 172 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction' |
| 173 | 173 | )); |
| 174 | 174 | |
| 175 | - Route::match( array( 'GET', 'POST' ), 'suggest', array( |
|
| 175 | + Route::match(array('GET', 'POST'), 'suggest', array( |
|
| 176 | 176 | 'as' => 'aimeos_shop_suggest', |
| 177 | 177 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction' |
| 178 | 178 | )); |
| 179 | 179 | |
| 180 | - Route::match( array( 'GET', 'POST' ), 'stock', array( |
|
| 180 | + Route::match(array('GET', 'POST'), 'stock', array( |
|
| 181 | 181 | 'as' => 'aimeos_shop_stock', |
| 182 | 182 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction' |
| 183 | 183 | )); |
| 184 | 184 | |
| 185 | - Route::match( array( 'GET', 'POST' ), 'basket', array( |
|
| 185 | + Route::match(array('GET', 'POST'), 'basket', array( |
|
| 186 | 186 | 'as' => 'aimeos_shop_basket', |
| 187 | 187 | 'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction' |
| 188 | 188 | )); |
| 189 | 189 | |
| 190 | - Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array( |
|
| 190 | + Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array( |
|
| 191 | 191 | 'as' => 'aimeos_shop_checkout', |
| 192 | 192 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction' |
| 193 | 193 | )); |
| 194 | 194 | |
| 195 | - Route::match( array( 'GET', 'POST' ), 'confirm/{code?}', array( |
|
| 195 | + Route::match(array('GET', 'POST'), 'confirm/{code?}', array( |
|
| 196 | 196 | 'as' => 'aimeos_shop_confirm', |
| 197 | 197 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction' |
| 198 | 198 | )); |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | |
| 203 | 203 | Route::group(config('shop.routes.update', []), function() { |
| 204 | 204 | |
| 205 | - Route::match( array( 'GET', 'POST' ), 'update', array( |
|
| 205 | + Route::match(array('GET', 'POST'), 'update', array( |
|
| 206 | 206 | 'as' => 'aimeos_shop_update', |
| 207 | 207 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction' |
| 208 | 208 | )); |