EProcurement/ProcureLinc-Mobile-App
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
Abin Toppo
2026-01-16 16:23:14 +05:30
parent 41a4487a0a
commit 432bd7f06d
10 changed files with 114 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Constant/Dialog/ConfirmDialog.tsx
+3 -2
View File
@@ -7,6 +7,7 @@ import {
StyleSheet,
Pressable,
} from 'react-native';
import colors from '../Color';
type ConfirmDialogProps = {
visible: boolean;
@@ -109,10 +110,10 @@ const styles = StyleSheet.create({
color: '#666',
},
confirmBtn: {
backgroundColor: '#1f4b6dff',
backgroundColor: colors.primary,
paddingVertical: 10,
paddingHorizontal: 18,
borderRadius: 6,
borderRadius: 10,
},
confirmText: {
color: '#fff',
src/Screens/Home/Home.tsx
+42 -3
View File
@@ -1,11 +1,13 @@
import React, { useEffect } from 'react';
import React, { useEffect, useState } from 'react';
import { View, Text, StyleSheet, Dimensions, FlatList, ActivityIndicator } from 'react-native';
import Animated, { useSharedValue, useAnimatedStyle, withDelay, withTiming } from 'react-native-reanimated';
import { Layers, Clock, ShoppingCart, X, FileText } from 'lucide-react-native';
import { Header } from '../../Component/Index';
import colors from '../../Constant/Color';
import { useDashboard } from '../../Services/BBPS/Hooks';
import { useDashboard, useESetuAdharVarification } from '../../Services/BBPS/Hooks';
import { log } from 'console';
import { useSelector } from 'react-redux';
import ConfirmDialog from '../../Constant/Dialog/ConfirmDialog';
const { width } = Dimensions.get('window');
const CARD_WIDTH = (width - 48) / 2;
@@ -59,8 +61,34 @@ const StatCard = ({ item, index, isLoading }: any) => {
const Home = () => {
const { data, isLoading } = useDashboard();
const user = useSelector((state: any) => state.token?.token);
console.log("-=--",user)
const { mutateAsync:eSetuAdharVarification } = useESetuAdharVarification();
const dashboard = data?.data || {};
const [esetu,setEsetu] = useState<boolean>();
useEffect(()=>{
if(user?.esetuVerified === 'Not Verified'){
const payLoad= {
contId: user,
transactionId: "string",
udf1: "string",
udf2: "string",
udf3: "string",
udf4: "string",
responseUrl: "string"
}
setEsetu(true)
eSetuAdharVarification(payLoad, {
onSuccess: (res) => {
console.log(res)
}, onError: (err) => {
console.log(err, '-----auction item error');
}
});
}else{
setEsetu(false)
}
},[user])
const DASHBOARD_CARDS = [
{
@@ -125,7 +153,18 @@ const Home = () => {
return (
<View style={styles.screen}>
<Header title="Dashboard" />
<ConfirmDialog
visible={esetu as boolean}
title="Aadhaar Verification Required"
message="To access features, please complete your Aadhaar verification."
confirmText="Proceed"
cancelText="Cancel"
onConfirm={() => {
setEsetu(false);
}}
onClose={() => setEsetu(false)}
/>
<FlatList
data={DASHBOARD_CARDS}
keyExtractor={(_, index) => index.toString()}
src/Screens/Login/Login.tsx
+1
View File
@@ -116,6 +116,7 @@ const Login = () => {
{ password: values.password, emailAdd: values.email },
{
onSuccess: res => {
console.log("res",res )
if (res.statusCode == 200) {
Dispatch(setToken({ ...res.data, token: res.token, userType: activeType }));
handleGetData();
src/Screens/Tender/LiveTenderTile.tsx
+1 -1
View File
@@ -29,7 +29,7 @@ const LiveTenderTile: React.FC<LiveTenderTileProps> = ({
? data.contractorId
: [];
const purchased =contractorIds.includes(String(contractorId));
const purchased = contractorIds.includes(String(contractorId));
return (
src/Screens/Tender/ProceedToBidDetail.tsx
+9 -10
View File
@@ -9,7 +9,7 @@ const ProceedToBidDetail = () => {
// Sample data based on your JSON
const route = useRoute<any>();
const tenderDataId = route.params?.tender;
const { data, refetch } = useProceedToBid(tenderDataId?.tenderId);
const { data, refetch,isRefetching } = useProceedToBid(tenderDataId?.tenderId);
const { data: tenderResponse, refetch: tenderRefetch }: any = useFetchTenderById(tenderDataId?.tenderId);
const tenderData = tenderResponse?.data;
const [refreshing, setRefreshing] = React.useState(false);
@@ -22,13 +22,12 @@ const ProceedToBidDetail = () => {
// Format date from array
const handleStartBidding = () => {
setLoading(true);
try {
setLoading(true);
refetch();
if (data) {
console.log(" ppp", tenderData, "ll", data)
navigation.navigate('TenderBidding', { tenderData: tenderData, bidData: data.data });
}
navigation.navigate('TenderBidding', { tenderId:tenderDataId.tenderId});
} catch (error) {
console.log("Error in starting bidding: ", error);
} finally {
@@ -184,9 +183,9 @@ const ProceedToBidDetail = () => {
{tenderData?.envelopeA_Logs && (
<View style={styles.section}>
<Text style={styles.sectionTitle}>Submission Logs</Text>
<EnvelopeLogCard log={tenderData?.envelopeA_Logs} title="Envelope A Submission" />
<EnvelopeLogCard log={tenderData?.envelopeB_Logs} title="Envelope B Submission" />
<EnvelopeLogCard log={tenderData?.envelopeC_Logs} title="Envelope C Submission" />
{tenderData?.envelopeA_Logs&& <EnvelopeLogCard log={tenderData?.envelopeA_Logs} title="Envelope A Submission" />}
{ tenderData?.envelopeB_Logs&&<EnvelopeLogCard log={tenderData?.envelopeB_Logs} title="Envelope B Submission" />}
{tenderData?.envelopeC_Logs && <EnvelopeLogCard log={tenderData?.envelopeC_Logs} title="Envelope C Submission" />}
</View>
)}
@@ -260,7 +259,7 @@ const ProceedToBidDetail = () => {
{
tenderData?.proceedtoBid && !tenderData?.viewBid && tenderData?.biddingStatus && tenderData?.bidWithdrawStatus === false ? (
<TouchableOpacity style={styles.proceedButton} onPress={handleStartBidding}>
<TouchableOpacity style={styles.proceedButton} onPress={handleStartBidding} disabled={isRefetching}>
<Text style={styles.proceedButtonText}>{loading ? <ActivityIndicator size={'small'} color={'#ffff'} /> : 'Start Bidding'}</Text>
</TouchableOpacity>
src/Screens/Tender/PurchaseTenderList.tsx
+10 -6
View File
@@ -1,4 +1,4 @@
import React, { useState } from 'react';
import React, { useEffect, useState } from 'react';
import { View, Text, StyleSheet, ScrollView, TouchableOpacity } from 'react-native';
import Animated, { FadeIn, FadeOut, Layout, useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated';
import { ChevronDown, Trash2, Info } from 'lucide-react-native';
@@ -18,16 +18,20 @@ const PurchaseTenderList = () => {
setExpandedIndex(prev => (prev === index ? null : index));
};
useEffect(()=>{
console.log("dcj",SelectedPurchaseList)
if(SelectedPurchaseList.length === 0){
Navigation.goBack()
}
},[SelectedPurchaseList]
)
return (
<View style={styles.screen}>
<InsideHeader title="Purchase" showArrow />
<ScrollView contentContainerStyle={styles.container}>
{/* Header */}
<View style={styles.header}>
<Text style={styles.heading}>Tender Purchase List</Text>
{/* <Info size={20} color="#0F172A" /> */}
</View>
{/* Cards */}
{SelectedPurchaseList.map((item: any, index: any) => {
src/Screens/Tender/tenderBidding/TenderBidding.tsx
+20 -3
View File
@@ -19,6 +19,7 @@ import { SUBMIT_ENVELOPE_A, SUBMIT_ENVELOPE_B, SUBMIT_ENVELOPE_FILE_A, SUBMIT_EN
import { CheckSquare, Square } from 'lucide-react-native';
import { apiCall } from '../../../Axios/Axios';
import EnvelopeCExcelPreview from '../Component/EnvelopeCExcelPreview';
import { useFetchTenderById, useProceedToBid } from '../../../Services/BBPS/Hooks';
type EnvelopeType = 'A' | 'B' | 'C';
type EnvelopeFormState = {
@@ -41,8 +42,20 @@ const TenderBidding = () => {
const route = useRoute<any>();
const navigation = useNavigation();
console.log("-=-=-=-=-=",route)
const [bidData] = useState<any>(route.params?.tenderData || null);
const tenderData: any = route.params?.bidData || null;
console.log("ROUTE DATA",route)
const tenderId = useState<any>(route.params?.tenderId || null);
const { data: tenderResponse, refetch: tenderRefetch }: any = useFetchTenderById(route.params?.tenderId);
const bidData= tenderResponse?.data;
console.log(" --------------1",bidData)
const { data:tender, refetch } = useProceedToBid(route.params?.tenderId);
const tenderData= tender?.data
console.log(" --------------2",tenderData)
const [activeEnvelope, setActiveEnvelope] = useState<EnvelopeType>('A');
const [envelopForm, setEnvelopForm] = useState<EnvelopeFormState>({
A: {},
@@ -425,6 +438,7 @@ const TenderBidding = () => {
}
console.log("bidData : ", bidData)
console.log("tender data : ", tenderData)
// console.log( `bold ${tenderData?.[`tenderEnvelope${activeEnvelope}List`]}`,tenderData?.[`tenderEnvelope${activeEnvelope}List`])
return (
<View style={styles.container}>
<InsideHeader title="Tender Bidding Start" showArrow />
@@ -462,6 +476,7 @@ const TenderBidding = () => {
envelopeType="B"
onPress={() => {
if (tenderData?.envelopeASubmittStatus) {
setActiveEnvelope('B')
} else {
Alert.alert('Info', 'Submit Envelop A First')
@@ -485,7 +500,9 @@ const TenderBidding = () => {
</View>
</View>
{/* Envelope A List */}
{tenderData?.[`tenderEnvelope${activeEnvelope}List`]?.length > 0 && bidData?.envelopeB_Logs !== null && (
{tenderData?.[`tenderEnvelope${activeEnvelope}List`]?.length > 0 && bidData?.envelopeB_Logs === null && (
<View style={styles.card}>
<Text style={styles.sectionTitle}>Envelope {activeEnvelope} Details</Text>
<FlatList
src/Services/BBPS/ApiUrls.tsx
+4 -3
View File
@@ -82,8 +82,8 @@ const SUBMIT_ENVELOPE_FILE_A = `${BASE_URL}tenderBidding/addDocumentsEnvelopeA`
const SUBMIT_ENVELOPE_FILE_B = `https://procurelinc.in/EProcurementSB/tenderBidding/addDocumentsEnvelopeB`
const GET_ENVELOPE_C = `${BASE_URL}eTendering/getEnvelopeCTemplate/tenderId?tenderId=`
const SUBMIT_ENVELOPE_C_UPLOAD = `${BASE_URL}tenderBidding/getSaveEnvelopeCData`
const GET_CONTRACTOR_PROFILE =`${BASE_URL}contractor/getcontractorfulldetails
`
const GET_CONTRACTOR_PROFILE =`${BASE_URL}contractor/getcontractorfulldetails`
const ESETU_VARIFICATION = `${BASE_URL}tenderBidding/eSetuAdharVarification`
@@ -162,6 +162,7 @@ export {
GET_ENVELOPE_C,
SUBMIT_ENVELOPE_C_UPLOAD,
GET_TENDER_BY_ID,
GET_CONTRACTOR_PROFILE
GET_CONTRACTOR_PROFILE,
ESETU_VARIFICATION
};
src/Services/BBPS/Hooks.ts
+8 -2
View File
@@ -1,5 +1,5 @@
import { useInfiniteQuery, useMutation, useQuery } from '@tanstack/react-query';
import { contractorStageThreeSubmit, contractorStageTwoSubmit, fetchAuctionItem, fetchCityDropdown, fetchDashboard, fetchEmdCheck, fetchLiveAuction, fetchLiveTender, fetchMasterData, fetchPurchaseAuction, fetchPurchaseAuctionList, fetchPurchaseTender, fetchTenderById, getAuction, getDesignation, getRagistrationState, offlineAuctionPurchase, offlineTenderPurchase, partnerShipSubmit, proceedToBid, registerContractor, sendAadhaarOtp, submitEnvelopeA, submitEnvelopeB, uploadEnvelopeFile, userAuctionLogin, userLogin, verifyAadhaarOtp, verifyGstNumber, verifyPanHandler, viewAuctionDocumentDownload, viewAuctionDocuments, viewAuctionItemDocuments, fetchPurchaseAuctionPage, tenderDetails, fetchLiveTenderById, fetchContractorProfile, updateUserProfile } from './apis';
import { contractorStageThreeSubmit, contractorStageTwoSubmit, fetchAuctionItem, fetchCityDropdown, fetchDashboard, fetchEmdCheck, fetchLiveAuction, fetchLiveTender, fetchMasterData, fetchPurchaseAuction, fetchPurchaseAuctionList, fetchPurchaseTender, fetchTenderById, getAuction, getDesignation, getRagistrationState, offlineAuctionPurchase, offlineTenderPurchase, partnerShipSubmit, proceedToBid, registerContractor, sendAadhaarOtp, submitEnvelopeA, submitEnvelopeB, uploadEnvelopeFile, userAuctionLogin, userLogin, verifyAadhaarOtp, verifyGstNumber, verifyPanHandler, viewAuctionDocumentDownload, viewAuctionDocuments, viewAuctionItemDocuments, fetchPurchaseAuctionPage, tenderDetails, fetchLiveTenderById, fetchContractorProfile, updateUserProfile, eSetuAdharVarification } from './apis';
// User
@@ -179,7 +179,7 @@ export const useProceedToBid = (tenderId?: string) => {
return useQuery({
queryKey: ['proceedToBid', tenderId],
queryFn: () => proceedToBid(tenderId as string),
enabled: false, // 👈 manual trigger
});
};
@@ -345,3 +345,9 @@ export const useFetchLiveTenderById = (tenderId: number) => {
queryFn: () => fetchLiveTenderById(tenderId)
});
};
export const useESetuAdharVarification = () => {
return useMutation({
mutationFn: (payload: any) => eSetuAdharVarification(payload),
});
};
src/Services/BBPS/apis.ts
+14 -1
View File
@@ -1,5 +1,5 @@
import axios from "axios";
import { AUCTION_DOCUMENT_DOWNLOAD, DASHBOARD_COUNT, EMD_CHECK, FORARD_AUCTION_ITEM, GET_AUCTION_DETAILS, GET_MY_AUCTION, GET_MY_TENDER, GET_TENDER_DETAILS, LIVE_AUCTION, LIVE_TENDER, LOG_IN_URL, PROCEED_PURCHASE_AUCTION, PROCEED_TO_BID, PURCHASE_TENDER_OFFLINE, TENDER_LOGIN, PURCHASE_AUCTION_LIST, PURCHASE_OFFLINE_AUCTION, REVERSE_AUCTION_ITEM, VIEW_AUCTION_DOCUMENTS, VIEW_AUCTION_ITEM_DETAIL, STAGETHREE, REJ_STAGE_TWO, GETCONTRACTORBYSTATE, GET_MASTER_DATA, ALL_DESIGNATION, GET_REGISTRATION_STATE, PARTNER_API_ENDPOINT, SAVE_CONTRACTOR_STAGE1, VERIFY_GST, VERIFY_ADHAR, SEND_ADHAROTP, SUBMIT_ENVELOPE_FILE_B, SUBMIT_ENVELOPE_FILE_A, SUBMIT_ENVELOPE_A, SUBMIT_ENVELOPE_B, VERIFY_ORGPAN, PURCHASE_AUCTION_PAGE, GET_TENDER_BY_ID, GET_CONTRACTOR_PROFILE, CONTRACTOR_PROFILE_UPDATE } from "./ApiUrls";
import { AUCTION_DOCUMENT_DOWNLOAD, DASHBOARD_COUNT, EMD_CHECK, FORARD_AUCTION_ITEM, GET_AUCTION_DETAILS, GET_MY_AUCTION, GET_MY_TENDER, GET_TENDER_DETAILS, LIVE_AUCTION, LIVE_TENDER, LOG_IN_URL, PROCEED_PURCHASE_AUCTION, PROCEED_TO_BID, PURCHASE_TENDER_OFFLINE, TENDER_LOGIN, PURCHASE_AUCTION_LIST, PURCHASE_OFFLINE_AUCTION, REVERSE_AUCTION_ITEM, VIEW_AUCTION_DOCUMENTS, VIEW_AUCTION_ITEM_DETAIL, STAGETHREE, REJ_STAGE_TWO, GETCONTRACTORBYSTATE, GET_MASTER_DATA, ALL_DESIGNATION, GET_REGISTRATION_STATE, PARTNER_API_ENDPOINT, SAVE_CONTRACTOR_STAGE1, VERIFY_GST, VERIFY_ADHAR, SEND_ADHAROTP, SUBMIT_ENVELOPE_FILE_B, SUBMIT_ENVELOPE_FILE_A, SUBMIT_ENVELOPE_A, SUBMIT_ENVELOPE_B, VERIFY_ORGPAN, PURCHASE_AUCTION_PAGE, GET_TENDER_BY_ID, GET_CONTRACTOR_PROFILE, CONTRACTOR_PROFILE_UPDATE, ESETU_VARIFICATION } from "./ApiUrls";
import { apiCall } from "../../Axios/Axios";
// User
@@ -149,6 +149,7 @@ export const proceedToBid = async (tenderId: string): Promise<any> => {
'get',
`${PROCEED_TO_BID}${tenderId}`
);
console.log("-=-=-=-=-89",data)
return data;
}
@@ -262,6 +263,18 @@ export const getRagistrationState = async (): Promise<any> => {
return data;
}
export const eSetuAdharVarification = async (payLoad:any ): Promise<any> => {
const data = await apiCall<any>(
'get',
`${ESETU_VARIFICATION}`,
payLoad,
{},
"application/x-www-form-urlencoded"
);
return data;
}
export const partnerShipSubmit = (
payload: any
): Promise<any> => {