feat(MED-131): conditional env

This commit is contained in:
2025-08-04 18:31:17 +03:00
parent bd78b28f3c
commit 47675252ed
2 changed files with 10 additions and 16 deletions

View File

@@ -8,13 +8,10 @@ import { createI18nServerInstance } from "~/lib/i18n/i18n.server";
import { createOrder } from '~/lib/services/order.service';
import { getOrderedAnalysisElementsIds, sendOrderToMedipost } from '~/lib/services/medipost.service';
const emailSender = process.env.EMAIL_SENDER;
const siteUrl = process.env.NEXT_PUBLIC_SITE_URL!;
const ANALYSIS_PACKAGES_TYPE_HANDLE = 'analysis-packages';
const MONTONIO_PAID_STATUS = 'PAID';
const env = z
const env = () => z
.object({
emailSender: z
.string({
@@ -28,8 +25,8 @@ const env = z
.min(1),
})
.parse({
emailSender,
siteUrl,
emailSender: process.env.EMAIL_SENDER,
siteUrl: process.env.NEXT_PUBLIC_SITE_URL!,
});
const sendEmail = async ({ email, analysisPackageName, personName, partnerLocationName, language }: { email: string, analysisPackageName: string, personName: string, partnerLocationName: string, language: string }) => {
@@ -48,7 +45,7 @@ const sendEmail = async ({ email, analysisPackageName, personName, partnerLocati
await mailer
.sendEmail({
from: env.emailSender,
from: env().emailSender,
to: email,
subject,
html,
@@ -104,7 +101,7 @@ const handleOrderToken = async (orderToken: string) => {
export async function GET(request: Request) {
const { language } = await createI18nServerInstance();
const baseUrl = new URL(env.siteUrl);
const baseUrl = new URL(env().siteUrl);
try {
const orderToken = new URL(request.url).searchParams.get('order-token');
if (!orderToken) {

View File

@@ -8,10 +8,7 @@ import { StoreCartLineItem, StoreProductVariant } from '@medusajs/types';
import { MontonioOrderHandlerService } from '@/packages/billing/montonio/src';
import { requireUserInServerComponent } from '../server/require-user-in-server-component';
const medusaBackendPublicUrl = process.env.MEDUSA_BACKEND_PUBLIC_URL!;
const siteUrl = process.env.NEXT_PUBLIC_SITE_URL!;
const env = z
const env = () => z
.object({
medusaBackendPublicUrl: z
.string({
@@ -25,8 +22,8 @@ const env = z
.min(1),
})
.parse({
medusaBackendPublicUrl,
siteUrl,
medusaBackendPublicUrl: process.env.MEDUSA_BACKEND_PUBLIC_URL!,
siteUrl: process.env.NEXT_PUBLIC_SITE_URL!,
});
export async function handleAddToCart({
@@ -81,8 +78,8 @@ export async function handleNavigateToPayment({ language, paymentSessionId }: {
}
const paymentLink = await new MontonioOrderHandlerService().getMontonioPaymentLink({
notificationUrl: `${env.medusaBackendPublicUrl}/hooks/payment/montonio_montonio`,
returnUrl: `${env.siteUrl}/home/cart/montonio-callback`,
notificationUrl: `${env().medusaBackendPublicUrl}/hooks/payment/montonio_montonio`,
returnUrl: `${env().siteUrl}/home/cart/montonio-callback`,
amount: cart.total,
currency: cart.currency_code.toUpperCase(),
description: `Order from Medreport`,