Merge pull request #358 from platformsh/init-one-off-charges

init one-off charges

Author: menor-upsun

src/model/Cost.ts

@@ -9,6 +9,10 @@ export type FormattedCostWithQuantity = FormattedCost & {
   quantity: number;
 };
 
+export type FormattedCostWithUnitPrice = FormattedCost & {
+  unit_price_formatted: string;
+};
+
 export type FormattedCostWithTitle = FormattedCost & {
   display_title: string;
 };
@@ -23,7 +27,8 @@ export type FormattedCostCounter = FormattedCostWithQuantity & {
   usage_type: "counter";
   current_usage: number;
   current_usage_formatted: string;
-  daily_average: number;
+  daily_average?: number;
+  custom_description?: string;
 };
 
 type MaybeComplex<T, IsComplex> = IsComplex extends true ? T : string;
@@ -33,6 +38,9 @@ export type MaybeComplexFormattedCost<IsComplex = false> = MaybeComplex<
   IsComplex
 >;
 
+export type MaybeComplexFormattedCostWithUnitPrice<IsComplex = false> =
+  MaybeComplex<FormattedCostWithUnitPrice, IsComplex>;
+
 export type MaybeComplexFormattedCostWithQuantity<IsComplex = false> =
   MaybeComplex<FormattedCostWithQuantity, IsComplex>;
 

src/model/Order.ts

@@ -17,8 +17,10 @@ export type CommerceOrderResponse = {
 
 export type LineItemComponent = {
   amount: number;
+  amount_formatted?: string;
   currency?: string;
   display_title: string;
+  formatted?: string;
 };
 
 export type OrderLineItem = {
@@ -31,14 +33,15 @@ export type OrderLineItem = {
   end: string;
   unit_price: number;
   quantity: string | number;
+  quantity_formatted?: string;
   consumption: string | number;
   duration: number;
   exclude_from_invoice?: boolean;
   id: string;
-  organization: string;
+  organization: string | null;
   plan_record_id: string;
   proration: number;
-  records: {
+  records?: {
     duration: number;
     end: string;
     quantity: string;

src/model/Organization.ts

@@ -3,8 +3,10 @@ import { getConfig } from "../config";
 
 import type {
   MaybeComplexFormattedCost,
+  MaybeComplexFormattedCostCounter,
   MaybeComplexFormattedCostMeasure,
-  MaybeComplexFormattedCostWithQuantity
+  MaybeComplexFormattedCostWithQuantity,
+  MaybeComplexFormattedCostWithUnitPrice
 } from "./Cost";
 import type { CursoredResult } from "./CursoredResult";
 import { OrganizationDiscount } from "./OrganizationDiscount";
@@ -37,16 +39,17 @@ type _OrganizationEstimate<IsComplex> = {
   sub_total: MaybeComplexFormattedCost<IsComplex>;
   discounts: MaybeComplexFormattedCost<IsComplex>;
   allowance_discount: MaybeComplexFormattedCost<IsComplex>;
-  enterprise_discount: MaybeComplexFormattedCost<IsComplex>;
-  startup_discount: MaybeComplexFormattedCost<IsComplex>;
+  enterprise_discount: MaybeComplexFormattedCost<IsComplex> | null;
+  startup_discount: MaybeComplexFormattedCost<IsComplex> | null;
   vouchers: MaybeComplexFormattedCost<IsComplex>;
   options: {
-    support_level: MaybeComplexFormattedCost<IsComplex>;
-    user_management: MaybeComplexFormattedCost<IsComplex>;
-    viewer_user: MaybeComplexFormattedCost<IsComplex>;
-    admin_user: MaybeComplexFormattedCost<IsComplex>;
-    standard_management_user: MaybeComplexFormattedCost<IsComplex>;
-    advanced_management_user: MaybeComplexFormattedCost<IsComplex>;
+    support_level?: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    user_management?: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    viewer_user: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    admin_user: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    standard_management_user: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    advanced_management_user: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    onboarding_training?: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
   };
 
   user_licenses: {
@@ -100,12 +103,14 @@ type _OrganizationEstimate<IsComplex> = {
         logs_fwd_content_size: number;
         fastly_bandwidth?: number;
         fastly_requests?: number;
+        onboarding_setup?: number;
       };
     }[];
   };
 
   support_level: MaybeComplexFormattedCostWithQuantity<IsComplex>;
   user_management: MaybeComplexFormattedCostWithQuantity<IsComplex>;
+  onboarding_training?: MaybeComplexFormattedCostCounter<IsComplex>;
 };
 
 export type OrganizationEstimate = _OrganizationEstimate<false>;

src/model/Subscription.ts

@@ -8,7 +8,8 @@ import type {
   MaybeComplexFormattedCostCounter,
   MaybeComplexFormattedCostMeasure,
   MaybeComplexFormattedCostWithTitle,
-  MaybeComplexFormattedCostWithQuantity
+  MaybeComplexFormattedCostWithQuantity,
+  MaybeComplexFormattedCostWithUnitPrice
 } from "./Cost";
 import { Project } from "./Project";
 import type { APIObject } from "./Ressource";
@@ -117,29 +118,30 @@ type _SubscriptionEstimate<IsComplex extends boolean> = {
   plan: MaybeComplexFormattedCostWithQuantity<IsComplex>;
   total: MaybeComplexFormattedCost<IsComplex>;
   options: {
-    storage: MaybeComplexFormattedCost<IsComplex>;
-    environments: MaybeComplexFormattedCost<IsComplex>;
-    user_licenses: MaybeComplexFormattedCost<IsComplex>;
-    cpu_development: MaybeComplexFormattedCost<IsComplex>;
-    storage_development: MaybeComplexFormattedCost<IsComplex>;
-    memory_development: MaybeComplexFormattedCost<IsComplex>;
-    cpu_production: MaybeComplexFormattedCost<IsComplex>;
-    storage_production: MaybeComplexFormattedCost<IsComplex>;
-    memory_production: MaybeComplexFormattedCost<IsComplex>;
-    cpu_app: MaybeComplexFormattedCost<IsComplex>;
-    storage_app_services: MaybeComplexFormattedCost<IsComplex>;
-    memory_app: MaybeComplexFormattedCost<IsComplex>;
-    cpu_services: MaybeComplexFormattedCost<IsComplex>;
-    memory_services: MaybeComplexFormattedCost<IsComplex>;
-    backup_storage: MaybeComplexFormattedCost<IsComplex>;
-    build_cpu: MaybeComplexFormattedCost<IsComplex>;
-    build_memory: MaybeComplexFormattedCost<IsComplex>;
-    egress_bandwidth: MaybeComplexFormattedCost<IsComplex>;
-    ingress_requests: MaybeComplexFormattedCost<IsComplex>;
-    logs_fwd_content_size: MaybeComplexFormattedCost<IsComplex>;
-    fastly_bandwidth?: MaybeComplexFormattedCost<IsComplex>;
-    fastly_requests?: MaybeComplexFormattedCost<IsComplex>;
-    continuous_profiling?: MaybeComplexFormattedCost<IsComplex>;
+    storage: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    environments: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    user_licenses: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    cpu_development: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    storage_development: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    memory_development: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    cpu_production: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    storage_production: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    memory_production: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    cpu_app: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    storage_app_services: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    memory_app: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    cpu_services: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    memory_services: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    backup_storage: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    build_cpu: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    build_memory: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    egress_bandwidth: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    ingress_requests: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    logs_fwd_content_size: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    fastly_bandwidth?: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    fastly_requests?: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    continuous_profiling?: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
+    onboarding_setup?: MaybeComplexFormattedCostWithUnitPrice<IsComplex>;
   };
   storage: MaybeComplexFormattedCostMeasure<IsComplex>;
   environments: MaybeComplexFormattedCostMeasure<IsComplex>;
@@ -161,6 +163,7 @@ type _SubscriptionEstimate<IsComplex extends boolean> = {
   egress_bandwidth: MaybeComplexFormattedCostCounter<IsComplex>;
   ingress_requests: MaybeComplexFormattedCostCounter<IsComplex>;
   logs_fwd_content_size: MaybeComplexFormattedCostCounter<IsComplex>;
+  onboarding_setup?: MaybeComplexFormattedCostCounter<IsComplex>;
   fastly_bandwidth?: MaybeComplexFormattedCostCounter<IsComplex>;
   fastly_requests?: MaybeComplexFormattedCostCounter<IsComplex>;
   big_dev: MaybeComplexFormattedCostWithQuantity<IsComplex>;