Merge branch 'main' into fix/add-override-and-attachments-for-template-use

packages/email/template-components/template-footer.tsx

@@ -23,7 +23,7 @@ export const TemplateFooter = ({ isDocument = true }: TemplateFooterProps) => {
         </Text>
       )}
 
-      {branding.brandingEnabled && branding.brandingCompanyDetails && (
+      {branding.brandingCompanyDetails ? (
         <Text className="my-8 text-sm text-slate-400">
           {branding.brandingCompanyDetails.split('\n').map((line, idx) => {
             return (
@@ -34,9 +34,7 @@ export const TemplateFooter = ({ isDocument = true }: TemplateFooterProps) => {
             );
           })}
         </Text>
-      )}
-
-      {!branding.brandingEnabled && (
+      ) : (
         <Text className="my-8 text-sm text-slate-400">
           Documenso, Inc.
           <br />

packages/lib/translations/pl/web.po

@@ -8,7 +8,7 @@ msgstr ""
 "Language: pl\n"
 "Project-Id-Version: documenso-app\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2025-11-21 00:14\n"
+"PO-Revision-Date: 2025-11-20 02:32\n"
 "Last-Translator: \n"
 "Language-Team: Polish\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
@@ -7584,7 +7584,7 @@ msgstr "Liczba podpisów"
 #: packages/ui/components/document/envelope-recipient-field-tooltip.tsx
 #: packages/ui/components/document/document-read-only-fields.tsx
 msgid "Signed"
-msgstr "Podpisano"
+msgstr "Podpisał"
 
 #: apps/remix/app/components/dialogs/envelope-download-dialog.tsx
 msgctxt "Signed document (adjective)"

packages/trpc/server/template-router/router.ts

@@ -457,8 +457,10 @@ export const templateRouter = router({
         recipients,
         distributeDocument,
         customDocumentDataId,
-        prefillFields,
         folderId,
+        prefillFields,
+        override,
+        attachments,
       } = input;
 
       ctx.logger.info({
@@ -495,6 +497,8 @@ export const templateRouter = router({
         requestMetadata: ctx.metadata,
         folderId,
         prefillFields,
+        override,
+        attachments,
       });
 
       if (distributeDocument) {

packages/trpc/server/template-router/schema.ts

@@ -133,12 +133,42 @@ export const ZCreateDocumentFromTemplateRequestSchema = z.object({
       'The ID of the folder to create the document in. If not provided, the document will be created in the root folder.',
     )
     .optional(),
+
   prefillFields: z
     .array(ZFieldMetaPrefillFieldsSchema)
     .describe(
       'The fields to prefill on the document before sending it out. Useful when you want to create a document from an existing template and pre-fill the fields with specific values.',
     )
     .optional(),
+
+  override: z
+    .object({
+      title: z.string().min(1).max(255).optional(),
+      subject: ZDocumentMetaSubjectSchema.optional(),
+      message: ZDocumentMetaMessageSchema.optional(),
+      timezone: ZDocumentMetaTimezoneSchema.optional(),
+      dateFormat: ZDocumentMetaDateFormatSchema.optional(),
+      redirectUrl: ZDocumentMetaRedirectUrlSchema.optional(),
+      distributionMethod: ZDocumentMetaDistributionMethodSchema.optional(),
+      emailSettings: ZDocumentEmailSettingsSchema.optional(),
+      language: ZDocumentMetaLanguageSchema.optional(),
+      typedSignatureEnabled: ZDocumentMetaTypedSignatureEnabledSchema.optional(),
+      uploadSignatureEnabled: ZDocumentMetaUploadSignatureEnabledSchema.optional(),
+      drawSignatureEnabled: ZDocumentMetaDrawSignatureEnabledSchema.optional(),
+      allowDictateNextSigner: z.boolean().optional(),
+    })
+    .describe('Override values from the template for the created document.')
+    .optional(),
+
+  attachments: z
+    .array(
+      z.object({
+        label: z.string().min(1, 'Label is required'),
+        data: z.string().url('Must be a valid URL'),
+        type: ZEnvelopeAttachmentTypeSchema.optional().default('link'),
+      }),
+    )
+    .optional(),
 });
 
 export const ZCreateDocumentFromTemplateResponseSchema = ZDocumentSchema;