@@ -37,13 +37,13 @@ discard block |
||
37 | 37 | public function boot() |
38 | 38 | { |
39 | 39 | $ds = DIRECTORY_SEPARATOR; |
40 | - $basedir = dirname( dirname( __DIR__ ) ) . $ds; |
|
40 | + $basedir = dirname(dirname(__DIR__)).$ds; |
|
41 | 41 | |
42 | - $this->loadRoutesFrom( $basedir . 'routes.php' ); |
|
43 | - $this->loadViewsFrom( $basedir . 'views', 'shop' ); |
|
42 | + $this->loadRoutesFrom($basedir.'routes.php'); |
|
43 | + $this->loadViewsFrom($basedir.'views', 'shop'); |
|
44 | 44 | |
45 | - $this->publishes( [ $basedir . 'config/shop.php' => config_path( 'shop.php' ) ], 'config' ); |
|
46 | - $this->publishes( [ dirname( $basedir ) . $ds . 'public' => public_path( 'packages/aimeos/shop' ) ], 'public' ); |
|
45 | + $this->publishes([$basedir.'config/shop.php' => config_path('shop.php')], 'config'); |
|
46 | + $this->publishes([dirname($basedir).$ds.'public' => public_path('packages/aimeos/shop')], 'public'); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | */ |
55 | 55 | public function register() |
56 | 56 | { |
57 | - $this->mergeConfigFrom( dirname( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . 'default.php', 'shop'); |
|
57 | + $this->mergeConfigFrom(dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR.'default.php', 'shop'); |
|
58 | 58 | |
59 | 59 | $this->app->singleton('Aimeos\Shop\Base\Aimeos', function($app) { |
60 | 60 | return new \Aimeos\Shop\Base\Aimeos($app['config']); |
@@ -89,12 +89,12 @@ discard block |
||
89 | 89 | }); |
90 | 90 | |
91 | 91 | |
92 | - $this->commands( array( |
|
92 | + $this->commands(array( |
|
93 | 93 | 'Aimeos\Shop\Command\AccountCommand', |
94 | 94 | 'Aimeos\Shop\Command\CacheCommand', |
95 | 95 | 'Aimeos\Shop\Command\SetupCommand', |
96 | 96 | 'Aimeos\Shop\Command\JobsCommand', |
97 | - ) ); |
|
97 | + )); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 |
@@ -46,30 +46,30 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public function handle() |
48 | 48 | { |
49 | - $aimeos = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
49 | + $aimeos = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get(); |
|
50 | 50 | $context = $this->getContext(); |
51 | 51 | |
52 | 52 | $process = $context->getProcess(); |
53 | - $jobs = explode( ' ', $this->argument( 'jobs' ) ); |
|
54 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
53 | + $jobs = explode(' ', $this->argument('jobs')); |
|
54 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
55 | 55 | |
56 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
56 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
57 | 57 | { |
58 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
59 | - $localeItem->setLanguageId( null ); |
|
60 | - $localeItem->setCurrencyId( null ); |
|
58 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
59 | + $localeItem->setLanguageId(null); |
|
60 | + $localeItem->setCurrencyId(null); |
|
61 | 61 | |
62 | - $context->setLocale( $localeItem ); |
|
62 | + $context->setLocale($localeItem); |
|
63 | 63 | |
64 | - $this->info( sprintf( 'Executing the Aimeos jobs for "%s"', $siteItem->getCode() ) ); |
|
64 | + $this->info(sprintf('Executing the Aimeos jobs for "%s"', $siteItem->getCode())); |
|
65 | 65 | |
66 | - foreach( $jobs as $jobname ) |
|
66 | + foreach ($jobs as $jobname) |
|
67 | 67 | { |
68 | - $fcn = function( $context, $aimeos, $jobname ) { |
|
69 | - \Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run(); |
|
68 | + $fcn = function($context, $aimeos, $jobname) { |
|
69 | + \Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run(); |
|
70 | 70 | }; |
71 | 71 | |
72 | - $process->start( $fcn, [$context, $aimeos, $jobname], true ); |
|
72 | + $process->start($fcn, [$context, $aimeos, $jobname], true); |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 | |
@@ -85,19 +85,19 @@ discard block |
||
85 | 85 | protected function getContext() |
86 | 86 | { |
87 | 87 | $lv = $this->getLaravel(); |
88 | - $aimeos = $lv->make( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
89 | - $context = $lv->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' ); |
|
88 | + $aimeos = $lv->make('\Aimeos\Shop\Base\Aimeos')->get(); |
|
89 | + $context = $lv->make('\Aimeos\Shop\Base\Context')->get(false, 'command'); |
|
90 | 90 | |
91 | - $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' ); |
|
92 | - $view = $lv->make( '\Aimeos\Shop\Base\View' )->create( $context, $tmplPaths ); |
|
91 | + $tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates'); |
|
92 | + $view = $lv->make('\Aimeos\Shop\Base\View')->create($context, $tmplPaths); |
|
93 | 93 | |
94 | - $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' ); |
|
95 | - $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) ); |
|
96 | - $i18n = $lv->make( '\Aimeos\Shop\Base\I18n' )->get( $langids ); |
|
94 | + $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language'); |
|
95 | + $langids = array_keys($langManager->searchItems($langManager->createSearch(true))); |
|
96 | + $i18n = $lv->make('\Aimeos\Shop\Base\I18n')->get($langids); |
|
97 | 97 | |
98 | - $context->setEditor( 'aimeos:jobs' ); |
|
99 | - $context->setView( $view ); |
|
100 | - $context->setI18n( $i18n ); |
|
98 | + $context->setEditor('aimeos:jobs'); |
|
99 | + $context->setView($view); |
|
100 | + $context->setI18n($i18n); |
|
101 | 101 | |
102 | 102 | return $context; |
103 | 103 | } |
@@ -49,39 +49,39 @@ discard block |
||
49 | 49 | */ |
50 | 50 | public function handle() |
51 | 51 | { |
52 | - $ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false, 'command' ); |
|
53 | - $ctx->setEditor( 'aimeos:setup' ); |
|
52 | + $ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false, 'command'); |
|
53 | + $ctx->setEditor('aimeos:setup'); |
|
54 | 54 | |
55 | 55 | $config = $ctx->getConfig(); |
56 | - $site = $this->argument( 'site' ); |
|
57 | - $template = $this->argument( 'tplsite' ); |
|
56 | + $site = $this->argument('site'); |
|
57 | + $template = $this->argument('tplsite'); |
|
58 | 58 | |
59 | - $config->set( 'setup/site', $site ); |
|
60 | - $dbconfig = $this->getDbConfig( $config ); |
|
61 | - $this->setOptions( $config ); |
|
59 | + $config->set('setup/site', $site); |
|
60 | + $dbconfig = $this->getDbConfig($config); |
|
61 | + $this->setOptions($config); |
|
62 | 62 | |
63 | - $taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template ); |
|
64 | - $manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx ); |
|
63 | + $taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template); |
|
64 | + $manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx); |
|
65 | 65 | |
66 | - $this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) ); |
|
66 | + $this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site)); |
|
67 | 67 | |
68 | - if( ( $task = $this->option( 'task' ) ) && is_array( $task ) ) { |
|
69 | - $task = reset( $task ); |
|
68 | + if (($task = $this->option('task')) && is_array($task)) { |
|
69 | + $task = reset($task); |
|
70 | 70 | } |
71 | 71 | |
72 | - switch( $this->option( 'action' ) ) |
|
72 | + switch ($this->option('action')) |
|
73 | 73 | { |
74 | 74 | case 'migrate': |
75 | - $manager->migrate( $task ); |
|
75 | + $manager->migrate($task); |
|
76 | 76 | break; |
77 | 77 | case 'rollback': |
78 | - $manager->rollback( $task ); |
|
78 | + $manager->rollback($task); |
|
79 | 79 | break; |
80 | 80 | case 'clean': |
81 | - $manager->clean( $task ); |
|
81 | + $manager->clean($task); |
|
82 | 82 | break; |
83 | 83 | default: |
84 | - throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $this->option( 'action' ) ) ); |
|
84 | + throw new \Exception(sprintf('Invalid setup action "%1$s"', $this->option('action'))); |
|
85 | 85 | } |
86 | 86 | } |
87 | 87 | |
@@ -92,14 +92,14 @@ discard block |
||
92 | 92 | * @param \Aimeos\MW\Config\Iface $conf Config object |
93 | 93 | * @return array Multi-dimensional associative list of database configuration parameters |
94 | 94 | */ |
95 | - protected function getDbConfig( \Aimeos\MW\Config\Iface $conf ) |
|
95 | + protected function getDbConfig(\Aimeos\MW\Config\Iface $conf) |
|
96 | 96 | { |
97 | - $dbconfig = $conf->get( 'resource', array() ); |
|
97 | + $dbconfig = $conf->get('resource', array()); |
|
98 | 98 | |
99 | - foreach( $dbconfig as $rname => $dbconf ) |
|
99 | + foreach ($dbconfig as $rname => $dbconf) |
|
100 | 100 | { |
101 | - if( strncmp( $rname, 'db', 2 ) !== 0 ) { |
|
102 | - unset( $dbconfig[$rname] ); |
|
101 | + if (strncmp($rname, 'db', 2) !== 0) { |
|
102 | + unset($dbconfig[$rname]); |
|
103 | 103 | } |
104 | 104 | } |
105 | 105 | |
@@ -114,12 +114,12 @@ discard block |
||
114 | 114 | * @param array Associative list of database configurations |
115 | 115 | * @throws \RuntimeException If the format of the options is invalid |
116 | 116 | */ |
117 | - protected function setOptions( \Aimeos\MW\Config\Iface $conf ) |
|
117 | + protected function setOptions(\Aimeos\MW\Config\Iface $conf) |
|
118 | 118 | { |
119 | - foreach( (array) $this->option( 'option' ) as $option ) |
|
119 | + foreach ((array) $this->option('option') as $option) |
|
120 | 120 | { |
121 | - list( $name, $value ) = explode( ':', $option ); |
|
122 | - $conf->set( str_replace( '\\', '/', $name ), $value ); |
|
121 | + list($name, $value) = explode(':', $option); |
|
122 | + $conf->set(str_replace('\\', '/', $name), $value); |
|
123 | 123 | } |
124 | 124 | } |
125 | 125 | } |
@@ -44,24 +44,24 @@ |
||
44 | 44 | */ |
45 | 45 | public function handle() |
46 | 46 | { |
47 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' ); |
|
48 | - $context->setEditor( 'aimeos:cache' ); |
|
47 | + $context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command'); |
|
48 | + $context->setEditor('aimeos:cache'); |
|
49 | 49 | |
50 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
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(), '', '', false ); |
|
54 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
55 | 55 | |
56 | 56 | $lcontext = clone $context; |
57 | - $lcontext->setLocale( $localeItem ); |
|
57 | + $lcontext->setLocale($localeItem); |
|
58 | 58 | |
59 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext ); |
|
60 | - $lcontext->setCache( $cache ); |
|
59 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext); |
|
60 | + $lcontext->setCache($cache); |
|
61 | 61 | |
62 | - $this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) ); |
|
62 | + $this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode())); |
|
63 | 63 | |
64 | - \Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->clear(); |
|
64 | + \Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->clear(); |
|
65 | 65 | } |
66 | 66 | } |
67 | 67 | } |
@@ -34,38 +34,38 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function fileAction() |
36 | 36 | { |
37 | - if( config( 'shop.authorize', true ) ) { |
|
38 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); |
|
37 | + if (config('shop.authorize', true)) { |
|
38 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | $contents = ''; |
42 | 42 | $files = array(); |
43 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
44 | - $type = Route::input( 'type', Input::get( 'type', 'js' ) ); |
|
43 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
44 | + $type = Route::input('type', Input::get('type', 'js')); |
|
45 | 45 | |
46 | - foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths ) |
|
46 | + foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths) |
|
47 | 47 | { |
48 | - foreach( $paths as $path ) |
|
48 | + foreach ($paths as $path) |
|
49 | 49 | { |
50 | - $jsbAbsPath = $base . '/' . $path; |
|
51 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
52 | - $files = array_merge( $files, $jsb2->getFiles( $type ) ); |
|
50 | + $jsbAbsPath = $base.'/'.$path; |
|
51 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
52 | + $files = array_merge($files, $jsb2->getFiles($type)); |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 | |
56 | - foreach( $files as $file ) |
|
56 | + foreach ($files as $file) |
|
57 | 57 | { |
58 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
58 | + if (($content = file_get_contents($file)) !== false) { |
|
59 | 59 | $contents .= $content; |
60 | 60 | } |
61 | 61 | } |
62 | 62 | |
63 | - $response = response( $contents ); |
|
63 | + $response = response($contents); |
|
64 | 64 | |
65 | - if( $type === 'js' ) { |
|
66 | - $response->header( 'Content-Type', 'application/javascript' ); |
|
67 | - } elseif( $type === 'css' ) { |
|
68 | - $response->header( 'Content-Type', 'text/css' ); |
|
65 | + if ($type === 'js') { |
|
66 | + $response->header('Content-Type', 'application/javascript'); |
|
67 | + } elseif ($type === 'css') { |
|
68 | + $response->header('Content-Type', 'text/css'); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | return $response; |
@@ -79,17 +79,17 @@ discard block |
||
79 | 79 | */ |
80 | 80 | public function copyAction() |
81 | 81 | { |
82 | - if( config( 'shop.authorize', true ) ) { |
|
83 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); |
|
82 | + if (config('shop.authorize', true)) { |
|
83 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | $cntl = $this->createClient(); |
87 | 87 | |
88 | - if( ( $html = $cntl->copy() ) == '' ) { |
|
88 | + if (($html = $cntl->copy()) == '') { |
|
89 | 89 | return $cntl->getView()->response(); |
90 | 90 | } |
91 | 91 | |
92 | - return $this->getHtml( $html ); |
|
92 | + return $this->getHtml($html); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | |
@@ -100,17 +100,17 @@ discard block |
||
100 | 100 | */ |
101 | 101 | public function createAction() |
102 | 102 | { |
103 | - if( config( 'shop.authorize', true ) ) { |
|
104 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); |
|
103 | + if (config('shop.authorize', true)) { |
|
104 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | $cntl = $this->createClient(); |
108 | 108 | |
109 | - if( ( $html = $cntl->create() ) == '' ) { |
|
109 | + if (($html = $cntl->create()) == '') { |
|
110 | 110 | return $cntl->getView()->response(); |
111 | 111 | } |
112 | 112 | |
113 | - return $this->getHtml( $html ); |
|
113 | + return $this->getHtml($html); |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | |
@@ -121,17 +121,17 @@ discard block |
||
121 | 121 | */ |
122 | 122 | public function deleteAction() |
123 | 123 | { |
124 | - if( config( 'shop.authorize', true ) ) { |
|
125 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); |
|
124 | + if (config('shop.authorize', true)) { |
|
125 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | $cntl = $this->createClient(); |
129 | 129 | |
130 | - if( ( $html = $cntl->delete() ) == '' ) { |
|
130 | + if (($html = $cntl->delete()) == '') { |
|
131 | 131 | return $cntl->getView()->response(); |
132 | 132 | } |
133 | 133 | |
134 | - return $this->getHtml( $html ); |
|
134 | + return $this->getHtml($html); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | |
@@ -142,17 +142,17 @@ discard block |
||
142 | 142 | */ |
143 | 143 | public function exportAction() |
144 | 144 | { |
145 | - if( config( 'shop.authorize', true ) ) { |
|
146 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); |
|
145 | + if (config('shop.authorize', true)) { |
|
146 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | $cntl = $this->createClient(); |
150 | 150 | |
151 | - if( ( $html = $cntl->export() ) == '' ) { |
|
151 | + if (($html = $cntl->export()) == '') { |
|
152 | 152 | return $cntl->getView()->response(); |
153 | 153 | } |
154 | 154 | |
155 | - return $this->getHtml( $html ); |
|
155 | + return $this->getHtml($html); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | |
@@ -163,17 +163,17 @@ discard block |
||
163 | 163 | */ |
164 | 164 | public function getAction() |
165 | 165 | { |
166 | - if( config( 'shop.authorize', true ) ) { |
|
167 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); |
|
166 | + if (config('shop.authorize', true)) { |
|
167 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); |
|
168 | 168 | } |
169 | 169 | |
170 | 170 | $cntl = $this->createClient(); |
171 | 171 | |
172 | - if( ( $html = $cntl->get() ) == '' ) { |
|
172 | + if (($html = $cntl->get()) == '') { |
|
173 | 173 | return $cntl->getView()->response(); |
174 | 174 | } |
175 | 175 | |
176 | - return $this->getHtml( $html ); |
|
176 | + return $this->getHtml($html); |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | |
@@ -184,17 +184,17 @@ discard block |
||
184 | 184 | */ |
185 | 185 | public function importAction() |
186 | 186 | { |
187 | - if( config( 'shop.authorize', true ) ) { |
|
188 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'super']] ); |
|
187 | + if (config('shop.authorize', true)) { |
|
188 | + $this->authorize('admin', [JqadmController::class, ['admin', 'super']]); |
|
189 | 189 | } |
190 | 190 | |
191 | 191 | $cntl = $this->createClient(); |
192 | 192 | |
193 | - if( ( $html = $cntl->import() ) == '' ) { |
|
193 | + if (($html = $cntl->import()) == '') { |
|
194 | 194 | return $cntl->getView()->response(); |
195 | 195 | } |
196 | 196 | |
197 | - return $this->getHtml( $html ); |
|
197 | + return $this->getHtml($html); |
|
198 | 198 | } |
199 | 199 | |
200 | 200 | |
@@ -205,17 +205,17 @@ discard block |
||
205 | 205 | */ |
206 | 206 | public function saveAction() |
207 | 207 | { |
208 | - if( config( 'shop.authorize', true ) ) { |
|
209 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); |
|
208 | + if (config('shop.authorize', true)) { |
|
209 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); |
|
210 | 210 | } |
211 | 211 | |
212 | 212 | $cntl = $this->createClient(); |
213 | 213 | |
214 | - if( ( $html = $cntl->save() ) == '' ) { |
|
214 | + if (($html = $cntl->save()) == '') { |
|
215 | 215 | return $cntl->getView()->response(); |
216 | 216 | } |
217 | 217 | |
218 | - return $this->getHtml( $html ); |
|
218 | + return $this->getHtml($html); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | |
@@ -226,17 +226,17 @@ discard block |
||
226 | 226 | */ |
227 | 227 | public function searchAction() |
228 | 228 | { |
229 | - if( config( 'shop.authorize', true ) ) { |
|
230 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'super']] ); |
|
229 | + if (config('shop.authorize', true)) { |
|
230 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'super']]); |
|
231 | 231 | } |
232 | 232 | |
233 | 233 | $cntl = $this->createClient(); |
234 | 234 | |
235 | - if( ( $html = $cntl->search() ) == '' ) { |
|
235 | + if (($html = $cntl->search()) == '') { |
|
236 | 236 | return $cntl->getView()->response(); |
237 | 237 | } |
238 | 238 | |
239 | - return $this->getHtml( $html ); |
|
239 | + return $this->getHtml($html); |
|
240 | 240 | } |
241 | 241 | |
242 | 242 | |
@@ -247,19 +247,19 @@ discard block |
||
247 | 247 | */ |
248 | 248 | protected function createClient() |
249 | 249 | { |
250 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
251 | - $lang = Input::get( 'lang', config( 'app.locale', 'en' ) ); |
|
252 | - $resource = Route::input( 'resource' ); |
|
250 | + $site = Route::input('site', Input::get('site', 'default')); |
|
251 | + $lang = Input::get('lang', config('app.locale', 'en')); |
|
252 | + $resource = Route::input('resource'); |
|
253 | 253 | |
254 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
255 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' ); |
|
254 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
255 | + $templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates'); |
|
256 | 256 | |
257 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); |
|
258 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) ); |
|
259 | - $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); |
|
260 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) ); |
|
257 | + $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
258 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en'))); |
|
259 | + $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); |
|
260 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang)); |
|
261 | 261 | |
262 | - return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $aimeos, $resource ); |
|
262 | + return \Aimeos\Admin\JQAdm\Factory::createClient($context, $aimeos, $resource); |
|
263 | 263 | } |
264 | 264 | |
265 | 265 | |
@@ -269,15 +269,15 @@ discard block |
||
269 | 269 | * @param string $content Content from admin client |
270 | 270 | * @return \Illuminate\Contracts\View\View View for rendering the output |
271 | 271 | */ |
272 | - protected function getHtml( $content ) |
|
272 | + protected function getHtml($content) |
|
273 | 273 | { |
274 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' ); |
|
275 | - $extnames = implode( ',', $aimeos->get()->getExtensions() ); |
|
274 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos'); |
|
275 | + $extnames = implode(',', $aimeos->get()->getExtensions()); |
|
276 | 276 | $version = $aimeos->getVersion(); |
277 | 277 | |
278 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
279 | - $content = str_replace( ['{type}', '{version}', '{extensions}'], ['Laravel', $version, $extnames], $content ); |
|
278 | + $site = Route::input('site', Input::get('site', 'default')); |
|
279 | + $content = str_replace(['{type}', '{version}', '{extensions}'], ['Laravel', $version, $extnames], $content); |
|
280 | 280 | |
281 | - return View::make( 'shop::jqadm.index', array( 'content' => $content, 'site' => $site ) ); |
|
281 | + return View::make('shop::jqadm.index', array('content' => $content, 'site' => $site)); |
|
282 | 282 | } |
283 | 283 | } |
@@ -36,13 +36,13 @@ discard block |
||
36 | 36 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
37 | 37 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
38 | 38 | */ |
39 | - public function deleteAction( ServerRequestInterface $request ) |
|
39 | + public function deleteAction(ServerRequestInterface $request) |
|
40 | 40 | { |
41 | - if( config( 'shop.authorize', true ) ) { |
|
42 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'super']] ); |
|
41 | + if (config('shop.authorize', true)) { |
|
42 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'super']]); |
|
43 | 43 | } |
44 | 44 | |
45 | - return $this->createClient()->delete( $request, new Response() ); |
|
45 | + return $this->createClient()->delete($request, new Response()); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | |
@@ -52,13 +52,13 @@ discard block |
||
52 | 52 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
53 | 53 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
54 | 54 | */ |
55 | - public function getAction( ServerRequestInterface $request ) |
|
55 | + public function getAction(ServerRequestInterface $request) |
|
56 | 56 | { |
57 | - if( config( 'shop.authorize', true ) ) { |
|
58 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor', 'super']] ); |
|
57 | + if (config('shop.authorize', true)) { |
|
58 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor', 'super']]); |
|
59 | 59 | } |
60 | 60 | |
61 | - return $this->createClient()->get( $request, new Response() ); |
|
61 | + return $this->createClient()->get($request, new Response()); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | |
@@ -68,13 +68,13 @@ discard block |
||
68 | 68 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
69 | 69 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
70 | 70 | */ |
71 | - public function patchAction( ServerRequestInterface $request ) |
|
71 | + public function patchAction(ServerRequestInterface $request) |
|
72 | 72 | { |
73 | - if( config( 'shop.authorize', true ) ) { |
|
74 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'super']] ); |
|
73 | + if (config('shop.authorize', true)) { |
|
74 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'super']]); |
|
75 | 75 | } |
76 | 76 | |
77 | - return $this->createClient()->patch( $request, new Response() ); |
|
77 | + return $this->createClient()->patch($request, new Response()); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | |
@@ -84,13 +84,13 @@ discard block |
||
84 | 84 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
85 | 85 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
86 | 86 | */ |
87 | - public function postAction( ServerRequestInterface $request ) |
|
87 | + public function postAction(ServerRequestInterface $request) |
|
88 | 88 | { |
89 | - if( config( 'shop.authorize', true ) ) { |
|
90 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'super']] ); |
|
89 | + if (config('shop.authorize', true)) { |
|
90 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'super']]); |
|
91 | 91 | } |
92 | 92 | |
93 | - return $this->createClient()->post( $request, new Response() ); |
|
93 | + return $this->createClient()->post($request, new Response()); |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | |
@@ -100,13 +100,13 @@ discard block |
||
100 | 100 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
101 | 101 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
102 | 102 | */ |
103 | - public function putAction( ServerRequestInterface $request ) |
|
103 | + public function putAction(ServerRequestInterface $request) |
|
104 | 104 | { |
105 | - if( config( 'shop.authorize', true ) ) { |
|
106 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'super']] ); |
|
105 | + if (config('shop.authorize', true)) { |
|
106 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'super']]); |
|
107 | 107 | } |
108 | 108 | |
109 | - return $this->createClient()->put( $request, new Response() ); |
|
109 | + return $this->createClient()->put($request, new Response()); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | |
@@ -116,13 +116,13 @@ discard block |
||
116 | 116 | * @param \Psr\Http\Message\ServerRequestInterface $request Request object |
117 | 117 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
118 | 118 | */ |
119 | - public function optionsAction( ServerRequestInterface $request ) |
|
119 | + public function optionsAction(ServerRequestInterface $request) |
|
120 | 120 | { |
121 | - if( config( 'shop.authorize', true ) ) { |
|
122 | - $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor', 'super']] ); |
|
121 | + if (config('shop.authorize', true)) { |
|
122 | + $this->authorize('admin', [JsonadmController::class, ['admin', 'api', 'editor', 'super']]); |
|
123 | 123 | } |
124 | 124 | |
125 | - return $this->createClient()->options( $request, new Response() ); |
|
125 | + return $this->createClient()->options($request, new Response()); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | |
@@ -133,18 +133,18 @@ discard block |
||
133 | 133 | */ |
134 | 134 | protected function createClient() |
135 | 135 | { |
136 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
137 | - $lang = Input::get( 'locale', config( 'app.locale', 'en' ) ); |
|
138 | - $resource = Route::input( 'resource' ); |
|
136 | + $site = Route::input('site', Input::get('site', 'default')); |
|
137 | + $lang = Input::get('locale', config('app.locale', 'en')); |
|
138 | + $resource = Route::input('resource'); |
|
139 | 139 | |
140 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
141 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' ); |
|
140 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
141 | + $templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates'); |
|
142 | 142 | |
143 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); |
|
144 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) ); |
|
145 | - $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); |
|
146 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) ); |
|
143 | + $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
144 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en'))); |
|
145 | + $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); |
|
146 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang)); |
|
147 | 147 | |
148 | - return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource ); |
|
148 | + return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource); |
|
149 | 149 | } |
150 | 150 | } |
@@ -36,24 +36,24 @@ |
||
36 | 36 | * @param \Illuminate\Http\Request $request Laravel request object |
37 | 37 | * @return \Illuminate\Contracts\View\View View for rendering the output |
38 | 38 | */ |
39 | - public function indexAction( Request $request ) |
|
39 | + public function indexAction(Request $request) |
|
40 | 40 | { |
41 | - if( Auth::check() === false |
|
42 | - || $request->user()->can( 'admin', [AdminController::class, ['admin', 'editor', 'super']] ) === false |
|
41 | + if (Auth::check() === false |
|
42 | + || $request->user()->can('admin', [AdminController::class, ['admin', 'editor', 'super']]) === false |
|
43 | 43 | ) { |
44 | - return redirect()->guest( 'login' ); |
|
44 | + return redirect()->guest('login'); |
|
45 | 45 | } |
46 | 46 | |
47 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
48 | - $siteManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
49 | - $siteItem = $siteManager->getItem( $request->user()->siteid ); |
|
47 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
48 | + $siteManager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
49 | + $siteItem = $siteManager->getItem($request->user()->siteid); |
|
50 | 50 | |
51 | 51 | $param = array( |
52 | 52 | 'resource' => 'dashboard', |
53 | - 'site' => Route::input( 'site', Input::get( 'site', $siteItem->getCode() ) ), |
|
54 | - 'lang' => Route::input( 'lang', Input::get( 'lang', $request->user()->langid ?: config( 'app.locale', 'en' ) ) ) |
|
53 | + 'site' => Route::input('site', Input::get('site', $siteItem->getCode())), |
|
54 | + 'lang' => Route::input('lang', Input::get('lang', $request->user()->langid ?: config('app.locale', 'en'))) |
|
55 | 55 | ); |
56 | 56 | |
57 | - return redirect()->route( 'aimeos_shop_jqadm_search', $param ); |
|
57 | + return redirect()->route('aimeos_shop_jqadm_search', $param); |
|
58 | 58 | } |
59 | 59 | } |
@@ -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 | <div class="app-menu" style="text-align: right; margin: 0 2.5%;"> |
@@ -33,6 +33,6 @@ discard block |
||
33 | 33 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.6.2/ckeditor.js" integrity="sha256-TD9khtuB9OoHJICSCe1SngH2RckROdDPDb5JJaUTi7I=" crossorigin="anonymous"></script> |
34 | 34 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.6.2/adapters/jquery.js" integrity="sha256-kWca68zAjkLv7iMEyHDuFKa9KxIij+DiCScmbTMlJHM=" crossorigin="anonymous"></script> |
35 | 35 | <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js"></script> |
36 | - <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'js' ) ); ?>"></script> |
|
36 | + <script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'js')); ?>"></script> |
|
37 | 37 | </body> |
38 | 38 | </html> |