@chevre/domain 21.25.0-alpha.14 → 21.25.0-alpha.15
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/factory/order.d.ts +0 -8
- package/lib/chevre/factory/order.js +1 -26
- package/lib/chevre/service/delivery.js +9 -18
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.js +5 -5
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js +5 -5
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.js +5 -5
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.js +12 -5
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js +5 -5
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.js +5 -5
- package/lib/chevre/service/order/placeOrder.js +10 -10
- package/lib/chevre/service/order/returnOrder.js +5 -5
- package/lib/chevre/service/order/sendOrder.js +5 -5
- package/lib/chevre/service/task/createAccountingReport.js +5 -5
- package/lib/chevre/service/task/returnPayTransaction.js +7 -6
- package/lib/chevre/service/task/returnReserveTransaction.js +3 -4
- package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/givePointAward.js +11 -6
- package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/sendEmailMessage.js +5 -5
- package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js +15 -15
- package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPointAward.js +8 -9
- package/lib/chevre/service/transaction/returnOrder/potentialActions/sendEmailMessage.js +5 -5
- package/lib/chevre/service/transaction/returnOrder/potentialActions.js +5 -5
- package/package.json +3 -3
|
@@ -1,10 +1,2 @@
|
|
|
1
|
-
import * as factory from '../factory';
|
|
2
1
|
export declare const POINT_AWARD_IDENTIFIER_NAME = "pointAwardIdentifiers";
|
|
3
2
|
export declare const AWARD_ACCOUNTS_IDENTIFIER_NAME = "awardAccounts";
|
|
4
|
-
export type IMaskedCustomer = factory.order.ICustomer | Pick<factory.order.ICustomer, 'id' | 'typeOf'>;
|
|
5
|
-
/**
|
|
6
|
-
* 個人情報のマスクされたカスタマーを作成する
|
|
7
|
-
*/
|
|
8
|
-
export declare function createMaskedCustomer(order: Pick<factory.order.IOrder, 'customer'>, options: {
|
|
9
|
-
noProfile: boolean;
|
|
10
|
-
}): IMaskedCustomer;
|
|
@@ -1,30 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.AWARD_ACCOUNTS_IDENTIFIER_NAME = exports.POINT_AWARD_IDENTIFIER_NAME = void 0;
|
|
4
4
|
exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
|
|
5
5
|
exports.AWARD_ACCOUNTS_IDENTIFIER_NAME = 'awardAccounts';
|
|
6
|
-
const MASKED_PROFILE = '****';
|
|
7
|
-
/**
|
|
8
|
-
* 個人情報のマスクされたカスタマーを作成する
|
|
9
|
-
*/
|
|
10
|
-
function createMaskedCustomer(order, options) {
|
|
11
|
-
// noProfileに対応する(2023-07-03~)
|
|
12
|
-
if ((options === null || options === void 0 ? void 0 : options.noProfile) === true) {
|
|
13
|
-
return {
|
|
14
|
-
id: order.customer.id,
|
|
15
|
-
typeOf: order.customer.typeOf
|
|
16
|
-
// ↓identifierも隠蔽
|
|
17
|
-
// identifier: [],
|
|
18
|
-
// ↓additionalPropertyも隠蔽
|
|
19
|
-
// additionalProperty: [],
|
|
20
|
-
};
|
|
21
|
-
}
|
|
22
|
-
else {
|
|
23
|
-
return Object.assign(Object.assign({}, order.customer), {
|
|
24
|
-
// ↓identifierも隠蔽
|
|
25
|
-
identifier: [],
|
|
26
|
-
// ↓additionalPropertyも隠蔽
|
|
27
|
-
additionalProperty: [], email: MASKED_PROFILE, telephone: MASKED_PROFILE, name: MASKED_PROFILE, familyName: MASKED_PROFILE, givenName: MASKED_PROFILE });
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
exports.createMaskedCustomer = createMaskedCustomer;
|
|
@@ -71,9 +71,9 @@ function createGivePointAwardStartParams4moneyTransfer(params, transactionNumber
|
|
|
71
71
|
var _a;
|
|
72
72
|
// Sellerに変更(2022-05-30~)
|
|
73
73
|
const agent = {
|
|
74
|
-
typeOf: params.
|
|
75
|
-
id:
|
|
76
|
-
name: String(params.
|
|
74
|
+
typeOf: params.agent.typeOf,
|
|
75
|
+
id: params.agent.id,
|
|
76
|
+
name: String(params.agent.name)
|
|
77
77
|
};
|
|
78
78
|
const recipient
|
|
79
79
|
// tslint:disable-next-line:no-object-literal-type-assertion
|
|
@@ -146,7 +146,6 @@ function returnPointAward(params) {
|
|
|
146
146
|
exports.returnPointAward = returnPointAward;
|
|
147
147
|
function processReturnPointAwardByTransactionIdentifier(params) {
|
|
148
148
|
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
149
|
-
const order = params.purpose;
|
|
150
149
|
let moneyTransferTransaction;
|
|
151
150
|
const moenyTransferAssetTransactionIdentifier = params.object.identifier;
|
|
152
151
|
const assetTransactions = yield repos.assetTransaction.search({
|
|
@@ -184,11 +183,10 @@ function processReturnPointAwardByTransactionIdentifier(params) {
|
|
|
184
183
|
.toDate(),
|
|
185
184
|
// Sellerに変更(2022-05-30~)
|
|
186
185
|
agent: {
|
|
187
|
-
typeOf:
|
|
188
|
-
id:
|
|
189
|
-
name:
|
|
186
|
+
typeOf: params.recipient.typeOf,
|
|
187
|
+
id: params.recipient.id,
|
|
188
|
+
name: String(params.recipient.name)
|
|
190
189
|
},
|
|
191
|
-
// agent: depositTransaction.recipient, // 入金と逆
|
|
192
190
|
recipient: depositTransaction.agent,
|
|
193
191
|
object: {
|
|
194
192
|
amount: depositTransaction.object.amount,
|
|
@@ -213,7 +211,6 @@ function processReturnPointAwardByTransactionIdentifier(params) {
|
|
|
213
211
|
function processReturnPointAwardByTransactionFromLocationIdentifier(params) {
|
|
214
212
|
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
215
213
|
var _a, _b;
|
|
216
|
-
const order = params.purpose;
|
|
217
214
|
const moneyTransferTransactions = [];
|
|
218
215
|
const moenyTransferAssetTransactionFromLocationIdentifier = (_b = (_a = params.object
|
|
219
216
|
.object) === null || _a === void 0 ? void 0 : _a.fromLocation) === null || _b === void 0 ? void 0 : _b.identifier;
|
|
@@ -261,20 +258,14 @@ function processReturnPointAwardByTransactionFromLocationIdentifier(params) {
|
|
|
261
258
|
.toDate(),
|
|
262
259
|
// Sellerに変更(2022-05-30~)
|
|
263
260
|
agent: {
|
|
264
|
-
typeOf:
|
|
265
|
-
id:
|
|
266
|
-
name:
|
|
261
|
+
typeOf: params.recipient.typeOf,
|
|
262
|
+
id: params.recipient.id,
|
|
263
|
+
name: String(params.recipient.name)
|
|
267
264
|
},
|
|
268
|
-
// agent: returningTransaction.recipient, // 入金と逆
|
|
269
265
|
recipient: returningTransaction.agent,
|
|
270
266
|
object: {
|
|
271
267
|
amount: returningTransaction.object.amount,
|
|
272
268
|
fromLocation,
|
|
273
|
-
// toLocation: {
|
|
274
|
-
// typeOf: order.typeOf,
|
|
275
|
-
// confirmationNumber: order.confirmationNumber,
|
|
276
|
-
// orderNumber: order.orderNumber
|
|
277
|
-
// },
|
|
278
269
|
toLocation,
|
|
279
270
|
description: `[Return Award]${returningTransaction.object.description}`,
|
|
280
271
|
pendingTransaction: {
|
|
@@ -55,11 +55,11 @@ function createNextSendOrderTasks(params) {
|
|
|
55
55
|
// const maskedCustomer = createMaskedCustomer({ customer: params.order.customer }, { noProfile: true });
|
|
56
56
|
const simpleOrder = {
|
|
57
57
|
typeOf: params.order.typeOf,
|
|
58
|
-
seller: {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
},
|
|
58
|
+
// seller: {
|
|
59
|
+
// id: params.order.seller.id,
|
|
60
|
+
// typeOf: params.order.seller.typeOf,
|
|
61
|
+
// name: params.order.seller.name
|
|
62
|
+
// }, // 廃止(2024-03-06~)
|
|
63
63
|
// mask
|
|
64
64
|
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
65
65
|
orderNumber: params.order.orderNumber,
|
|
@@ -42,11 +42,11 @@ function createSendOrderTaskIfNotExist(params) {
|
|
|
42
42
|
// const maskedCustomer = createMaskedCustomer({ customer: params.order.customer }, { noProfile: true });
|
|
43
43
|
const simpleOrder = {
|
|
44
44
|
typeOf: params.order.typeOf,
|
|
45
|
-
seller: {
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
},
|
|
45
|
+
// seller: {
|
|
46
|
+
// id: params.order.seller.id,
|
|
47
|
+
// typeOf: params.order.seller.typeOf,
|
|
48
|
+
// name: params.order.seller.name
|
|
49
|
+
// }, // 廃止(2024-03-06~)
|
|
50
50
|
// mask
|
|
51
51
|
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
52
52
|
orderNumber: params.order.orderNumber,
|
|
@@ -24,11 +24,11 @@ function onOrderPaymentDue(params) {
|
|
|
24
24
|
// const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
|
|
25
25
|
const simpleOrder = {
|
|
26
26
|
typeOf: params.order.typeOf,
|
|
27
|
-
seller: {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
},
|
|
27
|
+
// seller: {
|
|
28
|
+
// id: params.order.seller.id,
|
|
29
|
+
// typeOf: params.order.seller.typeOf,
|
|
30
|
+
// name: params.order.seller.name
|
|
31
|
+
// }, // 廃止(2024-03-06~)
|
|
32
32
|
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
33
33
|
orderNumber: params.order.orderNumber,
|
|
34
34
|
price: params.order.price,
|
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// import * as COA from '@motionpicture/coa-service';
|
|
3
|
-
// import { PhoneNumberFormat, PhoneNumberUtil } from 'google-libphonenumber';
|
|
4
|
-
// import { format } from 'util';
|
|
5
2
|
var _a;
|
|
6
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
4
|
exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = void 0;
|
|
8
5
|
const factory = require("../../../../factory");
|
|
9
|
-
const order_1 = require("../../../../factory/order");
|
|
10
6
|
const reservedAgentIdentifireNames_1 = require("../../../../factory/reservedAgentIdentifireNames");
|
|
11
7
|
const settings_1 = require("../../../../settings");
|
|
12
8
|
const informOrder = (_a = settings_1.settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
|
|
@@ -47,6 +43,17 @@ function createInformTasks(order) {
|
|
|
47
43
|
return informTasks;
|
|
48
44
|
}
|
|
49
45
|
exports.createInformTasks = createInformTasks;
|
|
46
|
+
const MASKED_PROFILE = '****';
|
|
47
|
+
/**
|
|
48
|
+
* 個人情報のマスクされたカスタマーを作成する
|
|
49
|
+
*/
|
|
50
|
+
function createMaskedCustomer(order) {
|
|
51
|
+
return Object.assign(Object.assign({}, order.customer), {
|
|
52
|
+
// ↓identifierも隠蔽
|
|
53
|
+
identifier: [],
|
|
54
|
+
// ↓additionalPropertyも隠蔽
|
|
55
|
+
additionalProperty: [], email: MASKED_PROFILE, telephone: MASKED_PROFILE, name: MASKED_PROFILE, familyName: MASKED_PROFILE, givenName: MASKED_PROFILE });
|
|
56
|
+
}
|
|
50
57
|
function creteOrder4inform(order) {
|
|
51
58
|
return Object.assign({
|
|
52
59
|
// whitelistで作成する(2022-07-19~)
|
|
@@ -54,7 +61,7 @@ function creteOrder4inform(order) {
|
|
|
54
61
|
// numAcceptedOffers: order.acceptedOffers.length,
|
|
55
62
|
numAcceptedOffers: order.numAcceptedOffers, orderStatus: order.orderStatus, orderDate: order.orderDate,
|
|
56
63
|
// mask
|
|
57
|
-
customer: Object.assign(Object.assign({},
|
|
64
|
+
customer: Object.assign(Object.assign({}, createMaskedCustomer(order)), { additionalProperty: (Array.isArray(order.customer.additionalProperty)) ? order.customer.additionalProperty : [],
|
|
58
65
|
// identifierは必要
|
|
59
66
|
// 予約語を隠蔽(2022-12-24~)
|
|
60
67
|
identifier: (Array.isArray(order.customer.identifier))
|
|
@@ -30,11 +30,11 @@ function onOrderProcessing(params) {
|
|
|
30
30
|
// const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
|
|
31
31
|
const simpleOrder = {
|
|
32
32
|
typeOf: params.order.typeOf,
|
|
33
|
-
seller: {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
},
|
|
33
|
+
// seller: {
|
|
34
|
+
// id: params.order.seller.id,
|
|
35
|
+
// typeOf: params.order.seller.typeOf,
|
|
36
|
+
// name: params.order.seller.name
|
|
37
|
+
// }, // 廃止(2024-03-06~)
|
|
38
38
|
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
39
39
|
orderNumber: params.order.orderNumber,
|
|
40
40
|
price: params.order.price,
|
|
@@ -27,11 +27,11 @@ function onOrderReturned(params) {
|
|
|
27
27
|
// const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
|
|
28
28
|
const simpleOrder = {
|
|
29
29
|
typeOf: params.order.typeOf,
|
|
30
|
-
seller: {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
},
|
|
30
|
+
// seller: {
|
|
31
|
+
// id: params.order.seller.id,
|
|
32
|
+
// typeOf: params.order.seller.typeOf,
|
|
33
|
+
// name: params.order.seller.name
|
|
34
|
+
// }, // 廃止(2024-03-06~)
|
|
35
35
|
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
36
36
|
orderNumber: params.order.orderNumber,
|
|
37
37
|
price: params.order.price,
|
|
@@ -71,11 +71,11 @@ function placeOrderWithoutTransaction(params) {
|
|
|
71
71
|
// const maskedCustomer = createMaskedCustomer(order, { noProfile: true });
|
|
72
72
|
const simpleOrder = {
|
|
73
73
|
typeOf: order.typeOf,
|
|
74
|
-
seller: {
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
},
|
|
74
|
+
// seller: {
|
|
75
|
+
// id: order.seller.id,
|
|
76
|
+
// typeOf: order.seller.typeOf,
|
|
77
|
+
// name: order.seller.name
|
|
78
|
+
// }, // 廃止(2024-03-06~)
|
|
79
79
|
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
80
80
|
orderNumber: order.orderNumber,
|
|
81
81
|
price: order.price,
|
|
@@ -239,11 +239,11 @@ function placeOrder(params) {
|
|
|
239
239
|
// const maskedCustomer = createMaskedCustomer(order, { noProfile: true });
|
|
240
240
|
const simpleOrder = {
|
|
241
241
|
typeOf: order.typeOf,
|
|
242
|
-
seller: {
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
},
|
|
242
|
+
// seller: {
|
|
243
|
+
// id: order.seller.id,
|
|
244
|
+
// typeOf: order.seller.typeOf,
|
|
245
|
+
// name: order.seller.name
|
|
246
|
+
// }, // 廃止(2024-03-06~)
|
|
247
247
|
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
248
248
|
orderNumber: order.orderNumber,
|
|
249
249
|
price: order.price,
|
|
@@ -61,11 +61,11 @@ function returnOrder(params) {
|
|
|
61
61
|
}
|
|
62
62
|
const simpleOrder = {
|
|
63
63
|
typeOf: order.typeOf,
|
|
64
|
-
seller: {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
},
|
|
64
|
+
// seller: {
|
|
65
|
+
// id: order.seller.id,
|
|
66
|
+
// typeOf: order.seller.typeOf,
|
|
67
|
+
// name: order.seller.name
|
|
68
|
+
// }, // 廃止(2024-03-06~)
|
|
69
69
|
// customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
|
|
70
70
|
orderNumber: order.orderNumber,
|
|
71
71
|
price: order.price,
|
|
@@ -66,11 +66,11 @@ function sendOrder(params) {
|
|
|
66
66
|
// const maskedCustomer = createMaskedCustomer(order, { noProfile: true });
|
|
67
67
|
const simpleOrder = {
|
|
68
68
|
typeOf: order.typeOf,
|
|
69
|
-
seller: {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
},
|
|
69
|
+
// seller: {
|
|
70
|
+
// id: order.seller.id,
|
|
71
|
+
// typeOf: order.seller.typeOf,
|
|
72
|
+
// name: order.seller.name
|
|
73
|
+
// }, // 廃止(2024-03-06~)
|
|
74
74
|
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
75
75
|
orderNumber: order.orderNumber,
|
|
76
76
|
price: order.price,
|
|
@@ -40,11 +40,11 @@ function createAccountingReport(params) {
|
|
|
40
40
|
});
|
|
41
41
|
const simpleOrder = {
|
|
42
42
|
typeOf: order.typeOf,
|
|
43
|
-
seller: {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
},
|
|
43
|
+
// seller: {
|
|
44
|
+
// id: order.seller.id,
|
|
45
|
+
// typeOf: order.seller.typeOf,
|
|
46
|
+
// name: order.seller.name
|
|
47
|
+
// }, // 廃止(2024-03-06~)
|
|
48
48
|
// customer: { typeOf: order.customer.typeOf, id: order.customer.id }, // 廃止(2024-03-06~)
|
|
49
49
|
orderNumber: order.orderNumber,
|
|
50
50
|
price: order.price,
|
|
@@ -85,7 +85,7 @@ function returnPayTransaction(params) {
|
|
|
85
85
|
// no op
|
|
86
86
|
const startRefundTransactionParams = createStartRefundTransactionParams(Object.assign(Object.assign({}, params), { transactionNumber,
|
|
87
87
|
paymentServiceType,
|
|
88
|
-
refundFee }));
|
|
88
|
+
refundFee, seller: order.seller }));
|
|
89
89
|
const refundPurpose = createRefundPurpose(params, order);
|
|
90
90
|
refundTransaction = yield RefundTransactionService.start(startRefundTransactionParams)({
|
|
91
91
|
action: repos.action,
|
|
@@ -164,15 +164,16 @@ function createStartRefundTransactionParams(params) {
|
|
|
164
164
|
if (typeof paymentMethodType !== 'string') {
|
|
165
165
|
throw new factory.errors.NotFound('object.paymentMethod.identifier');
|
|
166
166
|
}
|
|
167
|
+
const agent = {
|
|
168
|
+
typeOf: params.seller.typeOf,
|
|
169
|
+
id: params.seller.id,
|
|
170
|
+
name: params.seller.name
|
|
171
|
+
};
|
|
167
172
|
return {
|
|
168
173
|
project: { id: params.project.id, typeOf: factory.organizationType.Project },
|
|
169
174
|
typeOf: factory.assetTransactionType.Refund,
|
|
170
175
|
transactionNumber: params.transactionNumber,
|
|
171
|
-
agent
|
|
172
|
-
typeOf: params.purpose.seller.typeOf,
|
|
173
|
-
name: String(params.purpose.seller.name),
|
|
174
|
-
id: String(params.purpose.seller.id)
|
|
175
|
-
},
|
|
176
|
+
agent,
|
|
176
177
|
// tslint:disable-next-line:no-object-literal-type-assertion
|
|
177
178
|
recipient: { typeOf: params.recipient.typeOf, name: params.recipient.name },
|
|
178
179
|
object: {
|
|
@@ -98,7 +98,6 @@ function processCancelReservation4chevre(params) {
|
|
|
98
98
|
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
99
99
|
const cancelReservationObject = params.object;
|
|
100
100
|
const project = params.project;
|
|
101
|
-
const order = params.purpose;
|
|
102
101
|
// まず取引番号発行
|
|
103
102
|
const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
|
|
104
103
|
yield CancelReservationTransactionService.startAndConfirm({
|
|
@@ -106,9 +105,9 @@ function processCancelReservation4chevre(params) {
|
|
|
106
105
|
transactionNumber,
|
|
107
106
|
typeOf: factory.assetTransactionType.CancelReservation,
|
|
108
107
|
agent: {
|
|
109
|
-
typeOf:
|
|
110
|
-
id:
|
|
111
|
-
name:
|
|
108
|
+
typeOf: params.recipient.typeOf,
|
|
109
|
+
id: params.recipient.id,
|
|
110
|
+
name: String(params.recipient.name)
|
|
112
111
|
},
|
|
113
112
|
object: {
|
|
114
113
|
reservation: {
|
package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/givePointAward.js
CHANGED
|
@@ -21,11 +21,11 @@ function createGivePointAwardActions(params) {
|
|
|
21
21
|
if (Array.isArray(givePointAwardParams)) {
|
|
22
22
|
const givePointAwardPurpose = {
|
|
23
23
|
typeOf: params.order.typeOf,
|
|
24
|
-
seller: {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
},
|
|
24
|
+
// seller: {
|
|
25
|
+
// id: params.order.seller.id,
|
|
26
|
+
// typeOf: params.order.seller.typeOf,
|
|
27
|
+
// name: params.order.seller.name
|
|
28
|
+
// }, // 廃止(2024-03-06~)
|
|
29
29
|
// mask
|
|
30
30
|
// customer: createMaskedCustomer(params.order, { noProfile: true }), // 廃止(2024-03-06~)
|
|
31
31
|
orderNumber: params.order.orderNumber,
|
|
@@ -44,7 +44,12 @@ function createGivePointAwardActions(params) {
|
|
|
44
44
|
actions.push({
|
|
45
45
|
project: params.transaction.project,
|
|
46
46
|
typeOf: factory.actionType.GiveAction,
|
|
47
|
-
agent: params.transaction.project,
|
|
47
|
+
// agent: params.transaction.project,
|
|
48
|
+
agent: {
|
|
49
|
+
id: params.order.seller.id,
|
|
50
|
+
typeOf: params.order.seller.typeOf,
|
|
51
|
+
name: params.order.seller.name
|
|
52
|
+
},
|
|
48
53
|
recipient: {
|
|
49
54
|
typeOf: params.order.customer.typeOf,
|
|
50
55
|
id: params.order.customer.id,
|
package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/sendEmailMessage.js
CHANGED
|
@@ -21,11 +21,11 @@ function createSendEmailMessageActions(params) {
|
|
|
21
21
|
// const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
|
|
22
22
|
const sendActionPurpose = {
|
|
23
23
|
typeOf: params.order.typeOf,
|
|
24
|
-
seller: {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
},
|
|
24
|
+
// seller: {
|
|
25
|
+
// id: params.order.seller.id,
|
|
26
|
+
// typeOf: params.order.seller.typeOf,
|
|
27
|
+
// name: params.order.seller.name
|
|
28
|
+
// }, // 廃止(2024-03-06~)
|
|
29
29
|
// mask
|
|
30
30
|
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
31
31
|
orderNumber: params.order.orderNumber,
|
|
@@ -41,11 +41,11 @@ function createReturnPaymentMethodPotentialActions(params) {
|
|
|
41
41
|
});
|
|
42
42
|
const sendActionPurpose = {
|
|
43
43
|
typeOf: order.typeOf,
|
|
44
|
-
seller: {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
},
|
|
44
|
+
// seller: {
|
|
45
|
+
// id: order.seller.id,
|
|
46
|
+
// typeOf: order.seller.typeOf,
|
|
47
|
+
// name: order.seller.name
|
|
48
|
+
// }, // 廃止(2024-03-06~)
|
|
49
49
|
// mask
|
|
50
50
|
// customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
|
|
51
51
|
orderNumber: order.orderNumber,
|
|
@@ -78,11 +78,11 @@ function createReturnPaymentMethodActions(params) {
|
|
|
78
78
|
const returnPaymentMethodActions = [];
|
|
79
79
|
const returnPaymentMethodPurpose = {
|
|
80
80
|
typeOf: order.typeOf,
|
|
81
|
-
seller: {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
},
|
|
81
|
+
// seller: {
|
|
82
|
+
// id: order.seller.id,
|
|
83
|
+
// typeOf: order.seller.typeOf,
|
|
84
|
+
// name: order.seller.name
|
|
85
|
+
// }, // 廃止(2024-03-06~)
|
|
86
86
|
// mask
|
|
87
87
|
// customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
|
|
88
88
|
orderNumber: order.orderNumber,
|
|
@@ -189,11 +189,11 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
|
|
|
189
189
|
},
|
|
190
190
|
purpose: {
|
|
191
191
|
typeOf: order.typeOf,
|
|
192
|
-
seller: {
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
},
|
|
192
|
+
// seller: {
|
|
193
|
+
// id: order.seller.id,
|
|
194
|
+
// typeOf: order.seller.typeOf,
|
|
195
|
+
// name: order.seller.name
|
|
196
|
+
// }, // 廃止(2024-03-06~)
|
|
197
197
|
// mask
|
|
198
198
|
// customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
|
|
199
199
|
orderNumber: order.orderNumber,
|
|
@@ -50,11 +50,11 @@ function createReturnPointAwardActions(params) {
|
|
|
50
50
|
// const maskedCustomer = createMaskedCustomer(order, { noProfile: true });
|
|
51
51
|
const purpose = {
|
|
52
52
|
typeOf: order.typeOf,
|
|
53
|
-
seller: {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
},
|
|
53
|
+
// seller: {
|
|
54
|
+
// id: order.seller.id,
|
|
55
|
+
// typeOf: order.seller.typeOf,
|
|
56
|
+
// name: order.seller.name
|
|
57
|
+
// }, // 廃止(2024-03-06~)
|
|
58
58
|
// mask
|
|
59
59
|
// customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
|
|
60
60
|
orderNumber: order.orderNumber,
|
|
@@ -62,6 +62,7 @@ function createReturnPointAwardActions(params) {
|
|
|
62
62
|
priceCurrency: order.priceCurrency,
|
|
63
63
|
orderDate: order.orderDate
|
|
64
64
|
};
|
|
65
|
+
const agent = order.project;
|
|
65
66
|
const recipient = {
|
|
66
67
|
typeOf: order.seller.typeOf,
|
|
67
68
|
id: order.seller.id,
|
|
@@ -72,13 +73,11 @@ function createReturnPointAwardActions(params) {
|
|
|
72
73
|
return {
|
|
73
74
|
project: order.project,
|
|
74
75
|
typeOf: factory.actionType.ReturnAction,
|
|
75
|
-
// objectは何であるべき?入金資産取引か?
|
|
76
|
-
// object: a,
|
|
77
76
|
object: {
|
|
78
77
|
typeOf: factory.assetTransactionType.MoneyTransfer,
|
|
79
78
|
identifier: pointAwardIdentifier
|
|
80
79
|
},
|
|
81
|
-
agent
|
|
80
|
+
agent,
|
|
82
81
|
potentialActions: {},
|
|
83
82
|
purpose,
|
|
84
83
|
recipient
|
|
@@ -93,7 +92,7 @@ function createReturnPointAwardActions(params) {
|
|
|
93
92
|
typeOf: factory.assetTransactionType.MoneyTransfer,
|
|
94
93
|
object: { fromLocation: { identifier: awardAccountIdentifier } }
|
|
95
94
|
},
|
|
96
|
-
agent
|
|
95
|
+
agent,
|
|
97
96
|
potentialActions: {},
|
|
98
97
|
purpose,
|
|
99
98
|
recipient
|
|
@@ -19,11 +19,11 @@ function createSendEmailMessaegActionsOnReturn(params) {
|
|
|
19
19
|
const order = params.order;
|
|
20
20
|
const sendActionPurpose = {
|
|
21
21
|
typeOf: order.typeOf,
|
|
22
|
-
seller: {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
},
|
|
22
|
+
// seller: {
|
|
23
|
+
// id: order.seller.id,
|
|
24
|
+
// typeOf: order.seller.typeOf,
|
|
25
|
+
// name: order.seller.name
|
|
26
|
+
// }, // 廃止(2024-03-06~)
|
|
27
27
|
// mask
|
|
28
28
|
// customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
|
|
29
29
|
orderNumber: order.orderNumber,
|
|
@@ -50,11 +50,11 @@ function createPotentialActions(params) {
|
|
|
50
50
|
};
|
|
51
51
|
const returnOrderObject = {
|
|
52
52
|
typeOf: order.typeOf,
|
|
53
|
-
seller: {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
},
|
|
53
|
+
// seller: {
|
|
54
|
+
// id: order.seller.id,
|
|
55
|
+
// typeOf: order.seller.typeOf,
|
|
56
|
+
// name: order.seller.name
|
|
57
|
+
// }, // 廃止(2024-03-06~)
|
|
58
58
|
// mask
|
|
59
59
|
// customer: createMaskedCustomer(order, { noProfile: true }), // 廃止(2024-03-06~)
|
|
60
60
|
orderNumber: order.orderNumber,
|
package/package.json
CHANGED
|
@@ -10,9 +10,9 @@
|
|
|
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.4",
|
|
14
14
|
"@cinerino/sdk": "5.13.0-alpha.3",
|
|
15
|
-
"@motionpicture/coa-service": "9.4.0
|
|
15
|
+
"@motionpicture/coa-service": "9.4.0",
|
|
16
16
|
"@motionpicture/gmo-service": "5.3.0",
|
|
17
17
|
"@sendgrid/mail": "6.4.0",
|
|
18
18
|
"@surfrock/sdk": "1.2.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.15"
|
|
114
114
|
}
|