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

Jump to bottom

CC-30037: Fixed display shopping cart items count #240

Merged
merged 2 commits into from
Jul 28, 2023
Merged

CC-30037: Fixed display shopping cart items count #240

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
f2d2f40
CC-30037: Adjust cart page layout and sidebar templates.
sakharova-yuliia Jul 19, 2023
fabff0c
CC-30037: Adjust cart templates in order to use data prepared in cart…
sakharova-yuliia Jul 24, 2023
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
1 change: 0 additions & 1 deletion ...Yves/CartPage/Theme/default/components/molecules/cart-sidebar-item/cart-sidebar-item.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
{% define data = {
title: '',
cart: required,
transformedCartItems: [],
isQuoteValid: false,
isQuoteEditable: false,
isAccordionItem: true,
Expand Down
8 changes: 5 additions & 3 deletions src/Pyz/Yves/CartPage/Theme/default/components/organisms/cart-sidebar/cart-sidebar.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% define data = {
cart: required,
cartItems: required,
transformedCartItems: required,
cartItemsCount: 0,
isQuoteEditable: required,
isQuoteValid: required,
} %}
Expand Down Expand Up @@ -174,18 +174,20 @@
{% embed molecule('cart-sidebar-item', 'CartPage') with {
data: {
cart: data.cart,
transformedCartItems: data.transformedCartItems,
isQuoteValid: data.isQuoteValid,
isQuoteEditable: data.isQuoteEditable,
isAccordionItem: false,
},
modifiers: ['summary'],
embed: {
cartItemsCount: data.cartItemsCount,
}
} only %}
{% block body %}
<div class="{{ config.name }}__start">
<div class="{{ config.name }}__order-header grid grid--justify grid--middle">
<h6 class="{{ config.name }}__title col">{{ 'cart.your-order' | trans }}</h6>
<div class="{{ config.name }}__quantity col">{{ data.transformedCartItems | length | executeFilterIfExists('formatInt', app.locale) }} {{ 'checkout.step.summary.items' | trans }}</div>
<div class="{{ config.name }}__quantity col">{{ embed.cartItemsCount | executeFilterIfExists('formatInt', app.locale) }} {{ 'checkout.step.summary.items' | trans }}</div>
</div>

{% set isCartCodeFormWidget = data.isQuoteEditable and can('ChangeCartItemPermissionPlugin') and can('SeePricePermissionPlugin') %}
Expand Down
10 changes: 7 additions & 3 deletions ...s/CartPage/Theme/default/templates/page-layout-cart-preview/page-layout-cart-preview.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
data: {
cart: data.cart,
cartItems: data.cartItems,
transformedCartItems: transformedCartItems,
cartItemsCount: cartItemsCount,
isQuoteEditable: data.isQuoteEditable,
isQuoteValid: data.isQuoteValid,
},
Expand All @@ -103,17 +103,21 @@
{% embed molecule('cart-sidebar-item', 'CartPage') with {
data: {
cart: data.cart,
transformedCartItems: data.transformedCartItems,
isQuoteValid: data.isQuoteValid,
isQuoteEditable: data.isQuoteEditable,
isAccordionItem: false,
},
modifiers: ['summary'],
embed: {
cartItemsCount: data.cartItemsCount,
},
} only %}
{% block body %}
<div class="{{ config.name }}__start grid grid--justify grid--middle">
<h6 class="{{ config.name }}__title col">{{ 'cart.your-order' | trans }}</h6>
<div class="{{ config.name }}__quantity col">{{ data.transformedCartItems | length | executeFilterIfExists('formatInt', app.locale) }} {{ 'checkout.step.summary.items' | trans }}</div>
<div class="{{ config.name }}__quantity col">
{{ embed.cartItemsCount | executeFilterIfExists('formatInt', app.locale) }} {{ 'checkout.step.summary.items' | trans }}
</div>
</div>

{% set isCartCodeFormWidget = data.isQuoteEditable and can('ChangeCartItemPermissionPlugin') and can('SeePricePermissionPlugin') %}
Expand Down
12 changes: 7 additions & 5 deletions src/Pyz/Yves/CartPage/Theme/default/templates/page-layout-cart/page-layout-cart.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

{% block content %}
{% set isQuoteEnadled = data.cart.idQuote and data.isQuoteEditable %}
{% set productBundleItemCounterWidget = findWidget('ProductBundleItemCounterWidget', [data.cart]) %}
{% set transformedCartItems = productBundleItemCounterWidget.items | default(data.cartItems) %}

{% if data.cart.items is empty %}
Expand All @@ -65,7 +66,6 @@
data: {
cart: data.cart,
cartItems: data.cartItems,
transformedCartItems: transformedCartItems,
isQuoteEditable: data.isQuoteEditable,
isQuoteValid: data.isQuoteValid,
},
Expand Down Expand Up @@ -117,8 +117,10 @@
{% endblock %}
{% endif %}
{% if data.cart.items is not empty %}
{% set productBundleItemCounterWidget = findWidget('ProductBundleItemCounterWidget', [data.cart]) %}

{% set cartItemsCount = 0 %}
{% for cartItem in transformedCartItems %}
{% set cartItemsCount = cartItemsCount + cartItem.quantity %}
{% endfor %}
<div class="grid grid--gap">
<div class="col col--sm-12 col--xl-9">
<div class="cart-title">
Expand Down Expand Up @@ -150,7 +152,7 @@
} only %}
{% endif %}
</div>
<div class="col col--sm-2 text-right cart-title__quantity">{{ transformedCartItems | length | executeFilterIfExists('formatInt', app.locale) }} {{ 'checkout.step.summary.items' | trans }}</div>
<div class="col col--sm-2 text-right cart-title__quantity">{{ cartItemsCount | executeFilterIfExists('formatInt', app.locale) }} {{ 'checkout.step.summary.items' | trans }}</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -201,7 +203,7 @@
data: {
cart: data.cart,
cartItems: data.cartItems,
transformedCartItems: transformedCartItems,
cartItemsCount: cartItemsCount,
isQuoteEditable: data.isQuoteEditable,
isQuoteValid: data.isQuoteValid,
},
Expand Down
Loading