Merge pull request #135 from City-of-Helsinki/fix/LINK-1897

LINK-1897 | remove create_payment from payload
City-of-Helsinki · Feb 7, 2024 · 0586281 · 0586281
2 parents b553a8c + 898353b
commit 0586281
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/src/domain/signupGroup/__tests__/utils.test.ts b/src/domain/signupGroup/__tests__/utils.test.ts
@@ -115,7 +115,6 @@ describe('getSignupGroupPayload function', () => {
         phone_number: null,
         service_language: null,
       },
-      create_payment: false,
       extra_info: '',
       registration: registration.id,
       reservation_code: 'code',

diff --git a/src/domain/signupGroup/signupGroupForm/signups/signup/Signup.tsx b/src/domain/signupGroup/signupGroupForm/signups/signup/Signup.tsx
@@ -113,22 +113,24 @@ const Signup: React.FC<SignupProps> = ({
       toggleButtonLabel={accordionLabel}
     >
       <Fieldset heading={t(`signup.titleBasicInfo`)}>
-        {featureFlagUtils.isFeatureEnabled('WEB_STORE_INTEGRATION') &&
-          priceGroupOptions && (
-            <FormGroup>
-              <div className={getRowClassName(styles.nameRow)}>
-                <Field
-                  name={getFieldName(signupPath, SIGNUP_FIELDS.PRICE_GROUP)}
-                  component={SingleSelectField}
-                  disabled={formDisabled || isEditingMode}
-                  label={t('signup.labelPriceGroup')}
-                  options={priceGroupOptions}
-                  placeholder={t('signup.placeholderPriceGroup')}
-                  required={!!priceGroupOptions?.length}
-                />
-              </div>
-            </FormGroup>
-          )}
+        {Boolean(
+          featureFlagUtils.isFeatureEnabled('WEB_STORE_INTEGRATION') &&
+            priceGroupOptions.length
+        ) && (
+          <FormGroup>
+            <div className={getRowClassName(styles.nameRow)}>
+              <Field
+                name={getFieldName(signupPath, SIGNUP_FIELDS.PRICE_GROUP)}
+                component={SingleSelectField}
+                disabled={formDisabled || isEditingMode}
+                label={t('signup.labelPriceGroup')}
+                options={priceGroupOptions}
+                placeholder={t('signup.placeholderPriceGroup')}
+                required={!!priceGroupOptions?.length}
+              />
+            </div>
+          </FormGroup>
+        )}
 
         {(isSignupFieldRequired(registration, SIGNUP_FIELDS.FIRST_NAME) ||
           isSignupFieldRequired(registration, SIGNUP_FIELDS.LAST_NAME)) && (

diff --git a/src/domain/signupGroup/utils.ts b/src/domain/signupGroup/utils.ts
@@ -140,7 +140,10 @@ export const getSignupGroupPayload = ({
 
   return {
     contact_person: getContactPersonPayload(contactPerson),
-    create_payment: createPayment,
+    ...(featureFlagUtils.isFeatureEnabled('WEB_STORE_INTEGRATION') &&
+    createPayment
+      ? { create_payment: createPayment }
+      : {}),
     extra_info: groupExtraInfo,
     registration: registration.id,
     reservation_code: reservationCode,