@@ -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' )->get(); |
|
111 | - $tmplPaths = $aimeos->getCustomPaths( 'client/jsonapi/templates' ); |
|
110 | + $aimeos = app('aimeos')->get(); |
|
111 | + $tmplPaths = $aimeos->getCustomPaths('client/jsonapi/templates'); |
|
112 | 112 | |
113 | - $context = app( 'aimeos.context' )->get(); |
|
113 | + $context = app('aimeos.context')->get(); |
|
114 | 114 | $langid = $context->getLocale()->getLanguageId(); |
115 | 115 | |
116 | - $context->setView( app( 'aimeos.view' )->create( $context, $tmplPaths, $langid ) ); |
|
116 | + $context->setView(app('aimeos.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 | } |
@@ -30,12 +30,12 @@ |
||
30 | 30 | */ |
31 | 31 | public function indexAction() |
32 | 32 | { |
33 | - $default = ['basket/standard','basket/related']; |
|
33 | + $default = ['basket/standard', 'basket/related']; |
|
34 | 34 | |
35 | - foreach( app( 'config' )->get( 'shop.page.basket-index', $default ) as $name ) |
|
35 | + foreach (app('config')->get('shop.page.basket-index', $default) as $name) |
|
36 | 36 | { |
37 | - $params['aiheader'][$name] = Shop::get( $name )->getHeader(); |
|
38 | - $params['aibody'][$name] = Shop::get( $name )->getBody(); |
|
37 | + $params['aiheader'][$name] = Shop::get($name)->getHeader(); |
|
38 | + $params['aibody'][$name] = Shop::get($name)->getBody(); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | return Response::view('shop::basket.index', $params)->header('Cache-Control', 'no-store'); |
@@ -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' )->get(); |
|
44 | - $type = Route::input( 'type', Input::get( 'type', 'js' ) ); |
|
43 | + $aimeos = app('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' )->get(); |
|
234 | - $paths = $aimeos->getCustomPaths( 'admin/jqadm/templates' ); |
|
233 | + $aimeos = app('aimeos')->get(); |
|
234 | + $paths = $aimeos->getCustomPaths('admin/jqadm/templates'); |
|
235 | 235 | |
236 | - $context = app( 'aimeos.context' )->get( false, 'backend' ); |
|
237 | - $context->setI18n( app('aimeos.i18n')->get( array( $lang, 'en' ) ) ); |
|
238 | - $context->setLocale( app('aimeos.locale')->getBackend( $context, $site ) ); |
|
236 | + $context = app('aimeos.context')->get(false, 'backend'); |
|
237 | + $context->setI18n(app('aimeos.i18n')->get(array($lang, 'en'))); |
|
238 | + $context->setLocale(app('aimeos.locale')->getBackend($context, $site)); |
|
239 | 239 | |
240 | - $view = app( 'aimeos.view' )->create( $context, $paths, $lang ); |
|
240 | + $view = app('aimeos.view')->create($context, $paths, $lang); |
|
241 | 241 | |
242 | 242 | $view->aimeosType = 'Laravel'; |
243 | - $view->aimeosVersion = app( 'aimeos' )->getVersion(); |
|
244 | - $view->aimeosExtensions = implode( ',', $aimeos->getExtensions() ); |
|
243 | + $view->aimeosVersion = app('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 | } |