Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Phase 8: regenerate SDK types for the tax surface

Łukasz Adamczykbcf53946fc16
diff --git a/packages/admin-sdk/src/types/generated/Fulfillment.ts b/packages/admin-sdk/src/types/generated/Fulfillment.ts
index 0e3c058cf9..61dc29a7f5 100644
--- a/packages/admin-sdk/src/types/generated/Fulfillment.ts
+++ b/packages/admin-sdk/src/types/generated/Fulfillment.ts
@@ -1,7 +1,7 @@
-// Typelizer digest 3f0a6296532bf05f2e34d5e65132adc6
+// Typelizer digest eefb847081348b9e928061359e49ef60
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
-import type {DeliveryMethod, StockLocation, DeliveryRate, FulfillmentItem, Order} from '@/types'
+import type {DeliveryMethod, StockLocation, DeliveryRate, TaxLine, FulfillmentItem, Order} from '@/types'
interface Fulfillment {
id: string;
@@ -29,6 +29,7 @@ interface Fulfillment {
delivery_method?: DeliveryMethod;
stock_location?: StockLocation;
delivery_rates?: Array<DeliveryRate>;
+ tax_lines?: Array<TaxLine>;
metadata: Record<string, unknown>;
adjustment_total: string;
pre_tax_amount: string;
diff --git a/packages/admin-sdk/src/types/generated/LineItem.ts b/packages/admin-sdk/src/types/generated/LineItem.ts
index 09d237ec9f..2e35fb555d 100644
--- a/packages/admin-sdk/src/types/generated/LineItem.ts
+++ b/packages/admin-sdk/src/types/generated/LineItem.ts
@@ -1,7 +1,7 @@
-// Typelizer digest 7c4c4d850ba307ee66d6e088101d1cba
+// Typelizer digest 8f67ab383ea63fa7ad640434ccb3e2a6
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
-import type {OptionValue, DigitalLink, Variant, TaxCategory} from '@/types'
+import type {OptionValue, DigitalLink, TaxLine, Variant, TaxCategory} from '@/types'
interface LineItem {
id: string;
@@ -34,6 +34,7 @@ interface LineItem {
thumbnail_url: string | null;
option_values: Array<OptionValue>;
digital_links: Array<DigitalLink>;
+ tax_lines?: Array<TaxLine>;
metadata: Record<string, unknown>;
created_at: string;
updated_at: string;
diff --git a/packages/admin-sdk/src/types/generated/Order.ts b/packages/admin-sdk/src/types/generated/Order.ts
index 99b2103f13..59ee965384 100644
--- a/packages/admin-sdk/src/types/generated/Order.ts
+++ b/packages/admin-sdk/src/types/generated/Order.ts
@@ -1,7 +1,7 @@
-// Typelizer digest 2367359de0e1fef1d82e130df6c964a9
+// Typelizer digest 5e79e610fcba285456124a15af8bbd14
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
-import type {LineItem, Fulfillment, Payment, Address, GiftCard, Market, AppliedPromotion, Cart, Channel, StockLocation, PaymentMethod, Customer, Return, Exchange, Claim} from '@/types'
+import type {LineItem, Fulfillment, Payment, Address, GiftCard, Market, AppliedPromotion, Cart, Channel, StockLocation, PaymentMethod, Customer, ReturnAuthorization, Reimbursement} from '@/types'
interface Order {
id: string;
@@ -76,9 +76,8 @@ interface Order {
approver?: Customer;
canceler?: Customer;
created_by?: Customer;
- returns?: Array<Return>;
- exchanges?: Array<Exchange>;
- claims?: Array<Claim>;
+ return_authorizations?: Array<ReturnAuthorization>;
+ reimbursements?: Array<Reimbursement>;
}
export default Order;
diff --git a/packages/admin-sdk/src/types/generated/TaxIdentifier.ts b/packages/admin-sdk/src/types/generated/TaxIdentifier.ts
new file mode 100644
index 0000000000..bfc54cfece
--- /dev/null
+++ b/packages/admin-sdk/src/types/generated/TaxIdentifier.ts
@@ -0,0 +1,21 @@
+// Typelizer digest dccc8ffcf4d2b00690ec4b8f390c3267
+//
+// DO NOT MODIFY: This file was automatically generated by Typelizer.
+
+interface TaxIdentifier {
+ id: string;
+ kind: string;
+ value: string;
+ validation_status: string | null;
+ validation_evidence: Record<string, unknown> | null;
+ source: string | null;
+ validated_at: string | null;
+ created_at: string;
+ updated_at: string;
+ validatable: boolean;
+ customer_id: string | null;
+ cart_id: string | null;
+ order_id: string | null;
+}
+
+export default TaxIdentifier;
diff --git a/packages/admin-sdk/src/types/generated/TaxLine.ts b/packages/admin-sdk/src/types/generated/TaxLine.ts
index 1f2e87a07d..e0b7f1e082 100644
--- a/packages/admin-sdk/src/types/generated/TaxLine.ts
+++ b/packages/admin-sdk/src/types/generated/TaxLine.ts
@@ -1,4 +1,4 @@
-// Typelizer digest c92826f6c8a65b31bc558b76f9e11c78
+// Typelizer digest 0e64b9d1f2d893adfe64ad0ba9a12ad8
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
@@ -15,8 +15,13 @@ interface TaxLine {
display_amount: string;
provider_id: string | null;
metadata: Record<string, unknown> | null;
+ taxability_reason: string | null;
+ country_iso: string | null;
+ state_code: string | null;
+ data: Record<string, unknown> | null;
created_at: string;
updated_at: string;
+ category_code: string | null;
}
export default TaxLine;
diff --git a/packages/admin-sdk/src/types/generated/TaxRate.ts b/packages/admin-sdk/src/types/generated/TaxRate.ts
new file mode 100644
index 0000000000..2501da2e94
--- /dev/null
+++ b/packages/admin-sdk/src/types/generated/TaxRate.ts
@@ -0,0 +1,21 @@
+// Typelizer digest 6b0a46ca795afe728d7f71806a5c05c0
+//
+// DO NOT MODIFY: This file was automatically generated by Typelizer.
+
+interface TaxRate {
+ id: string;
+ name: string;
+ included_in_price: boolean;
+ show_rate_in_label: boolean;
+ metadata: Record<string, unknown> | null;
+ created_at: string;
+ updated_at: string;
+ deleted_at: string | null;
+ amount: string;
+ amount_percentage: number | null;
+ tax_category_id: string | null;
+ store_id: string | null;
+ zone_id: string | null;
+}
+
+export default TaxRate;
diff --git a/packages/admin-sdk/src/types/generated/index.ts b/packages/admin-sdk/src/types/generated/index.ts
index 42c7b27a01..a4acdaba6f 100644
--- a/packages/admin-sdk/src/types/generated/index.ts
+++ b/packages/admin-sdk/src/types/generated/index.ts
@@ -1,4 +1,4 @@
-// Typelizer digest f3752f6b51964654d3c3a4cc30e5c6ac
+// Typelizer digest 4e2f718fc9921c07d39ded8ccdab27d1
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
export type { default as Address } from './Address'
@@ -10,7 +10,6 @@ export type { default as Cart } from './Cart'
export type { default as Category } from './Category'
export type { default as Channel } from './Channel'
export type { default as ClaimLineItem } from './ClaimLineItem'
-export type { default as ClaimReason } from './ClaimReason'
export type { default as Claim } from './Claim'
export type { default as CollectionRule } from './CollectionRule'
export type { default as Collection } from './Collection'
@@ -57,15 +56,14 @@ export type { default as PriceRule } from './PriceRule'
export type { default as Price } from './Price'
export type { default as ProductPublication } from './ProductPublication'
export type { default as Product } from './Product'
-export type { default as ProductTypeCustomFieldDefinition } from './ProductTypeCustomFieldDefinition'
export type { default as ProductType } from './ProductType'
export type { default as PromotionAction } from './PromotionAction'
export type { default as PromotionRule } from './PromotionRule'
export type { default as Promotion } from './Promotion'
-export type { default as RefundReason } from './RefundReason'
export type { default as Refund } from './Refund'
+export type { default as Reimbursement } from './Reimbursement'
+export type { default as ReturnAuthorization } from './ReturnAuthorization'
export type { default as ReturnLineItem } from './ReturnLineItem'
-export type { default as ReturnReason } from './ReturnReason'
export type { default as Return } from './Return'
export type { default as Role } from './Role'
export type { default as SetupTask } from './SetupTask'
@@ -78,7 +76,9 @@ export type { default as StoreCreditCategory } from './StoreCreditCategory'
export type { default as StoreCredit } from './StoreCredit'
export type { default as Store } from './Store'
export type { default as TaxCategory } from './TaxCategory'
+export type { default as TaxIdentifier } from './TaxIdentifier'
export type { default as TaxLine } from './TaxLine'
+export type { default as TaxRate } from './TaxRate'
export type { default as Variant } from './Variant'
export type { default as WebhookDelivery } from './WebhookDelivery'
export type { default as WebhookEndpoint } from './WebhookEndpoint'
diff --git a/packages/sdk/src/types/generated/Fulfillment.ts b/packages/sdk/src/types/generated/Fulfillment.ts
index b4781a0bd4..354c4c97ee 100644
--- a/packages/sdk/src/types/generated/Fulfillment.ts
+++ b/packages/sdk/src/types/generated/Fulfillment.ts
@@ -1,7 +1,7 @@
-// Typelizer digest 6aeaca0e5388fa62ee8edfd278b010f6
+// Typelizer digest 22963ae2bf35d9f53b9223c4541d5db7
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
-import type {DeliveryMethod, StockLocation, DeliveryRate} from '@/types'
+import type {DeliveryMethod, StockLocation, DeliveryRate, TaxLine} from '@/types'
interface Fulfillment {
id: string;
@@ -29,6 +29,7 @@ interface Fulfillment {
delivery_method: DeliveryMethod;
stock_location: StockLocation;
delivery_rates: Array<DeliveryRate>;
+ tax_lines?: Array<TaxLine>;
}
export default Fulfillment;
diff --git a/packages/sdk/src/types/generated/LineItem.ts b/packages/sdk/src/types/generated/LineItem.ts
index b842ee3098..bb269f860e 100644
--- a/packages/sdk/src/types/generated/LineItem.ts
+++ b/packages/sdk/src/types/generated/LineItem.ts
@@ -1,7 +1,7 @@
-// Typelizer digest 0e77b4c357712521007c53211156cde3
+// Typelizer digest 69a3ebd1326e3527457a9769afdd413e
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
-import type {OptionValue, DigitalLink} from '@/types'
+import type {OptionValue, DigitalLink, TaxLine} from '@/types'
interface LineItem {
id: string;
@@ -34,6 +34,7 @@ interface LineItem {
thumbnail_url: string | null;
option_values: Array<OptionValue>;
digital_links: Array<DigitalLink>;
+ tax_lines?: Array<TaxLine>;
}
export default LineItem;
diff --git a/packages/sdk/src/types/generated/TaxIdentifier.ts b/packages/sdk/src/types/generated/TaxIdentifier.ts
new file mode 100644
index 0000000000..0ed957a46f
--- /dev/null
+++ b/packages/sdk/src/types/generated/TaxIdentifier.ts
@@ -0,0 +1,11 @@
+// Typelizer digest 2b760cd49f6f329a3d23cdf4e50d8e25
+//
+// DO NOT MODIFY: This file was automatically generated by Typelizer.
+
+interface TaxIdentifier {
+ id: string;
+ kind: string;
+ value: string;
+}
+
+export default TaxIdentifier;
diff --git a/packages/sdk/src/types/generated/index.ts b/packages/sdk/src/types/generated/index.ts
index 8e19be0f21..cba5bff5f3 100644
--- a/packages/sdk/src/types/generated/index.ts
+++ b/packages/sdk/src/types/generated/index.ts
@@ -1,4 +1,4 @@
-// Typelizer digest 89f41f905b6cda40eac05dcc72c5b5d1
+// Typelizer digest 790b0ca5388fdfe76e1c0f716e4b679d
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
export type { default as Address } from './Address'
@@ -23,6 +23,8 @@ export type { default as DeliveryZone } from './DeliveryZone'
export type { default as DigitalLink } from './DigitalLink'
export type { default as Digital } from './Digital'
export type { default as Discount } from './Discount'
+export type { default as ExchangeLineItem } from './ExchangeLineItem'
+export type { default as Exchange } from './Exchange'
export type { default as Fee } from './Fee'
export type { default as Fulfillment } from './Fulfillment'
export type { default as GiftCardBatch } from './GiftCardBatch'
@@ -58,12 +60,15 @@ export type { default as Product } from './Product'
export type { default as ProductType } from './ProductType'
export type { default as Promotion } from './Promotion'
export type { default as Refund } from './Refund'
+export type { default as ReturnAuthorization } from './ReturnAuthorization'
+export type { default as ReturnItem } from './ReturnItem'
export type { default as ReturnLineItem } from './ReturnLineItem'
export type { default as Return } from './Return'
export type { default as State } from './State'
export type { default as StockLocation } from './StockLocation'
export type { default as StockReservation } from './StockReservation'
export type { default as StoreCredit } from './StoreCredit'
+export type { default as TaxIdentifier } from './TaxIdentifier'
export type { default as TaxLine } from './TaxLine'
export type { default as Variant } from './Variant'
export type { default as WishlistItem } from './WishlistItem'
diff --git a/packages/sdk/src/zod/generated/Fulfillment.ts b/packages/sdk/src/zod/generated/Fulfillment.ts
index 29ad6b0212..5dff8bc089 100644
--- a/packages/sdk/src/zod/generated/Fulfillment.ts
+++ b/packages/sdk/src/zod/generated/Fulfillment.ts
@@ -3,6 +3,7 @@ import { z } from 'zod';
import { DeliveryMethodSchema } from './DeliveryMethod';
import { DeliveryRateSchema } from './DeliveryRate';
import { StockLocationSchema } from './StockLocation';
+import { TaxLineSchema } from './TaxLine';
export const FulfillmentSchema = z.object({
id: z.string(),
@@ -30,6 +31,7 @@ export const FulfillmentSchema = z.object({
delivery_method: DeliveryMethodSchema,
stock_location: StockLocationSchema,
delivery_rates: z.array(DeliveryRateSchema),
+ tax_lines: z.array(TaxLineSchema).optional(),
});
export type Fulfillment = z.infer<typeof FulfillmentSchema>;
diff --git a/packages/sdk/src/zod/generated/LineItem.ts b/packages/sdk/src/zod/generated/LineItem.ts
index 0a68ed85c0..52b677a396 100644
--- a/packages/sdk/src/zod/generated/LineItem.ts
+++ b/packages/sdk/src/zod/generated/LineItem.ts
@@ -2,6 +2,7 @@
import { z } from 'zod';
import { DigitalLinkSchema } from './DigitalLink';
import { OptionValueSchema } from './OptionValue';
+import { TaxLineSchema } from './TaxLine';
export const LineItemSchema = z.object({
id: z.string(),
@@ -34,6 +35,7 @@ export const LineItemSchema = z.object({
thumbnail_url: z.string().nullable(),
option_values: z.array(OptionValueSchema),
digital_links: z.array(DigitalLinkSchema),
+ tax_lines: z.array(TaxLineSchema).optional(),
});
export type LineItem = z.infer<typeof LineItemSchema>;
diff --git a/packages/sdk/src/zod/generated/TaxIdentifier.ts b/packages/sdk/src/zod/generated/TaxIdentifier.ts
new file mode 100644
index 0000000000..409d3ece66
--- /dev/null
+++ b/packages/sdk/src/zod/generated/TaxIdentifier.ts
@@ -0,0 +1,10 @@
+// This file is auto-generated. Do not edit directly.
+import { z } from 'zod';
+
+export const TaxIdentifierSchema = z.object({
+ id: z.string(),
+ kind: z.string(),
+ value: z.string(),
+});
+
+export type TaxIdentifier = z.infer<typeof TaxIdentifierSchema>;
diff --git a/packages/sdk/src/zod/generated/index.ts b/packages/sdk/src/zod/generated/index.ts
index feb057e579..b0df2177c6 100644
--- a/packages/sdk/src/zod/generated/index.ts
+++ b/packages/sdk/src/zod/generated/index.ts
@@ -62,6 +62,7 @@ export { StateSchema, type State } from './State';
export { StockLocationSchema, type StockLocation } from './StockLocation';
export { StockReservationSchema, type StockReservation } from './StockReservation';
export { StoreCreditSchema, type StoreCredit } from './StoreCredit';
+export { TaxIdentifierSchema, type TaxIdentifier } from './TaxIdentifier';
export { TaxLineSchema, type TaxLine } from './TaxLine';
export { VariantSchema, type Variant } from './Variant';
export { WishlistSchema, type Wishlist } from './Wishlist';
diff --git a/spree/api/app/serializers/spree/api/v3/admin/fulfillment_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/fulfillment_serializer.rb
index 19b5366daa..14a33c2373 100644
--- a/spree/api/app/serializers/spree/api/v3/admin/fulfillment_serializer.rb
+++ b/spree/api/app/serializers/spree/api/v3/admin/fulfillment_serializer.rb
@@ -33,6 +33,7 @@ module Spree
one :delivery_method, resource: proc { Spree.api.admin_delivery_method_serializer }, if: proc { expand?('delivery_method') }
one :stock_location, resource: proc { Spree.api.admin_stock_location_serializer }, if: proc { expand?('stock_location') }
many :delivery_rates, resource: proc { Spree.api.admin_delivery_rate_serializer }, if: proc { expand?('delivery_rates') }
+ many :tax_lines, resource: proc { Spree.api.admin_tax_line_serializer }, if: proc { expand?('tax_lines') }
# The units in this fulfillment — the dashboard needs them to offer
# what can actually be returned or exchanged.
diff --git a/spree/api/app/serializers/spree/api/v3/admin/line_item_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/line_item_serializer.rb
index 870a0b41f0..3a04452159 100644
--- a/spree/api/app/serializers/spree/api/v3/admin/line_item_serializer.rb
+++ b/spree/api/app/serializers/spree/api/v3/admin/line_item_serializer.rb
@@ -34,6 +34,7 @@ module Spree
# Override inherited associations to use admin serializers
many :option_values, resource: proc { Spree.api.admin_option_value_serializer }
many :digital_links, resource: proc { Spree.api.admin_digital_link_serializer }
+ many :tax_lines, resource: proc { Spree.api.admin_tax_line_serializer }, if: proc { expand?('tax_lines') }
one :variant,
resource: proc { Spree.api.admin_variant_serializer },