@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | * @param \Aimeos\Shop\Base\I18n $i18n I18n object |
48 | 48 | * @param \Aimeos\Shop\Base\Support $support Support object |
49 | 49 | */ |
50 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, |
|
51 | - \Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support ) |
|
50 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, |
|
51 | + \Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support) |
|
52 | 52 | { |
53 | 53 | $this->i18n = $i18n; |
54 | 54 | $this->config = $config; |
@@ -64,24 +64,24 @@ discard block |
||
64 | 64 | * @param string|null $locale Code of the current language or null for no translation |
65 | 65 | * @return \Aimeos\MW\View\Iface View object |
66 | 66 | */ |
67 | - public function create( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null ) |
|
67 | + public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null) |
|
68 | 68 | { |
69 | - $engine = new \Aimeos\MW\View\Engine\Blade( app( 'Illuminate\Contracts\View\Factory' ) ); |
|
70 | - $view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.blade.php' => $engine ) ); |
|
69 | + $engine = new \Aimeos\MW\View\Engine\Blade(app('Illuminate\Contracts\View\Factory')); |
|
70 | + $view = new \Aimeos\MW\View\Standard($templatePaths, array('.blade.php' => $engine)); |
|
71 | 71 | |
72 | 72 | $config = $context->getConfig(); |
73 | 73 | $session = $context->getSession(); |
74 | 74 | |
75 | - $this->addCsrf( $view ); |
|
76 | - $this->addAccess( $view, $context ); |
|
77 | - $this->addConfig( $view, $config ); |
|
78 | - $this->addNumber( $view, $config ); |
|
79 | - $this->addParam( $view ); |
|
80 | - $this->addRequest( $view ); |
|
81 | - $this->addResponse( $view ); |
|
82 | - $this->addSession( $view, $session ); |
|
83 | - $this->addTranslate( $view, $locale ); |
|
84 | - $this->addUrl( $view ); |
|
75 | + $this->addCsrf($view); |
|
76 | + $this->addAccess($view, $context); |
|
77 | + $this->addConfig($view, $config); |
|
78 | + $this->addNumber($view, $config); |
|
79 | + $this->addParam($view); |
|
80 | + $this->addRequest($view); |
|
81 | + $this->addResponse($view); |
|
82 | + $this->addSession($view, $session); |
|
83 | + $this->addTranslate($view, $locale); |
|
84 | + $this->addUrl($view); |
|
85 | 85 | |
86 | 86 | return $view; |
87 | 87 | } |
@@ -94,25 +94,25 @@ discard block |
||
94 | 94 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
95 | 95 | * @return \Aimeos\MW\View\Iface Modified view object |
96 | 96 | */ |
97 | - protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context ) |
|
97 | + protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context) |
|
98 | 98 | { |
99 | - if( $this->config->get( 'shop.accessControl', true ) === false |
|
100 | - || ( ( $user = \Illuminate\Support\Facades\Auth::user() ) !== null && $user->superuser ) |
|
99 | + if ($this->config->get('shop.accessControl', true) === false |
|
100 | + || (($user = \Illuminate\Support\Facades\Auth::user()) !== null && $user->superuser) |
|
101 | 101 | ) { |
102 | - $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
|
102 | + $helper = new \Aimeos\MW\View\Helper\Access\All($view); |
|
103 | 103 | } |
104 | 104 | else |
105 | 105 | { |
106 | 106 | $support = $this->support; |
107 | 107 | |
108 | - $fcn = function() use ( $support, $context ) { |
|
109 | - return $support->getGroups( $context ); |
|
108 | + $fcn = function() use ($support, $context) { |
|
109 | + return $support->getGroups($context); |
|
110 | 110 | }; |
111 | 111 | |
112 | - $helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn ); |
|
112 | + $helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn); |
|
113 | 113 | } |
114 | 114 | |
115 | - $view->addHelper( 'access', $helper ); |
|
115 | + $view->addHelper('access', $helper); |
|
116 | 116 | |
117 | 117 | return $view; |
118 | 118 | } |
@@ -125,11 +125,11 @@ discard block |
||
125 | 125 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
126 | 126 | * @return \Aimeos\MW\View\Iface Modified view object |
127 | 127 | */ |
128 | - protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
128 | + protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
129 | 129 | { |
130 | - $config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) ); |
|
131 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
132 | - $view->addHelper( 'config', $helper ); |
|
130 | + $config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client')); |
|
131 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
132 | + $view->addHelper('config', $helper); |
|
133 | 133 | |
134 | 134 | return $view; |
135 | 135 | } |
@@ -141,10 +141,10 @@ discard block |
||
141 | 141 | * @param \Aimeos\MW\View\Iface $view View object |
142 | 142 | * @return \Aimeos\MW\View\Iface Modified view object |
143 | 143 | */ |
144 | - protected function addCsrf( \Aimeos\MW\View\Iface $view ) |
|
144 | + protected function addCsrf(\Aimeos\MW\View\Iface $view) |
|
145 | 145 | { |
146 | - $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() ); |
|
147 | - $view->addHelper( 'csrf', $helper ); |
|
146 | + $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token()); |
|
147 | + $view->addHelper('csrf', $helper); |
|
148 | 148 | |
149 | 149 | return $view; |
150 | 150 | } |
@@ -157,14 +157,14 @@ discard block |
||
157 | 157 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
158 | 158 | * @return \Aimeos\MW\View\Iface Modified view object |
159 | 159 | */ |
160 | - protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) |
|
160 | + protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) |
|
161 | 161 | { |
162 | - $sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' ); |
|
163 | - $sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' ); |
|
164 | - $decimals = $config->get( 'client/html/common/format/decimals', 2 ); |
|
162 | + $sepDec = $config->get('client/html/common/format/separatorDecimal', '.'); |
|
163 | + $sep1000 = $config->get('client/html/common/format/separator1000', ' '); |
|
164 | + $decimals = $config->get('client/html/common/format/decimals', 2); |
|
165 | 165 | |
166 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals ); |
|
167 | - $view->addHelper( 'number', $helper ); |
|
166 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals); |
|
167 | + $view->addHelper('number', $helper); |
|
168 | 168 | |
169 | 169 | return $view; |
170 | 170 | } |
@@ -176,11 +176,11 @@ discard block |
||
176 | 176 | * @param \Aimeos\MW\View\Iface $view View object |
177 | 177 | * @return \Aimeos\MW\View\Iface Modified view object |
178 | 178 | */ |
179 | - protected function addParam( \Aimeos\MW\View\Iface $view ) |
|
179 | + protected function addParam(\Aimeos\MW\View\Iface $view) |
|
180 | 180 | { |
181 | - $params = ( Route::current() ? Route::current()->parameters() : array() ) + Input::all(); |
|
182 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params ); |
|
183 | - $view->addHelper( 'param', $helper ); |
|
181 | + $params = (Route::current() ? Route::current()->parameters() : array()) + Input::all(); |
|
182 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params); |
|
183 | + $view->addHelper('param', $helper); |
|
184 | 184 | |
185 | 185 | return $view; |
186 | 186 | } |
@@ -192,10 +192,10 @@ discard block |
||
192 | 192 | * @param \Aimeos\MW\View\Iface $view View object |
193 | 193 | * @return \Aimeos\MW\View\Iface Modified view object |
194 | 194 | */ |
195 | - protected function addRequest( \Aimeos\MW\View\Iface $view ) |
|
195 | + protected function addRequest(\Aimeos\MW\View\Iface $view) |
|
196 | 196 | { |
197 | - $helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() ); |
|
198 | - $view->addHelper( 'request', $helper ); |
|
197 | + $helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance()); |
|
198 | + $view->addHelper('request', $helper); |
|
199 | 199 | |
200 | 200 | return $view; |
201 | 201 | } |
@@ -207,10 +207,10 @@ discard block |
||
207 | 207 | * @param \Aimeos\MW\View\Iface $view View object |
208 | 208 | * @return \Aimeos\MW\View\Iface Modified view object |
209 | 209 | */ |
210 | - protected function addResponse( \Aimeos\MW\View\Iface $view ) |
|
210 | + protected function addResponse(\Aimeos\MW\View\Iface $view) |
|
211 | 211 | { |
212 | - $helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view ); |
|
213 | - $view->addHelper( 'response', $helper ); |
|
212 | + $helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view); |
|
213 | + $view->addHelper('response', $helper); |
|
214 | 214 | |
215 | 215 | return $view; |
216 | 216 | } |
@@ -223,10 +223,10 @@ discard block |
||
223 | 223 | * @param \Aimeos\MW\Session\Iface $session Session object |
224 | 224 | * @return \Aimeos\MW\View\Iface Modified view object |
225 | 225 | */ |
226 | - protected function addSession( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session ) |
|
226 | + protected function addSession(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session) |
|
227 | 227 | { |
228 | - $helper = new \Aimeos\MW\View\Helper\Session\Standard( $view, $session ); |
|
229 | - $view->addHelper( 'session', $helper ); |
|
228 | + $helper = new \Aimeos\MW\View\Helper\Session\Standard($view, $session); |
|
229 | + $view->addHelper('session', $helper); |
|
230 | 230 | |
231 | 231 | return $view; |
232 | 232 | } |
@@ -239,20 +239,20 @@ discard block |
||
239 | 239 | * @param string|null $locale ISO language code, e.g. "de" or "de_CH" |
240 | 240 | * @return \Aimeos\MW\View\Iface Modified view object |
241 | 241 | */ |
242 | - protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale ) |
|
242 | + protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale) |
|
243 | 243 | { |
244 | - if( $locale !== null ) |
|
244 | + if ($locale !== null) |
|
245 | 245 | { |
246 | - $i18n = $this->i18n->get( array( $locale ) ); |
|
246 | + $i18n = $this->i18n->get(array($locale)); |
|
247 | 247 | $translation = $i18n[$locale]; |
248 | 248 | } |
249 | 249 | else |
250 | 250 | { |
251 | - $translation = new \Aimeos\MW\Translation\None( 'en' ); |
|
251 | + $translation = new \Aimeos\MW\Translation\None('en'); |
|
252 | 252 | } |
253 | 253 | |
254 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation ); |
|
255 | - $view->addHelper( 'translate', $helper ); |
|
254 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation); |
|
255 | + $view->addHelper('translate', $helper); |
|
256 | 256 | |
257 | 257 | return $view; |
258 | 258 | } |
@@ -264,27 +264,27 @@ discard block |
||
264 | 264 | * @param \Aimeos\MW\View\Iface $view View object |
265 | 265 | * @return \Aimeos\MW\View\Iface Modified view object |
266 | 266 | */ |
267 | - protected function addUrl( \Aimeos\MW\View\Iface $view ) |
|
267 | + protected function addUrl(\Aimeos\MW\View\Iface $view) |
|
268 | 268 | { |
269 | 269 | $fixed = array(); |
270 | 270 | |
271 | - if( Route::current() ) |
|
271 | + if (Route::current()) |
|
272 | 272 | { |
273 | - if( ( $value = Route::input( 'site' ) ) !== null ) { |
|
273 | + if (($value = Route::input('site')) !== null) { |
|
274 | 274 | $fixed['site'] = $value; |
275 | 275 | } |
276 | 276 | |
277 | - if( ( $value = Route::input( 'locale' ) ) !== null ) { |
|
277 | + if (($value = Route::input('locale')) !== null) { |
|
278 | 278 | $fixed['locale'] = $value; |
279 | 279 | } |
280 | 280 | |
281 | - if( ( $value = Route::input( 'currency' ) ) !== null ) { |
|
281 | + if (($value = Route::input('currency')) !== null) { |
|
282 | 282 | $fixed['currency'] = $value; |
283 | 283 | } |
284 | 284 | } |
285 | 285 | |
286 | - $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed ); |
|
287 | - $view->addHelper( 'url', $helper ); |
|
286 | + $helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed); |
|
287 | + $view->addHelper('url', $helper); |
|
288 | 288 | |
289 | 289 | return $view; |
290 | 290 | } |
@@ -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 | |
@@ -245,8 +244,7 @@ discard block |
||
245 | 244 | { |
246 | 245 | $i18n = $this->i18n->get( array( $locale ) ); |
247 | 246 | $translation = $i18n[$locale]; |
248 | - } |
|
249 | - else |
|
247 | + } else |
|
250 | 248 | { |
251 | 249 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
252 | 250 | } |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css" /> |
10 | 10 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" /> |
11 | 11 | <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" /> |
12 | - <link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'css' ) ); ?>" /> |
|
12 | + <link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'css')); ?>" /> |
|
13 | 13 | </head> |
14 | 14 | <body> |
15 | 15 | <div class="app-menu" style="text-align: right; margin: 0 2.5%;"> |
@@ -33,6 +33,6 @@ discard block |
||
33 | 33 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.9.1/adapters/jquery.js"></script> |
34 | 34 | <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"></script> |
35 | 35 | <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"></script> |
36 | - <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'js' ) ); ?>"></script> |
|
36 | + <script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'js')); ?>"></script> |
|
37 | 37 | </body> |
38 | 38 | </html> |
@@ -10,16 +10,16 @@ discard block |
||
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' ), |
|
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/stage','catalog/lists' ), |
|
18 | - 'catalog-stock' => array( 'catalog/stock' ), |
|
19 | - 'catalog-suggest' => array( 'catalog/suggest' ), |
|
20 | - 'checkout-confirm' => array( 'checkout/confirm' ), |
|
21 | - 'checkout-index' => array( 'checkout/standard' ), |
|
22 | - 'checkout-update' => array( 'checkout/update'), |
|
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 | + '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/stage', 'catalog/lists'), |
|
18 | + 'catalog-stock' => array('catalog/stock'), |
|
19 | + 'catalog-suggest' => array('catalog/suggest'), |
|
20 | + 'checkout-confirm' => array('checkout/confirm'), |
|
21 | + 'checkout-index' => array('checkout/standard'), |
|
22 | + 'checkout-update' => array('checkout/update'), |
|
23 | 23 | ), |
24 | 24 | |
25 | 25 | 'resource' => array( |
@@ -37,22 +37,22 @@ discard block |
||
37 | 37 | 'fs' => array( |
38 | 38 | 'adapter' => 'Standard', |
39 | 39 | 'basedir' => public_path(), |
40 | - 'tempdir' => storage_path( 'tmp' ), |
|
40 | + 'tempdir' => storage_path('tmp'), |
|
41 | 41 | ), |
42 | 42 | 'fs-admin' => array( |
43 | 43 | 'adapter' => 'Standard', |
44 | - 'basedir' => storage_path( 'admin' ), |
|
45 | - 'tempdir' => storage_path( 'tmp' ), |
|
44 | + 'basedir' => storage_path('admin'), |
|
45 | + 'tempdir' => storage_path('tmp'), |
|
46 | 46 | ), |
47 | 47 | 'fs-import' => array( |
48 | 48 | 'adapter' => 'Standard', |
49 | - 'basedir' => storage_path( 'import' ), |
|
50 | - 'tempdir' => storage_path( 'tmp' ), |
|
49 | + 'basedir' => storage_path('import'), |
|
50 | + 'tempdir' => storage_path('tmp'), |
|
51 | 51 | ), |
52 | 52 | 'fs-secure' => array( |
53 | 53 | 'adapter' => 'Standard', |
54 | - 'basedir' => storage_path( 'secure' ), |
|
55 | - 'tempdir' => storage_path( 'tmp' ), |
|
54 | + 'basedir' => storage_path('secure'), |
|
55 | + 'tempdir' => storage_path('tmp'), |
|
56 | 56 | ), |
57 | 57 | 'mq' => array( |
58 | 58 | 'adapter' => 'Standard', |
@@ -169,10 +169,10 @@ discard block |
||
169 | 169 | ), |
170 | 170 | 'common' => array( |
171 | 171 | 'content' => array( |
172 | - 'baseurl' => config( 'app.url' ) . '/', |
|
172 | + 'baseurl' => config('app.url').'/', |
|
173 | 173 | ), |
174 | 174 | 'template' => array( |
175 | - 'baseurl' => public_path( 'packages/aimeos/shop/themes/elegance' ), |
|
175 | + 'baseurl' => public_path('packages/aimeos/shop/themes/elegance'), |
|
176 | 176 | ), |
177 | 177 | ), |
178 | 178 | 'basket' => array( |
@@ -219,8 +219,8 @@ discard block |
||
219 | 219 | ), |
220 | 220 | ), |
221 | 221 | 'email' => [ |
222 | - 'from-email' => config( 'mail.from.address' ), |
|
223 | - 'from-name' => config( 'mail.from.name' ), |
|
222 | + 'from-email' => config('mail.from.address'), |
|
223 | + 'from-name' => config('mail.from.name'), |
|
224 | 224 | ], |
225 | 225 | 'locale' => array( |
226 | 226 | 'select' => array( |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | # in the "maxwidth" parameter |
298 | 298 | # 'maxheight' => 280, |
299 | 299 | ), |
300 | - 'tempdir' => storage_path( 'aimeos' ), |
|
300 | + 'tempdir' => storage_path('aimeos'), |
|
301 | 301 | ), |
302 | 302 | ), |
303 | 303 | ), |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | Route::group(config('shop.routes.admin', ['prefix' => 'admin', 'middleware' => ['web']]), function() { |
4 | 4 | |
5 | - Route::match( array( 'GET' ), '', array( |
|
5 | + Route::match(array('GET'), '', array( |
|
6 | 6 | 'as' => 'aimeos_shop_admin', |
7 | 7 | 'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction' |
8 | 8 | )); |
@@ -12,112 +12,112 @@ discard block |
||
12 | 12 | |
13 | 13 | Route::group(config('shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']]), function() { |
14 | 14 | |
15 | - Route::match( array( 'GET' ), 'file/{type}', array( |
|
15 | + Route::match(array('GET'), 'file/{type}', array( |
|
16 | 16 | 'as' => 'aimeos_shop_jqadm_file', |
17 | 17 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@fileAction' |
18 | 18 | )); |
19 | 19 | |
20 | - Route::match( array( 'GET', 'POST' ), 'copy/{resource}/{id}', array( |
|
20 | + Route::match(array('GET', 'POST'), 'copy/{resource}/{id}', array( |
|
21 | 21 | 'as' => 'aimeos_shop_jqadm_copy', |
22 | 22 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction' |
23 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
23 | + ))->where(array('resource' => '[a-z\/]+')); |
|
24 | 24 | |
25 | - Route::match( array( 'GET', 'POST' ), 'create/{resource}', array( |
|
25 | + Route::match(array('GET', 'POST'), 'create/{resource}', array( |
|
26 | 26 | 'as' => 'aimeos_shop_jqadm_create', |
27 | 27 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction' |
28 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
28 | + ))->where(array('resource' => '[a-z\/]+')); |
|
29 | 29 | |
30 | - Route::match( array( 'GET', 'POST' ), 'delete/{resource}/{id}', array( |
|
30 | + Route::match(array('GET', 'POST'), 'delete/{resource}/{id}', array( |
|
31 | 31 | 'as' => 'aimeos_shop_jqadm_delete', |
32 | 32 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction' |
33 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
33 | + ))->where(array('resource' => '[a-z\/]+')); |
|
34 | 34 | |
35 | - Route::match( array( 'GET', 'POST' ), 'export/{resource}', array( |
|
35 | + Route::match(array('GET', 'POST'), 'export/{resource}', array( |
|
36 | 36 | 'as' => 'aimeos_shop_jqadm_export', |
37 | 37 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@exportAction' |
38 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
38 | + ))->where(array('resource' => '[a-z\/]+')); |
|
39 | 39 | |
40 | - Route::match( array( 'GET' ), 'get/{resource}/{id}', array( |
|
40 | + Route::match(array('GET'), 'get/{resource}/{id}', array( |
|
41 | 41 | 'as' => 'aimeos_shop_jqadm_get', |
42 | 42 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction' |
43 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
43 | + ))->where(array('resource' => '[a-z\/]+')); |
|
44 | 44 | |
45 | - Route::match( array( 'POST' ), 'save/{resource}', array( |
|
45 | + Route::match(array('POST'), 'save/{resource}', array( |
|
46 | 46 | 'as' => 'aimeos_shop_jqadm_save', |
47 | 47 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction' |
48 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
48 | + ))->where(array('resource' => '[a-z\/]+')); |
|
49 | 49 | |
50 | - Route::match( array( 'GET', 'POST' ), 'search/{resource}', array( |
|
50 | + Route::match(array('GET', 'POST'), 'search/{resource}', array( |
|
51 | 51 | 'as' => 'aimeos_shop_jqadm_search', |
52 | 52 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction' |
53 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
53 | + ))->where(array('resource' => '[a-z\/]+')); |
|
54 | 54 | |
55 | 55 | }); |
56 | 56 | |
57 | 57 | |
58 | 58 | Route::group(config('shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']]), function() { |
59 | 59 | |
60 | - Route::match( array( 'DELETE' ), '{resource}/{id?}', array( |
|
60 | + Route::match(array('DELETE'), '{resource}/{id?}', array( |
|
61 | 61 | 'as' => 'aimeos_shop_jsonadm_delete', |
62 | 62 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction' |
63 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
63 | + ))->where(array('resource' => '[a-z\/]+')); |
|
64 | 64 | |
65 | - Route::match( array( 'GET' ), '{resource}/{id?}', array( |
|
65 | + Route::match(array('GET'), '{resource}/{id?}', array( |
|
66 | 66 | 'as' => 'aimeos_shop_jsonadm_get', |
67 | 67 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction' |
68 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
68 | + ))->where(array('resource' => '[a-z\/]+')); |
|
69 | 69 | |
70 | - Route::match( array( 'PATCH' ), '{resource}/{id?}', array( |
|
70 | + Route::match(array('PATCH'), '{resource}/{id?}', array( |
|
71 | 71 | 'as' => 'aimeos_shop_jsonadm_patch', |
72 | 72 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction' |
73 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
73 | + ))->where(array('resource' => '[a-z\/]+')); |
|
74 | 74 | |
75 | - Route::match( array( 'POST' ), '{resource}/{id?}', array( |
|
75 | + Route::match(array('POST'), '{resource}/{id?}', array( |
|
76 | 76 | 'as' => 'aimeos_shop_jsonadm_post', |
77 | 77 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction' |
78 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
78 | + ))->where(array('resource' => '[a-z\/]+')); |
|
79 | 79 | |
80 | - Route::match( array( 'PUT' ), '{resource}/{id?}', array( |
|
80 | + Route::match(array('PUT'), '{resource}/{id?}', array( |
|
81 | 81 | 'as' => 'aimeos_shop_jsonadm_put', |
82 | 82 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction' |
83 | - ))->where( array( 'resource' => '[a-z\/]+' ) ); |
|
83 | + ))->where(array('resource' => '[a-z\/]+')); |
|
84 | 84 | |
85 | - Route::match( array( 'OPTIONS' ), '{resource?}', array( |
|
85 | + Route::match(array('OPTIONS'), '{resource?}', array( |
|
86 | 86 | 'as' => 'aimeos_shop_jsonadm_options', |
87 | 87 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction' |
88 | - ))->where( array( 'resource' => '[a-z\/]*' ) ); |
|
88 | + ))->where(array('resource' => '[a-z\/]*')); |
|
89 | 89 | |
90 | 90 | }); |
91 | 91 | |
92 | 92 | |
93 | 93 | Route::group(config('shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['web', 'api']]), function() { |
94 | 94 | |
95 | - Route::match( array( 'DELETE' ), '{resource}', array( |
|
95 | + Route::match(array('DELETE'), '{resource}', array( |
|
96 | 96 | 'as' => 'aimeos_shop_jsonapi_delete', |
97 | 97 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@deleteAction' |
98 | 98 | )); |
99 | 99 | |
100 | - Route::match( array( 'GET' ), '{resource}', array( |
|
100 | + Route::match(array('GET'), '{resource}', array( |
|
101 | 101 | 'as' => 'aimeos_shop_jsonapi_get', |
102 | 102 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@getAction' |
103 | 103 | )); |
104 | 104 | |
105 | - Route::match( array( 'PATCH' ), '{resource}', array( |
|
105 | + Route::match(array('PATCH'), '{resource}', array( |
|
106 | 106 | 'as' => 'aimeos_shop_jsonapi_patch', |
107 | 107 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@patchAction' |
108 | 108 | )); |
109 | 109 | |
110 | - Route::match( array( 'POST' ), '{resource}', array( |
|
110 | + Route::match(array('POST'), '{resource}', array( |
|
111 | 111 | 'as' => 'aimeos_shop_jsonapi_post', |
112 | 112 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@postAction' |
113 | 113 | )); |
114 | 114 | |
115 | - Route::match( array( 'PUT' ), '{resource}', array( |
|
115 | + Route::match(array('PUT'), '{resource}', array( |
|
116 | 116 | 'as' => 'aimeos_shop_jsonapi_put', |
117 | 117 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@putAction' |
118 | 118 | )); |
119 | 119 | |
120 | - Route::match( array( 'OPTIONS' ), '{resource?}', array( |
|
120 | + Route::match(array('OPTIONS'), '{resource?}', array( |
|
121 | 121 | 'as' => 'aimeos_shop_jsonapi_options', |
122 | 122 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@optionsAction' |
123 | 123 | )); |
@@ -127,22 +127,22 @@ discard block |
||
127 | 127 | |
128 | 128 | Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() { |
129 | 129 | |
130 | - Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
130 | + Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
131 | 131 | 'as' => 'aimeos_shop_account_favorite', |
132 | 132 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
133 | 133 | )); |
134 | 134 | |
135 | - Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
135 | + Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
136 | 136 | 'as' => 'aimeos_shop_account_watch', |
137 | 137 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
138 | 138 | )); |
139 | 139 | |
140 | - Route::match( array( 'GET', 'POST' ), 'myaccount/download/{dl_id}', array( |
|
140 | + Route::match(array('GET', 'POST'), 'myaccount/download/{dl_id}', array( |
|
141 | 141 | 'as' => 'aimeos_shop_account_download', |
142 | 142 | 'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction' |
143 | 143 | )); |
144 | 144 | |
145 | - Route::match( array( 'GET', 'POST' ), 'myaccount', array( |
|
145 | + Route::match(array('GET', 'POST'), 'myaccount', array( |
|
146 | 146 | 'as' => 'aimeos_shop_account', |
147 | 147 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
148 | 148 | )); |
@@ -152,47 +152,47 @@ discard block |
||
152 | 152 | |
153 | 153 | Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() { |
154 | 154 | |
155 | - Route::match( array( 'GET', 'POST' ), 'count', array( |
|
155 | + Route::match(array('GET', 'POST'), 'count', array( |
|
156 | 156 | 'as' => 'aimeos_shop_count', |
157 | 157 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction' |
158 | 158 | )); |
159 | 159 | |
160 | - Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array( |
|
160 | + Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array( |
|
161 | 161 | 'as' => 'aimeos_shop_detail', |
162 | 162 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
163 | 163 | )); |
164 | 164 | |
165 | - Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
165 | + Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
166 | 166 | 'as' => 'aimeos_shop_session_pinned', |
167 | 167 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
168 | 168 | )); |
169 | 169 | |
170 | - Route::match( array( 'GET', 'POST' ), 'list', array( |
|
170 | + Route::match(array('GET', 'POST'), 'list', array( |
|
171 | 171 | 'as' => 'aimeos_shop_list', |
172 | 172 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction' |
173 | 173 | )); |
174 | 174 | |
175 | - Route::match( array( 'GET', 'POST' ), 'suggest', array( |
|
175 | + Route::match(array('GET', 'POST'), 'suggest', array( |
|
176 | 176 | 'as' => 'aimeos_shop_suggest', |
177 | 177 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction' |
178 | 178 | )); |
179 | 179 | |
180 | - Route::match( array( 'GET', 'POST' ), 'stock', array( |
|
180 | + Route::match(array('GET', 'POST'), 'stock', array( |
|
181 | 181 | 'as' => 'aimeos_shop_stock', |
182 | 182 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction' |
183 | 183 | )); |
184 | 184 | |
185 | - Route::match( array( 'GET', 'POST' ), 'basket', array( |
|
185 | + Route::match(array('GET', 'POST'), 'basket', array( |
|
186 | 186 | 'as' => 'aimeos_shop_basket', |
187 | 187 | 'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction' |
188 | 188 | )); |
189 | 189 | |
190 | - Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array( |
|
190 | + Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array( |
|
191 | 191 | 'as' => 'aimeos_shop_checkout', |
192 | 192 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction' |
193 | 193 | )); |
194 | 194 | |
195 | - Route::match( array( 'GET', 'POST' ), 'confirm/{code?}', array( |
|
195 | + Route::match(array('GET', 'POST'), 'confirm/{code?}', array( |
|
196 | 196 | 'as' => 'aimeos_shop_confirm', |
197 | 197 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction' |
198 | 198 | )); |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | |
203 | 203 | Route::group(config('shop.routes.update', []), function() { |
204 | 204 | |
205 | - Route::match( array( 'GET', 'POST' ), 'update', array( |
|
205 | + Route::match(array('GET', 'POST'), 'update', array( |
|
206 | 206 | 'as' => 'aimeos_shop_update', |
207 | 207 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction' |
208 | 208 | )); |
@@ -36,13 +36,13 @@ discard block |
||
36 | 36 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
37 | 37 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
38 | 38 | */ |
39 | - public function deleteAction( ServerRequestInterface $request ) |
|
39 | + public function deleteAction(ServerRequestInterface $request) |
|
40 | 40 | { |
41 | - if( config( 'shop.authorize', true ) ) { |
|
42 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
|
41 | + if (config('shop.authorize', true)) { |
|
42 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]); |
|
43 | 43 | } |
44 | 44 | |
45 | - return $this->createAdmin()->delete( $request, new Response() ); |
|
45 | + return $this->createAdmin()->delete($request, new Response()); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | |
@@ -52,13 +52,13 @@ discard block |
||
52 | 52 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
53 | 53 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
54 | 54 | */ |
55 | - public function getAction( ServerRequestInterface $request ) |
|
55 | + public function getAction(ServerRequestInterface $request) |
|
56 | 56 | { |
57 | - if( config( 'shop.authorize', true ) ) { |
|
58 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] ); |
|
57 | + if (config('shop.authorize', true)) { |
|
58 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]); |
|
59 | 59 | } |
60 | 60 | |
61 | - return $this->createAdmin()->get( $request, new Response() ); |
|
61 | + return $this->createAdmin()->get($request, new Response()); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | |
@@ -68,13 +68,13 @@ discard block |
||
68 | 68 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
69 | 69 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
70 | 70 | */ |
71 | - public function patchAction( ServerRequestInterface $request ) |
|
71 | + public function patchAction(ServerRequestInterface $request) |
|
72 | 72 | { |
73 | - if( config( 'shop.authorize', true ) ) { |
|
74 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
|
73 | + if (config('shop.authorize', true)) { |
|
74 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]); |
|
75 | 75 | } |
76 | 76 | |
77 | - return $this->createAdmin()->patch( $request, new Response() ); |
|
77 | + return $this->createAdmin()->patch($request, new Response()); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | |
@@ -84,13 +84,13 @@ discard block |
||
84 | 84 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
85 | 85 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
86 | 86 | */ |
87 | - public function postAction( ServerRequestInterface $request ) |
|
87 | + public function postAction(ServerRequestInterface $request) |
|
88 | 88 | { |
89 | - if( config( 'shop.authorize', true ) ) { |
|
90 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
|
89 | + if (config('shop.authorize', true)) { |
|
90 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]); |
|
91 | 91 | } |
92 | 92 | |
93 | - return $this->createAdmin()->post( $request, new Response() ); |
|
93 | + return $this->createAdmin()->post($request, new Response()); |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | |
@@ -100,13 +100,13 @@ discard block |
||
100 | 100 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
101 | 101 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
102 | 102 | */ |
103 | - public function putAction( ServerRequestInterface $request ) |
|
103 | + public function putAction(ServerRequestInterface $request) |
|
104 | 104 | { |
105 | - if( config( 'shop.authorize', true ) ) { |
|
106 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
|
105 | + if (config('shop.authorize', true)) { |
|
106 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api']]); |
|
107 | 107 | } |
108 | 108 | |
109 | - return $this->createAdmin()->put( $request, new Response() ); |
|
109 | + return $this->createAdmin()->put($request, new Response()); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | |
@@ -116,13 +116,13 @@ discard block |
||
116 | 116 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
117 | 117 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
118 | 118 | */ |
119 | - public function optionsAction( ServerRequestInterface $request ) |
|
119 | + public function optionsAction(ServerRequestInterface $request) |
|
120 | 120 | { |
121 | - if( config( 'shop.authorize', true ) ) { |
|
122 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] ); |
|
121 | + if (config('shop.authorize', true)) { |
|
122 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor']]); |
|
123 | 123 | } |
124 | 124 | |
125 | - return $this->createAdmin()->options( $request, new Response() ); |
|
125 | + return $this->createAdmin()->options($request, new Response()); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | |
@@ -133,18 +133,18 @@ discard block |
||
133 | 133 | */ |
134 | 134 | protected function createAdmin() |
135 | 135 | { |
136 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
137 | - $lang = Input::get( 'locale', config( 'app.locale', 'en' ) ); |
|
138 | - $resource = Route::input( 'resource' ); |
|
136 | + $site = Route::input('site', Input::get('site', 'default')); |
|
137 | + $lang = Input::get('locale', config('app.locale', 'en')); |
|
138 | + $resource = Route::input('resource'); |
|
139 | 139 | |
140 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
141 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' ); |
|
140 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
141 | + $templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates'); |
|
142 | 142 | |
143 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); |
|
144 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) ); |
|
145 | - $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); |
|
146 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) ); |
|
143 | + $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
144 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en'))); |
|
145 | + $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); |
|
146 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang)); |
|
147 | 147 | |
148 | - return \Aimeos\Admin\JsonAdm::create( $context, $aimeos, $resource ); |
|
148 | + return \Aimeos\Admin\JsonAdm::create($context, $aimeos, $resource); |
|
149 | 149 | } |
150 | 150 | } |
@@ -31,9 +31,9 @@ discard block |
||
31 | 31 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
32 | 32 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
33 | 33 | */ |
34 | - public function deleteAction( ServerRequestInterface $request ) |
|
34 | + public function deleteAction(ServerRequestInterface $request) |
|
35 | 35 | { |
36 | - return $this->createClient()->delete( $request, new Response() ); |
|
36 | + return $this->createClient()->delete($request, new Response()); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
44 | 44 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
45 | 45 | */ |
46 | - public function getAction( ServerRequestInterface $request ) |
|
46 | + public function getAction(ServerRequestInterface $request) |
|
47 | 47 | { |
48 | - return $this->createClient()->get( $request, new Response() ); |
|
48 | + return $this->createClient()->get($request, new Response()); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
56 | 56 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
57 | 57 | */ |
58 | - public function patchAction( ServerRequestInterface $request ) |
|
58 | + public function patchAction(ServerRequestInterface $request) |
|
59 | 59 | { |
60 | - return $this->createClient()->patch( $request, new Response() ); |
|
60 | + return $this->createClient()->patch($request, new Response()); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | |
@@ -67,9 +67,9 @@ discard block |
||
67 | 67 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
68 | 68 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
69 | 69 | */ |
70 | - public function postAction( ServerRequestInterface $request ) |
|
70 | + public function postAction(ServerRequestInterface $request) |
|
71 | 71 | { |
72 | - return $this->createClient()->post( $request, new Response() ); |
|
72 | + return $this->createClient()->post($request, new Response()); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | |
@@ -79,9 +79,9 @@ discard block |
||
79 | 79 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
80 | 80 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
81 | 81 | */ |
82 | - public function putAction( ServerRequestInterface $request ) |
|
82 | + public function putAction(ServerRequestInterface $request) |
|
83 | 83 | { |
84 | - return $this->createClient()->put( $request, new Response() ); |
|
84 | + return $this->createClient()->put($request, new Response()); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | |
@@ -91,9 +91,9 @@ discard block |
||
91 | 91 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
92 | 92 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
93 | 93 | */ |
94 | - public function optionsAction( ServerRequestInterface $request ) |
|
94 | + public function optionsAction(ServerRequestInterface $request) |
|
95 | 95 | { |
96 | - return $this->createClient()->options( $request, new Response() ); |
|
96 | + return $this->createClient()->options($request, new Response()); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | |
@@ -104,17 +104,17 @@ discard block |
||
104 | 104 | */ |
105 | 105 | protected function createClient() |
106 | 106 | { |
107 | - $resource = Route::input( 'resource' ); |
|
108 | - $related = Route::input( 'related', Input::get( 'related' ) ); |
|
107 | + $resource = Route::input('resource'); |
|
108 | + $related = Route::input('related', Input::get('related')); |
|
109 | 109 | |
110 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
111 | - $tmplPaths = $aimeos->getCustomPaths( 'client/jsonapi/templates' ); |
|
110 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
111 | + $tmplPaths = $aimeos->getCustomPaths('client/jsonapi/templates'); |
|
112 | 112 | |
113 | - $context = app( '\Aimeos\Shop\Base\Context' )->get(); |
|
113 | + $context = app('\Aimeos\Shop\Base\Context')->get(); |
|
114 | 114 | $langid = $context->getLocale()->getLanguageId(); |
115 | 115 | |
116 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths, $langid ) ); |
|
116 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context, $tmplPaths, $langid)); |
|
117 | 117 | |
118 | - return \Aimeos\Client\JsonApi::create( $context, $resource . '/' . $related ); |
|
118 | + return \Aimeos\Client\JsonApi::create($context, $resource.'/'.$related); |
|
119 | 119 | } |
120 | 120 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function indexAction() |
31 | 31 | { |
32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' ); |
|
32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('account-index'); |
|
33 | 33 | return Response::view('shop::account.index', $params); |
34 | 34 | } |
35 | 35 | |
@@ -41,17 +41,17 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function downloadAction() |
43 | 43 | { |
44 | - $context = app( '\Aimeos\Shop\Base\Context' )->get(); |
|
44 | + $context = app('\Aimeos\Shop\Base\Context')->get(); |
|
45 | 45 | $langid = $context->getLocale()->getLanguageId(); |
46 | 46 | |
47 | - $view = app( '\Aimeos\Shop\Base\View' )->create( $context, array(), $langid ); |
|
48 | - $context->setView( $view ); |
|
47 | + $view = app('\Aimeos\Shop\Base\View')->create($context, array(), $langid); |
|
48 | + $context->setView($view); |
|
49 | 49 | |
50 | - $client = \Aimeos\Client\Html::create( $context, 'account/download' ); |
|
51 | - $client->setView( $view ); |
|
50 | + $client = \Aimeos\Client\Html::create($context, 'account/download'); |
|
51 | + $client->setView($view); |
|
52 | 52 | $client->process(); |
53 | 53 | |
54 | 54 | $response = $view->response(); |
55 | - return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() ); |
|
55 | + return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders()); |
|
56 | 56 | } |
57 | 57 | } |
58 | 58 | \ No newline at end of file |
@@ -34,38 +34,38 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function fileAction() |
36 | 36 | { |
37 | - if( config( 'shop.authorize', true ) ) { |
|
38 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] ); |
|
37 | + if (config('shop.authorize', true)) { |
|
38 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | $contents = ''; |
42 | 42 | $files = array(); |
43 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
44 | - $type = Route::input( 'type', Input::get( 'type', 'js' ) ); |
|
43 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
44 | + $type = Route::input('type', Input::get('type', 'js')); |
|
45 | 45 | |
46 | - foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths ) |
|
46 | + foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths) |
|
47 | 47 | { |
48 | - foreach( $paths as $path ) |
|
48 | + foreach ($paths as $path) |
|
49 | 49 | { |
50 | - $jsbAbsPath = $base . '/' . $path; |
|
51 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
52 | - $files = array_merge( $files, $jsb2->getFiles( $type ) ); |
|
50 | + $jsbAbsPath = $base.'/'.$path; |
|
51 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
52 | + $files = array_merge($files, $jsb2->getFiles($type)); |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 | |
56 | - foreach( $files as $file ) |
|
56 | + foreach ($files as $file) |
|
57 | 57 | { |
58 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
58 | + if (($content = file_get_contents($file)) !== false) { |
|
59 | 59 | $contents .= $content; |
60 | 60 | } |
61 | 61 | } |
62 | 62 | |
63 | - $response = response( $contents ); |
|
63 | + $response = response($contents); |
|
64 | 64 | |
65 | - if( $type === 'js' ) { |
|
66 | - $response->header( 'Content-Type', 'application/javascript' ); |
|
67 | - } elseif( $type === 'css' ) { |
|
68 | - $response->header( 'Content-Type', 'text/css' ); |
|
65 | + if ($type === 'js') { |
|
66 | + $response->header('Content-Type', 'application/javascript'); |
|
67 | + } elseif ($type === 'css') { |
|
68 | + $response->header('Content-Type', 'text/css'); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | return $response; |
@@ -79,17 +79,17 @@ discard block |
||
79 | 79 | */ |
80 | 80 | public function copyAction() |
81 | 81 | { |
82 | - if( config( 'shop.authorize', true ) ) { |
|
83 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] ); |
|
82 | + if (config('shop.authorize', true)) { |
|
83 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | $cntl = $this->createAdmin(); |
87 | 87 | |
88 | - if( ( $html = $cntl->copy() ) == '' ) { |
|
88 | + if (($html = $cntl->copy()) == '') { |
|
89 | 89 | return $cntl->getView()->response(); |
90 | 90 | } |
91 | 91 | |
92 | - return $this->getHtml( $html ); |
|
92 | + return $this->getHtml($html); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | |
@@ -100,17 +100,17 @@ discard block |
||
100 | 100 | */ |
101 | 101 | public function createAction() |
102 | 102 | { |
103 | - if( config( 'shop.authorize', true ) ) { |
|
104 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] ); |
|
103 | + if (config('shop.authorize', true)) { |
|
104 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | $cntl = $this->createAdmin(); |
108 | 108 | |
109 | - if( ( $html = $cntl->create() ) == '' ) { |
|
109 | + if (($html = $cntl->create()) == '') { |
|
110 | 110 | return $cntl->getView()->response(); |
111 | 111 | } |
112 | 112 | |
113 | - return $this->getHtml( $html ); |
|
113 | + return $this->getHtml($html); |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | |
@@ -121,17 +121,17 @@ discard block |
||
121 | 121 | */ |
122 | 122 | public function deleteAction() |
123 | 123 | { |
124 | - if( config( 'shop.authorize', true ) ) { |
|
125 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] ); |
|
124 | + if (config('shop.authorize', true)) { |
|
125 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | $cntl = $this->createAdmin(); |
129 | 129 | |
130 | - if( ( $html = $cntl->delete() ) == '' ) { |
|
130 | + if (($html = $cntl->delete()) == '') { |
|
131 | 131 | return $cntl->getView()->response(); |
132 | 132 | } |
133 | 133 | |
134 | - return $this->getHtml( $html ); |
|
134 | + return $this->getHtml($html); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | |
@@ -142,17 +142,17 @@ discard block |
||
142 | 142 | */ |
143 | 143 | public function exportAction() |
144 | 144 | { |
145 | - if( config( 'shop.authorize', true ) ) { |
|
146 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] ); |
|
145 | + if (config('shop.authorize', true)) { |
|
146 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | $cntl = $this->createAdmin(); |
150 | 150 | |
151 | - if( ( $html = $cntl->export() ) == '' ) { |
|
151 | + if (($html = $cntl->export()) == '') { |
|
152 | 152 | return $cntl->getView()->response(); |
153 | 153 | } |
154 | 154 | |
155 | - return $this->getHtml( $html ); |
|
155 | + return $this->getHtml($html); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | |
@@ -163,17 +163,17 @@ discard block |
||
163 | 163 | */ |
164 | 164 | public function getAction() |
165 | 165 | { |
166 | - if( config( 'shop.authorize', true ) ) { |
|
167 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] ); |
|
166 | + if (config('shop.authorize', true)) { |
|
167 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); |
|
168 | 168 | } |
169 | 169 | |
170 | 170 | $cntl = $this->createAdmin(); |
171 | 171 | |
172 | - if( ( $html = $cntl->get() ) == '' ) { |
|
172 | + if (($html = $cntl->get()) == '') { |
|
173 | 173 | return $cntl->getView()->response(); |
174 | 174 | } |
175 | 175 | |
176 | - return $this->getHtml( $html ); |
|
176 | + return $this->getHtml($html); |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | |
@@ -184,17 +184,17 @@ discard block |
||
184 | 184 | */ |
185 | 185 | public function saveAction() |
186 | 186 | { |
187 | - if( config( 'shop.authorize', true ) ) { |
|
188 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] ); |
|
187 | + if (config('shop.authorize', true)) { |
|
188 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); |
|
189 | 189 | } |
190 | 190 | |
191 | 191 | $cntl = $this->createAdmin(); |
192 | 192 | |
193 | - if( ( $html = $cntl->save() ) == '' ) { |
|
193 | + if (($html = $cntl->save()) == '') { |
|
194 | 194 | return $cntl->getView()->response(); |
195 | 195 | } |
196 | 196 | |
197 | - return $this->getHtml( $html ); |
|
197 | + return $this->getHtml($html); |
|
198 | 198 | } |
199 | 199 | |
200 | 200 | |
@@ -205,17 +205,17 @@ discard block |
||
205 | 205 | */ |
206 | 206 | public function searchAction() |
207 | 207 | { |
208 | - if( config( 'shop.authorize', true ) ) { |
|
209 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] ); |
|
208 | + if (config('shop.authorize', true)) { |
|
209 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); |
|
210 | 210 | } |
211 | 211 | |
212 | 212 | $cntl = $this->createAdmin(); |
213 | 213 | |
214 | - if( ( $html = $cntl->search() ) == '' ) { |
|
214 | + if (($html = $cntl->search()) == '') { |
|
215 | 215 | return $cntl->getView()->response(); |
216 | 216 | } |
217 | 217 | |
218 | - return $this->getHtml( $html ); |
|
218 | + return $this->getHtml($html); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | |
@@ -226,26 +226,26 @@ discard block |
||
226 | 226 | */ |
227 | 227 | protected function createAdmin() |
228 | 228 | { |
229 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
230 | - $lang = Input::get( 'lang', config( 'app.locale', 'en' ) ); |
|
231 | - $resource = Route::input( 'resource' ); |
|
229 | + $site = Route::input('site', Input::get('site', 'default')); |
|
230 | + $lang = Input::get('lang', config('app.locale', 'en')); |
|
231 | + $resource = Route::input('resource'); |
|
232 | 232 | |
233 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
234 | - $paths = $aimeos->getCustomPaths( 'admin/jqadm/templates' ); |
|
233 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
234 | + $paths = $aimeos->getCustomPaths('admin/jqadm/templates'); |
|
235 | 235 | |
236 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); |
|
237 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) ); |
|
238 | - $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); |
|
236 | + $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
237 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en'))); |
|
238 | + $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); |
|
239 | 239 | |
240 | - $view = app( '\Aimeos\Shop\Base\View' )->create( $context, $paths, $lang ); |
|
240 | + $view = app('\Aimeos\Shop\Base\View')->create($context, $paths, $lang); |
|
241 | 241 | |
242 | 242 | $view->aimeosType = 'Laravel'; |
243 | - $view->aimeosVersion = app( '\Aimeos\Shop\Base\Aimeos' )->getVersion(); |
|
244 | - $view->aimeosExtensions = implode( ',', $aimeos->getExtensions() ); |
|
243 | + $view->aimeosVersion = app('\Aimeos\Shop\Base\Aimeos')->getVersion(); |
|
244 | + $view->aimeosExtensions = implode(',', $aimeos->getExtensions()); |
|
245 | 245 | |
246 | - $context->setView( $view ); |
|
246 | + $context->setView($view); |
|
247 | 247 | |
248 | - return \Aimeos\Admin\JQAdm::create( $context, $aimeos, $resource ); |
|
248 | + return \Aimeos\Admin\JQAdm::create($context, $aimeos, $resource); |
|
249 | 249 | } |
250 | 250 | |
251 | 251 | |
@@ -255,9 +255,9 @@ discard block |
||
255 | 255 | * @param string $content Content from admin client |
256 | 256 | * @return \Illuminate\Contracts\View\View View for rendering the output |
257 | 257 | */ |
258 | - protected function getHtml( $content ) |
|
258 | + protected function getHtml($content) |
|
259 | 259 | { |
260 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
261 | - return View::make( 'shop::jqadm.index', array( 'content' => $content, 'site' => $site ) ); |
|
260 | + $site = Route::input('site', Input::get('site', 'default')); |
|
261 | + return View::make('shop::jqadm.index', array('content' => $content, 'site' => $site)); |
|
262 | 262 | } |
263 | 263 | } |
@@ -36,26 +36,26 @@ |
||
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( Auth::check() === false |
|
42 | - || $request->user()->can( 'admin', [AdminController::class, ['admin', 'editor']] ) === false |
|
41 | + if (Auth::check() === false |
|
42 | + || $request->user()->can('admin', [AdminController::class, ['admin', 'editor']]) === false |
|
43 | 43 | ) { |
44 | - return redirect()->guest( 'login' ); |
|
44 | + return redirect()->guest('login'); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | $siteId = $request->user()->siteid; |
48 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
49 | - $siteManager = \Aimeos\MShop::create( $context, 'locale/site' ); |
|
50 | - $siteCode = ( $siteId ? $siteManager->getItem( $siteId )->getCode() : 'default' ); |
|
51 | - $locale = $request->user()->langid ?: config( 'app.locale', 'en' ); |
|
48 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
49 | + $siteManager = \Aimeos\MShop::create($context, 'locale/site'); |
|
50 | + $siteCode = ($siteId ? $siteManager->getItem($siteId)->getCode() : 'default'); |
|
51 | + $locale = $request->user()->langid ?: config('app.locale', 'en'); |
|
52 | 52 | |
53 | 53 | $param = array( |
54 | 54 | 'resource' => 'dashboard', |
55 | - 'site' => Route::input( 'site', Input::get( 'site', $siteCode ) ), |
|
56 | - 'lang' => Route::input( 'lang', Input::get( 'lang', $locale ) ) |
|
55 | + 'site' => Route::input('site', Input::get('site', $siteCode)), |
|
56 | + 'lang' => Route::input('lang', Input::get('lang', $locale)) |
|
57 | 57 | ); |
58 | 58 | |
59 | - return redirect()->route( 'aimeos_shop_jqadm_search', $param ); |
|
59 | + return redirect()->route('aimeos_shop_jqadm_search', $param); |
|
60 | 60 | } |
61 | 61 | } |