diff --git a/src/Screens/Tender/LiveTenderTile.tsx b/src/Screens/Tender/LiveTenderTile.tsx index 453096d..b9c73a1 100644 --- a/src/Screens/Tender/LiveTenderTile.tsx +++ b/src/Screens/Tender/LiveTenderTile.tsx @@ -29,7 +29,7 @@ const LiveTenderTile: React.FC = ({ ? data.contractorId : []; - const purchased = contractorIds.includes(String(contractorId)); + const purchased =contractorIds.includes(String(contractorId)); return ( diff --git a/src/Screens/Tender/ProceedToPurTender.tsx b/src/Screens/Tender/ProceedToPurTender.tsx index a422633..73608b8 100644 --- a/src/Screens/Tender/ProceedToPurTender.tsx +++ b/src/Screens/Tender/ProceedToPurTender.tsx @@ -5,8 +5,9 @@ import colors from '../../Constant/Color'; import { CreditCard, Calendar, User, DollarSign, ArrowRight } from 'lucide-react-native'; import { useSelector } from 'react-redux'; import { useOfflineTenderPurchase } from '../../Services/BBPS/Hooks'; -import { useNavigation } from '@react-navigation/native'; +import { StackActions, useNavigation } from '@react-navigation/native'; import NavigationString from '../../Constant/NavigationString'; +import { showErrorAlert, showToast } from '../../Constant/ShowDailog'; const ProceedToPurTender = () => { const navigation: any = useNavigation(); @@ -52,11 +53,13 @@ const ProceedToPurTender = () => { mutate(body, { onSuccess: (res) => { console.log(res, '---------------------purchsase response'); - - Alert.alert('Offline Purchase Successful!', `Order No: ${orderNo}`); - navigation.goBack() + if(res.statusCode === 200 ){ + showToast(res.message); + navigation.dispatch(StackActions.pop(2)); + } }, onError: (error) => { + showErrorAlert('Something went wrong'); console.log(error, "================purchse Error"); } }) @@ -70,7 +73,7 @@ const ProceedToPurTender = () => { setLoading(true); setTimeout(() => { setLoading(false); - type === 'online' ? Alert.alert('Online Purchase Successful!') : handleOfflinePurchase(); + type === 'online' ? showErrorAlert('Online Purchase is disabled') : handleOfflinePurchase(); }, 1200); }; diff --git a/src/Screens/Tender/tenderBidding/TenderBidding.tsx b/src/Screens/Tender/tenderBidding/TenderBidding.tsx index 4778bf9..168efbc 100644 --- a/src/Screens/Tender/tenderBidding/TenderBidding.tsx +++ b/src/Screens/Tender/tenderBidding/TenderBidding.tsx @@ -40,6 +40,7 @@ interface InfoRowProps { const TenderBidding = () => { const route = useRoute(); const navigation = useNavigation(); + console.log("-=-=-=-=-=",route) const [bidData] = useState(route.params?.tenderData || null); const tenderData: any = route.params?.bidData || null; const [activeEnvelope, setActiveEnvelope] = useState('A'); @@ -317,14 +318,17 @@ const TenderBidding = () => { const handleSubmitEnvelopeA = async () => { + console.log("hitting here ",envelopForm?.[activeEnvelope]) if (!validateEnvelope()) { Alert.alert('Validation Error', 'Please fill all mandatory fields'); return; } const payload = buildEnvelopePayload(); + if (envelopForm?.[activeEnvelope]?.[3]) { + console.log("----",) const result = await handleSubmitEnvelopeFile(SUBMIT_ENVELOPE_FILE_A) - + if (result && result?.statusCode === 200) { try { const res = await apiCall('post', SUBMIT_ENVELOPE_A, payload) as any diff --git a/src/Services/BBPS/apis.ts b/src/Services/BBPS/apis.ts index 47c2d29..38bd109 100644 --- a/src/Services/BBPS/apis.ts +++ b/src/Services/BBPS/apis.ts @@ -103,7 +103,7 @@ export const fetchAuctionItem = async (payload: any): Promise => { export const offlineTenderPurchase = async (payload: any): Promise => { try { const response = await apiCall('post', PURCHASE_TENDER_OFFLINE, payload); - return response.data; + return response; } catch (error: any) { throw error.response?.data || error.message; }