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

package/lib/assetTransaction/pay.d.ts

@@ -3,11 +3,11 @@ import { IAction as IPayAction, IAttributes as IPayActionAttributes, ILocation,
 import * as AssetTransactionFactory from '../assetTransaction';
 import { AssetTransactionType } from '../assetTransactionType';
 import { IExtendId } from '../autoGenerated';
-import { ITotalPaymentDue } from '../order';
+import { IOrderPaymentMethodIssuedThroughServiceOutput, ITotalPaymentDue } from '../order';
 import { IUnauthorizedCardOfMember, IUncheckedCardRaw, IUncheckedCardTokenized } from '../paymentMethod/paymentCard/creditCard';
 import { IOnPaymentStatusChanged } from '../project';
 import { IPropertyValue } from '../propertyValue';
-import { ICreditCardAsPaymentServiceOutput, PaymentServiceType } from '../service/paymentService';
+import { PaymentServiceType } from '../service/paymentService';
 export import IAgent = AssetTransactionFactory.IAgent;
 export declare type IRecipient = IPayRecipient;
 /**
@@ -89,7 +89,7 @@ export interface IObject {
      * 発行決済サービスID
      */
     id: string;
-    serviceOutput?: ICreditCardAsPaymentServiceOutput;
+    serviceOutput?: IOrderPaymentMethodIssuedThroughServiceOutput;
     paymentMethod: IPaymentMethod;
     pendingTransaction?: IPendingTransaction;
     entryTranArgs?: IEntryTranArgs;

package/lib/invoice.d.ts

@@ -1,16 +1,16 @@
 import { IMonetaryAmount } from './monetaryAmount';
 import * as OrderFactory from './order';
 import { PaymentStatusType } from './paymentStatusType';
-import * as PersonFactory from './person';
+import { IPerson } from './person';
 import { IAccounting } from './priceSpecification';
 import { IPriceSpecification as ICategoryCodeChargeSpecification } from './priceSpecification/categoryCodeChargeSpecification';
 import { IAppliesToMovieTicket, IPriceSpecification as IMovieTicketTypeChargeSpecification } from './priceSpecification/movieTicketTypeChargeSpecification';
 import { IAppliesToAddOn as IUnitPriceSpecAppliesToAddOn, IPriceSpecification as IUnitPriceSpecification } from './priceSpecification/unitPriceSpecification';
 import { IPriceSpecification } from './reservation/event';
-import * as SellerFactory from './seller';
-import { ICreditCardAsPaymentServiceOutput, PaymentServiceType } from './service/paymentService';
-export declare type IBroker = SellerFactory.ISeller | PersonFactory.IPerson;
-export declare type IProvider = SellerFactory.ISeller | PersonFactory.IPerson;
+import { ISeller } from './seller';
+import { PaymentServiceType } from './service/paymentService';
+export declare type IBroker = Pick<ISeller, 'id' | 'typeOf'> | IPerson;
+export declare type IProvider = Pick<ISeller, 'id' | 'typeOf'> | IPerson;
 export interface IReferenceOrder extends OrderFactory.IOrder {
     acceptedOffers: OrderFactory.IAcceptedOffer<OrderFactory.IItemOffered>[];
 }
@@ -57,7 +57,7 @@ export interface IMovieTicketAsPaymentServiceOutput {
     serviceOutput?: IReservation;
     amount?: IAmountOfMovieTicketAsPaymentServiceOutput;
 }
-export declare type IPaymentServiceOutput = IMovieTicketAsPaymentServiceOutput[] | ICreditCardAsPaymentServiceOutput;
+export declare type IPaymentServiceOutput = IMovieTicketAsPaymentServiceOutput[] | OrderFactory.IOrderPaymentMethodIssuedThroughServiceOutput;
 /**
  * 決済方法(サービス)
  */

package/lib/order.d.ts

@@ -10,7 +10,7 @@ import { IMultilingualString } from './multilingualString';
 import { IOffer } from './offer';
 import { OrderStatus } from './orderStatus';
 import { OrganizationType } from './organizationType';
-import * as PermitFactory from './permit';
+import { IPermit as IBasePermit } from './permit';
 import { IPerson, IProfile } from './person';
 import { PersonType } from './personType';
 import { PlaceType } from './placeType';
@@ -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 { ISeller as IBaseSeller } from './seller';
 import { ICreditCardAsPaymentServiceOutput, PaymentServiceType } from './service/paymentService';
 import { SortType } from './sortType';
 import { IUnitPriceOfferPriceSpecification } from './unitPriceOffer';
@@ -34,13 +35,19 @@ export interface IProject {
 export declare enum OrderType {
     Order = "Order"
 }
+export interface IOrderPaymentMethodIssuedThroughServiceOutput extends ICreditCardAsPaymentServiceOutput {
+    amount?: {
+        currency: string;
+        value: number;
+    };
+}
 export interface IOrderPaymentMethodIssuedThrough {
     typeOf: PaymentServiceType;
     /**
      * 発行決済サービスID
      */
     id: string;
-    serviceOutput?: ICreditCardAsPaymentServiceOutput;
+    serviceOutput?: IOrderPaymentMethodIssuedThroughServiceOutput;
 }
 export interface ITotalPaymentDue extends Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'value'> {
     value: number;
@@ -117,7 +124,7 @@ export declare type IEventReservation = Pick<EventReservationFactory.IReservatio
     reservedTicket: IReservedTicket;
 };
 export declare type IReservation = IBusReservation | IEventReservation;
-export declare type IPermit = Pick<PermitFactory.IPermit, 'amount' | 'identifier' | 'issuedThrough' | 'name' | 'typeOf' | 'validFor'>;
+export declare type IPermit = Pick<IBasePermit, 'amount' | 'identifier' | 'issuedThrough' | 'name' | 'typeOf' | 'validFor'>;
 export interface IMoneyTransferPendingTransaction {
     typeOf: AssetTransactionType.MoneyTransfer;
     /**
@@ -174,9 +181,8 @@ export interface IAcceptedOffer<T extends IItemOffered> extends IOfferOptimized4
 /**
  * 販売者
  */
-export interface ISeller {
+export interface ISeller extends Pick<IBaseSeller, 'typeOf' | 'additionalProperty'> {
     id: string;
-    typeOf: OrganizationType.Corporation;
     name: string;
 }
 /**
@@ -200,15 +206,12 @@ export declare type IParticipantAsReturner = IParticipantAsPerson | IParticipant
 export declare type IReturner = Pick<IParticipantAsReturner, 'id' | 'typeOf'>;
 export declare type IIdentifier = IPropertyValue<string>[];
 export declare type ISimpleCustomer = Pick<ICustomer, 'id' | 'typeOf'>;
+export declare type ISimpleSeller = Pick<ISeller, 'id' | 'typeOf' | 'name'>;
 export interface ISimpleOrder {
     /**
      * object type
      */
     typeOf: OrderType;
-    /**
-     * The party taking the order (e.g. Amazon.com is a merchant for many sellers). Also accepts a string (e.g. "Amazon.com").
-     */
-    seller: ISeller;
     /**
      * Party placing the order.
      */
@@ -229,6 +232,7 @@ export interface ISimpleOrder {
      * Date order was placed.
      */
     orderDate: Date;
+    seller: ISimpleSeller;
 }
 export interface IReservationFor4EventServiceOrderedItem {
     location?: {
@@ -325,6 +329,10 @@ export interface IOrder extends Omit<ISimpleOrder, 'customer'> {
      * Returner
      */
     returner?: IReturner;
+    /**
+     * The party taking the order (e.g. Amazon.com is a merchant for many sellers). Also accepts a string (e.g. "Amazon.com").
+     */
+    seller: ISeller;
     /**
      * URL	(recommended for confirmation cards/ Search Answers)
      * URL of the Order, typically a link to the merchant's website where the user can retrieve further details about an order.

package/lib/transaction/placeOrder.d.ts

@@ -91,7 +91,7 @@ export interface IStartParamsWithoutDetail {
         name?: string;
     };
 }
-export declare type ISeller = TransactionFactory.ISeller;
+export declare type ISeller = TransactionFactory.ISeller & Pick<OrderFactory.ISeller, 'additionalProperty'>;
 /**
  * 取引開始パラメーター
  */

package/package.json

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