refactor mail sender

resources/scripts/admin/views/customers/Create.vue

@@ -257,30 +257,6 @@
               ></BaseInput>
             </BaseInputGroup>
             <!-- && setPasswordMethod !== 'manual' -->
-            <BaseInputGroup
-              v-show="customerStore.currentCustomer.enable_portal"
-              :label="$t('customers.select_sender')"
-              class="pt-5"
-              :error="
-                v$.currentCustomer.mail_sender_id.$error &&
-                v$.currentCustomer.mail_sender_id.$errors[0].$message
-              "
-              :content-loading="isFetchingInitialData"
-              required
-            >
-              <BaseMultiselect
-                v-model="customerStore.currentCustomer.mail_sender_id"
-                label="name"
-                value-prop="id"
-                :options="mailSenderStore.mailSenders"
-                :can-deselect="false"
-                :can-clear="false"
-                searchable
-                track-by="name"
-                :invalid="v$.currentCustomer.mail_sender_id.$error"
-                @input="v$.currentCustomer.mail_sender_id.$touch()"
-              />
-            </BaseInputGroup>
           </BaseInputGrid>
         </div>
 
@@ -626,13 +602,11 @@ import CustomerCustomFields from '@/scripts/admin/components/custom-fields/Creat
 import { useGlobalStore } from '@/scripts/admin/stores/global'
 import CopyInputField from '@/scripts/admin/components/CopyInputField.vue'
 import { useCompanyStore } from '@/scripts/admin/stores/company'
-import { useMailSenderStore } from '@/scripts/admin/stores/mail-sender'
 
 const customerStore = useCustomerStore()
 const customFieldStore = useCustomFieldStore()
 const globalStore = useGlobalStore()
 const companyStore = useCompanyStore()
-const mailSenderStore = useMailSenderStore()
 
 const customFieldValidationScope = 'customFields'
 
@@ -644,7 +618,6 @@ const route = useRoute()
 let isFetchingInitialData = ref(false)
 let isShowPassword = ref(false)
 let isShowConfirmPassword = ref(false)
-const mailSenders = ref(null)
 
 let active = ref(false)
 const isSaving = ref(false)
@@ -678,10 +651,7 @@ const rules = computed(() => {
       },
 
       email: {
-        required: helpers.withMessage(
-          t('validation.required'),
-          requiredIf(customerStore.currentCustomer.enable_portal == true)
-        ),
+        required: helpers.withMessage(t('validation.required'), required),
         email: helpers.withMessage(t('validation.email_incorrect'), email),
       },
       password: {
@@ -707,12 +677,6 @@ const rules = computed(() => {
       website: {
         url: helpers.withMessage(t('validation.invalid_url'), url),
       },
-      mail_sender_id: {
-        required: helpers.withMessage(
-          t('validation.required'),
-          requiredIf(customerStore.currentCustomer.enable_portal == true)
-        ),
-      },
       billing: {
         address_street_1: {
           maxLength: helpers.withMessage(
@@ -756,20 +720,6 @@ const v$ = useVuelidate(rules, customerStore, {
   $scope: customFieldValidationScope,
 })
 
-onMounted(async () => {
-  await mailSenderStore.fetchMailSenders()
-  let mailSenderData = await mailSenderStore.fetchMailSenderList()
-  if (mailSenderData.data) {
-    mailSenders.value = mailSenderData.data.data
-    let defaultMailSender = mailSenderData.data.data.find(
-      (mailSender) => mailSender.is_default == true
-    )
-    customerStore.currentCustomer.mail_sender_id = defaultMailSender
-      ? defaultMailSender.id
-      : null
-  }
-})
-
 customerStore.resetCurrentCustomer()
 
 customerStore.fetchCustomerInitialSettings(isEdit.value)

resources/scripts/admin/views/installation/Step5EmailConfig.vue

@@ -98,13 +98,6 @@
             :mail-sender-store="mailSenderStore"
           />
         </BaseInputGrid>
-
-        <!-- Is Default? -->
-        <BaseSwitchSection
-          v-model="mailSenderStore.currentMailSender.is_default"
-          :title="$t(`${pre_t}.is_default`)"
-          :description="$t(`${pre_t}.is_default_description`)"
-        />
         <BaseDivider class="my-4" />
 
         <BaseButton
@@ -227,26 +220,12 @@ async function submitMailSenderData() {
     return true
   }
   try {
-    const action = mailSenderStore.isEdit
-      ? mailSenderStore.updateMailSender
-      : mailSenderStore.addMailSender
-    isSaving.value = true
-
-    var mailDriverConfig = null
-    switch (mailSenderStore.currentMailSender.driver) {
-      case 'smtp':
-        mailDriverConfig = mailSenderStore.smtpConfig
-        break
-      case 'mailgun':
-        mailDriverConfig = mailSenderStore.mailgunConfig
-        break
-      case 'ses':
-        mailDriverConfig = mailSenderStore.sesConfig
-        break
+    let data = {
+      ...mailSenderStore.currentMailSender,
+      is_default: true,
     }
-    mailSenderStore.currentMailSender.settings = mailDriverConfig
-
-    let res = await action(mailSenderStore.currentMailSender)
+    await mailSenderStore.addMailSender(data)
+    isSaving.value = true
     emit('next')
     isSaving.value = false
   } catch (err) {

resources/scripts/admin/views/users/Create.vue

@@ -128,29 +128,6 @@
               </BaseInput>
             </BaseInputGroup>
 
-            <BaseInputGroup
-              :label="$t('users.select_sender')"
-              :error="
-                v$.userData.mail_sender_id.$error &&
-                v$.userData.mail_sender_id.$errors[0].$message
-              "
-              :content-loading="isFetchingInitialData"
-              required
-            >
-              <BaseMultiselect
-                v-model="userStore.userData.mail_sender_id"
-                label="name"
-                value-prop="id"
-                :options="mailSenderStore.mailSenders"
-                :can-deselect="false"
-                :can-clear="false"
-                searchable
-                track-by="name"
-                :invalid="v$.userData.mail_sender_id.$error"
-                @input="v$.userData.mail_sender_id.$touch()"
-              />
-            </BaseInputGroup>
-
             <BaseInputGroup
               :content-loading="isFetchingInitialData"
               :label="$t('users.phone')"
@@ -199,7 +176,6 @@ import useVuelidate from '@vuelidate/core'
 import { ValidateEach } from '@vuelidate/components'
 import { useI18n } from 'vue-i18n'
 import { useUsersStore } from '@/scripts/admin/stores/users'
-import { useMailSenderStore } from '@/scripts/admin/stores/mail-sender'
 
 const userStore = useUsersStore()
 
@@ -207,13 +183,11 @@ const { t } = useI18n()
 const route = useRoute()
 const router = useRouter()
 const companyStore = useCompanyStore()
-const mailSenderStore = useMailSenderStore()
 
 let isSaving = ref(false)
 let isFetchingInitialData = ref(false)
 let selectedCompanies = ref([])
 let companies = ref([])
-const mailSenders = ref(null)
 
 const isEdit = computed(() => route.name === 'users.edit')
 
@@ -248,9 +222,6 @@ const rules = computed(() => {
       companies: {
         required: helpers.withMessage(t('validation.required'), required),
       },
-      mail_sender_id: {
-        required: helpers.withMessage(t('validation.required'), required),
-      },
     },
   }
 })
@@ -265,20 +236,6 @@ const v$ = useVuelidate(rules, userStore, {
   $scope: true,
 })
 
-onMounted(async () => {
-  await mailSenderStore.fetchMailSenders()
-  let mailSenderData = await mailSenderStore.fetchMailSenderList()
-  if (mailSenderData.data) {
-    mailSenders.value = mailSenderData.data.data
-    let defaultMailSender = mailSenderData.data.data.find(
-      (mailSender) => mailSender.is_default == true
-    )
-    userStore.userData.mail_sender_id = defaultMailSender
-      ? defaultMailSender.id
-      : null
-  }
-})
-
 loadInitialData()
 
 userStore.resetUserData()