@reactionary/provider-commercetools 0.3.17 → 0.3.18

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@reactionary/provider-commercetools",
-  "version": "0.3.17",
+  "version": "0.3.18",
   "main": "index.js",
   "types": "src/index.d.ts",
   "dependencies": {
-    "@reactionary/core": "0.3.17",
+    "@reactionary/core": "0.3.18",
     "debug": "^4.4.3",
     "zod": "4.1.9",
     "@commercetools/ts-client": "^4.2.1",

package/providers/cart.provider.js

@@ -32,6 +32,7 @@ import { CommercetoolsCartIdentifierSchema } from "../schema/commercetools.schem
 class CommercetoolsCartProvider extends CartProvider {
   constructor(config, cache, context, commercetools) {
     super(cache, context);
+    this.expandedCartFields = ["discountCodes[*].discountCode"];
     this.config = config;
     this.commercetools = commercetools;
   }
@@ -39,7 +40,13 @@ class CommercetoolsCartProvider extends CartProvider {
     const client = await this.getClient();
     const ctId = payload.cart;
     try {
-      const remote = await client.carts.withId({ ID: ctId.key }).get().execute();
+      const remote = await client.carts.withId({ ID: ctId.key }).get(
+        {
+          queryArgs: {
+            expand: this.expandedCartFields
+          }
+        }
+      ).execute();
       return success(this.parseSingle(remote.body));
     } catch (err) {
       return error({
@@ -53,6 +60,7 @@ class CommercetoolsCartProvider extends CartProvider {
     if (!cartIdentifier) {
       cartIdentifier = await this.createCart();
     }
+    const channelId = await this.commercetools.resolveChannelIdByRole("Primary");
     const result = await this.applyActions(cartIdentifier, [
       {
         action: "addLineItem",
@@ -61,7 +69,7 @@ class CommercetoolsCartProvider extends CartProvider {
         // FIXME: This should be dynamic, probably as part of the context...
         distributionChannel: {
           typeId: "channel",
-          key: "OnlineFfmChannel"
+          id: channelId
         }
       },
       {
@@ -142,11 +150,21 @@ class CommercetoolsCartProvider extends CartProvider {
     return success(result);
   }
   async removeCouponCode(payload) {
+    const client = await this.getClient();
+    const currentCart = await client.carts.withId({ ID: payload.cart.key }).get({
+      queryArgs: {
+        expand: this.expandedCartFields
+      }
+    }).execute();
+    const discountCodeReference = currentCart.body.discountCodes?.find((dc) => dc.discountCode.obj?.code === payload.couponCode)?.discountCode;
+    if (!discountCodeReference) {
+      return success(this.parseSingle(currentCart.body));
+    }
     const result = await this.applyActions(payload.cart, [
       {
         action: "removeDiscountCode",
         discountCode: {
-          id: payload.couponCode,
+          id: discountCodeReference.id,
           typeId: "discount-code"
         }
       },
@@ -197,6 +215,9 @@ class CommercetoolsCartProvider extends CartProvider {
         currency: this.context.languageContext.currencyCode || "USD",
         country: this.context.taxJurisdiction.countryCode || "US",
         locale: this.context.languageContext.locale
+      },
+      queryArgs: {
+        expand: this.expandedCartFields
       }
     }).execute();
     return CommercetoolsCartIdentifierSchema.parse({
@@ -212,6 +233,9 @@ class CommercetoolsCartProvider extends CartProvider {
         body: {
           version: ctId.version,
           actions
+        },
+        queryArgs: {
+          expand: this.expandedCartFields
         }
       }).execute();
       if (response.error) {
@@ -242,7 +266,13 @@ class CommercetoolsCartProvider extends CartProvider {
   parseCartItem(remoteItem) {
     const unitPrice = remoteItem.price.value.centAmount;
     const totalPrice = remoteItem.totalPrice.centAmount || 0;
-    const totalDiscount = remoteItem.price.discounted?.value.centAmount || 0;
+    let itemDiscount = 0;
+    if (remoteItem.discountedPricePerQuantity && remoteItem.discountedPricePerQuantity.length > 0) {
+      itemDiscount = remoteItem.discountedPricePerQuantity.reduce((sum, discPrQty) => {
+        return sum + discPrQty.quantity * discPrQty.discountedPrice?.includedDiscounts?.reduce((sum2, discount) => sum2 + discount.discountedAmount.centAmount, 0) || 0;
+      }, 0);
+    }
+    const totalDiscount = (remoteItem.price.discounted?.value.centAmount || 0) + itemDiscount;
     const unitDiscount = totalDiscount / remoteItem.quantity;
     const currency = remoteItem.price.value.currencyCode.toUpperCase();
     const item = {
@@ -282,11 +312,16 @@ class CommercetoolsCartProvider extends CartProvider {
       key: remote.id,
       version: remote.version || 0
     };
+    const items = new Array();
+    for (const remoteItem of remote.lineItems) {
+      const item = this.parseCartItem(remoteItem);
+      items.push(item);
+    }
     const grandTotal = remote.totalPrice.centAmount || 0;
     const shippingTotal = remote.shippingInfo?.price.centAmount || 0;
     const productTotal = grandTotal - shippingTotal;
     const taxTotal = remote.taxedPrice?.totalTax?.centAmount || 0;
-    const discountTotal = remote.discountOnTotalPrice?.discountedAmount.centAmount || 0;
+    const discountTotal = (remote.discountOnTotalPrice?.discountedAmount.centAmount || 0) + items.reduce((sum, item) => sum + (item.price.totalDiscount.value * 100 || 0), 0);
     const surchargeTotal = 0;
     const currency = remote.totalPrice.currencyCode;
     const price = {
@@ -315,10 +350,17 @@ class CommercetoolsCartProvider extends CartProvider {
         currency
       }
     };
-    const items = new Array();
-    for (const remoteItem of remote.lineItems) {
-      const item = this.parseCartItem(remoteItem);
-      items.push(item);
+    const localeString = this.context.languageContext.locale || "en";
+    const appliedPromotions = [];
+    if (remote.discountCodes) {
+      for (const promo of remote.discountCodes) {
+        appliedPromotions.push({
+          code: promo.discountCode.obj?.code || "",
+          isCouponCode: true,
+          name: promo.discountCode.obj?.name?.[localeString] || "",
+          description: promo.discountCode.obj?.description?.[localeString] || ""
+        });
+      }
     }
     const cart = {
       identifier,
@@ -328,6 +370,7 @@ class CommercetoolsCartProvider extends CartProvider {
       name: remote.custom?.fields["name"] || "",
       description: remote.custom?.fields["description"] || "",
       price,
+      appliedPromotions,
       items
     };
     return cart;
@@ -364,8 +407,7 @@ __decorateClass([
 ], CommercetoolsCartProvider.prototype, "getActiveCartId", 1);
 __decorateClass([
   Reactionary({
-    inputSchema: CartMutationDeleteCartSchema,
-    outputSchema: CartSchema
+    inputSchema: CartMutationDeleteCartSchema
   })
 ], CommercetoolsCartProvider.prototype, "deleteCart", 1);
 __decorateClass([

package/src/providers/cart.provider.d.ts

@@ -6,6 +6,7 @@ import type { CommercetoolsAPI } from '../core/client.js';
 export declare class CommercetoolsCartProvider extends CartProvider {
     protected config: CommercetoolsConfiguration;
     protected commercetools: CommercetoolsAPI;
+    protected expandedCartFields: string[];
     constructor(config: CommercetoolsConfiguration, cache: Cache, context: RequestContext, commercetools: CommercetoolsAPI);
     getById(payload: CartQueryById): Promise<Result<Cart, NotFoundError>>;
     add(payload: CartMutationItemAdd): Promise<Result<Cart>>;