@@ -42,24 +42,24 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function fire() |
44 | 44 | { |
45 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' ); |
|
46 | - $context->setEditor( 'aimeos:cache' ); |
|
45 | + $context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command'); |
|
46 | + $context->setEditor('aimeos:cache'); |
|
47 | 47 | |
48 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
48 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
49 | 49 | |
50 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
50 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
51 | 51 | { |
52 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
52 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
53 | 53 | |
54 | 54 | $lcontext = clone $context; |
55 | - $lcontext->setLocale( $localeItem ); |
|
55 | + $lcontext->setLocale($localeItem); |
|
56 | 56 | |
57 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext ); |
|
58 | - $lcontext->setCache( $cache ); |
|
57 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext); |
|
58 | + $lcontext->setCache($cache); |
|
59 | 59 | |
60 | - $this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) ); |
|
60 | + $this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode())); |
|
61 | 61 | |
62 | - \Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->clear(); |
|
62 | + \Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->clear(); |
|
63 | 63 | } |
64 | 64 | } |
65 | 65 | |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | protected function getArguments() |
73 | 73 | { |
74 | 74 | return array( |
75 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ), |
|
75 | + array('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'), |
|
76 | 76 | ); |
77 | 77 | } |
78 | 78 |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * @param \Aimeos\Shop\Base\I18n $i18n I18n object |
42 | 42 | * @param \Aimeos\Shop\Base\Support $support Support object |
43 | 43 | */ |
44 | - public function __construct( \Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support ) |
|
44 | + public function __construct(\Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support) |
|
45 | 45 | { |
46 | 46 | $this->i18n = $i18n; |
47 | 47 | $this->support = $support; |
@@ -56,21 +56,21 @@ discard block |
||
56 | 56 | * @param string|null $locale Code of the current language or null for no translation |
57 | 57 | * @return \Aimeos\MW\View\Iface View object |
58 | 58 | */ |
59 | - public function create( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null ) |
|
59 | + public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null) |
|
60 | 60 | { |
61 | - $engine = new \Aimeos\MW\View\Engine\Blade( app( 'Illuminate\Contracts\View\Factory' ) ); |
|
62 | - $view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.blade.php' => $engine ) ); |
|
61 | + $engine = new \Aimeos\MW\View\Engine\Blade(app('Illuminate\Contracts\View\Factory')); |
|
62 | + $view = new \Aimeos\MW\View\Standard($templatePaths, array('.blade.php' => $engine)); |
|
63 | 63 | $config = $context->getConfig(); |
64 | 64 | |
65 | - $this->addCsrf( $view ); |
|
66 | - $this->addAccess( $view, $context ); |
|
67 | - $this->addConfig( $view, $config ); |
|
68 | - $this->addNumber( $view, $config ); |
|
69 | - $this->addParam( $view ); |
|
70 | - $this->addRequest( $view ); |
|
71 | - $this->addResponse( $view ); |
|
72 | - $this->addTranslate( $view, $locale ); |
|
73 | - $this->addUrl( $view ); |
|
65 | + $this->addCsrf($view); |
|
66 | + $this->addAccess($view, $context); |
|
67 | + $this->addConfig($view, $config); |
|
68 | + $this->addNumber($view, $config); |
|
69 | + $this->addParam($view); |
|
70 | + $this->addRequest($view); |
|
71 | + $this->addResponse($view); |
|
72 | + $this->addTranslate($view, $locale); |
|
73 | + $this->addUrl($view); |
|
74 | 74 | |
75 | 75 | return $view; |
76 | 76 | } |
@@ -83,16 +83,16 @@ discard block |
||
83 | 83 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
84 | 84 | * @return \Aimeos\MW\View\Iface Modified view object |
85 | 85 | */ |
86 | - protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context ) |
|
86 | + protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context) |
|
87 | 87 | { |
88 | 88 | $support = $this->support; |
89 | 89 | |
90 | - $fcn = function() use ( $support, $context ) { |
|
91 | - return $support->getGroups( $context ); |
|
90 | + $fcn = function() use ($support, $context) { |
|
91 | + return $support->getGroups($context); |
|
92 | 92 | }; |
93 | 93 | |
94 | - $helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn ); |
|
95 | - $view->addHelper( 'access', $helper ); |
|
94 | + $helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn); |
|
95 | + $view->addHelper('access', $helper); |
|
96 | 96 | |
97 | 97 | return $view; |
98 | 98 | } |
@@ -105,11 +105,11 @@ discard block |
||
105 | 105 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
106 | 106 | * @return \Aimeos\MW\View\Iface Modified view object |
107 | 107 | */ |
108 | - protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
108 | + protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
109 | 109 | { |
110 | - $config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) ); |
|
111 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
112 | - $view->addHelper( 'config', $helper ); |
|
110 | + $config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client')); |
|
111 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
112 | + $view->addHelper('config', $helper); |
|
113 | 113 | |
114 | 114 | return $view; |
115 | 115 | } |
@@ -121,10 +121,10 @@ discard block |
||
121 | 121 | * @param \Aimeos\MW\View\Iface $view View object |
122 | 122 | * @return \Aimeos\MW\View\Iface Modified view object |
123 | 123 | */ |
124 | - protected function addCsrf( \Aimeos\MW\View\Iface $view ) |
|
124 | + protected function addCsrf(\Aimeos\MW\View\Iface $view) |
|
125 | 125 | { |
126 | - $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() ); |
|
127 | - $view->addHelper( 'csrf', $helper ); |
|
126 | + $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token()); |
|
127 | + $view->addHelper('csrf', $helper); |
|
128 | 128 | |
129 | 129 | return $view; |
130 | 130 | } |
@@ -137,14 +137,14 @@ discard block |
||
137 | 137 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
138 | 138 | * @return \Aimeos\MW\View\Iface Modified view object |
139 | 139 | */ |
140 | - protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
140 | + protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
141 | 141 | { |
142 | - $sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' ); |
|
143 | - $sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' ); |
|
144 | - $decimals = $config->get( 'client/html/common/format/decimals', 2 ); |
|
142 | + $sepDec = $config->get('client/html/common/format/separatorDecimal', '.'); |
|
143 | + $sep1000 = $config->get('client/html/common/format/separator1000', ' '); |
|
144 | + $decimals = $config->get('client/html/common/format/decimals', 2); |
|
145 | 145 | |
146 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals ); |
|
147 | - $view->addHelper( 'number', $helper ); |
|
146 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals); |
|
147 | + $view->addHelper('number', $helper); |
|
148 | 148 | |
149 | 149 | return $view; |
150 | 150 | } |
@@ -156,11 +156,11 @@ discard block |
||
156 | 156 | * @param \Aimeos\MW\View\Iface $view View object |
157 | 157 | * @return \Aimeos\MW\View\Iface Modified view object |
158 | 158 | */ |
159 | - protected function addParam( \Aimeos\MW\View\Iface $view ) |
|
159 | + protected function addParam(\Aimeos\MW\View\Iface $view) |
|
160 | 160 | { |
161 | - $params = ( Route::current() ? Route::current()->parameters() + Input::all() : array() ); |
|
162 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params ); |
|
163 | - $view->addHelper( 'param', $helper ); |
|
161 | + $params = (Route::current() ? Route::current()->parameters() + Input::all() : array()); |
|
162 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params); |
|
163 | + $view->addHelper('param', $helper); |
|
164 | 164 | |
165 | 165 | return $view; |
166 | 166 | } |
@@ -172,10 +172,10 @@ discard block |
||
172 | 172 | * @param \Aimeos\MW\View\Iface $view View object |
173 | 173 | * @return \Aimeos\MW\View\Iface Modified view object |
174 | 174 | */ |
175 | - protected function addRequest( \Aimeos\MW\View\Iface $view ) |
|
175 | + protected function addRequest(\Aimeos\MW\View\Iface $view) |
|
176 | 176 | { |
177 | - $helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() ); |
|
178 | - $view->addHelper( 'request', $helper ); |
|
177 | + $helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance()); |
|
178 | + $view->addHelper('request', $helper); |
|
179 | 179 | |
180 | 180 | return $view; |
181 | 181 | } |
@@ -187,10 +187,10 @@ discard block |
||
187 | 187 | * @param \Aimeos\MW\View\Iface $view View object |
188 | 188 | * @return \Aimeos\MW\View\Iface Modified view object |
189 | 189 | */ |
190 | - protected function addResponse( \Aimeos\MW\View\Iface $view ) |
|
190 | + protected function addResponse(\Aimeos\MW\View\Iface $view) |
|
191 | 191 | { |
192 | - $helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view ); |
|
193 | - $view->addHelper( 'response', $helper ); |
|
192 | + $helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view); |
|
193 | + $view->addHelper('response', $helper); |
|
194 | 194 | |
195 | 195 | return $view; |
196 | 196 | } |
@@ -203,20 +203,20 @@ discard block |
||
203 | 203 | * @param string|null $locale ISO language code, e.g. "de" or "de_CH" |
204 | 204 | * @return \Aimeos\MW\View\Iface Modified view object |
205 | 205 | */ |
206 | - protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale ) |
|
206 | + protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale) |
|
207 | 207 | { |
208 | - if( $locale !== null ) |
|
208 | + if ($locale !== null) |
|
209 | 209 | { |
210 | - $i18n = $this->i18n->get( array( $locale ) ); |
|
210 | + $i18n = $this->i18n->get(array($locale)); |
|
211 | 211 | $translation = $i18n[$locale]; |
212 | 212 | } |
213 | 213 | else |
214 | 214 | { |
215 | - $translation = new \Aimeos\MW\Translation\None( 'en' ); |
|
215 | + $translation = new \Aimeos\MW\Translation\None('en'); |
|
216 | 216 | } |
217 | 217 | |
218 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation ); |
|
219 | - $view->addHelper( 'translate', $helper ); |
|
218 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation); |
|
219 | + $view->addHelper('translate', $helper); |
|
220 | 220 | |
221 | 221 | return $view; |
222 | 222 | } |
@@ -228,27 +228,27 @@ discard block |
||
228 | 228 | * @param \Aimeos\MW\View\Iface $view View object |
229 | 229 | * @return \Aimeos\MW\View\Iface Modified view object |
230 | 230 | */ |
231 | - protected function addUrl( \Aimeos\MW\View\Iface $view ) |
|
231 | + protected function addUrl(\Aimeos\MW\View\Iface $view) |
|
232 | 232 | { |
233 | 233 | $fixed = array(); |
234 | 234 | |
235 | - if( Route::current() ) |
|
235 | + if (Route::current()) |
|
236 | 236 | { |
237 | - if( ( $value = Route::input( 'site' ) ) !== null ) { |
|
237 | + if (($value = Route::input('site')) !== null) { |
|
238 | 238 | $fixed['site'] = $value; |
239 | 239 | } |
240 | 240 | |
241 | - if( ( $value = Route::input( 'locale' ) ) !== null ) { |
|
241 | + if (($value = Route::input('locale')) !== null) { |
|
242 | 242 | $fixed['locale'] = $value; |
243 | 243 | } |
244 | 244 | |
245 | - if( ( $value = Route::input( 'currency' ) ) !== null ) { |
|
245 | + if (($value = Route::input('currency')) !== null) { |
|
246 | 246 | $fixed['currency'] = $value; |
247 | 247 | } |
248 | 248 | } |
249 | 249 | |
250 | - $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed ); |
|
251 | - $view->addHelper( 'url', $helper ); |
|
250 | + $helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed); |
|
251 | + $view->addHelper('url', $helper); |
|
252 | 252 | |
253 | 253 | return $view; |
254 | 254 | } |
@@ -209,8 +209,7 @@ |
||
209 | 209 | { |
210 | 210 | $i18n = $this->i18n->get( array( $locale ) ); |
211 | 211 | $translation = $i18n[$locale]; |
212 | - } |
|
213 | - else |
|
212 | + } else |
|
214 | 213 | { |
215 | 214 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
216 | 215 | } |
@@ -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 | } |
@@ -91,8 +91,7 @@ |
||
91 | 91 | $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
92 | 92 | $localeItem->setLanguageId( null ); |
93 | 93 | $localeItem->setCurrencyId( null ); |
94 | - } |
|
95 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
94 | + } catch( \Aimeos\MShop\Locale\Exception $e ) |
|
96 | 95 | { |
97 | 96 | $localeItem = $localeManager->createItem(); |
98 | 97 | } |
@@ -9,57 +9,57 @@ |
||
9 | 9 | |
10 | 10 | if( !function_exists( 'aiconfig' ) ) |
11 | 11 | { |
12 | - /** |
|
13 | - * Returns the configuration setting for the given key |
|
14 | - * |
|
15 | - * @param string $key Configuration key |
|
16 | - * @param mixed $default Default value if the configuration key isn't found |
|
17 | - * @return mixed Configuration value |
|
18 | - */ |
|
19 | - function aiconfig( $key, $default = null ) |
|
20 | - { |
|
21 | - return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default ); |
|
22 | - } |
|
12 | + /** |
|
13 | + * Returns the configuration setting for the given key |
|
14 | + * |
|
15 | + * @param string $key Configuration key |
|
16 | + * @param mixed $default Default value if the configuration key isn't found |
|
17 | + * @return mixed Configuration value |
|
18 | + */ |
|
19 | + function aiconfig( $key, $default = null ) |
|
20 | + { |
|
21 | + return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default ); |
|
22 | + } |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | |
26 | 26 | if( !function_exists( 'aitrans' ) ) |
27 | 27 | { |
28 | - /** |
|
29 | - * Translates the given message |
|
30 | - * |
|
31 | - * @param string $singular Message to translate |
|
32 | - * @param array $params List of paramters for replacing the placeholders in that order |
|
33 | - * @param string $domain Translation domain |
|
34 | - * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
|
35 | - * @return string Translated string |
|
36 | - */ |
|
37 | - function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null ) |
|
38 | - { |
|
39 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
28 | + /** |
|
29 | + * Translates the given message |
|
30 | + * |
|
31 | + * @param string $singular Message to translate |
|
32 | + * @param array $params List of paramters for replacing the placeholders in that order |
|
33 | + * @param string $domain Translation domain |
|
34 | + * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
|
35 | + * @return string Translated string |
|
36 | + */ |
|
37 | + function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null ) |
|
38 | + { |
|
39 | + $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
40 | 40 | |
41 | - return vsprintf( $i18n->dt( $domain, $singular ), $params ); |
|
42 | - } |
|
41 | + return vsprintf( $i18n->dt( $domain, $singular ), $params ); |
|
42 | + } |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
46 | 46 | if( !function_exists( 'aitransplural' ) ) |
47 | 47 | { |
48 | - /** |
|
49 | - * Translates the given messages based on the number |
|
50 | - * |
|
51 | - * @param string $singular Message to translate |
|
52 | - * @param string $plural Message for plural translations |
|
53 | - * @param integer $number Count of items to chose the correct plural translation |
|
54 | - * @param array $params List of paramters for replacing the placeholders in that order |
|
55 | - * @param string $domain Translation domain |
|
56 | - * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
|
57 | - * @return string Translated string |
|
58 | - */ |
|
59 | - function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null ) |
|
60 | - { |
|
61 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
48 | + /** |
|
49 | + * Translates the given messages based on the number |
|
50 | + * |
|
51 | + * @param string $singular Message to translate |
|
52 | + * @param string $plural Message for plural translations |
|
53 | + * @param integer $number Count of items to chose the correct plural translation |
|
54 | + * @param array $params List of paramters for replacing the placeholders in that order |
|
55 | + * @param string $domain Translation domain |
|
56 | + * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
|
57 | + * @return string Translated string |
|
58 | + */ |
|
59 | + function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null ) |
|
60 | + { |
|
61 | + $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
62 | 62 | |
63 | - return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params ); |
|
64 | - } |
|
63 | + return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params ); |
|
64 | + } |
|
65 | 65 | } |
@@ -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 | } |
@@ -106,12 +106,12 @@ |
||
106 | 106 | }); |
107 | 107 | |
108 | 108 | |
109 | - $this->commands( array( |
|
109 | + $this->commands(array( |
|
110 | 110 | 'Aimeos\Shop\Command\AccountCommand', |
111 | 111 | 'Aimeos\Shop\Command\CacheCommand', |
112 | 112 | 'Aimeos\Shop\Command\SetupCommand', |
113 | 113 | 'Aimeos\Shop\Command\JobsCommand', |
114 | - ) ); |
|
114 | + )); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 |
@@ -36,20 +36,20 @@ |
||
36 | 36 | * @param \Illuminate\Http\Request $request Laravel request object |
37 | 37 | * @return \Illuminate\Contracts\View\View View for rendering the output |
38 | 38 | */ |
39 | - public function indexAction( Request $request ) |
|
39 | + public function indexAction(Request $request) |
|
40 | 40 | { |
41 | - if( config( 'shop.authorize', true ) && ( Auth::check() === false |
|
42 | - || $request->user()->can( 'admin', [AdminController::class, ['admin', 'editor']] ) ) === false |
|
41 | + if (config('shop.authorize', true) && (Auth::check() === false |
|
42 | + || $request->user()->can('admin', [AdminController::class, ['admin', 'editor']])) === false |
|
43 | 43 | ) { |
44 | - return View::make( 'shop::admin.index' ); |
|
44 | + return View::make('shop::admin.index'); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | $param = array( |
48 | 48 | 'resource' => 'dashboard', |
49 | - 'site' => Route::input( 'site', Input::get( 'site', 'default' ) ), |
|
50 | - 'lang' => Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) ) |
|
49 | + 'site' => Route::input('site', Input::get('site', 'default')), |
|
50 | + 'lang' => Route::input('lang', Input::get('lang', config('app.locale', 'en'))) |
|
51 | 51 | ); |
52 | 52 | |
53 | - return redirect()->route( 'aimeos_shop_jqadm_search', $param ); |
|
53 | + return redirect()->route('aimeos_shop_jqadm_search', $param); |
|
54 | 54 | } |
55 | 55 | } |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/css/tether.min.css"> |
11 | 11 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css"> |
12 | 12 | <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.4/css/bootstrap.min.css"> |
13 | - <link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'css' ) ); ?>"> |
|
13 | + <link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'css')); ?>"> |
|
14 | 14 | |
15 | 15 | <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> |
16 | 16 | <!--[if lt IE 9]> |
@@ -30,6 +30,6 @@ discard block |
||
30 | 30 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/ckeditor.js"></script> |
31 | 31 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/adapters/jquery.js"></script> |
32 | 32 | <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.17/d3.min.js"></script> |
33 | - <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'js' ) ); ?>"></script> |
|
33 | + <script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'js')); ?>"></script> |
|
34 | 34 | </body> |
35 | 35 | </html> |
@@ -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> |
@@ -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 View::make('shop::basket.index', $params); |
34 | 34 | } |
35 | 35 | } |
36 | 36 | \ No newline at end of file |