diff --git a/_dev/apps/ui/src/components/campaign-creation/campaign-creation-filter-popin/campaign-creation-popin-recap.vue b/_dev/apps/ui/src/components/campaign-creation/campaign-creation-filter-popin/campaign-creation-popin-recap.vue index f6463496f2..0b7ea5a7fb 100644 --- a/_dev/apps/ui/src/components/campaign-creation/campaign-creation-filter-popin/campaign-creation-popin-recap.vue +++ b/_dev/apps/ui/src/components/campaign-creation/campaign-creation-filter-popin/campaign-creation-popin-recap.vue @@ -111,6 +111,7 @@ import PsModal from '@/components/commons/ps-modal.vue'; import SegmentGenericParams from '@/utils/SegmentGenericParams'; import compareYears from '@/utils/CompareYears'; import {changeCountryNameToCode} from '@/utils/Countries'; +import { timeConverterToDate } from '@/utils/Dates'; export default defineComponent({ name: 'SSCCreationPopinRecap', @@ -154,7 +155,7 @@ export default defineComponent({ const isThereAnEndDate = compareYears(this.newCampaign.endDate); return isThereAnEndDate - ? this.$options.filters.timeConverterToDate(this.newCampaign.endDate) + ? timeConverterToDate(this.newCampaign.endDate) : null; } return '-'; diff --git a/_dev/apps/ui/src/components/campaign-creation/campaign-creation.vue b/_dev/apps/ui/src/components/campaign-creation/campaign-creation.vue index 7e11acfded..548613acff 100644 --- a/_dev/apps/ui/src/components/campaign-creation/campaign-creation.vue +++ b/_dev/apps/ui/src/components/campaign-creation/campaign-creation.vue @@ -631,7 +631,7 @@ export default defineComponent({ ?.currencyCode; }, currencySymbol(): string { - return this.$options.filters.formatPrice(0, this.currency).replace(/[\s.,0]*/g, ''); + return formatPrice(0, this.currency).replace(/[\s.,0]*/g, ''); }, finalCampaignFilters() { // IMPORTANT: Do not send the filters property if the campaign has unhandled filters diff --git a/_dev/apps/ui/src/components/campaign/campaign-table-list-row.vue b/_dev/apps/ui/src/components/campaign/campaign-table-list-row.vue index 0e57b97134..2fd44fc090 100644 --- a/_dev/apps/ui/src/components/campaign/campaign-table-list-row.vue +++ b/_dev/apps/ui/src/components/campaign/campaign-table-list-row.vue @@ -100,9 +100,10 @@ import CampaignStatus, {CampaignStatusToggle} from '@/enums/reporting/CampaignSt import compareYears from '@/utils/CompareYears'; import {CampaignPerformanceObject, CampaignStatusPayload} from '@/store/modules/campaigns/state'; import {timeConverterToDate} from '@/utils/Dates'; -import {formatPrice} from '../../utils/Price'; +import {formatPrice} from '@/utils/Price'; import SegmentGenericParams from '@/utils/SegmentGenericParams'; import AlertLowBudget from './alert-low-budget.vue'; +import {changeCountriesCodesToNames} from '@/utils/Countries'; export default defineComponent({ name: 'CampaignTableListRow', @@ -130,7 +131,7 @@ export default defineComponent({ return this.$t('campaigns.dateLabel.from', {startDate: timeConverterToDate(this.campaign.startDate)}); }, campaignCountryName() { - return this.$options.filters.changeCountriesCodesToNames([this.campaign.targetCountry])[0]; + return changeCountriesCodesToNames([this.campaign.targetCountry])[0]; }, currencyCode(): string { return this.campaign.currencyCode || this.$store.getters['googleAds/GET_GOOGLE_ADS_ACCOUNT_CHOSEN']?.currencyCode; diff --git a/_dev/apps/ui/src/components/campaign/reporting/key-metrics/key-metrics-chart-wrapper.vue b/_dev/apps/ui/src/components/campaign/reporting/key-metrics/key-metrics-chart-wrapper.vue index 103e6c17af..ca6f561847 100644 --- a/_dev/apps/ui/src/components/campaign/reporting/key-metrics/key-metrics-chart-wrapper.vue +++ b/_dev/apps/ui/src/components/campaign/reporting/key-metrics/key-metrics-chart-wrapper.vue @@ -44,6 +44,7 @@ import KpiType from '@/enums/reporting/KpiType'; import ChartCanvas from '@/components/chart/chart-canvas.vue'; import {Kpis, DailyResultTypes} from '@/store/modules/campaigns/state'; import {timeConverterToDate} from '@/utils/Dates'; +import {formatPrice} from '@/utils/Price'; import {externalTooltipHandler} from '@/utils/ChartTooltip'; const skipped = ( @@ -215,7 +216,7 @@ export default defineComponent({ || type === KpiType.COSTS; }, getFormattedValue(value: string|number|Point|null) { - return this.$options.filters.formatPrice(value, this.currencyCode); + return formatPrice(value, this.currencyCode); }, }, }); diff --git a/_dev/apps/ui/src/components/google-ads-account/google-ads-account-popin-new.vue b/_dev/apps/ui/src/components/google-ads-account/google-ads-account-popin-new.vue index 141046fdfa..c8aae604a2 100644 --- a/_dev/apps/ui/src/components/google-ads-account/google-ads-account-popin-new.vue +++ b/_dev/apps/ui/src/components/google-ads-account/google-ads-account-popin-new.vue @@ -209,6 +209,7 @@ import SelectCountry from '../commons/select-country.vue'; import SegmentGenericParams from '@/utils/SegmentGenericParams'; import {GoogleAccountContext} from '@/store/modules/accounts/state'; import BannerAds from '../commons/banner-ads.vue'; +import {changeCountryCodeToName} from '@/utils/Countries'; export default defineComponent({ name: 'GoogleAdsAccountPopinNew', @@ -261,13 +262,13 @@ export default defineComponent({ saveCountrySelected(value) { this.newAccountInfos.country = value; }, - defaultCountry() { + defaultCountry(): string { if (!this.$store.state.app.psxMtgWithGoogleDefaultShopCountry) { return ''; } - return this.$options.filters.changeCountriesCodesToNames( - [this.$store.state.app.psxMtgWithGoogleDefaultShopCountry], - )[0]; + return changeCountryCodeToName( + this.$store.state.app.psxMtgWithGoogleDefaultShopCountry, + ); }, }, props: { diff --git a/_dev/apps/ui/src/components/product-feed-page/dashboard/sync-history/sync-history.vue b/_dev/apps/ui/src/components/product-feed-page/dashboard/sync-history/sync-history.vue index 20b31fa93f..8e7170dc5e 100644 --- a/_dev/apps/ui/src/components/product-feed-page/dashboard/sync-history/sync-history.vue +++ b/_dev/apps/ui/src/components/product-feed-page/dashboard/sync-history/sync-history.vue @@ -4,10 +4,11 @@ -