washday-sdk 1.6.11 → 1.6.13

package/dist/api/index.js

@@ -43,6 +43,7 @@ import * as publicsEndpoints from './publics';
 import { validateUserPin } from "./users/post";
 import { getAxiosInstance } from "./axiosInstance";
 import * as integrationsEndpoints from './integrations';
+import * as updatesEndpoints from './updates';
 function bindMethods(instance, methods) {
     const boundMethods = {};
     for (const key in methods) {
@@ -135,6 +136,7 @@ const WashdayClient = function WashdayClient(apiToken, env = 'PROD', clientId, c
         createOrderEvidence: ordersEndpoints.postModule.createOrderEvidence,
         getRedeemPointsPreview: ordersEndpoints.postModule.getRedeemPointsPreview,
         setOrderUncollected: ordersEndpoints.postModule.setOrderUncollected,
+        payAndCollect: ordersEndpoints.postModule.payAndCollect,
         deletePaymentLineById: ordersEndpoints.deleteModule.deletePaymentLineById,
         getListCustomersApp: ordersEndpoints.getModule.getListCustomersApp,
         getByIdCustomersApp: ordersEndpoints.getModule.getByIdCustomersApp,
@@ -355,5 +357,9 @@ const WashdayClient = function WashdayClient(apiToken, env = 'PROD', clientId, c
         getMPAttemptStatus: integrationsEndpoints.getModule.getMPAttemptStatus,
         updateMPTerminalOperationMode: integrationsEndpoints.postModule.updateMPTerminalOperationMode,
     });
+    this.updates = bindMethods(this, {
+        getLatestUpdates: updatesEndpoints.getModule.getLatestUpdates,
+        markUpdatesAsSeen: updatesEndpoints.postModule.markUpdatesAsSeen,
+    });
 };
 export default WashdayClient;

package/dist/api/order/post.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const GET_SET_ORDER_PAYMENTLINES = (orderId) => `/api/v2/order/${orderId}/paymentLines`;
 const GET_SET_ORDER = 'api/v2/order';
 const GET_SET_ORDER_CUSTOMERS_APP = 'api/v2/washdayapp/orders';
+const PAY_AND_COLLECT = (sequence, storeId) => `/api/v2/order/${sequence}/${storeId}/pay-and-collect`;
 export const createPaymentLine = function (id, data) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -126,3 +127,26 @@ export const setOrderUncollected = function (data) {
         }
     });
 };
+export const payAndCollect = function (params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            return yield this.axiosInstance.post(PAY_AND_COLLECT(params.sequence, params.storeId), {
+                paymentMethod: params.paymentMethod,
+                cashierBoxId: params.cashierBoxId,
+                amount: params.amount,
+                paymentDate: params.paymentDate,
+                collectedDateTime: params.collectedDateTime,
+                collectWithAmountDue: params.collectWithAmountDue,
+                pinUserId: params.pinUserId,
+                attemptId: params.attemptId,
+            }, config);
+        }
+        catch (error) {
+            console.error('Error fetching payAndCollect:', error);
+            throw error;
+        }
+    });
+};

package/dist/api/updates/get.js

@@ -0,0 +1,32 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { generateQueryParamsStr } from "../../utils/apiUtils";
+const GET_LATEST_UPDATES = 'api/updates/latest';
+export const getLatestUpdates = function (params, options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` },
+                signal: (options === null || options === void 0 ? void 0 : options.signal) || (params === null || params === void 0 ? void 0 : params.signal) || undefined
+            };
+            const queryParams = generateQueryParamsStr(['limit'], params || {});
+            const url = queryParams ? `${GET_LATEST_UPDATES}?${queryParams}` : GET_LATEST_UPDATES;
+            return yield this.axiosInstance.get(url, config);
+        }
+        catch (error) {
+            if (error instanceof Error && (error.name === 'AbortError' || error.name === 'CanceledError')) {
+                console.log('Request was cancelled');
+                throw error;
+            }
+            console.error('Washday SDK - Error fetching latest updates:', error);
+            throw error;
+        }
+    });
+};

package/dist/api/updates/index.js

@@ -0,0 +1,2 @@
+export * as getModule from './get';
+export * as postModule from './post';

package/dist/api/updates/post.js

@@ -0,0 +1,24 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+const MARK_UPDATES_SEEN = 'api/updates/mark-seen';
+export const markUpdatesAsSeen = function () {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            return yield this.axiosInstance.post(MARK_UPDATES_SEEN, {}, config);
+        }
+        catch (error) {
+            console.error('Washday SDK - Error marking updates as seen:', error);
+            throw error;
+        }
+    });
+};

package/dist/utils/orders/calculateTotalTaxesIncluded.js

@@ -17,6 +17,7 @@ export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettin
         let discPercentageInteger = 0;
         let productPercentageDiscount = 0;
         let customerDiscount = 0;
+        // ORDER DOES NOT HAVE A DISCOUNT CODE
         if (!order.discountCode) {
             const discountsToApply = storeDiscounts.filter((discount) => discount.isActive && discount.products.some((p) => {
                 if (typeof p === 'string') {
@@ -35,7 +36,9 @@ export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettin
             discountsToApply.forEach((discount) => (appliedOrderDiscounts[discount._id] = discount));
         }
         else {
-            if ((discountCodeObj === null || discountCodeObj === void 0 ? void 0 : discountCodeObj.type) === 'percentage') {
+            // ORDER HAS A DISCOUNT CODE
+            // PERCENTAGE DISCOUNT CODE
+            if ((discountCodeObj === null || discountCodeObj === void 0 ? void 0 : discountCodeObj.type) === DiscountCodeTypes.PERCENTAGE) {
                 discPercentageInteger = +(discountCodeObj.value / 100).toFixed(2);
                 if (!discountCodeObj.applyToAllProducts) {
                     discPercentageInteger = ((_b = discountCodeObj.products) === null || _b === void 0 ? void 0 : _b.includes(current._id))
@@ -43,7 +46,7 @@ export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettin
                         : 0;
                 }
             }
-            if ((discountCodeObj === null || discountCodeObj === void 0 ? void 0 : discountCodeObj.type) === 'buyXGetY') {
+            if ((discountCodeObj === null || discountCodeObj === void 0 ? void 0 : discountCodeObj.type) === DiscountCodeTypes.BUY_X_GET_Y) {
                 const discountType = discountCodeObj.buyAndGetConditions[0].getDiscountType;
                 const discountValue = discountCodeObj.buyAndGetConditions[0].discountValue;
                 if (discountType === 'percentage' && current.isBuyAndGetProduct) {
@@ -52,6 +55,7 @@ export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettin
                 if (discountType === 'free' && current.isBuyAndGetProduct) {
                     discPercentageInteger = 1;
                 }
+                // FREE ITEM DISCOUNT CODE
             }
             else if (discountCodeObj.type === DiscountCodeTypes.FREE_ITEM && (current.isFreeItem)) {
                 discPercentageInteger = 1;

package/package.json

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

package/src/api/index.ts

@@ -45,6 +45,7 @@ import * as publicsEndpoints from './publics';
 import { validateUserPin } from "./users/post";
 import { getAxiosInstance } from "./axiosInstance";
 import * as integrationsEndpoints from './integrations';
+import * as updatesEndpoints from './updates';
 
 type WashdayClientConstructor = {
     new(apiToken: string, env?: string, clientId?: string, clientSecret?: string): WashdayClientInstance
@@ -142,6 +143,7 @@ const WashdayClient: WashdayClientConstructor = function WashdayClient(this: Was
         createOrderEvidence: ordersEndpoints.postModule.createOrderEvidence,
         getRedeemPointsPreview: ordersEndpoints.postModule.getRedeemPointsPreview,
         setOrderUncollected: ordersEndpoints.postModule.setOrderUncollected,
+        payAndCollect: ordersEndpoints.postModule.payAndCollect,
         deletePaymentLineById: ordersEndpoints.deleteModule.deletePaymentLineById,
         getListCustomersApp: ordersEndpoints.getModule.getListCustomersApp,
         getByIdCustomersApp: ordersEndpoints.getModule.getByIdCustomersApp,
@@ -362,6 +364,10 @@ const WashdayClient: WashdayClientConstructor = function WashdayClient(this: Was
         getMPAttemptStatus: integrationsEndpoints.getModule.getMPAttemptStatus,
         updateMPTerminalOperationMode: integrationsEndpoints.postModule.updateMPTerminalOperationMode,
     });
+    this.updates = bindMethods(this, {
+        getLatestUpdates: updatesEndpoints.getModule.getLatestUpdates,
+        markUpdatesAsSeen: updatesEndpoints.postModule.markUpdatesAsSeen,
+    });
 } as any;
 
 export default WashdayClient;

package/src/api/order/post.ts

@@ -6,6 +6,7 @@ import axiosInstance from "../axiosInstance";
 const GET_SET_ORDER_PAYMENTLINES = (orderId: string) => `/api/v2/order/${orderId}/paymentLines`;
 const GET_SET_ORDER = 'api/v2/order';
 const GET_SET_ORDER_CUSTOMERS_APP = 'api/v2/washdayapp/orders';
+const PAY_AND_COLLECT = (sequence: string, storeId: string) => `/api/v2/order/${sequence}/${storeId}/pay-and-collect`;
 
 export const createPaymentLine = async function (this: WashdayClientInstance, id: string, data: {
     amountPaid: number,
@@ -132,4 +133,40 @@ export const setOrderUncollected = async function (this: WashdayClientInstance,
         console.error('Error fetching setOrderUncollected:', error);
         throw error;
     }
+};
+
+export const payAndCollect = async function (this: WashdayClientInstance, params: {
+    sequence: string;
+    storeId: string;
+    paymentMethod: string;
+    cashierBoxId?: string;
+    amount?: number;
+    paymentDate?: string | Date;
+    collectedDateTime?: string | Date;
+    collectWithAmountDue?: boolean;
+    pinUserId?: string;
+    attemptId?: string;
+}): Promise<AxiosResponse<any, any>> {
+    try {
+        const config = {
+            headers: { Authorization: `Bearer ${this.apiToken}` }
+        };
+        return await this.axiosInstance.post(
+            PAY_AND_COLLECT(params.sequence, params.storeId),
+            {
+                paymentMethod: params.paymentMethod,
+                cashierBoxId: params.cashierBoxId,
+                amount: params.amount,
+                paymentDate: params.paymentDate,
+                collectedDateTime: params.collectedDateTime,
+                collectWithAmountDue: params.collectWithAmountDue,
+                pinUserId: params.pinUserId,
+                attemptId: params.attemptId,
+            },
+            config
+        );
+    } catch (error) {
+        console.error('Error fetching payAndCollect:', error);
+        throw error;
+    }
 };

package/src/api/updates/get.ts

@@ -0,0 +1,25 @@
+import { GenericAbortSignal } from "axios";
+import { WashdayClientInstance } from "../../interfaces/Api";
+import { generateQueryParamsStr } from "../../utils/apiUtils";
+
+const GET_LATEST_UPDATES = 'api/updates/latest';
+
+export const getLatestUpdates = async function (this: WashdayClientInstance, params?: { limit?: number | string, signal?: GenericAbortSignal }, options?: { signal?: GenericAbortSignal }): Promise<any> {
+    try {
+        const config = {
+            headers: { Authorization: `Bearer ${this.apiToken}` },
+            signal: options?.signal || params?.signal || undefined
+        };
+        const queryParams = generateQueryParamsStr(['limit'], params || {});
+        const url = queryParams ? `${GET_LATEST_UPDATES}?${queryParams}` : GET_LATEST_UPDATES;
+        return await this.axiosInstance.get(url, config);
+    } catch (error) {
+        if (error instanceof Error && (error.name === 'AbortError' || error.name === 'CanceledError')) {
+            console.log('Request was cancelled');
+            throw error;
+        }
+        console.error('Washday SDK - Error fetching latest updates:', error);
+        throw error;
+    }
+};
+

package/src/api/updates/index.ts

@@ -0,0 +1,3 @@
+export * as getModule from './get';
+export * as postModule from './post';
+

package/src/api/updates/post.ts

@@ -0,0 +1,16 @@
+import { WashdayClientInstance } from "../../interfaces/Api";
+
+const MARK_UPDATES_SEEN = 'api/updates/mark-seen';
+
+export const markUpdatesAsSeen = async function (this: WashdayClientInstance): Promise<any> {
+    try {
+        const config = {
+            headers: { Authorization: `Bearer ${this.apiToken}` }
+        };
+        return await this.axiosInstance.post(MARK_UPDATES_SEEN, {}, config);
+    } catch (error) {
+        console.error('Washday SDK - Error marking updates as seen:', error);
+        throw error;
+    }
+};
+

package/src/interfaces/Api.ts

@@ -41,6 +41,7 @@ import * as partnersEndpoints from '../api/partners';
 import * as outsourcedOrdersEndpoints from '../api/outsourcedOrders';
 import * as publicsEndpoints from '../api/publics';
 import * as integrationsEndpoints from '../api/integrations';
+import * as updatesEndpoints from '../api/updates';
 import { validateUserPin } from "../api/users/post";
 import { AxiosInstance } from "axios";
 
@@ -127,6 +128,7 @@ export interface WashdayClientInstance {
         createOrderEvidence: typeof ordersEndpoints.postModule.createOrderEvidence,
         getRedeemPointsPreview: typeof ordersEndpoints.postModule.getRedeemPointsPreview,
         setOrderUncollected: typeof ordersEndpoints.postModule.setOrderUncollected,
+        payAndCollect: typeof ordersEndpoints.postModule.payAndCollect,
         deletePaymentLineById: typeof ordersEndpoints.deleteModule.deletePaymentLineById;
         getListCustomersApp: typeof ordersEndpoints.getModule.getListCustomersApp;
         getByIdCustomersApp: typeof ordersEndpoints.getModule.getByIdCustomersApp;
@@ -345,4 +347,8 @@ export interface WashdayClientInstance {
             updateMPTerminalOperationMode: typeof integrationsEndpoints.postModule.updateMPTerminalOperationMode;
         }
     };
+    updates: {
+        getLatestUpdates: typeof updatesEndpoints.getModule.getLatestUpdates;
+        markUpdatesAsSeen: typeof updatesEndpoints.postModule.markUpdatesAsSeen;
+    };
 }

package/src/utils/orders/calculateTotalTaxesIncluded.ts

@@ -28,6 +28,7 @@ export const calculateTotalTaxesIncluded = (
     let discPercentageInteger = 0;
     let productPercentageDiscount = 0;
     let customerDiscount = 0;
+    // ORDER DOES NOT HAVE A DISCOUNT CODE
     if (!order.discountCode) {
       const discountsToApply = storeDiscounts.filter(
         (discount: any) => discount.isActive && discount.products.some((p: any) => {
@@ -46,7 +47,9 @@ export const calculateTotalTaxesIncluded = (
       discPercentageInteger = +((productPercentageDiscount + customerDiscount) / 100).toFixed(2);
       discountsToApply.forEach((discount) => (appliedOrderDiscounts[discount._id] = discount));
     } else {
-      if (discountCodeObj?.type === 'percentage') {
+      // ORDER HAS A DISCOUNT CODE
+      // PERCENTAGE DISCOUNT CODE
+      if (discountCodeObj?.type === DiscountCodeTypes.PERCENTAGE) {
         discPercentageInteger = +(discountCodeObj.value / 100).toFixed(2);
         if (!discountCodeObj.applyToAllProducts) {
           discPercentageInteger = discountCodeObj.products?.includes(current._id)
@@ -54,7 +57,7 @@ export const calculateTotalTaxesIncluded = (
             : 0;
         }
       }
-      if (discountCodeObj?.type === 'buyXGetY') {
+      if (discountCodeObj?.type === DiscountCodeTypes.BUY_X_GET_Y) {
         const discountType = discountCodeObj.buyAndGetConditions[0].getDiscountType;
         const discountValue = discountCodeObj.buyAndGetConditions[0].discountValue;
         if (discountType === 'percentage' && current.isBuyAndGetProduct) {
@@ -63,6 +66,7 @@ export const calculateTotalTaxesIncluded = (
         if (discountType === 'free' && current.isBuyAndGetProduct) {
           discPercentageInteger = 1;
         }
+        // FREE ITEM DISCOUNT CODE
       } else if (discountCodeObj.type === DiscountCodeTypes.FREE_ITEM && ((current as any).isFreeItem)) {
         discPercentageInteger = 1;
       }