@@ -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 | |
@@ -283,7 +283,7 @@ |
||
| 283 | 283 | } |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | - $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed ); |
|
| 286 | + $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app( 'url' ), $fixed ); |
|
| 287 | 287 | $view->addHelper( 'url', $helper ); |
| 288 | 288 | |
| 289 | 289 | return $view; |
@@ -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 | } |
@@ -41,7 +41,7 @@ |
||
| 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, |
|
| 44 | + public function __construct( \Aimeos\Shop\Base\Aimeos $aimeos, |
|
| 45 | 45 | \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view ) |
| 46 | 46 | { |
| 47 | 47 | $this->context = $context->get(); |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | |
| 61 | 61 | if( Route::current() ) |
| 62 | 62 | { |
| 63 | - $site = Route::input( 'site', $site ); |
|
| 63 | + $site = Route::input( 'site', $site ); |
|
| 64 | 64 | $currency = Route::input( 'currency', $currency ); |
| 65 | 65 | $lang = Route::input( 'locale', $lang ); |
| 66 | 66 | } |
@@ -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 | |
@@ -42,8 +42,8 @@ discard block |
||
| 42 | 42 | $this->loadRoutesFrom( $basedir . 'routes.php' ); |
| 43 | 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,38 +54,38 @@ 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 | - $this->app->singleton('aimeos', function($app) { |
|
| 60 | - return new \Aimeos\Shop\Base\Aimeos($app['config']); |
|
| 59 | + $this->app->singleton( 'aimeos', function( $app ) { |
|
| 60 | + return new \Aimeos\Shop\Base\Aimeos( $app['config'] ); |
|
| 61 | 61 | }); |
| 62 | 62 | |
| 63 | - $this->app->singleton('aimeos.config', function($app) { |
|
| 64 | - return new \Aimeos\Shop\Base\Config($app['config'], $app['aimeos']); |
|
| 63 | + $this->app->singleton( 'aimeos.config', function( $app ) { |
|
| 64 | + return new \Aimeos\Shop\Base\Config( $app['config'], $app['aimeos'] ); |
|
| 65 | 65 | }); |
| 66 | 66 | |
| 67 | - $this->app->singleton('aimeos.i18n', function($app) { |
|
| 68 | - return new \Aimeos\Shop\Base\I18n($this->app['config'], $app['aimeos']); |
|
| 67 | + $this->app->singleton( 'aimeos.i18n', function( $app ) { |
|
| 68 | + return new \Aimeos\Shop\Base\I18n( $this->app['config'], $app['aimeos'] ); |
|
| 69 | 69 | }); |
| 70 | 70 | |
| 71 | - $this->app->singleton('aimeos.locale', function($app) { |
|
| 72 | - return new \Aimeos\Shop\Base\Locale($app['config']); |
|
| 71 | + $this->app->singleton( 'aimeos.locale', function( $app ) { |
|
| 72 | + return new \Aimeos\Shop\Base\Locale( $app['config'] ); |
|
| 73 | 73 | }); |
| 74 | 74 | |
| 75 | - $this->app->singleton('aimeos.context', function($app) { |
|
| 76 | - return new \Aimeos\Shop\Base\Context($app['session.store'], $app['aimeos.config'], $app['aimeos.locale'], $app['aimeos.i18n']); |
|
| 75 | + $this->app->singleton( 'aimeos.context', function( $app ) { |
|
| 76 | + return new \Aimeos\Shop\Base\Context( $app['session.store'], $app['aimeos.config'], $app['aimeos.locale'], $app['aimeos.i18n'] ); |
|
| 77 | 77 | }); |
| 78 | 78 | |
| 79 | - $this->app->singleton('aimeos.support', function($app) { |
|
| 80 | - return new \Aimeos\Shop\Base\Support($app['aimeos.context'], $app['aimeos.locale']); |
|
| 79 | + $this->app->singleton( 'aimeos.support', function( $app ) { |
|
| 80 | + return new \Aimeos\Shop\Base\Support( $app['aimeos.context'], $app['aimeos.locale'] ); |
|
| 81 | 81 | }); |
| 82 | 82 | |
| 83 | - $this->app->singleton('aimeos.view', function($app) { |
|
| 84 | - return new \Aimeos\Shop\Base\View($app['config'], $app['aimeos.i18n'], $app['aimeos.support']); |
|
| 83 | + $this->app->singleton( 'aimeos.view', function( $app ) { |
|
| 84 | + return new \Aimeos\Shop\Base\View( $app['config'], $app['aimeos.i18n'], $app['aimeos.support'] ); |
|
| 85 | 85 | }); |
| 86 | 86 | |
| 87 | - $this->app->singleton('aimeos.shop', function($app) { |
|
| 88 | - return new \Aimeos\Shop\Base\Shop($app['aimeos'], $app['aimeos.context'], $app['aimeos.view']); |
|
| 87 | + $this->app->singleton( 'aimeos.shop', function( $app ) { |
|
| 88 | + return new \Aimeos\Shop\Base\Shop( $app['aimeos'], $app['aimeos.context'], $app['aimeos.view'] ); |
|
| 89 | 89 | }); |
| 90 | 90 | |
| 91 | 91 | |
@@ -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 | |
@@ -4,40 +4,40 @@ |
||
| 4 | 4 | |
| 5 | 5 | 'apc_enabled' => false, |
| 6 | 6 | 'apc_prefix' => 'laravel:', |
| 7 | - 'extdir' => base_path('ext'), |
|
| 7 | + 'extdir' => base_path( 'ext' ), |
|
| 8 | 8 | 'pcntl_max' => 4, |
| 9 | 9 | 'pcntl_priority' => 19, |
| 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' ), |
|
| 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 | 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' ), |
|
| 16 | + 'catalog-detail' => array( 'basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session' ), |
|
| 17 | + 'catalog-list' => array( 'basket/mini', 'catalog/filter', 'catalog/lists' ), |
|
| 18 | 18 | 'catalog-stock' => array( 'catalog/stock' ), |
| 19 | 19 | 'catalog-suggest' => array( 'catalog/suggest' ), |
| 20 | - 'catalog-tree' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ), |
|
| 20 | + 'catalog-tree' => array( 'basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists' ), |
|
| 21 | 21 | 'checkout-confirm' => array( 'checkout/confirm' ), |
| 22 | 22 | 'checkout-index' => array( 'checkout/standard' ), |
| 23 | - 'checkout-update' => array( 'checkout/update'), |
|
| 23 | + 'checkout-update' => array( 'checkout/update' ), |
|
| 24 | 24 | ), |
| 25 | 25 | |
| 26 | 26 | 'resource' => array( |
| 27 | 27 | 'db' => array( |
| 28 | - 'adapter' => config('database.connections.mysql.driver', 'mysql'), |
|
| 29 | - 'host' => config('database.connections.mysql.host', '127.0.0.1'), |
|
| 30 | - 'port' => config('database.connections.mysql.port', '3306'), |
|
| 31 | - 'socket' => config('database.connections.mysql.unix_socket', ''), |
|
| 32 | - 'database' => config('database.connections.mysql.database', 'forge'), |
|
| 33 | - 'username' => config('database.connections.mysql.username', 'forge'), |
|
| 34 | - 'password' => config('database.connections.mysql.password', ''), |
|
| 28 | + 'adapter' => config( 'database.connections.mysql.driver', 'mysql' ), |
|
| 29 | + 'host' => config( 'database.connections.mysql.host', '127.0.0.1' ), |
|
| 30 | + 'port' => config( 'database.connections.mysql.port', '3306' ), |
|
| 31 | + 'socket' => config( 'database.connections.mysql.unix_socket', '' ), |
|
| 32 | + 'database' => config( 'database.connections.mysql.database', 'forge' ), |
|
| 33 | + 'username' => config( 'database.connections.mysql.username', 'forge' ), |
|
| 34 | + 'password' => config( 'database.connections.mysql.password', '' ), |
|
| 35 | 35 | 'stmt' => ["SET SESSION sort_buffer_size=2097144; SET NAMES 'utf8mb4'; SET SESSION sql_mode='ANSI'"], |
| 36 | 36 | 'opt-persistent' => 0, |
| 37 | 37 | 'limit' => 3, |
| 38 | 38 | 'defaultTableOptions' => [ |
| 39 | - 'charset' => config('database.connections.mysql.charset'), |
|
| 40 | - 'collate' => config('database.connections.mysql.collation'), |
|
| 39 | + 'charset' => config( 'database.connections.mysql.charset' ), |
|
| 40 | + 'collate' => config( 'database.connections.mysql.collation' ), |
|
| 41 | 41 | ], |
| 42 | 42 | ), |
| 43 | 43 | 'fs' => array( |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | @section('aimeos_scripts') |
| 4 | 4 | @parent |
| 5 | - <script type="text/javascript" src="<?php echo asset('packages/aimeos/shop/themes/aimeos-detail.js'); ?>"></script> |
|
| 5 | + <script type="text/javascript" src="<?php echo asset( 'packages/aimeos/shop/themes/aimeos-detail.js' ); ?>"></script> |
|
| 6 | 6 | @stop |
| 7 | 7 | |
| 8 | 8 | @section('aimeos_header') |