@chevre/domain 21.18.0-alpha.4 → 21.18.0-alpha.41

package/lib/chevre/service/task/onAssetTransactionStatusChanged.js

@@ -10,8 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const order_1 = require("../../repo/order");
 const task_1 = require("../../repo/task");
@@ -22,13 +21,13 @@ const onAssetTransactionStatusChanged_1 = require("../order/onAssetTransactionSt
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         yield (0, onAssetTransactionStatusChanged_1.onAssetTransactionStatusChanged)(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
-            registerActionInProgress: new registerServiceInProgress_1.RedisRepository(settings.redisClient),
             task: new task_1.MongoRepository(settings.connection),
             transaction: new transaction_1.MongoRepository(settings.connection)
         });

package/lib/chevre/service/task/onAuthorizationCreated.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const code_1 = require("../../repo/code");
@@ -26,6 +27,7 @@ const reserve_1 = require("../reserve");
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         yield onAuthorizationCreated(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             code: new code_1.MongoRepository(settings.connection),
@@ -38,6 +40,7 @@ function call(data) {
     });
 }
 exports.call = call;
+// tslint:disable-next-line:max-func-body-length
 function onAuthorizationCreated(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // 発券対象予約ID
@@ -55,24 +58,12 @@ function onAuthorizationCreated(params) {
                 // 注文検索
                 const orderNumber = authorizationObject.orderNumber;
                 if (typeof orderNumber === 'string' && orderNumber.length > 0) {
-                    // 最適化(2023-01-28~)
-                    const order = yield repos.order.findByOrderNumber({
-                        orderNumber,
-                        project: { id: params.project.id },
-                        inclusion: ['acceptedOffers'],
-                        exclusion: []
-                    });
-                    const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-                    reservationNumbers = acceptedOffers
-                        .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
-                        || o.itemOffered.typeOf === factory.reservationType.BusReservation)
-                        .map((o) => o.itemOffered.reservationNumber);
-                    reservationNumbers = [...new Set(reservationNumbers)];
-                    reservationForIds = acceptedOffers
-                        .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
-                        || o.itemOffered.typeOf === factory.reservationType.BusReservation)
-                        .map((o) => String(o.itemOffered.reservationFor.id));
-                    reservationForIds = [...new Set(reservationForIds)];
+                    reservationNumbers = yield repos.acceptedOffer.distinctValues({
+                        orderNumber: { $in: [orderNumber] }
+                    }, 'acceptedOffers.itemOffered.reservationNumber');
+                    reservationForIds = yield repos.acceptedOffer.distinctValues({
+                        orderNumber: { $in: [orderNumber] }
+                    }, 'acceptedOffers.itemOffered.reservationFor.id');
                 }
                 break;
             case 'OwnershipInfo':

package/lib/chevre/service/task/onOrderPaymentCompleted.js

@@ -10,8 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const order_1 = require("../../repo/order");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
@@ -21,12 +20,12 @@ const payOrder_1 = require("../order/payOrder");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         yield (0, payOrder_1.payOrder)(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
-            registerActionInProgress: new registerServiceInProgress_1.RedisRepository(settings.redisClient),
             task: new task_1.MongoRepository(settings.connection),
             transaction: new transaction_1.MongoRepository(settings.connection)
         });

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.js

@@ -337,7 +337,7 @@ function deleteResourcesByOfferCatalog(params) {
             const action = yield repos.action.start(deleteActionAttributes);
             try {
                 // カタログからプロダクト検索
-                const productsWithCatalog = yield repos.product.search({
+                const productsWithCatalog = yield repos.product.searchProducts({
                     project: { id: { $eq: params.project.id } },
                     hasOfferCatalog: { id: { $eq: catalogId } }
                 }, ['_id'], []);

package/lib/chevre/service/task/onResourceUpdated.js

@@ -187,7 +187,7 @@ function createInformMovieTasks(params) {
 }
 function createInformProductTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const products4inform = yield repos.product.search({
+        const products4inform = yield repos.product.searchProducts({
             typeOf: { $eq: params.typeOf },
             id: { $in: params.ids }
         }, ['additionalProperty', 'description', 'name', 'productID', 'project', 'typeOf', 'serviceType'], []);

package/lib/chevre/service/task/placeOrder.js

@@ -10,10 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const order_1 = require("../../repo/order");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
@@ -23,22 +22,16 @@ const OrderService = require("../order");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const accountingReportRepo = new accountingReport_1.MongoRepository(settings.connection);
-        const orderRepo = new order_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
-        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
-        const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         yield OrderService.placeOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
-            accountingReport: accountingReportRepo,
-            action: actionRepo,
-            order: orderRepo,
-            registerActionInProgress: registerServiceInProgressRepo,
-            task: taskRepo,
-            transaction: transactionRepo
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
+            accountingReport: new accountingReport_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

package/lib/chevre/service/task/returnOrder.js

@@ -10,9 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const task_1 = require("../../repo/task");
@@ -23,22 +22,16 @@ const returnOrder_1 = require("../order/returnOrder");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const orderRepo = new order_1.MongoRepository(settings.connection);
-        const ownershipInfoRepo = new ownershipInfo_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
-        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
-        const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         yield (0, returnOrder_1.returnOrder)(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
-            action: actionRepo,
-            order: orderRepo,
-            ownershipInfo: ownershipInfoRepo,
-            registerServiceInProgress: registerServiceInProgressRepo,
-            task: taskRepo,
-            transaction: transactionRepo
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

package/lib/chevre/service/task/sendOrder.js

@@ -10,9 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const task_1 = require("../../repo/task");
@@ -23,22 +22,16 @@ const OrderService = require("../order");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const orderRepo = new order_1.MongoRepository(settings.connection);
-        const ownershipInfoRepo = new ownershipInfo_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
-        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
-        const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         yield OrderService.sendOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
-            action: actionRepo,
-            order: orderRepo,
-            ownershipInfo: ownershipInfoRepo,
-            registerActionInProgress: registerServiceInProgressRepo,
-            task: taskRepo,
-            transaction: transactionRepo
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

package/lib/chevre/service/task/voidRegisterServiceTransaction.js

@@ -10,9 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const transaction_1 = require("../../repo/transaction");
 const ProductOfferService = require("../offer/product");
@@ -21,17 +19,15 @@ const ProductOfferService = require("../offer/product");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         const actionRepo = new action_1.MongoRepository(settings.connection);
-        const registerActionInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
         const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
         const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         yield ProductOfferService.voidTransaction(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
-            registerActionInProgress: registerActionInProgressRepo,
             transaction: transactionRepo
         });
     });

package/lib/chevre/service/transaction/deleteTransaction.d.ts

@@ -1,4 +1,5 @@
 import * as factory from '../../factory';
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -13,6 +14,7 @@ import type { MongoRepository as TransactionRepo } from '../../repo/transaction'
  * 冪等性を確保すること
  */
 export declare function deleteTransaction(params: factory.task.IData<factory.taskName.DeleteTransaction>): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -412,8 +412,8 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
                     orderNumbers: [String(fromLocation.orderNumber)],
                     confirmationNumbers: [String(fromLocation.confirmationNumber)]
                 }, {
-                    acceptedOffers: 0,
-                    orderedItem: 0
+                    identifier: 1,
+                    orderStatus: 1
                 });
                 const order = orders.shift();
                 if (order === undefined) {
@@ -467,8 +467,7 @@ function validateToLocation(project, toLocationBeforeStart, issuedThrough) {
                     orderNumbers: [String(toLocation.orderNumber)],
                     confirmationNumbers: [String(toLocation.confirmationNumber)]
                 }, {
-                    acceptedOffers: 0,
-                    orderedItem: 0
+                    identifier: 1
                 });
                 const order = orders.shift();
                 if (order === undefined) {

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.d.ts

@@ -4,7 +4,3 @@ export declare function createRegisterServiceActions(params: {
     transaction: factory.transaction.placeOrder.ITransaction;
     authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): Promise<factory.action.interact.confirm.registerService.IAttributes[]>;
-/**
- * ssktsへの互換性対応として
- * 次回メンバーシップ注文タスクを作成する
- */

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.js

@@ -76,89 +76,3 @@ function createRegisterServiceActionObject(params) {
         typeOf: factory.assetTransactionType.RegisterService
     };
 }
-/**
- * ssktsへの互換性対応として
- * 次回メンバーシップ注文タスクを作成する
- */
-// function createOrderProgramMembershipTask(params: {
-//     order: factory.order.IOrder;
-//     authorizeAction: factory.action.authorize.offer.product.IAction;
-// }): factory.task.IAttributes<factory.taskName.OrderProgramMembership> | undefined {
-//     let orderMembershipTask: factory.task.IAttributes<factory.taskName.OrderProgramMembership> | undefined;
-//     const acceptedOffer = params.authorizeAction.object[0];
-//     // ssktsへの互換性対応なので、限定的に(暫定対応のautomaticRenewal設定で判定)
-//     const serviceOutput = acceptedOffer.itemOffered.serviceOutput;
-//     if (acceptedOffer.itemOffered.typeOf === factory.product.ProductType.MembershipService
-//         && typeof serviceOutput?.typeOf === 'string'
-//         && serviceOutput.typeOf.length > 0
-//         && serviceOutput.automaticRenewal === true) {
-//         const memebershipFor: Pick<factory.product.IProduct, 'project' | 'typeOf' | 'id'> = {
-//             project: { typeOf: factory.organizationType.Project, id: params.order.project.id },
-//             typeOf: acceptedOffer.itemOffered.typeOf,
-//             id: String(acceptedOffer.itemOffered.id)
-//         };
-//         const orderMembershipObject: factory.task.orderProgramMembership.IAcceptedOffer = {
-//             seller: { id: String(acceptedOffer.seller.id) },
-//             typeOf: acceptedOffer.typeOf,
-//             itemOffered: {
-//                 typeOf: serviceOutput.typeOf,
-//                 name: (typeof serviceOutput.name === 'string') ? serviceOutput.name : serviceOutput.typeOf,
-//                 issuedThrough: { id: String(memebershipFor.id), typeOf: factory.product.ProductType.MembershipService }
-//             },
-//             id: String(acceptedOffer.id),
-//             identifier: String(acceptedOffer.identifier)
-//         };
-//         // 次回のメンバーシップ注文タスクを生成
-//         const orderProgramMembershipTaskData: factory.task.IData<factory.taskName.OrderProgramMembership> = {
-//             // 最低限の情報のみagentに設定
-//             agent: {
-//                 typeOf: factory.personType.Person,
-//                 id: params.order.customer.id,
-//                 // transaction.agent.identifierにissがあれば情報を引き継ぐ
-//                 identifier: (Array.isArray(params.order.customer.identifier))
-//                     ? params.order.customer.identifier
-//                     : []
-//             },
-//             object: orderMembershipObject,
-//             project: params.order.project,
-//             typeOf: factory.actionType.OrderAction
-//         };
-//         // どういう期間でいくらのオファーなのか
-//         const priceSpec = <factory.compoundPriceSpecification.IPriceSpecification<factory.priceSpecificationType>>
-//             acceptedOffer.priceSpecification;
-//         if (priceSpec === undefined) {
-//             throw new factory.errors.NotFound('Order.acceptedOffers.priceSpecification');
-//         }
-//         const unitPriceSpec =
-//             <factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.UnitPriceSpecification>>
-//             priceSpec.priceComponent.find(
-//                 (p) => p.typeOf === factory.priceSpecificationType.UnitPriceSpecification
-//             );
-//         if (unitPriceSpec === undefined) {
-//             throw new factory.errors.NotFound('Unit Price Specification in Order.acceptedOffers.priceSpecification');
-//         }
-//         // 期間単位としては秒のみ実装
-//         if (unitPriceSpec.referenceQuantity.unitCode !== factory.unitCode.Sec) {
-//             throw new factory.errors.NotImplemented('Only \'SEC\' is implemented for priceSpecification.referenceQuantity.unitCode ');
-//         }
-//         const referenceQuantityValue = unitPriceSpec.referenceQuantity.value;
-//         if (typeof referenceQuantityValue !== 'number') {
-//             throw new factory.errors.NotFound('Order.acceptedOffers.priceSpecification.referenceQuantity.value');
-//         }
-//         // プログラム更新日時は、今回のプログラムの所有期限
-//         const runsAt = moment(params.order.orderDate)
-//             .add(referenceQuantityValue, 'seconds')
-//             .toDate();
-//         orderMembershipTask = {
-//             data: orderProgramMembershipTaskData,
-//             executionResults: [],
-//             name: <factory.taskName.OrderProgramMembership>factory.taskName.OrderProgramMembership,
-//             numberOfTried: 0,
-//             project: params.order.project,
-//             remainingNumberOfTries: 10,
-//             runsAt: runsAt,
-//             status: factory.taskStatus.Ready
-//         };
-//     }
-//     return orderMembershipTask;
-// }

package/lib/chevre/service/transaction/placeOrderInProgress/result.d.ts

@@ -10,4 +10,4 @@ export declare function createOrder(params: {
     orderStatus: factory.orderStatus;
     isGift: boolean;
     authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
-}): factory.order.IOrder;
+}): factory.transaction.placeOrder.IOrderAsResult;

package/lib/chevre/service/transaction/placeOrderInProgress/validation.d.ts

@@ -32,7 +32,7 @@ export type IResultOrderParams = factory.transaction.placeOrder.IResultOrderPara
     };
 };
 export declare function validateNumItems(params: {
-    order: factory.order.IOrder;
+    order: factory.transaction.placeOrder.IOrderAsResult;
     result: {
         order: IResultOrderParams;
     };

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnMoneyTransfer.d.ts

@@ -2,5 +2,6 @@ import * as factory from '../../../../factory';
 export type WebAPIIdentifier = factory.service.webAPI.Identifier;
 export declare function createReturnMoneyTransferActions(params: {
     order: factory.order.IOrder;
+    moneyTransferAcceptedOffers: Pick<factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>, 'itemOffered'>[];
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
 }): Promise<factory.task.IData<factory.taskName.ReturnMoneyTransfer>[]>;

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnMoneyTransfer.js

@@ -32,9 +32,9 @@ function createReturnMoneyTransferActions(params) {
             priceCurrency: order.priceCurrency,
             orderDate: order.orderDate
         };
-        // 注文アイテムから返却アクションを作成する
-        const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-        for (const acceptedOffer of acceptedOffers) {
+        // 注文オファーから返却アクションを作成する
+        // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+        for (const acceptedOffer of params.moneyTransferAcceptedOffers) {
             if (acceptedOffer.itemOffered.typeOf === factory.actionType.MoneyTransfer) {
                 const moneyTransfer = acceptedOffer.itemOffered;
                 const transactionNumber = String((_b = (_a = moneyTransfer.object) === null || _a === void 0 ? void 0 : _a.pendingTransaction) === null || _b === void 0 ? void 0 : _b.transactionNumber);

package/lib/chevre/service/transaction/returnOrder/potentialActions.d.ts

@@ -9,4 +9,5 @@ export declare function createPotentialActions(params: {
     potentialActions?: factory.transaction.returnOrder.IPotentialActionsParams;
     transaction: factory.transaction.returnOrder.ITransaction;
     emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
+    moneyTransferAcceptedOffers: Pick<factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>, 'itemOffered'>[];
 }): Promise<factory.transaction.returnOrder.IPotentialActions>;

package/lib/chevre/service/transaction/returnOrder/potentialActions.js

@@ -34,7 +34,7 @@ function createPotentialActions(params) {
             const returnPaymentMethodActions = yield (0, returnPaymentMethod_1.createReturnPaymentMethodActions)(Object.assign(Object.assign({}, params), { order, returnOrderActionParams }));
             // ポイント特典の数だけ、返却アクションを作成
             const returnPointAwardActions = yield (0, returnPointAward_1.createReturnPointAwardActions)(Object.assign(Object.assign({}, params), { order }));
-            const returnMoneyTransferActions = yield (0, returnMoneyTransfer_1.createReturnMoneyTransferActions)(Object.assign(Object.assign({}, params), { order, returnOrderActionParams }));
+            const returnMoneyTransferActions = yield (0, returnMoneyTransfer_1.createReturnMoneyTransferActions)(Object.assign(Object.assign({}, params), { order, moneyTransferAcceptedOffers: params.moneyTransferAcceptedOffers, returnOrderActionParams }));
             // 返品後のEメール送信アクション
             const sendEmailMessaegActionsOnReturn = yield (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)(Object.assign(Object.assign({}, params), { order, returnOrderActionParams }));
             const potentialActionsOnReturnOrder = {

package/lib/chevre/service/transaction/returnOrder.d.ts

@@ -1,4 +1,5 @@
 import * as factory from '../../factory';
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as EmailMessageRepo } from '../../repo/emailMessage';
 import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as MerchantReturnPolicyRepo } from '../../repo/merchantReturnPolicy';
@@ -11,6 +12,7 @@ import type { MongoRepository as SellerRepo } from '../../repo/seller';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 export interface IStartOperationRepos {
+    acceptedOffer: AcceptedOfferRepo;
     event: EventRepo;
     merchantReturnPolicy: MerchantReturnPolicyRepo;
     offer: OfferRepo;
@@ -40,6 +42,7 @@ export declare function confirm(params: factory.transaction.returnOrder.IConfirm
         };
     };
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     emailMessage?: EmailMessageRepo;
     order: OrderRepo;
     transaction: TransactionRepo;