@chevre/domain 23.2.0-alpha.9 → 24.0.0-alpha.0

package/lib/chevre/service/payment/creditCard/voidTransaction.js

@@ -1,29 +1,41 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.voidTransaction = voidTransaction;
-const GMO = require("@motionpicture/gmo-service");
-const factory = require("../../../factory");
+const GMO = __importStar(require("@motionpicture/gmo-service"));
+const factory = __importStar(require("../../../factory"));
 const getGMOInfoFromSeller_1 = require("./getGMOInfoFromSeller");
 const gmoError_1 = require("./gmoError");
 /**
  * クレジットカード決済中止
  */
-// tslint:disable-next-line:max-func-body-length
 function voidTransaction(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+    return async (repos, settings) => {
         const transaction = params.object;
         // CreditCard系統の決済方法タイプは動的
-        const paymentMethodType = (_a = transaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
+        const paymentMethodType = transaction.object.paymentMethod?.identifier;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
@@ -32,20 +44,20 @@ function voidTransaction(params) {
             throw new factory.errors.ArgumentNull('object.paymentMethodId');
         }
         const paymentServiceId = String(transaction.object.id);
-        const availableChannel = yield repos.paymentService.findAvailableChannelCreditCard({
+        const availableChannel = await repos.paymentService.findAvailableChannelCreditCard({
             project: transaction.project,
             id: paymentServiceId
         });
-        const sellerId = (_b = transaction.recipient) === null || _b === void 0 ? void 0 : _b.id;
+        const sellerId = transaction.recipient?.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('object.recipient.id');
         }
-        const { shopId, shopPass } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
+        const { shopId, shopPass } = await (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
             paymentMethodType, seller: { id: sellerId }, paymentServiceId,
             requirePaymentAccepted: false
         })(repos);
         // authorizeInvoiceActionが存在すれば取消(2024-06-13~)
-        const authorizeInvoiceAction = (yield repos.action.search({
+        const authorizeInvoiceAction = (await repos.action.search({
             limit: 1,
             page: 1,
             typeOf: { $eq: factory.actionType.AuthorizeAction },
@@ -58,7 +70,7 @@ function voidTransaction(params) {
                 agent: { id: authorizeInvoiceAction.project.id, typeOf: factory.organizationType.Project }
                 // ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
             };
-            yield repos.action.cancelWithVoid({ typeOf: authorizeInvoiceAction.typeOf, id: authorizeInvoiceAction.id, cancelAction });
+            await repos.action.cancelWithVoid({ typeOf: authorizeInvoiceAction.typeOf, id: authorizeInvoiceAction.id, cancelAction });
         }
         const creditCardService = new GMO.service.Credit({
             endpoint: String(availableChannel.serviceUrl),
@@ -66,12 +78,12 @@ function voidTransaction(params) {
         }, { timeout: settings.gmo.timeout });
         let searchTradeResult;
         try {
-            searchTradeResult = yield creditCardService.searchTrade({
+            searchTradeResult = await creditCardService.searchTrade({
                 shopId: shopId,
                 shopPass: shopPass,
                 orderId: paymentMethodId,
-                siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
-                sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
+                siteId: availableChannel.credentials?.siteId,
+                sitePass: availableChannel.credentials?.sitePass
             });
         }
         catch (error) {
@@ -92,16 +104,16 @@ function voidTransaction(params) {
             }
         }
         // 仮売上であれば取消
-        if ((searchTradeResult === null || searchTradeResult === void 0 ? void 0 : searchTradeResult.status) === GMO.utils.util.JobCd.Auth) {
-            yield creditCardService.alterTran({
+        if (searchTradeResult?.status === GMO.utils.util.JobCd.Auth) {
+            await creditCardService.alterTran({
                 shopId: shopId,
                 shopPass: shopPass,
                 accessId: searchTradeResult.accessId,
                 accessPass: searchTradeResult.accessPass,
                 jobCd: GMO.utils.util.JobCd.Void,
-                siteId: (_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.siteId,
-                sitePass: (_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.sitePass
+                siteId: availableChannel.credentials?.siteId,
+                sitePass: availableChannel.credentials?.sitePass
             });
         }
-    });
+    };
 }

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

@@ -1,12 +1,26 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.payFaceToFace = payFaceToFace;
@@ -15,23 +29,23 @@ exports.voidTransaction = voidTransaction;
 /**
  * 対面決済サービス
  */
-const factory = require("../../factory");
+const factory = __importStar(require("../../factory"));
 const onPayActionCompleted_1 = require("./any/onPayActionCompleted");
 const onRefundActionCompletedOrFailed_1 = require("./any/onRefundActionCompletedOrFailed");
 function voidTransaction(__) {
-    return (___) => __awaiter(this, void 0, void 0, function* () {
+    return async (___) => {
         // no op
-    });
+    };
 }
 function payFaceToFace(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const action = yield repos.action.start(params);
+    return async (repos) => {
+        const action = await repos.action.start(params);
         try {
             // no op
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -39,8 +53,8 @@ function payFaceToFace(params) {
             throw error;
         }
         const actionResult = {};
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
-        yield (0, onPayActionCompleted_1.onPayActionCompleted)({
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await (0, onPayActionCompleted_1.onPayActionCompleted)({
             // actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
             object: params.object,
@@ -50,17 +64,17 @@ function payFaceToFace(params) {
             typeOf: action.typeOf
         })(repos);
         // return action;
-    });
+    };
 }
 function refundFaceToFace(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const action = yield repos.action.start(params);
+    return async (repos) => {
+        const action = await repos.action.start(params);
         try {
             // no op
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
@@ -68,8 +82,8 @@ function refundFaceToFace(params) {
             throw error;
         }
         const actionResult = {};
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
-        yield (0, onRefundActionCompletedOrFailed_1.onRefundActionCompletedOrFailed)({
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await (0, onRefundActionCompletedOrFailed_1.onRefundActionCompletedOrFailed)({
             actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
             object: params.object,
@@ -79,5 +93,5 @@ function refundFaceToFace(params) {
             typeOf: action.typeOf
         })(repos);
         // return action;
-    });
+    };
 }

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

@@ -1,7 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPayObjectServiceOutput = createPayObjectServiceOutput;
-const factory = require("../../../factory");
+const factory = __importStar(require("../../../factory"));
 /**
  * PayAction.object.serviceOutputを作成する
  * 決済カード決済の場合のみ、対象予約情報をserviceOutputに持つ決済カード情報として存在する
@@ -17,16 +40,21 @@ function createPayObjectServiceOutput(params) {
         case factory.service.paymentService.PaymentServiceType.CreditCard:
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
-            const paymentMethodType = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier;
-            const movieTickets = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets;
+            const paymentMethodType = paymentMethod?.identifier;
+            const movieTickets = paymentMethod?.movieTickets;
             if (Array.isArray(movieTickets)) {
                 paymentServiceOutput = movieTickets.map((movieTicket) => {
-                    var _a;
                     const { amount, additionalProperty } = checkResult2movieTicket(movieTicket, params.checkResult);
                     const reservation4invoice = movieTicket2reservation4invoice(movieTicket, order, String(paymentMethodType), transaction.transactionNumber);
-                    return Object.assign(Object.assign({ identifier: movieTicket.identifier, additionalProperty }, (typeof (amount === null || amount === void 0 ? void 0 : amount.value) === 'number') ? { amount } : undefined), (typeof ((_a = reservation4invoice.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-                        ? { serviceOutput: reservation4invoice }
-                        : undefined);
+                    return {
+                        identifier: movieTicket.identifier,
+                        additionalProperty, // add additionalProperty(2024-12-13~)
+                        // 計上金額を追加(2023-05-17~)
+                        ...(typeof amount?.value === 'number') ? { amount } : undefined,
+                        ...(typeof reservation4invoice.priceSpecification?.typeOf === 'string')
+                            ? { serviceOutput: reservation4invoice }
+                            : undefined
+                    };
                 });
             }
             break;
@@ -38,20 +66,19 @@ function createPayObjectServiceOutput(params) {
 function checkResult2movieTicket(
 // transaction: Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType.Pay>, 'object'>,
 movieTicket, checkResult) {
-    var _a, _b;
     const additionalProperty = [];
     let amount;
     // accountsReceivablesByServiceTypeへの依存をactionRecipeへ移行(2024-12-16~)
-    const purchaseNumberInfo = (_a = checkResult === null || checkResult === void 0 ? void 0 : checkResult.purchaseNumberAuthResult.knyknrNoInfoOut) === null || _a === void 0 ? void 0 : _a.find(({ knyknrNo }) => knyknrNo === movieTicket.identifier);
-    const ykknInfoOfServiceType = (_b = purchaseNumberInfo === null || purchaseNumberInfo === void 0 ? void 0 : purchaseNumberInfo.ykknInfo) === null || _b === void 0 ? void 0 : _b.find((ykknInfo) => ykknInfo.ykknshTyp === movieTicket.serviceType);
-    const kijUnip = ykknInfoOfServiceType === null || ykknInfoOfServiceType === void 0 ? void 0 : ykknInfoOfServiceType.kijUnip;
+    const purchaseNumberInfo = checkResult?.purchaseNumberAuthResult.knyknrNoInfoOut?.find(({ knyknrNo }) => knyknrNo === movieTicket.identifier);
+    const ykknInfoOfServiceType = purchaseNumberInfo?.ykknInfo?.find((ykknInfo) => ykknInfo.ykknshTyp === movieTicket.serviceType);
+    const kijUnip = ykknInfoOfServiceType?.kijUnip;
     if (typeof kijUnip === 'string') {
         amount = {
             typeOf: 'MonetaryAmount',
             value: Number(kijUnip)
         };
     }
-    additionalProperty.push(...(typeof kijUnip === 'string') ? [{ name: 'kijUnip', value: kijUnip }] : [], ...(typeof (purchaseNumberInfo === null || purchaseNumberInfo === void 0 ? void 0 : purchaseNumberInfo.dnshKmTyp) === 'string') ? [{ name: 'dnshKmTyp', value: purchaseNumberInfo.dnshKmTyp }] : []
+    additionalProperty.push(...(typeof kijUnip === 'string') ? [{ name: 'kijUnip', value: kijUnip }] : [], ...(typeof purchaseNumberInfo?.dnshKmTyp === 'string') ? [{ name: 'dnshKmTyp', value: purchaseNumberInfo.dnshKmTyp }] : []
     // ...(typeof purchaseNumberInfo?.znkkkytsknGkjknTyp === 'string')
     //     ? [{ name: 'znkkkytsknGkjknTyp', value: purchaseNumberInfo.znkkkytsknGkjknTyp }]
     //     : []
@@ -69,8 +96,7 @@ movieTicket, checkResult) {
     return { additionalProperty, amount };
 }
 function reservationPriceComponent2invoicePriceComponent(component) {
-    var _a;
-    const accounting = (typeof ((_a = component.accounting) === null || _a === void 0 ? void 0 : _a.accountsReceivable) === 'number')
+    const accounting = (typeof component.accounting?.accountsReceivable === 'number')
         ? { accountsReceivable: component.accounting.accountsReceivable }
         : undefined;
     let minimizedUnitPriceSpec;
@@ -82,19 +108,33 @@ function reservationPriceComponent2invoicePriceComponent(component) {
                 return { typeOf: addOn.typeOf };
             })
             : undefined;
-        minimizedUnitPriceSpec = Object.assign(Object.assign({ typeOf: component.typeOf, price: component.price, referenceQuantity: component.referenceQuantity }, (Array.isArray(appliesToAddOn)) ? { appliesToAddOn } : undefined), (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
+        minimizedUnitPriceSpec = {
+            typeOf: component.typeOf,
+            price: component.price,
+            referenceQuantity: component.referenceQuantity,
+            ...(Array.isArray(appliesToAddOn)) ? { appliesToAddOn } : undefined,
+            ...(typeof accounting?.accountsReceivable === 'number') ? { accounting } : undefined
+        };
     }
     else if (component.typeOf === factory.priceSpecificationType.MovieTicketTypeChargeSpecification) {
-        minimizedMovieTicketTypeChargeSpec = Object.assign({ typeOf: component.typeOf, price: component.price, 
+        minimizedMovieTicketTypeChargeSpec = {
+            typeOf: component.typeOf,
+            price: component.price,
             // 適用決済方法区分を追加(2023-03-29~)
             appliesToMovieTicket: {
                 serviceOutput: {
                     typeOf: component.appliesToMovieTicket.serviceOutput.typeOf
                 }
-            } }, (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
+            },
+            ...(typeof accounting?.accountsReceivable === 'number') ? { accounting } : undefined
+        };
     }
     else {
-        minimizedCategoryCodeChargeSpec = Object.assign({ typeOf: component.typeOf, price: component.price }, (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
+        minimizedCategoryCodeChargeSpec = {
+            typeOf: component.typeOf,
+            price: component.price,
+            ...(typeof accounting?.accountsReceivable === 'number') ? { accounting } : undefined
+        };
     }
     if (minimizedUnitPriceSpec !== undefined) {
         return minimizedUnitPriceSpec;
@@ -113,15 +153,13 @@ function reservationPriceComponent2invoicePriceComponent(component) {
  * 決済カードの対象予約情報を作成する
  */
 function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType, payTransactionNumber) {
-    var _a;
     // Orderから対象予約を取得
     const reservationOffer = order.acceptedOffersMovieTicketUsed.find(({ itemOffered, priceSpecification }) => {
-        var _a, _b;
         let mvtkUnitPriceSpec;
         // MovieTicket適用単価オファーからidentifierを取り出す
-        if ((priceSpecification === null || priceSpecification === void 0 ? void 0 : priceSpecification.typeOf) === factory.priceSpecificationType.CompoundPriceSpecification) {
+        if (priceSpecification?.typeOf === factory.priceSpecificationType.CompoundPriceSpecification) {
             // 適用購入管理番号が一致、かつ、決済方法区分が一致、の単価仕様を検索
-            mvtkUnitPriceSpec = (_a = priceSpecification === null || priceSpecification === void 0 ? void 0 : priceSpecification.priceComponent) === null || _a === void 0 ? void 0 : _a.find((p) => {
+            mvtkUnitPriceSpec = priceSpecification?.priceComponent?.find((p) => {
                 return p.typeOf === factory.priceSpecificationType.UnitPriceSpecification
                     && Array.isArray(p.appliesToMovieTicket)
                     && p.appliesToMovieTicket.some((appliesToMovieTicket) => {
@@ -132,7 +170,7 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType,
         }
         let isMovieTicketServiceOutput = mvtkUnitPriceSpec !== undefined
             && itemOffered.reservationFor.id === movieTicket.serviceOutput.reservationFor.id
-            && ((_b = itemOffered.reservedTicket.ticketedSeat) === null || _b === void 0 ? void 0 : _b.seatNumber) === movieTicket.serviceOutput.reservedTicket.ticketedSeat.seatNumber
+            && itemOffered.reservedTicket.ticketedSeat?.seatNumber === movieTicket.serviceOutput.reservedTicket.ticketedSeat.seatNumber
             && itemOffered.reservedTicket.ticketedSeat.seatSection === movieTicket.serviceOutput.reservedTicket.ticketedSeat.seatSection;
         // チケット識別子で照合(2024-04-17~)
         isMovieTicketServiceOutput = isMovieTicketServiceOutput
@@ -154,12 +192,16 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType,
     }
     const reservationNumber = reservationOffer.itemOffered.reservationNumber;
     let priceComponents4invoice = [];
-    const priceComponent = (_a = reservationOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent;
+    const priceComponent = reservationOffer.priceSpecification?.priceComponent;
     if (Array.isArray(priceComponent)) {
         priceComponents4invoice = priceComponent.map(reservationPriceComponent2invoicePriceComponent);
     }
-    return Object.assign({ priceSpecification: {
+    return {
+        priceSpecification: {
             typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
             priceComponent: priceComponents4invoice
-        }, reservationNumber }, (typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined);
+        },
+        reservationNumber, // add reservationNumber(2023-03-20~)
+        ...(typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined
+    };
 }

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

@@ -1,13 +1,35 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPayOrderAction = createPayOrderAction;
-const factory = require("../../factory");
+const factory = __importStar(require("../../factory"));
 const createPayObjectServiceOutput_1 = require("./factory/createPayObjectServiceOutput");
 /**
  * 注文に対する決済アクションを生成する
  */
 function createPayOrderAction(params) {
-    var _a;
     const payObject = createPayObject(params);
     const informPaymentActions = createInformPaymentActions(params);
     const payPurpose = {
@@ -28,27 +50,35 @@ function createPayOrderAction(params) {
         name: params.transaction.recipient.name,
         typeOf: params.transaction.recipient.typeOf
     };
-    return Object.assign({ project: params.transaction.project, typeOf: factory.actionType.PayAction, object: [payObject], agent: params.transaction.project, potentialActions: {
+    return {
+        project: params.transaction.project,
+        typeOf: factory.actionType.PayAction,
+        object: [payObject],
+        agent: params.transaction.project,
+        potentialActions: {
             informPayment: informPaymentActions,
             add2report: true
-        }, purpose: payPurpose, recipient,
-        instrument }, (typeof ((_a = params.transaction.location) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-        ? { location: params.transaction.location }
-        : undefined);
+        },
+        purpose: payPurpose,
+        recipient,
+        instrument,
+        // add location(2022-11-11~)
+        ...(typeof params.transaction.location?.typeOf === 'string')
+            ? { location: params.transaction.location }
+            : undefined
+    };
 }
-// tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createPayObject(params) {
-    var _a;
     const transaction = params.transaction;
     const paymentMethod = transaction.object.paymentMethod;
-    const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier);
-    const additionalProperty = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.additionalProperty;
+    const paymentMethodType = String(paymentMethod?.identifier);
+    const additionalProperty = paymentMethod?.additionalProperty;
     const paymentMethodId = transaction.object.paymentMethodId;
-    const paymentMethodName = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name) === 'string') ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name : paymentMethodType;
+    const paymentMethodName = (typeof paymentMethod?.name === 'string') ? paymentMethod?.name : paymentMethodType;
     // MonetaryAmount対応(2023-08-13~)
-    const paymentMethodAmountValue = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount) === 'number')
+    const paymentMethodAmountValue = (typeof paymentMethod?.amount === 'number')
         ? paymentMethod.amount
-        : paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount.value;
+        : paymentMethod?.amount.value;
     const paymentServiceOutput = (0, createPayObjectServiceOutput_1.createPayObjectServiceOutput)(params);
     let payObject;
     switch (transaction.object.typeOf) {
@@ -62,11 +92,18 @@ function createPayObject(params) {
             payObject = {
                 typeOf: transaction.object.typeOf,
                 id: (typeof transaction.object.id === 'string') ? transaction.object.id : '',
-                paymentMethod: Object.assign({ additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [], name: paymentMethodName, paymentMethodId: paymentMethodId, totalPaymentDue: totalPaymentDue4faceToFace, typeOf: paymentMethodType }, (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.accountId) === 'string') ? { accountId: paymentMethod.accountId } : undefined)
+                paymentMethod: {
+                    additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [],
+                    name: paymentMethodName,
+                    paymentMethodId: paymentMethodId,
+                    totalPaymentDue: totalPaymentDue4faceToFace,
+                    typeOf: paymentMethodType,
+                    ...(typeof paymentMethod?.accountId === 'string') ? { accountId: paymentMethod.accountId } : undefined
+                }
             };
             break;
         case factory.service.paymentService.PaymentServiceType.PaymentCard:
-            const totalPaymentDue = (typeof ((_a = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.totalPaymentDue) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+            const totalPaymentDue = (typeof paymentMethod?.totalPaymentDue?.typeOf === 'string')
                 ? paymentMethod.totalPaymentDue
                 : {
                     typeOf: 'MonetaryAmount',
@@ -77,7 +114,7 @@ function createPayObject(params) {
                 typeOf: transaction.object.typeOf,
                 id: (typeof transaction.object.id === 'string') ? transaction.object.id : '',
                 paymentMethod: {
-                    accountId: paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.accountId,
+                    accountId: paymentMethod?.accountId,
                     additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [],
                     name: paymentMethodName,
                     paymentMethodId: paymentMethodId,
@@ -91,28 +128,41 @@ function createPayObject(params) {
             payObject = {
                 typeOf: transaction.object.typeOf,
                 id: (typeof transaction.object.id === 'string') ? transaction.object.id : '',
-                paymentMethod: Object.assign({ additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [], name: paymentMethodName, paymentMethodId: paymentMethodId, totalPaymentDue: {
+                paymentMethod: {
+                    additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [],
+                    name: paymentMethodName,
+                    paymentMethodId: paymentMethodId,
+                    totalPaymentDue: {
                         typeOf: 'MonetaryAmount',
                         currency: factory.priceCurrency.JPY,
                         value: paymentMethodAmountValue
-                    }, typeOf: paymentMethodType }, (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.accountId) === 'string') ? { accountId: paymentMethod.accountId } : undefined)
+                    },
+                    typeOf: paymentMethodType,
+                    ...(typeof paymentMethod?.accountId === 'string') ? { accountId: paymentMethod.accountId } : undefined
+                }
                 // CreditCardIFのカード通貨区分を追加(2023-08-07~)
                 // ...(paymentServiceOutput !== undefined) ? { serviceOutput: paymentServiceOutput } : undefined
             };
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
-            payObject = Object.assign({ typeOf: transaction.object.typeOf, id: (typeof transaction.object.id === 'string') ? transaction.object.id : '', paymentMethod: {
-                    accountId: paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.accountId,
+            payObject = {
+                typeOf: transaction.object.typeOf,
+                id: (typeof transaction.object.id === 'string') ? transaction.object.id : '',
+                paymentMethod: {
+                    accountId: paymentMethod?.accountId,
                     additionalProperty: (Array.isArray(additionalProperty)) ? additionalProperty : [],
                     name: paymentMethodName,
                     paymentMethodId: paymentMethodId,
                     totalPaymentDue: {
                         typeOf: 'MonetaryAmount',
                         currency: factory.unitCode.C62,
-                        value: (Array.isArray(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets)) ? paymentMethod.movieTickets.length : 0
+                        value: (Array.isArray(paymentMethod?.movieTickets)) ? paymentMethod.movieTickets.length : 0
                     },
                     typeOf: paymentMethodType
-                }, movieTickets: paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets }, (Array.isArray(paymentServiceOutput)) ? { serviceOutput: paymentServiceOutput } : undefined);
+                },
+                movieTickets: paymentMethod?.movieTickets,
+                ...(Array.isArray(paymentServiceOutput)) ? { serviceOutput: paymentServiceOutput } : undefined
+            };
             break;
         default:
             throw new factory.errors.NotImplemented(`Payment service "${transaction.object.typeOf}" not implemented.`);
@@ -120,12 +170,11 @@ function createPayObject(params) {
     return payObject;
 }
 function createInformPaymentActions(params) {
-    var _a, _b;
     const transaction = params.transaction;
     const informPaymentActions = [];
     // 取引に指定があれば設定
     // const informPayment = transaction.object.onPaymentStatusChanged?.informPayment;
-    const potentialInformActionId = (_b = (_a = transaction.potentialAction) === null || _a === void 0 ? void 0 : _a.find(({ typeOf }) => typeOf === factory.actionType.InformAction)) === null || _b === void 0 ? void 0 : _b.id;
+    const potentialInformActionId = transaction.potentialAction?.find(({ typeOf }) => typeOf === factory.actionType.InformAction)?.id;
     if (typeof potentialInformActionId === 'string') {
         // const recipient: factory.action.trade.pay.IInformPayment['recipient'] = {
         //     typeOf: transaction.agent.typeOf,