1
0
forked from test/crm

Merge pull request #159 from frappe/develop

chore: Merge develop to main
This commit is contained in:
Shariq Ansari 2024-04-30 13:59:25 +05:30 committed by GitHub
commit 75d99ea0e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 342 additions and 244 deletions

View File

@ -1,8 +1,8 @@
// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
// frappe.ui.form.on("CRM Deal", {
// refresh(frm) {
// },
// });
frappe.ui.form.on("CRM Deal", {
refresh(frm) {
frm.add_web_link(`/crm/deals/${frm.doc.name}`, __("Open in Portal"));
},
});

View File

@ -1,8 +1,8 @@
// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
// frappe.ui.form.on("CRM Lead", {
// refresh(frm) {
// },
// });
frappe.ui.form.on("CRM Lead", {
refresh(frm) {
frm.add_web_link(`/crm/leads/${frm.doc.name}`, __("Open in Portal"));
},
});

View File

@ -10,7 +10,7 @@
<div class="mb-3 flex flex-col">
<SidebarLink
id="notifications-btn"
:label="__('Notifications')"
label="Notifications"
:icon="NotificationsIcon"
:isCollapsed="isSidebarCollapsed"
@click="() => toggleNotificationPanel()"
@ -67,7 +67,7 @@
<SidebarLink
v-for="link in view.views"
:icon="link.icon"
:label="__(link.label)"
:label="link.label"
:to="link.to"
:isCollapsed="isSidebarCollapsed"
class="mx-2 my-0.5"
@ -78,13 +78,13 @@
</div>
<div class="m-2 flex flex-col gap-1">
<SidebarLink
:label="__('Docs')"
label="Docs"
:isCollapsed="isSidebarCollapsed"
icon="book-open"
@click="() => openDocs()"
/>
<SidebarLink
:label="isSidebarCollapsed ? __('Expand') : __('Collapse')"
:label="isSidebarCollapsed ? 'Expand' : 'Collapse'"
:isCollapsed="isSidebarCollapsed"
@click="isSidebarCollapsed = !isSidebarCollapsed"
class=""

View File

@ -22,10 +22,7 @@
v-slot="{ idx, column, item }"
:row="row"
>
<ListRowItem
:item="item"
@click="(event) => emit('applyFilter', { event, idx, column, item })"
>
<ListRowItem :item="item">
<template #prefix>
<div v-if="['caller', 'receiver'].includes(column.key)">
<Avatar
@ -40,30 +37,47 @@
<FeatherIcon :name="item.icon" class="h-3 w-3" />
</div>
</template>
<div
v-if="['modified', 'creation'].includes(column.key)"
class="truncate text-base"
>
<Tooltip :text="item.label">
<div>{{ item.timeAgo }}</div>
</Tooltip>
</div>
<div v-else-if="column.key === 'status'" class="truncate text-base">
<Badge
:variant="'subtle'"
:theme="item.color"
size="md"
:label="__(item.label)"
/>
</div>
<div v-else-if="column.type === 'Check'">
<FormControl
type="checkbox"
:modelValue="item"
:disabled="true"
class="text-gray-900"
/>
</div>
<template #default="{ label }">
<div
v-if="['modified', 'creation'].includes(column.key)"
class="truncate text-base"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
>
<Tooltip :text="item.label">
<div>{{ item.timeAgo }}</div>
</Tooltip>
</div>
<div v-else-if="column.key === 'status'" class="truncate text-base">
<Badge
:variant="'subtle'"
:theme="item.color"
size="md"
:label="__(item.label)"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
/>
</div>
<div v-else-if="column.type === 'Check'">
<FormControl
type="checkbox"
:modelValue="item"
:disabled="true"
class="text-gray-900"
/>
</div>
<div
v-else
class="truncate text-base"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
>
{{ label }}
</div>
</template>
</ListRowItem>
</ListRow>
</ListRows>

View File

@ -23,10 +23,7 @@
v-slot="{ idx, column, item }"
:row="row"
>
<ListRowItem
:item="item"
@click="(event) => emit('applyFilter', { event, idx, column, item })"
>
<ListRowItem :item="item">
<template #prefix>
<div v-if="column.key === 'full_name'">
<Avatar
@ -50,22 +47,36 @@
<PhoneIcon class="h-4 w-4" />
</div>
</template>
<div
v-if="['modified', 'creation'].includes(column.key)"
class="truncate text-base"
>
<Tooltip :text="item.label">
<div>{{ item.timeAgo }}</div>
</Tooltip>
</div>
<div v-else-if="column.type === 'Check'">
<FormControl
type="checkbox"
:modelValue="item"
:disabled="true"
class="text-gray-900"
/>
</div>
<template #default="{ label }">
<div
v-if="['modified', 'creation'].includes(column.key)"
class="truncate text-base"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
>
<Tooltip :text="item.label">
<div>{{ item.timeAgo }}</div>
</Tooltip>
</div>
<div v-else-if="column.type === 'Check'">
<FormControl
type="checkbox"
:modelValue="item"
:disabled="true"
class="text-gray-900"
/>
</div>
<div
v-else
class="truncate text-base"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
>
{{ label }}
</div>
</template>
</ListRowItem>
</ListRow>
</ListRows>

View File

@ -20,18 +20,16 @@
v-slot="{ idx, column, item }"
:row="row"
>
<div
v-if="column.key === '_assign'"
class="flex items-center"
@click="(event) => emit('applyFilter', { event, idx, column, item })"
>
<MultipleAvatar :avatars="item" size="sm" />
<div v-if="column.key === '_assign'" class="flex items-center">
<MultipleAvatar
:avatars="item"
size="sm"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
/>
</div>
<ListRowItem
v-else
:item="item"
@click="(event) => emit('applyFilter', { event, idx, column, item })"
>
<ListRowItem v-else :item="item">
<template #prefix>
<div v-if="column.key === 'status'">
<IndicatorIcon :class="item.color" />
@ -58,42 +56,59 @@
<PhoneIcon class="h-4 w-4" />
</div>
</template>
<div
v-if="
[
'modified',
'creation',
'first_response_time',
'first_responded_on',
'response_by',
].includes(column.key)
"
class="truncate text-base"
>
<Tooltip :text="item.label">
<div>{{ item.timeAgo }}</div>
</Tooltip>
</div>
<div
v-else-if="column.key === 'sla_status'"
class="truncate text-base"
>
<Badge
v-if="item.value"
:variant="'subtle'"
:theme="item.color"
size="md"
:label="item.value"
/>
</div>
<div v-else-if="column.type === 'Check'">
<FormControl
type="checkbox"
:modelValue="item"
:disabled="true"
class="text-gray-900"
/>
</div>
<template #default="{ label }">
<div
v-if="
[
'modified',
'creation',
'first_response_time',
'first_responded_on',
'response_by',
].includes(column.key)
"
class="truncate text-base"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
>
<Tooltip :text="item.label">
<div>{{ item.timeAgo }}</div>
</Tooltip>
</div>
<div
v-else-if="column.key === 'sla_status'"
class="truncate text-base"
>
<Badge
v-if="item.value"
:variant="'subtle'"
:theme="item.color"
size="md"
:label="item.value"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
/>
</div>
<div v-else-if="column.type === 'Check'">
<FormControl
type="checkbox"
:modelValue="item"
:disabled="true"
class="text-gray-900"
/>
</div>
<div
v-else
class="truncate text-base"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
>
{{ label }}
</div>
</template>
</ListRowItem>
</ListRow>
</ListRows>

View File

@ -19,37 +19,51 @@
v-slot="{ idx, column, item }"
:row="row"
>
<ListRowItem
:item="item"
@click="(event) => emit('applyFilter', { event, idx, column, item })"
>
<ListRowItem :item="item">
<!-- <template #prefix>
</template> -->
<div
v-if="['modified', 'creation'].includes(column.key)"
class="truncate text-base"
>
<Tooltip :text="item.label">
<div>{{ item.timeAgo }}</div>
</Tooltip>
</div>
<div v-else-if="column.key === 'status'" class="truncate text-base">
<Badge
:variant="'subtle'"
:theme="item.color"
size="md"
:label="item.label"
/>
</div>
<div v-else-if="column.type === 'Check'">
<FormControl
type="checkbox"
:modelValue="item"
:disabled="true"
class="text-gray-900"
/>
</div>
<template #default="{ label }">
<div
v-if="['modified', 'creation'].includes(column.key)"
class="truncate text-base"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
>
<Tooltip :text="item.label">
<div>{{ item.timeAgo }}</div>
</Tooltip>
</div>
<div v-else-if="column.key === 'status'" class="truncate text-base">
<Badge
:variant="'subtle'"
:theme="item.color"
size="md"
:label="item.label"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
/>
</div>
<div v-else-if="column.type === 'Check'">
<FormControl
type="checkbox"
:modelValue="item"
:disabled="true"
class="text-gray-900"
/>
</div>
<div
v-else
class="truncate text-base"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
>
{{ label }}
</div>
</template>
</ListRowItem>
</ListRow>
</ListRows>

View File

@ -20,18 +20,16 @@
v-slot="{ idx, column, item }"
:row="row"
>
<div
v-if="column.key === '_assign'"
class="flex items-center"
@click="(event) => emit('applyFilter', { event, idx, column, item })"
>
<MultipleAvatar :avatars="item" size="sm" />
<div v-if="column.key === '_assign'" class="flex items-center">
<MultipleAvatar
:avatars="item"
size="sm"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
/>
</div>
<ListRowItem
v-else
:item="item"
@click="(event) => emit('applyFilter', { event, idx, column, item })"
>
<ListRowItem v-else :item="item">
<template #prefix>
<div v-if="column.key === 'status'">
<IndicatorIcon :class="item.color" />
@ -67,42 +65,59 @@
<PhoneIcon class="h-4 w-4" />
</div>
</template>
<div
v-if="
[
'modified',
'creation',
'first_response_time',
'first_responded_on',
'response_by',
].includes(column.key)
"
class="truncate text-base"
>
<Tooltip :text="item.label">
<div>{{ item.timeAgo }}</div>
</Tooltip>
</div>
<div
v-else-if="column.key === 'sla_status'"
class="truncate text-base"
>
<Badge
v-if="item.value"
:variant="'subtle'"
:theme="item.color"
size="md"
:label="item.value"
/>
</div>
<div v-else-if="column.type === 'Check'">
<FormControl
type="checkbox"
:modelValue="item"
:disabled="true"
class="text-gray-900"
/>
</div>
<template #default="{ label }">
<div
v-if="
[
'modified',
'creation',
'first_response_time',
'first_responded_on',
'response_by',
].includes(column.key)
"
class="truncate text-base"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
>
<Tooltip :text="item.label">
<div>{{ item.timeAgo }}</div>
</Tooltip>
</div>
<div
v-else-if="column.key === 'sla_status'"
class="truncate text-base"
>
<Badge
v-if="item.value"
:variant="'subtle'"
:theme="item.color"
size="md"
:label="item.value"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
/>
</div>
<div v-else-if="column.type === 'Check'">
<FormControl
type="checkbox"
:modelValue="item"
:disabled="true"
class="text-gray-900"
/>
</div>
<div
v-else
class="truncate text-base"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
>
{{ label }}
</div>
</template>
</ListRowItem>
</ListRow>
</ListRows>
@ -213,7 +228,9 @@ function editValues(selections, unselectAll) {
function deleteValues(selections, unselectAll) {
$dialog({
title: __('Delete'),
message: __('Are you sure you want to delete {0} item(s)?', [selections.size]),
message: __('Are you sure you want to delete {0} item(s)?', [
selections.size,
]),
variant: 'danger',
actions: [
{

View File

@ -22,10 +22,7 @@
v-slot="{ idx, column, item }"
:row="row"
>
<ListRowItem
:item="item"
@click="(event) => emit('applyFilter', { event, idx, column, item })"
>
<ListRowItem :item="item">
<template #prefix>
<div v-if="column.key === 'organization_name'">
<Avatar
@ -37,22 +34,36 @@
/>
</div>
</template>
<div
v-if="['modified', 'creation'].includes(column.key)"
class="truncate text-base"
>
<Tooltip :text="item.label">
<div>{{ item.timeAgo }}</div>
</Tooltip>
</div>
<div v-else-if="column.type === 'Check'">
<FormControl
type="checkbox"
:modelValue="item"
:disabled="true"
class="text-gray-900"
/>
</div>
<template #default="{ label }">
<div
v-if="['modified', 'creation'].includes(column.key)"
class="truncate text-base"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
>
<Tooltip :text="item.label">
<div>{{ item.timeAgo }}</div>
</Tooltip>
</div>
<div v-else-if="column.type === 'Check'">
<FormControl
type="checkbox"
:modelValue="item"
:disabled="true"
class="text-gray-900"
/>
</div>
<div
v-else
class="truncate text-base"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
>
{{ label }}
</div>
</template>
</ListRowItem>
</ListRow>
</ListRows>

View File

@ -29,11 +29,7 @@
</div>
</Tooltip>
</div>
<ListRowItem
v-else
:item="item"
@click="(event) => emit('applyFilter', { event, idx, column, item })"
>
<ListRowItem v-else :item="item">
<template #prefix>
<div v-if="column.key === 'status'">
<TaskStatusIcon :status="item" />
@ -51,22 +47,36 @@
/>
</div>
</template>
<div
v-if="['modified', 'creation'].includes(column.key)"
class="truncate text-base"
>
<Tooltip :text="item.label">
<div>{{ item.timeAgo }}</div>
</Tooltip>
</div>
<div v-else-if="column.type === 'Check'">
<FormControl
type="checkbox"
:modelValue="item"
:disabled="true"
class="text-gray-900"
/>
</div>
<template #default="{ label }">
<div
v-if="['modified', 'creation'].includes(column.key)"
class="truncate text-base"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
>
<Tooltip :text="item.label">
<div>{{ item.timeAgo }}</div>
</Tooltip>
</div>
<div v-else-if="column.type === 'Check'">
<FormControl
type="checkbox"
:modelValue="item"
:disabled="true"
class="text-gray-900"
/>
</div>
<div
v-else
class="truncate text-base"
@click="
(event) => emit('applyFilter', { event, idx, column, item })
"
>
{{ label }}
</div>
</template>
</ListRowItem>
</ListRow>
</ListRows>
@ -177,7 +187,9 @@ function editValues(selections, unselectAll) {
function deleteValues(selections, unselectAll) {
$dialog({
title: __('Delete'),
message: __('Are you sure you want to delete {0} item(s)?'),
message: __('Are you sure you want to delete {0} item(s)?', [
selections.size,
]),
variant: 'danger',
actions: [
{

View File

@ -17,7 +17,7 @@
<Switch v-model="chooseExistingContact" />
</div>
</div>
<Fields class="border-t" :sections="sections" :data="deal" />
<Fields class="border-t pt-4" :sections="sections" :data="deal" />
<ErrorMessage class="mt-4" v-if="error" :message="__(error)" />
</template>
<template #actions>

View File

@ -6,10 +6,12 @@
:class="[field.hidden && 'hidden']"
class="flex items-center gap-2 px-3 leading-5 first:mt-3"
>
<div class="w-[106px] shrink-0 text-sm text-gray-600">
{{ __(field.label) }}
<span class="text-red-500">{{ field.reqd ? ' *' : '' }}</span>
</div>
<Tooltip :text="__(field.label)" hoverDelay="1">
<div class="w-[106px] shrink-0 truncate text-sm text-gray-600">
<span>{{ __(field.label) }}</span>
<span class="text-red-500">{{ field.reqd ? ' *' : '' }}</span>
</div>
</Tooltip>
<div
class="grid min-h-[28px] flex-1 items-center overflow-hidden text-base"
>

View File

@ -8,8 +8,8 @@
class="flex w-full items-center justify-between duration-300 ease-in-out"
:class="isCollapsed ? 'ml-[3px] p-1' : 'px-2 py-1'"
>
<div class="flex items-center">
<Tooltip :text="label" placement="right" :disabled="!isCollapsed">
<div class="flex items-center truncate">
<Tooltip :text="__(label)" placement="right" :disabled="!isCollapsed">
<slot name="icon">
<span class="grid h-4.5 w-4.5 flex-shrink-0 place-items-center">
<FeatherIcon
@ -21,16 +21,18 @@
</span>
</slot>
</Tooltip>
<span
class="flex-1 flex-shrink-0 text-base duration-300 ease-in-out"
:class="
isCollapsed
? 'ml-0 w-0 overflow-hidden opacity-0'
: 'ml-2 w-auto opacity-100'
"
>
{{ label }}
</span>
<Tooltip :text="__(label)" placement="right" :disabled="isCollapsed" hoverDelay="1.5">
<span
class="flex-1 flex-shrink-0 truncate text-base duration-300 ease-in-out"
:class="
isCollapsed
? 'ml-0 w-0 overflow-hidden opacity-0'
: 'ml-2 w-auto opacity-100'
"
>
{{ __(label) }}
</span>
</Tooltip>
</div>
<slot name="right" />
</div>