@shushed/helpers 0.0.204-main-20251209142954 → 0.0.205-fix-erp-729-20251209153116

package/dist/cjs/src-public/airtable.js

@@ -62,7 +62,6 @@ class AirtableHelper extends runtime_1.default {
                         fieldsToMergeOn: (options.fieldsToMergeOn ?? [this.primaryKeyFieldName]).map(x => this.dictionary[x] || x),
                     },
                     returnFieldsByFieldId: true,
-                    typecast: options.typecast || false,
                     records: currentBatch.map(x => {
                         const recordId = x.$recordId;
                         const fieldsWithoutRecordId = { ...x };

package/dist/cjs/src-public/bcOrder.js

@@ -400,18 +400,15 @@ function transformMasterOrder(payload) {
         const desc = String(line?.description || '').trim().toLowerCase();
         return desc === 'delivery';
     };
-    let invoicesNetMinor = 0;
     let invoicesGrossMinor = 0;
     (payload.invoices || []).forEach((inv) => {
         (inv.invoice_lines || []).forEach((line) => {
             if (!isDeliveryItem(line)) {
-                invoicesNetMinor += toMinorUnits(Number(line?.amount || line?.amount_excl_vat || 0));
                 invoicesGrossMinor += toMinorUnits(Number(line?.amount_including_vat || line?.amount_incl_vat || 0));
             }
         });
     });
     if (invoicesGrossMinor === 0 && (payload.invoices || []).length > 0) {
-        invoicesNetMinor = toMinorUnits((payload.invoices || []).reduce((acc, inv) => acc + (inv.amount_excl_vat || 0), 0));
         invoicesGrossMinor = toMinorUnits((payload.invoices || []).reduce((acc, inv) => acc + (inv.amount_incl_vat || 0), 0));
     }
     if (invoicesGrossMinor === 0 && invoicedLineNos.size > 0 && sale0?.sale_lines) {
@@ -423,10 +420,8 @@ function transformMasterOrder(payload) {
             const lineNo = Number(l?.line_no || -1);
             return invoicedLineNos.has(lineNo);
         });
-        invoicesNetMinor = toMinorUnits(invoicedSaleLines.reduce((acc, l) => acc + (Number(l?.amount || 0)), 0));
         invoicesGrossMinor = toMinorUnits(invoicedSaleLines.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
     }
-    let nonInvSalesNetMinor = 0;
     let nonInvSalesGrossMinor = 0;
     if (sale0?.sale_lines && sale0.sale_lines.length > 0) {
         const allSaleLines = (sale0.sale_lines || []).filter((l) => {
@@ -436,26 +431,20 @@ function transformMasterOrder(payload) {
                 return false;
             return true;
         });
-        const totalSaleNetMinor = toMinorUnits(allSaleLines.reduce((acc, l) => acc + (Number(l?.amount || 0)), 0));
         const totalSaleGrossMinor = toMinorUnits(allSaleLines.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
         if (invoicesGrossMinor > 0) {
-            nonInvSalesNetMinor = Math.max(0, totalSaleNetMinor - invoicesNetMinor);
             nonInvSalesGrossMinor = Math.max(0, totalSaleGrossMinor - invoicesGrossMinor);
         }
         else {
-            nonInvSalesNetMinor = totalSaleNetMinor;
             nonInvSalesGrossMinor = totalSaleGrossMinor;
         }
     }
     else if (sale0 && (sale0.amount_excl_vat || sale0.amount_incl_vat)) {
-        const saleNetMinor = toMinorUnits(sale0.amount_excl_vat || 0);
         const saleGrossMinor = toMinorUnits(sale0.amount_incl_vat || 0);
         if (invoicesGrossMinor > 0) {
-            nonInvSalesNetMinor = Math.max(0, saleNetMinor - invoicesNetMinor);
             nonInvSalesGrossMinor = Math.max(0, saleGrossMinor - invoicesGrossMinor);
         }
         else {
-            nonInvSalesNetMinor = saleNetMinor;
             nonInvSalesGrossMinor = saleGrossMinor;
         }
     }
@@ -468,32 +457,30 @@ function transformMasterOrder(payload) {
             const lineNo = Number(l?.line_no || -1);
             return !invoicedLineNos.has(lineNo);
         });
-        nonInvSalesNetMinor = toMinorUnits(nonInvoicedSales.reduce((acc, l) => acc + (Number(l?.amount || 0)), 0));
         nonInvSalesGrossMinor = toMinorUnits(nonInvoicedSales.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
     }
-    const returnsNetMinor = toMinorUnits((payload.credit_memos || []).reduce((acc, cm) => acc + (cm.amount_excl_vat || 0), 0));
-    const returnsGrossMinor = toMinorUnits((payload.credit_memos || []).reduce((acc, cm) => acc + (cm.amount_incl_vat || 0), 0));
-    const totalNetMinor = invoicesNetMinor + nonInvSalesNetMinor;
     const totalGrossMinor = invoicesGrossMinor + nonInvSalesGrossMinor;
-    const total = {
-        amount_net: moneyFromMinor(totalNetMinor),
-        amount_gross: moneyFromMinor(totalGrossMinor),
-        discount_amount_net: money(0),
-        discount_amount_gross: money(0),
-        discount_amount_percent: 0,
-    };
-    const return_total = (payload.credit_memos && payload.credit_memos.length > 0)
-        ? {
-            amount_net: moneyFromMinor(returnsNetMinor),
-            amount_gross: moneyFromMinor(returnsGrossMinor),
-            discount_amount_net: money(0),
-            discount_amount_gross: money(0),
-            discount_amount_percent: 0,
+    const invoicesNetMinorWithDelivery = toMinorUnits((payload.invoices || []).reduce((acc, inv) => acc + (inv.amount_excl_vat || 0), 0));
+    const invoicesGrossMinorWithDelivery = toMinorUnits((payload.invoices || []).reduce((acc, inv) => acc + (inv.amount_incl_vat || 0), 0));
+    let nonInvSalesNetMinorWithDelivery = 0;
+    let nonInvSalesGrossMinorWithDelivery = 0;
+    if (sale0 && (sale0.amount_excl_vat || sale0.amount_incl_vat)) {
+        const saleNetMinor = toMinorUnits(sale0.amount_excl_vat || 0);
+        const saleGrossMinor = toMinorUnits(sale0.amount_incl_vat || 0);
+        if (invoicesGrossMinorWithDelivery > 0) {
+            nonInvSalesNetMinorWithDelivery = Math.max(0, saleNetMinor - invoicesNetMinorWithDelivery);
+            nonInvSalesGrossMinorWithDelivery = Math.max(0, saleGrossMinor - invoicesGrossMinorWithDelivery);
         }
-        : undefined;
-    const net_total = {
-        amount_net: moneyFromMinor(Math.max(0, totalNetMinor - returnsNetMinor)),
-        amount_gross: moneyFromMinor(Math.max(0, totalGrossMinor - returnsGrossMinor)),
+        else {
+            nonInvSalesNetMinorWithDelivery = saleNetMinor;
+            nonInvSalesGrossMinorWithDelivery = saleGrossMinor;
+        }
+    }
+    const totalNetMinorWithDelivery = invoicesNetMinorWithDelivery + nonInvSalesNetMinorWithDelivery;
+    const totalGrossMinorWithDelivery = invoicesGrossMinorWithDelivery + nonInvSalesGrossMinorWithDelivery;
+    const total = {
+        amount_net: moneyFromMinor(totalNetMinorWithDelivery),
+        amount_gross: moneyFromMinor(totalGrossMinorWithDelivery),
         discount_amount_net: money(0),
         discount_amount_gross: money(0),
         discount_amount_percent: 0,
@@ -603,7 +590,7 @@ function transformMasterOrder(payload) {
     const merchReturnGrossFromCreditMemos = (payload.credit_memos || []).reduce((acc, cm) => {
         const lines = cm?.credit_memo_lines || [];
         let hasQualifying = false;
-        const sum = lines.reduce((s, l) => {
+        const sumGross = lines.reduce((s, l) => {
             const itemNo = String(l?.item_no || l?.no || "");
             const desc = String(l?.description || "");
             const looksProduct = itemNo.includes('-') || desc.includes(' - ');
@@ -616,24 +603,36 @@ function transformMasterOrder(payload) {
             }
             return s;
         }, 0);
+        const sumNet = lines.reduce((s, l) => {
+            const itemNo = String(l?.item_no || l?.no || "");
+            const desc = String(l?.description || "");
+            const looksProduct = itemNo.includes('-') || desc.includes(' - ');
+            const typeStr = String(l?.type || "").toLowerCase();
+            const isItemish = typeStr.includes('item') || looksProduct;
+            const isRefund = itemNo.toUpperCase() === 'REFUND';
+            if ((l?.quantity || 0) > 0 && isItemish && !isRefund && !isDeliveryItem(l)) {
+                return s + (l?.amount || l?.amount_excl_vat || 0);
+            }
+            return s;
+        }, 0);
         if (!hasQualifying)
             return acc;
         if (cm?.amount_incl_vat != null && cm.amount_incl_vat > 0) {
-            return acc + cm.amount_incl_vat;
+            return { gross: acc.gross + cm.amount_incl_vat, net: acc.net + (cm.amount_excl_vat || 0) };
         }
-        return acc + sum;
-    }, 0);
+        return { gross: acc.gross + sumGross, net: acc.net + sumNet };
+    }, { gross: 0, net: 0 });
     const merchReturnGrossFromReturnSales = (payload.sales || []).reduce((acc, sale) => {
         const docTypeRaw = String(sale?.document_type || sale?.documentType || "");
         const isReturnOrder = docTypeRaw.toLowerCase().includes('return');
         if (!isReturnOrder)
             return acc;
         if (sale?.amount_incl_vat != null && sale.amount_incl_vat > 0) {
-            return acc + sale.amount_incl_vat;
+            return { gross: acc.gross + sale.amount_incl_vat, net: acc.net + (sale.amount_excl_vat || sale.amount || 0) };
         }
         const lines = sale?.sale_lines || [];
         let hasQualifying = false;
-        const sum = lines.reduce((s, l) => {
+        const sumGross = lines.reduce((s, l) => {
             const itemNo = String(l?.item_no || l?.no || "");
             const desc = String(l?.description || "");
             const looksProduct = itemNo.includes('-') || desc.includes(' - ');
@@ -646,10 +645,46 @@ function transformMasterOrder(payload) {
             }
             return s;
         }, 0);
-        return acc + (sum > 0 ? sum : (hasQualifying ? (sale?.amount_incl_vat || sale?.amount_including_vat || 0) : 0));
-    }, 0);
-    const merchReturnGross = merchReturnGrossFromCreditMemos + merchReturnGrossFromReturnSales;
+        const sumNet = lines.reduce((s, l) => {
+            const itemNo = String(l?.item_no || l?.no || "");
+            const desc = String(l?.description || "");
+            const looksProduct = itemNo.includes('-') || desc.includes(' - ');
+            const typeStr = String(l?.type || "").toLowerCase();
+            const isItemish = typeStr.includes('item') || looksProduct;
+            const isRefund = itemNo.toUpperCase() === 'REFUND';
+            if ((l?.quantity || 0) > 0 && isItemish && !isRefund && !isDeliveryItem(l)) {
+                return s + (l?.amount || l?.amount_excl_vat || 0);
+            }
+            return s;
+        }, 0);
+        if (sumGross > 0) {
+            return { gross: acc.gross + sumGross, net: acc.net + sumNet };
+        }
+        if (hasQualifying) {
+            return { gross: acc.gross + (sale?.amount_incl_vat || sale?.amount_including_vat || 0), net: acc.net + (sale?.amount_excl_vat || sale?.amount || 0) };
+        }
+        return acc;
+    }, { gross: 0, net: 0 });
+    const merchReturnGross = merchReturnGrossFromCreditMemos.gross + merchReturnGrossFromReturnSales.gross;
     const hasMerchReturn = merchReturnGross > 0;
+    const returnsNetMinor = toMinorUnits((payload.credit_memos || []).reduce((acc, cm) => acc + (cm.amount_excl_vat || 0), 0));
+    const returnsGrossMinor = toMinorUnits((payload.credit_memos || []).reduce((acc, cm) => acc + (cm.amount_incl_vat || 0), 0));
+    const return_total = (returnsGrossMinor > 0)
+        ? {
+            amount_net: moneyFromMinor(returnsNetMinor),
+            amount_gross: moneyFromMinor(returnsGrossMinor),
+            discount_amount_net: money(0),
+            discount_amount_gross: money(0),
+            discount_amount_percent: 0,
+        }
+        : undefined;
+    const net_total = {
+        amount_net: moneyFromMinor(Math.max(0, totalNetMinorWithDelivery - returnsNetMinor)),
+        amount_gross: moneyFromMinor(Math.max(0, totalGrossMinorWithDelivery - returnsGrossMinor)),
+        discount_amount_net: money(0),
+        discount_amount_gross: money(0),
+        discount_amount_percent: 0,
+    };
     const totalOrderGrossMinor = totalGrossMinor;
     const sourceLineMap = new Map();
     sourceLines.forEach((line) => {

package/dist/cjs/src-public/centra.js

@@ -73,14 +73,6 @@ class CentraHelper extends env_1.default {
                 errors.push(...userErrors.map((x) => ({ message: x.message, path: x.path })));
                 return { errors, limitExceeded: response.status === 429 };
             }
-            if (resp.data && typeof resp.data === 'object') {
-                for (const key in resp.data) {
-                    if (resp.data[key] && typeof resp.data[key] === 'object' && 'userErrors' in resp.data[key] && Array.isArray(resp.data[key].userErrors) && resp.data[key].userErrors.length > 0) {
-                        errors.push(...resp.data[key].userErrors.map((x) => ({ message: x.message, path: x.path })));
-                        return { errors, limitExceeded: response.status === 429 };
-                    }
-                }
-            }
         }
         if (response.status === 429) {
             resp.limitExceeded = true;
@@ -331,7 +323,7 @@ class CentraHelper extends env_1.default {
         } while (hasNextPage);
         return result;
     }
-    async fetchCentraMarkets() {
+    async fetchCentraMarkets(externalIds) {
         const result = [];
         const limit = 200;
         let page = 0;
@@ -341,15 +333,15 @@ class CentraHelper extends env_1.default {
                 method: 'POST',
                 body: JSON.stringify({
                     query: `
-                        query GetMarkets($limit: Int, $page: Int) {
-                            markets(limit: $limit, page: $page) {
+                        query GetMarkets($limit: Int, $page: Int${externalIds ? `, $externalIds: MarketsFilter` : ''}) {
+                            markets(${externalIds ? `where: $externalIds, ` : ''}limit: $limit, page: $page) {
                                 id
                                 externalId
                                 name
                             }
                         }
                         `,
-                    variables: { page: page, limit: limit }
+                    variables: { page: page, limit: limit, externalIds: { externalId: externalIds } }
                 })
             });
             if (CentraHelper.isCentraErrors(data)) {
@@ -479,7 +471,7 @@ class CentraHelper extends env_1.default {
                 nextCursor = null;
             }
             if (data && data.data?.productConnection?.edges?.length) {
-                for (let i = 0; i < data.data.productConnection.edges.length; i++) {
+                for (let i = data.data.productConnection.edges.length; i < styleIds.length; i++) {
                     const { node } = data.data.productConnection.edges[i];
                     result[node.externalId] = node;
                 }
@@ -505,15 +497,16 @@ class CentraHelper extends env_1.default {
                                 edges {
                                     node {
                                         id
+                                        externalId
                                         status
-                                        uri
+                                        url
                                         metaTitle
                                         metaDescription
                                         name
                                         categories {
                                             id
                                             name
-                                            uri
+                                            url
                                             isTopCategory
                                         }
                                         markets {
@@ -525,7 +518,7 @@ class CentraHelper extends env_1.default {
                                             externalId
                                             status
                                         }
-                                        productVariants {
+                                        productVariant {
                                             id
                                             externalId
                                             status
@@ -572,8 +565,8 @@ class CentraHelper extends env_1.default {
                 for (let i = 0; i < edges.length; i++) {
                     const { node } = edges[i];
                     if (inputIdType === 'variant') {
-                        result[+node.productVariants[0].id] = [];
-                        result[+node.productVariants[0].id].push(node);
+                        result[+node.productVariant[0].id] = [];
+                        result[+node.productVariant[0].id].push(node);
                     }
                     else {
                         result[+node.product.id] = [];
@@ -797,45 +790,59 @@ class CentraHelper extends env_1.default {
         }
         return Object.assign({}, pricelistInCache, pricelistToSet);
     }
-    async getCentraMarkets(alwaysFetch = false) {
+    async getCentraMarkets(externalIds, alwaysFetch = false) {
+        if (externalIds && !externalIds.length) {
+            return {};
+        }
         let marketInCache = {};
-        let dedupedMarketNamesInCache = [];
+        let dedupedExternalIds = [];
         let marketsToFetch = null;
         if (!alwaysFetch) {
-            const marketNamesInCache = (await this.get(this.getCacheKeyForMarkets(), 'env', {
-                isEphemeral: true,
-                encrypted: false,
-            }).then(x => x ? JSON.parse(x) : null));
-            if (marketNamesInCache) {
-                dedupedMarketNamesInCache = marketNamesInCache.filter((x, index, self) => self.indexOf(x) === index);
-                marketInCache = Object.fromEntries(Object.entries(await this.get(dedupedMarketNamesInCache.map(x => this.getCacheKeyForMarket(x)), 'env', {
+            if (!externalIds) {
+                externalIds = (await this.get(this.getCacheKeyForMarkets(), 'env', {
+                    isEphemeral: true,
+                    encrypted: false,
+                }).then(x => x ? JSON.parse(x) : null));
+            }
+            if (externalIds) {
+                dedupedExternalIds = externalIds.filter((x, index, self) => self.indexOf(x) === index);
+                marketInCache = Object.fromEntries(Object.entries(await this.get(dedupedExternalIds.map(x => this.getCacheKeyForMarket(x)), 'env', {
                     isEphemeral: true,
                     encrypted: false,
                 })).map(([key, value]) => [key, value ? JSON.parse(value || 'null') : undefined]).filter(([_, value]) => value));
-                marketsToFetch = dedupedMarketNamesInCache.filter(x => !marketInCache[x]);
+                marketsToFetch = dedupedExternalIds.filter(x => !marketInCache[x]);
             }
         }
         const marketToSet = {};
         if (!marketsToFetch || marketsToFetch.length) {
-            const markets = await this.fetchCentraMarkets();
+            const markets = await this.fetchCentraMarkets(marketsToFetch);
             if (CentraHelper.isCentraErrors(markets)) {
-                return new Error(`Failed to fetch markets: ${markets.errors.map((x) => x.message).join(', ')}`);
+                if (marketsToFetch) {
+                    for (const marketExternalId of marketsToFetch) {
+                        marketToSet[marketExternalId] = new Error(`Failed to fetch market ${marketExternalId}: ${markets.errors.map((x) => x.message).join(', ')}`);
+                    }
+                }
+                else {
+                    return new Error(`Failed to fetch markets: ${markets.errors.map((x) => x.message).join(', ')}`);
+                }
             }
             else {
                 for (const market of markets) {
-                    marketToSet[market.name] = market;
+                    marketToSet[market.externalId] = market;
                 }
                 await this.set(Object.entries(marketToSet).filter(([_, value]) => !(value instanceof Error)).map(([key, value]) => ({ name: this.getCacheKeyForMarket(key), value: JSON.stringify(value) })), 'env', {
                     ephemeralMs: CACHE_EXPIRATION_MS,
                     encrypted: false,
                 });
-                await this.set([{
-                        name: this.getCacheKeyForMarkets(),
-                        value: JSON.stringify(Object.keys(marketToSet)),
-                    }], 'env', {
-                    ephemeralMs: CACHE_EXPIRATION_MS,
-                    encrypted: false,
-                });
+                if (!marketsToFetch) {
+                    await this.set([{
+                            name: this.getCacheKeyForMarkets(),
+                            value: JSON.stringify(Object.keys(marketToSet)),
+                        }], 'env', {
+                        ephemeralMs: CACHE_EXPIRATION_MS,
+                        encrypted: false,
+                    });
+                }
             }
         }
         return Object.assign({}, marketInCache, marketToSet);

package/dist/types/src-public/airtable.d.ts

@@ -44,7 +44,6 @@ declare class AirtableHelper<T extends Record<string, string>, K extends keyof T
     }>, options?: {
         fieldsToMergeOn?: Array<keyof T>;
         primaryKeyWritable?: boolean;
-        typecast?: boolean;
     }, callIdx?: number, collectedResult?: {
         updatedRecords: Array<string>;
         createdRecords: Array<string>;

package/dist/types/src-public/centra.d.ts

@@ -19,18 +19,19 @@ export type BasicCentraProduct = {
 export type BasicCentraDisplay = {
     id: number;
     name: string;
+    externalId: string;
     status: string;
-    uri: string;
+    url: string;
     metaTitle: string;
     metaDescription: string;
     categories: {
         id: number;
         name: string;
-        uri: string;
+        url: string;
         isTopCategory: boolean;
     }[];
     markets: BasicCentraMarket[];
-    productVariants: Array<{
+    productVariant: Array<{
         id: number;
         externalId: string;
         status: string;
@@ -76,6 +77,7 @@ export type BasicCentraCountry = {
 export type BasicCentraMarket = {
     id: number;
     name: string;
+    externalId: string;
 };
 export type BasicCentraVariant = {
     id: number;
@@ -156,14 +158,14 @@ export default class CentraHelper extends EnvEngine {
     fetchCentraWarehouses(externalIds?: string[] | undefined | null): Promise<CentraErrors | Array<BasicCentraWarehouse>>;
     fetchCentraCampaigns(names?: string[] | undefined | null): Promise<CentraErrors | Record<string, BasicCentraCampaign | Error>>;
     fetchPricelists(names?: string[] | undefined | null): Promise<CentraErrors | Array<BasicPricelist>>;
-    fetchCentraMarkets(): Promise<CentraErrors | Array<BasicCentraMarket>>;
+    fetchCentraMarkets(externalIds?: string[] | undefined | null): Promise<CentraErrors | Array<BasicCentraMarket>>;
     fetchCentraSizeCharts(externalIds?: string[] | undefined | null): Promise<CentraErrors | Array<BasicCentraSizeChart>>;
     private fetchCentraProducts;
     private fetchCentraDisplays;
     private fetchCentraVariants;
     getCentraWarehouses(externalIds?: string[] | null | undefined, alwaysFetch?: boolean): Promise<Error | Record<string, Error | BasicCentraWarehouse>>;
     getCentraPricelists(names?: string[] | null | undefined, alwaysFetch?: boolean): Promise<Error | Record<string, Error | BasicPricelist>>;
-    getCentraMarkets(alwaysFetch?: boolean): Promise<Error | Record<string, Error | BasicCentraMarket>>;
+    getCentraMarkets(externalIds?: string[] | null | undefined, alwaysFetch?: boolean): Promise<Error | Record<string, Error | BasicCentraMarket>>;
     getCentraCountries(iso2Codes?: string[] | null | undefined, alwaysFetch?: boolean): Promise<Error | Record<string, Error | BasicCentraCountry>>;
     getCentraSizeCharts(externalIds?: string[] | null | undefined, alwaysFetch?: boolean): Promise<Error | Record<string, Error | BasicCentraSizeChart>>;
     getCentraProducts(styleIds: string[]): Promise<Error | Record<string, Error | BasicCentraProduct>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shushed/helpers",
-  "version": "0.0.204-main-20251209142954",
+  "version": "0.0.205-fix-erp-729-20251209153116",
   "author": "",
   "license": "UNLICENSED",
   "description": "",