Merge pull request #537 from frappe/develop
This commit is contained in:
commit
8d143166f1
5
.github/workflows/builds.yml
vendored
5
.github/workflows/builds.yml
vendored
@ -46,6 +46,7 @@ jobs:
|
||||
- name: Set Image Tag
|
||||
run: |
|
||||
echo "IMAGE_TAG=${{ github.ref_name == 'develop' && 'latest' || 'v15' }}" >> $GITHUB_ENV
|
||||
echo "STABLE_TAG=${{ github.ref_name == 'develop' && 'nightly' || 'stable' }}" >> $GITHUB_ENV
|
||||
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
@ -60,7 +61,9 @@ jobs:
|
||||
file: builds/images/layered/Containerfile
|
||||
tags: >
|
||||
ghcr.io/${{ github.repository }}:${{ github.ref_name }},
|
||||
ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }}
|
||||
ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }},
|
||||
ghcr.io/${{ github.repository }}:${{ env.STABLE_TAG }}
|
||||
|
||||
build-args: |
|
||||
"FRAPPE_BRANCH=${{ env.FRAPPE_BRANCH }}"
|
||||
"APPS_JSON_BASE64=${{ env.APPS_JSON_BASE64 }}"
|
||||
|
||||
@ -253,7 +253,6 @@ import { ref, onBeforeUnmount, watch, nextTick } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
|
||||
const { $socket } = globalStore()
|
||||
const { user } = sessionStore()
|
||||
|
||||
const callPopupHeader = ref(null)
|
||||
const showCallPopup = ref(false)
|
||||
@ -298,11 +297,14 @@ const getContact = createResource({
|
||||
},
|
||||
})
|
||||
|
||||
watch(phoneNumber, (value) => {
|
||||
if (!value) return
|
||||
getContact.fetch()
|
||||
}, { immediate: true })
|
||||
|
||||
watch(
|
||||
phoneNumber,
|
||||
(value) => {
|
||||
if (!value) return
|
||||
getContact.fetch()
|
||||
},
|
||||
{ immediate: true },
|
||||
)
|
||||
|
||||
const dirty = ref(false)
|
||||
|
||||
@ -427,12 +429,13 @@ function setup() {
|
||||
console.log(data)
|
||||
|
||||
callStatus.value = updateStatus(data)
|
||||
const { user } = sessionStore()
|
||||
|
||||
if (
|
||||
!showCallPopup.value &&
|
||||
!showSmallCallPopup.value &&
|
||||
data.AgentEmail &&
|
||||
data.AgentEmail == user.value
|
||||
data.AgentEmail == (user || user.value)
|
||||
) {
|
||||
phoneNumber.value = data.CallTo || data.To
|
||||
showCallPopup.value = true
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user