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

Merge pull request #90 from MR-medreport/develop

Browse Source 
develop -> main
This commit is contained in:
Karli
2025-09-10 07:13:24 +00:00
committed by GitHub
parent be1ba7ef16 745ba874b6
commit 90aa6f6fd6
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/home/(user)/_lib/server/load-analysis-packages.ts
View File

@@ -122,8 +122,9 @@ async function analysisPackagesWithVariantLoader({
return [ return [
...acc, ...acc,
{ {
variant,
variantId: variant.id, variantId: variant.id,
nrOfAnalyses: getAnalysisElementMedusaProductIds([product]).length, nrOfAnalyses: getAnalysisElementMedusaProductIds([{ ...product, variant }]).length,
price: variant.calculated_price?.calculated_amount ?? 0, price: variant.calculated_price?.calculated_amount ?? 0,
title: product.title, title: product.title,
subtitle: product.subtitle, subtitle: product.subtitle,

3
packages/shared/src/components/select-analysis-package.tsx
View File

@@ -5,7 +5,7 @@ import { useState } from 'react';
import Image from 'next/image'; import Image from 'next/image';
import { useRouter } from 'next/navigation'; import { useRouter } from 'next/navigation';
import { StoreProduct } from '@medusajs/types'; import type { AdminProductVariant, StoreProduct } from '@medusajs/types';
import { Button } from '@medusajs/ui'; import { Button } from '@medusajs/ui';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { handleAddToCart } from '../../../../lib/services/medusaCart.service'; import { handleAddToCart } from '../../../../lib/services/medusaCart.service';
@@ -30,6 +30,7 @@ export type AnalysisPackageWithVariant = Pick<StoreProduct, 'title' | 'descripti
isStandard: boolean; isStandard: boolean;
isStandardPlus: boolean; isStandardPlus: boolean;
isPremium: boolean; isPremium: boolean;
variant: Pick<AdminProductVariant, 'metadata'>;
}; };
export default function SelectAnalysisPackage({ export default function SelectAnalysisPackage({

4
utils/medusa-product.ts
View File

@@ -1,4 +1,4 @@
import { StoreProduct } from "@medusajs/types"; import type { AdminProductVariant, StoreProduct } from "@medusajs/types";
type Product = { type Product = {
metadata?: { metadata?: {
@@ -11,7 +11,7 @@ type Product = {
} | null; } | null;
} | null; } | null;
export const getAnalysisElementMedusaProductIds = (products: Pick<StoreProduct, 'metadata'>[]) => { export const getAnalysisElementMedusaProductIds = (products: (Pick<StoreProduct, 'metadata'> & { variant?: Pick<AdminProductVariant, 'metadata'> })[]) => {
if (!products) { if (!products) {
return []; return [];
} }