Skip to content

Commit

Permalink
Worked on modification
Browse files Browse the repository at this point in the history
  • Loading branch information
glo82145 committed Jun 26, 2024
1 parent 09808cd commit 199b660
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 33 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
const SUPPORTED_PRODUCT_TYPES = ['SimpleProduct', 'ConfigurableProduct', 'configurable', 'simple'];
const SUPPORTED_PRODUCT_TYPES = [
'SimpleProduct',
'ConfigurableProduct',
'configurable',
'simple'
];

export const isSupportedProductType = productType => {
return SUPPORTED_PRODUCT_TYPES.includes(productType);
Expand Down
15 changes: 11 additions & 4 deletions packages/peregrine/lib/talons/Gallery/useAddToCartButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,16 @@ export const useAddToCartButton = props => {

const isInStock = item.stock_status === 'IN_STOCK';

const productType = item ? item.__typename !==undefined?item.__typename:item.type : null;
const productType = item
? item.__typename !== undefined
? item.__typename
: item.type
: null;

const isUnsupportedProductType = UNSUPPORTED_PRODUCT_TYPES.includes(
productType
);

const isDisabled = isLoading || !isInStock || isUnsupportedProductType;

const history = useHistory();
Expand All @@ -51,9 +57,7 @@ export const useAddToCartButton = props => {
const [addToCart] = useMutation(operations.ADD_ITEM);

const handleAddToCart = useCallback(async () => {

try {
console.log(productType); console.log('sdfsd');
if (productType === 'SimpleProduct' || productType === 'simple') {
setIsLoading(true);

Expand Down Expand Up @@ -99,7 +103,10 @@ export const useAddToCartButton = props => {
});

setIsLoading(false);
} else if (productType === 'ConfigurableProduct' || productType === 'configurable') {
} else if (
productType === 'ConfigurableProduct' ||
productType === 'configurable'
) {
const productLink = resourceUrl(
`/${item.url_key}${urlSuffix || ''}`
);
Expand Down
9 changes: 6 additions & 3 deletions packages/peregrine/lib/talons/Gallery/useGalleryItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,12 @@ export const useGalleryItem = (props = {}) => {
intersectionObserver,
item
]);
//
// const productType = item ? item.__typename : null;
const productType = item ? item.__typename !==undefined?item.__typename:item.type : null;

const productType = item
? item.__typename !== undefined
? item.__typename
: item.type
: null;
const isSupportedProductType = isSupported(productType);

const wishlistButtonProps =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import defaultClasses from './category.module.css';
import NoProductsFound from './NoProductsFound';
import {
VeniaProductRecommendations,
PageTypes,
} from "@magento/venia-product-recommendations";
PageTypes
} from '@magento/venia-product-recommendations';

const FilterModal = React.lazy(() => import('../../components/FilterModal'));
const FilterSidebar = React.lazy(() =>
Expand Down
5 changes: 2 additions & 3 deletions packages/venia-ui/lib/components/CartPage/cartPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import ProductListing from './ProductListing';
import defaultClasses from './cartPage.module.css';
import {
VeniaProductRecommendations,
PageTypes,
} from "@magento/venia-product-recommendations";
PageTypes
} from '@magento/venia-product-recommendations';
const CheckIcon = <Icon size={20} src={Check} />;

/**
Expand Down Expand Up @@ -123,7 +123,6 @@ const CartPage = props => {
</div>
<VeniaProductRecommendations pageType={PageTypes.CMS} />;
</div>

);
};

Expand Down
28 changes: 13 additions & 15 deletions packages/venia-ui/lib/components/Gallery/item.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,20 @@ const GalleryItem = props => {
</p>
</div>
);
const currencyCode= price_range?.maximum_price?.final_price?.currency ||
item.price.regularPrice.amount.currency;
const currencyCode =
price_range?.maximum_price?.final_price?.currency ||
item.price.regularPrice.amount.currency;

// fallback to regular price when final price is unavailable
const priceSource =
(price_range?.maximum_price?.final_price !== undefined &&
price_range?.maximum_price?.final_price !== null
? price_range.maximum_price.final_price
: item.prices.maximum.final) ||
(price_range?.maximum_price?.regular_price !== undefined &&
price_range?.maximum_price?.regular_price !== null
? price_range.maximum_price.regular_price
: item.prices.maximum.regular);
(price_range?.maximum_price?.final_price !== undefined &&
price_range?.maximum_price?.final_price !== null
? price_range.maximum_price.final_price
: item.prices.maximum.final) ||
(price_range?.maximum_price?.regular_price !== undefined &&
price_range?.maximum_price?.regular_price !== null
? price_range.maximum_price.regular_price
: item.prices.maximum.regular);
const priceSourceValue = priceSource.value || priceSource;

// Hide the Rating component until it is updated with the new look and feel (PWA-2512).
Expand Down Expand Up @@ -121,12 +122,9 @@ const GalleryItem = props => {
>
<span>{name}</span>
</Link>

<div data-cy="GalleryItem-price" className={classes.price}>
<Price
value={priceSourceValue}
currencyCode={currencyCode}
/>
<Price value={priceSourceValue} currencyCode={currencyCode} />
</div>

<div className={classes.actionsContainer}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ import { Form } from 'informed';
import { Info } from 'react-feather';
import {
VeniaProductRecommendations,
PageTypes,
} from "@magento/venia-product-recommendations";

PageTypes
} from '@magento/venia-product-recommendations';

import Price from '@magento/venia-ui/lib/components/Price';
import { useProductFullDetail } from '@magento/peregrine/lib/talons/ProductFullDetail/useProductFullDetail';
Expand Down Expand Up @@ -246,7 +245,6 @@ const ProductFullDetail = props => {
data-cy="ProductFullDetail-root"
onSubmit={handleAddToCart}
>

<section className={classes.imageCarousel}>
<Carousel images={mediaGalleryEntries} />
</section>
Expand Down Expand Up @@ -325,7 +323,6 @@ const ProductFullDetail = props => {
/>
</section>
{pageBuilderAttributes}

</Form>
<VeniaProductRecommendations pageType={PageTypes.CMS} />;
</Fragment>
Expand Down

0 comments on commit 199b660

Please sign in to comment.