washday-sdk 0.0.170 → 0.0.172

package/dist/api/discounts/get.js

@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { generateQueryParamsStr } from "../../utils/apiUtils";
 import axiosInstance from "../axiosInstance";
 const GET_SET_DISCOUNT_CODES = 'api/v2/discountCodes';
 const GET_SET_AUTOMATIC_DISCOUNTS = 'api/discounts';
@@ -33,10 +34,9 @@ export const getDiscountCodes = function (storeId, params) {
 export const getAutomaticDiscounts = function (storeId, params) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            let queryParams = '';
-            // if (params.isActive) {
-            //   queryParams += `isActive=${params.isActive}`
-            // }
+            const queryParams = generateQueryParamsStr([
+                'currentDate',
+            ], params);
             const config = {
                 headers: { Authorization: `Bearer ${this.apiToken}` }
             };

package/dist/utils/orders/calculateTotalTaxesIncluded.js

@@ -17,7 +17,15 @@ export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettin
         let productPercentageDiscount = 0;
         let customerDiscount = 0;
         if (!order.discountCode) {
-            const discountsToApply = storeDiscounts.filter((discount) => discount.isActive && discount.products.some((p) => p._id === current._id));
+            const discountsToApply = storeDiscounts.filter((discount) => discount.isActive && discount.products.some((p) => {
+                if (typeof p === 'string') {
+                    return p === current._id;
+                }
+                else if (typeof p === 'object') {
+                    return p._id === current._id;
+                }
+                return false;
+            }));
             customerDiscount = ((_a = selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.customer) === null || _a === void 0 ? void 0 : _a.discount) || 0;
             productPercentageDiscount = discountsToApply.reduce((prev, next) => {
                 return next.type === 'percentage' ? prev + next.value : prev;

package/dist/utils/orders/calculateTotalTaxesOverPrice.js

@@ -17,7 +17,15 @@ export const calculateTotalTaxesOverPrice = (order, selectedCustomer, storeSetti
         const adjustedPrice = productBasePrice + unitExtra;
         // Cálculo de descuento sobre el precio ajustado
         if (!order.discountCode) {
-            const discountsToApply = storeDiscounts.filter((discount) => discount.isActive && discount.products.some((p) => p._id === current._id));
+            const discountsToApply = storeDiscounts.filter((discount) => discount.isActive && discount.products.some((p) => {
+                if (typeof p === 'string') {
+                    return p === current._id;
+                }
+                else if (typeof p === 'object') {
+                    return p._id === current._id;
+                }
+                return false;
+            }));
             customerDiscount = ((_a = selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.customer) === null || _a === void 0 ? void 0 : _a.discount) || 0;
             productPercentageDiscount = discountsToApply.reduce((acc, discount) => {
                 return discount.type === 'percentage' ? acc + discount.value : acc;

package/dist/utils/orders/helpers.js

@@ -64,7 +64,15 @@ export const applyDiscountToProducts = (discountCode, productsArr, isExpress, st
         // Caso sin discountCode: se aplican descuentos automáticos solo sobre el precio del producto
         return {
             newOrderProds: productsArr.map((prod) => {
-                const discountsToApply = storeDiscounts.filter((discount) => discount.isActive && discount.products.some((p) => p._id === prod._id));
+                const discountsToApply = storeDiscounts.filter((discount) => discount.isActive && discount.products.some((p) => {
+                    if (typeof p === 'string') {
+                        return p === prod._id;
+                    }
+                    else if (typeof p === 'object') {
+                        return p._id === prod._id;
+                    }
+                    return false;
+                }));
                 const customerDiscount = (selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.discount) / 100 || 0;
                 const productPercentageDiscount = discountsToApply.reduce((prev, next) => {
                     if (next.type === 'percentage') {

package/package.json

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

package/src/api/discounts/get.ts

@@ -1,4 +1,5 @@
 import { WashdayClientInstance } from "../../interfaces/Api";
+import { generateQueryParamsStr } from "../../utils/apiUtils";
 import axiosInstance from "../axiosInstance";
 
 const GET_SET_DISCOUNT_CODES = 'api/v2/discountCodes';
@@ -22,12 +23,12 @@ export const getDiscountCodes = async function (this: WashdayClientInstance, sto
   }
 };
 
-export const getAutomaticDiscounts = async function (this: WashdayClientInstance, storeId: string, params?: string): Promise<any> {
+export const getAutomaticDiscounts = async function (this: WashdayClientInstance, storeId: string, params?: {}): Promise<any> {
   try {
-    let queryParams = '';
-    // if (params.isActive) {
-    //   queryParams += `isActive=${params.isActive}`
-    // }
+    const queryParams = generateQueryParamsStr([
+      'currentDate',
+    ], params);
+
     const config = {
       headers: { Authorization: `Bearer ${this.apiToken}` }
     };

package/src/utils/orders/calculateTotalTaxesIncluded.ts

@@ -29,7 +29,14 @@ export const calculateTotalTaxesIncluded = (
     let customerDiscount = 0;
     if (!order.discountCode) {
       const discountsToApply = storeDiscounts.filter(
-        (discount) => discount.isActive && discount.products.some((p: any) => p._id === current._id)
+        (discount: any) => discount.isActive && discount.products.some((p: any) => {
+          if(typeof p === 'string') {
+            return p === current._id
+          } else if(typeof p === 'object') {
+            return p._id === current._id
+          }
+          return false
+        })
       );
       customerDiscount = selectedCustomer?.customer?.discount || 0;
       productPercentageDiscount = discountsToApply.reduce((prev, next) => {

package/src/utils/orders/calculateTotalTaxesOverPrice.ts

@@ -28,7 +28,14 @@ export const calculateTotalTaxesOverPrice = (
     // Cálculo de descuento sobre el precio ajustado
     if (!order.discountCode) {
       const discountsToApply = storeDiscounts.filter(
-        (discount: any) => discount.isActive && discount.products.some((p: any) => p._id === current._id)
+        (discount: any) => discount.isActive && discount.products.some((p: any) => {
+          if(typeof p === 'string') {
+            return p === current._id
+          } else if(typeof p === 'object') {
+            return p._id === current._id
+          }
+          return false
+        })
       );
       customerDiscount = selectedCustomer?.customer?.discount || 0;
       productPercentageDiscount = discountsToApply.reduce((acc, discount) => {

package/src/utils/orders/helpers.ts

@@ -94,7 +94,14 @@ export const applyDiscountToProducts = (
     return {
       newOrderProds: productsArr.map((prod: any) => {
         const discountsToApply = storeDiscounts.filter(
-          (discount: any) => discount.isActive && discount.products.some((p: any) => p._id === prod._id)
+          (discount: any) => discount.isActive && discount.products.some((p: any) =>{
+            if(typeof p === 'string') {
+              return p === prod._id
+            } else if(typeof p === 'object') {
+              return p._id === prod._id
+            }
+            return false
+          })
         );
         const customerDiscount = selectedCustomer?.discount / 100 || 0;
         const productPercentageDiscount = discountsToApply.reduce((prev: number, next: any) => {