@chevre/factory 4.324.0-alpha.0 → 4.324.0-alpha.2

package/lib/action/authorize/offer/seatReservation.d.ts

@@ -1,6 +1,5 @@
 import * as COA from '@motionpicture/coa-service';
 import * as ActionFactory from '../../../action';
-import { ITotalPaymentDue } from '../../../action/trade/pay';
 import { ActionType } from '../../../actionType';
 import * as ReserveTransactionFactory from '../../../assetTransaction/reserve';
 import { AssetTransactionType } from '../../../assetTransactionType';
@@ -35,7 +34,7 @@ export interface IResult<T extends WebAPIFactory.Identifier> {
      * オファーに対して必要な金額
      * currencyを口座タイプとして扱う
      */
-    amount: ITotalPaymentDue[];
+    amount: OrderFactory.ITotalPaymentDue[];
     /**
      * 外部リクエストエンドポイント
      */

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

@@ -1,10 +1,10 @@
 import * as ActionFactory from '../../../action';
 import * as CheckMovieTicketActionFactory from '../../../action/check/paymentMethod/movieTicket';
-import { IMovieTicket, ITotalPaymentDue } from '../../../action/trade/pay';
+import { IMovieTicket } from '../../../action/trade/pay';
 import { ActionType } from '../../../actionType';
 import * as PayTransactionFactory from '../../../assetTransaction/pay';
 import { AssetTransactionType } from '../../../assetTransactionType';
-import { IPaymentMethodIssuedThrough } from '../../../order';
+import { IOrderPaymentMethodIssuedThrough, ITotalPaymentDue } from '../../../order';
 import * as CreditCardFactory from '../../../paymentMethod/paymentCard/creditCard';
 import { PaymentStatusType } from '../../../paymentStatusType';
 import { IPropertyValue } from '../../../propertyValue';
@@ -105,8 +105,8 @@ export interface IResult {
     accountId: string;
     /**
      * The amount of money.
+     * 廃止(2023-08-07~)
      */
-    amount: number;
     /**
      * 決済方法
      */
@@ -132,7 +132,7 @@ export interface IResult {
      */
     additionalProperty?: IPropertyValue<string>[];
     typeOf: ResultType;
-    issuedThrough: IPaymentMethodIssuedThrough;
+    issuedThrough: IOrderPaymentMethodIssuedThrough;
 }
 export interface IPurpose {
     typeOf: TransactionType;

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

@@ -5,8 +5,8 @@ import { IAttributes as IReturnOrderActionAttributes } from '../../action/transf
 import { ActionType } from '../../actionType';
 import { AssetTransactionType } from '../../assetTransactionType';
 import { CreativeWorkType } from '../../creativeWorkType';
-import { IPaymentServiceOutput, ITotalPaymentDue } from '../../invoice';
-import { OrderType } from '../../order';
+import { IPaymentServiceOutput } from '../../invoice';
+import { ITotalPaymentDue, OrderType } from '../../order';
 import { IMovieTicket as IMovieTicketPaymentCard } from '../../paymentMethod/paymentCard/movieTicket';
 import { IPropertyValue } from '../../propertyValue';
 import { PaymentServiceType } from '../../service/paymentService';
@@ -134,4 +134,3 @@ export interface IAttributes extends Omit<ActionFactory.IAttributes<ActionType.P
  * 決済アクション
  */
 export declare type IAction = ActionFactory.IAction<IAttributes>;
-export { ITotalPaymentDue };

package/lib/assetTransaction/pay.d.ts

@@ -1,12 +1,13 @@
 import * as GMO from '@motionpicture/gmo-service';
-import { IAction as IPayAction, IAttributes as IPayActionAttributes, ILocation, IMovieTicket, IOrderAsPayPurpose, IPendingTransaction, IPurpose as IPayPurpose, IRecipient as IPayRecipient, ITotalPaymentDue } from '../action/trade/pay';
+import { IAction as IPayAction, IAttributes as IPayActionAttributes, ILocation, IMovieTicket, IOrderAsPayPurpose, IPendingTransaction, IPurpose as IPayPurpose, IRecipient as IPayRecipient } from '../action/trade/pay';
 import * as AssetTransactionFactory from '../assetTransaction';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
+import { ITotalPaymentDue } from '../order';
 import { IUnauthorizedCardOfMember, IUncheckedCardRaw, IUncheckedCardTokenized } from '../paymentMethod/paymentCard/creditCard';
 import { IOnPaymentStatusChanged } from '../project';
 import { IPropertyValue } from '../propertyValue';
-import { PaymentServiceType } from '../service/paymentService';
+import { ICreditCardAsPaymentServiceOutput, PaymentServiceType } from '../service/paymentService';
 export import IAgent = AssetTransactionFactory.IAgent;
 export declare type IRecipient = IPayRecipient;
 /**
@@ -88,6 +89,7 @@ export interface IObject {
      * 発行決済サービスID
      */
     id: string;
+    serviceOutput?: ICreditCardAsPaymentServiceOutput;
     paymentMethod: IPaymentMethod;
     pendingTransaction?: IPendingTransaction;
     entryTranArgs?: IEntryTranArgs;

package/lib/event/anyEvent.d.ts

@@ -5,7 +5,6 @@ import * as OfferFactory from '../offer';
 import { OfferType } from '../offerType';
 import { OrganizationType } from '../organizationType';
 import { PlaceType } from '../placeType';
-import { PriceCurrency } from '../priceCurrency';
 import { IServiceType as IProductServiceType, ProductType } from '../product';
 import * as ReservationFactory from '../reservation';
 import { ReservationType } from '../reservationType';
@@ -130,7 +129,6 @@ export import IEligibleQuantity = OfferFactory.IEligibleQuantity;
  */
 export interface IOffer {
     typeOf: OfferType.Offer;
-    priceCurrency: PriceCurrency.JPY;
     /**
      * 情報提供終了日時(オンライン取引アプリケーションの設定)
      * @deprecated Use seller.makesOffer

package/lib/event/screeningEvent.d.ts

@@ -4,7 +4,6 @@ import * as ScreeningEventSeriesFactory from '../event/screeningEventSeries';
 import { EventType } from '../eventType';
 import { OfferType } from '../offerType';
 import { PlaceType } from '../placeType';
-import { PriceCurrency } from '../priceCurrency';
 import { IServiceType as IProductServiceType, ProductType } from '../product';
 import * as ReservationFactory from '../reservation';
 import { ReservationType } from '../reservationType';
@@ -62,7 +61,6 @@ export import IEligibleQuantity = AnyEventFactory.IEligibleQuantity;
  */
 export interface IOffer {
     typeOf: OfferType.Offer;
-    priceCurrency: PriceCurrency.JPY;
     /**
      * 情報提供終了日時(オンライン取引アプリケーションの設定)
      * @deprecated Use seller.makesOffer
@@ -92,7 +90,7 @@ export interface IOffer {
     unacceptedPaymentMethod?: string[];
     seller: ISeller;
 }
-export declare type IOffer4COA = Pick<IOffer, 'typeOf' | 'offeredThrough' | 'priceCurrency'> & {
+export declare type IOffer4COA = Pick<IOffer, 'typeOf' | 'offeredThrough'> & {
     itemOffered: {
         serviceOutput: Pick<IServiceOutput, 'reservedTicket'>;
     };

package/lib/event/screeningEventSeries.d.ts

@@ -6,13 +6,11 @@ import { ILanguage } from '../language';
 import { IMultilingualString } from '../multilingualString';
 import { OfferType } from '../offerType';
 import { PlaceType } from '../placeType';
-import { PriceCurrency } from '../priceCurrency';
 /**
  * 施設コンテンツに対するオファー
  */
 export interface IOffer {
     typeOf: OfferType.Offer;
-    priceCurrency: PriceCurrency.JPY;
     /**
      * 利用不可決済方法区分
      */

package/lib/event.d.ts

@@ -7,7 +7,7 @@ import * as PlaceFactory from './place';
 import { IProject } from './project';
 import { IPropertyValue } from './propertyValue';
 import { SortType } from './sortType';
-export declare type IOffer = Omit<OfferFactory.IOffer, 'project'>;
+export declare type IOffer = Pick<OfferFactory.IOffer, 'typeOf' | 'unacceptedPaymentMethod' | 'seller' | 'eligibleQuantity' | 'itemOffered' | 'offeredThrough'>;
 export interface IAttributes<T extends EventType> {
     project: Pick<IProject, 'id' | 'typeOf'>;
     /**

package/lib/invoice.d.ts

@@ -8,7 +8,7 @@ import { IAppliesToMovieTicket, IPriceSpecification as IMovieTicketTypeChargeSpe
 import { IAppliesToAddOn as IUnitPriceSpecAppliesToAddOn, IPriceSpecification as IUnitPriceSpecification } from './priceSpecification/unitPriceSpecification';
 import { IPriceSpecification } from './reservation/event';
 import * as SellerFactory from './seller';
-import { PaymentServiceType } from './service/paymentService';
+import { ICreditCardAsPaymentServiceOutput, PaymentServiceType } from './service/paymentService';
 export declare type IBroker = SellerFactory.ISeller | PersonFactory.IPerson;
 export declare type IProvider = SellerFactory.ISeller | PersonFactory.IPerson;
 export interface IReferenceOrder extends OrderFactory.IOrder {
@@ -57,7 +57,7 @@ export interface IMovieTicketAsPaymentServiceOutput {
     serviceOutput?: IReservation;
     amount?: IAmountOfMovieTicketAsPaymentServiceOutput;
 }
-export declare type IPaymentServiceOutput = IMovieTicketAsPaymentServiceOutput[];
+export declare type IPaymentServiceOutput = IMovieTicketAsPaymentServiceOutput[] | ICreditCardAsPaymentServiceOutput;
 /**
  * 決済方法(サービス)
  */
@@ -66,9 +66,6 @@ export interface IPaymentMethod {
     typeOf: PaymentServiceType;
     serviceOutput?: IPaymentServiceOutput;
 }
-export declare type ITotalPaymentDue = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'value'> & {
-    value: number;
-};
 /**
  * インボイス
  * {@link https://schema.org/Invoice}
@@ -137,5 +134,5 @@ export interface IInvoice {
     /**
      * The total amount due.
      */
-    totalPaymentDue?: ITotalPaymentDue;
+    totalPaymentDue?: OrderFactory.ITotalPaymentDue;
 }

package/lib/order.d.ts

@@ -1,11 +1,11 @@
 import { IParticipantAsPerson, IParticipantAsProject, IParticipantAsWebApplication } from './action';
-import { IPaymentService, ITotalPaymentDue } from './action/trade/pay';
 import { IAmount as IMoneyTransferAmount, IPaymentCard as IPaymentCardAsMoneyTransferToLocation } from './action/transfer/moneyTransfer';
 import { ActionType } from './actionType';
 import { AssetTransactionType } from './assetTransactionType';
 import { ICreativeWork as IWebApplication } from './creativeWork/softwareApplication/webApplication';
 import { ICustomer as ICustomerOrganization } from './customer';
 import { EventType } from './eventType';
+import { IMonetaryAmount } from './monetaryAmount';
 import { IMultilingualString } from './multilingualString';
 import { IOffer } from './offer';
 import { OrderStatus } from './orderStatus';
@@ -24,6 +24,7 @@ import { IProgramMembershipUsedSearchConditions, ITicket, ITicketType } from './
 import * as BusReservationFactory from './reservation/busReservation';
 import * as EventReservationFactory from './reservation/event';
 import { ReservationType } from './reservationType';
+import { ICreditCardAsPaymentServiceOutput, PaymentServiceType } from './service/paymentService';
 import { SortType } from './sortType';
 import { IUnitPriceOfferPriceSpecification } from './unitPriceOffer';
 export interface IProject {
@@ -33,7 +34,17 @@ export interface IProject {
 export declare enum OrderType {
     Order = "Order"
 }
-export declare type IPaymentMethodIssuedThrough = Pick<IPaymentService, 'typeOf' | 'id' | 'serviceOutput'>;
+export interface IOrderPaymentMethodIssuedThrough {
+    typeOf: PaymentServiceType;
+    /**
+     * 発行決済サービスID
+     */
+    id: string;
+    serviceOutput?: ICreditCardAsPaymentServiceOutput;
+}
+export interface ITotalPaymentDue extends Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'value'> {
+    value: number;
+}
 /**
  * 決済方法
  */
@@ -62,7 +73,7 @@ export interface IPaymentMethod {
      * 追加特性
      */
     additionalProperty: IPropertyValue<string>[];
-    issuedThrough: IPaymentMethodIssuedThrough;
+    issuedThrough: IOrderPaymentMethodIssuedThrough;
 }
 /**
  * ディスカウント

package/lib/service/paymentService.d.ts

@@ -58,7 +58,20 @@ export declare type IAvailableChannel = IProductAvailableChannel & {
     };
 };
 /**
- * 決済サービスインターフェース
+ * CreditCardIF決済サービスのカード属性
+ * ポイントカード情報など
+ */
+export interface ICreditCardAsPaymentServiceOutput {
+    amount?: {
+        /**
+         * 通貨区分
+         */
+        currency: string;
+    };
+}
+export declare type IServiceOutput = ICreditCardAsPaymentServiceOutput;
+/**
+ * 決済サービス
  * {@link https://schema.org/Service}
  */
 export interface IService extends Pick<IThing, 'name' | 'description'> {
@@ -71,6 +84,10 @@ export interface IService extends Pick<IThing, 'name' | 'description'> {
      * 決済サービス提供者(決済サービスを利用する販売者)
      */
     provider?: IProvider[];
+    /**
+     * 提供元のカード情報
+     */
+    serviceOutput?: IServiceOutput;
     /**
      * The type of service being offered, e.g. veterans' benefits, emergency relief, etc.
      * 決済サービスの場合、serviceType.codeValueが決済方法区分

package/package.json

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