@chevre/domain 21.7.0-alpha.4 → 21.7.0-alpha.5

package/lib/chevre/emailMessageBuilder.d.ts

@@ -24,6 +24,6 @@ export declare function createReturnOrderMessage(params: {
  */
 export declare function createRefundMessage(params: {
     order: factory.order.IOrder;
-    paymentMethods: factory.order.IPaymentMethod[];
+    paymentMethods: factory.order.IReferencedInvoice[];
     email?: factory.creativeWork.message.email.ICustomization;
 }): Promise<factory.creativeWork.message.email.ICreativeWork>;

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

@@ -104,6 +104,9 @@ function createAuthorizeResult(params) {
         //     }
         //     : undefined
     };
+    const paymentMethodAsObject = {
+        typeOf: params.object.paymentMethod
+    };
     return {
         accountId: (typeof ((_b = payTransactionObject.paymentMethod) === null || _b === void 0 ? void 0 : _b.accountId) === 'string')
             ? payTransactionObject.paymentMethod.accountId
@@ -112,6 +115,7 @@ function createAuthorizeResult(params) {
         // amount: params.object.amount,
         issuedThrough,
         paymentMethod: params.object.paymentMethod,
+        paymentMethodAsObject,
         paymentStatus: factory.paymentStatusType.PaymentDue,
         paymentMethodId: (typeof ((_c = payTransactionObject.paymentMethod) === null || _c === void 0 ? void 0 : _c.paymentMethodId) === 'string')
             ? payTransactionObject.paymentMethod.paymentMethodId

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -70,16 +70,13 @@ function createPaymentMethods(params) {
     });
     // 決済方法をセット
     authorizePaymentActions.forEach((a) => {
+        var _a, _b;
         const result = a.result;
-        paymentMethods.push({
-            accountId: result.accountId,
-            additionalProperty: (Array.isArray(result.additionalProperty)) ? result.additionalProperty : [],
-            issuedThrough: result.issuedThrough,
-            name: result.name,
-            paymentMethodId: result.paymentMethodId,
-            totalPaymentDue: result.totalPaymentDue,
-            typeOf: result.paymentMethod
-        });
+        const paymentMethodAmountCurrencyByAuthorizeAction = (_b = (_a = result.paymentMethodAsObject) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
+        const paymentMethodOfInvoice = (typeof paymentMethodAmountCurrencyByAuthorizeAction === 'string') ?
+            { amount: { currency: paymentMethodAmountCurrencyByAuthorizeAction } }
+            : undefined;
+        paymentMethods.push(Object.assign({ accountId: result.accountId, additionalProperty: (Array.isArray(result.additionalProperty)) ? result.additionalProperty : [], issuedThrough: result.issuedThrough, name: result.name, paymentMethodId: result.paymentMethodId, totalPaymentDue: result.totalPaymentDue, typeOf: result.paymentMethod }, (paymentMethodOfInvoice !== undefined) ? { paymentMethod: paymentMethodOfInvoice } : undefined));
     });
     // 決済方法から注文金額の計算
     // price += authorizePaymentActions

package/lib/chevre/service/transaction/placeOrderInProgress/validation.js

@@ -214,9 +214,9 @@ function validatePaymentMethods(params) {
     if (typeof settings_1.settings.maxNumCreditCardPaymentMethod === 'number') {
         // CreditCard IFの決済方法の最大値検証
         const creditCardPaymentMethodCount = params.order.paymentMethods.filter((p) => {
-            var _a, _b, _c;
+            var _a, _b;
             // カード通貨区分の存在する決済サービスを考慮(2023-08-09~)
-            const serviceOutputAmountCurrency = (_c = (_b = (_a = p.issuedThrough.serviceOutput) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.amount) === null || _c === void 0 ? void 0 : _c.currency;
+            const serviceOutputAmountCurrency = (_b = (_a = p.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
             return p.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
                 && typeof serviceOutputAmountCurrency !== 'string';
         }).length;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.325.0-alpha.2",
+    "@chevre/factory": "4.325.0-alpha.3",
     "@cinerino/sdk": "3.164.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.7.0-alpha.4"
+  "version": "21.7.0-alpha.5"
 }