@afosto/checkout-ui 0.0.12 → 0.0.13

package/dist/steps/informationStep.js

@@ -2,8 +2,8 @@ import { CheckoutInformationStep as ni } from "../CheckoutInformationStep/Checko
 import { addressDefaultValues as q } from "../constants/addressDefaultValues.js";
 import { formatAddressResponse as j } from "../utils/formatAddressResponse.js";
 import { getErrorMessage as W } from "../utils/getErrorMessage.js";
-import { capitalize as X, isDefined as O } from "@afosto/utils";
-import * as a from "yup";
+import { capitalize as X, isDefined as D } from "@afosto/utils";
+import * as u from "yup";
 import { formatUpdateAccountInformationPayload as si } from "../utils/formatUpdateAccountInformationPayload.js";
 import { formatUpdateOrganisationOnAccountPayload as ri } from "../utils/formatUpdateOrganisationOnAccountPayload.js";
 import { setupCustomValidationRules as ti } from "../utils/setupCustomValidationRules.js";
@@ -25,10 +25,10 @@ const ai = {
     "shippingAddress",
     "billingAddress"
   ],
-  defaultValues: (I) => {
-    const { defaultCountry: d, formatCountryAsOption: S, settings: R } = I || {}, { isB2cExcluded: f, isSharedOrganisationRequired: s } = R || {};
+  defaultValues: (S) => {
+    const { defaultCountry: a, formatCountryAsOption: v, settings: O } = S || {}, { isB2cExcluded: y, isSharedOrganisationRequired: s } = O || {};
     return {
-      type: f ? "business" : "private",
+      type: y ? "business" : "private",
       contact: null,
       email: "",
       emailOptIn: !1,
@@ -38,189 +38,188 @@ const ai = {
         cocNumber: "",
         type: s ? "SHARED" : "DEFAULT",
         vatNumber: "",
-        vatNumberCountry: f && d ? S(d) : null
+        vatNumberCountry: y && a ? v(a) : null
       },
       password: "",
       passwordConfirm: "",
       phoneNumber: "",
-      phoneNumberCountry: d ? S(d) : null,
+      phoneNumberCountry: a ? v(a) : null,
       phoneNumberId: "",
       phoneNumberIsDirty: !1,
-      salutation: "",
       sameBillingAsShippingAddress: !0,
       shipping: {
         ...q,
-        country: d ? S(d) : null,
-        countryCode: d ? d.alpha2Code : ""
+        country: a ? v(a) : null,
+        countryCode: a ? a.alpha2Code : ""
       },
       shippingAddressId: "",
       billing: {
         ...q,
-        country: d ? S(d) : null,
-        countryCode: d ? d.alpha2Code : ""
+        country: a ? v(a) : null,
+        countryCode: a ? a.alpha2Code : ""
       },
       billingAddressId: "",
       shouldCreateAccount: !1
     };
   },
-  initialize: (I, d, S) => {
+  initialize: (S, a, v) => {
     const {
-      defaultCountry: R,
-      formatCountryAsOption: f,
+      defaultCountry: O,
+      formatCountryAsOption: y,
       getCountryByCode: s,
-      settings: v,
-      step: D
-    } = S || {}, { defaultValues: m } = D || {}, { addressOptions: p } = d || {}, { countryCode: C } = p || {}, { isB2bExcluded: U, isB2cExcluded: $ } = v || {}, n = typeof m == "function" ? m(S) : m, {
+      settings: f,
+      step: g
+    } = v || {}, { defaultValues: C } = g || {}, { addressOptions: B } = a || {}, { countryCode: N } = B || {}, { isB2bExcluded: U, isB2cExcluded: $ } = f || {}, n = typeof C == "function" ? C(v) : C, {
       billing: M,
       customer: e,
-      delivery: b,
-      expressPayment: h,
+      delivery: m,
+      expressPayment: b,
       options: i,
       phoneNumber: o
-    } = I || {}, {
+    } = S || {}, {
       contact: t,
-      countryCode: l,
+      countryCode: d,
       organisation: r
-    } = e || {}, { address: N } = M || {}, { address: P } = b || {}, { address: E, customer: c } = h?.details?.express || {}, { shipping: x } = i || {}, { countries: V } = x || {}, A = s(C) || R, B = s(l), g = !!r?.id && !U || $, _ = g ? r?.phoneNumbers?.primary : t?.phoneNumbers?.primary, w = s(
+    } = e || {}, { address: A } = M || {}, { address: P } = m || {}, { address: E, customer: p } = b?.details?.express || {}, { shipping: x } = i || {}, { countries: V } = x || {}, I = s(N) || O, R = s(d), c = !!r?.id && !U || $, _ = c ? r?.phoneNumbers?.primary : t?.phoneNumbers?.primary, w = s(
       o?.countryCode || _?.countryCode
-    ) || B || A || null, [L] = w?.callingCodes || [], k = (O(o?.number) ? o.number : _?.number || n.phoneNumber).replace(`+${L}`, ""), T = g ? r?.addressing?.shipping?.primary : t?.addressing?.shipping?.primary, u = j(
+    ) || R || I || null, [L] = w?.callingCodes || [], k = (D(o?.number) ? o.number : _?.number || n.phoneNumber).replace(`+${L}`, ""), T = c ? r?.addressing?.shipping?.primary : t?.addressing?.shipping?.primary, l = j(
       P?.addressLine1 ? P : E || T || {}
     );
     let G = null;
-    if (B && V?.includes(B?.alpha2Code))
-      G = B;
-    else if (A && V?.includes(A?.alpha2Code))
-      G = A;
+    if (R && V?.includes(R?.alpha2Code))
+      G = R;
+    else if (I && V?.includes(I?.alpha2Code))
+      G = I;
     else {
       const [ei] = V || [];
       G = s(ei);
     }
-    const J = s(u?.countryCode) || G, F = O(J) ? f(J) : n.shipping.country, z = u?.administrativeArea || n.shipping.administrativeArea, Y = z && typeof z == "string" ? {
+    const J = s(l?.countryCode) || G, F = D(J) ? y(J) : n.shipping.country, z = l?.administrativeArea || n.shipping.administrativeArea, Y = z && typeof z == "string" ? {
       code: z,
       label: z,
       value: z
-    } : z, Z = g ? r?.addressing?.billing?.primary : t?.addressing?.billing?.primary, y = j(
-      N?.addressLine1 ? N : Z || {}
-    ), K = s(y?.countryCode) || A, Q = O(K) ? f(K) : n.billing.country, H = y?.administrativeArea || n.billing.administrativeArea, ii = H && typeof H == "string" ? {
+    } : z, Z = c ? r?.addressing?.billing?.primary : t?.addressing?.billing?.primary, h = j(
+      A?.addressLine1 ? A : Z || {}
+    ), K = s(h?.countryCode) || I, Q = D(K) ? y(K) : n.billing.country, H = h?.administrativeArea || n.billing.administrativeArea, ii = H && typeof H == "string" ? {
       code: H,
       label: H,
       value: H
     } : H;
     return {
       ...n,
-      defaultCountry: f(A),
-      type: g ? "business" : "private",
+      defaultCountry: y(I),
+      type: c ? "business" : "private",
       contact: t || null,
-      email: g ? r?.administration?.email || t?.email || c?.email || n.email : t?.email || c?.email || n.email,
+      email: c ? r?.administration?.email || t?.email || p?.email || n.email : t?.email || p?.email || n.email,
       organisation: {
         ...n.organisation,
-        ...g ? {
+        ...c ? {
           id: r?.id || n.organisation.id,
           name: r?.name || n.organisation.name,
           cocNumber: r?.cocNumber || n.organisation.cocNumber,
           type: r?.type || n.organisation.type,
           vatNumber: r?.vatNumber || n.organisation.vatNumber,
-          vatNumberCountry: f(
-            s(r?.registration?.countryCode) || A
+          vatNumberCountry: y(
+            s(r?.registration?.countryCode) || I
           )
         } : {
-          vatNumberCountry: f(A)
+          vatNumberCountry: y(I)
         }
       },
       phoneNumber: k,
-      phoneNumberCountry: O(w) ? f(w) : n.phoneNumberCountry,
+      phoneNumberCountry: D(w) ? y(w) : n.phoneNumberCountry,
       phoneNumberId: o?.id || _?.id || n.phoneNumberId,
       shipping: {
         ...n.shipping,
-        givenName: u?.givenName || (g ? void 0 : t?.givenName) || n.shipping.givenName,
-        additionalName: u?.additionalName || (g ? void 0 : t?.additionalName) || n.shipping.additionalName,
-        familyName: u?.familyName || (g ? void 0 : t?.familyName) || n.shipping.familyName,
-        address_line_1: u?.address_line_1 || n.shipping.address_line_1,
-        address_line_2: u?.address_line_2 || n.shipping.address_line_2,
-        addressLine1: u?.addressLine1 || n.shipping.addressLine1,
-        addressLine2: u?.addressLine2 || n.shipping.addressLine2,
+        givenName: l?.givenName || (c ? void 0 : t?.givenName) || n.shipping.givenName,
+        additionalName: l?.additionalName || (c ? void 0 : t?.additionalName) || n.shipping.additionalName,
+        familyName: l?.familyName || (c ? void 0 : t?.familyName) || n.shipping.familyName,
+        address_line_1: l?.address_line_1 || n.shipping.address_line_1,
+        address_line_2: l?.address_line_2 || n.shipping.address_line_2,
+        addressLine1: l?.addressLine1 || n.shipping.addressLine1,
+        addressLine2: l?.addressLine2 || n.shipping.addressLine2,
         country: F,
         countryCode: F?.value || n.shipping.countryCode,
-        organisation: u?.organisation || n.shipping.organisation,
-        postalCode: u?.postalCode || n.shipping.postalCode,
-        premiseNumber: u?.premiseNumber || n.shipping.premiseNumber,
-        premiseNumberSuffix: u?.premiseNumberSuffix || n.shipping.premiseNumberSuffix,
-        thoroughfare: u?.thoroughfare || n.shipping.thoroughfare,
-        locality: u?.locality || n.shipping.locality,
+        organisation: l?.organisation || n.shipping.organisation,
+        postalCode: l?.postalCode || n.shipping.postalCode,
+        premiseNumber: l?.premiseNumber || n.shipping.premiseNumber,
+        premiseNumberSuffix: l?.premiseNumberSuffix || n.shipping.premiseNumberSuffix,
+        thoroughfare: l?.thoroughfare || n.shipping.thoroughfare,
+        locality: l?.locality || n.shipping.locality,
         administrativeArea: Y
       },
-      shippingAddressId: u?.id || n.shippingAddressId,
+      shippingAddressId: l?.id || n.shippingAddressId,
       billing: {
         ...n.billing,
-        givenName: y?.givenName || n.billing.givenName,
-        additionalName: y?.additionalName || n.billing.additionalName,
-        familyName: y?.familyName || n.billing.familyName,
-        address_line_1: y?.address_line_1 || n.billing.address_line_1,
-        address_line_2: y?.address_line_2 || n.billing.address_line_2,
-        addressLine1: y?.addressLine1 || n.billing.addressLine1,
-        addressLine2: y?.addressLine2 || n.billing.addressLine2,
+        givenName: h?.givenName || n.billing.givenName,
+        additionalName: h?.additionalName || n.billing.additionalName,
+        familyName: h?.familyName || n.billing.familyName,
+        address_line_1: h?.address_line_1 || n.billing.address_line_1,
+        address_line_2: h?.address_line_2 || n.billing.address_line_2,
+        addressLine1: h?.addressLine1 || n.billing.addressLine1,
+        addressLine2: h?.addressLine2 || n.billing.addressLine2,
         country: Q,
         countryCode: Q?.value || n.billing.countryCode,
-        organisation: y?.organisation || n.billing.organisation,
-        postalCode: y?.postalCode || n.billing.postalCode,
-        premiseNumber: y?.premiseNumber || n.billing.premiseNumber,
-        premiseNumberSuffix: y?.premiseNumberSuffix || n.billing.premiseNumberSuffix,
-        thoroughfare: y?.thoroughfare || n.billing.thoroughfare,
-        locality: y?.locality || n.billing.locality,
+        organisation: h?.organisation || n.billing.organisation,
+        postalCode: h?.postalCode || n.billing.postalCode,
+        premiseNumber: h?.premiseNumber || n.billing.premiseNumber,
+        premiseNumberSuffix: h?.premiseNumberSuffix || n.billing.premiseNumberSuffix,
+        thoroughfare: h?.thoroughfare || n.billing.thoroughfare,
+        locality: h?.locality || n.billing.locality,
         administrativeArea: ii
       },
-      billingAddressId: y?.id || n.billingAddressId,
-      sameBillingAsShippingAddress: O(y?.id) && O(u?.id) ? y?.id === u?.id : n.sameBillingAsShippingAddress
+      billingAddressId: h?.id || n.billingAddressId,
+      sameBillingAsShippingAddress: D(h?.id) && D(l?.id) ? h?.id === l?.id : n.sameBillingAsShippingAddress
     };
   },
-  isComplete: (I, d) => {
-    const { step: S } = d || {};
-    return S.validationSchema(d).isValidSync(I);
+  isComplete: (S, a) => {
+    const { step: v } = a || {};
+    return v.validationSchema(a).isValidSync(S);
   },
-  onEvent: async (I, d, S, R) => {
-    const { step: f, stepIndex: s } = S || {}, {
-      activeStep: v,
-      addCustomer: D,
-      formRef: m,
-      formatCountryAsOption: p,
-      getCountryByCode: C,
+  onEvent: async (S, a, v, O) => {
+    const { step: y, stepIndex: s } = v || {}, {
+      activeStep: f,
+      addCustomer: g,
+      formRef: C,
+      formatCountryAsOption: B,
+      getCountryByCode: N,
       settings: U
-    } = R || {}, { isB2bExcluded: $, isB2cExcluded: n } = U || {}, M = m.current?.formProps?.data || [], e = v === s ? m.current?.getValues() : M[s] ?? {}, b = typeof f.defaultValues == "function" ? f.defaultValues(R) : f.defaultValues;
-    if (I === "signedIn") {
-      const { user: h, account: i } = d || {};
+    } = O || {}, { isB2bExcluded: $, isB2cExcluded: n } = U || {}, M = C.current?.formProps?.data || [], e = f === s ? C.current?.getValues() : M[s] ?? {}, m = typeof y.defaultValues == "function" ? y.defaultValues(O) : y.defaultValues;
+    if (S === "signedIn") {
+      const { user: b, account: i } = a || {};
       let o = e?.contact;
-      h?.id && e?.contact?.id !== h?.id && (o = (await D({
+      b?.id && e?.contact?.id !== b?.id && (o = (await g({
         customer: {
-          contactId: h.id
+          contactId: b.id
         }
       }))?.customer?.contact);
-      const [t] = i?.billing || [], [l] = i?.shipping || [], [r] = i?.organisations || [], [N] = i?.phoneNumbers || [], P = C(N?.countryCode) || e?.defaultCountry, [E] = P?.callingCodes || [], c = l ? j(l) : null, {
+      const [t] = i?.billing || [], [d] = i?.shipping || [], [r] = i?.organisations || [], [A] = i?.phoneNumbers || [], P = N(A?.countryCode) || e?.defaultCountry, [E] = P?.callingCodes || [], p = d ? j(d) : null, {
         id: x,
         isValid: V,
-        ...A
-      } = c || {}, B = A?.countryCode ? p(C(A.countryCode)) : e?.defaultCountry, g = t ? j(t) : null, {
+        ...I
+      } = p || {}, R = I?.countryCode ? B(N(I.countryCode)) : e?.defaultCountry, c = t ? j(t) : null, {
         id: _,
         isValid: w,
         ...L
-      } = g || {}, k = L?.countryCode ? p(C(L.countryCode)) : e?.defaultCountry, T = !$ && r?.id || n, u = T && r?.administration?.email || i?.email, J = {
+      } = c || {}, k = L?.countryCode ? B(N(L.countryCode)) : e?.defaultCountry, T = !$ && r?.id || n, l = T && r?.administration?.email || i?.email, J = {
         ...e,
-        ...b || {},
+        ...m || {},
         contact: o,
-        email: u,
+        email: l,
         type: T ? "business" : "private",
-        ...N ? {
-          phoneNumber: N.number?.replace(
+        ...A ? {
+          phoneNumber: A.number?.replace(
             `+${E}`,
             ""
           ),
           phoneNumberCountry: P,
-          phoneNumberId: N?.id || ""
+          phoneNumberId: A?.id || ""
         } : {
           phoneNumberCountry: e.defaultCountry
         },
         organisation: T ? {
           ...e?.organisation || {},
-          ...b?.organisation || {},
+          ...m?.organisation || {},
           id: r?.id || "",
           name: r?.name || "",
           cocNumber: r?.cocNumber || "",
@@ -228,14 +227,14 @@ const ai = {
           isVatNumberRequired: e?.organisation?.isVatNumberRequired ?? !1,
           type: r?.type || "DEFAULT",
           vatNumber: r?.registration?.number || "",
-          vatNumberCountry: p(
-            C(
+          vatNumberCountry: B(
+            N(
               r?.registration?.countryCode
             ) || e?.defaultCountry
           )
         } : {
           ...e?.organisation || {},
-          ...b?.organisation || {},
+          ...m?.organisation || {},
           isCocNumberRequired: e?.organisation?.isCocNumberRequired ?? !1,
           isVatNumberRequired: e?.organisation?.isVatNumberRequired ?? !1,
           vatNumberCountry: e.defaultCountry
@@ -251,91 +250,91 @@ const ai = {
           country: e.defaultCountry
         },
         billingAddressId: _ || "",
-        shipping: l ? {
+        shipping: d ? {
           ...e.shipping,
           ...q,
-          ...A,
-          country: B
+          ...I,
+          country: R
         } : {
           ...e.shipping,
           ...q,
           country: e.defaultCountry
         },
         shippingAddressId: x || "",
-        sameBillingAsShippingAddress: O(_) || O(_) && _ === x
+        sameBillingAsShippingAddress: D(_) || D(_) && _ === x
       };
-      i && (v === s && m.current?.reset({
+      i && (f === s && C.current?.reset({
         ...e,
         ...J
-      }), m.current?.formProps?.setData((F) => (F.splice(s, 1, {
+      }), C.current?.formProps?.setData((F) => (F.splice(s, 1, {
         ...F[s],
         ...J
       }), F)));
     }
-    if (I === "clearSession") {
-      const { sessionExpired: h, shouldCreateAccount: i } = d || {}, o = {
+    if (S === "clearSession") {
+      const { sessionExpired: b, shouldCreateAccount: i } = a || {}, o = {
         ...e,
-        ...h ? b || {} : {},
+        ...b ? m || {} : {},
         shouldCreateAccount: i ?? !1
       };
-      v === s && m.current?.reset({
+      f === s && C.current?.reset({
         ...e,
         ...o
-      }), m.current?.formProps?.setData((t) => (t.splice(s, 1, {
+      }), C.current?.formProps?.setData((t) => (t.splice(s, 1, {
         ...t[s],
         ...o
       }), t));
     }
-    if (I === "accountSelected") {
-      const { account: h, user: i } = d || {}, [o] = h?.billing || [], [t] = h?.shipping || [], [l] = h?.organisations || [], [r] = h?.phoneNumbers || [], N = C(r?.countryCode) || e?.defaultCountry, [P] = N?.callingCodes || [], E = t ? j(t) : null, {
-        id: c,
+    if (S === "accountSelected") {
+      const { account: b, user: i } = a || {}, [o] = b?.billing || [], [t] = b?.shipping || [], [d] = b?.organisations || [], [r] = b?.phoneNumbers || [], A = N(r?.countryCode) || e?.defaultCountry, [P] = A?.callingCodes || [], E = t ? j(t) : null, {
+        id: p,
         isValid: x,
         ...V
-      } = E || {}, A = V?.countryCode ? p(C(V.countryCode)) : e?.defaultCountry, B = o ? j(o) : null, {
-        id: g,
+      } = E || {}, I = V?.countryCode ? B(N(V.countryCode)) : e?.defaultCountry, R = o ? j(o) : null, {
+        id: c,
         isValid: _,
         ...w
-      } = B || {}, L = w?.countryCode ? p(C(w.countryCode)) : e?.defaultCountry, k = !$ && l?.id || n;
-      await D({
+      } = R || {}, L = w?.countryCode ? B(N(w.countryCode)) : e?.defaultCountry, k = !$ && d?.id || n;
+      await g({
         customer: {
           contactId: i.id,
-          ...k && l?.id ? { organisationId: l?.id } : {}
+          ...k && d?.id ? { organisationId: d?.id } : {}
         }
       });
       const T = {
         ...e,
-        ...b || {},
+        ...m || {},
         contact: e?.contact,
-        email: k && l?.administration?.email || h?.email,
+        email: k && d?.administration?.email || b?.email,
         type: k ? "business" : "private",
         ...r ? {
           phoneNumber: r.number?.replace(
             `+${P}`,
             ""
           ),
-          phoneNumberCountry: N,
+          phoneNumberCountry: A,
           phoneNumberId: r?.id || ""
         } : {
           phoneNumberCountry: e.defaultCountry
         },
         organisation: k ? {
           ...e?.organisation || {},
-          ...b?.organisation || {},
-          id: l?.id || "",
-          name: l?.name || "",
-          cocNumber: l?.cocNumber || "",
+          ...m?.organisation || {},
+          id: d?.id || "",
+          name: d?.name || "",
+          cocNumber: d?.cocNumber || "",
           isCocNumberRequired: e?.organisation?.isCocNumberRequired ?? !1,
           isVatNumberRequired: e?.organisation?.isVatNumberRequired ?? !1,
-          type: l?.type || "DEFAULT",
-          vatNumber: l?.registration?.number || "",
-          vatNumberCountry: p(
-            C(
-              l?.registration?.countryCode
+          type: d?.type || "DEFAULT",
+          vatNumber: d?.registration?.number || "",
+          vatNumberCountry: B(
+            N(
+              d?.registration?.countryCode
             ) || e?.defaultCountry
           )
         } : {
           ...e?.organisation || {},
-          ...b?.organisation || {},
+          ...m?.organisation || {},
           isCocNumberRequired: e?.organisation?.isCocNumberRequired ?? !1,
           isVatNumberRequired: e?.organisation?.isVatNumberRequired ?? !1,
           vatNumberCountry: e.defaultCountry
@@ -350,71 +349,71 @@ const ai = {
           ...q,
           country: e.defaultCountry
         },
-        billingAddressId: g || "",
+        billingAddressId: c || "",
         shipping: t ? {
           ...e.shipping,
           ...q,
           ...V,
-          country: A
+          country: I
         } : {
           ...e.shipping,
           ...q,
           country: e.defaultCountry
         },
-        shippingAddressId: c || "",
-        sameBillingAsShippingAddress: !O(g) || O(g) && g === c
+        shippingAddressId: p || "",
+        sameBillingAsShippingAddress: !D(c) || D(c) && c === p
       };
-      v === s && m.current?.reset({
+      f === s && C.current?.reset({
         ...e,
         ...T
-      }), m.current?.formProps?.setData((u) => (u.splice(s, 1, {
-        ...u[s],
+      }), C.current?.formProps?.setData((l) => (l.splice(s, 1, {
+        ...l[s],
         ...T
-      }), u));
+      }), l));
     }
-    if (I === "businessAccountSelected") {
-      const { account: h, organisation: i, user: o } = d || {};
-      await D({
+    if (S === "businessAccountSelected") {
+      const { account: b, organisation: i, user: o } = a || {};
+      await g({
         customer: {
           contactId: o.id,
           organisationId: i?.id
         }
       });
       const t = i?.addressing?.billing?.primary ? j(i?.addressing?.billing?.primary) : null, {
-        id: l,
+        id: d,
         isValid: r,
-        ...N
-      } = t || {}, P = N?.countryCode ? p(
-        C(N.countryCode)
+        ...A
+      } = t || {}, P = A?.countryCode ? B(
+        N(A.countryCode)
       ) : e?.defaultCountry, E = i?.addressing?.shipping?.primary ? j(i?.addressing?.shipping?.primary) : null, {
-        id: c,
+        id: p,
         isValid: x,
         ...V
-      } = E || {}, A = V?.countryCode ? p(
-        C(V.countryCode)
-      ) : e?.defaultCountry, B = i?.phoneNumbers?.primary, g = C(B?.countryCode) || e?.defaultCountry, [_] = g?.callingCodes || [], w = {
+      } = E || {}, I = V?.countryCode ? B(
+        N(V.countryCode)
+      ) : e?.defaultCountry, R = i?.phoneNumbers?.primary, c = N(R?.countryCode) || e?.defaultCountry, [_] = c?.callingCodes || [], w = {
         ...e,
-        ...b || {}
+        ...m || {}
       };
-      v === s && m.current?.reset({
+      f === s && C.current?.reset({
         ...e,
         ...w,
         contact: e?.contact,
-        email: i?.administration?.email || h?.email || "",
+        email: i?.administration?.email || b?.email || "",
         type: "business",
-        ...B ? {
-          phoneNumber: B?.number?.replace(
+        ...R ? {
+          phoneNumber: R?.number?.replace(
             `+${_}`,
             ""
           ),
-          phoneNumberCountry: g,
-          phoneNumberId: B?.id || ""
+          phoneNumberCountry: c,
+          phoneNumberId: R?.id || ""
         } : {
           phoneNumberCountry: e.defaultCountry
         },
         organisation: i ? {
           ...e?.organisation || {},
-          ...b?.organisation || {},
+          ...m?.organisation || {},
           id: i?.id || "",
           name: i?.name || "",
           cocNumber: i?.cocNumber || "",
@@ -422,12 +421,12 @@ const ai = {
           isVatNumberRequired: e?.organisation?.isVatNumberRequired ?? !1,
           type: i?.type || "SHARED",
           vatNumber: i?.registration?.number || "",
-          vatNumberCountry: p(
-            C(i?.registration?.countryCode) || e?.defaultCountry
+          vatNumberCountry: B(
+            N(i?.registration?.countryCode) || e?.defaultCountry
           )
         } : {
           ...e?.organisation || {},
-          ...b?.organisation || {},
+          ...m?.organisation || {},
           isCocNumberRequired: e?.organisation?.isCocNumberRequired ?? !1,
           isVatNumberRequired: e?.organisation?.isVatNumberRequired ?? !1,
           vatNumberCountry: e.defaultCountry
@@ -435,59 +434,59 @@ const ai = {
         billing: t ? {
           ...e.billing,
           ...q,
-          ...N,
+          ...A,
           country: P
         } : {
           ...e.billing,
           ...q,
           country: e.defaultCountry
         },
-        billingAddressId: l || "",
+        billingAddressId: d || "",
         shipping: E ? {
           ...e.shipping,
           ...q,
           ...V,
-          country: A
+          country: I
         } : {
           ...e.shipping,
           ...q,
           country: e.defaultCountry
         },
-        shippingAddressId: c || "",
-        sameBillingAsShippingAddress: !O(l) || O(l) && l === c
-      }), m.current?.formProps?.setData((L) => (L.splice(s, 1, {
+        shippingAddressId: p || "",
+        sameBillingAsShippingAddress: !D(d) || D(d) && d === p
+      }), C.current?.formProps?.setData((L) => (L.splice(s, 1, {
         ...L[s],
         ...w
       }), L));
     }
   },
-  submit: async (I, d, S) => {
+  submit: async (S, a, v) => {
     const {
-      activeStep: R,
-      addInformation: f,
+      activeStep: O,
+      addInformation: y,
       currentOrganisation: s,
-      formRef: v,
-      getCountryByCode: D,
-      getUser: m,
-      isSignedIn: p,
-      setCurrentOrganisation: C,
+      formRef: f,
+      getCountryByCode: g,
+      getUser: C,
+      isSignedIn: B,
+      setCurrentOrganisation: N,
       setErrorMessage: U,
       signUp: $,
       translations: n = {},
       updateAccountInformation: M,
       updateOrganisationOnAccount: e
-    } = S || {}, b = {
+    } = v || {}, m = {
       ...ai,
       ...n.feedback || {}
-    }, { shouldCreateAccount: h } = I || {};
+    }, { shouldCreateAccount: b } = S || {};
     try {
       U(null);
-      const i = oi(I, {
+      const i = oi(S, {
         currentOrganisation: s,
-        isSignedIn: p
-      }), o = m();
-      if (h) {
-        const c = await $({
+        isSignedIn: B
+      }), o = C();
+      if (b) {
+        const p = await $({
           givenName: i?.shipping?.givenName,
           additionalName: i?.shipping?.additionalName,
           familyName: i?.shipping?.familyName,
@@ -501,25 +500,25 @@ const ai = {
         }).catch((x) => {
           const V = W(x);
           return U({
-            title: b.feedback?.signUpFailedTitle,
-            description: V ? X(V) : b.feedback?.signUpFailedDescription,
+            title: m.feedback?.signUpFailedTitle,
+            description: V ? X(V) : m.feedback?.signUpFailedDescription,
             action: {
-              label: b.feedback?.signUpFailedActionLabel,
+              label: m.feedback?.signUpFailedActionLabel,
               onClick: () => {
-                U(null), v.current?.reset({
-                  ...v.current?.getValues() || {},
+                U(null), f.current?.reset({
+                  ...f.current?.getValues() || {},
                   shouldCreateAccount: !1
-                }), v.current?.submitForm();
+                }), f.current?.submitForm();
               }
             }
           }), Promise.reject(x);
         });
-        if (!c)
+        if (!p)
           return Promise.reject();
-        delete i.customer.contact, i.customer.contactId = c.id, v.current?.setValue("shouldCreateAccount", !1);
+        delete i.customer.contact, i.customer.contactId = p.id, f.current?.setValue("shouldCreateAccount", !1);
       }
       if (o && !o?.organisation?.id) {
-        const c = si(
+        const p = si(
           {
             billingAddress: i.billingAddress,
             billingAddressId: i.billingAddressId,
@@ -536,14 +535,14 @@ const ai = {
             user: o
           },
           {
-            getCountryByCode: D
+            getCountryByCode: g
           }
         );
-        c && await M(c).catch(() => {
+        p && await M(p).catch(() => {
         });
       }
       if (o?.organisation?.id && o?.organisation?.role?.toLowerCase() === "admin") {
-        const c = ri(
+        const p = ri(
           {
             billingAddress: i.billingAddress,
             billingAddressId: i.billingAddressId,
@@ -560,80 +559,77 @@ const ai = {
             user: o
           },
           {
-            getCountryByCode: D
+            getCountryByCode: g
           }
         );
-        c && await e(c).catch(
+        p && await e(p).catch(
           () => {
           }
         );
       }
-      const t = await f({
+      const t = await y({
         billingAddress: i.billingAddress,
         customer: i.customer,
         phoneNumber: i.phoneNumber,
         shippingAddress: i.shippingAddress
-      }), { customer: l, billing: r, delivery: N, phoneNumber: P } = t || {}, { organisation: E } = l || {};
-      return v.current?.formProps?.setData((c) => (c.splice(R, 1, {
-        ...c[R],
-        contact: l?.contact,
+      }), { customer: d, billing: r, delivery: A, phoneNumber: P } = t || {}, { organisation: E } = d || {};
+      return f.current?.formProps?.setData((p) => (p.splice(O, 1, {
+        ...p[O],
+        contact: d?.contact,
         billingAddressId: r?.address?.id,
-        shippingAddressId: N?.address?.id,
+        shippingAddressId: A?.address?.id,
         phoneNumberId: P?.id,
         phoneNumberIsDirty: !1
-      }), c)), C(E), t;
+      }), p)), N(E), t;
     } catch (i) {
       const o = W(i);
       return U({
-        title: b.feedback?.informationStepErrorTitle,
-        description: o ? X(o) : b.feedback?.informationStepErrorDescription
+        title: m.feedback?.informationStepErrorTitle,
+        description: o ? X(o) : m.feedback?.informationStepErrorDescription
       }), Promise.reject(i);
     }
   },
-  validationSchema: (I) => {
+  validationSchema: (S) => {
     const {
-      billingAddressValidationSchema: d,
-      shippingAddressValidationSchema: S,
-      settings: R
-    } = I || {}, {
-      isCocNumberRequired: f,
+      billingAddressValidationSchema: a,
+      shippingAddressValidationSchema: v,
+      settings: O
+    } = S || {}, {
+      isCocNumberRequired: y,
       isPhoneNumberRequired: s,
-      isSalutationRequired: v,
-      isVatNumberRequired: D,
-      salutation: m
-    } = R || {};
-    return a.object().shape({
-      type: a.string().oneOf(["business", "private"]).required(),
-      contact: a.object().nullable(),
-      email: a.string().trim().email().required(),
-      emailOptIn: a.boolean().nullable(),
-      salutation: m && v ? a.string().nullable().required() : a.string().nullable(),
-      shouldCreateAccount: a.boolean().nullable(),
-      password: a.string().nullable().when("shouldCreateAccount", {
+      isVatNumberRequired: f
+    } = O || {};
+    return u.object().shape({
+      type: u.string().oneOf(["business", "private"]).required(),
+      contact: u.object().nullable(),
+      email: u.string().trim().email().required(),
+      emailOptIn: u.boolean().nullable(),
+      shouldCreateAccount: u.boolean().nullable(),
+      password: u.string().nullable().when("shouldCreateAccount", {
         is: !0,
-        then: (p) => p.required()
+        then: (g) => g.required()
       }),
-      passwordConfirm: a.string().when("shouldCreateAccount", {
+      passwordConfirm: u.string().when("shouldCreateAccount", {
         is: !0,
-        then: (p) => p.required().equalPassword()
+        then: (g) => g.required().equalPassword()
       }),
-      phoneNumber: s ? a.string().phoneNumber().nullable().required() : a.string().phoneNumber().nullable(),
-      phoneNumberCountry: s ? a.object().nullable().required() : a.object().nullable(),
-      organisation: a.object().nullable().when("type", {
-        is: (p) => p === "business",
-        then: (p) => p.shape({
-          id: a.string().nullable(),
-          name: a.string().required(),
-          cocNumber: f ? a.string().trim().required() : a.string().trim().nullable(),
-          vatNumber: D ? a.string().trim().required() : a.string().trim().nullable(),
-          vatNumberCountry: D ? a.object().nullable().required() : a.object().nullable()
+      phoneNumber: s ? u.string().phoneNumber().nullable().required() : u.string().phoneNumber().nullable(),
+      phoneNumberCountry: s ? u.object().nullable().required() : u.object().nullable(),
+      organisation: u.object().nullable().when("type", {
+        is: (g) => g === "business",
+        then: (g) => g.shape({
+          id: u.string().nullable(),
+          name: u.string().required(),
+          cocNumber: y ? u.string().trim().required() : u.string().trim().nullable(),
+          vatNumber: f ? u.string().trim().required() : u.string().trim().nullable(),
+          vatNumberCountry: f ? u.object().nullable().required() : u.object().nullable()
         })
       }),
-      sameBillingAsShippingAddress: a.boolean().nullable(),
-      shipping: a.object().nullable().shape(S),
-      billing: a.object().nullable().when("sameBillingAsShippingAddress", {
+      sameBillingAsShippingAddress: u.boolean().nullable(),
+      shipping: u.object().nullable().shape(v),
+      billing: u.object().nullable().when("sameBillingAsShippingAddress", {
         is: !1,
-        then: (p) => p.shape(d)
+        then: (g) => g.shape(a)
       })
     });
   }