@things-factory/marketplace-base 4.1.41 → 4.2.2
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.
|
@@ -179,7 +179,9 @@ exports.splitOrdersByBatch = {
|
|
|
179
179
|
.getRepository(entities_1.MarketplaceOrderShipping)
|
|
180
180
|
.find({ where: { domain, orderNoRef: marketplaceOrder.orderNo } });
|
|
181
181
|
marketplaceOrderShippings = marketplaceOrderShippings.map((marketplaceOrderShipping, idx) => {
|
|
182
|
-
return Object.assign(Object.assign({}, marketplaceOrderShipping), { subOrderNoRef:
|
|
182
|
+
return Object.assign(Object.assign({}, marketplaceOrderShipping), { subOrderNoRef: marketplaceOrderShippings.length == 1
|
|
183
|
+
? marketplaceOrderShipping.orderNoRef
|
|
184
|
+
: marketplaceOrderShipping.orderNoRef + ' - ' + (idx + 1) + '/' + marketplaceOrderShippings.length });
|
|
183
185
|
});
|
|
184
186
|
await tx.getRepository(entities_1.MarketplaceOrderShipping).save(marketplaceOrderShippings);
|
|
185
187
|
let newMarketplaceOrder = await tx.getRepository(entities_1.MarketplaceOrder).findOne({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"split-orders-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/split-orders-by-batch.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"split-orders-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/split-orders-by-batch.ts"],"names":[],"mappings":";;;;;;AACA,iDAA0B;AAG1B,qFAA8F;AAI9F,gDAM0B;AAC1B,0CAA4C;AAE/B,QAAA,kBAAkB,GAAG;IAChC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAY;QACxD,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC/C,MAAM,KAAK,GAAQ,OAAO,CAAC,CAAC,CAAC,CAAA;YAC7B,IAAI,gBAAgB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAC,OAAO,CAAC;gBACxF,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;gBACvB,SAAS,EAAE;oBACT,QAAQ;oBACR,kBAAkB;oBAClB,uBAAuB;oBACvB,mDAAmD;iBACpD;aACF,CAAC,CAAA;YACF,IAAI,CAAC,gBAAgB;gBAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;YAE3D,MAAM,gBAAgB,GAAqB,gBAAgB,CAAC,gBAAgB,CAAA;YAE5E,MAAM,gBAAgB,GAAuB,MAAM,EAAE,CAAC,aAAa,CAAC,4CAAkB,CAAC,CAAC,OAAO,CAAC;gBAC9F,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,8BAA8B,EAAE,gBAAgB,EAAE;aAC9E,CAAC,CAAA;YACF,IAAI,CAAC,gBAAgB;gBAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAA;YAExF,MAAM,qBAAqB,GAA2B,gBAAgB,CAAC,qBAAqB,CAAA;YAC5F,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,GAAG,CAAC;gBAC5G,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;YAEhE,IAAI,gCAAgC,GAA6B,MAAM,EAAE;iBACtE,aAAa,CAAC,mCAAwB,CAAC;iBACvC,OAAO,CAAC;gBACP,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,gBAAgB,EAAE;gBAC5G,SAAS,EAAE;oBACT,+BAA+B;oBAC/B,uCAAuC;oBACvC,sDAAsD;oBACtD,oDAAoD;oBACpD,gFAAgF;iBACjF;aACF,CAAC,CAAA;YAEJ,MAAM,qCAAqC,GACzC,gCAAgC,CAAC,6BAA6B,CAAA;YAChE,IAAI,gCAAgC,GAAmC,EAAE,CAAA;YACzE,IAAI,qBAAqB,GAAU,EAAE,CAAA;YAErC,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,qCAAqC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC7E,MAAM,4BAA4B,GAAiC,qCAAqC,CAAC,CAAC,CAAC,CAAA;gBAE3G,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,4BAA4B,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;oBACjE,MAAM,OAAO,mCACR,4BAA4B,KAC/B,GAAG,EAAE,CAAC,GACP,CAAA;oBACD,gCAAgC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBAC/C;aACF;YAED,gCAAgC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBAClD,IACE,CAAC,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,gBAAgB;oBACnE,CAAC,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,gBAAgB;oBAEnE,OAAO,CAAC,CAAC,CAAA;gBACX,IACE,CAAC,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,gBAAgB;oBACnE,CAAC,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,gBAAgB;oBAEnE,OAAO,CAAC,CAAA;gBACV,OAAO,CAAC,CAAA;YACV,CAAC,CAAC,CAAA;YAEF,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,gCAAgC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACxE,IAAI,4BAA4B,GAAiC,gCAAgC,CAAC,CAAC,CAAC,CAAA;gBACpG,MAAM,OAAO,GAAY,4BAA4B,CAAC,OAAO,CAAA;gBAC7D,MAAM,oBAAoB,GAAyB,4BAA4B,CAAC,oBAAoB,CAAA;gBACpG,MAAM,4BAA4B,GAAkC,MAAM,EAAE;qBACzE,aAAa,CAAC,sCAA2B,CAAC;qBAC1C,IAAI,CAAC;oBACJ,KAAK,EAAE,EAAE,MAAM,EAAE,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;oBAC5D,SAAS,EAAE,CAAC,oBAAoB,EAAE,qCAAqC,CAAC;iBACzE,CAAC,CAAA;gBACJ,MAAM,2BAA2B,GAAgC,4BAA4B,CAAC,MAAM,CAClG,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,IAAI,gBAAgB,CAAC,gBAAgB,CAAC,EAAE,CAC1F,CAAC,CAAC,CAAC,CAAA;gBAEJ,IAAI,CAAC,CAAA,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAE,gBAAgB,CAAA;oBAChD,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,YAAY,GAAG,kBAAkB,CAAC,CAAA;gBAEhF,MAAM,gBAAgB,GAAW,UAAU,CAAC,2BAA2B,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;gBAEzG,OAAO,4BAA4B,CAAC,EAAE,CAAA;gBAEtC,IAAI,2BAA2B,GAA6B,IAAI,mCAAwB,EAAE,CAAA;gBAC1F,2BAA2B,CAAC,IAAI,GAAG,mBAAW,CAAC,aAAa,EAAE,CAAA;gBAC9D,2BAA2B,CAAC,QAAQ,GAAG,gCAAgC,CAAC,QAAQ,CAAA;gBAChF,2BAA2B,CAAC,QAAQ,GAAG,gCAAgC,CAAC,QAAQ,CAAA;gBAChF,2BAA2B,CAAC,QAAQ,GAAG,gCAAgC,CAAC,QAAQ,CAAA;gBAChF,2BAA2B,CAAC,QAAQ,GAAG,gCAAgC,CAAC,QAAQ,CAAA;gBAChF,2BAA2B,CAAC,QAAQ,GAAG,gCAAgC,CAAC,QAAQ,CAAA;gBAChF,2BAA2B,CAAC,WAAW,GAAG,gCAAgC,CAAC,WAAW,CAAA;gBACtF,2BAA2B,CAAC,IAAI,GAAG,gCAAgC,CAAC,IAAI,CAAA;gBACxE,2BAA2B,CAAC,OAAO,GAAG,gCAAgC,CAAC,OAAO,CAAA;gBAC9E,2BAA2B,CAAC,QAAQ,GAAG,gCAAgC,CAAC,QAAQ,CAAA;gBAChF,2BAA2B,CAAC,MAAM,GAAG,gCAAgC,CAAC,MAAM,CAAA;gBAC5E,2BAA2B,CAAC,MAAM,GAAG,gCAAgC,CAAC,MAAM,CAAA;gBAC5E,2BAA2B,CAAC,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAA;gBACjE,2BAA2B,CAAC,WAAW,GAAG,gCAAgC,CAAC,WAAW,CAAA;gBACtF,2BAA2B,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;gBAC/D,2BAA2B,CAAC,OAAO,GAAG,IAAI,CAAA;gBAC1C,2BAA2B,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAA;gBAC5D,2BAA2B,CAAC,UAAU,GAAG,IAAI,CAAA;gBAE7C,IAAI,qBAAqB,CAAC,MAAM,IAAI,CAAC,EAAE;oBACrC,2BAA2B,CAAC,WAAW,GAAG,gBAAgB,CAAA;oBAE1D,2BAA2B,GAAG,MAAM,EAAE;yBACnC,aAAa,CAAC,mCAAwB,CAAC;yBACvC,IAAI,CAAC,2BAA2B,CAAC,CAAA;oBAEpC,4BAA4B,CAAC,IAAI,GAAG,IAAA,YAAI,GAAE,CAAA;oBAC1C,4BAA4B,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;oBACxE,4BAA4B,CAAC,wBAAwB,GAAG,2BAA2B,CAAA;oBACnF,4BAA4B,CAAC,OAAO,GAAG,OAAO,CAAA;oBAC9C,4BAA4B,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAA;oBAE7D,IAAI,gBAAgB,GAAQ;wBAC1B,SAAS,EAAE,mBAAM,4BAA4B,EAAG;wBAChD,WAAW,EAAE,gBAAgB;qBAC9B,CAAA;oBACD,qBAAqB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;iBAC7C;qBAAM;oBACL,IAAI,YAAY,GAAQ,qBAAqB,CAAC,qBAAqB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;oBAC/E,IAAI,eAAe,GAAW,UAAU,CAAC,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;oBAC7E,IAAI,eAAe,GAAG,gBAAgB,GAAG,UAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;wBAC3E,qBAAqB,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,GAAG,EAAE,EAAE;4BAC9C,IAAI,GAAG,KAAK,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE;gCAC5C,IAAI,SAAS,GAAU,YAAY,CAAC,SAAS,CAAA;gCAE7C,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,EAAC,QAAQ,EAAC,EAAE;oCACzC,IAAI,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,EAAE;wCACtC,QAAQ,CAAC,GAAG,IAAI,4BAA4B,CAAC,GAAG,CAAA;qCACjD;yCAAM;wCACL,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,OAAO,CAAC,EAAE,CAAC,CAAA;wCACpF,IAAI,CAAC,cAAc,EAAE;4CACnB,4BAA4B,CAAC,IAAI,GAAG,IAAA,YAAI,GAAE,CAAA;4CAC1C,4BAA4B,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;4CACxE,4BAA4B,CAAC,wBAAwB,GAAG,QAAQ,CAAC,wBAAwB,CAAA;4CACzF,4BAA4B,CAAC,OAAO,GAAG,OAAO,CAAA;4CAC9C,4BAA4B,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAA;4CAC7D,YAAY,CAAC,SAAS,CAAC,IAAI,mBAAM,4BAA4B,EAAG,CAAA;yCACjE;qCACF;oCAED,QAAQ,CAAC,wBAAwB,CAAC,WAAW,GAAG,UAAU,CACxD,CAAC,eAAe,GAAG,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAChD,CAAA;oCACD,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAwB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAA;gCAC1F,CAAC,CAAC,CAAA;gCAEF,YAAY,CAAC,WAAW,IAAI,gBAAgB,CAAA;6BAC7C;wBACH,CAAC,CAAC,CAAA;qBACH;yBAAM;wBACL,2BAA2B,CAAC,WAAW,GAAG,gBAAgB,CAAA;wBAE1D,2BAA2B,GAAG,MAAM,EAAE;6BACnC,aAAa,CAAC,mCAAwB,CAAC;6BACvC,IAAI,CAAC,2BAA2B,CAAC,CAAA;wBAEpC,4BAA4B,CAAC,IAAI,GAAG,IAAA,YAAI,GAAE,CAAA;wBAC1C,4BAA4B,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;wBACxE,4BAA4B,CAAC,wBAAwB,GAAG,2BAA2B,CAAA;wBACnF,4BAA4B,CAAC,OAAO,GAAG,OAAO,CAAA;wBAC9C,4BAA4B,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAA;wBAE7D,IAAI,gBAAgB,GAAQ;4BAC1B,SAAS,EAAE,mBAAM,4BAA4B,EAAG;4BAChD,WAAW,EAAE,gBAAgB;yBAC9B,CAAA;wBACD,qBAAqB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;qBAC7C;iBACF;aACF;YAED,IAAI,kCAAkC,GAAmC,EAAE,CAAA;YAC3E,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,qBAAqB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC7D,MAAM,SAAS,GAAU,qBAAqB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;gBAC3D,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACjD,kCAAkC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;iBACtD;aACF;YAED,kCAAkC,GAAG,MAAM,EAAE;iBAC1C,aAAa,CAAC,uCAA4B,CAAC;iBAC3C,IAAI,CAAC,kCAAkC,CAAC,CAAA;YAE3C,MAAM,EAAE;iBACL,aAAa,CAAC,uCAA4B,CAAC;iBAC3C,MAAM,CAAC,qCAAqC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;YAErE,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAwB,CAAC,CAAC,MAAM,CAAC,gCAAgC,CAAC,EAAE,CAAC,CAAA;YAE5F,IAAI,yBAAyB,GAA+B,MAAM,EAAE;iBACjE,aAAa,CAAC,mCAAwB,CAAC;iBACvC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;YAEpE,yBAAyB,GAAG,yBAAyB,CAAC,GAAG,CAAC,CAAC,wBAAwB,EAAE,GAAG,EAAE,EAAE;gBAC1F,uCACK,wBAAwB,KAC3B,aAAa,EACX,yBAAyB,CAAC,MAAM,IAAI,CAAC;wBACnC,CAAC,CAAC,wBAAwB,CAAC,UAAU;wBACrC,CAAC,CAAC,wBAAwB,CAAC,UAAU,GAAG,KAAK,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,GAAG,yBAAyB,CAAC,MAAM,IACvG;YACH,CAAC,CAAC,CAAA;YAEF,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAwB,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;YAEhF,IAAI,mBAAmB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAC,OAAO,CAAC;gBAC3F,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;aACxB,CAAC,CAAA;YACF,mBAAmB,CAAC,UAAU,GAAG,IAAI,CAAA;YACrC,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;SACnE;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/marketplace-base",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.2.2",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -25,9 +25,9 @@
|
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"@things-factory/integration-fulfillment": "^4.1.40",
|
|
28
|
-
"@things-factory/integration-marketplace": "^4.
|
|
29
|
-
"@things-factory/product-base": "^4.
|
|
28
|
+
"@things-factory/integration-marketplace": "^4.2.2",
|
|
29
|
+
"@things-factory/product-base": "^4.2.0",
|
|
30
30
|
"@things-factory/shell": "^4.1.40"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "29a63a11161cd2b9692f9e9aafbf4d34b17a6a7b"
|
|
33
33
|
}
|
|
@@ -226,7 +226,9 @@ export const splitOrdersByBatch = {
|
|
|
226
226
|
return {
|
|
227
227
|
...marketplaceOrderShipping,
|
|
228
228
|
subOrderNoRef:
|
|
229
|
-
|
|
229
|
+
marketplaceOrderShippings.length == 1
|
|
230
|
+
? marketplaceOrderShipping.orderNoRef
|
|
231
|
+
: marketplaceOrderShipping.orderNoRef + ' - ' + (idx + 1) + '/' + marketplaceOrderShippings.length
|
|
230
232
|
}
|
|
231
233
|
})
|
|
232
234
|
|