diff --git a/packages/admin-ui/src/app/catalog/catalog.routes.ts b/packages/admin-ui/src/app/catalog/catalog.routes.ts index 34b077b6ae..c13ff4fe16 100644 --- a/packages/admin-ui/src/app/catalog/catalog.routes.ts +++ b/packages/admin-ui/src/app/catalog/catalog.routes.ts @@ -108,7 +108,7 @@ export function productVariantEditorBreadcrumb(data: any, params: any) { link: ['../', 'products'], }, { - label: `#${params.id} (${entity.name})`, + label: `${entity.name}`, link: ['../', 'products', params.id, { tab: 'variants' }], }, { diff --git a/packages/admin-ui/src/app/common/detail-breadcrumb.ts b/packages/admin-ui/src/app/common/detail-breadcrumb.ts index 0ed67e4f5e..fc7f95757c 100644 --- a/packages/admin-ui/src/app/common/detail-breadcrumb.ts +++ b/packages/admin-ui/src/app/common/detail-breadcrumb.ts @@ -20,7 +20,7 @@ export function detailBreadcrumb(options: { if (options.id === 'create') { label = 'common.create'; } else { - label = `#${options.id} (${options.getName(entity)})`; + label = `${options.getName(entity)}`; } return [ { diff --git a/packages/admin-ui/src/app/customer/components/customer-list/customer-list.component.html b/packages/admin-ui/src/app/customer/components/customer-list/customer-list.component.html index bec8aaf985..16e20c7dc4 100644 --- a/packages/admin-ui/src/app/customer/components/customer-list/customer-list.component.html +++ b/packages/admin-ui/src/app/customer/components/customer-list/customer-list.component.html @@ -25,13 +25,11 @@ (pageChange)="setPageNumber($event)" (itemsPerPageChange)="setItemsPerPage($event)" > - {{ 'common.ID' | translate }} {{ 'customer.name' | translate }} {{ 'customer.email-address' | translate }} {{ 'customer.customer-type' | translate }} - {{ customer.id }} {{ customer.title }} {{ customer.firstName }} {{ customer.lastName }} diff --git a/packages/admin-ui/src/app/marketing/components/promotion-list/promotion-list.component.html b/packages/admin-ui/src/app/marketing/components/promotion-list/promotion-list.component.html index 6fc8c7bd9b..0b332ccbe4 100644 --- a/packages/admin-ui/src/app/marketing/components/promotion-list/promotion-list.component.html +++ b/packages/admin-ui/src/app/marketing/components/promotion-list/promotion-list.component.html @@ -18,7 +18,6 @@ (pageChange)="setPageNumber($event)" (itemsPerPageChange)="setItemsPerPage($event)" > - {{ 'common.ID' | translate }} {{ 'common.name' | translate }} {{ 'common.created-at' | translate }} {{ 'common.updated-at' | translate }} @@ -26,7 +25,6 @@ - {{ promotion.id }} {{ promotion.name }} {{ promotion.createdAt | date: 'longDate' }} {{ promotion.updatedAt | date: 'longDate' }} diff --git a/packages/admin-ui/src/app/order/components/order-history/order-history.component.html b/packages/admin-ui/src/app/order/components/order-history/order-history.component.html index 9b6529be20..819ab08507 100644 --- a/packages/admin-ui/src/app/order/components/order-history/order-history.component.html +++ b/packages/admin-ui/src/app/order/components/order-history/order-history.component.html @@ -75,7 +75,7 @@

{{ 'order.order-history' | translate }}

*ngIf="entry.data.to === 'Settled'; else regularPaymentTransition" >
- {{ 'order.history-payment-settled' | translate: { id: entry.data.paymentId } }} + {{ 'order.history-payment-settled' | translate }}
{{ 'order.transaction-id' | translate }}: {{ getPayment(entry)?.transactionId }} diff --git a/packages/admin-ui/src/app/order/components/order-list/order-list.component.html b/packages/admin-ui/src/app/order/components/order-list/order-list.component.html index 49fbd24999..8250939df8 100644 --- a/packages/admin-ui/src/app/order/components/order-list/order-list.component.html +++ b/packages/admin-ui/src/app/order/components/order-list/order-list.component.html @@ -36,7 +36,6 @@ (pageChange)="setPageNumber($event)" (itemsPerPageChange)="setItemsPerPage($event)" > - {{ 'common.ID' | translate }} {{ 'common.code' | translate }} {{ 'order.customer' | translate }} {{ 'order.state' | translate }} @@ -44,7 +43,6 @@ {{ 'common.updated-at' | translate }} - {{ order.id }} {{ order.code }} diff --git a/packages/admin-ui/src/app/order/components/order-payment-card/order-payment-card.component.html b/packages/admin-ui/src/app/order/components/order-payment-card/order-payment-card.component.html index c30a31c809..2ed157faf3 100644 --- a/packages/admin-ui/src/app/order/components/order-payment-card/order-payment-card.component.html +++ b/packages/admin-ui/src/app/order/components/order-payment-card/order-payment-card.component.html @@ -1,6 +1,6 @@
-
{{ 'order.payment' | translate }} #{{ payment.id }}
+
{{ 'order.payment' | translate }} #{{ payment.transactionId }}
diff --git a/packages/admin-ui/src/app/settings/components/administrator-list/administrator-list.component.html b/packages/admin-ui/src/app/settings/components/administrator-list/administrator-list.component.html index 461450a80a..667e1148bb 100644 --- a/packages/admin-ui/src/app/settings/components/administrator-list/administrator-list.component.html +++ b/packages/admin-ui/src/app/settings/components/administrator-list/administrator-list.component.html @@ -16,13 +16,11 @@ (pageChange)="setPageNumber($event)" (itemsPerPageChange)="setItemsPerPage($event)" > - {{ 'common.ID' | translate }} {{ 'settings.first-name' | translate }} {{ 'settings.last-name' | translate }} {{ 'settings.email-address' | translate }} - {{ administrator.id }} {{ administrator.firstName }} {{ administrator.lastName }} {{ administrator.emailAddress }} diff --git a/packages/admin-ui/src/app/settings/components/channel-list/channel-list.component.html b/packages/admin-ui/src/app/settings/components/channel-list/channel-list.component.html index 3a8376a611..4a129b267b 100644 --- a/packages/admin-ui/src/app/settings/components/channel-list/channel-list.component.html +++ b/packages/admin-ui/src/app/settings/components/channel-list/channel-list.component.html @@ -9,11 +9,9 @@ - {{ 'common.ID' | translate }} {{ 'common.code' | translate }} - {{ channel.id }} {{ channel.code }} - {{ 'common.ID' | translate }} {{ 'common.code' | translate }} {{ 'common.description' | translate }} {{ 'settings.permissions' | translate }} - {{ role.id }} {{ role.code }} {{ role.description }} diff --git a/packages/admin-ui/src/app/settings/components/tax-category-list/tax-category-list.component.html b/packages/admin-ui/src/app/settings/components/tax-category-list/tax-category-list.component.html index b55ab4af9b..2d827f1baf 100644 --- a/packages/admin-ui/src/app/settings/components/tax-category-list/tax-category-list.component.html +++ b/packages/admin-ui/src/app/settings/components/tax-category-list/tax-category-list.component.html @@ -9,11 +9,9 @@ - {{ 'common.ID' | translate }} {{ 'common.name' | translate }} - {{ taxCategory.id }} {{ taxCategory.name }} - {{ 'common.ID' | translate }} {{ 'common.name' | translate }} {{ 'settings.tax-category' | translate }} {{ 'settings.zone' | translate }} {{ 'settings.tax-rate' | translate }} - {{ taxRate.id }} {{ taxRate.name }} {{ taxRate.category.name }} {{ taxRate.zone.name }} diff --git a/packages/admin-ui/src/i18n-messages/en.json b/packages/admin-ui/src/i18n-messages/en.json index 7adda5083b..2ac0763c98 100644 --- a/packages/admin-ui/src/i18n-messages/en.json +++ b/packages/admin-ui/src/i18n-messages/en.json @@ -433,7 +433,7 @@ "history-order-cancelled": "Order cancelled", "history-order-fulfilled": "Order fulfilled", "history-order-transition": "Order transitioned from {from} to {to}", - "history-payment-settled": "Payment #{id} settled", + "history-payment-settled": "Payment settled", "history-payment-transition": "Payment #{id} transitioned from {from} to {to}", "history-refund-transition": "Refund #{id} transitioned from {from} to {to}", "item-count": "{count} {count, plural, one {item} other {items}}",