@chevre/factory 4.325.0-alpha.1 → 4.325.0-alpha.3

package/lib/action/authorize/paymentMethod/any.d.ts

@@ -98,6 +98,12 @@ export interface IObject {
      */
     movieTickets?: IMovieTicket[];
 }
+export interface IResultPaymentMethod {
+    typeOf: IAnyPaymentMethod;
+    amount?: {
+        currency?: string;
+    };
+}
 export interface IResult {
     /**
      * The identifier for the account the payment will be applied to.
@@ -111,6 +117,10 @@ export interface IResult {
      * 決済方法
      */
     paymentMethod: IAnyPaymentMethod;
+    /**
+     * amount.currencyに対応するために追加(2023-08-13~)
+     */
+    paymentMethodAsObject?: IResultPaymentMethod;
     /**
      * 決済ID
      */

package/lib/action/transfer/return/paymentMethod.d.ts

@@ -1,10 +1,10 @@
 import * as ActionFactory from '../../../action';
-import * as OrderFactory from '../../../order';
+import { IReferencedInvoice, ISimpleOrder } from '../../../order';
 import { IAttributes as ISendEmailMessageActionAttributes } from '../../transfer/send/message/email';
 import * as ReturnActionFactory from '../return';
 export declare type IAgent = ActionFactory.IParticipantAsProject;
 export declare type IRecipient = ActionFactory.IParticipant;
-export declare type IObject = OrderFactory.IPaymentMethod;
+export declare type IObject = IReferencedInvoice;
 export declare type IResult = any;
 export interface IPotentialActions {
     /**
@@ -12,7 +12,7 @@ export interface IPotentialActions {
      */
     sendEmailMessage?: ISendEmailMessageActionAttributes[];
 }
-export declare type IPurpose = OrderFactory.ISimpleOrder;
+export declare type IPurpose = ISimpleOrder;
 export interface IAttributes extends ReturnActionFactory.IAttributes<IObject, IResult> {
     agent: IAgent;
     recipient: IRecipient;

package/lib/assetTransaction/pay.d.ts

@@ -3,7 +3,8 @@ import { IAction as IPayAction, IAttributes as IPayActionAttributes, ILocation,
 import * as AssetTransactionFactory from '../assetTransaction';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
-import { IOrderPaymentMethodIssuedThroughServiceOutput, ITotalPaymentDue } from '../order';
+import { IMonetaryAmount } from '../monetaryAmount';
+import { ITotalPaymentDue } from '../order';
 import { IUnauthorizedCardOfMember, IUncheckedCardRaw, IUncheckedCardTokenized } from '../paymentMethod/paymentCard/creditCard';
 import { IOnPaymentStatusChanged } from '../project';
 import { IPropertyValue } from '../propertyValue';
@@ -23,6 +24,9 @@ export import IEntryTranArgs = GMO.factory.credit.IEntryTranArgs;
 export import IEntryTranResult = GMO.factory.credit.IEntryTranResult;
 export import IExecTranArgs = GMO.factory.credit.IExecTranArgs;
 export import IExecTranResult = GMO.factory.credit.IExecTranResult;
+export interface IPaymentMethodAmount extends Pick<IMonetaryAmount, 'currency' | 'typeOf' | 'value'> {
+    value: number;
+}
 export interface IPaymentMethod {
     /**
      * The identifier for the account the payment will be applied to.
@@ -34,8 +38,9 @@ export interface IPaymentMethod {
     additionalProperty?: IPropertyValue<string>[];
     /**
      * The amount of money.
+     * MonetaryAmount対応(2023-08-12~)
      */
-    amount: number;
+    amount: number | IPaymentMethodAmount;
     /**
      * 説明
      */
@@ -89,7 +94,6 @@ export interface IObject {
      * 発行決済サービスID
      */
     id: string;
-    serviceOutput?: IOrderPaymentMethodIssuedThroughServiceOutput;
     paymentMethod: IPaymentMethod;
     pendingTransaction?: IPendingTransaction;
     entryTranArgs?: IEntryTranArgs;
@@ -100,7 +104,15 @@ export interface IObject {
     onPaymentStatusChanged?: IOnPaymentStatusChanged;
     accountsReceivablesByServiceType?: IAccountsReceivableByServiceType[];
 }
-export declare type IObjectWithoutDetail = Pick<IObject, 'typeOf' | 'id' | 'paymentMethod'>;
+export interface IPaymentMethodWithoutDetail extends IPaymentMethod {
+    /**
+     * 取引開始前の指定ではnumberに限定
+     */
+    amount: number;
+}
+export interface IObjectWithoutDetail extends Pick<IObject, 'typeOf' | 'id' | 'paymentMethod'> {
+    paymentMethod: IPaymentMethodWithoutDetail;
+}
 export declare type IStartParamsWithoutDetail = AssetTransactionFactory.IStartParams<AssetTransactionType.Pay, IAgent, IRecipient, IObjectWithoutDetail> & {
     location?: ILocation;
     recipient: IRecipient;

package/lib/invoice.d.ts

@@ -57,7 +57,7 @@ export interface IMovieTicketAsPaymentServiceOutput {
     serviceOutput?: IReservation;
     amount?: IAmountOfMovieTicketAsPaymentServiceOutput;
 }
-export declare type IPaymentServiceOutput = IMovieTicketAsPaymentServiceOutput[] | OrderFactory.IOrderPaymentMethodIssuedThroughServiceOutput;
+export declare type IPaymentServiceOutput = IMovieTicketAsPaymentServiceOutput[];
 /**
  * 決済方法(サービス)
  */

package/lib/order.d.ts

@@ -25,7 +25,7 @@ import * as BusReservationFactory from './reservation/busReservation';
 import * as EventReservationFactory from './reservation/event';
 import { ReservationType } from './reservationType';
 import { ISeller as IBaseSeller } from './seller';
-import { ICreditCardAsPaymentServiceOutput, PaymentServiceType } from './service/paymentService';
+import { IPaymentMethodAsServiceOutput, PaymentServiceType } from './service/paymentService';
 import { SortType } from './sortType';
 import { IUnitPriceOfferPriceSpecification } from './unitPriceOffer';
 export interface IProject {
@@ -35,27 +35,21 @@ export interface IProject {
 export declare enum OrderType {
     Order = "Order"
 }
-export interface IOrderPaymentMethodIssuedThroughServiceOutput extends ICreditCardAsPaymentServiceOutput {
-    amount?: {
-        currency: string;
-        value: number;
-    };
-}
 export interface IOrderPaymentMethodIssuedThrough {
     typeOf: PaymentServiceType;
     /**
      * 発行決済サービスID
      */
     id: string;
-    serviceOutput?: IOrderPaymentMethodIssuedThroughServiceOutput;
 }
 export interface ITotalPaymentDue extends Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'value'> {
     value: number;
 }
+export declare type IPaymentMethodOfInvoice = Pick<IPaymentMethodAsServiceOutput, 'amount'>;
 /**
- * 決済方法
+ * 請求
  */
-export interface IPaymentMethod {
+export interface IReferencedInvoice {
     /**
      * The identifier for the account the payment will be applied to.
      */
@@ -68,6 +62,11 @@ export interface IPaymentMethod {
      * 決済方法名称
      */
     name: string;
+    /**
+     * The name of the credit card or other method of payment for the order.
+     * 追加(2023-08-13~)
+     */
+    paymentMethod?: IPaymentMethodOfInvoice;
     /**
      * An identifier for the method of payment used (e.g.the last 4 digits of the credit card).
      */
@@ -324,7 +323,7 @@ export interface IOrder extends Omit<ISimpleOrder, 'customer'> {
     /**
      * payment methods
      */
-    paymentMethods: IPaymentMethod[];
+    paymentMethods: IReferencedInvoice[];
     /**
      * Returner
      */

package/lib/service/paymentService.d.ts

@@ -1,3 +1,4 @@
+import { IInvoice } from '../invoice';
 import { IAvailableChannel as IProductAvailableChannel, IServiceType } from '../product';
 import { IOnPaymentStatusChanged, IProject } from '../project';
 import { IPropertyValue } from '../propertyValue';
@@ -61,15 +62,21 @@ export declare type IAvailableChannel = IProductAvailableChannel & {
  * CreditCardIF決済サービスのカード属性
  * ポイントカード情報など
  */
-export interface ICreditCardAsPaymentServiceOutput {
+export interface IPaymentMethodAsServiceOutput {
     amount?: {
         /**
-         * 通貨区分
+         * カード通貨区分
          */
         currency: string;
     };
 }
-export declare type IServiceOutput = ICreditCardAsPaymentServiceOutput;
+export interface IInvoiceAsServiceOutput extends Pick<IInvoice, 'paymentStatus' | 'typeOf'> {
+    /**
+     * 発行される決済方法
+     */
+    paymentMethod?: IPaymentMethodAsServiceOutput;
+}
+export declare type IServiceOutput = IInvoiceAsServiceOutput;
 /**
  * 決済サービス
  * {@link https://schema.org/Service}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chevre/factory",
-  "version": "4.325.0-alpha.1",
+  "version": "4.325.0-alpha.3",
   "description": "Chevre Factory Library for Javascript",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",