@@ -175,7 +175,9 @@ |
||
175 | 175 | */ |
176 | 176 | protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context ) |
177 | 177 | { |
178 | - $mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } ); |
|
178 | + $mail = new \Aimeos\MW\Mail\Swift( function() |
|
179 | + { |
|
180 | +return app( 'mailer' )->getSwiftMailer(); } ); |
|
179 | 181 | |
180 | 182 | return $context->setMail( $mail ); |
181 | 183 | } |
@@ -69,9 +69,12 @@ |
||
69 | 69 | $this->cache[$user->id][$groups] = false; |
70 | 70 | $context = $this->context->get( false ); |
71 | 71 | |
72 | - try { |
|
72 | + try |
|
73 | + { |
|
73 | 74 | $site = \Aimeos\MShop::create( $context, 'locale/site' )->getItem( $user->siteid )->getCode(); |
74 | - } catch( \Exception $e ) { |
|
75 | + } |
|
76 | + catch( \Exception $e ) |
|
77 | + { |
|
75 | 78 | $site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' ); |
76 | 79 | } |
77 | 80 |
@@ -100,12 +100,12 @@ discard block |
||
100 | 100 | || ( ( $user = \Illuminate\Support\Facades\Auth::user() ) !== null && $user->superuser ) |
101 | 101 | ) { |
102 | 102 | $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
103 | - } |
|
104 | - else |
|
103 | + } else |
|
105 | 104 | { |
106 | 105 | $support = $this->support; |
107 | 106 | |
108 | - $fcn = function() use ( $support, $context ) { |
|
107 | + $fcn = function() use ( $support, $context ) |
|
108 | + { |
|
109 | 109 | return $support->getGroups( $context ); |
110 | 110 | }; |
111 | 111 | |
@@ -245,8 +245,7 @@ discard block |
||
245 | 245 | { |
246 | 246 | $i18n = $this->i18n->get( array( $locale ) ); |
247 | 247 | $translation = $i18n[$locale]; |
248 | - } |
|
249 | - else |
|
248 | + } else |
|
250 | 249 | { |
251 | 250 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
252 | 251 | } |
@@ -86,9 +86,12 @@ |
||
86 | 86 | { |
87 | 87 | $localeManager = \Aimeos\MShop::create( $context, 'locale' ); |
88 | 88 | |
89 | - try { |
|
89 | + try |
|
90 | + { |
|
90 | 91 | $localeItem = $localeManager->bootstrap( $site, '', '', false, null, true ); |
91 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
92 | + } |
|
93 | + catch( \Aimeos\MShop\Exception $e ) |
|
94 | + { |
|
92 | 95 | $localeItem = $localeManager->createItem(); |
93 | 96 | } |
94 | 97 |
@@ -65,7 +65,8 @@ |
||
65 | 65 | |
66 | 66 | foreach( $jobs as $jobname ) |
67 | 67 | { |
68 | - $fcn = function( $context, $aimeos, $jobname ) { |
|
68 | + $fcn = function( $context, $aimeos, $jobname ) |
|
69 | + { |
|
69 | 70 | \Aimeos\Controller\Jobs::create( $context, $aimeos, $jobname )->run(); |
70 | 71 | }; |
71 | 72 |
@@ -162,9 +162,12 @@ |
||
162 | 162 | { |
163 | 163 | $manager = \Aimeos\MShop::create( $context, 'customer' ); |
164 | 164 | |
165 | - try { |
|
165 | + try |
|
166 | + { |
|
166 | 167 | $item = $manager->findItem( $email ); |
167 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
168 | + } |
|
169 | + catch( \Aimeos\MShop\Exception $e ) |
|
170 | + { |
|
168 | 171 | $item = $manager->createItem(); |
169 | 172 | } |
170 | 173 |
@@ -19,7 +19,8 @@ discard block |
||
19 | 19 | * Aimeos shop service provider for Laravel |
20 | 20 | * @package laravel |
21 | 21 | */ |
22 | -class ShopServiceProvider extends ServiceProvider { |
|
22 | +class ShopServiceProvider extends ServiceProvider |
|
23 | +{ |
|
23 | 24 | |
24 | 25 | /** |
25 | 26 | * Indicates if loading of the provider is deferred. |
@@ -56,35 +57,43 @@ discard block |
||
56 | 57 | { |
57 | 58 | $this->mergeConfigFrom( dirname( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . 'default.php', 'shop'); |
58 | 59 | |
59 | - $this->app->singleton('aimeos', function($app) { |
|
60 | + $this->app->singleton('aimeos', function($app) |
|
61 | + { |
|
60 | 62 | return new \Aimeos\Shop\Base\Aimeos($app['config']); |
61 | 63 | }); |
62 | 64 | |
63 | - $this->app->singleton('aimeos.config', function($app) { |
|
65 | + $this->app->singleton('aimeos.config', function($app) |
|
66 | + { |
|
64 | 67 | return new \Aimeos\Shop\Base\Config($app['config'], $app['aimeos']); |
65 | 68 | }); |
66 | 69 | |
67 | - $this->app->singleton('aimeos.i18n', function($app) { |
|
70 | + $this->app->singleton('aimeos.i18n', function($app) |
|
71 | + { |
|
68 | 72 | return new \Aimeos\Shop\Base\I18n($this->app['config'], $app['aimeos']); |
69 | 73 | }); |
70 | 74 | |
71 | - $this->app->singleton('aimeos.locale', function($app) { |
|
75 | + $this->app->singleton('aimeos.locale', function($app) |
|
76 | + { |
|
72 | 77 | return new \Aimeos\Shop\Base\Locale($app['config']); |
73 | 78 | }); |
74 | 79 | |
75 | - $this->app->singleton('aimeos.context', function($app) { |
|
80 | + $this->app->singleton('aimeos.context', function($app) |
|
81 | + { |
|
76 | 82 | return new \Aimeos\Shop\Base\Context($app['session.store'], $app['aimeos.config'], $app['aimeos.locale'], $app['aimeos.i18n']); |
77 | 83 | }); |
78 | 84 | |
79 | - $this->app->singleton('aimeos.support', function($app) { |
|
85 | + $this->app->singleton('aimeos.support', function($app) |
|
86 | + { |
|
80 | 87 | return new \Aimeos\Shop\Base\Support($app['aimeos.context'], $app['aimeos.locale']); |
81 | 88 | }); |
82 | 89 | |
83 | - $this->app->singleton('aimeos.view', function($app) { |
|
90 | + $this->app->singleton('aimeos.view', function($app) |
|
91 | + { |
|
84 | 92 | return new \Aimeos\Shop\Base\View($app['config'], $app['aimeos.i18n'], $app['aimeos.support']); |
85 | 93 | }); |
86 | 94 | |
87 | - $this->app->singleton('aimeos.shop', function($app) { |
|
95 | + $this->app->singleton('aimeos.shop', function($app) |
|
96 | + { |
|
88 | 97 | return new \Aimeos\Shop\Base\Shop($app['aimeos'], $app['aimeos.context'], $app['aimeos.view']); |
89 | 98 | }); |
90 | 99 |
@@ -1,6 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -Route::group(config('shop.routes.admin', ['prefix' => 'admin', 'middleware' => ['web']]), function() { |
|
3 | +Route::group(config('shop.routes.admin', ['prefix' => 'admin', 'middleware' => ['web']]), function() |
|
4 | +{ |
|
4 | 5 | |
5 | 6 | Route::match( array( 'GET' ), '', array( |
6 | 7 | 'as' => 'aimeos_shop_admin', |
@@ -10,7 +11,8 @@ discard block |
||
10 | 11 | }); |
11 | 12 | |
12 | 13 | |
13 | -Route::group(config('shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']]), function() { |
|
14 | +Route::group(config('shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']]), function() |
|
15 | +{ |
|
14 | 16 | |
15 | 17 | Route::match( array( 'GET' ), 'file/{type}', array( |
16 | 18 | 'as' => 'aimeos_shop_jqadm_file', |
@@ -55,7 +57,8 @@ discard block |
||
55 | 57 | }); |
56 | 58 | |
57 | 59 | |
58 | -Route::group(config('shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']]), function() { |
|
60 | +Route::group(config('shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']]), function() |
|
61 | +{ |
|
59 | 62 | |
60 | 63 | Route::match( array( 'DELETE' ), '{resource}/{id?}', array( |
61 | 64 | 'as' => 'aimeos_shop_jsonadm_delete', |
@@ -90,7 +93,8 @@ discard block |
||
90 | 93 | }); |
91 | 94 | |
92 | 95 | |
93 | -Route::group(config('shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']]), function() { |
|
96 | +Route::group(config('shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']]), function() |
|
97 | +{ |
|
94 | 98 | |
95 | 99 | Route::match( array( 'DELETE' ), '{resource}', array( |
96 | 100 | 'as' => 'aimeos_shop_jsonapi_delete', |
@@ -125,7 +129,8 @@ discard block |
||
125 | 129 | }); |
126 | 130 | |
127 | 131 | |
128 | -Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() { |
|
132 | +Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() |
|
133 | +{ |
|
129 | 134 | |
130 | 135 | Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
131 | 136 | 'as' => 'aimeos_shop_account_favorite', |
@@ -150,7 +155,8 @@ discard block |
||
150 | 155 | }); |
151 | 156 | |
152 | 157 | |
153 | -Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() { |
|
158 | +Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() |
|
159 | +{ |
|
154 | 160 | |
155 | 161 | Route::match( array( 'GET', 'POST' ), 'count', array( |
156 | 162 | 'as' => 'aimeos_shop_count', |
@@ -205,7 +211,8 @@ discard block |
||
205 | 211 | }); |
206 | 212 | |
207 | 213 | |
208 | -Route::group(config('shop.routes.update', []), function() { |
|
214 | +Route::group(config('shop.routes.update', []), function() |
|
215 | +{ |
|
209 | 216 | |
210 | 217 | Route::match( array( 'GET', 'POST' ), 'update', array( |
211 | 218 | 'as' => 'aimeos_shop_update', |