Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ProductVariantPrice custom fields ui inputs #3263

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add ProductVariantPrice custom fields ui inputs #3263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b78351c
feat(admin-ui): Added ProductVariantPrice custom fields ui inputs
Dec 6, 2024
0a960e6
feat(core): Added create & update input for ProductVariantPrice
Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74,414 changes: 37,207 additions & 37,207 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions ...c/lib/catalog/src/components/product-variant-detail/product-variant-detail.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,12 +195,26 @@
[priceIncludesTax]="channelPriceIncludesTax$ | async"
[taxCategoryId]="detailForm.get('taxCategoryId')!.value"
/>

<div class="form-grid-span" *ngIf="customPriceFields.length">
<div class="title-row">
<span class="title">{{ 'common.custom-fields' | translate }}</span>
</div>
<vdr-tabbed-custom-fields
entityName="ProductVariantPrice"
[customFields]="customPriceFields"
[customFieldsFormGroup]="price.get(['customFields'])"
[readonly]="!(updatePermissions | hasPermission)"
/>
</div>
</div>

<vdr-variant-price-strategy-detail
[channelPriceIncludesTax]="channelPriceIncludesTax$ | async"
[channelDefaultCurrencyCode]="channelDefaultCurrencyCode"
[variant]="variant"
/>

<ng-container *ngIf="unusedCurrencyCodes$ | async as unusedCurrencyCodes">
<div *ngIf="unusedCurrencyCodes.length">
<vdr-dropdown>
Expand Down
9 changes: 9 additions & 0 deletions ...c/lib/catalog/src/components/product-variant-detail/product-variant-detail.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,12 @@ vdr-product-variant-quick-jump {
}
}
}

.title-row {
display: flex;
justify-content: space-between;
align-items: center;
}
.title {
font-size: var(--font-size-base);
}
21 changes: 14 additions & 7 deletions ...src/lib/catalog/src/components/product-variant-detail/product-variant-detail.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export class ProductVariantDetailComponent
{
public readonly updatePermissions = [Permission.UpdateCatalog, Permission.UpdateProduct];
readonly customFields = this.getCustomFieldConfig('ProductVariant');
readonly customPriceFields = this.getCustomFieldConfig('ProductVariantPrice');
readonly customOptionFields = this.getCustomFieldConfig('ProductOption');
stockLevels$: Observable<NonNullable<GetProductVariantDetailQuery['productVariant']>['stockLevels']>;
detailForm = this.formBuilder.group<VariantFormValue>({
Expand Down Expand Up @@ -99,6 +100,7 @@ export class ProductVariantDetailComponent
price: FormControl<number | null>;
currencyCode: FormControl<CurrencyCode | null>;
delete: FormControl<boolean | null>;
customFields: FormGroup<any>; //TODO: Add type
}>
>([]);
assetChanges: SelectedAssets = {};
Expand Down Expand Up @@ -181,6 +183,7 @@ export class ProductVariantDetailComponent
currencyCode,
price: 0,
delete: false as boolean,
customFields: this.formBuilder.group(getCustomFieldsDefaults(this.customPriceFields)),
}),
);
}
Expand Down Expand Up @@ -246,6 +249,7 @@ export class ProductVariantDetailComponent
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
currencyCode: control.value.currencyCode!,
delete: control.value.delete === true,
customFields: control.get('customFields')?.value,
}));
}
return this.dataService.mutate(ProductVariantUpdateMutationDocument, {
Expand Down Expand Up @@ -356,13 +360,16 @@ export class ProductVariantDetailComponent
}
this.pricesForm.clear();
for (const price of variant.prices) {
this.pricesForm.push(
this.formBuilder.group({
price: price.price,
currencyCode: price.currencyCode,
delete: false as boolean,
}),
);
const priceForm = this.formBuilder.group({
price: price.price,
currencyCode: price.currencyCode,
delete: false as boolean,
customFields: this.formBuilder.group(getCustomFieldsDefaults(this.customPriceFields)),
});
if (this.customPriceFields.length) {
this.setCustomFieldFormValues(this.customPriceFields, priceForm.get(['customFields']), price);
}
this.pricesForm.push(priceForm);
}
if (this.customFields.length) {
this.setCustomFieldFormValues(
Expand Down
10 changes: 7 additions & 3 deletions ...i/src/lib/catalog/src/components/product-variant-detail/product-variant-detail.graphql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { ASSET_FRAGMENT, PRODUCT_OPTION_FRAGMENT } from '@vendure/admin-ui/core';
import {
ASSET_FRAGMENT,
PRODUCT_OPTION_FRAGMENT,
PRODUCT_VARIANT_PRICE_FRAGMENT,
} from '@vendure/admin-ui/core';
import { gql } from 'apollo-angular';

export const PRODUCT_VARIANT_DETAIL_QUERY_PRODUCT_VARIANT_FRAGMENT = gql`
Expand All @@ -12,8 +16,7 @@ export const PRODUCT_VARIANT_DETAIL_QUERY_PRODUCT_VARIANT_FRAGMENT = gql`
price
currencyCode
prices {
price
currencyCode
...ProductVariantPrice
}
priceWithTax
stockOnHand
Expand Down Expand Up @@ -87,6 +90,7 @@ export const PRODUCT_VARIANT_DETAIL_QUERY_PRODUCT_VARIANT_FRAGMENT = gql`
}
}
}
${PRODUCT_VARIANT_PRICE_FRAGMENT}
`;

export const PRODUCT_VARIANT_DETAIL_QUERY = gql`
Expand Down
Loading
Loading