Compare commits

..

No commits in common. "64497c4c0da15a7a4d97a45ba8c9d7ccb5165081" and "73253dd03c0126ee75d186dd93e74e1940abf45a" have entirely different histories.

4 changed files with 9 additions and 4 deletions

View file

@ -49,7 +49,7 @@ final class SetUserTimezoneSubscriber implements EventSubscriberInterface
}
//Fill with default value if needed
if (null === $timezone && $this->localizationSettings->timezone !== '') {
if (null === $timezone && $this->localizationSettings !== '') {
$timezone = $this->localizationSettings->timezone;
}

View file

@ -77,7 +77,7 @@ class Element14Provider implements InfoProviderInterface
public function isActive(): bool
{
return trim($this->settings->apiKey) !== '';
return $this->settings->storeId !== null && $this->settings->apiKey !== '';
}
/**
@ -131,6 +131,11 @@ class Element14Provider implements InfoProviderInterface
return $result;
}
private function generateProductURL($sku): string
{
return 'https://' . $this->store_id . '/' . $sku;
}
/**
* @param array|null $datasheets
* @return FileDTO[]|null Array of FileDTOs

View file

@ -59,7 +59,7 @@ class TMEClient
public function isUsingPrivateToken(): bool
{
//Private tokens are longer than anonymous ones (50 instead of 45 characters)
return strlen($this->settings->apiToken) > 45;
return strlen($this->token) > 45;
}
/**

View file

@ -44,7 +44,7 @@ class TMEProvider implements InfoProviderInterface
if ($this->tmeClient->isUsingPrivateToken()) {
$this->get_gross_prices = false;
} else {
$this->get_gross_prices = $this->settings->grossPrices;
$this->get_gross_prices = $get_gross_prices;
}
}