@chevre/factory 5.3.0-alpha.2 → 5.3.0-alpha.3

package/lib/action/accept/pay.d.ts

@@ -7,10 +7,16 @@ import { TransactionType } from '../../transactionType';
 import * as AcceptActionFactory from '../accept';
 export { IExecTran3dsArgs, IExecTran3dsResult, IAgent, IRecipe };
 export type IPaymentMethod = Pick<IPaymentMethodWithoutDetail, 'amount' | 'creditCard' | 'identifier' | 'method'>;
-export type IPayObject = Pick<IObjectWithoutDetail, 'id' | 'typeOf'> & {
+/**
+ * 採用する決済方法
+ */
+export type IPayObject = Pick<IObjectWithoutDetail, 'id' | 'typeOf' | 'serviceOutput'> & {
     paymentMethod: IPaymentMethod;
 };
 export interface IObject {
+    /**
+     * 決済方法(決済サービス)
+     */
     object: IPayObject;
     transactionNumber: string;
     typeOf: AssetTransactionType.Pay;

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

@@ -2,9 +2,9 @@ import * as ActionFactory from '../../../action';
 import * as CheckMovieTicketActionFactory from '../../../action/check/paymentMethod/movieTicket';
 import { AvailablePaymentMethodType, IMovieTicket } from '../../../action/trade/pay';
 import { ActionType } from '../../../actionType';
-import { ICreditCard, IFromLocation, ITokenizedPaymentCard } from '../../../assetTransaction/pay';
+import { ICreditCard, IFromLocation, IInvoiceReferenceOrder, ITokenizedPaymentCard } from '../../../assetTransaction/pay';
 import { AssetTransactionType } from '../../../assetTransactionType';
-import { IEventServiceAsOrderedItem, IOrder, IOrderPaymentMethodIssuedThrough, IReservationFor4EventServiceOrderedItem, ITotalPaymentDue } from '../../../order';
+import { IOrderPaymentMethodIssuedThrough, ITotalPaymentDue } from '../../../order';
 import { PaymentStatusType } from '../../../paymentStatusType';
 import { IPropertyValue } from '../../../propertyValue';
 import { IPermitAsServiceOutput } from '../../../service/paymentService';
@@ -82,6 +82,7 @@ export interface IObjectIncludingPaymentMethodDetails {
      * メンバーシップチケットに限らず、承認前に発行された決済方法チケットを指定すると、paymentMethodIdはチケットに依存する
      */
     ticketToken?: string;
+    referencesOrder: IInvoiceReferenceOrder;
 }
 export type IAuthorizeAnyPaymentObject = Pick<IObjectIncludingPaymentMethodDetails, 'amount' | 'issuedThrough' | 'paymentMethod' | 'name' | 'additionalProperty' | 'ticketToken'> & {
     creditCard?: never;
@@ -89,16 +90,18 @@ export type IAuthorizeAnyPaymentObject = Pick<IObjectIncludingPaymentMethodDetai
     movieTickets?: never;
     paymentMethodId?: never;
     fromLocation?: never;
-    description?: string;
+    description?: never;
+    referencesOrder?: never;
 };
 export type IAuthorizeCreditCardObject = Pick<IObjectIncludingPaymentMethodDetails, 'amount' | 'issuedThrough' | 'paymentMethod' | 'creditCard' | 'method' | 'name' | 'additionalProperty' | 'ticketToken'> & {
     /**
      * 決済URL発行の場合、発行済のpaymentMethodIdを指定
      */
     paymentMethodId?: string;
+    referencesOrder?: IInvoiceReferenceOrder;
     movieTickets?: never;
     fromLocation?: never;
-    description?: string;
+    description?: never;
 };
 export type IAuthorizeMovieTicketObject = Pick<IObjectIncludingPaymentMethodDetails, 'issuedThrough' | 'paymentMethod' | 'movieTickets' | 'name' | 'additionalProperty' | 'ticketToken'> & {
     /**
@@ -109,7 +112,8 @@ export type IAuthorizeMovieTicketObject = Pick<IObjectIncludingPaymentMethodDeta
     method?: never;
     paymentMethodId?: never;
     fromLocation?: never;
-    description?: string;
+    description?: never;
+    referencesOrder?: never;
 };
 export type IAuthorizePaymentCardObject = Pick<IObjectIncludingPaymentMethodDetails, 'amount' | 'issuedThrough' | 'paymentMethod' | 'fromLocation' | 'name' | 'additionalProperty'> & {
     description?: string;
@@ -118,7 +122,11 @@ export type IAuthorizePaymentCardObject = Pick<IObjectIncludingPaymentMethodDeta
     movieTickets?: never;
     ticketToken?: never;
     paymentMethodId?: never;
+    referencesOrder?: never;
 };
+/**
+ * 決済承認リクエストの承認対象オブジェクト
+ */
 export type IObjectWithoutDetail = IAuthorizeAnyPaymentObject | IAuthorizeCreditCardObject | IAuthorizeMovieTicketObject | IAuthorizePaymentCardObject;
 export type IObject = Pick<IObjectIncludingPaymentMethodDetails, 'typeOf' | 'paymentMethodId' | 'accountId'>;
 export interface IResultPaymentMethod {
@@ -133,34 +141,6 @@ export interface IResultPaymentMethod {
         currency?: string;
     };
 }
-/**
- * 決済承認結果としての請求書に関連する注文アイテムとしての興行
- */
-export type IEventServiceAsInvoiceOrderedItem = Pick<IEventServiceAsOrderedItem, 'typeOf'> & {
-    serviceOutput: {
-        /**
-         * 請求書に関連するイベント
-         * 興行オファー承認のイベントリストと完全に一致する必要がある
-         */
-        reservationFor: Pick<IReservationFor4EventServiceOrderedItem, 'id' | 'typeOf'>;
-    };
-};
-/**
- * 決済承認結果としての請求書に関連する注文アイテム
- */
-export interface IInvoiceOrderedItem {
-    typeOf: 'OrderItem';
-    orderedItem: IEventServiceAsInvoiceOrderedItem;
-}
-/**
- * 決済承認結果としての請求書に関連する注文
- */
-export interface IInvoiceReferenceOrder extends Pick<IOrder, 'typeOf'> {
-    /**
-     * 決済承認プロセスにおいて注文アイテムを指定された場合のみ定義される
-     */
-    orderedItem?: IInvoiceOrderedItem[];
-}
 export interface IResultAsInvoice {
     /**
      * The identifier for the account the payment will be applied to.

package/lib/assetTransaction/pay.d.ts

@@ -2,8 +2,9 @@ import { IAction as IPayAction, IInstrument, ILocation, IMovieTicket, IOrderAsPa
 import * as AssetTransactionFactory from '../assetTransaction';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
+import { IInvoice } from '../invoice';
 import { IMonetaryAmount } from '../monetaryAmount';
-import { ITotalPaymentDue } from '../order';
+import { IEventServiceAsOrderedItem, IOrder, IReservationFor4EventServiceOrderedItem, ITotalPaymentDue } from '../order';
 import { ICreditCard3DS, IUnauthorizedCardOfMember, IUncheckedCardRaw, IUncheckedCardTokenized } from '../paymentMethod/paymentCard/creditCard';
 import { IPropertyValue } from '../propertyValue';
 import { IPotentialAction as IPotentialInformAction, PaymentServiceType } from '../service/paymentService';
@@ -75,10 +76,44 @@ export interface IAccountsReceivableByServiceType {
     accountsReceivable?: number;
 }
 export type IPayActionInObject = Pick<IPayAction, 'actionStatus' | 'id' | 'typeOf'>;
+/**
+ * 決済承認結果としての請求書に関連する注文アイテムとしての興行
+ */
+export type IEventServiceAsInvoiceOrderedItem = Pick<IEventServiceAsOrderedItem, 'typeOf'> & {
+    serviceOutput: {
+        /**
+         * 請求書に関連するイベント
+         * 興行オファー承認のイベントリストと完全に一致する必要がある
+         */
+        reservationFor: Pick<IReservationFor4EventServiceOrderedItem, 'id' | 'typeOf'>;
+    };
+};
+/**
+ * 決済承認結果としての請求書に関連する注文アイテム
+ */
+export interface IInvoiceOrderedItem {
+    typeOf: 'OrderItem';
+    orderedItem: IEventServiceAsInvoiceOrderedItem;
+}
+/**
+ * 決済承認結果としての請求書に関連する注文
+ */
+export interface IInvoiceReferenceOrder extends Pick<IOrder, 'typeOf'> {
+    /**
+     * 決済承認プロセスにおいて注文アイテムを指定された場合のみ定義される
+     */
+    orderedItem?: IInvoiceOrderedItem[];
+}
+/**
+ * 関連注文情報を含む請求情報
+ */
+export type IInvoiceAsPaymentServiceOutput = Pick<IInvoice, 'typeOf'> & {
+    referencesOrder: IInvoiceReferenceOrder;
+};
 /**
  * 取引対象物
  */
-export interface IObject {
+export interface IPaymentServiceAsObject {
     accountId: string;
     paymentMethodId: string;
     typeOf: PaymentServiceType;
@@ -96,14 +131,16 @@ export interface IObject {
     checkedAction?: {
         id: string;
     };
+    serviceOutput?: IInvoiceAsPaymentServiceOutput;
 }
+export type IObject = IPaymentServiceAsObject;
 export interface IPaymentMethodWithoutDetail extends IPaymentMethod {
     /**
      * 取引開始前の指定ではnumberに限定
      */
     amount: number;
 }
-export interface IObjectWithoutDetail extends Pick<IObject, 'typeOf' | 'id' | 'paymentMethod'> {
+export interface IObjectWithoutDetail extends Pick<IObject, 'serviceOutput' | 'typeOf' | 'id' | 'paymentMethod'> {
     paymentMethod: IPaymentMethodWithoutDetail;
 }
 export type IPotentialAction = IPotentialInformAction;

package/lib/task/publishPaymentUrl.d.ts

@@ -11,7 +11,7 @@ export interface IData {
     agent: {
         id: string;
     };
-    object: Pick<IAuthorizeCreditCardObject, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod'>;
+    object: Pick<IAuthorizeCreditCardObject, 'amount' | 'creditCard' | 'issuedThrough' | 'method' | 'paymentMethod' | 'referencesOrder'>;
     purpose: IPurpose;
     paymentServiceType: PaymentServiceType;
     location: ILocation;

package/package.json

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