@infosoftas/s4-orders-js-sdk 0.0.1-alpha2a → 0.0.1-alpha2b

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@infosoftas/s4-orders-js-sdk",
-    "version": "0.0.1-alpha2a",
+    "version": "0.0.1-alpha2b",
     "scripts": {
         "build": "rimraf lib && webpack --env mode=production"
     },

package/src/App.tsx

@@ -1,8 +1,14 @@
 import { FC, useEffect, useState } from 'react';
 
-import { MessageEventTypeEnum, PaymentMethodEnum } from './enums/general';
+import {
+    FormTypeEnum,
+    MessageEventTypeEnum,
+    PaymentMethodEnum,
+} from './enums/general';
 import useMessageEvent from './hooks/useMessageEvent';
 import OrderForm from './components/OrderForm/OrderForm';
+import OIOForm from './components/OIOForm/OIOForm';
+import EHFForm from './components/EHFForm/EHFForm';
 import Loader from './components/Loader/Loader';
 import MainIframe from './components/MainIframe/MainIframe';
 import Alert from './components/Alert/Alert';
@@ -35,6 +41,11 @@ const App: FC<ConfigType> = ({
         successText: 'Order successful completed!',
         failureText: 'Something went wrong!',
         buttonText: 'Start',
+        submitButtonText: 'Start',
+        backButtonText: 'Back',
+        verifyButtonText: 'Verify',
+        organizationNumberLabel: 'CVR',
+        glnLabel: 'GLN',
     },
 }) => {
     const [loading, setLoading] = useState<boolean>(false);
@@ -46,6 +57,7 @@ const App: FC<ConfigType> = ({
     const [failedMsg, setFailedMsg] = useState<string>('');
     const [errorsMsg, setErrorsMsg] = useState<string[]>([]);
     const [orderInfo, setOrderInfo] = useState<OrderInfoType | null>(null);
+    const [formType, setFormType] = useState(FormTypeEnum.ORDER);
 
     useEffect(() => {
         if (apiKey) {
@@ -108,6 +120,7 @@ const App: FC<ConfigType> = ({
             setIsFailed(true);
             setLoading(false);
             setShowOrderForm(true);
+            setFormType(FormTypeEnum.ORDER);
         }
     };
 
@@ -191,18 +204,15 @@ const App: FC<ConfigType> = ({
             data?.paymentMethod === PaymentMethodEnum.Email ||
             data?.paymentMethod === PaymentMethodEnum.Invoice
         ) {
-            if (window === top) {
-                setIsConfirmed(true);
-                setLoading(false);
-                top.postMessage(
-                    {
-                        type: MessageEventTypeEnum.ORDER_FLOW_COMPLETE,
-                        isCompleted: true,
-                        orderInfo: data || null,
-                    },
-                    top?.location?.origin || '*'
-                );
-            }
+            messageCallback({
+                orderId: data.orderId || orderId || '',
+                agreementId: '',
+                orderInfo: data || orderInfo || null,
+            });
+        } else if (data?.paymentMethod === PaymentMethodEnum.EHF) {
+            setFormType(FormTypeEnum.EHF);
+        } else if (data?.paymentMethod === PaymentMethodEnum.OIO) {
+            setFormType(FormTypeEnum.OIO);
         } else if (url) {
             if (
                 showIframe &&
@@ -219,6 +229,18 @@ const App: FC<ConfigType> = ({
         setIframeSrc(null);
     };
 
+    const handleInvoiceBack = () => {
+        setFormType(FormTypeEnum.ORDER);
+    };
+
+    const handleInvoiceForm = async () => {
+        await messageCallback({
+            orderId: orderId || '',
+            agreementId: '',
+            orderInfo: orderInfo || null,
+        });
+    };
+
     if (window !== top) {
         return null;
     }
@@ -238,27 +260,67 @@ const App: FC<ConfigType> = ({
                     </div>
                 )}
                 {!iframeSrc && showOrderForm && (
-                    <OrderForm
-                        callback={handleForm}
-                        templatePackageId={templatePackageId}
-                        subscriberId={subscriberId}
-                        userId={userId}
-                        identityProviderId={identityProviderId}
-                        organizationId={organizationId}
-                        paymentMethods={availablePaymentMethods}
-                        buttonText={settings?.buttonText}
-                        paymentMethodLabel={settings?.paymentMethodLabel}
-                        errorReqMsg={settings?.errorReqMsg}
-                        errorInvalidEmailMsg={settings?.errorInvalidEmailMsg}
-                        errorInvalidPhoneMsg={settings?.errorInvalidPhoneMsg}
-                        defaultValues={settings?.orderDefaultValues}
-                        redirectUrl={redirectUrl}
-                        showIframe={showIframe}
-                        paymentMethodsOptions={paymentMethodsOptions}
-                        language={language}
-                        merchantAgreementUrl={merchantAgreementUrl}
-                        invoiceAddressSelection={invoiceAddressSelection}
-                    />
+                    <>
+                        {formType === FormTypeEnum.OIO && (
+                            <OIOForm
+                                onBack={handleInvoiceBack}
+                                callback={handleInvoiceForm}
+                                backButtonText={settings?.backButtonText}
+                                verifyButtonText={settings?.verifyButtonText}
+                                organizationNumberLabel={
+                                    settings?.organizationNumberLabel
+                                }
+                                glnLabel={settings?.glnLabel}
+                            />
+                        )}
+                        {formType === FormTypeEnum.EHF && (
+                            <EHFForm
+                                onBack={handleInvoiceBack}
+                                callback={handleInvoiceForm}
+                                backButtonText={settings?.backButtonText}
+                                verifyButtonText={settings?.verifyButtonText}
+                                organizationNumberLabel={
+                                    settings?.organizationNumberLabel
+                                }
+                            />
+                        )}
+                        {formType !== FormTypeEnum.OIO &&
+                            formType !== FormTypeEnum.EHF && (
+                                <OrderForm
+                                    callback={handleForm}
+                                    templatePackageId={templatePackageId}
+                                    subscriberId={subscriberId}
+                                    userId={userId}
+                                    identityProviderId={identityProviderId}
+                                    organizationId={organizationId}
+                                    paymentMethods={availablePaymentMethods}
+                                    submitButtonText={
+                                        settings?.submitButtonText
+                                    }
+                                    paymentMethodLabel={
+                                        settings?.paymentMethodLabel
+                                    }
+                                    errorReqMsg={settings?.errorReqMsg}
+                                    errorInvalidEmailMsg={
+                                        settings?.errorInvalidEmailMsg
+                                    }
+                                    errorInvalidPhoneMsg={
+                                        settings?.errorInvalidPhoneMsg
+                                    }
+                                    defaultValues={settings?.orderDefaultValues}
+                                    redirectUrl={redirectUrl}
+                                    showIframe={showIframe}
+                                    paymentMethodsOptions={
+                                        paymentMethodsOptions
+                                    }
+                                    language={language}
+                                    merchantAgreementUrl={merchantAgreementUrl}
+                                    invoiceAddressSelection={
+                                        invoiceAddressSelection
+                                    }
+                                />
+                            )}
+                    </>
                 )}
                 {showIframe && <MainIframe iframeSrc={iframeSrc} />}
                 {isConfirmed && (

package/src/api/InvoiceApi.ts

@@ -0,0 +1,25 @@
+import fetcher from '../utils/fetcher';
+
+type RequestInvoiceLookupType = {
+    network: string;
+    value: string;
+};
+
+type InvoiceLookupResponseType = {
+    recievesInvoice: boolean;
+};
+
+export const invoiceLookup = (
+    body: RequestInvoiceLookupType
+): Promise<InvoiceLookupResponseType> =>
+    fetcher<InvoiceLookupResponseType, RequestInvoiceLookupType>({
+        method: 'POST',
+        url: '/invoicelookup',
+        headers: {
+            'S4-ORDERS-API-KEY':
+                sessionStorage.getItem('sdk_api_key') ||
+                process.env.API_KEY ||
+                '',
+        },
+        body,
+    }) as Promise<InvoiceLookupResponseType>;

package/src/assets/styles/general.scss

@@ -17,6 +17,10 @@
     align-items: center;
 }
 
+.gap-2 {
+    gap: 0.5rem
+}
+
 .mt-2 {
     margin-top: 0.5rem;
 }

package/src/components/Button/Button.tsx

@@ -7,7 +7,7 @@ import './button.scss';
 type Props = {
     onClick?: (e: MouseEvent<HTMLButtonElement>) => void;
     type?: 'button' | 'submit' | 'reset';
-    btnType?: 'primary';
+    btnType?: 'primary' | 'default';
     buttonText?: string;
     loading?: boolean;
     disable?: boolean;

package/src/components/EHFForm/EHFForm.tsx

@@ -0,0 +1,125 @@
+import { FC, useState } from 'react';
+import { FormProvider, useForm, SubmitHandler } from 'react-hook-form';
+
+import { invoiceLookup } from '../../api/InvoiceApi';
+import Alert from '../Alert/Alert';
+import Button from '../Button/Button';
+import InputField from '../FormFields/InputField';
+import {
+    prepareErrorMessage,
+    prepareErrorsArrayMessage,
+} from '../../utils/helper';
+import { InvoiceLookupNetworkEnum } from '../../enums/general';
+import { ErrorsMsg } from '../../types/general';
+
+type Props = {
+    callback: (value: string) => void;
+    onBack: () => void;
+    backButtonText?: string;
+    verifyButtonText?: string;
+    organizationNumberLabel?: string;
+    className?: string;
+};
+
+type EHFFormInputsType = {
+    organizationNumber: string;
+};
+
+const initialData = {
+    organizationNumber: '',
+};
+
+const EHFForm: FC<Props> = ({
+    callback,
+    onBack,
+    backButtonText = '',
+    verifyButtonText = '',
+    organizationNumberLabel = '',
+    className = '',
+}) => {
+    const [loading, setLoading] = useState<boolean>(false);
+    const [apiErrorMsg, setApiErrorMsg] = useState<string>('');
+    const [errorsMsg, setErrorsMsg] = useState<string[]>([]);
+
+    const methods = useForm<EHFFormInputsType>({
+        defaultValues: {
+            ...initialData,
+        },
+    });
+
+    const {
+        handleSubmit,
+        formState: { errors },
+    } = methods;
+
+    const onSubmit: SubmitHandler<EHFFormInputsType> = async (
+        data
+    ): Promise<void> => {
+        setApiErrorMsg('');
+        setErrorsMsg([]);
+        setLoading(true);
+        try {
+            await invoiceLookup({
+                network: InvoiceLookupNetworkEnum.EHF,
+                value: data.organizationNumber,
+            });
+            callback(data.organizationNumber);
+        } catch (error) {
+            setApiErrorMsg(prepareErrorMessage(error as Error));
+            setErrorsMsg(
+                prepareErrorsArrayMessage(
+                    (
+                        error as {
+                            errors: ErrorsMsg;
+                        }
+                    )?.errors
+                )
+            );
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    const handleBack = () => {
+        onBack?.();
+    };
+
+    return (
+        <FormProvider {...methods}>
+            <form
+                className={`${className}`}
+                onSubmit={handleSubmit(onSubmit)}
+                data-testid="ehf-form-id"
+            >
+                <InputField
+                    name="organizationNumber"
+                    label={organizationNumberLabel}
+                    required
+                    readOnly={false}
+                    errors={errors}
+                />
+                <div className="d-flex justify-center flex-wrap gap-2">
+                    <Button
+                        type="button"
+                        btnType="default"
+                        disable={loading}
+                        buttonText={backButtonText}
+                        onClick={handleBack}
+                    />
+
+                    <Button
+                        type="submit"
+                        loading={loading}
+                        buttonText={verifyButtonText}
+                    />
+                </div>
+
+                {apiErrorMsg && <Alert className="mt-2" msg={apiErrorMsg} />}
+                {errorsMsg?.length > 0 &&
+                    errorsMsg.map((i) => <Alert className="mt-2" msg={i} />)}
+            </form>
+        </FormProvider>
+    );
+};
+
+export default EHFForm;

package/src/components/OIOForm/OIOForm.tsx

@@ -0,0 +1,141 @@
+import { FC, useState } from 'react';
+import { FormProvider, useForm, SubmitHandler } from 'react-hook-form';
+
+import { invoiceLookup } from '../../api/InvoiceApi';
+import Alert from '../Alert/Alert';
+import Button from '../Button/Button';
+import InputField from '../FormFields/InputField';
+import {
+    prepareErrorMessage,
+    prepareErrorsArrayMessage,
+} from '../../utils/helper';
+import { InvoiceLookupNetworkEnum } from '../../enums/general';
+import { ErrorsMsg } from '../../types/general';
+
+type Props = {
+    callback: (value: string) => void;
+    onBack: () => void;
+    backButtonText?: string;
+    verifyButtonText?: string;
+    organizationNumberLabel?: string;
+    glnLabel?: string;
+    className?: string;
+};
+
+type OIOFormInputsType = {
+    cvr: string;
+    gln: string;
+};
+
+const initialData = {
+    cvr: '',
+    gln: '',
+};
+
+const EHFForm: FC<Props> = ({
+    callback,
+    onBack,
+    backButtonText = '',
+    verifyButtonText = '',
+    organizationNumberLabel = '',
+    glnLabel = '',
+    className = '',
+}) => {
+    const [loading, setLoading] = useState<boolean>(false);
+    const [apiErrorMsg, setApiErrorMsg] = useState<string>('');
+    const [errorsMsg, setErrorsMsg] = useState<string[]>([]);
+
+    const methods = useForm<OIOFormInputsType>({
+        defaultValues: {
+            ...initialData,
+        },
+    });
+
+    const {
+        handleSubmit,
+        watch,
+        formState: { errors },
+    } = methods;
+
+    const cvr = watch('cvr');
+    const gln = watch('gln');
+
+    const onSubmit: SubmitHandler<OIOFormInputsType> = async (
+        data
+    ): Promise<void> => {
+        setApiErrorMsg('');
+        setErrorsMsg([]);
+        setLoading(true);
+        try {
+            await invoiceLookup({
+                network: data.gln
+                    ? InvoiceLookupNetworkEnum.OIO_GLN
+                    : InvoiceLookupNetworkEnum.OIO_Danish_CVR,
+                value: data.gln || data.cvr,
+            });
+            callback(data.gln || data.cvr);
+        } catch (error) {
+            setApiErrorMsg(prepareErrorMessage(error as Error));
+            setErrorsMsg(
+                prepareErrorsArrayMessage(
+                    (
+                        error as {
+                            errors: ErrorsMsg;
+                        }
+                    )?.errors
+                )
+            );
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    const handleBack = () => {
+        onBack?.();
+    };
+
+    return (
+        <FormProvider {...methods}>
+            <form
+                className={`${className}`}
+                onSubmit={handleSubmit(onSubmit)}
+                data-testid="oio-form-id"
+            >
+                <InputField
+                    name="cvr"
+                    label={organizationNumberLabel}
+                    required={!gln}
+                    readOnly={false}
+                    errors={errors}
+                />
+                <InputField
+                    name="gln"
+                    label={glnLabel}
+                    required={!cvr}
+                    readOnly={false}
+                    errors={errors}
+                />
+                <div className="d-flex justify-center flex-wrap gap-2">
+                    <Button
+                        type="button"
+                        btnType="default"
+                        disable={loading}
+                        buttonText={backButtonText}
+                        onClick={handleBack}
+                    />
+
+                    <Button
+                        type="submit"
+                        loading={loading}
+                        buttonText={verifyButtonText}
+                    />
+                </div>
+                {apiErrorMsg && <Alert className="mt-2" msg={apiErrorMsg} />}
+                {errorsMsg?.length > 0 &&
+                    errorsMsg.map((i) => <Alert className="mt-2" msg={i} />)}
+            </form>
+        </FormProvider>
+    );
+};
+
+export default EHFForm;

package/src/components/OrderForm/OrderForm.tsx

@@ -43,7 +43,7 @@ type Props = {
     paymentMethodsOptions?: PaymentMethodOptionsType;
     defaultValues?: OrderFormInputsType;
     paymentMethods?: { label: string; value: PaymentMethodEnum }[];
-    buttonText?: string;
+    submitButtonText?: string;
     paymentMethodLabel?: string;
     errorReqMsg?: string;
     errorInvalidEmailMsg?: string;
@@ -83,7 +83,7 @@ const OrderForm: FC<Props> = ({
     merchantAgreementUrl,
     paymentMethods = [],
     invoiceAddressSelection,
-    buttonText = 'Start',
+    submitButtonText = 'Start',
     paymentMethodLabel = 'Select Payment Method',
     errorReqMsg = '',
     errorInvalidEmailMsg = '',
@@ -311,7 +311,7 @@ const OrderForm: FC<Props> = ({
                 <Button
                     type="submit"
                     loading={loading}
-                    buttonText={buttonText}
+                    buttonText={submitButtonText}
                 />
                 <Alert className="mt-2" msg={apiErrorMsg} />
                 {errorsMsg?.length > 0 &&

package/src/enums/general.ts

@@ -16,3 +16,15 @@ export enum MessageEventTypeEnum {
     CANCEL = 'cancel',
     COMPLETE = 'complete',
 }
+
+export enum InvoiceLookupNetworkEnum {
+    EHF = '0192',
+    OIO_GLN = '0088',
+    OIO_Danish_CVR = '0096',
+}
+
+export enum FormTypeEnum {
+    ORDER = 'order',
+    EHF = 'EHF',
+    OIO = 'OIO',
+}

package/src/types/general.ts

@@ -46,7 +46,11 @@ export type ConfigType = {
     settings?: {
         successText?: string;
         failureText?: string;
-        buttonText?: string;
+        submitButtonText?: string;
+        backButtonText?: string;
+        verifyButtonText?: string;
+        organizationNumberLabel?: string;
+        glnLabel?: string;
         orderDefaultValues?: OrderFormInputsType;
         paymentMethodLabel?: string;
         errorReqMsg?: string;