@chevre/domain 22.9.0-alpha.46 → 22.9.0-alpha.48

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

@@ -609,7 +609,8 @@ function searchGMOTrade(params) {
         const { shopId, shopPass } = yield CreditCardPayment.getGMOInfoFromSeller({
             paymentMethodType,
             seller: { id: sellerId },
-            paymentServiceId
+            paymentServiceId,
+            requirePaymentAccepted: false
         })(repos);
         return CreditCardPayment.searchGMOTrade({
             availableChannel,

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

@@ -35,14 +35,16 @@ payTransaction, paymentServiceId, options) {
         }
         const availableChannel = yield repos.paymentService.findAvailableChannelCreditCard({
             project: payTransaction.project,
-            // typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
             id: paymentServiceId
         });
         const sellerId = (_b = payTransaction.recipient) === null || _b === void 0 ? void 0 : _b.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const { shopId, shopPass, returnUrls3ds, callbackType3ds } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({ paymentMethodType, seller: { id: sellerId }, paymentServiceId })(repos);
+        const { shopId, shopPass, returnUrls3ds, callbackType3ds } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
+            paymentMethodType, seller: { id: sellerId }, paymentServiceId,
+            requirePaymentAccepted: true
+        })(repos);
         // GMOオーダーIDはカスタム指定可能
         const orderId = payTransaction.transactionNumber;
         if (typeof orderId !== 'string') {

package/lib/chevre/service/payment/creditCard/getGMOInfoFromSeller.d.ts

@@ -13,6 +13,7 @@ declare function getGMOInfoFromSeller(params: {
         id: string;
     };
     paymentServiceId: string;
+    requirePaymentAccepted: boolean;
 }): (repos: {
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;

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

@@ -14,12 +14,14 @@ const factory = require("../../../factory");
 function getGMOInfoFromSeller(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
-        const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
-            seller: { id: params.seller.id },
-            codeValue: params.paymentMethodType
-        });
-        if (paymentAccepted !== true) {
-            throw new factory.errors.Argument('transaction', `payment not accepted [${params.paymentMethodType}]`);
+        if (params.requirePaymentAccepted) {
+            const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
+                seller: { id: params.seller.id },
+                codeValue: params.paymentMethodType
+            });
+            if (paymentAccepted !== true) {
+                throw new factory.errors.Argument('transaction', `payment not accepted [${params.paymentMethodType}]`);
+            }
         }
         // 決済サービスからcredentialsを取得する
         const paymentServices = yield repos.paymentServiceProvider.search({

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

@@ -37,7 +37,10 @@ function payCreditCard(params) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const { shopId, shopPass } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({ paymentMethodType, seller: { id: sellerId }, paymentServiceId })(repos);
+        const { shopId, shopPass } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
+            paymentMethodType, seller: { id: sellerId }, paymentServiceId,
+            requirePaymentAccepted: true
+        })(repos);
         const action = yield repos.action.start(params);
         const alterTranResults = [];
         const processAlterTranResults = [];

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

@@ -43,8 +43,10 @@ function refundCreditCard(params
         const paymentMethodId = (_b = params.object[0]) === null || _b === void 0 ? void 0 : _b.paymentMethod.paymentMethodId;
         const paymentServiceId = (_c = params.object[0]) === null || _c === void 0 ? void 0 : _c.id;
         let requirePayAction = false;
+        let requirePaymentAccepted = false;
         if (purpose.typeOf === factory.actionType.ReturnAction) {
             requirePayAction = true;
+            requirePaymentAccepted = true;
         }
         // 本アクションに対応するPayActionを取り出す(Cinerino側で決済していた時期に関してはpayActionが存在しないので注意)
         let payAction;
@@ -61,17 +63,16 @@ function refundCreditCard(params
             alterTranResultByPayAction = (_f = (_e = (_d = payRecipe === null || payRecipe === void 0 ? void 0 : payRecipe.step[0]) === null || _d === void 0 ? void 0 : _d.itemListElement[1]) === null || _e === void 0 ? void 0 : _e.itemListElement[0]) === null || _f === void 0 ? void 0 : _f.afterMedia;
         }
         const sellerId = params.agent.id;
-        const { shopId, shopPass } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({ paymentMethodType, seller: { id: sellerId }, paymentServiceId })(repos);
+        const { shopId, shopPass } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
+            paymentMethodType, seller: { id: sellerId }, paymentServiceId,
+            requirePaymentAccepted
+        })(repos);
         const availableChannel = yield repos.paymentService.findAvailableChannelCreditCard({
             project: params.project,
             id: paymentServiceId
         });
         const { sameAs } = params, startingActionParams = __rest(params, ["sameAs"]);
         const action = yield repos.action.start(Object.assign(Object.assign({}, startingActionParams), (typeof ((_g = params.sameAs) === null || _g === void 0 ? void 0 : _g.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined));
-        // const alterTranResult: (
-        //     actory.action.trade.refund.IAlterTranResult
-        //     | factory.action.trade.refund.IAlterTranResultAsError
-        // )[] = [];
         let processAlterTranResult;
         let recipe;
         try {
@@ -92,7 +93,6 @@ function refundCreditCard(params
             if (processAlterTranResult.processAlterTranError === undefined) {
                 if (processAlterTranResult.alterTranResult !== undefined) {
                     // no op
-                    // alterTranResult.push(processAlterTranResult.alterTranResult);
                 }
             }
             else {
@@ -121,7 +121,6 @@ function refundCreditCard(params
             purpose: startingActionParams.purpose,
             typeOf: action.typeOf
         })(repos);
-        // return action;
     });
 }
 function processAlterTran(params) {

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

@@ -34,14 +34,16 @@ function voidTransaction(params) {
         const paymentServiceId = String(transaction.object.id);
         const availableChannel = yield repos.paymentService.findAvailableChannelCreditCard({
             project: transaction.project,
-            // typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
             id: paymentServiceId
         });
         const sellerId = (_b = transaction.recipient) === null || _b === void 0 ? void 0 : _b.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('object.recipient.id');
         }
-        const { shopId, shopPass } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({ paymentMethodType, seller: { id: sellerId }, paymentServiceId })(repos);
+        const { shopId, shopPass } = yield (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
+            paymentMethodType, seller: { id: sellerId }, paymentServiceId,
+            requirePaymentAccepted: false
+        })(repos);
         // authorizeInvoiceActionが存在すれば取消(2024-06-13~)
         const authorizeInvoiceAction = (yield repos.action.search({
             limit: 1,

package/package.json

@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.46"
+  "version": "22.9.0-alpha.48"
 }