@@ -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' ); |
|
107 | + $resource = Route::input('resource'); |
|
108 | + $related = Route::input('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\Factory::createClient( $context, $tmplPaths, $resource . '/' . $related ); |
|
118 | + return \Aimeos\Client\JsonApi\Factory::createClient($context, $tmplPaths, $resource.'/'.$related); |
|
119 | 119 | } |
120 | 120 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
41 | 41 | * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object |
42 | 42 | */ |
43 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos ) |
|
43 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos) |
|
44 | 44 | { |
45 | 45 | $this->aimeos = $aimeos; |
46 | 46 | $this->config = $config; |
@@ -53,23 +53,23 @@ discard block |
||
53 | 53 | * @param integer $type Configuration type ("frontend" or "backend") |
54 | 54 | * @return \Aimeos\MW\Config\Iface Configuration object |
55 | 55 | */ |
56 | - public function get( $type = 'frontend' ) |
|
56 | + public function get($type = 'frontend') |
|
57 | 57 | { |
58 | - if( !isset( $this->objects[$type] ) ) |
|
58 | + if (!isset($this->objects[$type])) |
|
59 | 59 | { |
60 | 60 | $configPaths = $this->aimeos->get()->getConfigPaths(); |
61 | - $cfgfile = dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'default.php'; |
|
61 | + $cfgfile = dirname(dirname(dirname(__DIR__))).DIRECTORY_SEPARATOR.'default.php'; |
|
62 | 62 | |
63 | - $config = new \Aimeos\MW\Config\PHPArray( require $cfgfile, $configPaths ); |
|
63 | + $config = new \Aimeos\MW\Config\PHPArray(require $cfgfile, $configPaths); |
|
64 | 64 | |
65 | - if( $this->config->get( 'shop.apc_enabled', false ) == true ) { |
|
66 | - $config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); |
|
65 | + if ($this->config->get('shop.apc_enabled', false) == true) { |
|
66 | + $config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:')); |
|
67 | 67 | } |
68 | 68 | |
69 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->config->get( 'shop' ) ); |
|
69 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->config->get('shop')); |
|
70 | 70 | |
71 | - if( ( $conf = $this->config->get( 'shop.' . $type, array() ) ) !== array() ) { |
|
72 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $conf ); |
|
71 | + if (($conf = $this->config->get('shop.'.$type, array())) !== array()) { |
|
72 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $conf); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | $this->objects[$type] = $config; |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
41 | 41 | * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object |
42 | 42 | */ |
43 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos ) |
|
43 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos) |
|
44 | 44 | { |
45 | 45 | $this->aimeos = $aimeos; |
46 | 46 | $this->config = $config; |
@@ -53,22 +53,22 @@ discard block |
||
53 | 53 | * @param array $languageIds List of two letter ISO language IDs |
54 | 54 | * @return \Aimeos\MW\Translation\Iface[] List of translation objects |
55 | 55 | */ |
56 | - public function get( array $languageIds ) |
|
56 | + public function get(array $languageIds) |
|
57 | 57 | { |
58 | 58 | $i18nPaths = $this->aimeos->get()->getI18nPaths(); |
59 | 59 | |
60 | - foreach( $languageIds as $langid ) |
|
60 | + foreach ($languageIds as $langid) |
|
61 | 61 | { |
62 | - if( !isset( $this->i18n[$langid] ) ) |
|
62 | + if (!isset($this->i18n[$langid])) |
|
63 | 63 | { |
64 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid ); |
|
64 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid); |
|
65 | 65 | |
66 | - if( $this->config->get( 'shop.apc_enabled', false ) == true ) { |
|
67 | - $i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); |
|
66 | + if ($this->config->get('shop.apc_enabled', false) == true) { |
|
67 | + $i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $this->config->get('shop.apc_prefix', 'laravel:')); |
|
68 | 68 | } |
69 | 69 | |
70 | - if( $this->config->has( 'shop.i18n.' . $langid ) ) { |
|
71 | - $i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $this->config->get( 'shop.i18n.' . $langid ) ); |
|
70 | + if ($this->config->has('shop.i18n.'.$langid)) { |
|
71 | + $i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $this->config->get('shop.i18n.'.$langid)); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | $this->i18n[$langid] = $i18n; |
@@ -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,57 +12,57 @@ 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 | - ))->defaults( 'lang', 'en' )->defaults( 'tab', 0 ); |
|
28 | + ))->defaults('lang', 'en')->defaults('tab', 0); |
|
29 | 29 | |
30 | 30 | }); |
31 | 31 | |
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 | 63 | )); |
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,94 +72,94 @@ 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-9]+', 'id' => '[0-9]*' ) )->defaults( 'id', '' ); |
|
78 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'))->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-9]+', 'id' => '[0-9]*' ) )->defaults( 'id', '' ); |
|
83 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'))->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-9]+', 'id' => '[0-9]*' ) )->defaults( 'id', '' ); |
|
88 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'))->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-9]+', 'id' => '[0-9]*' ) )->defaults( 'id', '' ); |
|
93 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'))->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-9]+', 'id' => '[0-9]*' ) )->defaults( 'id', '' ); |
|
98 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*'))->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-9]*' ) ); |
|
103 | + ))->where(array('resource' => '[^0-9]*')); |
|
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}/{id?}/{related?}/{relatedid?}', array( |
|
110 | + Route::match(array('DELETE'), '{resource}/{id?}/{related?}/{relatedid?}', array( |
|
111 | 111 | 'as' => 'aimeos_shop_jsonapi_delete', |
112 | 112 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@deleteAction' |
113 | - ))->defaults( 'id', '' )->defaults( 'related', '' )->defaults( 'relatedid', '' ); |
|
113 | + ))->defaults('id', '')->defaults('related', '')->defaults('relatedid', ''); |
|
114 | 114 | |
115 | - Route::match( array( 'GET' ), '{resource}/{id?}/{related?}/{relatedid?}', array( |
|
115 | + Route::match(array('GET'), '{resource}/{id?}/{related?}/{relatedid?}', array( |
|
116 | 116 | 'as' => 'aimeos_shop_jsonapi_get', |
117 | 117 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@getAction' |
118 | - ))->defaults( 'id', '' )->defaults( 'related', '' )->defaults( 'relatedid', '' ); |
|
118 | + ))->defaults('id', '')->defaults('related', '')->defaults('relatedid', ''); |
|
119 | 119 | |
120 | - Route::match( array( 'PATCH' ), '{resource}/{id?}/{related?}/{relatedid?}', array( |
|
120 | + Route::match(array('PATCH'), '{resource}/{id?}/{related?}/{relatedid?}', array( |
|
121 | 121 | 'as' => 'aimeos_shop_jsonapi_patch', |
122 | 122 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@patchAction' |
123 | - ))->defaults( 'id', '' )->defaults( 'related', '' )->defaults( 'relatedid', '' ); |
|
123 | + ))->defaults('id', '')->defaults('related', '')->defaults('relatedid', ''); |
|
124 | 124 | |
125 | - Route::match( array( 'POST' ), '{resource}/{id?}/{related?}/{relatedid?}', array( |
|
125 | + Route::match(array('POST'), '{resource}/{id?}/{related?}/{relatedid?}', array( |
|
126 | 126 | 'as' => 'aimeos_shop_jsonapi_post', |
127 | 127 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@postAction' |
128 | - ))->defaults( 'id', '' )->defaults( 'related', '' )->defaults( 'relatedid', '' ); |
|
128 | + ))->defaults('id', '')->defaults('related', '')->defaults('relatedid', ''); |
|
129 | 129 | |
130 | - Route::match( array( 'PUT' ), '{resource}/{id?}/{related?}/{relatedid?}', array( |
|
130 | + Route::match(array('PUT'), '{resource}/{id?}/{related?}/{relatedid?}', array( |
|
131 | 131 | 'as' => 'aimeos_shop_jsonapi_put', |
132 | 132 | 'uses' => 'Aimeos\Shop\Controller\JsonapiController@putAction' |
133 | - ))->defaults( 'id', '' )->defaults( 'related', '' )->defaults( 'relatedid', '' ); |
|
133 | + ))->defaults('id', '')->defaults('related', '')->defaults('relatedid', ''); |
|
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 | - ))->defaults( 'resource', '' ); |
|
138 | + ))->defaults('resource', ''); |
|
139 | 139 | |
140 | 140 | }); |
141 | 141 | |
142 | 142 | |
143 | 143 | Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() { |
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 | )); |
149 | 149 | |
150 | - Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
150 | + Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
151 | 151 | 'as' => 'aimeos_shop_account_favorite', |
152 | 152 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
153 | - ))->defaults( 'fav_action', '' )->defaults( 'fav_id', '' )->defaults( 'd_prodid', '' ) |
|
154 | - ->defaults( 'd_name', '' )->defaults( 'd_pos', 0 ); |
|
153 | + ))->defaults('fav_action', '')->defaults('fav_id', '')->defaults('d_prodid', '') |
|
154 | + ->defaults('d_name', '')->defaults('d_pos', 0); |
|
155 | 155 | |
156 | - Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
156 | + Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
157 | 157 | 'as' => 'aimeos_shop_account_watch', |
158 | 158 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
159 | - ))->defaults( 'wat_action', '' )->defaults( 'wat_id', '' )->defaults( 'd_prodid', '' ) |
|
160 | - ->defaults( 'd_name', '' )->defaults( 'd_pos', 0 ); |
|
159 | + ))->defaults('wat_action', '')->defaults('wat_id', '')->defaults('d_prodid', '') |
|
160 | + ->defaults('d_name', '')->defaults('d_pos', 0); |
|
161 | 161 | |
162 | - Route::match( array( 'GET', 'POST' ), 'myaccount/download/{dl_id}', array( |
|
162 | + Route::match(array('GET', 'POST'), 'myaccount/download/{dl_id}', array( |
|
163 | 163 | 'as' => 'aimeos_shop_account_download', |
164 | 164 | 'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction' |
165 | 165 | )); |
@@ -169,66 +169,66 @@ discard block |
||
169 | 169 | |
170 | 170 | Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() { |
171 | 171 | |
172 | - Route::match( array( 'GET', 'POST' ), 'count', array( |
|
172 | + Route::match(array('GET', 'POST'), 'count', array( |
|
173 | 173 | 'as' => 'aimeos_shop_count', |
174 | 174 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction' |
175 | 175 | )); |
176 | 176 | |
177 | - Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array( |
|
177 | + Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{d_pos?}', array( |
|
178 | 178 | 'as' => 'aimeos_shop_detail', |
179 | 179 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
180 | - ))->defaults( 'd_name', '' )->defaults( 'd_pos', 0 ); |
|
180 | + ))->defaults('d_name', '')->defaults('d_pos', 0); |
|
181 | 181 | |
182 | - Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
182 | + Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{d_pos?}', array( |
|
183 | 183 | 'as' => 'aimeos_shop_session_pinned', |
184 | 184 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
185 | - ))->defaults( 'pin_action', '' )->defaults( 'pin_id', '' )->defaults( 'd_prodid', '' ) |
|
186 | - ->defaults( 'd_name', '' )->defaults( 'd_pos', 0 ); |
|
185 | + ))->defaults('pin_action', '')->defaults('pin_id', '')->defaults('d_prodid', '') |
|
186 | + ->defaults('d_name', '')->defaults('d_pos', 0); |
|
187 | 187 | |
188 | - Route::match( array( 'GET', 'POST' ), 'list/{f_catid?}/{f_name?}', array( |
|
188 | + Route::match(array('GET', 'POST'), 'list/{f_catid?}/{f_name?}', array( |
|
189 | 189 | 'as' => 'aimeos_shop_list', |
190 | 190 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction' |
191 | - ))->defaults( 'f_catid', '' )->defaults( 'f_name', '' ); |
|
191 | + ))->defaults('f_catid', '')->defaults('f_name', ''); |
|
192 | 192 | |
193 | - Route::match( array( 'GET', 'POST' ), 'suggest', array( |
|
193 | + Route::match(array('GET', 'POST'), 'suggest', array( |
|
194 | 194 | 'as' => 'aimeos_shop_suggest', |
195 | 195 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction' |
196 | 196 | )); |
197 | 197 | |
198 | - Route::match( array( 'GET', 'POST' ), 'stock', array( |
|
198 | + Route::match(array('GET', 'POST'), 'stock', array( |
|
199 | 199 | 'as' => 'aimeos_shop_stock', |
200 | 200 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction' |
201 | 201 | )); |
202 | 202 | |
203 | - Route::match( array( 'GET', 'POST' ), 'basket/{b_action?}', array( |
|
203 | + Route::match(array('GET', 'POST'), 'basket/{b_action?}', array( |
|
204 | 204 | 'as' => 'aimeos_shop_basket', |
205 | 205 | 'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction' |
206 | - ))->defaults( 'b_action', '' ); |
|
206 | + ))->defaults('b_action', ''); |
|
207 | 207 | |
208 | - Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array( |
|
208 | + Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array( |
|
209 | 209 | 'as' => 'aimeos_shop_checkout', |
210 | 210 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction' |
211 | - ))->defaults( 'c_step', '' ); |
|
211 | + ))->defaults('c_step', ''); |
|
212 | 212 | |
213 | 213 | }); |
214 | 214 | |
215 | 215 | |
216 | 216 | Route::group(config('shop.routes.confirm', ['middleware' => ['web']]), function() { |
217 | 217 | |
218 | - Route::match( array( 'GET', 'POST' ), 'confirm/{code?}/{orderid?}', array( |
|
218 | + Route::match(array('GET', 'POST'), 'confirm/{code?}/{orderid?}', array( |
|
219 | 219 | 'as' => 'aimeos_shop_confirm', |
220 | 220 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction' |
221 | - ))->defaults( 'code', '' )->defaults( 'orderid', '' ); |
|
221 | + ))->defaults('code', '')->defaults('orderid', ''); |
|
222 | 222 | |
223 | 223 | }); |
224 | 224 | |
225 | 225 | |
226 | 226 | Route::group(config('shop.routes.update', []), function() { |
227 | 227 | |
228 | - Route::match( array( 'GET', 'POST' ), 'update/{code?}/{orderid?}', array( |
|
228 | + Route::match(array('GET', 'POST'), 'update/{code?}/{orderid?}', array( |
|
229 | 229 | 'as' => 'aimeos_shop_update', |
230 | 230 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction' |
231 | - ))->defaults( 'code', '' )->defaults( 'orderid', '' ); |
|
231 | + ))->defaults('code', '')->defaults('orderid', ''); |
|
232 | 232 | |
233 | 233 | }); |
234 | 234 |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/css/tether.min.css"> |
11 | 11 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css"> |
12 | 12 | <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.4/css/bootstrap.min.css"> |
13 | - <link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'css' ) ); ?>"> |
|
13 | + <link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'css')); ?>"> |
|
14 | 14 | |
15 | 15 | <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> |
16 | 16 | <!--[if lt IE 9]> |
@@ -30,6 +30,6 @@ discard block |
||
30 | 30 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/ckeditor.js"></script> |
31 | 31 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/adapters/jquery.js"></script> |
32 | 32 | <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.17/d3.min.js"></script> |
33 | - <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'js' ) ); ?>"></script> |
|
33 | + <script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'js')); ?>"></script> |
|
34 | 34 | </body> |
35 | 35 | </html> |