@chevre/domain 23.1.0-alpha.18 → 23.1.0-alpha.19

package/lib/chevre/service/assetTransaction/pay/factory.js

@@ -7,7 +7,7 @@ exports.createStartParams = createStartParams;
 const factory = require("../../../factory");
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createStartParams(params, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
     const { instrument } = params;
     const paymentServiceId = (params.paymentService !== undefined)
         ? String(params.paymentService.id)
@@ -109,7 +109,12 @@ function createStartParams(params, options) {
         : undefined);
     const object = Object.assign({ accountId: (typeof accountId === 'string') ? accountId : '', paymentMethodId: params.transactionNumber, typeOf: params.paymentServiceType, id: paymentServiceId, 
         // onPaymentStatusChanged: { informPayment: params.informActions }, // discontinue(2025-02-09~)
-        paymentMethod }, (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket)
+        paymentMethod, serviceOutput: (((_0 = params.object.serviceOutput) === null || _0 === void 0 ? void 0 : _0.typeOf) === 'Invoice') // support serviceOutput(2025-11-24~)
+            ? params.object.serviceOutput
+            : {
+                typeOf: 'Invoice',
+                referencesOrder: { typeOf: factory.order.OrderType.Order }
+            } }, (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket)
         ? { checkedAction: { id: options.checkedAction.id } } // add checkedAction(2024-12-13~)
         : undefined);
     const potentialAction = [];
@@ -118,7 +123,7 @@ function createStartParams(params, options) {
             potentialAction.push({ id: informAction.id, typeOf: factory.actionType.InformAction });
         }
     });
-    return Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires, instrument: (Array.isArray(instrument)) ? instrument : [] }, (typeof ((_0 = params.location) === null || _0 === void 0 ? void 0 : _0.typeOf) === 'string')
+    return Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires, instrument: (Array.isArray(instrument)) ? instrument : [] }, (typeof ((_1 = params.location) === null || _1 === void 0 ? void 0 : _1.typeOf) === 'string')
         ? { location: params.location }
         : undefined), (potentialAction.length > 0) ? { potentialAction } : undefined // add potentialAction(2025-02-05~)
     );

package/lib/chevre/service/payment/any/factory.d.ts

@@ -6,7 +6,7 @@ export type IInvoiceByTicketToken = factory.authorization.IInvoiceAsPaymentMetho
 export type INotification = factory.notification.payAction.IPayAction4inform | factory.notification.refundAction.IRefundAction4inform;
 export declare function creatPublishPaymentUrlParams(params: {
     accountId?: string;
-    object: Pick<factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod'>;
+    object: Pick<factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod' | 'referencesOrder'>;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller' | 'project'>;
     transactionNumber: string;

package/lib/chevre/service/payment/any/factory.js

@@ -22,7 +22,11 @@ function creatPublishPaymentUrlParams(params) {
     const object = {
         typeOf: params.paymentServiceType,
         id: issuedThroughId,
-        paymentMethod
+        paymentMethod,
+        serviceOutput: {
+            typeOf: 'Invoice',
+            referencesOrder: params.object.referencesOrder
+        }
     };
     const ticketAsInstrument = (typeof params.ticketToken === 'string') ? { ticketToken: params.ticketToken, typeOf: 'Ticket' } : undefined;
     return Object.assign(Object.assign(Object.assign({ project: { id: params.transaction.project.id, typeOf: factory.organizationType.Project }, typeOf: factory.assetTransactionType.Pay, transactionNumber: params.transactionNumber, agent: {
@@ -90,7 +94,11 @@ function creatPayTransactionStartParams(params) {
         }, object: {
             typeOf: params.paymentServiceType,
             id: issuedThroughId,
-            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ identifier: params.object.paymentMethod, amount: params.object.amount, additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [] }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (typeof params.object.name === 'string') ? { name: params.object.name } : undefined), (typeof accountId === 'string') ? { accountId } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined), (typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined)
+            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ identifier: params.object.paymentMethod, amount: params.object.amount, additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [] }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (typeof params.object.name === 'string') ? { name: params.object.name } : undefined), (typeof accountId === 'string') ? { accountId } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined), (typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined),
+            serviceOutput: {
+                typeOf: 'Invoice',
+                referencesOrder: params.object.referencesOrder
+            }
         }, expires: expires, purpose: {
             typeOf: factory.order.OrderType.Order,
             confirmationNumber,

package/lib/chevre/service/payment/any.d.ts

@@ -125,7 +125,7 @@ declare function publishPaymentUrl(params: {
     agent: {
         id: string;
     };
-    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod'>;
+    object: Pick<IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod' | 'referencesOrder'>;
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
     paymentServiceType: factory.service.paymentService.PaymentServiceType;
     location: factory.action.trade.pay.ILocation;

package/lib/chevre/service/payment/any.js

@@ -323,7 +323,7 @@ function processVoidPayTransaction(params) {
 function publishPaymentUrl(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const { paymentServiceType, purpose, project } = params;
         if (purpose.typeOf !== factory.transactionType.PlaceOrder) {
             throw new factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
@@ -361,9 +361,13 @@ function publishPaymentUrl(params) {
             // }
             let result;
             // URL発行
-            const authorizeObject = Object.assign(Object.assign({}, params.object), { accountId: '', paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment });
+            const authorizeObject = Object.assign(Object.assign({}, params.object), { accountId: '', paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment, 
+                // support referencesOrder(2025-11-24~)
+                referencesOrder: (((_a = params.object.referencesOrder) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.order.OrderType.Order)
+                    ? params.object.referencesOrder
+                    : { typeOf: factory.order.OrderType.Order } });
             const startParams = (0, factory_1.creatPublishPaymentUrlParams)(Object.assign(Object.assign({ object: authorizeObject, paymentServiceType, transaction: transaction, transactionNumber: transactionNumber, location: params.location }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined));
-            const taskId = (_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id;
+            const taskId = (_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id;
             result = yield PayTransactionService.publishPaymentUrl(startParams, {
                 purposeAsTransaction: { id: transaction.id },
                 executor: (typeof taskId === 'string') ? { id: taskId } : {} // タスク関連付け(2024-05-22~)
@@ -416,7 +420,7 @@ function minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPay
 function authorize(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const { paymentServiceType, purpose, project } = params;
         if (purpose.typeOf !== factory.transactionType.PlaceOrder) {
             throw new factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
@@ -497,10 +501,14 @@ function authorize(params) {
         const { accountId } = yield fixAccountIdIfPossible({
             object: params.object, project: { id: transaction.project.id }
         })();
-        const authorizeObjectIncludingPaymentMethodDetails = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
+        const authorizeObjectIncludingPaymentMethodDetails = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment, 
+            // support referencesOrder(2025-11-24~)
+            referencesOrder: (((_a = params.object.referencesOrder) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.order.OrderType.Order)
+                ? params.object.referencesOrder
+                : { typeOf: factory.order.OrderType.Order } }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
         const { authorizeObject } = minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPaymentMethodDetails);
         // 承認アクションを開始する
-        const taskId = (_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id;
+        const taskId = (_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id;
         const uniqueActionIdentifier = util.format(`%s:%s:%s`, factory.actionType.AuthorizeAction, factory.action.authorize.paymentMethod.any.ResultType.Payment, authorizeObject.paymentMethodId);
         const actionAttributes = Object.assign({ project: transaction.project, typeOf: factory.actionType.AuthorizeAction, object: authorizeObject, agent: {
                 typeOf: transaction.agent.typeOf,
@@ -514,7 +522,7 @@ function authorize(params) {
                 id: transaction.seller.id,
                 name: (typeof transaction.seller.name === 'string')
                     ? transaction.seller.name
-                    : String((_b = transaction.seller.name) === null || _b === void 0 ? void 0 : _b.ja)
+                    : String((_c = transaction.seller.name) === null || _c === void 0 ? void 0 : _c.ja)
             }, purpose: { typeOf: transaction.typeOf, id: transaction.id }, identifier: uniqueActionIdentifier }, (typeof taskId === 'string') ? { sameAs: { id: taskId, typeOf: 'Task' } } : undefined // タスク関連付け(2024-04-22~)
         );
         const action = yield repos.action.start(actionAttributes);

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": "5.3.0-alpha.2",
+    "@chevre/factory": "5.3.0-alpha.3",
     "@cinerino/sdk": "12.9.0-alpha.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.1.0-alpha.18"
+  "version": "23.1.0-alpha.19"
 }