@jarwizz/create-jarshop 0.1.5 → 0.1.6

package/dist/template/src/migrations/1788000000000-jarshop-email-brand-schema-parity.ts

@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class JarShopEmailBrandSchemaParity1788000000000 implements MigrationInterface {
+  name = "JarShopEmailBrandSchemaParity1788000000000";
+
+  async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE "jarshop_email_brand_configuration"
+      DROP CONSTRAINT IF EXISTS "FK_jarshop_email_brand_configuration_channel"
+    `);
+  }
+
+  async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE "jarshop_email_brand_configuration"
+      ADD CONSTRAINT "FK_jarshop_email_brand_configuration_channel"
+      FOREIGN KEY ("channelId") REFERENCES "channel"("id")
+      ON DELETE CASCADE ON UPDATE CASCADE
+    `);
+  }
+}

package/dist/template/src/plugins/jarshop-checkout/order-email-configuration.entity.ts

@@ -47,10 +47,10 @@ export class JarShopEmailBrandConfiguration {
   @Column({ type: "text" })
   companyAddress!: string;
 
-  @Column({ type: "jsonb", default: () => "'[]'::jsonb" })
+  @Column({ type: "jsonb", default: [] })
   enabledEvents!: ConfigurableOrderEmailKind[];
 
-  @Column({ type: "jsonb", default: () => "'[]'::jsonb" })
+  @Column({ type: "jsonb", default: [] })
   shippingMethods!: OrderEmailShippingMethodConfiguration[];
 
   @CreateDateColumn()

package/dist/template/src/plugins/jarshop-checkout/order-email-lifecycle.ts

@@ -31,6 +31,7 @@ import {
 import { toOrderEmailLanguageCode } from "./order-email-delivery-core.js";
 import {
   getCourierOrderAlignmentState,
+  resolveLocalizedVariantName,
   resolveShippingMethodCodeForOrderLines,
   toFulfillmentLifecycleEmailKind,
 } from "./order-lifecycle-core.js";
@@ -43,6 +44,15 @@ type CancellationHistoryInput = {
   };
 };
 
+export const fulfillmentLifecycleOrderRelations = [
+  "customer",
+  "lines.productVariant",
+  "lines.productVariant.translations",
+  "shippingLines.shippingMethod",
+  "shippingLines.orderLines",
+  "fulfillments.lines",
+] as const;
+
 @Injectable()
 export class JarShopOrderEmailLifecycleOutbox
   implements OnApplicationBootstrap, OnModuleDestroy
@@ -98,13 +108,7 @@ export class JarShopOrderEmailLifecycleOutbox
     }
     const orders = await this.connection.getRepository(event.ctx, Order).find({
       where: { fulfillments: { id: event.fulfillment.id } },
-      relations: [
-        "customer",
-        "lines.productVariant",
-        "shippingLines.shippingMethod",
-        "shippingLines.orderLines",
-        "fulfillments.lines",
-      ],
+      relations: [...fulfillmentLifecycleOrderRelations],
     });
 
     for (const order of orders) {
@@ -138,7 +142,11 @@ export class JarShopOrderEmailLifecycleOutbox
           shippingMethodCode,
           fulfillmentId: String(fulfillment.id),
           trackingCode: fulfillment.trackingCode ?? "",
-          lines: toEmailLineSnapshots(order.lines, fulfillment.lines),
+          lines: toEmailLineSnapshots(
+            order.lines,
+            fulfillment.lines,
+            identity.languageCode,
+          ),
         },
       });
       await this.insertOnce(event.ctx, delivery);
@@ -162,7 +170,11 @@ export class JarShopOrderEmailLifecycleOutbox
       .getRepository(event.ctx, Order)
       .findOne({
         where: { id: orderId },
-        relations: ["customer", "lines.productVariant"],
+        relations: [
+          "customer",
+          "lines.productVariant",
+          "lines.productVariant.translations",
+        ],
       });
     if (!order) return;
 
@@ -177,7 +189,11 @@ export class JarShopOrderEmailLifecycleOutbox
         shippingWithTax: order.shippingWithTax,
         historyEntryId: String(event.entity.id),
         shippingCancelled: input.data.shippingCancelled,
-        lines: toEmailLineSnapshots(order.lines, input.data.lines),
+        lines: toEmailLineSnapshots(
+          order.lines,
+          input.data.lines,
+          identity.languageCode,
+        ),
       },
     });
     await this.insertOnce(event.ctx, delivery);
@@ -293,6 +309,7 @@ export function toEmailLineSnapshots(
     orderLineId: string | number;
     quantity: number;
   }>,
+  languageCode: string,
 ): OrderEmailLineSnapshot[] {
   return eventLines.map((eventLine) => {
     const orderLine = orderLines.find(
@@ -302,7 +319,10 @@ export function toEmailLineSnapshots(
       throw new Error("order lifecycle email line is missing");
     }
     return {
-      name: orderLine.productVariant.name,
+      name: resolveLocalizedVariantName(
+        orderLine.productVariant.translations,
+        languageCode,
+      ),
       quantity: eventLine.quantity,
       totalWithTax: Math.round(
         orderLine.proratedUnitPriceWithTax * eventLine.quantity,

package/dist/template/src/plugins/jarshop-checkout/order-lifecycle-core.ts

@@ -105,6 +105,27 @@ export function toFulfillmentLifecycleEmailKind(
   return undefined;
 }
 
+export function resolveLocalizedVariantName(
+  translations: ReadonlyArray<{
+    languageCode: string;
+    name: string;
+  }>,
+  languageCode: string,
+): string {
+  const preferredLanguages = [languageCode, "en"];
+  for (const preferredLanguage of preferredLanguages) {
+    const name = translations.find(
+      (translation) => translation.languageCode === preferredLanguage,
+    )?.name;
+    if (name?.trim()) return name;
+  }
+  const fallbackName = translations.find((translation) =>
+    Boolean(translation.name.trim()),
+  )?.name;
+  if (fallbackName) return fallbackName;
+  throw new Error("order lifecycle email variant translation is missing");
+}
+
 function coverageByOrderLine(lines: readonly FulfillmentCoverage[]) {
   const coverage = new Map<string, number>();
   for (const line of lines) {

package/dist/template-manifest.json

@@ -1,3 +1,3 @@
 {
-  "digest": "sha256:5bad80f81fba2cb39efa1328b8d0555b44e74dabce6f4b0951f48a71b3b3cc69"
+  "digest": "sha256:a5012d75c71197626051c3e3150d6a9974a18576481c9f14fd7b1144b6b9724b"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jarwizz/create-jarshop",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "private": false,
   "description": "Generate an independent JarShop Client Project.",
   "license": "MIT",