@riosst100/pwa-marketplace 3.2.7 → 3.2.9

package/src/talons/MessagesPage/messagesPage.gql.js

@@ -0,0 +1,299 @@
+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 const GET_CUSTOMER_SELLER_MESSAGES = gql`
+    query GetCustomerSellerMessages(
+        $pageSize: Int!
+        $currentPage: Int!
+        $filter: SellerMessageFilterInput
+        $sort: SellerMessageSortInput
+    ) {
+        customer {
+            sellerMessages(
+                pageSize: $pageSize
+                currentPage: $currentPage
+                filter: $filter
+                sort: $sort
+            ) {
+                total_count
+                page_info {
+                    current_page
+                    page_size
+                    total_pages
+                }
+                items {
+                    message_id
+                    subject
+                    description
+                    sender_email
+                    sender_name
+                    created_at
+                    status
+                    is_read
+                    sender_id
+                    owner_id
+                    receiver_id
+                    seller_send
+                    details(pageSize: 500, currentPage: 1) {
+                        total_count
+                        items {
+                            content
+                            sender_name
+                            sender_email
+                            receiver_name
+                            is_read
+                            created_at
+                        }
+                    }
+                }
+            }
+        }
+    }
+`;
+
+export const CUSTOMER_SEND_MESSAGE_MUTATION = gql`
+    mutation CustomerSendMessage($input: CustomerMessageInput!) {
+        customerSendMessage(input: $input) {
+            message_id
+            subject
+            description
+            sender_name
+            sender_email
+            created_at
+            status
+        }
+    }
+`;
+
+export const CUSTOMER_REPLY_MESSAGE_MUTATION = gql`
+    mutation CUSTOMER_REPLY_MESSAGE_MUTATION($input: ReplyMessageInput!) {
+        customerReplyMessage(input: $input) {
+            content
+            sender_name
+            sender_email
+            receiver_name
+            is_read
+            created_at
+        }
+    }
+`;
+
+export const CUSTOMER_DELETE_MESSAGE_MUTATION = gql`
+    mutation CustomerDeleteMessage($id: Int!) {
+        customerDeleteMessage(message_id: $id) {
+            message
+            code
+        }
+    }
+`;
+
+export default {
+    getStoreConfigData: GET_STORE_CONFIG_DATA,
+    getSellerDetailQuery: GET_SELLER_DETAIL_QUERY,
+    getCouponCodeQuery: GET_COUPON_CODE_QUERY,
+    getCustomerSellerMessages: GET_CUSTOMER_SELLER_MESSAGES,
+    customerSendMessageMutation: CUSTOMER_SEND_MESSAGE_MUTATION,
+    customerReplyMessageMutation: CUSTOMER_REPLY_MESSAGE_MUTATION,
+    customerDeleteMessageMutation: CUSTOMER_DELETE_MESSAGE_MUTATION,
+};

package/src/talons/MessagesPage/useMessagesPage.js

@@ -0,0 +1,87 @@
+import { useCallback, useState, useEffect, useMemo } from 'react';
+import { useHistory, useLocation } from 'react-router-dom';
+import mergeOperations from '@magento/peregrine/lib/util/shallowMerge';
+import DEFAULT_OPERATIONS from './messagesPage.gql';
+import { useQuery, useMutation } from '@apollo/client';
+import { useToasts } from '@magento/peregrine/lib';
+import { FormattedMessage, useIntl } from 'react-intl';
+
+export const useMessagesPage = props => {
+    const operations = mergeOperations(DEFAULT_OPERATIONS, null);
+
+    const [, { addToast }] = useToasts();
+    const { formatMessage } = useIntl();
+
+    const {
+        getCustomerSellerMessages,
+        customerSendMessageMutation,
+        customerReplyMessageMutation,
+        customerDeleteMessageMutation
+    } = operations;
+
+    const [messageListVars] = useState({
+        pageSize: 500,
+        currentPage: 1,
+        filter: undefined,
+        sort: undefined
+    });
+
+    const {
+        data: messagesData,
+        loading: messagesLoading,
+        error: messagesError,
+        refetch: refetchMessages
+    } = useQuery(getCustomerSellerMessages, {
+        fetchPolicy: 'network-only',
+        nextFetchPolicy: 'network-only',
+        variables: messageListVars,
+        pollInterval: 10000,
+        notifyOnNetworkStatusChange: true
+    });
+
+    const [sendMessage] = useMutation(customerSendMessageMutation);
+    const [replyMessage] = useMutation(customerReplyMessageMutation);
+    const [deleteMessage] = useMutation(customerDeleteMessageMutation);
+
+    const handleSendMessage = async ({ subject, content, seller_url }) => {
+        const input = { subject, content, seller_url };
+        const result = await sendMessage({ variables: { input }, refetchQueries: [{ query: getCustomerSellerMessages, variables: messageListVars }] });
+        addToast({
+            type: 'success',
+            message: formatMessage({ id: 'messages.messageSent', defaultMessage: 'Message sent successfully.' }),
+            timeout: 3000
+        });
+        await refetchMessages({ fetchPolicy: 'network-only' });
+        return result?.data?.customerSendMessage;
+    };
+
+    const handleReplyMessage = async ({ message_id, content }) => {
+        const input = { message_id, content };
+        const result = await replyMessage({ variables: { input }, refetchQueries: [{ query: getCustomerSellerMessages, variables: messageListVars }] });
+        addToast({
+            type: 'success',
+            message: formatMessage({ id: 'messages.replySent', defaultMessage: 'Reply sent successfully.' }),
+            timeout: 3000
+        });
+        await refetchMessages({ fetchPolicy: 'network-only' });
+        return result?.data?.customerReplyMessage;
+    };
+
+    const handleDeleteMessage = async ({ id }) => {
+        await deleteMessage({ variables: { id }, refetchQueries: [{ query: getCustomerSellerMessages, variables: messageListVars }] });
+        addToast({
+            type: 'success',
+            message: formatMessage({ id: 'messages.messageDeleted', defaultMessage: 'Message deleted successfully.' }),
+            timeout: 3000
+        });
+        await refetchMessages({ fetchPolicy: 'network-only' });
+    };
+
+    return {
+        messagesData,
+        messagesLoading,
+        handleReplyMessage,
+        handleDeleteMessage,
+        handleSendMessage
+    };
+};

package/src/talons/RFQ/rfq.gql.js

@@ -70,6 +70,11 @@ export const GET_QUICK_RFQ_LIST_QUERY = gql`
 export const GET_QUICK_RFQ_DETAIL_QUERY = gql`
     query getQuickRfqDetail($quickrfqId: Int!) {
         quickrfqDetail(quickrfq_id: $quickrfqId) {
+            admin_price {
+                currency
+                value
+            }
+            admin_quantity
             attachment
             attachments {
                 created_at
@@ -84,8 +89,11 @@ export const GET_QUICK_RFQ_DETAIL_QUERY = gql`
             cart_id
             comment
             contact_name
+            coupon_code
             create_date
+            date_need_quote
             email
+            expiry
             info_buy_request
             messages {
                 created_at
@@ -103,12 +111,17 @@ export const GET_QUICK_RFQ_DETAIL_QUERY = gql`
             }
             product_id
             product_name
+            product_sku
             quantity
             quickrfq_id
+            seller_id
+            seller_name
             status
             store_currency_code
             store_id
             update_date
+            user_id
+            user_name
             website_id
         }
     }

package/src/talons/Seller/useSeller.js

@@ -1,7 +1,7 @@
 import { useQuery, useMutation } from '@apollo/client';
 import { useEffect, useMemo, useCallback, useState } from 'react';
 import { useToasts } from '@magento/peregrine/lib/Toasts/useToasts';
-import { useLocation } from 'react-router-dom';
+import { useLocation, useHistory } from 'react-router-dom';
 import { useAppContext } from '@magento/peregrine/lib/context/app';
 import { useIntl } from 'react-intl';
 
@@ -13,6 +13,8 @@ export const useSeller = props => {
 
     const { formatMessage } = useIntl();
 
+    const history = useHistory();
+
     const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations);
     const {
         getStoreConfigData,
@@ -152,7 +154,7 @@ export const useSeller = props => {
             }),
             timeout: 3000
         });
-        await refetchMessages({ fetchPolicy: 'network-only' });
+        history.push('/messages');
         return result?.data?.customerSendMessage;
     }, [sendMessage, refetchMessages, addToast, formatMessage]);
 

package/src/talons/SellerMegaMenu/useSellerMegaMenu.js

@@ -208,9 +208,6 @@ export const useSellerMegaMenu = (props = {}) => {
             megaMenuData
         );
 
-        console.log('megaMenuData',megaMenuData)
-        console.log('activeCategory',activeCategory)
-
         if (activeCategory) {
             setActiveCategoryId(activeCategory.path[0]);
             setActiveCategory(activeCategory);
@@ -223,8 +220,6 @@ export const useSellerMegaMenu = (props = {}) => {
     useEffect(() => {
         const { search, pathname } = location;
 
-        console.log('category555',category)
-
         if (!hasCategoryPath(pathname) && category && category.url_path) {
             const url_path = category.url_path;
             const categoryUrlPath = `/${url_path}${categoryUrlSuffix || ''}`;
@@ -244,17 +239,11 @@ export const useSellerMegaMenu = (props = {}) => {
         if (activeCategory && activeCategory.default_top_filter) {
             const defaultTopFilter = activeCategory.default_top_filter;
 
-            console.log('activeCategory',activeCategory)
-            console.log('2defaultTopFilte344444',defaultTopFilter)
-            console.log('search',search)
-
             const attrCode = defaultTopFilter.attribute_code;
             const label = defaultTopFilter.label;
             const value = defaultTopFilter.value;
 
             if (!search.includes(attrCode)) {
-                console.log('setDefaultSubcategoryAndTopFilter',attrCode)
-
                 setDefaultSubcategoryAndTopFilter(
                     label + ',' + value, 
                     attrCode + '[filter]',