diff --git a/CHANGELOG.md b/CHANGELOG.md index ceac7fab9b..eb894fda13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Default storeview settings are now overridden by specific storeview settings - @lukeromanowicz (#3057) - Apache2 proxy header support for store based on host - @resubaka (#3143) - Items count badges for Compare products and wishlist icons at header - @vishal-7037 (#3047) +- Added product image in order summary - @obsceniczny (#2544) - Add icons on the product tiles that allow to add to the wish list and to the list to compare products from the list of products - @Michal-Dziedzinski (#2773) - Get also none product image thumbnails via API - @cewald, @resubaka (#3207) - Added a config option `optimizeShoppingCartOmitFields` - @EmilsM (#3222) diff --git a/core/i18n/resource/i18n/cs-CZ.csv b/core/i18n/resource/i18n/cs-CZ.csv index 9cd6a5de33..44ef3dd3a8 100644 --- a/core/i18n/resource/i18n/cs-CZ.csv +++ b/core/i18n/resource/i18n/cs-CZ.csv @@ -65,3 +65,4 @@ "to account","na účet" "Are you sure you would like to remove this item from the shopping cart?","Opravdu chcete tuto položku odebrat z nákupního košíku?" "You need to be logged in to see this page","Pro zobrazení této stránky musíte být přihlášeni" +"Thumbnail","Thumbnail" diff --git a/core/i18n/resource/i18n/de-DE.csv b/core/i18n/resource/i18n/de-DE.csv index 458dc1b96c..1c90f70ed7 100644 --- a/core/i18n/resource/i18n/de-DE.csv +++ b/core/i18n/resource/i18n/de-DE.csv @@ -71,3 +71,4 @@ "You need to be logged in to see this page","Sie müssen angemeldet sein, um diese Seite anzuzeigen" "Quantity must be above 0","Die Menge muss größer als 0 sein" "Error: Error while adding products","Error: Fehler beim hinzufügen der Produkte" +"Thumbnail","Thumbnail" diff --git a/core/i18n/resource/i18n/en-US.csv b/core/i18n/resource/i18n/en-US.csv index b65f397d6f..edbb743911 100644 --- a/core/i18n/resource/i18n/en-US.csv +++ b/core/i18n/resource/i18n/en-US.csv @@ -77,5 +77,6 @@ "Unexpected authorization error. Check your Network conection.","Unexpected authorization error. Check your Network conection." "Columns","Columns" "You are going to pay for this order upon delivery.","You are going to pay for this order upon delivery." +"Thumbnail","Thumbnail" "Select 0","Select 0" -"Select 1","Select 1" \ No newline at end of file +"Select 1","Select 1" diff --git a/core/i18n/resource/i18n/es-ES.csv b/core/i18n/resource/i18n/es-ES.csv index 01b400ca68..567646b176 100644 --- a/core/i18n/resource/i18n/es-ES.csv +++ b/core/i18n/resource/i18n/es-ES.csv @@ -37,3 +37,4 @@ "Unhandled error, wrong response format!","¡Error no controlado, formato de respuesta incorrecto!" "Are you sure you would like to remove this item from the shopping cart?","¿Está seguro de que desea eliminar este artículo de la cesta de la compra?" "You need to be logged in to see this page","Necesitas iniciar sesión para ver esta página" +"Thumbnail","Thumbnail" diff --git a/core/i18n/resource/i18n/fr-FR.csv b/core/i18n/resource/i18n/fr-FR.csv index 7cdaa7b74a..a6451fe872 100644 --- a/core/i18n/resource/i18n/fr-FR.csv +++ b/core/i18n/resource/i18n/fr-FR.csv @@ -47,3 +47,4 @@ "Must be greater than 0","Doit être supérieur à 0" "Are you sure you would like to remove this item from the shopping cart?","Etes-vous sûr de vouloir supprimer cet objet de votre panier ?" "You need to be logged in to see this page","Vous devez être connecté pour voir cette page" +"Thumbnail","Thumbnail" diff --git a/core/i18n/resource/i18n/it-IT.csv b/core/i18n/resource/i18n/it-IT.csv index f93a63ebb2..4af4834462 100644 --- a/core/i18n/resource/i18n/it-IT.csv +++ b/core/i18n/resource/i18n/it-IT.csv @@ -50,3 +50,4 @@ "password","password" "Are you sure you would like to remove this item from the shopping cart?","Sei sicuro di voler rimuovere questo articolo dal carrello?" "You need to be logged in to see this page","Devi essere loggato per vedere questa pagina" +"Thumbnail","Thumbnail" diff --git a/core/i18n/resource/i18n/jp-JP.csv b/core/i18n/resource/i18n/jp-JP.csv index 40a4617656..bfbc524c23 100644 --- a/core/i18n/resource/i18n/jp-JP.csv +++ b/core/i18n/resource/i18n/jp-JP.csv @@ -168,3 +168,4 @@ "You will receive Push notification after coming back online. You can confirm the order by clicking on it","オンラインになるとプッシュ通知が送られ、そこから注文の確認ができます。" "Zipcode","郵便番号" "Zip-code","郵便番号" +"Thumbnail","Thumbnail" diff --git a/core/i18n/resource/i18n/nl-NL.csv b/core/i18n/resource/i18n/nl-NL.csv index 8042d3e057..5b03dbe9b8 100644 --- a/core/i18n/resource/i18n/nl-NL.csv +++ b/core/i18n/resource/i18n/nl-NL.csv @@ -37,3 +37,4 @@ Error with response - bad content-type!,Error with response - bad content-type! "Unhandled error, wrong response format!","Unhandled error, wrong response format!" "Are you sure you would like to remove this item from the shopping cart?","Weet u zeker dat u dit artikel uit uw mandje wilt verwijderen?" "You need to be logged in to see this page","U moet ingelogd zijn om deze pagina te bekijken" +"Thumbnail","Thumbnail" diff --git a/core/i18n/resource/i18n/pl-PL.csv b/core/i18n/resource/i18n/pl-PL.csv index ffc30e7b67..8cf1f306a5 100644 --- a/core/i18n/resource/i18n/pl-PL.csv +++ b/core/i18n/resource/i18n/pl-PL.csv @@ -46,3 +46,4 @@ "Must be greater than 0","Musi być większa niż 0" "Are you sure you would like to remove this item from the shopping cart?","Czy na pewno chcesz usunąć ten produkt z koszyka?" "You need to be logged in to see this page","Musisz być zalogowany, aby zobaczyć tę stronę" +"Thumbnail","Miniaturka" diff --git a/core/i18n/resource/i18n/pt-BR.csv b/core/i18n/resource/i18n/pt-BR.csv index 85c1e464c7..4185e2cc8e 100644 --- a/core/i18n/resource/i18n/pt-BR.csv +++ b/core/i18n/resource/i18n/pt-BR.csv @@ -41,3 +41,4 @@ "OK","OK" "Are you sure you would like to remove this item from the shopping cart?","Tem certeza de que deseja remover este item do carrinho de compras?" "You need to be logged in to see this page","Você precisa estar logado para ver esta página" +"Thumbnail","Thumbnail" diff --git a/core/i18n/resource/i18n/pt-PT.csv b/core/i18n/resource/i18n/pt-PT.csv index bdeb4b8e7f..ef484c5e3a 100644 --- a/core/i18n/resource/i18n/pt-PT.csv +++ b/core/i18n/resource/i18n/pt-PT.csv @@ -41,3 +41,4 @@ "OK","OK" "Are you sure you would like to remove this item from the shopping cart?","Tem a certeza de que deseja remover este item do Cesto de Compras?" "You need to be logged in to see this page","Precisa de iniciar sessão para ver esta página" +"Thumbnail","Thumbnail" diff --git a/core/i18n/resource/i18n/ru-RU.csv b/core/i18n/resource/i18n/ru-RU.csv index c2a5609c8a..91f0de6fe8 100644 --- a/core/i18n/resource/i18n/ru-RU.csv +++ b/core/i18n/resource/i18n/ru-RU.csv @@ -37,3 +37,4 @@ "Unhandled error, wrong response format!","Необработанная ошибка, неверный формат ответа!" "Are you sure you would like to remove this item from the shopping cart?","Вы уверены, что хотите удалить этот товар из корзины?" "You need to be logged in to see this page","Вы должны войти в систему, чтобы увидеть эту страницу" +"Thumbnail","Thumbnail" diff --git a/core/i18n/resource/i18n/zh-cn.csv b/core/i18n/resource/i18n/zh-cn.csv index b82419f6d5..de1abb6f67 100644 --- a/core/i18n/resource/i18n/zh-cn.csv +++ b/core/i18n/resource/i18n/zh-cn.csv @@ -66,3 +66,4 @@ "Please configure product bundle options and fix the validation errors","请配置商品属性选项并修复验证错误" "Processing order...","订单处理中..." "You need to be logged in to see this page","您需要登录才能查看此页面" +"Thumbnail","Thumbnail" diff --git a/core/modules/order/components/UserSingleOrder.ts b/core/modules/order/components/UserSingleOrder.ts index faf35bd6e5..69ae2b5f47 100644 --- a/core/modules/order/components/UserSingleOrder.ts +++ b/core/modules/order/components/UserSingleOrder.ts @@ -20,6 +20,11 @@ export const UserSingleOrder = { }, shippingAddress () { return this.order.extension_attributes.shipping_assignments[0].shipping.address + }, + singleOrderItems () { + return this.order.items.filter((item) => { + return !item.parent_item_id + }) } }, methods: { diff --git a/docs/guide/modules/order.md b/docs/guide/modules/order.md index ad69ad013a..04474134de 100644 --- a/docs/guide/modules/order.md +++ b/docs/guide/modules/order.md @@ -25,6 +25,7 @@ This module contains all the logic, components and store related to order operat - `paymentMethod` - returns `payment.additional_information[0]` from the `order` computed property - `billingAddress` - returns `billing_address` from the `order` computed property - `shippingAddress` - returns `extension_attributes.shipping_assignments[0].shipping.address` from the `order` computed property +- `singleOrderItems` - returns ordered products without `parent_id` **Methods** diff --git a/src/themes/default/components/core/blocks/MyAccount/MyOrder.vue b/src/themes/default/components/core/blocks/MyAccount/MyOrder.vue index 3b7793bd86..a7400c94f4 100644 --- a/src/themes/default/components/core/blocks/MyAccount/MyOrder.vue +++ b/src/themes/default/components/core/blocks/MyAccount/MyOrder.vue @@ -19,7 +19,7 @@

{{ order.created_at | date('LLL') }}

- {{ $t('Remake order') }} + {{ $t('Remake order') }}

@@ -44,10 +44,13 @@ {{ $t('Subtotal') }} + + {{ $t('Thumbnail') }} + - + {{ item.name }} @@ -63,35 +66,38 @@ {{ item.row_total_incl_tax | price }} + + + - + {{ $t('Subtotal') }} {{ order.subtotal | price }} - + {{ $t('Shipping') }} {{ order.shipping_amount | price }} - + {{ $t('Tax') }} {{ order.tax_amount + order.discount_tax_compensation_amount | price }} - + {{ $t('Discount') }} {{ order.discount_amount | price }} - + {{ $t('Grand total') }} {{ order.grand_total | price }} @@ -137,13 +143,37 @@