fix: 🐛 order creation not working with templateId

Print-one · Apr 15, 2024 · 8784076 · 8784076
1 parent 5284c84
commit 8784076
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/src/PrintOne.ts b/src/PrintOne.ts
@@ -245,13 +245,8 @@ export class PrintOne {
    * Create an order
    */
   public async createOrder(data: CreateOrder): Promise<Order> {
-    let templateId: undefined | string;
-
-    if (data.template instanceof Template) {
-      templateId = data.template.id;
-    } else {
-      templateId = data.template;
-    }
+    const template = data.templateId ?? data.template;
+    const templateId = template instanceof Template ? template.id : template;
 
     const sendDateStr =
       data.sendDate instanceof Date
@@ -272,13 +267,8 @@ export class PrintOne {
   }
 
   public async createCsvOrder(data: CreateCsvOrder): Promise<CsvOrder> {
-    let templateId: undefined | string;
-
-    if (data.template instanceof Template) {
-      templateId = data.template.id;
-    } else {
-      templateId = data.template;
-    }
+    const template = data.templateId ?? data.template;
+    const templateId = template instanceof Template ? template.id : template;
 
     const formData = new FormData();
     formData.append(

diff --git a/src/models/CsvOrder.ts b/src/models/CsvOrder.ts
@@ -14,11 +14,19 @@ export type CreateCsvOrder = {
     recipient: Address;
     mergeVariables?: Record<string, string>;
   };
-  template: Template | string;
   finish?: Finish;
   billingId?: string;
   sender?: Address;
-};
+} & (
+  | {
+      template: Template | string;
+      templateId: undefined;
+    }
+  | {
+      template: undefined;
+      templateId: string;
+    }
+);
 
 export class CsvOrder {
   private _data: ICsvOrder;

diff --git a/src/models/Order.ts b/src/models/Order.ts
@@ -10,15 +10,23 @@ import { sleep } from "../utils";
 export type CreateOrder = {
   recipient: Address;
   sender?: Address;
-  template: Template | string;
   /**
    * @default GLOSSY
    */
   finish?: Finish;
   mergeVariables?: Record<string, unknown>;
   billingId?: string;
   sendDate?: Date | string;
-};
+} & (
+  | {
+      template: Template | string;
+      templateId: undefined;
+    }
+  | {
+      template: undefined;
+      templateId: string;
+    }
+);
 
 export class Order {
   private _data: IOrder;