@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function confirmAction() |
30 | 30 | { |
31 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' ); |
|
31 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm'); |
|
32 | 32 | return \View::make('shop::checkout.confirm', $params); |
33 | 33 | } |
34 | 34 | |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function indexAction() |
42 | 42 | { |
43 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' ); |
|
43 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index'); |
|
44 | 44 | return \View::make('shop::checkout.index', $params); |
45 | 45 | } |
46 | 46 | |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public function updateAction() |
54 | 54 | { |
55 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' ); |
|
55 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update'); |
|
56 | 56 | return \View::make('shop::checkout.update', $params); |
57 | 57 | } |
58 | 58 | } |
59 | 59 | \ No newline at end of file |
@@ -28,31 +28,31 @@ |
||
28 | 28 | */ |
29 | 29 | public function boot() |
30 | 30 | { |
31 | - $basedir = dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR; |
|
31 | + $basedir = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR; |
|
32 | 32 | |
33 | - $this->mergeConfigFrom(dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR.'config/shop.php', 'shop'); |
|
33 | + $this->mergeConfigFrom(dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'config/shop.php', 'shop'); |
|
34 | 34 | |
35 | - $this->loadViewsFrom($basedir.'views', 'shop'); |
|
35 | + $this->loadViewsFrom($basedir . 'views', 'shop'); |
|
36 | 36 | |
37 | 37 | |
38 | 38 | $this->publishes(array( |
39 | - $basedir.'config/shop.php' => config_path('shop.php'), |
|
39 | + $basedir . 'config/shop.php' => config_path('shop.php'), |
|
40 | 40 | ), 'config'); |
41 | 41 | |
42 | 42 | $this->publishes(array( |
43 | - $basedir.'database/migrations' => base_path('database/migrations'), |
|
43 | + $basedir . 'database/migrations' => base_path('database/migrations'), |
|
44 | 44 | ), 'migrations'); |
45 | 45 | |
46 | 46 | $this->publishes(array( |
47 | - $basedir.'views' => base_path('resources/views/vendor/shop'), |
|
47 | + $basedir . 'views' => base_path('resources/views/vendor/shop'), |
|
48 | 48 | ), 'views'); |
49 | 49 | |
50 | 50 | $this->publishes(array( |
51 | - dirname($basedir).DIRECTORY_SEPARATOR.'public' => public_path('packages/aimeos/shop'), |
|
51 | + dirname($basedir) . DIRECTORY_SEPARATOR . 'public' => public_path('packages/aimeos/shop'), |
|
52 | 52 | ), 'public'); |
53 | 53 | |
54 | 54 | |
55 | - require $basedir.'routes.php'; |
|
55 | + require $basedir . 'routes.php'; |
|
56 | 56 | } |
57 | 57 | |
58 | 58 |
@@ -177,8 +177,7 @@ |
||
177 | 177 | try |
178 | 178 | { |
179 | 179 | $item = $manager->getItem( $code ); |
180 | - } |
|
181 | - catch( \Aimeos\MShop\Exception $e ) |
|
180 | + } catch( \Aimeos\MShop\Exception $e ) |
|
182 | 181 | { |
183 | 182 | $item = $manager->createItem(); |
184 | 183 | $item->setLabel( $code ); |
@@ -39,21 +39,21 @@ discard block |
||
39 | 39 | */ |
40 | 40 | public function fire() |
41 | 41 | { |
42 | - $code = $this->argument( 'email' ); |
|
43 | - if( ( $password = $this->option( 'password' ) ) === null ) { |
|
44 | - $password = $this->secret( 'Password' ); |
|
42 | + $code = $this->argument('email'); |
|
43 | + if (($password = $this->option('password')) === null) { |
|
44 | + $password = $this->secret('Password'); |
|
45 | 45 | } |
46 | 46 | |
47 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false ); |
|
48 | - $context->setEditor( 'aimeos:account' ); |
|
47 | + $context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false); |
|
48 | + $context->setEditor('aimeos:account'); |
|
49 | 49 | |
50 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
51 | - $context->setLocale( $localeManager->createItem() ); |
|
50 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
51 | + $context->setLocale($localeManager->createItem()); |
|
52 | 52 | |
53 | - $user = $this->createCustomerItem( $context, $code, $password ); |
|
53 | + $user = $this->createCustomerItem($context, $code, $password); |
|
54 | 54 | |
55 | - if( $this->option( 'admin' ) ) { |
|
56 | - $this->addPrivilege( $context, $user, 'admin' ); |
|
55 | + if ($this->option('admin')) { |
|
56 | + $this->addPrivilege($context, $user, 'admin'); |
|
57 | 57 | } |
58 | 58 | } |
59 | 59 | |
@@ -65,31 +65,31 @@ discard block |
||
65 | 65 | * @param string $userid Unique user ID |
66 | 66 | * @param string $groupid Unique group ID |
67 | 67 | */ |
68 | - protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid ) |
|
68 | + protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid) |
|
69 | 69 | { |
70 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'lists' ); |
|
71 | - $typeid = $manager->getSubmanager( 'type' )->findItem( 'default', array(), 'customer/group' )->getId(); |
|
70 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('lists'); |
|
71 | + $typeid = $manager->getSubmanager('type')->findItem('default', array(), 'customer/group')->getId(); |
|
72 | 72 | |
73 | 73 | $search = $manager->createSearch(); |
74 | 74 | $expr = array( |
75 | - $search->compare( '==', 'customer.lists.parentid', $userid ), |
|
76 | - $search->compare( '==', 'customer.lists.refid', $groupid ), |
|
77 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), |
|
78 | - $search->compare( '==', 'customer.lists.typeid', $typeid ), |
|
75 | + $search->compare('==', 'customer.lists.parentid', $userid), |
|
76 | + $search->compare('==', 'customer.lists.refid', $groupid), |
|
77 | + $search->compare('==', 'customer.lists.domain', 'customer/group'), |
|
78 | + $search->compare('==', 'customer.lists.typeid', $typeid), |
|
79 | 79 | ); |
80 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
81 | - $search->setSlice( 0, 1 ); |
|
80 | + $search->setConditions($search->combine('&&', $expr)); |
|
81 | + $search->setSlice(0, 1); |
|
82 | 82 | |
83 | - if( count( $manager->searchItems( $search ) ) === 0 ) |
|
83 | + if (count($manager->searchItems($search)) === 0) |
|
84 | 84 | { |
85 | 85 | $item = $manager->createItem(); |
86 | - $item->setDomain( 'customer/group' ); |
|
87 | - $item->setParentId( $userid ); |
|
88 | - $item->setTypeId( $typeid ); |
|
89 | - $item->setRefId( $groupid ); |
|
90 | - $item->setStatus( 1 ); |
|
86 | + $item->setDomain('customer/group'); |
|
87 | + $item->setParentId($userid); |
|
88 | + $item->setTypeId($typeid); |
|
89 | + $item->setRefId($groupid); |
|
90 | + $item->setStatus(1); |
|
91 | 91 | |
92 | - $manager->saveItem( $item, false ); |
|
92 | + $manager->saveItem($item, false); |
|
93 | 93 | } |
94 | 94 | } |
95 | 95 | |
@@ -101,23 +101,23 @@ discard block |
||
101 | 101 | * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object |
102 | 102 | * @param string $privilege Unique customer group code |
103 | 103 | */ |
104 | - protected function addPrivilege( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $privilege ) |
|
104 | + protected function addPrivilege(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $privilege) |
|
105 | 105 | { |
106 | - $this->info( sprintf( 'Add "%1$s" privilege to user "%2$s" for sites', $privilege, $user->getCode() ) ); |
|
106 | + $this->info(sprintf('Add "%1$s" privilege to user "%2$s" for sites', $privilege, $user->getCode())); |
|
107 | 107 | |
108 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
108 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
109 | 109 | |
110 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
110 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
111 | 111 | { |
112 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
112 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
113 | 113 | |
114 | 114 | $lcontext = clone $context; |
115 | - $lcontext->setLocale( $localeItem ); |
|
115 | + $lcontext->setLocale($localeItem); |
|
116 | 116 | |
117 | - $this->info( '- ' . $siteItem->getCode() ); |
|
117 | + $this->info('- ' . $siteItem->getCode()); |
|
118 | 118 | |
119 | - $groupItem = $this->getGroupItem( $lcontext, $privilege ); |
|
120 | - $this->addListItem( $lcontext, $user->getId(), $groupItem->getId() ); |
|
119 | + $groupItem = $this->getGroupItem($lcontext, $privilege); |
|
120 | + $this->addListItem($lcontext, $user->getId(), $groupItem->getId()); |
|
121 | 121 | } |
122 | 122 | } |
123 | 123 | |
@@ -132,21 +132,21 @@ discard block |
||
132 | 132 | * @param string $password New user password |
133 | 133 | * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object |
134 | 134 | */ |
135 | - protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password ) |
|
135 | + protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password) |
|
136 | 136 | { |
137 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
137 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
138 | 138 | |
139 | 139 | try { |
140 | - $item = $manager->findItem( $email ); |
|
141 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
140 | + $item = $manager->findItem($email); |
|
141 | + } catch (\Aimeos\MShop\Exception $e) { |
|
142 | 142 | $item = $manager->createItem(); |
143 | 143 | } |
144 | 144 | |
145 | - $item->setCode( $email ); |
|
146 | - $item->getPaymentAddress()->setEmail( $email ); |
|
147 | - $item->setPassword( $password ); |
|
145 | + $item->setCode($email); |
|
146 | + $item->getPaymentAddress()->setEmail($email); |
|
147 | + $item->setPassword($password); |
|
148 | 148 | |
149 | - $manager->saveItem( $item ); |
|
149 | + $manager->saveItem($item); |
|
150 | 150 | |
151 | 151 | return $item; |
152 | 152 | } |
@@ -160,8 +160,8 @@ discard block |
||
160 | 160 | protected function getArguments() |
161 | 161 | { |
162 | 162 | return array( |
163 | - array( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ), |
|
164 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)' ), |
|
163 | + array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'), |
|
164 | + array('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)'), |
|
165 | 165 | ); |
166 | 166 | } |
167 | 167 | |
@@ -173,21 +173,21 @@ discard block |
||
173 | 173 | * @param string $code Unique customer group code |
174 | 174 | * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object |
175 | 175 | */ |
176 | - protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code ) |
|
176 | + protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code) |
|
177 | 177 | { |
178 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' ); |
|
178 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group'); |
|
179 | 179 | |
180 | 180 | try |
181 | 181 | { |
182 | - $item = $manager->findItem( $code ); |
|
182 | + $item = $manager->findItem($code); |
|
183 | 183 | } |
184 | - catch( \Aimeos\MShop\Exception $e ) |
|
184 | + catch (\Aimeos\MShop\Exception $e) |
|
185 | 185 | { |
186 | 186 | $item = $manager->createItem(); |
187 | - $item->setLabel( $code ); |
|
188 | - $item->setCode( $code ); |
|
187 | + $item->setLabel($code); |
|
188 | + $item->setCode($code); |
|
189 | 189 | |
190 | - $manager->saveItem( $item ); |
|
190 | + $manager->saveItem($item); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | return $item; |
@@ -202,8 +202,8 @@ discard block |
||
202 | 202 | protected function getOptions() |
203 | 203 | { |
204 | 204 | return array( |
205 | - array( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ), |
|
206 | - array( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ), |
|
205 | + array('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'), |
|
206 | + array('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'), |
|
207 | 207 | ); |
208 | 208 | } |
209 | 209 | } |
@@ -163,8 +163,7 @@ |
||
163 | 163 | $site = \Route::input( 'site', 'default' ); |
164 | 164 | $lang = \Route::input( 'locale', '' ); |
165 | 165 | $currency = \Route::input( 'currency', '' ); |
166 | - } |
|
167 | - else |
|
166 | + } else |
|
168 | 167 | { |
169 | 168 | $site = 'default'; |
170 | 169 | $lang = $currency = ''; |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object |
50 | 50 | * @param \Illuminate\Session\Store $session Laravel session object |
51 | 51 | */ |
52 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Illuminate\Session\Store $session ) |
|
52 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Illuminate\Session\Store $session) |
|
53 | 53 | { |
54 | 54 | $this->config = $config; |
55 | 55 | $this->session = $session; |
@@ -62,48 +62,48 @@ discard block |
||
62 | 62 | * @param boolean $locale True to add locale object to context, false if not |
63 | 63 | * @return \Aimeos\MShop\Context\Item\Iface Context object |
64 | 64 | */ |
65 | - public function get( $locale = true ) |
|
65 | + public function get($locale = true) |
|
66 | 66 | { |
67 | - if( self::$context === null ) |
|
67 | + if (self::$context === null) |
|
68 | 68 | { |
69 | 69 | $context = new \Aimeos\MShop\Context\Item\Standard(); |
70 | 70 | |
71 | 71 | $config = $this->getConfig(); |
72 | - $context->setConfig( $config ); |
|
72 | + $context->setConfig($config); |
|
73 | 73 | |
74 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $config ); |
|
75 | - $context->setDatabaseManager( $dbm ); |
|
74 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($config); |
|
75 | + $context->setDatabaseManager($dbm); |
|
76 | 76 | |
77 | - $fs = new \Aimeos\MW\Filesystem\Manager\Laravel( app( 'filesystem' ), $config, storage_path( 'aimeos' ) ); |
|
78 | - $context->setFilesystemManager( $fs ); |
|
77 | + $fs = new \Aimeos\MW\Filesystem\Manager\Laravel(app('filesystem'), $config, storage_path('aimeos')); |
|
78 | + $context->setFilesystemManager($fs); |
|
79 | 79 | |
80 | - $mail = new \Aimeos\MW\Mail\Swift( function() { return app( 'mailer' )->getSwiftMailer(); } ); |
|
81 | - $context->setMail( $mail ); |
|
80 | + $mail = new \Aimeos\MW\Mail\Swift(function() { return app('mailer')->getSwiftMailer(); } ); |
|
81 | + $context->setMail($mail); |
|
82 | 82 | |
83 | - $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context ); |
|
84 | - $context->setLogger( $logger ); |
|
83 | + $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context); |
|
84 | + $context->setLogger($logger); |
|
85 | 85 | |
86 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context ); |
|
87 | - $context->setCache( $cache ); |
|
86 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context); |
|
87 | + $context->setCache($cache); |
|
88 | 88 | |
89 | 89 | self::$context = $context; |
90 | 90 | } |
91 | 91 | |
92 | 92 | $context = self::$context; |
93 | 93 | |
94 | - if( $locale === true ) |
|
94 | + if ($locale === true) |
|
95 | 95 | { |
96 | - $localeItem = $this->getLocale( $context ); |
|
96 | + $localeItem = $this->getLocale($context); |
|
97 | 97 | $langid = $localeItem->getLanguageId(); |
98 | 98 | |
99 | - $context->setLocale( $localeItem ); |
|
100 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $langid ) ) ); |
|
99 | + $context->setLocale($localeItem); |
|
100 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($langid))); |
|
101 | 101 | } |
102 | 102 | |
103 | - $session = new \Aimeos\MW\Session\Laravel5( $this->session ); |
|
104 | - $context->setSession( $session ); |
|
103 | + $session = new \Aimeos\MW\Session\Laravel5($this->session); |
|
104 | + $context->setSession($session); |
|
105 | 105 | |
106 | - $this->addUser( $context ); |
|
106 | + $this->addUser($context); |
|
107 | 107 | |
108 | 108 | return $context; |
109 | 109 | } |
@@ -114,20 +114,20 @@ discard block |
||
114 | 114 | * |
115 | 115 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
116 | 116 | */ |
117 | - protected function addUser( \Aimeos\MShop\Context\Item\Iface $context ) |
|
117 | + protected function addUser(\Aimeos\MShop\Context\Item\Iface $context) |
|
118 | 118 | { |
119 | - if( ( $userid = Auth::id() ) !== null ) |
|
119 | + if (($userid = Auth::id()) !== null) |
|
120 | 120 | { |
121 | - $context->setUserId( $userid ); |
|
122 | - $context->setGroupIds( function() use ( $context, $userid ) |
|
121 | + $context->setUserId($userid); |
|
122 | + $context->setGroupIds(function() use ($context, $userid) |
|
123 | 123 | { |
124 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
125 | - return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups(); |
|
124 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
125 | + return $manager->getItem($userid, array('customer/group'))->getGroups(); |
|
126 | 126 | } ); |
127 | 127 | } |
128 | 128 | |
129 | - if( ( $user = Auth::user() ) !== null ) { |
|
130 | - $context->setEditor( $user->name ); |
|
129 | + if (($user = Auth::user()) !== null) { |
|
130 | + $context->setEditor($user->name); |
|
131 | 131 | } |
132 | 132 | } |
133 | 133 | |
@@ -139,13 +139,13 @@ discard block |
||
139 | 139 | */ |
140 | 140 | protected function getConfig() |
141 | 141 | { |
142 | - $conf = $this->config->get( 'shop' ); |
|
142 | + $conf = $this->config->get('shop'); |
|
143 | 143 | |
144 | - $configPaths = app( '\Aimeos\Shop\Base\Aimeos' )->get()->getConfigPaths( 'mysql' ); |
|
145 | - $config = new \Aimeos\MW\Config\PHPArray( $conf, $configPaths ); |
|
144 | + $configPaths = app('\Aimeos\Shop\Base\Aimeos')->get()->getConfigPaths('mysql'); |
|
145 | + $config = new \Aimeos\MW\Config\PHPArray($conf, $configPaths); |
|
146 | 146 | |
147 | - if( function_exists( 'apc_store' ) === true && $this->config->get( 'shop.apc_enabled', false ) == true ) { |
|
148 | - $config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); |
|
147 | + if (function_exists('apc_store') === true && $this->config->get('shop.apc_enabled', false) == true) { |
|
148 | + $config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:')); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | return $config; |
@@ -158,15 +158,15 @@ discard block |
||
158 | 158 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
159 | 159 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
160 | 160 | */ |
161 | - protected function getLocale( \Aimeos\MShop\Context\Item\Iface $context ) |
|
161 | + protected function getLocale(\Aimeos\MShop\Context\Item\Iface $context) |
|
162 | 162 | { |
163 | - if( $this->locale === null ) |
|
163 | + if ($this->locale === null) |
|
164 | 164 | { |
165 | - if( Route::current() !== null ) |
|
165 | + if (Route::current() !== null) |
|
166 | 166 | { |
167 | - $site = Route::input( 'site', 'default' ); |
|
168 | - $lang = Route::input( 'locale', '' ); |
|
169 | - $currency = Route::input( 'currency', '' ); |
|
167 | + $site = Route::input('site', 'default'); |
|
168 | + $lang = Route::input('locale', ''); |
|
169 | + $currency = Route::input('currency', ''); |
|
170 | 170 | } |
171 | 171 | else |
172 | 172 | { |
@@ -174,10 +174,10 @@ discard block |
||
174 | 174 | $lang = $currency = ''; |
175 | 175 | } |
176 | 176 | |
177 | - $disableSites = $this->config->has( 'shop.disableSites' ); |
|
177 | + $disableSites = $this->config->has('shop.disableSites'); |
|
178 | 178 | |
179 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
180 | - $this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites ); |
|
179 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
180 | + $this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites); |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | return $this->locale; |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | return array( |
4 | 4 | 'apc_enabled' => false, |
5 | 5 | 'apc_prefix' => 'laravel:', |
6 | - 'extdir' => ( is_dir(base_path('ext')) ? base_path('ext') : dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'ext' ), |
|
6 | + 'extdir' => (is_dir(base_path('ext')) ? base_path('ext') : dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'ext'), |
|
7 | 7 | 'uploaddir' => '/', |
8 | 8 | |
9 | 9 | 'routes' => array( |
@@ -14,16 +14,16 @@ discard block |
||
14 | 14 | ), |
15 | 15 | |
16 | 16 | 'page' => array( |
17 | - 'account-index' => array( 'account/history','account/favorite','account/watch','basket/mini','catalog/session' ), |
|
18 | - 'basket-index' => array( 'basket/standard','basket/related' ), |
|
19 | - 'catalog-count' => array( 'catalog/count' ), |
|
20 | - 'catalog-detail' => array( 'basket/mini','catalog/stage','catalog/detail','catalog/session' ), |
|
21 | - 'catalog-list' => array( 'basket/mini','catalog/filter','catalog/stage','catalog/lists' ), |
|
22 | - 'catalog-stock' => array( 'catalog/stock' ), |
|
23 | - 'catalog-suggest' => array( 'catalog/suggest' ), |
|
24 | - 'checkout-confirm' => array( 'checkout/confirm' ), |
|
25 | - 'checkout-index' => array( 'checkout/standard' ), |
|
26 | - 'checkout-update' => array( 'checkout/update'), |
|
17 | + 'account-index' => array('account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'), |
|
18 | + 'basket-index' => array('basket/standard', 'basket/related'), |
|
19 | + 'catalog-count' => array('catalog/count'), |
|
20 | + 'catalog-detail' => array('basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'), |
|
21 | + 'catalog-list' => array('basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'), |
|
22 | + 'catalog-stock' => array('catalog/stock'), |
|
23 | + 'catalog-suggest' => array('catalog/suggest'), |
|
24 | + 'checkout-confirm' => array('checkout/confirm'), |
|
25 | + 'checkout-index' => array('checkout/standard'), |
|
26 | + 'checkout-update' => array('checkout/update'), |
|
27 | 27 | ), |
28 | 28 | |
29 | 29 | 'resource' => array( |
@@ -34,19 +34,19 @@ discard block |
||
34 | 34 | 'database' => env('DB_DATABASE', 'laravel'), |
35 | 35 | 'username' => env('DB_USERNAME', 'root'), |
36 | 36 | 'password' => env('DB_PASSWORD', ''), |
37 | - 'stmt' => array( "SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'" ), |
|
37 | + 'stmt' => array("SET NAMES 'utf8'", "SET SESSION sql_mode='ANSI'"), |
|
38 | 38 | 'opt-persistent' => 0, |
39 | 39 | 'limit' => 2, |
40 | 40 | ), |
41 | 41 | 'fs' => array( |
42 | 42 | 'adapter' => 'Standard', |
43 | 43 | 'basedir' => public_path(), |
44 | - 'tempdir' => storage_path( 'aimeos' ), |
|
44 | + 'tempdir' => storage_path('aimeos'), |
|
45 | 45 | ), |
46 | 46 | 'fs-admin' => array( |
47 | 47 | 'adapter' => 'Standard', |
48 | - 'basedir' => public_path( 'uploads' ), |
|
49 | - 'tempdir' => storage_path( 'aimeos' ), |
|
48 | + 'basedir' => public_path('uploads'), |
|
49 | + 'tempdir' => storage_path('aimeos'), |
|
50 | 50 | ), |
51 | 51 | /* 'fs-media' => array( |
52 | 52 | 'adapter' => 'Standard', |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | 'default' => array( |
192 | 192 | 'mimeicon' => array( |
193 | 193 | # Directory where icons for the mime types stored |
194 | - 'directory' => public_path( '/packages/aimeos/shop/mimeicons' ), |
|
194 | + 'directory' => public_path('/packages/aimeos/shop/mimeicons'), |
|
195 | 195 | # File extension of mime type icons |
196 | 196 | 'extension' => '.png' |
197 | 197 | ), |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | # in the "maxwidth" parameter |
235 | 235 | # maxheight: 280 |
236 | 236 | ), |
237 | - 'tempdir' => storage_path( 'aimeos' ), |
|
237 | + 'tempdir' => storage_path('aimeos'), |
|
238 | 238 | ), |
239 | 239 | ), |
240 | 240 | 'product' => array( |
@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | * @param \Aimeos\Shop\Base\Context $context Context object |
48 | 48 | * @param \Aimeos\Shop\Base\View $view View object |
49 | 49 | */ |
50 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, |
|
51 | - \Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view ) |
|
50 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, |
|
51 | + \Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, \Aimeos\Shop\Base\View $view) |
|
52 | 52 | { |
53 | 53 | $this->config = $config; |
54 | 54 | $this->aimeos = $aimeos; |
@@ -63,23 +63,23 @@ discard block |
||
63 | 63 | * @param string $pageName Name of the configured page |
64 | 64 | * @return array Associative list with body and header output separated by client name |
65 | 65 | */ |
66 | - public function getSections( $pageName ) |
|
66 | + public function getSections($pageName) |
|
67 | 67 | { |
68 | 68 | $context = $this->context->get(); |
69 | 69 | $langid = $context->getLocale()->getLanguageId(); |
70 | - $tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' ); |
|
71 | - $view = $this->view->create( $context->getConfig(), $tmplPaths, $langid ); |
|
72 | - $context->setView( $view ); |
|
70 | + $tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates'); |
|
71 | + $view = $this->view->create($context->getConfig(), $tmplPaths, $langid); |
|
72 | + $context->setView($view); |
|
73 | 73 | |
74 | - $pagesConfig = $this->config->get( 'shop.page', array() ); |
|
75 | - $result = array( 'aibody' => array(), 'aiheader' => array() ); |
|
74 | + $pagesConfig = $this->config->get('shop.page', array()); |
|
75 | + $result = array('aibody' => array(), 'aiheader' => array()); |
|
76 | 76 | |
77 | - if( isset( $pagesConfig[$pageName] ) ) |
|
77 | + if (isset($pagesConfig[$pageName])) |
|
78 | 78 | { |
79 | - foreach( (array) $pagesConfig[$pageName] as $clientName ) |
|
79 | + foreach ((array) $pagesConfig[$pageName] as $clientName) |
|
80 | 80 | { |
81 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName ); |
|
82 | - $client->setView( clone $view ); |
|
81 | + $client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName); |
|
82 | + $client->setView(clone $view); |
|
83 | 83 | $client->process(); |
84 | 84 | |
85 | 85 | $result['aibody'][$clientName] = $client->getBody(); |
@@ -29,7 +29,6 @@ discard block |
||
29 | 29 | * Returns the HTML code for a copy of a resource object |
30 | 30 | * |
31 | 31 | * @param string Resource location, e.g. "product" |
32 | - * @param string $sitecode Unique site code |
|
33 | 32 | * @param integer $id Unique resource ID |
34 | 33 | * @return string Generated output |
35 | 34 | */ |
@@ -51,7 +50,6 @@ discard block |
||
51 | 50 | * Returns the HTML code for a new resource object |
52 | 51 | * |
53 | 52 | * @param string Resource location, e.g. "product" |
54 | - * @param string $sitecode Unique site code |
|
55 | 53 | * @return string Generated output |
56 | 54 | */ |
57 | 55 | public function createAction( $site = 'default', $resource ) |
@@ -72,7 +70,6 @@ discard block |
||
72 | 70 | * Deletes the resource object or a list of resource objects |
73 | 71 | * |
74 | 72 | * @param string Resource location, e.g. "product" |
75 | - * @param string $sitecode Unique site code |
|
76 | 73 | * @param integer $id Unique resource ID |
77 | 74 | * @return string Generated output |
78 | 75 | */ |
@@ -94,7 +91,6 @@ discard block |
||
94 | 91 | * Returns the HTML code for the requested resource object |
95 | 92 | * |
96 | 93 | * @param string Resource location, e.g. "product" |
97 | - * @param string $sitecode Unique site code |
|
98 | 94 | * @param integer $id Unique resource ID |
99 | 95 | * @return string Generated output |
100 | 96 | */ |
@@ -116,7 +112,6 @@ discard block |
||
116 | 112 | * Saves a new resource object |
117 | 113 | * |
118 | 114 | * @param string Resource location, e.g. "product" |
119 | - * @param string $sitecode Unique site code |
|
120 | 115 | * @return string Generated output |
121 | 116 | */ |
122 | 117 | public function saveAction( $site = 'default', $resource ) |
@@ -137,7 +132,6 @@ discard block |
||
137 | 132 | * Returns the HTML code for a list of resource objects |
138 | 133 | * |
139 | 134 | * @param string Resource location, e.g. "product" |
140 | - * @param string $sitecode Unique site code |
|
141 | 135 | * @return string Generated output |
142 | 136 | */ |
143 | 137 | public function searchAction( $site = 'default', $resource ) |
@@ -158,7 +152,7 @@ discard block |
||
158 | 152 | * Returns the resource controller |
159 | 153 | * |
160 | 154 | * @param string $sitecode Unique site code |
161 | - * @return \Aimeos\MShop\Context\Item\Iface Context item |
|
155 | + * @return \Aimeos\Admin\JQAdm\Iface Context item |
|
162 | 156 | */ |
163 | 157 | protected function createClient( $sitecode, $resource ) |
164 | 158 | { |
@@ -34,16 +34,16 @@ discard block |
||
34 | 34 | * @param integer $id Unique resource ID |
35 | 35 | * @return string Generated output |
36 | 36 | */ |
37 | - public function copyAction( $site = 'default', $resource, $id ) |
|
37 | + public function copyAction($site = 'default', $resource, $id) |
|
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 | - $cntl = $this->createClient( $site, $resource ); |
|
44 | - $content = $cntl->copy( $id ); |
|
43 | + $cntl = $this->createClient($site, $resource); |
|
44 | + $content = $cntl->copy($id); |
|
45 | 45 | |
46 | - return View::make('shop::admin.jqadm', array( 'content' => $content, 'site' => $site ) ); |
|
46 | + return View::make('shop::admin.jqadm', array('content' => $content, 'site' => $site)); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
@@ -54,16 +54,16 @@ discard block |
||
54 | 54 | * @param string $sitecode Unique site code |
55 | 55 | * @return string Generated output |
56 | 56 | */ |
57 | - public function createAction( $site = 'default', $resource ) |
|
57 | + public function createAction($site = 'default', $resource) |
|
58 | 58 | { |
59 | - if( config( 'shop.authorize', true ) ) { |
|
60 | - $this->authorize( 'admin' ); |
|
59 | + if (config('shop.authorize', true)) { |
|
60 | + $this->authorize('admin'); |
|
61 | 61 | } |
62 | 62 | |
63 | - $cntl = $this->createClient( $site, $resource ); |
|
63 | + $cntl = $this->createClient($site, $resource); |
|
64 | 64 | $content = $cntl->create(); |
65 | 65 | |
66 | - return View::make('shop::admin.jqadm', array( 'content' => $content, 'site' => $site ) ); |
|
66 | + return View::make('shop::admin.jqadm', array('content' => $content, 'site' => $site)); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | |
@@ -75,16 +75,16 @@ discard block |
||
75 | 75 | * @param integer $id Unique resource ID |
76 | 76 | * @return string Generated output |
77 | 77 | */ |
78 | - public function deleteAction( $site = 'default', $resource, $id ) |
|
78 | + public function deleteAction($site = 'default', $resource, $id) |
|
79 | 79 | { |
80 | - if( config( 'shop.authorize', true ) ) { |
|
81 | - $this->authorize( 'admin' ); |
|
80 | + if (config('shop.authorize', true)) { |
|
81 | + $this->authorize('admin'); |
|
82 | 82 | } |
83 | 83 | |
84 | - $cntl = $this->createClient( $site, $resource ); |
|
85 | - $content = $cntl->delete( $id ) . $cntl->search(); |
|
84 | + $cntl = $this->createClient($site, $resource); |
|
85 | + $content = $cntl->delete($id) . $cntl->search(); |
|
86 | 86 | |
87 | - return View::make('shop::admin.jqadm', array( 'content' => $content, 'site' => $site ) ); |
|
87 | + return View::make('shop::admin.jqadm', array('content' => $content, 'site' => $site)); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | |
@@ -96,16 +96,16 @@ discard block |
||
96 | 96 | * @param integer $id Unique resource ID |
97 | 97 | * @return string Generated output |
98 | 98 | */ |
99 | - public function getAction( $site = 'default', $resource, $id ) |
|
99 | + public function getAction($site = 'default', $resource, $id) |
|
100 | 100 | { |
101 | - if( config( 'shop.authorize', true ) ) { |
|
102 | - $this->authorize( 'admin' ); |
|
101 | + if (config('shop.authorize', true)) { |
|
102 | + $this->authorize('admin'); |
|
103 | 103 | } |
104 | 104 | |
105 | - $cntl = $this->createClient( $site, $resource ); |
|
106 | - $content = $cntl->get( $id ); |
|
105 | + $cntl = $this->createClient($site, $resource); |
|
106 | + $content = $cntl->get($id); |
|
107 | 107 | |
108 | - return View::make('shop::admin.jqadm', array( 'content' => $content, 'site' => $site ) ); |
|
108 | + return View::make('shop::admin.jqadm', array('content' => $content, 'site' => $site)); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | |
@@ -116,16 +116,16 @@ discard block |
||
116 | 116 | * @param string $sitecode Unique site code |
117 | 117 | * @return string Generated output |
118 | 118 | */ |
119 | - public function saveAction( $site = 'default', $resource ) |
|
119 | + public function saveAction($site = 'default', $resource) |
|
120 | 120 | { |
121 | - if( config( 'shop.authorize', true ) ) { |
|
122 | - $this->authorize( 'admin' ); |
|
121 | + if (config('shop.authorize', true)) { |
|
122 | + $this->authorize('admin'); |
|
123 | 123 | } |
124 | 124 | |
125 | - $cntl = $this->createClient( $site, $resource ); |
|
126 | - $content = ( $cntl->save() ? : $cntl->search() ); |
|
125 | + $cntl = $this->createClient($site, $resource); |
|
126 | + $content = ($cntl->save() ?: $cntl->search()); |
|
127 | 127 | |
128 | - return View::make('shop::admin.jqadm', array( 'content' => $content, 'site' => $site ) ); |
|
128 | + return View::make('shop::admin.jqadm', array('content' => $content, 'site' => $site)); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | |
@@ -136,16 +136,16 @@ discard block |
||
136 | 136 | * @param string $sitecode Unique site code |
137 | 137 | * @return string Generated output |
138 | 138 | */ |
139 | - public function searchAction( $site = 'default', $resource ) |
|
139 | + public function searchAction($site = 'default', $resource) |
|
140 | 140 | { |
141 | - if( config( 'shop.authorize', true ) ) { |
|
142 | - $this->authorize( 'admin' ); |
|
141 | + if (config('shop.authorize', true)) { |
|
142 | + $this->authorize('admin'); |
|
143 | 143 | } |
144 | 144 | |
145 | - $cntl = $this->createClient( $site, $resource ); |
|
145 | + $cntl = $this->createClient($site, $resource); |
|
146 | 146 | $content = $cntl->search(); |
147 | 147 | |
148 | - return View::make('shop::admin.jqadm', array( 'content' => $content, 'site' => $site ) ); |
|
148 | + return View::make('shop::admin.jqadm', array('content' => $content, 'site' => $site)); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | |
@@ -155,19 +155,19 @@ discard block |
||
155 | 155 | * @param string $sitecode Unique site code |
156 | 156 | * @return \Aimeos\MShop\Context\Item\Iface Context item |
157 | 157 | */ |
158 | - protected function createClient( $sitecode, $resource ) |
|
158 | + protected function createClient($sitecode, $resource) |
|
159 | 159 | { |
160 | - $lang = Input::get( 'lang', config( 'app.locale', 'en' ) ); |
|
160 | + $lang = Input::get('lang', config('app.locale', 'en')); |
|
161 | 161 | |
162 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
163 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' ); |
|
162 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
163 | + $templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates'); |
|
164 | 164 | |
165 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
166 | - $context = $this->setLocale( $context, $sitecode, $lang ); |
|
165 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
166 | + $context = $this->setLocale($context, $sitecode, $lang); |
|
167 | 167 | |
168 | - $view = app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), $templatePaths, $lang ); |
|
169 | - $context->setView( $view ); |
|
168 | + $view = app('\Aimeos\Shop\Base\View')->create($context->getConfig(), $templatePaths, $lang); |
|
169 | + $context->setView($view); |
|
170 | 170 | |
171 | - return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource ); |
|
171 | + return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource); |
|
172 | 172 | } |
173 | 173 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * |
30 | 30 | * @param \Aimeos\Shop\Base\Context $context Context object |
31 | 31 | */ |
32 | - public function __construct( \Aimeos\Shop\Base\Context $context ) |
|
32 | + public function __construct(\Aimeos\Shop\Base\Context $context) |
|
33 | 33 | { |
34 | 34 | $this->context = $context; |
35 | 35 | } |
@@ -42,21 +42,21 @@ discard block |
||
42 | 42 | * @param string $groupcode Unique user/customer group code |
43 | 43 | * @return boolean True if user is part of the group, false if not |
44 | 44 | */ |
45 | - public function checkGroup( $userid, $groupcode ) |
|
45 | + public function checkGroup($userid, $groupcode) |
|
46 | 46 | { |
47 | 47 | $context = $this->context->get(); |
48 | - $group = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' )->findItem( $groupcode ); |
|
49 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' ); |
|
48 | + $group = \Aimeos\MShop\Factory::createManager($context, 'customer/group')->findItem($groupcode); |
|
49 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists'); |
|
50 | 50 | |
51 | 51 | $search = $manager->createSearch(); |
52 | 52 | $expr = array( |
53 | - $search->compare( '==', 'customer.lists.parentid', $userid ), |
|
54 | - $search->compare( '==', 'customer.lists.refid', $group->getId() ), |
|
55 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), |
|
53 | + $search->compare('==', 'customer.lists.parentid', $userid), |
|
54 | + $search->compare('==', 'customer.lists.refid', $group->getId()), |
|
55 | + $search->compare('==', 'customer.lists.domain', 'customer/group'), |
|
56 | 56 | ); |
57 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
58 | - $search->setSlice( 0, 1 ); |
|
57 | + $search->setConditions($search->combine('&&', $expr)); |
|
58 | + $search->setSlice(0, 1); |
|
59 | 59 | |
60 | - return (bool) count( $manager->searchItems( $search ) ); |
|
60 | + return (bool) count($manager->searchItems($search)); |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | \ No newline at end of file |
@@ -135,7 +135,7 @@ |
||
135 | 135 | * Creates a list of all available translations. |
136 | 136 | * |
137 | 137 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
138 | - * @return array List of language IDs with labels |
|
138 | + * @return string List of language IDs with labels |
|
139 | 139 | */ |
140 | 140 | protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context ) |
141 | 141 | { |
@@ -34,53 +34,53 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function indexAction() |
36 | 36 | { |
37 | - if( config( 'shop.authorize', true ) ) { |
|
38 | - $this->authorize( 'admin' ); |
|
37 | + if (config('shop.authorize', true)) { |
|
38 | + $this->authorize('admin'); |
|
39 | 39 | } |
40 | 40 | |
41 | - $site = Route::input( 'site', 'default' ); |
|
42 | - $lang = Input::get( 'lang', config( 'app.locale', 'en' ) ); |
|
41 | + $site = Route::input('site', 'default'); |
|
42 | + $lang = Input::get('lang', config('app.locale', 'en')); |
|
43 | 43 | |
44 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
45 | - $cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' ); |
|
44 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
45 | + $cntlPaths = $aimeos->getCustomPaths('controller/extjs'); |
|
46 | 46 | |
47 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
48 | - $context = $this->setLocale( $context, $site, $lang ); |
|
47 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
48 | + $context = $this->setLocale($context, $site, $lang); |
|
49 | 49 | |
50 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
50 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
51 | 51 | $cssFiles = array(); |
52 | 52 | |
53 | - foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
53 | + foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths) |
|
54 | 54 | { |
55 | - foreach( $paths as $path ) |
|
55 | + foreach ($paths as $path) |
|
56 | 56 | { |
57 | 57 | $jsbAbsPath = $base . '/' . $path; |
58 | 58 | |
59 | - if( !is_file( $jsbAbsPath ) ) { |
|
60 | - throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) ); |
|
59 | + if (!is_file($jsbAbsPath)) { |
|
60 | + throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath)); |
|
61 | 61 | } |
62 | 62 | |
63 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) ); |
|
64 | - $cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) ); |
|
63 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path)); |
|
64 | + $cssFiles = array_merge($cssFiles, $jsb2->getUrls('css')); |
|
65 | 65 | } |
66 | 66 | } |
67 | 67 | |
68 | - $adminUrl = route( 'aimeos_shop_extadm', array( 'site' => '%site%', 'lang' => '%lang%', 'tab' => '%tab%' ) ); |
|
69 | - $jsonUrl = route( 'aimeos_shop_extadm_json', array( 'site' => $site, '_token' => csrf_token() ) ); |
|
68 | + $adminUrl = route('aimeos_shop_extadm', array('site' => '%site%', 'lang' => '%lang%', 'tab' => '%tab%')); |
|
69 | + $jsonUrl = route('aimeos_shop_extadm_json', array('site' => $site, '_token' => csrf_token())); |
|
70 | 70 | |
71 | 71 | $vars = array( |
72 | 72 | 'lang' => $lang, |
73 | 73 | 'cssFiles' => $cssFiles, |
74 | - 'languages' => $this->getJsonLanguages( $context), |
|
75 | - 'config' => $this->getJsonClientConfig( $context ), |
|
76 | - 'site' => $this->getJsonSiteItem( $context, Input::get( 'site', 'default' ) ), |
|
77 | - 'i18nContent' => $this->getJsonClientI18n( $aimeos->getI18nPaths(), $lang ), |
|
74 | + 'languages' => $this->getJsonLanguages($context), |
|
75 | + 'config' => $this->getJsonClientConfig($context), |
|
76 | + 'site' => $this->getJsonSiteItem($context, Input::get('site', 'default')), |
|
77 | + 'i18nContent' => $this->getJsonClientI18n($aimeos->getI18nPaths(), $lang), |
|
78 | 78 | 'searchSchemas' => $controller->getJsonSearchSchemas(), |
79 | 79 | 'itemSchemas' => $controller->getJsonItemSchemas(), |
80 | - 'smd' => $controller->getJsonSmd( $jsonUrl ), |
|
81 | - 'urlTemplate' => urldecode( $adminUrl ), |
|
82 | - 'uploaddir' => config( 'shop::uploaddir' ), |
|
83 | - 'activeTab' => Input::get( 'tab', 0 ), |
|
80 | + 'smd' => $controller->getJsonSmd($jsonUrl), |
|
81 | + 'urlTemplate' => urldecode($adminUrl), |
|
82 | + 'uploaddir' => config('shop::uploaddir'), |
|
83 | + 'activeTab' => Input::get('tab', 0), |
|
84 | 84 | 'version' => $this->getVersion(), |
85 | 85 | ); |
86 | 86 | |
@@ -95,20 +95,20 @@ discard block |
||
95 | 95 | */ |
96 | 96 | public function doAction() |
97 | 97 | { |
98 | - if( config( 'shop.authorize', true ) ) { |
|
99 | - $this->authorize( 'admin' ); |
|
98 | + if (config('shop.authorize', true)) { |
|
99 | + $this->authorize('admin'); |
|
100 | 100 | } |
101 | 101 | |
102 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
103 | - $cntlPaths = $aimeos->getCustomPaths( 'controller/extjs' ); |
|
102 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
103 | + $cntlPaths = $aimeos->getCustomPaths('controller/extjs'); |
|
104 | 104 | |
105 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
106 | - $context = $this->setLocale( $context ); |
|
105 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
106 | + $context = $this->setLocale($context); |
|
107 | 107 | |
108 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
108 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
109 | 109 | |
110 | - $response = $controller->process( Input::instance()->request->all(), 'php://input' ); |
|
111 | - return View::make('shop::admin.extadm-do', array( 'output' => $response )); |
|
110 | + $response = $controller->process(Input::instance()->request->all(), 'php://input'); |
|
111 | + return View::make('shop::admin.extadm-do', array('output' => $response)); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | |
@@ -119,32 +119,32 @@ discard block |
||
119 | 119 | */ |
120 | 120 | public function fileAction() |
121 | 121 | { |
122 | - if( config( 'shop.authorize', true ) ) { |
|
123 | - $this->authorize( 'admin' ); |
|
122 | + if (config('shop.authorize', true)) { |
|
123 | + $this->authorize('admin'); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | $contents = ''; |
127 | 127 | $jsFiles = array(); |
128 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
128 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
129 | 129 | |
130 | - foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
130 | + foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths) |
|
131 | 131 | { |
132 | - foreach( $paths as $path ) |
|
132 | + foreach ($paths as $path) |
|
133 | 133 | { |
134 | 134 | $jsbAbsPath = $base . '/' . $path; |
135 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
136 | - $jsFiles = array_merge( $jsFiles, $jsb2->getUrls( 'js', '' ) ); |
|
135 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
136 | + $jsFiles = array_merge($jsFiles, $jsb2->getUrls('js', '')); |
|
137 | 137 | } |
138 | 138 | } |
139 | 139 | |
140 | - foreach( $jsFiles as $file ) |
|
140 | + foreach ($jsFiles as $file) |
|
141 | 141 | { |
142 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
142 | + if (($content = file_get_contents($file)) !== false) { |
|
143 | 143 | $contents .= $content; |
144 | 144 | } |
145 | 145 | } |
146 | 146 | |
147 | - return response( $contents )->header( 'Content-Type', 'application/javascript' ); |
|
147 | + return response($contents)->header('Content-Type', 'application/javascript'); |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | |
@@ -154,30 +154,30 @@ discard block |
||
154 | 154 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
155 | 155 | * @return array List of language IDs with labels |
156 | 156 | */ |
157 | - protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context ) |
|
157 | + protected function getJsonLanguages(\Aimeos\MShop\Context\Item\Iface $context) |
|
158 | 158 | { |
159 | - $paths = app( '\Aimeos\Shop\Base\Aimeos' )->get()->getI18nPaths(); |
|
159 | + $paths = app('\Aimeos\Shop\Base\Aimeos')->get()->getI18nPaths(); |
|
160 | 160 | $langs = array(); |
161 | 161 | |
162 | - if( !isset( $paths['admin'] ) ) { |
|
163 | - return json_encode( array() ); |
|
162 | + if (!isset($paths['admin'])) { |
|
163 | + return json_encode(array()); |
|
164 | 164 | } |
165 | 165 | |
166 | - foreach( $paths['admin'] as $path ) |
|
166 | + foreach ($paths['admin'] as $path) |
|
167 | 167 | { |
168 | - $iter = new \DirectoryIterator( $path ); |
|
168 | + $iter = new \DirectoryIterator($path); |
|
169 | 169 | |
170 | - foreach( $iter as $file ) |
|
170 | + foreach ($iter as $file) |
|
171 | 171 | { |
172 | 172 | $name = $file->getFilename(); |
173 | 173 | |
174 | - if( preg_match('/^[a-z]{2,3}(_[A-Z]{2})?$/', $name ) ) { |
|
174 | + if (preg_match('/^[a-z]{2,3}(_[A-Z]{2})?$/', $name)) { |
|
175 | 175 | $langs[$name] = null; |
176 | 176 | } |
177 | 177 | } |
178 | 178 | } |
179 | 179 | |
180 | - return json_encode( $this->getLanguages( $context, array_keys( $langs ) ) ); |
|
180 | + return json_encode($this->getLanguages($context, array_keys($langs))); |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | |
@@ -187,10 +187,10 @@ discard block |
||
187 | 187 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item object |
188 | 188 | * @return string JSON encoded configuration object |
189 | 189 | */ |
190 | - protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context ) |
|
190 | + protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context) |
|
191 | 191 | { |
192 | - $config = $context->getConfig()->get( 'admin/extjs', array() ); |
|
193 | - return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT ); |
|
192 | + $config = $context->getConfig()->get('admin/extjs', array()); |
|
193 | + return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT); |
|
194 | 194 | } |
195 | 195 | |
196 | 196 | |
@@ -201,16 +201,16 @@ discard block |
||
201 | 201 | * @param string $lang ISO language code like "en" or "en_GB" |
202 | 202 | * @return string JSON encoded translation object |
203 | 203 | */ |
204 | - protected function getJsonClientI18n( array $i18nPaths, $lang ) |
|
204 | + protected function getJsonClientI18n(array $i18nPaths, $lang) |
|
205 | 205 | { |
206 | - $i18n = new \Aimeos\MW\Translation\Zend2( $i18nPaths, 'gettext', $lang, array( 'disableNotices' => true ) ); |
|
206 | + $i18n = new \Aimeos\MW\Translation\Zend2($i18nPaths, 'gettext', $lang, array('disableNotices' => true)); |
|
207 | 207 | |
208 | 208 | $content = array( |
209 | - 'admin' => $i18n->getAll( 'admin' ), |
|
210 | - 'admin/ext' => $i18n->getAll( 'admin/ext' ), |
|
209 | + 'admin' => $i18n->getAll('admin'), |
|
210 | + 'admin/ext' => $i18n->getAll('admin/ext'), |
|
211 | 211 | ); |
212 | 212 | |
213 | - return json_encode( $content, JSON_FORCE_OBJECT ); |
|
213 | + return json_encode($content, JSON_FORCE_OBJECT); |
|
214 | 214 | } |
215 | 215 | |
216 | 216 | |
@@ -222,19 +222,19 @@ discard block |
||
222 | 222 | * @return string JSON encoded site item object |
223 | 223 | * @throws Exception If no site item was found for the code |
224 | 224 | */ |
225 | - protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
225 | + protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
226 | 226 | { |
227 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
227 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
228 | 228 | |
229 | 229 | $criteria = $manager->createSearch(); |
230 | - $criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) ); |
|
231 | - $items = $manager->searchItems( $criteria ); |
|
230 | + $criteria->setConditions($criteria->compare('==', 'locale.site.code', $site)); |
|
231 | + $items = $manager->searchItems($criteria); |
|
232 | 232 | |
233 | - if( ( $item = reset( $items ) ) === false ) { |
|
234 | - throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) ); |
|
233 | + if (($item = reset($items)) === false) { |
|
234 | + throw new \Exception(sprintf('No site found for code "%1$s"', $site)); |
|
235 | 235 | } |
236 | 236 | |
237 | - return json_encode( $item->toArray() ); |
|
237 | + return json_encode($item->toArray()); |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | |
@@ -245,18 +245,18 @@ discard block |
||
245 | 245 | * @param array $langIds List of language IDs |
246 | 246 | * @return array List of associative lists with "id" and "label" as keys |
247 | 247 | */ |
248 | - protected function getLanguages( \Aimeos\MShop\Context\Item\Iface $context, array $langIds ) |
|
248 | + protected function getLanguages(\Aimeos\MShop\Context\Item\Iface $context, array $langIds) |
|
249 | 249 | { |
250 | - $languageManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/language' ); |
|
250 | + $languageManager = \Aimeos\MShop\Factory::createManager($context, 'locale/language'); |
|
251 | 251 | $result = array(); |
252 | 252 | |
253 | 253 | $search = $languageManager->createSearch(); |
254 | - $search->setConditions( $search->compare('==', 'locale.language.id', $langIds ) ); |
|
255 | - $search->setSortations( array( $search->sort( '-', 'locale.language.status' ), $search->sort( '+', 'locale.language.label' ) ) ); |
|
256 | - $langItems = $languageManager->searchItems( $search ); |
|
254 | + $search->setConditions($search->compare('==', 'locale.language.id', $langIds)); |
|
255 | + $search->setSortations(array($search->sort('-', 'locale.language.status'), $search->sort('+', 'locale.language.label'))); |
|
256 | + $langItems = $languageManager->searchItems($search); |
|
257 | 257 | |
258 | - foreach( $langItems as $id => $item ) { |
|
259 | - $result[] = array( 'id' => $id, 'label' => $item->getLabel() ); |
|
258 | + foreach ($langItems as $id => $item) { |
|
259 | + $result[] = array('id' => $id, 'label' => $item->getLabel()); |
|
260 | 260 | } |
261 | 261 | |
262 | 262 | return $result; |
@@ -271,17 +271,17 @@ discard block |
||
271 | 271 | * @param string $locale ISO language code, e.g. "en" or "en_GB" |
272 | 272 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
273 | 273 | */ |
274 | - protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null ) |
|
274 | + protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null) |
|
275 | 275 | { |
276 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
276 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
277 | 277 | |
278 | 278 | try { |
279 | - $localeItem = $localeManager->bootstrap( $sitecode, $locale, '', false ); |
|
280 | - } catch( \Aimeos\MShop\Locale\Exception $e ) { |
|
279 | + $localeItem = $localeManager->bootstrap($sitecode, $locale, '', false); |
|
280 | + } catch (\Aimeos\MShop\Locale\Exception $e) { |
|
281 | 281 | $localeItem = $localeManager->createItem(); |
282 | 282 | } |
283 | 283 | |
284 | - $context->setLocale( $localeItem ); |
|
284 | + $context->setLocale($localeItem); |
|
285 | 285 | |
286 | 286 | return $context; |
287 | 287 | } |