| @@ -39,8 +39,7 @@ | ||
| 39 | 39 | |
| 40 | 40 |  			$i18n = app('\Aimeos\Shop\Base\I18n')->get( array( $locale ) ); | 
| 41 | 41 | $translation = $i18n[$locale]; | 
| 42 | - } | |
| 43 | - else | |
| 42 | + } else | |
| 44 | 43 |  		{ | 
| 45 | 44 | $translation = new \Aimeos\MW\Translation\None( 'en' ); | 
| 46 | 45 | } | 
| @@ -41,7 +41,7 @@ discard block | ||
| 41 | 41 | * @param \Aimeos\Shop\Base\I18n $i18n I18n object | 
| 42 | 42 | * @param \Aimeos\Shop\Base\Support $support Support object | 
| 43 | 43 | */ | 
| 44 | - public function __construct( \Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support ) | |
| 44 | + public function __construct(\Aimeos\Shop\Base\I18n $i18n, \Aimeos\Shop\Base\Support $support) | |
| 45 | 45 |  	{ | 
| 46 | 46 | $this->i18n = $i18n; | 
| 47 | 47 | $this->support = $support; | 
| @@ -56,20 +56,20 @@ discard block | ||
| 56 | 56 | * @param string|null $locale Code of the current language or null for no translation | 
| 57 | 57 | * @return \Aimeos\MW\View\Iface View object | 
| 58 | 58 | */ | 
| 59 | - public function create( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null ) | |
| 59 | + public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null) | |
| 60 | 60 |  	{ | 
| 61 | 61 | $config = $context->getConfig(); | 
| 62 | - $view = new \Aimeos\MW\View\Standard( $templatePaths ); | |
| 63 | - | |
| 64 | - $this->addCsrf( $view ); | |
| 65 | - $this->addAccess( $view, $context ); | |
| 66 | - $this->addConfig( $view, $config ); | |
| 67 | - $this->addNumber( $view, $config ); | |
| 68 | - $this->addParam( $view ); | |
| 69 | - $this->addRequest( $view ); | |
| 70 | - $this->addResponse( $view ); | |
| 71 | - $this->addTranslate( $view, $locale ); | |
| 72 | - $this->addUrl( $view ); | |
| 62 | + $view = new \Aimeos\MW\View\Standard($templatePaths); | |
| 63 | + | |
| 64 | + $this->addCsrf($view); | |
| 65 | + $this->addAccess($view, $context); | |
| 66 | + $this->addConfig($view, $config); | |
| 67 | + $this->addNumber($view, $config); | |
| 68 | + $this->addParam($view); | |
| 69 | + $this->addRequest($view); | |
| 70 | + $this->addResponse($view); | |
| 71 | + $this->addTranslate($view, $locale); | |
| 72 | + $this->addUrl($view); | |
| 73 | 73 | |
| 74 | 74 | return $view; | 
| 75 | 75 | } | 
| @@ -82,16 +82,16 @@ discard block | ||
| 82 | 82 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object | 
| 83 | 83 | * @return \Aimeos\MW\View\Iface Modified view object | 
| 84 | 84 | */ | 
| 85 | - protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context ) | |
| 85 | + protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context) | |
| 86 | 86 |  	{ | 
| 87 | 87 | $support = $this->support; | 
| 88 | 88 | |
| 89 | -		$fcn = function() use ( $support, $context ) { | |
| 90 | - return $support->getGroups( $context ); | |
| 89 | +		$fcn = function() use ($support, $context) { | |
| 90 | + return $support->getGroups($context); | |
| 91 | 91 | }; | 
| 92 | 92 | |
| 93 | - $helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn ); | |
| 94 | - $view->addHelper( 'access', $helper ); | |
| 93 | + $helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn); | |
| 94 | +		$view->addHelper('access', $helper); | |
| 95 | 95 | |
| 96 | 96 | return $view; | 
| 97 | 97 | } | 
| @@ -104,11 +104,11 @@ discard block | ||
| 104 | 104 | * @param \Aimeos\MW\Config\Iface $config Configuration object | 
| 105 | 105 | * @return \Aimeos\MW\View\Iface Modified view object | 
| 106 | 106 | */ | 
| 107 | - protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) | |
| 107 | + protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) | |
| 108 | 108 |  	{ | 
| 109 | - $config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) ); | |
| 110 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); | |
| 111 | - $view->addHelper( 'config', $helper ); | |
| 109 | +		$config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client')); | |
| 110 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); | |
| 111 | +		$view->addHelper('config', $helper); | |
| 112 | 112 | |
| 113 | 113 | return $view; | 
| 114 | 114 | } | 
| @@ -120,10 +120,10 @@ discard block | ||
| 120 | 120 | * @param \Aimeos\MW\View\Iface $view View object | 
| 121 | 121 | * @return \Aimeos\MW\View\Iface Modified view object | 
| 122 | 122 | */ | 
| 123 | - protected function addCsrf( \Aimeos\MW\View\Iface $view ) | |
| 123 | + protected function addCsrf(\Aimeos\MW\View\Iface $view) | |
| 124 | 124 |  	{ | 
| 125 | - $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() ); | |
| 126 | - $view->addHelper( 'csrf', $helper ); | |
| 125 | + $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token()); | |
| 126 | +		$view->addHelper('csrf', $helper); | |
| 127 | 127 | |
| 128 | 128 | return $view; | 
| 129 | 129 | } | 
| @@ -136,14 +136,14 @@ discard block | ||
| 136 | 136 | * @param \Aimeos\MW\Config\Iface $config Configuration object | 
| 137 | 137 | * @return \Aimeos\MW\View\Iface Modified view object | 
| 138 | 138 | */ | 
| 139 | - protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config ) | |
| 139 | + protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config) | |
| 140 | 140 |  	{ | 
| 141 | - $sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' ); | |
| 142 | - $sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' ); | |
| 143 | - $decimals = $config->get( 'client/html/common/format/decimals', 2 ); | |
| 141 | +		$sepDec = $config->get('client/html/common/format/separatorDecimal', '.'); | |
| 142 | +		$sep1000 = $config->get('client/html/common/format/separator1000', ' '); | |
| 143 | +		$decimals = $config->get('client/html/common/format/decimals', 2); | |
| 144 | 144 | |
| 145 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals ); | |
| 146 | - $view->addHelper( 'number', $helper ); | |
| 145 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals); | |
| 146 | +		$view->addHelper('number', $helper); | |
| 147 | 147 | |
| 148 | 148 | return $view; | 
| 149 | 149 | } | 
| @@ -155,11 +155,11 @@ discard block | ||
| 155 | 155 | * @param \Aimeos\MW\View\Iface $view View object | 
| 156 | 156 | * @return \Aimeos\MW\View\Iface Modified view object | 
| 157 | 157 | */ | 
| 158 | - protected function addParam( \Aimeos\MW\View\Iface $view ) | |
| 158 | + protected function addParam(\Aimeos\MW\View\Iface $view) | |
| 159 | 159 |  	{ | 
| 160 | - $params = ( Route::current() ? Route::current()->parameters() + Input::all() : array() ); | |
| 161 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params ); | |
| 162 | - $view->addHelper( 'param', $helper ); | |
| 160 | + $params = (Route::current() ? Route::current()->parameters() + Input::all() : array()); | |
| 161 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params); | |
| 162 | +		$view->addHelper('param', $helper); | |
| 163 | 163 | |
| 164 | 164 | return $view; | 
| 165 | 165 | } | 
| @@ -171,10 +171,10 @@ discard block | ||
| 171 | 171 | * @param \Aimeos\MW\View\Iface $view View object | 
| 172 | 172 | * @return \Aimeos\MW\View\Iface Modified view object | 
| 173 | 173 | */ | 
| 174 | - protected function addRequest( \Aimeos\MW\View\Iface $view ) | |
| 174 | + protected function addRequest(\Aimeos\MW\View\Iface $view) | |
| 175 | 175 |  	{ | 
| 176 | - $helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() ); | |
| 177 | - $view->addHelper( 'request', $helper ); | |
| 176 | + $helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance()); | |
| 177 | +		$view->addHelper('request', $helper); | |
| 178 | 178 | |
| 179 | 179 | return $view; | 
| 180 | 180 | } | 
| @@ -186,10 +186,10 @@ discard block | ||
| 186 | 186 | * @param \Aimeos\MW\View\Iface $view View object | 
| 187 | 187 | * @return \Aimeos\MW\View\Iface Modified view object | 
| 188 | 188 | */ | 
| 189 | - protected function addResponse( \Aimeos\MW\View\Iface $view ) | |
| 189 | + protected function addResponse(\Aimeos\MW\View\Iface $view) | |
| 190 | 190 |  	{ | 
| 191 | - $helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view ); | |
| 192 | - $view->addHelper( 'response', $helper ); | |
| 191 | + $helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view); | |
| 192 | +		$view->addHelper('response', $helper); | |
| 193 | 193 | |
| 194 | 194 | return $view; | 
| 195 | 195 | } | 
| @@ -202,20 +202,20 @@ discard block | ||
| 202 | 202 | * @param string|null $locale ISO language code, e.g. "de" or "de_CH" | 
| 203 | 203 | * @return \Aimeos\MW\View\Iface Modified view object | 
| 204 | 204 | */ | 
| 205 | - protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale ) | |
| 205 | + protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale) | |
| 206 | 206 |  	{ | 
| 207 | - if( $locale !== null ) | |
| 207 | + if ($locale !== null) | |
| 208 | 208 |  		{ | 
| 209 | - $i18n = $this->i18n->get( array( $locale ) ); | |
| 209 | + $i18n = $this->i18n->get(array($locale)); | |
| 210 | 210 | $translation = $i18n[$locale]; | 
| 211 | 211 | } | 
| 212 | 212 | else | 
| 213 | 213 |  		{ | 
| 214 | - $translation = new \Aimeos\MW\Translation\None( 'en' ); | |
| 214 | +			$translation = new \Aimeos\MW\Translation\None('en'); | |
| 215 | 215 | } | 
| 216 | 216 | |
| 217 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation ); | |
| 218 | - $view->addHelper( 'translate', $helper ); | |
| 217 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation); | |
| 218 | +		$view->addHelper('translate', $helper); | |
| 219 | 219 | |
| 220 | 220 | return $view; | 
| 221 | 221 | } | 
| @@ -227,27 +227,27 @@ discard block | ||
| 227 | 227 | * @param \Aimeos\MW\View\Iface $view View object | 
| 228 | 228 | * @return \Aimeos\MW\View\Iface Modified view object | 
| 229 | 229 | */ | 
| 230 | - protected function addUrl( \Aimeos\MW\View\Iface $view ) | |
| 230 | + protected function addUrl(\Aimeos\MW\View\Iface $view) | |
| 231 | 231 |  	{ | 
| 232 | 232 | $fixed = array(); | 
| 233 | 233 | |
| 234 | - if( Route::current() ) | |
| 234 | + if (Route::current()) | |
| 235 | 235 |  		{ | 
| 236 | -			if( ( $value = Route::input( 'site' ) ) !== null ) { | |
| 236 | +			if (($value = Route::input('site')) !== null) { | |
| 237 | 237 | $fixed['site'] = $value; | 
| 238 | 238 | } | 
| 239 | 239 | |
| 240 | -			if( ( $value = Route::input( 'locale' ) ) !== null ) { | |
| 240 | +			if (($value = Route::input('locale')) !== null) { | |
| 241 | 241 | $fixed['locale'] = $value; | 
| 242 | 242 | } | 
| 243 | 243 | |
| 244 | -			if( ( $value = Route::input( 'currency' ) ) !== null ) { | |
| 244 | +			if (($value = Route::input('currency')) !== null) { | |
| 245 | 245 | $fixed['currency'] = $value; | 
| 246 | 246 | } | 
| 247 | 247 | } | 
| 248 | 248 | |
| 249 | -		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed ); | |
| 250 | - $view->addHelper( 'url', $helper ); | |
| 249 | +		$helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed); | |
| 250 | +		$view->addHelper('url', $helper); | |
| 251 | 251 | |
| 252 | 252 | return $view; | 
| 253 | 253 | } | 
| @@ -22,19 +22,19 @@ | ||
| 22 | 22 | * @param string|array $sites Unique site codes | 
| 23 | 23 | * @return \Aimeos\MShop\Locale\Item\Site\Iface[] List of site items | 
| 24 | 24 | */ | 
| 25 | - protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, $sites ) | |
| 25 | + protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, $sites) | |
| 26 | 26 |  	{ | 
| 27 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); | |
| 27 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); | |
| 28 | 28 | $search = $manager->createSearch(); | 
| 29 | 29 | |
| 30 | -		if( is_scalar( $sites ) && $sites != '' ) { | |
| 31 | - $sites = explode( ' ', $sites ); | |
| 30 | +		if (is_scalar($sites) && $sites != '') { | |
| 31 | +			$sites = explode(' ', $sites); | |
| 32 | 32 | } | 
| 33 | 33 | |
| 34 | -		if( !empty( $sites ) ) { | |
| 35 | - $search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) ); | |
| 34 | +		if (!empty($sites)) { | |
| 35 | +			$search->setConditions($search->compare('==', 'locale.site.code', $sites)); | |
| 36 | 36 | } | 
| 37 | 37 | |
| 38 | - return $manager->searchItems( $search ); | |
| 38 | + return $manager->searchItems($search); | |
| 39 | 39 | } | 
| 40 | 40 | } | 
| 41 | 41 | \ No newline at end of file | 
| @@ -28,7 +28,7 @@ | ||
| 28 | 28 | */ | 
| 29 | 29 | public function indexAction() | 
| 30 | 30 |  	{ | 
| 31 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' ); | |
| 31 | +		$params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index'); | |
| 32 | 32 |  		return \View::make('shop::basket.index', $params); | 
| 33 | 33 | } | 
| 34 | 34 | } | 
| 35 | 35 | \ No newline at end of file | 
| @@ -28,7 +28,7 @@ discard block | ||
| 28 | 28 | */ | 
| 29 | 29 | public function countAction() | 
| 30 | 30 |  	{ | 
| 31 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' ); | |
| 31 | +		$params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count'); | |
| 32 | 32 |  		$contents = \View::make('shop::catalog.count', $params); | 
| 33 | 33 | |
| 34 | 34 | $response = \Response::make($contents, 200); | 
| @@ -45,7 +45,7 @@ discard block | ||
| 45 | 45 | */ | 
| 46 | 46 | public function detailAction() | 
| 47 | 47 |  	{ | 
| 48 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' ); | |
| 48 | +		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail'); | |
| 49 | 49 |  		return \View::make('shop::catalog.detail', $params); | 
| 50 | 50 | } | 
| 51 | 51 | |
| @@ -57,7 +57,7 @@ discard block | ||
| 57 | 57 | */ | 
| 58 | 58 | public function listAction() | 
| 59 | 59 |  	{ | 
| 60 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' ); | |
| 60 | +		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list'); | |
| 61 | 61 |  		return \View::make('shop::catalog.list', $params); | 
| 62 | 62 | } | 
| 63 | 63 | |
| @@ -69,7 +69,7 @@ discard block | ||
| 69 | 69 | */ | 
| 70 | 70 | public function stockAction() | 
| 71 | 71 |  	{ | 
| 72 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' ); | |
| 72 | +		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock'); | |
| 73 | 73 |  		$contents = \View::make('shop::catalog.stock', $params); | 
| 74 | 74 | |
| 75 | 75 | $response = \Response::make($contents, 200); | 
| @@ -86,7 +86,7 @@ discard block | ||
| 86 | 86 | */ | 
| 87 | 87 | public function suggestAction() | 
| 88 | 88 |  	{ | 
| 89 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' ); | |
| 89 | +		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest'); | |
| 90 | 90 |  		$contents = \View::make('shop::catalog.suggest', $params); | 
| 91 | 91 | |
| 92 | 92 | $response = \Response::make($contents, 200); | 
| @@ -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 | 
| @@ -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 ); | 
| @@ -43,29 +43,29 @@ 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\Locale\Manager\Factory::createManager( $context ); | |
| 55 | - $context->setLocale( $localeManager->createItem() ); | |
| 54 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); | |
| 55 | + $context->setLocale($localeManager->createItem()); | |
| 56 | 56 | |
| 57 | - $user = $this->createCustomerItem( $context, $code, $password ); | |
| 57 | + $user = $this->createCustomerItem($context, $code, $password); | |
| 58 | 58 | |
| 59 | -		if( $this->option( 'admin' ) ) { | |
| 60 | - $this->addGroup( $context, $user, 'admin' ); | |
| 59 | +		if ($this->option('admin')) { | |
| 60 | + $this->addGroup($context, $user, 'admin'); | |
| 61 | 61 | } | 
| 62 | 62 | |
| 63 | -		if( $this->option( 'api' ) ) { | |
| 64 | - $this->addGroup( $context, $user, 'api' ); | |
| 63 | +		if ($this->option('api')) { | |
| 64 | + $this->addGroup($context, $user, 'api'); | |
| 65 | 65 | } | 
| 66 | 66 | |
| 67 | -		if( $this->option( 'editor' ) ) { | |
| 68 | - $this->addGroup( $context, $user, 'editor' ); | |
| 67 | +		if ($this->option('editor')) { | |
| 68 | + $this->addGroup($context, $user, 'editor'); | |
| 69 | 69 | } | 
| 70 | 70 | } | 
| 71 | 71 | |
| @@ -77,33 +77,33 @@ discard block | ||
| 77 | 77 | * @param string $userid Unique user ID | 
| 78 | 78 | * @param string $groupid Unique group ID | 
| 79 | 79 | */ | 
| 80 | - protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid ) | |
| 80 | + protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid) | |
| 81 | 81 |  	{ | 
| 82 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' ); | |
| 83 | - $typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' ); | |
| 82 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists'); | |
| 83 | + $typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type'); | |
| 84 | 84 | |
| 85 | - $typeid = $typeManager->findItem( 'default', array(), 'customer/group' )->getId(); | |
| 85 | +		$typeid = $typeManager->findItem('default', array(), 'customer/group')->getId(); | |
| 86 | 86 | |
| 87 | 87 | $search = $manager->createSearch(); | 
| 88 | 88 | $expr = array( | 
| 89 | - $search->compare( '==', 'customer.lists.parentid', $userid ), | |
| 90 | - $search->compare( '==', 'customer.lists.refid', $groupid ), | |
| 91 | - $search->compare( '==', 'customer.lists.domain', 'customer/group' ), | |
| 92 | - $search->compare( '==', 'customer.lists.typeid', $typeid ), | |
| 89 | +			$search->compare('==', 'customer.lists.parentid', $userid), | |
| 90 | +			$search->compare('==', 'customer.lists.refid', $groupid), | |
| 91 | +			$search->compare('==', 'customer.lists.domain', 'customer/group'), | |
| 92 | +			$search->compare('==', 'customer.lists.typeid', $typeid), | |
| 93 | 93 | ); | 
| 94 | - $search->setConditions( $search->combine( '&&', $expr ) ); | |
| 95 | - $search->setSlice( 0, 1 ); | |
| 94 | +		$search->setConditions($search->combine('&&', $expr)); | |
| 95 | + $search->setSlice(0, 1); | |
| 96 | 96 | |
| 97 | - if( count( $manager->searchItems( $search ) ) === 0 ) | |
| 97 | + if (count($manager->searchItems($search)) === 0) | |
| 98 | 98 |  		{ | 
| 99 | 99 | $item = $manager->createItem(); | 
| 100 | - $item->setDomain( 'customer/group' ); | |
| 101 | - $item->setParentId( $userid ); | |
| 102 | - $item->setTypeId( $typeid ); | |
| 103 | - $item->setRefId( $groupid ); | |
| 104 | - $item->setStatus( 1 ); | |
| 100 | +			$item->setDomain('customer/group'); | |
| 101 | + $item->setParentId($userid); | |
| 102 | + $item->setTypeId($typeid); | |
| 103 | + $item->setRefId($groupid); | |
| 104 | + $item->setStatus(1); | |
| 105 | 105 | |
| 106 | - $manager->saveItem( $item, false ); | |
| 106 | + $manager->saveItem($item, false); | |
| 107 | 107 | } | 
| 108 | 108 | } | 
| 109 | 109 | |
| @@ -115,23 +115,23 @@ discard block | ||
| 115 | 115 | * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object | 
| 116 | 116 | * @param string $group Unique customer group code | 
| 117 | 117 | */ | 
| 118 | - protected function addGroup( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group ) | |
| 118 | + protected function addGroup(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group) | |
| 119 | 119 |  	{ | 
| 120 | - $this->info( sprintf( 'Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode() ) ); | |
| 120 | +		$this->info(sprintf('Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode())); | |
| 121 | 121 | |
| 122 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); | |
| 122 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); | |
| 123 | 123 | |
| 124 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) | |
| 124 | +		foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) | |
| 125 | 125 |  		{ | 
| 126 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); | |
| 126 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); | |
| 127 | 127 | |
| 128 | 128 | $lcontext = clone $context; | 
| 129 | - $lcontext->setLocale( $localeItem ); | |
| 129 | + $lcontext->setLocale($localeItem); | |
| 130 | 130 | |
| 131 | - $this->info( '- ' . $siteItem->getCode() ); | |
| 131 | +			$this->info('- '.$siteItem->getCode()); | |
| 132 | 132 | |
| 133 | - $groupItem = $this->getGroupItem( $lcontext, $group ); | |
| 134 | - $this->addListItem( $lcontext, $user->getId(), $groupItem->getId() ); | |
| 133 | + $groupItem = $this->getGroupItem($lcontext, $group); | |
| 134 | + $this->addListItem($lcontext, $user->getId(), $groupItem->getId()); | |
| 135 | 135 | } | 
| 136 | 136 | } | 
| 137 | 137 | |
| @@ -146,23 +146,23 @@ discard block | ||
| 146 | 146 | * @param string $password New user password | 
| 147 | 147 | * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object | 
| 148 | 148 | */ | 
| 149 | - protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password ) | |
| 149 | + protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password) | |
| 150 | 150 |  	{ | 
| 151 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); | |
| 151 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); | |
| 152 | 152 | |
| 153 | 153 |  		try { | 
| 154 | - $item = $manager->findItem( $email ); | |
| 155 | -		} catch( \Aimeos\MShop\Exception $e ) { | |
| 154 | + $item = $manager->findItem($email); | |
| 155 | +		} catch (\Aimeos\MShop\Exception $e) { | |
| 156 | 156 | $item = $manager->createItem(); | 
| 157 | 157 | } | 
| 158 | 158 | |
| 159 | - $item->setCode( $email ); | |
| 160 | - $item->setLabel( $email ); | |
| 161 | - $item->getPaymentAddress()->setEmail( $email ); | |
| 162 | - $item->setPassword( $password ); | |
| 163 | - $item->setStatus( 1 ); | |
| 159 | + $item->setCode($email); | |
| 160 | + $item->setLabel($email); | |
| 161 | + $item->getPaymentAddress()->setEmail($email); | |
| 162 | + $item->setPassword($password); | |
| 163 | + $item->setStatus(1); | |
| 164 | 164 | |
| 165 | - $manager->saveItem( $item ); | |
| 165 | + $manager->saveItem($item); | |
| 166 | 166 | |
| 167 | 167 | return $item; | 
| 168 | 168 | } | 
| @@ -176,8 +176,8 @@ discard block | ||
| 176 | 176 | protected function getArguments() | 
| 177 | 177 |  	{ | 
| 178 | 178 | return array( | 
| 179 | - array( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ), | |
| 180 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)' ), | |
| 179 | +			array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'), | |
| 180 | +			array('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)'), | |
| 181 | 181 | ); | 
| 182 | 182 | } | 
| 183 | 183 | |
| @@ -189,21 +189,21 @@ discard block | ||
| 189 | 189 | * @param string $code Unique customer group code | 
| 190 | 190 | * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object | 
| 191 | 191 | */ | 
| 192 | - protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code ) | |
| 192 | + protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code) | |
| 193 | 193 |  	{ | 
| 194 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' ); | |
| 194 | +		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group'); | |
| 195 | 195 | |
| 196 | 196 | try | 
| 197 | 197 |  		{ | 
| 198 | - $item = $manager->findItem( $code ); | |
| 198 | + $item = $manager->findItem($code); | |
| 199 | 199 | } | 
| 200 | - catch( \Aimeos\MShop\Exception $e ) | |
| 200 | + catch (\Aimeos\MShop\Exception $e) | |
| 201 | 201 |  		{ | 
| 202 | 202 | $item = $manager->createItem(); | 
| 203 | - $item->setLabel( $code ); | |
| 204 | - $item->setCode( $code ); | |
| 203 | + $item->setLabel($code); | |
| 204 | + $item->setCode($code); | |
| 205 | 205 | |
| 206 | - $manager->saveItem( $item ); | |
| 206 | + $manager->saveItem($item); | |
| 207 | 207 | } | 
| 208 | 208 | |
| 209 | 209 | return $item; | 
| @@ -218,10 +218,10 @@ discard block | ||
| 218 | 218 | protected function getOptions() | 
| 219 | 219 |  	{ | 
| 220 | 220 | return array( | 
| 221 | - array( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ), | |
| 222 | - array( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ), | |
| 223 | - array( 'api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs' ), | |
| 224 | - array( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' ), | |
| 221 | +			array('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'), | |
| 222 | +			array('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'), | |
| 223 | +			array('api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs'), | |
| 224 | +			array('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges'), | |
| 225 | 225 | ); | 
| 226 | 226 | } | 
| 227 | 227 | } | 
| @@ -34,7 +34,7 @@ discard block | ||
| 34 | 34 | * | 
| 35 | 35 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object | 
| 36 | 36 | */ | 
| 37 | - public function __construct( \Illuminate\Contracts\Config\Repository $config ) | |
| 37 | + public function __construct(\Illuminate\Contracts\Config\Repository $config) | |
| 38 | 38 |  	{ | 
| 39 | 39 | $this->config = $config; | 
| 40 | 40 | } | 
| @@ -47,10 +47,10 @@ discard block | ||
| 47 | 47 | */ | 
| 48 | 48 | public function get() | 
| 49 | 49 |  	{ | 
| 50 | - if( $this->object === null ) | |
| 50 | + if ($this->object === null) | |
| 51 | 51 |  		{ | 
| 52 | - $extDirs = (array) $this->config->get( 'shop.extdir', array() ); | |
| 53 | - $this->object = new \Aimeos\Bootstrap( $extDirs, false ); | |
| 52 | +			$extDirs = (array) $this->config->get('shop.extdir', array()); | |
| 53 | + $this->object = new \Aimeos\Bootstrap($extDirs, false); | |
| 54 | 54 | } | 
| 55 | 55 | |
| 56 | 56 | return $this->object; | 
| @@ -64,12 +64,12 @@ discard block | ||
| 64 | 64 | */ | 
| 65 | 65 | public function getVersion() | 
| 66 | 66 |  	{ | 
| 67 | - if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false | |
| 68 | - && ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] ) | |
| 67 | +		if (($content = @file_get_contents(base_path('composer.lock'))) !== false | |
| 68 | + && ($content = json_decode($content, true)) !== null && isset($content['packages']) | |
| 69 | 69 |  		) { | 
| 70 | - foreach( (array) $content['packages'] as $item ) | |
| 70 | + foreach ((array) $content['packages'] as $item) | |
| 71 | 71 |  			{ | 
| 72 | -				if( $item['name'] === 'aimeos/aimeos-laravel' ) { | |
| 72 | +				if ($item['name'] === 'aimeos/aimeos-laravel') { | |
| 73 | 73 | return $item['version']; | 
| 74 | 74 | } | 
| 75 | 75 | } | 
| @@ -10,7 +10,7 @@ discard block | ||
| 10 | 10 | <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/css/tether.min.css"> | 
| 11 | 11 | <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css"> | 
| 12 | 12 | <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/css/bootstrap.min.css"> | 
| 13 | - <link rel="stylesheet" href="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'css' ) ); ?>"> | |
| 13 | +		<link rel="stylesheet" href="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'css')); ?>"> | |
| 14 | 14 | |
| 15 | 15 | <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> | 
| 16 | 16 | <!--[if lt IE 9]> | 
| @@ -29,6 +29,6 @@ discard block | ||
| 29 | 29 | <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/js/bootstrap.min.js"></script> | 
| 30 | 30 | <script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/ckeditor.js"></script> | 
| 31 | 31 | <script src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.5.4/adapters/jquery.js"></script> | 
| 32 | - <script src="<?= route( 'aimeos_shop_jqadm_file', array( 'site' => $site, 'type' => 'js' ) ); ?>"></script> | |
| 32 | +		<script src="<?= route('aimeos_shop_jqadm_file', array('site' => $site, 'type' => 'js')); ?>"></script> | |
| 33 | 33 | </body> | 
| 34 | 34 | </html> | 
| @@ -9,7 +9,7 @@ discard block | ||
| 9 | 9 | <link type="text/css" rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/ext-all.css" /> | 
| 10 | 10 | <link type="text/css" rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/xtheme-gray.css" /> | 
| 11 | 11 | @foreach ($cssFiles as $cssFile) | 
| 12 | -        <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/' . $cssFile) ?>" /> | |
| 12 | +        <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/'.$cssFile) ?>" /> | |
| 13 | 13 | @endforeach | 
| 14 | 14 | |
| 15 | 15 | <script type="text/javascript"> | 
| @@ -45,7 +45,7 @@ discard block | ||
| 45 | 45 | |
| 46 | 46 | <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/adapter/ext/ext-base.js"></script> | 
| 47 | 47 | <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/ext-all.js"></script> | 
| 48 | - <script type="text/javascript" src="<?= route( 'aimeos_shop_extadm_file', array( 'site' => $site ) ); ?>"></script> | |
| 48 | +        <script type="text/javascript" src="<?= route('aimeos_shop_extadm_file', array('site' => $site)); ?>"></script> | |
| 49 | 49 | |
| 50 | 50 | </head> | 
| 51 | 51 | <body> |