@os1-platform/dispatch-mobile 2.1.21 → 2.1.23

package/src/network/NetworkClient.ts

@@ -2,6 +2,7 @@ import HttpClient from './client';
 import DispatchSdkCache from '../manager/sdk/DispatchSdkCache';
 import type { DispatchSDKConfig } from '../models/sdk';
 import type { Headers } from '../models/auth';
+import { AxiosRequestConfig } from 'axios';
 import { isTokenExpired } from '../utils/utils';
 import callbackHandler from '../manager/sdk/callbacksHandler';
 
@@ -13,7 +14,38 @@ export default class NetworkClient extends HttpClient {
     super(baseURL);
   }
 
-  public async requestGet() {}
+  public async requestGet(
+    endpoint: string,
+    headers: Headers,
+    queryParams?: { [key: string]: string | number | boolean }
+  ) {
+    let sdkConfig = (await cache.getObjectFromCache(
+      cacheKeys.SDK_CONFIG
+    )) as DispatchSDKConfig;
+
+    if(isTokenExpired(sdkConfig.accessToken)){
+      await callbackHandler.refresheAndUpdateToken();
+      sdkConfig = (await cache.getObjectFromCache(
+        cacheKeys.SDK_CONFIG
+      )) as DispatchSDKConfig;
+    }
+    let config: AxiosRequestConfig = {
+      headers: {
+        'accept': 'application/json',
+        'X-COREOS-REQUEST-ID':
+          'DispatchSdk:' + ((headers && headers.requestId) || ''),
+        'X-COREOS-ACCESS': sdkConfig.accessToken ?? '',
+        'X-COREOS-TID': sdkConfig.tenantID ?? '',
+        'Content-Type': 'application/json',
+        'x-coreos-userinfo': JSON.stringify({ id: sdkConfig?.userID }),
+      },
+    };
+    if (queryParams) {
+      config.params = queryParams;
+    }
+
+    return this.instance.get(endpoint, config);
+  }
 
   public async requestPost(
     endpoint: string,
@@ -39,6 +71,7 @@ export default class NetworkClient extends HttpClient {
         'X-COREOS-ACCESS': sdkConfig.accessToken ?? '',
         'X-COREOS-TID': sdkConfig.tenantID ?? '',
         'Content-Type': 'application/json',
+        'x-coreos-userinfo': JSON.stringify({ id: sdkConfig?.userID }),
       },
     });
   }

package/src/network/client.ts

@@ -26,6 +26,7 @@ export default abstract class HttpClient {
   };
 
   protected _handleError = (error: any) => {
+    console.log('error.response: ', error);
     if (error.response) {
       // Request made and server responded
       const { status } = error.response;

package/src/styles/executionTasks/CommonStyles.ts

@@ -1,4 +1,4 @@
-import { StyleSheet,Platform } from 'react-native';
+import { StyleSheet, Platform } from 'react-native';
 import SdkColors, { ColorTheme } from '../SdkColors';
 
 export enum Fonts {
@@ -66,7 +66,10 @@ export const CommonStyles = StyleSheet.create({
   },
   nextButtonLabel: {
     color: '#ffffff',
-    fontFamily: Platform.OS === 'android' ? Fonts.IBMPlexSans_500Medium : 'IBMPlexSans-Medium',
+    fontFamily:
+      Platform.OS === 'android'
+        ? Fonts.IBMPlexSans_500Medium
+        : 'IBMPlexSans-Medium',
     fontSize: 14,
     lineHeight: 20,
     textAlign: 'center',
@@ -79,20 +82,26 @@ export const CommonStyles = StyleSheet.create({
   },
   cancelButtonLabel: {
     color: SdkColors[ColorTheme.LIGHT].defaultColor,
-    fontFamily: Platform.OS === 'android' ? Fonts.IBMPlexSans_500Medium : 'IBMPlexSans-Medium',
+    fontFamily:
+      Platform.OS === 'android'
+        ? Fonts.IBMPlexSans_500Medium
+        : 'IBMPlexSans-Medium',
     fontSize: 14,
     fontWeight: '500',
     lineHeight: 20,
     textAlign: 'center',
     fontStyle: 'normal',
-    textTransform:'capitalize'
+    textTransform: 'capitalize',
   },
   mainExitButton: {
     backgroundColor: SdkColors[ColorTheme.LIGHT].exitButton,
   },
   mainExitButtonLabel: {
     color: '#ffffff',
-    fontFamily: Platform.OS === 'android' ? Fonts.IBMPlexSans_500Medium : 'IBMPlexSans-Medium',
+    fontFamily:
+      Platform.OS === 'android'
+        ? Fonts.IBMPlexSans_500Medium
+        : 'IBMPlexSans-Medium',
     fontSize: 14,
     fontWeight: '500',
     lineHeight: 20,
@@ -105,7 +114,10 @@ export const CommonStyles = StyleSheet.create({
   },
   exitButtonLabel: {
     color: SdkColors[ColorTheme.LIGHT].exitButton,
-    fontFamily: Platform.OS === 'android' ? Fonts.IBMPlexSans_500Medium : 'IBMPlexSans-Medium',
+    fontFamily:
+      Platform.OS === 'android'
+        ? Fonts.IBMPlexSans_500Medium
+        : 'IBMPlexSans-Medium',
     fontSize: 14,
     fontWeight: '500',
     lineHeight: 20,
@@ -132,13 +144,21 @@ export const CommonStyles = StyleSheet.create({
     justifyContent: 'center',
     fontFamily: 'IBMPlexSans_400Regular',
     fontStyle: 'normal',
+    fontWeight: '400',
     fontSize: 14,
     letterSpacing: 0.25,
     lineHeight: 20,
     textAlign: 'center',
-    color: '#000000',
+    color: '#3D445C',
     marginBottom: 10,
   },
+  titleText: {
+    fontFamily: Fonts.IBMPlexSans_500Medium,
+    fontWeight: '500',
+    fontSize: 16,
+    lineHeight: 28,
+    color: '#3D445C',
+  },
 });
 export const DeliverPickupStyles = StyleSheet.create({
   itemTextStyle: {
@@ -164,11 +184,15 @@ export const DeliverPickupStyles = StyleSheet.create({
   modalView: {
     backgroundColor: 'white',
     padding: 15,
+    paddingVertical: 45,
+    // paddingVertical: 14,
     borderRadius: 9,
   },
   titleText: {
     justifyContent: 'center',
-    fontFamily: Fonts.IBMPlexSans_600SemiBold,
+    fontFamily: Platform.OS === 'android'
+    ? Fonts.IBMPlexSans_600SemiBold
+    : 'IBMPlexSans-SemiBold',
     fontStyle: 'normal',
     fontSize: 14,
     lineHeight: 20,

package/src/ui/screens/CollectPaymentScreen.tsx

@@ -0,0 +1,315 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import React, { useCallback, useState } from 'react';
+import withBaseDispatchScreen from './WithBaseDispatchScreen';
+import type { BaseETProps } from '../../models/DispatchModels';
+import { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';
+import { CollectPaymentET } from '../../components/executiontasks/ExecutionTasksIndex';
+import DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';
+import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
+import { Alert } from 'react-native';
+import { handleDynamicValues, onTaskStart } from '../../utils/ExecTaskUtils';
+import { useEffect } from 'react';
+import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
+import NetworkClient from '../../network/NetworkClient';
+import DispatchSdkCache from '../../manager/sdk/DispatchSdkCache';
+import { DispatchSDKConfig } from '../../models/sdk';
+import { PaymentContext } from '../../utils/context/paymentContext';
+import { isMandatoryKeysPresent } from '../../utils/utils';
+import ErrorCodes from '../../errors/ErrorCodes';
+import { ENDPOINTS } from '../../constants/apiConstants';
+import { PaymentConfigResponse } from '../../components/executiontasks/collectPayment/CollectPaymentSchema';
+import Logger, { LOG_TYPE } from '../../utils/Logger';
+import ProgressDialog from '../../components/widgets/ProgressDialog';
+import { GO_BACK_EVENT_CODE } from '../../constants/constants';
+import CancelOrderDialog from '../../components/widgets/CancelOrderDialog';
+
+const CollectPaymentScreen = ({
+  navigation,
+  route,
+  baseETProps,
+}: {
+  route: any;
+  navigation: any;
+  baseETProps: BaseETProps;
+}) => {
+  const nextState = route.params[RouteParams.NEXT_STATES];
+  const { taskMeta, mergedObjectiveId, input, taskId } =
+    getDataFromNextState(nextState);
+  const [expectedAmount, setExpectedAmount] = useState(0);
+  const [modifiedInput, setInputs] = useState({ ...input });
+  const [contextData, setContextData] = useState<any>();
+  const [showAlert, setShowAlert] = useState(false);
+  const [sResponse, setResponse] = useState<any>();
+  const [showScreen, setShowScreen] = useState<boolean>(false);
+  const paymentRefId =
+    route.params[RouteParams.ROOT_META_DATA].paymentConfig?.paymentRefId;
+
+  async function getSdkConfig() {
+    const cache = DispatchSdkCache.getInstance();
+    const _sdkConfig: DispatchSDKConfig = await cache.getObjectFromCache(
+      DispatchSdkCache.KEYS.SDK_CONFIG
+    );
+
+    const networkInstance = new NetworkClient(_sdkConfig.domain);
+    setContextData({ _sdkConfig, networkInstance });
+    return { _sdkConfig, networkInstance };
+  }
+
+  const showAlertMessage = useCallback(
+    (errorMessage: string, title: string) => {
+      Alert.alert(title, errorMessage);
+      navigation.goBack();
+    },
+    [navigation]
+  );
+
+  const navigateWithError = useCallback(
+    (errorCode: string, errorMessage: string) => {
+      if (route.params.initRoute) {
+        navigation.navigate({
+          name: route.params.initRoute,
+          params: { sdkError: { code: errorCode, message: errorMessage } },
+          merge: true,
+        });
+      } else {
+        showAlertMessage(errorMessage, 'Error');
+      }
+    },
+    [navigation, route.params.initRoute, showAlertMessage]
+  );
+
+  useEffect(() => {
+    
+    if (
+      taskId === ExecutionTaskID.COLLECT_PAYMENT_ET &&
+      (!isMandatoryKeysPresent(route.params[RouteParams.ROOT_META_DATA], [
+        'paymentConfig',
+      ]) ||
+        !isMandatoryKeysPresent(
+          route.params[RouteParams.ROOT_META_DATA].paymentConfig,
+          ['paymentRefId']
+        ))
+    ) {
+      navigateWithError(
+        ErrorCodes.InvalidArgumentError,
+        'Missing or Invalid Route Params to execute Payment.'
+      );
+      return;
+    }
+    onTaskStart(
+      route.params[RouteParams.NEXT_STATES],
+      route.params[RouteParams.ROOT_META_DATA].customEventsData
+    );
+    (async () => {
+      let updatedInput = JSON.parse(JSON.stringify(modifiedInput));
+      if (route.params[RouteParams.ROOT_META_DATA]) {
+        updatedInput = handleDynamicValues(
+          route?.params[RouteParams.NEXT_STATES].input,
+          route.params[RouteParams.ROOT_META_DATA]
+        );
+      }
+      /**
+       * Get sum of merged objectives amount
+       * Get sdkConfig from cache and set in context
+       */
+      await getTotalExpected();
+      const { networkInstance } = await getSdkConfig();
+      /**
+       * Get list of selected payment modes from default PG for tenant
+       */
+      if (modifiedInput.allowedModes.includes('ONLINE')) {
+        try {
+          const modes = await getPaymentModes(networkInstance);
+          updatedInput.allowedModes = modes?.methods;
+          updatedInput.plModes = modes?.plModes || [];
+          const index = modifiedInput.allowedModes.indexOf('ONLINE');
+          if (index > -1) {
+            modifiedInput.allowedModes.splice(index, 1);
+          }
+        } catch (error: any) {
+          Logger.getInstance().logEvent(
+            '~ getTotalExpected triggered ',
+            JSON.stringify(error?.response?.data || error),
+            LOG_TYPE.SDK_ERROR
+          );
+          updatedInput.allowedModes = [];
+          updatedInput.plModes = [];
+          const index = modifiedInput.allowedModes.indexOf('ONLINE');
+          if (index > -1) {
+            modifiedInput.allowedModes.splice(index, 1);
+          }
+        }
+      } else {
+        updatedInput.allowedModes = [];
+        updatedInput.plModes = [];
+      }
+
+      if (modifiedInput.allowedModes?.length) {
+        updatedInput.allowedModes = [
+          ...modifiedInput.allowedModes,
+          ...updatedInput.allowedModes,
+        ];
+      }
+      if (!updatedInput.allowedModes?.length) {
+        navigateWithError(
+          ErrorCodes.InvalidArgumentError,
+          'No payment modes available. Please contact your Admin.'
+        );
+        return;
+      }
+      setInputs(updatedInput);
+    })();
+  }, []);
+
+  const getPaymentModes = async (
+    networkInstance: NetworkClient
+  ): Promise<{ methods: string[]; plModes: string[] } | null> => {
+    try {
+      let response: { methods: string[]; plModes: string[] } = {
+        methods: [],
+        plModes: [],
+      };
+      const paymentResp: { data: PaymentConfigResponse } =
+        await networkInstance.requestGet(ENDPOINTS.PAYMENT_MODES, {
+          requestId: 'payment:' + paymentRefId,
+        });
+
+      // FOR TESTING
+      // const paymentResp = {
+      //   data: {
+      //     data: {
+      //       configDetails: [
+      //         {
+      //           paymentMethods: {
+      //             QR: true,
+      //             paymentLink: true,
+      //           },
+      //         },
+      //       ],
+      //     },
+      //   },
+      // };
+
+      const configData = paymentResp?.data?.data?.configDetails[0];
+      if (configData?.paymentMethods?.QR) {
+        response.methods.push('QR_CODE');
+      }
+      if (configData?.paymentMethods?.paymentLink) {
+        response.methods.push('PAYMENT_LINK');
+      }
+      if (configData?.modesMapping) {
+        response.plModes = Object.values(configData.modesMapping);
+      }
+
+      return response;
+    } catch (error: any) {
+      Logger.getInstance().logEvent(
+        '~ getPaymentModes triggered ',
+        JSON.stringify(error?.response?.data || error),
+        LOG_TYPE.SDK_ERROR
+      );
+      return null;
+    }
+  };
+
+  const getTotalExpected = async () => {
+    const totalAmount: number = await DispatchExecutor.getTotalPaymentAmountMWI(
+      mergedObjectiveId
+    );
+    setExpectedAmount(totalAmount);
+    // setExpectedAmount(1000); //FOR TESTING
+    return totalAmount;
+  };
+
+  const submitOutput = useCallback(
+    async (etOutput: any) => {
+      console.log('CollectPaymentScreen:SubmitOutput:', etOutput);
+      if (etOutput.paymentMode == 'QR_CODE') {
+        console.log(
+          'CollectPaymentScreen:SubmitOutput:etOutput.paymentMode',
+          etOutput.paymentMode
+        );
+        let jobData = await DispatchExecutor.wQueryJobForMOId(
+          mergedObjectiveId[0]
+        );
+        console.log(
+          'CollectPaymentScreen:SubmitOutput:etOutput.jobData',
+          jobData
+        );
+        let result = await DispatchExecutor.wUpdateAmountToZero(
+          jobData[0].jobId
+        );
+        console.log(
+          'CollectPaymentScreen:SubmitOutput:etOutput.result',
+          result
+        );
+      }
+      await DispatchStateContainer.getInstance().navigateToNextTask(
+        navigation,
+        route,
+        etOutput,
+        etOutput.success,
+        EntityCode.COLLECT_PAYMENT_ET,
+        ExecutionTaskID.COLLECT_PAYMENT_ET,
+        baseETProps,
+        false
+      );
+    },
+    [baseETProps, navigation, route]
+  );
+
+  // console.log("collectpayment1:",contextData)
+  // console.log("collectpayment2:",modifiedInput.allowedModes.includes('ONLINE'))
+  // console.log("collectpayment3:",modifiedInput.allowedModes?.length)
+  useEffect(() => {
+    if (contextData && modifiedInput?.allowedModes?.length) {
+      setShowScreen(true);
+    } else {
+      setShowScreen(false);
+    }
+  }, [contextData, modifiedInput?.allowedModes]);
+
+  return showScreen ? (
+    <PaymentContext.Provider
+      value={{
+        sdkConfig: contextData?._sdkConfig,
+        networkInstance: contextData?.networkInstance,
+      }}
+    >
+      <CollectPaymentET
+        {...modifiedInput}
+        expectedAmount={expectedAmount}
+        navigation={navigation}
+        mergedObjectiveId={mergedObjectiveId}
+        taskMeta={taskMeta}
+        route={route}
+        onSubmitET={async (etOutput) => {
+          console.log('etOutput: ', JSON.stringify(etOutput));
+          if (etOutput.success || etOutput.eventCode == GO_BACK_EVENT_CODE) {
+            await submitOutput(etOutput);
+          } else {
+            setResponse((_prevState: any) => {
+              setShowAlert(true);
+              return etOutput;
+            });
+          }
+        }}
+      />
+      <CancelOrderDialog
+        visible={showAlert}
+        onSubmit={async (value) => {
+          if (value) {
+            setShowAlert(false);
+            await submitOutput(sResponse);
+          } else {
+            setShowAlert(false);
+          }
+        }}
+      />
+    </PaymentContext.Provider>
+  ) : (
+    <ProgressDialog visible={true} label="Loading..." />
+  );
+};
+
+export default withBaseDispatchScreen(CollectPaymentScreen);

package/src/ui/screens/DropCashScreen.tsx

@@ -8,7 +8,7 @@ import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 import type { ETAmount } from '../../components/executiontasks/payments/init/InitPaymentSchema';
 import { View } from 'react-native';
 import CancelOrderDialog from '../../components/widgets/CancelOrderDialog';
-import { onTaskStart } from '../../utils/ExecTaskUtils';
+import { getBaseETResponse, onTaskStart } from '../../utils/ExecTaskUtils';
 
 import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
 import { GO_BACK_EVENT_CODE } from '../../constants/constants';
@@ -16,6 +16,8 @@ import Helper from '../../utils/helper';
 //{ fireEventWithScreenName } from 'src/analytics/sentry/SentryAnalyticsUtils';
 import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
 import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
+import ProgressDialog from '../../components/widgets/ProgressDialog';
+import { getEventCodeByET } from '../../manager/dispatchCodes/EventCodeContainer';
 
 // OLD CODE
 // function getTotalExpected(nextStates: any[]): ETAmount {
@@ -40,13 +42,15 @@ const DropCashScreen = ({
   navigation: any;
   baseETProps: BaseETProps;
 }) => {
+  const [loading, setLoading] = useState(false);
+
   const helperInstance = Helper.getInstance();
   const nextState = route.params[RouteParams.NEXT_STATES];
   const { taskMeta, mergedObjectiveId, input, wfMeta, taskName } =
     getDataFromNextState(nextState);
 
   const [expectedAmount, setExpectedAmount] = useState<ETAmount>({
-    value: 0,
+    value: 1,
     minorUnit: input.expectedAmount.minorUnit,
     currencyCode: input.expectedAmount.currencyCode,
   });
@@ -66,6 +70,45 @@ const DropCashScreen = ({
     })();
   }, [])
 
+  useEffect(() => {
+    (async () => {
+      console.log("expectedAmount:",expectedAmount);
+      if(expectedAmount.value === 0){
+        // setLoading(true);
+        let dropCashETOutput = {
+          amount: {
+            value: expectedAmount.value,
+            currencyCode: expectedAmount.currencyCode,
+            minorUnit: expectedAmount.minorUnit,
+          },
+          ...(await getBaseETResponse(
+            EntityCode.DELIVER_CASH,
+            true,
+            getEventCodeByET(
+              ExecutionTaskID.DELIVER_CASH,
+              true,
+              input.applicableReasons?.success
+            ),
+            '',
+            mergedObjectiveId,
+            ExecutionTaskID.DELIVER_CASH
+          )),
+        }
+        if (dropCashETOutput.success || dropCashETOutput.eventCode == GO_BACK_EVENT_CODE) {
+          await submitOutput(dropCashETOutput);
+        } else {
+          setResponse((_prevState: any) => {
+            setShowAlert(true);
+            return dropCashETOutput;
+          });
+        }
+        // setLoading(false);
+    }
+    })();
+  }, [expectedAmount.value])
+
+
+
   const getTotalExpected = async () => {
     const totalAmount: number = await DispatchExecutor.getTotalAmountMWI(
       mergedObjectiveId
@@ -101,8 +144,10 @@ const DropCashScreen = ({
     },
     [baseETProps, navigation, route]
   );
+  
   return (
     <View style={{ flex: 1 }}>
+      { expectedAmount.value === 0 ? <View><ProgressDialog visible={loading} label={'Please wait...'} /></View> : 
       <SLDropCash
         {...input}
         expectedAmount={expectedAmount}
@@ -121,6 +166,8 @@ const DropCashScreen = ({
           }
         }}
       />
+      }
+      
       <CancelOrderDialog
         visible={showAlert}
         onSubmit={async (value) => {

package/src/ui/screens/ETScreensIndex.ts

@@ -14,6 +14,7 @@ import DropCashScreen from './DropCashScreen';
 import ScanScreen from './ScanScreen';
 import HttpRequestScreen from './HttpRequestScreen';
 import ValidateOTPScreen from './ValidateOTPScreen';
+import CollectPaymentScreen from './CollectPaymentScreen';
 
 export {
   CancellationScreen,
@@ -32,4 +33,5 @@ export {
   ScanScreen,
   HttpRequestScreen,
   ValidateOTPScreen,
+  CollectPaymentScreen,
 };

package/src/ui/screens/PaymentScreen.tsx

@@ -73,6 +73,7 @@ const PaymentScreen = ({
 
   const submitOutput = useCallback(
     async (etOutput: any) => {
+      console.log("submitOutput:",JSON.stringify(etOutput));
       await DispatchStateContainer.getInstance().navigateToNextTask(
         navigation,
         route,

package/src/ui/screens/StartWorkFlowScreen.tsx

@@ -112,6 +112,20 @@ const StartWorkFlowScreen = ({
             )
           )[0];
 
+          if (
+            nextStateData.taskId === ExecutionTaskID.COLLECT_PAYMENT_ET &&
+            (!isMandatoryKeysPresent(route.params, ['paymentConfig']) ||
+              !isMandatoryKeysPresent(route.params.paymentConfig, [
+                'paymentRefId',
+              ]))
+          ) {
+            navigateWithError(
+              ErrorCodes.InvalidArgumentError,
+              'Missing or Invalid Route Params'
+            );
+            return;
+          }
+
           let updatedStatusFilter: IDispatchExecutor.ExecutionStatus[] = [];
 
           if (
@@ -136,6 +150,7 @@ const StartWorkFlowScreen = ({
             customEventsData: route.params.mergedWI.customEventsData,
             statusFilter: updatedStatusFilter,
             prefixedMergedObjectiveId,
+            paymentConfig: route.params.paymentConfig,
           };
 
           // if (nextStateList != null && nextStateList.length > 0) {

package/src/ui/uiConfig/RouteParams.ts

@@ -24,5 +24,12 @@ export function getDataFromNextState(
   const mergedObjectiveId = nextState.mergedObjectiveIds;
   const wfMeta = JSON.parse(nextState.meta?.workflow || '{}'); //nextState.meta?.workflow || {}; //JSON.parse(nextState.meta?.workflow || '{}');
 
-  return { input, taskMeta, mergedObjectiveId, wfMeta, taskName };
+  return {
+    input,
+    taskMeta,
+    mergedObjectiveId,
+    wfMeta,
+    taskName,
+    taskId: nextState.taskId,
+  };
 }

package/src/utils/ApiUtils.ts

@@ -119,6 +119,7 @@ export async function getApiResponse(apiData: APIData) {
   if (apiData.requestBody) {
     axiosConfig.data = { ...apiData.requestBody };
   }
+  // console.log('axiosConfig: ', JSON.stringify(axiosConfig));
 
   return axios(axiosConfig);
 }