Skip to content

Beautiful Open-Source Form Builder

Refactor payment block checks to consider visibility (#1021)

Chirag Chhatralac43d191f9d6e
diff --git a/client/lib/forms/composables/useFocusedStructure.js b/client/lib/forms/composables/useFocusedStructure.js
index 79c6f0665..b4afcfafe 100644
--- a/client/lib/forms/composables/useFocusedStructure.js
+++ b/client/lib/forms/composables/useFocusedStructure.js
@@ -42,11 +42,11 @@ export function useFocusedStructure(formConfig, managerState, formData, fieldSta
}
const hasPaymentBlock = (pageIndex) => {
- return getPageFields(pageIndex).some(field => field?.type === 'payment')
+ return getPageFields(pageIndex).some(field => field?.type === 'payment' && !isFieldHidden(field))
}
const getPaymentBlock = (pageIndex) => {
- return getPageFields(pageIndex).find(field => field?.type === 'payment')
+ return getPageFields(pageIndex).find(field => field?.type === 'payment' && !isFieldHidden(field))
}
const currentPageHasPaymentBlock = computed(() => {
diff --git a/client/lib/forms/composables/useFormStructure.js b/client/lib/forms/composables/useFormStructure.js
index 5c7787021..50fca5f74 100644
--- a/client/lib/forms/composables/useFormStructure.js
+++ b/client/lib/forms/composables/useFormStructure.js
@@ -246,21 +246,21 @@ export function useFormStructure(formConfig, managerState, formData, fieldState)
}
/**
- * Checks if a given page contains a payment block.
+ * Checks if a given page contains a visible (non-hidden) payment block.
* @param {Number} pageIndex - The page index.
- * @returns {Boolean} True if a payment block exists on the page.
+ * @returns {Boolean} True if a visible payment block exists on the page.
*/
const hasPaymentBlock = (pageIndex) => {
- return getPageFields(pageIndex).some(field => field?.type === 'payment')
+ return getPageFields(pageIndex).some(field => field?.type === 'payment' && !isFieldHidden(field))
}
/**
- * Gets the payment block field object from a given page.
+ * Gets the visible (non-hidden) payment block field object from a given page.
* @param {Number} pageIndex - The page index.
- * @returns {Object|undefined} The payment field object or undefined if not found.
+ * @returns {Object|undefined} The payment field object or undefined if not found or hidden.
*/
const getPaymentBlock = (pageIndex) => {
- return getPageFields(pageIndex).find(field => field?.type === 'payment')
+ return getPageFields(pageIndex).find(field => field?.type === 'payment' && !isFieldHidden(field))
}
/**