@things-factory/marketplace-base 4.1.1 → 4.1.6
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.
- package/dist-server/entities/index.js +13 -10
- package/dist-server/entities/index.js.map +1 -1
- package/dist-server/entities/marketplace-order-item.js +3 -3
- package/dist-server/entities/marketplace-order-item.js.map +1 -1
- package/dist-server/entities/marketplace-order-shipping-item.js +77 -0
- package/dist-server/entities/marketplace-order-shipping-item.js.map +1 -0
- package/dist-server/entities/marketplace-order-shipping.js +6 -2
- package/dist-server/entities/marketplace-order-shipping.js.map +1 -1
- package/dist-server/graphql/resolvers/index.js +1 -0
- package/dist-server/graphql/resolvers/index.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/auto-initialise-logistics-by-batch.js +9 -6
- package/dist-server/graphql/resolvers/marketplace-order/auto-initialise-logistics-by-batch.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/auto-update-order-ready-to-ship.js +10 -5
- package/dist-server/graphql/resolvers/marketplace-order/auto-update-order-ready-to-ship.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/generate-marketplace-order.js +58 -3
- package/dist-server/graphql/resolvers/marketplace-order/generate-marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/get-etrax-order-document.js +3 -2
- package/dist-server/graphql/resolvers/marketplace-order/get-etrax-order-document.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/get-order-document.js +14 -6
- package/dist-server/graphql/resolvers/marketplace-order/get-order-document.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.js +2 -1
- package/dist-server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/initialise-logistics-by-batch.js +2 -0
- package/dist-server/graphql/resolvers/marketplace-order/initialise-logistics-by-batch.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders-for-batch-init.js +3 -2
- package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders-for-batch-init.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders-for-export.js +4 -2
- package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders-for-export.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js +2 -1
- package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/split-orders-by-batch.js +72 -243
- package/dist-server/graphql/resolvers/marketplace-order/split-orders-by-batch.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js +3 -2
- package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js +60 -4
- package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.js +60 -34
- package/dist-server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shipping.js +7 -4
- package/dist-server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shipping.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/create-marketplace-order-shipping-item.js +11 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/create-marketplace-order-shipping-item.js.map +1 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/delete-marketplace-order-shipping-item.js +12 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/delete-marketplace-order-shipping-item.js.map +1 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/delete-marketplace-order-shipping-items.js +15 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/delete-marketplace-order-shipping-items.js.map +1 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/index.js +14 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/index.js.map +1 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/marketplace-order-shipping-item.js +22 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/marketplace-order-shipping-item.js.map +1 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/marketplace-order-shipping-items.js +14 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/marketplace-order-shipping-items.js.map +1 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/update-marketplace-order-shipping-item.js +15 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/update-marketplace-order-shipping-item.js.map +1 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/update-multiple-marketplace-order-shipping-item.js +30 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping-item/update-multiple-marketplace-order-shipping-item.js.map +1 -0
- package/dist-server/graphql/types/index.js +1 -0
- package/dist-server/graphql/types/index.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order/index.js +1 -1
- package/dist-server/graphql/types/marketplace-order/logistics-info.js +1 -0
- package/dist-server/graphql/types/marketplace-order/logistics-info.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order-item/marketplace-order-item.js +1 -1
- package/dist-server/graphql/types/marketplace-order-item/new-marketplace-order-item.js +0 -1
- package/dist-server/graphql/types/marketplace-order-item/new-marketplace-order-item.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.js +0 -1
- package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.js +2 -1
- package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.js +0 -1
- package/dist-server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order-shipping-item/index.js +47 -0
- package/dist-server/graphql/types/marketplace-order-shipping-item/index.js.map +1 -0
- package/dist-server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item-list.js +14 -0
- package/dist-server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item-list.js.map +1 -0
- package/dist-server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item-patch.js +19 -0
- package/dist-server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item-patch.js.map +1 -0
- package/dist-server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item.js +22 -0
- package/dist-server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item.js.map +1 -0
- package/dist-server/graphql/types/marketplace-order-shipping-item/new-marketplace-order-shipping-item.js +18 -0
- package/dist-server/graphql/types/marketplace-order-shipping-item/new-marketplace-order-shipping-item.js.map +1 -0
- package/package.json +6 -6
- package/server/entities/index.ts +15 -12
- package/server/entities/marketplace-order-item.ts +17 -5
- package/server/entities/marketplace-order-shipping-item.ts +55 -0
- package/server/entities/marketplace-order-shipping.ts +9 -3
- package/server/graphql/resolvers/index.ts +1 -0
- package/server/graphql/resolvers/marketplace-order/auto-initialise-logistics-by-batch.ts +9 -6
- package/server/graphql/resolvers/marketplace-order/auto-update-order-ready-to-ship.ts +16 -6
- package/server/graphql/resolvers/marketplace-order/generate-marketplace-order.ts +65 -3
- package/server/graphql/resolvers/marketplace-order/get-etrax-order-document.ts +5 -2
- package/server/graphql/resolvers/marketplace-order/get-order-document.ts +22 -7
- package/server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.ts +4 -2
- package/server/graphql/resolvers/marketplace-order/initialise-logistics-by-batch.ts +2 -0
- package/server/graphql/resolvers/marketplace-order/marketplace-orders-for-batch-init.ts +5 -2
- package/server/graphql/resolvers/marketplace-order/marketplace-orders-for-export.ts +7 -3
- package/server/graphql/resolvers/marketplace-order/marketplace-orders.ts +2 -1
- package/server/graphql/resolvers/marketplace-order/split-orders-by-batch.ts +84 -280
- package/server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts +3 -2
- package/server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts +64 -5
- package/server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.ts +73 -39
- package/server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shipping.ts +9 -4
- package/server/graphql/resolvers/marketplace-order-shipping-item/create-marketplace-order-shipping-item.ts +14 -0
- package/server/graphql/resolvers/marketplace-order-shipping-item/delete-marketplace-order-shipping-item.ts +10 -0
- package/server/graphql/resolvers/marketplace-order-shipping-item/delete-marketplace-order-shipping-items.ts +13 -0
- package/server/graphql/resolvers/marketplace-order-shipping-item/index.ts +20 -0
- package/server/graphql/resolvers/marketplace-order-shipping-item/marketplace-order-shipping-item.ts +21 -0
- package/server/graphql/resolvers/marketplace-order-shipping-item/marketplace-order-shipping-items.ts +16 -0
- package/server/graphql/resolvers/marketplace-order-shipping-item/update-marketplace-order-shipping-item.ts +18 -0
- package/server/graphql/resolvers/marketplace-order-shipping-item/update-multiple-marketplace-order-shipping-item.ts +44 -0
- package/server/graphql/types/index.ts +1 -0
- package/server/graphql/types/marketplace-order/index.ts +1 -1
- package/server/graphql/types/marketplace-order/logistics-info.ts +1 -0
- package/server/graphql/types/marketplace-order-item/marketplace-order-item.ts +1 -1
- package/server/graphql/types/marketplace-order-item/new-marketplace-order-item.ts +0 -1
- package/server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.ts +0 -1
- package/server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.ts +2 -1
- package/server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.ts +0 -1
- package/server/graphql/types/marketplace-order-shipping-item/index.ts +32 -0
- package/server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item-list.ts +8 -0
- package/server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item-patch.ts +13 -0
- package/server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item.ts +16 -0
- package/server/graphql/types/marketplace-order-shipping-item/new-marketplace-order-shipping-item.ts +12 -0
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.marketplaceOrderShippingItemResolver = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
5
|
+
const entities_1 = require("../../../entities");
|
|
6
|
+
exports.marketplaceOrderShippingItemResolver = {
|
|
7
|
+
async marketplaceOrderShippingItem(_, { name }, context) {
|
|
8
|
+
const repository = (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderShippingItem);
|
|
9
|
+
return await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderShippingItem).findOne({
|
|
10
|
+
where: { domain: context.state.domain, name },
|
|
11
|
+
relations: [
|
|
12
|
+
'domain',
|
|
13
|
+
'creator',
|
|
14
|
+
'updater',
|
|
15
|
+
'marketplaceOrderItem',
|
|
16
|
+
'marketplaceOrderItem.marketplaceProductVariation',
|
|
17
|
+
'marketplaceOrderItem.marketplaceProductVariation.marketplaceProduct'
|
|
18
|
+
]
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
//# sourceMappingURL=marketplace-order-shipping-item.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"marketplace-order-shipping-item.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order-shipping-item/marketplace-order-shipping-item.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,gDAAgE;AAEnD,QAAA,oCAAoC,GAAG;IAClD,KAAK,CAAC,4BAA4B,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QAC/D,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,uCAA4B,CAAC,CAAA;QAE9D,OAAO,MAAM,IAAA,uBAAa,EAAC,uCAA4B,CAAC,CAAC,OAAO,CAAC;YAC/D,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE;YAC7C,SAAS,EAAE;gBACT,QAAQ;gBACR,SAAS;gBACT,SAAS;gBACT,sBAAsB;gBACtB,kDAAkD;gBAClD,qEAAqE;aACtE;SACF,CAAC,CAAA;IACJ,CAAC;CACF,CAAA"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.marketplaceOrderShippingItemsResolver = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
5
|
+
const shell_1 = require("@things-factory/shell");
|
|
6
|
+
const entities_1 = require("../../../entities");
|
|
7
|
+
exports.marketplaceOrderShippingItemsResolver = {
|
|
8
|
+
async marketplaceOrderShippingItems(_, params, context) {
|
|
9
|
+
const convertedParams = (0, shell_1.convertListParams)(params);
|
|
10
|
+
const [items, total] = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderShippingItem).findAndCount(Object.assign(Object.assign({}, convertedParams), { relations: ['domain', 'creator', 'updater'] }));
|
|
11
|
+
return { items, total };
|
|
12
|
+
}
|
|
13
|
+
};
|
|
14
|
+
//# sourceMappingURL=marketplace-order-shipping-items.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"marketplace-order-shipping-items.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order-shipping-item/marketplace-order-shipping-items.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,iDAAoE;AAEpE,gDAAgE;AAEnD,QAAA,qCAAqC,GAAG;IACnD,KAAK,CAAC,6BAA6B,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACzE,MAAM,eAAe,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,CAAA;QACjD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,uBAAa,EAAC,uCAA4B,CAAC,CAAC,YAAY,iCAChF,eAAe,KAClB,SAAS,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,IAC3C,CAAA;QACF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.updateMarketplaceOrderShippingItem = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
5
|
+
const entities_1 = require("../../../entities");
|
|
6
|
+
exports.updateMarketplaceOrderShippingItem = {
|
|
7
|
+
async updateMarketplaceOrderShippingItem(_, { name, patch }, context) {
|
|
8
|
+
const repository = (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderShippingItem);
|
|
9
|
+
const marketplaceOrderShippingItem = await repository.findOne({
|
|
10
|
+
where: { domain: context.state.domain, name }
|
|
11
|
+
});
|
|
12
|
+
return await repository.save(Object.assign(Object.assign(Object.assign({}, marketplaceOrderShippingItem), patch), { updater: context.state.user }));
|
|
13
|
+
}
|
|
14
|
+
};
|
|
15
|
+
//# sourceMappingURL=update-marketplace-order-shipping-item.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-marketplace-order-shipping-item.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order-shipping-item/update-marketplace-order-shipping-item.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,gDAAgE;AAEnD,QAAA,kCAAkC,GAAG;IAChD,KAAK,CAAC,kCAAkC,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,OAAY;QAC5E,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,uCAA4B,CAAC,CAAA;QAC9D,MAAM,4BAA4B,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YAC5D,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE;SAC9C,CAAC,CAAA;QAEF,OAAO,MAAM,UAAU,CAAC,IAAI,+CACvB,4BAA4B,GAC5B,KAAK,KACR,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,IAC3B,CAAA;IACJ,CAAC;CACF,CAAA"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.updateMultipleMarketplaceOrderShippingItem = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
5
|
+
const entities_1 = require("../../../entities");
|
|
6
|
+
exports.updateMultipleMarketplaceOrderShippingItem = {
|
|
7
|
+
async updateMultipleMarketplaceOrderShippingItem(_, { patches }, context) {
|
|
8
|
+
let results = [];
|
|
9
|
+
const _createRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === '+');
|
|
10
|
+
const _updateRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === 'M');
|
|
11
|
+
const marketplaceOrderShippingItemRepo = (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderShippingItem);
|
|
12
|
+
if (_createRecords.length > 0) {
|
|
13
|
+
for (let i = 0; i < _createRecords.length; i++) {
|
|
14
|
+
const newRecord = _createRecords[i];
|
|
15
|
+
const result = await marketplaceOrderShippingItemRepo.save(Object.assign(Object.assign({}, newRecord), { domain: context.state.domain, creator: context.state.user, updater: context.state.user }));
|
|
16
|
+
results.push(Object.assign(Object.assign({}, result), { cuFlag: '+' }));
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
if (_updateRecords.length > 0) {
|
|
20
|
+
for (let i = 0; i < _updateRecords.length; i++) {
|
|
21
|
+
const newRecord = _updateRecords[i];
|
|
22
|
+
const marketplaceOrderShippingItem = await marketplaceOrderShippingItemRepo.findOne(newRecord.id);
|
|
23
|
+
const result = await marketplaceOrderShippingItemRepo.save(Object.assign(Object.assign(Object.assign({}, marketplaceOrderShippingItem), newRecord), { updater: context.state.user }));
|
|
24
|
+
results.push(Object.assign(Object.assign({}, result), { cuFlag: 'M' }));
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return results;
|
|
28
|
+
}
|
|
29
|
+
};
|
|
30
|
+
//# sourceMappingURL=update-multiple-marketplace-order-shipping-item.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-multiple-marketplace-order-shipping-item.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order-shipping-item/update-multiple-marketplace-order-shipping-item.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,gDAAgE;AAEnD,QAAA,0CAA0C,GAAG;IACxD,KAAK,CAAC,0CAA0C,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAY;QAChF,IAAI,OAAO,GAAG,EAAE,CAAA;QAChB,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;QACzF,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;QACzF,MAAM,gCAAgC,GAAG,IAAA,uBAAa,EAAC,uCAA4B,CAAC,CAAA;QAEpF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC9C,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;gBAEnC,MAAM,MAAM,GAAG,MAAM,gCAAgC,CAAC,IAAI,iCACrD,SAAS,KACZ,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,EAC5B,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,EAC3B,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,IAC3B,CAAA;gBAEF,OAAO,CAAC,IAAI,iCAAM,MAAM,KAAE,MAAM,EAAE,GAAG,IAAG,CAAA;aACzC;SACF;QAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC9C,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;gBACnC,MAAM,4BAA4B,GAAG,MAAM,gCAAgC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;gBAEjG,MAAM,MAAM,GAAG,MAAM,gCAAgC,CAAC,IAAI,+CACrD,4BAA4B,GAC5B,SAAS,KACZ,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,IAC3B,CAAA;gBAEF,OAAO,CAAC,IAAI,iCAAM,MAAM,KAAE,MAAM,EAAE,GAAG,IAAG,CAAA;aACzC;SACF;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;CACF,CAAA"}
|
|
@@ -22,4 +22,5 @@ __exportStar(require("./store-replenishment-item"), exports);
|
|
|
22
22
|
__exportStar(require("./marketplace-product-variation-price"), exports);
|
|
23
23
|
__exportStar(require("./marketplace-refund-order"), exports);
|
|
24
24
|
__exportStar(require("./marketplace-report"), exports);
|
|
25
|
+
__exportStar(require("./marketplace-order-shipping-item"), exports);
|
|
25
26
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAmC;AACnC,2DAAwC;AACxC,+DAA4C;AAC5C,wDAAqC;AACrC,kEAA+C;AAC/C,iEAA8C;AAC9C,kEAA+C;AAC/C,wDAAqC;AACrC,6DAA0C;AAC1C,wEAAqD;AACrD,6DAA0C;AAC1C,uDAAoC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAmC;AACnC,2DAAwC;AACxC,+DAA4C;AAC5C,wDAAqC;AACrC,kEAA+C;AAC/C,iEAA8C;AAC9C,kEAA+C;AAC/C,wDAAqC;AACrC,6DAA0C;AAC1C,wEAAqD;AACrD,6DAA0C;AAC1C,uDAAoC;AACpC,oEAAiD"}
|
|
@@ -43,7 +43,7 @@ exports.MarketplaceOrderResolver = (0, graphql_tag_1.default) `
|
|
|
43
43
|
toDate: String
|
|
44
44
|
blackListStores: String
|
|
45
45
|
): Boolean
|
|
46
|
-
updateOrderReadyToShip(shippingProvider: String
|
|
46
|
+
updateOrderReadyToShip(shippingProvider: String, deliveryType: String, orderNo: String!): Boolean @transaction
|
|
47
47
|
initialiseLogistics(deliveryType: LogisticsInit, orderNo: String!): Boolean @transaction
|
|
48
48
|
initialiseLogisticsByBatch(patches: [LogisticsInfo]!): Boolean @transaction
|
|
49
49
|
initialiseShopeeLogisticsByBatch(patches: [LogisticsInfo]!): Boolean
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logistics-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order/logistics-info.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,aAAa,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"logistics-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order/logistics-info.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,aAAa,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;CAwB/B,CAAA"}
|
|
@@ -11,8 +11,8 @@ exports.MarketplaceOrderItem = (0, graphql_tag_1.default) `
|
|
|
11
11
|
name: String
|
|
12
12
|
domain: Domain
|
|
13
13
|
marketplaceOrder: MarketplaceOrder
|
|
14
|
+
marketplaceOrderShippingItems: [MarketplaceOrderShippingItem]
|
|
14
15
|
marketplaceProductVariation: MarketplaceProductVariation
|
|
15
|
-
marketplaceOrderShipping: MarketplaceOrderShipping
|
|
16
16
|
orderType: String
|
|
17
17
|
cancelBy: String
|
|
18
18
|
returnStatus: String
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-marketplace-order-item.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-item/new-marketplace-order-item.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,uBAAuB,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"new-marketplace-order-item.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-item/new-marketplace-order-item.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,uBAAuB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;CAczC,CAAA"}
|
package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order-shipping-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,6BAA6B,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"marketplace-order-shipping-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,6BAA6B,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0C/C,CAAA"}
|
|
@@ -12,7 +12,7 @@ exports.MarketplaceOrderShipping = (0, graphql_tag_1.default) `
|
|
|
12
12
|
domain: Domain
|
|
13
13
|
description: String
|
|
14
14
|
marketplaceOrder: MarketplaceOrder
|
|
15
|
-
|
|
15
|
+
marketplaceOrderShippingItems: [MarketplaceOrderShippingItem]
|
|
16
16
|
marketplaceStore: MarketplaceStore
|
|
17
17
|
orderNoRef: String
|
|
18
18
|
subOrderNoRef: String
|
|
@@ -55,6 +55,7 @@ exports.MarketplaceOrderShipping = (0, graphql_tag_1.default) `
|
|
|
55
55
|
sellerShippingFeeVoucher: Float
|
|
56
56
|
releaseOrderId: String
|
|
57
57
|
fulfillmentCenter: FulfillmentCenter
|
|
58
|
+
trackingUrl: String
|
|
58
59
|
updater: User
|
|
59
60
|
creator: User
|
|
60
61
|
updatedAt: String
|
package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,wBAAwB,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,wBAAwB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwD1C,CAAA"}
|
package/dist-server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-marketplace-order-shipping.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,2BAA2B,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"new-marketplace-order-shipping.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,2BAA2B,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyC7C,CAAA"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
|
+
};
|
|
12
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
13
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
14
|
+
};
|
|
15
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.MarketplaceOrderShippingItemResolver = void 0;
|
|
17
|
+
const graphql_tag_1 = __importDefault(require("graphql-tag"));
|
|
18
|
+
__exportStar(require("./marketplace-order-shipping-item"), exports);
|
|
19
|
+
__exportStar(require("./marketplace-order-shipping-item-list"), exports);
|
|
20
|
+
__exportStar(require("./marketplace-order-shipping-item-patch"), exports);
|
|
21
|
+
__exportStar(require("./new-marketplace-order-shipping-item"), exports);
|
|
22
|
+
exports.MarketplaceOrderShippingItemResolver = (0, graphql_tag_1.default) `
|
|
23
|
+
extend type Mutation {
|
|
24
|
+
createMarketplaceOrderShippingItem(
|
|
25
|
+
marketplaceOrderShippingItem: NewMarketplaceOrderShippingItem!
|
|
26
|
+
): MarketplaceOrderShippingItem
|
|
27
|
+
updateMarketplaceOrderShippingItem(
|
|
28
|
+
name: String!
|
|
29
|
+
patch: MarketplaceOrderShippingItemPatch!
|
|
30
|
+
): MarketplaceOrderShippingItem @transaction
|
|
31
|
+
updateMultipleMarketplaceOrderShippingItem(
|
|
32
|
+
patches: [MarketplaceOrderShippingItemPatch]!
|
|
33
|
+
): [MarketplaceOrderShippingItem]
|
|
34
|
+
deleteMarketplaceOrderShippingItem(name: String!): Boolean
|
|
35
|
+
deleteMarketplaceOrderShippingItems(names: [String]!): Boolean
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
extend type Query {
|
|
39
|
+
marketplaceOrderShippingItems(
|
|
40
|
+
filters: [Filter]
|
|
41
|
+
pagination: Pagination
|
|
42
|
+
sortings: [Sorting]
|
|
43
|
+
): MarketplaceOrderShippingItemList
|
|
44
|
+
marketplaceOrderShippingItem(name: String!): MarketplaceOrderShippingItem
|
|
45
|
+
}
|
|
46
|
+
`;
|
|
47
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping-item/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA6B;AAE7B,oEAAiD;AACjD,yEAAsD;AACtD,0EAAuD;AACvD,wEAAqD;AAExC,QAAA,oCAAoC,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;CAwBtD,CAAA"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.MarketplaceOrderShippingItemList = void 0;
|
|
7
|
+
const graphql_tag_1 = __importDefault(require("graphql-tag"));
|
|
8
|
+
exports.MarketplaceOrderShippingItemList = (0, graphql_tag_1.default) `
|
|
9
|
+
type MarketplaceOrderShippingItemList {
|
|
10
|
+
items: [MarketplaceOrderShippingItemList]
|
|
11
|
+
total: Int
|
|
12
|
+
}
|
|
13
|
+
`;
|
|
14
|
+
//# sourceMappingURL=marketplace-order-shipping-item-list.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"marketplace-order-shipping-item-list.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item-list.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gCAAgC,GAAG,IAAA,qBAAG,EAAA;;;;;CAKlD,CAAA"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.MarketplaceOrderShippingItemPatch = void 0;
|
|
7
|
+
const graphql_tag_1 = __importDefault(require("graphql-tag"));
|
|
8
|
+
exports.MarketplaceOrderShippingItemPatch = (0, graphql_tag_1.default) `
|
|
9
|
+
input MarketplaceOrderShippingItemPatch {
|
|
10
|
+
id: String
|
|
11
|
+
name: String
|
|
12
|
+
marketplaceOrderItem: ObjectRef
|
|
13
|
+
marketplaceOrderShipping: ObjectRef
|
|
14
|
+
product: ObjectRef
|
|
15
|
+
qty: Int
|
|
16
|
+
cuFlag: String
|
|
17
|
+
}
|
|
18
|
+
`;
|
|
19
|
+
//# sourceMappingURL=marketplace-order-shipping-item-patch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"marketplace-order-shipping-item-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,iCAAiC,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;CAUnD,CAAA"}
|
package/dist-server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item.js
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.MarketplaceOrderShippingItem = void 0;
|
|
7
|
+
const graphql_tag_1 = __importDefault(require("graphql-tag"));
|
|
8
|
+
exports.MarketplaceOrderShippingItem = (0, graphql_tag_1.default) `
|
|
9
|
+
type MarketplaceOrderShippingItem {
|
|
10
|
+
id: String
|
|
11
|
+
name: String
|
|
12
|
+
marketplaceOrderItem: MarketplaceOrderItem
|
|
13
|
+
marketplaceOrderShipping: MarketplaceOrderShipping
|
|
14
|
+
product: Product
|
|
15
|
+
qty: Int
|
|
16
|
+
updater: User
|
|
17
|
+
creator: User
|
|
18
|
+
updatedAt: String
|
|
19
|
+
createdAt: String
|
|
20
|
+
}
|
|
21
|
+
`;
|
|
22
|
+
//# sourceMappingURL=marketplace-order-shipping-item.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"marketplace-order-shipping-item.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,4BAA4B,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;CAa9C,CAAA"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.NewMarketplaceOrderShippingItem = void 0;
|
|
7
|
+
const graphql_tag_1 = __importDefault(require("graphql-tag"));
|
|
8
|
+
exports.NewMarketplaceOrderShippingItem = (0, graphql_tag_1.default) `
|
|
9
|
+
input NewMarketplaceOrderShippingItem {
|
|
10
|
+
id: String
|
|
11
|
+
name: String
|
|
12
|
+
marketplaceOrderItem: ObjectRef
|
|
13
|
+
marketplaceOrderShipping: ObjectRef
|
|
14
|
+
product: ObjectRef
|
|
15
|
+
qty: Int
|
|
16
|
+
}
|
|
17
|
+
`;
|
|
18
|
+
//# sourceMappingURL=new-marketplace-order-shipping-item.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"new-marketplace-order-shipping-item.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping-item/new-marketplace-order-shipping-item.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,+BAA+B,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;CASjD,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/marketplace-base",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.6",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,10 +24,10 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/integration-fulfillment": "^4.1.
|
|
28
|
-
"@things-factory/integration-marketplace": "^4.1.
|
|
29
|
-
"@things-factory/product-base": "^4.1.
|
|
30
|
-
"@things-factory/shell": "^4.1.
|
|
27
|
+
"@things-factory/integration-fulfillment": "^4.1.6",
|
|
28
|
+
"@things-factory/integration-marketplace": "^4.1.6",
|
|
29
|
+
"@things-factory/product-base": "^4.1.6",
|
|
30
|
+
"@things-factory/shell": "^4.1.6"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "3b0bbe1cd54f9585579fb85c64cce3338b45fa30"
|
|
33
33
|
}
|
package/server/entities/index.ts
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
|
-
import { MarketplaceProductVariationPrice } from './marketplace-product-variation-price'
|
|
2
|
-
import { StoreReplenishment } from './store-replenishment'
|
|
3
|
-
import { StoreReplenishmentItem } from './store-replenishment-item'
|
|
4
1
|
import { MarketplaceOrder } from './marketplace-order'
|
|
5
2
|
import { MarketplaceOrderItem } from './marketplace-order-item'
|
|
6
3
|
import { MarketplaceOrderShipping } from './marketplace-order-shipping'
|
|
4
|
+
import { MarketplaceOrderShippingItem } from './marketplace-order-shipping-item'
|
|
7
5
|
import { MarketplaceProduct } from './marketplace-product'
|
|
8
6
|
import { MarketplaceProductAttribute } from './marketplace-product-attribute'
|
|
9
7
|
import { MarketplaceProductCategory } from './marketplace-product-category'
|
|
10
8
|
import { MarketplaceProductVariation } from './marketplace-product-variation'
|
|
11
|
-
import {
|
|
9
|
+
import { MarketplaceProductVariationPrice } from './marketplace-product-variation-price'
|
|
12
10
|
import { MarketplaceRefundOrder } from './marketplace-refund-order'
|
|
11
|
+
import { MarketplaceRefundOrderItem } from './marketplace-refund-order-item'
|
|
12
|
+
import { StoreReplenishment } from './store-replenishment'
|
|
13
|
+
import { StoreReplenishmentItem } from './store-replenishment-item'
|
|
13
14
|
|
|
14
15
|
export const entities = [
|
|
15
16
|
MarketplaceProductVariationPrice,
|
|
@@ -23,20 +24,22 @@ export const entities = [
|
|
|
23
24
|
MarketplaceOrderItem,
|
|
24
25
|
MarketplaceOrderShipping,
|
|
25
26
|
MarketplaceRefundOrder,
|
|
26
|
-
MarketplaceRefundOrderItem
|
|
27
|
+
MarketplaceRefundOrderItem,
|
|
28
|
+
MarketplaceOrderShippingItem
|
|
27
29
|
]
|
|
28
30
|
|
|
29
31
|
export {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
32
|
+
MarketplaceOrder,
|
|
33
|
+
MarketplaceOrderItem,
|
|
34
|
+
MarketplaceOrderShipping,
|
|
35
|
+
MarketplaceOrderShippingItem,
|
|
33
36
|
MarketplaceProduct,
|
|
34
37
|
MarketplaceProductAttribute,
|
|
35
38
|
MarketplaceProductCategory,
|
|
36
39
|
MarketplaceProductVariation,
|
|
37
|
-
|
|
38
|
-
MarketplaceOrderItem,
|
|
39
|
-
MarketplaceOrderShipping,
|
|
40
|
+
MarketplaceProductVariationPrice,
|
|
40
41
|
MarketplaceRefundOrder,
|
|
41
|
-
MarketplaceRefundOrderItem
|
|
42
|
+
MarketplaceRefundOrderItem,
|
|
43
|
+
StoreReplenishment,
|
|
44
|
+
StoreReplenishmentItem
|
|
42
45
|
}
|
|
@@ -1,9 +1,18 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
Column,
|
|
3
|
+
CreateDateColumn,
|
|
4
|
+
Entity,
|
|
5
|
+
Index,
|
|
6
|
+
ManyToOne,
|
|
7
|
+
OneToMany,
|
|
8
|
+
PrimaryGeneratedColumn,
|
|
9
|
+
UpdateDateColumn
|
|
10
|
+
} from 'typeorm'
|
|
2
11
|
|
|
3
12
|
import { User } from '@things-factory/auth-base'
|
|
4
13
|
import { Domain } from '@things-factory/shell'
|
|
5
14
|
|
|
6
|
-
import { MarketplaceOrder,
|
|
15
|
+
import { MarketplaceOrder, MarketplaceOrderShippingItem, MarketplaceProductVariation } from '../entities'
|
|
7
16
|
|
|
8
17
|
@Entity()
|
|
9
18
|
@Index(
|
|
@@ -24,8 +33,11 @@ export class MarketplaceOrderItem {
|
|
|
24
33
|
@ManyToOne(type => MarketplaceOrder)
|
|
25
34
|
marketplaceOrder: MarketplaceOrder
|
|
26
35
|
|
|
27
|
-
@
|
|
28
|
-
|
|
36
|
+
@OneToMany(
|
|
37
|
+
type => MarketplaceOrderShippingItem,
|
|
38
|
+
marketplaceOrderShippingItem => marketplaceOrderShippingItem.marketplaceOrderItem
|
|
39
|
+
)
|
|
40
|
+
marketplaceOrderShippingItems: MarketplaceOrderShippingItem[]
|
|
29
41
|
|
|
30
42
|
@Column()
|
|
31
43
|
name: string
|
|
@@ -45,7 +57,7 @@ export class MarketplaceOrderItem {
|
|
|
45
57
|
@Column({ type: 'float', nullable: true })
|
|
46
58
|
originalPrice: number
|
|
47
59
|
|
|
48
|
-
@Column({ type: 'float',
|
|
60
|
+
@Column({ type: 'float', nullable: true })
|
|
49
61
|
discount: number
|
|
50
62
|
|
|
51
63
|
@Column({ nullable: true })
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { User } from '@things-factory/auth-base'
|
|
4
|
+
import { Product } from '@things-factory/product-base'
|
|
5
|
+
import { Domain } from '@things-factory/shell'
|
|
6
|
+
|
|
7
|
+
import { MarketplaceOrderItem, MarketplaceOrderShipping } from '../entities'
|
|
8
|
+
|
|
9
|
+
@Entity()
|
|
10
|
+
@Index(
|
|
11
|
+
'ix_marketplace-order-shipping-item_0',
|
|
12
|
+
(marketplaceOrderShippingItem: MarketplaceOrderShippingItem) => [
|
|
13
|
+
marketplaceOrderShippingItem.domain,
|
|
14
|
+
marketplaceOrderShippingItem.name
|
|
15
|
+
],
|
|
16
|
+
{ unique: true }
|
|
17
|
+
)
|
|
18
|
+
export class MarketplaceOrderShippingItem {
|
|
19
|
+
@PrimaryGeneratedColumn('uuid')
|
|
20
|
+
id: string
|
|
21
|
+
|
|
22
|
+
@ManyToOne(type => Domain)
|
|
23
|
+
domain: Domain
|
|
24
|
+
|
|
25
|
+
@ManyToOne(type => MarketplaceOrderItem)
|
|
26
|
+
marketplaceOrderItem: MarketplaceOrderItem
|
|
27
|
+
|
|
28
|
+
@ManyToOne(type => MarketplaceOrderShipping)
|
|
29
|
+
marketplaceOrderShipping: MarketplaceOrderShipping
|
|
30
|
+
|
|
31
|
+
@ManyToOne(type => Product, { nullable: true })
|
|
32
|
+
product: Product
|
|
33
|
+
|
|
34
|
+
@Column()
|
|
35
|
+
name: string
|
|
36
|
+
|
|
37
|
+
@Column({ type: 'int', nullable: true })
|
|
38
|
+
qty: number
|
|
39
|
+
|
|
40
|
+
@CreateDateColumn()
|
|
41
|
+
createdAt: Date
|
|
42
|
+
|
|
43
|
+
@UpdateDateColumn()
|
|
44
|
+
updatedAt: Date
|
|
45
|
+
|
|
46
|
+
@ManyToOne(type => User, {
|
|
47
|
+
nullable: true
|
|
48
|
+
})
|
|
49
|
+
creator: User
|
|
50
|
+
|
|
51
|
+
@ManyToOne(type => User, {
|
|
52
|
+
nullable: true
|
|
53
|
+
})
|
|
54
|
+
updater: User
|
|
55
|
+
}
|
|
@@ -14,7 +14,7 @@ import { FulfillmentCenter } from '@things-factory/integration-fulfillment'
|
|
|
14
14
|
import { MarketplaceStore } from '@things-factory/integration-marketplace'
|
|
15
15
|
import { Domain } from '@things-factory/shell'
|
|
16
16
|
|
|
17
|
-
import {
|
|
17
|
+
import { MarketplaceOrderShippingItem } from '../entities'
|
|
18
18
|
|
|
19
19
|
@Entity()
|
|
20
20
|
@Index(
|
|
@@ -35,8 +35,11 @@ export class MarketplaceOrderShipping {
|
|
|
35
35
|
@Column()
|
|
36
36
|
name: string
|
|
37
37
|
|
|
38
|
-
@OneToMany(
|
|
39
|
-
|
|
38
|
+
@OneToMany(
|
|
39
|
+
type => MarketplaceOrderShippingItem,
|
|
40
|
+
marketplaceOrderShippingItem => marketplaceOrderShippingItem.marketplaceOrderShipping
|
|
41
|
+
)
|
|
42
|
+
marketplaceOrderShippingItems: MarketplaceOrderShippingItem[]
|
|
40
43
|
|
|
41
44
|
@ManyToOne(type => MarketplaceStore)
|
|
42
45
|
marketplaceStore: MarketplaceStore
|
|
@@ -161,6 +164,9 @@ export class MarketplaceOrderShipping {
|
|
|
161
164
|
@ManyToOne(type => FulfillmentCenter, { nullable: true })
|
|
162
165
|
fulfillmentCenter: FulfillmentCenter
|
|
163
166
|
|
|
167
|
+
@Column({ nullable: true })
|
|
168
|
+
trackingUrl: String
|
|
169
|
+
|
|
164
170
|
@CreateDateColumn()
|
|
165
171
|
createdAt: Date
|
|
166
172
|
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export * from './marketplace-order'
|
|
2
2
|
export * from './marketplace-order-item'
|
|
3
3
|
export * from './marketplace-order-shipping'
|
|
4
|
+
export * from './marketplace-order-shipping-item'
|
|
4
5
|
export * from './marketplace-product'
|
|
5
6
|
export * from './marketplace-product-attribute'
|
|
6
7
|
export * from './marketplace-product-category'
|
|
@@ -29,8 +29,9 @@ export const autoInitialiseLogisticsByBatch = {
|
|
|
29
29
|
},
|
|
30
30
|
relations: [
|
|
31
31
|
'marketplaceOrderItems',
|
|
32
|
-
'marketplaceOrderItems.
|
|
33
|
-
'marketplaceOrderItems.marketplaceOrderShipping'
|
|
32
|
+
'marketplaceOrderItems.marketplaceOrderShippingItem',
|
|
33
|
+
'marketplaceOrderItems.marketplaceOrderShippingItem.marketplaceOrderShipping',
|
|
34
|
+
'marketplaceOrderItems.marketplaceProductVariation'
|
|
34
35
|
]
|
|
35
36
|
})
|
|
36
37
|
} else {
|
|
@@ -44,8 +45,9 @@ export const autoInitialiseLogisticsByBatch = {
|
|
|
44
45
|
},
|
|
45
46
|
relations: [
|
|
46
47
|
'marketplaceOrderItems',
|
|
47
|
-
'marketplaceOrderItems.
|
|
48
|
-
'marketplaceOrderItems.marketplaceOrderShipping'
|
|
48
|
+
'marketplaceOrderItems.marketplaceOrderShippingItem',
|
|
49
|
+
'marketplaceOrderItems.marketplaceOrderShippingItem.marketplaceOrderShipping',
|
|
50
|
+
'marketplaceOrderItems.marketplaceProductVariation'
|
|
49
51
|
]
|
|
50
52
|
})
|
|
51
53
|
} else {
|
|
@@ -57,8 +59,9 @@ export const autoInitialiseLogisticsByBatch = {
|
|
|
57
59
|
},
|
|
58
60
|
relations: [
|
|
59
61
|
'marketplaceOrderItems',
|
|
60
|
-
'marketplaceOrderItems.
|
|
61
|
-
'marketplaceOrderItems.marketplaceOrderShipping'
|
|
62
|
+
'marketplaceOrderItems.marketplaceOrderShippingItem',
|
|
63
|
+
'marketplaceOrderItems.marketplaceOrderShippingItem.marketplaceOrderShipping',
|
|
64
|
+
'marketplaceOrderItems.marketplaceProductVariation'
|
|
62
65
|
]
|
|
63
66
|
})
|
|
64
67
|
}
|