@@ -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', 'viewer']] ); |
|
37 | + if (config('shop.authorize', true)) { |
|
38 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'viewer']]); |
|
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,12 +79,12 @@ 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']] ); |
|
82 | + if (config('shop.authorize', true)) { |
|
83 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | $cntl = $this->createClient(); |
87 | - return $this->getHtml( $cntl->copy() ); |
|
87 | + return $this->getHtml($cntl->copy()); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | |
@@ -95,12 +95,12 @@ discard block |
||
95 | 95 | */ |
96 | 96 | public function createAction() |
97 | 97 | { |
98 | - if( config( 'shop.authorize', true ) ) { |
|
99 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] ); |
|
98 | + if (config('shop.authorize', true)) { |
|
99 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | $cntl = $this->createClient(); |
103 | - return $this->getHtml( $cntl->create() ); |
|
103 | + return $this->getHtml($cntl->create()); |
|
104 | 104 | } |
105 | 105 | |
106 | 106 | |
@@ -111,12 +111,12 @@ discard block |
||
111 | 111 | */ |
112 | 112 | public function deleteAction() |
113 | 113 | { |
114 | - if( config( 'shop.authorize', true ) ) { |
|
115 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] ); |
|
114 | + if (config('shop.authorize', true)) { |
|
115 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | $cntl = $this->createClient(); |
119 | - return $this->getHtml( $cntl->delete() . $cntl->search() ); |
|
119 | + return $this->getHtml($cntl->delete().$cntl->search()); |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | |
@@ -127,12 +127,12 @@ discard block |
||
127 | 127 | */ |
128 | 128 | public function getAction() |
129 | 129 | { |
130 | - if( config( 'shop.authorize', true ) ) { |
|
131 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'viewer']] ); |
|
130 | + if (config('shop.authorize', true)) { |
|
131 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'viewer']]); |
|
132 | 132 | } |
133 | 133 | |
134 | 134 | $cntl = $this->createClient(); |
135 | - return $this->getHtml( $cntl->get() ); |
|
135 | + return $this->getHtml($cntl->get()); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | |
@@ -143,12 +143,12 @@ discard block |
||
143 | 143 | */ |
144 | 144 | public function saveAction() |
145 | 145 | { |
146 | - if( config( 'shop.authorize', true ) ) { |
|
147 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor']] ); |
|
146 | + if (config('shop.authorize', true)) { |
|
147 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor']]); |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | $cntl = $this->createClient(); |
151 | - return $this->getHtml( ( $cntl->save() ? : $cntl->search() ) ); |
|
151 | + return $this->getHtml(($cntl->save() ?: $cntl->search())); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | |
@@ -159,12 +159,12 @@ discard block |
||
159 | 159 | */ |
160 | 160 | public function searchAction() |
161 | 161 | { |
162 | - if( config( 'shop.authorize', true ) ) { |
|
163 | - $this->authorize( 'admin', [JqadmController::class, ['admin', 'editor', 'viewer']] ); |
|
162 | + if (config('shop.authorize', true)) { |
|
163 | + $this->authorize('admin', [JqadmController::class, ['admin', 'editor', 'viewer']]); |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | $cntl = $this->createClient(); |
167 | - return $this->getHtml( $cntl->search() ); |
|
167 | + return $this->getHtml($cntl->search()); |
|
168 | 168 | } |
169 | 169 | |
170 | 170 | |
@@ -175,19 +175,19 @@ discard block |
||
175 | 175 | */ |
176 | 176 | protected function createClient() |
177 | 177 | { |
178 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
179 | - $lang = Input::get( 'lang', config( 'app.locale', 'en' ) ); |
|
180 | - $resource = Route::input( 'resource' ); |
|
178 | + $site = Route::input('site', Input::get('site', 'default')); |
|
179 | + $lang = Input::get('lang', config('app.locale', 'en')); |
|
180 | + $resource = Route::input('resource'); |
|
181 | 181 | |
182 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
183 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' ); |
|
182 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
183 | + $templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates'); |
|
184 | 184 | |
185 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false, 'backend' ); |
|
186 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang, 'en' ) ) ); |
|
187 | - $context->setLocale( app('\Aimeos\Shop\Base\Locale')->getBackend( $context, $site ) ); |
|
188 | - $context->setView( app( '\Aimeos\Shop\Base\View' )->create( $context, $templatePaths, $lang ) ); |
|
185 | + $context = app('\Aimeos\Shop\Base\Context')->get(false, 'backend'); |
|
186 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang, 'en'))); |
|
187 | + $context->setLocale(app('\Aimeos\Shop\Base\Locale')->getBackend($context, $site)); |
|
188 | + $context->setView(app('\Aimeos\Shop\Base\View')->create($context, $templatePaths, $lang)); |
|
189 | 189 | |
190 | - return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource ); |
|
190 | + return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | |
@@ -197,15 +197,15 @@ discard block |
||
197 | 197 | * @param string $content Content from admin client |
198 | 198 | * @return \Illuminate\Contracts\View\View View for rendering the output |
199 | 199 | */ |
200 | - protected function getHtml( $content ) |
|
200 | + protected function getHtml($content) |
|
201 | 201 | { |
202 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' ); |
|
203 | - $extnames = implode( ',', $aimeos->get()->getExtensions() ); |
|
202 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos'); |
|
203 | + $extnames = implode(',', $aimeos->get()->getExtensions()); |
|
204 | 204 | $version = $aimeos->getVersion(); |
205 | 205 | |
206 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
207 | - $content = str_replace( ['{type}', '{version}', '{extensions}'], ['Laravel', $version, $extnames], $content ); |
|
206 | + $site = Route::input('site', Input::get('site', 'default')); |
|
207 | + $content = str_replace(['{type}', '{version}', '{extensions}'], ['Laravel', $version, $extnames], $content); |
|
208 | 208 | |
209 | - return View::make( 'shop::jqadm.index', array( 'content' => $content, 'site' => $site ) ); |
|
209 | + return View::make('shop::jqadm.index', array('content' => $content, 'site' => $site)); |
|
210 | 210 | } |
211 | 211 | } |
@@ -43,34 +43,34 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public function fire() |
45 | 45 | { |
46 | - $code = $this->argument( 'email' ); |
|
47 | - if( ( $password = $this->option( 'password' ) ) === null ) { |
|
48 | - $password = $this->secret( 'Password' ); |
|
46 | + $code = $this->argument('email'); |
|
47 | + if (($password = $this->option('password')) === null) { |
|
48 | + $password = $this->secret('Password'); |
|
49 | 49 | } |
50 | 50 | |
51 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' ); |
|
52 | - $context->setEditor( 'aimeos:account' ); |
|
51 | + $context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command'); |
|
52 | + $context->setEditor('aimeos:account'); |
|
53 | 53 | |
54 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
55 | - $localeItem = $localeManager->bootstrap( $this->argument( 'site' ), '', '', false ); |
|
56 | - $context->setLocale( $localeItem ); |
|
54 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
55 | + $localeItem = $localeManager->bootstrap($this->argument('site'), '', '', false); |
|
56 | + $context->setLocale($localeItem); |
|
57 | 57 | |
58 | - $user = $this->createCustomerItem( $context, $code, $password ); |
|
58 | + $user = $this->createCustomerItem($context, $code, $password); |
|
59 | 59 | |
60 | - if( $this->option( 'admin' ) ) { |
|
61 | - $this->addGroup( $context, $user, 'admin' ); |
|
60 | + if ($this->option('admin')) { |
|
61 | + $this->addGroup($context, $user, 'admin'); |
|
62 | 62 | } |
63 | 63 | |
64 | - if( $this->option( 'api' ) ) { |
|
65 | - $this->addGroup( $context, $user, 'api' ); |
|
64 | + if ($this->option('api')) { |
|
65 | + $this->addGroup($context, $user, 'api'); |
|
66 | 66 | } |
67 | 67 | |
68 | - if( $this->option( 'editor' ) ) { |
|
69 | - $this->addGroup( $context, $user, 'editor' ); |
|
68 | + if ($this->option('editor')) { |
|
69 | + $this->addGroup($context, $user, 'editor'); |
|
70 | 70 | } |
71 | 71 | |
72 | - if( $this->option( 'viewer' ) ) { |
|
73 | - $this->addGroup( $context, $user, 'viewer' ); |
|
72 | + if ($this->option('viewer')) { |
|
73 | + $this->addGroup($context, $user, 'viewer'); |
|
74 | 74 | } |
75 | 75 | } |
76 | 76 | |
@@ -82,33 +82,33 @@ discard block |
||
82 | 82 | * @param string $userid Unique user ID |
83 | 83 | * @param string $groupid Unique group ID |
84 | 84 | */ |
85 | - protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid ) |
|
85 | + protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid) |
|
86 | 86 | { |
87 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' ); |
|
88 | - $typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' ); |
|
87 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists'); |
|
88 | + $typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type'); |
|
89 | 89 | |
90 | - $typeid = $typeManager->findItem( 'default', array(), 'customer/group' )->getId(); |
|
90 | + $typeid = $typeManager->findItem('default', array(), 'customer/group')->getId(); |
|
91 | 91 | |
92 | 92 | $search = $manager->createSearch(); |
93 | 93 | $expr = array( |
94 | - $search->compare( '==', 'customer.lists.parentid', $userid ), |
|
95 | - $search->compare( '==', 'customer.lists.refid', $groupid ), |
|
96 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), |
|
97 | - $search->compare( '==', 'customer.lists.typeid', $typeid ), |
|
94 | + $search->compare('==', 'customer.lists.parentid', $userid), |
|
95 | + $search->compare('==', 'customer.lists.refid', $groupid), |
|
96 | + $search->compare('==', 'customer.lists.domain', 'customer/group'), |
|
97 | + $search->compare('==', 'customer.lists.typeid', $typeid), |
|
98 | 98 | ); |
99 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
100 | - $search->setSlice( 0, 1 ); |
|
99 | + $search->setConditions($search->combine('&&', $expr)); |
|
100 | + $search->setSlice(0, 1); |
|
101 | 101 | |
102 | - if( count( $manager->searchItems( $search ) ) === 0 ) |
|
102 | + if (count($manager->searchItems($search)) === 0) |
|
103 | 103 | { |
104 | 104 | $item = $manager->createItem(); |
105 | - $item->setDomain( 'customer/group' ); |
|
106 | - $item->setParentId( $userid ); |
|
107 | - $item->setTypeId( $typeid ); |
|
108 | - $item->setRefId( $groupid ); |
|
109 | - $item->setStatus( 1 ); |
|
105 | + $item->setDomain('customer/group'); |
|
106 | + $item->setParentId($userid); |
|
107 | + $item->setTypeId($typeid); |
|
108 | + $item->setRefId($groupid); |
|
109 | + $item->setStatus(1); |
|
110 | 110 | |
111 | - $manager->saveItem( $item, false ); |
|
111 | + $manager->saveItem($item, false); |
|
112 | 112 | } |
113 | 113 | } |
114 | 114 | |
@@ -120,13 +120,13 @@ discard block |
||
120 | 120 | * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object |
121 | 121 | * @param string $group Unique customer group code |
122 | 122 | */ |
123 | - protected function addGroup( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group ) |
|
123 | + protected function addGroup(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group) |
|
124 | 124 | { |
125 | 125 | $msg = 'Add "%1$s" group to user "%2$s" for site "%3$s"'; |
126 | - $this->info( sprintf( $msg, $group, $user->getCode(), $this->argument( 'site' ) ) ); |
|
126 | + $this->info(sprintf($msg, $group, $user->getCode(), $this->argument('site'))); |
|
127 | 127 | |
128 | - $groupItem = $this->getGroupItem( $context, $group ); |
|
129 | - $this->addListItem( $context, $user->getId(), $groupItem->getId() ); |
|
128 | + $groupItem = $this->getGroupItem($context, $group); |
|
129 | + $this->addListItem($context, $user->getId(), $groupItem->getId()); |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | |
@@ -140,23 +140,23 @@ discard block |
||
140 | 140 | * @param string $password New user password |
141 | 141 | * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object |
142 | 142 | */ |
143 | - protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password ) |
|
143 | + protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password) |
|
144 | 144 | { |
145 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
145 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
146 | 146 | |
147 | 147 | try { |
148 | - $item = $manager->findItem( $email ); |
|
149 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
148 | + $item = $manager->findItem($email); |
|
149 | + } catch (\Aimeos\MShop\Exception $e) { |
|
150 | 150 | $item = $manager->createItem(); |
151 | 151 | } |
152 | 152 | |
153 | - $item->setCode( $email ); |
|
154 | - $item->setLabel( $email ); |
|
155 | - $item->getPaymentAddress()->setEmail( $email ); |
|
156 | - $item->setPassword( $password ); |
|
157 | - $item->setStatus( 1 ); |
|
153 | + $item->setCode($email); |
|
154 | + $item->setLabel($email); |
|
155 | + $item->getPaymentAddress()->setEmail($email); |
|
156 | + $item->setPassword($password); |
|
157 | + $item->setStatus(1); |
|
158 | 158 | |
159 | - $manager->saveItem( $item ); |
|
159 | + $manager->saveItem($item); |
|
160 | 160 | |
161 | 161 | return $item; |
162 | 162 | } |
@@ -170,8 +170,8 @@ discard block |
||
170 | 170 | protected function getArguments() |
171 | 171 | { |
172 | 172 | return array( |
173 | - array( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ), |
|
174 | - array( 'site', InputArgument::OPTIONAL, 'Site code to create the account for', 'default' ), |
|
173 | + array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'), |
|
174 | + array('site', InputArgument::OPTIONAL, 'Site code to create the account for', 'default'), |
|
175 | 175 | ); |
176 | 176 | } |
177 | 177 | |
@@ -183,21 +183,21 @@ discard block |
||
183 | 183 | * @param string $code Unique customer group code |
184 | 184 | * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object |
185 | 185 | */ |
186 | - protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code ) |
|
186 | + protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code) |
|
187 | 187 | { |
188 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' ); |
|
188 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group'); |
|
189 | 189 | |
190 | 190 | try |
191 | 191 | { |
192 | - $item = $manager->findItem( $code ); |
|
192 | + $item = $manager->findItem($code); |
|
193 | 193 | } |
194 | - catch( \Aimeos\MShop\Exception $e ) |
|
194 | + catch (\Aimeos\MShop\Exception $e) |
|
195 | 195 | { |
196 | 196 | $item = $manager->createItem(); |
197 | - $item->setLabel( $code ); |
|
198 | - $item->setCode( $code ); |
|
197 | + $item->setLabel($code); |
|
198 | + $item->setCode($code); |
|
199 | 199 | |
200 | - $manager->saveItem( $item ); |
|
200 | + $manager->saveItem($item); |
|
201 | 201 | } |
202 | 202 | |
203 | 203 | return $item; |
@@ -212,11 +212,11 @@ discard block |
||
212 | 212 | protected function getOptions() |
213 | 213 | { |
214 | 214 | return array( |
215 | - array( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ), |
|
216 | - array( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ), |
|
217 | - array( 'api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs' ), |
|
218 | - array( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' ), |
|
219 | - array( 'viewer', null, InputOption::VALUE_NONE, 'If account should only have view privileges' ), |
|
215 | + array('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'), |
|
216 | + array('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'), |
|
217 | + array('api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs'), |
|
218 | + array('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges'), |
|
219 | + array('viewer', null, InputOption::VALUE_NONE, 'If account should only have view privileges'), |
|
220 | 220 | ); |
221 | 221 | } |
222 | 222 | } |