@@ -29,19 +29,19 @@ |
||
29 | 29 | * @param string|array $sites Unique site codes |
30 | 30 | * @return \Aimeos\MShop\Locale\Item\Site\Iface[] List of site items |
31 | 31 | */ |
32 | - protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, $sites ) |
|
32 | + protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, $sites) |
|
33 | 33 | { |
34 | - $manager = \Aimeos\MShop::create( $context, 'locale/site' ); |
|
34 | + $manager = \Aimeos\MShop::create($context, 'locale/site'); |
|
35 | 35 | $search = $manager->createSearch(); |
36 | 36 | |
37 | - if( is_scalar( $sites ) && $sites != '' ) { |
|
38 | - $sites = explode( ' ', $sites ); |
|
37 | + if (is_scalar($sites) && $sites != '') { |
|
38 | + $sites = explode(' ', $sites); |
|
39 | 39 | } |
40 | 40 | |
41 | - if( !empty( $sites ) ) { |
|
42 | - $search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) ); |
|
41 | + if (!empty($sites)) { |
|
42 | + $search->setConditions($search->compare('==', 'locale.site.code', $sites)); |
|
43 | 43 | } |
44 | 44 | |
45 | - return $manager->searchItems( $search ); |
|
45 | + return $manager->searchItems($search); |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | \ No newline at end of file |
@@ -44,24 +44,24 @@ |
||
44 | 44 | */ |
45 | 45 | public function handle() |
46 | 46 | { |
47 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' ); |
|
48 | - $context->setEditor( 'aimeos:cache' ); |
|
47 | + $context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command'); |
|
48 | + $context->setEditor('aimeos:cache'); |
|
49 | 49 | |
50 | - $localeManager = \Aimeos\MShop::create( $context, 'locale' ); |
|
50 | + $localeManager = \Aimeos\MShop::create($context, 'locale'); |
|
51 | 51 | |
52 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
52 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
53 | 53 | { |
54 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
54 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
55 | 55 | |
56 | 56 | $lcontext = clone $context; |
57 | - $lcontext->setLocale( $localeItem ); |
|
57 | + $lcontext->setLocale($localeItem); |
|
58 | 58 | |
59 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext ); |
|
60 | - $lcontext->setCache( $cache ); |
|
59 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext); |
|
60 | + $lcontext->setCache($cache); |
|
61 | 61 | |
62 | - $this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) ); |
|
62 | + $this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode())); |
|
63 | 63 | |
64 | - \Aimeos\MAdmin::create( $lcontext, 'cache' )->getCache()->clear(); |
|
64 | + \Aimeos\MAdmin::create($lcontext, 'cache')->getCache()->clear(); |
|
65 | 65 | } |
66 | 66 | } |
67 | 67 | } |
@@ -10,17 +10,17 @@ 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/lists' ), |
|
18 | - 'catalog-stock' => array( 'catalog/stock' ), |
|
19 | - 'catalog-suggest' => array( 'catalog/suggest' ), |
|
20 | - 'catalog-tree' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ), |
|
21 | - 'checkout-confirm' => array( 'checkout/confirm' ), |
|
22 | - 'checkout-index' => array( 'checkout/standard' ), |
|
23 | - '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/lists'), |
|
18 | + 'catalog-stock' => array('catalog/stock'), |
|
19 | + 'catalog-suggest' => array('catalog/suggest'), |
|
20 | + 'catalog-tree' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'), |
|
21 | + 'checkout-confirm' => array('checkout/confirm'), |
|
22 | + 'checkout-index' => array('checkout/standard'), |
|
23 | + 'checkout-update' => array('checkout/update'), |
|
24 | 24 | ), |
25 | 25 | |
26 | 26 | 'resource' => array( |
@@ -43,22 +43,22 @@ discard block |
||
43 | 43 | 'fs' => array( |
44 | 44 | 'adapter' => 'Standard', |
45 | 45 | 'basedir' => public_path(), |
46 | - 'tempdir' => storage_path( 'tmp' ), |
|
46 | + 'tempdir' => storage_path('tmp'), |
|
47 | 47 | ), |
48 | 48 | 'fs-admin' => array( |
49 | 49 | 'adapter' => 'Standard', |
50 | - 'basedir' => storage_path( 'admin' ), |
|
51 | - 'tempdir' => storage_path( 'tmp' ), |
|
50 | + 'basedir' => storage_path('admin'), |
|
51 | + 'tempdir' => storage_path('tmp'), |
|
52 | 52 | ), |
53 | 53 | 'fs-import' => array( |
54 | 54 | 'adapter' => 'Standard', |
55 | - 'basedir' => storage_path( 'import' ), |
|
56 | - 'tempdir' => storage_path( 'tmp' ), |
|
55 | + 'basedir' => storage_path('import'), |
|
56 | + 'tempdir' => storage_path('tmp'), |
|
57 | 57 | ), |
58 | 58 | 'fs-secure' => array( |
59 | 59 | 'adapter' => 'Standard', |
60 | - 'basedir' => storage_path( 'secure' ), |
|
61 | - 'tempdir' => storage_path( 'tmp' ), |
|
60 | + 'basedir' => storage_path('secure'), |
|
61 | + 'tempdir' => storage_path('tmp'), |
|
62 | 62 | ), |
63 | 63 | 'mq' => array( |
64 | 64 | 'adapter' => 'Standard', |
@@ -180,10 +180,10 @@ discard block |
||
180 | 180 | ), |
181 | 181 | 'common' => array( |
182 | 182 | 'content' => array( |
183 | - 'baseurl' => config( 'app.url' ) . '/', |
|
183 | + 'baseurl' => config('app.url').'/', |
|
184 | 184 | ), |
185 | 185 | 'template' => array( |
186 | - 'baseurl' => public_path( 'packages/aimeos/shop/themes/elegance' ), |
|
186 | + 'baseurl' => public_path('packages/aimeos/shop/themes/elegance'), |
|
187 | 187 | ), |
188 | 188 | ), |
189 | 189 | 'basket' => array( |
@@ -230,8 +230,8 @@ discard block |
||
230 | 230 | ), |
231 | 231 | ), |
232 | 232 | 'email' => [ |
233 | - 'from-email' => config( 'mail.from.address' ), |
|
234 | - 'from-name' => config( 'mail.from.name' ), |
|
233 | + 'from-email' => config('mail.from.address'), |
|
234 | + 'from-name' => config('mail.from.name'), |
|
235 | 235 | ], |
236 | 236 | 'locale' => array( |
237 | 237 | 'select' => array( |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | # in the "maxwidth" parameter |
309 | 309 | # 'maxheight' => 280, |
310 | 310 | ), |
311 | - 'tempdir' => storage_path( 'aimeos' ), |
|
311 | + 'tempdir' => storage_path('aimeos'), |
|
312 | 312 | ), |
313 | 313 | ), |
314 | 314 | ), |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | Route::group(config('shop.routes.admin', ['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,52 +152,52 @@ 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' ), 'd/{d_name}/{d_prodid}/{d_pos?}', array( |
|
160 | + Route::match(array('GET', 'POST'), 'd/{d_name}/{d_prodid}/{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' ), 'd/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
165 | + Route::match(array('GET', 'POST'), 'd/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' ), 'c/{f_name}/{f_catid}', array( |
|
175 | + Route::match(array('GET', 'POST'), 'c/{f_name}/{f_catid}', array( |
|
176 | 176 | 'as' => 'aimeos_shop_tree', |
177 | 177 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@treeAction' |
178 | 178 | )); |
179 | 179 | |
180 | - Route::match( array( 'GET', 'POST' ), 'suggest', array( |
|
180 | + Route::match(array('GET', 'POST'), 'suggest', array( |
|
181 | 181 | 'as' => 'aimeos_shop_suggest', |
182 | 182 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction' |
183 | 183 | )); |
184 | 184 | |
185 | - Route::match( array( 'GET', 'POST' ), 'stock', array( |
|
185 | + Route::match(array('GET', 'POST'), 'stock', array( |
|
186 | 186 | 'as' => 'aimeos_shop_stock', |
187 | 187 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction' |
188 | 188 | )); |
189 | 189 | |
190 | - Route::match( array( 'GET', 'POST' ), 'basket', array( |
|
190 | + Route::match(array('GET', 'POST'), 'basket', array( |
|
191 | 191 | 'as' => 'aimeos_shop_basket', |
192 | 192 | 'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction' |
193 | 193 | )); |
194 | 194 | |
195 | - Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array( |
|
195 | + Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array( |
|
196 | 196 | 'as' => 'aimeos_shop_checkout', |
197 | 197 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction' |
198 | 198 | )); |
199 | 199 | |
200 | - Route::match( array( 'GET', 'POST' ), 'confirm/{code?}', array( |
|
200 | + Route::match(array('GET', 'POST'), 'confirm/{code?}', array( |
|
201 | 201 | 'as' => 'aimeos_shop_confirm', |
202 | 202 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction' |
203 | 203 | )); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | |
208 | 208 | Route::group(config('shop.routes.update', []), function() { |
209 | 209 | |
210 | - Route::match( array( 'GET', 'POST' ), 'update', array( |
|
210 | + Route::match(array('GET', 'POST'), 'update', array( |
|
211 | 211 | 'as' => 'aimeos_shop_update', |
212 | 212 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction' |
213 | 213 | )); |
@@ -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 | } |