@infosoftas/s4-orders-js-sdk 0.0.1-alpha1e → 0.0.1-alpha2

package/package.json

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

package/src/App.tsx

@@ -186,7 +186,23 @@ const App: FC<ConfigType> = ({
                 top?.location?.origin || '*'
             );
         }
-        if (url) {
+        if (
+            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 || '*'
+                );
+            }
+        } else if (url) {
             if (
                 showIframe &&
                 data?.paymentMethod === PaymentMethodEnum.SwedbankPay

package/src/api/OrdersApi.ts

@@ -1,3 +1,4 @@
+import { CreateSubscriberRequestType } from '../types/api';
 import { AgreementsType } from '../types/order';
 import fetcher from '../utils/fetcher';
 
@@ -8,6 +9,7 @@ type RequestOrderStartType = {
         templateSubscriptionPlanId?: string;
     };
     paymentAgreement: AgreementsType;
+    invoiceContact?: CreateSubscriberRequestType;
 };
 
 type OrderResponseType = {

package/src/api/SubscribeApi.ts

@@ -1,14 +1,5 @@
 import fetcher from '../utils/fetcher';
-
-type CreateSubscriberRequestType = {
-    name?: string;
-    email?: string;
-    phone?: string;
-    country?: string;
-    city?: string;
-    addressLines?: string[];
-    zip?: string;
-};
+import { CreateSubscriberRequestType } from '../types/api';
 
 type CreateSubscriberResponseType = {
     id: string;

package/src/components/FormFields/FormFields.helper.ts

@@ -8,6 +8,10 @@ export const FIELD_TYPES = {
     CITY: 'city',
     ADDRESS: 'address',
     ZIP: 'zip',
+    CARE_OF: 'careOf',
+    ORGANIZATION_NUMBER: 'organizationNumber',
+    BUYER_REFERENCE: 'buyerReference',
+    ORDER_REFERENCE: 'orderReference',
 };
 
 export const DEFAULT_ORDER_FORM_FIELDS: OrderFormFiledType[] = [

package/src/components/FormFields/FormFieldsMapper.ts

@@ -14,6 +14,10 @@ const formFieldsMapper = {
     [FIELD_TYPES.COUNTRY]: InputField,
     [FIELD_TYPES.CITY]: InputField,
     [FIELD_TYPES.ZIP]: InputField,
+    [FIELD_TYPES.CARE_OF]: InputField,
+    [FIELD_TYPES.ORGANIZATION_NUMBER]: InputField,
+    [FIELD_TYPES.BUYER_REFERENCE]: InputField,
+    [FIELD_TYPES.ORDER_REFERENCE]: InputField,
 };
 
 export default formFieldsMapper;

package/src/components/OrderForm/OrderForm.tsx

@@ -15,7 +15,10 @@ import {
     OrderFormFiledType,
     ErrorsMsg,
 } from '../../types/general';
-import { prepareAgreementModel } from '../../utils/order.helper';
+import {
+    prepareAgreementModel,
+    prepareContactModel,
+} from '../../utils/order.helper';
 import {
     prepareErrorMessage,
     prepareErrorsArrayMessage,
@@ -79,14 +82,17 @@ const OrderForm: FC<Props> = ({
     const [apiErrorMsg, setApiErrorMsg] = useState<string>('');
     const [errorsMsg, setErrorsMsg] = useState<string[]>([]);
     const [orderFields, setOrderFields] = useState<OrderFormFiledType[]>(
-        paymentMethodsOptions?.[PAYMENT_METHOD_DEFAULT]?.orderFormFields ??
-            DEFAULT_ORDER_FORM_FIELDS
+        paymentMethodsOptions?.[
+            defaultValues?.paymentMethod || PAYMENT_METHOD_DEFAULT
+        ]?.orderFormFields ?? DEFAULT_ORDER_FORM_FIELDS
     );
 
     const methods = useForm<OrderFormInputsType>({
         defaultValues: {
             ...initialData,
             ...(defaultValues ?? {}),
+            paymentMethod:
+                defaultValues?.paymentMethod || PAYMENT_METHOD_DEFAULT,
         },
     });
 
@@ -106,35 +112,10 @@ const OrderForm: FC<Props> = ({
         setLoading(true);
         try {
             let id: string | undefined = subscriberId;
+            const contactModel = prepareContactModel({ data, orderFields });
             if (!subscriberId) {
                 const response = await createSubscriber({
-                    name: orderFields.find((i) => i.name === 'name')
-                        ? data.name?.trim() || undefined
-                        : undefined,
-                    email: orderFields.find((i) => i.name === 'email')
-                        ? data.email?.trim() || undefined
-                        : undefined,
-                    phone: orderFields.find((i) => i.name === 'phoneNumber')
-                        ? data.phoneNumber?.trim() || undefined
-                        : undefined,
-                    country: orderFields.find((i) => i.name === 'country')
-                        ? data.country?.trim() || undefined
-                        : undefined,
-                    city: orderFields.find((i) => i.name === 'city')
-                        ? data.city?.trim() || undefined
-                        : undefined,
-                    addressLines: orderFields.find((i) => i.name === 'address')
-                        ? data.address?.trim()
-                            ? data.address
-                                  ?.trim()
-                                  .replace(/\r\n/g, '\n')
-                                  .split('\n')
-                                  .filter((line) => line)
-                            : undefined
-                        : undefined,
-                    zip: orderFields.find((i) => i.name === 'zip')
-                        ? data.zip?.trim() || undefined
-                        : undefined,
+                    ...contactModel,
                 });
                 id = response.id;
 

package/src/enums/api.ts

@@ -1,4 +1,5 @@
 export enum HttpStatusCode {
     UNAUTHORIZED = 401,
     FORBIDDEN = 403,
+    LIMIT = 429,
 }

package/src/enums/general.ts

@@ -2,6 +2,10 @@ export enum PaymentMethodEnum {
     Vipps = 'Vipps',
     MobilePay = 'MobilePay',
     SwedbankPay = 'SwedbankPay',
+    Invoice = 'Invoice',
+    Email = 'Email',
+    EHF = 'EHF',
+    OIO = 'OIO',
 }
 
 export enum MessageEventTypeEnum {

package/src/types/api.ts

@@ -10,3 +10,14 @@ export interface ApiResponseType<T> {
     query: string;
     url: string;
 }
+
+export type CreateSubscriberRequestType = {
+    name?: string;
+    email?: string;
+    phone?: string;
+    country?: string;
+    city?: string;
+    addressLines?: string[];
+    zip?: string;
+    careOf?: string;
+};

package/src/types/order.ts

@@ -9,6 +9,7 @@ export type OrderFormInputsType = {
     city?: string;
     address?: string;
     zip?: string;
+    careOf?: string;
 };
 
 export type VippsMobilePay = {

package/src/utils/fetcher.ts

@@ -68,6 +68,10 @@ async function fetcher<ResponseType, BodyType = void>(
                         reject({ message: 'Not Authorized user!' });
                     } else if (response.status === HttpStatusCode.FORBIDDEN) {
                         reject({ message: 'Something Wrong with permission!' });
+                    } else if (response.status === HttpStatusCode.LIMIT) {
+                        reject({
+                            message: 'System busy please try again shortly!',
+                        });
                     } else {
                         if (response.ok) {
                             response

package/src/utils/order.helper.ts

@@ -1,5 +1,6 @@
 import { MessageEventTypeEnum, PaymentMethodEnum } from '../enums/general';
-import { AgreementsType } from '../types/order';
+import { AgreementsType, OrderFormInputsType } from '../types/order';
+import { OrderFormFiledType } from '../types/general';
 
 type AgreementModelType = {
     paymentMethod: PaymentMethodEnum;
@@ -55,14 +56,65 @@ export const prepareAgreementModel = ({
         return model;
     }
 
-    return {
-        ...model,
-        vippsMobilePay: {
+    if (
+        paymentMethod === PaymentMethodEnum.Vipps ||
+        paymentMethod === PaymentMethodEnum.MobilePay
+    ) {
+        model.vippsMobilePay = {
             generateSubscriberContact,
             merchantAgreementUrl,
             accountId,
             phoneNumber,
             merchantRedirectUrl: redirectUrl || window.location.href,
-        },
+        };
+
+        return model;
+    }
+
+    return model;
+};
+
+type ContactModelType = {
+    data: OrderFormInputsType;
+    orderFields: OrderFormFiledType[];
+};
+
+export const prepareContactModel = ({
+    data,
+    orderFields,
+}: ContactModelType) => {
+    const model = {
+        name: orderFields.find((i) => i.name === 'name')
+            ? data.name?.trim() || undefined
+            : undefined,
+        email: orderFields.find((i) => i.name === 'email')
+            ? data.email?.trim() || undefined
+            : undefined,
+        phone: orderFields.find((i) => i.name === 'phoneNumber')
+            ? data.phoneNumber?.trim() || undefined
+            : undefined,
+        country: orderFields.find((i) => i.name === 'country')
+            ? data.country?.trim() || undefined
+            : undefined,
+        city: orderFields.find((i) => i.name === 'city')
+            ? data.city?.trim() || undefined
+            : undefined,
+        addressLines: orderFields.find((i) => i.name === 'address')
+            ? data.address?.trim()
+                ? data.address
+                      ?.trim()
+                      .replace(/\r\n/g, '\n')
+                      .split('\n')
+                      .filter((line) => line)
+                : undefined
+            : undefined,
+        zip: orderFields.find((i) => i.name === 'zip')
+            ? data.zip?.trim() || undefined
+            : undefined,
+        careOf: orderFields.find((i) => i.name === 'careOf')
+            ? data.zip?.trim() || undefined
+            : undefined,
     };
+
+    return model;
 };