@@ -36,20 +36,20 @@ |
||
| 36 | 36 | * @param \Illuminate\Http\Request $request Laravel request object |
| 37 | 37 | * @return \Illuminate\Contracts\View\View View for rendering the output |
| 38 | 38 | */ |
| 39 | - public function indexAction( Request $request ) |
|
| 39 | + public function indexAction(Request $request) |
|
| 40 | 40 | { |
| 41 | - if( config( 'shop.authorize', true ) && ( Auth::check() === false |
|
| 42 | - || $request->user()->can( 'admin', [AdminController::class, ['admin', 'editor']] ) ) === false |
|
| 41 | + if (config('shop.authorize', true) && (Auth::check() === false |
|
| 42 | + || $request->user()->can('admin', [AdminController::class, ['admin', 'editor']])) === false |
|
| 43 | 43 | ) { |
| 44 | - return View::make( 'shop::admin.index' ); |
|
| 44 | + return View::make('shop::admin.index'); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | $param = array( |
| 48 | 48 | 'resource' => 'dashboard', |
| 49 | - 'site' => Route::input( 'site', Input::get( 'site', 'default' ) ), |
|
| 50 | - 'lang' => Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) ) |
|
| 49 | + 'site' => Route::input('site', Input::get('site', 'default')), |
|
| 50 | + 'lang' => Route::input('lang', Input::get('lang', config('app.locale', 'en'))) |
|
| 51 | 51 | ); |
| 52 | 52 | |
| 53 | - return redirect()->route( 'aimeos_shop_jqadm_search', $param ); |
|
| 53 | + return redirect()->route('aimeos_shop_jqadm_search', $param); |
|
| 54 | 54 | } |
| 55 | 55 | } |
@@ -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( 'lang', config( 'app.locale', 'en' ) ); |
|
| 138 | - $resource = Route::input( 'resource' ); |
|
| 136 | + $site = Route::input('site', Input::get('site', 'default')); |
|
| 137 | + $lang = Input::get('lang', 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, $templatePaths, $resource ); |
|
| 148 | + return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource); |
|
| 149 | 149 | } |
| 150 | 150 | } |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/css/tether.min.css"> |
| 11 | 11 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css"> |
| 12 | 12 | <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.4/css/bootstrap.min.css"> |
| 13 | - <link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'css' ) ); ?>"> |
|
| 13 | + <link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'css')); ?>"> |
|
| 14 | 14 | |
| 15 | 15 | <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> |
| 16 | 16 | <!--[if lt IE 9]> |
@@ -30,6 +30,6 @@ discard block |
||
| 30 | 30 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/ckeditor.js"></script> |
| 31 | 31 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/adapters/jquery.js"></script> |
| 32 | 32 | <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.17/d3.min.js"></script> |
| 33 | - <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'js' ) ); ?>"></script> |
|
| 33 | + <script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'js')); ?>"></script> |
|
| 34 | 34 | </body> |
| 35 | 35 | </html> |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/ext-all.css" /> |
| 10 | 10 | <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/xtheme-gray.css" /> |
| 11 | 11 | @foreach ($cssFiles as $cssFile) |
| 12 | - <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/' . $cssFile) ?>" /> |
|
| 12 | + <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/'.$cssFile) ?>" /> |
|
| 13 | 13 | @endforeach |
| 14 | 14 | |
| 15 | 15 | <script type="text/javascript"> |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/adapter/ext/ext-base.js"></script> |
| 47 | 47 | <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/ext-all.js"></script> |
| 48 | - <script type="text/javascript" src="<?= route( 'aimeos_shop_extadm_file', array( 'site' => $site ) ); ?>"></script> |
|
| 48 | + <script type="text/javascript" src="<?= route('aimeos_shop_extadm_file', array('site' => $site)); ?>"></script> |
|
| 49 | 49 | |
| 50 | 50 | </head> |
| 51 | 51 | <body> |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | public function indexAction() |
| 31 | 31 | { |
| 32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' ); |
|
| 32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index'); |
|
| 33 | 33 | return View::make('shop::basket.index', $params); |
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | \ No newline at end of file |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function countAction() |
| 32 | 32 | { |
| 33 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' ); |
|
| 33 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count'); |
|
| 34 | 34 | $contents = \View::make('shop::catalog.count', $params); |
| 35 | 35 | |
| 36 | 36 | $response = \Response::make($contents, 200); |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function detailAction() |
| 49 | 49 | { |
| 50 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' ); |
|
| 50 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail'); |
|
| 51 | 51 | return View::make('shop::catalog.detail', $params); |
| 52 | 52 | } |
| 53 | 53 | |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | public function listAction() |
| 61 | 61 | { |
| 62 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' ); |
|
| 62 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list'); |
|
| 63 | 63 | return View::make('shop::catalog.list', $params); |
| 64 | 64 | } |
| 65 | 65 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | */ |
| 72 | 72 | public function stockAction() |
| 73 | 73 | { |
| 74 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' ); |
|
| 74 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock'); |
|
| 75 | 75 | $contents = View::make('shop::catalog.stock', $params); |
| 76 | 76 | |
| 77 | 77 | $response = \Response::make($contents, 200); |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | */ |
| 89 | 89 | public function suggestAction() |
| 90 | 90 | { |
| 91 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' ); |
|
| 91 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest'); |
|
| 92 | 92 | $contents = View::make('shop::catalog.suggest', $params); |
| 93 | 93 | |
| 94 | 94 | $response = Response::make($contents, 200); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function confirmAction() |
| 31 | 31 | { |
| 32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' ); |
|
| 32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm'); |
|
| 33 | 33 | return View::make('shop::checkout.confirm', $params); |
| 34 | 34 | } |
| 35 | 35 | |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | public function indexAction() |
| 43 | 43 | { |
| 44 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' ); |
|
| 44 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index'); |
|
| 45 | 45 | return View::make('shop::checkout.index', $params); |
| 46 | 46 | } |
| 47 | 47 | |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | public function updateAction() |
| 55 | 55 | { |
| 56 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' ); |
|
| 56 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update'); |
|
| 57 | 57 | return View::make('shop::checkout.update', $params); |
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | 60 | \ No newline at end of file |