@shushed/helpers 0.0.223 → 0.0.224-main-20251222140743

package/dist/cjs/contracts/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Order = exports.PurchaseOrderline = exports.StockMovement = exports.MarketingPref = exports.CustomerSegment = exports.Asset = exports.DevelopmentColour = exports.Category = exports.ProductCategory = exports.Product = exports.ProductDraft = exports.Total = exports.Money = exports.Country = exports.Currency = void 0;
+exports.Order = exports.MarketingPref = exports.CustomerSegment = exports.Asset = exports.DevelopmentColour = exports.Category = exports.ProductCategory = exports.Product = exports.ProductDraft = exports.Total = exports.Money = exports.Country = exports.Currency = void 0;
 var currency_schema_json_1 = require("./currency.schema.json");
 Object.defineProperty(exports, "Currency", { enumerable: true, get: function () { return __importDefault(currency_schema_json_1).default; } });
 var country_schema_json_1 = require("./country.schema.json");
@@ -42,10 +42,6 @@ var customer_segment_schema_json_1 = require("./customer-segment.schema.json");
 Object.defineProperty(exports, "CustomerSegment", { enumerable: true, get: function () { return __importDefault(customer_segment_schema_json_1).default; } });
 var marketing_preferences_schema_json_1 = require("./marketing-preferences.schema.json");
 Object.defineProperty(exports, "MarketingPref", { enumerable: true, get: function () { return __importDefault(marketing_preferences_schema_json_1).default; } });
-var stock_movement_schema_json_1 = require("./stock-movement.schema.json");
-Object.defineProperty(exports, "StockMovement", { enumerable: true, get: function () { return __importDefault(stock_movement_schema_json_1).default; } });
-var purchase_orderline_schema_json_1 = require("./purchase-orderline.schema.json");
-Object.defineProperty(exports, "PurchaseOrderline", { enumerable: true, get: function () { return __importDefault(purchase_orderline_schema_json_1).default; } });
 __exportStar(require("./order"), exports);
 var order_schema_json_1 = require("./order.schema.json");
 Object.defineProperty(exports, "Order", { enumerable: true, get: function () { return __importDefault(order_schema_json_1).default; } });

package/dist/cjs/dist-dereferenced/index.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Order = exports.Messages = exports.Total = exports.Stock = exports.StockMovement = exports.PurchaseOrderline = exports.Product = exports.ProductDraft = exports.ProductCategory = exports.Price = exports.Money = exports.MarketingPreferences = exports.DevelopmentColour = exports.CustomerSegment = exports.Currency = exports.Country = exports.Category = exports.Asset = void 0;
+exports.Order = exports.Messages = exports.Total = exports.Stock = exports.Product = exports.ProductDraft = exports.ProductCategory = exports.Price = exports.Money = exports.MarketingPreferences = exports.DevelopmentColour = exports.CustomerSegment = exports.Currency = exports.Country = exports.Category = exports.Asset = void 0;
 var asset_1 = require("./asset");
 Object.defineProperty(exports, "Asset", { enumerable: true, get: function () { return __importDefault(asset_1).default; } });
 var category_1 = require("./category");
@@ -61,10 +61,6 @@ var product_draft_1 = require("./product-draft");
 Object.defineProperty(exports, "ProductDraft", { enumerable: true, get: function () { return __importDefault(product_draft_1).default; } });
 var product_1 = require("./product");
 Object.defineProperty(exports, "Product", { enumerable: true, get: function () { return __importDefault(product_1).default; } });
-var purchase_orderline_1 = require("./purchase-orderline");
-Object.defineProperty(exports, "PurchaseOrderline", { enumerable: true, get: function () { return __importDefault(purchase_orderline_1).default; } });
-var stock_movement_1 = require("./stock-movement");
-Object.defineProperty(exports, "StockMovement", { enumerable: true, get: function () { return __importDefault(stock_movement_1).default; } });
 var stock_1 = require("./stock");
 Object.defineProperty(exports, "Stock", { enumerable: true, get: function () { return __importDefault(stock_1).default; } });
 var total_1 = require("./total");

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

@@ -42,107 +42,71 @@ class AirtableHelper extends runtime_1.default {
         }
         return existingRecord;
     }
-    async updateMultiple(payload, options = {}) {
+    async updateMultiple(payload, options = {}, callIdx = 0, collectedResult = {
+        updatedRecords: [],
+        createdRecords: [],
+        records: []
+    }) {
         let response = null;
         const tableUrl = `https://api.airtable.com/v0/${this.baseId}/${this.tableId}`;
-        const batchSize = 10;
-        let collectedResult = {
-            updatedRecords: [],
-            createdRecords: [],
-            records: []
-        };
-        const fieldsToMergeOn = (options.fieldsToMergeOn || [this.primaryKeyFieldName]);
-        const fieldsToMergeOnIds = fieldsToMergeOn.map(x => this.dictionary[x] || x);
-        let callIdx = 0;
-        const payloadDeduplicated = payload.filter((x, idx, self) => idx === self.findIndex((t) => fieldsToMergeOn.every(field => (0, lodash_isequal_1.default)(t[field], x[field]))));
-        const maxCallIdx = Math.ceil(payloadDeduplicated.length / batchSize);
-        while (callIdx < maxCallIdx) {
-            const currentBatch = payloadDeduplicated.slice(callIdx * batchSize, (callIdx + 1) * batchSize);
-            const recordsInBatch = currentBatch.map(x => {
-                const recordId = x.$recordId;
-                const fieldsWithoutRecordId = { ...x };
-                delete fieldsWithoutRecordId.$recordId;
-                const record = {
-                    fields: AirtableHelper.convertToDictionary(this.dictionary, this.primaryKeyWritable === false
-                        ? AirtableHelper.removePrimaryKey(fieldsWithoutRecordId, this.primaryKeyFieldName)
-                        : fieldsWithoutRecordId),
-                };
-                if (recordId) {
-                    record.id = recordId;
-                }
-                return record;
-            });
-            try {
-                response = await fetch(`${tableUrl}`, {
-                    method: "PATCH",
-                    headers: {
-                        Authorization: `Bearer ${this.apiKey}`,
-                        "Content-Type": "application/json",
+        const currentBatch = payload.slice(callIdx * 10, (callIdx + 1) * 10);
+        try {
+            response = await fetch(`${tableUrl}`, {
+                method: "PATCH",
+                headers: {
+                    Authorization: `Bearer ${this.apiKey}`,
+                    "Content-Type": "application/json",
+                },
+                body: JSON.stringify({
+                    performUpsert: {
+                        fieldsToMergeOn: (options.fieldsToMergeOn ?? [this.primaryKeyFieldName]).map(x => this.dictionary[x] || x),
                     },
-                    body: JSON.stringify({
-                        performUpsert: {
-                            fieldsToMergeOn: fieldsToMergeOnIds,
-                        },
-                        returnFieldsByFieldId: true,
-                        typecast: options.typecast || false,
-                        records: recordsInBatch
-                    }),
-                });
-                if (!response.ok && response) {
-                    const text = await response.text().catch(() => `${response?.status || 'unknown'}`);
-                    throw new Error(text);
-                }
-                const resp = (await response.json());
-                collectedResult = {
-                    updatedRecords: collectedResult.updatedRecords.concat(resp.updatedRecords),
-                    createdRecords: collectedResult.createdRecords.concat(resp.createdRecords),
-                    records: collectedResult.records.concat(resp.records.map(x => AirtableHelper.translateFields(this.dictionary, x)))
-                };
-            }
-            catch (err) {
-                const errorMessage = `Failed to update records in ${this.tableId} table (baseId: ${this.baseId}). Status: ${response?.status || 'unknown'}. Error: ${err.message}`;
-                const batchErrors = currentBatch.map(() => new Error(errorMessage));
-                collectedResult = {
-                    updatedRecords: collectedResult.updatedRecords,
-                    createdRecords: collectedResult.createdRecords,
-                    records: collectedResult.records.concat(batchErrors)
-                };
+                    returnFieldsByFieldId: true,
+                    typecast: options.typecast || false,
+                    records: currentBatch.map(x => {
+                        const recordId = x.$recordId;
+                        const fieldsWithoutRecordId = { ...x };
+                        delete fieldsWithoutRecordId.$recordId;
+                        const record = {
+                            fields: AirtableHelper.convertToDictionary(this.dictionary, this.primaryKeyWritable === false
+                                ? AirtableHelper.removePrimaryKey(fieldsWithoutRecordId, this.primaryKeyFieldName)
+                                : fieldsWithoutRecordId),
+                        };
+                        if (recordId) {
+                            record.id = recordId;
+                        }
+                        return record;
+                    })
+                }),
+            });
+            if (!response.ok && response) {
+                const text = await response.text().catch(() => `${response?.status || 'unknown'}`);
+                throw new Error(text);
             }
-            finally {
-                callIdx += 1;
+            const resp = (await response.json());
+            const nextCollectedResult = {
+                updatedRecords: collectedResult.updatedRecords.concat(resp.updatedRecords),
+                createdRecords: collectedResult.createdRecords.concat(resp.createdRecords),
+                records: collectedResult.records.concat(resp.records.map(x => AirtableHelper.translateFields(this.dictionary, x)))
+            };
+            if (payload.length > (callIdx + 1) * 10) {
+                return this.updateMultiple(payload, options, callIdx + 1, nextCollectedResult);
             }
+            return nextCollectedResult;
         }
-        const resultInOrder = [];
-        for (let i = 0; i < payload.length; i++) {
-            let j = 0;
-            let foundMatchingRecord = null;
-            while (j < collectedResult.records.length && foundMatchingRecord === null) {
-                let isMatching = true;
-                let k = 0;
-                while (k < fieldsToMergeOn.length && isMatching) {
-                    const field = fieldsToMergeOn[k];
-                    if (!(0, lodash_isequal_1.default)(collectedResult.records[j].fields[field], payload[i][field])) {
-                        isMatching = false;
-                    }
-                    k += 1;
-                }
-                if (isMatching) {
-                    foundMatchingRecord = j;
-                }
-                j += 1;
-            }
-            if (foundMatchingRecord !== null) {
-                resultInOrder.push(collectedResult.records[foundMatchingRecord]);
-            }
-            else {
-                resultInOrder.push(new Error(`Record ${payload[i][this.primaryKeyFieldName]} does not match any record in the response`));
+        catch (err) {
+            const errorMessage = `Failed to update records in ${this.tableId} table (baseId: ${this.baseId}). Status: ${response?.status || 'unknown'}. Error: ${err.message}`;
+            const batchErrors = currentBatch.map(() => new Error(errorMessage));
+            const nextCollectedResult = {
+                updatedRecords: collectedResult.updatedRecords,
+                createdRecords: collectedResult.createdRecords,
+                records: collectedResult.records.concat(batchErrors)
+            };
+            if (payload.length > (callIdx + 1) * 10) {
+                return this.updateMultiple(payload, options, callIdx + 1, nextCollectedResult);
             }
+            return nextCollectedResult;
         }
-        return {
-            updatedRecords: collectedResult.updatedRecords,
-            createdRecords: collectedResult.createdRecords,
-            records: resultInOrder
-        };
     }
     async upsert(payload) {
         const existingRecord = await this.getExistingRecord(payload);
@@ -294,10 +258,9 @@ class AirtableHelper extends runtime_1.default {
         const escapeFormulaValue = (value) => {
             return value.replace(/"/g, '\\"');
         };
-        const dedupedKeys = keys.filter((x, idx, self) => self.indexOf(x) === idx);
         const batchSize = 50;
-        for (let i = 0; i < dedupedKeys.length; i += batchSize) {
-            const batch = dedupedKeys.slice(i, i + batchSize);
+        for (let i = 0; i < keys.length; i += batchSize) {
+            const batch = keys.slice(i, i + batchSize);
             const orConditions = batch.map(key => `${this.dictionary[this.primaryKeyFieldName]} = "${escapeFormulaValue(key)}"`).join(', ');
             const formula = `OR(${orConditions})`;
             const records = await this.getExistingRecords(formula);

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,57 @@ 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?.sale_lines && sale0.sale_lines.length > 0) {
+        const allSaleLinesWithDelivery = (sale0.sale_lines || []).filter((l) => {
+            if (String(l?.type || '').toLowerCase() !== 'item')
+                return false;
+            return true;
+        });
+        const totalSaleNetMinorWithDelivery = toMinorUnits(allSaleLinesWithDelivery.reduce((acc, l) => acc + (Number(l?.amount || 0)), 0));
+        const totalSaleGrossMinorWithDelivery = toMinorUnits(allSaleLinesWithDelivery.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
+        if (invoicesGrossMinorWithDelivery > 0) {
+            nonInvSalesNetMinorWithDelivery = Math.max(0, totalSaleNetMinorWithDelivery - invoicesNetMinorWithDelivery);
+            nonInvSalesGrossMinorWithDelivery = Math.max(0, totalSaleGrossMinorWithDelivery - invoicesGrossMinorWithDelivery);
         }
-        : undefined;
-    const net_total = {
-        amount_net: moneyFromMinor(Math.max(0, totalNetMinor - returnsNetMinor)),
-        amount_gross: moneyFromMinor(Math.max(0, totalGrossMinor - returnsGrossMinor)),
+        else {
+            nonInvSalesNetMinorWithDelivery = totalSaleNetMinorWithDelivery;
+            nonInvSalesGrossMinorWithDelivery = totalSaleGrossMinorWithDelivery;
+        }
+    }
+    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 (invoicesGrossMinorWithDelivery > 0) {
+            nonInvSalesNetMinorWithDelivery = Math.max(0, saleNetMinor - invoicesNetMinorWithDelivery);
+            nonInvSalesGrossMinorWithDelivery = Math.max(0, saleGrossMinor - invoicesGrossMinorWithDelivery);
+        }
+        else {
+            nonInvSalesNetMinorWithDelivery = saleNetMinor;
+            nonInvSalesGrossMinorWithDelivery = saleGrossMinor;
+        }
+    }
+    else {
+        const nonInvoicedSalesWithDelivery = (sale0?.sale_lines || []).filter((l) => {
+            if (String(l?.type || '').toLowerCase() !== 'item')
+                return false;
+            const lineNo = Number(l?.line_no || -1);
+            return !invoicedLineNos.has(lineNo);
+        });
+        nonInvSalesNetMinorWithDelivery = toMinorUnits(nonInvoicedSalesWithDelivery.reduce((acc, l) => acc + (Number(l?.amount || 0)), 0));
+        nonInvSalesGrossMinorWithDelivery = toMinorUnits(nonInvoicedSalesWithDelivery.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
+    }
+    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 +617,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 +630,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 +672,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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const crypto_1 = __importDefault(require("crypto"));
 const env_1 = __importDefault(require("./env"));
 const utils_1 = require("./utils");
-const CACHE_EXPIRATION_MS = 1000 * 60 * 5;
+const CACHE_EXPIRATION_MS = 1000 * 60 * 60 * 3;
 class CentraHelper extends env_1.default {
     opts;
     shaToken;
@@ -99,12 +99,6 @@ class CentraHelper extends env_1.default {
     getCacheKeyForMarket(marketExternalId) {
         return `${this.getCacheKeyForMarkets()}_${marketExternalId}`;
     }
-    getCacheKeyForCampaigns() {
-        return `centra_${this.shaToken}_campaign_name`;
-    }
-    getCacheKeyForCampaign(campaignName) {
-        return `${this.getCacheKeyForCampaigns()}_${campaignName}`;
-    }
     getCacheKeyForSizeCharts() {
         return `centra_${this.shaToken}_size_chart_external_id`;
     }
@@ -136,7 +130,7 @@ class CentraHelper extends env_1.default {
         return `${this.getCacheKeyForCentraWarehouses()}_${warehouseExternalId}`;
     }
     getCacheKeyForCentraPricelists() {
-        return `centra_${this.shaToken}_pricelists_external_id`;
+        return `centra_${this.shaToken}_pricelist_external_id`;
     }
     getCacheKeyForCentraPricelist(pricelistExternalId) {
         return `${this.getCacheKeyForCentraPricelists()}_${pricelistExternalId}`;
@@ -224,7 +218,7 @@ class CentraHelper extends env_1.default {
         return result;
     }
     async fetchCentraCampaigns(names) {
-        const limit = names ? (names.length > 200 ? 200 : names.length) : 200;
+        const limit = (names?.length || 0) > 200 ? 200 : (names?.length || 0);
         let nextCursor = null;
         const result = {};
         do {
@@ -276,7 +270,7 @@ class CentraHelper extends env_1.default {
                     nextCursor = null;
                 }
                 if (campaignConnection && campaignConnection.edges?.length) {
-                    for (let i = 0; i < campaignConnection.edges.length; i++) {
+                    for (let i = campaignConnection.edges.length; i < (names?.length || 0); i++) {
                         const { node } = campaignConnection.edges[i];
                         result[node.name] = node;
                     }
@@ -727,9 +721,7 @@ class CentraHelper extends env_1.default {
             }
             else {
                 for (const warehouse of warehouses) {
-                    if (warehouse.externalId) {
-                        warehouseToSet[warehouse.externalId] = warehouse;
-                    }
+                    warehouseToSet[warehouse.externalId] = warehouse;
                 }
                 await this.set(Object.entries(warehouseToSet).filter(([_, value]) => !(value instanceof Error)).map(([key, value]) => ({ name: this.getCacheKeyForCentraWarehouse(key), value: JSON.stringify(value) })), 'env', {
                     ephemeralMs: CACHE_EXPIRATION_MS,
@@ -805,49 +797,6 @@ class CentraHelper extends env_1.default {
         }
         return Object.assign({}, pricelistInCache, pricelistToSet);
     }
-    async getCentraCampaigns(alwaysFetch = false) {
-        let campaignInCache = {};
-        let dedupedCampaignNamesInCache = [];
-        let campaignsToFetch = null;
-        if (!alwaysFetch) {
-            const campaignNamesInCache = await (this.get(this.getCacheKeyForCampaigns(), 'env', {
-                isEphemeral: true,
-                encrypted: false,
-            }).then(x => x ? JSON.parse(x) : null));
-            if (campaignNamesInCache) {
-                dedupedCampaignNamesInCache = campaignNamesInCache.filter((x, index, self) => self.indexOf(x) === index);
-                campaignInCache = Object.fromEntries(Object.entries(await this.get(dedupedCampaignNamesInCache.map((x) => this.getCacheKeyForCampaign(x)), 'env', {
-                    isEphemeral: true,
-                    encrypted: false,
-                })).map(([key, value]) => [key, value ? JSON.parse(value || 'null') : undefined]).filter(([_, value]) => value));
-                campaignsToFetch = dedupedCampaignNamesInCache.filter(x => !campaignInCache[x]);
-            }
-        }
-        const campaignToSet = {};
-        if (!campaignsToFetch || campaignsToFetch.length) {
-            const campaigns = await this.fetchCentraCampaigns();
-            if (CentraHelper.isCentraErrors(campaigns)) {
-                return new Error(`Failed to fetch campaigns: ${campaigns.errors.map((x) => x.message).join(', ')}`);
-            }
-            else {
-                for (const campaign of Object.values(campaigns)) {
-                    campaignToSet[campaign.name] = campaign;
-                }
-                await this.set(Object.entries(campaignToSet).filter(([_, value]) => !(value instanceof Error)).map(([key, value]) => ({ name: this.getCacheKeyForCampaign(key), value: JSON.stringify(value) })), 'env', {
-                    ephemeralMs: CACHE_EXPIRATION_MS,
-                    encrypted: false,
-                });
-                await this.set([{
-                        name: this.getCacheKeyForCampaigns(),
-                        value: JSON.stringify(Object.keys(campaignToSet)),
-                    }], 'env', {
-                    ephemeralMs: CACHE_EXPIRATION_MS,
-                    encrypted: false,
-                });
-            }
-        }
-        return Object.assign({}, campaignInCache, campaignToSet);
-    }
     async getCentraMarkets(alwaysFetch = false) {
         let marketInCache = {};
         let dedupedMarketNamesInCache = [];

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

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SitooHelper = exports.RedisConnectionError = exports.RateLimit = exports.setHeaders = exports.BCOrderHelper = exports.DatoHelper = exports.AirtableHelper = exports.CentraHelper = exports.BigQueryHelper = exports.JWKSHelper = exports.CloudTasksHelper = exports.Secrets = exports.SchedulerHelper = exports.Logging = exports.Runtime = exports.PubSubHelper = exports.EnvEngine = exports.validate = void 0;
+exports.RedisConnectionError = exports.RateLimit = exports.setHeaders = exports.BCOrderHelper = exports.DatoHelper = exports.AirtableHelper = exports.CentraHelper = exports.BigQueryHelper = exports.JWKSHelper = exports.CloudTasksHelper = exports.Secrets = exports.SchedulerHelper = exports.Logging = exports.Runtime = exports.PubSubHelper = exports.EnvEngine = exports.validate = void 0;
 var validate_1 = require("./validate");
 Object.defineProperty(exports, "validate", { enumerable: true, get: function () { return __importDefault(validate_1).default; } });
 __exportStar(require("./sanitize"), exports);
@@ -52,5 +52,3 @@ Object.defineProperty(exports, "setHeaders", { enumerable: true, get: function (
 var rateLimit_1 = require("./rateLimit");
 Object.defineProperty(exports, "RateLimit", { enumerable: true, get: function () { return __importDefault(rateLimit_1).default; } });
 Object.defineProperty(exports, "RedisConnectionError", { enumerable: true, get: function () { return rateLimit_1.RedisConnectionError; } });
-var sitoo_1 = require("./sitoo");
-Object.defineProperty(exports, "SitooHelper", { enumerable: true, get: function () { return __importDefault(sitoo_1).default; } });

package/dist/package.json

@@ -5,7 +5,6 @@
   "license": "UNLICENSED",
   "description": "",
   "dependencies": {
-    "@google-cloud/firestore": "^7.11.1",
     "@hackylabs/deep-redact": "^2.2.1",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
@@ -13,15 +12,15 @@
     "jose": "^6.0.11",
     "lodash.chunk": "^4.2.0",
     "lodash.clonedeep": "^4.5.0",
-    "lodash.groupby": "^4.6.0",
     "lodash.isequal": "^4.5.0",
     "lodash.omit": "^4.5.0",
     "lodash.pick": "^4.4.0",
     "mime-types": "^3.0.1",
     "p-limit": "^7.1.1",
     "rate-limiter-flexible": "^7.2.0",
+    "uuid": "^11.1.0",
     "redis": "^5.6.0",
-    "uuid": "^11.1.0"
+    "@google-cloud/firestore": "^7.11.1"
   },
   "files": [
     "dist"

package/dist/types/contracts/index.d.ts

@@ -10,8 +10,6 @@ export { default as DevelopmentColour } from './development-colour.schema.json';
 export { default as Asset } from './asset.schema.json';
 export { default as CustomerSegment } from './customer-segment.schema.json';
 export { default as MarketingPref } from './marketing-preferences.schema.json';
-export { default as StockMovement } from './stock-movement.schema.json';
-export { default as PurchaseOrderline } from './purchase-orderline.schema.json';
 export * from './order';
 export { default as Order } from './order.schema.json';
 export * from './messages';

package/dist/types/dist-dereferenced/index.d.ts

@@ -10,8 +10,6 @@ export { default as Price } from './price';
 export { default as ProductCategory } from './product-category';
 export { default as ProductDraft } from './product-draft';
 export { default as Product } from './product';
-export { default as PurchaseOrderline } from './purchase-orderline';
-export { default as StockMovement } from './stock-movement';
 export { default as Stock } from './stock';
 export { default as Total } from './total';
 export * as Messages from './messages';

package/dist/types/dist-types/index.d.ts

@@ -10,8 +10,6 @@ export { default as Price } from './price';
 export { default as ProductCategory } from './product-category';
 export { default as ProductDraft } from './product-draft';
 export { default as Product } from './product';
-export { default as PurchaseOrderline } from './purchase-orderline';
-export { default as StockMovement } from './stock-movement';
 export { default as Stock } from './stock';
 export { default as Total } from './total';
 export * as Messages from './messages';