test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: added territory field in organization page

Browse Source
This commit is contained in:
Shariq Ansari 2024-01-04 19:31:17 +05:30
parent ebf9b40746
commit c3c18ca119
5 changed files with 62 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crm/fcrm/doctype/crm_territory/crm_territory.json
View File

@ -1,6 +1,7 @@
{
"actions": [],
"allow_rename": 1,
"autoname": "field:territory_name",
"creation": "2024-01-04 18:52:58.872535",
"doctype": "DocType",
"engine": "InnoDB",
@ -22,7 +23,8 @@
"fieldtype": "Data",
"in_list_view": 1,
"label": "Territory Name",
"reqd": 1
"reqd": 1,
"unique": 1
},
{
"default": "0",
@ -87,10 +89,11 @@
"index_web_pages_for_search": 1,
"is_tree": 1,
"links": [],
"modified": "2024-01-04 18:56:49.292276",
"modified": "2024-01-04 19:16:36.234887",
"modified_by": "Administrator",
"module": "FCRM",
"name": "CRM Territory",
"naming_rule": "By fieldname",
"nsm_parent_field": "parent_crm_territory",
"owner": "Administrator",
"permissions": [

21
frontend/src/components/Icons/TerritoryIcon.vue Normal file
View File

@ -0,0 +1,21 @@
<template>
<svg
xmlns="http://www.w3.org/2000/svg"
width="16"
height="16"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="1.5"
stroke-linecap="round"
stroke-linejoin="round"
class="lucide lucide-land-plot"
>
<path d="m12 8 6-3-6-3v10" />
<path
d="m8 11.99-5.5 3.14a1 1 0 0 0 0 1.74l8.5 4.86a2 2 0 0 0 2 0l8.5-4.86a1 1 0 0 0 0-1.74L16 12"
/>
<path d="m6.49 12.85 11.02 6.3" />
<path d="M17.51 12.85 6.5 19.15" />
</svg>
</template>

15
frontend/src/components/Modals/OrganizationModal.vue
View File

@ -66,6 +66,15 @@
placeholder="Add Annual Revenue"
/>
</div>
<Link
class="flex-1"
size="md"
label="Territory"
variant="outline"
v-model="_organization.territory"
doctype="CRM Territory"
placeholder="Add Territory"
/>
<div class="flex gap-4">
<FormControl
class="flex-1"
@ -119,6 +128,7 @@
import EditIcon from '@/components/Icons/EditIcon.vue'
import WebsiteIcon from '@/components/Icons/WebsiteIcon.vue'
import OrganizationsIcon from '@/components/Icons/OrganizationsIcon.vue'
import TerritoryIcon from '@/components/Icons/TerritoryIcon.vue'
import Link from '@/components/Controls/Link.vue'
import { organizationsStore } from '@/stores/organizations'
import { FormControl, Dialog, call, FeatherIcon } from 'frappe-ui'
@ -252,6 +262,11 @@ const fields = computed(() => {
name: 'website',
value: _organization.value.website,
},
{
icon: TerritoryIcon,
name: 'territory',
value: _organization.value.territory,
},
{
icon: h(FeatherIcon, { name: 'dollar-sign', class: 'h-4 w-4' }),
name: 'annual_revenue',

11
frontend/src/pages/Contact.vue
View File

@ -65,7 +65,7 @@
<span class="">{{ contact.email_id }}</span>
</div>
<span
v-if="contact.mobile_no && contact.email_id"
v-if="contact.email_id"
class="text-3xl leading-[0] text-gray-600"
>
&middot;
@ -80,10 +80,7 @@
<span class="">{{ contact.mobile_no }}</span>
</Tooltip>
<span
v-if="
(contact.email_id || contact.mobile_no) &&
contact.company_name
"
v-if="contact.mobile_no"
class="text-3xl leading-[0] text-gray-600"
>
&middot;
@ -102,9 +99,7 @@
<span class="">{{ contact.company_name }}</span>
</div>
<span
v-if="
contact.email_id || contact.mobile_no || contact.company_name
"
v-if="contact.company_name"
class="text-3xl leading-[0] text-gray-600"
>
&middot;

28
frontend/src/pages/Organization.vue
View File

@ -66,7 +66,7 @@
<span class="">{{ website(organization.website) }}</span>
</div>
<span
v-if="organization.industry && organization.website"
v-if="organization.website"
class="text-3xl leading-[0] text-gray-600"
>
&middot;
@ -79,10 +79,20 @@
<span class="">{{ organization.industry }}</span>
</div>
<span
v-if="
(organization.website || organization.industry) &&
organization.annual_revenue
"
v-if="organization.industry"
class="text-3xl leading-[0] text-gray-600"
>
&middot;
</span>
<div
v-if="organization.territory"
class="flex items-center gap-1.5"
>
<TerritoryIcon class="h-4 w-4" />
<span class="">{{ organization.territory }}</span>
</div>
<span
v-if="organization.territory"
class="text-3xl leading-[0] text-gray-600"
>
&middot;
@ -95,11 +105,7 @@
<span class="">{{ organization.annual_revenue }}</span>
</div>
<span
v-if="
organization.website ||
organization.industry ||
organization.annual_revenue
"
v-if="organization.annual_revenue"
class="text-3xl leading-[0] text-gray-600"
>
&middot;
@ -108,6 +114,7 @@
v-if="
organization.website ||
organization.industry ||
organization.territory ||
organization.annual_revenue
"
variant="ghost"
@ -243,6 +250,7 @@ import LeadsListView from '@/components/ListViews/LeadsListView.vue'
import DealsListView from '@/components/ListViews/DealsListView.vue'
import ContactsListView from '@/components/ListViews/ContactsListView.vue'
import WebsiteIcon from '@/components/Icons/WebsiteIcon.vue'
import TerritoryIcon from '@/components/Icons/TerritoryIcon.vue'
import EditIcon from '@/components/Icons/EditIcon.vue'
import CameraIcon from '@/components/Icons/CameraIcon.vue'
import LeadsIcon from '@/components/Icons/LeadsIcon.vue'