@chevre/domain 25.0.0-alpha.1 → 25.0.0-alpha.10

package/lib/chevre/service/offer/event/authorize.js

@@ -66,7 +66,9 @@ function authorize(params, options) {
                 await (0, any_1.acceptOffer)({
                     orderNumber,
                     project: transaction.project,
-                    acceptedOffers: minimizedAcceptedOffers
+                    placeOrderId: transaction.id,
+                    acceptedOffers: minimizedAcceptedOffers,
+                    ...((typeof params.object.broker?.typeOf === 'string') && { broker: params.object.broker })
                 })(repos);
             }
         }

package/lib/chevre/service/offer/eventServiceByCOA/authorize.js

@@ -119,6 +119,7 @@ function authorize(params) {
             await (0, any_1.acceptOffer)({
                 orderNumber,
                 project: transaction.project,
+                placeOrderId: params.transaction.id,
                 acceptedOffers: acceptedOffers4result
             })(repos);
             // }

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -154,6 +154,7 @@ function changeOffers(params) {
             await (0, any_1.acceptOffer)({
                 orderNumber,
                 project: transaction.project,
+                placeOrderId: params.transaction.id,
                 acceptedOffers: acceptedOffers4result
             })(repos);
             // }

package/lib/chevre/service/order/deleteOrder.js

@@ -93,7 +93,7 @@ function deleteReservationsByOrder(order) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: order.project.id } },
-        }, { noName: true });
+        });
         const reservationIds = acceptedOffers.map((o) => String(o.itemOffered.id));
         if (reservationIds.length > 0) {
             await repos.reservation.deleteByIds({ project: { id: order.project.id }, ids: reservationIds });

package/lib/chevre/service/order/placeOrder/factory.js

@@ -95,7 +95,9 @@ function createPlacingOrder(params) {
     // discontinue(2026-06-11~)
     // const name: string | undefined =
     //     (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
-    const broker = (typeof transaction.object.broker?.typeOf === 'string') ? transaction.object.broker : undefined;
+    // discontinue(2026-06-22~)
+    // const broker: factory.order.IBroker | undefined =
+    //     (typeof transaction.object.broker?.typeOf === 'string') ? transaction.object.broker : undefined;
     const { paymentMethods, price } = createPaymentMethods({ authorizePaymentActions });
     const eventReservationAcceptedOffers = [];
     params.acceptedOffers.forEach((acceptedOffer) => {
@@ -125,6 +127,6 @@ function createPlacingOrder(params) {
             .toDate(),
         orderedItem, // 2024-06-18~
         // ...(typeof name === 'string') ? { name } : undefined, // discontinue(2026-06-11~)
-        ...(typeof broker?.typeOf === 'string') ? { broker } : undefined // 2024-06-17~
+        // ...(typeof broker?.typeOf === 'string') ? { broker } : undefined // discontinue(2026-06-22~)
     };
 }

package/lib/chevre/service/order.d.ts

@@ -6,5 +6,4 @@ import { paymentDue2Processing } from './order/onAssetTransactionStatusChanged';
 import { processOrder } from './order/onOrderStatusChanged';
 import { onOrderUpdated } from './order/onOrderUpdated';
 import { placeOrder } from './order/placeOrder';
-import { placeOrderWithoutTransaction } from './order/placeOrderWithoutTransaction';
-export { confirmPayTransaction, onOrderUpdated, paymentDue2Processing, placeOrder, placeOrderWithoutTransaction, processOrder, };
+export { confirmPayTransaction, onOrderUpdated, paymentDue2Processing, placeOrder, processOrder, };

package/lib/chevre/service/order.js

@@ -1,20 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.paymentDue2Processing = exports.onOrderUpdated = exports.confirmPayTransaction = void 0;
+exports.processOrder = exports.placeOrder = exports.paymentDue2Processing = exports.onOrderUpdated = exports.confirmPayTransaction = void 0;
 /**
  * 注文サービス
  */
 const confirmPayTransaction_1 = require("./order/confirmPayTransaction");
 Object.defineProperty(exports, "confirmPayTransaction", { enumerable: true, get: function () { return confirmPayTransaction_1.confirmPayTransaction; } });
-// import { deleteOrder } from './order/deleteOrder';
 const onAssetTransactionStatusChanged_1 = require("./order/onAssetTransactionStatusChanged");
 Object.defineProperty(exports, "paymentDue2Processing", { enumerable: true, get: function () { return onAssetTransactionStatusChanged_1.paymentDue2Processing; } });
 const onOrderStatusChanged_1 = require("./order/onOrderStatusChanged");
 Object.defineProperty(exports, "processOrder", { enumerable: true, get: function () { return onOrderStatusChanged_1.processOrder; } });
 const onOrderUpdated_1 = require("./order/onOrderUpdated");
 Object.defineProperty(exports, "onOrderUpdated", { enumerable: true, get: function () { return onOrderUpdated_1.onOrderUpdated; } });
-// import { payOrder } from './order/payOrder';
 const placeOrder_1 = require("./order/placeOrder");
 Object.defineProperty(exports, "placeOrder", { enumerable: true, get: function () { return placeOrder_1.placeOrder; } });
-const placeOrderWithoutTransaction_1 = require("./order/placeOrderWithoutTransaction");
-Object.defineProperty(exports, "placeOrderWithoutTransaction", { enumerable: true, get: function () { return placeOrderWithoutTransaction_1.placeOrderWithoutTransaction; } });

package/lib/chevre/service/reserve/findByCode.js

@@ -39,7 +39,7 @@ function findByCode(params) {
                                 // typeOf?: { $in?: factory.order.IItemOffered['typeOf'][] };
                             }
                         }
-                    }, { noName: true })).shift();
+                    })).shift();
                     if (acceptedOffer === undefined) {
                         throw new factory_1.factory.errors.NotFound('acceptedOffer');
                     }

package/lib/chevre/service/reserve/searchByOrder.js

@@ -16,7 +16,7 @@ function searchByOrder(params) {
                 // typeOf: { $in: [reservationType] }
                 }
             }
-        }, { noName: true });
+        });
         const reservationIds = acceptedOffers.map((offer) => {
             if (offer.itemOffered.typeOf === reservationType) {
                 return offer.itemOffered.id;

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

@@ -139,7 +139,7 @@ function fixOrderAsPurpose(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: params.project.id } }
-        }, { noName: true });
+        });
         return {
             ...order,
             acceptedOffers

package/lib/chevre/service/task/payment/payByTask.js

@@ -76,7 +76,7 @@ function fixOrderAsPurpose(params, transaction) {
                     // reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } } // 座席番号による絞りは廃止(2026-06-01~)
                     }
                 }
-            }, { noName: true });
+            });
         }
         return {
             ...orderWithoutAcceptedOffers,

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.d.ts

@@ -12,7 +12,6 @@ export declare function createSendEmailMessageActions(params: {
     seller: factory.order.ISeller;
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
-    emailMessage?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     sendEmailMessageActions: factory.transaction.placeOrder.IPotentialSendEmailMessageAction[];

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.js

@@ -3,34 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessageActions = createSendEmailMessageActions;
 const emailMessageBuilder_1 = require("../../../../../emailMessageBuilder");
 const factory_1 = require("../../../../../factory");
-async function createSendEmailMessageActions(params, 
-// settings: Settings
-setting) {
+async function createSendEmailMessageActions(params, setting) {
     // 注文配送メール送信設定
     const emailMessages = [];
-    // const sendEmailMessageActions: factory.action.transfer.send.message.email.IAttributes[] = [];
     const sendEmailMessageActions = [];
-    // const sendActionPurpose: factory.action.transfer.send.message.email.IPurpose = {
-    //     typeOf: params.order.typeOf,
-    //     orderNumber: params.order.orderNumber,
-    //     price: params.order.price,
-    //     priceCurrency: params.order.priceCurrency,
-    //     orderDate: params.order.orderDate
-    // };
     const sendEmailMessageOnOrderSentParams = params.potentialActions?.order?.potentialActions?.sendOrder?.potentialActions?.sendEmailMessage;
     if (Array.isArray(sendEmailMessageOnOrderSentParams)) {
+        // pugテンプレートに渡す変数を最小化(2026-06-19~)
         const orderAsCreateEmailParams = {
-            ...params.order,
+            // ...params.order,
+            // paymentMethods: params.paymentMethods
             customer: params.customer,
             seller: params.seller,
-            paymentMethods: params.paymentMethods
+            orderNumber: params.order.orderNumber,
+            confirmationNumber: params.order.confirmationNumber,
+            price: params.order.price
         };
         await Promise.all(sendEmailMessageOnOrderSentParams.map(async (s, index) => {
             const emailMessage = await (0, emailMessageBuilder_1.createSendOrderMessage)({
                 order: orderAsCreateEmailParams,
                 index,
                 ...(s.object !== undefined) ? { email: s.object } : undefined,
-                ...(params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined
+                // ...(params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined
             }, setting);
             emailMessages.push(emailMessage);
             // 送信アクション最適化に対応(2024-04-29~)
@@ -40,16 +34,7 @@ setting) {
             };
             // optimize(2024-05-07~)
             sendEmailMessageActions.push({
-                // project: params.order.project,
-                // typeOf: factory.actionType.SendAction,
                 object: sendEmailMessageActionObject
-                // agent: params.order.project,
-                // recipient: {
-                //     typeOf: params.order.customer.typeOf,
-                //     id: params.order.customer.id
-                // },
-                // potentialActions: {},
-                // purpose: sendActionPurpose
             });
         }));
     }

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.d.ts

@@ -15,7 +15,6 @@ export declare function createPotentialActions(params: {
     seller: factory.order.ISeller;
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
-    emailMessage?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     potentialActions: factory.transaction.placeOrder.IPotentialActions;
     emailMessages: factory.creativeWork.message.email.ICreativeWork[];

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.js

@@ -5,14 +5,9 @@ const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
 /**
  * 取引のポストアクションを作成する
  */
-async function createPotentialActions(params, 
-// settings: Settings
-setting) {
+async function createPotentialActions(params, setting) {
     // 注文処理開始メール送信設定
     const { emailMessages, sendEmailMessageActions } = await (0, sendEmailMessage_1.createSendEmailMessageActions)(params, setting);
-    // const sendOrderActionAttributes: factory.transaction.placeOrder.IPotentialSendOrderAction = {
-    //     potentialActions: { sendEmailMessage: sendEmailMessageActions }
-    // };
     return {
         emailMessages,
         potentialActions: {

package/lib/chevre/service/transaction/placeOrder/confirm.d.ts

@@ -4,7 +4,6 @@ import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOff
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
-import type { EmailMessageRepo } from '../../../repo/emailMessage';
 import type { MessageRepo } from '../../../repo/message';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { ProjectRepo } from '../../../repo/project';
@@ -18,7 +17,6 @@ interface IConfirmOperationRepos {
     authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
-    emailMessage?: EmailMessageRepo;
     message: MessageRepo;
     project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
@@ -41,7 +39,7 @@ interface IConfirmOptions {
      */
     maxNumCreditCardPaymentMethod: number;
     /**
-     * 取引ドキュメントのresult.orderを保管しないオプション(2026-06-15~)
+     * 取引ドキュメントのresult.order,result,numAcceptedOffersを保管しないオプション(2026-06-15~)
      */
     disableResultOrder: boolean;
 }

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -136,17 +136,18 @@ function confirm(params, options) {
             acceptedOffers, payTransactions, customer,
             ...(typeof code === 'string') ? { code } : undefined
         }, options);
-        // デフォルトEメールメッセージを検索
-        let emailMessageOnOrderSent;
-        if (repos.emailMessage !== undefined) {
-            const searchEmailMessagesResult = await repos.emailMessage.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: transaction.project.id } },
-                about: { identifier: { $eq: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } }
-            });
-            emailMessageOnOrderSent = searchEmailMessagesResult.shift();
-        }
+        // discontinue emailMessageRepo
+        // // デフォルトEメールメッセージを検索
+        // let emailMessageOnOrderSent: factory.creativeWork.message.email.ICreativeWork | undefined;
+        // if (repos.emailMessage !== undefined) {
+        //     const searchEmailMessagesResult = await repos.emailMessage.search({
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: transaction.project.id } },
+        //         about: { identifier: { $eq: factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } }
+        //     });
+        //     emailMessageOnOrderSent = searchEmailMessagesResult.shift();
+        // }
         // ポストアクションを作成
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
         if (typeof setting?.defaultSenderEmail !== 'string') {
@@ -160,7 +161,7 @@ function confirm(params, options) {
             // order: orderWithAcceptedOffers, // 現時点でcreateEmailMessageでorder.acceptedOffersを使用している(2024-02-06~)
             // transaction: transaction,
             ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined,
-            ...(emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined
+            // ...(emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined
         }, 
         // settings
         setting);
@@ -372,9 +373,11 @@ function createResult(params, options) {
         placingOrder,
         result: {
             authorizeActions, // 追加(2024-01-17~)
-            numAcceptedOffers: params.acceptedOffers.length, // 追加(2024-01-17~)
             ...(typeof params.code === 'string') ? { code: params.code } : undefined,
-            ...((!options.disableResultOrder) && { order: orderAsResult }) // support disableResultOrder(2026-06-15~)
+            ...((!options.disableResultOrder) && { order: orderAsResult }), // support disableResultOrder(2026-06-15~)
+            ...((!options.disableResultOrder) && {
+                numAcceptedOffers: params.acceptedOffers.length, // 追加(2024-01-17~)
+            }) // support disableResultOrder(2026-06-17~)
         },
         ...(typeof eventId === 'string') ? { eventId } : undefined,
         ...(Array.isArray(reservationIds)) ? { reservationIds } : undefined

package/lib/chevre/service/transaction/placeOrder/start/factory.d.ts

@@ -13,7 +13,6 @@ type IStartPlaceOrderParams = factory.transaction.placeOrder.IStartParamsWithout
          */
         clientUser: factory.transaction.placeOrder.IClientUserBeforeStart;
     };
-    broker?: factory.order.IBroker;
 };
 declare function createStartParams(params: IStartPlaceOrderParams, expiresInSeconds: number, passport: IVerifiedPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, customerType?: string): factory.transaction.placeOrder.IStartParams;
 export { AGENT_IDENTIFIER_NAME_PASSPORT, createStartParams, IStartPlaceOrderParams };

package/lib/chevre/service/transaction/placeOrder/start/factory.js

@@ -5,10 +5,8 @@ exports.createStartParams = createStartParams;
 const factory_1 = require("../../../../factory");
 const AGENT_IDENTIFIER_NAME_PASSPORT = 'passport';
 exports.AGENT_IDENTIFIER_NAME_PASSPORT = AGENT_IDENTIFIER_NAME_PASSPORT;
-function createStartParams(params, expiresInSeconds, passport, seller, 
-// broker?: factory.order.IBroker,
-customerType) {
-    const { broker } = params;
+function createStartParams(params, expiresInSeconds, passport, seller, customerType) {
+    // const { broker } = params;
     // let clientUser: Omit<factory.clientUser.IClientUser, 'scope' | 'scopes'> | undefined;
     let instrument;
     if (typeof params.object.clientUser?.client_id === 'string') {
@@ -21,7 +19,7 @@ customerType) {
         // ...(typeof passport?.scope === 'string') ? { passport } : undefined, // discontinue(2026-06-10~)
         // ...(typeof clientUser?.client_id === 'string') ? { clientUser } : undefined, // discontinue(2026-06-10~)
         // ...(typeof params.object?.name === 'string') ? { name: params.object?.name } : undefined, // discontinue(2026-06-11~)
-        ...(typeof broker?.typeOf === 'string') ? { broker: broker } : undefined,
+        // ...(typeof broker?.typeOf === 'string') ? { broker: broker } : undefined, // discontinue(2026-06-22~)
         ...(typeof params.object.customer?.typeOf === 'string') ? { customer: params.object.customer } : undefined,
         ...(typeof customerType === 'string') ? { customerType } : undefined
     };

package/lib/chevre/service/transaction/placeOrder/updateAgent.js

@@ -94,6 +94,7 @@ function updateAgent(params) {
             await repos.orderInTransaction.setCustomer({
                 orderNumber,
                 project: transaction.project,
+                identifier: params.id,
                 customer: customerInOrder
             });
         }

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

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReturnPaymentMethodActions = createReturnPaymentMethodActions;
 const emailMessageBuilder_1 = require("../../../../emailMessageBuilder");
 const factory_1 = require("../../../../factory");
-async function createReturnInvoicePotentialActions(params, 
-// settings: Settings
-setting) {
+async function createReturnInvoicePotentialActions(params, setting) {
     const order = params.order;
     const emailMessagesOnReturnEachPaymentMethodId = [];
     const sendEmailMessageOnRefund = [];
@@ -32,21 +30,10 @@ setting) {
         }, setting);
         emailMessagesOnReturnEachPaymentMethodId.push(emailMessage);
         sendEmailMessageOnRefund.push({
-            // project: order.project, // discontinue(2024-06-26~)
-            // typeOf: factory.actionType.SendAction, // discontinue(2024-06-26~)
-            // standardize object(2024-06-27~)
-            // object: emailMessage
             object: {
                 identifier: emailMessage.identifier,
                 typeOf: factory_1.factory.creativeWorkType.EmailMessage
             }
-            // agent: order.project, // discontinue(2024-06-26~)
-            // recipient: { // discontinue(2024-06-26~)
-            //     typeOf: order.customer.typeOf,
-            //     id: order.customer.id
-            // },
-            // potentialActions: {}, // discontinue(2024-06-25~)
-            // purpose: sendActionPurpose // discontinue(2024-06-26~)
         });
     }
     return {
@@ -56,18 +43,9 @@ setting) {
         }
     };
 }
-async function createReturnPaymentMethodActions(params, 
-// settings: Settings
-setting) {
+async function createReturnPaymentMethodActions(params, setting) {
     const emailMessagesOnReturnInvoice = [];
     const potentialReturnInvoiceActions = [];
-    // const returnPaymentMethodPurpose: factory.order.ISimpleOrder = {
-    //     typeOf: order.typeOf,
-    //     orderNumber: order.orderNumber,
-    //     price: order.price,
-    //     priceCurrency: order.priceCurrency,
-    //     orderDate: order.orderDate
-    // };
     // MovieTicket決済以外について返品ポリシーのreturnFeesを適用する(2022-08-10~)
     const returnFees = params.transaction.object.returnPolicy.returnFees;
     // ReturnFeesCustomerResponsibilityであれば返金はなし、それ以外は返金する
@@ -95,19 +73,6 @@ setting) {
                 };
                 // optimize(2024-06-19~)
                 return { object, potentialActions: potentialActionsOnRefund };
-                // return {
-                //     project: order.project,
-                //     typeOf: factory.actionType.ReturnAction,
-                //     object,
-                //     agent: order.project,
-                //     recipient: {
-                //         typeOf: order.customer.typeOf,
-                //         id: order.customer.id,
-                //         name: String(order.customer.name)
-                //     },
-                //     purpose: returnPaymentMethodPurpose,
-                //     potentialActions: potentialActionsOnRefund
-                // };
             })));
     }
     // 決済カード決済について

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

@@ -1,10 +1,10 @@
+import { IOrderAsCreateEmailParams } from '../../../../emailMessageBuilder';
 import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
 type IPotentialSendEmailMessageAction = factory.action.transfer.returnAction.order.IPotentialSendEmailMessageAction;
 export declare function createSendEmailMessaegActionsOnReturn(params: {
-    order: Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
+    order: IOrderAsCreateEmailParams;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
-    emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessagesOnReturn: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     sendEmailMessaegActionsOnReturn: IPotentialSendEmailMessageAction[];

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

@@ -7,13 +7,6 @@ async function createSendEmailMessaegActionsOnReturn(params,
 // settings: Settings
 setting) {
     const order = params.order;
-    // const sendActionPurpose: factory.action.transfer.send.message.email.IPurpose = {
-    //     typeOf: order.typeOf,
-    //     orderNumber: order.orderNumber,
-    //     price: order.price,
-    //     priceCurrency: order.priceCurrency,
-    //     orderDate: order.orderDate
-    // };
     // 返品後のEメール送信アクション
     const emailMessagesOnReturn = [];
     const sendEmailMessaegActionsOnReturn = [];
@@ -24,24 +17,16 @@ setting) {
                 order,
                 index,
                 ...(sendEmailMessageParams.object !== undefined) ? { email: sendEmailMessageParams.object } : undefined,
-                ...(params.emailMessageOnOrderReturned !== undefined)
-                    ? { emailMessage: params.emailMessageOnOrderReturned }
-                    : undefined
+                // ...(params.emailMessageOnOrderReturned !== undefined)
+                //     ? { emailMessage: params.emailMessageOnOrderReturned }
+                //     : undefined
             }, setting);
             emailMessagesOnReturn.push(emailMessage);
             return {
-                // project: order.project, // optimize(2024-06-25~)
-                // typeOf: factory.actionType.SendAction, // optimize(2024-06-25~)
-                // standardize object(2024-06-27~)
-                // object: emailMessage
                 object: {
                     identifier: emailMessage.identifier,
                     typeOf: factory_1.factory.creativeWorkType.EmailMessage
                 }
-                // agent: order.project, // optimize(2024-06-25~)
-                // recipient: { typeOf: order.customer.typeOf, id: order.customer.id }, // optimize(2024-06-25~)
-                // potentialActions: {} // optimize(2024-06-25~)
-                // purpose: sendActionPurpose // optimize(2024-06-25~)
             };
         })));
     }

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

@@ -6,7 +6,6 @@ declare function createPotentialActions(params: {
     orders: IReturningOrder4potentialActions[];
     potentialActions?: factory.transaction.returnOrder.IPotentialActionsParams;
     transaction: Pick<factory.transaction.returnOrder.ITransaction, 'agent' | 'object'>;
-    emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     potentialActions: factory.transaction.returnOrder.IPotentialActions;

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

@@ -22,9 +22,6 @@ setting) {
             ...(returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined
         }, setting);
         emailMessages.push(...emailMessagesOnReturnInvoice);
-        // discontinue(2026-04-18~)
-        // // ポイント特典の数だけ、返却アクションを作成
-        // const returnPointAwardActions = await createReturnPointAwardActions({ ...params, order });
         // 返品後のEメール送信アクション
         const { emailMessagesOnReturn, sendEmailMessaegActionsOnReturn } = await (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)({
             ...params,
@@ -34,7 +31,6 @@ setting) {
         emailMessages.push(...emailMessagesOnReturn);
         const potentialActionsOnReturnOrder = {
             returnPaymentMethod: returnPaymentMethodActions,
-            // returnPointAward: returnPointAwardActions, // discontinue(2026-04-18~)
             sendEmailMessage: sendEmailMessaegActionsOnReturn
         };
         const returnOrderObject = {

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

@@ -144,7 +144,7 @@ function fixOrders(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.object.order[0].orderNumber },
             project: { id: { $eq: params.project.id } }
-        }, { noName: true });
+        });
         return { acceptedOffers, eventIds, offerIds, orders };
     };
 }

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

@@ -1,6 +1,5 @@
 import { factory } from '../../factory';
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
-import type { EmailMessageRepo } from '../../repo/emailMessage';
 import type { EventRepo } from '../../repo/event';
 import type { MerchantReturnPolicyRepo } from '../../repo/merchantReturnPolicy';
 import type { MessageRepo } from '../../repo/message';
@@ -41,7 +40,6 @@ type ITaskAndTransactionOperation<T> = (repos: IExportTasksByIdRepos) => Promise
 declare function start(params: factory.transaction.returnOrder.IStartParamsWithoutDetail): IStartOperation<IStartedTransaction>;
 interface IConfirmRepos {
     acceptedOffer: AcceptedOfferRepo;
-    emailMessage?: EmailMessageRepo;
     message: MessageRepo;
     order: OrderRepo;
     setting: SettingRepo;

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

@@ -112,17 +112,18 @@ function confirm(params) {
                 'orderedItem', 'paymentMethods', 'price', 'priceCurrency', 'project', 'seller', 'typeOf'
             ]
         });
-        // デフォルトEメールメッセージを検索
-        let emailMessageOnOrderReturned;
-        if (repos.emailMessage !== undefined) {
-            const searchEmailMessagesResult = await repos.emailMessage.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: transaction.project.id } },
-                about: { identifier: { $eq: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderReturned } }
-            });
-            emailMessageOnOrderReturned = searchEmailMessagesResult.shift();
-        }
+        // discontinue emailMessageRepo
+        // // デフォルトEメールメッセージを検索
+        // let emailMessageOnOrderReturned: factory.creativeWork.message.email.ICreativeWork | undefined;
+        // if (repos.emailMessage !== undefined) {
+        //     const searchEmailMessagesResult = await repos.emailMessage.search({
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: transaction.project.id } },
+        //         about: { identifier: { $eq: factory.creativeWork.message.email.AboutIdentifier.OnOrderReturned } }
+        //     });
+        //     emailMessageOnOrderReturned = searchEmailMessagesResult.shift();
+        // }
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
         if (typeof setting?.defaultSenderEmail !== 'string') {
             throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
@@ -133,7 +134,7 @@ function confirm(params) {
             orders: returningOrders,
             transaction: transaction,
             ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined,
-            ...(emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined
+            // ...(emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined
         }, 
         // settings
         setting);

package/lib/chevre/service/validation/validateOrder.js

@@ -22,7 +22,7 @@ function validateOrder(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: params.orderNumber },
             project: { id: { $eq: params.project.id } }
-        }, { noName: true });
+        });
         let payTransactions = [];
         if (order.paymentMethods.length > 0) {
             payTransactions = await repos.assetTransaction.search({

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "9.0.0-alpha.1",
+    "@chevre/factory": "9.0.0-alpha.3",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.0.0-alpha.1"
+  "version": "25.0.0-alpha.10"
 }

package/lib/chevre/service/order/placeOrderWithoutTransaction.d.ts

@@ -1,22 +0,0 @@
-import type { AccountingReportRepo } from '../../repo/accountingReport';
-import type { ActionRepo } from '../../repo/action';
-import type { OrderRepo } from '../../repo/order';
-import type { TaskRepo } from '../../repo/task';
-import { factory } from '../../factory';
-import { IExternalOrder } from './onOrderStatusChanged';
-/**
- * 注文取引なしに注文を作成する
- */
-declare function placeOrderWithoutTransaction(params: {
-    agent?: factory.action.trade.order.IAgent;
-    project: {
-        id: string;
-    };
-    object: IExternalOrder;
-}): (repos: {
-    accountingReport: AccountingReportRepo;
-    action: ActionRepo;
-    order: OrderRepo;
-    task: TaskRepo;
-}) => Promise<void>;
-export { placeOrderWithoutTransaction };