fix conflict duplicates

This commit is contained in:
Danel Kungla
2025-09-24 18:45:29 +03:00
parent c7298d2b7e
commit 6c6e7a6847
8 changed files with 29 additions and 120 deletions

View File

@@ -1,14 +1,4 @@
'use client';
'use client';
import { useState } from 'react';
import { handleNavigateToPayment } from '@/lib/services/medusaCart.service';
import { formatCurrency } from '@/packages/shared/src/utils';
import { initiatePaymentSession } from '@lib/data/cart';
import { StoreCart, StoreCartLineItem } from '@medusajs/types';
import { Loader2 } from 'lucide-react';
import { useTranslation } from 'react-i18next';
import { useState } from 'react';
@@ -36,7 +26,6 @@ export default function Cart({
synlabAnalyses,
ttoServiceItems,
}: {
cart: StoreCart | null;
cart: StoreCart | null;
synlabAnalyses: StoreCartLineItem[];
ttoServiceItems: EnrichedCartItem[];
@@ -44,12 +33,10 @@ export default function Cart({
const {
i18n: { language },
} = useTranslation();
const {
i18n: { language },
} = useTranslation();
const [isInitiatingSession, setIsInitiatingSession] = useState(false);
const [unavailableLineItemIds, setUnavailableLineItemIds] = useState<string[]>()
const [unavailableLineItemIds, setUnavailableLineItemIds] =
useState<string[]>();
const items = cart?.items ?? [];
@@ -57,10 +44,6 @@ export default function Cart({
return (
<div className="content-container py-5 lg:px-4">
<div>
<div
className="flex flex-col items-center justify-center"
data-testid="empty-cart-message"
>
<div
className="flex flex-col items-center justify-center"
data-testid="empty-cart-message"
@@ -85,12 +68,15 @@ export default function Cart({
if (response.payment_collection) {
const { payment_sessions } = response.payment_collection;
const paymentSessionId = payment_sessions![0]!.id;
const result = await handleNavigateToPayment({ language, paymentSessionId });
const result = await handleNavigateToPayment({
language,
paymentSessionId,
});
if (result.url) {
window.location.href = result.url;
}
if (result.unavailableLineItemIds) {
setUnavailableLineItemIds(result.unavailableLineItemIds)
setUnavailableLineItemIds(result.unavailableLineItemIds);
}
} else {
setIsInitiatingSession(false);
@@ -117,9 +103,6 @@ export default function Cart({
</div>
{hasCartItems && (
<>
<div className="flex gap-x-4 px-4 pt-2 sm:justify-end sm:px-6 sm:pt-4">
<div className="w-full sm:mr-[42px] sm:w-auto">
<p className="text-muted-foreground ml-0 text-sm font-bold">
<div className="flex gap-x-4 px-4 pt-2 sm:justify-end sm:px-6 sm:pt-4">
<div className="w-full sm:mr-[42px] sm:w-auto">
<p className="text-muted-foreground ml-0 text-sm font-bold">
@@ -127,7 +110,6 @@ export default function Cart({
</p>
</div>
<div className={`sm:mr-[112px] sm:w-[50px]`}>
<p className="text-right text-sm">
<p className="text-right text-sm">
{formatCurrency({
value: cart.subtotal,
@@ -137,9 +119,6 @@ export default function Cart({
</p>
</div>
</div>
<div className="flex gap-x-4 px-4 py-2 sm:justify-end sm:px-6 sm:py-4">
<div className="w-full sm:mr-[42px] sm:w-auto">
<p className="text-muted-foreground ml-0 text-sm font-bold">
<div className="flex gap-x-4 px-4 py-2 sm:justify-end sm:px-6 sm:py-4">
<div className="w-full sm:mr-[42px] sm:w-auto">
<p className="text-muted-foreground ml-0 text-sm font-bold">
@@ -147,7 +126,6 @@ export default function Cart({
</p>
</div>
<div className={`sm:mr-[112px] sm:w-[50px]`}>
<p className="text-right text-sm">
<p className="text-right text-sm">
{formatCurrency({
value: cart.discount_total,
@@ -157,9 +135,6 @@ export default function Cart({
</p>
</div>
</div>
<div className="flex gap-x-4 px-4 sm:justify-end sm:px-6">
<div className="w-full sm:mr-[42px] sm:w-auto">
<p className="ml-0 text-sm font-bold">
<div className="flex gap-x-4 px-4 sm:justify-end sm:px-6">
<div className="w-full sm:mr-[42px] sm:w-auto">
<p className="ml-0 text-sm font-bold">
@@ -167,7 +142,6 @@ export default function Cart({
</p>
</div>
<div className={`sm:mr-[112px] sm:w-[50px]`}>
<p className="text-right text-sm">
<p className="text-right text-sm">
{formatCurrency({
value: cart.total,
@@ -180,10 +154,8 @@ export default function Cart({
</>
)}
<div className="flex flex-col gap-x-4 gap-y-6 py-4 sm:flex-row sm:py-8">
<div className="flex flex-col gap-x-4 gap-y-6 py-4 sm:flex-row sm:py-8">
{IS_DISCOUNT_SHOWN && (
<Card className="flex w-full flex-col justify-between sm:w-1/2">
<Card className="flex w-full flex-col justify-between sm:w-1/2">
<CardHeader className="pb-4">
<h5>
@@ -197,7 +169,6 @@ export default function Cart({
)}
{isLocationsShown && (
<Card className="flex w-full flex-col justify-between sm:w-1/2">
<Card className="flex w-full flex-col justify-between sm:w-1/2">
<CardHeader className="pb-4">
<h5>
@@ -219,14 +190,6 @@ export default function Cart({
</div>
<div>
<Button
className="h-10"
onClick={initiatePayment}
disabled={isInitiatingSession}
>
{isInitiatingSession && (
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
)}
<Button
className="h-10"
onClick={initiatePayment}