feat: Implement pricesIncludeTax option on Channel

Relates to #31, aims to solve the "net vs gross prices" problem outlined therein.

Next step is to get the tax calculations working correctly for Orders when tax is included in price.

admin-ui/src/app/catalog/catalog.module.ts

@@ -22,6 +22,7 @@ import { ProductVariantsListComponent } from './components/product-variants-list
 import { ProductVariantsWizardComponent } from './components/product-variants-wizard/product-variants-wizard.component';
 import { SelectOptionGroupDialogComponent } from './components/select-option-group-dialog/select-option-group-dialog.component';
 import { SelectOptionGroupComponent } from './components/select-option-group/select-option-group.component';
+import { VariantPriceDetailComponent } from './components/variant-price-detail/variant-price-detail.component';
 import { FacetResolver } from './providers/routing/facet-resolver';
 import { ProductResolver } from './providers/routing/product-resolver';
 
@@ -47,6 +48,7 @@ import { ProductResolver } from './providers/routing/product-resolver';
         ProductAssetsComponent,
         AssetPickerDialogComponent,
         AssetFileInputComponent,
+        VariantPriceDetailComponent,
     ],
     entryComponents: [
         AssetPickerDialogComponent,

admin-ui/src/app/catalog/components/product-detail/product-detail.component.ts

@@ -245,6 +245,7 @@ export class ProductDetailComponent extends BaseDetailComponent<ProductWithVaria
                     sku: variant.sku,
                     name: variantTranslation ? variantTranslation.name : '',
                     price: variant.price,
+                    priceIncludesTax: variant.priceIncludesTax,
                     priceWithTax: variant.priceWithTax,
                     taxCategoryId: variant.taxCategory.id,
                 };

admin-ui/src/app/catalog/components/product-variants-list/product-variants-list.component.html

@@ -57,15 +57,9 @@
                                             [formControl]="formArray.get([i, 'price'])"></vdr-currency-input>
                     </clr-input-container>
                 </div>
-                <div class="price-with-tax">
-                    <clr-input-container>
-                        <label>{{ 'catalog.price-including-tax' | translate }}</label>
-                        <vdr-currency-input clrInput
-                                            [formControl]="formArray.get([i, 'priceWithTax'])"></vdr-currency-input>                    </clr-input-container>
-                </div>
-                <div class="price-with-tax-preview">
-                    {{ formArray.get([i, 'price']).value * ( 1 + variant.taxRateApplied.value / 100) }}
-                </div>
+                <vdr-variant-price-detail [price]="formArray.get([i, 'price'])!.value"
+                                          [priceIncludesTax]="variant.priceIncludesTax"
+                                          [taxCategoryId]="formArray.get([i, 'taxCategoryId'])!.value"></vdr-variant-price-detail>
             </div>
         </div>
     </div>

admin-ui/src/app/catalog/components/product-variants-list/product-variants-list.component.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { FormArray, FormControl } from '@angular/forms';
+import { FormArray } from '@angular/forms';
 import { ProductWithVariants, TaxCategory } from 'shared/generated-types';
 
 @Component({

admin-ui/src/app/catalog/components/variant-price-detail/variant-price-detail.component.html

@@ -0,0 +1,7 @@
+<label class="clr-control-label">{{ 'catalog.taxes' | translate }}</label>
+<div *ngIf="priceIncludesTax">
+    {{ 'catalog.price-includes-tax-at' | translate : { rate: (taxRate$ | async) } }}
+</div>
+<div *ngIf="!priceIncludesTax">
+    {{ 'catalog.price-with-tax-in-default-zone' | translate: { price: (grossPrice$ | async | currency), rate: (taxRate$ | async) } }}
+</div>

admin-ui/src/app/catalog/components/variant-price-detail/variant-price-detail.component.scss

@@ -0,0 +1,4 @@
+:host {
+    display: flex;
+    flex-direction: column;
+}

admin-ui/src/app/catalog/components/variant-price-detail/variant-price-detail.component.ts

@@ -0,0 +1,66 @@
+import { ChangeDetectionStrategy, Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
+import { BehaviorSubject, combineLatest, Observable, Subject } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { DataService } from '../../../data/providers/data.service';
+
+@Component({
+    selector: 'vdr-variant-price-detail',
+    templateUrl: './variant-price-detail.component.html',
+    styleUrls: ['./variant-price-detail.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class VariantPriceDetailComponent implements OnInit, OnChanges {
+    @Input() priceIncludesTax: boolean;
+    @Input() price: number;
+    @Input() taxCategoryId: string;
+
+    grossPrice$: Observable<number>;
+    taxRate$: Observable<number>;
+
+    private priceChange$ = new BehaviorSubject<number>(0);
+    private taxCategoryIdChange$ = new BehaviorSubject<string>('');
+
+    constructor(private dataService: DataService) {}
+
+    ngOnInit() {
+        const taxRates$ = this.dataService.settings
+            .getTaxRates(99999, 0)
+            .mapStream(data => data.taxRates.items);
+        const activeChannel$ = this.dataService.settings
+            .getActiveChannel()
+            .mapStream(data => data.activeChannel);
+
+        this.taxRate$ = combineLatest(activeChannel$, taxRates$, this.taxCategoryIdChange$).pipe(
+            map(([channel, taxRates, taxCategoryId]) => {
+                const defaultTaxZone = channel.defaultTaxZone;
+                if (!defaultTaxZone) {
+                    return 0;
+                }
+                const applicableRate = taxRates.find(
+                    taxRate => taxRate.zone.id === defaultTaxZone.id && taxRate.category.id === taxCategoryId,
+                );
+
+                if (!applicableRate) {
+                    return 0;
+                }
+                return applicableRate.value;
+            }),
+        );
+
+        this.grossPrice$ = combineLatest(this.taxRate$, this.priceChange$).pipe(
+            map(([taxRate, price]) => {
+                return Math.round(price * ((100 + taxRate) / 100)) / 100;
+            }),
+        );
+    }
+
+    ngOnChanges(changes: SimpleChanges): void {
+        if ('price' in changes) {
+            this.priceChange$.next(changes.price.currentValue);
+        }
+        if ('taxCategoryId' in changes) {
+            this.taxCategoryIdChange$.next(changes.taxCategoryId.currentValue);
+        }
+    }
+}

admin-ui/src/app/data/client-state/client-resolvers.ts

@@ -9,7 +9,7 @@ import {
     SetUiLanguage,
 } from 'shared/generated-types';
 
-import { GET_NEWTORK_STATUS } from '../definitions/local-definitions';
+import { GET_NEWTORK_STATUS } from '../definitions/client-definitions';
 
 export type ResolverContext = {
     cache: InMemoryCache;

admin-ui/src/app/data/definitions/product-definitions.ts

@@ -18,6 +18,7 @@ export const PRODUCT_VARIANT_FRAGMENT = gql`
         languageCode
         name
         price
+        priceIncludesTax
         priceWithTax
         taxRateApplied {
             id

admin-ui/src/app/data/definitions/settings-definitions.ts

@@ -221,6 +221,7 @@ export const CHANNEL_FRAGMENT = gql`
         id
         code
         token
+        pricesIncludeTax
         defaultLanguageCode
         defaultShippingZone {
             id
@@ -251,6 +252,15 @@ export const GET_CHANNEL = gql`
     ${CHANNEL_FRAGMENT}
 `;
 
+export const GET_ACTIVE_CHANNEL = gql`
+    query GetActiveChannel {
+        activeChannel {
+            ...Channel
+        }
+    }
+    ${CHANNEL_FRAGMENT}
+`;
+
 export const CREATE_CHANNEL = gql`
     mutation CreateChannel($input: CreateChannelInput!) {
         createChannel(input: $input) {

admin-ui/src/app/data/providers/client-data.service.ts

@@ -18,7 +18,7 @@ import {
     SET_AS_LOGGED_IN,
     SET_AS_LOGGED_OUT,
     SET_UI_LANGUAGE,
-} from '../definitions/local-definitions';
+} from '../definitions/client-definitions';
 
 import { BaseDataService } from './base-data.service';
 

admin-ui/src/app/data/providers/data.service.mock.ts

@@ -109,6 +109,7 @@ export class MockDataService implements DataServiceMock {
         updateTaxRate: spyObservable('updateTaxRate'),
         getChannels: spyQueryResult('getChannels'),
         getChannel: spyQueryResult('getChannel'),
+        getActiveChannel: spyQueryResult('getActiveChannel'),
         createChannel: spyObservable('createChannel'),
         updateChannel: spyObservable('updateChannel'),
     };

admin-ui/src/app/data/providers/settings-data.service.ts

@@ -10,6 +10,7 @@ import {
     CreateTaxRateInput,
     CreateZone,
     CreateZoneInput,
+    GetActiveChannel,
     GetChannel,
     GetChannels,
     GetCountry,
@@ -40,6 +41,7 @@ import {
     CREATE_TAX_CATEGORY,
     CREATE_TAX_RATE,
     CREATE_ZONE,
+    GET_ACTIVE_CHANNEL,
     GET_CHANNEL,
     GET_CHANNELS,
     GET_COUNTRY,
@@ -192,6 +194,12 @@ export class SettingsDataService {
         });
     }
 
+    getActiveChannel() {
+        return this.baseDataService.query<GetActiveChannel.Query, GetActiveChannel.Variables>(
+            GET_ACTIVE_CHANNEL,
+        );
+    }
+
     createChannel(input: CreateChannelInput) {
         return this.baseDataService.mutate<CreateChannel.Mutation, CreateChannel.Variables>(CREATE_CHANNEL, {
             input,

admin-ui/src/app/settings/components/channel-detail/channel-detail.component.html

@@ -20,6 +20,12 @@
         <vdr-form-field [label]="'common.code' | translate" for="code">
             <input id="code" type="text" formControlName="code">
         </vdr-form-field>
+        <vdr-form-field [label]="'settings.prices-include-tax' | translate" for="pricesIncludeTax">
+            <div class="toggle-switch">
+                <input type="checkbox" id="pricesIncludeTax" formControlName="pricesIncludeTax">
+                <label for="pricesIncludeTax"></label>
+            </div>
+        </vdr-form-field>
         <vdr-form-field [label]="'settings.default-tax-zone' | translate" for="defaultTaxZoneId">
             <select clrSelect name="defaultTaxZoneId"
                     formControlName="defaultTaxZoneId">

admin-ui/src/app/settings/components/channel-detail/channel-detail.component.ts

@@ -35,6 +35,7 @@ export class ChannelDetailComponent extends BaseDetailComponent<Channel.Fragment
         this.channelForm = this.formBuilder.group({
             code: ['', Validators.required],
             token: ['', Validators.required],
+            pricesIncludeTax: [false],
             defaultShippingZoneId: [''],
             defaultTaxZoneId: [''],
         });
@@ -60,6 +61,7 @@ export class ChannelDetailComponent extends BaseDetailComponent<Channel.Fragment
         const formValue = this.channelForm.value;
         const input = {
             code: formValue.code,
+            pricesIncludeTax: formValue.pricesIncludeTax,
             defaultShippingZoneId: formValue.defaultShippingZoneId,
             defaultTaxZoneId: formValue.defaultTaxZoneId,
         } as CreateChannelInput;
@@ -92,6 +94,7 @@ export class ChannelDetailComponent extends BaseDetailComponent<Channel.Fragment
                     const input = {
                         id: channel.id,
                         code: formValue.code,
+                        pricesIncludeTax: formValue.pricesIncludeTax,
                         defaultShippingZoneId: formValue.defaultShippingZoneId,
                         defaultTaxZoneId: formValue.defaultTaxZoneId,
                     } as UpdateChannelInput;
@@ -121,6 +124,7 @@ export class ChannelDetailComponent extends BaseDetailComponent<Channel.Fragment
         this.channelForm.patchValue({
             code: entity.code,
             token: entity.token,
+            pricesIncludeTax: entity.pricesIncludeTax,
             defaultShippingZoneId: entity.defaultShippingZone ? entity.defaultShippingZone.id : '',
             defaultTaxZoneId: entity.defaultTaxZone ? entity.defaultTaxZone.id : '',
         });

admin-ui/src/app/settings/providers/routing/channel-resolver.ts

@@ -17,6 +17,7 @@ export class ChannelResolver extends BaseEntityResolver<Channel.Fragment> {
                 id: '',
                 code: '',
                 token: '',
+                pricesIncludeTax: false,
                 defaultLanguageCode: getDefaultLanguage(),
                 defaultShippingZone: {} as any,
                 defaultTaxZone: {} as any,

admin-ui/src/i18n-messages/en.json

@@ -48,6 +48,8 @@
     "option-group-options-tooltip": "Enter each option on a new line in the default language ({ defaultLanguage })",
     "original-asset-size": "Source size",
     "price": "Price",
+    "price-includes-tax-at": "Price includes tax at { rate }%",
+    "price-with-tax-in-default-zone": "Price with { rate }% tax: { price }",
     "product": "Product",
     "product-name": "Product name",
     "product-option-groups": "Option groups",
@@ -60,6 +62,7 @@
     "sku": "SKU",
     "slug": "Slug",
     "tax-category": "Tax category",
+    "taxes": "Taxes",
     "truncated-options-count": "{count} further {count, plural, one {option} other {options}}",
     "upload-assets": "Upload assets",
     "values": "Values",
@@ -153,6 +156,7 @@
     "order": "Order",
     "password": "Password",
     "permissions": "Permissions",
+    "prices-include-tax": "Prices include tax for the default Zone",
     "rate": "Rate",
     "read": "Read",
     "remove-countries-from-zone": "Remove countries from zone...",

admin-ui/src/styles/styles.scss

@@ -13,3 +13,7 @@ a:link, a:visited {
         color: darken($color-warning, 20%);
     }
 }
+
+.clr-form-control {
+    margin-top: 0;
+}

server/mock-data/mock-data.service.ts

@@ -67,6 +67,7 @@ export class MockDataService {
                 {
                     input: {
                         code,
+                        pricesIncludeTax: true,
                         token: `${code}_token`,
                         defaultLanguageCode: LanguageCode.en,
                     },

server/src/api/resolvers/channel.resolver.ts

@@ -29,6 +29,12 @@ export class ChannelResolver {
         return this.channelService.findOne(args.id);
     }
 
+    @Query()
+    @Allow(Permission.Public)
+    async activeChannel(@Ctx() ctx: RequestContext): Promise<Channel> {
+        return ctx.channel;
+    }
+
     @Mutation()
     @Allow(Permission.SuperAdmin)
     @Decode('defaultTaxZoneId', 'defaultShippingZoneId')

server/src/api/types/channel.api.graphql

@@ -1,6 +1,7 @@
 type Query {
     channels: [Channel!]!
     channel(id: ID!): Channel
+    activeChannel: Channel!
 }
 
 type Mutation {

server/src/entity/channel/channel.entity.ts

@@ -28,6 +28,8 @@ export class Channel extends VendureEntity {
     @ManyToOne(type => Zone)
     defaultShippingZone: Zone;
 
+    @Column() pricesIncludeTax: boolean;
+
     private generateToken(): string {
         const randomString = () =>
             Math.random()

server/src/entity/channel/channel.graphql

@@ -7,12 +7,14 @@ type Channel implements Node {
     defaultTaxZone: Zone
     defaultShippingZone: Zone
     defaultLanguageCode: LanguageCode!
+    pricesIncludeTax: Boolean!
 }
 
 input CreateChannelInput {
     code: String!
     token: String!
     defaultLanguageCode: LanguageCode!
+    pricesIncludeTax: Boolean!
     defaultTaxZoneId: ID
     defaultShippingZoneId: ID
 }
@@ -22,6 +24,7 @@ input UpdateChannelInput {
     code: String
     token: String
     defaultLanguageCode: LanguageCode
+    pricesIncludeTax: Boolean
     defaultTaxZoneId: ID
     defaultShippingZoneId: ID
 }

server/src/entity/product-variant/product-variant.entity.ts

@@ -36,12 +36,17 @@ export class ProductVariant extends VendureEntity implements Translatable, HasCu
     /**
      * Calculated at run-time
      */
-    priceWithTax?: number;
+    priceIncludesTax: boolean;
 
     /**
      * Calculated at run-time
      */
-    taxRateApplied?: TaxRate;
+    priceWithTax: number;
+
+    /**
+     * Calculated at run-time
+     */
+    taxRateApplied: TaxRate;
 
     @ManyToOne(type => TaxCategory)
     taxCategory: TaxCategory;

server/src/entity/product-variant/product-variant.graphql

@@ -6,8 +6,9 @@ type ProductVariant implements Node {
     sku: String!
     name: String!
     price: Int!
+    priceIncludesTax: Boolean!
     priceWithTax: Int!
-    taxRateApplied: TaxRate
+    taxRateApplied: TaxRate!
     taxCategory: TaxCategory!
     options: [ProductOption!]!
     facetValues: [FacetValue!]!

server/src/entity/tax-rate/tax-rate.entity.ts

@@ -35,10 +35,17 @@ export class TaxRate extends AdjustmentSource {
     customerGroup?: CustomerGroup;
 
     /**
-     * Returns the tax applicable to the given price.
+     * Returns the tax component of a given gross price.
      */
-    getTax(price: number): number {
-        return this.round(price * (this.value / 100));
+    taxComponentOf(grossPrice: number): number {
+        return this.round(grossPrice - grossPrice / ((100 + this.value) / 100));
+    }
+
+    /**
+     * Returns the tax applicable to the given net price.
+     */
+    taxPayableOn(netPrice: number): number {
+        return this.round(netPrice * (this.value / 100));
     }
 
     apply(price: number): Adjustment {
@@ -46,7 +53,7 @@ export class TaxRate extends AdjustmentSource {
             type: this.type,
             adjustmentSource: this.getSourceId(),
             description: this.name,
-            amount: this.getTax(price),
+            amount: this.taxPayableOn(price),
         };
     }
 

server/src/service/providers/channel.service.ts

@@ -137,6 +137,7 @@ export class ChannelService {
             const newDefaultChannel = new Channel({
                 code: DEFAULT_CHANNEL_CODE,
                 defaultLanguageCode: DEFAULT_LANGUAGE_CODE,
+                pricesIncludeTax: false,
                 token: defaultChannelToken,
             });
             await this.connection.manager.save(newDefaultChannel);

server/src/service/providers/product-variant.service.ts

@@ -9,11 +9,13 @@ import { RequestContext } from '../../api/common/request-context';
 import { DEFAULT_LANGUAGE_CODE } from '../../common/constants';
 import { Translated } from '../../common/types/locale-types';
 import { assertFound, idsAreEqual } from '../../common/utils';
+import { Channel } from '../../entity/channel/channel.entity';
 import { FacetValue } from '../../entity/facet-value/facet-value.entity';
 import { ProductOption } from '../../entity/product-option/product-option.entity';
 import { ProductVariantTranslation } from '../../entity/product-variant/product-variant-translation.entity';
 import { ProductVariant } from '../../entity/product-variant/product-variant.entity';
 import { Product } from '../../entity/product/product.entity';
+import { TaxRate } from '../../entity/tax-rate/tax-rate.entity';
 import { Zone } from '../../entity/zone/zone.entity';
 import { I18nError } from '../../i18n/i18n-error';
 import { createTranslatable } from '../helpers/create-translatable';
@@ -41,7 +43,7 @@ export class ProductVariantService {
             .then(result => {
                 if (result) {
                     return translateDeep(
-                        this.applyChannelPriceAndTax(result, ctx.channelId, ctx.channel.defaultTaxZone),
+                        this.applyChannelPriceAndTax(result, ctx.channel, ctx.channel.defaultTaxZone),
                         ctx.languageCode,
                     );
                 }
@@ -90,7 +92,7 @@ export class ProductVariantService {
             }),
         );
         return translateDeep(
-            this.applyChannelPriceAndTax(variant, ctx.channelId, ctx.channel.defaultTaxZone),
+            this.applyChannelPriceAndTax(variant, ctx.channel, ctx.channel.defaultTaxZone),
             DEFAULT_LANGUAGE_CODE,
             ['options', 'facetValues'],
         );
@@ -168,7 +170,7 @@ export class ProductVariantService {
 
         return variants.map(v =>
             translateDeep(
-                this.applyChannelPriceAndTax(v, ctx.channelId, ctx.channel.defaultTaxZone),
+                this.applyChannelPriceAndTax(v, ctx.channel, ctx.channel.defaultTaxZone),
                 DEFAULT_LANGUAGE_CODE,
                 ['options', 'facetValues'],
             ),
@@ -178,22 +180,39 @@ export class ProductVariantService {
     /**
      * Populates the `price` field with the price for the specified channel.
      */
-    applyChannelPriceAndTax(variant: ProductVariant, channelId: ID, taxZone: Zone): ProductVariant {
-        const channelPrice = variant.productVariantPrices.find(p => idsAreEqual(p.channelId, channelId));
+    applyChannelPriceAndTax(variant: ProductVariant, channel: Channel, taxZone: Zone): ProductVariant {
+        const channelPrice = variant.productVariantPrices.find(p => idsAreEqual(p.channelId, channel.id));
         if (!channelPrice) {
             throw new I18nError(`error.no-price-found-for-channel`);
         }
-        variant.price = channelPrice.price;
-
-        const applicableTaxRate = this.taxRateService
-            .getActiveTaxRates()
-            .find(r => r.test(taxZone, variant.taxCategory));
-        if (applicableTaxRate) {
-            variant.priceWithTax = variant.price + applicableTaxRate.getTax(variant.price);
-            variant.taxRateApplied = applicableTaxRate;
+        const applicableTaxRate = this.taxRateService.getApplicableTaxRate(taxZone, variant.taxCategory);
+
+        if (channel.pricesIncludeTax) {
+            const isDefaultZone = taxZone.id === channel.defaultTaxZone.id;
+            if (isDefaultZone) {
+                const grossPrice = channelPrice.price;
+                variant.priceIncludesTax = true;
+                variant.price = grossPrice;
+                variant.priceWithTax = grossPrice;
+            } else {
+                const taxRateForDefaultZone = this.taxRateService.getApplicableTaxRate(
+                    channel.defaultTaxZone,
+                    variant.taxCategory,
+                );
+                const grossPriceInDefaultZone = channelPrice.price;
+                const netPrice =
+                    grossPriceInDefaultZone - taxRateForDefaultZone.taxComponentOf(grossPriceInDefaultZone);
+                variant.price = netPrice;
+                variant.priceIncludesTax = false;
+                variant.priceWithTax = netPrice + applicableTaxRate.taxPayableOn(netPrice);
+            }
         } else {
-            variant.priceWithTax = variant.price;
+            const netPrice = channelPrice.price;
+            variant.price = netPrice;
+            variant.priceIncludesTax = false;
+            variant.priceWithTax = netPrice + applicableTaxRate.taxPayableOn(netPrice);
         }
+        variant.taxRateApplied = applicableTaxRate;
         return variant;
     }
 

server/src/service/providers/product.service.ts

@@ -170,7 +170,7 @@ export class ProductService {
         product.variants = product.variants.map(variant => {
             return this.productVariantService.applyChannelPriceAndTax(
                 variant,
-                ctx.channelId,
+                ctx.channel,
                 ctx.channel.defaultTaxZone,
             );
         });

server/src/service/providers/tax-rate.service.ts

@@ -20,6 +20,12 @@ export class TaxRateService {
      * per request.
      */
     private activeTaxRates: TaxRate[] = [];
+    private readonly defaultTaxRate = new TaxRate({
+        value: 0,
+        enabled: true,
+        name: 'No configured tax rate',
+        id: '0',
+    });
 
     constructor(@InjectConnection() private connection: Connection) {}
 
@@ -89,6 +95,11 @@ export class TaxRateService {
         return this.activeTaxRates;
     }
 
+    getApplicableTaxRate(zone: Zone, taxCategory: TaxCategory): TaxRate {
+        const rate = this.getActiveTaxRates().find(r => r.test(zone, taxCategory));
+        return rate || this.defaultTaxRate;
+    }
+
     private async updateActiveTaxRates() {
         this.activeTaxRates = await this.connection.getRepository(TaxRate).find({
             relations: ['category', 'zone', 'customerGroup'],

shared/generated-types.ts

@@ -46,6 +46,7 @@ export interface Query {
     me?: CurrentUser | null;
     channels: Channel[];
     channel?: Channel | null;
+    activeChannel: Channel;
     config: Config;
     countries: CountryList;
     country?: Country | null;
@@ -123,6 +124,7 @@ export interface Channel extends Node {
     defaultTaxZone?: Zone | null;
     defaultShippingZone?: Zone | null;
     defaultLanguageCode: LanguageCode;
+    pricesIncludeTax: boolean;
 }
 
 export interface Zone extends Node {
@@ -284,6 +286,7 @@ export interface OrderLine extends Node {
     productVariant: ProductVariant;
     featuredAsset?: Asset | null;
     unitPrice: number;
+    unitPriceWithPromotions: number;
     unitPriceWithTax: number;
     quantity: number;
     items: OrderItem[];
@@ -300,8 +303,9 @@ export interface ProductVariant extends Node {
     sku: string;
     name: string;
     price: number;
+    priceIncludesTax: boolean;
     priceWithTax: number;
-    taxRateApplied?: TaxRate | null;
+    taxRateApplied: TaxRate;
     taxCategory: TaxCategory;
     options: ProductOption[];
     facetValues: FacetValue[];
@@ -831,6 +835,7 @@ export interface CreateChannelInput {
     code: string;
     token: string;
     defaultLanguageCode: LanguageCode;
+    pricesIncludeTax: boolean;
     defaultTaxZoneId?: string | null;
     defaultShippingZoneId?: string | null;
 }
@@ -840,6 +845,7 @@ export interface UpdateChannelInput {
     code?: string | null;
     token?: string | null;
     defaultLanguageCode?: LanguageCode | null;
+    pricesIncludeTax?: boolean | null;
     defaultTaxZoneId?: string | null;
     defaultShippingZoneId?: string | null;
 }
@@ -1625,6 +1631,7 @@ export namespace QueryResolvers {
         me?: MeResolver<CurrentUser | null, any, Context>;
         channels?: ChannelsResolver<Channel[], any, Context>;
         channel?: ChannelResolver<Channel | null, any, Context>;
+        activeChannel?: ActiveChannelResolver<Channel, any, Context>;
         config?: ConfigResolver<Config, any, Context>;
         countries?: CountriesResolver<CountryList, any, Context>;
         country?: CountryResolver<Country | null, any, Context>;
@@ -1713,6 +1720,11 @@ export namespace QueryResolvers {
         id: string;
     }
 
+    export type ActiveChannelResolver<R = Channel, Parent = any, Context = any> = Resolver<
+        R,
+        Parent,
+        Context
+    >;
     export type ConfigResolver<R = Config, Parent = any, Context = any> = Resolver<R, Parent, Context>;
     export type CountriesResolver<R = CountryList, Parent = any, Context = any> = Resolver<
         R,
@@ -2061,6 +2073,7 @@ export namespace ChannelResolvers {
         defaultTaxZone?: DefaultTaxZoneResolver<Zone | null, any, Context>;
         defaultShippingZone?: DefaultShippingZoneResolver<Zone | null, any, Context>;
         defaultLanguageCode?: DefaultLanguageCodeResolver<LanguageCode, any, Context>;
+        pricesIncludeTax?: PricesIncludeTaxResolver<boolean, any, Context>;
     }
 
     export type IdResolver<R = string, Parent = any, Context = any> = Resolver<R, Parent, Context>;
@@ -2083,6 +2096,11 @@ export namespace ChannelResolvers {
         Parent,
         Context
     >;
+    export type PricesIncludeTaxResolver<R = boolean, Parent = any, Context = any> = Resolver<
+        R,
+        Parent,
+        Context
+    >;
 }
 
 export namespace ZoneResolvers {
@@ -2509,6 +2527,7 @@ export namespace OrderLineResolvers {
         productVariant?: ProductVariantResolver<ProductVariant, any, Context>;
         featuredAsset?: FeaturedAssetResolver<Asset | null, any, Context>;
         unitPrice?: UnitPriceResolver<number, any, Context>;
+        unitPriceWithPromotions?: UnitPriceWithPromotionsResolver<number, any, Context>;
         unitPriceWithTax?: UnitPriceWithTaxResolver<number, any, Context>;
         quantity?: QuantityResolver<number, any, Context>;
         items?: ItemsResolver<OrderItem[], any, Context>;
@@ -2531,6 +2550,11 @@ export namespace OrderLineResolvers {
         Context
     >;
     export type UnitPriceResolver<R = number, Parent = any, Context = any> = Resolver<R, Parent, Context>;
+    export type UnitPriceWithPromotionsResolver<R = number, Parent = any, Context = any> = Resolver<
+        R,
+        Parent,
+        Context
+    >;
     export type UnitPriceWithTaxResolver<R = number, Parent = any, Context = any> = Resolver<
         R,
         Parent,
@@ -2556,8 +2580,9 @@ export namespace ProductVariantResolvers {
         sku?: SkuResolver<string, any, Context>;
         name?: NameResolver<string, any, Context>;
         price?: PriceResolver<number, any, Context>;
+        priceIncludesTax?: PriceIncludesTaxResolver<boolean, any, Context>;
         priceWithTax?: PriceWithTaxResolver<number, any, Context>;
-        taxRateApplied?: TaxRateAppliedResolver<TaxRate | null, any, Context>;
+        taxRateApplied?: TaxRateAppliedResolver<TaxRate, any, Context>;
         taxCategory?: TaxCategoryResolver<TaxCategory, any, Context>;
         options?: OptionsResolver<ProductOption[], any, Context>;
         facetValues?: FacetValuesResolver<FacetValue[], any, Context>;
@@ -2576,8 +2601,13 @@ export namespace ProductVariantResolvers {
     export type SkuResolver<R = string, Parent = any, Context = any> = Resolver<R, Parent, Context>;
     export type NameResolver<R = string, Parent = any, Context = any> = Resolver<R, Parent, Context>;
     export type PriceResolver<R = number, Parent = any, Context = any> = Resolver<R, Parent, Context>;
+    export type PriceIncludesTaxResolver<R = boolean, Parent = any, Context = any> = Resolver<
+        R,
+        Parent,
+        Context
+    >;
     export type PriceWithTaxResolver<R = number, Parent = any, Context = any> = Resolver<R, Parent, Context>;
-    export type TaxRateAppliedResolver<R = TaxRate | null, Parent = any, Context = any> = Resolver<
+    export type TaxRateAppliedResolver<R = TaxRate, Parent = any, Context = any> = Resolver<
         R,
         Parent,
         Context
@@ -3809,106 +3839,6 @@ export namespace GetCurrentUser {
     export type Me = CurrentUser.Fragment;
 }
 
-export namespace GetServerConfig {
-    export type Variables = {};
-
-    export type Query = {
-        __typename?: 'Query';
-        config: Config;
-    };
-
-    export type Config = {
-        __typename?: 'Config';
-        customFields?: Json | null;
-    };
-}
-
-export namespace CreateFacet {
-    export type Variables = {
-        input: CreateFacetInput;
-    };
-
-    export type Mutation = {
-        __typename?: 'Mutation';
-        createFacet: CreateFacet;
-    };
-
-    export type CreateFacet = FacetWithValues.Fragment;
-}
-
-export namespace UpdateFacet {
-    export type Variables = {
-        input: UpdateFacetInput;
-    };
-
-    export type Mutation = {
-        __typename?: 'Mutation';
-        updateFacet: UpdateFacet;
-    };
-
-    export type UpdateFacet = FacetWithValues.Fragment;
-}
-
-export namespace CreateFacetValues {
-    export type Variables = {
-        input: CreateFacetValueInput[];
-    };
-
-    export type Mutation = {
-        __typename?: 'Mutation';
-        createFacetValues: CreateFacetValues[];
-    };
-
-    export type CreateFacetValues = FacetValue.Fragment;
-}
-
-export namespace UpdateFacetValues {
-    export type Variables = {
-        input: UpdateFacetValueInput[];
-    };
-
-    export type Mutation = {
-        __typename?: 'Mutation';
-        updateFacetValues: UpdateFacetValues[];
-    };
-
-    export type UpdateFacetValues = FacetValue.Fragment;
-}
-
-export namespace GetFacetList {
-    export type Variables = {
-        options?: FacetListOptions | null;
-        languageCode?: LanguageCode | null;
-    };
-
-    export type Query = {
-        __typename?: 'Query';
-        facets: Facets;
-    };
-
-    export type Facets = {
-        __typename?: 'FacetList';
-        items: Items[];
-        totalItems: number;
-    };
-
-    export type Items = FacetWithValues.Fragment;
-}
-
-export namespace GetFacetWithValues {
-    export type Variables = {
-        id: string;
-        languageCode?: LanguageCode | null;
-    };
-
-    export type Query = {
-        __typename?: 'Query';
-        facet?: Facet | null;
-    };
-
-    export type Facet = FacetWithValues.Fragment;
-}
-
 export namespace RequestStarted {
     export type Variables = {};
 
@@ -4017,6 +3947,106 @@ export namespace GetUiState {
     };
 }
 
+export namespace GetServerConfig {
+    export type Variables = {};
+
+    export type Query = {
+        __typename?: 'Query';
+        config: Config;
+    };
+
+    export type Config = {
+        __typename?: 'Config';
+        customFields?: Json | null;
+    };
+}
+
+export namespace CreateFacet {
+    export type Variables = {
+        input: CreateFacetInput;
+    };
+
+    export type Mutation = {
+        __typename?: 'Mutation';
+        createFacet: CreateFacet;
+    };
+
+    export type CreateFacet = FacetWithValues.Fragment;
+}
+
+export namespace UpdateFacet {
+    export type Variables = {
+        input: UpdateFacetInput;
+    };
+
+    export type Mutation = {
+        __typename?: 'Mutation';
+        updateFacet: UpdateFacet;
+    };
+
+    export type UpdateFacet = FacetWithValues.Fragment;
+}
+
+export namespace CreateFacetValues {
+    export type Variables = {
+        input: CreateFacetValueInput[];
+    };
+
+    export type Mutation = {
+        __typename?: 'Mutation';
+        createFacetValues: CreateFacetValues[];
+    };
+
+    export type CreateFacetValues = FacetValue.Fragment;
+}
+
+export namespace UpdateFacetValues {
+    export type Variables = {
+        input: UpdateFacetValueInput[];
+    };
+
+    export type Mutation = {
+        __typename?: 'Mutation';
+        updateFacetValues: UpdateFacetValues[];
+    };
+
+    export type UpdateFacetValues = FacetValue.Fragment;
+}
+
+export namespace GetFacetList {
+    export type Variables = {
+        options?: FacetListOptions | null;
+        languageCode?: LanguageCode | null;
+    };
+
+    export type Query = {
+        __typename?: 'Query';
+        facets: Facets;
+    };
+
+    export type Facets = {
+        __typename?: 'FacetList';
+        items: Items[];
+        totalItems: number;
+    };
+
+    export type Items = FacetWithValues.Fragment;
+}
+
+export namespace GetFacetWithValues {
+    export type Variables = {
+        id: string;
+        languageCode?: LanguageCode | null;
+    };
+
+    export type Query = {
+        __typename?: 'Query';
+        facet?: Facet | null;
+    };
+
+    export type Facet = FacetWithValues.Fragment;
+}
+
 export namespace GetOrderList {
     export type Variables = {
         options?: OrderListOptions | null;
@@ -4627,6 +4657,17 @@ export namespace GetChannel {
     export type Channel = Channel.Fragment;
 }
 
+export namespace GetActiveChannel {
+    export type Variables = {};
+
+    export type Query = {
+        __typename?: 'Query';
+        activeChannel: ActiveChannel;
+    };
+
+    export type ActiveChannel = Channel.Fragment;
+}
+
 export namespace CreateChannel {
     export type Variables = {
         input: CreateChannelInput;
@@ -4783,8 +4824,9 @@ export namespace ProductVariant {
         languageCode: LanguageCode;
         name: string;
         price: number;
+        priceIncludesTax: boolean;
         priceWithTax: number;
-        taxRateApplied?: TaxRateApplied | null;
+        taxRateApplied: TaxRateApplied;
         taxCategory: TaxCategory;
         sku: string;
         options: Options[];
@@ -4996,6 +5038,7 @@ export namespace Channel {
         id: string;
         code: string;
         token: string;
+        pricesIncludeTax: boolean;
         defaultLanguageCode: LanguageCode;
         defaultShippingZone?: DefaultShippingZone | null;
         defaultTaxZone?: DefaultTaxZone | null;