Fix: Defult value issues (#2341)

* Fix: Default Value Issues * Fix: Default Value Issues * Fix: Default Value Issues * Fix: Default Value Issues * Fix: Default Value Issues
solop-develop · Jun 12, 2024 · 89ca39e · 89ca39e
1 parent ce8e8ed
commit 89ca39e
Showing 1 changed file with 60 additions and 39 deletions.
diff --git a/src/components/ADempiere/Form/Issues/component/Comment.vue b/src/components/ADempiere/Form/Issues/component/Comment.vue
@@ -1597,7 +1597,7 @@ export default defineComponent({
     const isLoadingNewIssues = ref(false)
     const centerDialogVisible = ref(false)
 
-    currentSalesReps.value = store.getters['user/userInfo'].id
+    currentSalesReps.value = store.getters['user/userInfo'].name
 
     const storedMailTemplatesList = computed(() => {
       return store.getters.getListMailTemplates
@@ -1695,7 +1695,6 @@ export default defineComponent({
     const getFixedHeader = computed(() => {
       return store.getters['settings/getFixedHeader']
     })
-
     function findSalesReps(isVisible, searchValue) {
       return new Promise((resolve, reject) => {
         if (!isVisible) {
@@ -1726,7 +1725,12 @@ export default defineComponent({
           })
       })
     }
-
+    const salesReps = computed(() => {
+      if (currentSalesReps.value === store.getters['user/userInfo'].name) {
+        return store.getters['user/userInfo'].id
+      }
+      return currentSalesReps.value
+    })
     const loadingSales = ref(false)
 
     function remoteMethodSales(query) {
@@ -1764,44 +1768,50 @@ export default defineComponent({
       if (!isEmptyValue(currentIssues.value) && !isPanelNewRequest.value) {
         requestTypeId = currentIssues.value.request_type.id
       }
-      requestListStatuses({
-        requestTypeId
-      })
-        .then(response => {
-          const { records } = response
-          listStatuses.value = records
+      return new Promise(resolve => {
+        requestListStatuses({
+          requestTypeId
         })
-        .catch(error => {
-          let message = error.message
-          if (!isEmptyValue(error.response) && !isEmptyValue(error.response.data.message)) {
-            message = error.response.data.message
-          }
-          showMessage({
-            message,
-            type: 'warning'
+          .then(response => {
+            const { records } = response
+            listStatuses.value = records
+            resolve(response)
           })
-        })
+          .catch(error => {
+            let message = error.message
+            if (!isEmptyValue(error.response) && !isEmptyValue(error.response.data.message)) {
+              message = error.response.data.message
+            }
+            showMessage({
+              message,
+              type: 'warning'
+            })
+          })
+      })
     }
 
     function findPriority(isVisible) {
       if (!isVisible) {
         return
       }
-      requestListPriorities({})
-        .then(response => {
-          const { records } = response
-          listPriority.value = records
-        })
-        .catch(error => {
-          let message = error.message
-          if (!isEmptyValue(error.response) && !isEmptyValue(error.response.data.message)) {
-            message = error.response.data.message
-          }
-          showMessage({
-            message,
-            type: 'warning'
+      return new Promise(resolve => {
+        requestListPriorities({})
+          .then(response => {
+            const { records } = response
+            listPriority.value = records
+            resolve(response)
           })
-        })
+          .catch(error => {
+            let message = error.message
+            if (!isEmptyValue(error.response) && !isEmptyValue(error.response.data.message)) {
+              message = error.response.data.message
+            }
+            showMessage({
+              message,
+              type: 'warning'
+            })
+          })
+      })
     }
 
     function saveIssues() {
@@ -1818,7 +1828,7 @@ export default defineComponent({
         subject: subject.value,
         summary: summary.value,
         requestTypeId: currentRequestTypes.value,
-        salesRepresentativeId: currentSalesReps.value,
+        salesRepresentativeId: salesReps.value,
         statusId: currentStatus.value,
         priorityValue: currentPriority.value,
         dateNextAction: newDateNextAction.value
@@ -2243,17 +2253,28 @@ export default defineComponent({
       // refs.updateDate.showPopper = false
     }
 
-    function exitPopover(popoverOption) {
+    async function exitPopover(popoverOption) {
       if (popoverOption === 'newtypeOfRequest') {
-        findStatus(true)
-        const requestType = this.listIssuesTypes.find(list => list.id === this.currentRequestTypes)
+        await findStatus(true)
+        await findPriority(true)
+        const requestType = listIssuesTypes.value.find(list => list.id === currentRequestTypes.value)
         const { default_status } = requestType
         // if (isEmptyValue(default_status.name)) return this.currentStatus = ''
-        this.currentStatus = default_status.id
+        currentStatus.value = default_status.id
+        valueDef(default_status)
       }
       if (isEmptyValue(popoverOption)) return
     }
 
+    function valueDef(default_status) {
+      if ((isEmptyValue(default_status) || default_status.id <= 0) && !isEmptyValue(listStatuses.value)) {
+        currentStatus.value = listStatuses.value[0].id
+      }
+      if ((isEmptyValue(currentPriority.value) || currentPriority.value.id <= 0) && !isEmptyValue(listPriority.value)) {
+        currentPriority.value = listPriority.value[0].value
+      }
+    }
+
     function SelectionIssue(issues) {
       if (isPanelNewRequest.value) {
         isPanelNewRequest.value = !isPanelNewRequest.value
@@ -2443,7 +2464,6 @@ export default defineComponent({
 
     const currentCategory = ref(0)
     const listCategory = ref([])
-
     function findCategory(isVisible, searchValue) {
       return new Promise((resolve, reject) => {
         if (!isVisible) {
@@ -2716,7 +2736,8 @@ export default defineComponent({
       updateIssuesProyect,
       updateIssuesGroup,
       //
-      markdownContent
+      markdownContent,
+      valueDef
     }
   }
 })