@@ -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 |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | * |
39 | 39 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
40 | 40 | */ |
41 | - public function __construct( \Illuminate\Contracts\Config\Repository $config ) |
|
41 | + public function __construct(\Illuminate\Contracts\Config\Repository $config) |
|
42 | 42 | { |
43 | 43 | $this->config = $config; |
44 | 44 | } |
@@ -50,25 +50,25 @@ discard block |
||
50 | 50 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
51 | 51 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
52 | 52 | */ |
53 | - public function get( \Aimeos\MShop\Context\Item\Iface $context ) |
|
53 | + public function get(\Aimeos\MShop\Context\Item\Iface $context) |
|
54 | 54 | { |
55 | - if( $this->locale === null ) |
|
55 | + if ($this->locale === null) |
|
56 | 56 | { |
57 | - $site = Input::get( 'site', 'default' ); |
|
58 | - $currency = Input::get( 'currency', '' ); |
|
59 | - $lang = Input::get( 'locale', '' ); |
|
57 | + $site = Input::get('site', 'default'); |
|
58 | + $currency = Input::get('currency', ''); |
|
59 | + $lang = Input::get('locale', ''); |
|
60 | 60 | |
61 | - if( Route::current() ) |
|
61 | + if (Route::current()) |
|
62 | 62 | { |
63 | - $site = Route::input( 'site', $site ); |
|
64 | - $currency = Route::input( 'currency', $currency ); |
|
65 | - $lang = Route::input( 'locale', $lang ); |
|
63 | + $site = Route::input('site', $site); |
|
64 | + $currency = Route::input('currency', $currency); |
|
65 | + $lang = Route::input('locale', $lang); |
|
66 | 66 | } |
67 | 67 | |
68 | - $disableSites = $this->config->get( 'shop.disableSites', true ); |
|
68 | + $disableSites = $this->config->get('shop.disableSites', true); |
|
69 | 69 | |
70 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
71 | - $this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites ); |
|
70 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
71 | + $this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | return $this->locale; |
@@ -82,17 +82,17 @@ discard block |
||
82 | 82 | * @param string $site Unique site code |
83 | 83 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
84 | 84 | */ |
85 | - public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
85 | + public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
86 | 86 | { |
87 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
87 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
88 | 88 | |
89 | 89 | try |
90 | 90 | { |
91 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
|
92 | - $localeItem->setLanguageId( null ); |
|
93 | - $localeItem->setCurrencyId( null ); |
|
91 | + $localeItem = $localeManager->bootstrap($site, '', '', false); |
|
92 | + $localeItem->setLanguageId(null); |
|
93 | + $localeItem->setCurrencyId(null); |
|
94 | 94 | } |
95 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
95 | + catch (\Aimeos\MShop\Locale\Exception $e) |
|
96 | 96 | { |
97 | 97 | $localeItem = $localeManager->createItem(); |
98 | 98 | } |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | */ |
8 | 8 | |
9 | 9 | |
10 | -if( !function_exists( 'aiconfig' ) ) |
|
10 | +if (!function_exists('aiconfig')) |
|
11 | 11 | { |
12 | 12 | /** |
13 | 13 | * Returns the configuration setting for the given key |
@@ -16,14 +16,14 @@ discard block |
||
16 | 16 | * @param mixed $default Default value if the configuration key isn't found |
17 | 17 | * @return mixed Configuration value |
18 | 18 | */ |
19 | - function aiconfig( $key, $default = null ) |
|
19 | + function aiconfig($key, $default = null) |
|
20 | 20 | { |
21 | - return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default ); |
|
21 | + return app('\Aimeos\Shop\Base\Config')->get()->get($key, $default); |
|
22 | 22 | } |
23 | 23 | } |
24 | 24 | |
25 | 25 | |
26 | -if( !function_exists( 'aitrans' ) ) |
|
26 | +if (!function_exists('aitrans')) |
|
27 | 27 | { |
28 | 28 | /** |
29 | 29 | * Translates the given message |
@@ -34,16 +34,16 @@ discard block |
||
34 | 34 | * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
35 | 35 | * @return string Translated string |
36 | 36 | */ |
37 | - function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null ) |
|
37 | + function aitrans($singular, array $params = array(), $domain = 'client', $locale = null) |
|
38 | 38 | { |
39 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
39 | + $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale); |
|
40 | 40 | |
41 | - return vsprintf( $i18n->dt( $domain, $singular ), $params ); |
|
41 | + return vsprintf($i18n->dt($domain, $singular), $params); |
|
42 | 42 | } |
43 | 43 | } |
44 | 44 | |
45 | 45 | |
46 | -if( !function_exists( 'aitransplural' ) ) |
|
46 | +if (!function_exists('aitransplural')) |
|
47 | 47 | { |
48 | 48 | /** |
49 | 49 | * Translates the given messages based on the number |
@@ -56,10 +56,10 @@ discard block |
||
56 | 56 | * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
57 | 57 | * @return string Translated string |
58 | 58 | */ |
59 | - function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null ) |
|
59 | + function aitransplural($singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null) |
|
60 | 60 | { |
61 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
61 | + $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale); |
|
62 | 62 | |
63 | - return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params ); |
|
63 | + return vsprintf($i18n->dn($domain, $singular, $plural, $number), $params); |
|
64 | 64 | } |
65 | 65 | } |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/ext-all.css" /> |
10 | 10 | <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/xtheme-gray.css" /> |
11 | 11 | @foreach ($cssFiles as $cssFile) |
12 | - <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/' . $cssFile) ?>" /> |
|
12 | + <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/'.$cssFile) ?>" /> |
|
13 | 13 | @endforeach |
14 | 14 | |
15 | 15 | <script type="text/javascript"> |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | |
46 | 46 | <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/adapter/ext/ext-base.js"></script> |
47 | 47 | <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/ext-all.js"></script> |
48 | - <script type="text/javascript" src="<?= route( 'aimeos_shop_extadm_file', array( 'site' => $site ) ); ?>"></script> |
|
48 | + <script type="text/javascript" src="<?= route('aimeos_shop_extadm_file', array('site' => $site)); ?>"></script> |
|
49 | 49 | |
50 | 50 | </head> |
51 | 51 | <body> |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | * |
35 | 35 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
36 | 36 | */ |
37 | - public function __construct( \Illuminate\Contracts\Config\Repository $config ) |
|
37 | + public function __construct(\Illuminate\Contracts\Config\Repository $config) |
|
38 | 38 | { |
39 | 39 | $this->config = $config; |
40 | 40 | } |
@@ -47,16 +47,16 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public function get() |
49 | 49 | { |
50 | - if( $this->object === null ) |
|
50 | + if ($this->object === null) |
|
51 | 51 | { |
52 | - $dir = base_path( 'ext' ); |
|
52 | + $dir = base_path('ext'); |
|
53 | 53 | |
54 | - if( !is_dir( $dir ) ) { |
|
55 | - $dir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'ext'; |
|
54 | + if (!is_dir($dir)) { |
|
55 | + $dir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'ext'; |
|
56 | 56 | } |
57 | 57 | |
58 | - $extDirs = (array) $this->config->get( 'shop.extdir', $dir ); |
|
59 | - $this->object = new \Aimeos\Bootstrap( $extDirs, false ); |
|
58 | + $extDirs = (array) $this->config->get('shop.extdir', $dir); |
|
59 | + $this->object = new \Aimeos\Bootstrap($extDirs, false); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | return $this->object; |
@@ -70,12 +70,12 @@ discard block |
||
70 | 70 | */ |
71 | 71 | public function getVersion() |
72 | 72 | { |
73 | - if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false |
|
74 | - && ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] ) |
|
73 | + if (($content = @file_get_contents(base_path('composer.lock'))) !== false |
|
74 | + && ($content = json_decode($content, true)) !== null && isset($content['packages']) |
|
75 | 75 | ) { |
76 | - foreach( (array) $content['packages'] as $item ) |
|
76 | + foreach ((array) $content['packages'] as $item) |
|
77 | 77 | { |
78 | - if( $item['name'] === 'aimeos/aimeos-laravel' ) { |
|
78 | + if ($item['name'] === 'aimeos/aimeos-laravel') { |
|
79 | 79 | return $item['version']; |
80 | 80 | } |
81 | 81 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
41 | 41 | * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object |
42 | 42 | */ |
43 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos ) |
|
43 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos) |
|
44 | 44 | { |
45 | 45 | $this->aimeos = $aimeos; |
46 | 46 | $this->config = $config; |
@@ -53,23 +53,23 @@ discard block |
||
53 | 53 | * @param integer $type Configuration type ("frontend" or "backend") |
54 | 54 | * @return \Aimeos\MW\Config\Iface Configuration object |
55 | 55 | */ |
56 | - public function get( $type = 'frontend' ) |
|
56 | + public function get($type = 'frontend') |
|
57 | 57 | { |
58 | - if( !isset( $this->objects[$type] ) ) |
|
58 | + if (!isset($this->objects[$type])) |
|
59 | 59 | { |
60 | 60 | $configPaths = $this->aimeos->get()->getConfigPaths(); |
61 | - $cfgfile = dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'default.php'; |
|
61 | + $cfgfile = dirname(dirname(dirname(__DIR__))).DIRECTORY_SEPARATOR.'default.php'; |
|
62 | 62 | |
63 | - $config = new \Aimeos\MW\Config\PHPArray( require $cfgfile, $configPaths ); |
|
63 | + $config = new \Aimeos\MW\Config\PHPArray(require $cfgfile, $configPaths); |
|
64 | 64 | |
65 | - if( $this->config->get( 'shop.apc_enabled', false ) == true ) { |
|
66 | - $config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); |
|
65 | + if ($this->config->get('shop.apc_enabled', false) == true) { |
|
66 | + $config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:')); |
|
67 | 67 | } |
68 | 68 | |
69 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->config->get( 'shop' ) ); |
|
69 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->config->get('shop')); |
|
70 | 70 | |
71 | - if( ( $conf = $this->config->get( 'shop.' . $type, array() ) ) !== array() ) { |
|
72 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $conf ); |
|
71 | + if (($conf = $this->config->get('shop.'.$type, array())) !== array()) { |
|
72 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $conf); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | $this->objects[$type] = $config; |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
41 | 41 | * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object |
42 | 42 | */ |
43 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos ) |
|
43 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos) |
|
44 | 44 | { |
45 | 45 | $this->aimeos = $aimeos; |
46 | 46 | $this->config = $config; |
@@ -53,22 +53,22 @@ discard block |
||
53 | 53 | * @param array $languageIds List of two letter ISO language IDs |
54 | 54 | * @return \Aimeos\MW\Translation\Iface[] List of translation objects |
55 | 55 | */ |
56 | - public function get( array $languageIds ) |
|
56 | + public function get(array $languageIds) |
|
57 | 57 | { |
58 | 58 | $i18nPaths = $this->aimeos->get()->getI18nPaths(); |
59 | 59 | |
60 | - foreach( $languageIds as $langid ) |
|
60 | + foreach ($languageIds as $langid) |
|
61 | 61 | { |
62 | - if( !isset( $this->i18n[$langid] ) ) |
|
62 | + if (!isset($this->i18n[$langid])) |
|
63 | 63 | { |
64 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid ); |
|
64 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid); |
|
65 | 65 | |
66 | - if( $this->config->get( 'shop.apc_enabled', false ) == true ) { |
|
67 | - $i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); |
|
66 | + if ($this->config->get('shop.apc_enabled', false) == true) { |
|
67 | + $i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $this->config->get('shop.apc_prefix', 'laravel:')); |
|
68 | 68 | } |
69 | 69 | |
70 | - if( $this->config->has( 'shop.i18n.' . $langid ) ) { |
|
71 | - $i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $this->config->get( 'shop.i18n.' . $langid ) ); |
|
70 | + if ($this->config->has('shop.i18n.'.$langid)) { |
|
71 | + $i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $this->config->get('shop.i18n.'.$langid)); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | $this->i18n[$langid] = $i18n; |
@@ -29,7 +29,7 @@ |
||
29 | 29 | */ |
30 | 30 | public function indexAction() |
31 | 31 | { |
32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' ); |
|
32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index'); |
|
33 | 33 | return Response::view('shop::basket.index', $params)->header('Cache-Control', 'no-store'); |
34 | 34 | } |
35 | 35 | } |
36 | 36 | \ No newline at end of file |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function confirmAction() |
31 | 31 | { |
32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' ); |
|
32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm'); |
|
33 | 33 | return Response::view('shop::checkout.confirm', $params)->header('Cache-Control', 'no-store'); |
34 | 34 | } |
35 | 35 | |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function indexAction() |
43 | 43 | { |
44 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' ); |
|
44 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index'); |
|
45 | 45 | return Response::view('shop::checkout.index', $params)->header('Cache-Control', 'no-store'); |
46 | 46 | } |
47 | 47 | |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | */ |
54 | 54 | public function updateAction() |
55 | 55 | { |
56 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' ); |
|
56 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update'); |
|
57 | 57 | return Response::view('shop::checkout.update', $params)->header('Cache-Control', 'no-store'); |
58 | 58 | } |
59 | 59 | } |
60 | 60 | \ No newline at end of file |