feat: use address object for lead address (#867)

* RM#89399
axelor · Jan 16, 2025 · 136ba5f · 136ba5f
1 parent c16d973
commit 136ba5f
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/changelogs/unreleased/89399.json b/changelogs/unreleased/89399.json
@@ -0,0 +1,5 @@
+{
+  "title": "Lead: manage address through the address field",
+  "type": "feat",
+  "packages": "crm"
+}
diff --git a/packages/apps/crm/src/components/organisms/Event/EventLeadCard/EventLeadCard.js b/packages/apps/crm/src/components/organisms/Event/EventLeadCard/EventLeadCard.js
@@ -52,7 +52,7 @@ const EventLeadCard = ({}) => {
       style={styles.item}
       leadsFullname={lead.simpleFullName}
       leadsCompany={lead.enterpriseName}
-      leadsAddress={lead.primaryAddress}
+      leadsAddress={lead.address?.fullName}
       leadsFixedPhone={lead.fixedPhone}
       leadsPhoneNumber={lead.mobilePhone}
       leadsEmail={lead.emailAddress?.address}

diff --git a/packages/apps/crm/src/components/organisms/Lead/LeadDropdownCards/LeadDropdownCards.js b/packages/apps/crm/src/components/organisms/Lead/LeadDropdownCards/LeadDropdownCards.js
@@ -51,7 +51,7 @@ const LeadDropdownCards = ({}) => {
             key: 1,
             childrenComp: (
               <DropdownContactView
-                address={lead.primaryAddress}
+                address={lead.address?.fullName}
                 fixedPhone={lead.fixedPhone}
                 mobilePhone={lead.mobilePhone}
                 emailAddress={lead.emailAddress?.address}

diff --git a/packages/apps/crm/src/hooks/use-crm-header-actions.ts b/packages/apps/crm/src/hooks/use-crm-header-actions.ts
@@ -214,7 +214,7 @@ const useLeadDetailsActions = () => {
               fixedPhone: lead.fixedPhone,
               email: lead.emailAddress?.address,
               address: {
-                street: lead.primaryAddress,
+                street: lead.address?.fullName,
               },
               notes: lead.description,
             }),

diff --git a/packages/apps/crm/src/models/forms.ts b/packages/apps/crm/src/models/forms.ts
@@ -236,11 +236,6 @@ export const crm_formsRegister: FormConfigs = {
         widget: 'custom',
         customComponent: FunctionSearchBar,
       },
-      primaryAddress: {
-        titleKey: 'Crm_Address',
-        type: 'string',
-        widget: 'default',
-      },
       fixedPhone: {
         titleKey: 'Crm_Phone',
         type: 'phone',

diff --git a/packages/apps/crm/src/models/objectFields.ts b/packages/apps/crm/src/models/objectFields.ts
@@ -109,7 +109,7 @@ export const crm_modelAPI: ObjectFields = {
     firstName: schemaContructor.string(),
     simpleFullName: schemaContructor.string(),
     leadStatus: schemaContructor.subObject('name'),
-    primaryAddress: schemaContructor.string(),
+    address: schemaContructor.subObject('fullName'),
     emailAddress: schemaContructor.subObject('address'),
     mobilePhone: schemaContructor.string(),
     fixedPhone: schemaContructor.string(),

diff --git a/packages/apps/crm/src/models/searchFields.ts b/packages/apps/crm/src/models/searchFields.ts
@@ -40,7 +40,7 @@ export const crm_searchFields: SearchFields = {
   crm_lead: [
     'simpleFullName',
     'enterpriseName',
-    'primaryAddress',
+    'address.fullName',
     'mobilePhone',
     'fixedPhone',
     'emailAddress.name',

diff --git a/packages/apps/crm/src/screens/lead/LeadListScreen.js b/packages/apps/crm/src/screens/lead/LeadListScreen.js
@@ -92,7 +92,7 @@ const LeadListScreen = ({navigation}) => {
             style={styles.item}
             leadsFullname={item.simpleFullName}
             leadsCompany={item.enterpriseName}
-            leadsAddress={item.primaryAddress}
+            leadsAddress={item.address?.fullName}
             leadsFixedPhone={item.fixedPhone}
             leadsPhoneNumber={item.mobilePhone}
             leadsEmail={item.emailAddress?.address}