Merge branch 'compnay-fix' into 'master'

fix: company save loader on duplicate name error See merge request mohit.panjvani/crater-web!1304
crater-invoice-inc · Dec 1, 2021 · 40f3415 · 40f3415
2 parents f97868d + 5c39525
commit 40f3415
Showing 1 changed file with 23 additions and 19 deletions.
diff --git a/resources/scripts/components/modal-components/CompanyModal.vue b/resources/scripts/components/modal-components/CompanyModal.vue
@@ -211,27 +211,31 @@ async function submitCompanyData() {
   }
 
   isSaving.value = true
-  const res = await companyStore.addNewCompany(newCompanyForm)
-  if (res.data.data) {
-    await companyStore.setSelectedCompany(res.data.data)
-    if (companyLogoFileBlob && companyLogoFileBlob.value) {
-      let logoData = new FormData()
-
-      logoData.append(
-        'company_logo',
-        JSON.stringify({
-          name: companyLogoName.value,
-          data: companyLogoFileBlob.value,
-        })
-      )
-
-      await companyStore.updateCompanyLogo(logoData)
+  try {
+    const res = await companyStore.addNewCompany(newCompanyForm)
+    if (res.data.data) {
+      await companyStore.setSelectedCompany(res.data.data)
+      if (companyLogoFileBlob && companyLogoFileBlob.value) {
+        let logoData = new FormData()
+
+        logoData.append(
+          'company_logo',
+          JSON.stringify({
+            name: companyLogoName.value,
+            data: companyLogoFileBlob.value,
+          })
+        )
+
+        await companyStore.updateCompanyLogo(logoData)
+      }
+      await globalStore.setIsAppLoaded(false)
+      await globalStore.bootstrap()
+      closeCompanyModal()
     }
-    await globalStore.setIsAppLoaded(false)
-    await globalStore.bootstrap()
-    closeCompanyModal()
+    isSaving.value = false
+  } catch {
+    isSaving.value = false
   }
-  isSaving.value = false
 }
 
 function resetNewCompanyForm() {