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

fix #2811: Cart's Limited Supply status should not hide item title/quantity info #2907

Merged
merged 8 commits into from
Sep 29, 2017
Merged

fix #2811: Cart's Limited Supply status should not hide item title/quantity info #2907

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a6720af
fix: if a cart item is in Limited Supply, show the Limited Supply bad…
Sep 20, 2017
c597b03
auto linting fix
Sep 20, 2017
d19c5ad
Merge branch 'marketplace' into machiko-fix-limited-supply-cart-display
machikoyasuda Sep 22, 2017
f0f4d6e
Merge branch 'marketplace' into machiko-fix-limited-supply-cart-display
mikemurray Sep 28, 2017
87ef450
Merge branch 'marketplace' into machiko-fix-limited-supply-cart-display
mikemurray Sep 28, 2017
d96bc6a
Use Components.Translation instead of i18next
Sep 29, 2017
782fb5d
Style rule: Sentence case Limited supplyg
Sep 29, 2017
bcc0a0a
Merge branch 'marketplace' into machiko-fix-limited-supply-cart-display
mikemurray Sep 29, 2017
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
34 changes: 19 additions & 15 deletions imports/plugins/core/checkout/client/components/cartItems.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { Component } from "react";
import PropTypes from "prop-types";
import { i18next } from "/client/api";
import { registerComponent } from "@reactioncommerce/reaction-components";

class CartItems extends Component {
Expand Down Expand Up @@ -30,7 +31,16 @@ class CartItems extends Component {
} = this.props;

return (
<div className="cart-items" key={item._id} style={{ display: "inline-block" }}>
<div
className="cart-items"
key={item._id}
style={{ display: "inline-block" }}
>
{handleLowInventory(item) &&
<div className="badge badge-top badge-low-inv-warning">
{ i18next.t("cartDrawerItems.limitedSupply", { default: "Limited Supply" }) }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer usage of translation component, over importing i18next where possible:

<Components.Translation i18nKey="cartDrawerItems.limitedSupply" defaultValue="Limited Supply" />

</div>
}
<i className="remove-cart-item fa fa-times fa-lg"
id={item._id}
onClick={handleRemoveItem}
Expand All @@ -50,20 +60,14 @@ class CartItems extends Component {
}
</a>
<div className="cart-labels">
{handleLowInventory(item) ?
<div className="badge badge-low-inv-warning"
title={item.variants.inventoryQuantity}
data-i18n="cartDrawerItems.left"
>!</div> :
<div>
<span className="badge" style={{ marginRight: "3px" }}>{item.quantity}</span>
<span className="cart-item-title">
{item.title}
<br />
<small>{item.variants.title}</small>
</span>
</div>
}
<div>
<span className="badge" style={{ marginRight: "3px" }}>{item.quantity}</span>
<span className="cart-item-title">
{item.title}
<br />
<small>{item.variants.title}</small>
</span>
</div>
</div>
</div>
);
Expand Down
3 changes: 3 additions & 0 deletions imports/plugins/core/checkout/server/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"dashboard": {},
"settings": {}
},
"cartDrawerItems": {
"limitedSupply": "Limited Supply"
},
"cartCompleted": {
"yourCart": "Your Cart",
"discountTotal": "Discount Total",
Expand Down
5 changes: 5 additions & 0 deletions imports/plugins/included/default-theme/client/styles/badge.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@
.label-variant(@label-warning-bg);
}

.badge-top {
position: absolute;
top: -10px;
left: -10px;
}

/* Badge Colors
// Contextual variations of badges
Expand Down