@chevre/domain 21.25.0-alpha.13 → 21.25.0-alpha.14
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/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.js +3 -3
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js +3 -3
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.js +3 -3
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js +3 -3
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.js +3 -3
- package/lib/chevre/service/order/placeOrder.js +4 -5
- package/lib/chevre/service/order/returnOrder.js +2 -2
- package/lib/chevre/service/order/sendOrder.js +3 -3
- package/lib/chevre/service/task/createAccountingReport.js +1 -1
- package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/givePointAward.js +2 -2
- package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/sendEmailMessage.js +3 -3
- package/lib/chevre/service/transaction/placeOrderInProgress/result/orderedItem.d.ts +6 -12
- package/lib/chevre/service/transaction/placeOrderInProgress/result/orderedItem.js +28 -18
- package/lib/chevre/service/transaction/placeOrderInProgress/result.js +1 -15
- package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js +4 -4
- package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPointAward.js +2 -2
- package/lib/chevre/service/transaction/returnOrder/potentialActions/sendEmailMessage.js +2 -2
- package/lib/chevre/service/transaction/returnOrder/potentialActions.js +2 -2
- package/package.json +2 -2
|
@@ -3,7 +3,7 @@ var _a;
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.createNextSendOrderTasks = exports.createInformTasks = void 0;
|
|
5
5
|
const factory = require("../../../../factory");
|
|
6
|
-
|
|
6
|
+
// import { createMaskedCustomer } from '../../../../factory/order';
|
|
7
7
|
const settings_1 = require("../../../../settings");
|
|
8
8
|
const informOrder = (_a = settings_1.settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
|
|
9
9
|
function creteOrder4inform(order) {
|
|
@@ -52,7 +52,7 @@ exports.createInformTasks = createInformTasks;
|
|
|
52
52
|
function createNextSendOrderTasks(params) {
|
|
53
53
|
const now = new Date();
|
|
54
54
|
const taskAttributes = [];
|
|
55
|
-
const maskedCustomer =
|
|
55
|
+
// const maskedCustomer = createMaskedCustomer({ customer: params.order.customer }, { noProfile: true });
|
|
56
56
|
const simpleOrder = {
|
|
57
57
|
typeOf: params.order.typeOf,
|
|
58
58
|
seller: {
|
|
@@ -61,7 +61,7 @@ function createNextSendOrderTasks(params) {
|
|
|
61
61
|
name: params.order.seller.name
|
|
62
62
|
},
|
|
63
63
|
// mask
|
|
64
|
-
customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
|
|
64
|
+
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
65
65
|
orderNumber: params.order.orderNumber,
|
|
66
66
|
price: params.order.price,
|
|
67
67
|
priceCurrency: params.order.priceCurrency,
|
|
@@ -15,7 +15,7 @@ exports.onOrderInTransit = void 0;
|
|
|
15
15
|
*/
|
|
16
16
|
const createDebug = require("debug");
|
|
17
17
|
const factory = require("../../../factory");
|
|
18
|
-
|
|
18
|
+
// import { createMaskedCustomer } from '../../../factory/order';
|
|
19
19
|
const settings_1 = require("../../../settings");
|
|
20
20
|
const debug = createDebug('chevre-domain:service:order');
|
|
21
21
|
function onOrderInTransit(params) {
|
|
@@ -39,7 +39,7 @@ exports.onOrderInTransit = onOrderInTransit;
|
|
|
39
39
|
function createSendOrderTaskIfNotExist(params) {
|
|
40
40
|
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
41
41
|
const now = new Date();
|
|
42
|
-
const maskedCustomer =
|
|
42
|
+
// const maskedCustomer = createMaskedCustomer({ customer: params.order.customer }, { noProfile: true });
|
|
43
43
|
const simpleOrder = {
|
|
44
44
|
typeOf: params.order.typeOf,
|
|
45
45
|
seller: {
|
|
@@ -48,7 +48,7 @@ function createSendOrderTaskIfNotExist(params) {
|
|
|
48
48
|
name: params.order.seller.name
|
|
49
49
|
},
|
|
50
50
|
// mask
|
|
51
|
-
customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
|
|
51
|
+
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
52
52
|
orderNumber: params.order.orderNumber,
|
|
53
53
|
price: params.order.price,
|
|
54
54
|
priceCurrency: params.order.priceCurrency,
|
|
@@ -15,13 +15,13 @@ exports.onOrderPaymentDue = void 0;
|
|
|
15
15
|
*/
|
|
16
16
|
const createDebug = require("debug");
|
|
17
17
|
const factory = require("../../../factory");
|
|
18
|
-
|
|
18
|
+
// import { createMaskedCustomer } from '../../../factory/order';
|
|
19
19
|
const debug = createDebug('chevre-domain:service:order');
|
|
20
20
|
function onOrderPaymentDue(params) {
|
|
21
21
|
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
22
22
|
debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
|
|
23
23
|
let tasks = [];
|
|
24
|
-
const maskedCustomer =
|
|
24
|
+
// const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
|
|
25
25
|
const simpleOrder = {
|
|
26
26
|
typeOf: params.order.typeOf,
|
|
27
27
|
seller: {
|
|
@@ -29,7 +29,7 @@ function onOrderPaymentDue(params) {
|
|
|
29
29
|
typeOf: params.order.seller.typeOf,
|
|
30
30
|
name: params.order.seller.name
|
|
31
31
|
},
|
|
32
|
-
customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
|
|
32
|
+
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
33
33
|
orderNumber: params.order.orderNumber,
|
|
34
34
|
price: params.order.price,
|
|
35
35
|
priceCurrency: params.order.priceCurrency,
|
|
@@ -16,7 +16,7 @@ exports.onOrderProcessing = void 0;
|
|
|
16
16
|
const createDebug = require("debug");
|
|
17
17
|
const util = require("util");
|
|
18
18
|
const factory = require("../../../factory");
|
|
19
|
-
|
|
19
|
+
// import { createMaskedCustomer } from '../../../factory/order';
|
|
20
20
|
const settings_1 = require("../../../settings");
|
|
21
21
|
const createSendEmailMessageTaskIfNotExist_1 = require("./onOrderProcessing/createSendEmailMessageTaskIfNotExist");
|
|
22
22
|
const factory_1 = require("./onOrderProcessing/factory");
|
|
@@ -27,7 +27,7 @@ function onOrderProcessing(params) {
|
|
|
27
27
|
debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
|
|
28
28
|
let tasks = [];
|
|
29
29
|
const sendOrderPotentialActions = (_e = (_d = (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.potentialActions) === null || _d === void 0 ? void 0 : _d.sendOrder) === null || _e === void 0 ? void 0 : _e.potentialActions;
|
|
30
|
-
const maskedCustomer =
|
|
30
|
+
// const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
|
|
31
31
|
const simpleOrder = {
|
|
32
32
|
typeOf: params.order.typeOf,
|
|
33
33
|
seller: {
|
|
@@ -35,7 +35,7 @@ function onOrderProcessing(params) {
|
|
|
35
35
|
typeOf: params.order.seller.typeOf,
|
|
36
36
|
name: params.order.seller.name
|
|
37
37
|
},
|
|
38
|
-
customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
|
|
38
|
+
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
39
39
|
orderNumber: params.order.orderNumber,
|
|
40
40
|
price: params.order.price,
|
|
41
41
|
priceCurrency: params.order.priceCurrency,
|
|
@@ -16,7 +16,7 @@ exports.onOrderReturned = void 0;
|
|
|
16
16
|
const createDebug = require("debug");
|
|
17
17
|
const google_libphonenumber_1 = require("google-libphonenumber");
|
|
18
18
|
const factory = require("../../../factory");
|
|
19
|
-
|
|
19
|
+
// import { createMaskedCustomer } from '../../../factory/order';
|
|
20
20
|
const factory_1 = require("./onOrderReturned/factory");
|
|
21
21
|
const debug = createDebug('chevre-domain:service:order');
|
|
22
22
|
function onOrderReturned(params) {
|
|
@@ -24,7 +24,7 @@ function onOrderReturned(params) {
|
|
|
24
24
|
var _a, _b, _c, _d;
|
|
25
25
|
debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
|
|
26
26
|
let tasks = [];
|
|
27
|
-
const maskedCustomer =
|
|
27
|
+
// const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
|
|
28
28
|
const simpleOrder = {
|
|
29
29
|
typeOf: params.order.typeOf,
|
|
30
30
|
seller: {
|
|
@@ -32,7 +32,7 @@ function onOrderReturned(params) {
|
|
|
32
32
|
typeOf: params.order.seller.typeOf,
|
|
33
33
|
name: params.order.seller.name
|
|
34
34
|
},
|
|
35
|
-
customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
|
|
35
|
+
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
36
36
|
orderNumber: params.order.orderNumber,
|
|
37
37
|
price: params.order.price,
|
|
38
38
|
priceCurrency: params.order.priceCurrency,
|
|
@@ -13,7 +13,6 @@ exports.placeOrderWithoutTransaction = exports.placeOrder = void 0;
|
|
|
13
13
|
const createDebug = require("debug");
|
|
14
14
|
const moment = require("moment");
|
|
15
15
|
const factory = require("../../factory");
|
|
16
|
-
const order_1 = require("../../factory/order");
|
|
17
16
|
const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
|
|
18
17
|
const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
|
|
19
18
|
const debug = createDebug('chevre-domain:service:order');
|
|
@@ -69,7 +68,7 @@ function placeOrderWithoutTransaction(params) {
|
|
|
69
68
|
var _a;
|
|
70
69
|
const order = params.object;
|
|
71
70
|
// アクションを作成する(2022-04-11~)
|
|
72
|
-
const maskedCustomer =
|
|
71
|
+
// const maskedCustomer = createMaskedCustomer(order, { noProfile: true });
|
|
73
72
|
const simpleOrder = {
|
|
74
73
|
typeOf: order.typeOf,
|
|
75
74
|
seller: {
|
|
@@ -77,7 +76,7 @@ function placeOrderWithoutTransaction(params) {
|
|
|
77
76
|
typeOf: order.seller.typeOf,
|
|
78
77
|
name: order.seller.name
|
|
79
78
|
},
|
|
80
|
-
customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
|
|
79
|
+
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
81
80
|
orderNumber: order.orderNumber,
|
|
82
81
|
price: order.price,
|
|
83
82
|
priceCurrency: order.priceCurrency,
|
|
@@ -237,7 +236,7 @@ function placeOrder(params) {
|
|
|
237
236
|
if (order.orderStatus !== factory.orderStatus.OrderPaymentDue) {
|
|
238
237
|
throw new factory.errors.ServiceUnavailable(`orderStatus must be ${factory.orderStatus.OrderPaymentDue}`);
|
|
239
238
|
}
|
|
240
|
-
const maskedCustomer =
|
|
239
|
+
// const maskedCustomer = createMaskedCustomer(order, { noProfile: true });
|
|
241
240
|
const simpleOrder = {
|
|
242
241
|
typeOf: order.typeOf,
|
|
243
242
|
seller: {
|
|
@@ -245,7 +244,7 @@ function placeOrder(params) {
|
|
|
245
244
|
typeOf: order.seller.typeOf,
|
|
246
245
|
name: order.seller.name
|
|
247
246
|
},
|
|
248
|
-
customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
|
|
247
|
+
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
249
248
|
orderNumber: order.orderNumber,
|
|
250
249
|
price: order.price,
|
|
251
250
|
priceCurrency: order.priceCurrency,
|
|
@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.returnOrder = void 0;
|
|
13
13
|
const createDebug = require("debug");
|
|
14
|
-
|
|
14
|
+
// import { createMaskedCustomer } from '../../factory/order';
|
|
15
15
|
const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
|
|
16
16
|
const factory = require("../../factory");
|
|
17
17
|
const debug = createDebug('chevre-domain:service:order');
|
|
@@ -66,7 +66,7 @@ function returnOrder(params) {
|
|
|
66
66
|
typeOf: order.seller.typeOf,
|
|
67
67
|
name: order.seller.name
|
|
68
68
|
},
|
|
69
|
-
customer:
|
|
69
|
+
// customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
|
|
70
70
|
orderNumber: order.orderNumber,
|
|
71
71
|
price: order.price,
|
|
72
72
|
priceCurrency: order.priceCurrency,
|
|
@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.sendOrder = void 0;
|
|
13
13
|
const createDebug = require("debug");
|
|
14
|
-
|
|
14
|
+
// import { createMaskedCustomer } from '../../factory/order';
|
|
15
15
|
const factory_1 = require("../delivery/factory");
|
|
16
16
|
const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
|
|
17
17
|
const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
|
|
@@ -63,7 +63,7 @@ function sendOrder(params) {
|
|
|
63
63
|
if (order.confirmationNumber !== confirmationNumber) {
|
|
64
64
|
throw new factory.errors.NotFound('Order');
|
|
65
65
|
}
|
|
66
|
-
const maskedCustomer =
|
|
66
|
+
// const maskedCustomer = createMaskedCustomer(order, { noProfile: true });
|
|
67
67
|
const simpleOrder = {
|
|
68
68
|
typeOf: order.typeOf,
|
|
69
69
|
seller: {
|
|
@@ -71,7 +71,7 @@ function sendOrder(params) {
|
|
|
71
71
|
typeOf: order.seller.typeOf,
|
|
72
72
|
name: order.seller.name
|
|
73
73
|
},
|
|
74
|
-
customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
|
|
74
|
+
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
75
75
|
orderNumber: order.orderNumber,
|
|
76
76
|
price: order.price,
|
|
77
77
|
priceCurrency: order.priceCurrency,
|
|
@@ -45,7 +45,7 @@ function createAccountingReport(params) {
|
|
|
45
45
|
typeOf: order.seller.typeOf,
|
|
46
46
|
name: order.seller.name
|
|
47
47
|
},
|
|
48
|
-
customer: { typeOf: order.customer.typeOf, id: order.customer.id },
|
|
48
|
+
// customer: { typeOf: order.customer.typeOf, id: order.customer.id }, // 廃止(2024-03-06~)
|
|
49
49
|
orderNumber: order.orderNumber,
|
|
50
50
|
price: order.price,
|
|
51
51
|
priceCurrency: order.priceCurrency,
|
package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/givePointAward.js
CHANGED
|
@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.createGivePointAwardActions = void 0;
|
|
13
13
|
const factory = require("../../../../factory");
|
|
14
|
-
|
|
14
|
+
// import { createMaskedCustomer } from '../../../../factory/order';
|
|
15
15
|
function createGivePointAwardActions(params) {
|
|
16
16
|
var _a;
|
|
17
17
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -27,7 +27,7 @@ function createGivePointAwardActions(params) {
|
|
|
27
27
|
name: params.order.seller.name
|
|
28
28
|
},
|
|
29
29
|
// mask
|
|
30
|
-
customer:
|
|
30
|
+
// customer: createMaskedCustomer(params.order, { noProfile: true }), // 廃止(2024-03-06~)
|
|
31
31
|
orderNumber: params.order.orderNumber,
|
|
32
32
|
price: params.order.price,
|
|
33
33
|
priceCurrency: params.order.priceCurrency,
|
package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/sendEmailMessage.js
CHANGED
|
@@ -12,13 +12,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.createSendEmailMessageActions = void 0;
|
|
13
13
|
const emailMessageBuilder = require("../../../../emailMessageBuilder");
|
|
14
14
|
const factory = require("../../../../factory");
|
|
15
|
-
|
|
15
|
+
// import { createMaskedCustomer } from '../../../../factory/order';
|
|
16
16
|
function createSendEmailMessageActions(params) {
|
|
17
17
|
var _a, _b, _c, _d, _e;
|
|
18
18
|
return __awaiter(this, void 0, void 0, function* () {
|
|
19
19
|
// 注文配送メール送信設定
|
|
20
20
|
const sendEmailMessageActions = [];
|
|
21
|
-
const maskedCustomer =
|
|
21
|
+
// const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
|
|
22
22
|
const sendActionPurpose = {
|
|
23
23
|
typeOf: params.order.typeOf,
|
|
24
24
|
seller: {
|
|
@@ -27,7 +27,7 @@ function createSendEmailMessageActions(params) {
|
|
|
27
27
|
name: params.order.seller.name
|
|
28
28
|
},
|
|
29
29
|
// mask
|
|
30
|
-
customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
|
|
30
|
+
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
31
31
|
orderNumber: params.order.orderNumber,
|
|
32
32
|
price: params.order.price,
|
|
33
33
|
priceCurrency: params.order.priceCurrency,
|
|
@@ -1,16 +1,10 @@
|
|
|
1
1
|
import * as factory from '../../../../factory';
|
|
2
|
-
|
|
2
|
+
/**
|
|
3
|
+
* 受入オファーを注文アイテムに変換する
|
|
4
|
+
*/
|
|
5
|
+
declare function acceptedOffers2orderedItem(params: {
|
|
3
6
|
eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[];
|
|
4
|
-
}): {
|
|
5
|
-
reservationOrderItems: factory.order.IOrderedItem[];
|
|
6
|
-
};
|
|
7
|
-
export declare function createProductItems(params: {
|
|
8
7
|
productAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IPermit>[];
|
|
9
|
-
}): {
|
|
10
|
-
productOrderItems: factory.order.IOrderedItem[];
|
|
11
|
-
};
|
|
12
|
-
export declare function createMoneyTransferAcceptedOffers(__: {
|
|
13
8
|
moneyTransferAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[];
|
|
14
|
-
}):
|
|
15
|
-
|
|
16
|
-
};
|
|
9
|
+
}): factory.order.IOrderedItem[];
|
|
10
|
+
export { acceptedOffers2orderedItem };
|
|
@@ -1,22 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.acceptedOffers2orderedItem = void 0;
|
|
4
4
|
const factory = require("../../../../factory");
|
|
5
|
+
/**
|
|
6
|
+
* 受入オファーを注文アイテムに変換する
|
|
7
|
+
*/
|
|
8
|
+
function acceptedOffers2orderedItem(params) {
|
|
9
|
+
// 予約がある場合
|
|
10
|
+
const { reservationOrderItems } = createReservationAcceptedOffers(params);
|
|
11
|
+
// 通貨転送がある場合
|
|
12
|
+
const { moneyTransferOrderItems } = createMoneyTransferAcceptedOffers(params);
|
|
13
|
+
// プロダクトがある場合
|
|
14
|
+
const { productOrderItems } = createProductItems(params);
|
|
15
|
+
return [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
|
|
16
|
+
}
|
|
17
|
+
exports.acceptedOffers2orderedItem = acceptedOffers2orderedItem;
|
|
5
18
|
function createReservationAcceptedOffers(params) {
|
|
6
19
|
const orderedItems = [];
|
|
7
20
|
const eventIds = [];
|
|
8
21
|
params.eventReservationAcceptedOffers.forEach(({ itemOffered }) => {
|
|
9
|
-
//
|
|
22
|
+
// reservationFor.id単位でユニーク化
|
|
10
23
|
const reservationFor = itemOffered.reservationFor;
|
|
11
24
|
const issuedThrough = itemOffered.issuedThrough;
|
|
12
|
-
if (typeof
|
|
13
|
-
|
|
14
|
-
|
|
25
|
+
if (typeof reservationFor.id !== 'string' || reservationFor.id.length === 0) {
|
|
26
|
+
throw new factory.errors.NotFound('acceptedOffers.itemOffered.reservationFor.id');
|
|
27
|
+
}
|
|
28
|
+
if (typeof issuedThrough.typeOf === 'string') {
|
|
29
|
+
if (!eventIds.includes(reservationFor.id)) {
|
|
30
|
+
eventIds.push(reservationFor.id);
|
|
15
31
|
const orderedItem = reservationOffers2orderedItem({ reservationFor, issuedThrough });
|
|
16
|
-
orderedItems.push({
|
|
17
|
-
typeOf: 'OrderItem',
|
|
18
|
-
orderedItem
|
|
19
|
-
});
|
|
32
|
+
orderedItems.push({ typeOf: 'OrderItem', orderedItem });
|
|
20
33
|
}
|
|
21
34
|
}
|
|
22
35
|
});
|
|
@@ -24,18 +37,17 @@ function createReservationAcceptedOffers(params) {
|
|
|
24
37
|
reservationOrderItems: orderedItems
|
|
25
38
|
};
|
|
26
39
|
}
|
|
27
|
-
exports.createReservationAcceptedOffers = createReservationAcceptedOffers;
|
|
28
40
|
function reservationOffers2orderedItem(params) {
|
|
29
|
-
var _a, _b
|
|
41
|
+
var _a, _b;
|
|
30
42
|
const reservationFor = params.reservationFor;
|
|
31
43
|
const issuedThrough = params.issuedThrough;
|
|
32
44
|
if (reservationFor.typeOf === factory.eventType.ScreeningEvent
|
|
33
45
|
&& issuedThrough.typeOf === factory.product.ProductType.EventService) {
|
|
34
46
|
const reservationFor4orderedItem = {
|
|
35
47
|
location: {
|
|
36
|
-
branchCode:
|
|
37
|
-
name:
|
|
38
|
-
typeOf:
|
|
48
|
+
branchCode: reservationFor.location.branchCode,
|
|
49
|
+
name: reservationFor.location.name,
|
|
50
|
+
typeOf: reservationFor.location.typeOf
|
|
39
51
|
},
|
|
40
52
|
typeOf: reservationFor.typeOf,
|
|
41
53
|
id: reservationFor.id,
|
|
@@ -43,7 +55,7 @@ function reservationOffers2orderedItem(params) {
|
|
|
43
55
|
startDate: reservationFor.startDate,
|
|
44
56
|
endDate: reservationFor.endDate
|
|
45
57
|
};
|
|
46
|
-
return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf }, (typeof ((
|
|
58
|
+
return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf, id: issuedThrough.id }, (typeof ((_a = issuedThrough.serviceType) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
|
|
47
59
|
? { serviceType: issuedThrough.serviceType }
|
|
48
60
|
: undefined), { serviceOutput: {
|
|
49
61
|
typeOf: factory.reservationType.EventReservation,
|
|
@@ -58,7 +70,7 @@ function reservationOffers2orderedItem(params) {
|
|
|
58
70
|
departureTime: reservationFor.departureTime,
|
|
59
71
|
arrivalTime: reservationFor.arrivalTime
|
|
60
72
|
};
|
|
61
|
-
return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf }, (typeof ((
|
|
73
|
+
return Object.assign(Object.assign({ typeOf: issuedThrough.typeOf, id: issuedThrough.id }, (typeof ((_b = issuedThrough.serviceType) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
|
|
62
74
|
? { serviceType: issuedThrough.serviceType }
|
|
63
75
|
: undefined), { serviceOutput: {
|
|
64
76
|
typeOf: factory.reservationType.ReservationPackage,
|
|
@@ -92,11 +104,9 @@ function createProductItems(params) {
|
|
|
92
104
|
productOrderItems: orderedItems
|
|
93
105
|
};
|
|
94
106
|
}
|
|
95
|
-
exports.createProductItems = createProductItems;
|
|
96
107
|
function createMoneyTransferAcceptedOffers(__) {
|
|
97
108
|
const orderedItems = [];
|
|
98
109
|
return {
|
|
99
110
|
moneyTransferOrderItems: orderedItems
|
|
100
111
|
};
|
|
101
112
|
}
|
|
102
|
-
exports.createMoneyTransferAcceptedOffers = createMoneyTransferAcceptedOffers;
|
|
@@ -10,21 +10,7 @@ function createOrder(params) {
|
|
|
10
10
|
var _a;
|
|
11
11
|
const seller = createSeller({ transaction: params.transaction });
|
|
12
12
|
const customer = createCustomer({ transaction: params.transaction });
|
|
13
|
-
|
|
14
|
-
// const { reservationAcceptedOffers, reservationOrderItems } = createReservationAcceptedOffers(params);
|
|
15
|
-
const { reservationOrderItems } = (0, orderedItem_1.createReservationAcceptedOffers)(params);
|
|
16
|
-
// 通貨転送がある場合
|
|
17
|
-
// const { moneyTransferAcceptedOffers, moneyTransferOrderItems } = createMoneyTransferAcceptedOffers({ ...params, seller: seller });
|
|
18
|
-
const { moneyTransferOrderItems } = (0, orderedItem_1.createMoneyTransferAcceptedOffers)(params);
|
|
19
|
-
// プロダクトがある場合
|
|
20
|
-
// const { productAcceptedOffers, productOrderItems } = createProductItems(params);
|
|
21
|
-
const { productOrderItems } = (0, orderedItem_1.createProductItems)(params);
|
|
22
|
-
// const acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[] = [
|
|
23
|
-
// ...reservationAcceptedOffers,
|
|
24
|
-
// ...moneyTransferAcceptedOffers,
|
|
25
|
-
// ...productAcceptedOffers
|
|
26
|
-
// ];
|
|
27
|
-
const orderedItems = [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
|
|
13
|
+
const orderedItems = (0, orderedItem_1.acceptedOffers2orderedItem)(params);
|
|
28
14
|
// 決済方法をセット
|
|
29
15
|
const { paymentMethods, price } = createPaymentMethods({
|
|
30
16
|
authorizePaymentActions: params.authorizePaymentActions
|
|
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.createReturnPaymentMethodActions = void 0;
|
|
13
13
|
const emailMessageBuilder = require("../../../../emailMessageBuilder");
|
|
14
14
|
const factory = require("../../../../factory");
|
|
15
|
-
|
|
15
|
+
// import { createMaskedCustomer } from '../../../../factory/order';
|
|
16
16
|
function createReturnPaymentMethodPotentialActions(params) {
|
|
17
17
|
var _a, _b, _c, _d;
|
|
18
18
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -47,7 +47,7 @@ function createReturnPaymentMethodPotentialActions(params) {
|
|
|
47
47
|
name: order.seller.name
|
|
48
48
|
},
|
|
49
49
|
// mask
|
|
50
|
-
customer:
|
|
50
|
+
// customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
|
|
51
51
|
orderNumber: order.orderNumber,
|
|
52
52
|
price: order.price,
|
|
53
53
|
priceCurrency: order.priceCurrency,
|
|
@@ -84,7 +84,7 @@ function createReturnPaymentMethodActions(params) {
|
|
|
84
84
|
name: order.seller.name
|
|
85
85
|
},
|
|
86
86
|
// mask
|
|
87
|
-
customer:
|
|
87
|
+
// customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
|
|
88
88
|
orderNumber: order.orderNumber,
|
|
89
89
|
price: order.price,
|
|
90
90
|
priceCurrency: order.priceCurrency,
|
|
@@ -195,7 +195,7 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
|
|
|
195
195
|
name: order.seller.name
|
|
196
196
|
},
|
|
197
197
|
// mask
|
|
198
|
-
customer:
|
|
198
|
+
// customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
|
|
199
199
|
orderNumber: order.orderNumber,
|
|
200
200
|
price: order.price,
|
|
201
201
|
priceCurrency: order.priceCurrency,
|
|
@@ -47,7 +47,7 @@ function createReturnPointAwardActions(params) {
|
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
49
|
const order = params.order;
|
|
50
|
-
const maskedCustomer =
|
|
50
|
+
// const maskedCustomer = createMaskedCustomer(order, { noProfile: true });
|
|
51
51
|
const purpose = {
|
|
52
52
|
typeOf: order.typeOf,
|
|
53
53
|
seller: {
|
|
@@ -56,7 +56,7 @@ function createReturnPointAwardActions(params) {
|
|
|
56
56
|
name: order.seller.name
|
|
57
57
|
},
|
|
58
58
|
// mask
|
|
59
|
-
customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
|
|
59
|
+
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
60
60
|
orderNumber: order.orderNumber,
|
|
61
61
|
price: order.price,
|
|
62
62
|
priceCurrency: order.priceCurrency,
|
|
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.createSendEmailMessaegActionsOnReturn = void 0;
|
|
13
13
|
const emailMessageBuilder = require("../../../../emailMessageBuilder");
|
|
14
14
|
const factory = require("../../../../factory");
|
|
15
|
-
|
|
15
|
+
// import { createMaskedCustomer } from '../../../../factory/order';
|
|
16
16
|
function createSendEmailMessaegActionsOnReturn(params) {
|
|
17
17
|
var _a, _b;
|
|
18
18
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -25,7 +25,7 @@ function createSendEmailMessaegActionsOnReturn(params) {
|
|
|
25
25
|
name: order.seller.name
|
|
26
26
|
},
|
|
27
27
|
// mask
|
|
28
|
-
customer:
|
|
28
|
+
// customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
|
|
29
29
|
orderNumber: order.orderNumber,
|
|
30
30
|
price: order.price,
|
|
31
31
|
priceCurrency: order.priceCurrency,
|
|
@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.createPotentialActions = void 0;
|
|
13
13
|
const factory = require("../../../factory");
|
|
14
|
-
|
|
14
|
+
// import { createMaskedCustomer } from '../../../factory/order';
|
|
15
15
|
// import { createReturnMoneyTransferActions } from './potentialActions/returnMoneyTransfer';
|
|
16
16
|
const returnPaymentMethod_1 = require("./potentialActions/returnPaymentMethod");
|
|
17
17
|
const returnPointAward_1 = require("./potentialActions/returnPointAward");
|
|
@@ -56,7 +56,7 @@ function createPotentialActions(params) {
|
|
|
56
56
|
name: order.seller.name
|
|
57
57
|
},
|
|
58
58
|
// mask
|
|
59
|
-
customer:
|
|
59
|
+
// customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
|
|
60
60
|
orderNumber: order.orderNumber,
|
|
61
61
|
price: order.price,
|
|
62
62
|
priceCurrency: order.priceCurrency,
|
package/package.json
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
],
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@aws-sdk/credential-providers": "3.433.0",
|
|
13
|
-
"@chevre/factory": "4.360.0-alpha.
|
|
13
|
+
"@chevre/factory": "4.360.0-alpha.3",
|
|
14
14
|
"@cinerino/sdk": "5.13.0-alpha.3",
|
|
15
15
|
"@motionpicture/coa-service": "9.4.0-alpha.0",
|
|
16
16
|
"@motionpicture/gmo-service": "5.3.0",
|
|
@@ -110,5 +110,5 @@
|
|
|
110
110
|
"postversion": "git push origin --tags",
|
|
111
111
|
"prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
|
|
112
112
|
},
|
|
113
|
-
"version": "21.25.0-alpha.
|
|
113
|
+
"version": "21.25.0-alpha.14"
|
|
114
114
|
}
|