From a9629a3f65ac3752d28e2255ed0581683f66904a Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Fri, 18 Jul 2025 16:30:49 +0530 Subject: [PATCH 01/26] Added: Retail --- .../services/webhook/webhook-service.ts | 2 +- .../beckn-bpp-adapter/server/tl/tl.helper.ts | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/plugins/beckn-bpp-adapter/server/services/webhook/webhook-service.ts b/plugins/beckn-bpp-adapter/server/services/webhook/webhook-service.ts index 0d87b1b0..80624b5e 100644 --- a/plugins/beckn-bpp-adapter/server/services/webhook/webhook-service.ts +++ b/plugins/beckn-bpp-adapter/server/services/webhook/webhook-service.ts @@ -11,7 +11,7 @@ export default ({ strapi: any }: { strapi: Strapi }) => ({ async index(body, domain) { try { const dummyProvider = { - DOMAIN: "Retail", + DOMAIN: "Retail:dev", provider_name: "Sample Provider", provider_short_desc: "Your one-stop shop for daily essentials.", provider_long_desc: diff --git a/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts b/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts index 0cc56aed..80306a26 100644 --- a/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts +++ b/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts @@ -90,16 +90,16 @@ export const quote = async (items: KeyValuePair[]) => { // Domain-specific base price name mappings const domainBasePriceNames = { - "Retail": "Item Price", - "dhp:pharmacy:0.1.0": "Item Price", - "supply-chain-services:assembly": "Base Price", - "mobility:1.1.0": "Base Fare", - "tourism": "Sub Total", - "dsep:courses": "Course Fee", - "hospitality": "Room Tariff", - "retail:1.1.0": "Item Price", - "uei:p2p_trading": "P2P Energy Cost", - "uei:charging": "Cost of Charge" + "Retail:dev": "Item Price", + "dhp:pharmacy:0.1.0:dev": "Item Price", + "supply-chain-services:assembly:dev": "Base Price", + "mobility:1.1.0:dev": "Base Fare", + "tourism:dev": "Sub Total", + "dsep:courses:dev": "Course Fee", + "hospitality:dev": "Room Tariff", + "retail:1.1.0:dev": "Item Price", + "uei:p2p_trading:dev": "P2P Energy Cost", + "uei:charging:dev": "Cost of Charge" }; export const quotePrice = async ( @@ -141,9 +141,9 @@ export const quotePrice = async ( title: price_bareakup_id.title, price: { currency: price_bareakup_id.currency, - value: adjustedValue.toString(), + value: adjustedValue.toString() }, - item: { id: `${item.id || ""}` }, + item: { id: `${item.id || ""}` } }); }); @@ -153,9 +153,9 @@ export const quotePrice = async ( title: basePriceName, price: { currency: scProduct.currency, - value: (Number(scProduct.base_fee) * selectedQuantity).toString(), + value: (Number(scProduct.base_fee) * selectedQuantity).toString() }, - item: { id: `${item.id || ""}` }, + item: { id: `${item.id || ""}` } }); } } else { @@ -176,9 +176,9 @@ export const quotePrice = async ( return { price: { value: (breakupPriceValue + totalPriceValue).toString(), - currency: items?.[0]?.sc_retail_product?.currency, + currency: items?.[0]?.sc_retail_product?.currency }, - breakup, + breakup }; }; From 03926f6e8cd834966f0c0ad9a88c2cdae987852b Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Fri, 18 Jul 2025 17:35:44 +0530 Subject: [PATCH 02/26] Added: Changes --- plugins/beckn-bpp-adapter/server/tl/tl.helper.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts b/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts index 80306a26..be45f786 100644 --- a/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts +++ b/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts @@ -90,14 +90,14 @@ export const quote = async (items: KeyValuePair[]) => { // Domain-specific base price name mappings const domainBasePriceNames = { - "Retail:dev": "Item Price", - "dhp:pharmacy:0.1.0:dev": "Item Price", + "Retail:dev": "Base Price", + "dhp:pharmacy:0.1.0:dev": "Base Price", "supply-chain-services:assembly:dev": "Base Price", "mobility:1.1.0:dev": "Base Fare", "tourism:dev": "Sub Total", "dsep:courses:dev": "Course Fee", "hospitality:dev": "Room Tariff", - "retail:1.1.0:dev": "Item Price", + "retail:1.1.0:dev": "Base Price", "uei:p2p_trading:dev": "P2P Energy Cost", "uei:charging:dev": "Cost of Charge" }; From 89767090782335925312c5e6960c9b02d110a269 Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Sat, 19 Jul 2025 18:56:45 +0530 Subject: [PATCH 03/26] Added: Changes for Xinput --- plugins/beckn-bpp-adapter/server/tl/tl.helper.ts | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts b/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts index be45f786..f19e8a9c 100644 --- a/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts +++ b/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts @@ -25,23 +25,29 @@ export const context = async (data: any, action: string) => { export const xInput = async (context: KeyValuePair) => { const { action, domain } = context; let formId; - if (action === "init" && domain === "dsep:scholarships") { + if ( + action === "init" && + domain === `dsep:scholarships:${process.env.BECKN_ENV}` + ) { formId = "dsepScholarshipDetailsForm"; - } else if (action === "init" && domain === "dsep:jobs") { + } else if ( + action === "init" && + domain === `dsep:jobs:${process.env.BECKN_ENV}` + ) { formId = "dsepJobsApplyForm"; } else if ( action === "select" && - domain === "online-dispute-resolution:0.1.0" + domain === `online-dispute-resolution:0.1.0:${process.env.BECKN_ENV}` ) { formId = "odrDisputeDetailsForm"; } else if ( action === "init" && - domain === "online-dispute-resolution:0.1.0" + domain === `online-dispute-resolution:0.1.0:${process.env.BECKN_ENV}` ) { formId = "odrConsentForm"; } else if ( action === "select" && - domain === "supply-chain-services:assembly" + domain === `supply-chain-services:assembly:${process.env.BECKN_ENV}` ) { formId = "industryAssemblyDetailsForm"; } else if (action === "rating" && isMobility(context)) { From 39d2b3f8436926760dbbc848e29d8ebc456834ff Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Sat, 19 Jul 2025 19:08:09 +0530 Subject: [PATCH 04/26] Added: Changes for xinput in jsonata in on_Search --- plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata b/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata index bcca63f0..c1db3b5f 100644 --- a/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata +++ b/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata @@ -70,6 +70,12 @@ $string($v.location_id.id) })[] : [], + "xinput": { + "form": { + "url": $xInput(%.%.context), + "mime_type": "text/html" + } + }, "tags": $tags(cat_attr_tag_relations), "time": { "duration": service.time_slot_per_client_in_min ? $string(service.time_slot_per_client_in_min) : "" From 8e8b1e2c764748f60395b952734a4d3363a1a25a Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Sat, 19 Jul 2025 19:12:42 +0530 Subject: [PATCH 05/26] Added: Changes for xinput in jsonata in on_Search --- plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata b/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata index c1db3b5f..bf8f9524 100644 --- a/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata +++ b/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata @@ -72,7 +72,7 @@ [], "xinput": { "form": { - "url": $xInput(%.%.context), + "url": $xInput(%.%.%.context), "mime_type": "text/html" } }, From 860f7d2b8f82753ad3a55cf0245afa44b543322c Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Sat, 19 Jul 2025 19:19:43 +0530 Subject: [PATCH 06/26] Added: Changes for xinput in jsonata in on_Search --- plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata b/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata index bf8f9524..166a951e 100644 --- a/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata +++ b/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata @@ -72,7 +72,7 @@ [], "xinput": { "form": { - "url": $xInput(%.%.%.context), + "url": $xInput(context), "mime_type": "text/html" } }, From d7469ebeaf392eda984b9fc8c4dd8ca4de3a2f95 Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Sat, 19 Jul 2025 19:22:29 +0530 Subject: [PATCH 07/26] Added: Changes for xinput in jsonata in on_Search --- plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata b/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata index 166a951e..d6013848 100644 --- a/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata +++ b/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata @@ -72,7 +72,7 @@ [], "xinput": { "form": { - "url": $xInput(context), + "url": $xInput($context), "mime_type": "text/html" } }, From 6a77a55df7f9b341cd86137e53cc3b1e47912a9d Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Sat, 19 Jul 2025 19:24:51 +0530 Subject: [PATCH 08/26] Added: Changes for xinput in jsonata in on_Search --- plugins/beckn-bpp-adapter/server/tl/tl.helper.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts b/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts index f19e8a9c..2ec13de5 100644 --- a/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts +++ b/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts @@ -23,6 +23,7 @@ export const context = async (data: any, action: string) => { }; export const xInput = async (context: KeyValuePair) => { + console.log("context====>", context, "\n\n\n"); const { action, domain } = context; let formId; if ( From 2cef2f3cefca6c3390d73442897a3b59cbdfea41 Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Sat, 19 Jul 2025 19:27:40 +0530 Subject: [PATCH 09/26] Added: Changes for xinput in jsonata in on_Search --- plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata b/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata index d6013848..2c458904 100644 --- a/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata +++ b/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata @@ -72,7 +72,7 @@ [], "xinput": { "form": { - "url": $xInput($context), + "url": $xInput(%.%.%.%.context), "mime_type": "text/html" } }, From 4d6afaf08a68fed26cc5f25824ec8744ea2328c0 Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Sat, 19 Jul 2025 19:28:58 +0530 Subject: [PATCH 10/26] Added: Changes for xinput in jsonata in on_Search --- .../beckn-bpp-adapter/server/tl/tl.service.ts | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/plugins/beckn-bpp-adapter/server/tl/tl.service.ts b/plugins/beckn-bpp-adapter/server/tl/tl.service.ts index 7155b09c..ad6cad16 100644 --- a/plugins/beckn-bpp-adapter/server/tl/tl.service.ts +++ b/plugins/beckn-bpp-adapter/server/tl/tl.service.ts @@ -1,21 +1,36 @@ import jsonata from "jsonata"; -import path from 'path'; +import path from "path"; import appRootPath from "app-root-path"; -import fs from 'fs'; +import fs from "fs"; import { ObjectUtil } from "../util/object.util"; -import * as tlHelpers from './tl.helper' +import * as tlHelpers from "./tl.helper"; export class TLService { - static async transform(data: any, action: string) { - - if (action) { - const expression = jsonata(fs.readFileSync(path.join(appRootPath.toString(), `/server/mappings/${action}.jsonata`), "utf8")); - console.log("Transforming %s data: \n%o", action, JSON.stringify(data)); - let transformed = await expression.evaluate(data, { action, ...tlHelpers }); - transformed = ObjectUtil.removeEmptyObjectKeys(transformed) - console.log("Transformed %s data: \n%o", action, JSON.stringify(transformed)); - return transformed; - } - return {}; + static async transform(data: any, action: string) { + if (action) { + const expression = jsonata( + fs.readFileSync( + path.join( + appRootPath.toString(), + `/server/mappings/${action}.jsonata` + ), + "utf8" + ) + ); + // console.log("Transforming %s data: \n%o", action, JSON.stringify(data)); + console.log(`Transforming ${action} data: \n${JSON.stringify(data)}`); + let transformed = await expression.evaluate(data, { + action, + ...tlHelpers + }); + transformed = ObjectUtil.removeEmptyObjectKeys(transformed); + console.log( + "Transformed %s data: \n%o", + action, + JSON.stringify(transformed) + ); + return transformed; } + return {}; + } } From 90c0a61bc21117197ff38ec32d8bff95534ff993 Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Sat, 19 Jul 2025 19:32:37 +0530 Subject: [PATCH 11/26] Added: Changes for xinput in jsonata in on_Search --- plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata b/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata index 2c458904..4d29cf6b 100644 --- a/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata +++ b/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata @@ -72,7 +72,7 @@ [], "xinput": { "form": { - "url": $xInput(%.%.%.%.context), + "url": $xInput(%.context), "mime_type": "text/html" } }, From 4168a901135600cf5615e1c05ed93e1cc253ad04 Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Sat, 19 Jul 2025 19:36:33 +0530 Subject: [PATCH 12/26] Added: Changes for xinput in jsonata in on_Search --- plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata b/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata index 4d29cf6b..c1db3b5f 100644 --- a/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata +++ b/plugins/beckn-bpp-adapter/server/mappings/on_search.jsonata @@ -72,7 +72,7 @@ [], "xinput": { "form": { - "url": $xInput(%.context), + "url": $xInput(%.%.context), "mime_type": "text/html" } }, From 6f4dd8798c7dfbc957146e26a7c7a1714efec63e Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Sat, 19 Jul 2025 19:38:58 +0530 Subject: [PATCH 13/26] Added: Changes for xinput in jsonata in on_Search --- plugins/beckn-bpp-adapter/server/tl/tl.helper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts b/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts index 2ec13de5..77b2e8e1 100644 --- a/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts +++ b/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts @@ -37,7 +37,7 @@ export const xInput = async (context: KeyValuePair) => { ) { formId = "dsepJobsApplyForm"; } else if ( - action === "select" && + (action === "select" || action === "search") && domain === `online-dispute-resolution:0.1.0:${process.env.BECKN_ENV}` ) { formId = "odrDisputeDetailsForm"; From caa3ff8a44344ebfb40e0298ca2afcece566970c Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Mon, 18 Aug 2025 00:47:09 +0530 Subject: [PATCH 14/26] Added: Changes for Toursim --- .../server/util/search.util.ts | 106 +++++++++--------- 1 file changed, 54 insertions(+), 52 deletions(-) diff --git a/plugins/beckn-bpp-adapter/server/util/search.util.ts b/plugins/beckn-bpp-adapter/server/util/search.util.ts index 4be428e8..777a49b2 100644 --- a/plugins/beckn-bpp-adapter/server/util/search.util.ts +++ b/plugins/beckn-bpp-adapter/server/util/search.util.ts @@ -102,58 +102,60 @@ export class SearchUtil { } else { filteredProviders = []; } - } else if (isTourism(context)) { - let checkInReq: KeyValuePair | null = null; - fulfillment?.stops.map((fulfillmentStop: KeyValuePair) => { - if (fulfillmentStop?.type?.toLowerCase() === CHECK_IN) { - checkInReq = fulfillmentStop; - } - }); - if (checkInReq) { - filteredProviders = providers.filter((providerItem: KeyValuePair) => { - providerItem.items = providerItem.items.filter( - (item: KeyValuePair) => { - let checkInItem: any = null; - item?.item_fulfillment_ids?.forEach( - (fulfillment: KeyValuePair) => { - if ( - fulfillment?.fulfilment_id?.type?.toLowerCase() === CHECK_IN - ) { - checkInItem = fulfillment; - } - } - ); - const checkInGps = checkInReq?.location?.gps.split(",") || []; - const itemGps = checkInItem?.location_id?.gps.split(",") || []; - const checkInLat = checkInGps[0]; - const checkInLong = checkInGps[1]; - const itemLat = itemGps[0]; - const itemLong = itemGps[1]; - console.log( - moment(checkInReq?.time?.timestamp).format("YYYY-MM-DD"), - moment(checkInItem?.timestamp).format("YYYY-MM-DD"), - checkInGps.length && - itemGps.length && - !isInRange(checkInLat, checkInLong, itemLat, itemLong) - ); - if ( - moment(checkInReq?.time?.timestamp).format("YYYY-MM-DD") !== - moment(checkInItem?.timestamp).format("YYYY-MM-DD") || - (checkInGps.length && - itemGps.length && - !isInRange(checkInLat, checkInLong, itemLat, itemLong)) - ) { - return false; - } - return true; - } - ); - return providerItem.items.length > 0; - }); - } else { - filteredProviders = []; - } - } else if (isMobility(context)) { + } + // else if (isTourism(context)) { + // let checkInReq: KeyValuePair | null = null; + // fulfillment?.stops?.map((fulfillmentStop: KeyValuePair) => { + // if (fulfillmentStop?.type?.toLowerCase() === CHECK_IN) { + // checkInReq = fulfillmentStop; + // } + // }); + // if (checkInReq) { + // filteredProviders = providers.filter((providerItem: KeyValuePair) => { + // providerItem.items = providerItem.items.filter( + // (item: KeyValuePair) => { + // let checkInItem: any = null; + // item?.item_fulfillment_ids?.forEach( + // (fulfillment: KeyValuePair) => { + // if ( + // fulfillment?.fulfilment_id?.type?.toLowerCase() === CHECK_IN + // ) { + // checkInItem = fulfillment; + // } + // } + // ); + // const checkInGps = checkInReq?.location?.gps.split(",") || []; + // const itemGps = checkInItem?.location_id?.gps.split(",") || []; + // const checkInLat = checkInGps[0]; + // const checkInLong = checkInGps[1]; + // const itemLat = itemGps[0]; + // const itemLong = itemGps[1]; + // console.log( + // moment(checkInReq?.time?.timestamp).format("YYYY-MM-DD"), + // moment(checkInItem?.timestamp).format("YYYY-MM-DD"), + // checkInGps.length && + // itemGps.length && + // !isInRange(checkInLat, checkInLong, itemLat, itemLong) + // ); + // if ( + // moment(checkInReq?.time?.timestamp).format("YYYY-MM-DD") !== + // moment(checkInItem?.timestamp).format("YYYY-MM-DD") || + // (checkInGps.length && + // itemGps.length && + // !isInRange(checkInLat, checkInLong, itemLat, itemLong)) + // ) { + // return false; + // } + // return true; + // } + // ); + // return providerItem.items.length > 0; + // }); + // } else { + // filteredProviders = []; + // } + // } + else if (isMobility(context)) { let customerLocation: KeyValuePair | null = null; fulfillment?.stops.map((fulfillmentStop: KeyValuePair) => { if (fulfillmentStop?.type?.toLowerCase() === START) { From dae0eef7b5df317d269adcfca5747b9af90b3a8d Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Mon, 18 Aug 2025 00:51:10 +0530 Subject: [PATCH 15/26] Added: Changes for Toursim --- .../server/util/search.util.ts | 107 +++++++++--------- 1 file changed, 53 insertions(+), 54 deletions(-) diff --git a/plugins/beckn-bpp-adapter/server/util/search.util.ts b/plugins/beckn-bpp-adapter/server/util/search.util.ts index 777a49b2..26f345e5 100644 --- a/plugins/beckn-bpp-adapter/server/util/search.util.ts +++ b/plugins/beckn-bpp-adapter/server/util/search.util.ts @@ -102,60 +102,59 @@ export class SearchUtil { } else { filteredProviders = []; } - } - // else if (isTourism(context)) { - // let checkInReq: KeyValuePair | null = null; - // fulfillment?.stops?.map((fulfillmentStop: KeyValuePair) => { - // if (fulfillmentStop?.type?.toLowerCase() === CHECK_IN) { - // checkInReq = fulfillmentStop; - // } - // }); - // if (checkInReq) { - // filteredProviders = providers.filter((providerItem: KeyValuePair) => { - // providerItem.items = providerItem.items.filter( - // (item: KeyValuePair) => { - // let checkInItem: any = null; - // item?.item_fulfillment_ids?.forEach( - // (fulfillment: KeyValuePair) => { - // if ( - // fulfillment?.fulfilment_id?.type?.toLowerCase() === CHECK_IN - // ) { - // checkInItem = fulfillment; - // } - // } - // ); - // const checkInGps = checkInReq?.location?.gps.split(",") || []; - // const itemGps = checkInItem?.location_id?.gps.split(",") || []; - // const checkInLat = checkInGps[0]; - // const checkInLong = checkInGps[1]; - // const itemLat = itemGps[0]; - // const itemLong = itemGps[1]; - // console.log( - // moment(checkInReq?.time?.timestamp).format("YYYY-MM-DD"), - // moment(checkInItem?.timestamp).format("YYYY-MM-DD"), - // checkInGps.length && - // itemGps.length && - // !isInRange(checkInLat, checkInLong, itemLat, itemLong) - // ); - // if ( - // moment(checkInReq?.time?.timestamp).format("YYYY-MM-DD") !== - // moment(checkInItem?.timestamp).format("YYYY-MM-DD") || - // (checkInGps.length && - // itemGps.length && - // !isInRange(checkInLat, checkInLong, itemLat, itemLong)) - // ) { - // return false; - // } - // return true; - // } - // ); - // return providerItem.items.length > 0; - // }); - // } else { - // filteredProviders = []; - // } - // } - else if (isMobility(context)) { + } else if (isTourism(context)) { + // let checkInReq: KeyValuePair | null = null; + // fulfillment?.stops?.map((fulfillmentStop: KeyValuePair) => { + // if (fulfillmentStop?.type?.toLowerCase() === CHECK_IN) { + // checkInReq = fulfillmentStop; + // } + // }); + // if (checkInReq) { + // filteredProviders = providers.filter((providerItem: KeyValuePair) => { + // providerItem.items = providerItem.items.filter( + // (item: KeyValuePair) => { + // let checkInItem: any = null; + // item?.item_fulfillment_ids?.forEach( + // (fulfillment: KeyValuePair) => { + // if ( + // fulfillment?.fulfilment_id?.type?.toLowerCase() === CHECK_IN + // ) { + // checkInItem = fulfillment; + // } + // } + // ); + // const checkInGps = checkInReq?.location?.gps.split(",") || []; + // const itemGps = checkInItem?.location_id?.gps.split(",") || []; + // const checkInLat = checkInGps[0]; + // const checkInLong = checkInGps[1]; + // const itemLat = itemGps[0]; + // const itemLong = itemGps[1]; + // console.log( + // moment(checkInReq?.time?.timestamp).format("YYYY-MM-DD"), + // moment(checkInItem?.timestamp).format("YYYY-MM-DD"), + // checkInGps.length && + // itemGps.length && + // !isInRange(checkInLat, checkInLong, itemLat, itemLong) + // ); + // if ( + // moment(checkInReq?.time?.timestamp).format("YYYY-MM-DD") !== + // moment(checkInItem?.timestamp).format("YYYY-MM-DD") || + // (checkInGps.length && + // itemGps.length && + // !isInRange(checkInLat, checkInLong, itemLat, itemLong)) + // ) { + // return false; + // } + // return true; + // } + // ); + // return providerItem.items.length > 0; + // }); + // } else { + // filteredProviders = []; + // } + return providers; + } else if (isMobility(context)) { let customerLocation: KeyValuePair | null = null; fulfillment?.stops.map((fulfillmentStop: KeyValuePair) => { if (fulfillmentStop?.type?.toLowerCase() === START) { From e887be04e1b18a36dd26a947900539db850c0d3f Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Mon, 6 Oct 2025 18:19:24 +0530 Subject: [PATCH 16/26] Added: Changes for mobility domain --- plugins/driver-app/contstants.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/driver-app/contstants.ts b/plugins/driver-app/contstants.ts index feceba4f..10900ff8 100644 --- a/plugins/driver-app/contstants.ts +++ b/plugins/driver-app/contstants.ts @@ -1,6 +1,10 @@ import pluginPkg from "./package.json"; +import dotenv from "dotenv"; export const PLUGIN: string = pluginPkg.strapi.name; -export const MOBILITY_DOMAIN = "mobility:1.1.0"; + +export const MOBILITY_DOMAIN = `mobility:1.1.0${ + process.env.BECKN_ENV ? `:${process.env.BECKN_ENV}` : "" +}`; export enum RIDE_STATUS_CODE { AWAITING_DRIVER_APPROVAL = "AWAITING_DRIVER_APPROVAL", RIDE_ACCEPTED = "RIDE_ACCEPTED", From 5119c127158b2652189598daf3b604df207d78a6 Mon Sep 17 00:00:00 2001 From: aniketceminds Date: Thu, 4 Dec 2025 21:19:54 +0530 Subject: [PATCH 17/26] buig fx --- .../services/confirm/commerce-workflow-service.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts b/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts index e8f106db..4740fbbf 100644 --- a/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts +++ b/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts @@ -122,6 +122,7 @@ export default ({ strapi }: { strapi: Strapi }) => ({ createOrder = await strapi.entityService.create("api::order.order", { data: orderData }); + console.log("createOrder ==>>>>>>", createOrder); orderId = createOrder.id; // Create order address @@ -207,12 +208,14 @@ export default ({ strapi }: { strapi: Strapi }) => ({ // Update the order with the modified tags console.log("Orderis", orderId); - await strapi.entityService.update("api::order.order", orderId, { + const updateOrder = await strapi.entityService.update("api::order.order", orderId, { data: { tags: items // Assuming 'items' is a writable field; adjust based on your Strapi schema } }); + console.log("updateOrder ==>>>>>>", updateOrder); + strapi.log.info( `Order ${orderId} has been successfully updated with tag IDs.` ); @@ -230,11 +233,11 @@ export default ({ strapi }: { strapi: Strapi }) => ({ ...billingInfo, publishedAt: isoString }; - await strapi.entityService.create( + const createOrderAddress = await strapi.entityService.create( "api::order-address.order-address", { data: orderAddressData } ); - + console.log("createOrderAddress ==>>>>>>", createOrderAddress); // Find or create customer const [existingCustomer] = await strapi.entityService.findMany( "api::customer.customer", @@ -254,6 +257,7 @@ export default ({ strapi }: { strapi: Strapi }) => ({ "api::order-fulfillment-location.order-fulfillment-location", { data: shippingDetail } ); + console.log("createShipping ==>>>>>>", createShipping); const stopsIds = [createShipping.id]; if (endLocationDetail) { @@ -301,6 +305,7 @@ export default ({ strapi }: { strapi: Strapi }) => ({ "api::order-fulfillment.order-fulfillment", { data: orderFulfillmentDetail } ); + console.log("orderFulfillmentRes ==>>>>>>", orderFulfillmentRes); orderFulFillmentId = orderFulfillmentRes.id; await onConfirm(message); @@ -397,6 +402,7 @@ export default ({ strapi }: { strapi: Strapi }) => ({ populate } ); + console.log("itemDetails ==>>>>>>", itemDetails); const commonService = strapi.plugin(PLUGIN).service("commonService"); await Promise.all( itemDetails.map(async (itemDetail) => { @@ -432,6 +438,7 @@ export default ({ strapi }: { strapi: Strapi }) => ({ fulfilment_id: {} } ); + console.log("orderFulfillment ==>>>>>>", orderFulfillment); const billingDetails = billing; const fulfillmentDetails = fulfillments; From 3f6984bbc8d6e1fe844ae7666bdbe46a5f18bef8 Mon Sep 17 00:00:00 2001 From: aniketceminds Date: Thu, 4 Dec 2025 21:27:13 +0530 Subject: [PATCH 18/26] buig fx --- .../server/services/confirm/commerce-workflow-service.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts b/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts index 4740fbbf..29cd9581 100644 --- a/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts +++ b/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts @@ -118,6 +118,7 @@ export default ({ strapi }: { strapi: Strapi }) => ({ total_amount: payments?.[0]?.params?.amount || 100, transaction_id: payments?.[0]?.id }; + console.log("orderData ==>>>>>>", orderData); // Create order createOrder = await strapi.entityService.create("api::order.order", { data: orderData @@ -311,6 +312,7 @@ export default ({ strapi }: { strapi: Strapi }) => ({ await onConfirm(message); trx.commit(); } catch (err) { + console.log("err ==>>>>>>", err); trx.rollback(); } }); From 6b11a27291a4f39eda6ce8b7cfde81b85053abaa Mon Sep 17 00:00:00 2001 From: aniketceminds Date: Thu, 4 Dec 2025 21:28:53 +0530 Subject: [PATCH 19/26] buig fx --- .../server/services/confirm/commerce-workflow-service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts b/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts index 29cd9581..12d3cdc1 100644 --- a/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts +++ b/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts @@ -312,7 +312,7 @@ export default ({ strapi }: { strapi: Strapi }) => ({ await onConfirm(message); trx.commit(); } catch (err) { - console.log("err ==>>>>>>", err); + console.log("err ==>>>>>>", JSON.stringify(err.details, null, 2)); trx.rollback(); } }); From eaf9c3e66d3dca106a75f1c512531e31be9bb8a8 Mon Sep 17 00:00:00 2001 From: aniketceminds Date: Thu, 4 Dec 2025 21:32:24 +0530 Subject: [PATCH 20/26] buig fx --- .../server/services/confirm/commerce-workflow-service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts b/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts index 12d3cdc1..133d5327 100644 --- a/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts +++ b/plugins/beckn-bpp-adapter/server/services/confirm/commerce-workflow-service.ts @@ -112,8 +112,8 @@ export default ({ strapi }: { strapi: Strapi }) => ({ order_transaction_id: transaction_id, publishedAt: isoString, domain, - bap_id, - bap_uri, + bap_id: bap_id ? bap_id : "sandbox-retail-np1.com", + bap_uri: bap_uri ? bap_uri : "http://34.93.45.226:8081/bap/receiver", currency: payments?.[0]?.params?.amount || "INR", total_amount: payments?.[0]?.params?.amount || 100, transaction_id: payments?.[0]?.id From 8cbb6d84c1eecf70f8b83d567629dea8465e7782 Mon Sep 17 00:00:00 2001 From: aniketceminds Date: Thu, 4 Dec 2025 21:35:24 +0530 Subject: [PATCH 21/26] buig fx --- plugins/beckn-bpp-adapter/server/mappings/context.jsonata | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/beckn-bpp-adapter/server/mappings/context.jsonata b/plugins/beckn-bpp-adapter/server/mappings/context.jsonata index fa9a4237..0f390cbf 100644 --- a/plugins/beckn-bpp-adapter/server/mappings/context.jsonata +++ b/plugins/beckn-bpp-adapter/server/mappings/context.jsonata @@ -15,8 +15,8 @@ "action": $action, "timestamp": $moment().toISOString(), "version": "1.1.0", - "bap_uri": bap_uri, - "bap_id": bap_id, + "bap_uri": bap_uri ? bap_uri : "http://34.93.45.226:8081/bap/receiver, + "bap_id": bap_id ? bap_id : "sandbox-retail-np1.com", "bpp_id": $env.BPP_ID, "bpp_uri": $env.BPP_URI } From 5dc4f8b68580d476088c7a979d5fff540314102d Mon Sep 17 00:00:00 2001 From: aniketceminds Date: Thu, 4 Dec 2025 21:37:26 +0530 Subject: [PATCH 22/26] buig fx --- plugins/beckn-bpp-adapter/server/mappings/context.jsonata | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/beckn-bpp-adapter/server/mappings/context.jsonata b/plugins/beckn-bpp-adapter/server/mappings/context.jsonata index 0f390cbf..caea65e3 100644 --- a/plugins/beckn-bpp-adapter/server/mappings/context.jsonata +++ b/plugins/beckn-bpp-adapter/server/mappings/context.jsonata @@ -15,8 +15,8 @@ "action": $action, "timestamp": $moment().toISOString(), "version": "1.1.0", - "bap_uri": bap_uri ? bap_uri : "http://34.93.45.226:8081/bap/receiver, - "bap_id": bap_id ? bap_id : "sandbox-retail-np1.com", + "bap_uri": "http://34.93.45.226:8081/bap/receiver, + "bap_id": "sandbox-retail-np1.com", "bpp_id": $env.BPP_ID, "bpp_uri": $env.BPP_URI } From 8e03b48570f3378f6cd29f4d1e63c7e991fc70bf Mon Sep 17 00:00:00 2001 From: aniketceminds Date: Thu, 4 Dec 2025 21:38:32 +0530 Subject: [PATCH 23/26] buig fx --- plugins/beckn-bpp-adapter/server/mappings/context.jsonata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/beckn-bpp-adapter/server/mappings/context.jsonata b/plugins/beckn-bpp-adapter/server/mappings/context.jsonata index caea65e3..146f1396 100644 --- a/plugins/beckn-bpp-adapter/server/mappings/context.jsonata +++ b/plugins/beckn-bpp-adapter/server/mappings/context.jsonata @@ -15,7 +15,7 @@ "action": $action, "timestamp": $moment().toISOString(), "version": "1.1.0", - "bap_uri": "http://34.93.45.226:8081/bap/receiver, + "bap_uri": "http://34.93.45.226:8081/bap/receiver", "bap_id": "sandbox-retail-np1.com", "bpp_id": $env.BPP_ID, "bpp_uri": $env.BPP_URI From f8ec412af7910c03f4630239d203080e15a5eede Mon Sep 17 00:00:00 2001 From: aniketceminds Date: Thu, 4 Dec 2025 21:39:17 +0530 Subject: [PATCH 24/26] buig fx --- plugins/beckn-bpp-adapter/server/mappings/context.jsonata | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/beckn-bpp-adapter/server/mappings/context.jsonata b/plugins/beckn-bpp-adapter/server/mappings/context.jsonata index 146f1396..c2852716 100644 --- a/plugins/beckn-bpp-adapter/server/mappings/context.jsonata +++ b/plugins/beckn-bpp-adapter/server/mappings/context.jsonata @@ -15,8 +15,8 @@ "action": $action, "timestamp": $moment().toISOString(), "version": "1.1.0", - "bap_uri": "http://34.93.45.226:8081/bap/receiver", - "bap_id": "sandbox-retail-np1.com", + "bap_uri": bap_uri ? bap_uri : "http://34.93.45.226:8081/bap/receiver", + "bap_id": bap_id ? bap_id : "sandbox-retail-np1.com", "bpp_id": $env.BPP_ID, "bpp_uri": $env.BPP_URI } From 3f89b7ba44a02f81b9595cb996183701f0d34bd8 Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Fri, 5 Dec 2025 13:27:05 +0530 Subject: [PATCH 25/26] Added: Changes --- plugins/beckn-bpp-adapter/server/tl/tl.helper.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts b/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts index 77b2e8e1..88275760 100644 --- a/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts +++ b/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts @@ -106,7 +106,8 @@ const domainBasePriceNames = { "hospitality:dev": "Room Tariff", "retail:1.1.0:dev": "Base Price", "uei:p2p_trading:dev": "P2P Energy Cost", - "uei:charging:dev": "Cost of Charge" + "uei:charging:dev": "Cost of Charge", + "retail:1.1.0": "Base Price" }; export const quotePrice = async ( From a4fb9e99f55300d91e7826d03d16afdb16bf9435 Mon Sep 17 00:00:00 2001 From: shreyvishal Date: Fri, 5 Dec 2025 13:31:17 +0530 Subject: [PATCH 26/26] Added: Changes --- plugins/beckn-bpp-adapter/server/tl/tl.helper.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts b/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts index 88275760..66feb1d5 100644 --- a/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts +++ b/plugins/beckn-bpp-adapter/server/tl/tl.helper.ts @@ -174,6 +174,8 @@ export const quotePrice = async ( } }); + console.log("Items Final====>", JSON.stringify(items, null, 2)); + // Calculate total priceValue as sum of all breakup.price.value plus any base_fee values const breakupPriceValue = breakup.reduce( (accumulator, currentValue) =>