@unchainedshop/core 4.5.0 → 4.6.1

package/lib/services/index.js

@@ -31,7 +31,7 @@ import { initializeEnrollmentService } from "./initializeEnrollment.js";
 import { activateEnrollmentService } from "./activateEnrollment.js";
 import { terminateEnrollmentService } from "./terminateEnrollment.js";
 import { invalidateFilterCacheService } from "./invalidateFilterCache.js";
-import { fullfillQuotationService } from "./fullfillQuotation.js";
+import { fulfillQuotationService } from "./fulfillQuotation.js";
 import { processQuotationService } from "./processQuotation.js";
 import { proposeQuotationService } from "./proposeQuotation.js";
 import { rejectQuotationService } from "./rejectQuotation.js";
@@ -127,7 +127,7 @@ export default function initServices(modules, customServices = {}) {
             terminateEnrollment: terminateEnrollmentService,
         },
         quotations: {
-            fullfillQuotation: fullfillQuotationService,
+            fulfillQuotation: fulfillQuotationService,
             processQuotation: processQuotationService,
             proposeQuotation: proposeQuotationService,
             rejectQuotation: rejectQuotationService,

package/lib/services/processOrder.js

@@ -3,14 +3,16 @@ import { createEnrollmentFromCheckoutService } from "./createEnrollmentFromCheck
 import { ProductType } from '@unchainedshop/core-products';
 import { WarehousingProviderType } from '@unchainedshop/core-warehousing';
 import { WarehousingDirector, DeliveryDirector, PaymentDirector } from "../directors/index.js";
-import { fullfillQuotationService } from "./fullfillQuotation.js";
+import { fulfillQuotationService } from "./fulfillQuotation.js";
+import { createLogger } from '@unchainedshop/logger';
+const logger = createLogger('unchained:core:processOrder');
 const isAutoConfirmationEnabled = async ({ orderPayment, orderDelivery, }, modules) => {
     if (orderPayment.status !== OrderPaymentStatus.PAID) {
         const paymentProvider = await modules.payment.paymentProviders.findProvider({
             paymentProviderId: orderPayment.paymentProviderId,
         });
         if (!paymentProvider)
-            throw new Error('Payment provider not found: ' + orderPayment.paymentProviderId);
+            throw new Error(`Payment provider not found: ${orderPayment.paymentProviderId}`);
         const actions = await PaymentDirector.actions(paymentProvider, {}, { modules });
         if (!actions.isPayLaterAllowed())
             return false;
@@ -20,7 +22,7 @@ const isAutoConfirmationEnabled = async ({ orderPayment, orderDelivery, }, modul
             deliveryProviderId: orderDelivery.deliveryProviderId,
         });
         if (!deliveryProvider)
-            throw new Error('Delivery provider not found: ' + orderDelivery.deliveryProviderId);
+            throw new Error(`Delivery provider not found: ${orderDelivery.deliveryProviderId}`);
         const director = await DeliveryDirector.actions(deliveryProvider, {}, { modules });
         if (!director.isAutoReleaseAllowed())
             return false;
@@ -31,7 +33,7 @@ const findNextStatus = async (status, order, modules) => {
     if (status === null) {
         return OrderStatus.PENDING;
     }
-    if (status === OrderStatus.FULLFILLED || status === OrderStatus.REJECTED) {
+    if (status === OrderStatus.FULFILLED || status === OrderStatus.REJECTED) {
         return status;
     }
     const orderPayment = order.paymentId &&
@@ -52,10 +54,10 @@ const findNextStatus = async (status, order, modules) => {
         }
     }
     if (status === OrderStatus.CONFIRMED) {
-        const readyForFullfillment = orderDelivery.status === OrderDeliveryStatus.DELIVERED &&
+        const readyForFulfillment = orderDelivery.status === OrderDeliveryStatus.DELIVERED &&
             orderPayment.status === OrderPaymentStatus.PAID;
-        if (readyForFullfillment) {
-            return OrderStatus.FULLFILLED;
+        if (readyForFulfillment) {
+            return OrderStatus.FULFILLED;
         }
     }
     return status;
@@ -125,9 +127,15 @@ export async function processOrderService(initialOrder, orderTransactionContext)
                 const quotation = await this.quotations.findQuotation({
                     quotationId: orderPosition.quotationId,
                 });
-                if (!quotation)
+                if (!quotation) {
+                    logger.warn('Quotation not found during order fulfillment', {
+                        orderId,
+                        orderPositionId: orderPosition._id,
+                        quotationId: orderPosition.quotationId,
+                    });
                     return;
-                await fullfillQuotationService.bind(this)(quotation, {
+                }
+                await fulfillQuotationService.bind(this)(quotation, {
                     orderId,
                     orderPositionId: orderPosition._id,
                 });

package/lib/services/rejectQuotation.js

@@ -1,7 +1,7 @@
 import { QuotationStatus } from '@unchainedshop/core-quotations';
 import { processQuotationService } from "./processQuotation.js";
 export async function rejectQuotationService(quotation, { quotationContext }) {
-    if (quotation.status === QuotationStatus.FULLFILLED)
+    if (quotation.status === QuotationStatus.FULFILLED)
         return quotation;
     const updatedQuotation = (await this.quotations.updateStatus(quotation._id, {
         status: QuotationStatus.REJECTED,

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@unchainedshop/core",
-  "version": "4.5.0",
+  "description": "Core orchestration package for the Unchained Engine with business services and directors",
+  "version": "4.6.1",
   "main": "lib/core-index.js",
   "types": "lib/core-index.d.ts",
   "type": "module",
@@ -34,25 +35,25 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/core-assortments": "^4.5.0",
-    "@unchainedshop/core-bookmarks": "^4.5.0",
-    "@unchainedshop/core-countries": "^4.5.0",
-    "@unchainedshop/core-currencies": "^4.5.0",
-    "@unchainedshop/core-delivery": "^4.5.0",
-    "@unchainedshop/core-enrollments": "^4.5.0",
-    "@unchainedshop/core-events": "^4.5.0",
-    "@unchainedshop/core-files": "^4.5.0",
-    "@unchainedshop/core-filters": "^4.5.0",
-    "@unchainedshop/core-languages": "^4.5.0",
-    "@unchainedshop/core-orders": "^4.5.0",
-    "@unchainedshop/core-payment": "^4.5.0",
-    "@unchainedshop/core-products": "^4.5.0",
-    "@unchainedshop/core-quotations": "^4.5.0",
-    "@unchainedshop/core-users": "^4.5.0",
-    "@unchainedshop/core-warehousing": "^4.5.0",
-    "@unchainedshop/core-worker": "^4.5.0",
-    "@unchainedshop/logger": "^4.5.0",
-    "@unchainedshop/utils": "^4.5.0",
+    "@unchainedshop/core-assortments": "^4.6.0",
+    "@unchainedshop/core-bookmarks": "^4.6.0",
+    "@unchainedshop/core-countries": "^4.6.0",
+    "@unchainedshop/core-currencies": "^4.6.0",
+    "@unchainedshop/core-delivery": "^4.6.0",
+    "@unchainedshop/core-enrollments": "^4.6.0",
+    "@unchainedshop/core-events": "^4.6.0",
+    "@unchainedshop/core-files": "^4.6.0",
+    "@unchainedshop/core-filters": "^4.6.0",
+    "@unchainedshop/core-languages": "^4.6.0",
+    "@unchainedshop/core-orders": "^4.6.0",
+    "@unchainedshop/core-payment": "^4.6.0",
+    "@unchainedshop/core-products": "^4.6.0",
+    "@unchainedshop/core-quotations": "^4.6.0",
+    "@unchainedshop/core-users": "^4.6.0",
+    "@unchainedshop/core-warehousing": "^4.6.0",
+    "@unchainedshop/core-worker": "^4.6.0",
+    "@unchainedshop/logger": "^4.6.0",
+    "@unchainedshop/utils": "^4.6.0",
     "minipass-json-stream": "^1.0.2"
   },
   "devDependencies": {

package/lib/services/fullfillQuotation.d.ts

@@ -1,3 +0,0 @@
-import { type Quotation } from '@unchainedshop/core-quotations';
-import type { Modules } from '../modules.ts';
-export declare function fullfillQuotationService(this: Modules, quotation: Quotation, info: any): Promise<Quotation>;