rerobe-js-orm 4.9.13 → 4.9.15

package/lib/constants/order-constants.d.ts

@@ -31,6 +31,7 @@ export namespace SALES_CHANNELS {
     let ribbnSellThroughChannelPartner: string;
     let ribbnSellOnChannelPartner: string;
 }
+export const POS_SALES_CHANNELS: string[];
 export namespace FULFILLMENT_TYPES {
     let fulfilled: string;
     let partiallyFulfilled: string;

package/lib/constants/order-constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SALES_CHANNEL_TO_RETURN_POLICY_MAPPING = exports.RETURN_POLICY_TYPES = exports.FINANCIAL_TYPES = exports.FULFILLMENT_TYPES = exports.SALES_CHANNELS = exports.ORDER_STATES = exports.PAYMENT_TYPES = exports.SHIPPING_TYPES = void 0;
+exports.SALES_CHANNEL_TO_RETURN_POLICY_MAPPING = exports.RETURN_POLICY_TYPES = exports.FINANCIAL_TYPES = exports.FULFILLMENT_TYPES = exports.POS_SALES_CHANNELS = exports.SALES_CHANNELS = exports.ORDER_STATES = exports.PAYMENT_TYPES = exports.SHIPPING_TYPES = void 0;
 exports.SHIPPING_TYPES = {
     localPickUp: 'LOCAL_PICK_UP',
     localDelivery: 'LOCAL_DELIVERY',
@@ -34,6 +34,10 @@ exports.SALES_CHANNELS = {
     ribbnSellThroughChannelPartner: 'RIBBN_SELL_THROUGH_CHANNEL_PARTNER',
     ribbnSellOnChannelPartner: 'RIBBN_SELL_ON_CHANNEL_PARTNER',
 };
+// Point-of-sale / in-person channels: the customer is handed the goods at the
+// moment of sale, so every item is fulfilled at sale time (there is no separate
+// fulfillment step, and no per-item fulfillment record is created).
+exports.POS_SALES_CHANNELS = [exports.SALES_CHANNELS.ribbnWebPOS, exports.SALES_CHANNELS.ribbnMobilePOS];
 exports.FULFILLMENT_TYPES = {
     fulfilled: 'FULFILLED',
     partiallyFulfilled: 'PARTIALLY_FULFILLED',

package/lib/helpers/OrderHelpers.d.ts

@@ -15,6 +15,9 @@ export default class OrderHelpers {
         currencyCode: string;
     };
     getAmountSumByField(array: OrderRefund[] | ReRobeOrderLineItem[], fieldKey: string): number;
+    isPosOrder(order: {
+        salesChannel?: string | null;
+    } | null | undefined): boolean;
     getOrderInfoWithRefundsAndFulfillments(order: CompleteOrder): OrderWithRefundsAndFulfillmentsInfoObj;
     getUpdatedOrderObjWithRefunds(orderObj: CompleteOrder, refundObj: OrderRefund): CompleteOrder;
     getUpdatedOrderObjWithFulfillment(orderObj: CompleteOrder, fulfillmentObj: FulfillmentAdmin, totalUnfulfilledItems: number): CompleteOrder;

package/lib/helpers/OrderHelpers.js

@@ -160,11 +160,21 @@ class OrderHelpers {
     getAmountSumByField(array, fieldKey) {
         return array.map((item) => { var _a; return Number(((_a = item[fieldKey]) === null || _a === void 0 ? void 0 : _a.amount) || 0); }).reduce((a, b) => a + b, 0);
     }
+    // Point-of-sale / in-person sale (Ribbn POS or the Ribbn Mobile App): goods are
+    // handed over at the moment of sale, so all items are fulfilled at sale time.
+    isPosOrder(order) {
+        return order_constants_1.POS_SALES_CHANNELS.includes((order && order.salesChannel) || '');
+    }
     getOrderInfoWithRefundsAndFulfillments(order) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         const orderRefunds = order.refunds ? [...order.refunds] : [];
         const orderFulfillment = order.fulfillments ? [...order.fulfillments] : [];
         const orderLineItems = order.lineItems && Array.isArray(order.lineItems) ? [...order.lineItems] : [];
+        // POS / in-person orders fulfill every item at sale and never create per-item
+        // fulfillment records, so without this they'd all bucket as "unfulfilled"
+        // (and a refund would strand the non-returned items there). When there are no
+        // real fulfillment records, baseline every item as fulfilled instead.
+        const posFulfilledBaseline = this.isPosOrder(order) && !orderFulfillment.length;
         const subtotalPrice = Object.assign(Object.assign({}, order.subtotalPrice), { amount: this.getSubtotalPrice(orderLineItems) });
         const subtotalPricePresentment = Object.assign(Object.assign({}, order.subtotalPricePresentment), { amount: this.getAmountSumByField(orderLineItems, 'presentmentTotalPrice') });
         const preparedOrder = {
@@ -226,6 +236,10 @@ class OrderHelpers {
             });
             preparedOrder.fulfilledItems = preparedOrder.activeLineItems.filter(({ fulfilledQuantity }) => fulfilledQuantity > 0);
         }
+        else if (posFulfilledBaseline) {
+            preparedOrder.activeLineItems = preparedOrder.activeLineItems.map((item) => (Object.assign(Object.assign({}, item), { fulfilledQuantity: Number(item.quantity), unfulfilledQuantity: 0 })));
+            preparedOrder.fulfilledItems = [...preparedOrder.activeLineItems];
+        }
         preparedOrder.unfulfilledItems = preparedOrder.activeLineItems.filter(({ unfulfilledQuantity }) => unfulfilledQuantity > 0);
         if (!orderRefunds.length) {
             return preparedOrder;
@@ -277,6 +291,16 @@ class OrderHelpers {
             }, { refundedQuantity: 0, canceledQuantity: 0 });
             // 3. fulfilledQuantity = (sum of order.fulfillment) - refundedQuantity
             // 4. quantity = unfulfilled quantity (prev quantity - sum of order.fulfillment) - cancelled
+            //
+            // POS / in-person: every item started fulfilled, so a return (recorded as a
+            // refund OR a cancel, depending on the refund flow) comes out of the
+            // fulfilled quantity — never out of unfulfilled (which is 0 here). Otherwise
+            // a returned POS item would stay in the fulfilled bucket AND show as removed.
+            if (posFulfilledBaseline) {
+                return Object.assign(Object.assign(Object.assign({}, item), { fulfilledQuantity: Number(item.fulfilledQuantity) -
+                        refundedAndCanceledQuantity.refundedQuantity -
+                        refundedAndCanceledQuantity.canceledQuantity, unfulfilledQuantity: 0 }), refundedAndCanceledQuantity);
+            }
             return Object.assign(Object.assign(Object.assign({}, item), { fulfilledQuantity: Number(item.fulfilledQuantity) - refundedAndCanceledQuantity.refundedQuantity, unfulfilledQuantity: Number(item.unfulfilledQuantity) - refundedAndCanceledQuantity.canceledQuantity }), refundedAndCanceledQuantity);
         });
         // Active lineItems - not refunded and not removed(not canceled) positions
@@ -679,12 +703,15 @@ class OrderHelpers {
         })
             .reduce((acc, cur) => {
             if (cur.taxRate) {
-                if (!acc[cur.taxRate]) {
-                    acc[cur.taxRate] = 0;
+                // Key by whole percent (25), matching the backend ReceiptBuilder and the
+                // canonical "Moms 25%" display format, so every receipt path is consistent.
+                const ratePercent = Math.round(Number(cur.taxRate) * 100);
+                if (!acc[ratePercent]) {
+                    acc[ratePercent] = 0;
                 }
                 const amount = Number(cur.taxAmount);
-                acc[cur.taxRate] += isRefund ? -Math.abs(amount) : amount;
-                acc[cur.taxRate] = parseFloat(acc[cur.taxRate].toFixed(2));
+                acc[ratePercent] += isRefund ? -Math.abs(amount) : amount;
+                acc[ratePercent] = parseFloat(acc[ratePercent].toFixed(2));
             }
             return acc;
         }, {});

package/lib/helpers/ReceiptXmlHelpers.d.ts

@@ -7,6 +7,7 @@ export type ReceiptPreviewLine = {
 };
 export default class ReceiptXmlHelpers {
     static escapeXML(text: any): string;
+    static vatRatePercent(rate: any): number;
     private static variantLabelForReceipt;
     static formatLineItemXML(lineItem: any): string;
     static buildReceiptContentXML(receiptData: any): string;

package/lib/helpers/ReceiptXmlHelpers.js

@@ -18,6 +18,17 @@ class ReceiptXmlHelpers {
             .replace(/"/g, '"')
             .replace(/'/g, ''');
     }
+    // Canonical VAT-rate-for-display normalizer — the single source of truth for how
+    // a VAT rate is shown on EVERY receipt/report ("Moms 25%"). Accepts a fraction
+    // (0.25), a whole percent (25), or their string forms, and always returns the
+    // integer percent (25). A value in (0,1) is treated as a fraction; >=1 is already
+    // a percent. Covers every Swedish rate (0, 6, 12, 25) from either representation.
+    static vatRatePercent(rate) {
+        const n = Math.abs(Number(rate));
+        if (!n || Number.isNaN(n))
+            return 0;
+        return Math.round(n < 1 ? n * 100 : n);
+    }
     // Variant label for a receipt line (e.g. "M · R"), delegated to the shared
     // helper so cart, order detail, and receipt render the same rule.
     static variantLabelForReceipt(lineItem) {
@@ -131,7 +142,7 @@ class ReceiptXmlHelpers {
         if (receiptData.taxRates && typeof receiptData.taxRates === 'object') {
             receipt += '<text font="font_a" width="1" height="1">';
             Object.entries(receiptData.taxRates).forEach(([taxRate, value]) => {
-                const rate = parseFloat(String(taxRate).trim());
+                const rate = this.vatRatePercent(taxRate);
                 receipt += `Moms ${this.escapeXML(String(rate))}%: ${this.escapeXML(value)}`;
                 receipt += '</text><feed/><text font="font_a" width="1" height="1">';
             });
@@ -340,7 +351,7 @@ class ReceiptXmlHelpers {
         // --- VAT ---
         receipt += dividerLine;
         vatLines.forEach((v) => {
-            receipt += row(`Moms ${this.escapeXML(String(v.rate))}%:`, String(v.amount));
+            receipt += row(`Moms ${this.escapeXML(String(this.vatRatePercent(v.rate)))}%:`, String(v.amount));
         });
         if (netExVat)
             receipt += row('Netto (exkl. moms):', netExVat, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rerobe-js-orm",
-  "version": "4.9.13",
+  "version": "4.9.15",
   "description": "ReRobe's Javascript ORM Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",