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

package/lib/invoice.d.ts

@@ -3,6 +3,9 @@ import * as OrderFactory from './order';
 import { PaymentStatusType } from './paymentStatusType';
 import * as PersonFactory from './person';
 import { IAccounting } from './priceSpecification';
+import { IPriceSpecification as ICategoryCodeChargeSpecification } from './priceSpecification/categoryCodeChargeSpecification';
+import { IPriceSpecification as IMovieTicketTypeChargeSpecification } from './priceSpecification/movieTicketTypeChargeSpecification';
+import { IPriceSpecification as IUnitPriceSpecification } from './priceSpecification/unitPriceSpecification';
 import { IPriceSpecification } from './reservation/event';
 import * as SellerFactory from './seller';
 import { PaymentServiceType } from './service/paymentService';
@@ -12,15 +15,18 @@ export interface IReferenceOrder extends OrderFactory.IOrder {
     acceptedOffers: OrderFactory.IAcceptedOffer<OrderFactory.IItemOffered>[];
 }
 export declare type IReservationPriceAccounting = Pick<IAccounting, 'accountsReceivable'>;
-export declare type IReservationPriceSpecification = Pick<IPriceSpecification, 'price' | 'typeOf'> & {
-    accounting: IReservationPriceAccounting;
+export declare type IPriceComponentSpecification = Pick<ICategoryCodeChargeSpecification, 'typeOf' | 'price'> | Pick<IMovieTicketTypeChargeSpecification, 'typeOf' | 'price'> | Pick<IUnitPriceSpecification, 'typeOf' | 'price' | 'referenceQuantity' | 'appliesToAddOn'> & {
+    accounting?: IReservationPriceAccounting;
+};
+export declare type IReservationPriceSpecification = Pick<IPriceSpecification, 'typeOf'> & {
+    priceComponent: IPriceComponentSpecification[];
 };
 export interface IReservation {
     /**
      * 予約価格
      */
     price?: number;
-    priceSpecification: IReservationPriceSpecification;
+    priceSpecification?: IReservationPriceSpecification;
 }
 export interface IMovieTicketAsPaymentServiceOutput {
     /**

package/lib/offer.d.ts

@@ -12,7 +12,7 @@ import { IPriceSpecification as ICompoundPriceSpecification } from './priceSpeci
 import { IPriceSpecification as IMovieTicketTypeChargeSpecification } from './priceSpecification/movieTicketTypeChargeSpecification';
 import { IAppliesToMovieTicket, IPriceSpecification as IUnitPriceSpecification } from './priceSpecification/unitPriceSpecification';
 import { PriceSpecificationType } from './priceSpecificationType';
-import { IPointAwardAmount, ProductType } from './product';
+import { IPointAwardAmount, IProduct, ProductType } from './product';
 import { IProject } from './project';
 import { IPropertyValue } from './propertyValue';
 import { IQuantitativeValue } from './quantitativeValue';
@@ -30,10 +30,6 @@ export interface ICategory {
     id?: string;
     codeValue?: string;
 }
-/**
- * アドオン
- */
-export declare type IAddOn = IOffer;
 export declare type IEligibleCategoryCode = Pick<ICategoryCode, 'project' | 'typeOf' | 'id' | 'codeValue' | 'inCodeSet'>;
 export declare type IEligibleMonetaryAmount = Pick<IMonetaryAmount, 'typeOf' | 'currency' | 'value'>;
 /**
@@ -78,6 +74,24 @@ export interface IAvailableAtOrFrom {
      */
     id: string;
 }
+/**
+ * アドオン
+ */
+export interface IAddOn {
+    /**
+     * コード
+     */
+    identifier?: string;
+    project: Pick<IProject, 'id' | 'typeOf'>;
+    typeOf: OfferType.Offer;
+    id?: string;
+    availableAtOrFrom?: IAvailableAtOrFrom[];
+    itemOffered?: any;
+    priceCurrency: PriceCurrency;
+    priceSpecification?: IPriceSpecification<PriceSpecificationType>;
+    validFrom?: Date;
+    validThrough?: Date;
+}
 /**
  * offer interface
  * An offer to transfer some rights to an item or to provide a service
@@ -243,6 +257,11 @@ export interface IItemOffered {
 export declare type IUnitPriceOfferPriceSpecification = Omit<IUnitPriceSpecification, 'appliesToMovieTicket'> & {
     appliesToMovieTicket?: IAppliesToMovieTicket[];
 };
+export interface IAddOnItemOffered extends Pick<IProduct, 'typeOf' | 'id' | 'name'> {
+}
+export interface IAddOn4unitPriceOffer extends Pick<IAddOn, 'project' | 'typeOf' | 'priceCurrency'> {
+    itemOffered: IAddOnItemOffered;
+}
 /**
  * 単価オファー
  */
@@ -256,6 +275,8 @@ export interface IUnitPriceOffer extends Omit<IOffer, 'seller'> {
      */
     priceSpecification?: IUnitPriceOfferPriceSpecification;
     itemOffered?: IItemOffered;
+    addOn?: IAddOn4unitPriceOffer[];
+    typeOf: OfferType.Offer;
 }
 /**
  * ソート条件

package/lib/priceSpecification/categoryCodeChargeSpecification.d.ts

@@ -5,11 +5,11 @@ export declare type IAppliesToCategoryCode = Pick<ICategoryCode, 'project' | 'ty
 /**
  * 区分加算料金
  */
-export declare type IPriceSpecification = BaseSpecification<PriceSpecificationType.CategoryCodeChargeSpecification> & {
+export interface IPriceSpecification extends Pick<BaseSpecification<PriceSpecificationType.CategoryCodeChargeSpecification>, 'project' | 'id' | 'typeOf' | 'name' | 'description' | 'price' | 'priceCurrency' | 'valueAddedTaxIncluded' | 'accounting'> {
     price: number;
     /**
      * 適用カテゴリーコード
      * AND適用条件
      */
     appliesToCategoryCode: IAppliesToCategoryCode[];
-};
+}

package/lib/priceSpecification/movieTicketTypeChargeSpecification.d.ts

@@ -21,7 +21,7 @@ export interface IAppliesToMovieTicket {
 /**
  * 決済カード加算料金
  */
-export declare type IPriceSpecification = BaseSpecification<PriceSpecificationType.MovieTicketTypeChargeSpecification> & {
+export interface IPriceSpecification extends Pick<BaseSpecification<PriceSpecificationType.MovieTicketTypeChargeSpecification>, 'project' | 'id' | 'typeOf' | 'name' | 'description' | 'price' | 'priceCurrency' | 'valueAddedTaxIncluded' | 'accounting'> {
     price: number;
     /**
      * 適用上映方式
@@ -31,4 +31,4 @@ export declare type IPriceSpecification = BaseSpecification<PriceSpecificationTy
      * 適用決済カード
      */
     appliesToMovieTicket: IAppliesToMovieTicket;
-};
+}

package/lib/priceSpecification/unitPriceSpecification.d.ts

@@ -1,6 +1,7 @@
-import { IAddOn } from '../offer';
+import { OfferType } from '../offerType';
 import { IPriceSpecification as BaseSpecification } from '../priceSpecification';
 import { PriceSpecificationType } from '../priceSpecificationType';
+import { IProduct } from '../product';
 import { IQuantitativeValue } from '../quantitativeValue';
 import { UnitCode } from '../unitCode';
 import { IAppliesToMovieTicket as IMovieTicketTypeChargeSpecAppliesToMovieTicket } from './movieTicketTypeChargeSpecification';
@@ -10,15 +11,23 @@ export declare type IAppliesToMovieTicket = Pick<IMovieTicketTypeChargeSpecAppli
      */
     identifier?: string;
 };
+export declare type IReferenceQuantity = Pick<IQuantitativeValue<UnitCode>, 'typeOf' | 'value' | 'unitCode'>;
+export declare type IAppliesToAddOnItemOffered = Pick<IProduct, 'id' | 'name' | 'productID' | 'project' | 'typeOf'>;
+export interface IAppliesToAddOn {
+    typeOf: OfferType.Offer;
+    id?: string;
+    identifier?: string;
+    itemOffered: IAppliesToAddOnItemOffered;
+}
 /**
  * 単価仕様
  */
-export declare type IPriceSpecification = BaseSpecification<PriceSpecificationType.UnitPriceSpecification> & {
+export interface IPriceSpecification extends Pick<BaseSpecification<PriceSpecificationType.UnitPriceSpecification>, 'project' | 'id' | 'typeOf' | 'name' | 'description' | 'eligibleQuantity' | 'eligibleTransactionVolume' | 'price' | 'priceCurrency' | 'validFrom' | 'validThrough' | 'valueAddedTaxIncluded' | 'accounting'> {
     price: number;
     /**
      * 基準数量
      */
-    referenceQuantity: IQuantitativeValue<UnitCode>;
+    referenceQuantity: IReferenceQuantity;
     /**
      * 適用MovieTicket
      */
@@ -27,5 +36,5 @@ export declare type IPriceSpecification = BaseSpecification<PriceSpecificationTy
      * 適用アドオン
      * アドオンを指定された場合に適用される
      */
-    appliesToAddOn?: IAddOn[];
-};
+    appliesToAddOn?: IAppliesToAddOn[];
+}

package/lib/priceSpecification.d.ts

@@ -17,8 +17,8 @@ export interface IAccounting {
     operatingRevenue?: IAccountTitle;
     /**
      * 営業外収益
+     * 廃止(2022-10-31~)
      */
-    nonOperatingRevenue?: IAccountTitle;
     /**
      * 売上金額
      */

package/package.json

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