VKT(Backend & Frontend): OPHVKTKEH-215 Stepper näkyy maksulinkin kaut…

…ta (#548) * VKT(Backend & Frontend): OPHVKTKEH-215 stepper fix when using payment link * VKT(Frontend) OPHVKTKEH-215: show stepper when using payment link * VKT(Frontend) OPHVKTKEH-215: stepper fix for mobile
Opetushallitus · Oct 13, 2023 · b82c28b · b82c28b
1 parent 9cdaa97
commit b82c28b
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 18 deletions.
diff --git a/backend/vkt/src/main/java/fi/oph/vkt/api/dto/PublicEnrollmentDTO.java b/backend/vkt/src/main/java/fi/oph/vkt/api/dto/PublicEnrollmentDTO.java
@@ -24,6 +24,7 @@ public record PublicEnrollmentDTO(
   String street,
   String postalCode,
   String town,
-  String country
+  String country,
+  Boolean hasPaymentLink
 )
   implements EnrollmentDTOCommonFields {}
diff --git a/backend/vkt/src/main/java/fi/oph/vkt/service/PublicEnrollmentService.java b/backend/vkt/src/main/java/fi/oph/vkt/service/PublicEnrollmentService.java
@@ -118,6 +118,7 @@ private PublicEnrollmentDTO createEnrollmentDTO(final Enrollment enrollment) {
       .postalCode(enrollment.getPostalCode())
       .town(enrollment.getTown())
       .country(enrollment.getCountry())
+      .hasPaymentLink(enrollment.getPaymentLinkHash() != null)
       .build();
   }
 

diff --git a/frontend/packages/vkt/src/components/publicEnrollment/PublicEnrollmentDesktopGrid.tsx b/frontend/packages/vkt/src/components/publicEnrollment/PublicEnrollmentDesktopGrid.tsx
@@ -77,12 +77,10 @@ export const PublicEnrollmentDesktopGrid = ({
                   : 'public-enrollment__grid__form-container'
               }
             >
-              {!isShiftedFromQueue && (
-                <PublicEnrollmentStepper
-                  activeStep={activeStep}
-                  includePaymentStep={ExamEventUtils.hasOpenings(examEvent)}
-                />
-              )}
+              <PublicEnrollmentStepper
+                activeStep={activeStep}
+                includePaymentStep={ExamEventUtils.hasOpenings(examEvent)}
+              />
               {reservation && !isPreviewPassed && (
                 <PublicEnrollmentTimer
                   reservation={reservation}

diff --git a/frontend/packages/vkt/src/components/publicEnrollment/PublicEnrollmentGrid.tsx b/frontend/packages/vkt/src/components/publicEnrollment/PublicEnrollmentGrid.tsx
@@ -127,7 +127,8 @@ export const PublicEnrollmentGrid = ({
     (isAuthenticatePassed && !reservation);
 
   const isShiftedFromQueue =
-    enrollment.status === EnrollmentStatus.SHIFTED_FROM_QUEUE;
+    enrollment.status === EnrollmentStatus.SHIFTED_FROM_QUEUE ||
+    enrollment.hasPaymentLink;
 
   const isPreviewStepActive = activeStep === PublicEnrollmentFormStep.Preview;
   const isPreviewPassed = activeStep > PublicEnrollmentFormStep.Preview;

diff --git a/frontend/packages/vkt/src/components/publicEnrollment/PublicEnrollmentPhoneGrid.tsx b/frontend/packages/vkt/src/components/publicEnrollment/PublicEnrollmentPhoneGrid.tsx
@@ -157,17 +157,15 @@ export const PublicEnrollmentPhoneGrid = ({
                   : 'public-enrollment__grid__form-container'
               }
             >
-              {!isShiftedFromQueue && (
-                <div className="columns gapped-xxl">
-                  <PublicEnrollmentStepper
-                    activeStep={activeStep}
-                    includePaymentStep={ExamEventUtils.hasOpenings(examEvent)}
-                  />
-                  <div className="rows gapped-xs grow">
-                    {getMobileStepperHeading()}
-                  </div>
+              <div className="columns gapped-xxl">
+                <PublicEnrollmentStepper
+                  activeStep={activeStep}
+                  includePaymentStep={ExamEventUtils.hasOpenings(examEvent)}
+                />
+                <div className="rows gapped-xs grow">
+                  {getMobileStepperHeading()}
                 </div>
-              )}
+              </div>
               {isExamEventDetailsAvailable && (
                 <div className="margin-top-lg">
                   <PublicEnrollmentExamEventDetails

diff --git a/frontend/packages/vkt/src/interfaces/publicEnrollment.ts b/frontend/packages/vkt/src/interfaces/publicEnrollment.ts
@@ -46,6 +46,7 @@ export interface PublicEnrollment
   privacyStatementConfirmation: boolean;
   status?: EnrollmentStatus;
   examEventId?: number;
+  hasPaymentLink?: boolean;
 }
 
 export interface PublicEnrollmentResponse

diff --git a/frontend/packages/vkt/src/redux/reducers/publicEnrollment.ts b/frontend/packages/vkt/src/redux/reducers/publicEnrollment.ts
@@ -49,6 +49,7 @@ export const initialState: PublicEnrollmentState = {
     privacyStatementConfirmation: false,
     status: undefined,
     examEventId: undefined,
+    hasPaymentLink: undefined,
   },
   examEvent: undefined,
   person: undefined,