91006: Check configurator is activated

axelor · Feb 17, 2025 · 297bac6 · 297bac6
1 parent 4a21ad2
commit 297bac6
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 2 deletions.
diff --git a/axelor-sale/src/main/java/com/axelor/apps/sale/exception/SaleExceptionMessage.java b/axelor-sale/src/main/java/com/axelor/apps/sale/exception/SaleExceptionMessage.java
@@ -180,4 +180,7 @@ private SaleExceptionMessage() {}
       "Sale order does not have configurator to duplicate." /*)*/;
   public static final String CONFIGURATOR_VERSION_IS_DIFFERENT = /*$$(*/
       "Configurator version is different than its configurator creator." /*)*/;
+
+  public static final String CONFIGURATOR_IS_NOT_ACTIVATED = /*$$(*/
+      "Configurator is not activated." /*)*/;
 }
diff --git a/...ale/src/main/java/com/axelor/apps/sale/service/configurator/ConfiguratorCheckService.java b/...ale/src/main/java/com/axelor/apps/sale/service/configurator/ConfiguratorCheckService.java
@@ -14,4 +14,6 @@ public interface ConfiguratorCheckService {
   void checkHaveConfigurator(SaleOrder saleOrder) throws AxelorException;
 
   boolean isConfiguratorVersionDifferent(Configurator configurator);
+
+  void checkConfiguratorActivated(Configurator configurator) throws AxelorException;
 }
diff --git a/...src/main/java/com/axelor/apps/sale/service/configurator/ConfiguratorCheckServiceImpl.java b/...src/main/java/com/axelor/apps/sale/service/configurator/ConfiguratorCheckServiceImpl.java
@@ -55,4 +55,15 @@ public boolean isConfiguratorVersionDifferent(Configurator configurator) {
         .getConfiguratorVersion()
         .equals(configurator.getConfiguratorCreator().getConfiguratorVersion());
   }
+
+  @Override
+  public void checkConfiguratorActivated(Configurator configurator) throws AxelorException {
+    if (configurator != null) {
+      if (!configurator.getConfiguratorCreator().getIsActive()) {
+        throw new AxelorException(
+            TraceBackRepository.CATEGORY_INCONSISTENCY,
+            I18n.get(SaleExceptionMessage.CONFIGURATOR_IS_NOT_ACTIVATED));
+      }
+    }
+  }
 }
diff --git a/...sale/src/main/java/com/axelor/apps/sale/service/configurator/ConfiguratorServiceImpl.java b/...sale/src/main/java/com/axelor/apps/sale/service/configurator/ConfiguratorServiceImpl.java
@@ -252,6 +252,7 @@ public void fillProductFields(
       Long saleOrderId)
       throws AxelorException {
 
+    configuratorCheckService.checkConfiguratorActivated(configurator);
     configuratorCheckService.checkLinkedSaleOrderLine(configurator, product);
     if (configuratorCheckService.isConfiguratorVersionDifferent(configurator)) {
       throw new AxelorException(
@@ -399,6 +400,7 @@ public SaleOrderLine generateSaleOrderLine(
       JsonContext jsonAttributes,
       JsonContext jsonIndicators)
       throws AxelorException {
+    configuratorCheckService.checkConfiguratorActivated(configurator);
     var newSaleOrderLine =
         generateSaleOrderLine(configurator, jsonAttributes, jsonIndicators, saleOrder);
     saleOrderLineRepository.save(newSaleOrderLine);

diff --git a/axelor-sale/src/main/java/com/axelor/apps/sale/web/SaleOrderLineController.java b/axelor-sale/src/main/java/com/axelor/apps/sale/web/SaleOrderLineController.java
@@ -387,18 +387,28 @@ public void configuratorDuplicateSaleOrderLine(ActionRequest request, ActionResp
     }
   }
 
-  public void checkDuplicationSaleOrderLine(ActionRequest request, ActionResponse response) {
+  @ErrorException
+  public void checkDuplicationSaleOrderLine(ActionRequest request, ActionResponse response)
+      throws AxelorException {
     SaleOrderLine saleOrderLine = request.getContext().asType(SaleOrderLine.class);
 
+    Beans.get(ConfiguratorCheckService.class)
+        .checkConfiguratorActivated(saleOrderLine.getConfigurator());
+
     if (Beans.get(ConfiguratorCheckService.class)
         .isConfiguratorVersionDifferent(saleOrderLine.getConfigurator())) {
       response.setAlert(I18n.get(ITranslation.CONFIGURATOR_VERSION_IS_DIFFERENT));
     }
   }
 
-  public void checkEditConfiguratorSaleOrderLine(ActionRequest request, ActionResponse response) {
+  @ErrorException
+  public void checkEditConfiguratorSaleOrderLine(ActionRequest request, ActionResponse response)
+      throws AxelorException {
     SaleOrderLine saleOrderLine = request.getContext().asType(SaleOrderLine.class);
 
+    Beans.get(ConfiguratorCheckService.class)
+        .checkConfiguratorActivated(saleOrderLine.getConfigurator());
+
     if (Beans.get(ConfiguratorCheckService.class)
         .isConfiguratorVersionDifferent(saleOrderLine.getConfigurator())) {
       response.setError(I18n.get(SaleExceptionMessage.CONFIGURATOR_VERSION_IS_DIFFERENT));

diff --git a/axelor-sale/src/main/resources/i18n/messages.csv b/axelor-sale/src/main/resources/i18n/messages.csv
@@ -127,6 +127,7 @@
 "Configurator creator name",,,
 "Configurator creators",,,
 "Configurator formula list",,,
+"Configurator is not activated.",,,
 "Configurator model",,,
 "Configurator version is different than its configurator creator.",,,
 "Configurator version is different than the version of its configurator creator, therefore only a simple duplicate will be created, proceed ?",,,

diff --git a/axelor-sale/src/main/resources/i18n/messages_en.csv b/axelor-sale/src/main/resources/i18n/messages_en.csv
@@ -127,6 +127,7 @@
 "Configurator creator name",,,
 "Configurator creators",,,
 "Configurator formula list",,,
+"Configurator is not activated.",,,
 "Configurator model",,,
 "Configurator version is different than its configurator creator.",,,
 "Configurator version is different than the version of its configurator creator, therefore only a simple duplicate will be created, proceed ?",,,

diff --git a/axelor-sale/src/main/resources/i18n/messages_fr.csv b/axelor-sale/src/main/resources/i18n/messages_fr.csv
@@ -127,6 +127,7 @@
 "Configurator creator name",,,
 "Configurator creators",,,
 "Configurator formula list","Liste des formules",,
+"Configurator is not activated.","Le configurator n'est pas activé.",,
 "Configurator model","Modèle de configurateur",,
 "Configurator version is different than its configurator creator.","La version du configurateur est différente de celle de son modèle.",,
 "Configurator version is different than the version of its configurator creator, therefore only a simple duplicate will be created, proceed ?","La version du configurateur est différente de celle de son modèle, une simple copie sera générer, confirmer ? ",,