diff --git a/src/app/components/product-card/product-card.component.html b/src/app/components/product-card/product-card.component.html index 3a17925..debfa43 100644 --- a/src/app/components/product-card/product-card.component.html +++ b/src/app/components/product-card/product-card.component.html @@ -51,10 +51,10 @@
{{ 'adminSettings.currencyRatesExplain' | translate }}
+@if (hasDiscount) { - {{ product.price | number:'1.2-2' }} {{ product.currency }} - {{ discountedPrice | number:'1.2-2' }} {{ product.currency }} + {{ product.price | currencyConvert:product.currency | number:'1.2-2' }} {{ displayCurrency() }} + {{ discountedPrice | currencyConvert:product.currency | number:'1.2-2' }} {{ displayCurrency() }} } @else { - {{ product.price | number:'1.2-2' }} {{ product.currency }} + {{ product.price | currencyConvert:product.currency | number:'1.2-2' }} {{ displayCurrency() }} }
@if (product.simpleDescription) { diff --git a/src/app/features/website/product/components/quick-view-dialog/quick-view-dialog.component.ts b/src/app/features/website/product/components/quick-view-dialog/quick-view-dialog.component.ts index b66a7b5..cfdf3e9 100644 --- a/src/app/features/website/product/components/quick-view-dialog/quick-view-dialog.component.ts +++ b/src/app/features/website/product/components/quick-view-dialog/quick-view-dialog.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, inject } from '@angular/core'; import { DecimalPipe } from '@angular/common'; import { RouterLink } from '@angular/router'; import { Product } from '../../../../../core/products/models/product-domain.model'; @@ -6,17 +6,22 @@ import { DialogComponent } from '../../../../../shared/ui/dialog/dialog.componen import { ButtonComponent } from '../../../../../shared/ui/button/button.component'; import { TranslatePipe } from '../../../../../i18n/translate.pipe'; import { LangRoutePipe } from '../../../../../pipes/lang-route.pipe'; +import { CurrencyConvertPipe } from '../../../../../pipes/currency-convert.pipe'; +import { LanguageService } from '../../../../../services/language.service'; import { getDiscountedPrice, getMainImage } from '../../../../../utils/item.utils'; @Component({ selector: 'app-quick-view-dialog', standalone: true, - imports: [DialogComponent, ButtonComponent, TranslatePipe, LangRoutePipe, DecimalPipe, RouterLink], + imports: [DialogComponent, ButtonComponent, TranslatePipe, LangRoutePipe, DecimalPipe, RouterLink, CurrencyConvertPipe], templateUrl: './quick-view-dialog.component.html', styleUrl: './quick-view-dialog.component.scss', changeDetection: ChangeDetectionStrategy.OnPush }) export class QuickViewDialogComponent { + private readonly languageService = inject(LanguageService); + readonly displayCurrency = this.languageService.currentCurrency; + @Input() product: Product | null = null; @Input() loading = false; diff --git a/src/app/features/website/user-experience/compare/components/compare-table.component.ts b/src/app/features/website/user-experience/compare/components/compare-table.component.ts index d1d925e..e3da135 100644 --- a/src/app/features/website/user-experience/compare/components/compare-table.component.ts +++ b/src/app/features/website/user-experience/compare/components/compare-table.component.ts @@ -3,6 +3,7 @@ import { Product } from '../../../../../core/products/models/product-domain.mode import { TranslateService } from '../../../../../i18n/translate.service'; import { TranslatePipe } from '../../../../../i18n/translate.pipe'; import { LanguageService } from '../../../../../services/language.service'; +import { CurrencyRatesService } from '../../../../../services/currency-rates.service'; import { getTranslatedField } from '../../../../../utils/item.utils'; interface CompareRow { @@ -30,6 +31,7 @@ const STOCK_LABEL_KEYS: Record