@@ -45,7 +45,7 @@ |
||
45 | 45 | /** |
46 | 46 | * Returns the html for the "My account" download page. |
47 | 47 | * |
48 | - * @return \Illuminate\Contracts\View\View View for rendering the output |
|
48 | + * @return \Illuminate\Http\Response View for rendering the output |
|
49 | 49 | */ |
50 | 50 | public function downloadAction() |
51 | 51 | { |
@@ -30,12 +30,12 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function indexAction() |
32 | 32 | { |
33 | - $default = ['account/profile','account/subscription','account/history','account/favorite','account/watch','basket/mini','catalog/session']; |
|
33 | + $default = ['account/profile', 'account/subscription', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session']; |
|
34 | 34 | |
35 | - foreach( app( 'config' )->get( 'shop.page.account-index', $default ) as $name ) |
|
35 | + foreach (app('config')->get('shop.page.account-index', $default) as $name) |
|
36 | 36 | { |
37 | - $params['aiheader'][$name] = Shop::get( $name )->getHeader(); |
|
38 | - $params['aibody'][$name] = Shop::get( $name )->getBody(); |
|
37 | + $params['aiheader'][$name] = Shop::get($name)->getHeader(); |
|
38 | + $params['aibody'][$name] = Shop::get($name)->getBody(); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | return Response::view('shop::account.index', $params); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | */ |
50 | 50 | public function downloadAction() |
51 | 51 | { |
52 | - $response = Shop::get( 'account/download' )->getView()->response(); |
|
53 | - return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() ); |
|
52 | + $response = Shop::get('account/download')->getView()->response(); |
|
53 | + return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders()); |
|
54 | 54 | } |
55 | 55 | } |
56 | 56 | \ No newline at end of file |
@@ -18,13 +18,13 @@ |
||
18 | 18 | */ |
19 | 19 | class Shop extends \Illuminate\Support\Facades\Facade |
20 | 20 | { |
21 | - /** |
|
22 | - * Get the registered name of the component. |
|
23 | - * |
|
24 | - * @return string |
|
25 | - */ |
|
26 | - protected static function getFacadeAccessor() |
|
27 | - { |
|
28 | - return 'aimeos.shop'; |
|
29 | - } |
|
21 | + /** |
|
22 | + * Get the registered name of the component. |
|
23 | + * |
|
24 | + * @return string |
|
25 | + */ |
|
26 | + protected static function getFacadeAccessor() |
|
27 | + { |
|
28 | + return 'aimeos.shop'; |
|
29 | + } |
|
30 | 30 | } |
@@ -37,13 +37,13 @@ discard block |
||
37 | 37 | public function boot() |
38 | 38 | { |
39 | 39 | $ds = DIRECTORY_SEPARATOR; |
40 | - $basedir = dirname( dirname( __DIR__ ) ) . $ds; |
|
40 | + $basedir = dirname(dirname(__DIR__)).$ds; |
|
41 | 41 | |
42 | - $this->loadRoutesFrom( $basedir . 'routes.php' ); |
|
43 | - $this->loadViewsFrom( $basedir . 'views', 'shop' ); |
|
42 | + $this->loadRoutesFrom($basedir.'routes.php'); |
|
43 | + $this->loadViewsFrom($basedir.'views', 'shop'); |
|
44 | 44 | |
45 | - $this->publishes( [ $basedir . 'config/shop.php' => config_path( 'shop.php' ) ], 'config' ); |
|
46 | - $this->publishes( [ dirname( $basedir ) . $ds . 'public' => public_path( 'packages/aimeos/shop' ) ], 'public' ); |
|
45 | + $this->publishes([$basedir.'config/shop.php' => config_path('shop.php')], 'config'); |
|
46 | + $this->publishes([dirname($basedir).$ds.'public' => public_path('packages/aimeos/shop')], 'public'); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | */ |
55 | 55 | public function register() |
56 | 56 | { |
57 | - $this->mergeConfigFrom( dirname( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . 'default.php', 'shop'); |
|
57 | + $this->mergeConfigFrom(dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR.'default.php', 'shop'); |
|
58 | 58 | |
59 | 59 | $this->app->singleton('aimeos', function($app) { |
60 | 60 | return new \Aimeos\Shop\Base\Aimeos($app['config']); |
@@ -89,12 +89,12 @@ discard block |
||
89 | 89 | }); |
90 | 90 | |
91 | 91 | |
92 | - $this->commands( array( |
|
92 | + $this->commands(array( |
|
93 | 93 | 'Aimeos\Shop\Command\AccountCommand', |
94 | 94 | 'Aimeos\Shop\Command\CacheCommand', |
95 | 95 | 'Aimeos\Shop\Command\SetupCommand', |
96 | 96 | 'Aimeos\Shop\Command\JobsCommand', |
97 | - ) ); |
|
97 | + )); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 |
@@ -49,39 +49,39 @@ discard block |
||
49 | 49 | */ |
50 | 50 | public function handle() |
51 | 51 | { |
52 | - $ctx = $this->getLaravel()->make( 'aimeos.context' )->get( false, 'command' ); |
|
53 | - $ctx->setEditor( 'aimeos:setup' ); |
|
52 | + $ctx = $this->getLaravel()->make('aimeos.context')->get(false, 'command'); |
|
53 | + $ctx->setEditor('aimeos:setup'); |
|
54 | 54 | |
55 | 55 | $config = $ctx->getConfig(); |
56 | - $site = $this->argument( 'site' ); |
|
57 | - $template = $this->argument( 'tplsite' ); |
|
56 | + $site = $this->argument('site'); |
|
57 | + $template = $this->argument('tplsite'); |
|
58 | 58 | |
59 | - $config->set( 'setup/site', $site ); |
|
60 | - $dbconfig = $this->getDbConfig( $config ); |
|
61 | - $this->setOptions( $config ); |
|
59 | + $config->set('setup/site', $site); |
|
60 | + $dbconfig = $this->getDbConfig($config); |
|
61 | + $this->setOptions($config); |
|
62 | 62 | |
63 | - $taskPaths = $this->getLaravel()->make( 'aimeos' )->get()->getSetupPaths( $template ); |
|
64 | - $manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx ); |
|
63 | + $taskPaths = $this->getLaravel()->make('aimeos')->get()->getSetupPaths($template); |
|
64 | + $manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx); |
|
65 | 65 | |
66 | - $this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) ); |
|
66 | + $this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site)); |
|
67 | 67 | |
68 | - if( ( $task = $this->option( 'task' ) ) && is_array( $task ) ) { |
|
69 | - $task = reset( $task ); |
|
68 | + if (($task = $this->option('task')) && is_array($task)) { |
|
69 | + $task = reset($task); |
|
70 | 70 | } |
71 | 71 | |
72 | - switch( $this->option( 'action' ) ) |
|
72 | + switch ($this->option('action')) |
|
73 | 73 | { |
74 | 74 | case 'migrate': |
75 | - $manager->migrate( $task ); |
|
75 | + $manager->migrate($task); |
|
76 | 76 | break; |
77 | 77 | case 'rollback': |
78 | - $manager->rollback( $task ); |
|
78 | + $manager->rollback($task); |
|
79 | 79 | break; |
80 | 80 | case 'clean': |
81 | - $manager->clean( $task ); |
|
81 | + $manager->clean($task); |
|
82 | 82 | break; |
83 | 83 | default: |
84 | - throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $this->option( 'action' ) ) ); |
|
84 | + throw new \Exception(sprintf('Invalid setup action "%1$s"', $this->option('action'))); |
|
85 | 85 | } |
86 | 86 | } |
87 | 87 | |
@@ -92,14 +92,14 @@ discard block |
||
92 | 92 | * @param \Aimeos\MW\Config\Iface $conf Config object |
93 | 93 | * @return array Multi-dimensional associative list of database configuration parameters |
94 | 94 | */ |
95 | - protected function getDbConfig( \Aimeos\MW\Config\Iface $conf ) |
|
95 | + protected function getDbConfig(\Aimeos\MW\Config\Iface $conf) |
|
96 | 96 | { |
97 | - $dbconfig = $conf->get( 'resource', array() ); |
|
97 | + $dbconfig = $conf->get('resource', array()); |
|
98 | 98 | |
99 | - foreach( $dbconfig as $rname => $dbconf ) |
|
99 | + foreach ($dbconfig as $rname => $dbconf) |
|
100 | 100 | { |
101 | - if( strncmp( $rname, 'db', 2 ) !== 0 ) { |
|
102 | - unset( $dbconfig[$rname] ); |
|
101 | + if (strncmp($rname, 'db', 2) !== 0) { |
|
102 | + unset($dbconfig[$rname]); |
|
103 | 103 | } |
104 | 104 | } |
105 | 105 | |
@@ -114,12 +114,12 @@ discard block |
||
114 | 114 | * @param array Associative list of database configurations |
115 | 115 | * @throws \RuntimeException If the format of the options is invalid |
116 | 116 | */ |
117 | - protected function setOptions( \Aimeos\MW\Config\Iface $conf ) |
|
117 | + protected function setOptions(\Aimeos\MW\Config\Iface $conf) |
|
118 | 118 | { |
119 | - foreach( (array) $this->option( 'option' ) as $option ) |
|
119 | + foreach ((array) $this->option('option') as $option) |
|
120 | 120 | { |
121 | - list( $name, $value ) = explode( ':', $option ); |
|
122 | - $conf->set( str_replace( '\\', '/', $name ), $value ); |
|
121 | + list($name, $value) = explode(':', $option); |
|
122 | + $conf->set(str_replace('\\', '/', $name), $value); |
|
123 | 123 | } |
124 | 124 | } |
125 | 125 | } |
@@ -46,30 +46,30 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public function handle() |
48 | 48 | { |
49 | - $aimeos = $this->getLaravel()->make( 'aimeos' )->get(); |
|
49 | + $aimeos = $this->getLaravel()->make('aimeos')->get(); |
|
50 | 50 | $context = $this->getContext(); |
51 | 51 | |
52 | 52 | $process = $context->getProcess(); |
53 | - $jobs = explode( ' ', $this->argument( 'jobs' ) ); |
|
54 | - $localeManager = \Aimeos\MShop::create( $context, 'locale' ); |
|
53 | + $jobs = explode(' ', $this->argument('jobs')); |
|
54 | + $localeManager = \Aimeos\MShop::create($context, 'locale'); |
|
55 | 55 | |
56 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
56 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
57 | 57 | { |
58 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
59 | - $localeItem->setLanguageId( null ); |
|
60 | - $localeItem->setCurrencyId( null ); |
|
58 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
59 | + $localeItem->setLanguageId(null); |
|
60 | + $localeItem->setCurrencyId(null); |
|
61 | 61 | |
62 | - $context->setLocale( $localeItem ); |
|
62 | + $context->setLocale($localeItem); |
|
63 | 63 | |
64 | - $this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) ); |
|
64 | + $this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode())); |
|
65 | 65 | |
66 | - foreach( $jobs as $jobname ) |
|
66 | + foreach ($jobs as $jobname) |
|
67 | 67 | { |
68 | - $fcn = function( $context, $aimeos, $jobname ) { |
|
69 | - \Aimeos\Controller\Jobs::create( $context, $aimeos, $jobname )->run(); |
|
68 | + $fcn = function($context, $aimeos, $jobname) { |
|
69 | + \Aimeos\Controller\Jobs::create($context, $aimeos, $jobname)->run(); |
|
70 | 70 | }; |
71 | 71 | |
72 | - $process->start( $fcn, [$context, $aimeos, $jobname], true ); |
|
72 | + $process->start($fcn, [$context, $aimeos, $jobname], true); |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 | |
@@ -85,19 +85,19 @@ discard block |
||
85 | 85 | protected function getContext() |
86 | 86 | { |
87 | 87 | $lv = $this->getLaravel(); |
88 | - $aimeos = $lv->make( 'aimeos' )->get(); |
|
89 | - $context = $lv->make( 'aimeos.context' )->get( false, 'command' ); |
|
88 | + $aimeos = $lv->make('aimeos')->get(); |
|
89 | + $context = $lv->make('aimeos.context')->get(false, 'command'); |
|
90 | 90 | |
91 | - $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' ); |
|
92 | - $view = $lv->make( 'aimeos.view' )->create( $context, $tmplPaths ); |
|
91 | + $tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates'); |
|
92 | + $view = $lv->make('aimeos.view')->create($context, $tmplPaths); |
|
93 | 93 | |
94 | - $langManager = \Aimeos\MShop::create( $context, 'locale/language' ); |
|
95 | - $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) ); |
|
96 | - $i18n = $lv->make( 'aimeos.i18n' )->get( $langids ); |
|
94 | + $langManager = \Aimeos\MShop::create($context, 'locale/language'); |
|
95 | + $langids = array_keys($langManager->searchItems($langManager->createSearch(true))); |
|
96 | + $i18n = $lv->make('aimeos.i18n')->get($langids); |
|
97 | 97 | |
98 | - $context->setEditor( 'aimeos:jobs' ); |
|
99 | - $context->setView( $view ); |
|
100 | - $context->setI18n( $i18n ); |
|
98 | + $context->setEditor('aimeos:jobs'); |
|
99 | + $context->setView($view); |
|
100 | + $context->setI18n($i18n); |
|
101 | 101 | |
102 | 102 | return $context; |
103 | 103 | } |
@@ -41,16 +41,16 @@ discard block |
||
41 | 41 | * @param \Aimeos\Shop\Base\Context $context Context object |
42 | 42 | * @param \Aimeos\Shop\Base\View $view View object |
43 | 43 | */ |
44 | - public function __construct( \Aimeos\Shop\Base\Aimeos $aimeos, |
|
45 | - \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view ) |
|
44 | + public function __construct(\Aimeos\Shop\Base\Aimeos $aimeos, |
|
45 | + \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view) |
|
46 | 46 | { |
47 | 47 | $this->context = $context->get(); |
48 | 48 | |
49 | 49 | $langid = $this->context->getLocale()->getLanguageId(); |
50 | - $tmplPaths = $aimeos->get()->getCustomPaths( 'client/html/templates' ); |
|
50 | + $tmplPaths = $aimeos->get()->getCustomPaths('client/html/templates'); |
|
51 | 51 | |
52 | - $this->view = $view->create( $this->context, $tmplPaths, $langid ); |
|
53 | - $this->context->setView( $this->view ); |
|
52 | + $this->view = $view->create($this->context, $tmplPaths, $langid); |
|
53 | + $this->context->setView($this->view); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | |
@@ -60,12 +60,12 @@ discard block |
||
60 | 60 | * @param string $name Name of the shop component |
61 | 61 | * @return \Aimeos\Client\Html\Iface HTML client |
62 | 62 | */ |
63 | - public function get( $name ) |
|
63 | + public function get($name) |
|
64 | 64 | { |
65 | - if( !isset( $this->objects[$name] ) ) |
|
65 | + if (!isset($this->objects[$name])) |
|
66 | 66 | { |
67 | - $client = \Aimeos\Client\Html::create( $this->context, $name ); |
|
68 | - $client->setView( clone $this->view ); |
|
67 | + $client = \Aimeos\Client\Html::create($this->context, $name); |
|
68 | + $client->setView(clone $this->view); |
|
69 | 69 | $client->process(); |
70 | 70 | |
71 | 71 | $this->objects[$name] = $client; |
@@ -30,10 +30,10 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function countAction() |
32 | 32 | { |
33 | - foreach( app( 'config' )->get( 'shop.page.catalog-count', ['catalog/count'] ) as $name ) |
|
33 | + foreach (app('config')->get('shop.page.catalog-count', ['catalog/count']) as $name) |
|
34 | 34 | { |
35 | - $params['aiheader'][$name] = Shop::get( $name )->getHeader(); |
|
36 | - $params['aibody'][$name] = Shop::get( $name )->getBody(); |
|
35 | + $params['aiheader'][$name] = Shop::get($name)->getHeader(); |
|
36 | + $params['aibody'][$name] = Shop::get($name)->getBody(); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | return Response::view('shop::catalog.count', $params) |
@@ -48,12 +48,12 @@ discard block |
||
48 | 48 | */ |
49 | 49 | public function detailAction() |
50 | 50 | { |
51 | - $default = ['basket/mini','catalog/stage','catalog/detail','catalog/session']; |
|
51 | + $default = ['basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session']; |
|
52 | 52 | |
53 | - foreach( app( 'config' )->get( 'shop.page.catalog-detail', $default ) as $name ) |
|
53 | + foreach (app('config')->get('shop.page.catalog-detail', $default) as $name) |
|
54 | 54 | { |
55 | - $params['aiheader'][$name] = Shop::get( $name )->getHeader(); |
|
56 | - $params['aibody'][$name] = Shop::get( $name )->getBody(); |
|
55 | + $params['aiheader'][$name] = Shop::get($name)->getHeader(); |
|
56 | + $params['aibody'][$name] = Shop::get($name)->getBody(); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | return Response::view('shop::catalog.detail', $params); |
@@ -67,12 +67,12 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public function listAction() |
69 | 69 | { |
70 | - $default = ['basket/mini','catalog/filter','catalog/lists']; |
|
70 | + $default = ['basket/mini', 'catalog/filter', 'catalog/lists']; |
|
71 | 71 | |
72 | - foreach( app( 'config' )->get( 'shop.page.catalog-list', $default ) as $name ) |
|
72 | + foreach (app('config')->get('shop.page.catalog-list', $default) as $name) |
|
73 | 73 | { |
74 | - $params['aiheader'][$name] = Shop::get( $name )->getHeader(); |
|
75 | - $params['aibody'][$name] = Shop::get( $name )->getBody(); |
|
74 | + $params['aiheader'][$name] = Shop::get($name)->getHeader(); |
|
75 | + $params['aibody'][$name] = Shop::get($name)->getBody(); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | return Response::view('shop::catalog.list', $params); |
@@ -86,10 +86,10 @@ discard block |
||
86 | 86 | */ |
87 | 87 | public function stockAction() |
88 | 88 | { |
89 | - foreach( app( 'config' )->get( 'shop.page.catalog-stock', ['catalog/stock'] ) as $name ) |
|
89 | + foreach (app('config')->get('shop.page.catalog-stock', ['catalog/stock']) as $name) |
|
90 | 90 | { |
91 | - $params['aiheader'][$name] = Shop::get( $name )->getHeader(); |
|
92 | - $params['aibody'][$name] = Shop::get( $name )->getBody(); |
|
91 | + $params['aiheader'][$name] = Shop::get($name)->getHeader(); |
|
92 | + $params['aibody'][$name] = Shop::get($name)->getBody(); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | return Response::view('shop::catalog.stock', $params) |
@@ -104,10 +104,10 @@ discard block |
||
104 | 104 | */ |
105 | 105 | public function suggestAction() |
106 | 106 | { |
107 | - foreach( app( 'config' )->get( 'shop.page.catalog-suggest', ['catalog/suggest'] ) as $name ) |
|
107 | + foreach (app('config')->get('shop.page.catalog-suggest', ['catalog/suggest']) as $name) |
|
108 | 108 | { |
109 | - $params['aiheader'][$name] = Shop::get( $name )->getHeader(); |
|
110 | - $params['aibody'][$name] = Shop::get( $name )->getBody(); |
|
109 | + $params['aiheader'][$name] = Shop::get($name)->getHeader(); |
|
110 | + $params['aibody'][$name] = Shop::get($name)->getBody(); |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | return Response::view('shop::catalog.suggest', $params) |
@@ -122,12 +122,12 @@ discard block |
||
122 | 122 | */ |
123 | 123 | public function treeAction() |
124 | 124 | { |
125 | - $default = ['basket/mini','catalog/filter','catalog/stage','catalog/lists']; |
|
125 | + $default = ['basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists']; |
|
126 | 126 | |
127 | - foreach( app( 'config' )->get( 'shop.page.catalog-tree', $default ) as $name ) |
|
127 | + foreach (app('config')->get('shop.page.catalog-tree', $default) as $name) |
|
128 | 128 | { |
129 | - $params['aiheader'][$name] = Shop::get( $name )->getHeader(); |
|
130 | - $params['aibody'][$name] = Shop::get( $name )->getBody(); |
|
129 | + $params['aiheader'][$name] = Shop::get($name)->getHeader(); |
|
130 | + $params['aibody'][$name] = Shop::get($name)->getBody(); |
|
131 | 131 | } |
132 | 132 | |
133 | 133 | return Response::view('shop::catalog.tree', $params); |
@@ -36,26 +36,26 @@ |
||
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( Auth::check() === false |
|
42 | - || $request->user()->can( 'admin', [AdminController::class, ['admin', 'editor']] ) === false |
|
41 | + if (Auth::check() === false |
|
42 | + || $request->user()->can('admin', [AdminController::class, ['admin', 'editor']]) === false |
|
43 | 43 | ) { |
44 | - return redirect()->guest( 'login' ); |
|
44 | + return redirect()->guest('login'); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | $siteId = $request->user()->siteid; |
48 | - $context = app( 'aimeos.context' )->get( false ); |
|
49 | - $siteManager = \Aimeos\MShop::create( $context, 'locale/site' ); |
|
50 | - $siteCode = ( $siteId ? $siteManager->getItem( $siteId )->getCode() : 'default' ); |
|
51 | - $locale = $request->user()->langid ?: config( 'app.locale', 'en' ); |
|
48 | + $context = app('aimeos.context')->get(false); |
|
49 | + $siteManager = \Aimeos\MShop::create($context, 'locale/site'); |
|
50 | + $siteCode = ($siteId ? $siteManager->getItem($siteId)->getCode() : 'default'); |
|
51 | + $locale = $request->user()->langid ?: config('app.locale', 'en'); |
|
52 | 52 | |
53 | 53 | $param = array( |
54 | 54 | 'resource' => 'dashboard', |
55 | - 'site' => Route::input( 'site', Input::get( 'site', $siteCode ) ), |
|
56 | - 'lang' => Route::input( 'lang', Input::get( 'lang', $locale ) ) |
|
55 | + 'site' => Route::input('site', Input::get('site', $siteCode)), |
|
56 | + 'lang' => Route::input('lang', Input::get('lang', $locale)) |
|
57 | 57 | ); |
58 | 58 | |
59 | - return redirect()->route( 'aimeos_shop_jqadm_search', $param ); |
|
59 | + return redirect()->route('aimeos_shop_jqadm_search', $param); |
|
60 | 60 | } |
61 | 61 | } |
@@ -30,10 +30,10 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function confirmAction() |
32 | 32 | { |
33 | - foreach( app( 'config' )->get( 'shop.page.checkout-confirm', ['checkout/confirm'] ) as $name ) |
|
33 | + foreach (app('config')->get('shop.page.checkout-confirm', ['checkout/confirm']) as $name) |
|
34 | 34 | { |
35 | - $params['aiheader'][$name] = Shop::get( $name )->getHeader(); |
|
36 | - $params['aibody'][$name] = Shop::get( $name )->getBody(); |
|
35 | + $params['aiheader'][$name] = Shop::get($name)->getHeader(); |
|
36 | + $params['aibody'][$name] = Shop::get($name)->getBody(); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | return Response::view('shop::checkout.confirm', $params)->header('Cache-Control', 'no-store'); |
@@ -47,10 +47,10 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public function indexAction() |
49 | 49 | { |
50 | - foreach( app( 'config' )->get( 'shop.page.checkout-index', ['checkout/standard'] ) as $name ) |
|
50 | + foreach (app('config')->get('shop.page.checkout-index', ['checkout/standard']) as $name) |
|
51 | 51 | { |
52 | - $params['aiheader'][$name] = Shop::get( $name )->getHeader(); |
|
53 | - $params['aibody'][$name] = Shop::get( $name )->getBody(); |
|
52 | + $params['aiheader'][$name] = Shop::get($name)->getHeader(); |
|
53 | + $params['aibody'][$name] = Shop::get($name)->getBody(); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | return Response::view('shop::checkout.index', $params)->header('Cache-Control', 'no-store'); |
@@ -64,10 +64,10 @@ discard block |
||
64 | 64 | */ |
65 | 65 | public function updateAction() |
66 | 66 | { |
67 | - foreach( app( 'config' )->get( 'shop.page.checkout-update', ['checkout/update'] ) as $name ) |
|
67 | + foreach (app('config')->get('shop.page.checkout-update', ['checkout/update']) as $name) |
|
68 | 68 | { |
69 | - $params['aiheader'][$name] = Shop::get( $name )->getHeader(); |
|
70 | - $params['aibody'][$name] = Shop::get( $name )->getBody(); |
|
69 | + $params['aiheader'][$name] = Shop::get($name)->getHeader(); |
|
70 | + $params['aibody'][$name] = Shop::get($name)->getBody(); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | return Response::view('shop::checkout.update', $params)->header('Cache-Control', 'no-store'); |