k4rli/medreport_mrb2b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #76 from MR-medreport/improvements-0609

Browse Source 
update order xml for live, allow adding discounts in cart
This commit is contained in:
Karli
2025-09-06 19:58:59 +00:00
committed by GitHub
parent d87d08aaea c83694222d
commit dfcfdb8f97
5 changed files with 119 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/home/(user)/_components/cart/discount-code.tsx
View File

@@ -1,6 +1,7 @@
"use client" "use client"
import { Badge, Heading, Text } from "@medusajs/ui" import { Badge, Text } from "@medusajs/ui"
import { toast } from '@kit/ui/sonner';
import React, { useActionState } from "react"; import React, { useActionState } from "react";
import { applyPromotions, submitPromotionForm } from "@lib/data/cart" import { applyPromotions, submitPromotionForm } from "@lib/data/cart"
@@ -31,11 +32,19 @@ export default function DiscountCode({ cart }: {
const removePromotionCode = async (code: string) => { const removePromotionCode = async (code: string) => {
const validPromotions = promotions.filter( const validPromotions = promotions.filter(
(promotion) => promotion.code !== code (promotion) => promotion.code !== code,
) )
await applyPromotions( await applyPromotions(
validPromotions.filter((p) => p.code === undefined).map((p) => p.code!) validPromotions.filter((p) => p.code === undefined).map((p) => p.code!),
{
onSuccess: () => {
toast.success(t('cart:discountCode.removeSuccess'));
},
onError: () => {
toast.error(t('cart:discountCode.removeError'));
},
}
) )
} }
@@ -45,7 +54,14 @@ export default function DiscountCode({ cart }: {
.map((p) => p.code!) .map((p) => p.code!)
codes.push(code.toString()) codes.push(code.toString())
await applyPromotions(codes) await applyPromotions(codes, {
onSuccess: () => {
toast.success(t('cart:discountCode.addSuccess'));
},
onError: () => {
toast.error(t('cart:discountCode.addError'));
},
});
form.reset() form.reset()
} }
@@ -64,7 +80,7 @@ export default function DiscountCode({ cart }: {
<Form {...form}> <Form {...form}>
<form <form
onSubmit={form.handleSubmit((data) => addPromotionCode(data.code))} onSubmit={form.handleSubmit((data) => addPromotionCode(data.code))}
className="w-full mb-2 flex gap-x-2" className="w-full mb-2 flex gap-x-2 sm:flex-row flex-col gap-y-2"
> >
<FormField <FormField
name={'code'} name={'code'}
@@ -87,16 +103,12 @@ export default function DiscountCode({ cart }: {
</form> </form>
</Form> </Form>
<p className="text-sm text-muted-foreground"> {promotions.length > 0 ? (
<Trans i18nKey={'cart:discountCode.subtitle'} /> <div className="w-full flex items-center mt-4">
</p> <div className="flex flex-col w-full gap-y-2">
<p>
{promotions.length > 0 && ( <Trans i18nKey={'cart:discountCode.appliedCodes'} />
<div className="w-full flex items-center"> </p>
<div className="flex flex-col w-full">
<Heading className="txt-medium mb-2">
Promotion(s) applied:
</Heading>
{promotions.map((promotion) => { {promotions.map((promotion) => {
return ( return (
@@ -110,6 +122,7 @@ export default function DiscountCode({ cart }: {
<Badge <Badge
color={promotion.is_automatic ? "green" : "grey"} color={promotion.is_automatic ? "green" : "grey"}
size="small" size="small"
className="px-4"
> >
{promotion.code} {promotion.code}
</Badge>{" "} </Badge>{" "}
@@ -151,7 +164,7 @@ export default function DiscountCode({ cart }: {
> >
<Trash size={14} /> <Trash size={14} />
<span className="sr-only"> <span className="sr-only">
Remove discount code from order <Trans i18nKey={'cart:discountCode.remove'} />
</span> </span>
</button> </button>
)} )}
@@ -160,6 +173,10 @@ export default function DiscountCode({ cart }: {
})} })}
</div> </div>
</div> </div>
) : (
<p className="text-sm text-muted-foreground">
<Trans i18nKey={'cart:discountCode.subtitle'} />
</p>
)} )}
</div> </div>
) )

72
app/home/(user)/_components/cart/index.tsx
View File

@@ -18,7 +18,7 @@ import { useTranslation } from "react-i18next";
import { handleNavigateToPayment } from "@/lib/services/medusaCart.service"; import { handleNavigateToPayment } from "@/lib/services/medusaCart.service";
import AnalysisLocation from "./analysis-location"; import AnalysisLocation from "./analysis-location";
const IS_DISCOUNT_SHOWN = false as boolean; const IS_DISCOUNT_SHOWN = true as boolean;
export default function Cart({ export default function Cart({
cart, cart,
@@ -69,7 +69,7 @@ export default function Cart({
const hasCartItems = Array.isArray(cart.items) && cart.items.length > 0; const hasCartItems = Array.isArray(cart.items) && cart.items.length > 0;
const isLocationsShown = synlabAnalyses.length > 0; const isLocationsShown = synlabAnalyses.length > 0;
return ( return (
<div className="grid grid-cols-1 small:grid-cols-[1fr_360px] gap-x-40 lg:px-4"> <div className="grid grid-cols-1 small:grid-cols-[1fr_360px] gap-x-40 lg:px-4">
<div className="flex flex-col bg-white gap-y-6"> <div className="flex flex-col bg-white gap-y-6">
@@ -77,28 +77,62 @@ export default function Cart({
<CartItems cart={cart} items={ttoServiceItems} productColumnLabelKey="cart:items.ttoServices.productColumnLabel" /> <CartItems cart={cart} items={ttoServiceItems} productColumnLabelKey="cart:items.ttoServices.productColumnLabel" />
</div> </div>
{hasCartItems && ( {hasCartItems && (
<div className="flex justify-end gap-x-4 px-6 py-4"> <>
<div className="mr-[36px]"> <div className="flex justify-end gap-x-4 px-6 pt-4">
<p className="ml-0 font-bold text-sm"> <div className="mr-[36px]">
<Trans i18nKey="cart:total" /> <p className="ml-0 font-bold text-sm text-muted-foreground">
</p> <Trans i18nKey="cart:subtotal" />
</p>
</div>
<div className="mr-[116px]">
<p className="text-sm">
{formatCurrency({
value: cart.subtotal,
currencyCode: cart.currency_code,
locale: language,
})}
</p>
</div>
</div> </div>
<div className="mr-[116px]"> <div className="flex justify-end gap-x-4 px-6 py-2">
<p className="text-sm"> <div className="mr-[36px]">
{formatCurrency({ <p className="ml-0 font-bold text-sm text-muted-foreground">
value: cart.total, <Trans i18nKey="cart:promotionsTotal" />
currencyCode: cart.currency_code, </p>
locale: language, </div>
})} <div className="mr-[116px]">
</p> <p className="text-sm">
{formatCurrency({
value: cart.discount_total,
currencyCode: cart.currency_code,
locale: language,
})}
</p>
</div>
</div> </div>
</div> <div className="flex justify-end gap-x-4 px-6">
<div className="mr-[36px]">
<p className="ml-0 font-bold text-sm">
<Trans i18nKey="cart:total" />
</p>
</div>
<div className="mr-[116px]">
<p className="text-sm">
{formatCurrency({
value: cart.total,
currencyCode: cart.currency_code,
locale: language,
})}
</p>
</div>
</div>
</>
)} )}
<div className="flex gap-y-6 py-8"> <div className="flex sm:flex-row flex-col gap-y-6 py-8 gap-x-4">
{IS_DISCOUNT_SHOWN && ( {IS_DISCOUNT_SHOWN && (
<Card <Card
className="flex flex-col justify-between w-1/2" className="flex flex-col justify-between w-full sm:w-1/2"
> >
<CardHeader className="pb-4"> <CardHeader className="pb-4">
<h5> <h5>
@@ -113,7 +147,7 @@ export default function Cart({
{isLocationsShown && ( {isLocationsShown && (
<Card <Card
className="flex flex-col justify-between w-1/2" className="flex flex-col justify-between w-full sm:w-1/2"
> >
<CardHeader className="pb-4"> <CardHeader className="pb-4">
<h5> <h5>

25
packages/features/medusa-storefront/src/lib/data/cart.ts
View File

@@ -87,7 +87,10 @@ export async function getOrSetCart(countryCode: string) {
return cart; return cart;
} }
export async function updateCart({ id, ...data }: HttpTypes.StoreUpdateCart & { id?: string }) { export async function updateCart(
{ id, ...data }: HttpTypes.StoreUpdateCart & { id?: string },
{ onSuccess, onError }: { onSuccess: () => void, onError: () => void } = { onSuccess: () => {}, onError: () => {} },
) {
const cartId = id || (await getCartId()); const cartId = id || (await getCartId());
if (!cartId) { if (!cartId) {
@@ -109,9 +112,13 @@ export async function updateCart({ id, ...data }: HttpTypes.StoreUpdateCart & {
const fulfillmentCacheTag = await getCacheTag("fulfillment"); const fulfillmentCacheTag = await getCacheTag("fulfillment");
revalidateTag(fulfillmentCacheTag); revalidateTag(fulfillmentCacheTag);
onSuccess();
return cart; return cart;
}) })
.catch(medusaError); .catch((e) => {
onError();
return medusaError(e);
});
} }
export async function addToCart({ export async function addToCart({
@@ -259,7 +266,10 @@ export async function initiatePaymentSession(
.catch(medusaError); .catch(medusaError);
} }
export async function applyPromotions(codes: string[]) { export async function applyPromotions(
codes: string[],
{ onSuccess, onError }: { onSuccess: () => void, onError: () => void } = { onSuccess: () => {}, onError: () => {} },
) {
const cartId = await getCartId(); const cartId = await getCartId();
if (!cartId) { if (!cartId) {
@@ -278,8 +288,13 @@ export async function applyPromotions(codes: string[]) {
const fulfillmentCacheTag = await getCacheTag("fulfillment"); const fulfillmentCacheTag = await getCacheTag("fulfillment");
revalidateTag(fulfillmentCacheTag); revalidateTag(fulfillmentCacheTag);
onSuccess();
}) })
.catch(medusaError); .catch((e) => {
onError();
return medusaError(e);
});
} }
export async function applyGiftCard(code: string) { export async function applyGiftCard(code: string) {
@@ -427,7 +442,7 @@ export async function placeOrder(cartId?: string, options: { revalidateCacheTags
} else { } else {
throw new Error("Cart is not an order"); throw new Error("Cart is not an order");
} }
return retrieveOrder(cartRes.order.id); return retrieveOrder(cartRes.order.id);
} }

6
public/locales/en/cart.json
View File

@@ -5,6 +5,7 @@
"emptyCartMessageDescription": "Add items to your cart to continue.", "emptyCartMessageDescription": "Add items to your cart to continue.",
"subtotal": "Subtotal", "subtotal": "Subtotal",
"total": "Total", "total": "Total",
"promotionsTotal": "Promotions total",
"table": { "table": {
"item": "Item", "item": "Item",
"quantity": "Quantity", "quantity": "Quantity",
@@ -24,10 +25,13 @@
"timeoutAction": "Continue" "timeoutAction": "Continue"
}, },
"discountCode": { "discountCode": {
"title": "Gift card or promotion code",
"label": "Add Promotion Code(s)", "label": "Add Promotion Code(s)",
"apply": "Apply", "apply": "Apply",
"subtitle": "If you wish, you can add a promotion code", "subtitle": "If you wish, you can add a promotion code",
"placeholder": "Enter promotion code" "placeholder": "Enter promotion code",
"remove": "Remove promotion code",
"appliedCodes": "Promotion(s) applied:"
}, },
"items": { "items": {
"synlabAnalyses": { "synlabAnalyses": {

9
public/locales/et/cart.json
View File

@@ -4,6 +4,7 @@
"emptyCartMessage": "Sinu ostukorv on tühi", "emptyCartMessage": "Sinu ostukorv on tühi",
"emptyCartMessageDescription": "Lisa tooteid ostukorvi, et jätkata.", "emptyCartMessageDescription": "Lisa tooteid ostukorvi, et jätkata.",
"subtotal": "Vahesumma", "subtotal": "Vahesumma",
"promotionsTotal": "Soodustuse summa",
"total": "Summa", "total": "Summa",
"table": { "table": {
"item": "Toode", "item": "Toode",
@@ -28,7 +29,13 @@
"label": "Lisa promo kood", "label": "Lisa promo kood",
"apply": "Rakenda", "apply": "Rakenda",
"subtitle": "Kui soovid, võid lisada promo koodi", "subtitle": "Kui soovid, võid lisada promo koodi",
"placeholder": "Sisesta promo kood" "placeholder": "Sisesta promo kood",
"remove": "Eemalda promo kood",
"appliedCodes": "Rakendatud sooduskoodid:",
"removeError": "Sooduskoodi eemaldamine ebaõnnestus",
"removeSuccess": "Sooduskood eemaldatud",
"addError": "Sooduskoodi rakendamine ebaõnnestus",
"addSuccess": "Sooduskood rakendatud"
}, },
"items": { "items": {
"synlabAnalyses": { "synlabAnalyses": {