Skip to content

EspoCRM – Open Source CRM Application

currency converter forbidden exception

Yuri Kuznetsov5f6bd7b7488a
diff --git a/application/Espo/Core/Action/Actions/ConvertCurrency.php b/application/Espo/Core/Action/Actions/ConvertCurrency.php
index 9d2f76ff74..46ead7d2d5 100644
--- a/application/Espo/Core/Action/Actions/ConvertCurrency.php
+++ b/application/Espo/Core/Action/Actions/ConvertCurrency.php
@@ -47,6 +47,9 @@ use Espo\Entities\User;
use Espo\Tools\Currency\Conversion\EntityConverterFactory;
use RuntimeException;
+/**
+ * @noinspection PhpUnused
+ */
class ConvertCurrency implements Action
{
public function __construct(
diff --git a/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php b/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php
index 6ce8cd800b..f6c858dfa3 100644
--- a/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php
+++ b/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php
@@ -43,11 +43,15 @@ use Espo\Core\MassAction\Result;
use Espo\Core\ORM\Entity as CoreEntity;
use Espo\Core\ORM\EntityManager;
use Espo\Core\ORM\Repository\Option\SaveOption;
+use Espo\Core\Utils\Log;
use Espo\Core\Utils\Metadata;
use Espo\Entities\User;
use Espo\Tools\Currency\Conversion\EntityConverterFactory;
use RuntimeException;
+/**
+ * @noinspection PhpUnused
+ */
class MassConvertCurrency implements MassAction
{
public function __construct(
@@ -57,7 +61,8 @@ class MassConvertCurrency implements MassAction
private Metadata $metadata,
private CurrencyConfigDataProvider $configDataProvider,
private EntityConverterFactory $converterFactory,
- private User $user
+ private User $user,
+ private Log $log,
) {}
public function process(Params $params, Data $data): Result
@@ -116,7 +121,14 @@ class MassConvertCurrency implements MassAction
throw new RuntimeException("Only Core-Entity allowed.");
}
- $converter->convert($entity, $targetCurrency, $rates);
+ try {
+ $converter->convert($entity, $targetCurrency, $rates);
+ } catch (Forbidden $e) {
+ $this->log->info("Could not convert currency for {id}.", [
+ 'id' => $entity->getId(),
+ 'exception' => $e,
+ ]);
+ }
$this->entityManager->saveEntity($entity, [SaveOption::MODIFIED_BY_ID => $this->user->getId()]);
diff --git a/application/Espo/Tools/Currency/Conversion/EntityConverter.php b/application/Espo/Tools/Currency/Conversion/EntityConverter.php
index da7827101b..f8f9a6c2a6 100644
--- a/application/Espo/Tools/Currency/Conversion/EntityConverter.php
+++ b/application/Espo/Tools/Currency/Conversion/EntityConverter.php
@@ -30,6 +30,7 @@
namespace Espo\Tools\Currency\Conversion;
use Espo\Core\Currency\Rates;
+use Espo\Core\Exceptions\Forbidden;
use Espo\ORM\Entity;
/**
@@ -41,6 +42,7 @@ interface EntityConverter
{
/**
* @param TEntity $entity
+ * @throws Forbidden
*/
public function convert(Entity $entity, string $targetCurrency, Rates $rates): void;
}