Merge pull request #73 from Jagannath-Padhy/master

minor fix
ONDC-Official · May 13, 2024 · 900804b · 900804b
2 parents b6dcf7b + b8842a8
commit 900804b
Show file tree

Hide file tree

Showing 26 changed files with 1,468 additions and 945 deletions.
diff --git a/constants/index.ts b/constants/index.ts
@@ -346,7 +346,7 @@ export const retailDomains = [
   'ONDC:RET19',
   'ONDC:RET20',
 ]
-
+export const ROUTING_ENUMS =['P2P', 'P2H2P']
 export const MOB_VEHICLE_CATEGORIES = ['AUTO_RICKSHAW', 'CAB', 'METRO', 'BUS', 'AIRLINE']
 export const ON_DEMAND_VEHICLE = ['AUTO_RICKSHAW', 'CAB']
 export const MOB__DESCRIPTOR_CODES = ['RIDE', 'SJT', 'SESJT', 'RUT', 'PASS', 'SEAT', 'NON STOP', 'CONNECT']

diff --git a/schema/Retail/Cancel/onCancel.ts b/schema/Retail/Cancel/onCancel.ts
@@ -549,7 +549,6 @@ export const onCancelSchema = {
                             required: ['currency', 'value'],
                           },
                         },
-                        required: ['price'],
                       },
                     },
                     required: ['@ondc/org/item_id', '@ondc/org/title_type', 'price'],

diff --git a/schema/Retail/Cancel/on_cancel_rto.ts b/schema/Retail/Cancel/on_cancel_rto.ts
@@ -303,7 +303,7 @@ export const cancel_RTO_Schema = {
                             required: ['locality', 'city', 'area_code', 'state'],
                           },
                         },
-                        required: ['id', 'descriptor', 'gps', 'address'],
+                        required: ['gps', 'address'],
                       },
                       time: {
                         type: 'object',
@@ -443,7 +443,7 @@ export const cancel_RTO_Schema = {
                       properties: {
                         code: {
                           type: 'string',
-                          enum: ['cancel_request', 'igm_request', 'precancel_state', 'quote_trail'],
+                          enum: ['cancel_request', 'igm_request', 'precancel_state', 'quote_trail','routing','tracking'],
                         },
                         list: {
                           type: 'array',
@@ -463,6 +463,10 @@ export const cancel_RTO_Schema = {
                                   'currency',
                                   'value',
                                   'type',
+                                  'gps_enabled',
+                                  'url_enabled',
+                                  'url',
+                                  'subtype'
                                 ],
                               },
                               value: {

diff --git a/schema/Retail/RET/on_search.ts b/schema/Retail/RET/on_search.ts
@@ -613,7 +613,7 @@ export const onSearchSchema = {
                           type: 'boolean',
                         },
                         '@ondc/org/return_window': {
-                          type: 'string',
+                          type: ['string', 'null'],
                           format: 'duration',
                         },
                         '@ondc/org/seller_pickup_return': {
@@ -831,9 +831,10 @@ export const onSearchSchema = {
                                         properties: {
                                           value: {
                                             type: 'string',
-                                            pattern: '^(2[0-3]|[01]?[0-9]|24)[0-5]?[0-9]$',
+                                            pattern: '^([01][0-9]|2[0-3])[0-5][0-9]$',
                                             errorMessage:
                                               "Value for 'time_from' must be a 4-digit numeric value in HHMM format",
+                                              minLength: 4,
                                           },
                                         },
                                         required: ['code', 'value'],

diff --git a/schema/Retail/RET/on_search_inc.ts b/schema/Retail/RET/on_search_inc.ts
@@ -516,9 +516,8 @@ export const onSearchIncSchema = {
                           type: 'boolean',
                         },
                         '@ondc/org/return_window': {
-                          type: 'string',
+                          type: ['string', 'null'],
                           format: 'duration',
-
                         },
                         '@ondc/org/seller_pickup_return': {
                           type: 'boolean',

diff --git a/schema/Retail/RET11/on_search.ts b/schema/Retail/RET11/on_search.ts
@@ -650,7 +650,7 @@ export const FnBonSearchSchema = {
                           type: 'boolean',
                         },
                         '@ondc/org/return_window': {
-                          type: 'string',
+                          type: ['string', 'null'],
                           format: 'duration',
                         },
                         '@ondc/org/seller_pickup_return': {
@@ -901,7 +901,7 @@ export const FnBonSearchSchema = {
                                         properties: {
                                           value: {
                                             type: 'string',
-                                            pattern: '^(2[0-3]|[01]?[0-9]|24)[0-5]?[0-9]$',
+                                            pattern: '^([01][0-9]|2[0-3])[0-5][0-9]$',
                                             errorMessage:
                                               "Value for 'time_from' must be a 4-digit numeric value in HHMM format",
                                           },

diff --git a/schema/Retail/RET11/on_search_inc.ts b/schema/Retail/RET11/on_search_inc.ts
@@ -515,7 +515,7 @@ export const FnBonSearchIncSchema = {
                           type: 'boolean',
                         },
                         '@ondc/org/return_window': {
-                          type: 'string',
+                          type: ['string', 'null'],
                           format: 'duration',
                         },
                         '@ondc/org/seller_pickup_return': {
-Original file line number
+Diff line change
@@ Expand Up / @@ -549,7 +549,6 @@ export const onCancelSchema = { @@
                                 required: ['currency', 'value'],
                               },
                             },
-                            required: ['price'],
                           },
                         },
                         required: ['@ondc/org/item_id', '@ondc/org/title_type', 'price'],
@@ Expand Down @@