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

Merge branch 'develop' into MED-49

Browse Source
This commit is contained in:
Danel Kungla
2025-09-30 18:07:07 +03:00
parent 72f6f2b716 f477bfaa13
commit 67c69f6273
6 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@@ -34,6 +34,7 @@ MEDIPOST_PASSWORD=SRB48HZMV
MEDIPOST_RECIPIENT=trvurgtst MEDIPOST_RECIPIENT=trvurgtst
MEDIPOST_MESSAGE_SENDER=trvurgtst MEDIPOST_MESSAGE_SENDER=trvurgtst
MEDIPOST_ENABLE_DISPATCH_ON_MONTONIO_CALLBACK=true MEDIPOST_ENABLE_DISPATCH_ON_MONTONIO_CALLBACK=true
MEDIPOST_ENABLE_DELETE_RESPONSE_PRIVATE_MESSAGE_ON_READ=false
#MEDIPOST_URL=https://medipost2.medisoft.ee:8443/Medipost/MedipostServlet #MEDIPOST_URL=https://medipost2.medisoft.ee:8443/Medipost/MedipostServlet
#MEDIPOST_USER=medreport #MEDIPOST_USER=medreport
@@ -43,6 +44,7 @@ MEDIPOST_ENABLE_DISPATCH_ON_MONTONIO_CALLBACK=true
#MEDIPOST_ENABLE_DISPATCH_ON_MONTONIO_CALLBACK=false #MEDIPOST_ENABLE_DISPATCH_ON_MONTONIO_CALLBACK=false
# MEDUSA # MEDUSA
COMPANY_BENEFITS_PAYMENT_SECRET_KEY=NzcwMzE2NmEtOThiMS0xMWYwLWI4NjYtMDMwZDQzMjFhMjExCg==
MEDUSA_BACKEND_URL=http://localhost:9000 MEDUSA_BACKEND_URL=http://localhost:9000
MEDUSA_BACKEND_PUBLIC_URL=http://localhost:9000 MEDUSA_BACKEND_PUBLIC_URL=http://localhost:9000

2
app/home/(user)/settings/_components/account-preferences-form.tsx
View File

@@ -2,8 +2,8 @@
import { zodResolver } from '@hookform/resolvers/zod'; import { zodResolver } from '@hookform/resolvers/zod';
import { useForm } from 'react-hook-form'; import { useForm } from 'react-hook-form';
import { Trans } from 'react-i18next';
import { Trans } from '@kit/ui/trans';
import { useRevalidatePersonalAccountDataQuery } from '@kit/accounts/hooks/use-personal-account-data'; import { useRevalidatePersonalAccountDataQuery } from '@kit/accounts/hooks/use-personal-account-data';
import type { AccountWithParams } from '@kit/accounts/types/accounts'; import type { AccountWithParams } from '@kit/accounts/types/accounts';
import { Button } from '@kit/ui/button'; import { Button } from '@kit/ui/button';

2
app/home/(user)/settings/_components/account-settings-form.tsx
View File

@@ -2,8 +2,8 @@
import { zodResolver } from '@hookform/resolvers/zod'; import { zodResolver } from '@hookform/resolvers/zod';
import { useForm } from 'react-hook-form'; import { useForm } from 'react-hook-form';
import { Trans } from 'react-i18next';
import { Trans } from '@kit/ui/trans';
import { useRevalidatePersonalAccountDataQuery } from '@kit/accounts/hooks/use-personal-account-data'; import { useRevalidatePersonalAccountDataQuery } from '@kit/accounts/hooks/use-personal-account-data';
import type { AccountWithParams } from '@kit/accounts/types/accounts'; import type { AccountWithParams } from '@kit/accounts/types/accounts';
import { Button } from '@kit/ui/button'; import { Button } from '@kit/ui/button';

4
app/home/[account]/_lib/server/load-team-account-health-details.ts
View File

@@ -63,13 +63,13 @@ export const getAccountHealthDetailsFields = (
return [ return [
{ {
title: 'teams:healthDetails.women', title: 'teams:healthDetails.women',
value: `${femalePercentage}% (${numberOfFemaleMembers})`, value: `${femalePercentage.toFixed(0)}% (${numberOfFemaleMembers})`,
Icon: User, Icon: User,
iconBg: 'bg-success', iconBg: 'bg-success',
}, },
{ {
title: 'teams:healthDetails.men', title: 'teams:healthDetails.men',
value: `${malePercentage}% (${numberOfMaleMembers})`, value: `${malePercentage.toFixed(0)}% (${numberOfMaleMembers})`,
Icon: User, Icon: User,
iconBg: 'bg-success', iconBg: 'bg-success',
}, },

7
lib/services/medipost/medipostPrivateMessage.service.ts
View File

@@ -43,7 +43,9 @@ const USER = process.env.MEDIPOST_USER!;
const PASSWORD = process.env.MEDIPOST_PASSWORD!; const PASSWORD = process.env.MEDIPOST_PASSWORD!;
const RECIPIENT = process.env.MEDIPOST_RECIPIENT!; const RECIPIENT = process.env.MEDIPOST_RECIPIENT!;
const IS_ENABLED_DELETE_PRIVATE_MESSAGE = false as boolean; const IS_ENABLED_DELETE_PRIVATE_MESSAGE =
process.env.MEDIPOST_ENABLE_DELETE_RESPONSE_PRIVATE_MESSAGE_ON_READ ===
'true';
export async function getLatestPrivateMessageListItem({ export async function getLatestPrivateMessageListItem({
excludedMessageIds, excludedMessageIds,
@@ -436,6 +438,9 @@ export async function readPrivateMessageResponse({
medusaOrderId, medusaOrderId,
orderStatus: 'PARTIAL_ANALYSIS_RESPONSE', orderStatus: 'PARTIAL_ANALYSIS_RESPONSE',
}); });
if (IS_ENABLED_DELETE_PRIVATE_MESSAGE) {
await deletePrivateMessage(privateMessageId);
}
hasAnalysisResponse = true; hasAnalysisResponse = true;
hasPartialAnalysisResponse = true; hasPartialAnalysisResponse = true;
} else if (status.isCompleted) { } else if (status.isCompleted) {

2
packages/features/medusa-storefront/src/lib/data/orders.ts
View File

@@ -25,6 +25,7 @@ export const retrieveOrder = async (id: string, allowCache = true) => {
headers, headers,
next, next,
...(allowCache ? { cache: 'force-cache' } : {}), ...(allowCache ? { cache: 'force-cache' } : {}),
credentials: 'include',
}) })
.then(({ order }) => order) .then(({ order }) => order)
.catch((err) => medusaError(err)); .catch((err) => medusaError(err));
@@ -55,6 +56,7 @@ export const listOrders = async (
}, },
headers, headers,
next, next,
credentials: 'include',
}) })
.then(({ orders }) => orders) .then(({ orders }) => orders)
.catch((err) => medusaError(err)); .catch((err) => medusaError(err));