@unchainedshop/plugins 1.2.11 → 1.2.12

package/src/payment/postfinance-checkout/silence-postfinancecheckout.d.ts

@@ -0,0 +1,33 @@
+export declare namespace PostFinanceCheckout {
+  namespace model {
+    const Transaction;
+    type Transaction = any;
+    const TransactionCompletion;
+    type TransactionCompletion = any;
+    const Token;
+    type Token = any;
+    const TransactionCreate;
+    type TransactionCreate = any;
+    const RefundCreate;
+    type RefundCreate = any;
+    const TransactionState: any;
+    const LineItemType: any;
+    const LineItemCreate: any;
+    const RefundType: any;
+    const CreationEntityState: any;
+    const TokenizationMode: any;
+    const TransactionCompletionBehavior: any;
+    const TransactionCompletionBehavior: any;
+  }
+  namespace api {
+    const [string]: any;
+    const TransactionService: any;
+    const TransactionCompletionService: any;
+    const TransactionVoidService: any;
+    const RefundService: any;
+    const TransactionPaymentPageService: any;
+    const TransactionIframeService: any;
+    const TransactionLightboxService: any;
+    const TokenService: any;
+  }
+}

package/src/payment/postfinance-checkout/utils.ts

@@ -1,20 +1,21 @@
 import { Order, OrdersModule } from '@unchainedshop/types/orders';
-import { Transaction } from 'postfinancecheckout/src/models/Transaction';
-import { TransactionState } from 'postfinancecheckout/src/models/TransactionState';
+import * as pf from 'postfinancecheckout';
+
+const { PostFinanceCheckout } = pf;
 
 export const transactionIsPaid = async (
-  transaction: Transaction,
+  transaction: pf.PostFinanceCheckout.model.Transaction,
   expectedCurrency: string,
   expectedAmount: number,
 ): Promise<boolean> => {
-  if (transaction.state === TransactionState.FULFILL) {
+  if (transaction.state === PostFinanceCheckout.model.TransactionState.FULFILL) {
     return (
       transaction.completedAmount !== undefined &&
       transaction.completedAmount.toFixed(2) === expectedAmount.toFixed(2) &&
       transaction.currency === expectedCurrency
     );
   }
-  if (transaction.state === TransactionState.AUTHORIZED) {
+  if (transaction.state === PostFinanceCheckout.model.TransactionState.AUTHORIZED) {
     return (
       transaction.authorizationAmount !== undefined &&
       transaction.authorizationAmount.toFixed(2) === expectedAmount.toFixed(2) &&
@@ -26,7 +27,7 @@ export const transactionIsPaid = async (
 
 export const orderIsPaid = async (
   order: Order,
-  transaction: Transaction,
+  transaction: pf.PostFinanceCheckout.model.Transaction,
   orderModule: OrdersModule,
 ): Promise<boolean> => {
   const pricing = orderModule.pricingSheet(order);

package/src/payment/stripe.ts

@@ -25,6 +25,8 @@ const {
   STRIPE_WEBHOOK_PATH = '/payment/stripe',
 } = process.env;
 
+// eslint-disable-next-line
+// @ts-ignore
 const stripe = createStripeClient(STRIPE_SECRET);
 
 export default (app) => {

package/src/payment/worldline-saferpay/index.ts

@@ -1,4 +1,4 @@
-import { IPaymentAdapter } from '@unchainedshop/types/payments';
+import { IPaymentAdapter, PaymentChargeActionResult } from '@unchainedshop/types/payments';
 import { PaymentAdapter, PaymentDirector, PaymentError } from '@unchainedshop/core-payment';
 import { PaymentPageInitializeInput, SaferpayClient } from './worldline-saferpay-client';
 
@@ -103,13 +103,16 @@ const WordlineSaferpay: IPaymentAdapter = {
           RequestHeader: saferpayClient.buildRequestHeader(orderPayment._id, 0),
           Token: transactionId,
         });
-        return (
+        const success =
           !paymentPageAssert.ErrorMessage &&
           paymentPageAssert.Transaction.Amount.Value === totalAmount.toString() &&
           paymentPageAssert.Transaction.Amount.CurrencyCode === order.currency &&
           (paymentPageAssert.Transaction.Status === 'AUTHORIZED' ||
-            paymentPageAssert.Transaction.Status === 'CAPTURED')
-        );
+            paymentPageAssert.Transaction.Status === 'CAPTURED');
+        if (success) {
+          return paymentPageAssert.Transaction as PaymentChargeActionResult;
+        }
+        return false;
       },
 
       cancel: async () => {

package/src/pricing/delivery-swiss-tax.ts

@@ -1,4 +1,3 @@
-import moment from 'moment';
 import { DeliveryPricingAdapter, DeliveryPricingDirector } from '@unchainedshop/core-delivery';
 import {
   DeliveryPricingAdapterContext,
@@ -8,11 +7,7 @@ import {
 // https://www.ch.ch/de/mehrwertsteuersatz-schweiz/
 export const SwissTaxCategories = {
   DEFAULT: {
-    rate: (date) => {
-      const referenceDate = moment(date);
-      if (referenceDate.isBefore('2018-01-01')) {
-        return 0.08;
-      }
+    rate: () => {
       return 0.077;
     },
   },
@@ -31,9 +26,7 @@ export const SwissTaxCategories = {
 };
 
 const getTaxRate = (context: DeliveryPricingAdapterContext) => {
-  const date = context.order && context.order.ordered ? new Date(context.order.ordered) : new Date();
-
-  const taxCategoryFromProvider = context.deliveryProvider?.configuration?.find(({ key }) => {
+  const taxCategoryFromProvider = context.provider?.configuration?.find(({ key }) => {
     if (key === 'swiss-tax-category') return true;
     return null;
   })?.value;
@@ -44,7 +37,7 @@ const getTaxRate = (context: DeliveryPricingAdapterContext) => {
   if (taxCategoryFromProvider === SwissTaxCategories.SPECIAL.value) {
     return SwissTaxCategories.SPECIAL.rate();
   }
-  return SwissTaxCategories.DEFAULT.rate(date);
+  return SwissTaxCategories.DEFAULT.rate();
 };
 
 const isDeliveryAddressInSwitzerland = ({ orderDelivery, order, country = null }) => {

package/src/pricing/free-delivery.ts

@@ -20,6 +20,8 @@ export const DeliveryFreePrice: IDeliveryPricingAdapter = {
       calculate: async () => {
         pricingAdapter.resultSheet().addFee({
           amount: 0,
+          isTaxable: false,
+          isNetPrice: false,
           meta: { adapter: DeliveryFreePrice.key },
         });
         return pricingAdapter.calculate();

package/src/pricing/free-payment.ts

@@ -21,6 +21,8 @@ export const PaymentFreePrice: IPaymentPricingAdapter = {
       calculate: async () => {
         pricingAdapter.resultSheet().addFee({
           amount: 0,
+          isNetPrice: false,
+          isTaxable: false,
           meta: { adapter: PaymentFreePrice.key },
         });
         return pricingAdapter.calculate();

package/src/pricing/order-discount.ts

@@ -133,6 +133,8 @@ const OrderDiscount: IOrderPricingAdapter = {
             pricingAdapter.resultSheet().addDiscount({
               amount: discountAmount * -1,
               discountId,
+              isTaxable: false,
+              isNetPrice: false,
               meta: {
                 adapter: OrderDiscount.key,
               },

package/src/pricing/order-items-discount.ts

@@ -91,6 +91,8 @@ const OrderItemsDiscount: IOrderPricingAdapter = {
             pricingAdapter.resultSheet().addDiscount({
               amount: discountAmount * -1,
               discountId,
+              isTaxable: false,
+              isNetPrice: false,
               meta: {
                 adapter: OrderItemsDiscount.key,
               },

package/src/pricing/product-swiss-tax.ts

@@ -1,18 +1,12 @@
-import moment from 'moment';
 import { ProductPricingDirector, ProductPricingAdapter } from '@unchainedshop/core-products';
 import {
   IProductPricingAdapter,
   ProductPricingAdapterContext,
 } from '@unchainedshop/types/products.pricing';
 
-// https://www.ch.ch/de/mehrwertsteuersatz-schweiz/
 export const SwissTaxCategories = {
   DEFAULT: {
-    rate: (date) => {
-      const referenceDate = moment(date);
-      if (referenceDate.isBefore('2018-01-01')) {
-        return 0.08;
-      }
+    rate: () => {
       return 0.077;
     },
   },
@@ -31,7 +25,6 @@ export const SwissTaxCategories = {
 };
 
 const getTaxRate = (context: ProductPricingAdapterContext) => {
-  const date = context.order && context.order.ordered ? new Date(context.order.ordered) : new Date();
   const { product } = context;
 
   if (product.tags?.includes(SwissTaxCategories.REDUCED.tag)) {
@@ -40,7 +33,7 @@ const getTaxRate = (context: ProductPricingAdapterContext) => {
   if (product.tags?.includes(SwissTaxCategories.SPECIAL.tag)) {
     return SwissTaxCategories.SPECIAL.rate();
   }
-  return SwissTaxCategories.DEFAULT.rate(date);
+  return SwissTaxCategories.DEFAULT.rate();
 };
 
 const isDeliveryAddressInSwitzerland = async ({ order, country, modules }) => {

package/src/warehousing/store.ts

@@ -21,11 +21,11 @@ const Store: IWarehousingAdapter = {
 
   actions: () => {
     return {
-      isActive: async () => {
+      isActive() {
         return true;
       },
 
-      configurationError: async () => {
+      configurationError() {
         return null;
       },
 

package/src/worker/BulkImportWorker.ts

@@ -5,10 +5,15 @@ import { BaseAdapter } from '@unchainedshop/utils';
 import fs from 'fs';
 import JSONStream from 'JSONStream';
 import { EventIterator } from 'event-iterator';
+import { UnchainedCore } from '@unchainedshop/types/core';
 
 const logger = createLogger('unchained:platform:bulk-import');
 
-const streamPayloadToBulkImporter = async (bulkImporter, createReadStream) => {
+const streamPayloadToBulkImporter = async (
+  bulkImporter,
+  createReadStream,
+  unchainedAPI: UnchainedCore,
+) => {
   logger.profile(`parseAsync`, { level: LogLevel.Verbose, message: 'parseAsync' });
 
   const eventIterator = new EventIterator(
@@ -34,7 +39,7 @@ const streamPayloadToBulkImporter = async (bulkImporter, createReadStream) => {
   );
 
   for await (const event of eventIterator) { // eslint-disable-line
-    await bulkImporter.prepare(event);
+    await bulkImporter.prepare(event, unchainedAPI);
   }
 
   logger.profile(`parseAsync`, { level: LogLevel.Verbose, message: 'parseAsync' });
@@ -48,7 +53,7 @@ export const BulkImportWorker: IWorkerAdapter<any, Record<string, unknown>> = {
   version: '1.0',
   type: 'BULK_IMPORT',
 
-  doWork: async (rawPayload, context) => {
+  doWork: async (rawPayload, unchainedAPI) => {
     try {
       const {
         createShouldUpsertIfIDExists = false,
@@ -56,25 +61,26 @@ export const BulkImportWorker: IWorkerAdapter<any, Record<string, unknown>> = {
         authorId = 'root',
       } = rawPayload;
 
-      const bulkImporter = context.bulkImporter.createBulkImporter(
-        {
-          logger,
-          authorId,
-          createShouldUpsertIfIDExists,
-          skipCacheInvalidation,
-        },
-        context,
-      );
+      const bulkImporter = unchainedAPI.bulkImporter.createBulkImporter({
+        logger,
+        authorId,
+        createShouldUpsertIfIDExists,
+        skipCacheInvalidation,
+      });
 
       if (rawPayload.payloadFilePath) {
         // stream payload from file system
-        await streamPayloadToBulkImporter(bulkImporter, () =>
-          fs.createReadStream(rawPayload.payloadFilePath),
+        await streamPayloadToBulkImporter(
+          bulkImporter,
+          () => fs.createReadStream(rawPayload.payloadFilePath),
+          unchainedAPI,
         );
       } else if (rawPayload.payloadId) {
         // stream payload from gridfs
-        await streamPayloadToBulkImporter(bulkImporter, () =>
-          context.bulkImporter.BulkImportPayloads.openDownloadStream(rawPayload.payloadId),
+        await streamPayloadToBulkImporter(
+          bulkImporter,
+          () => unchainedAPI.bulkImporter.BulkImportPayloads.openDownloadStream(rawPayload.payloadId),
+          unchainedAPI,
         );
       } else {
         const { events } = rawPayload;
@@ -82,12 +88,12 @@ export const BulkImportWorker: IWorkerAdapter<any, Record<string, unknown>> = {
 
         await events.reduce(async (currentEventPromise, nextEvent) => {
           await currentEventPromise;
-          return bulkImporter.prepare(nextEvent);
+          return bulkImporter.prepare(nextEvent, unchainedAPI);
         }, Promise.resolve());
       }
 
       const [result, error] = await bulkImporter.execute();
-      await bulkImporter.invalidateCaches();
+      await bulkImporter.invalidateCaches(unchainedAPI);
 
       if (error) {
         return {

package/src/worker/GenerateOrderWorker.ts

@@ -97,7 +97,7 @@ const GenerateOrderWorker: IWorkerAdapter<any, any> = {
       await Promise.all(
         enrollments.map(async (enrollment) => {
           try {
-            const director = await EnrollmentDirector.actions({ enrollment }, requestContext);
+            const director = await EnrollmentDirector.actions({ enrollment }, requestContext as Context); // TODO: Type Refactor
             const period = await director.nextPeriod();
             if (period) {
               const configuration = await director.configurationForOrder({
@@ -105,7 +105,7 @@ const GenerateOrderWorker: IWorkerAdapter<any, any> = {
                 period,
               });
               if (configuration) {
-                const order = await generateOrder(enrollment, configuration, requestContext);
+                const order = await generateOrder(enrollment, configuration, requestContext as Context); // TODO: Type Refactor
                 if (order) {
                   await modules.enrollments.addEnrollmentPeriod(enrollment._id, {
                     ...period,

package/src/worker/MessageWorker.ts

@@ -2,6 +2,7 @@ import { IWorkerAdapter, Work } from '@unchainedshop/types/worker';
 import { MessagingDirector } from '@unchainedshop/core-messaging';
 import { WorkerAdapter, WorkerDirector } from '@unchainedshop/core-worker';
 import { createLogger } from '@unchainedshop/logger';
+import { Context } from '@unchainedshop/types/api';
 
 export const messagingLogger = createLogger('unchained:core-messaging');
 
@@ -25,7 +26,7 @@ export const MessageWorker: IWorkerAdapter<
           template,
           ...payload,
         },
-        requestContext,
+        requestContext as Context, // TODO: Type Refactor
       );
 
       if (workConfigurations.length > 0) {
@@ -36,7 +37,7 @@ export const MessageWorker: IWorkerAdapter<
                 ...workConfiguration,
                 originalWorkId: workId,
               },
-              requestContext.userId,
+              null,
             );
             delete work.input;
             return work;

package/src/worker/email.ts

@@ -60,7 +60,7 @@ const EmailWorkerPlugin: IWorkerAdapter<
     subject?: string;
     [x: string]: any;
   },
-  void
+  any
 > = {
   ...WorkerAdapter,
 
@@ -94,6 +94,9 @@ const EmailWorkerPlugin: IWorkerAdapter<
         openInBrowser(sendMailOptions);
         return { success: true, result: { intercepted: true } };
       }
+      if (!process.env.MAIL_URL) {
+        return { success: false, error: { name: 'NO_MAIL_URL_SET', message: 'MAIL_URL is not set' } };
+      }
       const transporter = nodemailer.createTransport(process.env.MAIL_URL);
       const result = await transporter.sendMail(sendMailOptions);
       return { success: true, result };

package/tsconfig.json

@@ -6,6 +6,7 @@
     "esModuleInterop": true,
     "experimentalDecorators": true,
     "forceConsistentCasingInFileNames": true,
+    "rootDir": "src",
     "lib": [
       "esnext"
     ],
@@ -21,8 +22,16 @@
     "types": [
       "node",
       "jest"
-    ]
+    ],
+    "paths": {
+      "postfinancecheckout": [
+        "./src/payment/postfinance-checkout/silence-postfinancecheckout.d.ts"
+      ],
+    }
   },
+  // "exclude": [
+  //   "./src/payment/postfinance-checkout/*"
+  // ],
   "include": [
     "src"
   ]