@riosst100/pwa-marketplace 3.1.3 → 3.1.4

package/src/overwrites/venia-ui/lib/components/OrderHistoryPage/orderRow.js

@@ -1,13 +1,9 @@
-import React, { useCallback, useMemo, useState } from 'react';
-import { useMutation } from '@apollo/client';
+import React, { useCallback, useState } from 'react';
 import { arrayOf, number, shape, string } from 'prop-types';
 import { ChevronDown, ChevronUp } from 'react-feather';
 import { FormattedMessage, useIntl } from 'react-intl';
 import Price from '@magento/venia-ui/lib/components/Price';
 import { useOrderRow } from '@magento/peregrine/lib/talons/OrderHistoryPage/useOrderRow';
-import { COMPLETE_PREORDER } from '@riosst100/pwa-marketplace/src/overwrites/peregrine/lib/talons/OrderHistoryPage/orderRow.gql';
-import { useCartContext } from '@magento/peregrine/lib/context/cart';
-import { useToasts } from '@magento/peregrine/lib/Toasts';
 
 import { useStyle } from '@magento/venia-ui/lib/classify';
 import Icon from '@magento/venia-ui/lib/components/Icon';
@@ -23,8 +19,6 @@ import { Link, useHistory } from 'react-router-dom';
 const OrderRow = props => {
     const { order, setReviewOrder } = props;
     const { formatMessage } = useIntl();
-    const [{ cartId }] = useCartContext();
-    const [, { addToast }] = useToasts();
     const history = useHistory();
     const {
         invoices,
@@ -35,7 +29,7 @@ const OrderRow = props => {
         status,
         total
     } = order;
-   
+
     const { grand_total: grandTotal } = total;
     const { currency, value: orderTotal } = grandTotal;
 
@@ -53,12 +47,7 @@ const OrderRow = props => {
     const hasInvoice = !!invoices.length;
     const hasShipment = !!shipments.length;
     let derivedStatus;
-    if (status === 'Canceled') {
-        derivedStatus = formatMessage({
-            id: 'orderRow.canceledText',
-            defaultMessage: 'Canceled'
-        });
-    } else if (status === 'Complete') {
+    if (status === 'Complete') {
         derivedStatus = formatMessage({
             id: 'orderRow.deliveredText',
             defaultMessage: 'Delivered'
@@ -112,9 +101,6 @@ const OrderRow = props => {
         );
 
     const badgeStatusStyle = () => {
-        if (status === 'Canceled') {
-            return 'text-red-600 text-[14px] font-medium py-[5px] border-none';
-        }
         return 'text-blue-700 text-[14px] font-medium py-[5px] border-none';
     }
 
@@ -152,58 +138,6 @@ const OrderRow = props => {
 
     const showNewReturnButton = status === 'Complete' || derivedStatus === formatMessage({ id: 'orderRow.deliveredText', defaultMessage: 'Delivered' });
 
-    // Find a preorder item eligible for completion (deposit type)
-    const preorderItem = useMemo(() => {
-        if (!Array.isArray(items)) return null;
-        return items.find(it => it && it.is_preorder && String(it.pre_order_payment_type).toLowerCase() === 'deposit');
-    }, [items]);
-
-    const [completePreorder, { loading: completingPreorder }] = useMutation(COMPLETE_PREORDER);
-
-    const handleCompletePreorder = async () => {
-        try {
-            const targetItem = preorderItem || (Array.isArray(items) && items.length ? items[0] : null);
-            if (!targetItem) {
-                console.warn('No eligible preorder item found to complete preorder');
-                return;
-            }
-
-            const input = {
-                cartId: cartId || '',
-                item_id: String(targetItem.id || ''),
-                order_reference: String(orderNumber || ''),
-                product_name: String(targetItem.product_name || ''),
-                qty: Number(targetItem.quantity_ordered || 1)
-            };
-
-            const { data: result } = await completePreorder({ variables: { input } });
-            const payload = result?.completePreorder;
-            if (payload?.success) {
-                addToast({
-                    type: 'success',
-                    message: payload.message || formatMessage({ id: 'orderRow.completePreorder.success', defaultMessage: 'Preorder completed successfully.' }),
-                    dismissable: true,
-                    timeout: 5000
-                });
-                history.push('/cart');
-            } else {
-                addToast({
-                    type: 'error',
-                    message: payload?.message || formatMessage({ id: 'orderRow.completePreorder.failed', defaultMessage: 'Failed to complete preorder.' }),
-                    dismissable: true,
-                    timeout: 7000
-                });
-            }
-        } catch (e) {
-            addToast({
-                type: 'error',
-                message: e?.message || formatMessage({ id: 'orderRow.completePreorder.error', defaultMessage: 'Something went wrong completing preorder.' }),
-                dismissable: true,
-                timeout: 7000
-            });
-        }
-    };
-
     const handleNewReturn = () => {
         // Inject product_image per item with safe fallbacks (prefer product_image_url from query)
         let orderWithImages = { ...order };
@@ -246,6 +180,7 @@ const OrderRow = props => {
     };
 
     const handleWriteReview = useCallback(( order ) => {
+        console.log('order',order)
         if (order) {
             setReviewOrder(order);
         }
@@ -342,22 +277,6 @@ const OrderRow = props => {
                                 </span>
                             </>
                         )}
-                        {preorderItem && (
-                        <button
-                            type="button"
-                            onClick={handleCompletePreorder}
-                            disabled={completingPreorder}
-                            aria-busy={completingPreorder}
-                            aria-disabled={completingPreorder}
-                            className={`bg-blue-700 rounded-full px-[30px] py-[8px] text-[13px] font-medium text-white transition-all duration-300 ease-in-out ${completingPreorder ? 'opacity-60 cursor-not-allowed pointer-events-none bg-gray-200 text-white' : ''}`}
-                        >
-                            {completingPreorder ? (
-                                <FormattedMessage id={'orderRow.completingPreorder'} defaultMessage={'Complete Loading...'} />
-                            ) : (
-                                <FormattedMessage id={'orderRow.completePreorder'} defaultMessage={'Complete Preorder'} />
-                            )}
-                        </button>
-                        )}
                         <Link 
                             to={{
                                 pathname: `/order-history/view/${orderNumber}`,

package/src/talons/ProductContent/productContent.gql.js

@@ -33,23 +33,7 @@ export const GET_CATEGORY_CONTENT = gql`
                 description
                 url_key
                 url_path
-                hide_filters
-                allowed_filters {
-                    code
-                }
                 prefixes
-                custom_subcategory {
-                    name
-                    path
-                }
-                attributes_block {
-                    label
-                    code
-                    items {
-                      label
-                      value
-                    }
-                }
                 parent {
                     uid
                     name

package/src/talons/ProductContent/useProductContent.js

@@ -146,9 +146,6 @@ export const useProductContent = props => {
         filters.push(newFilter);
     });
 
-    const attributesBlock = categoryData && categoryData.categories.items.length
-    ? categoryData.categories.items[0].attributes_block
-    : null;
     const parent =
     categoryData && categoryData.categories.items.length
         ? categoryData.categories.items[0].parent
@@ -196,7 +193,6 @@ export const useProductContent = props => {
         totalPagesFromData,
         children,
         parent,
-        attributesBlock,
         category,
         virtualCategoryFilters,
         paymentTypeOptions,

package/src/talons/RelatedProducts/relatedProducts.gql.js

@@ -0,0 +1,209 @@
+import { gql } from '@apollo/client';
+
+export const GET_STORE_CONFIG_DATA = gql`
+    query getStoreConfigData {
+        # eslint-disable-next-line @graphql-eslint/require-id-when-available
+        storeConfig {
+            store_code
+            product_url_suffix
+        }
+    }
+`;
+
+export const GET_SELLER_DETAIL_QUERY = gql`
+    query getSellerDetailForSellerPage($urlKey: String!, $getOtherInfo: Boolean, $getProducts: Boolean) {
+        sellerByUrl(seller_url: $urlKey, get_other_info: $getOtherInfo, get_products: $getProducts) {
+            seller_id
+            contact_number
+            shop_title
+            company
+            term_and_conditions
+            website_url
+            ship_to
+            ship_to_country
+            seller_rates {
+                total_count
+                page_info {
+                    current_page
+                    page_size
+                    total_pages
+                }
+                items {
+                    rating_id
+                    seller_id
+                    customer_id
+                    rate1
+                    rate2
+                    rate3
+                    rate4
+                    rate5
+                    rating
+                    email
+                    title
+                    status
+                    detail
+                    nickname
+                    created_at
+                    verified_buyer
+                    is_recommended
+                    is_hidden
+                    answer
+                    admin_note
+                    like_about
+                    not_like_about
+                    guest_email
+                    plus_review
+                    minus_review
+                    report_abuse
+                    country
+                }
+            }
+            products {
+                total_count
+                page_info {
+                    current_page
+                    page_size
+                    total_pages
+                }
+                items {
+                    name
+                    sku
+                }
+            }
+            operating_hours {
+                day
+                status
+                time {
+                    opening_time
+                    closing_time
+                }
+            }
+            store_locators {
+                name
+                country
+                region
+                address_line_1
+                address_line_2
+                city
+                postcode
+                operating_hours {
+                    day
+                    status
+                    time {
+                        opening_time
+                        closing_time
+                    }
+                }
+            }
+            description
+            country
+            image
+            thumbnail
+            city
+            region
+            group
+            group_id
+            url
+            email
+            name
+            sale
+            creation_time
+            page_layout
+            status
+            position
+            twitter_id
+            facebook_id
+            gplus_id
+            youtube_id
+            vimeo_id
+            instagram_id
+            pinterest_id
+            linkedin_id
+            tw_active
+            fb_active
+            gplus_active
+            vimeo_active
+            instagram_active
+            pinterest_active
+            linkedin_active
+            banner_pic
+            shop_url
+            url_key
+            logo_pic
+            verify_status
+            product_count
+            telephone
+            creation_time
+            update_time
+            country_id
+            total_sold
+            operating_time
+            order_processing_time
+            shipping_partners
+            offers
+            benefits
+            product_shipping_info
+            prepare_time
+            response_ratio
+            response_time
+            store_id
+            products {
+                total_count
+                page_info {
+                    page_size
+                    current_page
+                }
+                items {
+                    id
+                    name
+                }
+            }
+        }
+    }
+`;
+
+export const GET_COUPON_CODE_QUERY = gql`
+    query getSellerCoupons(
+        $sellerUrl: String!
+        $pageSize: Int
+        $currentPage: Int
+        $filters: CouponCodeFilterInput
+        ) {
+        sellerCoupons(
+            sellerUrl: $sellerUrl
+            pageSize: $pageSize
+            currentPage: $currentPage
+            filters: $filters
+        ) {
+            items {
+            code
+            coupon_id
+            couponcode_id
+            created_at
+            description
+            discount_amount
+            expiration_date
+            from_date
+            is_active
+            name
+            seller_id
+            times_used
+            to_date
+            type
+            uses_per_customer
+            }
+            page_info {
+            current_page
+            page_size
+            total_pages
+            }
+            total_count
+        }
+    }
+`;
+
+export default {
+    getStoreConfigData: GET_STORE_CONFIG_DATA,
+    getSellerDetailQuery: GET_SELLER_DETAIL_QUERY,
+    getCouponCodeQuery: GET_COUPON_CODE_QUERY,
+};

package/src/talons/RelatedProducts/useRelatedProducts.js

@@ -0,0 +1,112 @@
+import { useQuery } from '@apollo/client';
+import { useEffect, useMemo } from 'react';
+import { useLocation } from 'react-router-dom';
+import { useAppContext } from '@magento/peregrine/lib/context/app';
+import { useIntl } from 'react-intl';
+
+import mergeOperations from '@magento/peregrine/lib/util/shallowMerge';
+import DEFAULT_OPERATIONS from './relatedProducts.gql';
+
+export const useRelatedProducts = props => {
+    const { mapSeller } = props;
+
+    const { formatMessage } = useIntl();
+
+    const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations);
+    const { getStoreConfigData, getSellerDetailQuery, getCouponCodeQuery } = operations;
+    const { pathname } = useLocation();
+    const [
+        ,
+        {
+            actions: { setPageLoading }
+        }
+    ] = useAppContext();
+
+    const { data: storeConfigData } = useQuery(getStoreConfigData, {
+        fetchPolicy: 'cache-and-network',
+        nextFetchPolicy: 'cache-first'
+    });
+
+    const slug = pathname.split('/')[2];
+    const productUrlSuffix = storeConfigData?.storeConfig?.product_url_suffix;
+    const urlKey = productUrlSuffix ? slug.replace(productUrlSuffix, '') : slug;
+
+    const getOtherInfo = true;
+    const getProducts = true;
+
+    const { error, loading, data } = useQuery(getSellerDetailQuery, {
+        fetchPolicy: 'cache-and-network',
+        nextFetchPolicy: 'cache-first',
+        skip: !storeConfigData,
+        variables: {
+            urlKey,
+            getOtherInfo,
+            getProducts
+        }
+    });
+
+    const {
+        data: couponData,
+        error: couponError,
+        loading: couponLoading
+    } = useQuery(getCouponCodeQuery, {
+        fetchPolicy: 'cache-and-network',
+        nextFetchPolicy: 'cache-first',
+        variables: {
+            sellerUrl: urlKey,
+            pageSize: 20,
+            currentPage: 1,
+            filters: {
+                is_public: {
+                    eq: '1'
+                }
+            }
+        },
+        skip: !urlKey
+    });
+
+    const isBackgroundLoading = !!data && loading;
+
+    const seller = useMemo(() => {
+        if (!data) {
+            return null;
+        }
+        
+        const seller = data.sellerByUrl;
+
+        if (!seller) {
+            return null;
+        }
+
+        return mapSeller(seller);
+    }, [data, mapSeller, urlKey]);
+
+    // Update the page indicator if the GraphQL query is in flight.
+    useEffect(() => {
+        setPageLoading(isBackgroundLoading);
+    }, [isBackgroundLoading, setPageLoading]);
+
+    const favoriteSellerOptions = useMemo(() => {
+        const options = {
+            seller_id: seller?.seller_id
+        };
+
+        return options;
+    }, [seller]);
+
+    const favoriteSellerButtonProps = {
+        buttonText: '',
+        item: favoriteSellerOptions,
+        storeConfig: storeConfigData ? storeConfigData.storeConfig : {}
+    };
+
+    return {
+        error,
+        loading,
+        seller,
+        favoriteSellerButtonProps,
+        couponData,
+        couponError,
+        couponLoading
+    };
+};

package/src/talons/SellerProducts/productContent.gql.js

@@ -34,23 +34,7 @@ export const GET_CATEGORY_CONTENT = gql`
                 description
                 url_key
                 url_path
-                hide_filters
-                allowed_filters {
-                    code
-                }
-                    prefixes
-                custom_subcategory {
-                    name
-                    path
-                }
-                attributes_block {
-                    label
-                    code
-                    items {
-                      label
-                      value
-                    }
-                }
+                prefixes
                 parent {
                     uid
                     name

package/src/talons/SellerProducts/useProductContent.js

@@ -9,9 +9,6 @@ import DEFAULT_OPERATIONS from './productContent.gql';
 export const useProductContent = props => {
     const { sellerId, categoryId, data, pageSize = 6 } = props;
 
-    // const categoryId = 'MTI=';
-    // alert(categoryId)
-
     const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations);
 
     const {
@@ -22,16 +19,12 @@ export const useProductContent = props => {
     } = operations;
 
     const placeholderItems = Array.from({ length: pageSize }).fill(null);
-
-    // console.log(getStoreConfigQuery)
     
     const { data: storeConfigData } = useQuery(getStoreConfigQuery, {
         fetchPolicy: 'cache-and-network',
         nextFetchPolicy: 'cache-first'
     });
 
-    // return '';
-
     const virtualCategoryFilters = useMemo(() => {
         if (storeConfigData) {
             const data = storeConfigData.storeConfig.custommarketplace_plp_filters_virtualcategory;
@@ -135,18 +128,9 @@ export const useProductContent = props => {
         filters.push(newFilter);
     });
 
-    const attributesBlock = null;
     const parent = null;
-    // const categoryName = null;
     const categoryDescription = null;
-    
-    // const attributesBlock = categoryData && categoryData.categories.items.length
-    // ? categoryData.categories.items[0].attributes_block
-    // : null;
-    // const parent =
-    // categoryData && categoryData.categories.items.length
-    //     ? categoryData.categories.items[0].parent
-    //     : null;
+
     const totalPagesFromData = data
         ? data.page_info.total_pages
         : null;
@@ -156,28 +140,10 @@ export const useProductContent = props => {
         categoryData && categoryData.categories.items.length
             ? categoryData.categories.items[0].name
             : null;
-    // const categoryDescription =
-    //     categoryData && categoryData.categories.items.length
-    //         ? categoryData.categories.items[0].description
-    //         : null;
     const availableSortMethods = sortData
         ? sortData.products.sort_fields.options
         : null;
 
-    // useEffect(() => {
-    //     if (!categoryLoading && categoryData.categories.items.length > 0) {
-    //         dispatch({
-    //             type: 'CATEGORY_PAGE_VIEW',
-    //             payload: {
-    //                 id: categoryData.categories.items[0].uid,
-    //                 name: categoryData.categories.items[0].name,
-    //                 url_key: categoryData.categories.items[0].url_key,
-    //                 url_path: categoryData.categories.items[0].url_path
-    //             }
-    //         });
-    //     }
-    // }, [categoryData, dispatch, categoryLoading]);
-
     return {
         availableSortMethods,
         categoryName,
@@ -188,7 +154,6 @@ export const useProductContent = props => {
         totalPagesFromData,
         children,
         parent,
-        attributesBlock,
         category,
         virtualCategoryFilters
     };

package/src/components/AttributesBlock/attributesBlock.js

@@ -1,54 +0,0 @@
-import { useAttributesBlock } from '@riosst100/pwa-marketplace/src/talons/AttributesBlock/useAttributesBlock';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import resourceUrl from '@magento/peregrine/lib/util/makeUrl';
-import defaultClasses from './attributesBlock.module.css';
-import { useStyle } from '@magento/venia-ui/lib/classify';
-
-const AttributesBlock = props => {
-    const { attributesBlock, category } = props;
-
-    const talonProps = useAttributesBlock({ attributesBlock });
-
-    const classes = useStyle(defaultClasses, props.classes);
-
-    const {
-        categoryUrlSuffix,
-        getPath
-    } = talonProps;
-    
-    const result = [];
-    
-    attributesBlock && attributesBlock.map(({ label, code, items }, index) => {
-
-        const itemsResult = [];
-
-        items && items.map(({ label, value }, index) => {
-            const path = resourceUrl(
-                `/${category.url_path}${categoryUrlSuffix || ''}?${code}[filter]=${label},${value}`
-            );
-
-            itemsResult.push(
-                <>
-                    <Link
-                            key={index}
-                            to={path}
-                        >
-                        <li className={classes.item}>{label}</li>
-                    </Link>
-                </>
-            )
-        });
-
-        result.push(
-            <span key={index}>
-                <div className={classes.title}>{label}</div>
-                <ul className={classes.root}>{itemsResult}</ul>
-            </span>
-        )
-    });
-
-    return result;
-};
-
-export default AttributesBlock;

package/src/components/AttributesBlock/attributesBlock.module.css

@@ -1,28 +0,0 @@
-.root {
-    composes: flex from global;
-    composes: flex-wrap from global;
-    composes: mt-3 from global;
-    composes: gap-[15px] from global;
-    margin-bottom: 30px;
-}
-
-.item {
-    composes: px-4 from global;
-    composes: py-2 from global;
-    composes: transition-colors from global;
-    composes: duration-150 from global;
-    composes: border from global;
-    composes: border-solid from global;
-    composes: leading-normal from global;
-    composes: text-base from global;
-    composes: text-colorDefault from global;
-    composes: bg-white from global;
-    composes: border-gray-100 from global;
-    border-radius: 5px;
-}
-
-.title {
-    composes: pb-3 from global;
-    composes: font-bold from global;
-    composes: text-[14px] from global;
-}