@chevre/domain 21.25.0-alpha.9 → 21.25.0
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/example/src/chevre/migrateDeleteTransactionTasks.ts +2 -2
- package/example/src/chevre/migrateScreeningEventSeriesOffers.ts +87 -0
- package/example/src/chevre/searchScreeningEventSeries.ts +35 -0
- package/example/src/chevre/unsetUnnecessaryFields.ts +7 -8
- package/example/src/chevre/upsertScreeningEventSeriesByVersion.ts +0 -2
- package/lib/chevre/emailMessageBuilder.d.ts +0 -1
- package/lib/chevre/factory/event.js +7 -4
- package/lib/chevre/factory/order.d.ts +0 -8
- package/lib/chevre/factory/order.js +1 -26
- package/lib/chevre/repo/event.d.ts +3 -3
- package/lib/chevre/repo/mongoose/schemas/event.d.ts +1 -1
- package/lib/chevre/repo/mongoose/schemas/event.js +18 -15
- package/lib/chevre/service/aggregation/event/findEventOffers.d.ts +1 -1
- package/lib/chevre/service/aggregation/event/findEventOffers.js +1 -1
- package/lib/chevre/service/assetTransaction/reserve/factory/price.js +1 -1
- package/lib/chevre/service/assetTransaction/reserve/factory.d.ts +1 -1
- package/lib/chevre/service/assetTransaction/reserve.js +1 -6
- package/lib/chevre/service/delivery.js +9 -18
- package/lib/chevre/service/event/createEvent.js +2 -1
- package/lib/chevre/service/event.js +2 -1
- package/lib/chevre/service/offer/event/authorize.d.ts +3 -2
- package/lib/chevre/service/offer/event/authorize.js +10 -20
- package/lib/chevre/service/offer/event/cancel.d.ts +1 -1
- package/lib/chevre/service/offer/event/cancel.js +1 -1
- package/lib/chevre/service/offer/event/factory.d.ts +6 -5
- package/lib/chevre/service/offer/event/factory.js +22 -36
- package/lib/chevre/service/offer/event/processStartReserve4chevre.d.ts +3 -3
- package/lib/chevre/service/offer/event/processStartReserve4chevre.js +6 -13
- package/lib/chevre/service/offer/event/voidTransaction.d.ts +1 -1
- package/lib/chevre/service/offer/event/voidTransaction.js +1 -1
- package/lib/chevre/service/offer/eventServiceByCOA/authorize.d.ts +1 -0
- package/lib/chevre/service/offer/eventServiceByCOA/authorize.js +7 -4
- package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.d.ts +1 -0
- package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js +3 -2
- package/lib/chevre/service/offer/eventServiceByCOA/factory.d.ts +2 -1
- package/lib/chevre/service/offer/eventServiceByCOA/factory.js +19 -10
- package/lib/chevre/service/offer/product/factory.js +11 -13
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.js +8 -8
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js +8 -8
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.js +8 -8
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.js +18 -116
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js +8 -8
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.js +8 -8
- package/lib/chevre/service/order/placeOrder.js +14 -15
- package/lib/chevre/service/order/returnOrder.js +7 -7
- package/lib/chevre/service/order/sendOrder.js +8 -8
- package/lib/chevre/service/payment/any/factory.js +11 -10
- package/lib/chevre/service/task/createAccountingReport.js +6 -6
- package/lib/chevre/service/task/returnPayTransaction.js +7 -7
- package/lib/chevre/service/task/returnReserveTransaction.js +3 -4
- package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/givePointAward.js +13 -8
- package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/sendEmailMessage.js +8 -8
- package/lib/chevre/service/transaction/placeOrderInProgress/result/orderedItem.d.ts +10 -0
- package/lib/chevre/service/transaction/placeOrderInProgress/result/orderedItem.js +112 -0
- package/lib/chevre/service/transaction/placeOrderInProgress/result.js +2 -16
- package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js +41 -26
- package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPointAward.js +10 -11
- package/lib/chevre/service/transaction/returnOrder/potentialActions/sendEmailMessage.js +7 -7
- package/lib/chevre/service/transaction/returnOrder/potentialActions.js +7 -7
- package/lib/chevre/settings.d.ts +0 -1
- package/lib/chevre/settings.js +1 -2
- package/package.json +4 -4
- package/example/src/chevre/migrateMovieAvailabilityStarts.ts +0 -83
- package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.d.ts +0 -16
- package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.js +0 -144
|
@@ -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))
|
|
@@ -72,45 +79,17 @@ function creteOrder4inform(order) {
|
|
|
72
79
|
function createConfirmReservationActionObject4ChevreByOrder(params) {
|
|
73
80
|
// serialNumberから生成(2024-02-01~)
|
|
74
81
|
return params.order.serialNumbers.map((reservationNumber) => {
|
|
82
|
+
const purpose = {
|
|
83
|
+
confirmationNumber: params.order.confirmationNumber,
|
|
84
|
+
orderNumber: params.order.orderNumber,
|
|
85
|
+
typeOf: factory.order.OrderType.Order
|
|
86
|
+
};
|
|
75
87
|
return {
|
|
76
|
-
potentialActions: {
|
|
77
|
-
reserve: {
|
|
78
|
-
purpose: {
|
|
79
|
-
confirmationNumber: params.order.confirmationNumber,
|
|
80
|
-
orderNumber: params.order.orderNumber,
|
|
81
|
-
typeOf: factory.order.OrderType.Order
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
},
|
|
88
|
+
potentialActions: { reserve: { purpose } },
|
|
85
89
|
transactionNumber: reservationNumber,
|
|
86
90
|
typeOf: factory.assetTransactionType.Reserve
|
|
87
91
|
};
|
|
88
92
|
});
|
|
89
|
-
// const chevreReservationNumbers: string[] = params.order.acceptedOffers.filter((o) => {
|
|
90
|
-
// return (
|
|
91
|
-
// o.itemOffered.typeOf === factory.reservationType.EventReservation
|
|
92
|
-
// || o.itemOffered.typeOf === factory.reservationType.BusReservation
|
|
93
|
-
// )
|
|
94
|
-
// && o.offeredThrough?.identifier === factory.service.webAPI.Identifier.Chevre;
|
|
95
|
-
// })
|
|
96
|
-
// .map((o) => {
|
|
97
|
-
// return (<factory.order.IReservation>o.itemOffered).reservationNumber;
|
|
98
|
-
// });
|
|
99
|
-
// return [...new Set(chevreReservationNumbers)].map((reservationNumber) => {
|
|
100
|
-
// return {
|
|
101
|
-
// potentialActions: {
|
|
102
|
-
// reserve: {
|
|
103
|
-
// purpose: {
|
|
104
|
-
// confirmationNumber: params.order.confirmationNumber,
|
|
105
|
-
// orderNumber: params.order.orderNumber,
|
|
106
|
-
// typeOf: factory.order.OrderType.Order
|
|
107
|
-
// }
|
|
108
|
-
// }
|
|
109
|
-
// },
|
|
110
|
-
// transactionNumber: reservationNumber,
|
|
111
|
-
// typeOf: factory.assetTransactionType.Reserve
|
|
112
|
-
// };
|
|
113
|
-
// });
|
|
114
93
|
}
|
|
115
94
|
exports.createConfirmReservationActionObject4ChevreByOrder = createConfirmReservationActionObject4ChevreByOrder;
|
|
116
95
|
function createConfirmReservationActionObject4COAByOrder(params) {
|
|
@@ -123,82 +102,5 @@ function createConfirmReservationActionObject4COAByOrder(params) {
|
|
|
123
102
|
typeOf: 'COAReserveTransaction'
|
|
124
103
|
};
|
|
125
104
|
});
|
|
126
|
-
// const coaReservationOffers = params.order.acceptedOffers.filter((o) => {
|
|
127
|
-
// return o.itemOffered.typeOf === factory.reservationType.EventReservation
|
|
128
|
-
// && o.offeredThrough?.identifier === factory.service.webAPI.Identifier.COA;
|
|
129
|
-
// });
|
|
130
|
-
// const coaReservationNumbers: string[] = [...new Set(coaReservationOffers
|
|
131
|
-
// .map((o) => {
|
|
132
|
-
// return (<factory.order.IReservation>o.itemOffered).reservationNumber;
|
|
133
|
-
// }))];
|
|
134
|
-
// // const customer = params.order.customer;
|
|
135
|
-
// // // 電話番号のフォーマットを日本人にリーダブルに調整(COAではこのフォーマットで扱うので)
|
|
136
|
-
// // const phoneUtil = PhoneNumberUtil.getInstance();
|
|
137
|
-
// // const phoneNumber = phoneUtil.parse(customer.telephone, 'JP');
|
|
138
|
-
// // let telNum = phoneUtil.format(phoneNumber, PhoneNumberFormat.NATIONAL);
|
|
139
|
-
// // // COAでは数字のみ受け付けるので数字以外を除去
|
|
140
|
-
// // telNum = telNum.replace(/[^\d]/g, '');
|
|
141
|
-
// // const mailAddr = customer.email;
|
|
142
|
-
// // if (mailAddr === undefined) {
|
|
143
|
-
// // throw new factory.errors.Argument('order', 'order.customer.email undefined');
|
|
144
|
-
// // }
|
|
145
|
-
// return coaReservationNumbers.map((reservationNumber) => {
|
|
146
|
-
// // 完全に最適化(2024-01-31~)
|
|
147
|
-
// return {
|
|
148
|
-
// optimized: true,
|
|
149
|
-
// transactionNumber: reservationNumber,
|
|
150
|
-
// typeOf: 'COAReserveTransaction'
|
|
151
|
-
// };
|
|
152
|
-
// // const coaReservations = coaReservationOffers
|
|
153
|
-
// // .filter((o) => (<factory.order.IEventReservation>o.itemOffered).reservationNumber === reservationNumber)
|
|
154
|
-
// // .map((o) => {
|
|
155
|
-
// // return <factory.order.IEventReservation>o.itemOffered;
|
|
156
|
-
// // });
|
|
157
|
-
// // const coaReservation = coaReservations[0];
|
|
158
|
-
// // const reservationForCOAInfo = coaReservation.reservationFor.coaInfo;
|
|
159
|
-
// // if (reservationForCOAInfo === undefined) {
|
|
160
|
-
// // throw new factory.errors.NotFound('reservationFor.coaInfo');
|
|
161
|
-
// // }
|
|
162
|
-
// // const totalPrice = coaReservation.reservedTicket.coaReserveAmount;
|
|
163
|
-
// // if (totalPrice === undefined) {
|
|
164
|
-
// // throw new factory.errors.NotFound('reservedTicket.coaReserveAmount');
|
|
165
|
-
// // }
|
|
166
|
-
// // const listTicket: COA.factory.reserve.IUpdReserveTicket[] = coaReservations.map((r) => {
|
|
167
|
-
// // if (typeof r.reservedTicket.coaTicketInfo?.ticketCode !== 'string') {
|
|
168
|
-
// // throw new factory.errors.NotFound('reservedTicket.coaTicketInfo');
|
|
169
|
-
// // }
|
|
170
|
-
// // // 冗長な属性を排除(2023-03-20~)
|
|
171
|
-
// // const {
|
|
172
|
-
// // ticketCode, stdPrice, addPrice, spseatAdd1, spseatAdd2,
|
|
173
|
-
// // disPrice, salePrice, mvtkAppPrice, ticketCount, spseatKbn,
|
|
174
|
-
// // seatNum, addGlasses, kbnEisyahousiki, mvtkNum, mvtkKbnDenshiken,
|
|
175
|
-
// // mvtkKbnMaeuriken, mvtkKbnKensyu, mvtkSalesPrice, kbnMgtk
|
|
176
|
-
// // } = r.reservedTicket.coaTicketInfo;
|
|
177
|
-
// // return {
|
|
178
|
-
// // ticketCode, stdPrice, addPrice, spseatAdd1, spseatAdd2,
|
|
179
|
-
// // disPrice, salePrice, mvtkAppPrice, ticketCount, spseatKbn,
|
|
180
|
-
// // seatNum, addGlasses, kbnEisyahousiki, mvtkNum, mvtkKbnDenshiken,
|
|
181
|
-
// // mvtkKbnMaeuriken, mvtkKbnKensyu, mvtkSalesPrice, kbnMgtk
|
|
182
|
-
// // };
|
|
183
|
-
// // });
|
|
184
|
-
// // return {
|
|
185
|
-
// // theaterCode: reservationForCOAInfo.theaterCode,
|
|
186
|
-
// // dateJouei: reservationForCOAInfo.dateJouei,
|
|
187
|
-
// // titleCode: reservationForCOAInfo.titleCode,
|
|
188
|
-
// // titleBranchNum: reservationForCOAInfo.titleBranchNum,
|
|
189
|
-
// // timeBegin: reservationForCOAInfo.timeBegin,
|
|
190
|
-
// // tmpReserveNum: reservationNumber,
|
|
191
|
-
// tslint:disable-next-line:no-irregular-whitespace
|
|
192
|
-
// // reserveName: format('%s %s', customer.familyName, customer.givenName),
|
|
193
|
-
// tslint:disable-next-line:no-irregular-whitespace
|
|
194
|
-
// // reserveNameJkana: format('%s %s', customer.familyName, customer.givenName),
|
|
195
|
-
// // telNum: telNum,
|
|
196
|
-
// // mailAddr: mailAddr,
|
|
197
|
-
// // reserveAmount: totalPrice, // デフォルトのpriceCurrencyがJPYなのでこれでよし
|
|
198
|
-
// // listTicket,
|
|
199
|
-
// // transactionNumber: reservationNumber,
|
|
200
|
-
// // typeOf: 'COAReserveTransaction'
|
|
201
|
-
// // };
|
|
202
|
-
// });
|
|
203
105
|
}
|
|
204
106
|
exports.createConfirmReservationActionObject4COAByOrder = createConfirmReservationActionObject4COAByOrder;
|
|
@@ -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,15 +27,15 @@ 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
|
-
seller: {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
},
|
|
38
|
-
customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
|
|
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
|
+
// 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,15 +24,15 @@ 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
|
-
seller: {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
},
|
|
35
|
-
customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
|
|
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
|
+
// 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,15 +68,15 @@ 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
|
-
seller: {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
},
|
|
80
|
-
customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
|
|
74
|
+
// seller: {
|
|
75
|
+
// id: order.seller.id,
|
|
76
|
+
// typeOf: order.seller.typeOf,
|
|
77
|
+
// name: order.seller.name
|
|
78
|
+
// }, // 廃止(2024-03-06~)
|
|
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,15 +236,15 @@ 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
|
-
seller: {
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
},
|
|
248
|
-
customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
|
|
242
|
+
// seller: {
|
|
243
|
+
// id: order.seller.id,
|
|
244
|
+
// typeOf: order.seller.typeOf,
|
|
245
|
+
// name: order.seller.name
|
|
246
|
+
// }, // 廃止(2024-03-06~)
|
|
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');
|
|
@@ -61,12 +61,12 @@ function returnOrder(params) {
|
|
|
61
61
|
}
|
|
62
62
|
const simpleOrder = {
|
|
63
63
|
typeOf: order.typeOf,
|
|
64
|
-
seller: {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
},
|
|
69
|
-
customer:
|
|
64
|
+
// seller: {
|
|
65
|
+
// id: order.seller.id,
|
|
66
|
+
// typeOf: order.seller.typeOf,
|
|
67
|
+
// name: order.seller.name
|
|
68
|
+
// }, // 廃止(2024-03-06~)
|
|
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,15 +63,15 @@ 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
|
-
seller: {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
},
|
|
74
|
-
customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id },
|
|
69
|
+
// seller: {
|
|
70
|
+
// id: order.seller.id,
|
|
71
|
+
// typeOf: order.seller.typeOf,
|
|
72
|
+
// name: order.seller.name
|
|
73
|
+
// }, // 廃止(2024-03-06~)
|
|
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,
|
|
@@ -25,18 +25,19 @@ function creatPayTransactionStartParams(params) {
|
|
|
25
25
|
const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(createMovieTicket) : undefined;
|
|
26
26
|
return Object.assign(Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
|
|
27
27
|
typeOf: params.transaction.seller.typeOf,
|
|
28
|
-
id:
|
|
28
|
+
id: params.transaction.seller.id,
|
|
29
29
|
name: (typeof params.transaction.seller.name === 'string')
|
|
30
30
|
? params.transaction.seller.name
|
|
31
|
-
: String((_b = params.transaction.seller.name) === null || _b === void 0 ? void 0 : _b.ja)
|
|
32
|
-
identifier
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
31
|
+
: String((_b = params.transaction.seller.name) === null || _b === void 0 ? void 0 : _b.ja)
|
|
32
|
+
// identifierを廃止(2024-03-05~)
|
|
33
|
+
// identifier: [
|
|
34
|
+
// { name: 'transaction', value: params.transaction.id },
|
|
35
|
+
// {
|
|
36
|
+
// name: 'transactionExpires',
|
|
37
|
+
// value: moment(params.transaction.expires)
|
|
38
|
+
// .toISOString()
|
|
39
|
+
// }
|
|
40
|
+
// ]
|
|
40
41
|
}, recipient: {
|
|
41
42
|
id: params.transaction.seller.id,
|
|
42
43
|
name: (typeof params.transaction.seller.name === 'string')
|
|
@@ -40,12 +40,12 @@ function createAccountingReport(params) {
|
|
|
40
40
|
});
|
|
41
41
|
const simpleOrder = {
|
|
42
42
|
typeOf: order.typeOf,
|
|
43
|
-
seller: {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
},
|
|
48
|
-
customer: { typeOf: order.customer.typeOf, id: order.customer.id },
|
|
43
|
+
// seller: {
|
|
44
|
+
// id: order.seller.id,
|
|
45
|
+
// typeOf: order.seller.typeOf,
|
|
46
|
+
// name: order.seller.name
|
|
47
|
+
// }, // 廃止(2024-03-06~)
|
|
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,
|
|
@@ -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: {
|
|
@@ -181,7 +182,6 @@ function createStartRefundTransactionParams(params) {
|
|
|
181
182
|
paymentMethod: {
|
|
182
183
|
additionalProperty: params.object.additionalProperty,
|
|
183
184
|
name: params.object.name,
|
|
184
|
-
// typeOf: params.object.typeOf,
|
|
185
185
|
typeOf: paymentMethodType,
|
|
186
186
|
paymentMethodId: params.object.paymentMethodId
|
|
187
187
|
},
|
|
@@ -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
|
@@ -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* () {
|
|
@@ -21,13 +21,13 @@ 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
|
-
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,
|
|
@@ -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
|
@@ -12,22 +12,22 @@ 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
|
-
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
|
-
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,
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import * as factory from '../../../../factory';
|
|
2
|
+
/**
|
|
3
|
+
* 受入オファーを注文アイテムに変換する
|
|
4
|
+
*/
|
|
5
|
+
declare function acceptedOffers2orderedItem(params: {
|
|
6
|
+
eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[];
|
|
7
|
+
productAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IPermit>[];
|
|
8
|
+
moneyTransferAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[];
|
|
9
|
+
}): factory.order.IOrderedItem[];
|
|
10
|
+
export { acceptedOffers2orderedItem };
|