From 965af0410937ed2ef70d2fce0f416ed5acfb4ab4 Mon Sep 17 00:00:00 2001 From: hamid zarghami Date: Tue, 30 Dec 2025 11:59:04 +0330 Subject: [PATCH] change end point wallet and score --- .../[id]/components/PaymentSection.tsx | 2 +- .../(Main)/transactions/discount/club/page.tsx | 9 +++++---- .../transactions/hooks/useTransactionData.ts | 9 ++++++++- .../transactions/service/TransactionService.ts | 18 +++++++++++++++--- .../[name]/(Main)/transactions/types/Types.ts | 6 ++++++ 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/src/app/[name]/(Dialogs)/order/checkout/[id]/components/PaymentSection.tsx b/src/app/[name]/(Dialogs)/order/checkout/[id]/components/PaymentSection.tsx index 5db769c..f6c0789 100644 --- a/src/app/[name]/(Dialogs)/order/checkout/[id]/components/PaymentSection.tsx +++ b/src/app/[name]/(Dialogs)/order/checkout/[id]/components/PaymentSection.tsx @@ -40,7 +40,7 @@ export const PaymentSection = ({ paymentType, onPaymentTypeChange }: PaymentSect const { isSuccess } = useGetProfile(); const { data: cartData } = useGetCartItems(isSuccess); - const walletAmount = userWallet?.data?.wallet ?? 0; + const walletAmount = userWallet?.data?.balance ?? 0; const totalAmount = cartData?.data?.total ?? 0; const isWalletInsufficient = walletAmount < totalAmount; diff --git a/src/app/[name]/(Main)/transactions/discount/club/page.tsx b/src/app/[name]/(Main)/transactions/discount/club/page.tsx index 7aa9e3b..595bc9a 100644 --- a/src/app/[name]/(Main)/transactions/discount/club/page.tsx +++ b/src/app/[name]/(Main)/transactions/discount/club/page.tsx @@ -2,7 +2,7 @@ import { ef } from '@/lib/helpers/utfNumbers' import { Cup, Star1, MoneyRecive } from 'iconsax-react' import React from 'react' -import { useConvertScoreToWallet, useGetUserWallet } from '../../hooks/useTransactionData'; +import { useConvertScoreToWallet, useGetUserPointsBalance, useGetUserWallet } from '../../hooks/useTransactionData'; import { Button } from '@/components/ui/button'; import { useGetAbout } from '../../../about/hooks/useAboutData'; import { toast } from '@/components/Toast'; @@ -11,10 +11,11 @@ import { extractErrorMessage } from '@/lib/func'; function TransactionsIndex() { const { data: userWallet } = useGetUserWallet(); + const { data: userPointsBalance } = useGetUserPointsBalance(); const { data: aboutData } = useGetAbout(); const { mutate: convertScoreToWallet, isPending: isConverting } = useConvertScoreToWallet(); - const userPoints = userWallet?.data?.points ?? 0; - const userWalletAmount = userWallet?.data?.wallet ?? 0; + const userPoints = userPointsBalance?.data?.balance ?? 0; + const userWalletAmount = userWallet?.data?.balance ?? 0; const conversionRate = Number(aboutData?.data?.score?.purchaseScore ?? 1000); const calculatedAmount = Math.floor(userPoints / conversionRate) * Number(aboutData?.data?.score?.purchaseAmount ?? 1); @@ -55,7 +56,7 @@ function TransactionsIndex() {

با امتیازی که داری سفارش بده!

-

مجموع امتیازات شما: {ef(userWallet?.data?.points?.toString() ?? '0')}

+

مجموع امتیازات شما: {ef(userPointsBalance?.data?.balance?.toString() ?? '0')}

diff --git a/src/app/[name]/(Main)/transactions/hooks/useTransactionData.ts b/src/app/[name]/(Main)/transactions/hooks/useTransactionData.ts index b2bf696..79d4141 100644 --- a/src/app/[name]/(Main)/transactions/hooks/useTransactionData.ts +++ b/src/app/[name]/(Main)/transactions/hooks/useTransactionData.ts @@ -11,7 +11,14 @@ export const useGetMyCoupons = () => { export const useGetUserWallet = () => { return useQuery({ queryKey: ["user-wallet"], - queryFn: api.getUserWallet, + queryFn: api.getUserWalletBalance, + }); +}; + +export const useGetUserPointsBalance = () => { + return useQuery({ + queryKey: ["user-points-balance"], + queryFn: api.getUserPointsBalance, }); }; diff --git a/src/app/[name]/(Main)/transactions/service/TransactionService.ts b/src/app/[name]/(Main)/transactions/service/TransactionService.ts index f9b10de..7e80ee9 100644 --- a/src/app/[name]/(Main)/transactions/service/TransactionService.ts +++ b/src/app/[name]/(Main)/transactions/service/TransactionService.ts @@ -1,7 +1,7 @@ import { api } from "@/config/axios"; import { CouponsResponse, - WalletResponse, + WalletBalanceResponse, TransactionsResponse, } from "../types/Types"; @@ -10,8 +10,20 @@ export const getMyCoupons = async (): Promise => { return data; }; -export const getUserWallet = async (): Promise => { - const { data } = await api.get("/public/user/wallet"); +export const getUserWalletBalance = async (): Promise< + WalletBalanceResponse +> => { + const { data } = await api.get( + "/public/user/wallet/balance" + ); + return data; +}; +export const getUserPointsBalance = async (): Promise< + WalletBalanceResponse +> => { + const { data } = await api.get( + "/public/user/points/balance" + ); return data; }; diff --git a/src/app/[name]/(Main)/transactions/types/Types.ts b/src/app/[name]/(Main)/transactions/types/Types.ts index 6db6a40..6104028 100644 --- a/src/app/[name]/(Main)/transactions/types/Types.ts +++ b/src/app/[name]/(Main)/transactions/types/Types.ts @@ -39,6 +39,12 @@ export interface Wallet { export type WalletResponse = BaseResponse; +export interface WalletBalance { + balance: number; +} + +export type WalletBalanceResponse = BaseResponse; + export interface PaymentMethod { id: string; createdAt: string;