Merge branch 'main' of https://github.com/JhumanJ/OpnForm

client/components/forms/PhoneInput.vue

@@ -11,7 +11,7 @@
                 :data="countries"
                 :disabled="(disabled || countries.length===1)?true:null" :searchable="true" :search-keys="['name']" :option-key="'code'" :color="color"
                 :has-error="hasValidation && form.errors.has(name)"
-                :placeholder="'Select a country'" :uppercase-labels="true" :theme="theme" @change="onChangeCountryCode"
+                :placeholder="'Select a country'" :uppercase-labels="true" :theme="theme" @update:model-value="onChangeCountryCode"
       >
         <template #option="props">
           <div class="flex items-center space-x-2 hover:text-white">
@@ -46,7 +46,7 @@
 <script>
 import { inputProps, useFormInput } from './useFormInput.js'
 import InputWrapper from './components/InputWrapper.vue'
-import countryCodes from '../../../data/country_codes.json'
+import countryCodes from '~/data/country_codes.json'
 import CountryFlag from 'vue-country-flag-next'
 import parsePhoneNumber from 'libphonenumber-js'
 

client/components/open/components/RecordOperations.vue

@@ -59,7 +59,7 @@ export default {
           this.useAlert.error('Something went wrong!')
         }
       }).catch((error) => {
-        this.useAlert.error(error.response.data.message)
+        this.useAlert.error(error.data.message)
       })
     }
   }

client/components/pages/forms/create/CreateFormBaseModal.vue

@@ -145,7 +145,7 @@ export default {
             this.fetchGeneratedForm(generationId)
           }
         }).catch(error => {
-          this.useAlert.error(error.response.data.message)
+          this.useAlert.error(error.data.message)
           this.state = 'default'
           this.loading = false
         })

client/components/pages/pricing/CheckoutDetailsModal.vue

@@ -83,7 +83,7 @@ export default {
         opnFetch('/subscription/new/' + this.plan + '/' + (!this.yearly ? 'monthly' : 'yearly') + '/checkout/with-trial').then((data) => {
           window.location = data.checkout_url
         }).catch((error) => {
-          useAlert().error(error.response.data.message)
+          useAlert().error(error.data.message)
         }).finally(() => {
           this.loading = false
           this.close()

client/pages/settings/account.vue

@@ -41,7 +41,7 @@ const deleteAccount = () => {
     // Redirect to login.
     router.push({ name: 'login' })
   }).catch((error) => {
-    useAlert().error(error.response.data.message)
+    useAlert().error(error.data.message)
     loading = false
   })
 }

client/pages/settings/admin.vue

@@ -76,7 +76,7 @@ const impersonate = () => {
     router.push({ name: 'home' })
   }).catch((error) => {
     console.error(error)
-    useAlert().error(error.response.data.message)
+    useAlert().error(error.data.message)
     loading.value = false
   })
 }

client/pages/settings/billing.vue

@@ -41,7 +41,7 @@ const openBillingDashboard = () => {
     const url = data.portal_url
     window.location = url
   }).catch((error) => {
-    useAlert().error(error.response.data.message)
+    useAlert().error(error.data.message)
   }).finally(() => {
     billingLoading = false
   })