aimeos /
aimeos-laravel
@@ -97,7 +97,7 @@ |
||
| 97 | 97 | }); |
| 98 | 98 | |
| 99 | 99 | $this->app->singleton('\Aimeos\Shop\Base\Support', function($app) { |
| 100 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
| 100 | + $site = Route::input('site', Input::get('site', 'default')); |
|
| 101 | 101 | return new \Aimeos\Shop\Base\Support($app['\Aimeos\Shop\Base\Context'], $site); |
| 102 | 102 | }); |
| 103 | 103 | |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/css/tether.min.css"> |
| 11 | 11 | <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css"> |
| 12 | 12 | <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/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]> |
@@ -29,6 +29,6 @@ discard block |
||
| 29 | 29 | <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/js/bootstrap.min.js"></script> |
| 30 | 30 | <script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/ckeditor.js"></script> |
| 31 | 31 | <script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/adapters/jquery.js"></script> |
| 32 | - <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'js' ) ); ?>"></script> |
|
| 32 | + <script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'js')); ?>"></script> |
|
| 33 | 33 | </body> |
| 34 | 34 | </html> |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | <link type="text/css" rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/ext-all.css" /> |
| 10 | 10 | <link type="text/css" rel="stylesheet" href="//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="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/adapter/ext/ext-base.js"></script> |
| 47 | 47 | <script type="text/javascript" src="//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> |
@@ -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', ['admin', 'editor'] ) ) === false |
|
| 41 | + if (config('shop.authorize', true) && (Auth::check() === false |
|
| 42 | + || $request->user()->can('admin', ['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' => 'product', |
| 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 | } |
| 56 | 56 | \ No newline at end of file |
