@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | * @param \Aimeos\Shop\Base\Locale $locale Locale object |
56 | 56 | * @param \Aimeos\Shop\Base\I18n $i18n Internationalisation object |
57 | 57 | */ |
58 | - public function __construct( \Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n ) |
|
58 | + public function __construct(\Illuminate\Session\Store $session, \Aimeos\Shop\Base\Config $config, \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\I18n $i18n) |
|
59 | 59 | { |
60 | 60 | $this->session = $session; |
61 | 61 | $this->config = $config; |
@@ -71,35 +71,35 @@ discard block |
||
71 | 71 | * @param string $type Configuration type, i.e. "frontend" or "backend" (deprecated, use \Aimeos\Shop\Base\Config) |
72 | 72 | * @return \Aimeos\MShop\Context\Item\Iface Context object |
73 | 73 | */ |
74 | - public function get( $locale = true, $type = 'frontend' ) |
|
74 | + public function get($locale = true, $type = 'frontend') |
|
75 | 75 | { |
76 | - $config = $this->config->get( $type ); |
|
76 | + $config = $this->config->get($type); |
|
77 | 77 | |
78 | - if( $this->context === null ) |
|
78 | + if ($this->context === null) |
|
79 | 79 | { |
80 | 80 | $context = new \Aimeos\MShop\Context\Item\Standard(); |
81 | - $context->setConfig( $config ); |
|
82 | - |
|
83 | - $this->addDataBaseManager( $context ); |
|
84 | - $this->addFilesystemManager( $context ); |
|
85 | - $this->addMessageQueueManager( $context ); |
|
86 | - $this->addLogger( $context ); |
|
87 | - $this->addCache( $context ); |
|
88 | - $this->addMailer( $context); |
|
89 | - $this->addSession( $context ); |
|
90 | - $this->addUser( $context); |
|
91 | - $this->addGroups( $context); |
|
81 | + $context->setConfig($config); |
|
82 | + |
|
83 | + $this->addDataBaseManager($context); |
|
84 | + $this->addFilesystemManager($context); |
|
85 | + $this->addMessageQueueManager($context); |
|
86 | + $this->addLogger($context); |
|
87 | + $this->addCache($context); |
|
88 | + $this->addMailer($context); |
|
89 | + $this->addSession($context); |
|
90 | + $this->addUser($context); |
|
91 | + $this->addGroups($context); |
|
92 | 92 | |
93 | 93 | $this->context = $context; |
94 | 94 | } |
95 | 95 | |
96 | - $this->context->setConfig( $config ); |
|
96 | + $this->context->setConfig($config); |
|
97 | 97 | |
98 | - if( $locale === true ) |
|
98 | + if ($locale === true) |
|
99 | 99 | { |
100 | - $localeItem = $this->locale->get( $this->context ); |
|
101 | - $this->context->setLocale( $localeItem ); |
|
102 | - $this->context->setI18n( $this->i18n->get( array( $localeItem->getLanguageId() ) ) ); |
|
100 | + $localeItem = $this->locale->get($this->context); |
|
101 | + $this->context->setLocale($localeItem); |
|
102 | + $this->context->setI18n($this->i18n->get(array($localeItem->getLanguageId()))); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | return $this->context; |
@@ -112,10 +112,10 @@ discard block |
||
112 | 112 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config |
113 | 113 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
114 | 114 | */ |
115 | - protected function addCache( \Aimeos\MShop\Context\Item\Iface $context ) |
|
115 | + protected function addCache(\Aimeos\MShop\Context\Item\Iface $context) |
|
116 | 116 | { |
117 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context ); |
|
118 | - $context->setCache( $cache ); |
|
117 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context); |
|
118 | + $context->setCache($cache); |
|
119 | 119 | |
120 | 120 | return $context; |
121 | 121 | } |
@@ -127,10 +127,10 @@ discard block |
||
127 | 127 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
128 | 128 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
129 | 129 | */ |
130 | - protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context ) |
|
130 | + protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context) |
|
131 | 131 | { |
132 | - $dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() ); |
|
133 | - $context->setDatabaseManager( $dbm ); |
|
132 | + $dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig()); |
|
133 | + $context->setDatabaseManager($dbm); |
|
134 | 134 | |
135 | 135 | return $context; |
136 | 136 | } |
@@ -142,13 +142,13 @@ discard block |
||
142 | 142 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
143 | 143 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
144 | 144 | */ |
145 | - protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context ) |
|
145 | + protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context) |
|
146 | 146 | { |
147 | 147 | $config = $context->getConfig(); |
148 | - $path = storage_path( 'aimeos' ); |
|
148 | + $path = storage_path('aimeos'); |
|
149 | 149 | |
150 | - $fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, $path ); |
|
151 | - $context->setFilesystemManager( $fs ); |
|
150 | + $fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, $path); |
|
151 | + $context->setFilesystemManager($fs); |
|
152 | 152 | |
153 | 153 | return $context; |
154 | 154 | } |
@@ -160,10 +160,10 @@ discard block |
||
160 | 160 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
161 | 161 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
162 | 162 | */ |
163 | - protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context ) |
|
163 | + protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context) |
|
164 | 164 | { |
165 | - $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context ); |
|
166 | - $context->setLogger( $logger ); |
|
165 | + $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context); |
|
166 | + $context->setLogger($logger); |
|
167 | 167 | |
168 | 168 | return $context; |
169 | 169 | } |
@@ -176,10 +176,10 @@ discard block |
||
176 | 176 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
177 | 177 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
178 | 178 | */ |
179 | - protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context ) |
|
179 | + protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context) |
|
180 | 180 | { |
181 | - $mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } ); |
|
182 | - $context->setMail( $mail ); |
|
181 | + $mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } ); |
|
182 | + $context->setMail($mail); |
|
183 | 183 | |
184 | 184 | return $context; |
185 | 185 | } |
@@ -191,10 +191,10 @@ discard block |
||
191 | 191 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
192 | 192 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
193 | 193 | */ |
194 | - protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context ) |
|
194 | + protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context) |
|
195 | 195 | { |
196 | - $mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() ); |
|
197 | - $context->setMessageQueueManager( $mq ); |
|
196 | + $mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig()); |
|
197 | + $context->setMessageQueueManager($mq); |
|
198 | 198 | |
199 | 199 | return $context; |
200 | 200 | } |
@@ -206,10 +206,10 @@ discard block |
||
206 | 206 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
207 | 207 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
208 | 208 | */ |
209 | - protected function addSession( \Aimeos\MShop\Context\Item\Iface $context ) |
|
209 | + protected function addSession(\Aimeos\MShop\Context\Item\Iface $context) |
|
210 | 210 | { |
211 | - $session = new \Aimeos\MW\Session\Laravel5( $this->session ); |
|
212 | - $context->setSession( $session ); |
|
211 | + $session = new \Aimeos\MW\Session\Laravel5($this->session); |
|
212 | + $context->setSession($session); |
|
213 | 213 | |
214 | 214 | return $context; |
215 | 215 | } |
@@ -221,16 +221,16 @@ discard block |
||
221 | 221 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
222 | 222 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
223 | 223 | */ |
224 | - protected function addUser( \Aimeos\MShop\Context\Item\Iface $context ) |
|
224 | + protected function addUser(\Aimeos\MShop\Context\Item\Iface $context) |
|
225 | 225 | { |
226 | - if( ( $userid = Auth::id() ) !== null ) { |
|
227 | - $context->setUserId( $userid ); |
|
226 | + if (($userid = Auth::id()) !== null) { |
|
227 | + $context->setUserId($userid); |
|
228 | 228 | } |
229 | 229 | |
230 | - if( ( $user = Auth::user() ) !== null ) { |
|
231 | - $context->setEditor( $user->name ); |
|
230 | + if (($user = Auth::user()) !== null) { |
|
231 | + $context->setEditor($user->name); |
|
232 | 232 | } else { |
233 | - $context->setEditor( \Request::ip() ); |
|
233 | + $context->setEditor(\Request::ip()); |
|
234 | 234 | } |
235 | 235 | |
236 | 236 | return $context; |
@@ -243,14 +243,14 @@ discard block |
||
243 | 243 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
244 | 244 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
245 | 245 | */ |
246 | - protected function addGroups( \Aimeos\MShop\Context\Item\Iface $context ) |
|
246 | + protected function addGroups(\Aimeos\MShop\Context\Item\Iface $context) |
|
247 | 247 | { |
248 | - if( ( $userid = Auth::id() ) !== null ) |
|
248 | + if (($userid = Auth::id()) !== null) |
|
249 | 249 | { |
250 | - $context->setGroupIds( function() use ( $context, $userid ) |
|
250 | + $context->setGroupIds(function() use ($context, $userid) |
|
251 | 251 | { |
252 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
253 | - return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups(); |
|
252 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
253 | + return $manager->getItem($userid, array('customer/group'))->getGroups(); |
|
254 | 254 | } ); |
255 | 255 | } |
256 | 256 |
@@ -29,7 +29,7 @@ |
||
29 | 29 | */ |
30 | 30 | public function indexAction() |
31 | 31 | { |
32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' ); |
|
32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index'); |
|
33 | 33 | return Response::view('shop::basket.index', $params)->header('Cache-Control', 'no-store'); |
34 | 34 | } |
35 | 35 | } |
36 | 36 | \ No newline at end of file |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function indexAction() |
31 | 31 | { |
32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'account-index' ); |
|
32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('account-index'); |
|
33 | 33 | return Response::view('shop::account.index', $params)->header('Cache-Control', 'private, max-age=300'); |
34 | 34 | } |
35 | 35 | |
@@ -41,18 +41,18 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function downloadAction() |
43 | 43 | { |
44 | - $context = app( '\Aimeos\Shop\Base\Context' )->get(); |
|
44 | + $context = app('\Aimeos\Shop\Base\Context')->get(); |
|
45 | 45 | $langid = $context->getLocale()->getLanguageId(); |
46 | 46 | |
47 | - $view = app( '\Aimeos\Shop\Base\View' )->create( $context, array(), $langid ); |
|
48 | - $context->setView( $view ); |
|
47 | + $view = app('\Aimeos\Shop\Base\View')->create($context, array(), $langid); |
|
48 | + $context->setView($view); |
|
49 | 49 | |
50 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' ); |
|
51 | - $client->setView( $view ); |
|
50 | + $client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download'); |
|
51 | + $client->setView($view); |
|
52 | 52 | $client->process(); |
53 | 53 | |
54 | 54 | $response = $view->response(); |
55 | - return Response::make( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() ) |
|
55 | + return Response::make((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders()) |
|
56 | 56 | ->header('Cache-Control', 'private, max-age=300', false); |
57 | 57 | } |
58 | 58 | } |
59 | 59 | \ No newline at end of file |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function countAction() |
31 | 31 | { |
32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' ); |
|
32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count'); |
|
33 | 33 | |
34 | 34 | return Response::view('shop::catalog.count', $params) |
35 | 35 | ->header('Content-Type', 'application/javascript') |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | */ |
45 | 45 | public function detailAction() |
46 | 46 | { |
47 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' ); |
|
47 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail'); |
|
48 | 48 | return Response::view('shop::catalog.detail', $params)->header('Cache-Control', 'max-age=43200'); |
49 | 49 | } |
50 | 50 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | */ |
57 | 57 | public function listAction() |
58 | 58 | { |
59 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' ); |
|
59 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list'); |
|
60 | 60 | return Response::view('shop::catalog.list', $params)->header('Cache-Control', 'max-age=43200'); |
61 | 61 | } |
62 | 62 | |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | */ |
69 | 69 | public function stockAction() |
70 | 70 | { |
71 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' ); |
|
71 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock'); |
|
72 | 72 | |
73 | 73 | return Response::view('shop::catalog.stock', $params) |
74 | 74 | ->header('Content-Type', 'application/javascript') |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | */ |
84 | 84 | public function suggestAction() |
85 | 85 | { |
86 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' ); |
|
86 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest'); |
|
87 | 87 | |
88 | 88 | return Response::view('shop::catalog.suggest', $params) |
89 | 89 | ->header('Content-Type', 'application/json') |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function confirmAction() |
31 | 31 | { |
32 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' ); |
|
32 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm'); |
|
33 | 33 | return Response::view('shop::checkout.confirm', $params)->header('Cache-Control', 'no-store'); |
34 | 34 | } |
35 | 35 | |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function indexAction() |
43 | 43 | { |
44 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' ); |
|
44 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index'); |
|
45 | 45 | return Response::view('shop::checkout.index', $params)->header('Cache-Control', 'no-store'); |
46 | 46 | } |
47 | 47 | |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | */ |
54 | 54 | public function updateAction() |
55 | 55 | { |
56 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' ); |
|
56 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update'); |
|
57 | 57 | return Response::view('shop::checkout.update', $params)->header('Cache-Control', 'no-store'); |
58 | 58 | } |
59 | 59 | } |
60 | 60 | \ No newline at end of file |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/css/tether.min.css" integrity="sha256-y4TDcAD4/j5o4keZvggf698Cr9Oc7JZ+gGMax23qmVA=" crossorigin="anonymous" /> |
12 | 12 | <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" /> |
13 | 13 | <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous"> |
14 | - <link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'css' ) ); ?>"> |
|
14 | + <link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'css')); ?>"> |
|
15 | 15 | </head> |
16 | 16 | <body> |
17 | 17 | |
@@ -24,6 +24,6 @@ discard block |
||
24 | 24 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.6.2/ckeditor.js" integrity="sha256-TD9khtuB9OoHJICSCe1SngH2RckROdDPDb5JJaUTi7I=" crossorigin="anonymous"></script> |
25 | 25 | <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.6.2/adapters/jquery.js" integrity="sha256-kWca68zAjkLv7iMEyHDuFKa9KxIij+DiCScmbTMlJHM=" crossorigin="anonymous"></script> |
26 | 26 | <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script> |
27 | - <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'lang' => 'en', 'type' => 'js' ) ); ?>"></script> |
|
27 | + <script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'lang' => 'en', 'type' => 'js')); ?>"></script> |
|
28 | 28 | </body> |
29 | 29 | </html> |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | * @param \Aimeos\Shop\Base\Context $context Context provider |
40 | 40 | * @param \Aimeos\Shop\Base\Locale $locale Locale provider |
41 | 41 | */ |
42 | - public function __construct( \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale ) |
|
42 | + public function __construct(\Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\Locale $locale) |
|
43 | 43 | { |
44 | 44 | $this->context = $context; |
45 | 45 | $this->locale = $locale; |
@@ -53,22 +53,22 @@ discard block |
||
53 | 53 | * @param string|array $groupcodes Unique user/customer group codes that are allowed |
54 | 54 | * @return boolean True if user is part of the group, false if not |
55 | 55 | */ |
56 | - public function checkUserGroup( \Illuminate\Foundation\Auth\User $user, $groupcodes ) |
|
56 | + public function checkUserGroup(\Illuminate\Foundation\Auth\User $user, $groupcodes) |
|
57 | 57 | { |
58 | - $context = $this->context->get( false ); |
|
58 | + $context = $this->context->get(false); |
|
59 | 59 | |
60 | 60 | try { |
61 | - $site = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' )->getItem( $user->siteid )->getCode(); |
|
62 | - } catch( \Exception $e ) { |
|
63 | - $site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' ); |
|
61 | + $site = \Aimeos\MShop\Factory::createManager($context, 'locale/site')->getItem($user->siteid)->getCode(); |
|
62 | + } catch (\Exception $e) { |
|
63 | + $site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default'); |
|
64 | 64 | } |
65 | 65 | |
66 | - $context->setLocale( $this->locale->getBackend( $context, $site ) ); |
|
66 | + $context->setLocale($this->locale->getBackend($context, $site)); |
|
67 | 67 | |
68 | - foreach( array_reverse( $context->getLocale()->getSitePath() ) as $siteid ) |
|
68 | + foreach (array_reverse($context->getLocale()->getSitePath()) as $siteid) |
|
69 | 69 | { |
70 | - if( $user->siteid === $siteid ) { |
|
71 | - return $this->checkGroups( $context, $user->id, $groupcodes ); |
|
70 | + if ($user->siteid === $siteid) { |
|
71 | + return $this->checkGroups($context, $user->id, $groupcodes); |
|
72 | 72 | } |
73 | 73 | } |
74 | 74 | |
@@ -84,14 +84,14 @@ discard block |
||
84 | 84 | * @return boolean True if user is part of the group, false if not |
85 | 85 | * @deprecated Use checkUserGroup() instead |
86 | 86 | */ |
87 | - public function checkGroup( $userid, $groupcodes ) |
|
87 | + public function checkGroup($userid, $groupcodes) |
|
88 | 88 | { |
89 | - $site = ( Route::current() ? Route::input( 'site', Input::get( 'site', 'default' ) ) : 'default' ); |
|
89 | + $site = (Route::current() ? Route::input('site', Input::get('site', 'default')) : 'default'); |
|
90 | 90 | |
91 | - $context = $this->context->get( false ); |
|
92 | - $context->setLocale( $this->locale->getBackend( $context, $site ) ); |
|
91 | + $context = $this->context->get(false); |
|
92 | + $context->setLocale($this->locale->getBackend($context, $site)); |
|
93 | 93 | |
94 | - return $this->checkGroups( $context, $userid, $groupcodes ); |
|
94 | + return $this->checkGroups($context, $userid, $groupcodes); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | |
@@ -101,15 +101,15 @@ discard block |
||
101 | 101 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item |
102 | 102 | * @return string[] List of group codes |
103 | 103 | */ |
104 | - public function getGroups( \Aimeos\MShop\Context\Item\Iface $context ) |
|
104 | + public function getGroups(\Aimeos\MShop\Context\Item\Iface $context) |
|
105 | 105 | { |
106 | 106 | $list = array(); |
107 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' ); |
|
107 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group'); |
|
108 | 108 | |
109 | 109 | $search = $manager->createSearch(); |
110 | - $search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) ); |
|
110 | + $search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds())); |
|
111 | 111 | |
112 | - foreach( $manager->searchItems( $search ) as $item ) { |
|
112 | + foreach ($manager->searchItems($search) as $item) { |
|
113 | 113 | $list[] = $item->getCode(); |
114 | 114 | } |
115 | 115 | |
@@ -125,26 +125,26 @@ discard block |
||
125 | 125 | * @param string[] $groupcodes List of group codes to check against |
126 | 126 | * @return boolean True if the user is in one of the groups, false if not |
127 | 127 | */ |
128 | - protected function checkGroups( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupcodes ) |
|
128 | + protected function checkGroups(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupcodes) |
|
129 | 129 | { |
130 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' ); |
|
130 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group'); |
|
131 | 131 | |
132 | 132 | $search = $manager->createSearch(); |
133 | - $search->setConditions( $search->compare( '==', 'customer.group.code', (array) $groupcodes ) ); |
|
134 | - $groupItems = $manager->searchItems( $search ); |
|
133 | + $search->setConditions($search->compare('==', 'customer.group.code', (array) $groupcodes)); |
|
134 | + $groupItems = $manager->searchItems($search); |
|
135 | 135 | |
136 | 136 | |
137 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' ); |
|
137 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists'); |
|
138 | 138 | |
139 | 139 | $search = $manager->createSearch(); |
140 | 140 | $expr = array( |
141 | - $search->compare( '==', 'customer.lists.parentid', $userid ), |
|
142 | - $search->compare( '==', 'customer.lists.refid', array_keys( $groupItems ) ), |
|
143 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), |
|
141 | + $search->compare('==', 'customer.lists.parentid', $userid), |
|
142 | + $search->compare('==', 'customer.lists.refid', array_keys($groupItems)), |
|
143 | + $search->compare('==', 'customer.lists.domain', 'customer/group'), |
|
144 | 144 | ); |
145 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
146 | - $search->setSlice( 0, 1 ); |
|
145 | + $search->setConditions($search->combine('&&', $expr)); |
|
146 | + $search->setSlice(0, 1); |
|
147 | 147 | |
148 | - return (bool) count( $manager->searchItems( $search ) ); |
|
148 | + return (bool) count($manager->searchItems($search)); |
|
149 | 149 | } |
150 | 150 | } |
151 | 151 | \ No newline at end of file |
@@ -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']] ) === false |
|
41 | + if (Auth::check() === false |
|
42 | + || $request->user()->can('admin', [AdminController::class, ['admin', 'editor']]) === 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 | } |