From ae7997545de8192791273cb33f9a6ebd94412a05 Mon Sep 17 00:00:00 2001 From: navdeep710 Date: Thu, 27 Oct 2022 23:55:36 +0530 Subject: [PATCH] Modified 1) logistics.yaml to 1.0.14 version 2) retail-hyperlocal.yaml to 1.0.17 version --- .../core/v0/api/logistics.yaml | 31 +++++++++---- .../core/v0/api/retail-hyperlocal.yaml | 44 ++++++++++++------- 2 files changed, 50 insertions(+), 25 deletions(-) diff --git a/protocol-specifications/core/v0/api/logistics.yaml b/protocol-specifications/core/v0/api/logistics.yaml index d457210..74b57e5 100644 --- a/protocol-specifications/core/v0/api/logistics.yaml +++ b/protocol-specifications/core/v0/api/logistics.yaml @@ -2,7 +2,7 @@ openapi: 3.0.0 info: title: ONDC Protocol API for logistics description: ONDC Protocol Core API specification. This is an adaptation of Beckn Core version 0.9.3 - version: 1.0.19 + version: 1.0.14 security: - SubscriberAuth: [] - GatewaySubscriberAuth: [] @@ -1798,6 +1798,14 @@ components: Use tags to communicate if order is ready to ship - Order ready to ship - "@ondc/org/order_ready_to_ship" (pass "Yes") + State can have following values - + "Searching for Agent", + "Agent is assigned", + "Agent reached pickup", + "Agent has picked up the order and enroute to drop", + "Agent reached drop location", + "Agent has delivered the order", + "Order is cancelled" type: object properties: id: @@ -2100,6 +2108,13 @@ components: will be created by buyer app in confirm API state: type: string + enum: + - Created + - Out for Delivery + - Delivered + - RTO Initiated + - RTO delivered + - Cancelled provider: type: object properties: @@ -2153,10 +2168,8 @@ components: $ref: '#/components/schemas/Document' billing: $ref: '#/components/schemas/Billing' - fulfillments: - type: array - items: - $ref: "#/components/schemas/Fulfillment" + fulfillment: + $ref: '#/components/schemas/Fulfillment' quote: $ref: '#/components/schemas/Quotation' payment: @@ -2293,17 +2306,17 @@ components: "@ondc/org/collection_amount": description: CoD collection amount type: string - "@ondc/org/settlement_window": + "@ondc/org/cod-settlement_window": description: settlement window in ISO8601 durations format e.g. 'PT48H' indicates T+2 settlement type: string - "@ondc/org/settlement_window_status": + "@ondc/org/cod-settlement_window_status": type: string enum: - Assert - Agree - Disagree - Terminate - "@ondc/org/settlement_details": + "@ondc/org/cod-settlement_details": type: array items: type: object @@ -2683,4 +2696,4 @@ components: energy_type: type: string registration: - type: string + type: string \ No newline at end of file diff --git a/protocol-specifications/core/v0/api/retail-hyperlocal.yaml b/protocol-specifications/core/v0/api/retail-hyperlocal.yaml index c117450..d1ea06f 100644 --- a/protocol-specifications/core/v0/api/retail-hyperlocal.yaml +++ b/protocol-specifications/core/v0/api/retail-hyperlocal.yaml @@ -3,7 +3,7 @@ info: title: ONDC Protocol API for retail (grocery, f&b) description: ONDC Protocol API specification, which includes statutory requirements for packaged commodities and pre-packaged food This is an adaptation of Beckn Core version 0.9.3 - version: 1.0.25 + version: 1.0.17 security: - SubscriberAuth: [] - GatewaySubscriberAuth: [] @@ -1541,14 +1541,14 @@ components: - Packaged Foods - Fruits and Vegetables - F&B - - Home & Decor + - Fashion parent_category_id: type: string description: Unique id of the parent category enum: - Grocery - F&B - - Home & Decor + - Fashion descriptor: $ref: '#/components/schemas/Descriptor' time: @@ -1814,7 +1814,19 @@ components: required: - feedback_id Fulfillment: - description: Describes how a single product/service will be rendered/fulfilled to the end customer + description: Describes how a single product/service will be rendered/fulfilled to the end customer - + (id, type) have the following values - + ("1", "Delivery") + ("2", "Pickup") + ("3", "Delivery and Pickup") + State can have following values - + "Searching for Agent", + "Agent is assigned", + "Agent reached pickup", + "Agent has picked up the order and enroute to drop", + "Agent reached drop location", + "Agent has delivered the order", + "Order is cancelled" type: object properties: id: @@ -1827,7 +1839,6 @@ components: - Delivery - Pickup - Delivery and Pickup - - Reverse QC "@ondc/org/category": type: string description: Fulfillment Category @@ -2006,8 +2017,6 @@ components: - value - maximum_value - currency - quantity: - $ref: '#/components/schemas/ItemQuantity' category_id: $ref: '#/components/schemas/Category/properties/id' fulfillment_id: @@ -2273,6 +2282,15 @@ components: Will be created by buyer app in confirm API state: type: string + enum: + - Created + - Packed + - Shipped + - Out for Delivery + - Delivered + - RTO Initiated + - RTO delivered + - Cancelled provider: type: object properties: @@ -2438,7 +2456,7 @@ components: - Disagree - Terminate "@ondc/org/return_window": - description: return window for withholding amount in ISO8601 durations format e.g. 'PT24H' indicates 24 hour return window + description: return window for the item in ISO8601 durations format e.g. 'PT24H' indicates 24 hour return window type: string "@ondc/org/return_window_status": type: string @@ -2462,7 +2480,7 @@ components: - Disagree - Terminate "@ondc/org/settlement_window": - description: settlement window for the counterparty in ISO8601 durations format e.g. 'PT48H' indicates 48 hour return window + description: return window for the item in ISO8601 durations format e.g. 'PT24H' indicates 24 hour return window type: string "@ondc/org/settlement_window_status": type: string @@ -2479,7 +2497,6 @@ components: settlement_counterparty: type: string enum: - - buyer - buyer-app - seller-app - logistics-provider @@ -2488,9 +2505,6 @@ components: enum: - sale-amount - withholding-amount - - refund - settlement_amount: - type: integer settlement_type: type: string enum: @@ -2673,8 +2687,6 @@ components: - tax - convenience charge - discount - item: - $ref: '#/components/schemas/Item' title: type: string price: @@ -2898,4 +2910,4 @@ components: energy_type: type: string registration: - type: string + type: string \ No newline at end of file