amsdal_crm 0.1.2__tar.gz → 0.1.3__tar.gz

{amsdal_crm-0.1.2 → amsdal_crm-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_crm
-Version: 0.1.2
+Version: 0.1.3
 Summary: amsdal-crm plugin for AMSDAL Framework
 Requires-Python: >=3.11
 Requires-Dist: aiohttp==3.12.15

amsdal_crm-0.1.3/amsdal_crm/__about__.py

@@ -0,0 +1 @@
+__version__ = '0.1.3'

{amsdal_crm-0.1.2 → amsdal_crm-0.1.3}/amsdal_crm/lifecycle/consumer.py

@@ -98,9 +98,6 @@ def _add_custom_fields_to_control(control: dict[str, Any], custom_field_controls
     if 'controls' not in control:
         control['controls'] = []
 
-    if 'control' in control:
-        control.pop('control', None)
-
     # Find the custom_fields control and update it, or append custom fields at the end
     custom_fields_control = None
     for ctrl in control.get('controls', []):
@@ -112,6 +109,8 @@ def _add_custom_fields_to_control(control: dict[str, Any], custom_field_controls
         # Update the custom_fields control to be a group with nested controls
         custom_fields_control['type'] = 'group'
         custom_fields_control['controls'] = custom_field_controls
+        if 'control' in custom_fields_control:
+            custom_fields_control.pop('control', None)
     else:
         # Add custom fields as a new group at the end
         control['controls'].append(

{amsdal_crm-0.1.2 → amsdal_crm-0.1.3}/amsdal_crm/models/account.py

@@ -89,7 +89,7 @@ class Account(TimestampMixin, Model):
         if self.custom_fields:
             from amsdal_crm.services.custom_field_service import CustomFieldService
 
-            self.custom_fields = CustomFieldService.validate_custom_fields('Account', self.custom_fields)
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields('Account', self.custom_fields)
         await super().apre_create()
 
     def pre_update(self) -> None:
@@ -109,7 +109,7 @@ class Account(TimestampMixin, Model):
         if self.custom_fields:
             from amsdal_crm.services.custom_field_service import CustomFieldService
 
-            self.custom_fields = CustomFieldService.validate_custom_fields('Account', self.custom_fields)
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields('Account', self.custom_fields)
 
         # Call parent to handle timestamps
         await super().apre_update()
@@ -124,4 +124,4 @@ class Account(TimestampMixin, Model):
         """Async hook called after updating account."""
         from amsdal_crm.services.workflow_service import WorkflowService
 
-        WorkflowService.execute_rules('Account', 'update', self)
+        await WorkflowService.aexecute_rules('Account', 'update', self)

{amsdal_crm-0.1.2 → amsdal_crm-0.1.3}/amsdal_crm/models/contact.py

@@ -89,7 +89,7 @@ class Contact(TimestampMixin, Model):
         if self.custom_fields:
             from amsdal_crm.services.custom_field_service import CustomFieldService
 
-            self.custom_fields = CustomFieldService.validate_custom_fields('Contact', self.custom_fields)
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields('Contact', self.custom_fields)
         await super().apre_create()
 
     def pre_update(self) -> None:
@@ -109,7 +109,7 @@ class Contact(TimestampMixin, Model):
         if self.custom_fields:
             from amsdal_crm.services.custom_field_service import CustomFieldService
 
-            self.custom_fields = CustomFieldService.validate_custom_fields('Contact', self.custom_fields)
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields('Contact', self.custom_fields)
 
         # Call parent to handle timestamps
         await super().apre_update()
@@ -124,7 +124,7 @@ class Contact(TimestampMixin, Model):
         """Async hook called after updating contact."""
         from amsdal_crm.services.workflow_service import WorkflowService
 
-        WorkflowService.execute_rules('Contact', 'update', self)
+        await WorkflowService.aexecute_rules('Contact', 'update', self)
 
 
 from amsdal_crm.models.account import Account

{amsdal_crm-0.1.2 → amsdal_crm-0.1.3}/amsdal_crm/models/deal.py

@@ -99,7 +99,7 @@ class Deal(TimestampMixin, Model):
         if self.custom_fields:
             from amsdal_crm.services.custom_field_service import CustomFieldService
 
-            self.custom_fields = CustomFieldService.validate_custom_fields('Deal', self.custom_fields)
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields('Deal', self.custom_fields)
         await super().apre_create()
 
     def pre_update(self) -> None:
@@ -137,7 +137,7 @@ class Deal(TimestampMixin, Model):
         if self.custom_fields:
             from amsdal_crm.services.custom_field_service import CustomFieldService
 
-            self.custom_fields = CustomFieldService.validate_custom_fields('Deal', self.custom_fields)
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields('Deal', self.custom_fields)
 
         # Load stage if it's a reference and sync closed status
         from amsdal_models.classes.helpers.reference_loader import ReferenceLoader

amsdal_crm-0.1.2/amsdal_crm/__about__.py

@@ -1 +0,0 @@
-__version__ = '0.1.2'