@infosoftas/s4-orders-js-sdk 0.0.1-beta1.2 → 0.0.1-beta1.4

package/README.md

@@ -272,6 +272,7 @@ export const prepareConfig = ({
             errorInvalidEmailMsg: 'Invalid email address!',
             errorInvalidPhoneMsg: 'Invalid phone number!',
             paymentMethodNotAllowedMsg: 'This payment method not allowed!',
+            invoiceLookupNotFoundText: 'There was no recipient found for the given information',
             successText: 'Success message',
             failureText: 'Failed message',
             orderDefaultValues: {
@@ -322,14 +323,14 @@ const OrderPlace: FC = ({journey, userEmail, sub, emails, userId, name, city, co
         if (!moduleMount.current && idTokenClaims) {
             moduleMount.current = true;
             const config = prepareConfig({
-                apiKey: process.env.API_KEY || '',
-                apiUrl: process.env.ORDER_SDK_API_URL || '',
+                apiKey: API_KEY,
+                apiUrl: API_URL,
                 userId: userId || '',
                 subscriberId: userEmail || '',
-                identityProviderId: process.env.IDENTITY_PROVIDER_ID || '',
-                templatePackageId: process.env.TEMPLATE_PACKAGE_ID || '',
-                selfServiceUrl: process.env.SELF_SERVICE_URL || '',
-                organizationId: process.env.ORGANIZATION_ID || '',
+                identityProviderId: IDENTITY_PROVIDER_ID,
+                templatePackageId: TEMPLATE_PACKAGE_ID,
+                selfServiceUrl: SELF_SERVICE_URL,
+                organizationId: ORGANIZATION_ID,
                 userEmail: userEmail || '',
                 name: name,
                 city: city,
@@ -372,4 +373,4 @@ export default OrderPlace;
 | availablePaymentMethods | [] | available payment methods |
 | language | 'en-US' | language |
 | merchantAgreementUrl | '' | vipps and MobilePay property |
-| settings | {successText: 'Order successful completed!',failureText: 'Something went wrong!',submitButtonText: 'Start',backButtonText: 'Back',verifyButtonText: 'Verify',organizationNumberLabel: 'CVR',glnLabel: 'GLN',paymentMethodLabel:'Select Payment Method', orderDefaultValues: 'Default order form values' } | label and text properties |
+| settings | {successText: 'Order successful completed!',failureText: 'Something went wrong!',submitButtonText: 'Start',backButtonText: 'Back',verifyButtonText: 'Verify',organizationNumberLabel: 'CVR',glnLabel: 'GLN',paymentMethodLabel:'Select Payment Method', orderDefaultValues: 'Default order form values', paymentMethodNotAllowedMsg: 'This payment method not allowed!', invoiceLookupNotFoundText: 'There was no recipient found for the given information' } | label and text properties |

package/package.json

@@ -1,8 +1,8 @@
 {
     "name": "@infosoftas/s4-orders-js-sdk",
-    "version": "0.0.1-beta1.2",
+    "version": "0.0.1-beta1.4",
     "scripts": {
-        "build": "rimraf lib && webpack --env mode=production",
+        "build": "rimraf lib && webpack --mode production",
         "release": "release-it"
     },
     "eslintConfig": {
@@ -26,7 +26,6 @@
         "babel-loader": "^8.3.0",
         "copy-webpack-plugin": "^12.0.2",
         "css-loader": "^7.1.2",
-        "dotenv-webpack": "^8.1.0",
         "mini-css-extract-plugin": "^2.9.1",
         "release-it": "^17.10.0",
         "rimraf": "^6.0.1",

package/src/App.tsx

@@ -59,6 +59,8 @@ const App: FC<ConfigType> = ({
         errorInvalidEmailMsg: '',
         errorInvalidPhoneMsg: '',
         paymentMethodNotAllowedMsg: '',
+        invoiceLookupNotFoundText:
+            'There was no recipient found for the given information',
     },
 }) => {
     const [loading, setLoading] = useState<boolean>(false);
@@ -324,6 +326,9 @@ const App: FC<ConfigType> = ({
                                 invoiceAddressSelection={
                                     invoiceAddressSelection
                                 }
+                                invoiceLookupNotFoundText={
+                                    settings?.invoiceLookupNotFoundText
+                                }
                             />
                         )}
                         {formType === FormTypeEnum.EHF && (
@@ -352,6 +357,9 @@ const App: FC<ConfigType> = ({
                                 invoiceAddressSelection={
                                     invoiceAddressSelection
                                 }
+                                invoiceLookupNotFoundText={
+                                    settings?.invoiceLookupNotFoundText
+                                }
                             />
                         )}
                         {formType !== FormTypeEnum.OIO &&

package/src/api/InvoiceApi.ts

@@ -17,9 +17,7 @@ export const invoiceLookup = (
         url: '/invoicelookup',
         headers: {
             'S4-ORDERS-API-KEY':
-                sessionStorage.getItem('sdk_api_key') ||
-                process.env.API_KEY ||
-                '',
+                sessionStorage.getItem('sdk_api_key') || '',
         },
         body,
     }) as Promise<InvoiceLookupResponseType>;

package/src/api/OrdersApi.ts

@@ -26,9 +26,7 @@ export const orderStart = (
         url: '/order',
         headers: {
             'S4-ORDERS-API-KEY':
-                sessionStorage.getItem('sdk_api_key') ||
-                process.env.API_KEY ||
-                '',
+                sessionStorage.getItem('sdk_api_key') || '',
         },
         body,
     }) as Promise<OrderResponseType>;
@@ -39,9 +37,7 @@ export const orderComplete = (id: string): Promise<OrderResponseType> =>
         url: `/order/${id}/complete`,
         headers: {
             'S4-ORDERS-API-KEY':
-                sessionStorage.getItem('sdk_api_key') ||
-                process.env.API_KEY ||
-                '',
+                sessionStorage.getItem('sdk_api_key') || '',
         },
         body: null,
     }) as Promise<OrderResponseType>;
@@ -52,9 +48,7 @@ export const orderDelete = (id: string): Promise<OrderResponseType> =>
         url: `/order/${id}`,
         headers: {
             'S4-ORDERS-API-KEY':
-                sessionStorage.getItem('sdk_api_key') ||
-                process.env.API_KEY ||
-                '',
+                sessionStorage.getItem('sdk_api_key') || '',
         },
         body: null,
     }) as Promise<OrderResponseType>;

package/src/api/SubscribeApi.ts

@@ -22,9 +22,7 @@ export const createSubscriber = (
         url: '/subscriber',
         headers: {
             'S4-ORDERS-API-KEY':
-                sessionStorage.getItem('sdk_api_key') ||
-                process.env.API_KEY ||
-                '',
+                sessionStorage.getItem('sdk_api_key') || '',
         },
         body,
     }) as Promise<CreateSubscriberResponseType>;
@@ -38,9 +36,7 @@ export const mapSubscriberToUser = (
         url: `/subscriber/${id}/user`,
         headers: {
             'S4-ORDERS-API-KEY':
-                sessionStorage.getItem('sdk_api_key') ||
-                process.env.API_KEY ||
-                '',
+                sessionStorage.getItem('sdk_api_key') || '',
         },
         body,
     }) as Promise<MapSubscriberToUserResponseType>;

package/src/components/EHFForm/EHFForm.tsx

@@ -41,6 +41,7 @@ type Props = {
         fields?: OrderFormFiledType[];
         paymentMethods?: PaymentMethodEnum[];
     };
+    invoiceLookupNotFoundText?: string;
 };
 
 type EHFFormInputsType = {
@@ -72,6 +73,7 @@ const EHFForm: FC<Props> = ({
     orderValues,
     paymentMethodsOptions,
     invoiceAddressSelection,
+    invoiceLookupNotFoundText,
 }) => {
     const methods = useForm<EHFFormInputsType>({
         defaultValues: {
@@ -108,6 +110,7 @@ const EHFForm: FC<Props> = ({
         templatePackageId,
         invoiceAddressToggle: orderValues?.invoiceAddressSelection,
         invoiceOrderFields,
+        invoiceLookupNotFoundText,
     });
 
     const onSubmit: SubmitHandler<EHFFormInputsType> = async (

package/src/components/OIOForm/OIOForm.tsx

@@ -42,6 +42,7 @@ type Props = {
         fields?: OrderFormFiledType[];
         paymentMethods?: PaymentMethodEnum[];
     };
+    invoiceLookupNotFoundText?: string;
 };
 
 type OIOFormInputsType = {
@@ -76,6 +77,7 @@ const EHFForm: FC<Props> = ({
     orderValues,
     paymentMethodsOptions,
     invoiceAddressSelection,
+    invoiceLookupNotFoundText,
 }) => {
     const methods = useForm<OIOFormInputsType>({
         defaultValues: {
@@ -116,6 +118,7 @@ const EHFForm: FC<Props> = ({
         templatePackageId,
         invoiceAddressToggle: orderValues?.invoiceAddressSelection,
         invoiceOrderFields,
+        invoiceLookupNotFoundText,
     });
 
     const onSubmit: SubmitHandler<OIOFormInputsType> = async (

package/src/constants/index.ts

@@ -1,6 +1,6 @@
 import { PaymentMethodEnum } from '../enums/general';
 
-export const BASE_API = process.env.API_URL ?? '/';
+export const BASE_API = '/';
 
 export const WRONG_MSG = 'Something went wrong!';
 

package/src/hooks/useOrderForm.tsx

@@ -38,6 +38,7 @@ type Props = {
     orderFields: OrderFormFiledType[];
     invoiceAddressToggle?: boolean;
     invoiceOrderFields: OrderFormFiledType[];
+    invoiceLookupNotFoundText?: string;
 };
 
 const useOrderForm = ({
@@ -56,6 +57,7 @@ const useOrderForm = ({
     templatePackageId,
     invoiceAddressToggle,
     invoiceOrderFields,
+    invoiceLookupNotFoundText,
 }: Props) => {
     const [loading, setLoading] = useState<boolean>(false);
     const [apiErrorMsg, setApiErrorMsg] = useState<string>('');
@@ -69,8 +71,9 @@ const useOrderForm = ({
         setLoading(true);
         try {
             let id: string | undefined = subscriberId;
+            let invoiceResponse = null;
             if (data.paymentMethod === PaymentMethodEnum.OIO) {
-                await invoiceLookup({
+                invoiceResponse = await invoiceLookup({
                     network: data.gln
                         ? InvoiceLookupNetworkEnum.OIO_GLN
                         : InvoiceLookupNetworkEnum.OIO_Danish_CVR,
@@ -78,12 +81,22 @@ const useOrderForm = ({
                 });
             }
             if (data.paymentMethod === PaymentMethodEnum.EHF) {
-                await invoiceLookup({
+                invoiceResponse = await invoiceLookup({
                     network: InvoiceLookupNetworkEnum.EHF,
                     value: data.organizationNumber || '',
                 });
             }
 
+            if (invoiceResponse && !invoiceResponse?.recievesInvoice) {
+                setLoading(false);
+                const value =
+                    data.paymentMethod === PaymentMethodEnum.OIO
+                        ? data.gln || data.cvr || ''
+                        : data.organizationNumber || '';
+                setApiErrorMsg(`${invoiceLookupNotFoundText || ''} (${value})`);
+                return;
+            }
+
             const contactModel = prepareContactModel({ data, orderFields });
             if (!subscriberId) {
                 const response = await createSubscriber({

package/src/types/general.ts

@@ -61,6 +61,7 @@ export type ConfigType = {
         errorInvalidEmailMsg?: string;
         errorInvalidPhoneMsg?: string;
         paymentMethodNotAllowedMsg?: string;
+        invoiceLookupNotFoundText?: string;
     };
 };
 

package/src/utils/order.helper.ts

@@ -14,6 +14,17 @@ type AgreementModelType = {
     accountId?: string;
 };
 
+const mapToSwedbankLanguage = (language: string) => {
+    const allowedLanguages = [ 'en-US', 'sv-SE', 'nb-NO', 'da-DK', 'fi-FI', 'en-GB', 'nn-NO', 'no-NO', 'se-NO' ];
+    if (allowedLanguages.includes(language)) {
+        return language;
+    }
+
+    console.warn(`Language ${language} not supported.`);
+
+    return 'en-US'; // Default value for 'Swedbank'
+};
+
 export const prepareAgreementModel = ({
     paymentMethod,
     redirectUrl,
@@ -57,7 +68,7 @@ export const prepareAgreementModel = ({
         model.swedbankPay = {
             cancelUrl: `${cancelUrl}`,
             completeUrl: `${confirmUrl}`,
-            language,
+            language: mapToSwedbankLanguage(language),
             accountId,
         };