fix bug 2

master
حسین معصومی پور 2024-03-05 10:01:44 +03:30
parent 086b6da97d
commit 97d4113e06
9 changed files with 50 additions and 37 deletions

View File

@ -121,7 +121,7 @@ const CartData = () => {
)?.toLocaleString() )?.toLocaleString()
: 0 : 0
} }
style={"!text-[14px] !font-semibold text-primary-800"} style={"!text-[14px] !font-medium text-primary-800"}
/> />
</p> </p>
<small className="text-gray-500 text-[12px] mt-1 mx-1"> <small className="text-gray-500 text-[12px] mt-1 mx-1">

View File

@ -83,13 +83,14 @@ const CheckoutData = () => {
}; };
const handleGoPayment = async () => { const handleGoPayment = async () => {
const token = localStorage.getItem("token");
try { try {
const data = await Chapar.post( const data = await Chapar.post(
`${process.env.NEXT_PUBLIC_API_URL}/order/bag/payment/${checkOutData?.id}?paymentMethod=1`, `${process.env.NEXT_PUBLIC_API_URL}/order/bag/payment/${checkOutData?.id}?paymentMethod=1`,
{ {
headers: { headers: {
Authorization: localStorage.getItem("token"), Authorization: token,
}, },
} }
); );
@ -132,7 +133,7 @@ const CheckoutData = () => {
<div className="xs:w-full lg:w-4/12 mx-auto"> <div className="xs:w-full lg:w-4/12 mx-auto">
<div className="text-right flex rtl justify-between border-y-[1px] border-gray-100 mt-3 px-4 "> <div className="text-right flex rtl justify-between border-y-[1px] border-gray-100 mt-3 px-4 ">
<p className="mb-0 !text-sm font-semibold py-4">آدس ها</p> <p className="mb-0 !text-sm font-medium py-4">آدس ها</p>
<div <div
className="bg-primary-200 w-fit h-fit relative my-3 p-1 rounded-lg" className="bg-primary-200 w-fit h-fit relative my-3 p-1 rounded-lg"
@ -187,7 +188,7 @@ const CheckoutData = () => {
))} ))}
<div className="text-right flex rtl justify-between border-y-[1px] border-gray-100 mt-3 px-4 "> <div className="text-right flex rtl justify-between border-y-[1px] border-gray-100 mt-3 px-4 ">
<p className="mb-0 text-sm font-semibold py-4">زمان و نحوه ارسال</p> <p className="mb-0 text-sm font-medium py-4">زمان و نحوه ارسال</p>
<div className="border border-gray-300 w-fit h-fit relative my-3 p-1 rounded-lg"> <div className="border border-gray-300 w-fit h-fit relative my-3 p-1 rounded-lg">
<div className="flex"> <div className="flex">
@ -272,7 +273,7 @@ const CheckoutData = () => {
</div> </div>
<div className="text-right flex rtl justify-between border-y-[1px] border-gray-100 mt-3 px-4 "> <div className="text-right flex rtl justify-between border-y-[1px] border-gray-100 mt-3 px-4 ">
<p className="mb-0 text-sm font-semibold py-4">روش پرداخت</p> <p className="mb-0 text-sm font-medium py-4">روش پرداخت</p>
</div> </div>
<div> <div>
@ -360,7 +361,7 @@ const CheckoutData = () => {
<div className=""> <div className="">
<div className="text-right flex rtl justify-between border-y-[1px] border-gray-100 my-3 px-4 "> <div className="text-right flex rtl justify-between border-y-[1px] border-gray-100 my-3 px-4 ">
<p className="mb-0 text-sm font-semibold py-4">حساب نهایی</p> <p className="mb-0 text-sm font-medium py-4">حساب نهایی</p>
{/* <div className="bg-primary-200 w-fit h-fit relative my-3 p-1 rounded-lg"> {/* <div className="bg-primary-200 w-fit h-fit relative my-3 p-1 rounded-lg">
<p className="mb-0 text-[11px] text-white rtl">مشاهده اقلام</p> <p className="mb-0 text-[11px] text-white rtl">مشاهده اقلام</p>
@ -377,7 +378,7 @@ const CheckoutData = () => {
number={( number={(
checkOutData?.totalProductsPrice / 10 checkOutData?.totalProductsPrice / 10
)?.toLocaleString()} )?.toLocaleString()}
style={"!text-[14px] !font-semibold"} style={"!text-[14px] !font-medium"}
/> />
</p> </p>
<small className="text-gray-500 text-[12px] mt-1 mx-1"> <small className="text-gray-500 text-[12px] mt-1 mx-1">
@ -396,7 +397,7 @@ const CheckoutData = () => {
number={( number={(
checkOutData?.discountPrice / 10 checkOutData?.discountPrice / 10
)?.toLocaleString()} )?.toLocaleString()}
style={"!text-[14px] !font-semibold"} style={"!text-[14px] !font-medium"}
/> />
</p> </p>
<small className="text-gray-500 text-[12px] mt-1 mx-1"> <small className="text-gray-500 text-[12px] mt-1 mx-1">
@ -417,7 +418,7 @@ const CheckoutData = () => {
number={( number={(
checkOutData?.packingPrice / 10 checkOutData?.packingPrice / 10
)?.toLocaleString()} )?.toLocaleString()}
style={"!text-[14px] !font-semibold"} style={"!text-[14px] !font-medium"}
/> />
</p> </p>
<small className="text-gray-500 text-[12px] mt-1 mx-1"> <small className="text-gray-500 text-[12px] mt-1 mx-1">
@ -436,7 +437,7 @@ const CheckoutData = () => {
number={( number={(
checkOutData?.deliveryPrice / 10 checkOutData?.deliveryPrice / 10
)?.toLocaleString()} )?.toLocaleString()}
style={"!text-[14px] !font-semibold"} style={"!text-[14px] !font-medium"}
/> />
</p> </p>
<small className="text-gray-500 text-[12px] mt-1 mx-1"> <small className="text-gray-500 text-[12px] mt-1 mx-1">
@ -447,7 +448,7 @@ const CheckoutData = () => {
</div> </div>
<div className="flex justify-between bg-primary-100 p-3 rtl my-2"> <div className="flex justify-between bg-primary-100 p-3 rtl my-2">
<p className="mb-0 text-sm text-primary-600 font-bold"> <p className="mb-0 text-sm text-primary-600 font-medium">
قابل پرداخت قابل پرداخت
</p> </p>

View File

@ -70,7 +70,7 @@ const ProductData = ({ params }) => {
<div className="lg:col-span-3 xs:px-5 lg:px-0 "> <div className="lg:col-span-3 xs:px-5 lg:px-0 ">
<div className="text-right mt-7"> <div className="text-right mt-7">
<h1 className="text-lg font-semibold ">{product.persianName} </h1> <h1 className="text-lg font-medium ">{product.persianName} </h1>
<p className="mb-0 text-sm text-gray-400"> <p className="mb-0 text-sm text-gray-400">
{product?.englishName}{" "} {product?.englishName}{" "}
</p> </p>

View File

@ -8,6 +8,7 @@ import logobrand3 from "../../public/images/logobrand/3.png";
import logobrand4 from "../../public/images/logobrand/4.png"; import logobrand4 from "../../public/images/logobrand/4.png";
import logobrand5 from "../../public/images/logobrand/5.png"; import logobrand5 from "../../public/images/logobrand/5.png";
import logobrand6 from "../../public/images/logobrand/6.png"; import logobrand6 from "../../public/images/logobrand/6.png";
import logobrand7 from "../../public/images/logobrand/7.png";
// import styles from "./MovingLogos.module.css"; // import styles from "./MovingLogos.module.css";
@ -17,22 +18,28 @@ const MovingLogos = () => {
{ id: 2, logo: logobrand4 }, { id: 2, logo: logobrand4 },
{ id: 3, logo: logobrand3 }, { id: 3, logo: logobrand3 },
{ id: 4, logo: logobrand6 }, { id: 4, logo: logobrand6 },
{ id: 1, logo: logobrand5 }, { id: 5, logo: logobrand5 },
{ id: 2, logo: logobrand4 }, { id: 6, logo: logobrand4 },
{ id: 3, logo: logobrand3 }, { id: 7, logo: logobrand3 },
{ id: 4, logo: logobrand2 }, { id: 8, logo: logobrand2 },
{ id: 1, logo: logobrand5 }, { id: 9, logo: logobrand5 },
{ id: 2, logo: logobrand4 }, { id: 10, logo: logobrand4 },
{ id: 3, logo: logobrand3 }, { id: 11, logo: logobrand3 },
{ id: 4, logo: logobrand6 }, { id: 12, logo: logobrand6 },
{ id: 1, logo: logobrand5 }, { id: 13, logo: logobrand5 },
{ id: 2, logo: logobrand4 }, { id: 14, logo: logobrand4 },
{ id: 3, logo: logobrand6 }, { id: 15, logo: logobrand6 },
{ id: 4, logo: logobrand2 }, { id: 16, logo: logobrand2 },
{ id: 1, logo: logobrand5 }, { id: 17, logo: logobrand7 },
{ id: 2, logo: logobrand4 }, { id: 18, logo: logobrand4 },
{ id: 3, logo: logobrand3 }, { id: 19, logo: logobrand3 },
{ id: 4, logo: logobrand2 }, { id: 20, logo: logobrand2 },
{ id: 21, logo: logobrand7 },
{ id: 22, logo: logobrand4 },
{ id: 23, logo: logobrand3 },
{ id: 24, logo: logobrand5 },
{ id: 25, logo: logobrand2 },
{ id: 26, logo: logobrand7 },
]; ];
useEffect(() => { useEffect(() => {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1000 KiB

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -1,4 +1,5 @@
"use client"; "use client";
import Link from "next/link";
import { useSearchParams } from "next/navigation"; import { useSearchParams } from "next/navigation";
const Page = () => { const Page = () => {
@ -7,11 +8,11 @@ const Page = () => {
const paymentStatus = params.get("paymentStatus"); const paymentStatus = params.get("paymentStatus");
const factorNumber = params.get("factorNumber"); const factorNumber = params.get("factorNumber");
console.log(paymentStatus); console.log("paymentStatus", paymentStatus);
return ( return (
<> <>
{!paymentStatus ? ( {paymentStatus === "true" ? (
<div className="bg-contact-us !min-h-[100vh]"> <div className="bg-contact-us !min-h-[100vh]">
<div className=" pb-20"> <div className=" pb-20">
<div className="pt-[190px] px-10"> <div className="pt-[190px] px-10">
@ -55,9 +56,11 @@ const Page = () => {
ببینید ببینید
</p> </p>
<div className="flex justify-center"> <div className="flex justify-center">
<Link href={"/profile/orders"}>
<button className="btn btn-outline-light text-sm rounded-xl py-1 mt-5"> <button className="btn btn-outline-light text-sm rounded-xl py-1 mt-5">
مشاهده سفارش مشاهده سفارش
</button> </button>
</Link>
</div> </div>
</div> </div>
</div> </div>
@ -71,16 +74,18 @@ const Page = () => {
</div> </div>
<h1 className=" xs:text-[20px] lg:text-[40px] text-white font-bold text-center mt-10 rtl"> <h1 className=" xs:text-[20px] lg:text-[40px] text-white font-bold text-center mt-10 rtl">
خرید شما با شماره فاکتور با موفقیت انجام نشد خرید شما انجام نشد
</h1> </h1>
<p className="mb-0 text-center xs:text-sm lg:text-base text-gray-200 opacity-80"> <p className="mb-0 text-center xs:text-sm lg:text-base text-gray-200 opacity-80">
میتونید با مراجعه به پنل گفتینو یا در صفحه تماس با ما با تیم میتونید با مراجعه به پنل گفتینو یا در صفحه تماس با ما با تیم
پشتیبانی ما در تماس باشید پشتیبانی ما در تماس باشید
</p> </p>
<div className="flex justify-center"> <div className="flex justify-center">
<Link href={"/"}>
<button className="btn btn-outline-light text-sm rounded-xl py-1 mt-5"> <button className="btn btn-outline-light text-sm rounded-xl py-1 mt-5">
درباره ما{" "} صفحه اصلی{" "}
</button> </button>
</Link>
</div> </div>
</div> </div>
</div> </div>