@chevre/domain 24.0.0-alpha.40 → 24.0.0-alpha.42
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/repo/accountTitle.d.ts +3 -3
- package/lib/chevre/repo/action/pay.d.ts +25 -0
- package/lib/chevre/repo/action/pay.js +54 -0
- package/lib/chevre/repo/action/refund.d.ts +9 -0
- package/lib/chevre/repo/action/refund.js +13 -0
- package/lib/chevre/repo/action.d.ts +5 -14
- package/lib/chevre/repo/action.js +20 -13
- package/lib/chevre/repo/additionalProperty.js +2 -2
- package/lib/chevre/repo/advanceBookingRequirement.d.ts +1 -3
- package/lib/chevre/repo/advanceBookingRequirement.js +2 -2
- package/lib/chevre/repo/aggregateOffer.d.ts +5 -9
- package/lib/chevre/repo/aggregateOffer.js +3 -3
- package/lib/chevre/repo/assetTransaction.d.ts +3 -3
- package/lib/chevre/repo/assetTransaction.js +12 -6
- package/lib/chevre/repo/categoryCode.d.ts +4 -6
- package/lib/chevre/repo/categoryCode.js +2 -2
- package/lib/chevre/repo/comment.d.ts +3 -3
- package/lib/chevre/repo/creativeWork.d.ts +3 -3
- package/lib/chevre/repo/creativeWork.js +3 -3
- package/lib/chevre/repo/customer.d.ts +3 -3
- package/lib/chevre/repo/customer.js +2 -2
- package/lib/chevre/repo/emailMessage.js +1 -1
- package/lib/chevre/repo/event.d.ts +6 -6
- package/lib/chevre/repo/event.js +10 -4
- package/lib/chevre/repo/eventSeries.d.ts +6 -6
- package/lib/chevre/repo/eventSeries.js +2 -2
- package/lib/chevre/repo/identity.d.ts +4 -6
- package/lib/chevre/repo/identityProvider.d.ts +4 -6
- package/lib/chevre/repo/identityProvider.js +2 -2
- package/lib/chevre/repo/issuer.d.ts +3 -3
- package/lib/chevre/repo/issuer.js +3 -3
- package/lib/chevre/repo/member.d.ts +3 -3
- package/lib/chevre/repo/merchantReturnPolicy.d.ts +3 -3
- package/lib/chevre/repo/merchantReturnPolicy.js +1 -1
- package/lib/chevre/repo/mongoose/schemas/acceptedPaymentMethod.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/account.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/accountTitle.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/accountTransaction.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/accountingReport.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/action.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/actionRecipe.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/additionalProperty.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/advanceBookingRequirement.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/aggregateOffer.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/aggregateOrder.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/aggregateReservation.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/aggregation.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/assetTransaction.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/authorization.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/categoryCode.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/civicStructure.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/comments.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/creativeWork.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/customer.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/customerType.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/emailMessages.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/event.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/eventOffer.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/eventSeries.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/identity.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/identityProvider.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/issuer.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/member/global.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/member.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/merchantReturnPolicy.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/message.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/movieTicketTypes.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/note.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/offerCatalog.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/offerCatalogItem.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/offerItemCondition.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/order.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/ownershipInfo.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/paymentService.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/paymentServiceChannel.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/pendingReservation.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/pendingReservationAggregate.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/place.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/potentialAction.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/priceSpecification.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/product.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/productModel.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/productOffer.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/project.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/reservation.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/reserveInterface.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/role.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/schedule.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/seller.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/sellerReturnPolicy.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/service/availableHour.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/serviceOutput.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/setting.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/task.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/ticket.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/transaction.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/transactionNumber.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/trip.d.ts +2 -2
- package/lib/chevre/repo/mongoose/schemas/webSite.d.ts +2 -2
- package/lib/chevre/repo/movieTicketType.d.ts +1 -3
- package/lib/chevre/repo/movieTicketType.js +2 -2
- package/lib/chevre/repo/offer/offerInCatalogReadOnly.d.ts +1 -3
- package/lib/chevre/repo/offer/unitPriceInCatalog.d.ts +1 -3
- package/lib/chevre/repo/offerCatalog.d.ts +3 -3
- package/lib/chevre/repo/offerCatalog.js +5 -4
- package/lib/chevre/repo/offerCatalogItem.js +4 -4
- package/lib/chevre/repo/offerItemCondition.js +2 -2
- package/lib/chevre/repo/order.d.ts +3 -3
- package/lib/chevre/repo/ownershipInfo.d.ts +3 -3
- package/lib/chevre/repo/passport.js +1 -1
- package/lib/chevre/repo/paymentService.d.ts +1 -3
- package/lib/chevre/repo/paymentService.js +2 -2
- package/lib/chevre/repo/paymentServiceChannel.d.ts +1 -3
- package/lib/chevre/repo/paymentServiceChannel.js +2 -2
- package/lib/chevre/repo/person.js +2 -2
- package/lib/chevre/repo/place/busStop.js +1 -1
- package/lib/chevre/repo/place/movieTheater.d.ts +3 -3
- package/lib/chevre/repo/place/movieTheater.js +10 -4
- package/lib/chevre/repo/place/screeningRoom.d.ts +3 -3
- package/lib/chevre/repo/place/screeningRoom.js +2 -2
- package/lib/chevre/repo/place/seat.d.ts +2 -4
- package/lib/chevre/repo/potentialAction.d.ts +4 -6
- package/lib/chevre/repo/potentialAction.js +2 -2
- package/lib/chevre/repo/priceSpecification.d.ts +3 -3
- package/lib/chevre/repo/priceSpecification.js +2 -2
- package/lib/chevre/repo/product.d.ts +5 -9
- package/lib/chevre/repo/product.js +3 -3
- package/lib/chevre/repo/productModel.js +2 -2
- package/lib/chevre/repo/project.d.ts +3 -3
- package/lib/chevre/repo/rateLimit/offer.js +1 -1
- package/lib/chevre/repo/reservation.d.ts +4 -6
- package/lib/chevre/repo/seller.d.ts +5 -9
- package/lib/chevre/repo/seller.js +2 -2
- package/lib/chevre/repo/sellerReturnPolicy.d.ts +1 -3
- package/lib/chevre/repo/sellerReturnPolicy.js +2 -2
- package/lib/chevre/repo/task.d.ts +3 -3
- package/lib/chevre/repo/task.js +1 -1
- package/lib/chevre/repo/transaction.d.ts +3 -3
- package/lib/chevre/repo/transactionProcess.js +1 -1
- package/lib/chevre/repo/trip.d.ts +4 -12
- package/lib/chevre/repo/trip.js +3 -3
- package/lib/chevre/repo/webSite.d.ts +1 -3
- package/lib/chevre/repo/webSite.js +3 -2
- package/lib/chevre/repository.d.ts +10 -0
- package/lib/chevre/repository.js +22 -0
- package/lib/chevre/service/assetTransaction/moneyTransfer.js +8 -5
- package/lib/chevre/service/assetTransaction/pay/confirm.d.ts +1 -1
- package/lib/chevre/service/assetTransaction/pay/exportTasksById.js +2 -1
- package/lib/chevre/service/assetTransaction/pay/publishPaymentUrl.js +2 -1
- package/lib/chevre/service/assetTransaction/pay/start/factory.js +2 -1
- package/lib/chevre/service/assetTransaction/pay/start/processAuthorize.d.ts +7 -2
- package/lib/chevre/service/assetTransaction/pay/start/processAuthorizeMovieTicket.d.ts +7 -2
- package/lib/chevre/service/assetTransaction/pay/start.d.ts +7 -2
- package/lib/chevre/service/assetTransaction/refund.d.ts +5 -2
- package/lib/chevre/service/assetTransaction/refund.js +1 -1
- package/lib/chevre/service/assetTransaction/reserve/start/createSubReservations.js +6 -3
- package/lib/chevre/service/assetTransaction/reserve/start/factory/createStartParams.js +3 -2
- package/lib/chevre/service/delivery/factory.js +2 -1
- package/lib/chevre/service/event/saveScreeningEvents.js +2 -2
- package/lib/chevre/service/event.js +1 -1
- package/lib/chevre/service/notification/notifyByEmail.d.ts +1 -1
- package/lib/chevre/service/notification/triggerWebhook.js +1 -1
- package/lib/chevre/service/offer/event/authorize.js +2 -1
- package/lib/chevre/service/offer/event/searchEventTicketOffers.js +2 -1
- package/lib/chevre/service/offer/event/searchOffersByIds.js +2 -1
- package/lib/chevre/service/offer/event/voidTransaction.js +6 -3
- package/lib/chevre/service/offer/event/voidTransactionByActionId.js +2 -1
- package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.js +14 -11
- package/lib/chevre/service/offer/eventServiceByCOA/authorize.d.ts +1 -1
- package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.d.ts +1 -1
- package/lib/chevre/service/offer/eventServiceByCOA/findAcceptAction.js +2 -1
- package/lib/chevre/service/offer/product.js +1 -1
- package/lib/chevre/service/order/confirmPayTransaction.d.ts +1 -1
- package/lib/chevre/service/order/onAssetTransactionStatusChanged.js +2 -1
- package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned.js +4 -2
- package/lib/chevre/service/payment/any/authorize.d.ts +7 -2
- package/lib/chevre/service/payment/any/findAcceptAction.js +2 -1
- package/lib/chevre/service/payment/any/findAuthorizeAction.js +2 -1
- package/lib/chevre/service/payment/any/findCheckAction.js +2 -1
- package/lib/chevre/service/payment/any/invalidatePaymentUrl.js +2 -1
- package/lib/chevre/service/payment/any/onPayActionCompleted.d.ts +7 -2
- package/lib/chevre/service/payment/any/onPayActionCompleted.js +7 -2
- package/lib/chevre/service/payment/any/onPaymentStatusChanged.d.ts +10 -5
- package/lib/chevre/service/payment/any/onPaymentStatusChanged.js +21 -11
- package/lib/chevre/service/payment/any/onRefundActionCompletedOrFailed.d.ts +13 -10
- package/lib/chevre/service/payment/any/onRefundActionCompletedOrFailed.js +9 -6
- package/lib/chevre/service/payment/any/processVoidPayTransaction.js +2 -1
- package/lib/chevre/service/payment/any/verifyTicketTokenAsNeeded.js +2 -1
- package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.js +1 -1
- package/lib/chevre/service/payment/creditCard/payCreditCard.d.ts +7 -2
- package/lib/chevre/service/payment/creditCard/payCreditCard.js +8 -4
- package/lib/chevre/service/payment/creditCard/refundCreditCard.d.ts +7 -2
- package/lib/chevre/service/payment/creditCard/refundCreditCard.js +11 -7
- package/lib/chevre/service/payment/faceToFace.d.ts +12 -3
- package/lib/chevre/service/payment/faceToFace.js +16 -8
- package/lib/chevre/service/payment/factory/createPayObjectServiceOutput.js +2 -1
- package/lib/chevre/service/payment/factory.js +4 -2
- package/lib/chevre/service/payment/movieTicket/authorize.d.ts +7 -2
- package/lib/chevre/service/payment/movieTicket/authorize.js +1 -1
- package/lib/chevre/service/payment/movieTicket/payMovieTicket/payActionParams2seatInfoSyncIn.d.ts +12 -0
- package/lib/chevre/service/payment/movieTicket/payMovieTicket/payActionParams2seatInfoSyncIn.js +72 -0
- package/lib/chevre/service/payment/movieTicket/payMovieTicket/processSeatInfoSync.d.ts +8 -0
- package/lib/chevre/service/payment/movieTicket/payMovieTicket/processSeatInfoSync.js +29 -0
- package/lib/chevre/service/payment/movieTicket/payMovieTicket.d.ts +8 -3
- package/lib/chevre/service/payment/movieTicket/payMovieTicket.js +14 -77
- package/lib/chevre/service/payment/movieTicket/refundMovieTicket/createSeatInfoSyncCancelInOnRefund.d.ts +14 -0
- package/lib/chevre/service/payment/movieTicket/refundMovieTicket/createSeatInfoSyncCancelInOnRefund.js +49 -0
- package/lib/chevre/service/payment/movieTicket/refundMovieTicket/createSeatInfoSyncInOnRefund.d.ts +14 -0
- package/lib/chevre/service/payment/movieTicket/refundMovieTicket/createSeatInfoSyncInOnRefund.js +46 -0
- package/lib/chevre/service/payment/movieTicket/refundMovieTicket/processSeatInfoSync.d.ts +12 -0
- package/lib/chevre/service/payment/movieTicket/refundMovieTicket/processSeatInfoSync.js +72 -0
- package/lib/chevre/service/payment/movieTicket/refundMovieTicket/processSeatInfoSyncCancel.d.ts +8 -0
- package/lib/chevre/service/payment/movieTicket/refundMovieTicket/processSeatInfoSyncCancel.js +60 -0
- package/lib/chevre/service/payment/movieTicket/refundMovieTicket.d.ts +8 -3
- package/lib/chevre/service/payment/movieTicket/refundMovieTicket.js +20 -125
- package/lib/chevre/service/payment/movieTicket/validation.d.ts +1 -2
- package/lib/chevre/service/payment/movieTicket/validation.js +37 -29
- package/lib/chevre/service/payment/movieTicket/voidTransaction.d.ts +6 -2
- package/lib/chevre/service/payment/movieTicket/voidTransaction.js +1 -1
- package/lib/chevre/service/payment/paymentCard.d.ts +12 -3
- package/lib/chevre/service/payment/paymentCard.js +16 -8
- package/lib/chevre/service/permit.js +4 -2
- package/lib/chevre/service/reserve/factory.d.ts +1 -1
- package/lib/chevre/service/reserve/findByCode.js +2 -1
- package/lib/chevre/service/reserve/searchByOrder.js +2 -1
- package/lib/chevre/service/reserve/verifyToken4reservation.js +2 -1
- package/lib/chevre/service/task/authorizePayment.js +8 -2
- package/lib/chevre/service/task/confirmReserveTransaction.js +4 -2
- package/lib/chevre/service/task/invalidatePaymentUrl.js +8 -2
- package/lib/chevre/service/task/onResourceUpdated.js +1 -1
- package/lib/chevre/service/task/pay.js +8 -2
- package/lib/chevre/service/task/payment/invalidatePaymentUrlByTask.d.ts +7 -2
- package/lib/chevre/service/task/payment/payByTask.d.ts +7 -2
- package/lib/chevre/service/task/payment/payByTask.js +2 -1
- package/lib/chevre/service/task/payment/refundByTask.d.ts +7 -2
- package/lib/chevre/service/task/payment/voidPaymentByTask.d.ts +6 -0
- package/lib/chevre/service/task/refund.js +8 -2
- package/lib/chevre/service/task/returnPayTransaction.js +5 -2
- package/lib/chevre/service/task/returnReserveTransaction.js +2 -1
- package/lib/chevre/service/task/voidPayment.js +6 -0
- package/lib/chevre/service/transaction/deleteTransaction.js +4 -2
- package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js +2 -1
- package/lib/chevre/service/transaction/returnOrder/exportTasks/factory.js +2 -1
- package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js +2 -2
- package/lib/chevre/service/transaction/returnOrder/preStart/getReturnPolicyByProject.js +5 -3
- package/lib/chevre/service/validation/validateOrder.js +4 -2
- package/package.json +2 -2
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import * as factory from '../../factory';
|
|
2
|
-
import type {
|
|
2
|
+
import type { PayActionRepo } from '../../repo/action/pay';
|
|
3
3
|
import type { AssetTransactionRepo } from '../../repo/assetTransaction';
|
|
4
4
|
import type { PaymentServiceRepo } from '../../repo/paymentService';
|
|
5
5
|
import type { PotentialActionRepo } from '../../repo/potentialAction';
|
|
6
6
|
import type { ProductRepo } from '../../repo/product';
|
|
7
7
|
import type { TaskRepo } from '../../repo/task';
|
|
8
8
|
export interface IStartOperationRepos {
|
|
9
|
-
action
|
|
9
|
+
action?: never;
|
|
10
|
+
actions: {
|
|
11
|
+
pay: PayActionRepo;
|
|
12
|
+
};
|
|
10
13
|
paymentService: PaymentServiceRepo;
|
|
11
14
|
potentialAction: PotentialActionRepo;
|
|
12
15
|
product: ProductRepo;
|
|
@@ -54,7 +54,7 @@ function start(params) {
|
|
|
54
54
|
});
|
|
55
55
|
const paymentServiceType = payTransaction.object.typeOf;
|
|
56
56
|
// PayActionを確認する
|
|
57
|
-
const payAction = await repos.
|
|
57
|
+
const payAction = await repos.actions.pay.findPayActionByPaymentMethodId({ project: { id: params.project.id }, paymentMethodId });
|
|
58
58
|
if (payAction === undefined) {
|
|
59
59
|
throw new factory.errors.NotFound(factory.actionType.PayAction);
|
|
60
60
|
}
|
|
@@ -421,7 +421,7 @@ function validateProgramMembershipUsed(params) {
|
|
|
421
421
|
throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
|
|
422
422
|
}
|
|
423
423
|
switch (permitIssuedThrough.typeOf) {
|
|
424
|
-
case factory.service.paymentService.PaymentServiceType.FaceToFace:
|
|
424
|
+
case factory.service.paymentService.PaymentServiceType.FaceToFace: {
|
|
425
425
|
// 適用メンバーシップ条件有のオファーであれば、問答無用に受け入れる
|
|
426
426
|
const eligibleMembershipType = params.availableOffer.eligibleMembershipType?.[0]?.codeValue;
|
|
427
427
|
if (typeof eligibleMembershipType === 'string') {
|
|
@@ -435,8 +435,9 @@ function validateProgramMembershipUsed(params) {
|
|
|
435
435
|
};
|
|
436
436
|
}
|
|
437
437
|
break;
|
|
438
|
+
}
|
|
438
439
|
// 発行サービスがCreditCardのケースに対応(2023-09-01~)
|
|
439
|
-
case factory.service.paymentService.PaymentServiceType.CreditCard:
|
|
440
|
+
case factory.service.paymentService.PaymentServiceType.CreditCard: {
|
|
440
441
|
// 決済サービスのserviceOutputにPermitが存在すれば、設定されたメンバーシップ区分のPermitをprogramMembershipUsedとして適用する
|
|
441
442
|
let issuedThroughServiceType;
|
|
442
443
|
if (Array.isArray(permitIssuedThrough.serviceOutput)) {
|
|
@@ -460,7 +461,8 @@ function validateProgramMembershipUsed(params) {
|
|
|
460
461
|
throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'issuedThrough has no serviceOutput as Permit');
|
|
461
462
|
}
|
|
462
463
|
break;
|
|
463
|
-
|
|
464
|
+
}
|
|
465
|
+
case factory.product.ProductType.MembershipService: {
|
|
464
466
|
// requestedProgramMembershipUsedの発行サービスIDから外部連携設定を取得する
|
|
465
467
|
const permitService = await createPermitService({ issuedThrough: { id: permitIssuedThrough.id } })(repos);
|
|
466
468
|
// メンバーシップの存在確認
|
|
@@ -492,6 +494,7 @@ function validateProgramMembershipUsed(params) {
|
|
|
492
494
|
};
|
|
493
495
|
}
|
|
494
496
|
break;
|
|
497
|
+
}
|
|
495
498
|
default:
|
|
496
499
|
throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', `${permitIssuedThrough.typeOf} not implemented`);
|
|
497
500
|
}
|
|
@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.createStartParams = createStartParams;
|
|
27
27
|
const factory = __importStar(require("../../../../../factory"));
|
|
28
|
+
const USE_DEPRECATED_RESERVATION_AVAILABLE_CHANNEL = process.env.USE_DEPRECATED_RESERVATION_AVAILABLE_CHANNEL === '1';
|
|
28
29
|
function createStartParams(params) {
|
|
29
30
|
const { reservationNumber, acceptedOffers4transactionObject, objectSubReservations, agent, expires, project, instrument } = params;
|
|
30
31
|
const provider = {
|
|
@@ -135,9 +136,9 @@ function createIssuedThrough(params) {
|
|
|
135
136
|
typeOf: factory.product.ProductType.EventService,
|
|
136
137
|
// 興行IDを追加(2022-09-08~)
|
|
137
138
|
id: eventOffers.itemOffered.id,
|
|
138
|
-
availableChannel,
|
|
139
139
|
// issuedThrough.serviceTypeを連携
|
|
140
|
-
...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
|
|
140
|
+
...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined,
|
|
141
|
+
...(USE_DEPRECATED_RESERVATION_AVAILABLE_CHANNEL) && { availableChannel }
|
|
141
142
|
};
|
|
142
143
|
return {
|
|
143
144
|
issuedThrough
|
|
@@ -57,7 +57,7 @@ function createOwnershipInfosFromOrder(params) {
|
|
|
57
57
|
if (ownedBy.length > 0) {
|
|
58
58
|
const itemOfferedType = itemOffered.typeOf;
|
|
59
59
|
switch (itemOfferedType) {
|
|
60
|
-
case factory.reservationType.EventReservation:
|
|
60
|
+
case factory.reservationType.EventReservation: {
|
|
61
61
|
const excludeCOAReservation = acceptedOffer.offeredThrough?.identifier === factory.service.webAPI.Identifier.COA;
|
|
62
62
|
if (excludeCOAReservation) {
|
|
63
63
|
// bookingService:COAでは作成しない(2024-12-31~)
|
|
@@ -73,6 +73,7 @@ function createOwnershipInfosFromOrder(params) {
|
|
|
73
73
|
});
|
|
74
74
|
}
|
|
75
75
|
break;
|
|
76
|
+
}
|
|
76
77
|
case factory.permit.PermitType.Permit:
|
|
77
78
|
ownershipInfo = (0, factory_1.createProductOwnershipInfo)({
|
|
78
79
|
project: params.order.project,
|
|
@@ -50,7 +50,7 @@ function saveScreeningEvents(params, options) {
|
|
|
50
50
|
upsert: true
|
|
51
51
|
});
|
|
52
52
|
}
|
|
53
|
-
catch (
|
|
53
|
+
catch (_error) {
|
|
54
54
|
// no op
|
|
55
55
|
}
|
|
56
56
|
}
|
|
@@ -229,7 +229,7 @@ function createScreeningEventFromCOA(params) {
|
|
|
229
229
|
addDay4endDate += Math.floor(Number(timeEnd) / DAY);
|
|
230
230
|
timeEnd = `0000${Number(timeEnd) % DAY}`.slice(-4);
|
|
231
231
|
}
|
|
232
|
-
catch (
|
|
232
|
+
catch (_error) {
|
|
233
233
|
// no op
|
|
234
234
|
}
|
|
235
235
|
let endDate = (0, moment_timezone_1.default)(`${params.performanceFromCOA.dateJouei} ${timeEnd} +09:00`, 'YYYYMMDD HHmm Z')
|
|
@@ -3,7 +3,7 @@ declare function notifyByEmail(params: {
|
|
|
3
3
|
subject: string;
|
|
4
4
|
content: string;
|
|
5
5
|
logLevel: LineNotifyLogLevel;
|
|
6
|
-
}): (__:
|
|
6
|
+
}): (__: Record<string, never>, credentials: {
|
|
7
7
|
sendGrid: SendGridCredentials;
|
|
8
8
|
}) => Promise<{
|
|
9
9
|
result: import("@chevre/factory/lib/action/transfer/send/message/email").IResult;
|
|
@@ -347,7 +347,7 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
|
|
|
347
347
|
// };
|
|
348
348
|
// itemOfferedServiceOutput = serviceOutputAsBusReservation;
|
|
349
349
|
// break;
|
|
350
|
-
case factory.reservationType.EventReservation:
|
|
350
|
+
case factory.reservationType.EventReservation: {
|
|
351
351
|
const serviceOutputAsEventReservation = {
|
|
352
352
|
typeOf,
|
|
353
353
|
...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
|
|
@@ -365,6 +365,7 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
|
|
|
365
365
|
};
|
|
366
366
|
itemOfferedServiceOutput = serviceOutputAsEventReservation;
|
|
367
367
|
break;
|
|
368
|
+
}
|
|
368
369
|
default:
|
|
369
370
|
throw new factory.errors.NotImplemented(`serviceOutput not implemented. typeOf:${typeOf}`);
|
|
370
371
|
// no op
|
|
@@ -243,7 +243,7 @@ function searchEventTicketOffers(params) {
|
|
|
243
243
|
switch (eventOffers.offeredThrough.identifier) {
|
|
244
244
|
case factory.service.webAPI.Identifier.COA:
|
|
245
245
|
throw new factory.errors.NotImplemented(`booking service '${eventOffers.offeredThrough.identifier}' not implemented`);
|
|
246
|
-
default:
|
|
246
|
+
default: {
|
|
247
247
|
const searchOffersResult = await searchEventTicketOffersByEvent({
|
|
248
248
|
event,
|
|
249
249
|
store: params.store,
|
|
@@ -258,6 +258,7 @@ function searchEventTicketOffers(params) {
|
|
|
258
258
|
})(repos);
|
|
259
259
|
offers = searchOffersResult.ticketOffers;
|
|
260
260
|
unitPriceOffers = searchOffersResult.unitPriceOffers;
|
|
261
|
+
}
|
|
261
262
|
}
|
|
262
263
|
return { ticketOffers: offers, unitPriceOffers };
|
|
263
264
|
};
|
|
@@ -230,7 +230,7 @@ function searchOffersByIds(params) {
|
|
|
230
230
|
switch (eventOffers.offeredThrough.identifier) {
|
|
231
231
|
case factory.service.webAPI.Identifier.COA:
|
|
232
232
|
throw new factory.errors.NotImplemented(`booking service '${eventOffers.offeredThrough.identifier}' not implemented`);
|
|
233
|
-
default:
|
|
233
|
+
default: {
|
|
234
234
|
const searchOffersResult = await searchEventTicketOffersByEvent({
|
|
235
235
|
ids: params.ids,
|
|
236
236
|
event,
|
|
@@ -246,6 +246,7 @@ function searchOffersByIds(params) {
|
|
|
246
246
|
})(repos);
|
|
247
247
|
offers = searchOffersResult.ticketOffers;
|
|
248
248
|
unitPriceOffers = searchOffersResult.unitPriceOffers;
|
|
249
|
+
}
|
|
249
250
|
}
|
|
250
251
|
return { ticketOffers: offers, unitPriceOffers };
|
|
251
252
|
};
|
|
@@ -59,7 +59,7 @@ function voidTransaction(params) {
|
|
|
59
59
|
case factory.transactionStatusType.InProgress:
|
|
60
60
|
throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
|
|
61
61
|
// 確定取引に対応(2023-05-07~)
|
|
62
|
-
case factory.transactionStatusType.Confirmed:
|
|
62
|
+
case factory.transactionStatusType.Confirmed: {
|
|
63
63
|
// OrderCancelledを考慮(2023-08-30~)
|
|
64
64
|
const orderCancelled = params.purpose.result?.order?.orderStatus === factory.orderStatus.OrderCancelled;
|
|
65
65
|
if (!orderCancelled) {
|
|
@@ -67,6 +67,7 @@ function voidTransaction(params) {
|
|
|
67
67
|
authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
|
|
68
68
|
}
|
|
69
69
|
break;
|
|
70
|
+
}
|
|
70
71
|
default:
|
|
71
72
|
// no op
|
|
72
73
|
}
|
|
@@ -92,7 +93,7 @@ function voidTransaction(params) {
|
|
|
92
93
|
await repos.authorizeOfferAction.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
|
|
93
94
|
switch (action.instrument.typeOf) {
|
|
94
95
|
// case WebAPIIdentifier.COA:
|
|
95
|
-
case factory.assetTransactionType.COAReserveTransaction:
|
|
96
|
+
case factory.assetTransactionType.COAReserveTransaction: {
|
|
96
97
|
const { reserveService } = repos;
|
|
97
98
|
if (reserveService === undefined) {
|
|
98
99
|
throw new factory.errors.Internal('repos.reserveService required');
|
|
@@ -103,6 +104,7 @@ function voidTransaction(params) {
|
|
|
103
104
|
task: repos.task
|
|
104
105
|
});
|
|
105
106
|
break;
|
|
107
|
+
}
|
|
106
108
|
default:
|
|
107
109
|
await (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
|
|
108
110
|
// action: <factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.Chevre>>action
|
|
@@ -150,7 +152,7 @@ function cancelAcceptActions(params) {
|
|
|
150
152
|
switch (transaction.status) {
|
|
151
153
|
case factory.transactionStatusType.InProgress:
|
|
152
154
|
throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
|
|
153
|
-
case factory.transactionStatusType.Confirmed:
|
|
155
|
+
case factory.transactionStatusType.Confirmed: {
|
|
154
156
|
// OrderCancelledを考慮
|
|
155
157
|
const orderCancelled = params.purpose.result?.order?.orderStatus === factory.orderStatus.OrderCancelled;
|
|
156
158
|
if (!orderCancelled) {
|
|
@@ -168,6 +170,7 @@ function cancelAcceptActions(params) {
|
|
|
168
170
|
});
|
|
169
171
|
}
|
|
170
172
|
break;
|
|
173
|
+
}
|
|
171
174
|
default:
|
|
172
175
|
// no op
|
|
173
176
|
}
|
|
@@ -69,7 +69,7 @@ function voidTransactionByActionId(params) {
|
|
|
69
69
|
})(repos);
|
|
70
70
|
}
|
|
71
71
|
switch (action.instrument.typeOf) {
|
|
72
|
-
case factory.assetTransactionType.COAReserveTransaction:
|
|
72
|
+
case factory.assetTransactionType.COAReserveTransaction: {
|
|
73
73
|
const { reserveService } = repos;
|
|
74
74
|
if (reserveService === undefined) {
|
|
75
75
|
throw new factory.errors.Internal('repos.reserveService required');
|
|
@@ -80,6 +80,7 @@ function voidTransactionByActionId(params) {
|
|
|
80
80
|
task: repos.task
|
|
81
81
|
});
|
|
82
82
|
break;
|
|
83
|
+
}
|
|
83
84
|
default:
|
|
84
85
|
await (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
|
|
85
86
|
action
|
|
@@ -32,6 +32,7 @@ exports.responseBody2acceptedOffers4result = responseBody2acceptedOffers4result;
|
|
|
32
32
|
const moment_1 = __importDefault(require("moment"));
|
|
33
33
|
const util = __importStar(require("util"));
|
|
34
34
|
const factory = __importStar(require("../../../../factory"));
|
|
35
|
+
const USE_DEPRECATED_RESERVATION_AVAILABLE_CHANNEL = process.env.USE_DEPRECATED_RESERVATION_AVAILABLE_CHANNEL === '1';
|
|
35
36
|
function createAuthorizeSeatReservationActionAttributes(params) {
|
|
36
37
|
const transaction = params.transaction;
|
|
37
38
|
// 最適化(2022-06-07~)
|
|
@@ -206,17 +207,19 @@ function responseBody2acceptedOffers4result(params) {
|
|
|
206
207
|
const issuedThrough = {
|
|
207
208
|
typeOf: factory.product.ProductType.EventService,
|
|
208
209
|
// id: '', // discontinue(2025-01-02~)
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
210
|
+
...(USE_DEPRECATED_RESERVATION_AVAILABLE_CHANNEL) && {
|
|
211
|
+
availableChannel: {
|
|
212
|
+
typeOf: 'ServiceChannel',
|
|
213
|
+
serviceLocation: {
|
|
214
|
+
typeOf: reservationFor.location.typeOf,
|
|
215
|
+
branchCode: reservationFor.location.branchCode,
|
|
216
|
+
name: reservationFor.location.name,
|
|
217
|
+
containedInPlace: {
|
|
218
|
+
typeOf: reservationFor.superEvent.location.typeOf,
|
|
219
|
+
id: reservationFor.superEvent.location.id,
|
|
220
|
+
branchCode: reservationFor.superEvent.location.branchCode,
|
|
221
|
+
name: reservationFor.superEvent.location.name
|
|
222
|
+
}
|
|
220
223
|
}
|
|
221
224
|
}
|
|
222
225
|
}
|
|
@@ -53,7 +53,7 @@ export declare function authorize(params: {
|
|
|
53
53
|
requestBody: IRequestBody;
|
|
54
54
|
responseBody: IResponseBody;
|
|
55
55
|
};
|
|
56
|
-
options:
|
|
56
|
+
options: Record<string, never>;
|
|
57
57
|
}): IAuthorizeOperation<Pick<IAuthorizeOfferAction, 'id' | 'instrument'> & {
|
|
58
58
|
result: IAuthorizeOfferAction['result'];
|
|
59
59
|
}>;
|
|
@@ -17,7 +17,7 @@ export declare function changeOffers(params: {
|
|
|
17
17
|
transaction: {
|
|
18
18
|
id: string;
|
|
19
19
|
};
|
|
20
|
-
options:
|
|
20
|
+
options: Record<string, never>;
|
|
21
21
|
}): IAuthorizeOperation<Pick<IAuthorizeOfferAction, 'id' | 'instrument'> & {
|
|
22
22
|
result: IAuthorizeOfferAction['result'];
|
|
23
23
|
}>;
|
|
@@ -53,7 +53,7 @@ function findAcceptAction(params) {
|
|
|
53
53
|
switch (task.status) {
|
|
54
54
|
case factory.taskStatus.Ready:
|
|
55
55
|
break;
|
|
56
|
-
default:
|
|
56
|
+
default: {
|
|
57
57
|
// タスクがReadyでなければアクション検索
|
|
58
58
|
const acceptAction = (await repos.action.searchBySameAs({
|
|
59
59
|
sameAs: { id: { $eq: task.id } },
|
|
@@ -77,6 +77,7 @@ function findAcceptAction(params) {
|
|
|
77
77
|
: undefined
|
|
78
78
|
};
|
|
79
79
|
}
|
|
80
|
+
}
|
|
80
81
|
}
|
|
81
82
|
return action;
|
|
82
83
|
};
|
|
@@ -128,7 +128,7 @@ function authorize(params) {
|
|
|
128
128
|
availableOffers,
|
|
129
129
|
seller: transaction.seller,
|
|
130
130
|
orderNumber
|
|
131
|
-
})(
|
|
131
|
+
})({});
|
|
132
132
|
acceptedOffer = await createServiceOutputIdentifier({ acceptedOffer, product })(repos);
|
|
133
133
|
let requestBody;
|
|
134
134
|
let responseBody;
|
|
@@ -12,7 +12,7 @@ declare function confirmPayTransaction(data: factory.task.IData<factory.taskName
|
|
|
12
12
|
id: string;
|
|
13
13
|
typeOf: factory.organizationType.Project;
|
|
14
14
|
};
|
|
15
|
-
}, options:
|
|
15
|
+
}, options: Record<string, never>): (repos: {
|
|
16
16
|
acceptedOffer: AcceptedOfferRepo;
|
|
17
17
|
action: ActionRepo;
|
|
18
18
|
assetTransaction: AssetTransactionRepo;
|
|
@@ -40,7 +40,7 @@ function onAssetTransactionStatusChanged(params) {
|
|
|
40
40
|
throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
|
|
41
41
|
}
|
|
42
42
|
switch (params.object.status) {
|
|
43
|
-
case factory.transactionStatusType.Confirmed:
|
|
43
|
+
case factory.transactionStatusType.Confirmed: {
|
|
44
44
|
const orderNumber = params.purpose?.orderNumber;
|
|
45
45
|
const confirmationNumber = params.purpose?.confirmationNumber;
|
|
46
46
|
switch (params.object.typeOf) {
|
|
@@ -109,6 +109,7 @@ function onAssetTransactionStatusChanged(params) {
|
|
|
109
109
|
// no op
|
|
110
110
|
}
|
|
111
111
|
break;
|
|
112
|
+
}
|
|
112
113
|
case factory.transactionStatusType.Canceled:
|
|
113
114
|
case factory.transactionStatusType.Expired:
|
|
114
115
|
switch (params.object.typeOf) {
|
|
@@ -59,7 +59,7 @@ function onOrderReturned(params) {
|
|
|
59
59
|
orderDate: params.order.orderDate
|
|
60
60
|
};
|
|
61
61
|
switch (params.order.orderStatus) {
|
|
62
|
-
case factory.orderStatus.OrderReturned:
|
|
62
|
+
case factory.orderStatus.OrderReturned: {
|
|
63
63
|
const potentialActionsByTransaction = params.returnOrderTransaction?.potentialActions?.returnOrder?.find((returnOrderActionByTransaction) => {
|
|
64
64
|
return returnOrderActionByTransaction.object.orderNumber === params.order.orderNumber;
|
|
65
65
|
})?.potentialActions;
|
|
@@ -97,6 +97,7 @@ function onOrderReturned(params) {
|
|
|
97
97
|
// : []
|
|
98
98
|
];
|
|
99
99
|
break;
|
|
100
|
+
}
|
|
100
101
|
default:
|
|
101
102
|
throw new factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
|
|
102
103
|
}
|
|
@@ -119,7 +120,7 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
|
|
|
119
120
|
// 予約番号ごとに返却アクションを作成する
|
|
120
121
|
let returnReserveTransactionAction;
|
|
121
122
|
switch (order.offeredThroughIdentifier) {
|
|
122
|
-
case factory.service.webAPI.Identifier.COA:
|
|
123
|
+
case factory.service.webAPI.Identifier.COA: {
|
|
123
124
|
// const superEventLocationBranchCode =
|
|
124
125
|
// (<factory.order.IEventReservation>reservation).reservationFor?.superEvent.location.branchCode;
|
|
125
126
|
// ↓1注文に複数施設はない想定なので、これで問題ない
|
|
@@ -148,6 +149,7 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
|
|
|
148
149
|
recipient: returnActionRecipient
|
|
149
150
|
};
|
|
150
151
|
break;
|
|
152
|
+
}
|
|
151
153
|
default:
|
|
152
154
|
returnReserveTransactionAction = {
|
|
153
155
|
project: order.project,
|
|
@@ -2,7 +2,8 @@ import * as factory from '../../../factory';
|
|
|
2
2
|
import { Settings } from '../../../settings';
|
|
3
3
|
import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMethod';
|
|
4
4
|
import type { AccountingReportRepo } from '../../../repo/accountingReport';
|
|
5
|
-
import type {
|
|
5
|
+
import type { PayActionRepo } from '../../../repo/action/pay';
|
|
6
|
+
import type { RefundActionRepo } from '../../../repo/action/refund';
|
|
6
7
|
import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
|
|
7
8
|
import type { AcceptPayActionRepo } from '../../../repo/action/acceptPay';
|
|
8
9
|
import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
|
|
@@ -27,7 +28,11 @@ import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
|
|
|
27
28
|
interface IAuthorizeRepos {
|
|
28
29
|
acceptedPaymentMethod: AcceptedPaymentMethodRepo;
|
|
29
30
|
accountingReport: AccountingReportRepo;
|
|
30
|
-
action
|
|
31
|
+
action?: never;
|
|
32
|
+
actions: {
|
|
33
|
+
pay: PayActionRepo;
|
|
34
|
+
refund: RefundActionRepo;
|
|
35
|
+
};
|
|
31
36
|
checkMovieTicketAction: CheckMovieTicketActionRepo;
|
|
32
37
|
acceptPayAction: AcceptPayActionRepo;
|
|
33
38
|
authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
|
|
@@ -53,7 +53,7 @@ function findAcceptAction(params) {
|
|
|
53
53
|
switch (task.status) {
|
|
54
54
|
case factory.taskStatus.Ready:
|
|
55
55
|
break;
|
|
56
|
-
default:
|
|
56
|
+
default: {
|
|
57
57
|
// タスクがReadyでなければアクション検索
|
|
58
58
|
const acceptAction = (await repos.acceptPayAction.searchBySameAs({
|
|
59
59
|
sameAs: { id: { $eq: task.id } },
|
|
@@ -88,6 +88,7 @@ function findAcceptAction(params) {
|
|
|
88
88
|
: undefined
|
|
89
89
|
};
|
|
90
90
|
}
|
|
91
|
+
}
|
|
91
92
|
}
|
|
92
93
|
return action;
|
|
93
94
|
};
|
|
@@ -53,7 +53,7 @@ function findAuthorizeAction(params) {
|
|
|
53
53
|
switch (task.status) {
|
|
54
54
|
case factory.taskStatus.Ready:
|
|
55
55
|
break;
|
|
56
|
-
default:
|
|
56
|
+
default: {
|
|
57
57
|
// タスクがReadyでなければアクション検索
|
|
58
58
|
const authorizeAction = (await repos.authorizePaymentMethodAction.searchBySameAs({
|
|
59
59
|
sameAs: { id: { $eq: task.id } },
|
|
@@ -77,6 +77,7 @@ function findAuthorizeAction(params) {
|
|
|
77
77
|
: undefined
|
|
78
78
|
};
|
|
79
79
|
}
|
|
80
|
+
}
|
|
80
81
|
}
|
|
81
82
|
return action;
|
|
82
83
|
};
|
|
@@ -53,7 +53,7 @@ function findCheckAction(params) {
|
|
|
53
53
|
switch (task.status) {
|
|
54
54
|
case factory.taskStatus.Ready:
|
|
55
55
|
break;
|
|
56
|
-
default:
|
|
56
|
+
default: {
|
|
57
57
|
// タスクがReadyでなければアクション検索
|
|
58
58
|
const authorizeAction = (await repos.checkMovieTicketAction.searchBySameAs({
|
|
59
59
|
sameAs: { id: { $eq: task.id } },
|
|
@@ -83,6 +83,7 @@ function findCheckAction(params) {
|
|
|
83
83
|
...(purchaseNumberAuthResult !== undefined) ? { result: { purchaseNumberAuthResult } } : undefined
|
|
84
84
|
};
|
|
85
85
|
}
|
|
86
|
+
}
|
|
86
87
|
}
|
|
87
88
|
return action;
|
|
88
89
|
};
|
|
@@ -62,7 +62,7 @@ function invalidatePaymentUrl(params) {
|
|
|
62
62
|
switch (transaction.status) {
|
|
63
63
|
case factory.transactionStatusType.InProgress:
|
|
64
64
|
throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
|
|
65
|
-
case factory.transactionStatusType.Confirmed:
|
|
65
|
+
case factory.transactionStatusType.Confirmed: {
|
|
66
66
|
// support OrderCanceled(2025-02-25~)
|
|
67
67
|
const orderCancelled = params.purpose.result?.order?.orderStatus === factory.orderStatus.OrderCancelled;
|
|
68
68
|
if (!orderCancelled) {
|
|
@@ -72,6 +72,7 @@ function invalidatePaymentUrl(params) {
|
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
break;
|
|
75
|
+
}
|
|
75
76
|
default:
|
|
76
77
|
// no op
|
|
77
78
|
}
|
|
@@ -3,10 +3,15 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import * as factory from '../../../factory';
|
|
5
5
|
import type { AccountingReportRepo } from '../../../repo/accountingReport';
|
|
6
|
-
import type {
|
|
6
|
+
import type { PayActionRepo } from '../../../repo/action/pay';
|
|
7
|
+
import type { RefundActionRepo } from '../../../repo/action/refund';
|
|
7
8
|
import type { TaskRepo } from '../../../repo/task';
|
|
8
9
|
interface IOnPayActionCompletedRepos {
|
|
9
|
-
action
|
|
10
|
+
action?: never;
|
|
11
|
+
actions: {
|
|
12
|
+
pay: PayActionRepo;
|
|
13
|
+
refund: RefundActionRepo;
|
|
14
|
+
};
|
|
10
15
|
accountingReport: AccountingReportRepo;
|
|
11
16
|
task: TaskRepo;
|
|
12
17
|
}
|
|
@@ -45,12 +45,15 @@ function onPayActionCompleted(payAction) {
|
|
|
45
45
|
await (0, onPaymentStatusChanged_1.onPaymentStatusChanged)(aciton4inform)(repos);
|
|
46
46
|
}
|
|
47
47
|
const informPayment = potentialActions?.informPayment;
|
|
48
|
+
/* istanbul ignore else -- @preserve */
|
|
48
49
|
if (Array.isArray(informPayment)) {
|
|
49
50
|
taskAttributes.push(...informPayment.map(({ purpose, id }) => {
|
|
50
51
|
let data;
|
|
51
52
|
if (typeof id === 'string' && id !== '') {
|
|
52
53
|
let about;
|
|
54
|
+
/* istanbul ignore else -- @preserve */
|
|
53
55
|
if (payAction.purpose.typeOf === factory.order.OrderType.Order) {
|
|
56
|
+
/* istanbul ignore else -- @preserve */
|
|
54
57
|
if (typeof payAction.purpose.orderNumber === 'string') {
|
|
55
58
|
about = { orderNumber: payAction.purpose.orderNumber, typeOf: factory.order.OrderType.Order };
|
|
56
59
|
}
|
|
@@ -64,8 +67,10 @@ function onPayActionCompleted(payAction) {
|
|
|
64
67
|
object: aciton4inform,
|
|
65
68
|
id, // add potentialAction(2025-02-05~)
|
|
66
69
|
typeOf: factory.actionType.InformAction,
|
|
67
|
-
...(typeof purpose?.typeOf === 'string') ? { purpose } :
|
|
68
|
-
...(typeof about?.typeOf === 'string') ? { about } :
|
|
70
|
+
// ...(typeof purpose?.typeOf === 'string') ? { purpose } : {},
|
|
71
|
+
// ...(typeof about?.typeOf === 'string') ? { about } : {}, // add(2025-02-14~)
|
|
72
|
+
...(typeof purpose?.typeOf === 'string' && { purpose }),
|
|
73
|
+
...(typeof about?.typeOf === 'string' && { about }),
|
|
69
74
|
};
|
|
70
75
|
}
|
|
71
76
|
else {
|
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
import type { AccountingReportRepo } from '../../../repo/accountingReport';
|
|
2
|
-
import type {
|
|
2
|
+
import type { PayActionRepo } from '../../../repo/action/pay';
|
|
3
|
+
import type { RefundActionRepo } from '../../../repo/action/refund';
|
|
3
4
|
import { INotification } from './factory';
|
|
5
|
+
export interface IOnPaymentStatusChangedRepos {
|
|
6
|
+
actions: {
|
|
7
|
+
pay: PayActionRepo;
|
|
8
|
+
refund: RefundActionRepo;
|
|
9
|
+
};
|
|
10
|
+
accountingReport: AccountingReportRepo;
|
|
11
|
+
}
|
|
4
12
|
/**
|
|
5
13
|
* 決済ステータス変更イベント
|
|
6
14
|
*/
|
|
7
|
-
export declare function onPaymentStatusChanged(params: INotification): (repos:
|
|
8
|
-
action: ActionRepo;
|
|
9
|
-
accountingReport: AccountingReportRepo;
|
|
10
|
-
}) => Promise<void>;
|
|
15
|
+
export declare function onPaymentStatusChanged(params: Pick<INotification, 'id' | 'typeOf'>): (repos: IOnPaymentStatusChangedRepos) => Promise<void>;
|