@@ -53,9 +53,9 @@ discard block |
||
| 53 | 53 | * @param \Aimeos\Shop\Base\Locale $locale Locale object |
| 54 | 54 | * @param \Aimeos\Shop\Base\View $view View object |
| 55 | 55 | */ |
| 56 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, |
|
| 56 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, |
|
| 57 | 57 | \Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, |
| 58 | - \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view ) |
|
| 58 | + \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view) |
|
| 59 | 59 | { |
| 60 | 60 | $this->config = $config; |
| 61 | 61 | $this->aimeos = $aimeos; |
@@ -71,21 +71,21 @@ discard block |
||
| 71 | 71 | * @param string $pageName Name of the configured page |
| 72 | 72 | * @return array Associative list with body and header output separated by client name |
| 73 | 73 | */ |
| 74 | - public function getSections( $pageName ) |
|
| 74 | + public function getSections($pageName) |
|
| 75 | 75 | { |
| 76 | 76 | $context = $this->context->get(); |
| 77 | 77 | $langid = $context->getLocale()->getLanguageId(); |
| 78 | - $tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' ); |
|
| 79 | - $view = $this->view->create( $context, $tmplPaths, $langid ); |
|
| 80 | - $context->setView( $view ); |
|
| 78 | + $tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates'); |
|
| 79 | + $view = $this->view->create($context, $tmplPaths, $langid); |
|
| 80 | + $context->setView($view); |
|
| 81 | 81 | |
| 82 | - $result = array( 'aibody' => array(), 'aiheader' => array() ); |
|
| 83 | - $page = $context->getConfig()->get( 'page/' . $pageName, array() ); |
|
| 82 | + $result = array('aibody' => array(), 'aiheader' => array()); |
|
| 83 | + $page = $context->getConfig()->get('page/'.$pageName, array()); |
|
| 84 | 84 | |
| 85 | - foreach( (array) $page as $clientName ) |
|
| 85 | + foreach ((array) $page as $clientName) |
|
| 86 | 86 | { |
| 87 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName ); |
|
| 88 | - $client->setView( clone $view ); |
|
| 87 | + $client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName); |
|
| 88 | + $client->setView(clone $view); |
|
| 89 | 89 | $client->process(); |
| 90 | 90 | |
| 91 | 91 | $result['aibody'][$clientName] = $client->getBody(); |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | * |
| 35 | 35 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
| 36 | 36 | */ |
| 37 | - public function __construct( \Illuminate\Contracts\Config\Repository $config ) |
|
| 37 | + public function __construct(\Illuminate\Contracts\Config\Repository $config) |
|
| 38 | 38 | { |
| 39 | 39 | $this->config = $config; |
| 40 | 40 | } |
@@ -47,16 +47,16 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function get() |
| 49 | 49 | { |
| 50 | - if( $this->object === null ) |
|
| 50 | + if ($this->object === null) |
|
| 51 | 51 | { |
| 52 | - $dir = base_path( 'ext' ); |
|
| 52 | + $dir = base_path('ext'); |
|
| 53 | 53 | |
| 54 | - if( !is_dir( $dir ) ) { |
|
| 55 | - $dir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'ext'; |
|
| 54 | + if (!is_dir($dir)) { |
|
| 55 | + $dir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'ext'; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - $extDirs = (array) $this->config->get( 'shop.extdir', $dir ); |
|
| 59 | - $this->object = new \Aimeos\Bootstrap( $extDirs, false ); |
|
| 58 | + $extDirs = (array) $this->config->get('shop.extdir', $dir); |
|
| 59 | + $this->object = new \Aimeos\Bootstrap($extDirs, false); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | return $this->object; |
@@ -70,12 +70,12 @@ discard block |
||
| 70 | 70 | */ |
| 71 | 71 | public function getVersion() |
| 72 | 72 | { |
| 73 | - if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false |
|
| 74 | - && ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] ) |
|
| 73 | + if (($content = @file_get_contents(base_path('composer.lock'))) !== false |
|
| 74 | + && ($content = json_decode($content, true)) !== null && isset($content['packages']) |
|
| 75 | 75 | ) { |
| 76 | - foreach( (array) $content['packages'] as $item ) |
|
| 76 | + foreach ((array) $content['packages'] as $item) |
|
| 77 | 77 | { |
| 78 | - if( $item['name'] === 'aimeos/aimeos-laravel' ) { |
|
| 78 | + if ($item['name'] === 'aimeos/aimeos-laravel') { |
|
| 79 | 79 | return $item['version']; |
| 80 | 80 | } |
| 81 | 81 | } |
@@ -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; |
@@ -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\Factory::createClient( $context, $tmplPaths, $resource . '/' . $related ); |
|
| 118 | + return \Aimeos\Client\JsonApi\Factory::createClient($context, $tmplPaths, $resource.'/'.$related); |
|
| 119 | 119 | } |
| 120 | 120 | } |
@@ -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\-\_]*' ) ); |
|
| 78 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*')); |
|
| 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\-\_]*' ) ); |
|
| 83 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*')); |
|
| 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\-\_]*' ) ); |
|
| 88 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*')); |
|
| 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\-\_]*' ) ); |
|
| 93 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*')); |
|
| 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\-\_]*' ) ); |
|
| 98 | + ))->where(array('resource' => '[^0-9A-Z\-\_]+', 'id' => '[0-9A-Z\-\_]*')); |
|
| 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' => ['web', '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 | )); |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | public function indexAction() |
| 31 | 31 | { |
| 32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' ); |
|
| 32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index'); |
|
| 33 | 33 | return Response::view('shop::basket.index', $params)->header('Cache-Control', 'no-store'); |
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | \ No newline at end of file |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function confirmAction() |
| 31 | 31 | { |
| 32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' ); |
|
| 32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm'); |
|
| 33 | 33 | return Response::view('shop::checkout.confirm', $params)->header('Cache-Control', 'no-store'); |
| 34 | 34 | } |
| 35 | 35 | |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | public function indexAction() |
| 43 | 43 | { |
| 44 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' ); |
|
| 44 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index'); |
|
| 45 | 45 | return Response::view('shop::checkout.index', $params)->header('Cache-Control', 'no-store'); |
| 46 | 46 | } |
| 47 | 47 | |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | public function updateAction() |
| 55 | 55 | { |
| 56 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' ); |
|
| 56 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update'); |
|
| 57 | 57 | return Response::view('shop::checkout.update', $params)->header('Cache-Control', 'no-store'); |
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | 60 | \ No newline at end of file |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/css/tether.min.css" integrity="sha256-y4TDcAD4/j5o4keZvggf698Cr9Oc7JZ+gGMax23qmVA=" crossorigin="anonymous" /> |
| 12 | 12 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" /> |
| 13 | 13 | <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous"> |
| 14 | - <link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'css' ) ); ?>"> |
|
| 14 | + <link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'css')); ?>"> |
|
| 15 | 15 | </head> |
| 16 | 16 | <body> |
| 17 | 17 | |
@@ -24,6 +24,6 @@ discard block |
||
| 24 | 24 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.6.2/ckeditor.js" integrity="sha256-TD9khtuB9OoHJICSCe1SngH2RckROdDPDb5JJaUTi7I=" crossorigin="anonymous"></script> |
| 25 | 25 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.6.2/adapters/jquery.js" integrity="sha256-kWca68zAjkLv7iMEyHDuFKa9KxIij+DiCScmbTMlJHM=" crossorigin="anonymous"></script> |
| 26 | 26 | <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script> |
| 27 | - <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'js' ) ); ?>"></script> |
|
| 27 | + <script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'js')); ?>"></script> |
|
| 28 | 28 | </body> |
| 29 | 29 | </html> |