@@ -19,7 +19,8 @@ |
||
| 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. |
@@ -68,9 +68,12 @@ |
||
| 68 | 68 | |
| 69 | 69 | $manager = \Aimeos\MShop::create( $context, 'customer' ); |
| 70 | 70 | |
| 71 | - try { |
|
| 71 | + try |
|
| 72 | + { |
|
| 72 | 73 | $item = $manager->find( $email ); |
| 73 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 74 | + } |
|
| 75 | + catch( \Aimeos\MShop\Exception $e ) |
|
| 76 | + { |
|
| 74 | 77 | $item = $manager->create(); |
| 75 | 78 | } |
| 76 | 79 | |
@@ -44,13 +44,14 @@ |
||
| 44 | 44 | { |
| 45 | 45 | \Composer\Factory::createHttpDownloader( $event->getIO(), $config ) |
| 46 | 46 | ->get( 'https://api.github.com/graphql', $options ); |
| 47 | - } |
|
| 48 | - else |
|
| 47 | + } else |
|
| 49 | 48 | { |
| 50 | 49 | \Composer\Factory::createRemoteFilesystem( $event->getIO(), $config ) |
| 51 | 50 | ->getContents( 'github.com', 'https://api.github.com/graphql', false, $options ); |
| 52 | 51 | } |
| 53 | 52 | } |
| 54 | - catch( \Exception $e ) {} |
|
| 53 | + catch( \Exception $e ) |
|
| 54 | + { |
|
| 55 | +} |
|
| 55 | 56 | } |
| 56 | 57 | } |
@@ -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->create(); |
| 93 | 96 | } |
| 94 | 97 | |
@@ -48,8 +48,7 @@ |
||
| 48 | 48 | $jobs = $this->argument( 'jobs' ); |
| 49 | 49 | $jobs = !is_array( $jobs ) ? explode( ' ', (string) $jobs ) : $jobs; |
| 50 | 50 | |
| 51 | - $fcn = function( \Aimeos\MShop\Context\Item\Iface $lcontext, \Aimeos\Bootstrap $aimeos ) use ( $jobs ) |
|
| 52 | - { |
|
| 51 | + $fcn = function( \Aimeos\MShop\Context\Item\Iface $lcontext, \Aimeos\Bootstrap $aimeos ) use ( $jobs ) { |
|
| 53 | 52 | $jobfcn = function( $context, $aimeos, $jobname ) { |
| 54 | 53 | \Aimeos\Controller\Jobs::create( $context, $aimeos, $jobname )->run(); |
| 55 | 54 | }; |
@@ -1,6 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -switch( config( 'database.default', 'mysql' ) ) { |
|
| 3 | +switch( config( 'database.default', 'mysql' ) ) |
|
| 4 | +{ |
|
| 4 | 5 | case 'pgsql': $aimeosIndexManagerName = 'PgSQL'; break; |
| 5 | 6 | case 'sqlsrv': $aimeosIndexManagerName = 'SQLSrv'; break; |
| 6 | 7 | default: $aimeosIndexManagerName = 'MySQL'; |
@@ -17,20 +17,20 @@ |
||
| 17 | 17 | 'uploaddir' => '/', |
| 18 | 18 | |
| 19 | 19 | 'page' => [ |
| 20 | - 'account-index' => [ 'locale/select', 'basket/mini','catalog/tree','catalog/search','account/profile','account/review','account/subscription','account/history','account/favorite','account/watch','catalog/session' ], |
|
| 21 | - 'basket-index' => [ 'locale/select', 'catalog/tree','catalog/search','basket/standard','basket/bulk','basket/related' ], |
|
| 22 | - 'catalog-count' => [ 'catalog/count' ], |
|
| 23 | - 'catalog-detail' => [ 'locale/select', 'basket/mini','catalog/tree','catalog/search','catalog/stage','catalog/detail','catalog/session' ], |
|
| 24 | - 'catalog-home' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','catalog/home' ], |
|
| 25 | - 'catalog-list' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','catalog/price','catalog/supplier','catalog/attribute','catalog/session','catalog/stage','catalog/lists' ], |
|
| 26 | - 'catalog-session' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','catalog/session' ], |
|
| 27 | - 'catalog-stock' => [ 'catalog/stock' ], |
|
| 28 | - 'catalog-suggest' => [ 'catalog/suggest' ], |
|
| 29 | - 'catalog-tree' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','catalog/price','catalog/supplier','catalog/attribute','catalog/session','catalog/stage','catalog/lists' ], |
|
| 30 | - 'checkout-confirm' => [ 'catalog/tree','catalog/search','checkout/confirm' ], |
|
| 31 | - 'checkout-index' => [ 'locale/select', 'catalog/tree','catalog/search','checkout/standard' ], |
|
| 32 | - 'checkout-update' => [ 'checkout/update' ], |
|
| 33 | - 'supplier-detail' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','supplier/detail','catalog/lists'], |
|
| 20 | + 'account-index' => ['locale/select', 'basket/mini', 'catalog/tree', 'catalog/search', 'account/profile', 'account/review', 'account/subscription', 'account/history', 'account/favorite', 'account/watch', 'catalog/session'], |
|
| 21 | + 'basket-index' => ['locale/select', 'catalog/tree', 'catalog/search', 'basket/standard', 'basket/bulk', 'basket/related'], |
|
| 22 | + 'catalog-count' => ['catalog/count'], |
|
| 23 | + 'catalog-detail' => ['locale/select', 'basket/mini', 'catalog/tree', 'catalog/search', 'catalog/stage', 'catalog/detail', 'catalog/session'], |
|
| 24 | + 'catalog-home' => ['locale/select', 'basket/mini', 'catalog/tree', 'catalog/search', 'catalog/home'], |
|
| 25 | + 'catalog-list' => ['locale/select', 'basket/mini', 'catalog/tree', 'catalog/search', 'catalog/price', 'catalog/supplier', 'catalog/attribute', 'catalog/session', 'catalog/stage', 'catalog/lists'], |
|
| 26 | + 'catalog-session' => ['locale/select', 'basket/mini', 'catalog/tree', 'catalog/search', 'catalog/session'], |
|
| 27 | + 'catalog-stock' => ['catalog/stock'], |
|
| 28 | + 'catalog-suggest' => ['catalog/suggest'], |
|
| 29 | + 'catalog-tree' => ['locale/select', 'basket/mini', 'catalog/tree', 'catalog/search', 'catalog/price', 'catalog/supplier', 'catalog/attribute', 'catalog/session', 'catalog/stage', 'catalog/lists'], |
|
| 30 | + 'checkout-confirm' => ['catalog/tree', 'catalog/search', 'checkout/confirm'], |
|
| 31 | + 'checkout-index' => ['locale/select', 'catalog/tree', 'catalog/search', 'checkout/standard'], |
|
| 32 | + 'checkout-update' => ['checkout/update'], |
|
| 33 | + 'supplier-detail' => ['locale/select', 'basket/mini', 'catalog/tree', 'catalog/search', 'supplier/detail', 'catalog/lists'], |
|
| 34 | 34 | ], |
| 35 | 35 | |
| 36 | 36 | 'resource' => [ |
@@ -100,8 +100,7 @@ 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 | |
@@ -165,8 +164,7 @@ discard block |
||
| 165 | 164 | { |
| 166 | 165 | $pattern = $config->get( 'client/html/common/format/pattern' ); |
| 167 | 166 | $helper = new \Aimeos\MW\View\Helper\Number\Locale( $view, $locale, $pattern ); |
| 168 | - } |
|
| 169 | - else |
|
| 167 | + } else |
|
| 170 | 168 | { |
| 171 | 169 | $sep1000 = $config->get( 'client/html/common/format/separator1000', '' ); |
| 172 | 170 | $decsep = $config->get( 'client/html/common/format/separatorDecimal', '.' ); |
@@ -252,8 +250,7 @@ discard block |
||
| 252 | 250 | { |
| 253 | 251 | $i18n = $this->i18n->get( array( $locale ) ); |
| 254 | 252 | $translation = $i18n[$locale]; |
| 255 | - } |
|
| 256 | - else |
|
| 253 | + } else |
|
| 257 | 254 | { |
| 258 | 255 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
| 259 | 256 | } |