@things-factory/operato-hub 4.3.190 → 4.3.192

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/dist-server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.js +32 -19
  2. package/dist-server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.js.map +1 -1
  3. package/dist-server/routers/api/restful-apis/v1/marketplace/get-marketplace-order-shipping-list.js +17 -0
  4. package/dist-server/routers/api/restful-apis/v1/marketplace/get-marketplace-order-shipping-list.js.map +1 -1
  5. package/dist-server/routers/api/restful-apis/v1/utils/params.js +45 -35
  6. package/dist-server/routers/api/restful-apis/v1/utils/params.js.map +1 -1
  7. package/openapi/v1/marketplace.yaml +111 -79
  8. package/package.json +6 -6
  9. package/server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.ts +32 -19
  10. package/server/routers/api/restful-apis/v1/marketplace/get-marketplace-order-shipping-list.ts +17 -0
  11. package/server/routers/api/restful-apis/v1/utils/params.ts +45 -35
package/dist-server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.js CHANGED
@@ -44,6 +44,10 @@ api_1.restfulApiRouter.post('/v1/marketplace/add-marketplace-order', middlewares
44
44
  (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.transporter) === '' ? null : marketplaceOrderShipping.transporter;
45
45
  newMarketplaceOrderShipping.ownTransporter =
46
46
  (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.transporter) === '' ? null : marketplaceOrderShipping.transporter;
47
+ newMarketplaceOrderShipping.trackingNo =
48
+ (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.trackingNo) === '' ? null : marketplaceOrderShipping.trackingNo;
49
+ newMarketplaceOrderShipping.ownTrackingNo =
50
+ (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.trackingNo) === '' ? null : marketplaceOrderShipping.trackingNo;
47
51
  newMarketplaceOrderShipping.marketplaceStore = marketplaceStore;
48
52
  newMarketplaceOrderShipping.orderNoRef = newMarketplaceOrder.orderNo;
49
53
  newMarketplaceOrderShipping.subOrderNoRef = newMarketplaceOrder.orderNo;
@@ -143,25 +147,27 @@ api_1.restfulApiRouter.post('/v1/marketplace/add-marketplace-order', middlewares
143
147
  variationName: item.marketplaceProductVariation.variationName
144
148
  },
145
149
  marketplaceOrderShipping: {
146
- attentionTo: item.marketplaceOrderShipping.attentionTo,
147
- address1: item.marketplaceOrderShipping.address1,
148
- address2: item.marketplaceOrderShipping.address2,
149
- address3: item.marketplaceOrderShipping.address3,
150
- address4: item.marketplaceOrderShipping.address4,
151
- address5: item.marketplaceOrderShipping.address5,
152
- state: item.marketplaceOrderShipping.state,
153
- city: item.marketplaceOrderShipping.city,
154
- postCode: item.marketplaceOrderShipping.postCode,
155
- country: item.marketplaceOrderShipping.country,
156
- phone1: item.marketplaceOrderShipping.phone1,
157
- phone2: item.marketplaceOrderShipping.phone2,
158
- email: item.marketplaceOrderShipping.email,
159
- freightType: item.marketplaceOrderShipping.freightType,
160
- parcelType: item.marketplaceOrderShipping.parcelType,
161
- deliveryMethod: item.marketplaceOrderShipping.deliveryMethod,
162
- totalWeight: item.marketplaceOrderShipping.totalWeight,
163
- totalVolume: item.marketplaceOrderShipping.totalVolume,
164
- transporter: item.marketplaceOrderShipping.transporter
150
+ billingAddress: newMarketplaceOrderShipping.billingAddress,
151
+ attentionTo: newMarketplaceOrderShipping.attentionTo,
152
+ address1: newMarketplaceOrderShipping.address1,
153
+ address2: newMarketplaceOrderShipping.address2,
154
+ address3: newMarketplaceOrderShipping.address3,
155
+ address4: newMarketplaceOrderShipping.address4,
156
+ address5: newMarketplaceOrderShipping.address5,
157
+ state: newMarketplaceOrderShipping.state,
158
+ city: newMarketplaceOrderShipping.city,
159
+ postCode: newMarketplaceOrderShipping.postCode,
160
+ country: newMarketplaceOrderShipping.country,
161
+ phone1: newMarketplaceOrderShipping.phone1,
162
+ phone2: newMarketplaceOrderShipping.phone2,
163
+ email: newMarketplaceOrderShipping.email,
164
+ freightType: newMarketplaceOrderShipping.freightType,
165
+ parcelType: newMarketplaceOrderShipping.parcelType,
166
+ deliveryMethod: newMarketplaceOrderShipping.deliveryMethod,
167
+ totalWeight: newMarketplaceOrderShipping.totalWeight,
168
+ totalVolume: newMarketplaceOrderShipping.totalVolume,
169
+ transporter: newMarketplaceOrderShipping.transporter,
170
+ trackingNo: newMarketplaceOrderShipping.trackingNo
165
171
  }
166
172
  };
167
173
  marketplaceOrderItemsData.push(datapoint);
@@ -170,6 +176,13 @@ api_1.restfulApiRouter.post('/v1/marketplace/add-marketplace-order', middlewares
170
176
  orderNo: newMarketplaceOrder.orderNo,
171
177
  itemCount,
172
178
  paymentMethod: newMarketplaceOrder.paymentMethod,
179
+ paymentStatus: newMarketplaceOrder.paymentStatus,
180
+ payTime: newMarketplaceOrder.payTime,
181
+ totalAmount: newMarketplaceOrder.totalAmount,
182
+ commissionFee: newMarketplaceOrder.commissionFee,
183
+ serviceFee: newMarketplaceOrder.serviceFee,
184
+ transactionFee: newMarketplaceOrder.transactionFee,
185
+ platformFee: newMarketplaceOrder.platformFee,
173
186
  remark: newMarketplaceOrder.remark,
174
187
  giftOption: newMarketplaceOrder.giftOption,
175
188
  orderCreatedAt: newMarketplaceOrder.orderCreatedAt,
package/dist-server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-marketplace-order.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add-marketplace-order.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.ts"],"names":[],"mappings":"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"}
package/dist-server/routers/api/restful-apis/v1/marketplace/get-marketplace-order-shipping-list.js CHANGED
@@ -38,6 +38,7 @@ api_1.restfulApiRouter.get('/v1/marketplace/get-marketplace-order-shipping-list'
38
38
  let data = [];
39
39
  for (const marketplaceOrderShipping of marketplaceOrderShippings) {
40
40
  const datapoint = {
41
+ billingAddress: marketplaceOrderShipping.billingAddress,
41
42
  attentionTo: marketplaceOrderShipping.attentionTo,
42
43
  address1: marketplaceOrderShipping.address1,
43
44
  address2: marketplaceOrderShipping.address2,
@@ -57,7 +58,23 @@ api_1.restfulApiRouter.get('/v1/marketplace/get-marketplace-order-shipping-list'
57
58
  totalWeight: marketplaceOrderShipping.totalWeight,
58
59
  totalVolume: marketplaceOrderShipping.totalVolume,
59
60
  transporter: marketplaceOrderShipping.transporter,
61
+ trackingNo: marketplaceOrderShipping.trackingNo,
60
62
  status: marketplaceOrderShipping.marketplaceOrder.status,
63
+ marketplaceOrder: {
64
+ orderNo: marketplaceOrderShipping.marketplaceOrder.orderNo,
65
+ currency: marketplaceOrderShipping.marketplaceOrder.currency,
66
+ paymentMethod: marketplaceOrderShipping.marketplaceOrder.paymentMethod,
67
+ remark: marketplaceOrderShipping.marketplaceOrder.remark,
68
+ totalAmount: marketplaceOrderShipping.marketplaceOrder.totalAmount,
69
+ payTime: marketplaceOrderShipping.marketplaceOrder.payTime,
70
+ commissionFee: marketplaceOrderShipping.marketplaceOrder.commissionFee,
71
+ serviceFee: marketplaceOrderShipping.marketplaceOrder.serviceFee,
72
+ transactionFee: marketplaceOrderShipping.marketplaceOrder.transactionFee,
73
+ voucherAmount: marketplaceOrderShipping.marketplaceOrder.voucherAmount,
74
+ shippingRebate: marketplaceOrderShipping.marketplaceOrder.shippingRebate,
75
+ platformFee: marketplaceOrderShipping.marketplaceOrder.platformFee,
76
+ paymentStatus: marketplaceOrderShipping.marketplaceOrder.paymentStatus
77
+ },
61
78
  marketplaceStore: {
62
79
  name: marketplaceOrderShipping.marketplaceStore.name,
63
80
  storeId: marketplaceOrderShipping.marketplaceStore.id
package/dist-server/routers/api/restful-apis/v1/marketplace/get-marketplace-order-shipping-list.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get-marketplace-order-shipping-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/marketplace/get-marketplace-order-shipping-list.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,qCAAuC;AAEvC,6CAAgE;AAChE,uEAA6F;AAE7F,gDAA4F;AAC5F,oDAAyF;AAEzF,sBAAM,CAAC,GAAG,CACR,qDAAqD,EACrD,gCAAkB,EAClB,kCAAoB,EACpB,+BAAiB,EACjB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACtB,IAAI;QACF,IAAI,MAAM,qBAAQ,OAAO,CAAC,KAAK,CAAE,CAAA;QACjC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;QAElD,IAAI,EAAE,GAAG,IAAA,uBAAa,EAAC,2CAAwB,CAAC;aAC7C,kBAAkB,CAAC,KAAK,CAAC;aACzB,kBAAkB,CAAC,sBAAsB,EAAE,KAAK,CAAC;aACjD,kBAAkB,CAAC,mCAAmC,EAAE,MAAM,CAAC;aAC/D,kBAAkB,CAAC,2BAA2B,EAAE,KAAK,CAAC;aACtD,kBAAkB,CAAC,iCAAiC,EAAE,KAAK,CAAC;aAC5D,kBAAkB,CAAC,sBAAsB,EAAE,mCAAgB,EAAE,IAAI,EAAE,6BAA6B,CAAC;aACjG,KAAK,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;aACtE,KAAK,CAAC,6CAA6C,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;aAC1E,QAAQ,CAAC,kBAAkB,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;QAEzD,kBAAkB;QAClB,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC;YAAE,EAAE,CAAC,QAAQ,CAAC,wBAAwB,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAA;QACzG,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC;YAAE,EAAE,CAAC,QAAQ,CAAC,8BAA8B,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;QACzG,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC;YAAE,EAAE,CAAC,QAAQ,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;QAE1F,MAAM,CAAC,yBAAyB,EAAE,UAAU,CAAC,GAA+B,MAAM,EAAE;aACjF,KAAK,CAAC,KAAK,CAAC;aACZ,MAAM,CAAC,MAAM,CAAC;aACd,eAAe,EAAE,CAAA;QAEpB,kCAAkC;QAClC,IAAI,IAAI,GAAG,EAAE,CAAA;QACb,KAAK,MAAM,wBAAwB,IAAI,yBAAyB,EAAE;YAChE,MAAM,SAAS,GAAG;gBAChB,WAAW,EAAE,wBAAwB,CAAC,WAAW;gBACjD,QAAQ,EAAE,wBAAwB,CAAC,QAAQ;gBAC3C,QAAQ,EAAE,wBAAwB,CAAC,QAAQ;gBAC3C,QAAQ,EAAE,wBAAwB,CAAC,QAAQ;gBAC3C,QAAQ,EAAE,wBAAwB,CAAC,QAAQ;gBAC3C,QAAQ,EAAE,wBAAwB,CAAC,QAAQ;gBAC3C,KAAK,EAAE,wBAAwB,CAAC,KAAK;gBACrC,IAAI,EAAE,wBAAwB,CAAC,IAAI;gBACnC,QAAQ,EAAE,wBAAwB,CAAC,QAAQ;gBAC3C,OAAO,EAAE,wBAAwB,CAAC,OAAO;gBACzC,MAAM,EAAE,wBAAwB,CAAC,MAAM;gBACvC,MAAM,EAAE,wBAAwB,CAAC,MAAM;gBACvC,KAAK,EAAE,wBAAwB,CAAC,KAAK;gBACrC,WAAW,EAAE,wBAAwB,CAAC,WAAW;gBACjD,UAAU,EAAE,wBAAwB,CAAC,UAAU;gBAC/C,cAAc,EAAE,wBAAwB,CAAC,cAAc;gBACvD,WAAW,EAAE,wBAAwB,CAAC,WAAW;gBACjD,WAAW,EAAE,wBAAwB,CAAC,WAAW;gBACjD,WAAW,EAAE,wBAAwB,CAAC,WAAW;gBACjD,MAAM,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,MAAM;gBACxD,gBAAgB,EAAE;oBAChB,IAAI,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,IAAI;oBACpD,OAAO,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,EAAE;iBACtD;gBACD,qBAAqB,EAAE,wBAAwB,CAAC,6BAA6B,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;oBACxF,OAAO;wBACL,2BAA2B,EAAE;4BAC3B,WAAW,EAAE,KAAK,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,WAAW;4BAC/E,GAAG,EAAE,KAAK,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,GAAG;4BAC/D,YAAY,EAAE,KAAK,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,YAAY;4BACjF,aAAa,EAAE,KAAK,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,IAAI;yBAC3E;wBACD,WAAW,EAAE,KAAK,CAAC,oBAAoB,CAAC,EAAE;wBAC1C,GAAG,EAAE,KAAK,CAAC,oBAAoB,CAAC,GAAG;wBACnC,QAAQ,EAAE,KAAK,CAAC,oBAAoB,CAAC,QAAQ;wBAC7C,YAAY,EAAE,KAAK,CAAC,oBAAoB,CAAC,YAAY;wBACrD,SAAS,EAAE,KAAK,CAAC,oBAAoB,CAAC,SAAS;wBAC/C,MAAM,EAAE,KAAK,CAAC,oBAAoB,CAAC,MAAM;qBAC1C,CAAA;gBACH,CAAC,CAAC;aACH,CAAA;YACD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;SACrB;QAED,OAAO,CAAC,IAAI,GAAG;YACb,IAAI;YACJ,UAAU;YACV,KAAK;YACL,MAAM;SACP,CAAA;KACF;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,YAAY,qBAAQ;YAAE,IAAA,4BAAe,EAAC,OAAO,EAAE,CAAC,CAAC,CAAA;;YACjD,IAAA,qCAAwB,EAAC,OAAO,EAAE,CAAC,CAAC,CAAA;KAC1C;AACH,CAAC,CACF,CAAA"}
1
+ {"version":3,"file":"get-marketplace-order-shipping-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/marketplace/get-marketplace-order-shipping-list.ts"],"names":[],"mappings":"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"}
package/dist-server/routers/api/restful-apis/v1/utils/params.js CHANGED
@@ -41,6 +41,13 @@ exports.params = {
41
41
  'status',
42
42
  'itemCount',
43
43
  'paymentMethod',
44
+ 'paymentStatus',
45
+ 'payTime',
46
+ 'totalAmount',
47
+ 'commissionFee',
48
+ 'serviceFee',
49
+ 'transactionFee',
50
+ 'platformFee',
44
51
  'remark',
45
52
  'giftOption',
46
53
  'orderCreatedAt',
@@ -48,6 +55,7 @@ exports.params = {
48
55
  'marketplaceOrderItems',
49
56
  'marketplaceOrderItems.orderItemId',
50
57
  'marketplaceOrderItems.qty',
58
+ 'marketplaceOrderItems.paidPrice',
51
59
  'marketplaceOrderItems.cancelBy',
52
60
  'marketplaceOrderItems.returnStatus',
53
61
  'marketplaceOrderItems.packageId',
@@ -57,26 +65,28 @@ exports.params = {
57
65
  'marketplaceOrderItems.marketplaceProductVariation.variationSku',
58
66
  'marketplaceOrderItems.marketplaceProductVariation.variationName',
59
67
  'marketplaceOrderItems.marketplaceProductVariation.variationId',
60
- 'marketplaceOrderItems.marketplaceOrderShipping',
61
- 'marketplaceOrderItems.marketplaceOrderShipping.attentionTo',
62
- 'marketplaceOrderItems.marketplaceOrderShipping.address1',
63
- 'marketplaceOrderItems.marketplaceOrderShipping.address2',
64
- 'marketplaceOrderItems.marketplaceOrderShipping.address3',
65
- 'marketplaceOrderItems.marketplaceOrderShipping.address4',
66
- 'marketplaceOrderItems.marketplaceOrderShipping.address5',
67
- 'marketplaceOrderItems.marketplaceOrderShipping.state',
68
- 'marketplaceOrderItems.marketplaceOrderShipping.city',
69
- 'marketplaceOrderItems.marketplaceOrderShipping.postCode',
70
- 'marketplaceOrderItems.marketplaceOrderShipping.country',
71
- 'marketplaceOrderItems.marketplaceOrderShipping.phone1',
72
- 'marketplaceOrderItems.marketplaceOrderShipping.phone2',
73
- 'marketplaceOrderItems.marketplaceOrderShipping.email',
74
- 'marketplaceOrderItems.marketplaceOrderShipping.freightType',
75
- 'marketplaceOrderItems.marketplaceOrderShipping.parcelType',
76
- 'marketplaceOrderItems.marketplaceOrderShipping.deliveryMethod',
77
- 'marketplaceOrderItems.marketplaceOrderShipping.totalWeight',
78
- 'marketplaceOrderItems.marketplaceOrderShipping.totalVolume',
79
- 'marketplaceOrderItems.marketplaceOrderShipping.transporter'
68
+ 'marketplaceOrderShipping',
69
+ 'marketplaceOrderShipping.billingAddress',
70
+ 'marketplaceOrderShipping.attentionTo',
71
+ 'marketplaceOrderShipping.address1',
72
+ 'marketplaceOrderShipping.address2',
73
+ 'marketplaceOrderShipping.address3',
74
+ 'marketplaceOrderShipping.address4',
75
+ 'marketplaceOrderShipping.address5',
76
+ 'marketplaceOrderShipping.state',
77
+ 'marketplaceOrderShipping.city',
78
+ 'marketplaceOrderShipping.postCode',
79
+ 'marketplaceOrderShipping.country',
80
+ 'marketplaceOrderShipping.phone1',
81
+ 'marketplaceOrderShipping.phone2',
82
+ 'marketplaceOrderShipping.email',
83
+ 'marketplaceOrderShipping.freightType',
84
+ 'marketplaceOrderShipping.parcelType',
85
+ 'marketplaceOrderShipping.deliveryMethod',
86
+ 'marketplaceOrderShipping.totalWeight',
87
+ 'marketplaceOrderShipping.totalVolume',
88
+ 'marketplaceOrderShipping.transporter',
89
+ 'marketplaceOrderShipping.trackingNo'
80
90
  ],
81
91
  'cancel-marketplace-order': ['storeId', 'orderNo', 'remark', 'cancelBy'],
82
92
  'update-marketplace-order-delivered': ['storeId', 'orderNo'],
@@ -404,23 +414,23 @@ exports.reqParams = {
404
414
  { name: 'variationSku', required: true, type: 'field' },
405
415
  { name: 'variationName', required: true, type: 'field' }
406
416
  ]
407
- },
408
- {
409
- name: 'marketplaceOrderShipping',
410
- required: true,
411
- type: 'object',
412
- data: [
413
- { name: 'attentionTo', required: true, type: 'field' },
414
- { name: 'address1', required: true, type: 'field' },
415
- { name: 'state', required: true, type: 'field' },
416
- { name: 'city', required: true, type: 'field' },
417
- { name: 'postCode', required: true, type: 'field' },
418
- { name: 'country', required: true, type: 'field' },
419
- { name: 'phone1', required: true, type: 'field' },
420
- { name: 'email', required: true, type: 'field' }
421
- ]
422
417
  }
423
418
  ]
419
+ },
420
+ {
421
+ name: 'marketplaceOrderShipping',
422
+ required: true,
423
+ type: 'object',
424
+ data: [
425
+ { name: 'attentionTo', required: true, type: 'field' },
426
+ { name: 'address1', required: true, type: 'field' },
427
+ { name: 'state', required: true, type: 'field' },
428
+ { name: 'city', required: true, type: 'field' },
429
+ { name: 'postCode', required: true, type: 'field' },
430
+ { name: 'country', required: true, type: 'field' },
431
+ { name: 'phone1', required: true, type: 'field' },
432
+ { name: 'email', required: true, type: 'field' }
433
+ ]
424
434
  }
425
435
  ],
426
436
  'cancel-marketplace-order': [
package/dist-server/routers/api/restful-apis/v1/utils/params.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"params.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/utils/params.ts"],"names":[],"mappings":";;;AAAA,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;AACvC,MAAM,UAAU,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;AAE5B,QAAA,MAAM,GAAG;IACpB,mBAAmB,EAAE,CAAC,GAAG,WAAW,CAAC;IACrC,wBAAwB,EAAE,CAAC,YAAY,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;IAChF,kBAAkB,EAAE,CAAC,YAAY,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;IAC3D,4BAA4B,EAAE,CAAC,GAAG,WAAW,CAAC;IAC9C,qCAAqC,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,GAAG,WAAW,CAAC;IACpH,kBAAkB,EAAE,CAAC,YAAY,EAAE,GAAG,WAAW,CAAC;IAClD,wBAAwB,EAAE,CAAC,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,GAAG,WAAW,CAAC;IAC1F,2BAA2B,EAAE,CAAC,YAAY,EAAE,OAAO,CAAC;IACpD,8BAA8B,EAAE,CAAC,YAAY,EAAE,GAAG,UAAU,EAAE,GAAG,WAAW,CAAC;IAC7E,wBAAwB,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,GAAG,WAAW,CAAC;IACzF,2BAA2B,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC;IACnD,yBAAyB,EAAE,CAAC,YAAY,EAAE,GAAG,UAAU,EAAE,GAAG,WAAW,CAAC;IACxE,2BAA2B,EAAE,CAAC,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,UAAU,EAAE,GAAG,WAAW,CAAC;IAC5F,kCAAkC,EAAE,CAAC,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,UAAU,EAAE,GAAG,WAAW,CAAC;IACnG,oBAAoB,EAAE;QACpB,YAAY;QACZ,MAAM;QACN,aAAa;QACb,aAAa;QACb,OAAO;QACP,KAAK;QACL,OAAO;QACP,gBAAgB;QAChB,WAAW;QACX,SAAS;QACT,UAAU;QACV,MAAM;QACN,OAAO;QACP,UAAU;QACV,MAAM;KACP;IACD,uBAAuB,EAAE;QACvB,SAAS;QACT,SAAS;QACT,QAAQ;QACR,WAAW;QACX,eAAe;QACf,QAAQ;QACR,YAAY;QACZ,gBAAgB;QAChB,gBAAgB;QAChB,uBAAuB;QACvB,mCAAmC;QACnC,2BAA2B;QAC3B,gCAAgC;QAChC,oCAAoC;QACpC,iCAAiC;QACjC,8BAA8B;QAC9B,mDAAmD;QACnD,uDAAuD;QACvD,gEAAgE;QAChE,iEAAiE;QACjE,+DAA+D;QAC/D,gDAAgD;QAChD,4DAA4D;QAC5D,yDAAyD;QACzD,yDAAyD;QACzD,yDAAyD;QACzD,yDAAyD;QACzD,yDAAyD;QACzD,sDAAsD;QACtD,qDAAqD;QACrD,yDAAyD;QACzD,wDAAwD;QACxD,uDAAuD;QACvD,uDAAuD;QACvD,sDAAsD;QACtD,4DAA4D;QAC5D,2DAA2D;QAC3D,+DAA+D;QAC/D,4DAA4D;QAC5D,4DAA4D;QAC5D,4DAA4D;KAC7D;IACD,0BAA0B,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,CAAC;IACxE,oCAAoC,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;IAC5D,0BAA0B,EAAE;QAC1B,SAAS;QACT,qBAAqB;QACrB,4BAA4B;QAC5B,0BAA0B;QAC1B,uCAAuC;QACvC,0BAA0B;QAC1B,iCAAiC;QACjC,2BAA2B;QAC3B,0BAA0B;QAC1B,4BAA4B;QAC5B,8BAA8B;QAC9B,gCAAgC;QAChC,+BAA+B;QAC/B,gCAAgC;QAChC,gCAAgC;QAChC,gCAAgC;QAChC,kDAAkD;QAClD,8DAA8D;QAC9D,+DAA+D;QAC/D,6DAA6D;QAC7D,uDAAuD;QACvD,8DAA8D;QAC9D,sDAAsD;QACtD,uDAAuD;QACvD,2DAA2D;QAC3D,4DAA4D;QAC5D,oEAAoE;QACpE,4DAA4D;QAC5D,qEAAqE;QACrE,6DAA6D;QAC7D,yDAAyD;QACzD,oEAAoE;QACpE,8DAA8D;QAC9D,mEAAmE;QACnE,kEAAkE;QAClE,kEAAkE;QAClE,6DAA6D;KAC9D;IACD,4BAA4B,EAAE;QAC5B,SAAS;QACT,IAAI;QACJ,QAAQ;QACR,MAAM;QACN,mBAAmB;QACnB,MAAM;QACN,aAAa;QACb,OAAO;QACP,MAAM;QACN,QAAQ;QACR,UAAU;QACV,YAAY;QACZ,WAAW;QACX,YAAY;QACZ,YAAY;QACZ,YAAY;QACZ,8BAA8B;QAC9B,0CAA0C;QAC1C,2CAA2C;QAC3C,yCAAyC;QACzC,mCAAmC;QACnC,0CAA0C;QAC1C,kCAAkC;QAClC,mCAAmC;QACnC,uCAAuC;QACvC,wCAAwC;QACxC,gDAAgD;QAChD,wCAAwC;QACxC,iDAAiD;QACjD,yCAAyC;QACzC,qCAAqC;QACrC,gDAAgD;QAChD,0CAA0C;QAC1C,+CAA+C;QAC/C,8CAA8C;QAC9C,8CAA8C;QAC9C,yCAAyC;KAC1C;IACD,cAAc,EAAE;QACd,KAAK;QACL,UAAU;QACV,MAAM;QACN,aAAa;QACb,MAAM;QACN,OAAO;QACP,UAAU;QACV,uBAAuB;QACvB,+BAA+B;QAC/B,sCAAsC;QACtC,uCAAuC;QACvC,iBAAiB;QACjB,kBAAkB;QAClB,WAAW;QACX,gBAAgB;QAChB,0BAA0B;QAC1B,qBAAqB;QACrB,wBAAwB;QACxB,4BAA4B;QAC5B,4BAA4B;QAC5B,oBAAoB;QACpB,yBAAyB;QACzB,0BAA0B;QAC1B,uBAAuB;QACvB,uBAAuB;QACvB,0BAA0B;QAC1B,yBAAyB;QACzB,2BAA2B;QAC3B,2BAA2B;QAC3B,4BAA4B;QAC5B,2BAA2B;QAC3B,sBAAsB;QACtB,sBAAsB;QACtB,uBAAuB;QACvB,uBAAuB;QACvB,yBAAyB;QACzB,0BAA0B;QAC1B,yBAAyB;QACzB,0BAA0B;QAC1B,yBAAyB;QACzB,0BAA0B;QAC1B,yBAAyB;QACzB,0BAA0B;QAC1B,yBAAyB;QACzB,0BAA0B;QAC1B,mCAAmC;KACpC;IACD,mBAAmB,EAAE;QACnB,YAAY;QACZ,OAAO;QACP,QAAQ;QACR,QAAQ;QACR,SAAS;QACT,cAAc;QACd,aAAa;QACb,WAAW;QACX,aAAa;QACb,eAAe;QACf,SAAS;QACT,iBAAiB;QACjB,eAAe;QACf,uBAAuB;QACvB,2BAA2B;QAC3B,2BAA2B;QAC3B,mBAAmB;QACnB,yBAAyB;QACzB,uBAAuB;QACvB,2BAA2B;QAC3B,+BAA+B;QAC/B,2BAA2B;QAC3B,gCAAgC;QAChC,YAAY;KACb;IACD,sBAAsB,EAAE,CAAC,YAAY,EAAE,OAAO,EAAE,QAAQ,CAAC;IACzD,mBAAmB,EAAE;QACnB,YAAY;QACZ,aAAa;QACb,OAAO;QACP,QAAQ;QACR,QAAQ;QACR,MAAM;QACN,aAAa;QACb,YAAY;QACZ,eAAe;QACf,cAAc;QACd,cAAc;QACd,eAAe;QACf,mBAAmB;QACnB,eAAe;QACf,wBAAwB;QACxB,2BAA2B;QAC3B,wBAAwB;QACxB,oBAAoB;QACpB,kBAAkB;QAClB,oCAAoC;QACpC,oCAAoC;QACpC,WAAW;QACX,4BAA4B;QAC5B,4BAA4B;QAC5B,4BAA4B;QAC5B,4BAA4B;QAC5B,4BAA4B;QAC5B,uBAAuB;QACvB,gBAAgB;QAChB,sBAAsB;QACtB,mBAAmB;QACnB,iBAAiB;QACjB,kBAAkB;QAClB,kBAAkB;QAClB,iBAAiB;QACjB,wBAAwB;QACxB,YAAY;QACZ,SAAS;QACT,kBAAkB;QAClB,OAAO;QACP,WAAW;QACX,WAAW;QACX,SAAS;QACT,SAAS;QACT,QAAQ;QACR,QAAQ;QACR,kBAAkB;QAClB,0BAA0B;QAC1B,8BAA8B;QAC9B,kCAAkC;QAClC,8BAA8B;QAC9B,8BAA8B;QAC9B,6BAA6B;QAC7B,+BAA+B;QAC/B,6BAA6B;QAC7B,QAAQ;QACR,QAAQ;QACR,uBAAuB;QACvB,eAAe;QACf,iBAAiB;QACjB,cAAc;QACd,cAAc;QACd,gBAAgB;QAChB,WAAW;QACX,aAAa;QACb,WAAW;KACZ;IACD,sBAAsB,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC;IAC3F,8BAA8B,EAAE;QAC9B,YAAY;QACZ,aAAa;QACb,kBAAkB;QAClB,+BAA+B;QAC/B,mBAAmB;QACnB,oBAAoB;QACpB,oBAAoB;QACpB,oCAAoC;QACpC,4BAA4B;QAC5B,8BAA8B;QAC9B,yBAAyB;QACzB,kBAAkB;QAClB,qBAAqB;QACrB,wBAAwB;QACxB,oBAAoB;QACpB,yBAAyB;QACzB,wBAAwB;QACxB,wBAAwB;QACxB,qBAAqB;QACrB,eAAe;QACf,wBAAwB;QACxB,2BAA2B;QAC3B,wBAAwB;QACxB,oBAAoB;QACpB,kBAAkB;QAClB,oCAAoC;QACpC,oCAAoC;KACrC;IACD,mCAAmC,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,CAAC;CACvG,CAAA;AAEY,QAAA,SAAS,GAAG;IACvB,wBAAwB,EAAE,CAAC,YAAY,CAAC;IACxC,kBAAkB,EAAE,CAAC,YAAY,CAAC;IAClC,qCAAqC,EAAE,CAAC,SAAS,CAAC;IAClD,wBAAwB,EAAE,CAAC,YAAY,CAAC;IACxC,2BAA2B,EAAE,CAAC,YAAY,EAAE,OAAO,CAAC;IACpD,8BAA8B,EAAE,CAAC,YAAY,CAAC;IAC9C,wBAAwB,EAAE,CAAC,YAAY,CAAC;IACxC,2BAA2B,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC;IACnD,yBAAyB,EAAE,CAAC,YAAY,CAAC;IACzC,2BAA2B,EAAE,CAAC,YAAY,CAAC;IAC3C,kCAAkC,EAAE,CAAC,YAAY,CAAC;IAClD,oBAAoB,EAAE;QACpB;YACE,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;KACF;IACD,uBAAuB,EAAE;QACvB;YACE,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,uBAAuB;YAC7B,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;YACb,IAAI,EAAE;gBACJ,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;gBACtD,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;gBAC9C;oBACE,IAAI,EAAE,6BAA6B;oBACnC,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE;wBACJ,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;wBACtD,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;wBACvD,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;qBACzD;iBACF;gBACD;oBACE,IAAI,EAAE,0BAA0B;oBAChC,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE;wBACJ,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;wBACtD,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;wBACnD,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;wBAChD,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;wBAC/C,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;wBACnD,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;wBAClD,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;wBACjD,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;qBACjD;iBACF;aACF;SACF;KACF;IACD,0BAA0B,EAAE;QAC1B,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;QAClD,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;QAClD,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;KAClD;IACD,oCAAoC,EAAE;QACpC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;QAClD,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;KACnD;IACD,0BAA0B,EAAE;QAC1B;YACE,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,qBAAqB;YAC3B,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;YACb,IAAI,EAAE;gBACJ;oBACE,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,OAAO;iBACd;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,OAAO;iBACd;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,OAAO;iBACd;gBACD;oBACE,IAAI,EAAE,8BAA8B;oBACpC,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE;wBACJ;4BACE,IAAI,EAAE,aAAa;4BACnB,QAAQ,EAAE,IAAI;4BACd,IAAI,EAAE,OAAO;yBACd;wBACD;4BACE,IAAI,EAAE,cAAc;4BACpB,QAAQ,EAAE,IAAI;4BACd,IAAI,EAAE,OAAO;yBACd;wBACD;4BACE,IAAI,EAAE,MAAM;4BACZ,QAAQ,EAAE,IAAI;4BACd,IAAI,EAAE,OAAO;yBACd;qBACF;iBACF;aACF;SACF;KACF;IACD,4BAA4B,EAAE;QAC5B;YACE,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,8BAA8B;YACpC,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,OAAO;YACb,IAAI,EAAE;gBACJ;oBACE,IAAI,EAAE,aAAa;oBACnB,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,OAAO;iBACd;aACF;SACF;KACF;IACD,cAAc,EAAE;QACd;YACE,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,gBAAgB;YACtB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;YACb,IAAI,EAAE;gBACJ,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;gBACpD,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;gBAC/C,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;gBACtD,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;gBACtD,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;gBAC9C,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;aACpD;SACF;KACF;IACD,mBAAmB,EAAE;QACnB;YACE,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,eAAe;YACrB,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE;gBACJ,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;gBACnD,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;gBACtD,EAAE,IAAI,EAAE,sBAAsB,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;gBAC/D,EAAE,IAAI,EAAE,sBAAsB,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;aAChE;SACF;QACD;YACE,IAAI,EAAE,kBAAkB;YACxB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;YACb,IAAI,EAAE;gBACJ;oBACE,IAAI,EAAE,SAAS;oBACf,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE;wBACJ;4BACE,IAAI,EAAE,KAAK;4BACX,QAAQ,EAAE,IAAI;4BACd,IAAI,EAAE,OAAO;yBACd;qBACF;iBACF;gBACD;oBACE,IAAI,EAAE,YAAY;oBAClB,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,OAAO;iBACd;aACF;SACF;QACD;YACE,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE;gBACJ;oBACE,IAAI,EAAE,gBAAgB;oBACtB,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,OAAO;iBACd;aACF;SACF;KACF;IACD,mBAAmB,EAAE;QACnB;YACE,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;SACd;QACD;YACE,IAAI,EAAE,eAAe;YACrB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;YACb,IAAI,EAAE;gBACJ;oBACE,IAAI,EAAE,SAAS;oBACf,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,OAAO;iBACd;gBACD;oBACE,IAAI,EAAE,KAAK;oBACX,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,OAAO;iBACd;gBACD;oBACE,IAAI,EAAE,SAAS;oBACf,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE;wBACJ;4BACE,IAAI,EAAE,KAAK;4BACX,QAAQ,EAAE,IAAI;4BACd,IAAI,EAAE,OAAO;yBACd;qBACF;iBACF;aACF;SACF;QACD;YACE,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,OAAO;SACd;KACF;IACD,sBAAsB,EAAE;QACtB,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;QACrD,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;QAChD,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;KAClD;IACD,sBAAsB,EAAE;QACtB,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;QACrD,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;KAClD;IACD,8BAA8B,EAAE;QAC9B,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;QACrD;YACE,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;SACxD;QACD;YACE,IAAI,EAAE,eAAe;YACrB,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE;gBACJ,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;gBACnD,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;gBACtD,EAAE,IAAI,EAAE,sBAAsB,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;gBAC/D,EAAE,IAAI,EAAE,sBAAsB,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;aAChE;SACF;KACF;IACD,mCAAmC,EAAE;QACnC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;QAClD,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;QAClD,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;QACrD,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;KACtD;CACF,CAAA;AAEY,QAAA,4BAA4B,GAAG;IAC1C,wBAAwB;IACxB,2BAA2B;IAC3B,kCAAkC;IAClC,wBAAwB;IACxB,8BAA8B;IAC9B,yBAAyB;IACzB,kBAAkB;IAClB,kBAAkB;IAClB,4BAA4B;IAC5B,qCAAqC;IACrC,wBAAwB;IACxB,mBAAmB;CACpB,CAAA;AAEY,QAAA,2BAA2B,GAAG;IACzC,wBAAwB;IACxB,2BAA2B;IAC3B,wBAAwB;IACxB,8BAA8B;IAC9B,yBAAyB;IACzB,qCAAqC;CACtC,CAAA"}
1
+ {"version":3,"file":"params.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/utils/params.ts"],"names":[],"mappings":"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"}
package/openapi/v1/marketplace.yaml CHANGED
@@ -446,6 +446,32 @@ paths:
446
446
  paymentMethod:
447
447
  type: 'string'
448
448
  example: 'string'
449
+ paymentStatus:
450
+ type: 'string'
451
+ example: 'string'
452
+ payTime:
453
+ type: 'datetime'
454
+ example: '2021-01-14T14:32:15Z'
455
+ totalAmount:
456
+ type: 'integer'
457
+ format: 'double'
458
+ example: 0.00
459
+ commissionFee:
460
+ type: 'integer'
461
+ format: 'double'
462
+ example: 0.00
463
+ serviceFee:
464
+ type: 'integer'
465
+ format: 'double'
466
+ example: 0.00
467
+ transactionFee:
468
+ type: 'integer'
469
+ format: 'double'
470
+ example: 0.00
471
+ platformFee:
472
+ type: 'integer'
473
+ format: 'double'
474
+ example: 0.00
449
475
  remark:
450
476
  type: 'string'
451
477
  example: 'string'
@@ -546,85 +572,91 @@ paths:
546
572
  type: 'string'
547
573
  required: true
548
574
  example: 'string'
549
- marketplaceOrderShipping:
550
- type: 'object'
551
- required:
552
- - 'attentionTo'
553
- - 'address1'
554
- - 'state'
555
- - 'city'
556
- - 'postCode'
557
- - 'country'
558
- - 'phone1'
559
- - 'email'
560
- properties:
561
- attentionTo:
562
- type: 'string'
563
- required: true
564
- example: 'string'
565
- address1:
566
- type: 'string'
567
- required: true
568
- example: 'string'
569
- address2:
570
- type: 'string'
571
- example: 'string'
572
- address3:
573
- type: 'string'
574
- example: 'string'
575
- address4:
576
- type: 'string'
577
- example: 'string'
578
- address5:
579
- type: 'string'
580
- example: 'string'
581
- state:
582
- type: 'string'
583
- required: true
584
- example: 'string'
585
- city:
586
- type: 'string'
587
- required: true
588
- example: 'string'
589
- postCode:
590
- type: 'string'
591
- required: true
592
- example: 'string'
593
- country:
594
- type: 'string'
595
- required: true
596
- example: 'string'
597
- phone1:
598
- type: 'string'
599
- required: true
600
- example: 'string'
601
- phone2:
602
- type:
603
- example: 'string'
604
- email:
605
- type: 'string'
606
- required: true
607
- example: 'string'
608
- freightType:
609
- type: 'string'
610
- example: 'string'
611
- parcelType:
612
- type: 'string'
613
- example: 'string'
614
- deliveryMethod:
615
- type: 'string'
616
- example: 'string'
617
- totalWeight:
618
- type: 'integer'
619
- format: 'double'
620
- example: 1
621
- totalVolume:
622
- type: 'integer'
623
- format: 'double'
624
- example: 1
625
- transporter:
626
- type: 'string'
627
- example: 'string'
575
+ marketplaceOrderShipping:
576
+ type: 'object'
577
+ required:
578
+ - 'attentionTo'
579
+ - 'address1'
580
+ - 'state'
581
+ - 'city'
582
+ - 'postCode'
583
+ - 'country'
584
+ - 'phone1'
585
+ - 'email'
586
+ properties:
587
+ attentionTo:
588
+ type: 'string'
589
+ required: true
590
+ example: 'string'
591
+ address1:
592
+ type: 'string'
593
+ required: true
594
+ example: 'string'
595
+ address2:
596
+ type: 'string'
597
+ example: 'string'
598
+ address3:
599
+ type: 'string'
600
+ example: 'string'
601
+ address4:
602
+ type: 'string'
603
+ example: 'string'
604
+ address5:
605
+ type: 'string'
606
+ example: 'string'
607
+ billingAddress:
608
+ type: 'string'
609
+ example: 'string'
610
+ state:
611
+ type: 'string'
612
+ required: true
613
+ example: 'string'
614
+ city:
615
+ type: 'string'
616
+ required: true
617
+ example: 'string'
618
+ postCode:
619
+ type: 'string'
620
+ required: true
621
+ example: 'string'
622
+ country:
623
+ type: 'string'
624
+ required: true
625
+ example: 'string'
626
+ phone1:
627
+ type: 'string'
628
+ required: true
629
+ example: 'string'
630
+ phone2:
631
+ type:
632
+ example: 'string'
633
+ email:
634
+ type: 'string'
635
+ required: true
636
+ example: 'string'
637
+ freightType:
638
+ type: 'integer'
639
+ example: 0
640
+ parcelType:
641
+ type: 'integer'
642
+ example: 0
643
+ deliveryMethod:
644
+ type: 'integer'
645
+ example: 0
646
+ totalWeight:
647
+ type: 'integer'
648
+ format: 'double'
649
+ example: 1
650
+ totalVolume:
651
+ type: 'integer'
652
+ format: 'double'
653
+ example: 1
654
+ transporter:
655
+ type: 'string'
656
+ example: 'string'
657
+ trackingNo:
658
+ type: 'string'
659
+ example: 'string'
628
660
  responses:
629
661
  '200':
630
662
  description: 'successful operation'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-hub",
3
- "version": "4.3.190",
3
+ "version": "4.3.192",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -85,13 +85,13 @@
85
85
  "@things-factory/integration-sellercraft": "^4.3.190",
86
86
  "@things-factory/integration-sftp": "^4.3.190",
87
87
  "@things-factory/lite-menu": "^4.3.186",
88
- "@things-factory/marketplace-base": "^4.3.190",
88
+ "@things-factory/marketplace-base": "^4.3.191",
89
89
  "@things-factory/more-ui": "^4.3.179",
90
90
  "@things-factory/notification": "^4.3.186",
91
91
  "@things-factory/pdf": "^4.3.159",
92
92
  "@things-factory/product-ui": "^4.3.187",
93
93
  "@things-factory/resource-ui": "^4.3.179",
94
- "@things-factory/sales-base": "^4.3.190",
94
+ "@things-factory/sales-base": "^4.3.191",
95
95
  "@things-factory/scene-data-transform": "^4.3.159",
96
96
  "@things-factory/scene-excel": "^4.3.159",
97
97
  "@things-factory/scene-firebase": "^4.3.159",
@@ -106,8 +106,8 @@
106
106
  "@things-factory/setting-ui": "^4.3.186",
107
107
  "@things-factory/shell": "^4.3.179",
108
108
  "@things-factory/system-ui": "^4.3.179",
109
- "@things-factory/warehouse-base": "^4.3.190",
110
- "@things-factory/worksheet-base": "^4.3.190",
109
+ "@things-factory/warehouse-base": "^4.3.191",
110
+ "@things-factory/worksheet-base": "^4.3.191",
111
111
  "cron-parser": "^4.7.0",
112
112
  "koa2-swagger-ui": "^5.0.2",
113
113
  "swagger-jsdoc": "^5.0.0",
@@ -119,5 +119,5 @@
119
119
  "resolutions": {
120
120
  "core-js": "^3.16.0"
121
121
  },
122
- "gitHead": "9fc85f3d95eeddd2191d156d99fc77bcc81b5071"
122
+ "gitHead": "8bd511b0bd7a109a9f657b0eacac810bf1749230"
123
123
  }
package/server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.ts CHANGED
@@ -63,6 +63,10 @@ router.post(
63
63
  marketplaceOrderShipping?.transporter === '' ? null : marketplaceOrderShipping.transporter
64
64
  newMarketplaceOrderShipping.ownTransporter =
65
65
  marketplaceOrderShipping?.transporter === '' ? null : marketplaceOrderShipping.transporter
66
+ newMarketplaceOrderShipping.trackingNo =
67
+ marketplaceOrderShipping?.trackingNo === '' ? null : marketplaceOrderShipping.trackingNo
68
+ newMarketplaceOrderShipping.ownTrackingNo =
69
+ marketplaceOrderShipping?.trackingNo === '' ? null : marketplaceOrderShipping.trackingNo
66
70
  newMarketplaceOrderShipping.marketplaceStore = marketplaceStore
67
71
  newMarketplaceOrderShipping.orderNoRef = newMarketplaceOrder.orderNo
68
72
  newMarketplaceOrderShipping.subOrderNoRef = newMarketplaceOrder.orderNo
@@ -183,25 +187,27 @@ router.post(
183
187
  variationName: item.marketplaceProductVariation.variationName
184
188
  },
185
189
  marketplaceOrderShipping: {
186
- attentionTo: item.marketplaceOrderShipping.attentionTo,
187
- address1: item.marketplaceOrderShipping.address1,
188
- address2: item.marketplaceOrderShipping.address2,
189
- address3: item.marketplaceOrderShipping.address3,
190
- address4: item.marketplaceOrderShipping.address4,
191
- address5: item.marketplaceOrderShipping.address5,
192
- state: item.marketplaceOrderShipping.state,
193
- city: item.marketplaceOrderShipping.city,
194
- postCode: item.marketplaceOrderShipping.postCode,
195
- country: item.marketplaceOrderShipping.country,
196
- phone1: item.marketplaceOrderShipping.phone1,
197
- phone2: item.marketplaceOrderShipping.phone2,
198
- email: item.marketplaceOrderShipping.email,
199
- freightType: item.marketplaceOrderShipping.freightType,
200
- parcelType: item.marketplaceOrderShipping.parcelType,
201
- deliveryMethod: item.marketplaceOrderShipping.deliveryMethod,
202
- totalWeight: item.marketplaceOrderShipping.totalWeight,
203
- totalVolume: item.marketplaceOrderShipping.totalVolume,
204
- transporter: item.marketplaceOrderShipping.transporter
190
+ billingAddress: newMarketplaceOrderShipping.billingAddress,
191
+ attentionTo: newMarketplaceOrderShipping.attentionTo,
192
+ address1: newMarketplaceOrderShipping.address1,
193
+ address2: newMarketplaceOrderShipping.address2,
194
+ address3: newMarketplaceOrderShipping.address3,
195
+ address4: newMarketplaceOrderShipping.address4,
196
+ address5: newMarketplaceOrderShipping.address5,
197
+ state: newMarketplaceOrderShipping.state,
198
+ city: newMarketplaceOrderShipping.city,
199
+ postCode: newMarketplaceOrderShipping.postCode,
200
+ country: newMarketplaceOrderShipping.country,
201
+ phone1: newMarketplaceOrderShipping.phone1,
202
+ phone2: newMarketplaceOrderShipping.phone2,
203
+ email: newMarketplaceOrderShipping.email,
204
+ freightType: newMarketplaceOrderShipping.freightType,
205
+ parcelType: newMarketplaceOrderShipping.parcelType,
206
+ deliveryMethod: newMarketplaceOrderShipping.deliveryMethod,
207
+ totalWeight: newMarketplaceOrderShipping.totalWeight,
208
+ totalVolume: newMarketplaceOrderShipping.totalVolume,
209
+ transporter: newMarketplaceOrderShipping.transporter,
210
+ trackingNo: newMarketplaceOrderShipping.trackingNo
205
211
  }
206
212
  }
207
213
  marketplaceOrderItemsData.push(datapoint)
@@ -210,6 +216,13 @@ router.post(
210
216
  orderNo: newMarketplaceOrder.orderNo,
211
217
  itemCount,
212
218
  paymentMethod: newMarketplaceOrder.paymentMethod,
219
+ paymentStatus: newMarketplaceOrder.paymentStatus,
220
+ payTime: newMarketplaceOrder.payTime,
221
+ totalAmount: newMarketplaceOrder.totalAmount,
222
+ commissionFee: newMarketplaceOrder.commissionFee,
223
+ serviceFee: newMarketplaceOrder.serviceFee,
224
+ transactionFee: newMarketplaceOrder.transactionFee,
225
+ platformFee: newMarketplaceOrder.platformFee,
213
226
  remark: newMarketplaceOrder.remark,
214
227
  giftOption: newMarketplaceOrder.giftOption,
215
228
  orderCreatedAt: newMarketplaceOrder.orderCreatedAt,
package/server/routers/api/restful-apis/v1/marketplace/get-marketplace-order-shipping-list.ts CHANGED
@@ -42,6 +42,7 @@ router.get(
42
42
  let data = []
43
43
  for (const marketplaceOrderShipping of marketplaceOrderShippings) {
44
44
  const datapoint = {
45
+ billingAddress: marketplaceOrderShipping.billingAddress,
45
46
  attentionTo: marketplaceOrderShipping.attentionTo,
46
47
  address1: marketplaceOrderShipping.address1,
47
48
  address2: marketplaceOrderShipping.address2,
@@ -61,7 +62,23 @@ router.get(
61
62
  totalWeight: marketplaceOrderShipping.totalWeight,
62
63
  totalVolume: marketplaceOrderShipping.totalVolume,
63
64
  transporter: marketplaceOrderShipping.transporter,
65
+ trackingNo: marketplaceOrderShipping.trackingNo,
64
66
  status: marketplaceOrderShipping.marketplaceOrder.status,
67
+ marketplaceOrder: {
68
+ orderNo: marketplaceOrderShipping.marketplaceOrder.orderNo,
69
+ currency: marketplaceOrderShipping.marketplaceOrder.currency,
70
+ paymentMethod: marketplaceOrderShipping.marketplaceOrder.paymentMethod,
71
+ remark: marketplaceOrderShipping.marketplaceOrder.remark,
72
+ totalAmount: marketplaceOrderShipping.marketplaceOrder.totalAmount,
73
+ payTime: marketplaceOrderShipping.marketplaceOrder.payTime,
74
+ commissionFee: marketplaceOrderShipping.marketplaceOrder.commissionFee,
75
+ serviceFee: marketplaceOrderShipping.marketplaceOrder.serviceFee,
76
+ transactionFee: marketplaceOrderShipping.marketplaceOrder.transactionFee,
77
+ voucherAmount: marketplaceOrderShipping.marketplaceOrder.voucherAmount,
78
+ shippingRebate: marketplaceOrderShipping.marketplaceOrder.shippingRebate,
79
+ platformFee: marketplaceOrderShipping.marketplaceOrder.platformFee,
80
+ paymentStatus: marketplaceOrderShipping.marketplaceOrder.paymentStatus
81
+ },
65
82
  marketplaceStore: {
66
83
  name: marketplaceOrderShipping.marketplaceStore.name,
67
84
  storeId: marketplaceOrderShipping.marketplaceStore.id
package/server/routers/api/restful-apis/v1/utils/params.ts CHANGED
@@ -39,6 +39,13 @@ export const params = {
39
39
  'status',
40
40
  'itemCount',
41
41
  'paymentMethod',
42
+ 'paymentStatus',
43
+ 'payTime',
44
+ 'totalAmount',
45
+ 'commissionFee',
46
+ 'serviceFee',
47
+ 'transactionFee',
48
+ 'platformFee',
42
49
  'remark',
43
50
  'giftOption',
44
51
  'orderCreatedAt',
@@ -46,6 +53,7 @@ export const params = {
46
53
  'marketplaceOrderItems',
47
54
  'marketplaceOrderItems.orderItemId',
48
55
  'marketplaceOrderItems.qty',
56
+ 'marketplaceOrderItems.paidPrice',
49
57
  'marketplaceOrderItems.cancelBy',
50
58
  'marketplaceOrderItems.returnStatus',
51
59
  'marketplaceOrderItems.packageId',
@@ -55,26 +63,28 @@ export const params = {
55
63
  'marketplaceOrderItems.marketplaceProductVariation.variationSku',
56
64
  'marketplaceOrderItems.marketplaceProductVariation.variationName',
57
65
  'marketplaceOrderItems.marketplaceProductVariation.variationId',
58
- 'marketplaceOrderItems.marketplaceOrderShipping',
59
- 'marketplaceOrderItems.marketplaceOrderShipping.attentionTo',
60
- 'marketplaceOrderItems.marketplaceOrderShipping.address1',
61
- 'marketplaceOrderItems.marketplaceOrderShipping.address2',
62
- 'marketplaceOrderItems.marketplaceOrderShipping.address3',
63
- 'marketplaceOrderItems.marketplaceOrderShipping.address4',
64
- 'marketplaceOrderItems.marketplaceOrderShipping.address5',
65
- 'marketplaceOrderItems.marketplaceOrderShipping.state',
66
- 'marketplaceOrderItems.marketplaceOrderShipping.city',
67
- 'marketplaceOrderItems.marketplaceOrderShipping.postCode',
68
- 'marketplaceOrderItems.marketplaceOrderShipping.country',
69
- 'marketplaceOrderItems.marketplaceOrderShipping.phone1',
70
- 'marketplaceOrderItems.marketplaceOrderShipping.phone2',
71
- 'marketplaceOrderItems.marketplaceOrderShipping.email',
72
- 'marketplaceOrderItems.marketplaceOrderShipping.freightType',
73
- 'marketplaceOrderItems.marketplaceOrderShipping.parcelType',
74
- 'marketplaceOrderItems.marketplaceOrderShipping.deliveryMethod',
75
- 'marketplaceOrderItems.marketplaceOrderShipping.totalWeight',
76
- 'marketplaceOrderItems.marketplaceOrderShipping.totalVolume',
77
- 'marketplaceOrderItems.marketplaceOrderShipping.transporter'
66
+ 'marketplaceOrderShipping',
67
+ 'marketplaceOrderShipping.billingAddress',
68
+ 'marketplaceOrderShipping.attentionTo',
69
+ 'marketplaceOrderShipping.address1',
70
+ 'marketplaceOrderShipping.address2',
71
+ 'marketplaceOrderShipping.address3',
72
+ 'marketplaceOrderShipping.address4',
73
+ 'marketplaceOrderShipping.address5',
74
+ 'marketplaceOrderShipping.state',
75
+ 'marketplaceOrderShipping.city',
76
+ 'marketplaceOrderShipping.postCode',
77
+ 'marketplaceOrderShipping.country',
78
+ 'marketplaceOrderShipping.phone1',
79
+ 'marketplaceOrderShipping.phone2',
80
+ 'marketplaceOrderShipping.email',
81
+ 'marketplaceOrderShipping.freightType',
82
+ 'marketplaceOrderShipping.parcelType',
83
+ 'marketplaceOrderShipping.deliveryMethod',
84
+ 'marketplaceOrderShipping.totalWeight',
85
+ 'marketplaceOrderShipping.totalVolume',
86
+ 'marketplaceOrderShipping.transporter',
87
+ 'marketplaceOrderShipping.trackingNo'
78
88
  ],
79
89
  'cancel-marketplace-order': ['storeId', 'orderNo', 'remark', 'cancelBy'],
80
90
  'update-marketplace-order-delivered': ['storeId', 'orderNo'],
@@ -403,23 +413,23 @@ export const reqParams = {
403
413
  { name: 'variationSku', required: true, type: 'field' },
404
414
  { name: 'variationName', required: true, type: 'field' }
405
415
  ]
406
- },
407
- {
408
- name: 'marketplaceOrderShipping',
409
- required: true,
410
- type: 'object',
411
- data: [
412
- { name: 'attentionTo', required: true, type: 'field' },
413
- { name: 'address1', required: true, type: 'field' },
414
- { name: 'state', required: true, type: 'field' },
415
- { name: 'city', required: true, type: 'field' },
416
- { name: 'postCode', required: true, type: 'field' },
417
- { name: 'country', required: true, type: 'field' },
418
- { name: 'phone1', required: true, type: 'field' },
419
- { name: 'email', required: true, type: 'field' }
420
- ]
421
416
  }
422
417
  ]
418
+ },
419
+ {
420
+ name: 'marketplaceOrderShipping',
421
+ required: true,
422
+ type: 'object',
423
+ data: [
424
+ { name: 'attentionTo', required: true, type: 'field' },
425
+ { name: 'address1', required: true, type: 'field' },
426
+ { name: 'state', required: true, type: 'field' },
427
+ { name: 'city', required: true, type: 'field' },
428
+ { name: 'postCode', required: true, type: 'field' },
429
+ { name: 'country', required: true, type: 'field' },
430
+ { name: 'phone1', required: true, type: 'field' },
431
+ { name: 'email', required: true, type: 'field' }
432
+ ]
423
433
  }
424
434
  ],
425
435
  'cancel-marketplace-order': [