aimeos /
aimeos-laravel
@@ -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,10 +47,10 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function get() |
| 49 | 49 | { |
| 50 | - if( $this->object === null ) |
|
| 50 | + if ($this->object === null) |
|
| 51 | 51 | { |
| 52 | - $extDirs = (array) $this->config->get( 'shop.extdir', array() ); |
|
| 53 | - $this->object = new \Aimeos\Bootstrap( $extDirs, false ); |
|
| 52 | + $extDirs = (array) $this->config->get('shop.extdir', array()); |
|
| 53 | + $this->object = new \Aimeos\Bootstrap($extDirs, false); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | return $this->object; |
@@ -64,12 +64,12 @@ discard block |
||
| 64 | 64 | */ |
| 65 | 65 | public function getVersion() |
| 66 | 66 | { |
| 67 | - if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false |
|
| 68 | - && ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] ) |
|
| 67 | + if (($content = @file_get_contents(base_path('composer.lock'))) !== false |
|
| 68 | + && ($content = json_decode($content, true)) !== null && isset($content['packages']) |
|
| 69 | 69 | ) { |
| 70 | - foreach( (array) $content['packages'] as $item ) |
|
| 70 | + foreach ((array) $content['packages'] as $item) |
|
| 71 | 71 | { |
| 72 | - if( $item['name'] === 'aimeos/aimeos-laravel' ) { |
|
| 72 | + if ($item['name'] === 'aimeos/aimeos-laravel') { |
|
| 73 | 73 | return $item['version']; |
| 74 | 74 | } |
| 75 | 75 | } |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | |
| 46 | 46 | <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/adapter/ext/ext-base.js"></script> |
| 47 | 47 | <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/ext-all.js"></script> |
| 48 | - <script type="text/javascript" src="<?= route( 'aimeos_shop_extadm_file', array( 'site' => 'default' ) ); ?>"></script> |
|
| 48 | + <script type="text/javascript" src="<?= route('aimeos_shop_extadm_file', array('site' => 'default')); ?>"></script> |
|
| 49 | 49 | |
| 50 | 50 | </head> |
| 51 | 51 | <body> |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function indexAction() |
| 32 | 32 | { |
| 33 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' ); |
|
| 33 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('account-index'); |
|
| 34 | 34 | return View::make('shop::account.index', $params); |
| 35 | 35 | } |
| 36 | 36 | |
@@ -42,17 +42,17 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function downloadAction() |
| 44 | 44 | { |
| 45 | - $context = app( '\Aimeos\Shop\Base\Context' )->get(); |
|
| 45 | + $context = app('\Aimeos\Shop\Base\Context')->get(); |
|
| 46 | 46 | $langid = $context->getLocale()->getLanguageId(); |
| 47 | 47 | |
| 48 | - $view = app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), array(), $langid ); |
|
| 49 | - $context->setView( $view ); |
|
| 48 | + $view = app('\Aimeos\Shop\Base\View')->create($context->getConfig(), array(), $langid); |
|
| 49 | + $context->setView($view); |
|
| 50 | 50 | |
| 51 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' ); |
|
| 52 | - $client->setView( $view ); |
|
| 51 | + $client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download'); |
|
| 52 | + $client->setView($view); |
|
| 53 | 53 | $client->process(); |
| 54 | 54 | |
| 55 | 55 | $response = $view->response(); |
| 56 | - return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() ); |
|
| 56 | + return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders()); |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | \ No newline at end of file |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object |
| 41 | 41 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
| 42 | 42 | */ |
| 43 | - public function __construct( \Aimeos\Shop\Base\Aimeos $aimeos, \Illuminate\Contracts\Config\Repository $config ) |
|
| 43 | + public function __construct(\Aimeos\Shop\Base\Aimeos $aimeos, \Illuminate\Contracts\Config\Repository $config) |
|
| 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( function_exists( 'apc_store' ) === true && $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 (function_exists('apc_store') === true && $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; |
@@ -43,21 +43,21 @@ discard block |
||
| 43 | 43 | */ |
| 44 | 44 | public function fire() |
| 45 | 45 | { |
| 46 | - $aimeos = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 46 | + $aimeos = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 47 | 47 | $context = $this->getContext(); |
| 48 | 48 | |
| 49 | - $jobs = explode( ' ', $this->argument( 'jobs' ) ); |
|
| 50 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 49 | + $jobs = explode(' ', $this->argument('jobs')); |
|
| 50 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 51 | 51 | |
| 52 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
| 52 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
| 53 | 53 | { |
| 54 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), 'en', '', false ); |
|
| 55 | - $context->setLocale( $localeItem ); |
|
| 54 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), 'en', '', false); |
|
| 55 | + $context->setLocale($localeItem); |
|
| 56 | 56 | |
| 57 | - $this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) ); |
|
| 57 | + $this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode())); |
|
| 58 | 58 | |
| 59 | - foreach( $jobs as $jobname ) { |
|
| 60 | - \Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run(); |
|
| 59 | + foreach ($jobs as $jobname) { |
|
| 60 | + \Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run(); |
|
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | } |
@@ -71,8 +71,8 @@ discard block |
||
| 71 | 71 | protected function getArguments() |
| 72 | 72 | { |
| 73 | 73 | return array( |
| 74 | - array( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' ), |
|
| 75 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' ), |
|
| 74 | + array('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"'), |
|
| 75 | + array('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)'), |
|
| 76 | 76 | ); |
| 77 | 77 | } |
| 78 | 78 | |
@@ -95,19 +95,19 @@ discard block |
||
| 95 | 95 | protected function getContext() |
| 96 | 96 | { |
| 97 | 97 | $lv = $this->getLaravel(); |
| 98 | - $aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 99 | - $context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
| 98 | + $aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 99 | + $context = $lv->make('\Aimeos\Shop\Base\Context')->get(false); |
|
| 100 | 100 | |
| 101 | - $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' ); |
|
| 102 | - $view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), $tmplPaths ); |
|
| 101 | + $tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates'); |
|
| 102 | + $view = $lv->make('\Aimeos\Shop\Base\View')->create($context->getConfig(), $tmplPaths); |
|
| 103 | 103 | |
| 104 | - $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' ); |
|
| 105 | - $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) ); |
|
| 106 | - $i18n = $lv->make( '\Aimeos\Shop\Base\I18n' )->get( $langids ); |
|
| 104 | + $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language'); |
|
| 105 | + $langids = array_keys($langManager->searchItems($langManager->createSearch(true))); |
|
| 106 | + $i18n = $lv->make('\Aimeos\Shop\Base\I18n')->get($langids); |
|
| 107 | 107 | |
| 108 | - $context->setEditor( 'aimeos:jobs' ); |
|
| 109 | - $context->setView( $view ); |
|
| 110 | - $context->setI18n( $i18n ); |
|
| 108 | + $context->setEditor('aimeos:jobs'); |
|
| 109 | + $context->setView($view); |
|
| 110 | + $context->setI18n($i18n); |
|
| 111 | 111 | |
| 112 | 112 | return $context; |
| 113 | 113 | } |
@@ -34,63 +34,63 @@ 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' ); |
|
| 39 | + if (config('shop.authorize', true)) { |
|
| 40 | + $this->authorize('admin'); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - $site = Route::input( 'site', 'default' ); |
|
| 44 | - $lang = Input::get( 'lang', config( 'app.locale', 'en' ) ); |
|
| 43 | + $site = Route::input('site', 'default'); |
|
| 44 | + $lang = Input::get('lang', config('app.locale', 'en')); |
|
| 45 | 45 | |
| 46 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' ); |
|
| 46 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos'); |
|
| 47 | 47 | |
| 48 | 48 | $bootstrap = $aimeos->get(); |
| 49 | - $cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' ); |
|
| 49 | + $cntlPaths = $bootstrap->getCustomPaths('controller/extjs'); |
|
| 50 | 50 | |
| 51 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
| 52 | - $context = $this->setLocale( $context, $site, $lang ); |
|
| 51 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
| 52 | + $context = $this->setLocale($context, $site, $lang); |
|
| 53 | 53 | |
| 54 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
| 54 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
| 55 | 55 | $cssFiles = array(); |
| 56 | 56 | |
| 57 | - foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
| 57 | + foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths) |
|
| 58 | 58 | { |
| 59 | - foreach( $paths as $path ) |
|
| 59 | + foreach ($paths as $path) |
|
| 60 | 60 | { |
| 61 | 61 | $jsbAbsPath = $base . '/' . $path; |
| 62 | 62 | |
| 63 | - if( !is_file( $jsbAbsPath ) ) { |
|
| 64 | - throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) ); |
|
| 63 | + if (!is_file($jsbAbsPath)) { |
|
| 64 | + throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath)); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) ); |
|
| 68 | - $cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) ); |
|
| 67 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path)); |
|
| 68 | + $cssFiles = array_merge($cssFiles, $jsb2->getUrls('css')); |
|
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - $jqadmUrl = route( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) ); |
|
| 73 | - $jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) ); |
|
| 74 | - $adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>' ) ); |
|
| 72 | + $jqadmUrl = route('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product')); |
|
| 73 | + $jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token())); |
|
| 74 | + $adminUrl = route('aimeos_shop_extadm', array('site' => '<site>', 'lang' => '<lang>', 'tab' => '<tab>')); |
|
| 75 | 75 | |
| 76 | 76 | $vars = array( |
| 77 | 77 | 'lang' => $lang, |
| 78 | 78 | 'cssFiles' => $cssFiles, |
| 79 | - 'languages' => $this->getJsonLanguages( $context), |
|
| 80 | - 'config' => $this->getJsonClientConfig( $context ), |
|
| 81 | - 'site' => $this->getJsonSiteItem( $context, $site ), |
|
| 82 | - 'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ), |
|
| 79 | + 'languages' => $this->getJsonLanguages($context), |
|
| 80 | + 'config' => $this->getJsonClientConfig($context), |
|
| 81 | + 'site' => $this->getJsonSiteItem($context, $site), |
|
| 82 | + 'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang), |
|
| 83 | 83 | 'searchSchemas' => $controller->getJsonSearchSchemas(), |
| 84 | 84 | 'itemSchemas' => $controller->getJsonItemSchemas(), |
| 85 | - 'smd' => $controller->getJsonSmd( $jsonUrl ), |
|
| 86 | - 'urlTemplate' => str_replace( ['<', '>'], ['{', '}'], urldecode( $adminUrl ) ), |
|
| 87 | - 'uploaddir' => config( 'shop::uploaddir' ), |
|
| 88 | - 'activeTab' => Input::get( 'tab', 0 ), |
|
| 85 | + 'smd' => $controller->getJsonSmd($jsonUrl), |
|
| 86 | + 'urlTemplate' => str_replace(['<', '>'], ['{', '}'], urldecode($adminUrl)), |
|
| 87 | + 'uploaddir' => config('shop::uploaddir'), |
|
| 88 | + 'activeTab' => Input::get('tab', 0), |
|
| 89 | 89 | 'version' => $aimeos->getVersion(), |
| 90 | 90 | 'jqadmurl' => $jqadmUrl, |
| 91 | 91 | ); |
| 92 | 92 | |
| 93 | - return View::make( 'shop::extadm.index', $vars ); |
|
| 93 | + return View::make('shop::extadm.index', $vars); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | |
@@ -100,23 +100,23 @@ discard block |
||
| 100 | 100 | * @param \Illuminate\Http\Request $request Laravel request object |
| 101 | 101 | * @return \Illuminate\Contracts\View\View View for rendering the output |
| 102 | 102 | */ |
| 103 | - public function doAction( Request $request ) |
|
| 103 | + public function doAction(Request $request) |
|
| 104 | 104 | { |
| 105 | - if( config( 'shop.authorize', true ) ) { |
|
| 106 | - $this->authorize( 'admin' ); |
|
| 105 | + if (config('shop.authorize', true)) { |
|
| 106 | + $this->authorize('admin'); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 110 | - $cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' ); |
|
| 109 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 110 | + $cntlPaths = $aimeos->getCustomPaths('controller/extjs'); |
|
| 111 | 111 | |
| 112 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
| 113 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), array() ) ); |
|
| 114 | - $context = $this->setLocale( $context ); |
|
| 112 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
| 113 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context->getConfig(), array())); |
|
| 114 | + $context = $this->setLocale($context); |
|
| 115 | 115 | |
| 116 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
| 116 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
| 117 | 117 | |
| 118 | - $response = $controller->process( Input::instance()->request->all(), $request->getContent() ); |
|
| 119 | - return View::make( 'shop::extadm.do', array( 'output' => $response ) ); |
|
| 118 | + $response = $controller->process(Input::instance()->request->all(), $request->getContent()); |
|
| 119 | + return View::make('shop::extadm.do', array('output' => $response)); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | |
@@ -127,32 +127,32 @@ discard block |
||
| 127 | 127 | */ |
| 128 | 128 | public function fileAction() |
| 129 | 129 | { |
| 130 | - if( config( 'shop.authorize', true ) ) { |
|
| 131 | - $this->authorize( 'admin' ); |
|
| 130 | + if (config('shop.authorize', true)) { |
|
| 131 | + $this->authorize('admin'); |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | $contents = ''; |
| 135 | 135 | $jsFiles = array(); |
| 136 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 136 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 137 | 137 | |
| 138 | - foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
| 138 | + foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths) |
|
| 139 | 139 | { |
| 140 | - foreach( $paths as $path ) |
|
| 140 | + foreach ($paths as $path) |
|
| 141 | 141 | { |
| 142 | 142 | $jsbAbsPath = $base . '/' . $path; |
| 143 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
| 144 | - $jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) ); |
|
| 143 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
| 144 | + $jsFiles = array_merge($jsFiles, $jsb2->getFiles('js')); |
|
| 145 | 145 | } |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | - foreach( $jsFiles as $file ) |
|
| 148 | + foreach ($jsFiles as $file) |
|
| 149 | 149 | { |
| 150 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
| 150 | + if (($content = file_get_contents($file)) !== false) { |
|
| 151 | 151 | $contents .= $content; |
| 152 | 152 | } |
| 153 | 153 | } |
| 154 | 154 | |
| 155 | - return response( $contents )->header( 'Content-Type', 'application/javascript' ); |
|
| 155 | + return response($contents)->header('Content-Type', 'application/javascript'); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | |
@@ -162,15 +162,15 @@ discard block |
||
| 162 | 162 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 163 | 163 | * @return array List of language IDs with labels |
| 164 | 164 | */ |
| 165 | - protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 165 | + protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 166 | 166 | { |
| 167 | 167 | $result = array(); |
| 168 | 168 | |
| 169 | - foreach( app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nList( 'admin' ) as $id ) { |
|
| 170 | - $result[] = array( 'id' => $id, 'label' => $id ); |
|
| 169 | + foreach (app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nList('admin') as $id) { |
|
| 170 | + $result[] = array('id' => $id, 'label' => $id); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | - return json_encode( $result ); |
|
| 173 | + return json_encode($result); |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | |
@@ -180,10 +180,10 @@ discard block |
||
| 180 | 180 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item object |
| 181 | 181 | * @return string JSON encoded configuration object |
| 182 | 182 | */ |
| 183 | - protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 183 | + protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 184 | 184 | { |
| 185 | - $config = $context->getConfig()->get( 'admin/extjs', array() ); |
|
| 186 | - return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT ); |
|
| 185 | + $config = $context->getConfig()->get('admin/extjs', array()); |
|
| 186 | + return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT); |
|
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | |
@@ -194,16 +194,16 @@ discard block |
||
| 194 | 194 | * @param string $lang ISO language code like "en" or "en_GB" |
| 195 | 195 | * @return string JSON encoded translation object |
| 196 | 196 | */ |
| 197 | - protected function getJsonClientI18n( array $i18nPaths, $lang ) |
|
| 197 | + protected function getJsonClientI18n(array $i18nPaths, $lang) |
|
| 198 | 198 | { |
| 199 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang ); |
|
| 199 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang); |
|
| 200 | 200 | |
| 201 | 201 | $content = array( |
| 202 | - 'admin' => $i18n->getAll( 'admin' ), |
|
| 203 | - 'admin/ext' => $i18n->getAll( 'admin/ext' ), |
|
| 202 | + 'admin' => $i18n->getAll('admin'), |
|
| 203 | + 'admin/ext' => $i18n->getAll('admin/ext'), |
|
| 204 | 204 | ); |
| 205 | 205 | |
| 206 | - return json_encode( $content, JSON_FORCE_OBJECT ); |
|
| 206 | + return json_encode($content, JSON_FORCE_OBJECT); |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | |
@@ -215,19 +215,19 @@ discard block |
||
| 215 | 215 | * @return string JSON encoded site item object |
| 216 | 216 | * @throws Exception If no site item was found for the code |
| 217 | 217 | */ |
| 218 | - protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
| 218 | + protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
| 219 | 219 | { |
| 220 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
| 220 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
| 221 | 221 | |
| 222 | 222 | $criteria = $manager->createSearch(); |
| 223 | - $criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) ); |
|
| 224 | - $items = $manager->searchItems( $criteria ); |
|
| 223 | + $criteria->setConditions($criteria->compare('==', 'locale.site.code', $site)); |
|
| 224 | + $items = $manager->searchItems($criteria); |
|
| 225 | 225 | |
| 226 | - if( ( $item = reset( $items ) ) === false ) { |
|
| 227 | - throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) ); |
|
| 226 | + if (($item = reset($items)) === false) { |
|
| 227 | + throw new \Exception(sprintf('No site found for code "%1$s"', $site)); |
|
| 228 | 228 | } |
| 229 | 229 | |
| 230 | - return json_encode( $item->toArray() ); |
|
| 230 | + return json_encode($item->toArray()); |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | |
@@ -239,17 +239,17 @@ discard block |
||
| 239 | 239 | * @param string $locale ISO language code, e.g. "en" or "en_GB" |
| 240 | 240 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 241 | 241 | */ |
| 242 | - protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null ) |
|
| 242 | + protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null) |
|
| 243 | 243 | { |
| 244 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
| 244 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
| 245 | 245 | |
| 246 | 246 | try { |
| 247 | - $localeItem = $localeManager->bootstrap( $sitecode, $locale, '', false ); |
|
| 248 | - } catch( \Aimeos\MShop\Locale\Exception $e ) { |
|
| 247 | + $localeItem = $localeManager->bootstrap($sitecode, $locale, '', false); |
|
| 248 | + } catch (\Aimeos\MShop\Locale\Exception $e) { |
|
| 249 | 249 | $localeItem = $localeManager->createItem(); |
| 250 | 250 | } |
| 251 | 251 | |
| 252 | - $context->setLocale( $localeItem ); |
|
| 252 | + $context->setLocale($localeItem); |
|
| 253 | 253 | |
| 254 | 254 | return $context; |
| 255 | 255 | } |
@@ -35,19 +35,19 @@ discard block |
||
| 35 | 35 | * @param \Illuminate\Http\Request $request Request object |
| 36 | 36 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 37 | 37 | */ |
| 38 | - public function deleteAction( Request $request ) |
|
| 38 | + public function deleteAction(Request $request) |
|
| 39 | 39 | { |
| 40 | - if( config( 'shop.authorize', true ) ) { |
|
| 41 | - $this->authorize( 'admin' ); |
|
| 40 | + if (config('shop.authorize', true)) { |
|
| 41 | + $this->authorize('admin'); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | $status = 500; |
| 45 | 45 | $header = $request->headers->all(); |
| 46 | 46 | |
| 47 | 47 | $client = $this->createClient(); |
| 48 | - $result = $client->delete( $request->getContent(), $header, $status ); |
|
| 48 | + $result = $client->delete($request->getContent(), $header, $status); |
|
| 49 | 49 | |
| 50 | - return $this->createResponse( $result, $status, $header ); |
|
| 50 | + return $this->createResponse($result, $status, $header); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | |
@@ -57,19 +57,19 @@ discard block |
||
| 57 | 57 | * @param \Illuminate\Http\Request $request Request object |
| 58 | 58 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 59 | 59 | */ |
| 60 | - public function getAction( Request $request ) |
|
| 60 | + public function getAction(Request $request) |
|
| 61 | 61 | { |
| 62 | - if( config( 'shop.authorize', true ) ) { |
|
| 63 | - $this->authorize( 'admin' ); |
|
| 62 | + if (config('shop.authorize', true)) { |
|
| 63 | + $this->authorize('admin'); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | $status = 500; |
| 67 | 67 | $header = $request->headers->all(); |
| 68 | 68 | |
| 69 | 69 | $client = $this->createClient(); |
| 70 | - $result = $client->get( $request->getContent(), $header, $status ); |
|
| 70 | + $result = $client->get($request->getContent(), $header, $status); |
|
| 71 | 71 | |
| 72 | - return $this->createResponse( $result, $status, $header ); |
|
| 72 | + return $this->createResponse($result, $status, $header); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | |
@@ -79,19 +79,19 @@ discard block |
||
| 79 | 79 | * @param \Illuminate\Http\Request $request Request object |
| 80 | 80 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 81 | 81 | */ |
| 82 | - public function patchAction( Request $request ) |
|
| 82 | + public function patchAction(Request $request) |
|
| 83 | 83 | { |
| 84 | - if( config( 'shop.authorize', true ) ) { |
|
| 85 | - $this->authorize( 'admin' ); |
|
| 84 | + if (config('shop.authorize', true)) { |
|
| 85 | + $this->authorize('admin'); |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | $status = 500; |
| 89 | 89 | $header = $request->headers->all(); |
| 90 | 90 | |
| 91 | 91 | $client = $this->createClient(); |
| 92 | - $result = $client->patch( $request->getContent(), $header, $status ); |
|
| 92 | + $result = $client->patch($request->getContent(), $header, $status); |
|
| 93 | 93 | |
| 94 | - return $this->createResponse( $result, $status, $header ); |
|
| 94 | + return $this->createResponse($result, $status, $header); |
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | |
@@ -101,19 +101,19 @@ discard block |
||
| 101 | 101 | * @param \Illuminate\Http\Request $request Request object |
| 102 | 102 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 103 | 103 | */ |
| 104 | - public function postAction( Request $request ) |
|
| 104 | + public function postAction(Request $request) |
|
| 105 | 105 | { |
| 106 | - if( config( 'shop.authorize', true ) ) { |
|
| 107 | - $this->authorize( 'admin' ); |
|
| 106 | + if (config('shop.authorize', true)) { |
|
| 107 | + $this->authorize('admin'); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | $status = 500; |
| 111 | 111 | $header = $request->headers->all(); |
| 112 | 112 | |
| 113 | 113 | $client = $this->createClient(); |
| 114 | - $result = $client->post( $request->getContent(), $header, $status ); |
|
| 114 | + $result = $client->post($request->getContent(), $header, $status); |
|
| 115 | 115 | |
| 116 | - return $this->createResponse( $result, $status, $header ); |
|
| 116 | + return $this->createResponse($result, $status, $header); |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | |
@@ -123,19 +123,19 @@ discard block |
||
| 123 | 123 | * @param \Illuminate\Http\Request $request Request object |
| 124 | 124 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 125 | 125 | */ |
| 126 | - public function putAction( Request $request ) |
|
| 126 | + public function putAction(Request $request) |
|
| 127 | 127 | { |
| 128 | - if( config( 'shop.authorize', true ) ) { |
|
| 129 | - $this->authorize( 'admin' ); |
|
| 128 | + if (config('shop.authorize', true)) { |
|
| 129 | + $this->authorize('admin'); |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | $status = 500; |
| 133 | 133 | $header = $request->headers->all(); |
| 134 | 134 | |
| 135 | 135 | $client = $this->createClient(); |
| 136 | - $result = $client->put( $request->getContent(), $header, $status ); |
|
| 136 | + $result = $client->put($request->getContent(), $header, $status); |
|
| 137 | 137 | |
| 138 | - return $this->createResponse( $result, $status, $header ); |
|
| 138 | + return $this->createResponse($result, $status, $header); |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | |
@@ -145,19 +145,19 @@ discard block |
||
| 145 | 145 | * @param \Illuminate\Http\Request $request Request object |
| 146 | 146 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 147 | 147 | */ |
| 148 | - public function optionsAction( Request $request ) |
|
| 148 | + public function optionsAction(Request $request) |
|
| 149 | 149 | { |
| 150 | - if( config( 'shop.authorize', true ) ) { |
|
| 151 | - $this->authorize( 'admin' ); |
|
| 150 | + if (config('shop.authorize', true)) { |
|
| 151 | + $this->authorize('admin'); |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | $status = 500; |
| 155 | 155 | $header = $request->headers->all(); |
| 156 | 156 | |
| 157 | 157 | $client = $this->createClient(); |
| 158 | - $result = $client->options( $request->getContent(), $header, $status ); |
|
| 158 | + $result = $client->options($request->getContent(), $header, $status); |
|
| 159 | 159 | |
| 160 | - return $this->createResponse( $result, $status, $header ); |
|
| 160 | + return $this->createResponse($result, $status, $header); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | |
@@ -168,20 +168,20 @@ discard block |
||
| 168 | 168 | */ |
| 169 | 169 | protected function createClient() |
| 170 | 170 | { |
| 171 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
| 172 | - $lang = Input::get( 'lang', config( 'app.locale', 'en' ) ); |
|
| 173 | - $resource = Route::input( 'resource' ); |
|
| 171 | + $site = Route::input('site', Input::get('site', 'default')); |
|
| 172 | + $lang = Input::get('lang', config('app.locale', 'en')); |
|
| 173 | + $resource = Route::input('resource'); |
|
| 174 | 174 | |
| 175 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 176 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' ); |
|
| 175 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 176 | + $templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates'); |
|
| 177 | 177 | |
| 178 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
| 179 | - $context = $this->setLocale( $context, $site, $lang ); |
|
| 178 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
| 179 | + $context = $this->setLocale($context, $site, $lang); |
|
| 180 | 180 | |
| 181 | - $view = app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), $templatePaths, $lang ); |
|
| 182 | - $context->setView( $view ); |
|
| 181 | + $view = app('\Aimeos\Shop\Base\View')->create($context->getConfig(), $templatePaths, $lang); |
|
| 182 | + $context->setView($view); |
|
| 183 | 183 | |
| 184 | - return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource ); |
|
| 184 | + return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource); |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | |
@@ -193,12 +193,12 @@ discard block |
||
| 193 | 193 | * @param array $header List of HTTP headers |
| 194 | 194 | * @return \Illuminate\Http\Response HTTP response object |
| 195 | 195 | */ |
| 196 | - protected function createResponse( $content, $status, array $header ) |
|
| 196 | + protected function createResponse($content, $status, array $header) |
|
| 197 | 197 | { |
| 198 | - $response = Response::make( $content, $status ); |
|
| 198 | + $response = Response::make($content, $status); |
|
| 199 | 199 | |
| 200 | - foreach( $header as $key => $value ) { |
|
| 201 | - $response->header( $key, $value ); |
|
| 200 | + foreach ($header as $key => $value) { |
|
| 201 | + $response->header($key, $value); |
|
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | return $response; |
@@ -213,23 +213,23 @@ discard block |
||
| 213 | 213 | * @param string $lang ISO language code, e.g. "en" or "en_GB" |
| 214 | 214 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 215 | 215 | */ |
| 216 | - protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode, $lang ) |
|
| 216 | + protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode, $lang) |
|
| 217 | 217 | { |
| 218 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
| 218 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
| 219 | 219 | |
| 220 | 220 | try |
| 221 | 221 | { |
| 222 | - $localeItem = $localeManager->bootstrap( $sitecode, '', '', false ); |
|
| 223 | - $localeItem->setLanguageId( null ); |
|
| 224 | - $localeItem->setCurrencyId( null ); |
|
| 222 | + $localeItem = $localeManager->bootstrap($sitecode, '', '', false); |
|
| 223 | + $localeItem->setLanguageId(null); |
|
| 224 | + $localeItem->setCurrencyId(null); |
|
| 225 | 225 | } |
| 226 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 226 | + catch (\Aimeos\MShop\Locale\Exception $e) |
|
| 227 | 227 | { |
| 228 | 228 | $localeItem = $localeManager->createItem(); |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | - $context->setLocale( $localeItem ); |
|
| 232 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang ) ) ); |
|
| 231 | + $context->setLocale($localeItem); |
|
| 232 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang))); |
|
| 233 | 233 | |
| 234 | 234 | return $context; |
| 235 | 235 | } |
@@ -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,109 +12,109 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | Route::group(config('shop.routes.admin', ['middleware' => ['web', 'auth']]), function() { |
| 14 | 14 | |
| 15 | - Route::match( array( 'GET' ), 'extadm', array( |
|
| 15 | + Route::match(array('GET'), 'extadm', array( |
|
| 16 | 16 | 'as' => 'aimeos_shop_extadm', |
| 17 | 17 | 'uses' => 'Aimeos\Shop\Controller\ExtadmController@indexAction' |
| 18 | 18 | )); |
| 19 | 19 | |
| 20 | - Route::match( array( 'GET' ), 'extadm/file', array( |
|
| 20 | + Route::match(array('GET'), 'extadm/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( 'POST' ), 'extadm/do', array( |
|
| 25 | + Route::match(array('POST'), 'extadm/do', array( |
|
| 26 | 26 | 'as' => 'aimeos_shop_extadm_json', |
| 27 | 27 | 'uses' => 'Aimeos\Shop\Controller\ExtadmController@doAction' |
| 28 | 28 | )); |
| 29 | 29 | |
| 30 | 30 | |
| 31 | - Route::match( array( 'GET' ), 'jqadm/file/{type}', array( |
|
| 31 | + Route::match(array('GET'), 'jqadm/file/{type}', array( |
|
| 32 | 32 | 'as' => 'aimeos_shop_jqadm_file', |
| 33 | 33 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@fileAction' |
| 34 | 34 | )); |
| 35 | 35 | |
| 36 | - Route::match( array( 'GET', 'POST' ), 'jqadm/copy/{resource}/{id}', array( |
|
| 36 | + Route::match(array('GET', 'POST'), 'jqadm/copy/{resource}/{id}', array( |
|
| 37 | 37 | 'as' => 'aimeos_shop_jqadm_copy', |
| 38 | 38 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@copyAction' |
| 39 | - ))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]+' ) ); |
|
| 39 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]+')); |
|
| 40 | 40 | |
| 41 | - Route::match( array( 'GET', 'POST' ), 'jqadm/create/{resource}', array( |
|
| 41 | + Route::match(array('GET', 'POST'), 'jqadm/create/{resource}', array( |
|
| 42 | 42 | 'as' => 'aimeos_shop_jqadm_create', |
| 43 | 43 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@createAction' |
| 44 | - ))->where( array( 'resource' => '[^0-9]+' ) ); |
|
| 44 | + ))->where(array('resource' => '[^0-9]+')); |
|
| 45 | 45 | |
| 46 | - Route::match( array( 'GET', 'POST' ), 'jqadm/delete/{resource}/{id}', array( |
|
| 46 | + Route::match(array('GET', 'POST'), 'jqadm/delete/{resource}/{id}', array( |
|
| 47 | 47 | 'as' => 'aimeos_shop_jqadm_delete', |
| 48 | 48 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@deleteAction' |
| 49 | - ))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]+' ) ); |
|
| 49 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]+')); |
|
| 50 | 50 | |
| 51 | - Route::match( array( 'GET' ), 'jqadm/get/{resource}/{id}', array( |
|
| 51 | + Route::match(array('GET'), 'jqadm/get/{resource}/{id}', array( |
|
| 52 | 52 | 'as' => 'aimeos_shop_jqadm_get', |
| 53 | 53 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@getAction' |
| 54 | - ))->where( array( 'resource' => '[^0-9]*', 'id' => '[0-9]+' ) ); |
|
| 54 | + ))->where(array('resource' => '[^0-9]*', 'id' => '[0-9]+')); |
|
| 55 | 55 | |
| 56 | - Route::match( array( 'POST' ), 'jqadm/save/{resource}/{id?}', array( |
|
| 56 | + Route::match(array('POST'), 'jqadm/save/{resource}/{id?}', array( |
|
| 57 | 57 | 'as' => 'aimeos_shop_jqadm_save', |
| 58 | 58 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@saveAction' |
| 59 | - ))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) ); |
|
| 59 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*')); |
|
| 60 | 60 | |
| 61 | - Route::match( array( 'GET', 'POST' ), 'jqadm/search/{resource}', array( |
|
| 61 | + Route::match(array('GET', 'POST'), 'jqadm/search/{resource}', array( |
|
| 62 | 62 | 'as' => 'aimeos_shop_jqadm_search', |
| 63 | 63 | 'uses' => 'Aimeos\Shop\Controller\JqadmController@searchAction' |
| 64 | - ))->where( array( 'resource' => '[^0-9]+' ) ); |
|
| 64 | + ))->where(array('resource' => '[^0-9]+')); |
|
| 65 | 65 | |
| 66 | 66 | |
| 67 | - Route::match( array( 'DELETE' ), 'jsonadm/{resource}/{id?}', array( |
|
| 67 | + Route::match(array('DELETE'), 'jsonadm/{resource}/{id?}', array( |
|
| 68 | 68 | 'as' => 'aimeos_shop_jsonadm_delete', |
| 69 | 69 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@deleteAction' |
| 70 | - ))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) ); |
|
| 70 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*')); |
|
| 71 | 71 | |
| 72 | - Route::match( array( 'GET' ), 'jsonadm/{resource}/{id?}', array( |
|
| 72 | + Route::match(array('GET'), 'jsonadm/{resource}/{id?}', array( |
|
| 73 | 73 | 'as' => 'aimeos_shop_jsonadm_get', |
| 74 | 74 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@getAction' |
| 75 | - ))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) ); |
|
| 75 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*')); |
|
| 76 | 76 | |
| 77 | - Route::match( array( 'PATCH' ), 'jsonadm/{resource}/{id?}', array( |
|
| 77 | + Route::match(array('PATCH'), 'jsonadm/{resource}/{id?}', array( |
|
| 78 | 78 | 'as' => 'aimeos_shop_jsonadm_patch', |
| 79 | 79 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@patchAction' |
| 80 | - ))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) ); |
|
| 80 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*')); |
|
| 81 | 81 | |
| 82 | - Route::match( array( 'POST' ), 'jsonadm/{resource}/{id?}', array( |
|
| 82 | + Route::match(array('POST'), 'jsonadm/{resource}/{id?}', array( |
|
| 83 | 83 | 'as' => 'aimeos_shop_jsonadm_post', |
| 84 | 84 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@postAction' |
| 85 | - ))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) ); |
|
| 85 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*')); |
|
| 86 | 86 | |
| 87 | - Route::match( array( 'PUT' ), 'jsonadm/{resource}/{id?}', array( |
|
| 87 | + Route::match(array('PUT'), 'jsonadm/{resource}/{id?}', array( |
|
| 88 | 88 | 'as' => 'aimeos_shop_jsonadm_put', |
| 89 | 89 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@putAction' |
| 90 | - ))->where( array( 'resource' => '[^0-9]+', 'id' => '[0-9]*' ) ); |
|
| 90 | + ))->where(array('resource' => '[^0-9]+', 'id' => '[0-9]*')); |
|
| 91 | 91 | |
| 92 | - Route::match( array( 'OPTIONS' ), 'jsonadm/{resource?}', array( |
|
| 92 | + Route::match(array('OPTIONS'), 'jsonadm/{resource?}', array( |
|
| 93 | 93 | 'as' => 'aimeos_shop_jsonadm_options', |
| 94 | 94 | 'uses' => 'Aimeos\Shop\Controller\JsonadmController@optionsAction' |
| 95 | - ))->where( array( 'resource' => '[^0-9]*' ) ); |
|
| 95 | + ))->where(array('resource' => '[^0-9]*')); |
|
| 96 | 96 | |
| 97 | 97 | }); |
| 98 | 98 | |
| 99 | 99 | |
| 100 | 100 | Route::group(config('shop.routes.account', ['middleware' => ['web', 'auth']]), function() { |
| 101 | 101 | |
| 102 | - Route::match( array( 'GET', 'POST' ), 'myaccount', array( |
|
| 102 | + Route::match(array('GET', 'POST'), 'myaccount', array( |
|
| 103 | 103 | 'as' => 'aimeos_shop_account', |
| 104 | 104 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
| 105 | 105 | )); |
| 106 | 106 | |
| 107 | - Route::match( array( 'GET', 'POST' ), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array( |
|
| 107 | + Route::match(array('GET', 'POST'), 'myaccount/favorite/{fav_action?}/{fav_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array( |
|
| 108 | 108 | 'as' => 'aimeos_shop_account_favorite', |
| 109 | 109 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
| 110 | 110 | )); |
| 111 | 111 | |
| 112 | - Route::match( array( 'GET', 'POST' ), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array( |
|
| 112 | + Route::match(array('GET', 'POST'), 'myaccount/watch/{wat_action?}/{wat_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array( |
|
| 113 | 113 | 'as' => 'aimeos_shop_account_watch', |
| 114 | 114 | 'uses' => 'Aimeos\Shop\Controller\AccountController@indexAction' |
| 115 | 115 | )); |
| 116 | 116 | |
| 117 | - Route::match( array( 'GET', 'POST' ), 'myaccount/download/{dl_id}', array( |
|
| 117 | + Route::match(array('GET', 'POST'), 'myaccount/download/{dl_id}', array( |
|
| 118 | 118 | 'as' => 'aimeos_shop_account_download', |
| 119 | 119 | 'uses' => 'Aimeos\Shop\Controller\AccountController@downloadAction' |
| 120 | 120 | )); |
@@ -124,42 +124,42 @@ discard block |
||
| 124 | 124 | |
| 125 | 125 | Route::group(config('shop.routes.default', ['middleware' => ['web']]), function() { |
| 126 | 126 | |
| 127 | - Route::match( array( 'GET', 'POST' ), 'count', array( |
|
| 127 | + Route::match(array('GET', 'POST'), 'count', array( |
|
| 128 | 128 | 'as' => 'aimeos_shop_count', |
| 129 | 129 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@countAction' |
| 130 | 130 | )); |
| 131 | 131 | |
| 132 | - Route::match( array( 'GET', 'POST' ), 'detail/{d_prodid}/{d_name?}/{l_pos?}', array( |
|
| 132 | + Route::match(array('GET', 'POST'), 'detail/{d_prodid}/{d_name?}/{l_pos?}', array( |
|
| 133 | 133 | 'as' => 'aimeos_shop_detail', |
| 134 | 134 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
| 135 | 135 | )); |
| 136 | 136 | |
| 137 | - Route::match( array( 'GET', 'POST' ), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array( |
|
| 137 | + Route::match(array('GET', 'POST'), 'detail/pin/{pin_action?}/{pin_id?}/{d_prodid?}/{d_name?}/{l_pos?}', array( |
|
| 138 | 138 | 'as' => 'aimeos_shop_session_pinned', |
| 139 | 139 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@detailAction' |
| 140 | 140 | )); |
| 141 | 141 | |
| 142 | - Route::match( array( 'GET', 'POST' ), 'list', array( |
|
| 142 | + Route::match(array('GET', 'POST'), 'list', array( |
|
| 143 | 143 | 'as' => 'aimeos_shop_list', |
| 144 | 144 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@listAction' |
| 145 | 145 | )); |
| 146 | 146 | |
| 147 | - Route::match( array( 'GET', 'POST' ), 'suggest', array( |
|
| 147 | + Route::match(array('GET', 'POST'), 'suggest', array( |
|
| 148 | 148 | 'as' => 'aimeos_shop_suggest', |
| 149 | 149 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@suggestAction' |
| 150 | 150 | )); |
| 151 | 151 | |
| 152 | - Route::match( array( 'GET', 'POST' ), 'stock', array( |
|
| 152 | + Route::match(array('GET', 'POST'), 'stock', array( |
|
| 153 | 153 | 'as' => 'aimeos_shop_stock', |
| 154 | 154 | 'uses' => 'Aimeos\Shop\Controller\CatalogController@stockAction' |
| 155 | 155 | )); |
| 156 | 156 | |
| 157 | - Route::match( array( 'GET', 'POST' ), 'basket', array( |
|
| 157 | + Route::match(array('GET', 'POST'), 'basket', array( |
|
| 158 | 158 | 'as' => 'aimeos_shop_basket', |
| 159 | 159 | 'uses' => 'Aimeos\Shop\Controller\BasketController@indexAction' |
| 160 | 160 | )); |
| 161 | 161 | |
| 162 | - Route::match( array( 'GET', 'POST' ), 'checkout/{c_step?}', array( |
|
| 162 | + Route::match(array('GET', 'POST'), 'checkout/{c_step?}', array( |
|
| 163 | 163 | 'as' => 'aimeos_shop_checkout', |
| 164 | 164 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@indexAction' |
| 165 | 165 | )); |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | |
| 170 | 170 | Route::group(config('shop.routes.confirm', ['middleware' => ['web']]), function() { |
| 171 | 171 | |
| 172 | - Route::match( array( 'GET', 'POST' ), 'confirm', array( |
|
| 172 | + Route::match(array('GET', 'POST'), 'confirm', array( |
|
| 173 | 173 | 'as' => 'aimeos_shop_confirm', |
| 174 | 174 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@confirmAction' |
| 175 | 175 | )); |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | |
| 180 | 180 | Route::group(config('shop.routes.update', []), function() { |
| 181 | 181 | |
| 182 | - Route::match( array( 'GET', 'POST' ), 'update', array( |
|
| 182 | + Route::match(array('GET', 'POST'), 'update', array( |
|
| 183 | 183 | 'as' => 'aimeos_shop_update', |
| 184 | 184 | 'uses' => 'Aimeos\Shop\Controller\CheckoutController@updateAction' |
| 185 | 185 | )); |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/css/tether.min.css"> |
| 11 | 11 | <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css"> |
| 12 | 12 | <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/css/bootstrap.min.css"> |
| 13 | - <link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => 'default', 'type' => 'css' ) ); ?>"> |
|
| 13 | + <link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => 'default', '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]> |
@@ -29,6 +29,6 @@ discard block |
||
| 29 | 29 | <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/js/bootstrap.min.js"></script> |
| 30 | 30 | <script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/ckeditor.js"></script> |
| 31 | 31 | <script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/adapters/jquery.js"></script> |
| 32 | - <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => 'default', 'type' => 'js' ) ); ?>"></script> |
|
| 32 | + <script src="<?= route('aimeos_shop_jqadm_file', array('site' => 'default', 'type' => 'js')); ?>"></script> |
|
| 33 | 33 | </body> |
| 34 | 34 | </html> |
