@unchainedshop/platform 3.0.0-alpha7 → 3.0.0-rc2

package/src/templates/order-parser/getOrderPositionsData.ts

@@ -1,12 +1,13 @@
 import { UnchainedCore } from '@unchainedshop/core';
 import { Order } from '@unchainedshop/core-orders';
 import formatPrice from './formatPrice.js';
+import { ProductPricingSheet } from '@unchainedshop/core';
 
 type PriceFormatter = ({ amount, currency }: { amount: number; currency: string }) => string;
 
 export const getOrderPositionsData = async (
   order: Order,
-  params: { locale?: Intl.Locale; useNetPrice?: boolean; format?: PriceFormatter },
+  params: { locale?: string; useNetPrice?: boolean; format?: PriceFormatter },
   context: UnchainedCore,
 ) => {
   const { modules } = context;
@@ -19,18 +20,15 @@ export const getOrderPositionsData = async (
     orderPositions.map(async (orderPosition) => {
       const productTexts = await modules.products.texts.findLocalizedText({
         productId: orderPosition.productId,
-        locale: params.locale?.baseName,
+        locale: params.locale,
       });
-      const originalProductTexts = await modules.products.texts.findLocalizedText({
-        productId: orderPosition.originalProductId,
-        locale: params.locale?.baseName,
+
+      const positionPricing = ProductPricingSheet({
+        calculation: orderPosition.calculation,
+        currency: order.currency,
+        quantity: orderPosition.quantity,
       });
 
-      const positionPricing = modules.orders.positions.pricingSheet(
-        orderPosition,
-        order.currency,
-        context,
-      );
       const total = positionPricing.total({ useNetPrice });
       const unitPrice = positionPricing.unitPrice({ useNetPrice });
 
@@ -38,7 +36,6 @@ export const getOrderPositionsData = async (
       return {
         productId: orderPosition.productId,
         configuration: orderPosition.configuration,
-        originalProductTexts,
         productTexts,
         quantity,
         rawPrices: {

package/src/templates/order-parser/getOrderSummaryData.ts

@@ -1,6 +1,5 @@
-import { UnchainedCore } from '@unchainedshop/core';
 import { Order } from '@unchainedshop/core-orders';
-import { OrderPricingRowCategory } from '@unchainedshop/core-orders';
+import { UnchainedCore, OrderPricingSheet, OrderPricingRowCategory } from '@unchainedshop/core';
 import formatPrice from './formatPrice.js';
 import { formatAddress } from './formatAddress.js';
 
@@ -8,7 +7,7 @@ type PriceFormatter = ({ amount, currency }: { amount: number; currency: string
 
 export const getOrderSummaryData = async (
   order: Order,
-  params: { locale?: Intl.Locale; useNetPrice?: boolean; format?: PriceFormatter },
+  params: { locale?: string; useNetPrice?: boolean; format?: PriceFormatter },
   context: UnchainedCore,
 ) => {
   const { modules } = context;
@@ -28,7 +27,10 @@ export const getOrderSummaryData = async (
 
   const deliveryAddress = formatAddress(orderDelivery?.context?.deliveryAddress || order.billingAddress);
   const billingAddress = formatAddress(order.billingAddress);
-  const orderPricing = modules.orders.pricingSheet(order);
+  const orderPricing = OrderPricingSheet({
+    calculation: order.calculation,
+    currency: order.currency,
+  });
 
   const paymentTotal = orderPricing.total({
     category: OrderPricingRowCategory.Payment,

package/src/templates/order-parser/index.ts

@@ -1,3 +1,4 @@
+import { Order } from '@unchainedshop/core-orders';
 import { getOrderPositionsData } from './getOrderPositionsData.js';
 import { getOrderSummaryData } from './getOrderSummaryData.js';
 
@@ -31,7 +32,10 @@ Total: {{summary.prices.gross}}
 {{/summary.rawPrices.taxes.amount}}
 `;
 
-export const transformOrderToText = async ({ order, locale }, context) => {
+export const transformOrderToText = async (
+  { order, locale }: { order: Order; locale: string },
+  context,
+) => {
   const { modules } = context;
   const data = {
     orderDate: new Date(order.ordered).toLocaleString(),

package/src/templates/resolveAccountActionTemplate.ts

@@ -1,4 +1,4 @@
-import { TemplateResolver } from '@unchainedshop/core-messaging';
+import { TemplateResolver } from '@unchainedshop/core';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_URL, EMAIL_WEBSITE_NAME } = process.env;
 

package/src/templates/resolveEnrollmentStatusTemplate.ts

@@ -1,4 +1,4 @@
-import { TemplateResolver } from '@unchainedshop/core-messaging';
+import { TemplateResolver } from '@unchainedshop/core';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
 

package/src/templates/resolveErrorReportTemplate.ts

@@ -1,4 +1,4 @@
-import { TemplateResolver } from '@unchainedshop/core-messaging';
+import { TemplateResolver } from '@unchainedshop/core';
 import util from 'util';
 
 const {

package/src/templates/resolveForwardDeliveryTemplate.ts

@@ -1,4 +1,4 @@
-import { TemplateResolver } from '@unchainedshop/core-messaging';
+import { TemplateResolver } from '@unchainedshop/core';
 import { systemLocale } from '@unchainedshop/utils';
 import { transformOrderToText } from './order-parser/index.js';
 
@@ -28,7 +28,7 @@ export const resolveForwardDeliveryTemplate: TemplateResolver = async ({ config,
   const data = {
     shopName: EMAIL_WEBSITE_NAME,
     shopUrl: EMAIL_WEBSITE_URL,
-    orderDetails: await transformOrderToText({ order, locale: systemLocale }, context),
+    orderDetails: await transformOrderToText({ order, locale: systemLocale.baseName }, context),
   };
 
   return [

package/src/templates/resolveOrderConfirmationTemplate.ts

@@ -1,4 +1,4 @@
-import { TemplateResolver } from '@unchainedshop/core-messaging';
+import { TemplateResolver } from '@unchainedshop/core';
 import { transformOrderToText } from './order-parser/index.js';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
@@ -11,10 +11,10 @@ Thank you very much for your order.
 {{shopName}}: {{shopUrl}}
 `;
 
-export const resolveOrderConfirmationTemplate: TemplateResolver = async (
-  { orderId, locale },
-  context,
-) => {
+export const resolveOrderConfirmationTemplate: TemplateResolver<{
+  orderId: string;
+  locale: string;
+}> = async ({ orderId, locale }, context) => {
   const { modules } = context;
   const order = await modules.orders.findOrder({ orderId });
 

package/src/templates/resolveOrderRejectionTemplate.ts

@@ -1,4 +1,4 @@
-import { TemplateResolver } from '@unchainedshop/core-messaging';
+import { TemplateResolver } from '@unchainedshop/core';
 import { transformOrderToText } from './order-parser/index.js';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;

package/src/templates/resolveQuotationStatusTemplate.ts

@@ -1,4 +1,4 @@
-import { TemplateResolver } from '@unchainedshop/core-messaging';
+import { TemplateResolver } from '@unchainedshop/core';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
 

package/tsconfig.json

@@ -1,11 +1,9 @@
 {
   "extends": "../shared/base.tsconfig.json",
   "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "lib",
+    "declarationDir": "./lib",
+    "rootDir": "./src",
+    "outDir": "./lib"
   },
-  "exclude": ["**/*.test.ts", "**/*.test.js", "tests"],
-  "include": [
-    "./src"
-  ]
-}
+  "exclude": ["**/*.test.ts", "**/*.test.js", "tests", "lib"]
+}