washday-sdk 0.0.171 → 0.0.173

package/dist/api/axiosInstance.js

@@ -1,8 +1,8 @@
 import axios from 'axios';
 // Define the type for the Axios instance
 let axiosInstance = null;
-// const BASE_URL: string = 'http://localhost:5555/';
-const BASE_URL = 'https://washday-backend.herokuapp.com/';
+const BASE_URL = 'http://localhost:5555/';
+// const BASE_URL: string = 'https://washday-backend.herokuapp.com/';
 // Function to create or return the singleton instance
 const getAxiosInstance = () => {
     if (!axiosInstance) {

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

@@ -48,6 +48,9 @@ export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettin
                 if (discountType === 'percentage' && current.isBuyAndGetProduct) {
                     discPercentageInteger = +(discountValue / 100).toFixed(2);
                 }
+                if (discountType === 'free' && current.isBuyAndGetProduct) {
+                    discPercentageInteger = 1;
+                }
             }
         }
         // === NUEVO: Aplicar descuento sobre el precio total ajustado (producto base + extra prorrateado) ===

package/dist/utils/orders/calculateTotalTaxesOverPrice.js

@@ -47,6 +47,9 @@ export const calculateTotalTaxesOverPrice = (order, selectedCustomer, storeSetti
                 if (condition.getDiscountType === BuyAndGetConditionsTypes.PERCENTAGE && current.isBuyAndGetProduct) {
                     discPercentageInteger = +(condition.discountValue / 100).toFixed(2);
                 }
+                if (condition.getDiscountType === BuyAndGetConditionsTypes.FREE && current.isBuyAndGetProduct) {
+                    discPercentageInteger = 1;
+                }
             }
         }
         // Calcular el descuento por unidad sobre el precio ajustado

package/package.json

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

package/src/api/axiosInstance.ts

@@ -3,8 +3,8 @@ import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
 // Define the type for the Axios instance
 let axiosInstance: AxiosInstance | null = null;
 
-// const BASE_URL: string = 'http://localhost:5555/';
-const BASE_URL: string = 'https://washday-backend.herokuapp.com/';
+const BASE_URL: string = 'http://localhost:5555/';
+// const BASE_URL: string = 'https://washday-backend.herokuapp.com/';
 
 // Function to create or return the singleton instance
 const getAxiosInstance = (): AxiosInstance => {

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

@@ -30,9 +30,9 @@ export const calculateTotalTaxesIncluded = (
     if (!order.discountCode) {
       const discountsToApply = storeDiscounts.filter(
         (discount: any) => discount.isActive && discount.products.some((p: any) => {
-          if(typeof p === 'string') {
+          if (typeof p === 'string') {
             return p === current._id
-          } else if(typeof p === 'object') {
+          } else if (typeof p === 'object') {
             return p._id === current._id
           }
           return false
@@ -59,6 +59,9 @@ export const calculateTotalTaxesIncluded = (
         if (discountType === 'percentage' && current.isBuyAndGetProduct) {
           discPercentageInteger = +(discountValue / 100).toFixed(2);
         }
+        if (discountType === 'free' && current.isBuyAndGetProduct) {
+          discPercentageInteger = 1;
+        }
       }
     }
 

package/src/utils/orders/calculateTotalTaxesOverPrice.ts

@@ -56,6 +56,9 @@ export const calculateTotalTaxesOverPrice = (
         if (condition.getDiscountType === BuyAndGetConditionsTypes.PERCENTAGE && current.isBuyAndGetProduct) {
           discPercentageInteger = +(condition.discountValue / 100).toFixed(2);
         }
+        if (condition.getDiscountType === BuyAndGetConditionsTypes.FREE && current.isBuyAndGetProduct) {
+          discPercentageInteger = 1;
+        }
       }
     }