@@ -34,66 +34,66 @@ discard block |
||
34 | 34 | * @param \Illuminate\Http\Request $request Laravel request object |
35 | 35 | * @return \Illuminate\Contracts\View\View View for rendering the output |
36 | 36 | */ |
37 | - public function indexAction( Request $request ) |
|
37 | + public function indexAction(Request $request) |
|
38 | 38 | { |
39 | - if( config( 'shop.authorize', true ) ) { |
|
40 | - $this->authorize( 'admin', [ExtadmController::class, ['admin']] ); |
|
39 | + if (config('shop.authorize', true)) { |
|
40 | + $this->authorize('admin', [ExtadmController::class, ['admin']]); |
|
41 | 41 | } |
42 | 42 | |
43 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
44 | - $lang = Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) ); |
|
45 | - $tab = Route::input( 'tab', Input::get( 'tab', 0 ) ); |
|
43 | + $site = Route::input('site', Input::get('site', 'default')); |
|
44 | + $lang = Route::input('lang', Input::get('lang', config('app.locale', 'en'))); |
|
45 | + $tab = Route::input('tab', Input::get('tab', 0)); |
|
46 | 46 | |
47 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' ); |
|
47 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos'); |
|
48 | 48 | |
49 | 49 | $bootstrap = $aimeos->get(); |
50 | - $cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' ); |
|
50 | + $cntlPaths = $bootstrap->getCustomPaths('controller/extjs'); |
|
51 | 51 | |
52 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); |
|
53 | - $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); |
|
52 | + $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
53 | + $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); |
|
54 | 54 | |
55 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
55 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
56 | 56 | $cssFiles = array(); |
57 | 57 | |
58 | - foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
58 | + foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths) |
|
59 | 59 | { |
60 | - foreach( $paths as $path ) |
|
60 | + foreach ($paths as $path) |
|
61 | 61 | { |
62 | - $jsbAbsPath = $base . '/' . $path; |
|
62 | + $jsbAbsPath = $base.'/'.$path; |
|
63 | 63 | |
64 | - if( !is_file( $jsbAbsPath ) ) { |
|
65 | - throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) ); |
|
64 | + if (!is_file($jsbAbsPath)) { |
|
65 | + throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath)); |
|
66 | 66 | } |
67 | 67 | |
68 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) ); |
|
69 | - $cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) ); |
|
68 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path)); |
|
69 | + $cssFiles = array_merge($cssFiles, $jsb2->getUrls('css')); |
|
70 | 70 | } |
71 | 71 | } |
72 | 72 | |
73 | - $jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) ); |
|
74 | - $jqadmUrl = route( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'lang' => $lang, 'resource' => 'dashboard' ) ); |
|
75 | - $adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) ); |
|
73 | + $jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token())); |
|
74 | + $jqadmUrl = route('aimeos_shop_jqadm_search', array('site' => $site, 'lang' => $lang, 'resource' => 'dashboard')); |
|
75 | + $adminUrl = route('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>')); |
|
76 | 76 | |
77 | 77 | $vars = array( |
78 | 78 | 'site' => $site, |
79 | 79 | 'lang' => $lang, |
80 | 80 | 'cssFiles' => $cssFiles, |
81 | - 'languages' => $this->getJsonLanguages( $context), |
|
82 | - 'config' => $this->getJsonClientConfig( $context ), |
|
83 | - 'siteitem' => $this->getJsonSiteItem( $context, $site ), |
|
84 | - 'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ), |
|
81 | + 'languages' => $this->getJsonLanguages($context), |
|
82 | + 'config' => $this->getJsonClientConfig($context), |
|
83 | + 'siteitem' => $this->getJsonSiteItem($context, $site), |
|
84 | + 'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang), |
|
85 | 85 | 'searchSchemas' => $controller->getJsonSearchSchemas(), |
86 | 86 | 'itemSchemas' => $controller->getJsonItemSchemas(), |
87 | - 'smd' => $controller->getJsonSmd( $jsonUrl ), |
|
88 | - 'uploaddir' => config( 'shop::uploaddir' ), |
|
89 | - 'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ), |
|
90 | - 'extensions' => implode( ',', $bootstrap->getExtensions() ), |
|
87 | + 'smd' => $controller->getJsonSmd($jsonUrl), |
|
88 | + 'uploaddir' => config('shop::uploaddir'), |
|
89 | + 'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)), |
|
90 | + 'extensions' => implode(',', $bootstrap->getExtensions()), |
|
91 | 91 | 'version' => $aimeos->getVersion(), |
92 | 92 | 'jqadmurl' => $jqadmUrl, |
93 | 93 | 'activeTab' => $tab, |
94 | 94 | ); |
95 | 95 | |
96 | - return View::make( 'shop::extadm.index', $vars ); |
|
96 | + return View::make('shop::extadm.index', $vars); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | |
@@ -103,25 +103,25 @@ discard block |
||
103 | 103 | * @param \Illuminate\Http\Request $request Laravel request object |
104 | 104 | * @return \Illuminate\Contracts\View\View View for rendering the output |
105 | 105 | */ |
106 | - public function doAction( Request $request ) |
|
106 | + public function doAction(Request $request) |
|
107 | 107 | { |
108 | - if( config( 'shop.authorize', true ) ) { |
|
109 | - $this->authorize( 'admin', [ExtadmController::class, ['admin']] ); |
|
108 | + if (config('shop.authorize', true)) { |
|
109 | + $this->authorize('admin', [ExtadmController::class, ['admin']]); |
|
110 | 110 | } |
111 | 111 | |
112 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
112 | + $site = Route::input('site', Input::get('site', 'default')); |
|
113 | 113 | |
114 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
115 | - $cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' ); |
|
114 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
115 | + $cntlPaths = $aimeos->getCustomPaths('controller/extjs'); |
|
116 | 116 | |
117 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); |
|
118 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, array() ) ); |
|
119 | - $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); |
|
117 | + $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
118 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context, array())); |
|
119 | + $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); |
|
120 | 120 | |
121 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
121 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
122 | 122 | |
123 | - $response = $controller->process( Input::instance()->request->all(), $request->getContent() ); |
|
124 | - return View::make( 'shop::extadm.do', array( 'output' => $response ) ); |
|
123 | + $response = $controller->process(Input::instance()->request->all(), $request->getContent()); |
|
124 | + return View::make('shop::extadm.do', array('output' => $response)); |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | |
@@ -132,32 +132,32 @@ discard block |
||
132 | 132 | */ |
133 | 133 | public function fileAction() |
134 | 134 | { |
135 | - if( config( 'shop.authorize', true ) ) { |
|
136 | - $this->authorize( 'admin', [ExtadmController::class, ['admin']] ); |
|
135 | + if (config('shop.authorize', true)) { |
|
136 | + $this->authorize('admin', [ExtadmController::class, ['admin']]); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | $contents = ''; |
140 | 140 | $jsFiles = array(); |
141 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
141 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
142 | 142 | |
143 | - foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
143 | + foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths) |
|
144 | 144 | { |
145 | - foreach( $paths as $path ) |
|
145 | + foreach ($paths as $path) |
|
146 | 146 | { |
147 | - $jsbAbsPath = $base . '/' . $path; |
|
148 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
149 | - $jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) ); |
|
147 | + $jsbAbsPath = $base.'/'.$path; |
|
148 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
149 | + $jsFiles = array_merge($jsFiles, $jsb2->getFiles('js')); |
|
150 | 150 | } |
151 | 151 | } |
152 | 152 | |
153 | - foreach( $jsFiles as $file ) |
|
153 | + foreach ($jsFiles as $file) |
|
154 | 154 | { |
155 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
155 | + if (($content = file_get_contents($file)) !== false) { |
|
156 | 156 | $contents .= $content; |
157 | 157 | } |
158 | 158 | } |
159 | 159 | |
160 | - return response( $contents )->header( 'Content-Type', 'application/javascript' ); |
|
160 | + return response($contents)->header('Content-Type', 'application/javascript'); |
|
161 | 161 | } |
162 | 162 | |
163 | 163 | |
@@ -167,15 +167,15 @@ discard block |
||
167 | 167 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
168 | 168 | * @return array List of language IDs with labels |
169 | 169 | */ |
170 | - protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context ) |
|
170 | + protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context) |
|
171 | 171 | { |
172 | 172 | $result = array(); |
173 | 173 | |
174 | - foreach( app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nList( 'admin' ) as $id ) { |
|
175 | - $result[] = array( 'id' => $id, 'label' => $id ); |
|
174 | + foreach (app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nList('admin') as $id) { |
|
175 | + $result[] = array('id' => $id, 'label' => $id); |
|
176 | 176 | } |
177 | 177 | |
178 | - return json_encode( $result ); |
|
178 | + return json_encode($result); |
|
179 | 179 | } |
180 | 180 | |
181 | 181 | |
@@ -185,10 +185,10 @@ discard block |
||
185 | 185 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item object |
186 | 186 | * @return string JSON encoded configuration object |
187 | 187 | */ |
188 | - protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context ) |
|
188 | + protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context) |
|
189 | 189 | { |
190 | - $config = $context->getConfig()->get( 'admin/extjs', array() ); |
|
191 | - return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT ); |
|
190 | + $config = $context->getConfig()->get('admin/extjs', array()); |
|
191 | + return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT); |
|
192 | 192 | } |
193 | 193 | |
194 | 194 | |
@@ -199,16 +199,16 @@ discard block |
||
199 | 199 | * @param string $lang ISO language code like "en" or "en_GB" |
200 | 200 | * @return string JSON encoded translation object |
201 | 201 | */ |
202 | - protected function getJsonClientI18n( array $i18nPaths, $lang ) |
|
202 | + protected function getJsonClientI18n(array $i18nPaths, $lang) |
|
203 | 203 | { |
204 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang ); |
|
204 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang); |
|
205 | 205 | |
206 | 206 | $content = array( |
207 | - 'admin' => $i18n->getAll( 'admin' ), |
|
208 | - 'admin/ext' => $i18n->getAll( 'admin/ext' ), |
|
207 | + 'admin' => $i18n->getAll('admin'), |
|
208 | + 'admin/ext' => $i18n->getAll('admin/ext'), |
|
209 | 209 | ); |
210 | 210 | |
211 | - return json_encode( $content, JSON_FORCE_OBJECT ); |
|
211 | + return json_encode($content, JSON_FORCE_OBJECT); |
|
212 | 212 | } |
213 | 213 | |
214 | 214 | |
@@ -220,18 +220,18 @@ discard block |
||
220 | 220 | * @return string JSON encoded site item object |
221 | 221 | * @throws Exception If no site item was found for the code |
222 | 222 | */ |
223 | - protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
223 | + protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
224 | 224 | { |
225 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
225 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
226 | 226 | |
227 | 227 | $criteria = $manager->createSearch(); |
228 | - $criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) ); |
|
229 | - $items = $manager->searchItems( $criteria ); |
|
228 | + $criteria->setConditions($criteria->compare('==', 'locale.site.code', $site)); |
|
229 | + $items = $manager->searchItems($criteria); |
|
230 | 230 | |
231 | - if( ( $item = reset( $items ) ) === false ) { |
|
232 | - throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) ); |
|
231 | + if (($item = reset($items)) === false) { |
|
232 | + throw new \Exception(sprintf('No site found for code "%1$s"', $site)); |
|
233 | 233 | } |
234 | 234 | |
235 | - return json_encode( $item->toArray() ); |
|
235 | + return json_encode($item->toArray()); |
|
236 | 236 | } |
237 | 237 | } |
238 | 238 | \ No newline at end of file |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | Route::group(config('shop.routes.login', ['middleware' => ['web']]), function() { |
4 | 4 | |
5 | - Route::match( array( 'GET' ), 'admin', array( |
|
5 | + Route::match(array('GET'), 'admin', array( |
|
6 | 6 | 'as' => 'aimeos_shop_admin', |
7 | 7 | 'uses' => 'Aimeos\Shop\Controller\AdminController@indexAction' |
8 | 8 | )); |
@@ -12,17 +12,17 @@ discard block |
||
12 | 12 | |
13 | 13 | Route::group(config('shop.routes.extadm', ['prefix' => 'admin/{site}/extadm', 'middleware' => ['web', 'auth']]), function() { |
14 | 14 | |
15 | - Route::match( array( 'POST' ), 'do', array( |
|
15 | + Route::match(array('POST'), 'do', array( |
|
16 | 16 | 'as' => 'aimeos_shop_extadm_json', |
17 | 17 | 'uses' => 'Aimeos\Shop\Controller\ExtadmController@doAction' |
18 | 18 | )); |
19 | 19 | |
20 | - Route::match( array( 'GET' ), 'file', array( |
|
20 | + Route::match(array('GET'), 'file', array( |
|
21 | 21 | 'as' => 'aimeos_shop_extadm_file', |
22 | 22 | 'uses' => 'Aimeos\Shop\Controller\ExtadmController@fileAction' |
23 | 23 | )); |
24 | 24 | |
25 | - Route::match( array( 'GET' ), '/{lang?}/{tab?}', array( |
|
25 | + Route::match(array('GET'), '/{lang?}/{tab?}', array( |
|
26 | 26 | 'as' => 'aimeos_shop_extadm', |
27 | 27 | 'uses' => 'Aimeos\Shop\Controller\ExtadmController@indexAction' |
28 | 28 | )); |
@@ -32,37 +32,37 @@ discard block |
||
32 | 32 | |
33 | 33 | Route::group(config('shop.routes.jqadm', ['prefix' => 'admin/{site}/jqadm', 'middleware' => ['web', 'auth']]), function() { |
34 | 34 | |
35 | - Route::match( array( 'GET' ), 'file/{type}', array( |
|
35 | + Route::match(array('GET'), 'file/{type}', array( |
|
36 | 36 | 'as' => 'aimeos_shop_jqadm_file', |
37 | 37 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@fileAction' |
38 | 38 | )); |
39 | 39 | |
40 | - Route::match( array( 'GET', 'POST' ), 'copy/{resource}/{id}', array( |
|
40 | + Route::match(array('GET', 'POST'), 'copy/{resource}/{id}', array( |
|
41 | 41 | 'as' => 'aimeos_shop_jqadm_copy', |
42 | 42 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction' |
43 | 43 | )); |
44 | 44 | |
45 | - Route::match( array( 'GET', 'POST' ), 'create/{resource}', array( |
|
45 | + Route::match(array('GET', 'POST'), 'create/{resource}', array( |
|
46 | 46 | 'as' => 'aimeos_shop_jqadm_create', |
47 | 47 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction' |
48 | 48 | )); |
49 | 49 | |
50 | - Route::match( array( 'GET', 'POST' ), 'delete/{resource}/{id}', array( |
|
50 | + Route::match(array('GET', 'POST'), 'delete/{resource}/{id}', array( |
|
51 | 51 | 'as' => 'aimeos_shop_jqadm_delete', |
52 | 52 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction' |
53 | 53 | )); |
54 | 54 | |
55 | - Route::match( array( 'GET' ), 'get/{resource}/{id}', array( |
|
55 | + Route::match(array('GET'), 'get/{resource}/{id}', array( |
|
56 | 56 | 'as' => 'aimeos_shop_jqadm_get', |
57 | 57 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction' |
58 | 58 | )); |
59 | 59 | |
60 | - Route::match( array( 'POST' ), 'save/{resource}/{id?}', array( |
|
60 | + Route::match(array('POST'), 'save/{resource}/{id?}', array( |
|
61 | 61 | 'as' => 'aimeos_shop_jqadm_save', |
62 | 62 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction' |
63 | - ))->defaults( 'id', '' ); |
|
63 | + ))->defaults('id', ''); |
|
64 | 64 | |
65 | - Route::match( array( 'GET', 'POST' ), 'search/{resource}', array( |
|
65 | + Route::match(array('GET', 'POST'), 'search/{resource}', array( |
|
66 | 66 | 'as' => 'aimeos_shop_jqadm_search', |
67 | 67 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction' |
68 | 68 | )); |
@@ -72,67 +72,67 @@ discard block |
||
72 | 72 | |
73 | 73 | Route::group(config('shop.routes.jsonadm', ['prefix' => 'admin/{site}/jsonadm', 'middleware' => ['web', 'auth']]), function() { |
74 | 74 | |
75 | - Route::match( array( 'DELETE' ), '{resource}/{id?}', array( |
|
75 | + Route::match(array('DELETE'), '{resource}/{id?}', array( |
|
76 | 76 | 'as' => 'aimeos_shop_jsonadm_delete', |
77 | 77 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction' |
78 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) )->defaults( 'id', '' ); |
|
78 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*'))->defaults('id', ''); |
|
79 | 79 | |
80 | - Route::match( array( 'GET' ), '{resource}/{id?}', array( |
|
80 | + Route::match(array('GET'), '{resource}/{id?}', array( |
|
81 | 81 | 'as' => 'aimeos_shop_jsonadm_get', |
82 | 82 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction' |
83 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) )->defaults( 'id', '' ); |
|
83 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*'))->defaults('id', ''); |
|
84 | 84 | |
85 | - Route::match( array( 'PATCH' ), '{resource}/{id?}', array( |
|
85 | + Route::match(array('PATCH'), '{resource}/{id?}', array( |
|
86 | 86 | 'as' => 'aimeos_shop_jsonadm_patch', |
87 | 87 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction' |
88 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) )->defaults( 'id', '' ); |
|
88 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*'))->defaults('id', ''); |
|
89 | 89 | |
90 | - Route::match( array( 'POST' ), '{resource}/{id?}', array( |
|
90 | + Route::match(array('POST'), '{resource}/{id?}', array( |
|
91 | 91 | 'as' => 'aimeos_shop_jsonadm_post', |
92 | 92 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction' |
93 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) )->defaults( 'id', '' ); |
|
93 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*'))->defaults('id', ''); |
|
94 | 94 | |
95 | - Route::match( array( 'PUT' ), '{resource}/{id?}', array( |
|
95 | + Route::match(array('PUT'), '{resource}/{id?}', array( |
|
96 | 96 | 'as' => 'aimeos_shop_jsonadm_put', |
97 | 97 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction' |
98 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*' ) )->defaults( 'id', '' ); |
|
98 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*'))->defaults('id', ''); |
|
99 | 99 | |
100 | - Route::match( array( 'OPTIONS' ), '{resource?}', array( |
|
100 | + Route::match(array('OPTIONS'), '{resource?}', array( |
|
101 | 101 | 'as' => 'aimeos_shop_jsonadm_options', |
102 | 102 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction' |
103 | - ))->where( array( 'resource' => '[^0-9A-Z\-\_]*' ) ); |
|
103 | + ))->where(array('resource' => '[^0-9A-Z\-\_]*')); |
|
104 | 104 | |
105 | 105 | }); |
106 | 106 | |
107 | 107 | |
108 | 108 | Route::group(config('shop.routes.jsonapi', ['prefix' => 'jsonapi', 'middleware' => ['api']]), function() { |
109 | 109 | |
110 | - Route::match( array( 'DELETE' ), '{resource}', array( |
|
110 | + Route::match(array('DELETE'), '{resource}', array( |
|
111 | 111 | 'as' => 'aimeos_shop_jsonapi_delete', |
112 | 112 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@deleteAction' |
113 | 113 | )); |
114 | 114 | |
115 | - Route::match( array( 'GET' ), '{resource}', array( |
|
115 | + Route::match(array('GET'), '{resource}', array( |
|
116 | 116 | 'as' => 'aimeos_shop_jsonapi_get', |
117 | 117 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@getAction' |
118 | 118 | )); |
119 | 119 | |
120 | - Route::match( array( 'PATCH' ), '{resource}', array( |
|
120 | + Route::match(array('PATCH'), '{resource}', array( |
|
121 | 121 | 'as' => 'aimeos_shop_jsonapi_patch', |
122 | 122 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@patchAction' |
123 | 123 | )); |
124 | 124 | |
125 | - Route::match( array( 'POST' ), '{resource}', array( |
|
125 | + Route::match(array('POST'), '{resource}', array( |
|
126 | 126 | 'as' => 'aimeos_shop_jsonapi_post', |
127 | 127 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@postAction' |
128 | 128 | )); |
129 | 129 | |
130 | - Route::match( array( 'PUT' ), '{resource}', array( |
|
130 | + Route::match(array('PUT'), '{resource}', array( |
|
131 | 131 | 'as' => 'aimeos_shop_jsonapi_put', |
132 | 132 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@putAction' |
133 | 133 | )); |
134 | 134 | |
135 | - Route::match( array( 'OPTIONS' ), '{resource?}', array( |
|
135 | + Route::match(array('OPTIONS'), '{resource?}', array( |
|
136 | 136 | 'as' => 'aimeos_shop_jsonapi_options', |
137 | 137 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@optionsAction' |
138 | 138 | )); |
@@ -142,22 +142,22 @@ discard block |
||
142 | 142 | |
143 | 143 | Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() { |
144 | 144 | |
145 | - Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
145 | + Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
146 | 146 | 'as' => 'aimeos_shop_account_favorite', |
147 | 147 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
148 | 148 | )); |
149 | 149 | |
150 | - Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
150 | + Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
151 | 151 | 'as' => 'aimeos_shop_account_watch', |
152 | 152 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
153 | 153 | )); |
154 | 154 | |
155 | - Route::match( array( 'GET', 'POST' ), 'myaccount/download/{dl_id}', array( |
|
155 | + Route::match(array('GET', 'POST'), 'myaccount/download/{dl_id}', array( |
|
156 | 156 | 'as' => 'aimeos_shop_account_download', |
157 | 157 | 'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction' |
158 | 158 | )); |
159 | 159 | |
160 | - Route::match( array( 'GET', 'POST' ), 'myaccount', array( |
|
160 | + Route::match(array('GET', 'POST'), 'myaccount', array( |
|
161 | 161 | 'as' => 'aimeos_shop_account', |
162 | 162 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
163 | 163 | )); |
@@ -167,42 +167,42 @@ discard block |
||
167 | 167 | |
168 | 168 | Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() { |
169 | 169 | |
170 | - Route::match( array( 'GET', 'POST' ), 'count', array( |
|
170 | + Route::match(array('GET', 'POST'), 'count', array( |
|
171 | 171 | 'as' => 'aimeos_shop_count', |
172 | 172 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction' |
173 | 173 | )); |
174 | 174 | |
175 | - Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array( |
|
175 | + Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array( |
|
176 | 176 | 'as' => 'aimeos_shop_detail', |
177 | 177 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
178 | 178 | )); |
179 | 179 | |
180 | - Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
180 | + Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
181 | 181 | 'as' => 'aimeos_shop_session_pinned', |
182 | 182 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
183 | 183 | )); |
184 | 184 | |
185 | - Route::match( array( 'GET', 'POST' ), 'list', array( |
|
185 | + Route::match(array('GET', 'POST'), 'list', array( |
|
186 | 186 | 'as' => 'aimeos_shop_list', |
187 | 187 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction' |
188 | 188 | )); |
189 | 189 | |
190 | - Route::match( array( 'GET', 'POST' ), 'suggest', array( |
|
190 | + Route::match(array('GET', 'POST'), 'suggest', array( |
|
191 | 191 | 'as' => 'aimeos_shop_suggest', |
192 | 192 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction' |
193 | 193 | )); |
194 | 194 | |
195 | - Route::match( array( 'GET', 'POST' ), 'stock', array( |
|
195 | + Route::match(array('GET', 'POST'), 'stock', array( |
|
196 | 196 | 'as' => 'aimeos_shop_stock', |
197 | 197 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction' |
198 | 198 | )); |
199 | 199 | |
200 | - Route::match( array( 'GET', 'POST' ), 'basket', array( |
|
200 | + Route::match(array('GET', 'POST'), 'basket', array( |
|
201 | 201 | 'as' => 'aimeos_shop_basket', |
202 | 202 | 'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction' |
203 | 203 | )); |
204 | 204 | |
205 | - Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array( |
|
205 | + Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array( |
|
206 | 206 | 'as' => 'aimeos_shop_checkout', |
207 | 207 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction' |
208 | 208 | )); |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | |
213 | 213 | Route::group(config('shop.routes.confirm', ['middleware' => ['web']]), function() { |
214 | 214 | |
215 | - Route::match( array( 'GET', 'POST' ), 'confirm', array( |
|
215 | + Route::match(array('GET', 'POST'), 'confirm', array( |
|
216 | 216 | 'as' => 'aimeos_shop_confirm', |
217 | 217 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction' |
218 | 218 | )); |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | |
223 | 223 | Route::group(config('shop.routes.update', []), function() { |
224 | 224 | |
225 | - Route::match( array( 'GET', 'POST' ), 'update', array( |
|
225 | + Route::match(array('GET', 'POST'), 'update', array( |
|
226 | 226 | 'as' => 'aimeos_shop_update', |
227 | 227 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction' |
228 | 228 | )); |