washday-sdk 1.6.69 → 1.6.70

package/dist/api/discounts/get.js

@@ -75,13 +75,27 @@ export const getAutomaticDiscountById = function (storeId, discountId) {
         }
     });
 };
-export const verifyDiscountCode = function (storeId, code) {
+const buildVerifyQueryString = (params) => {
+    if (!params)
+        return '';
+    const entries = [];
+    if (params.currentDate)
+        entries.push(`currentDate=${encodeURIComponent(params.currentDate)}`);
+    if (params.orderSubtotal !== undefined &&
+        params.orderSubtotal !== null &&
+        Number.isFinite(Number(params.orderSubtotal))) {
+        entries.push(`orderSubtotal=${encodeURIComponent(String(params.orderSubtotal))}`);
+    }
+    return entries.length ? `?${entries.join('&')}` : '';
+};
+export const verifyDiscountCode = function (storeId, code, params) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             const config = {
                 headers: { Authorization: `Bearer ${this.apiToken}` }
             };
-            return yield this.axiosInstance.get(`${GET_SET_DISCOUNT_CODES}/${storeId}/${code}/verify`, config);
+            const qs = buildVerifyQueryString(params);
+            return yield this.axiosInstance.get(`${GET_SET_DISCOUNT_CODES}/${storeId}/${code}/verify${qs}`, config);
         }
         catch (error) {
             console.error('Error fetching verifyDiscountCode:', error);
@@ -89,13 +103,14 @@ export const verifyDiscountCode = function (storeId, code) {
         }
     });
 };
-export const verifyDiscountCodeCustomersApp = function (storeId, code) {
+export const verifyDiscountCodeCustomersApp = function (storeId, code, params) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             const config = {
                 headers: { Authorization: `Bearer ${this.apiToken}` }
             };
-            return yield this.axiosInstance.get(`${GET_DISCOUNT_CODES_CUSTOMER_APP}/${storeId}/${code}/verify`, config);
+            const qs = buildVerifyQueryString(params);
+            return yield this.axiosInstance.get(`${GET_DISCOUNT_CODES_CUSTOMER_APP}/${storeId}/${code}/verify${qs}`, config);
         }
         catch (error) {
             console.error('Error fetching verifyDiscountCodeCustomersApp:', error);

package/dist/utils/orders/calculateOrderTotal.js

@@ -38,7 +38,7 @@ const hasMatchingDiscountTarget = (targets = [], product) => {
 };
 export const calculateOrderTotal = (order, selectedCustomer, storeSettings, hasShippingCost, storeDiscounts = [], discountCodeObj, redeemPointsDiscount = 0 // 💡 NUEVO parámetro
 ) => {
-    var _a;
+    var _a, _b, _c;
     try {
         const appliedOrderDiscounts = {};
         const productTableCalculator = (storeSettings === null || storeSettings === void 0 ? void 0 : storeSettings.taxesType) === 'over_price'
@@ -54,7 +54,11 @@ export const calculateOrderTotal = (order, selectedCustomer, storeSettings, hasS
             discountCodeObj.applyOnceOnOrder) {
             const includesProducts = discountCodeObj.applyToAllProducts ||
                 order.products.some((curr) => hasMatchingDiscountTarget(discountCodeObj.products, curr));
-            discountCodeAmount = includesProducts ? discountCodeObj.value : 0;
+            const minimumOrderSubtotal = Number((_a = discountCodeObj.minimumOrderSubtotal) !== null && _a !== void 0 ? _a : 0);
+            const meetsMinimum = !Number.isFinite(minimumOrderSubtotal) ||
+                minimumOrderSubtotal <= 0 ||
+                Number((_b = totalImportWithoutDiscount !== null && totalImportWithoutDiscount !== void 0 ? totalImportWithoutDiscount : totalSubtotalAmount) !== null && _b !== void 0 ? _b : 0) >= minimumOrderSubtotal;
+            discountCodeAmount = includesProducts && meetsMinimum ? discountCodeObj.value : 0;
         }
         // === SHIPPING COST ===
         const shippingCost = getShippingCost(discountCodeObj, hasShippingCost, storeSettings);
@@ -68,7 +72,7 @@ export const calculateOrderTotal = (order, selectedCustomer, storeSettings, hasS
             creditApplied -
             redeemPointsDiscount).toFixed(2);
         // === RETURN FINAL OBJECT ===
-        return Object.assign(Object.assign({}, order), { totalQuantity, customerDiscount: order.discountCode ? 0 : (_a = selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.customer) === null || _a === void 0 ? void 0 : _a.discount, productTotal: totalImportWithDiscount, taxesTotal: totalImporTaxes, taxBreakdown, total: orderTotal, creditApplied, redeemPointsApplied: redeemPointsDiscount, productTotalWithoutDiscount: totalImportWithoutDiscount, totalDiscountAmount: totalDiscountAmount + discountCodeAmount, shippingServiceTotal: shippingCost, appliedOrderDiscounts, subtotal: totalSubtotalAmount });
+        return Object.assign(Object.assign({}, order), { totalQuantity, customerDiscount: order.discountCode ? 0 : (_c = selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.customer) === null || _c === void 0 ? void 0 : _c.discount, productTotal: totalImportWithDiscount, taxesTotal: totalImporTaxes, taxBreakdown, total: orderTotal, creditApplied, redeemPointsApplied: redeemPointsDiscount, productTotalWithoutDiscount: totalImportWithoutDiscount, totalDiscountAmount: totalDiscountAmount + discountCodeAmount, shippingServiceTotal: shippingCost, appliedOrderDiscounts, subtotal: totalSubtotalAmount });
     }
     catch (error) {
         throw error;

package/dist/utils/orders/helpers.js

@@ -225,7 +225,28 @@ export const getCreditApplied = (selectedCustomer, orderTotal) => {
     }
     return Math.min(customerCredit, orderTotal);
 };
+const productsMeetMinimumSubtotal = (productsArr, isExpress, minimumOrderSubtotal) => {
+    if (!Number.isFinite(minimumOrderSubtotal) || minimumOrderSubtotal <= 0)
+        return true;
+    const subtotal = (productsArr || []).reduce((sum, prod) => {
+        var _a, _b, _c, _d, _e;
+        if (!prod || prod.isBuyAndGetProduct || prod.isFreeItem)
+            return sum;
+        const price = Number((_b = (_a = (isExpress ? prod.expressPrice : prod.price)) !== null && _a !== void 0 ? _a : prod.price) !== null && _b !== void 0 ? _b : 0);
+        const qty = Number((_d = (_c = prod.quantity) !== null && _c !== void 0 ? _c : prod.qty) !== null && _d !== void 0 ? _d : 0);
+        const extra = Number((_e = prod.extraAmount) !== null && _e !== void 0 ? _e : 0);
+        if (!Number.isFinite(price) || !Number.isFinite(qty))
+            return sum;
+        return sum + price * qty + (Number.isFinite(extra) ? extra : 0);
+    }, 0);
+    return subtotal >= minimumOrderSubtotal;
+};
 export const applyDiscountToProducts = (discountCode, productsArr, isExpress, storeDiscounts = [], selectedCustomer = { discount: 0 }) => {
+    var _a;
+    if (discountCode &&
+        !productsMeetMinimumSubtotal(productsArr, isExpress, Number((_a = discountCode.minimumOrderSubtotal) !== null && _a !== void 0 ? _a : 0))) {
+        discountCode = null;
+    }
     if (!discountCode) {
         // Caso sin discountCode: se aplican descuentos automáticos solo sobre el precio del producto
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "washday-sdk",
-  "version": "1.6.69",
+  "version": "1.6.70",
   "description": "Washday utilities functions and API",
   "main": "dist/index.js",
   "type": "module",

package/src/api/discounts/get.ts

@@ -63,24 +63,50 @@ export const getAutomaticDiscountById = async function (this: WashdayClientInsta
   }
 };
 
-export const verifyDiscountCode = async function (this: WashdayClientInstance, storeId: string, code: string,): Promise<any> {
+const buildVerifyQueryString = (params?: { orderSubtotal?: number; currentDate?: string }): string => {
+  if (!params) return '';
+  const entries: string[] = [];
+  if (params.currentDate) entries.push(`currentDate=${encodeURIComponent(params.currentDate)}`);
+  if (
+    params.orderSubtotal !== undefined &&
+    params.orderSubtotal !== null &&
+    Number.isFinite(Number(params.orderSubtotal))
+  ) {
+    entries.push(`orderSubtotal=${encodeURIComponent(String(params.orderSubtotal))}`);
+  }
+  return entries.length ? `?${entries.join('&')}` : '';
+};
+
+export const verifyDiscountCode = async function (
+  this: WashdayClientInstance,
+  storeId: string,
+  code: string,
+  params?: { orderSubtotal?: number; currentDate?: string },
+): Promise<any> {
   try {
     const config = {
       headers: { Authorization: `Bearer ${this.apiToken}` }
     };
-    return await this.axiosInstance.get(`${GET_SET_DISCOUNT_CODES}/${storeId}/${code}/verify`, config);
+    const qs = buildVerifyQueryString(params);
+    return await this.axiosInstance.get(`${GET_SET_DISCOUNT_CODES}/${storeId}/${code}/verify${qs}`, config);
   } catch (error) {
     console.error('Error fetching verifyDiscountCode:', error);
     throw error;
   }
 };
 
-export const verifyDiscountCodeCustomersApp = async function (this: WashdayClientInstance, storeId: string, code: string,): Promise<any> {
+export const verifyDiscountCodeCustomersApp = async function (
+  this: WashdayClientInstance,
+  storeId: string,
+  code: string,
+  params?: { orderSubtotal?: number; currentDate?: string },
+): Promise<any> {
   try {
     const config = {
       headers: { Authorization: `Bearer ${this.apiToken}` }
     };
-    return await this.axiosInstance.get(`${GET_DISCOUNT_CODES_CUSTOMER_APP}/${storeId}/${code}/verify`, config);
+    const qs = buildVerifyQueryString(params);
+    return await this.axiosInstance.get(`${GET_DISCOUNT_CODES_CUSTOMER_APP}/${storeId}/${code}/verify${qs}`, config);
   } catch (error) {
     console.error('Error fetching verifyDiscountCodeCustomersApp:', error);
     throw error;

package/src/api/discounts/put.ts

@@ -52,6 +52,9 @@ export const updateDiscountCodeById = async function (this: WashdayClientInstanc
     code?: string;
     fromDate?: string;
     toDate?: string;
+    applyOnceOnOrder?: boolean;
+    applyToAllProducts?: boolean;
+    minimumOrderSubtotal?: number;
 }): Promise<any> {
     try {
         const config = {

package/src/api/order/put.ts

@@ -1,12 +1,18 @@
 import { AxiosResponse } from "axios";
 import { WashdayClientInstance } from "../../interfaces/Api";
 import { IUpdateOrderByIdDto } from "../../interfaces/Order";
+import { PaymentMethodsEnum } from "../../enum";
 import axiosInstance from "../axiosInstance";
 import { generateQueryParamsStr } from "../../utils/apiUtils";
 const GET_SET_ORDER = 'api/v2/order';
 const GET_SET_ORDER_OLD = 'api/order';
 const GET_SET_ORDER_PAYMENTLINES = (orderId: string) => `/api/v2/order/${orderId}/paymentLines`;
 
+type EditablePaymentMethod =
+    | PaymentMethodsEnum.Cash
+    | PaymentMethodsEnum.Card
+    | PaymentMethodsEnum.Transfer;
+
 export const updateById = async function (this: WashdayClientInstance, id: string, data: IUpdateOrderByIdDto): Promise<any> {
     try {
         const config = {
@@ -21,6 +27,7 @@ export const updateById = async function (this: WashdayClientInstance, id: strin
 
 export const updatePaymentLineById = async function (this: WashdayClientInstance, orderId: string, id: string, data: {
     amountPaid: number
+    paymentMethod?: EditablePaymentMethod
     updatedDate: Date
     pinUserId?: string
 }): Promise<any> {

package/src/interfaces/Store.ts

@@ -422,6 +422,7 @@ export interface IDiscountCode {
     createdBy: IUser | string,
     isActive: boolean,
     applyOnceOnOrder: boolean,
+    minimumOrderSubtotal?: number,
     applyToAllProducts: boolean,
     hasUseLimit: boolean,
     useLimitQty: number,

package/src/utils/orders/calculateOrderTotal.ts

@@ -92,7 +92,13 @@ export const calculateOrderTotal = (
           hasMatchingDiscountTarget(discountCodeObj.products, curr)
         );
 
-      discountCodeAmount = includesProducts ? discountCodeObj.value : 0;
+      const minimumOrderSubtotal = Number(discountCodeObj.minimumOrderSubtotal ?? 0);
+      const meetsMinimum =
+        !Number.isFinite(minimumOrderSubtotal) ||
+        minimumOrderSubtotal <= 0 ||
+        Number(totalImportWithoutDiscount ?? totalSubtotalAmount ?? 0) >= minimumOrderSubtotal;
+
+      discountCodeAmount = includesProducts && meetsMinimum ? discountCodeObj.value : 0;
     }
 
     // === SHIPPING COST ===

package/src/utils/orders/helpers.ts

@@ -307,6 +307,23 @@ export const getCreditApplied = (selectedCustomer: { customer: ICustomer } | und
   return Math.min(customerCredit, orderTotal);
 };
 
+const productsMeetMinimumSubtotal = (
+  productsArr: any[] | undefined,
+  isExpress: boolean,
+  minimumOrderSubtotal: number,
+): boolean => {
+  if (!Number.isFinite(minimumOrderSubtotal) || minimumOrderSubtotal <= 0) return true;
+  const subtotal = (productsArr || []).reduce((sum: number, prod: any) => {
+    if (!prod || prod.isBuyAndGetProduct || prod.isFreeItem) return sum;
+    const price = Number((isExpress ? prod.expressPrice : prod.price) ?? prod.price ?? 0);
+    const qty = Number(prod.quantity ?? prod.qty ?? 0);
+    const extra = Number(prod.extraAmount ?? 0);
+    if (!Number.isFinite(price) || !Number.isFinite(qty)) return sum;
+    return sum + price * qty + (Number.isFinite(extra) ? extra : 0);
+  }, 0);
+  return subtotal >= minimumOrderSubtotal;
+};
+
 export const applyDiscountToProducts = (
   discountCode: {
     freeProductSetting: any;
@@ -315,6 +332,7 @@ export const applyDiscountToProducts = (
     type: string;
     applyToAllProducts: boolean;
     applyOnceOnOrder: boolean;
+    minimumOrderSubtotal?: number;
     buyAndGetConditions: any,
   },
   productsArr: any,
@@ -322,6 +340,12 @@ export const applyDiscountToProducts = (
   storeDiscounts: any = [],
   selectedCustomer = { discount: 0 }
 ) => {
+  if (
+    discountCode &&
+    !productsMeetMinimumSubtotal(productsArr, isExpress, Number(discountCode.minimumOrderSubtotal ?? 0))
+  ) {
+    discountCode = null as any;
+  }
   if (!discountCode) {
     // Caso sin discountCode: se aplican descuentos automáticos solo sobre el precio del producto
     return {

package/test/orders.discountCodeOnceOnOrderAndMinimum.test.ts

@@ -0,0 +1,291 @@
+import { utils } from "../src";
+
+const baseSelectedCustomer = {
+  customer: {
+    credit: 0,
+    discount: 0,
+  },
+};
+
+const baseStore = {
+  taxesType: "over_price" as const,
+  taxOne: { name: "IVA", value: 16 },
+  taxTwo: null,
+  taxThree: null,
+  orderPageConfig: { shippingServiceCost: 0 },
+};
+
+const buildOrder = (overrides: any = {}) => ({
+  express: false,
+  products: [
+    { _id: "p1", qty: 1, quantity: 1, price: 100, expressPrice: 100, extraAmount: 0 },
+    { _id: "p2", qty: 1, quantity: 1, price: 150, expressPrice: 150, extraAmount: 0 },
+  ],
+  buyAndGetProducts: [],
+  discountCode: null,
+  taxesType: "over_price",
+  ...overrides,
+});
+
+describe("calculateOrderTotal — fixed-amount coupons", () => {
+  it("applyOnceOnOrder=true subtracts the coupon value once, regardless of quantity", () => {
+    const order = buildOrder({
+      products: [
+        { _id: "p1", qty: 5, quantity: 5, price: 100, expressPrice: 100, extraAmount: 0 },
+      ],
+    });
+    const discountCode = {
+      type: "number",
+      value: 20,
+      applyToAllProducts: true,
+      products: [],
+      applyOnceOnOrder: true,
+    };
+
+    const result = utils.calculateOrderTotal(
+      order,
+      baseSelectedCustomer as any,
+      baseStore as any,
+      false,
+      [],
+      discountCode,
+      0
+    );
+
+    // baseline (no coupon): 5*100=500 subtotal, +16% taxes over_price = 580.
+    // once-on-order applies a flat $20 reduction to the order total only.
+    expect(result.total).toBe(560);
+    // discount is order-level, not per-line, so totalDiscountAmount keeps the once-on-order $20.
+    expect(result.totalDiscountAmount).toBe(20);
+  });
+
+  it("minimumOrderSubtotal blocks the once-on-order coupon when subtotal is below the minimum", () => {
+    const order = buildOrder();
+    const discountCode = {
+      type: "number",
+      value: 50,
+      applyToAllProducts: true,
+      products: [],
+      applyOnceOnOrder: true,
+      minimumOrderSubtotal: 300,
+    };
+
+    const result = utils.calculateOrderTotal(
+      order,
+      baseSelectedCustomer as any,
+      baseStore as any,
+      false,
+      [],
+      discountCode,
+      0
+    );
+
+    // 250 < 300 → no discount applied, totals match the no-coupon baseline (250 + 40 taxes).
+    expect(result.totalDiscountAmount).toBe(0);
+    expect(result.total).toBe(290);
+  });
+
+  it("minimumOrderSubtotal allows the once-on-order coupon at exactly the minimum", () => {
+    const order = buildOrder();
+    const discountCode = {
+      type: "number",
+      value: 50,
+      applyToAllProducts: true,
+      products: [],
+      applyOnceOnOrder: true,
+      minimumOrderSubtotal: 250,
+    };
+
+    const result = utils.calculateOrderTotal(
+      order,
+      baseSelectedCustomer as any,
+      baseStore as any,
+      false,
+      [],
+      discountCode,
+      0
+    );
+
+    // 250 == 250 → discount applied. Baseline 290, minus $50 = 240.
+    expect(result.total).toBe(240);
+  });
+
+  it("zero/undefined minimumOrderSubtotal keeps current behavior (backwards compatible)", () => {
+    const order = buildOrder();
+    const discountCode = {
+      type: "number",
+      value: 50,
+      applyToAllProducts: true,
+      products: [],
+      applyOnceOnOrder: true,
+      minimumOrderSubtotal: 0,
+    };
+
+    const result = utils.calculateOrderTotal(
+      order,
+      baseSelectedCustomer as any,
+      baseStore as any,
+      false,
+      [],
+      discountCode,
+      0
+    );
+
+    expect(result.total).toBe(240);
+  });
+});
+
+describe("applyDiscountToProducts — minimumOrderSubtotal gate", () => {
+  const sharedProducts = [
+    { _id: "p1", price: 100, expressPrice: 100, qty: 1, quantity: 1 },
+    { _id: "p2", price: 150, expressPrice: 150, qty: 1, quantity: 1 },
+  ];
+
+  it("applies per-product fixed discount when no minimum is configured", () => {
+    const { newOrderProds } = utils.applyDiscountToProducts(
+      {
+        type: "number",
+        value: 10,
+        applyToAllProducts: true,
+        products: [],
+        applyOnceOnOrder: false,
+        buyAndGetConditions: null,
+        freeProductSetting: null,
+      } as any,
+      sharedProducts,
+      false,
+      [],
+      { discount: 0 }
+    );
+    expect(newOrderProds.every((p: any) => p.discountAmount === 10)).toBe(true);
+  });
+
+  it("skips the discount when subtotal is below minimumOrderSubtotal", () => {
+    const { newOrderProds } = utils.applyDiscountToProducts(
+      {
+        type: "number",
+        value: 10,
+        applyToAllProducts: true,
+        products: [],
+        applyOnceOnOrder: false,
+        minimumOrderSubtotal: 999,
+        buyAndGetConditions: null,
+        freeProductSetting: null,
+      } as any,
+      sharedProducts,
+      false,
+      [],
+      { discount: 0 }
+    );
+    expect(newOrderProds.every((p: any) => (p.discountAmount ?? 0) === 0)).toBe(true);
+  });
+
+  it("applies the discount when subtotal meets the minimum", () => {
+    const { newOrderProds } = utils.applyDiscountToProducts(
+      {
+        type: "number",
+        value: 10,
+        applyToAllProducts: true,
+        products: [],
+        applyOnceOnOrder: false,
+        minimumOrderSubtotal: 200,
+        buyAndGetConditions: null,
+        freeProductSetting: null,
+      } as any,
+      sharedProducts,
+      false,
+      [],
+      { discount: 0 }
+    );
+    expect(newOrderProds.every((p: any) => p.discountAmount === 10)).toBe(true);
+  });
+
+  it("uses expressPrice when isExpress=true for the minimum check", () => {
+    const expressProducts = [
+      { _id: "p1", price: 100, expressPrice: 160, qty: 1, quantity: 1 },
+    ];
+
+    // Non-express: subtotal=100, below minimum → discount skipped
+    const nonExpress = utils.applyDiscountToProducts(
+      {
+        type: "number",
+        value: 10,
+        applyToAllProducts: true,
+        products: [],
+        applyOnceOnOrder: false,
+        minimumOrderSubtotal: 150,
+        buyAndGetConditions: null,
+        freeProductSetting: null,
+      } as any,
+      expressProducts,
+      false,
+      [],
+      { discount: 0 }
+    );
+    expect((nonExpress.newOrderProds[0] as any).discountAmount ?? 0).toBe(0);
+
+    // Express: subtotal=160, meets minimum → discount applied
+    const express = utils.applyDiscountToProducts(
+      {
+        type: "number",
+        value: 10,
+        applyToAllProducts: true,
+        products: [],
+        applyOnceOnOrder: false,
+        minimumOrderSubtotal: 150,
+        buyAndGetConditions: null,
+        freeProductSetting: null,
+      } as any,
+      expressProducts,
+      true,
+      [],
+      { discount: 0 }
+    );
+    expect((express.newOrderProds[0] as any).discountAmount).toBe(10);
+  });
+
+  it("includes extraAmount when checking the minimum subtotal", () => {
+    const productsWithExtra = [
+      { _id: "p1", price: 100, expressPrice: 100, qty: 1, quantity: 1, extraAmount: 25 },
+    ];
+
+    // Base price * qty = 100, + extraAmount 25 = 125 → minimum 120 should clear
+    const meetsWithExtra = utils.applyDiscountToProducts(
+      {
+        type: "number",
+        value: 5,
+        applyToAllProducts: true,
+        products: [],
+        applyOnceOnOrder: false,
+        minimumOrderSubtotal: 120,
+        buyAndGetConditions: null,
+        freeProductSetting: null,
+      } as any,
+      productsWithExtra,
+      false,
+      [],
+      { discount: 0 }
+    );
+    expect((meetsWithExtra.newOrderProds[0] as any).discountAmount).toBe(5);
+
+    // Without extra (extraAmount removed), 100 < 120 → skipped
+    const productsNoExtra = [{ _id: "p1", price: 100, expressPrice: 100, qty: 1, quantity: 1 }];
+    const failsWithoutExtra = utils.applyDiscountToProducts(
+      {
+        type: "number",
+        value: 5,
+        applyToAllProducts: true,
+        products: [],
+        applyOnceOnOrder: false,
+        minimumOrderSubtotal: 120,
+        buyAndGetConditions: null,
+        freeProductSetting: null,
+      } as any,
+      productsNoExtra,
+      false,
+      [],
+      { discount: 0 }
+    );
+    expect((failsWithoutExtra.newOrderProds[0] as any).discountAmount ?? 0).toBe(0);
+  });
+});