From fd45ba6ca714d3e20dbbbc47e51c85f924b80216 Mon Sep 17 00:00:00 2001 From: saifsultanc Date: Wed, 19 Mar 2025 11:03:20 +0530 Subject: [PATCH 1/2] `gwaft-template-collapsible.php`: Added Order Summary as an additional last page. --- gravity-forms/gwaft-template-collapsible.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gravity-forms/gwaft-template-collapsible.php b/gravity-forms/gwaft-template-collapsible.php index 6097a031c..d4e51ffde 100644 --- a/gravity-forms/gwaft-template-collapsible.php +++ b/gravity-forms/gwaft-template-collapsible.php @@ -25,9 +25,17 @@ $pages = $data['form']['pagination']['pages']; $page_groups = array(); foreach ( $data['items'] as $item ) { - $field = $item['field']; + $field = rgar( $item, 'field' ); + + // Add Order Summary as a separate last page. + if ( ! $field && rgar( $item, 'label' ) == apply_filters( 'gwaft_order_summary_label', 'Order Summary' ) ) { + $page_groups[-1][] = $item; + $pages[-1] = apply_filters( 'gwaft_order_summary_label', 'Order Summary' ); + continue; + } + // Skip hidden fields. - if ( $field->type === 'hidden' || $field->visibility === 'hidden' ) { + if ( ! $field || $field->type === 'hidden' || $field->visibility === 'hidden' ) { continue; } // Adjust pageNumber to be zero-based. From fae205a0a62087b8eed5bf57baa6953be3d2d454 Mon Sep 17 00:00:00 2001 From: Saif Sultan Date: Mon, 7 Apr 2025 17:52:17 +0530 Subject: [PATCH 2/2] `gwaft-template-collapsible.php`: Added Order Summary as an additional last page. --- gravity-forms/gwaft-template-collapsible.php | 1 + 1 file changed, 1 insertion(+) diff --git a/gravity-forms/gwaft-template-collapsible.php b/gravity-forms/gwaft-template-collapsible.php index d4e51ffde..bf99c49af 100644 --- a/gravity-forms/gwaft-template-collapsible.php +++ b/gravity-forms/gwaft-template-collapsible.php @@ -29,6 +29,7 @@ // Add Order Summary as a separate last page. if ( ! $field && rgar( $item, 'label' ) == apply_filters( 'gwaft_order_summary_label', 'Order Summary' ) ) { + // Storing order summary page as '-1' to be the last page, and avoid conflicts with the actual page numbers. $page_groups[-1][] = $item; $pages[-1] = apply_filters( 'gwaft_order_summary_label', 'Order Summary' ); continue;