Bernt Christian Egeland 7 месяцев назад
Родитель
Сommit
e5948bee66

+ 6 - 6
src/app/(authenticated)/layout.tsx

@@ -22,11 +22,6 @@ export default async function DashboardLayout({
   const showWhiteLabelCta = !isCloudMode() && !features.brandingRemoved;
 
   return (
-    <DateSettingsProvider
-      dateFormat={data.dateFormat}
-      timeFormat={data.timeFormat}
-      timezone={data.timezone}
-    >
     <WhiteLabelCtaProvider show={showWhiteLabelCta}>
     <SidebarProvider
       style={
@@ -35,6 +30,11 @@ export default async function DashboardLayout({
         } as React.CSSProperties
       }
     >
+      <DateSettingsProvider
+        dateFormat={data.dateFormat}
+        timeFormat={data.timeFormat}
+        timezone={data.timezone}
+      >
       <ConfirmProvider>
         <AppSidebar
           companyLogo={data.companyLogo}
@@ -46,8 +46,8 @@ export default async function DashboardLayout({
         <SidebarInset>{children}</SidebarInset>
         <SearchCommand />
       </ConfirmProvider>
+      </DateSettingsProvider>
     </SidebarProvider>
     </WhiteLabelCtaProvider>
-    </DateSettingsProvider>
   );
 }

+ 1 - 1
src/app/api/quotes/[id]/pdf/route.ts

@@ -86,7 +86,7 @@ export async function GET(
 
     const quoteNum = quote.quoteNumber || `QT-${quote.id.slice(-8).toUpperCase()}`;
 
-    return new NextResponse(buffer.buffer as ArrayBuffer, {
+    return new NextResponse(new Uint8Array(buffer), {
       headers: {
         "Content-Type": "application/pdf",
         "Content-Disposition": `attachment; filename="${quoteNum}.pdf"`,

+ 3 - 3
src/app/api/services/[id]/pdf/route.ts

@@ -196,7 +196,7 @@ export async function GET(
     const invoiceNum = record.invoiceNumber || `INV-${record.id.slice(-8).toUpperCase()}`;
 
     // Merge attached PDF diagnostic reports into the invoice
-    let finalBytes: ArrayBuffer;
+    let finalBytes: Uint8Array;
     if (pdfAttachments.length > 0) {
       const mergedPdf = await PDFDocument.load(invoiceBuffer);
       for (const att of pdfAttachments) {
@@ -211,9 +211,9 @@ export async function GET(
         }
       }
       const saved = await mergedPdf.save();
-      finalBytes = saved.buffer as ArrayBuffer;
+      finalBytes = new Uint8Array(saved);
     } else {
-      finalBytes = invoiceBuffer.buffer as ArrayBuffer;
+      finalBytes = new Uint8Array(invoiceBuffer);
     }
 
     return new NextResponse(finalBytes, {

+ 1 - 1
src/app/api/share/invoice/[orgId]/[token]/pdf/route.ts

@@ -147,7 +147,7 @@ export async function GET(
 
     const invoiceNum = record.invoiceNumber || `INV-${record.id.slice(-8).toUpperCase()}`;
 
-    return new NextResponse(buffer.buffer as ArrayBuffer, {
+    return new NextResponse(new Uint8Array(buffer), {
       headers: {
         "Content-Type": "application/pdf",
         "Content-Disposition": `attachment; filename="${invoiceNum}.pdf"`,