@chevre/factory 4.190.0 → 4.191.0

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

@@ -30,14 +30,8 @@ export interface IObjectPendingTransaction {
     transactionNumber?: string;
 }
 export declare type IPaymentCard = MoneyTransferActionFactory.IPaymentCard;
-/**
- * 決済トークン
- */
-export declare type ITokenizedPaymentCard = string;
-/**
- * 転送元インターフェース
- */
-export declare type IFromLocation = IPaymentCard | ITokenizedPaymentCard;
+export import ITokenizedPaymentCard = PayTransactionFactory.ITokenizedPaymentCard;
+export import IFromLocation = PayTransactionFactory.IFromLocation;
 /**
  * 転送先インターフェース
  */
@@ -97,7 +91,6 @@ export interface IObject {
     /**
      * 転送先(PaymentCard決済)
      */
-    toLocation?: IToLocation;
     /**
      * 支払い方法(CreditCard決済)
      */

package/lib/factory/action/interact/confirm/moneyTransfer.d.ts

@@ -4,7 +4,6 @@ import ActionType from '../../../actionType';
 import * as MoneyTransferTransactionFactory from '../../../assetTransaction/moneyTransfer';
 import { IMonetaryAmount } from '../../../monetaryAmount';
 import * as OrderFactory from '../../../order';
-import { PermitType } from '../../../permit';
 import { IPropertyValue } from '../../../propertyValue';
 import TransactionType from '../../../transactionType';
 export declare type IAgent = ActionFactory.IParticipant;
@@ -44,21 +43,8 @@ export interface IPaymentMethodLocation {
      */
     additionalProperty: IPropertyValue<string>[];
 }
-/**
- * ペイメントカードインターフェース
- */
-export interface IPaymentCard {
-    typeOf: PermitType;
-    identifier: string;
-    accessCode?: string;
-    hasNoPermit?: boolean;
-    issuedThrough: {
-        /**
-         * カード発行サービスID
-         */
-        id: string;
-    };
-}
+export import IPaymentCard = MoneyTransferTransactionFactory.IPaymentCard;
+export import IFromLocationBeforeStart = MoneyTransferTransactionFactory.IFromLocationBeforeStart;
 /**
  * 転送元あるいは転送先の場所インターフェース
  */
@@ -83,7 +69,7 @@ export interface IAttributes extends ActionFactory.IAttributes<ActionType.Confir
     /**
      * 転送元
      */
-    fromLocation: ILocation;
+    fromLocation: ILocation | IFromLocationBeforeStart;
     /**
      * 転送先
      */

package/lib/factory/action/transfer/moneyTransfer.d.ts

@@ -1,9 +1,9 @@
 import * as AccountFactory from '../../account';
 import * as ActionFactory from '../../action';
 import ActionType from '../../actionType';
+import * as MoneyTransferTransactionFactory from '../../assetTransaction/moneyTransfer';
 import AssetTransactionType from '../../assetTransactionType';
 import { IMonetaryAmount } from '../../monetaryAmount';
-import { PermitType } from '../../permit';
 /**
  * 進行中取引インターフェース
  */
@@ -22,18 +22,7 @@ export import IAnonymousLocation = AccountFactory.action.moneyTransfer.IAnonymou
 /**
  * ペイメントカードインターフェース
  */
-export interface IPaymentCard {
-    typeOf: PermitType;
-    identifier: string;
-    accessCode?: string;
-    hasNoPermit?: boolean;
-    issuedThrough: {
-        /**
-         * カード発行サービスID
-         */
-        id: string;
-    };
-}
+export import IPaymentCard = MoneyTransferTransactionFactory.IPaymentCard;
 /**
  * 転送元あるいは転送先の場所インターフェース
  */

package/lib/factory/assetTransaction/moneyTransfer.d.ts

@@ -3,10 +3,40 @@ import * as TransactionFactory from '../assetTransaction';
 import AssetTransactionType from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
 import { IMonetaryAmount } from '../monetaryAmount';
+import { OrderType } from '../order';
+import { PermitType } from '../permit';
 export declare type IAgent = any;
 export declare type IRecipient = IMoneyTransferRecipient;
 export declare type IFromLocation = ILocation;
 export declare type IToLocation = ILocation;
+/**
+ * ペイメントカードインターフェース
+ */
+export interface IPaymentCard {
+    typeOf: PermitType;
+    identifier: string;
+    accessCode?: string;
+    hasNoPermit?: boolean;
+    issuedThrough: {
+        /**
+         * カード発行サービスID
+         */
+        id: string;
+    };
+}
+/**
+ * トークン化されたペイメントカードンターフェース
+ */
+export declare type ITokenizedPaymentCard = string;
+/**
+ * 転送元としての注文インターフェース
+ */
+export interface IOrderAsFromLocation {
+    typeOf: OrderType;
+    confirmationNumber: string;
+    orderNumber: string;
+}
+export declare type IFromLocationBeforeStart = IOrderAsFromLocation | IPaymentCard | ITokenizedPaymentCard;
 /**
  * 取引対象物インターフェース
  */
@@ -30,9 +60,31 @@ export interface IObject {
     pendingTransaction?: IPendingTransaction;
 }
 export declare type IObjectWithoutDetail = IObject;
+export interface IObjectBeforeStart {
+    /**
+     * 金額
+     */
+    amount: IMonetaryAmount;
+    /**
+     * 転送元
+     */
+    fromLocation: IFromLocation | IFromLocationBeforeStart;
+    /**
+     * 転送先
+     */
+    toLocation: IToLocation;
+    /**
+     * 取引説明
+     */
+    description?: string;
+    pendingTransaction?: IPendingTransaction;
+}
 export interface IStartParamsWithoutDetail extends TransactionFactory.IStartParams<AssetTransactionType.MoneyTransfer, IAgent, IRecipient, IObjectWithoutDetail> {
     recipient: IRecipient;
 }
+export interface IStartParamsBeforeStart extends TransactionFactory.IStartParams<AssetTransactionType.MoneyTransfer, IAgent, IRecipient, IObjectBeforeStart> {
+    recipient: IRecipient;
+}
 export interface IStartParams extends TransactionFactory.IStartParams<AssetTransactionType.MoneyTransfer, IAgent, IRecipient, IObject> {
     recipient: IRecipient;
 }

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

@@ -33,6 +33,11 @@ export interface IConfirmParams {
 }
 export declare type IResult = any;
 export declare type IError = any;
+/**
+ * ペイメントカードトークン
+ */
+export declare type ITokenizedPaymentCard = string;
+export declare type IFromLocation = ITokenizedPaymentCard;
 /**
  * クレジットカード決済承認に必要なクレジットカードインターフェース
  */
@@ -75,6 +80,10 @@ export interface IPaymentMethod {
      * 決済方法タイプ
      */
     typeOf: string;
+    /**
+     * 出金元ペイメントカード
+     */
+    fromLocation?: IFromLocation;
     /**
      * ムビチケリスト
      */

package/lib/factory/transaction/moneyTransfer.d.ts

@@ -1,10 +1,10 @@
 import * as waiter from '@waiter/factory';
 import { IAction as IAuthorizeAction, IAttributes as IAuthorizeActionAttributes } from '../action/authorize';
-import { IAttributes as IMoneyTransferActionAttributes, IPaymentCard } from '../action/interact/confirm/moneyTransfer';
+import { IAttributes as IMoneyTransferActionAttributes } from '../action/interact/confirm/moneyTransfer';
+import * as MoneyTransferAssetTransactionFactory from '../assetTransaction/moneyTransfer';
 import AssetTransactionType from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
 import { IMonetaryAmount } from '../monetaryAmount';
-import * as OrderFactory from '../order';
 import { IPerson } from '../person';
 import { IProject } from '../project';
 import * as TransactionFactory from '../transaction';
@@ -12,19 +12,10 @@ import TransactionType from '../transactionType';
 export declare type IAgent = TransactionFactory.IAgent;
 export declare type IRecipient = IPerson | TransactionFactory.ISeller;
 export import ISeller = TransactionFactory.ISeller;
-/**
- * トークン化されたペイメントカードンターフェース
- */
-export declare type ITokenizedPaymentCard = string;
-/**
- * 転送元としての注文インターフェース
- */
-export interface IOrderAsFromLocation {
-    typeOf: OrderFactory.OrderType;
-    confirmationNumber: string;
-    orderNumber: string;
-}
-export declare type IFromLocationBeforeStart = IOrderAsFromLocation | IPaymentCard | ITokenizedPaymentCard;
+export import IPaymentCard = MoneyTransferAssetTransactionFactory.IPaymentCard;
+export import ITokenizedPaymentCard = MoneyTransferAssetTransactionFactory.ITokenizedPaymentCard;
+export import IOrderAsFromLocation = MoneyTransferAssetTransactionFactory.IOrderAsFromLocation;
+export import IFromLocationBeforeStart = MoneyTransferAssetTransactionFactory.IFromLocationBeforeStart;
 export declare type IFromLocation = IPaymentCard;
 export declare type IToLocation = IPaymentCard;
 export interface IObjectPendingTransaction {
@@ -103,7 +94,7 @@ export interface IObject {
     /**
      * 転送元
      */
-    fromLocation: IFromLocation;
+    fromLocation: IFromLocationBeforeStart;
     /**
      * 転送先
      */

package/package.json

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