@riosst100/pwa-marketplace 3.2.8 → 3.3.0

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,12 @@ export const GET_QUICK_RFQ_DETAIL_QUERY = gql`
             cart_id
             comment
             contact_name
+            coupon_code
             create_date
+            date_need_quote
             email
+            expiry
+            image_url
             info_buy_request
             messages {
                 created_at
@@ -103,12 +112,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
         }
     }
@@ -153,7 +167,14 @@ export const CONVERT_QUICK_RFQ_TO_CART_MUTATION = gql`
     }
 `;
 
+export const CREATE_CART = gql`
+    mutation createCart {
+        cartId: createEmptyCart
+    }
+`;
+
 export default {
+    createCartMutation: CREATE_CART,
     convertQuickrfqToCartMutation: CONVERT_QUICK_RFQ_TO_CART_MUTATION,
     sendRfqMessageMutation: SEND_RFQ_MESSAGE_MUTATION,
     getQuickRfqDetailQuery: GET_QUICK_RFQ_DETAIL_QUERY,

package/src/talons/RFQ/useRFQ.js

@@ -4,14 +4,23 @@ import { useCallback } from 'react';
 import mergeOperations from '@magento/peregrine/lib/util/shallowMerge';
 import DEFAULT_OPERATIONS from './rfq.gql';
 
+import { useLocation } from 'react-router-dom';
+
 export const useRFQ = props => {
+	const { pathname } = useLocation();
+	const rfqQuoteId = pathname.split('/')[2];
+
+	console.log('rfqQuoteId',rfqQuoteId)
+
 	const operations = mergeOperations(DEFAULT_OPERATIONS, props?.operations);
+
 	const {
 		getQuickRfqListQuery,
 		getQuickRfqDetailQuery,
 		createQuickRfqMutation,
 		sendRfqMessageMutation,
-		convertQuickrfqToCartMutation
+		convertQuickrfqToCartMutation,
+		createCartMutation
 	} = operations;
 
 	const [fetchRfqList, rfqListState] = useLazyQuery(getQuickRfqListQuery, {
@@ -28,7 +37,20 @@ export const useRFQ = props => {
 
 	const [createQuickRfq, createState] = useMutation(createQuickRfqMutation);
 	const [sendRfqMessage, sendMessageState] = useMutation(sendRfqMessageMutation);
-	const [convertQuickrfqToCart, convertState] = useMutation(convertQuickrfqToCartMutation);
+
+	const [fetchCartId] = useMutation(createCartMutation);
+	// const [convertQuickrfqToCart, convertState] = useMutation(convertQuickrfqToCartMutation);
+	
+	const convertState = null;
+
+	const [
+        convertQuickrfqToCart,
+        {
+            data: addToCartResponseData,
+            error: errorAddingProductToCart,
+            loading: isAddProductLoading
+        }
+    ] = useMutation(convertQuickrfqToCartMutation);
 
 	const loadRfqList = useCallback(
 		variables => fetchRfqList({ variables }),
@@ -57,12 +79,15 @@ export const useRFQ = props => {
 		[sendRfqMessage]
 	);
 
-	const handleConvertQuickrfqToCart = useCallback(
-		quickrfqId => convertQuickrfqToCart({ variables: { quickrfqId } }),
-		[convertQuickrfqToCart]
-	);
+	const handleConvertQuickrfqToCart = useCallback(() => {
+		convertQuickrfqToCart({ variables: { quickrfqId: rfqQuoteId } })
+	}, [convertQuickrfqToCart, rfqQuoteId]);
 
 	return {
+		fetchCartId,
+		addToCartResponseData, 
+		isAddProductLoading, 
+		errorAddingProductToCart,
 		loadRfqList,
 		rfqListState,
 		loadRfqDetail,

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,10 @@ export const useSeller = props => {
             }),
             timeout: 3000
         });
-        await refetchMessages({ fetchPolicy: 'network-only' });
+        if (result) {
+            var messageId = result?.data?.customerSendMessage.message_id;
+            history.push('/messages?id=' + messageId);
+        }
         return result?.data?.customerSendMessage;
     }, [sendMessage, refetchMessages, addToast, formatMessage]);