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

PWA-3071::Graphql Cart > Prices > Discounts array also including Gift… #4052

Merged
merged 5 commits into from
Mar 15, 2023
Merged

PWA-3071::Graphql Cart > Prices > Discounts array also including Gift… #4052

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e112e80
PWA-3071::Graphql Cart > Prices > Discounts array also including Gift…
glo82145 Mar 2, 2023
2ac5564
Merge branch 'develop' into PWA-3071
glo82145 Mar 2, 2023
7de5c45
PWA-3071::Graphql Cart > Prices > Discounts array also including Gift…
glo82145 Mar 3, 2023
7df850d
Merge branch 'PWA-3071' of github.com:glo71317/pwa-studio into PWA-3071
glo82145 Mar 3, 2023
6bef78c
Merge branch 'develop' into PWA-3071
glo82145 Mar 10, 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
50 changes: 27 additions & 23 deletions packages/venia-ui/lib/components/CartPage/PriceSummary/discountSummary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,31 +47,35 @@ const DiscountSummary = props => {
>
<hr className={classes.individualDiscountSeparator} />
{discountData.map(discount => {
return (
<li
className={classes.individualDiscountsListLineItem}
key={discount.label}
>
<span
className={classes.lineItemLabel}
data-cy="DiscountSummary-IndividualDiscount-Label"
if (discount.label != 'Gift Cards') {
return (
<li
className={
classes.individualDiscountsListLineItem
}
key={discount.label}
>
<span data-cy="DiscountSummary-IndividualDiscount-DiscountLabel">
{discount.label}
<span
className={classes.lineItemLabel}
data-cy="DiscountSummary-IndividualDiscount-Label"
>
<span data-cy="DiscountSummary-IndividualDiscount-DiscountLabel">
{discount.label}
</span>
</span>
</span>
<span
data-cy="DiscountSummary-IndividualDiscount-DiscountValue"
className={classes.price}
>
{MINUS_SYMBOL}
<Price
value={discount.amount.value}
currencyCode={discount.amount.currency}
/>
</span>
</li>
);
<span
data-cy="DiscountSummary-IndividualDiscount-DiscountValue"
className={classes.price}
>
{MINUS_SYMBOL}
<Price
value={discount.amount.value}
currencyCode={discount.amount.currency}
/>
</span>
</li>
);
}
})}
<hr className={classes.individualDiscountSeparator} />
</ul>
Expand Down