rerobe-js-orm 3.0.43 → 3.1.1

package/lib/factories/Order/OrderFromFormState.js

@@ -5,7 +5,7 @@ const Order_1 = require("../../models/Order");
 const order_constants_1 = require("../../constants/order-constants");
 class OrderFromFormState extends OrderFactory_1.default {
     createOrder(fs) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         const currencyCode = fs.fields.currencyCode.inputValue || 'SEK';
         const customer = fs.fields.customer.selectedValue || {};
         const customerAttr = {
@@ -98,7 +98,7 @@ class OrderFromFormState extends OrderFactory_1.default {
             fulfillmentStatus: fs.fields.fulfillmentStatus.selectedValue,
             statusUrl: ((_j = fs.props) === null || _j === void 0 ? void 0 : _j.statusUrl) || '',
         };
-        const orderAttributes = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, totalPricesAttr), presentmentTotalPricesAttr), discountsAttr), shippingAndLocationAttr), customerAttr), statusesAttr), { id: ((_k = fs.props) === null || _k === void 0 ? void 0 : _k.id) || '', documentId: ((_l = fs.props) === null || _l === void 0 ? void 0 : _l.documentId) || '', name: ((_m = fs.props) === null || _m === void 0 ? void 0 : _m.name) || '', orderNumber: (_o = fs.props) === null || _o === void 0 ? void 0 : _o.orderNumber, ribbnOrderNumber: (_p = fs.props) === null || _p === void 0 ? void 0 : _p.ribbnOrderNumber, merchantId: ((_q = fs.props) === null || _q === void 0 ? void 0 : _q.merchantId) || '', currencyCode: fs.fields.currencyCode.inputValue, lineItems: fs.fields.lineItems.selectedValues || [], fulfillments: ((_r = fs.props) === null || _r === void 0 ? void 0 : _r.fulfillments) || [], refunds: ((_s = fs.props) === null || _s === void 0 ? void 0 : _s.refunds) || [], paymentType: fs.fields.paymentType.selectedValue, paymentMethod: fs.fields.paymentMethod.selectedValue || '', paymentDetails: fs.fields.paymentDetails.selectedValue || {}, notes: fs.fields.notes.inputValue || '', tags: fs.fields.tags.selectedValues || [], cancelReason: fs.fields.cancelReason.selectedValue || '', canceledAt: ((_t = fs.props) === null || _t === void 0 ? void 0 : _t.canceledAt) || '', processedAt: ((_u = fs.props) === null || _u === void 0 ? void 0 : _u.processedAt) || new Date().toUTCString(), createdAtTimestamp: 0, updatedAtTimestamp: 0 });
+        const orderAttributes = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, totalPricesAttr), presentmentTotalPricesAttr), discountsAttr), shippingAndLocationAttr), customerAttr), statusesAttr), { id: ((_k = fs.props) === null || _k === void 0 ? void 0 : _k.id) || '', documentId: ((_l = fs.props) === null || _l === void 0 ? void 0 : _l.documentId) || '', name: ((_m = fs.props) === null || _m === void 0 ? void 0 : _m.name) || '', orderNumber: (_o = fs.props) === null || _o === void 0 ? void 0 : _o.orderNumber, ribbnOrderNumber: (_p = fs.props) === null || _p === void 0 ? void 0 : _p.ribbnOrderNumber, merchantId: ((_q = fs.props) === null || _q === void 0 ? void 0 : _q.merchantId) || '', currencyCode: fs.fields.currencyCode.inputValue, lineItems: fs.fields.lineItems.selectedValues || [], fulfillments: ((_r = fs.props) === null || _r === void 0 ? void 0 : _r.fulfillments) || [], refunds: ((_s = fs.props) === null || _s === void 0 ? void 0 : _s.refunds) || [], paymentType: fs.fields.paymentType.selectedValue, paymentMethod: fs.fields.paymentMethod.selectedValue || '', paymentDetails: fs.fields.paymentDetails.selectedValue || {}, notes: fs.fields.notes.inputValue || '', tags: fs.fields.tags.selectedValues || [], cancelReason: fs.fields.cancelReason.selectedValue || '', canceledAt: ((_t = fs.props) === null || _t === void 0 ? void 0 : _t.canceledAt) || '', processedAt: ((_u = fs.props) === null || _u === void 0 ? void 0 : _u.processedAt) || new Date().toUTCString(), adjustments: ((_v = fs.props) === null || _v === void 0 ? void 0 : _v.adjustments) || [], createdAtTimestamp: 0, updatedAtTimestamp: 0 });
         return new Order_1.default(Object.assign({}, orderAttributes));
     }
 }

package/lib/factories/Order/RefundFromFormState.js

@@ -4,24 +4,45 @@ const Refund_1 = require("../../models/Refund");
 const RefundFactory_1 = require("./RefundFactory");
 class RefundFromFormState extends RefundFactory_1.default {
     createRefund(fs) {
-        var _a, _b;
-        let currencyCode = fs.props.totalRefunded.currencyCode || '';
-        if (!currencyCode && fs.fields.refundLineItems.selectedValues.length) {
-            currencyCode = ((_a = fs.fields.refundLineItems.selectedValues[0].subtotalRefund) === null || _a === void 0 ? void 0 : _a.currencyCode) || '';
-        }
-        const subtotalRefundedAmount = fs.fields.subtotalRefunded.inputValue;
+        var _a, _b, _c, _d, _e, _f;
+        const currencyCode = fs.props.totalRefunded.currencyCode ||
+            ((_b = (_a = fs.fields.refundLineItems.selectedValues[0]) === null || _a === void 0 ? void 0 : _a.subtotalRefund) === null || _b === void 0 ? void 0 : _b.currencyCode) ||
+            '';
+        const currencyCodePresentment = fs.props.totalRefundedPresentment.currencyCode ||
+            ((_e = (_d = (_c = fs.fields.refundLineItems.selectedValues[0]) === null || _c === void 0 ? void 0 : _c.lineItem) === null || _d === void 0 ? void 0 : _d.presentmentUnitPrice) === null || _e === void 0 ? void 0 : _e.currencyCode) ||
+            '';
         const preparedRefundLineItems = !fs.fields.refundLineItems.selectedValues.length
             ? []
             : fs.fields.refundLineItems.selectedValues.filter(({ quantityRefund, quantityCancel }) => quantityRefund + quantityCancel > 0);
         const refundAttributes = {
-            documentId: ((_b = fs.props) === null || _b === void 0 ? void 0 : _b.documentId) || '',
+            documentId: ((_f = fs.props) === null || _f === void 0 ? void 0 : _f.documentId) || '',
             totalRefunded: { amount: fs.fields.totalRefunded.inputValue || 0, currencyCode },
-            subtotalRefunded: { amount: subtotalRefundedAmount, currencyCode },
+            subtotalRefunded: { amount: fs.fields.subtotalRefunded.inputValue || 0, currencyCode },
             refundDiscount: { amount: fs.fields.refundDiscount.inputValue || 0, currencyCode },
             refundShipping: { amount: fs.fields.refundShipping.inputValue || 0, currencyCode },
             totalTax: { amount: fs.fields.totalTax.inputValue || 0, currencyCode },
             refundLineItems: preparedRefundLineItems,
             note: fs.fields.note.inputValue || '',
+            totalRefundedPresentment: {
+                amount: fs.fields.totalRefundedPresentment.inputValue || 0,
+                currencyCode: currencyCodePresentment,
+            },
+            subtotalRefundedPresentment: {
+                amount: fs.fields.subtotalRefundedPresentment.inputValue || 0,
+                currencyCode: currencyCodePresentment,
+            },
+            refundDiscountPresentment: {
+                amount: fs.fields.refundDiscountPresentment.inputValue || 0,
+                currencyCode: currencyCodePresentment,
+            },
+            refundShippingPresentment: {
+                amount: fs.fields.refundShippingPresentment.inputValue || 0,
+                currencyCode: currencyCodePresentment,
+            },
+            totalTaxPresentment: {
+                amount: fs.fields.totalTaxPresentment.inputValue || 0,
+                currencyCode: currencyCodePresentment,
+            },
         };
         return new Refund_1.default(Object.assign({}, refundAttributes));
     }

package/lib/form-states/Order/RefundFormState.d.ts

@@ -6,12 +6,13 @@ export default class RefundFormState extends FormState {
     constructor(props?: any);
     createRefund(): Refund;
     updateTotalRefunded(): void;
-    getUpdatedRefundLineItem(lineItem: ReRobeOrderLineItem, quantityRefund: number | string, quantityCancel: number | string, unitOrderDiscountAmount: number): RefundLineItem;
+    getUpdatedRefundLineItem(lineItem: ReRobeOrderLineItem, quantityRefund: number | string, quantityCancel: number | string, unitOrderDiscountAmount: number, unitOrderDiscountPresentmentAmount: number): RefundLineItem;
     refundLineItemChangeHandler(val: {
         lineItemLike: ReRobeOrderLineItem | RefundLineItem;
         quantityRefund: number | string;
         quantityCancel: number | string;
         unitOrderDiscount: number;
+        unitOrderDiscountPresentment?: number;
     }): void;
     private fieldFactory;
 }

package/lib/form-states/Order/RefundFormState.js

@@ -14,6 +14,11 @@ class RefundFormState extends FormState_1.default {
         this.fields.totalTax = this.fieldFactory('textInput', 'totalTax');
         this.fields.refundLineItems = this.fieldFactory('multiSelect', 'refundLineItems');
         this.fields.note = this.fieldFactory('textInput', 'note');
+        this.fields.totalRefundedPresentment = this.fieldFactory('textInput', 'totalRefundedPresentment');
+        this.fields.subtotalRefundedPresentment = this.fieldFactory('textInput', 'subtotalRefundedPresentment');
+        this.fields.refundDiscountPresentment = this.fieldFactory('textInput', 'refundDiscountPresentment');
+        this.fields.refundShippingPresentment = this.fieldFactory('textInput', 'refundShippingPresentment');
+        this.fields.totalTaxPresentment = this.fieldFactory('textInput', 'totalTaxPresentment');
     }
     createRefund() {
         const refundFactory = new RefundFromFormState_1.default();
@@ -24,15 +29,24 @@ class RefundFormState extends FormState_1.default {
             Number(this.fields.refundDiscount.inputValue) +
             Number(this.fields.refundShipping.inputValue) +
             Number(this.fields.totalTax.inputValue)).toFixed(2);
+        this.fields.totalRefundedPresentment.inputValue = Number(Number(this.fields.subtotalRefundedPresentment.inputValue) -
+            Number(this.fields.refundDiscountPresentment.inputValue) +
+            Number(this.fields.refundShippingPresentment.inputValue) +
+            Number(this.fields.totalTaxPresentment.inputValue)).toFixed(2);
     }
-    getUpdatedRefundLineItem(lineItem, quantityRefund, quantityCancel, unitOrderDiscountAmount) {
-        var _a;
+    getUpdatedRefundLineItem(lineItem, quantityRefund, quantityCancel, unitOrderDiscountAmount, unitOrderDiscountPresentmentAmount) {
+        var _a, _b;
         const lineItemPriceAmount = Number((_a = lineItem.originalUnitPrice) === null || _a === void 0 ? void 0 : _a.amount);
+        const lineItemPricePresentmentAmount = Number(((_b = lineItem.presentmentUnitPrice) === null || _b === void 0 ? void 0 : _b.amount) || 0);
         const quantityRefundValue = Number(quantityRefund || 0);
         const quantityCancelValue = Number(quantityCancel || 0);
         const discountTotalRefundAmount = Number(unitOrderDiscountAmount * (quantityRefundValue + quantityCancelValue));
         const subtotalRefundWithoutDiscount = Number((lineItemPriceAmount - unitOrderDiscountAmount) * quantityRefundValue);
         const subtotalCanceledWithoutDiscount = Number((lineItemPriceAmount - unitOrderDiscountAmount) * quantityCancelValue);
+        // Presentment prices
+        const discountTotalRefundPresentmentAmount = Number(unitOrderDiscountPresentmentAmount * (quantityRefundValue + quantityCancelValue));
+        const subtotalRefundWithoutPresentmentDiscount = Number((lineItemPricePresentmentAmount - unitOrderDiscountPresentmentAmount) * quantityRefundValue);
+        const subtotalCanceledWithoutPresentmentDiscount = Number((lineItemPricePresentmentAmount - unitOrderDiscountPresentmentAmount) * quantityCancelValue);
         return {
             lineItem,
             quantityRefund: quantityRefundValue,
@@ -40,26 +54,30 @@ class RefundFormState extends FormState_1.default {
             discountRefund: Object.assign(Object.assign({}, lineItem.originalUnitPrice), { amount: discountTotalRefundAmount }),
             subtotalRefund: Object.assign(Object.assign({}, lineItem.originalUnitPrice), { amount: subtotalRefundWithoutDiscount }),
             subtotalCanceled: Object.assign(Object.assign({}, lineItem.originalUnitPrice), { amount: subtotalCanceledWithoutDiscount }),
+            // Presentment prices
+            discountRefundPresentment: Object.assign(Object.assign({}, lineItem.originalUnitPrice), { amount: discountTotalRefundAmount }),
+            subtotalRefundPresentment: Object.assign(Object.assign({}, lineItem.originalUnitPrice), { amount: subtotalRefundWithoutDiscount }),
+            subtotalCanceledPresentment: Object.assign(Object.assign({}, lineItem.originalUnitPrice), { amount: subtotalCanceledWithoutDiscount }),
         };
     }
     refundLineItemChangeHandler(val) {
         const currentLineItems = this.fields.refundLineItems.selectedValues;
         const unitOrderDiscountAmount = val.unitOrderDiscount || 0;
+        const unitOrderDiscountPresentmentAmount = val.unitOrderDiscountPresentment || 0;
         // Add new product to line items
         if (val.lineItemLike.productId) {
             const lineItem = val.lineItemLike;
-            const newRefundLineItem = this.getUpdatedRefundLineItem(lineItem, val.quantityRefund, val.quantityCancel, unitOrderDiscountAmount);
-            this.fields.refundLineItems.selectedValues = [...currentLineItems, newRefundLineItem];
+            const newRefundLineItem = this.getUpdatedRefundLineItem(lineItem, val.quantityRefund, val.quantityCancel, unitOrderDiscountAmount, unitOrderDiscountPresentmentAmount);
+            this.fields.refundLineItems.selectedValues = this.utilities.uniqObjArray([...currentLineItems, newRefundLineItem], 'lineItem.productId');
         }
         // Update quantity of a line item
         if ((val.quantityRefund || val.quantityCancel) && val.lineItemLike.lineItem) {
             const refundLineItem = val.lineItemLike;
             const { lineItem, quantityRefund: prevQuantityRefund, quantityCancel: prevQuantityCancel } = refundLineItem;
-            const updatedRefundLineItem = this.getUpdatedRefundLineItem(lineItem, val.quantityRefund || prevQuantityRefund, val.quantityCancel || prevQuantityCancel, unitOrderDiscountAmount);
-            const lineItemToUpdateIndex = currentLineItems.findIndex((li) => li.lineItem.productId === refundLineItem.lineItem.productId);
-            const lineItemsClone = [...currentLineItems];
-            lineItemsClone.splice(lineItemToUpdateIndex, 1, updatedRefundLineItem);
-            this.fields.refundLineItems.selectedValues = lineItemsClone;
+            const updatedRefundLineItem = this.getUpdatedRefundLineItem(lineItem, val.quantityRefund || prevQuantityRefund, val.quantityCancel || prevQuantityCancel, unitOrderDiscountAmount, unitOrderDiscountPresentmentAmount);
+            this.fields.refundLineItems.selectedValues = currentLineItems.map((li) => {
+                return li.lineItem.productId === refundLineItem.lineItem.productId ? updatedRefundLineItem : li;
+            });
         }
         // Update discount price
         this.fields.refundDiscount.inputValue = this.fields.refundLineItems.selectedValues
@@ -69,6 +87,13 @@ class RefundFormState extends FormState_1.default {
         this.fields.subtotalRefunded.inputValue = this.fields.refundLineItems.selectedValues
             .map((item) => { var _a; return Number(Number((_a = item.lineItem.originalUnitPrice) === null || _a === void 0 ? void 0 : _a.amount) * (item.quantityRefund + item.quantityCancel)); })
             .reduce((a, b) => a + b, 0);
+        // Update discount and subtotal presentment prices
+        this.fields.refundDiscountPresentment.inputValue = this.fields.refundLineItems.selectedValues
+            .map((item) => { var _a; return Number((_a = item.discountRefundPresentment) === null || _a === void 0 ? void 0 : _a.amount); })
+            .reduce((a, b) => a + b, 0);
+        this.fields.subtotalRefundedPresentment.inputValue = this.fields.refundLineItems.selectedValues
+            .map((item) => { var _a; return Number(Number((_a = item.lineItem.presentmentUnitPrice) === null || _a === void 0 ? void 0 : _a.amount) * (item.quantityRefund + item.quantityCancel)); })
+            .reduce((a, b) => a + b, 0);
         // Update total price
         this.updateTotalRefunded();
     }
@@ -78,14 +103,25 @@ class RefundFormState extends FormState_1.default {
             let inputValue = this.props[fieldKey] || '';
             let onChangeHandler = (val) => this.textInputChangeHandler(fieldKey, String(val));
             const amountTypeFields = ['totalRefunded', 'subtotalRefunded', 'refundDiscount', 'refundShipping', 'totalTax'];
-            if (amountTypeFields.includes(fieldKey.toString())) {
-                // @ts-ignore
+            const presentmentAmountTypeFields = [
+                'totalRefundedPresentment',
+                'subtotalRefundedPresentment',
+                'refundDiscountPresentment',
+                'refundShippingPresentment',
+                'totalTaxPresentment',
+            ];
+            if ([...amountTypeFields, ...presentmentAmountTypeFields].includes(fieldKey.toString())) {
                 inputValue = this.props[fieldKey] ? this.props[fieldKey].amount : 0;
             }
+            // all amountTypeFields without totalRefunded and totalRefundedPresentment
             if (fieldKey === 'subtotalRefunded' ||
                 fieldKey === 'refundDiscount' ||
                 fieldKey === 'refundShipping' ||
-                fieldKey === 'totalTax') {
+                fieldKey === 'totalTax' ||
+                fieldKey === 'subtotalRefundedPresentment' ||
+                fieldKey === 'refundDiscountPresentment' ||
+                fieldKey === 'refundShippingPresentment' ||
+                fieldKey === 'totalTaxPresentment') {
                 onChangeHandler = (val) => {
                     this.fields[fieldKey].inputValue = String(val);
                     this.updateTotalRefunded();

package/lib/helpers/OrderHelpers.d.ts

@@ -13,4 +13,9 @@ export default class OrderHelpers {
     getCreditDiscount(lineItems: ReRobeOrderLineItem[] | undefined, userAvailableCredit: number | string): number;
     getSaleDiscount(lineItems?: ReRobeOrderLineItem[]): number;
     getDiscountAmount(lineItems?: ReRobeOrderLineItem[], userAvailableCredit?: number | string): number;
+    getLineItemUnitOrderDiscount({ originalUnitPrice, totalDiscount, subtotalPrice, }: {
+        originalUnitPrice: Money;
+        totalDiscount?: Money;
+        subtotalPrice?: Money;
+    }): number;
 }

package/lib/helpers/OrderHelpers.js

@@ -93,10 +93,10 @@ class OrderHelpers {
         return Number(price).toFixed(2);
     }
     getAmountSumByField(array, fieldKey) {
-        return array.map((item) => Number(item[fieldKey].amount)).reduce((a, b) => a + b, 0);
+        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);
     }
     getOrderInfoWithRefundsAndFulfillments(order) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const orderRefunds = order.refunds ? [...order.refunds] : [];
         const orderFulfillment = order.fulfillments ? [...order.fulfillments] : [];
         const preparedOrder = {
@@ -104,17 +104,27 @@ class OrderHelpers {
             name: order.name || '',
             currencyCode: order.currencyCode,
             fulfillmentStatus: order.fulfillmentStatus || '',
+            // Total prices
             totalDiscount: order.totalDiscount ? Object.assign({}, order.totalDiscount) : { amount: 0 },
             totalTax: order.totalTax ? Object.assign({}, order.totalTax) : { amount: 0 },
             subtotalPrice: order.subtotalPrice ? Object.assign({}, order.subtotalPrice) : { amount: 0 },
             totalRefunded: order.totalRefunded ? Object.assign({}, order.totalRefunded) : { amount: 0 },
             totalShippingPrice: order.totalShippingPrice ? Object.assign({}, order.totalShippingPrice) : { amount: 0 },
             totalPrice: order.totalPrice ? Object.assign({}, order.totalPrice) : { amount: 0 },
+            // Total prices presentment prices
+            totalDiscountPresentment: order.totalDiscountPresentment ? Object.assign({}, order.totalDiscountPresentment) : { amount: 0 },
+            totalTaxPresentment: order.totalTaxPresentment ? Object.assign({}, order.totalTaxPresentment) : { amount: 0 },
+            subtotalPricePresentment: order.subtotalPricePresentment ? Object.assign({}, order.subtotalPricePresentment) : { amount: 0 },
+            totalRefundedPresentment: order.totalRefundedPresentment ? Object.assign({}, order.totalRefundedPresentment) : { amount: 0 },
+            totalShippingPricePresentment: order.totalShippingPricePresentment
+                ? Object.assign({}, order.totalShippingPricePresentment) : { amount: 0 },
+            totalPricePresentment: order.totalPricePresentment ? Object.assign({}, order.totalPricePresentment) : { amount: 0 },
+            // Additional order info
             activeLineItems: !order.lineItems || !order.lineItems.length
                 ? []
                 : order.lineItems.map((item) => (Object.assign(Object.assign({}, item), { unfulfilledQuantity: Number(item.quantity), fulfilledQuantity: 0, refundedQuantity: 0, canceledQuantity: 0 }))),
-            discountType: 'Custom discount',
-            shippingRate: 'Custom shipping rate',
+            discountType: ((_a = order.appliedDiscount) === null || _a === void 0 ? void 0 : _a.title) || 'Custom discount',
+            shippingRate: ((_c = (_b = order.fulfillmentLocations) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.shippingRateName) || 'Custom shipping rate',
             unfulfilledItems: [],
             fulfilledItems: [],
             refundedItems: [],
@@ -124,6 +134,7 @@ class OrderHelpers {
         if (!preparedOrder.activeLineItems.length) {
             return preparedOrder;
         }
+        // Get unfulfilledQuantity and fulfilledQuantity for each lineItem
         if (orderFulfillment.length) {
             preparedOrder.activeLineItems = preparedOrder.activeLineItems.map((item) => {
                 const currentItem = item.productId;
@@ -144,14 +155,32 @@ class OrderHelpers {
         if (!orderRefunds.length) {
             return preparedOrder;
         }
+        // Subtract existed refunds prices from total prices
         preparedOrder.totalDiscount.amount =
             Number(order.totalDiscount.amount) - this.getAmountSumByField(orderRefunds, 'refundDiscount');
+        preparedOrder.totalTax.amount =
+            Number(((_d = order.totalTax) === null || _d === void 0 ? void 0 : _d.amount) || 0) - this.getAmountSumByField(orderRefunds, 'totalTaxPresentment');
         preparedOrder.subtotalPrice.amount =
             Number(order.subtotalPrice.amount) - this.getAmountSumByField(orderRefunds, 'subtotalRefunded');
         preparedOrder.totalShippingPrice.amount =
-            Number(((_a = order.totalShippingPrice) === null || _a === void 0 ? void 0 : _a.amount) || 0) - this.getAmountSumByField(orderRefunds, 'refundShipping');
+            Number(((_e = order.totalShippingPrice) === null || _e === void 0 ? void 0 : _e.amount) || 0) - this.getAmountSumByField(orderRefunds, 'refundShipping');
         preparedOrder.totalPrice.amount =
             Number(order.totalPrice.amount) - this.getAmountSumByField(orderRefunds, 'totalRefunded');
+        // Subtract existed refunds prices from total presentment prices
+        preparedOrder.totalDiscountPresentment.amount =
+            Number(((_f = order.totalDiscountPresentment) === null || _f === void 0 ? void 0 : _f.amount) || 0) -
+                this.getAmountSumByField(orderRefunds, 'refundDiscountPresentment');
+        preparedOrder.totalTaxPresentment.amount =
+            Number(((_g = order.totalTaxPresentment) === null || _g === void 0 ? void 0 : _g.amount) || 0) - this.getAmountSumByField(orderRefunds, 'totalTaxPresentment');
+        preparedOrder.subtotalPricePresentment.amount =
+            Number(((_h = order.subtotalPricePresentment) === null || _h === void 0 ? void 0 : _h.amount) || 0) -
+                this.getAmountSumByField(orderRefunds, 'subtotalRefundedPresentment');
+        preparedOrder.totalShippingPricePresentment.amount =
+            Number(((_j = order.totalShippingPricePresentment) === null || _j === void 0 ? void 0 : _j.amount) || 0) -
+                this.getAmountSumByField(orderRefunds, 'refundShippingPresentment');
+        preparedOrder.totalPricePresentment.amount =
+            Number(((_k = order.totalPricePresentment) === null || _k === void 0 ? void 0 : _k.amount) || 0) -
+                this.getAmountSumByField(orderRefunds, 'totalRefundedPresentment');
         const lineItemsWithQuantityInfo = preparedOrder.activeLineItems.map((item) => {
             const currentItem = item.productId;
             const refundedAndCanceledQuantity = orderRefunds.reduce((result, { refundLineItems }) => {
@@ -168,6 +197,7 @@ class OrderHelpers {
             // 4. quantity = unfulfilled quantity (prev quantity - sum of order.fulfillment) - cancelled
             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
         preparedOrder.activeLineItems = lineItemsWithQuantityInfo.filter(({ unfulfilledQuantity, fulfilledQuantity }) => unfulfilledQuantity + fulfilledQuantity > 0);
         preparedOrder.unfulfilledItems = lineItemsWithQuantityInfo.filter(({ unfulfilledQuantity }) => unfulfilledQuantity > 0);
         preparedOrder.fulfilledItems = lineItemsWithQuantityInfo.filter(({ fulfilledQuantity }) => fulfilledQuantity > 0);
@@ -240,5 +270,15 @@ class OrderHelpers {
         const discount = Number(Number(creditDiscount + saleDiscount).toFixed(2));
         return discount;
     }
+    // Calculate amount of discount that each lineItem unit gets (used for Refund)
+    getLineItemUnitOrderDiscount({ originalUnitPrice, totalDiscount, subtotalPrice, }) {
+        const td = Number((totalDiscount === null || totalDiscount === void 0 ? void 0 : totalDiscount.amount) || 0);
+        const subT = Number((subtotalPrice === null || subtotalPrice === void 0 ? void 0 : subtotalPrice.amount) || 0);
+        const unitPrice = Number(originalUnitPrice.amount || 0);
+        if (subT === 0) {
+            return td;
+        }
+        return (td / subT) * unitPrice;
+    }
 }
 exports.default = OrderHelpers;

package/lib/models/CustomerNotification.d.ts

@@ -11,6 +11,8 @@ export default class CustomerNotification extends Base {
     message: string;
     imgUrl?: string;
     recipientMap: RecipientMap[];
+    isRead?: boolean;
+    skipSend?: boolean;
     constructor(props?: any);
     toObj(): CustomerNotificationAttributes;
 }

package/lib/models/CustomerNotification.js

@@ -15,6 +15,8 @@ class CustomerNotification extends Base_1.default {
         this.message = (props === null || props === void 0 ? void 0 : props.message) || '';
         this.imgUrl = (props === null || props === void 0 ? void 0 : props.imgUrl) || '';
         this.recipientMap = (props === null || props === void 0 ? void 0 : props.recipientMap) || [];
+        this.isRead = (props === null || props === void 0 ? void 0 : props.isRead) || false;
+        this.skipSend = (props === null || props === void 0 ? void 0 : props.skipSend) || false;
     }
     toObj() {
         return {
@@ -29,6 +31,8 @@ class CustomerNotification extends Base_1.default {
             message: this.message,
             imgUrl: this.imgUrl,
             recipientMap: this.recipientMap,
+            isRead: this.isRead,
+            skipSend: this.skipSend,
         };
     }
 }

package/lib/models/Order.d.ts

@@ -99,6 +99,7 @@ export default class Order extends Base {
     additionalDiscountPresentment: Money;
     createdAtTimestamp: number;
     updatedAtTimestamp: number;
+    adjustments?: OrderAdjustment[];
     constructor(props?: any);
     toObj(): ReRobeOrderObj;
     generateSchemaForTypesense(name?: string): {

package/lib/models/Order.js

@@ -126,6 +126,7 @@ class Order extends Base_1.default {
         };
         this.createdAtTimestamp = (props === null || props === void 0 ? void 0 : props.createdAtTimestamp) || 0;
         this.updatedAtTimestamp = (props === null || props === void 0 ? void 0 : props.updatedAtTimestamp) || 0;
+        this.adjustments = (props === null || props === void 0 ? void 0 : props.adjustments) || [];
     }
     toObj() {
         const orderObj = {
@@ -185,6 +186,7 @@ class Order extends Base_1.default {
             creditDiscountPresentment: this.creditDiscountPresentment,
             saleDiscountPresentment: this.saleDiscountPresentment,
             additionalDiscountPresentment: this.additionalDiscountPresentment,
+            adjustments: this.adjustments,
             createdAtTimestamp: this.createdAtTimestamp,
             updatedAtTimestamp: this.updatedAtTimestamp,
         };

package/lib/models/Refund.d.ts

@@ -8,6 +8,15 @@ export default class Refund extends Base {
     totalTax?: Money;
     refundLineItems: RefundLineItem[];
     note?: string;
+    totalRefundedPresentment: Money;
+    subtotalRefundedPresentment?: Money;
+    refundDiscountPresentment?: Money;
+    refundShippingPresentment?: Money;
+    totalTaxPresentment?: Money;
+    createdAtTimestamp?: number;
+    updatedAtTimestamp?: number;
+    createdAt?: string;
+    updatedAt?: string;
     constructor(props?: any);
     toObj(): OrderRefund;
 }

package/lib/models/Refund.js

@@ -4,24 +4,23 @@ const Base_1 = require("../Base");
 class Refund extends Base_1.default {
     constructor(props) {
         super();
-        this.documentId = (props === null || props === void 0 ? void 0 : props.documentId) || '';
-        this.totalRefunded = (props === null || props === void 0 ? void 0 : props.totalRefunded) || {
-            amount: 0,
-        };
-        this.subtotalRefunded = (props === null || props === void 0 ? void 0 : props.subtotalRefunded) || {
-            amount: 0,
-        };
-        this.refundDiscount = (props === null || props === void 0 ? void 0 : props.refundDiscount) || {
-            amount: 0,
-        };
-        this.refundShipping = (props === null || props === void 0 ? void 0 : props.refundShipping) || {
-            amount: 0,
-        };
-        this.totalTax = (props === null || props === void 0 ? void 0 : props.totalTax) || {
-            amount: 0,
-        };
+        this.documentId = (props === null || props === void 0 ? void 0 : props.documentId) || this.utilities.makeRandId(28);
+        this.totalRefunded = (props === null || props === void 0 ? void 0 : props.totalRefunded) || { amount: 0 };
+        this.subtotalRefunded = (props === null || props === void 0 ? void 0 : props.subtotalRefunded) || { amount: 0 };
+        this.refundDiscount = (props === null || props === void 0 ? void 0 : props.refundDiscount) || { amount: 0 };
+        this.refundShipping = (props === null || props === void 0 ? void 0 : props.refundShipping) || { amount: 0 };
+        this.totalTax = (props === null || props === void 0 ? void 0 : props.totalTax) || { amount: 0 };
         this.refundLineItems = (props === null || props === void 0 ? void 0 : props.refundLineItems) || [];
         this.note = (props === null || props === void 0 ? void 0 : props.note) || '';
+        this.totalRefundedPresentment = (props === null || props === void 0 ? void 0 : props.totalRefundedPresentment) || { amount: 0 };
+        this.subtotalRefundedPresentment = (props === null || props === void 0 ? void 0 : props.subtotalRefundedPresentment) || { amount: 0 };
+        this.refundDiscountPresentment = (props === null || props === void 0 ? void 0 : props.refundDiscountPresentment) || { amount: 0 };
+        this.refundShippingPresentment = (props === null || props === void 0 ? void 0 : props.refundShippingPresentment) || { amount: 0 };
+        this.totalTaxPresentment = (props === null || props === void 0 ? void 0 : props.totalTaxPresentment) || { amount: 0 };
+        this.createdAtTimestamp = (props === null || props === void 0 ? void 0 : props.createdAtTimestamp) || 0;
+        this.updatedAtTimestamp = (props === null || props === void 0 ? void 0 : props.updatedAtTimestamp) || 0;
+        this.createdAt = (props === null || props === void 0 ? void 0 : props.createdAt) || '';
+        this.updatedAt = (props === null || props === void 0 ? void 0 : props.updatedAt) || '';
     }
     toObj() {
         const refundObj = {
@@ -33,7 +32,23 @@ class Refund extends Base_1.default {
             totalTax: this.totalTax,
             refundLineItems: this.refundLineItems,
             note: this.note,
+            totalRefundedPresentment: this.totalRefundedPresentment,
+            subtotalRefundedPresentment: this.subtotalRefundedPresentment,
+            refundDiscountPresentment: this.refundDiscountPresentment,
+            refundShippingPresentment: this.refundShippingPresentment,
+            totalTaxPresentment: this.totalTaxPresentment,
+            createdAtTimestamp: this.createdAtTimestamp,
+            createdAt: this.createdAt,
         };
+        if (this.createdAt) {
+            refundObj.createdAt = this.createdAt;
+        }
+        if (this.updatedAtTimestamp) {
+            refundObj.updatedAtTimestamp = this.updatedAtTimestamp;
+        }
+        if (this.updatedAt) {
+            refundObj.updatedAt = this.updatedAt;
+        }
         return refundObj;
     }
 }

package/lib/types/customer-notification-types.d.ts

@@ -14,6 +14,8 @@ declare type CustomerNotificationAttributes = {
     message: string;
     imgUrl?: string;
     recipientMap: RecipientMap[];
+    isRead?: boolean;
+    skipSend?: boolean;
 };
 declare type ORDER_CONFIRMATION_TYPE = 'ORDER_CONFIRMATION';
 declare type ORDER_CANCELLATION_TYPE = 'ORDER_CANCELLATION';

package/lib/types/rerobe-order-types.d.ts

@@ -77,6 +77,7 @@ declare type ReRobeOrderObj = {
     creditDiscountPresentment?: Money;
     saleDiscountPresentment?: Money;
     additionalDiscountPresentment?: Money;
+    adjustments?: OrderAdjustment[];
     createdAtTimestamp: number;
     updatedAtTimestamp: number;
 };
@@ -99,6 +100,12 @@ declare type OrderWithRefundsAndFulfillmentsInfoObj = {
     fulfilledItems: ReRobeOrderLineItem[];
     refundedItems: ReRobeOrderLineItem[];
     canceledItems: ReRobeOrderLineItem[];
+    subtotalPricePresentment: Money;
+    totalDiscountPresentment: Money;
+    totalPricePresentment: Money;
+    totalRefundedPresentment: Money;
+    totalShippingPricePresentment: Money;
+    totalTaxPresentment: Money;
 };
 declare type OrderInput = {
     id?: string | null;
@@ -330,6 +337,13 @@ declare type OrderRefund = {
     totalTax?: Money;
     refundLineItems: RefundLineItem[];
     note?: string;
+    totalRefundedPresentment: Money;
+    subtotalRefundedPresentment?: Money;
+    refundDiscountPresentment?: Money;
+    refundShippingPresentment?: Money;
+    totalTaxPresentment?: Money;
+    createdAtTimestamp?: number;
+    updatedAtTimestamp?: number;
 };
 declare type RefundLineItem = {
     lineItem: ReRobeOrderLineItem;
@@ -338,6 +352,9 @@ declare type RefundLineItem = {
     discountRefund?: Money;
     subtotalRefund?: Money;
     subtotalCanceled?: Money;
+    discountRefundPresentment?: Money;
+    subtotalRefundPresentment?: Money;
+    subtotalCanceledPresentment?: Money;
 };
 declare type TaxLine = {
     title: string;
@@ -397,6 +414,8 @@ declare type FulfillmentAdmin = {
     totalQuantity?: number;
     trackingInfo?: FulfillmentTrackingInfo;
     updatedAt?: string;
+    createdAtTimestamp?: number;
+    updatedAtTimestamp?: number;
 };
 declare type FulfillmentService = {
     id: string | number;
@@ -741,6 +760,11 @@ declare type OrderRefundFormFields = {
     totalTax: TextInputFormField<string | number>;
     refundLineItems: MultiSelectFormField<RefundLineItem>;
     note: TextInputFormField<string>;
+    totalRefundedPresentment: TextInputFormField<string | number>;
+    subtotalRefundedPresentment: TextInputFormField<string | number>;
+    refundDiscountPresentment: TextInputFormField<string | number>;
+    refundShippingPresentment: TextInputFormField<string | number>;
+    totalTaxPresentment: TextInputFormField<string | number>;
 };
 declare type TypesenseOrderObj = {
     id: string;
@@ -769,3 +793,10 @@ declare type TypesenseOrderObj = {
     createdAtHour: string;
     createdAtYear: string;
 };
+declare type OrderAdjustment = {
+    createdAtTimestamp?: number;
+    updatedAtTimestamp?: number;
+    totalAdjustmentPrice: Money;
+    totalAdjustmentPricePresentment: Money;
+    note?: string;
+};

package/package.json

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