fix: check site conf before sending email

This commit is contained in:
Jannat Patel
2024-04-10 19:38:30 +05:30
parent 13536aac51
commit 20fab8dbd3
5 changed files with 21 additions and 10 deletions

View File

@@ -3,12 +3,21 @@
{{ __('Components') }}
</div>
<div class="mt-5">
<div class="">
<div class="text-xs text-gray-600 mb-1">
{{ __('Select an Editor') }}
<Tooltip
:text="
__(
'Content such as quiz, video and image will be added in the editor you select.'
)
"
placement="bottom"
>
<div class="">
<div class="text-xs text-gray-600 mb-1">
{{ __('Select an Editor') }}
</div>
<Select v-model="currentEditor" :options="getEditorOptions()" />
</div>
<Select v-model="currentEditor" :options="getEditorOptions()" />
</div>
</Tooltip>
<div class="flex mt-4">
<Link
v-model="quiz"
@@ -63,7 +72,7 @@
</template>
<script setup>
import Link from '@/components/Controls/Link.vue'
import { FileUploader, Button, Select } from 'frappe-ui'
import { FileUploader, Button, Select, Tooltip } from 'frappe-ui'
import { Plus, FileText } from 'lucide-vue-next'
import { ref, watch } from 'vue'

View File

@@ -14,7 +14,7 @@ class LMSJobApplication(Document):
outgoing_email_account = frappe.get_cached_value(
"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
)
if outgoing_email_account:
if outgoing_email_account or frappe.conf.get("mail_login"):
self.send_email_to_employer()
def validate_duplicate(self):

View File

@@ -18,7 +18,7 @@ class LMSAssignmentSubmission(Document):
outgoing_email_account = frappe.get_cached_value(
"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
)
if outgoing_email_account:
if outgoing_email_account or frappe.conf.get("mail_login"):
self.send_mail()
def validate_duplicates(self):

View File

@@ -73,7 +73,9 @@ class LMSBatch(Document):
outgoing_email_account = frappe.get_cached_value(
"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
)
if not student.confirmation_email_sent and outgoing_email_account:
if not student.confirmation_email_sent and (
outgoing_email_account or frappe.conf.get("mail_login")
):
self.send_mail(student)
student.confirmation_email_sent = 1

View File

@@ -18,7 +18,7 @@ class LMSCertificate(Document):
outgoing_email_account = frappe.get_cached_value(
"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
)
if outgoing_email_account:
if outgoing_email_account or frappe.conf.get("mail_login"):
self.send_mail()
def send_mail(self):