From feb2045e2ed2a46342c8479cc9aaddea6983b137 Mon Sep 17 00:00:00 2001
From: Muhsin <muhsinkeramam@gmail.com>
Date: Mon, 30 Mar 2026 14:50:29 +0400
Subject: [PATCH] chore: prefill billing modal with fetched details

---
 .../dashboard/settings/billing/Index.vue      | 25 ++++++++--
 .../ConfirmBusinessDetailsModal.vue           | 50 +++++++++----------
 2 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue
index dcf07729c..c2b445fb2 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue
@@ -1,11 +1,14 @@
 <script setup>
-import { computed, onMounted, ref } from 'vue';
+import { computed, onMounted, ref, nextTick } from 'vue';
 import { useRouter } from 'vue-router';
 import { useMapGetter, useStore } from 'dashboard/composables/store.js';
 import { useAccount } from 'dashboard/composables/useAccount';
 import { useCaptain } from 'dashboard/composables/useCaptain';
 import { format } from 'date-fns';
+import { useAlert } from 'dashboard/composables';
+import { useI18n } from 'vue-i18n';
 import sessionStorage from 'shared/helpers/sessionStorage';
+import EnterpriseAccountAPI from 'dashboard/api/enterprise/account';
 
 import BillingMeter from './components/BillingMeter.vue';
 import BillingCard from './components/BillingCard.vue';
@@ -28,6 +31,7 @@ const {
   isFetchingLimits,
 } = useCaptain();
 
+const { t } = useI18n();
 const uiFlags = useMapGetter('accounts/getUIFlags');
 const store = useStore();
 
@@ -124,11 +128,25 @@ const handleBillingPageLogic = async () => {
   }
 };
 
-const onClickBillingPortal = () => {
+const billingDetails = ref({});
+const isFetchingBillingDetails = ref(false);
+
+const onClickBillingPortal = async () => {
   if (billingDetailsConfirmed.value) {
     store.dispatch('accounts/checkout');
-  } else {
+    return;
+  }
+
+  isFetchingBillingDetails.value = true;
+  try {
+    const { data } = await EnterpriseAccountAPI.getBillingDetails();
+    billingDetails.value = data;
+    await nextTick();
     confirmBusinessDetailsModalRef.value?.open();
+  } catch {
+    useAlert(t('BILLING_SETTINGS.CONFIRM_BUSINESS.ERROR'));
+  } finally {
+    isFetchingBillingDetails.value = false;
   }
 };
 
@@ -279,6 +297,7 @@ onMounted(handleBillingPageLogic);
       />
       <ConfirmBusinessDetailsModal
         ref="confirmBusinessDetailsModalRef"
+        :billing-details="billingDetails"
         @confirmed="onBusinessDetailsConfirmed"
       />
     </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing/components/ConfirmBusinessDetailsModal.vue b/app/javascript/dashboard/routes/dashboard/settings/billing/components/ConfirmBusinessDetailsModal.vue
index a894ca028..9c36796f0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/billing/components/ConfirmBusinessDetailsModal.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/billing/components/ConfirmBusinessDetailsModal.vue
@@ -10,13 +10,26 @@ import Input from 'dashboard/components-next/input/Input.vue';
 import TextArea from 'dashboard/components-next/textarea/TextArea.vue';
 import EnterpriseAccountAPI from 'dashboard/api/enterprise/account';
 
+const props = defineProps({
+  billingDetails: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+
 const emit = defineEmits(['confirmed']);
 const { t } = useI18n();
 
 const dialogRef = ref(null);
 const isLoading = ref(false);
-const isFetchingDetails = ref(false);
-const hasPreExistingData = ref(false);
+
+const hasPreExistingData = computed(() => {
+  return Boolean(
+    props.billingDetails.business_name ||
+      props.billingDetails.business_address ||
+      props.billingDetails.billing_email
+  );
+});
 
 const formValues = reactive({
   businessName: '',
@@ -53,31 +66,12 @@ const getErrorMessage = field => {
   return '';
 };
 
-const fetchBillingDetails = async () => {
-  isFetchingDetails.value = true;
-  try {
-    const { data } = await EnterpriseAccountAPI.getBillingDetails();
-    if (data.business_name || data.business_address || data.billing_email) {
-      formValues.businessName = data.business_name || '';
-      formValues.businessAddress = data.business_address || '';
-      formValues.billingEmail = data.billing_email || '';
-      hasPreExistingData.value = true;
-    }
-  } catch {
-    // Silently fail - user can still fill in details manually
-  } finally {
-    isFetchingDetails.value = false;
-  }
-};
-
 const open = () => {
   v$.value.$reset();
-  formValues.businessName = '';
-  formValues.businessAddress = '';
-  formValues.billingEmail = '';
-  hasPreExistingData.value = false;
+  formValues.businessName = props.billingDetails.business_name || '';
+  formValues.businessAddress = props.billingDetails.business_address || '';
+  formValues.billingEmail = props.billingDetails.billing_email || '';
   dialogRef.value?.open();
-  fetchBillingDetails();
 };
 
 const close = () => {
@@ -119,9 +113,13 @@ defineExpose({ open, close });
     <div class="flex flex-col gap-4">
       <div
         v-if="hasPreExistingData"
-        class="flex items-center gap-2 p-3 rounded-lg bg-n-teal-2 border border-n-teal-6"
+        class="flex items-center gap-3 p-3 rounded-lg bg-n-teal-2 border border-n-teal-6"
       >
-        <fluent-icon icon="checkmark-circle" size="16" class="text-n-teal-11" />
+        <fluent-icon
+          icon="checkmark-circle"
+          size="18"
+          class="text-n-teal-11 shrink-0"
+        />
         <p class="text-sm text-n-teal-11">
           {{ $t('BILLING_SETTINGS.CONFIRM_BUSINESS.PREFILLED_BANNER') }}
         </p>