@os1-platform/dispatch-mobile 2.1.22 → 2.1.24

package/lib/typescript/models/DispatchModels.d.ts

@@ -59,6 +59,17 @@ export interface startEvent {
         [key: string]: any;
     };
 }
+export interface clickEvent {
+    timestamp: number;
+    taskId: string;
+    customData?: any;
+    etData: {
+        [key: string]: any;
+    };
+    additionalData: {
+        [key: string]: any;
+    };
+}
 export interface stateParams {
     next_states: IDispatch.IExecutionTaskQueryResponse;
     rootMetaData: {

package/lib/typescript/models/execTasks/ETConfig.d.ts

@@ -17,7 +17,8 @@ export declare enum ExecutionTaskID {
     VERIFY_INPUT = "etask:6fc10a60-a144-5798-97f3-1f12e77f56e2",
     DELIVER_CASH = "etask:2fffdf62-62b3-5e70-bd9e-d4d2644ee2fe",
     HTTP_REQUEST_ET = "etask:e148b862-8368-5586-b29d-1eda95ffc8c4",
-    VALIDATE_OTP_ET = "etask:8d5b96f3-7342-5e25-a57f-30004f53de17"
+    VALIDATE_OTP_ET = "etask:8d5b96f3-7342-5e25-a57f-30004f53de17",
+    COLLECT_PAYMENT_ET = "etask:c014eb65-8944-5320-8e51-dccad861a086"
 }
 export declare enum ExecutionTaskName {
     DELIVER = "Deliver",
@@ -38,7 +39,8 @@ export declare enum ExecutionTaskName {
     VERIFY_INPUT = "Verifying Input",
     DELIVER_CASH = "Drop Cash",
     HTTP_REQUEST_ET = "Network Request",
-    VALIDATE_OTP_ET = "Validate OTP"
+    VALIDATE_OTP_ET = "Validate OTP",
+    COLLECT_PAYMENT_ET = "Collect Payment"
 }
 export declare enum CustomScreens {
     REMARK_SCREEN = "REMARKS_SCREEN"
@@ -62,7 +64,8 @@ export declare enum EntityCode {
     VERIFY_INPUT = "0020",
     DELIVER_CASH = "0022",
     HTTP_REQUEST_ET = "0023",
-    VALIDATE_OTP_ET = "0052"
+    VALIDATE_OTP_ET = "0052",
+    COLLECT_PAYMENT_ET = "0055"
 }
 export declare enum BaseEventCodes {
     ENTITY_SUCCESS = "E-010",

package/lib/typescript/models/sdk.d.ts

@@ -4,6 +4,8 @@ export interface DispatchSDKConfig {
     userID: string;
     userName: string;
     tenantBaseURL: string;
+    domain: string;
+    env: ENV;
     headers?: {
         [key: string]: any;
     };
@@ -20,6 +22,7 @@ export interface DispatchSDKConfig {
         description: string;
         interval: number;
     };
+    paymentSuccessTimeout?: number;
     eventMapping?: EventCodes[];
     debugLevelLog?: Boolean;
     callbacks?: {
@@ -30,9 +33,18 @@ export interface DispatchSDKConfig {
         fetchDateTimeCallback?: () => Promise<string>;
         tokenRefreshCallback?: () => Promise<string>;
     };
+    etConfig: {
+        phoneCode: string;
+        mobilePhoneRegex: string;
+        currencySymbol: string;
+        appAbbr: string;
+        currencyCode: string;
+        goBackDisableTimer?: number;
+    };
 }
 export declare enum ENVIRONMENT {
     DEV = "dev",
     PRE_PROD = "preprod",
     PROD = "prod"
 }
+export type ENV = 'DEV' | 'SANDBOX' | 'SHARED_P1' | 'DLV_INDIA_P2';

package/lib/typescript/network/NetworkClient.d.ts

@@ -2,7 +2,9 @@ import HttpClient from './client';
 import type { Headers } from '../models/auth';
 export default class NetworkClient extends HttpClient {
     constructor(baseURL: string);
-    requestGet(): Promise<void>;
+    requestGet(endpoint: string, headers: Headers, queryParams?: {
+        [key: string]: string | number | boolean;
+    }): Promise<import("axios").AxiosResponse<any, any>>;
     requestPost(endpoint: string, requestBody: any, headers: Headers): Promise<import("axios").AxiosResponse<any, any>>;
     requestPut(endpoint: string, requestBody: any, headers: Headers): Promise<import("axios").AxiosResponse<any, any>>;
 }

package/lib/typescript/styles/executionTasks/CommonStyles.d.ts

@@ -129,6 +129,7 @@ export declare const CommonStyles: {
         justifyContent: "center";
         fontFamily: string;
         fontStyle: "normal";
+        fontWeight: "400";
         fontSize: number;
         letterSpacing: number;
         lineHeight: number;
@@ -136,6 +137,13 @@ export declare const CommonStyles: {
         color: string;
         marginBottom: number;
     };
+    titleText: {
+        fontFamily: Fonts;
+        fontWeight: "500";
+        fontSize: number;
+        lineHeight: number;
+        color: string;
+    };
 };
 export declare const DeliverPickupStyles: {
     itemTextStyle: {
@@ -161,11 +169,12 @@ export declare const DeliverPickupStyles: {
     modalView: {
         backgroundColor: string;
         padding: number;
+        paddingVertical: number;
         borderRadius: number;
     };
     titleText: {
         justifyContent: "center";
-        fontFamily: Fonts;
+        fontFamily: string;
         fontStyle: "normal";
         fontSize: number;
         lineHeight: number;

package/lib/typescript/ui/screens/CollectPaymentScreen.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const _default: (props: any) => React.JSX.Element;
+export default _default;

package/lib/typescript/ui/screens/ETScreensIndex.d.ts

@@ -14,4 +14,5 @@ import DropCashScreen from './DropCashScreen';
 import ScanScreen from './ScanScreen';
 import HttpRequestScreen from './HttpRequestScreen';
 import ValidateOTPScreen from './ValidateOTPScreen';
-export { CancellationScreen, DeliverScreen, DoodleScreen, ImageCaptureScreen, FormsScreen, PickupScreen, StartWorkFlowScreen, CaptureInputScreen, GeofenceScreen, PaymentScreen, DisplayScreen, CompleteObjectiveScreen, DropCashScreen, ScanScreen, HttpRequestScreen, ValidateOTPScreen, };
+import CollectPaymentScreen from './CollectPaymentScreen';
+export { CancellationScreen, DeliverScreen, DoodleScreen, ImageCaptureScreen, FormsScreen, PickupScreen, StartWorkFlowScreen, CaptureInputScreen, GeofenceScreen, PaymentScreen, DisplayScreen, CompleteObjectiveScreen, DropCashScreen, ScanScreen, HttpRequestScreen, ValidateOTPScreen, CollectPaymentScreen, };

package/lib/typescript/ui/uiConfig/RouteParams.d.ts

@@ -19,4 +19,5 @@ export declare function getDataFromNextState(nextState: IDispatch.IExecutionTask
     mergedObjectiveId: string[];
     wfMeta: any;
     taskName: string;
+    taskId: string;
 };

package/lib/typescript/utils/ExecTaskUtils.d.ts

@@ -10,4 +10,6 @@ export declare function getEntityCodeByET(etId: string): string;
  * @param eventData nextState: state | objRef: string | jobId: string
  */
 export declare function onTaskStart(eventData: IDispatch.IExecutionTaskQueryResponse, customData: any, triggerEvent?: boolean): void;
+export declare function onClickEvent(eventName: string, eventData: IDispatch.IExecutionTaskQueryResponse, customData: any, additionalData: any, triggerEvent?: boolean): void;
 export declare function handleDynamicValues(jsonInput: any, dataBlob: any): any;
+export declare const maskContact: (contact: string) => string;

package/lib/typescript/utils/context/paymentContext.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+import { DispatchSDKConfig } from '../../models/sdk';
+import NetworkClient from '../../network/NetworkClient';
+export declare const PaymentContext: import("react").Context<{
+    sdkConfig: DispatchSDKConfig;
+    networkInstance: NetworkClient;
+} | null>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@os1-platform/dispatch-mobile",
-  "version": "2.1.22",
+  "version": "2.1.24",
   "description": "Dispatch SDK React Native Package",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -33,7 +33,7 @@
   "scripts": {
     "test": "jest",
     "typescript": "tsc --noEmit",
-    "lint": "eslint \"**/*.{js,ts,tsx}\"",
+    "lint": "eslint \"**/*.{js,ts,tsx}\" --fix",
     "prepare": "bob build",
     "release": "release-it",
     "example": "yarn --cwd example",
@@ -217,7 +217,8 @@
     "root": true,
     "extends": [
       "@react-native-community",
-      "prettier"
+      "prettier",
+      "plugin:react-hooks/recommended"
     ],
     "rules": {
       "prettier/prettier": [
@@ -258,7 +259,7 @@
     ]
   },
   "dependencies": {
-    "@os1-platform/platform-coreos-execution-engine-sdk": "1.0.14",
+    "@os1-platform/platform-coreos-execution-engine-sdk": "1.0.15",
     "@rjsf/core": "^2.0.0",
     "apollo-link-timeout": "^4.0.0",
     "decompress": "^4.2.1",

package/src/analytics/firebase/FirebaseLogging.ts

@@ -1,29 +1,20 @@
 import analytics from '@react-native-firebase/analytics';
-import {
-  createObjectWithoutNullValues,
-  flattenObject,
-} from '../../utils/utils';
 import { Event } from '@sentry/types';
 import { SentryEventNameSdkConstants } from '../sentry/SentrySdkConstants';
-import crashlytics from '@react-native-firebase/crashlytics';
-import Logger, { LOG_TYPE } from '../../utils/Logger';
 
 export async function fireFirebaseEvent(eventName: string, data: Event) {
   let strEventVal = eventName;
-  console.log('fireFirebaseEvent:eventName', eventName);
-  console.log('fireFirebaseEvent:data', data.extra);
   try {
     if (
       eventName === SentryEventNameSdkConstants.API_CALL ||
-      eventName === SentryEventNameSdkConstants.API_RESPONSE || 
+      eventName === SentryEventNameSdkConstants.API_RESPONSE ||
       eventName === SentryEventNameSdkConstants.API_ERROR ||
       eventName === SentryEventNameSdkConstants.APP_LOG
     ) {
-      if(data?.extra){
+      if (data?.extra) {
         strEventVal = JSON.stringify(data?.extra);
       }
     }
-    console.log('fireFirebaseEvent:strEventVal', strEventVal);
     analytics().logEvent(eventName, { eventNameData: strEventVal });
   } catch (error: any) {
     analytics().logEvent(eventName, { eventNameData: 'fireFirebaseEvent error' });

package/src/analytics/sentry/SentryAnalyticsUtils.ts

@@ -10,13 +10,6 @@ export async function fireEventWithScreenName({ severityLevel, eventName, cta =
 
   //ignoring the button clicked event for now
   if (eventName === SentryEventNameSdkConstants.BUTTON_CLICKED) return;
-
-  console.log("sentry::fireEventWithScreenName()", " called")
-  console.log("sentry::fireEventWithScreenName::severityLevel", severityLevel)
-  console.log("sentry::fireEventWithScreenName::eventName", eventName)
-  console.log("sentry::fireEventWithScreenName::cta", cta)
-  console.log("sentry::fireEventWithScreenName::screenName", screenName)
-  console.log("sentry::fireEventWithScreenName::extraParams", JSON.stringify(extraParams))
   // 
   const singletonInstance = SentryAnalyticsSingleton.getInstance();
   const tenantId = singletonInstance.getDispatchAndUserData()?.tenantId ?? "N/A"

package/src/components/dispatch/DispatchExecNavigator.tsx

@@ -87,6 +87,20 @@ const DispatchExecNavigator = ({ route }: { route: any }) => {
             };
           }}
         />
+        <Stack.Screen
+          name={ExecutionTaskID.COLLECT_PAYMENT_ET}
+          component={ETScreen.CollectPaymentScreen}
+          options={(rProps) => {
+            let taskTitle = getTaskTitle(rProps.route);
+            return {
+              title: taskTitle
+                ? taskTitle
+                : ExecutionTaskName.COLLECT_PAYMENT_ET,
+              orientation: 'portrait',
+              headerBackVisible: false,
+            };
+          }}
+        />
         <Stack.Screen
           name={ExecutionTaskID.FORMS}
           component={ETScreen.FormsScreen}

package/src/components/executiontasks/ExecutionTasksIndex.ts

@@ -66,11 +66,16 @@ import SLDropCash from './dropCash/SLDropCash';
 import HttpRequestET from './httpRequest/HttpRequestET';
 import ScanET from './scan/ScanET';
 import ValidateOTPET from './validateOTP/ValidateOTPET';
+import CollectPaymentET from './collectPayment/CollectPayment';
 import type { ScannerInput, ScannerOutput } from './scan/ScanSchema';
 import type {
   ValidateOTPInput,
   ValidateOTPOutput,
 } from './validateOTP/ValidateOTPSchema';
+import type {
+  CollectPaymentInput,
+  CollectPaymentOutput,
+} from './collectPayment/CollectPaymentSchema';
 
 export type {
   CancellationInput,
@@ -110,6 +115,8 @@ export type {
   ScannerOutput,
   ValidateOTPInput,
   ValidateOTPOutput,
+  CollectPaymentInput,
+  CollectPaymentOutput,
 };
 
 export {
@@ -134,4 +141,5 @@ export {
   HttpRequestET,
   ScanET,
   ValidateOTPET,
+  CollectPaymentET,
 };

package/src/components/executiontasks/collectPayment/CollectPayment.tsx

@@ -0,0 +1,60 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import React, { useState } from 'react';
+import { View } from 'react-native';
+import {
+  CollectPaymentInput,
+  CollectPaymentOutput,
+  PAYMENT_SCREEN,
+} from './CollectPaymentSchema';
+import InitPayment from './components/InitPayment';
+import { Provider } from 'react-native-paper';
+import ProcessPayment from './components/ProcessPayment';
+import CompletePayment from './components/CompletePayment';
+import PaymentContactDetails from './components/PaymentContactDetails';
+
+const CollectPaymentET = (props: CollectPaymentInput) => {
+  const [moveToNextData, setMoveToNextData] = useState<
+    CollectPaymentOutput & {
+      screen: PAYMENT_SCREEN;
+      sourceScreen: PAYMENT_SCREEN;
+    }
+  >();
+
+  return (
+    <Provider>
+      <View style={{ flex: 1 }}>
+        {!moveToNextData || moveToNextData.screen === PAYMENT_SCREEN.INIT ? (
+          <InitPayment
+            {...props}
+            {...moveToNextData}
+            onSubmitET={async (etOutput) => props.onSubmitET(etOutput)}
+            next={(etOutput) => setMoveToNextData(etOutput)}
+          />
+        ) : moveToNextData.screen === PAYMENT_SCREEN.CONTACTS ? (
+          <PaymentContactDetails
+            {...props}
+            {...moveToNextData}
+            onSubmitET={async (etOutput) => props.onSubmitET(etOutput)}
+            next={(etOutput) => setMoveToNextData(etOutput)}
+          />
+        ) : moveToNextData.screen === PAYMENT_SCREEN.PROCESS ? (
+          <ProcessPayment
+            {...props}
+            {...moveToNextData}
+            onSubmitET={async (etOutput) => props.onSubmitET(etOutput)}
+            next={(etOutput) => setMoveToNextData(etOutput)}
+          />
+        ) : moveToNextData.screen === PAYMENT_SCREEN.COMPLETE ? (
+          <CompletePayment
+            {...props}
+            {...moveToNextData}
+            onSubmitET={async (etOutput) => props.onSubmitET(etOutput)}
+            next={(etOutput) => setMoveToNextData(etOutput)}
+          />
+        ) : null}
+      </View>
+    </Provider>
+  );
+};
+
+export default CollectPaymentET;

package/src/components/executiontasks/collectPayment/CollectPaymentSchema.ts

@@ -0,0 +1,182 @@
+import {
+  BaseETRequest,
+  BaseETResponse,
+} from '../../../models/execTasks/ETBaseModels';
+import {
+  HTTPMethod,
+  HTTPRequestBody,
+} from '../httpRequest/HttpRequestETSchema';
+import { Headers, PathParams, QueryParams } from '../../../utils/ApiUtils';
+
+export type AllowedModes = 'CASH' | 'QR_CODE' | 'PAYMENT_LINK' | 'ONLINE';
+export type OnsiteLink = 'Phone Number' | 'Email';
+
+export interface ETAmount {
+  value: number;
+  currencyCode: string;
+  // minorUnit?: number;
+}
+
+export interface API {
+  uri: string;
+  timeout?: number;
+  httpMethod: HTTPMethod;
+  headers?: Headers[];
+  requestBody?: HTTPRequestBody;
+  queryParams?: QueryParams[];
+  pathParams?: PathParams[];
+  responseJsonLogic: object;
+  errorJsonLogic: object;
+}
+
+export type CollectPaymentInput = BaseETRequest & {
+  // amount: ETAmount;
+  allowedModes: AllowedModes[];
+  plModes?: string[];
+  expectedAmount: number;
+  onsiteLinkSharing?: OnsiteLink[];
+  onSubmitET: (output: CollectPaymentOutput) => void;
+  next: (
+    output: CollectPaymentOutput & {
+      screen: PAYMENT_SCREEN;
+      contactDetails?: string;
+      sourceScreen: PAYMENT_SCREEN;
+    }
+  ) => void;
+  screen: PAYMENT_SCREEN;
+  sourceScreen: PAYMENT_SCREEN;
+};
+
+export interface ProcessPaymentInput {
+  paymentMode: AllowedModes;
+  contactDetails?: string;
+}
+
+export interface CompletePaymentInput {
+  paymentMode: AllowedModes;
+}
+
+export type CollectPaymentOutput = BaseETResponse & {
+  refId: string;
+  collectedAmount: ETAmount;
+  paymentMeta?: {};
+  paymentMode: AllowedModes;
+};
+
+export interface QrResponse {
+  data: {
+    qrCode?: string;
+    txnId?: string;
+    paymentCompleted?: boolean;
+    status?: STATUS;
+  };
+}
+
+export interface QR_REQUEST_BODY {
+  refId: string;
+  appAbbr: string;
+  money: {
+    amount: number;
+    currency: string;
+  };
+  userInfo?: {
+    phone?: {
+      countryCode: string;
+      mobileNumber: string;
+    };
+  };
+  pgConfigId?: string;
+  description?: string;
+  meta?: { [key: string]: any };
+}
+
+export interface PaymentStatusResponse {
+  data: {
+    meta?: { totalCount?: number };
+    transactions?: {
+      refId: string;
+      status: STATUS;
+      subStatus: SUB_STATUS;
+      money: {
+        amount: number;
+        currency: string;
+      };
+      txnId: string;
+      txnType: TRANSACTION_TYPE;
+      appAbbr: string;
+    }[];
+  };
+}
+
+export interface PaymentLinkResponse {
+  txnId: string;
+  refId: string;
+  status?: STATUS;
+}
+
+export interface notificationPaymentStatus {
+  refId: string;
+  status: STATUS;
+}
+
+export enum STATUS {
+  INITIATED = 'INITIATED',
+  FAILED = 'FAILED',
+  SUCCESS = 'SUCCESS',
+}
+
+export enum SUB_STATUS {
+  completed = 'completed',
+  expired = 'expired',
+  created = 'created',
+  plFailed = 'plFailed',
+  qrFailed = 'qrFailed',
+  paymentFailed = 'paymentFailed',
+  closed = 'closed',
+}
+
+export enum PAYMENT_SCREEN {
+  INIT = 'INIT',
+  CONTACTS = 'CONTACTS',
+  PROCESS = 'PROCESS',
+  COMPLETE = 'COMPLETE',
+}
+
+export interface sharedPrefPaymentDataInterface {
+  paymentMode: AllowedModes;
+  amount: ETAmount;
+  // refId: string;
+  moIds: string[];
+  previousSelection?: AllowedModes[];
+}
+
+export interface PaymentEventDataInterface {
+  refId: string;
+  money: {
+    amount: number;
+    currency: string;
+  };
+  contactDetails?: string;
+  paymentLink?: string;
+}
+
+export interface PaymentConfigResponse {
+  data: {
+    configDetails: {
+      tenantId: string;
+      paymentMethods: PaymentMethods;
+      modesMapping: object;
+    }[];
+  };
+}
+
+export interface PaymentMethods {
+  QR: boolean;
+  paymentLink: boolean;
+  modes?: object;
+}
+
+export enum TRANSACTION_TYPE {
+  LINK = 'link',
+  QRCODE = 'qrCode',
+}

package/src/components/executiontasks/collectPayment/PaymentStyles.ts

@@ -0,0 +1,102 @@
+import { StyleSheet, Platform } from 'react-native';
+import { Fonts } from '../../../styles/executionTasks/CommonStyles';
+
+export const PaymentStyles = StyleSheet.create({
+  amountStyle: {
+    fontSize: 18,
+    fontWeight: '600',
+    fontStyle: 'normal',
+    // backgroundColor: 'white',
+    textAlign: 'center',
+    alignItems: 'center',
+    paddingTop: 25,
+    paddingBottom: 25,
+    fontFamily: Platform.OS === 'android'
+    ? Fonts.IBMPlexSans_600SemiBold
+    : 'IBMPlexSans-SemiBold',
+  },
+  messageStyle: {
+    fontFamily: Platform.OS === 'android'
+    ? Fonts.IBMPlexSans_400Regular
+    : 'IBMPlexSans-Regular',
+    backgroundColor: '#FFFFFF',
+    color: '#111111',
+    padding: 20,
+    fontStyle: 'normal',
+    fontWeight: 'normal',
+    fontSize: 14,
+  },
+  textStyle1: {
+    fontFamily: Platform.OS === 'android'
+    ? Fonts.IBMPlexSans_400Regular
+    : 'IBMPlexSans-Regular',
+    marginTop: 20,
+    marginStart: 20,
+    marginEnd: 20,
+    color: '#9D9D9D',
+    fontStyle: 'normal',
+    fontWeight: 'normal',
+    fontSize: 14,
+  },
+  reasonTextStyle: {
+    flex: 1,
+    flexWrap: 'wrap',
+    fontFamily: Platform.OS === 'android'
+    ? Fonts.IBMPlexSans_400Regular
+    : 'IBMPlexSans-Regular',
+    fontStyle: 'normal',
+    fontSize: 14,
+    lineHeight: 21,
+    letterSpacing: 0.25,
+    textAlign: 'justify',
+    color: '#111111',
+    paddingTop: 5,
+  },
+
+  reasonItemStyle: {
+    flexDirection: 'row',
+    paddingTop: 10,
+    paddingStart: 20,
+    paddingEnd: 20,
+    backgroundColor: 'white',
+  },
+  heading: {
+    marginTop: 30,
+    marginStart: 25,
+    fontSize: 14,
+    lineHeight: 21,
+    letterSpacing: 0.25,
+    fontFamily: 'IBMPlexSans_400Regular',
+    color: '#9D9D9D',
+  },
+  item: {
+    margin: 10,
+    padding: 15,
+    borderWidth: 0.2,
+  },
+  btn: {
+    width: 240,
+    borderRadius: 4,
+    backgroundColor: '#62d1bc',
+    paddingHorizontal: 24,
+    paddingVertical: 12,
+    marginVertical: 8,
+  },
+
+  loader: { flex: 1, justifyContent: 'center', alignItems: 'center' },
+  flexCenter: {
+    width: 300,
+    height: 200,
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  paymentWaitIcon: {
+    backgroundColor: '#ECF0FF',
+    width: 113,
+    height: 113,
+    borderRadius: 60,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+});