@chevre/domain 21.27.0-alpha.5 → 21.27.0-alpha.7
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/payment/any/onRefund.js +42 -39
- package/lib/chevre/service/payment/creditCard.js +2 -1
- package/lib/chevre/service/payment/faceToFace.js +2 -1
- package/lib/chevre/service/payment/movieTicket.js +20 -26
- package/lib/chevre/service/reserve/factory.d.ts +8 -7
- package/lib/chevre/service/reserve/factory.js +15 -19
- package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js +27 -24
- package/lib/chevre/service/reserve.d.ts +1 -2
- package/lib/chevre/service/reserve.js +1 -4
- package/lib/chevre/service/task/returnPayTransaction.js +9 -5
- package/package.json +2 -2
|
@@ -38,47 +38,50 @@ function onRefund(refundAction) {
|
|
|
38
38
|
if (paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
|
|
39
39
|
const refundFee = (_b = refundAction.object[0]) === null || _b === void 0 ? void 0 : _b.refundFee;
|
|
40
40
|
if (typeof refundFee === 'number' && refundFee > 0) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
41
|
+
// purpose.typeOf:PlaceOrderは外部決済URL無効化における返金アクションのみなので、手数料決済から除外してよい(2024-03-19~)
|
|
42
|
+
if (refundAction.purpose.typeOf !== factory.transactionType.PlaceOrder) {
|
|
43
|
+
const payObject = refundAction.object.map((o) => {
|
|
44
|
+
return {
|
|
45
|
+
typeOf: o.typeOf,
|
|
46
|
+
id: o.id,
|
|
47
|
+
paymentMethod: {
|
|
48
|
+
accountId: o.paymentMethod.accountId,
|
|
49
|
+
additionalProperty: o.paymentMethod.additionalProperty,
|
|
50
|
+
name: o.paymentMethod.name,
|
|
51
|
+
paymentMethodId: o.paymentMethod.paymentMethodId,
|
|
52
|
+
totalPaymentDue: {
|
|
53
|
+
typeOf: 'MonetaryAmount',
|
|
54
|
+
currency: factory.priceCurrency.JPY,
|
|
55
|
+
value: refundFee
|
|
56
|
+
},
|
|
57
|
+
typeOf: o.paymentMethod.typeOf
|
|
58
|
+
}
|
|
59
|
+
};
|
|
60
|
+
});
|
|
61
|
+
const payAction = {
|
|
62
|
+
project: refundAction.project,
|
|
63
|
+
typeOf: factory.actionType.PayAction,
|
|
64
|
+
object: payObject,
|
|
65
|
+
agent: refundAction.project,
|
|
66
|
+
recipient: refundAction.agent,
|
|
67
|
+
purpose: refundAction.purpose,
|
|
68
|
+
potentialActions: {
|
|
69
|
+
add2report: true,
|
|
70
|
+
informPayment: (Array.isArray(informPayment)) ? informPayment : []
|
|
56
71
|
}
|
|
57
72
|
};
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
};
|
|
71
|
-
const payTask = {
|
|
72
|
-
project: refundAction.project,
|
|
73
|
-
name: factory.taskName.Pay,
|
|
74
|
-
status: factory.taskStatus.Ready,
|
|
75
|
-
runsAt: now,
|
|
76
|
-
remainingNumberOfTries: 10,
|
|
77
|
-
numberOfTried: 0,
|
|
78
|
-
executionResults: [],
|
|
79
|
-
data: payAction
|
|
80
|
-
};
|
|
81
|
-
taskAttributes.push(payTask);
|
|
73
|
+
const payTask = {
|
|
74
|
+
project: refundAction.project,
|
|
75
|
+
name: factory.taskName.Pay,
|
|
76
|
+
status: factory.taskStatus.Ready,
|
|
77
|
+
runsAt: now,
|
|
78
|
+
remainingNumberOfTries: 10,
|
|
79
|
+
numberOfTried: 0,
|
|
80
|
+
executionResults: [],
|
|
81
|
+
data: payAction
|
|
82
|
+
};
|
|
83
|
+
taskAttributes.push(payTask);
|
|
84
|
+
}
|
|
82
85
|
}
|
|
83
86
|
}
|
|
84
87
|
if (Array.isArray(informPayment)) {
|
|
@@ -453,7 +453,8 @@ function refundCreditCard(params, options) {
|
|
|
453
453
|
}
|
|
454
454
|
throw error;
|
|
455
455
|
}
|
|
456
|
-
|
|
456
|
+
const actionResult = { alterTranResult };
|
|
457
|
+
action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
|
|
457
458
|
yield (0, onRefund_1.onRefund)(action)(repos);
|
|
458
459
|
return action;
|
|
459
460
|
});
|
|
@@ -57,7 +57,8 @@ function refundFaceToFace(params) {
|
|
|
57
57
|
}
|
|
58
58
|
throw error;
|
|
59
59
|
}
|
|
60
|
-
|
|
60
|
+
const actionResult = {};
|
|
61
|
+
action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
|
|
61
62
|
yield (0, onRefund_1.onRefund)(action)(repos);
|
|
62
63
|
return action;
|
|
63
64
|
});
|
|
@@ -29,6 +29,7 @@ var MovieticketReserveRequestErrorMessage;
|
|
|
29
29
|
MovieticketReserveRequestErrorMessage["AlreadyPaid"] = "\u65E2\u306B\u5B58\u5728\u3059\u308B\u8208\u884C\u30B7\u30B9\u30C6\u30E0\u5EA7\u5E2D\u4E88\u7D04\u756A\u53F7\u304C\u5165\u529B\u3055\u308C\u307E\u3057\u305F\u3002";
|
|
30
30
|
MovieticketReserveRequestErrorMessage["NotFound"] = "\u5B58\u5728\u3057\u306A\u3044\u8208\u884C\u4F1A\u793E\u30B7\u30B9\u30C6\u30E0\u5EA7\u5E2D\u4E88\u7D04\u756A\u53F7\u304C\u5165\u529B\u3055\u308C\u307E\u3057\u305F\u3002";
|
|
31
31
|
MovieticketReserveRequestErrorMessage["ReservationResult19"] = "ReservationResult 19";
|
|
32
|
+
MovieticketReserveRequestErrorMessage["CancellationPeriodPassed"] = "\u5EA7\u5E2D\u4E88\u7D04\u53D6\u6D88\u53EF\u80FD\u671F\u9593\u3092\u904E\u304E\u3066\u3044\u307E\u3059\u3002";
|
|
32
33
|
})(MovieticketReserveRequestErrorMessage || (MovieticketReserveRequestErrorMessage = {}));
|
|
33
34
|
/**
|
|
34
35
|
* MovieTicket認証
|
|
@@ -61,9 +62,7 @@ function checkMovieTicket(params) {
|
|
|
61
62
|
});
|
|
62
63
|
const paymentMethodType = (_b = optimizedCheckObject[0]) === null || _b === void 0 ? void 0 : _b.paymentMethod.typeOf; // 決済方法区分
|
|
63
64
|
const paymentServiceId = (_c = optimizedCheckObject[0]) === null || _c === void 0 ? void 0 : _c.id;
|
|
64
|
-
const actionAttributes = Object.assign({ project: params.project, typeOf: factory.actionType.CheckAction, agent: params.agent,
|
|
65
|
-
// object: params.object,
|
|
66
|
-
object: optimizedCheckObject }, (typeof ((_d = params.purpose) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { purpose: params.purpose } : undefined);
|
|
65
|
+
const actionAttributes = Object.assign({ project: params.project, typeOf: factory.actionType.CheckAction, agent: params.agent, object: optimizedCheckObject }, (typeof ((_d = params.purpose) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { purpose: params.purpose } : undefined);
|
|
67
66
|
const action = yield repos.action.start(actionAttributes);
|
|
68
67
|
let checkResult;
|
|
69
68
|
try {
|
|
@@ -79,7 +78,6 @@ function checkMovieTicket(params) {
|
|
|
79
78
|
// イベント取得属性最適化(2023-01-23~)
|
|
80
79
|
screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] });
|
|
81
80
|
const sellerId = (_e = optimizedCheckObject[0]) === null || _e === void 0 ? void 0 : _e.seller.id;
|
|
82
|
-
// const paymentAccepted = seller.paymentAccepted?.some((a) => a.paymentMethodType === paymentMethodType);
|
|
83
81
|
const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
|
|
84
82
|
seller: { id: sellerId },
|
|
85
83
|
codeValue: paymentMethodType
|
|
@@ -198,7 +196,10 @@ function voidTransaction(params) {
|
|
|
198
196
|
if (typeof (seller === null || seller === void 0 ? void 0 : seller.id) !== 'string') {
|
|
199
197
|
throw new factory.errors.NotFound('payTransaction.recipient');
|
|
200
198
|
}
|
|
201
|
-
refundAction =
|
|
199
|
+
refundAction = {
|
|
200
|
+
project: transaction.project,
|
|
201
|
+
typeOf: factory.actionType.RefundAction,
|
|
202
|
+
object: [{
|
|
202
203
|
typeOf: transaction.object.typeOf,
|
|
203
204
|
id: (typeof transaction.object.id === 'string') ? transaction.object.id : '',
|
|
204
205
|
paymentMethod: {
|
|
@@ -209,13 +210,15 @@ function voidTransaction(params) {
|
|
|
209
210
|
: paymentMethodType,
|
|
210
211
|
additionalProperty: []
|
|
211
212
|
}
|
|
212
|
-
}],
|
|
213
|
+
}],
|
|
214
|
+
agent: {
|
|
213
215
|
id: seller.id,
|
|
214
216
|
name: (typeof seller.name === 'string') ? seller.name : String((_c = seller.name) === null || _c === void 0 ? void 0 : _c.ja),
|
|
215
217
|
typeOf: seller.typeOf
|
|
216
|
-
},
|
|
217
|
-
|
|
218
|
-
|
|
218
|
+
},
|
|
219
|
+
recipient: transaction.recipient,
|
|
220
|
+
purpose: payAction.purpose
|
|
221
|
+
};
|
|
219
222
|
yield refundMovieTicket(refundAction)(repos);
|
|
220
223
|
}
|
|
221
224
|
});
|
|
@@ -320,23 +323,9 @@ function payActionParams2seatInfoSyncIn(params) {
|
|
|
320
323
|
// イベント取得属性最適化(2023-01-23~)
|
|
321
324
|
const event = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] });
|
|
322
325
|
const sellerId = String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id);
|
|
323
|
-
// const sellers = <Pick<factory.seller.ISeller, 'id' | 'paymentAccepted' | 'project'>[]>await repos.seller.search(
|
|
324
|
-
// {
|
|
325
|
-
// limit: 1,
|
|
326
|
-
// page: 1,
|
|
327
|
-
// id: { $eq: sellerId }
|
|
328
|
-
// },
|
|
329
|
-
// ['paymentAccepted', 'project'],
|
|
330
|
-
// []
|
|
331
|
-
// );
|
|
332
|
-
// const seller = sellers.shift();
|
|
333
|
-
// if (seller === undefined) {
|
|
334
|
-
// throw new factory.errors.NotFound(factory.organizationType.Corporation);
|
|
335
|
-
// }
|
|
336
326
|
// 全購入管理番号のMovieTicketをマージ
|
|
337
327
|
const movieTickets = params.object.reduce((a, b) => [...a, ...(Array.isArray(b.movieTickets)) ? b.movieTickets : []], []);
|
|
338
328
|
const sellerCredentials = yield (0, getCredentials_1.getCredentials)({
|
|
339
|
-
// paymentMethodType,
|
|
340
329
|
seller: { id: sellerId, project: { id: event.project.id } },
|
|
341
330
|
paymentServiceId
|
|
342
331
|
})(repos);
|
|
@@ -353,7 +342,6 @@ function payActionParams2seatInfoSyncIn(params) {
|
|
|
353
342
|
movieTickets: movieTickets,
|
|
354
343
|
event: event,
|
|
355
344
|
purpose: params.purpose,
|
|
356
|
-
// seller: seller,
|
|
357
345
|
credentials: sellerCredentials
|
|
358
346
|
});
|
|
359
347
|
});
|
|
@@ -409,6 +397,13 @@ function refundMovieTicket(params) {
|
|
|
409
397
|
seatInfoSyncResult = error;
|
|
410
398
|
throwsError = false;
|
|
411
399
|
}
|
|
400
|
+
// 着券取消可能期間超過を認識した上でのあえての返金の場合(注文からしばらく経って返品など)(2024-03-19~)
|
|
401
|
+
if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.CancellationPeriodPassed) {
|
|
402
|
+
if (params.purpose.typeOf === factory.actionType.ReturnAction) {
|
|
403
|
+
seatInfoSyncResult = error;
|
|
404
|
+
throwsError = false;
|
|
405
|
+
}
|
|
406
|
+
}
|
|
412
407
|
}
|
|
413
408
|
if (throwsError) {
|
|
414
409
|
let message = String(error.message);
|
|
@@ -425,8 +420,7 @@ function refundMovieTicket(params) {
|
|
|
425
420
|
throw error;
|
|
426
421
|
}
|
|
427
422
|
}
|
|
428
|
-
|
|
429
|
-
const actionResult = { seatInfoSyncIn, seatInfoSyncResult };
|
|
423
|
+
const actionResult = Object.assign(Object.assign({}, (seatInfoSyncIn !== undefined) ? { seatInfoSyncIn } : undefined), (seatInfoSyncResult !== undefined) ? { seatInfoSyncResult } : undefined);
|
|
430
424
|
action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
|
|
431
425
|
yield (0, onRefund_1.onRefund)(action)(repos);
|
|
432
426
|
return action;
|
|
@@ -1,24 +1,25 @@
|
|
|
1
1
|
import * as factory from '../../factory';
|
|
2
2
|
type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;
|
|
3
3
|
type IMaskedUnderName = Pick<factory.reservation.IUnderName<factory.reservationType.EventReservation>, 'id' | 'typeOf'>;
|
|
4
|
-
|
|
5
|
-
underName
|
|
6
|
-
};
|
|
7
|
-
|
|
8
|
-
export interface IProject {
|
|
4
|
+
export declare function optimizeUnderName4inform(params: {
|
|
5
|
+
underName: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
|
|
6
|
+
}): IMaskedUnderName;
|
|
7
|
+
interface IProject {
|
|
9
8
|
id: string;
|
|
10
9
|
typeOf: factory.organizationType.Project;
|
|
11
10
|
}
|
|
12
|
-
export type
|
|
11
|
+
export type ISubReservation4inform = Pick<IEventReservation, 'additionalProperty' | 'additionalTicketText' | 'attended' | 'bookingTime' | 'checkedIn' | 'id' | 'modifiedTime' | 'numSeats' | 'price' | 'programMembershipUsed' | 'reservedTicket' | 'subReservation' | 'typeOf'>;
|
|
13
12
|
/**
|
|
14
13
|
* 確定予約通知
|
|
15
14
|
*/
|
|
16
15
|
export interface IReservationPackage4informConfirmed {
|
|
16
|
+
issuedThrough: factory.reservation.eventReservation.IIssuedThrough;
|
|
17
17
|
project: IProject;
|
|
18
|
+
provider: factory.reservation.IProvider;
|
|
18
19
|
reservationFor: factory.reservation.IReservationFor<factory.reservationType.EventReservation>;
|
|
19
20
|
reservationNumber: string;
|
|
20
21
|
reservationStatus: factory.reservationStatusType;
|
|
21
|
-
subReservation:
|
|
22
|
+
subReservation: ISubReservation4inform[];
|
|
22
23
|
underName?: IMaskedUnderName;
|
|
23
24
|
typeOf: factory.reservationType.ReservationPackage;
|
|
24
25
|
}
|
|
@@ -1,23 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.NUM_TRY_INFORM_RESERVATION = exports.
|
|
4
|
-
function
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
// }
|
|
18
|
-
? { id: reservation.underName.id, typeOf: reservation.underName.typeOf }
|
|
19
|
-
: undefined;
|
|
20
|
-
return Object.assign(Object.assign({}, reservation), (underName !== undefined) ? { underName } : undefined);
|
|
3
|
+
exports.NUM_TRY_INFORM_RESERVATION = exports.optimizeUnderName4inform = void 0;
|
|
4
|
+
function optimizeUnderName4inform(params) {
|
|
5
|
+
// ReservationPackage通知アクションのobject.underNameを最小化(2024-03-19~)
|
|
6
|
+
// ? {
|
|
7
|
+
// ...reservation.underName,
|
|
8
|
+
// email: MASKED_PROFILE,
|
|
9
|
+
// telephone: MASKED_PROFILE,
|
|
10
|
+
// name: MASKED_PROFILE,
|
|
11
|
+
// familyName: MASKED_PROFILE,
|
|
12
|
+
// givenName: MASKED_PROFILE,
|
|
13
|
+
// // identifierも隠蔽(2022-12-27~)
|
|
14
|
+
// identifier: []
|
|
15
|
+
// }
|
|
16
|
+
return { id: params.underName.id, typeOf: params.underName.typeOf };
|
|
21
17
|
}
|
|
22
|
-
exports.
|
|
18
|
+
exports.optimizeUnderName4inform = optimizeUnderName4inform;
|
|
23
19
|
exports.NUM_TRY_INFORM_RESERVATION = 10;
|
|
@@ -8,17 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var __rest = (this && this.__rest) || function (s, e) {
|
|
12
|
-
var t = {};
|
|
13
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
14
|
-
t[p] = s[p];
|
|
15
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
16
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
17
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
18
|
-
t[p[i]] = s[p[i]];
|
|
19
|
-
}
|
|
20
|
-
return t;
|
|
21
|
-
};
|
|
22
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
12
|
exports.onReservationConfirmed = exports.onReservationConfirmedByAction = void 0;
|
|
24
13
|
/**
|
|
@@ -65,30 +54,44 @@ exports.onReservationConfirmedByAction = onReservationConfirmedByAction;
|
|
|
65
54
|
function onReservationConfirmed(confirmedReservations) {
|
|
66
55
|
return (repos) => __awaiter(this, void 0, void 0, function* () {
|
|
67
56
|
if (Array.isArray(confirmedReservations) && confirmedReservations.length > 0) {
|
|
57
|
+
// ひとつめの予約からReservationPackageの共有属性を取り出す
|
|
58
|
+
const { issuedThrough, project, provider, reservationFor, reservationNumber, reservationStatus, underName } = confirmedReservations[0];
|
|
68
59
|
yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
|
|
69
|
-
project
|
|
70
|
-
reservationFor: [{ id:
|
|
60
|
+
project,
|
|
61
|
+
reservationFor: [{ id: reservationFor.id }],
|
|
71
62
|
force: false,
|
|
72
|
-
identifier: `onReservationConfirmed:${
|
|
63
|
+
identifier: `onReservationConfirmed:${reservationNumber}`
|
|
73
64
|
})({ task: repos.task });
|
|
74
65
|
const now = new Date();
|
|
75
66
|
const taskAttributes = [];
|
|
76
67
|
// inform galobally
|
|
77
68
|
if (Array.isArray(informReservations)) {
|
|
78
69
|
taskAttributes.push(...informReservations.map((informReservation) => {
|
|
79
|
-
var _a
|
|
80
|
-
const
|
|
70
|
+
var _a;
|
|
71
|
+
const subReservations4inform = confirmedReservations.map((r) => {
|
|
72
|
+
// const {
|
|
73
|
+
// broker, project, reservationFor, reservationNumber, reservationStatus, underName,
|
|
74
|
+
// ...subReservation
|
|
75
|
+
// } = r;
|
|
76
|
+
const { additionalProperty, additionalTicketText, attended, bookingTime, checkedIn, id, modifiedTime, numSeats, price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
|
|
77
|
+
return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ id,
|
|
78
|
+
typeOf,
|
|
79
|
+
reservedTicket }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), (typeof attended === 'boolean') ? { attended } : undefined), (typeof checkedIn === 'boolean') ? { checkedIn } : undefined), (bookingTime instanceof Date) ? { bookingTime } : undefined), (modifiedTime instanceof Date) ? { modifiedTime } : undefined), (typeof numSeats === 'number') ? { numSeats } : undefined), (price !== undefined) ? { price } : undefined), (programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined), (Array.isArray(subReservation)) ? { subReservation } : undefined);
|
|
80
|
+
});
|
|
81
81
|
// ReservationPackage通知に変更(2022-12-24~)
|
|
82
|
-
const informObject = [Object.assign({
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
82
|
+
const informObject = [Object.assign({ issuedThrough,
|
|
83
|
+
project,
|
|
84
|
+
provider,
|
|
85
|
+
reservationFor,
|
|
86
|
+
reservationNumber,
|
|
87
|
+
reservationStatus, subReservation: subReservations4inform, typeOf: factory.reservationType.ReservationPackage }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string')
|
|
88
|
+
? { underName: (0, factory_1.optimizeUnderName4inform)({ underName }) }
|
|
87
89
|
: undefined)];
|
|
90
|
+
const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
|
|
88
91
|
const informReservationAttributes = {
|
|
89
|
-
agent:
|
|
92
|
+
agent: project,
|
|
90
93
|
object: informObject,
|
|
91
|
-
project
|
|
94
|
+
project,
|
|
92
95
|
recipient: {
|
|
93
96
|
id: '',
|
|
94
97
|
name: informUrl,
|
|
@@ -98,7 +101,7 @@ function onReservationConfirmed(confirmedReservations) {
|
|
|
98
101
|
typeOf: factory.actionType.InformAction
|
|
99
102
|
};
|
|
100
103
|
return {
|
|
101
|
-
project
|
|
104
|
+
project,
|
|
102
105
|
name: factory.taskName.TriggerWebhook,
|
|
103
106
|
status: factory.taskStatus.Ready,
|
|
104
107
|
runsAt: now,
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* 予約サービス
|
|
3
3
|
*/
|
|
4
|
-
import { maskUnderName } from './reserve/factory';
|
|
5
4
|
import { cancelPendingReservation, cancelReservation } from './reserve/cancelReservation';
|
|
6
5
|
import { checkInReservation } from './reserve/checkInReservation';
|
|
7
6
|
import { confirmReservation } from './reserve/confirmReservation';
|
|
8
7
|
import { findByCode } from './reserve/findByCode';
|
|
9
8
|
import { searchByOrder } from './reserve/searchByOrder';
|
|
10
9
|
import { verifyToken4reservation } from './reserve/verifyToken4reservation';
|
|
11
|
-
export {
|
|
10
|
+
export { cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, searchByOrder, verifyToken4reservation };
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.verifyToken4reservation = exports.searchByOrder = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation =
|
|
3
|
+
exports.verifyToken4reservation = exports.searchByOrder = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = void 0;
|
|
4
4
|
/**
|
|
5
5
|
* 予約サービス
|
|
6
6
|
*/
|
|
7
|
-
const factory_1 = require("./reserve/factory");
|
|
8
|
-
Object.defineProperty(exports, "maskUnderName", { enumerable: true, get: function () { return factory_1.maskUnderName; } });
|
|
9
7
|
const cancelReservation_1 = require("./reserve/cancelReservation");
|
|
10
8
|
Object.defineProperty(exports, "cancelPendingReservation", { enumerable: true, get: function () { return cancelReservation_1.cancelPendingReservation; } });
|
|
11
9
|
Object.defineProperty(exports, "cancelReservation", { enumerable: true, get: function () { return cancelReservation_1.cancelReservation; } });
|
|
@@ -17,6 +15,5 @@ const findByCode_1 = require("./reserve/findByCode");
|
|
|
17
15
|
Object.defineProperty(exports, "findByCode", { enumerable: true, get: function () { return findByCode_1.findByCode; } });
|
|
18
16
|
const searchByOrder_1 = require("./reserve/searchByOrder");
|
|
19
17
|
Object.defineProperty(exports, "searchByOrder", { enumerable: true, get: function () { return searchByOrder_1.searchByOrder; } });
|
|
20
|
-
// import { useReservation } from './reserve/useReservation';
|
|
21
18
|
const verifyToken4reservation_1 = require("./reserve/verifyToken4reservation");
|
|
22
19
|
Object.defineProperty(exports, "verifyToken4reservation", { enumerable: true, get: function () { return verifyToken4reservation_1.verifyToken4reservation; } });
|
|
@@ -117,13 +117,17 @@ function returnPayTransaction(params) {
|
|
|
117
117
|
});
|
|
118
118
|
}
|
|
119
119
|
function createRefundPurpose(params, order) {
|
|
120
|
-
const returnOrderRecipient
|
|
120
|
+
// const returnOrderRecipient: factory.action.IParticipantAsSeller = {
|
|
121
|
+
// id: order.seller.id,
|
|
122
|
+
// typeOf: order.seller.typeOf,
|
|
123
|
+
// ...(typeof order.seller.name === 'string') ? { name: order.seller.name } : undefined
|
|
124
|
+
// };
|
|
121
125
|
return {
|
|
122
|
-
project: order.project,
|
|
126
|
+
// project: order.project,
|
|
123
127
|
typeOf: factory.actionType.ReturnAction,
|
|
124
|
-
object: Object.assign(Object.assign({}, params.purpose), { dateReturned: order.dateReturned })
|
|
125
|
-
agent: order.project,
|
|
126
|
-
recipient: returnOrderRecipient
|
|
128
|
+
object: Object.assign(Object.assign({}, params.purpose), { dateReturned: order.dateReturned })
|
|
129
|
+
// agent: order.project,
|
|
130
|
+
// recipient: returnOrderRecipient
|
|
127
131
|
};
|
|
128
132
|
}
|
|
129
133
|
function refundTransactionAlreadyExists(params) {
|
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.363.0-alpha.
|
|
13
|
+
"@chevre/factory": "4.363.0-alpha.2",
|
|
14
14
|
"@cinerino/sdk": "5.14.0",
|
|
15
15
|
"@motionpicture/coa-service": "9.4.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.27.0-alpha.
|
|
113
|
+
"version": "21.27.0-alpha.7"
|
|
114
114
|
}
|