@chevre/factory 4.204.0 → 4.207.0

package/lib/chevre.d.ts

@@ -381,7 +381,7 @@ export declare namespace reservation {
     type ISortOrder<T extends ReservationType> = T extends ReservationType.EventReservation ? ReservationFactory.ISortOrder : ReservationFactory.ISortOrder;
     type ISeat<T extends ReservationType> = T extends ReservationType.EventReservation ? ReservationFactory.ISeat : ReservationFactory.ISeat;
     type ISubReservation<T extends ReservationType> = T extends ReservationType.EventReservation ? EventReservationFactory.ISubReservation : T extends ReservationType.ReservationPackage ? ReservationPackageFactory.ISubReservation : any;
-    type ITicket<T extends ReservationType> = T extends ReservationType.EventReservation ? ReservationFactory.ITicket<IPriceSpecification<T>> : ReservationFactory.ITicket<IPriceSpecification<T>>;
+    export import ITicket = ReservationFactory.ITicket;
     type IUnderName<T extends ReservationType> = T extends ReservationType.EventReservation ? ReservationFactory.IUnderName : ReservationFactory.IUnderName;
     type TicketType<T extends ReservationType> = T extends ReservationType.EventReservation ? ReservationFactory.TicketType : ReservationFactory.TicketType;
     type ITicketType<T extends ReservationType> = T extends ReservationType.EventReservation ? ReservationFactory.ITicketType : ReservationFactory.ITicketType;

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

@@ -4,6 +4,7 @@ import * as ActionFactory from '../../action';
 import { IAttributes as IReturnOrderActionAttributes } from '../../action/transfer/return/order';
 import { ActionType } from '../../actionType';
 import { AssetTransactionType } from '../../assetTransactionType';
+import { IPaymentServiceOutput } from '../../invoice';
 import { IMonetaryAmount } from '../../monetaryAmount';
 import { OrderType } from '../../order';
 import { IMovieTicket } from '../../paymentMethod/paymentCard/movieTicket';
@@ -75,22 +76,6 @@ export interface IPaymentMethod {
      */
     additionalProperty: IPropertyValue<string>[];
 }
-export interface IMovieTicketAsPaymentServiceOutput {
-    /**
-     * 購入管理番号
-     */
-    identifier: string;
-    /**
-     * 利用対象予約
-     */
-    serviceOutput?: {
-        /**
-         * 予約価格
-         */
-        price?: number;
-    };
-}
-export declare type IPaymentServiceOutput = IMovieTicketAsPaymentServiceOutput[];
 export interface IPaymentService {
     typeOf: PaymentServiceType;
     /**

package/lib/factory/action.d.ts

@@ -141,6 +141,11 @@ export interface ISearchConditions {
             $eq?: string;
             $in?: string[];
         };
+        object?: {
+            paymentMethodId?: {
+                $eq?: string;
+            };
+        };
         orderNumber?: {
             $in?: string[];
         };

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

@@ -1,5 +1,5 @@
 import * as GMO from '@motionpicture/gmo-service';
-import { IAgent as IPayAgent, IAttributes as IPayActionAttributes, IPayPurpose, IPendingTransaction, IRecipient as IPayRecipient } from '../action/trade/pay';
+import { IAgent as IPayAgent, IAttributes as IPayActionAttributes, IOrderAsPayPurpose, IPayPurpose, IPendingTransaction, IRecipient as IPayRecipient } from '../action/trade/pay';
 import * as TransactionFactory from '../assetTransaction';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
@@ -18,8 +18,8 @@ export declare type IStartParamsWithoutDetail = TransactionFactory.IStartParams<
 export interface IStartParams extends TransactionFactory.IStartParams<AssetTransactionType.Pay, IAgent, IRecipient, IObject> {
 }
 export interface IPotentialActionsParams {
-    pay?: {
-        purpose?: IPayPurpose;
+    pay: {
+        purpose: IOrderAsPayPurpose;
     };
 }
 /**
@@ -29,7 +29,7 @@ export interface IConfirmParams {
     id?: string;
     transactionNumber?: string;
     endDate?: Date;
-    potentialActions?: IPotentialActionsParams;
+    potentialActions: IPotentialActionsParams;
 }
 export declare type IResult = any;
 export declare type IError = any;

package/lib/factory/invoice.d.ts

@@ -2,26 +2,47 @@ import { IMonetaryAmount } from './monetaryAmount';
 import * as OrderFactory from './order';
 import { PaymentStatusType } from './paymentStatusType';
 import * as PersonFactory from './person';
-import { PersonType } from './personType';
-import { IProject } from './project';
 import * as SellerFactory from './seller';
-import { SortType } from './sortType';
+import { 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 {
     acceptedOffers: OrderFactory.IAcceptedOffer<any>[];
 }
+export interface IMovieTicketAsPaymentServiceOutput {
+    /**
+     * 購入管理番号
+     */
+    identifier: string;
+    /**
+     * 利用対象予約
+     */
+    serviceOutput?: {
+        /**
+         * 予約価格
+         */
+        price?: number;
+    };
+}
+export declare type IPaymentServiceOutput = IMovieTicketAsPaymentServiceOutput[];
+/**
+ * 決済方法(サービス)
+ */
+export interface IPaymentMethod {
+    id: string;
+    typeOf: PaymentServiceType;
+    serviceOutput?: IPaymentServiceOutput;
+}
 /**
  * インボイスインターフェース
  * {@link https://schema.org/Invoice}
  */
 export interface IInvoice {
-    project: IProject;
     typeOf: 'Invoice';
     /**
      * The identifier for the account the payment will be applied to.
      */
-    accountId: string;
+    accountId?: string;
     /**
      * The time interval used to compute the invoice.
      */
@@ -54,7 +75,7 @@ export interface IInvoice {
     /**
      * The name of the credit card or other method of payment for the order.
      */
-    paymentMethod: string;
+    paymentMethod: IPaymentMethod;
     /**
      * An identifier for the method of payment used (e.g. the last 4 digits of the credit card).
      */
@@ -62,7 +83,7 @@ export interface IInvoice {
     /**
      * The status of payment; whether the invoice has been paid or not.
      */
-    paymentStatus: PaymentStatusType;
+    paymentStatus?: PaymentStatusType;
     /**
      * The service provider, service operator, or service performer; the goods producer.
      * Another party (a seller) may offer those services or goods on behalf of the provider.
@@ -72,7 +93,7 @@ export interface IInvoice {
     /**
      * The Order(s) related to this Invoice. One or more Orders may be combined into a single Invoice.
      */
-    referencesOrder: IReferenceOrder;
+    referencesOrder?: IReferenceOrder;
     /**
      * The date the invoice is scheduled to be paid.
      */
@@ -85,50 +106,6 @@ export interface IInvoice {
 /**
  * ソート条件インターフェース
  */
-export interface ISortOrder {
-    createdAt?: SortType;
-}
-export interface ICustomerSearchConditions {
-    typeOf?: PersonType;
-    ids?: string[];
-    identifiers?: PersonFactory.IIdentifier;
-    /**
-     * メールアドレス
-     */
-    email?: string;
-    /**
-     * 電話番号
-     */
-    telephone?: string;
-    memberOf?: {
-        /**
-         * 会員番号
-         */
-        membershipNumbers?: string[];
-    };
-}
-export interface IReferencesOrderSearchConditions {
-    orderNumbers?: string[];
-}
 /**
  * インボイス検索条件インターフェース
  */
-export interface ISearchConditions {
-    limit?: number;
-    page?: number;
-    sort?: ISortOrder;
-    project?: {
-        id?: {
-            $eq?: string;
-        };
-    };
-    createdFrom?: Date;
-    createdThrough?: Date;
-    accountIds?: string[];
-    confirmationNumbers?: string[];
-    customer?: ICustomerSearchConditions;
-    paymentMethods?: string[];
-    paymentMethodIds?: string[];
-    paymentStatuses?: PaymentStatusType[];
-    referencesOrder?: IReferencesOrderSearchConditions;
-}

package/lib/factory/invoice.js

@@ -1,2 +1,50 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * ソート条件インターフェース
+ */
+// export interface ISortOrder {
+//     createdAt?: SortType;
+// }
+// export interface ICustomerSearchConditions {
+//     typeOf?: PersonType;
+//     ids?: string[];
+//     identifiers?: PersonFactory.IIdentifier;
+//     /**
+//      * メールアドレス
+//      */
+//     email?: string;
+//     /**
+//      * 電話番号
+//      */
+//     telephone?: string;
+//     memberOf?: {
+//         /**
+//          * 会員番号
+//          */
+//         membershipNumbers?: string[];
+//     };
+// }
+// export interface IReferencesOrderSearchConditions {
+//     orderNumbers?: string[];
+// }
+/**
+ * インボイス検索条件インターフェース
+ */
+// export interface ISearchConditions {
+//     limit?: number;
+//     page?: number;
+//     sort?: ISortOrder;
+//     project?: {
+//         id?: { $eq?: string };
+//     };
+//     createdFrom?: Date;
+//     createdThrough?: Date;
+//     accountIds?: string[];
+//     confirmationNumbers?: string[];
+//     customer?: ICustomerSearchConditions;
+//     paymentMethods?: string[];
+//     paymentMethodIds?: string[];
+//     paymentStatuses?: PaymentStatusType[];
+//     referencesOrder?: IReferencesOrderSearchConditions;
+// }

package/lib/factory/product.d.ts

@@ -3,6 +3,7 @@ import { IMonetaryAmount } from './monetaryAmount';
 import { IOffer } from './offer';
 import { IPermit } from './permit';
 import { IProject } from './project';
+import { IPropertyValue } from './propertyValue';
 import { IQuantitativeValue } from './quantitativeValue';
 import { IServiceType } from './serviceType';
 import { SortType } from './sortType';
@@ -112,6 +113,7 @@ export interface IProduct extends IThing {
      * The type of service being offered, e.g. veterans' benefits, emergency relief, etc.
      */
     serviceType?: IServiceType;
+    additionalProperty?: IPropertyValue<string>[];
 }
 export interface ISortOrder {
     productID?: SortType;

package/lib/factory/reservation/event.d.ts

@@ -44,7 +44,7 @@ export interface IReservation extends ReservationFactory.IReservation<IPriceSpec
     id: string;
     reservationFor: IReservationFor;
     reservationNumber: string;
-    reservedTicket: ReservationFactory.ITicket<IPriceSpecification>;
+    reservedTicket: ReservationFactory.ITicket;
     subReservation?: ISubReservation[];
     typeOf: ReservationType.EventReservation;
 }

package/lib/factory/reservation.d.ts

@@ -7,7 +7,6 @@ import * as SeatFactory from './place/seat';
 import { PlaceType } from './placeType';
 import { PriceCurrency } from './priceCurrency';
 import { IPriceSpecification as IGenericPriceSpecification } from './priceSpecification';
-import { IPriceSpecification as IUnitPriceSpecification } from './priceSpecification/unitPriceSpecification';
 import { PriceSpecificationType } from './priceSpecificationType';
 import { ProductType } from './product';
 import { IProject } from './project';
@@ -27,7 +26,6 @@ export interface ITicketType {
     identifier: string;
     name?: string | IMultilingualString;
     priceCurrency: PriceCurrency;
-    priceSpecification?: IUnitPriceSpecification;
     project: IProject;
     typeOf: OfferType;
     validRateLimit?: OfferFactory.IValidRateLimit;
@@ -100,7 +98,7 @@ export declare type IReservationFor = any;
 /**
  * 予約チケット情報
  */
-export interface ITicket<T extends IPriceSpecification> {
+export interface ITicket {
     typeOf: TicketType;
     /**
      * The date the ticket was issued.
@@ -117,7 +115,6 @@ export interface ITicket<T extends IPriceSpecification> {
     /**
      * The total price for the reservation or ticket, including applicable taxes, shipping, etc.
      */
-    totalPrice?: T | number;
     /**
      * The currency (in 3-letter ISO 4217 format) of the Reservation's price.
      */
@@ -198,15 +195,12 @@ export interface IReservation<T extends IPriceSpecification> extends IThing {
     /**
      * Web page where reservation can be cancelled.
      */
-    cancelReservationUrl?: string;
     /**
      * Webpage where the passenger can check in.
      */
-    checkinUrl?: string;
     /**
      * Web page where reservation can be confirmed.
      */
-    confirmReservationUrl?: string;
     issuedThrough?: {
         typeOf: ProductType.EventService;
         serviceType?: IServiceType;
@@ -218,7 +212,6 @@ export interface IReservation<T extends IPriceSpecification> extends IThing {
     /**
      * Web page where reservation can be modified.
      */
-    modifyReservationUrl?: string;
     /**
      * Number of seats if unreserved seating.
      */
@@ -226,7 +219,7 @@ export interface IReservation<T extends IPriceSpecification> extends IThing {
     /**
      * Total price of the Reservation.
      */
-    price?: T | number;
+    price?: T;
     /**
      * The currency (in 3-letter ISO 4217 format) of the Reservation's price.
      */
@@ -250,7 +243,7 @@ export interface IReservation<T extends IPriceSpecification> extends IThing {
     /**
      * A ticket associated with the reservation.
      */
-    reservedTicket?: ITicket<T>;
+    reservedTicket?: ITicket;
     /**
      * The individual reservations included in the package. Typically a repeated property.
      */
@@ -354,6 +347,15 @@ export interface IProgramMembershipUsedSearchConditions {
         };
     };
 }
+export interface IPriceSearchConditions {
+    priceComponent?: {
+        appliesToMovieTicket?: {
+            identifier?: {
+                $eq?: string;
+            };
+        };
+    };
+}
 /**
  * 検索条件
  */
@@ -427,4 +429,5 @@ export interface ISearchConditions<T extends ReservationType> {
      * 使用メンバーシップ
      */
     programMembershipUsed?: IProgramMembershipUsedSearchConditions;
+    price?: IPriceSearchConditions;
 }

package/lib/factory/service/paymentService.d.ts

@@ -1,6 +1,7 @@
 import { IOrganization } from '../organization';
 import { IAvailableChannel } from '../product';
 import { IProject } from '../project';
+import { IPropertyValue } from '../propertyValue';
 import { IServiceType } from '../serviceType';
 import { IThing } from '../thing';
 export declare enum PaymentServiceType {
@@ -61,4 +62,5 @@ export interface IService extends IThing {
      * 決済サービスの場合、serviceType.codeValueが決済方法区分
      */
     serviceType?: IServiceType;
+    additionalProperty?: IPropertyValue<string>[];
 }

package/package.json

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