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

fix: resolved conflicts

Browse Source 
(cherry picked from commit c98beaee9c385ac26151845d765126d736b1ed40)

# Conflicts:
#	frontend/src/pages/Contact.vue
#	frontend/src/pages/Lead.vue
#	frontend/src/pages/MobileContact.vue
This commit is contained in:
Shariq Ansari 2025-06-09 14:03:07 +05:30 committed by Mergify
parent 8c43732d2e
commit a4892f1918
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,7 +184,11 @@ import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
import CameraIcon from '@/components/Icons/CameraIcon.vue' import CameraIcon from '@/components/Icons/CameraIcon.vue'
import DealsIcon from '@/components/Icons/DealsIcon.vue' import DealsIcon from '@/components/Icons/DealsIcon.vue'
import DealsListView from '@/components/ListViews/DealsListView.vue' import DealsListView from '@/components/ListViews/DealsListView.vue'
<<<<<<< HEAD
import { formatDate, timeAgo } from '@/utils' import { formatDate, timeAgo } from '@/utils'
=======
import { formatDate, timeAgo, validateIsImageFile } from '@/utils'
>>>>>>> c98beae (fix: resolved conflicts)
import { showAddressModal, addressProps } from '@/composables/modals' import { showAddressModal, addressProps } from '@/composables/modals'
import { getView } from '@/utils/view' import { getView } from '@/utils/view'
import { getSettings } from '@/stores/settings' import { getSettings } from '@/stores/settings'

9
frontend/src/pages/Lead.vue
View File

@ -344,7 +344,16 @@ import SidePanelLayout from '@/components/SidePanelLayout.vue'
import FieldLayout from '@/components/FieldLayout/FieldLayout.vue' import FieldLayout from '@/components/FieldLayout/FieldLayout.vue'
import SLASection from '@/components/SLASection.vue' import SLASection from '@/components/SLASection.vue'
import CustomActions from '@/components/CustomActions.vue' import CustomActions from '@/components/CustomActions.vue'
<<<<<<< HEAD
import { openWebsite, setupCustomizations, copyToClipboard } from '@/utils' import { openWebsite, setupCustomizations, copyToClipboard } from '@/utils'
=======
import {
openWebsite,
setupCustomizations,
copyToClipboard,
validateIsImageFile,
} from '@/utils'
>>>>>>> c98beae (fix: resolved conflicts)
import { showQuickEntryModal, quickEntryProps } from '@/composables/modals' import { showQuickEntryModal, quickEntryProps } from '@/composables/modals'
import { getView } from '@/utils/view' import { getView } from '@/utils/view'
import { getSettings } from '@/stores/settings' import { getSettings } from '@/stores/settings'

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

@ -11,7 +11,14 @@
</header> </header>
</LayoutHeader> </LayoutHeader>
<div v-if="contact.data" class="flex flex-col h-full overflow-hidden"> <div v-if="contact.data" class="flex flex-col h-full overflow-hidden">
<<<<<<< HEAD
<FileUploader @success="changeContactImage" :validateFile="validateFile"> <FileUploader @success="changeContactImage" :validateFile="validateFile">
=======
<FileUploader
@success="changeContactImage"
:validateFile="validateIsImageFile"
>
>>>>>>> c98beae (fix: resolved conflicts)
<template #default="{ openFileSelector, error }"> <template #default="{ openFileSelector, error }">
<div class="flex flex-col items-start justify-start gap-4 p-4"> <div class="flex flex-col items-start justify-start gap-4 p-4">
<div class="flex gap-4 items-center"> <div class="flex gap-4 items-center">
@ -167,7 +174,11 @@ import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
import CameraIcon from '@/components/Icons/CameraIcon.vue' import CameraIcon from '@/components/Icons/CameraIcon.vue'
import DealsIcon from '@/components/Icons/DealsIcon.vue' import DealsIcon from '@/components/Icons/DealsIcon.vue'
import DealsListView from '@/components/ListViews/DealsListView.vue' import DealsListView from '@/components/ListViews/DealsListView.vue'
<<<<<<< HEAD
import { formatDate, timeAgo } from '@/utils' import { formatDate, timeAgo } from '@/utils'
=======
import { formatDate, timeAgo, validateIsImageFile } from '@/utils'
>>>>>>> c98beae (fix: resolved conflicts)
import { getView } from '@/utils/view' import { getView } from '@/utils/view'
import { showAddressModal, addressProps } from '@/composables/modals' import { showAddressModal, addressProps } from '@/composables/modals'
import { getSettings } from '@/stores/settings' import { getSettings } from '@/stores/settings'