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

[PWA-2672] Product prices is informed by the outdated field #3760

Merged
merged 8 commits into from
Apr 22, 2022
Merged

[PWA-2672] Product prices is informed by the outdated field #3760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
85fcf66
Update two areas displaying special prices incorrectly
tjwiebell Apr 13, 2022
d116f33
Update additional areas not using final_price that includes special p…
tjwiebell Apr 13, 2022
39301dc
Fix whitespace in snaps from manual edit
tjwiebell Apr 13, 2022
bb06194
Merge branch 'develop' into tommy/special-pricing-field-update
michaelyu0123 Apr 14, 2022
7730d91
Merge branch 'develop' into tommy/special-pricing-field-update
dpatil-magento Apr 19, 2022
1977d35
Merge branch 'develop' into tommy/special-pricing-field-update
dpatil-magento Apr 21, 2022
8cb2ce1
Add price_range data to integration test fixtures.
tjwiebell Apr 21, 2022
b046a3f
Merge branch 'develop' into tommy/special-pricing-field-update
dpatil-magento Apr 22, 2022
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
2 changes: 1 addition & 1 deletion packages/pagebuilder/lib/ContentTypes/Products/products.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ export const GET_PRODUCTS_BY_URL_KEY = gql`
name
price_range {
maximum_price {
regular_price {
final_price {
currency
value
}
Expand Down
8 changes: 8 additions & 0 deletions packages/peregrine/lib/talons/CartPage/ProductListing/EditModal/productFormFragment.gql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@ export const ProductFormFragment = gql`
}
}
}
price_range {
maximum_price {
final_price {
currency
value
}
}
}
sku
}
}
Expand Down
17 changes: 5 additions & 12 deletions packages/peregrine/lib/talons/CartPage/ProductListing/EditModal/useProductForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import DEFAULT_OPERATIONS from './productForm.gql';
*
* @param {Object} props
* @param {Object} props.cartItem The cart item to configure on the form
* @param {GraphQLAST} props.getConfigurableOptionsQuery GraphQL query to get the configurable options for a product.
* @param {GraphQLDocument} props.getConfigurableOptionsQuery GraphQL query to get the configurable options for a product.
* @param {function} props.setIsCartUpdating Function for setting the updating state for the shopping cart.
* @param {function} props.setVariantPrice Function for setting the variant price on a product.
* @param {GraphQLAST} props.updateConfigurableOptionsMutation GraphQL mutation for updating the configurable options for a product.
* @param {GraphQLAST} props.updateQuantityMutation GraphQL mutation for updating the quantity of a product in a cart.
* @param {GraphQLDocument} props.updateConfigurableOptionsMutation GraphQL mutation for updating the configurable options for a product.
* @param {GraphQLDocument} props.updateQuantityMutation GraphQL mutation for updating the quantity of a product in a cart.
* @param {function} props.setActiveEditItem Function for setting the actively editing item.
*
* @return {ProductFormTalonProps}
Expand Down Expand Up @@ -150,15 +150,8 @@ export const useProductForm = props => {
}, [storeConfigData]);

useEffect(() => {
let variantPrice = null;

if (selectedVariant) {
const { product } = selectedVariant;
const { price } = product;
const { regularPrice } = price;
variantPrice = regularPrice.amount;
}

const variantPrice =
selectedVariant?.product?.price_range?.maximum_price?.final_price;
setVariantPrice(variantPrice);
}, [selectedVariant, setVariantPrice]);

Expand Down
6 changes: 3 additions & 3 deletions packages/peregrine/lib/talons/ProductFullDetail/useProductFullDetail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ const getConfigPrice = (product, optionCodes, optionSelections) => {
0;

if (!isConfigurable || !optionsSelected) {
value = product.price.regularPrice.amount;
value = product.price_range?.maximum_price?.final_price;
} else {
const item = findMatchingVariant({
optionCodes,
Expand All @@ -164,8 +164,8 @@ const getConfigPrice = (product, optionCodes, optionSelections) => {
});

value = item
? item.product.price.regularPrice.amount
: product.price.regularPrice.amount;
? item.product.price_range?.maximum_price?.final_price
: product.price_range?.maximum_price?.final_price;
}

return value;
Expand Down
2 changes: 1 addition & 1 deletion packages/peregrine/lib/talons/RootComponents/Category/categoryFragments.gql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const ProductsFragment = gql`
name
price_range {
maximum_price {
regular_price {
final_price {
currency
value
}
Expand Down
16 changes: 16 additions & 0 deletions packages/peregrine/lib/talons/RootComponents/Product/productDetailFragment.gql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ export const ProductDetailsFragment = gql`
}
}
}
price_range {
maximum_price {
final_price {
currency
value
}
}
}
sku
small_image {
url
Expand Down Expand Up @@ -119,6 +127,14 @@ export const ProductDetailsFragment = gql`
}
}
}
price_range {
maximum_price {
final_price {
currency
value
}
}
}
custom_attributes {
selected_attribute_options {
attribute_option {
Expand Down
2 changes: 1 addition & 1 deletion packages/peregrine/lib/talons/SearchPage/searchPage.gql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const PRODUCT_SEARCH = gql`
name
price_range {
maximum_price {
regular_price {
final_price {
currency
value
}
Expand Down
4 changes: 2 additions & 2 deletions packages/venia-ui/lib/components/Gallery/__tests__/__snapshots__/gallery.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ exports[`renders if \`items\` is an array of objects 1`] = `
"name": "Test Product 1",
"price_range": Object {
"maximum_price": Object {
"regular_price": Object {
"final_price": Object {
"currency": "USD",
"value": 100,
},
Expand Down Expand Up @@ -183,7 +183,7 @@ exports[`renders if \`items\` is an array of objects 1`] = `
"name": "Test Product 2",
"price_range": Object {
"maximum_price": Object {
"regular_price": Object {
"final_price": Object {
"currency": "USD",
"value": 100,
},
Expand Down
2 changes: 1 addition & 1 deletion packages/venia-ui/lib/components/Gallery/__tests__/__snapshots__/item.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ exports[`renders correctly with valid item data 1`] = `
"name": "Test Product",
"price_range": Object {
"maximum_price": Object {
"regular_price": Object {
"final_price": Object {
"currency": "USD",
"value": 21,
},
Expand Down
4 changes: 2 additions & 2 deletions packages/venia-ui/lib/components/Gallery/__tests__/gallery.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const items = [
__typename: 'SimpleProduct',
price_range: {
maximum_price: {
regular_price: {
final_price: {
value: 100,
currency: 'USD'
}
Expand All @@ -59,7 +59,7 @@ const items = [
__typename: 'SimpleProduct',
price_range: {
maximum_price: {
regular_price: {
final_price: {
value: 100,
currency: 'USD'
}
Expand Down
2 changes: 1 addition & 1 deletion packages/venia-ui/lib/components/Gallery/__tests__/item.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const validItem = {
sku: 'sku-123',
price_range: {
maximum_price: {
regular_price: {
final_price: {
value: 21,
currency: 'USD'
}
Expand Down
6 changes: 3 additions & 3 deletions packages/venia-ui/lib/components/Gallery/item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ const GalleryItem = props => {
</Link>
<div data-cy="GalleryItem-price" className={classes.price}>
<Price
value={price_range.maximum_price.regular_price.value}
value={price_range.maximum_price.final_price.value}
currencyCode={
price_range.maximum_price.regular_price.currency
price_range.maximum_price.final_price.currency
}
/>
</div>
Expand Down Expand Up @@ -152,7 +152,7 @@ GalleryItem.propTypes = {
sku: string.isRequired,
price_range: shape({
maximum_price: shape({
regular_price: shape({
final_price: shape({
value: number.isRequired,
currency: string.isRequired
}).isRequired
Expand Down
8 changes: 8 additions & 0 deletions packages/venia-ui/lib/components/SearchBar/__tests__/suggestedProduct.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ const defaultProps = {
value: 3.5
}
}
},
price_range: {
maximum_price: {
final_price: {
currency: 'USD',
value: 3.5
}
}
}
};

Expand Down
8 changes: 8 additions & 0 deletions packages/venia-ui/lib/components/SearchBar/autocomplete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ const GET_AUTOCOMPLETE_RESULTS = gql`
}
}
}
price_range {
maximum_price {
final_price {
currency
value
}
}
}
}
page_info {
total_pages
Expand Down
19 changes: 14 additions & 5 deletions packages/venia-ui/lib/components/SearchBar/suggestedProduct.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ const IMAGE_WIDTH = 60;

const SuggestedProduct = props => {
const classes = useStyle(defaultClasses, props.classes);
const { url_key, small_image, name, onNavigate, price, url_suffix } = props;
const {
url_key,
small_image,
name,
onNavigate,
price_range,
url_suffix
} = props;

const handleClick = useCallback(() => {
if (typeof onNavigate === 'function') {
Expand All @@ -25,6 +32,11 @@ const SuggestedProduct = props => {
url_suffix
]);

const priceProps = {
currencyCode: price_range?.maximum_price?.final_price?.currency,
value: price_range?.maximum_price?.final_price?.value
};

return (
<Link
className={classes.root}
Expand All @@ -41,10 +53,7 @@ const SuggestedProduct = props => {
/>
<span className={classes.name}>{name}</span>
<span data-cy="SuggestedProduct-price" className={classes.price}>
<Price
currencyCode={price.regularPrice.amount.currency}
value={price.regularPrice.amount.value}
/>
<Price {...priceProps} />
</span>
</Link>
);
Expand Down
24 changes: 12 additions & 12 deletions venia-integration-tests/src/fixtures/categoryPage/productMockCall/productMockResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"name": "Carina Cardigan",
"price_range": {
"maximum_price": {
"regular_price": {
"final_price": {
"currency": "USD",
"value": 78,
"__typename": "Money"
Expand All @@ -45,7 +45,7 @@
"name": "Juno Sweater",
"price_range": {
"maximum_price": {
"regular_price": {
"final_price": {
"currency": "USD",
"value": 68,
"__typename": "Money"
Expand All @@ -70,7 +70,7 @@
"name": "Phoebe Cardigan",
"price_range": {
"maximum_price": {
"regular_price": {
"final_price": {
"currency": "USD",
"value": 88,
"__typename": "Money"
Expand All @@ -95,7 +95,7 @@
"name": "Rosalina Cardigan",
"price_range": {
"maximum_price": {
"regular_price": {
"final_price": {
"currency": "USD",
"value": 98,
"__typename": "Money"
Expand All @@ -120,7 +120,7 @@
"name": "Hanna Sweater",
"price_range": {
"maximum_price": {
"regular_price": {
"final_price": {
"currency": "USD",
"value": 98,
"__typename": "Money"
Expand All @@ -145,7 +145,7 @@
"name": "Sabina Hooded Cardigan",
"price_range": {
"maximum_price": {
"regular_price": {
"final_price": {
"currency": "USD",
"value": 108,
"__typename": "Money"
Expand All @@ -170,7 +170,7 @@
"name": "Brigid Boucle Cardigan",
"price_range": {
"maximum_price": {
"regular_price": {
"final_price": {
"currency": "USD",
"value": 118,
"__typename": "Money"
Expand All @@ -195,7 +195,7 @@
"name": "Roxana Cropped Sweater",
"price_range": {
"maximum_price": {
"regular_price": {
"final_price": {
"currency": "USD",
"value": 78,
"__typename": "Money"
Expand All @@ -220,7 +220,7 @@
"name": "Helena Cardigan",
"price_range": {
"maximum_price": {
"regular_price": {
"final_price": {
"currency": "USD",
"value": 98,
"__typename": "Money"
Expand All @@ -245,7 +245,7 @@
"name": "Corina Lace-Back Sweater",
"price_range": {
"maximum_price": {
"regular_price": {
"final_price": {
"currency": "USD",
"value": 108,
"__typename": "Money"
Expand All @@ -270,7 +270,7 @@
"name": "Echo Sweater",
"price_range": {
"maximum_price": {
"regular_price": {
"final_price": {
"currency": "USD",
"value": 78,
"__typename": "Money"
Expand All @@ -295,7 +295,7 @@
"name": "Lorena Cardigan",
"price_range": {
"maximum_price": {
"regular_price": {
"final_price": {
"currency": "USD",
"value": 98,
"__typename": "Money"
Expand Down
Loading