@chevre/factory 9.5.0-alpha.4 → 9.5.0-alpha.6

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

@@ -1,12 +1,11 @@
 import { IParticipantAsWebApplication, IParticipantAsPerson, IParticipantAsSeller, IAction as IBaseAction } from '../../../action';
 import { AvailablePaymentMethodType, IMovieTicket } from '../../../action/trade/pay';
 import { ActionType } from '../../../actionType';
-import { ICreditCard, IFromLocation, IInvoiceReferenceOrder, ITokenizedPaymentCard } from '../../../assetTransaction/pay';
+import { ICreditCard, IInvoiceReferenceOrder } from '../../../assetTransaction/pay';
 import { AssetTransactionType } from '../../../assetTransactionType';
 import { IOrderPaymentMethodIssuedThrough, ITotalPaymentDue } from '../../../order';
 import { PaymentStatusType } from '../../../paymentStatusType';
 import { IPropertyValue } from '../../../propertyValue';
-import { IPermitAsServiceOutput } from '../../../service/paymentService';
 import { TransactionType } from '../../../transactionType';
 import { IAttributes as IBaseAttributes } from '../../authorize';
 export type IAgent = IParticipantAsWebApplication | IParticipantAsPerson;
@@ -14,7 +13,7 @@ export type IRecipient = IParticipantAsSeller;
 export declare enum ResultType {
     Payment = "Payment"
 }
-export { ICreditCard, IFromLocation, ITokenizedPaymentCard };
+export { ICreditCard };
 export interface IObjectIncludingPaymentMethodDetails {
     /**
      * The identifier for the account the payment will be applied to.
@@ -58,10 +57,6 @@ export interface IObjectIncludingPaymentMethodDetails {
          */
         id: string;
     };
-    /**
-     * 転送元(PaymentCard決済)
-     */
-    fromLocation?: IFromLocation;
     /**
      * 支払い方法(CreditCard決済)
      */
@@ -87,7 +82,6 @@ export type IAuthorizeAnyPaymentObject = Pick<IObjectIncludingPaymentMethodDetai
     method?: never;
     movieTickets?: never;
     paymentMethodId?: never;
-    fromLocation?: never;
     description?: never;
     referencesOrder?: never;
 };
@@ -102,7 +96,6 @@ export type IAuthorizeCreditCardObject = Pick<IObjectIncludingPaymentMethodDetai
      */
     referencesOrder?: IInvoiceReferenceOrder;
     movieTickets?: never;
-    fromLocation?: never;
     description?: never;
 };
 export type IAuthorizeMovieTicketObject = Pick<IObjectIncludingPaymentMethodDetails, 'issuedThrough' | 'paymentMethod' | 'movieTickets' | 'name' | 'additionalProperty' | 'ticketToken'> & {
@@ -113,23 +106,13 @@ export type IAuthorizeMovieTicketObject = Pick<IObjectIncludingPaymentMethodDeta
     creditCard?: never;
     method?: never;
     paymentMethodId?: never;
-    fromLocation?: never;
     description?: never;
     referencesOrder?: never;
 };
-export type IAuthorizePaymentCardObject = Pick<IObjectIncludingPaymentMethodDetails, 'amount' | 'issuedThrough' | 'paymentMethod' | 'fromLocation' | 'name' | 'additionalProperty'> & {
-    description?: string;
-    creditCard?: never;
-    method?: never;
-    movieTickets?: never;
-    ticketToken?: never;
-    paymentMethodId?: never;
-    referencesOrder?: never;
-};
 /**
  * 決済承認リクエストの承認対象オブジェクト
  */
-export type IObjectWithoutDetail = IAuthorizeAnyPaymentObject | IAuthorizeCreditCardObject | IAuthorizeMovieTicketObject | IAuthorizePaymentCardObject;
+export type IObjectWithoutDetail = IAuthorizeAnyPaymentObject | IAuthorizeCreditCardObject | IAuthorizeMovieTicketObject;
 /**
  * 決済承認アクションオブジェクト
  * paymentMethodIdが決済取引の取引番号に等しい
@@ -174,12 +157,12 @@ export interface IResultAsInvoice {
     /**
      * The total amount due.
      */
-    totalPaymentDue?: ITotalPaymentDue;
+    totalPaymentDue: ITotalPaymentDue;
     /**
      * 追加特性
      */
     additionalProperty?: IPropertyValue<string>[];
-    typeOf: ResultType;
+    typeOf: ResultType.Payment;
     issuedThrough: IOrderPaymentMethodIssuedThrough;
     /**
      * 請求の関連注文
@@ -187,13 +170,9 @@ export interface IResultAsInvoice {
      */
     referencesOrder?: IInvoiceReferenceOrder;
 }
-export type IResultAsPermit = Pick<IPermitAsServiceOutput, 'typeOf' | 'issuedThrough'> & {
-    /**
-     * メンバーシップコード
-     */
-    identifier: string;
-};
-export type IResult = [IResultAsInvoice, IResultAsPermit?];
+export type IResult = [
+    IResultAsInvoice
+];
 export interface IPurpose {
     typeOf: TransactionType.PlaceOrder;
     id: string;

package/lib/chevre/action.d.ts

@@ -82,9 +82,6 @@ export interface IAttributes<T extends ActionType, TObject, TResult> {
      * アクションタイプ
      */
     typeOf: T;
-    amount?: any;
-    fromLocation?: any;
-    toLocation?: any;
     replacer?: any;
     targetCollection?: any;
     cancelAction?: any;
@@ -281,26 +278,4 @@ export interface ISearchConditions {
             $eq?: string;
         };
     };
-    fromLocation?: {
-        typeOf?: {
-            $in?: string[];
-        };
-        accountNumber?: {
-            $in?: string[];
-        };
-        accountType?: {
-            $in?: string[];
-        };
-    };
-    toLocation?: {
-        typeOf?: {
-            $in?: string[];
-        };
-        accountNumber?: {
-            $in?: string[];
-        };
-        accountType?: {
-            $in?: string[];
-        };
-    };
 }

package/lib/chevre/assetTransaction/pay.d.ts

@@ -10,11 +10,6 @@ import { IPropertyValue } from '../propertyValue';
 import { IPotentialAction as IPotentialInformAction, PaymentServiceType } from '../service/paymentService';
 export type IAgent = IAgentAsSeller;
 export type IRecipient = IPayRecipient;
-/**
- * ペイメントカードトークン
- */
-export type ITokenizedPaymentCard = string;
-export type IFromLocation = ITokenizedPaymentCard;
 /**
  * クレジットカード決済承認に必要なクレジットカードインターフェース
  */
@@ -33,10 +28,11 @@ export interface IPaymentMethod {
      */
     additionalProperty?: IPropertyValue<string>[];
     /**
-     * The amount of money.
+     * 金額
+     * 通貨はJPY、あるいは、決済サービスのカード通貨区分が自動的に適用される
      * MonetaryAmount対応(2023-08-12~)
      */
-    amount: number | IPaymentMethodAmount;
+    amount: IPaymentMethodAmount;
     /**
      * 説明
      */
@@ -47,17 +43,13 @@ export interface IPaymentMethod {
      */
     name?: string;
     /**
-     * The total amount due.
+     * JPYとしての金額、あるいは、決済カードの枚数
      */
-    totalPaymentDue?: ITotalPaymentDue;
+    totalPaymentDue: ITotalPaymentDue;
     /**
      * 決済方法区分
      */
     identifier: string;
-    /**
-     * 出金元ペイメントカード
-     */
-    fromLocation?: IFromLocation;
     /**
      * 決済カードリスト
      */
@@ -134,13 +126,13 @@ export interface IPaymentServiceAsObject {
     serviceOutput?: IInvoiceAsPaymentServiceOutput;
 }
 export type IObject = IPaymentServiceAsObject;
-export interface IPaymentMethodWithoutDetail extends IPaymentMethod {
+export interface IPaymentMethodWithoutDetail extends Pick<IPaymentMethod, 'accountId' | 'additionalProperty' | 'creditCard' | 'description' | 'identifier' | 'method' | 'movieTickets' | 'name'> {
     /**
      * 取引開始前の指定ではnumberに限定
      */
     amount: number;
 }
-export interface IObjectWithoutDetail extends Pick<IObject, 'serviceOutput' | 'typeOf' | 'id' | 'paymentMethod'> {
+export interface IObjectWithoutDetail extends Pick<IObject, 'serviceOutput' | 'typeOf' | 'id'> {
     paymentMethod: IPaymentMethodWithoutDetail;
 }
 export type IPotentialAction = IPotentialInformAction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chevre/factory",
-  "version": "9.5.0-alpha.4",
+  "version": "9.5.0-alpha.6",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "files": [