Merge pull request #909 from shariquerik/backport-issue

frontend/src/components/Modals/CallLogModal.vue

@@ -10,7 +10,12 @@
             <Badge v-if="callLog.isDirty" :label="'Not Saved'" theme="orange" />
           </div>
           <div class="flex items-center gap-1">
-            <Button v-if="isManager() && !isMobileView" variant="ghost" class="w-7" @click="openQuickEntryModal">
+            <Button
+              v-if="isManager() && !isMobileView"
+              variant="ghost"
+              class="w-7"
+              @click="openQuickEntryModal"
+            >
               <EditIcon class="w-4 h-4" />
             </Button>
             <Button variant="ghost" class="w-7" @click="show = false">
@@ -19,19 +24,28 @@
           </div>
         </div>
         <div v-if="tabs.data">
-          <FieldLayout :tabs="tabs.data" :data="_callLog" doctype="CRM Call Log" />
+          <FieldLayout
+            :tabs="tabs.data"
+            :data="callLog.doc"
+            doctype="CRM Call Log"
+          />
           <ErrorMessage class="mt-8" :message="error" />
         </div>
       </div>
       <div class="px-4 pt-4 pb-7 sm:px-6">
         <div class="space-y-2">
-          <Button class="w-full" v-for="action in dialogOptions.actions" :key="action.label" v-bind="action"
-            :label="__(action.label)" :loading="loading" />
+          <Button
+            class="w-full"
+            v-for="action in dialogOptions.actions"
+            :key="action.label"
+            v-bind="action"
+            :label="__(action.label)"
+            :loading="loading"
+          />
         </div>
       </div>
     </template>
   </Dialog>
-  <QuickEntryModal v-if="showQuickEntryModal" v-model="showQuickEntryModal" doctype="CRM Call Log" />
 </template>
 
 <script setup>
@@ -54,7 +68,7 @@ const props = defineProps({
   options: {
     type: Object,
     default: {
-      afterInsert: () => { },
+      afterInsert: () => {},
     },
   },
 })

frontend/src/components/Modals/OrganizationModal.vue

@@ -9,7 +9,12 @@
             </h3>
           </div>
           <div class="flex items-center gap-1">
-            <Button v-if="isManager() && !isMobileView" variant="ghost" class="w-7" @click="openQuickEntryModal">
+            <Button
+              v-if="isManager() && !isMobileView"
+              variant="ghost"
+              class="w-7"
+              @click="openQuickEntryModal"
+            >
               <EditIcon class="w-4 h-4" />
             </Button>
             <Button variant="ghost" class="w-7" @click="show = false">
@@ -27,7 +32,13 @@
       </div>
       <div class="px-4 pt-4 pb-7 sm:px-6">
         <div class="space-y-2">
-          <Button class="w-full" variant="solid" :label="__('Create')" :loading="loading" @click="createOrganization" />
+          <Button
+            class="w-full"
+            variant="solid"
+            :label="__('Create')"
+            :loading="loading"
+            @click="createOrganization"
+          />
         </div>
       </div>
     </template>
@@ -60,7 +71,7 @@ const props = defineProps({
     type: Object,
     default: {
       redirect: true,
-      afterInsert: () => { },
+      afterInsert: () => {},
     },
   },
 })
@@ -156,4 +167,4 @@ function openAddressModal(_address) {
   }
   nextTick(() => (show.value = false))
 }
-</script>
+</script>

frontend/src/pages/Contact.vue

@@ -184,16 +184,8 @@ import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
 import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import DealsIcon from '@/components/Icons/DealsIcon.vue'
 import DealsListView from '@/components/ListViews/DealsListView.vue'
-<<<<<<< HEAD
-<<<<<<< HEAD
-import { formatDate, timeAgo } from '@/utils'
-import { showAddressModal, addressProps } from '@/composables/modals'
-=======
-import AddressModal from '@/components/Modals/AddressModal.vue'
-=======
->>>>>>> 42285dd9 (fix: unused import due to merge conflict)
 import { formatDate, timeAgo, validateIsImageFile } from '@/utils'
->>>>>>> c6ad1085 (refactor: DRY up validate image file)
+import { showAddressModal, addressProps } from '@/composables/modals'
 import { getView } from '@/utils/view'
 import { getSettings } from '@/stores/settings'
 import { getMeta } from '@/stores/meta'

frontend/src/pages/Lead.vue

@@ -344,18 +344,13 @@ import SidePanelLayout from '@/components/SidePanelLayout.vue'
 import FieldLayout from '@/components/FieldLayout/FieldLayout.vue'
 import SLASection from '@/components/SLASection.vue'
 import CustomActions from '@/components/CustomActions.vue'
-<<<<<<< HEAD
-import { openWebsite, setupCustomizations, copyToClipboard } from '@/utils'
-import { showQuickEntryModal, quickEntryProps } from '@/composables/modals'
-=======
 import {
   openWebsite,
-  setupAssignees,
   setupCustomizations,
   copyToClipboard,
-  validateIsImageFile
+  validateIsImageFile,
 } from '@/utils'
->>>>>>> c6ad1085 (refactor: DRY up validate image file)
+import { showQuickEntryModal, quickEntryProps } from '@/composables/modals'
 import { getView } from '@/utils/view'
 import { getSettings } from '@/stores/settings'
 import { sessionStore } from '@/stores/session'

frontend/src/pages/MobileContact.vue

@@ -11,7 +11,10 @@
     </header>
   </LayoutHeader>
   <div v-if="contact.data" class="flex flex-col h-full overflow-hidden">
-    <FileUploader @success="changeContactImage" :validateFile="validateIsImageFile">
+    <FileUploader
+      @success="changeContactImage"
+      :validateFile="validateIsImageFile"
+    >
       <template #default="{ openFileSelector, error }">
         <div class="flex flex-col items-start justify-start gap-4 p-4">
           <div class="flex gap-4 items-center">
@@ -167,15 +170,7 @@ import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
 import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import DealsIcon from '@/components/Icons/DealsIcon.vue'
 import DealsListView from '@/components/ListViews/DealsListView.vue'
-<<<<<<< HEAD
-<<<<<<< HEAD
-import { formatDate, timeAgo } from '@/utils'
-=======
-import AddressModal from '@/components/Modals/AddressModal.vue'
-=======
->>>>>>> ab409dfd (fix: yet another unused import due to merge conflict)
 import { formatDate, timeAgo, validateIsImageFile } from '@/utils'
->>>>>>> c6ad1085 (refactor: DRY up validate image file)
 import { getView } from '@/utils/view'
 import { showAddressModal, addressProps } from '@/composables/modals'
 import { getSettings } from '@/stores/settings'