@@ -22,19 +22,19 @@ |
||
22 | 22 | * @param string|array $sites Unique site codes |
23 | 23 | * @return \Aimeos\MShop\Locale\Item\Site\Iface[] List of site items |
24 | 24 | */ |
25 | - protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, $sites ) |
|
25 | + protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, $sites) |
|
26 | 26 | { |
27 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
27 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
28 | 28 | $search = $manager->createSearch(); |
29 | 29 | |
30 | - if( is_scalar( $sites ) && $sites != '' ) { |
|
31 | - $sites = explode( ' ', $sites ); |
|
30 | + if (is_scalar($sites) && $sites != '') { |
|
31 | + $sites = explode(' ', $sites); |
|
32 | 32 | } |
33 | 33 | |
34 | - if( !empty( $sites ) ) { |
|
35 | - $search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) ); |
|
34 | + if (!empty($sites)) { |
|
35 | + $search->setConditions($search->compare('==', 'locale.site.code', $sites)); |
|
36 | 36 | } |
37 | 37 | |
38 | - return $manager->searchItems( $search ); |
|
38 | + return $manager->searchItems($search); |
|
39 | 39 | } |
40 | 40 | } |
41 | 41 | \ No newline at end of file |
@@ -35,24 +35,24 @@ discard block |
||
35 | 35 | */ |
36 | 36 | public function fire() |
37 | 37 | { |
38 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false ); |
|
39 | - $context->setEditor( 'aimeos:cache' ); |
|
38 | + $context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false); |
|
39 | + $context->setEditor('aimeos:cache'); |
|
40 | 40 | |
41 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
41 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
42 | 42 | |
43 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
43 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
44 | 44 | { |
45 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
45 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
46 | 46 | |
47 | 47 | $lcontext = clone $context; |
48 | - $lcontext->setLocale( $localeItem ); |
|
48 | + $lcontext->setLocale($localeItem); |
|
49 | 49 | |
50 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext ); |
|
51 | - $lcontext->setCache( $cache ); |
|
50 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext); |
|
51 | + $lcontext->setCache($cache); |
|
52 | 52 | |
53 | - $this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) ); |
|
53 | + $this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode())); |
|
54 | 54 | |
55 | - \Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->flush(); |
|
55 | + \Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->flush(); |
|
56 | 56 | } |
57 | 57 | } |
58 | 58 | |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | protected function getArguments() |
66 | 66 | { |
67 | 67 | return array( |
68 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ), |
|
68 | + array('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'), |
|
69 | 69 | ); |
70 | 70 | } |
71 | 71 |
@@ -28,7 +28,7 @@ |
||
28 | 28 | */ |
29 | 29 | public function indexAction() |
30 | 30 | { |
31 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' ); |
|
31 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index'); |
|
32 | 32 | return \View::make('shop::basket.index', $params); |
33 | 33 | } |
34 | 34 | } |
35 | 35 | \ No newline at end of file |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function countAction() |
30 | 30 | { |
31 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' ); |
|
31 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count'); |
|
32 | 32 | $contents = \View::make('shop::catalog.count', $params); |
33 | 33 | |
34 | 34 | $response = \Response::make($contents, 200); |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function detailAction() |
47 | 47 | { |
48 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' ); |
|
48 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail'); |
|
49 | 49 | return \View::make('shop::catalog.detail', $params); |
50 | 50 | } |
51 | 51 | |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | */ |
58 | 58 | public function listAction() |
59 | 59 | { |
60 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' ); |
|
60 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list'); |
|
61 | 61 | return \View::make('shop::catalog.list', $params); |
62 | 62 | } |
63 | 63 | |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function stockAction() |
71 | 71 | { |
72 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' ); |
|
72 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock'); |
|
73 | 73 | $contents = \View::make('shop::catalog.stock', $params); |
74 | 74 | |
75 | 75 | $response = \Response::make($contents, 200); |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | */ |
87 | 87 | public function suggestAction() |
88 | 88 | { |
89 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' ); |
|
89 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest'); |
|
90 | 90 | $contents = \View::make('shop::catalog.suggest', $params); |
91 | 91 | |
92 | 92 | $response = \Response::make($contents, 200); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function confirmAction() |
30 | 30 | { |
31 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' ); |
|
31 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm'); |
|
32 | 32 | return \View::make('shop::checkout.confirm', $params); |
33 | 33 | } |
34 | 34 | |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function indexAction() |
42 | 42 | { |
43 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' ); |
|
43 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index'); |
|
44 | 44 | return \View::make('shop::checkout.index', $params); |
45 | 45 | } |
46 | 46 | |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public function updateAction() |
54 | 54 | { |
55 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' ); |
|
55 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update'); |
|
56 | 56 | return \View::make('shop::checkout.update', $params); |
57 | 57 | } |
58 | 58 | } |
59 | 59 | \ No newline at end of file |
@@ -28,31 +28,31 @@ |
||
28 | 28 | */ |
29 | 29 | public function boot() |
30 | 30 | { |
31 | - $basedir = dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR; |
|
31 | + $basedir = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR; |
|
32 | 32 | |
33 | - $this->mergeConfigFrom(dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR.'config/shop.php', 'shop'); |
|
33 | + $this->mergeConfigFrom(dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'config/shop.php', 'shop'); |
|
34 | 34 | |
35 | - $this->loadViewsFrom($basedir.'views', 'shop'); |
|
35 | + $this->loadViewsFrom($basedir . 'views', 'shop'); |
|
36 | 36 | |
37 | 37 | |
38 | 38 | $this->publishes(array( |
39 | - $basedir.'config/shop.php' => config_path('shop.php'), |
|
39 | + $basedir . 'config/shop.php' => config_path('shop.php'), |
|
40 | 40 | ), 'config'); |
41 | 41 | |
42 | 42 | $this->publishes(array( |
43 | - $basedir.'database/migrations' => base_path('database/migrations'), |
|
43 | + $basedir . 'database/migrations' => base_path('database/migrations'), |
|
44 | 44 | ), 'migrations'); |
45 | 45 | |
46 | 46 | $this->publishes(array( |
47 | - $basedir.'views' => base_path('resources/views/vendor/shop'), |
|
47 | + $basedir . 'views' => base_path('resources/views/vendor/shop'), |
|
48 | 48 | ), 'views'); |
49 | 49 | |
50 | 50 | $this->publishes(array( |
51 | - dirname($basedir).DIRECTORY_SEPARATOR.'public' => public_path('packages/aimeos/shop'), |
|
51 | + dirname($basedir) . DIRECTORY_SEPARATOR . 'public' => public_path('packages/aimeos/shop'), |
|
52 | 52 | ), 'public'); |
53 | 53 | |
54 | 54 | |
55 | - require $basedir.'routes.php'; |
|
55 | + require $basedir . 'routes.php'; |
|
56 | 56 | } |
57 | 57 | |
58 | 58 |
@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | * @param \Aimeos\Shop\Base\Context $context Context object |
48 | 48 | * @param \Aimeos\Shop\Base\View $view View object |
49 | 49 | */ |
50 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, |
|
51 | - \Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view ) |
|
50 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, |
|
51 | + \Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view) |
|
52 | 52 | { |
53 | 53 | $this->config = $config; |
54 | 54 | $this->aimeos = $aimeos; |
@@ -63,23 +63,23 @@ discard block |
||
63 | 63 | * @param string $pageName Name of the configured page |
64 | 64 | * @return array Associative list with body and header output separated by client name |
65 | 65 | */ |
66 | - public function getSections( $pageName ) |
|
66 | + public function getSections($pageName) |
|
67 | 67 | { |
68 | 68 | $context = $this->context->get(); |
69 | 69 | $langid = $context->getLocale()->getLanguageId(); |
70 | - $tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' ); |
|
71 | - $view = $this->view->create( $context->getConfig(), $tmplPaths, $langid ); |
|
72 | - $context->setView( $view ); |
|
70 | + $tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates'); |
|
71 | + $view = $this->view->create($context->getConfig(), $tmplPaths, $langid); |
|
72 | + $context->setView($view); |
|
73 | 73 | |
74 | - $pagesConfig = $this->config->get( 'shop.page', array() ); |
|
75 | - $result = array( 'aibody' => array(), 'aiheader' => array() ); |
|
74 | + $pagesConfig = $this->config->get('shop.page', array()); |
|
75 | + $result = array('aibody' => array(), 'aiheader' => array()); |
|
76 | 76 | |
77 | - if( isset( $pagesConfig[$pageName] ) ) |
|
77 | + if (isset($pagesConfig[$pageName])) |
|
78 | 78 | { |
79 | - foreach( (array) $pagesConfig[$pageName] as $clientName ) |
|
79 | + foreach ((array) $pagesConfig[$pageName] as $clientName) |
|
80 | 80 | { |
81 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName ); |
|
82 | - $client->setView( clone $view ); |
|
81 | + $client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName); |
|
82 | + $client->setView(clone $view); |
|
83 | 83 | $client->process(); |
84 | 84 | |
85 | 85 | $result['aibody'][$clientName] = $client->getBody(); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * |
30 | 30 | * @param \Aimeos\Shop\Base\Context $context Context object |
31 | 31 | */ |
32 | - public function __construct( \Aimeos\Shop\Base\Context $context ) |
|
32 | + public function __construct(\Aimeos\Shop\Base\Context $context) |
|
33 | 33 | { |
34 | 34 | $this->context = $context; |
35 | 35 | } |
@@ -42,21 +42,21 @@ discard block |
||
42 | 42 | * @param string $groupcode Unique user/customer group code |
43 | 43 | * @return boolean True if user is part of the group, false if not |
44 | 44 | */ |
45 | - public function checkGroup( $userid, $groupcode ) |
|
45 | + public function checkGroup($userid, $groupcode) |
|
46 | 46 | { |
47 | 47 | $context = $this->context->get(); |
48 | - $group = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' )->findItem( $groupcode ); |
|
49 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' ); |
|
48 | + $group = \Aimeos\MShop\Factory::createManager($context, 'customer/group')->findItem($groupcode); |
|
49 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists'); |
|
50 | 50 | |
51 | 51 | $search = $manager->createSearch(); |
52 | 52 | $expr = array( |
53 | - $search->compare( '==', 'customer.lists.parentid', $userid ), |
|
54 | - $search->compare( '==', 'customer.lists.refid', $group->getId() ), |
|
55 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), |
|
53 | + $search->compare('==', 'customer.lists.parentid', $userid), |
|
54 | + $search->compare('==', 'customer.lists.refid', $group->getId()), |
|
55 | + $search->compare('==', 'customer.lists.domain', 'customer/group'), |
|
56 | 56 | ); |
57 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
58 | - $search->setSlice( 0, 1 ); |
|
57 | + $search->setConditions($search->combine('&&', $expr)); |
|
58 | + $search->setSlice(0, 1); |
|
59 | 59 | |
60 | - return (bool) count( $manager->searchItems( $search ) ); |
|
60 | + return (bool) count($manager->searchItems($search)); |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | \ No newline at end of file |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
50 | 50 | * @param \Illuminate\Session\Store $session Laravel session object |
51 | 51 | */ |
52 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Illuminate\Session\Store $session ) |
|
52 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Illuminate\Session\Store $session) |
|
53 | 53 | { |
54 | 54 | $this->config = $config; |
55 | 55 | $this->session = $session; |
@@ -62,48 +62,48 @@ discard block |
||
62 | 62 | * @param boolean $locale True to add locale object to context, false if not |
63 | 63 | * @return \Aimeos\MShop\Context\Item\Iface Context object |
64 | 64 | */ |
65 | - public function get( $locale = true ) |
|
65 | + public function get($locale = true) |
|
66 | 66 | { |
67 | - if( self::$context === null ) |
|
67 | + if (self::$context === null) |
|
68 | 68 | { |
69 | 69 | $context = new \Aimeos\MShop\Context\Item\Standard(); |
70 | 70 | |
71 | 71 | $config = $this->getConfig(); |
72 | - $context->setConfig( $config ); |
|
72 | + $context->setConfig($config); |
|
73 | 73 | |
74 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $config ); |
|
75 | - $context->setDatabaseManager( $dbm ); |
|
74 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($config); |
|
75 | + $context->setDatabaseManager($dbm); |
|
76 | 76 | |
77 | - $fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, storage_path( 'aimeos' ) ); |
|
78 | - $context->setFilesystemManager( $fs ); |
|
77 | + $fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, storage_path('aimeos')); |
|
78 | + $context->setFilesystemManager($fs); |
|
79 | 79 | |
80 | - $mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } ); |
|
81 | - $context->setMail( $mail ); |
|
80 | + $mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } ); |
|
81 | + $context->setMail($mail); |
|
82 | 82 | |
83 | - $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context ); |
|
84 | - $context->setLogger( $logger ); |
|
83 | + $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context); |
|
84 | + $context->setLogger($logger); |
|
85 | 85 | |
86 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context ); |
|
87 | - $context->setCache( $cache ); |
|
86 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context); |
|
87 | + $context->setCache($cache); |
|
88 | 88 | |
89 | 89 | self::$context = $context; |
90 | 90 | } |
91 | 91 | |
92 | 92 | $context = self::$context; |
93 | 93 | |
94 | - if( $locale === true ) |
|
94 | + if ($locale === true) |
|
95 | 95 | { |
96 | - $localeItem = $this->getLocale( $context ); |
|
96 | + $localeItem = $this->getLocale($context); |
|
97 | 97 | $langid = $localeItem->getLanguageId(); |
98 | 98 | |
99 | - $context->setLocale( $localeItem ); |
|
100 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $langid ) ) ); |
|
99 | + $context->setLocale($localeItem); |
|
100 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($langid))); |
|
101 | 101 | } |
102 | 102 | |
103 | - $session = new \Aimeos\MW\Session\Laravel5( $this->session ); |
|
104 | - $context->setSession( $session ); |
|
103 | + $session = new \Aimeos\MW\Session\Laravel5($this->session); |
|
104 | + $context->setSession($session); |
|
105 | 105 | |
106 | - $this->addUser( $context ); |
|
106 | + $this->addUser($context); |
|
107 | 107 | |
108 | 108 | return $context; |
109 | 109 | } |
@@ -114,20 +114,20 @@ discard block |
||
114 | 114 | * |
115 | 115 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
116 | 116 | */ |
117 | - protected function addUser( \Aimeos\MShop\Context\Item\Iface $context ) |
|
117 | + protected function addUser(\Aimeos\MShop\Context\Item\Iface $context) |
|
118 | 118 | { |
119 | - if( ( $userid = Auth::id() ) !== null ) |
|
119 | + if (($userid = Auth::id()) !== null) |
|
120 | 120 | { |
121 | - $context->setUserId( $userid ); |
|
122 | - $context->setGroupIds( function() use ( $context, $userid ) |
|
121 | + $context->setUserId($userid); |
|
122 | + $context->setGroupIds(function() use ($context, $userid) |
|
123 | 123 | { |
124 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
125 | - return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups(); |
|
124 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
125 | + return $manager->getItem($userid, array('customer/group'))->getGroups(); |
|
126 | 126 | } ); |
127 | 127 | } |
128 | 128 | |
129 | - if( ( $user = Auth::user() ) !== null ) { |
|
130 | - $context->setEditor( $user->name ); |
|
129 | + if (($user = Auth::user()) !== null) { |
|
130 | + $context->setEditor($user->name); |
|
131 | 131 | } |
132 | 132 | } |
133 | 133 | |
@@ -139,13 +139,13 @@ discard block |
||
139 | 139 | */ |
140 | 140 | protected function getConfig() |
141 | 141 | { |
142 | - $conf = $this->config->get( 'shop' ); |
|
142 | + $conf = $this->config->get('shop'); |
|
143 | 143 | |
144 | - $configPaths = app( '\Aimeos\Shop\Base\Aimeos' )->get()->getConfigPaths( 'mysql' ); |
|
145 | - $config = new \Aimeos\MW\Config\PHPArray( $conf, $configPaths ); |
|
144 | + $configPaths = app('\Aimeos\Shop\Base\Aimeos')->get()->getConfigPaths('mysql'); |
|
145 | + $config = new \Aimeos\MW\Config\PHPArray($conf, $configPaths); |
|
146 | 146 | |
147 | - if( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) { |
|
148 | - $config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); |
|
147 | + if (function_exists('apc_store') === true && $this->config->get('shop.apc_enabled', false) == true) { |
|
148 | + $config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:')); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | return $config; |
@@ -158,15 +158,15 @@ discard block |
||
158 | 158 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
159 | 159 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
160 | 160 | */ |
161 | - protected function getLocale( \Aimeos\MShop\Context\Item\Iface $context ) |
|
161 | + protected function getLocale(\Aimeos\MShop\Context\Item\Iface $context) |
|
162 | 162 | { |
163 | - if( $this->locale === null ) |
|
163 | + if ($this->locale === null) |
|
164 | 164 | { |
165 | - if( Route::current() !== null ) |
|
165 | + if (Route::current() !== null) |
|
166 | 166 | { |
167 | - $site = Route::input( 'site', 'default' ); |
|
168 | - $lang = Route::input( 'locale', '' ); |
|
169 | - $currency = Route::input( 'currency', '' ); |
|
167 | + $site = Route::input('site', 'default'); |
|
168 | + $lang = Route::input('locale', ''); |
|
169 | + $currency = Route::input('currency', ''); |
|
170 | 170 | } |
171 | 171 | else |
172 | 172 | { |
@@ -174,10 +174,10 @@ discard block |
||
174 | 174 | $lang = $currency = ''; |
175 | 175 | } |
176 | 176 | |
177 | - $disableSites = $this->config->has( 'shop.disableSites' ); |
|
177 | + $disableSites = $this->config->has('shop.disableSites'); |
|
178 | 178 | |
179 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
180 | - $this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites ); |
|
179 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
180 | + $this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites); |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | return $this->locale; |