| @@ -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 | 
| @@ -38,7 +38,7 @@ discard block | ||
| 38 | 38 | * | 
| 39 | 39 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object | 
| 40 | 40 | */ | 
| 41 | - public function __construct( \Illuminate\Contracts\Config\Repository $config ) | |
| 41 | + public function __construct(\Illuminate\Contracts\Config\Repository $config) | |
| 42 | 42 |  	{ | 
| 43 | 43 | $this->config = $config; | 
| 44 | 44 | } | 
| @@ -50,25 +50,25 @@ discard block | ||
| 50 | 50 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object | 
| 51 | 51 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object | 
| 52 | 52 | */ | 
| 53 | - public function get( \Aimeos\MShop\Context\Item\Iface $context ) | |
| 53 | + public function get(\Aimeos\MShop\Context\Item\Iface $context) | |
| 54 | 54 |  	{ | 
| 55 | - if( $this->locale === null ) | |
| 55 | + if ($this->locale === null) | |
| 56 | 56 |  		{ | 
| 57 | - $site = Input::get( 'site', 'default' ); | |
| 58 | - $currency = Input::get( 'currency', '' ); | |
| 59 | - $lang = Input::get( 'locale', '' ); | |
| 57 | +			$site = Input::get('site', 'default'); | |
| 58 | +			$currency = Input::get('currency', ''); | |
| 59 | +			$lang = Input::get('locale', ''); | |
| 60 | 60 | |
| 61 | - if( Route::current() ) | |
| 61 | + if (Route::current()) | |
| 62 | 62 |  			{ | 
| 63 | - $site = Route::input( 'site', $site ); | |
| 64 | - $currency = Route::input( 'currency', $currency ); | |
| 65 | - $lang = Route::input( 'locale', $lang ); | |
| 63 | +				$site = Route::input('site', $site); | |
| 64 | +				$currency = Route::input('currency', $currency); | |
| 65 | +				$lang = Route::input('locale', $lang); | |
| 66 | 66 | } | 
| 67 | 67 | |
| 68 | - $disableSites = $this->config->get( 'shop.disableSites', true ); | |
| 68 | +			$disableSites = $this->config->get('shop.disableSites', true); | |
| 69 | 69 | |
| 70 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); | |
| 71 | - $this->locale = $localeManager->bootstrap( $site, $lang, $currency, $disableSites ); | |
| 70 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); | |
| 71 | + $this->locale = $localeManager->bootstrap($site, $lang, $currency, $disableSites); | |
| 72 | 72 | } | 
| 73 | 73 | |
| 74 | 74 | return $this->locale; | 
| @@ -82,17 +82,17 @@ discard block | ||
| 82 | 82 | * @param string $site Unique site code | 
| 83 | 83 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object | 
| 84 | 84 | */ | 
| 85 | - public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site ) | |
| 85 | + public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site) | |
| 86 | 86 |  	{ | 
| 87 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); | |
| 87 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); | |
| 88 | 88 | |
| 89 | 89 | try | 
| 90 | 90 |  		{ | 
| 91 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); | |
| 92 | - $localeItem->setLanguageId( null ); | |
| 93 | - $localeItem->setCurrencyId( null ); | |
| 91 | + $localeItem = $localeManager->bootstrap($site, '', '', false); | |
| 92 | + $localeItem->setLanguageId(null); | |
| 93 | + $localeItem->setCurrencyId(null); | |
| 94 | 94 | } | 
| 95 | - catch( \Aimeos\MShop\Locale\Exception $e ) | |
| 95 | + catch (\Aimeos\MShop\Locale\Exception $e) | |
| 96 | 96 |  		{ | 
| 97 | 97 | $localeItem = $localeManager->createItem(); | 
| 98 | 98 | } | 
| @@ -91,8 +91,7 @@ | ||
| 91 | 91 | $localeItem = $localeManager->bootstrap( $site, '', '', false ); | 
| 92 | 92 | $localeItem->setLanguageId( null ); | 
| 93 | 93 | $localeItem->setCurrencyId( null ); | 
| 94 | - } | |
| 95 | - catch( \Aimeos\MShop\Locale\Exception $e ) | |
| 94 | + } catch( \Aimeos\MShop\Locale\Exception $e ) | |
| 96 | 95 |  		{ | 
| 97 | 96 | $localeItem = $localeManager->createItem(); | 
| 98 | 97 | } | 
| @@ -9,57 +9,57 @@ | ||
| 9 | 9 | |
| 10 | 10 | if( !function_exists( 'aiconfig' ) ) | 
| 11 | 11 |  { | 
| 12 | - /** | |
| 13 | - * Returns the configuration setting for the given key | |
| 14 | - * | |
| 15 | - * @param string $key Configuration key | |
| 16 | - * @param mixed $default Default value if the configuration key isn't found | |
| 17 | - * @return mixed Configuration value | |
| 18 | - */ | |
| 19 | - function aiconfig( $key, $default = null ) | |
| 20 | -    { | |
| 21 | - return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default ); | |
| 22 | - } | |
| 12 | + /** | |
| 13 | + * Returns the configuration setting for the given key | |
| 14 | + * | |
| 15 | + * @param string $key Configuration key | |
| 16 | + * @param mixed $default Default value if the configuration key isn't found | |
| 17 | + * @return mixed Configuration value | |
| 18 | + */ | |
| 19 | + function aiconfig( $key, $default = null ) | |
| 20 | +	{ | |
| 21 | + return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default ); | |
| 22 | + } | |
| 23 | 23 | } | 
| 24 | 24 | |
| 25 | 25 | |
| 26 | 26 | if( !function_exists( 'aitrans' ) ) | 
| 27 | 27 |  { | 
| 28 | - /** | |
| 29 | - * Translates the given message | |
| 30 | - * | |
| 31 | - * @param string $singular Message to translate | |
| 32 | - * @param array $params List of paramters for replacing the placeholders in that order | |
| 33 | - * @param string $domain Translation domain | |
| 34 | - * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" | |
| 35 | - * @return string Translated string | |
| 36 | - */ | |
| 37 | - function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null ) | |
| 38 | -    { | |
| 39 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); | |
| 28 | + /** | |
| 29 | + * Translates the given message | |
| 30 | + * | |
| 31 | + * @param string $singular Message to translate | |
| 32 | + * @param array $params List of paramters for replacing the placeholders in that order | |
| 33 | + * @param string $domain Translation domain | |
| 34 | + * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" | |
| 35 | + * @return string Translated string | |
| 36 | + */ | |
| 37 | + function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null ) | |
| 38 | +	{ | |
| 39 | + $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); | |
| 40 | 40 | |
| 41 | - return vsprintf( $i18n->dt( $domain, $singular ), $params ); | |
| 42 | - } | |
| 41 | + return vsprintf( $i18n->dt( $domain, $singular ), $params ); | |
| 42 | + } | |
| 43 | 43 | } | 
| 44 | 44 | |
| 45 | 45 | |
| 46 | 46 | if( !function_exists( 'aitransplural' ) ) | 
| 47 | 47 |  { | 
| 48 | - /** | |
| 49 | - * Translates the given messages based on the number | |
| 50 | - * | |
| 51 | - * @param string $singular Message to translate | |
| 52 | - * @param string $plural Message for plural translations | |
| 53 | - * @param integer $number Count of items to chose the correct plural translation | |
| 54 | - * @param array $params List of paramters for replacing the placeholders in that order | |
| 55 | - * @param string $domain Translation domain | |
| 56 | - * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" | |
| 57 | - * @return string Translated string | |
| 58 | - */ | |
| 59 | - function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null ) | |
| 60 | -    { | |
| 61 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); | |
| 48 | + /** | |
| 49 | + * Translates the given messages based on the number | |
| 50 | + * | |
| 51 | + * @param string $singular Message to translate | |
| 52 | + * @param string $plural Message for plural translations | |
| 53 | + * @param integer $number Count of items to chose the correct plural translation | |
| 54 | + * @param array $params List of paramters for replacing the placeholders in that order | |
| 55 | + * @param string $domain Translation domain | |
| 56 | + * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" | |
| 57 | + * @return string Translated string | |
| 58 | + */ | |
| 59 | + function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null ) | |
| 60 | +	{ | |
| 61 | + $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); | |
| 62 | 62 | |
| 63 | - return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params ); | |
| 64 | - } | |
| 63 | + return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params ); | |
| 64 | + } | |
| 65 | 65 | } | 
| @@ -7,7 +7,7 @@ discard block | ||
| 7 | 7 | */ | 
| 8 | 8 | |
| 9 | 9 | |
| 10 | -if( !function_exists( 'aiconfig' ) ) | |
| 10 | +if (!function_exists('aiconfig')) | |
| 11 | 11 |  { | 
| 12 | 12 | /** | 
| 13 | 13 | * Returns the configuration setting for the given key | 
| @@ -16,14 +16,14 @@ discard block | ||
| 16 | 16 | * @param mixed $default Default value if the configuration key isn't found | 
| 17 | 17 | * @return mixed Configuration value | 
| 18 | 18 | */ | 
| 19 | - function aiconfig( $key, $default = null ) | |
| 19 | + function aiconfig($key, $default = null) | |
| 20 | 20 |      { | 
| 21 | - return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default ); | |
| 21 | +        return app('\Aimeos\Shop\Base\Config')->get()->get($key, $default); | |
| 22 | 22 | } | 
| 23 | 23 | } | 
| 24 | 24 | |
| 25 | 25 | |
| 26 | -if( !function_exists( 'aitrans' ) ) | |
| 26 | +if (!function_exists('aitrans')) | |
| 27 | 27 |  { | 
| 28 | 28 | /** | 
| 29 | 29 | * Translates the given message | 
| @@ -34,16 +34,16 @@ discard block | ||
| 34 | 34 | * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" | 
| 35 | 35 | * @return string Translated string | 
| 36 | 36 | */ | 
| 37 | - function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null ) | |
| 37 | + function aitrans($singular, array $params = array(), $domain = 'client', $locale = null) | |
| 38 | 38 |      { | 
| 39 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); | |
| 39 | +        $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale); | |
| 40 | 40 | |
| 41 | - return vsprintf( $i18n->dt( $domain, $singular ), $params ); | |
| 41 | + return vsprintf($i18n->dt($domain, $singular), $params); | |
| 42 | 42 | } | 
| 43 | 43 | } | 
| 44 | 44 | |
| 45 | 45 | |
| 46 | -if( !function_exists( 'aitransplural' ) ) | |
| 46 | +if (!function_exists('aitransplural')) | |
| 47 | 47 |  { | 
| 48 | 48 | /** | 
| 49 | 49 | * Translates the given messages based on the number | 
| @@ -56,10 +56,10 @@ discard block | ||
| 56 | 56 | * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" | 
| 57 | 57 | * @return string Translated string | 
| 58 | 58 | */ | 
| 59 | - function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null ) | |
| 59 | + function aitransplural($singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null) | |
| 60 | 60 |      { | 
| 61 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); | |
| 61 | +        $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale); | |
| 62 | 62 | |
| 63 | - return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params ); | |
| 63 | + return vsprintf($i18n->dn($domain, $singular, $plural, $number), $params); | |
| 64 | 64 | } | 
| 65 | 65 | } | 
| @@ -9,7 +9,7 @@ discard block | ||
| 9 | 9 | <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/ext-all.css" /> | 
| 10 | 10 | <link type="text/css" rel="stylesheet" href="https://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="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/adapter/ext/ext-base.js"></script> | 
| 47 | 47 | <script type="text/javascript" src="https://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> | 
| @@ -196,8 +196,7 @@ | ||
| 196 | 196 | try | 
| 197 | 197 |  		{ | 
| 198 | 198 | $item = $manager->findItem( $code ); | 
| 199 | - } | |
| 200 | - catch( \Aimeos\MShop\Exception $e ) | |
| 199 | + } catch( \Aimeos\MShop\Exception $e ) | |
| 201 | 200 |  		{ | 
| 202 | 201 | $item = $manager->createItem(); | 
| 203 | 202 | $item->setLabel( $code ); | 
| @@ -51,22 +51,22 @@ discard block | ||
| 51 | 51 | */ | 
| 52 | 52 | public function handle() | 
| 53 | 53 |  	{ | 
| 54 | -		if( ( $code = $this->argument( 'email' ) ) === null ) { | |
| 55 | - $code = $this->ask( 'E-Mail' ); | |
| 54 | +		if (($code = $this->argument('email')) === null) { | |
| 55 | +			$code = $this->ask('E-Mail'); | |
| 56 | 56 | } | 
| 57 | 57 | |
| 58 | -		if( ( $password = $this->option( 'password' ) ) === null ) { | |
| 59 | - $password = $this->secret( 'Password' ); | |
| 58 | +		if (($password = $this->option('password')) === null) { | |
| 59 | +			$password = $this->secret('Password'); | |
| 60 | 60 | } | 
| 61 | 61 | |
| 62 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false, 'command' ); | |
| 63 | - $context->setEditor( 'aimeos:account' ); | |
| 62 | +		$context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false, 'command'); | |
| 63 | +		$context->setEditor('aimeos:account'); | |
| 64 | 64 | |
| 65 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); | |
| 66 | - $localeItem = $localeManager->bootstrap( $this->argument( 'site' ), '', '', false ); | |
| 67 | - $context->setLocale( $localeItem ); | |
| 65 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); | |
| 66 | +		$localeItem = $localeManager->bootstrap($this->argument('site'), '', '', false); | |
| 67 | + $context->setLocale($localeItem); | |
| 68 | 68 | |
| 69 | - $this->addGroups( $context, $this->createCustomerItem( $context, $code, $password ) ); | |
| 69 | + $this->addGroups($context, $this->createCustomerItem($context, $code, $password)); | |
| 70 | 70 | } | 
| 71 | 71 | |
| 72 | 72 | |
| @@ -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 | |
| @@ -114,22 +114,22 @@ discard block | ||
| 114 | 114 | * @param \Aimeos\MShop\Context\Item\Iface $context Aimeos context object | 
| 115 | 115 | * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object | 
| 116 | 116 | */ | 
| 117 | - protected function addGroups( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user ) | |
| 117 | + protected function addGroups(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user) | |
| 118 | 118 |  	{ | 
| 119 | -		if( $this->option( 'super' ) ) { | |
| 120 | - $this->addGroup( $context, $user, 'super' ); | |
| 119 | +		if ($this->option('super')) { | |
| 120 | + $this->addGroup($context, $user, 'super'); | |
| 121 | 121 | } | 
| 122 | 122 | |
| 123 | -		if( $this->option( 'admin' ) ) { | |
| 124 | - $this->addGroup( $context, $user, 'admin' ); | |
| 123 | +		if ($this->option('admin')) { | |
| 124 | + $this->addGroup($context, $user, 'admin'); | |
| 125 | 125 | } | 
| 126 | 126 | |
| 127 | -		if( $this->option( 'editor' ) ) { | |
| 128 | - $this->addGroup( $context, $user, 'editor' ); | |
| 127 | +		if ($this->option('editor')) { | |
| 128 | + $this->addGroup($context, $user, 'editor'); | |
| 129 | 129 | } | 
| 130 | 130 | |
| 131 | -		if( $this->option( 'api' ) ) { | |
| 132 | - $this->addGroup( $context, $user, 'api' ); | |
| 131 | +		if ($this->option('api')) { | |
| 132 | + $this->addGroup($context, $user, 'api'); | |
| 133 | 133 | } | 
| 134 | 134 | } | 
| 135 | 135 | |
| @@ -141,13 +141,13 @@ discard block | ||
| 141 | 141 | * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object | 
| 142 | 142 | * @param string $group Unique customer group code | 
| 143 | 143 | */ | 
| 144 | - protected function addGroup( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group ) | |
| 144 | + protected function addGroup(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group) | |
| 145 | 145 |  	{ | 
| 146 | 146 | $msg = 'Add "%1$s" group to user "%2$s" for site "%3$s"'; | 
| 147 | - $this->info( sprintf( $msg, $group, $user->getCode(), $this->argument( 'site' ) ) ); | |
| 147 | +		$this->info(sprintf($msg, $group, $user->getCode(), $this->argument('site'))); | |
| 148 | 148 | |
| 149 | - $groupItem = $this->getGroupItem( $context, $group ); | |
| 150 | - $this->addListItem( $context, $user->getId(), $groupItem->getId() ); | |
| 149 | + $groupItem = $this->getGroupItem($context, $group); | |
| 150 | + $this->addListItem($context, $user->getId(), $groupItem->getId()); | |
| 151 | 151 | } | 
| 152 | 152 | |
| 153 | 153 | |
| @@ -161,23 +161,23 @@ discard block | ||
| 161 | 161 | * @param string $password New user password | 
| 162 | 162 | * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object | 
| 163 | 163 | */ | 
| 164 | - protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password ) | |
| 164 | + protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password) | |
| 165 | 165 |  	{ | 
| 166 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); | |
| 166 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); | |
| 167 | 167 | |
| 168 | 168 |  		try { | 
| 169 | - $item = $manager->findItem( $email ); | |
| 170 | -		} catch( \Aimeos\MShop\Exception $e ) { | |
| 169 | + $item = $manager->findItem($email); | |
| 170 | +		} catch (\Aimeos\MShop\Exception $e) { | |
| 171 | 171 | $item = $manager->createItem(); | 
| 172 | 172 | } | 
| 173 | 173 | |
| 174 | - $item->setCode( $email ); | |
| 175 | - $item->setLabel( $email ); | |
| 176 | - $item->getPaymentAddress()->setEmail( $email ); | |
| 177 | - $item->setPassword( $password ); | |
| 178 | - $item->setStatus( 1 ); | |
| 174 | + $item->setCode($email); | |
| 175 | + $item->setLabel($email); | |
| 176 | + $item->getPaymentAddress()->setEmail($email); | |
| 177 | + $item->setPassword($password); | |
| 178 | + $item->setStatus(1); | |
| 179 | 179 | |
| 180 | - $manager->saveItem( $item ); | |
| 180 | + $manager->saveItem($item); | |
| 181 | 181 | |
| 182 | 182 | return $item; | 
| 183 | 183 | } | 
| @@ -191,8 +191,8 @@ discard block | ||
| 191 | 191 | protected function getArguments() | 
| 192 | 192 |  	{ | 
| 193 | 193 | return array( | 
| 194 | - array( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' ), | |
| 195 | - array( 'site', InputArgument::OPTIONAL, 'Site code to create the account for', 'default' ), | |
| 194 | +			array('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created'), | |
| 195 | +			array('site', InputArgument::OPTIONAL, 'Site code to create the account for', 'default'), | |
| 196 | 196 | ); | 
| 197 | 197 | } | 
| 198 | 198 | |
| @@ -204,21 +204,21 @@ discard block | ||
| 204 | 204 | * @param string $code Unique customer group code | 
| 205 | 205 | * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object | 
| 206 | 206 | */ | 
| 207 | - protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code ) | |
| 207 | + protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code) | |
| 208 | 208 |  	{ | 
| 209 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' ); | |
| 209 | +		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group'); | |
| 210 | 210 | |
| 211 | 211 | try | 
| 212 | 212 |  		{ | 
| 213 | - $item = $manager->findItem( $code ); | |
| 213 | + $item = $manager->findItem($code); | |
| 214 | 214 | } | 
| 215 | - catch( \Aimeos\MShop\Exception $e ) | |
| 215 | + catch (\Aimeos\MShop\Exception $e) | |
| 216 | 216 |  		{ | 
| 217 | 217 | $item = $manager->createItem(); | 
| 218 | - $item->setLabel( $code ); | |
| 219 | - $item->setCode( $code ); | |
| 218 | + $item->setLabel($code); | |
| 219 | + $item->setCode($code); | |
| 220 | 220 | |
| 221 | - $manager->saveItem( $item ); | |
| 221 | + $manager->saveItem($item); | |
| 222 | 222 | } | 
| 223 | 223 | |
| 224 | 224 | return $item; | 
| @@ -233,11 +233,11 @@ discard block | ||
| 233 | 233 | protected function getOptions() | 
| 234 | 234 |  	{ | 
| 235 | 235 | return array( | 
| 236 | - array( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' ), | |
| 237 | - array( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' ), | |
| 238 | - array( 'api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs' ), | |
| 239 | - array( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' ), | |
| 240 | - array( 'viewer', null, InputOption::VALUE_NONE, 'If account should only have view privileges' ), | |
| 236 | +			array('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)'), | |
| 237 | +			array('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges'), | |
| 238 | +			array('api', null, InputOption::VALUE_NONE, 'If account should be able to access the APIs'), | |
| 239 | +			array('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges'), | |
| 240 | +			array('viewer', null, InputOption::VALUE_NONE, 'If account should only have view privileges'), | |
| 241 | 241 | ); | 
| 242 | 242 | } | 
| 243 | 243 | } | 
| @@ -53,9 +53,9 @@ discard block | ||
| 53 | 53 | * @param \Aimeos\Shop\Base\Locale $locale Locale object | 
| 54 | 54 | * @param \Aimeos\Shop\Base\View $view View object | 
| 55 | 55 | */ | 
| 56 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, | |
| 56 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, | |
| 57 | 57 | \Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context, | 
| 58 | - \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view ) | |
| 58 | + \Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view) | |
| 59 | 59 |  	{ | 
| 60 | 60 | $this->config = $config; | 
| 61 | 61 | $this->aimeos = $aimeos; | 
| @@ -71,21 +71,21 @@ discard block | ||
| 71 | 71 | * @param string $pageName Name of the configured page | 
| 72 | 72 | * @return array Associative list with body and header output separated by client name | 
| 73 | 73 | */ | 
| 74 | - public function getSections( $pageName ) | |
| 74 | + public function getSections($pageName) | |
| 75 | 75 |  	{ | 
| 76 | 76 | $context = $this->context->get(); | 
| 77 | 77 | $langid = $context->getLocale()->getLanguageId(); | 
| 78 | - $tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' ); | |
| 79 | - $view = $this->view->create( $context, $tmplPaths, $langid ); | |
| 80 | - $context->setView( $view ); | |
| 78 | +		$tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates'); | |
| 79 | + $view = $this->view->create($context, $tmplPaths, $langid); | |
| 80 | + $context->setView($view); | |
| 81 | 81 | |
| 82 | - $result = array( 'aibody' => array(), 'aiheader' => array() ); | |
| 83 | - $page = $context->getConfig()->get( 'page/' . $pageName, array() ); | |
| 82 | +		$result = array('aibody' => array(), 'aiheader' => array()); | |
| 83 | +		$page = $context->getConfig()->get('page/'.$pageName, array()); | |
| 84 | 84 | |
| 85 | - foreach( (array) $page as $clientName ) | |
| 85 | + foreach ((array) $page as $clientName) | |
| 86 | 86 |  		{ | 
| 87 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName ); | |
| 88 | - $client->setView( clone $view ); | |
| 87 | + $client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName); | |
| 88 | + $client->setView(clone $view); | |
| 89 | 89 | $client->process(); | 
| 90 | 90 | |
| 91 | 91 | $result['aibody'][$clientName] = $client->getBody(); | 
| @@ -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,16 +47,16 @@ discard block | ||
| 47 | 47 | */ | 
| 48 | 48 | public function get() | 
| 49 | 49 |  	{ | 
| 50 | - if( $this->object === null ) | |
| 50 | + if ($this->object === null) | |
| 51 | 51 |  		{ | 
| 52 | - $dir = base_path( 'ext' ); | |
| 52 | +			$dir = base_path('ext'); | |
| 53 | 53 | |
| 54 | -			if( !is_dir( $dir ) ) { | |
| 55 | - $dir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'ext'; | |
| 54 | +			if (!is_dir($dir)) { | |
| 55 | + $dir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'ext'; | |
| 56 | 56 | } | 
| 57 | 57 | |
| 58 | - $extDirs = (array) $this->config->get( 'shop.extdir', $dir ); | |
| 59 | - $this->object = new \Aimeos\Bootstrap( $extDirs, false ); | |
| 58 | +			$extDirs = (array) $this->config->get('shop.extdir', $dir); | |
| 59 | + $this->object = new \Aimeos\Bootstrap($extDirs, false); | |
| 60 | 60 | } | 
| 61 | 61 | |
| 62 | 62 | return $this->object; | 
| @@ -70,12 +70,12 @@ discard block | ||
| 70 | 70 | */ | 
| 71 | 71 | public function getVersion() | 
| 72 | 72 |  	{ | 
| 73 | - if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false | |
| 74 | - && ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] ) | |
| 73 | +		if (($content = @file_get_contents(base_path('composer.lock'))) !== false | |
| 74 | + && ($content = json_decode($content, true)) !== null && isset($content['packages']) | |
| 75 | 75 |  		) { | 
| 76 | - foreach( (array) $content['packages'] as $item ) | |
| 76 | + foreach ((array) $content['packages'] as $item) | |
| 77 | 77 |  			{ | 
| 78 | -				if( $item['name'] === 'aimeos/aimeos-laravel' ) { | |
| 78 | +				if ($item['name'] === 'aimeos/aimeos-laravel') { | |
| 79 | 79 | return $item['version']; | 
| 80 | 80 | } | 
| 81 | 81 | } | 
| @@ -40,7 +40,7 @@ discard block | ||
| 40 | 40 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object | 
| 41 | 41 | * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object | 
| 42 | 42 | */ | 
| 43 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos ) | |
| 43 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos) | |
| 44 | 44 |  	{ | 
| 45 | 45 | $this->aimeos = $aimeos; | 
| 46 | 46 | $this->config = $config; | 
| @@ -53,23 +53,23 @@ discard block | ||
| 53 | 53 |  	 * @param integer $type Configuration type ("frontend" or "backend") | 
| 54 | 54 | * @return \Aimeos\MW\Config\Iface Configuration object | 
| 55 | 55 | */ | 
| 56 | - public function get( $type = 'frontend' ) | |
| 56 | + public function get($type = 'frontend') | |
| 57 | 57 |  	{ | 
| 58 | - if( !isset( $this->objects[$type] ) ) | |
| 58 | + if (!isset($this->objects[$type])) | |
| 59 | 59 |  		{ | 
| 60 | 60 | $configPaths = $this->aimeos->get()->getConfigPaths(); | 
| 61 | - $cfgfile = dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'default.php'; | |
| 61 | + $cfgfile = dirname(dirname(dirname(__DIR__))).DIRECTORY_SEPARATOR.'default.php'; | |
| 62 | 62 | |
| 63 | - $config = new \Aimeos\MW\Config\PHPArray( require $cfgfile, $configPaths ); | |
| 63 | + $config = new \Aimeos\MW\Config\PHPArray(require $cfgfile, $configPaths); | |
| 64 | 64 | |
| 65 | -			if( $this->config->get( 'shop.apc_enabled', false ) == true ) { | |
| 66 | - $config = new \Aimeos\MW\Config\Decorator\APC( $config, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); | |
| 65 | +			if ($this->config->get('shop.apc_enabled', false) == true) { | |
| 66 | +				$config = new \Aimeos\MW\Config\Decorator\APC($config, $this->config->get('shop.apc_prefix', 'laravel:')); | |
| 67 | 67 | } | 
| 68 | 68 | |
| 69 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $this->config->get( 'shop' ) ); | |
| 69 | +			$config = new \Aimeos\MW\Config\Decorator\Memory($config, $this->config->get('shop')); | |
| 70 | 70 | |
| 71 | -			if( ( $conf = $this->config->get( 'shop.' . $type, array() ) ) !== array() ) { | |
| 72 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $conf ); | |
| 71 | +			if (($conf = $this->config->get('shop.'.$type, array())) !== array()) { | |
| 72 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $conf); | |
| 73 | 73 | } | 
| 74 | 74 | |
| 75 | 75 | $this->objects[$type] = $config; | 
| @@ -40,7 +40,7 @@ discard block | ||
| 40 | 40 | * @param \Illuminate\Contracts\Config\Repository $config Configuration object | 
| 41 | 41 | * @param \Aimeos\Shop\Base\Aimeos $aimeos Aimeos object | 
| 42 | 42 | */ | 
| 43 | - public function __construct( \Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos ) | |
| 43 | + public function __construct(\Illuminate\Contracts\Config\Repository $config, \Aimeos\Shop\Base\Aimeos $aimeos) | |
| 44 | 44 |  	{ | 
| 45 | 45 | $this->aimeos = $aimeos; | 
| 46 | 46 | $this->config = $config; | 
| @@ -53,22 +53,22 @@ discard block | ||
| 53 | 53 | * @param array $languageIds List of two letter ISO language IDs | 
| 54 | 54 | * @return \Aimeos\MW\Translation\Iface[] List of translation objects | 
| 55 | 55 | */ | 
| 56 | - public function get( array $languageIds ) | |
| 56 | + public function get(array $languageIds) | |
| 57 | 57 |  	{ | 
| 58 | 58 | $i18nPaths = $this->aimeos->get()->getI18nPaths(); | 
| 59 | 59 | |
| 60 | - foreach( $languageIds as $langid ) | |
| 60 | + foreach ($languageIds as $langid) | |
| 61 | 61 |  		{ | 
| 62 | - if( !isset( $this->i18n[$langid] ) ) | |
| 62 | + if (!isset($this->i18n[$langid])) | |
| 63 | 63 |  			{ | 
| 64 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid ); | |
| 64 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid); | |
| 65 | 65 | |
| 66 | -				if( $this->config->get( 'shop.apc_enabled', false ) == true ) { | |
| 67 | - $i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $this->config->get( 'shop.apc_prefix', 'laravel:' ) ); | |
| 66 | +				if ($this->config->get('shop.apc_enabled', false) == true) { | |
| 67 | +					$i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $this->config->get('shop.apc_prefix', 'laravel:')); | |
| 68 | 68 | } | 
| 69 | 69 | |
| 70 | -				if( $this->config->has( 'shop.i18n.' . $langid ) ) { | |
| 71 | - $i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $this->config->get( 'shop.i18n.' . $langid ) ); | |
| 70 | +				if ($this->config->has('shop.i18n.'.$langid)) { | |
| 71 | +					$i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $this->config->get('shop.i18n.'.$langid)); | |
| 72 | 72 | } | 
| 73 | 73 | |
| 74 | 74 | $this->i18n[$langid] = $i18n; |