rerobe-js-orm 2.4.63 → 2.4.67

package/lib/factories/FormState/ProductCollection/ProductCollectionFormStateFactory.d.ts

@@ -0,0 +1,5 @@
+import FormStateFactory from '../FormStateFactory';
+import ProductCollectionFormState from '../../../form-states/ProductCollection/ProductCollectionFormState';
+export default class ProductCollectionFormStateFactory extends FormStateFactory {
+    createFormState(props?: any, opts?: any): ProductCollectionFormState;
+}

package/lib/factories/FormState/ProductCollection/ProductCollectionFormStateFactory.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const FormStateFactory_1 = require("../FormStateFactory");
+const ProductCollectionFormState_1 = require("../../../form-states/ProductCollection/ProductCollectionFormState");
+class ProductCollectionFormStateFactory extends FormStateFactory_1.default {
+    createFormState(props, opts) {
+        return new ProductCollectionFormState_1.default(props);
+    }
+}
+exports.default = ProductCollectionFormStateFactory;

package/lib/factories/Order/RefundFromFormState.js

@@ -10,6 +10,9 @@ class RefundFromFormState extends RefundFactory_1.default {
             currencyCode = ((_a = fs.fields.refundLineItems.selectedValues[0].subtotalRefund) === null || _a === void 0 ? void 0 : _a.currencyCode) || '';
         }
         const subtotalRefundedAmount = fs.fields.subtotalRefunded.inputValue;
+        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) || '',
             totalRefunded: { amount: fs.fields.totalRefunded.inputValue || 0, currencyCode },
@@ -17,7 +20,7 @@ class RefundFromFormState extends RefundFactory_1.default {
             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: fs.fields.refundLineItems.selectedValues || [],
+            refundLineItems: preparedRefundLineItems,
             note: fs.fields.note.inputValue || '',
         };
         return new Refund_1.default(Object.assign({}, refundAttributes));

package/lib/factories/Product/ProductFromFormState.js

@@ -4,7 +4,7 @@ const ProductFactory_1 = require("./ProductFactory");
 const Product_1 = require("../../models/Product");
 class ProductFromFormState extends ProductFactory_1.default {
     createProduct(props) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         const productAttributes = {
             availableForSale: props.fields.availableForSale.selectedValue,
             description: props.fields.description.inputValue,
@@ -28,10 +28,10 @@ class ProductFromFormState extends ProductFactory_1.default {
             quantity: props.fields.quantity.inputValue,
             merchants: ((_l = props.props) === null || _l === void 0 ? void 0 : _l.merchants) || [],
             editorAuthorizations: props.fields.editorAuthorizations.selectedValue,
-            rfidTag: ((_m = props.props) === null || _m === void 0 ? void 0 : _m.rfidTag) || '',
+            rfidTag: props.fields.rfidTag.inputValue || '',
         };
         const productFilterAttributes = {
-            documentId: (_o = props.props) === null || _o === void 0 ? void 0 : _o.documentId,
+            documentId: (_m = props.props) === null || _m === void 0 ? void 0 : _m.documentId,
             brand: props.fields.brand.selectedValue,
             clothingSize: props.fields.clothingSize.selectedValues,
             color: props.fields.color.selectedValue,
@@ -45,10 +45,11 @@ class ProductFromFormState extends ProductFactory_1.default {
             productStyle: props.fields.productStyle.selectedValues,
             shoeSize: props.fields.shoeSize.selectedValue,
             measurements: props.fields.measurements.selectedValue || {},
+            featuredCollections: props.fields.featuredCollections.selectedValues || [],
         };
         const consignmentAttributes = {
             previousSellers: props.fields.previousSellers.selectedValues,
-            sellRequestId: ((_p = props.props) === null || _p === void 0 ? void 0 : _p.sellRequestId) || '',
+            sellRequestId: ((_o = props.props) === null || _o === void 0 ? void 0 : _o.sellRequestId) || '',
             publishType: props.fields.publishType.selectedValue,
             conditionRemarks: props.fields.conditionRemarks.inputValue,
             productRemarks: props.fields.productRemarks.inputValue,
@@ -61,18 +62,19 @@ class ProductFromFormState extends ProductFactory_1.default {
             nextAvailableSeason: props.fields.nextAvailableSeason.selectedValue,
             notesForProductionTeam: props.fields.notesForProductionTeam.inputValue,
             reviewedBy: props.fields.reviewedBy.selectedValue,
-            sellRequestImageUrls: ((_q = props.props) === null || _q === void 0 ? void 0 : _q.sellRequestImageUrls) || [],
+            sellRequestImageUrls: ((_p = props.props) === null || _p === void 0 ? void 0 : _p.sellRequestImageUrls) || [],
             dateSold: props.fields.dateSold.selectedValue || '',
             dateInQualityControl: props.fields.dateInQualityControl.selectedValue || '',
             dateInPendingPublication: props.fields.dateInPendingPublication.selectedValue || '',
             dateListedOnline: props.fields.dateListedOnline.selectedValue || '',
             salesChannel: props.fields.salesChannel.selectedValues || [],
             sizeComment: props.fields.sizeComment.selectedValue,
-            salePrice: ((_r = props.props) === null || _r === void 0 ? void 0 : _r.salePrice) || '',
+            salePrice: ((_q = props.props) === null || _q === void 0 ? void 0 : _q.salePrice) || '',
             isOnSale: props.fields.isOnSale.selectedValue || '',
             discountType: props.fields.discountType.selectedValue || '',
             discountValue: props.fields.discountValue.inputValue || '',
-            selectedForClearance: ((_s = props.props) === null || _s === void 0 ? void 0 : _s.selectedForClearance) || '',
+            selectedForClearance: ((_r = props.props) === null || _r === void 0 ? void 0 : _r.selectedForClearance) || '',
+            locationIds: props.fields.locationIds.selectedValues || [],
         };
         return new Product_1.default(Object.assign(Object.assign(Object.assign({}, productAttributes), productFilterAttributes), consignmentAttributes));
     }

package/lib/factories/ProductCollection/ProductCollectionFactory.d.ts

@@ -0,0 +1,5 @@
+import Base from '../../Base';
+import ProductCollectionFormState from '../../form-states/ProductCollection/ProductCollectionFormState';
+export default abstract class ProductCollectionFactory extends Base {
+    abstract createProductCollection(refund: ProductCollectionFormState): ProductCollectionType;
+}

package/lib/factories/ProductCollection/ProductCollectionFactory.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Base_1 = require("../../Base");
+class ProductCollectionFactory extends Base_1.default {
+}
+exports.default = ProductCollectionFactory;

package/lib/factories/ProductCollection/ProductCollectionFromFormState.d.ts

@@ -0,0 +1,5 @@
+import ProductCollectionFormState from '../../form-states/ProductCollection/ProductCollectionFormState';
+import ProductCollectionFactory from './ProductCollectionFactory';
+export default class ProductCollectionFromFormState extends ProductCollectionFactory {
+    createProductCollection(fs: ProductCollectionFormState): ProductCollectionType;
+}

package/lib/factories/ProductCollection/ProductCollectionFromFormState.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ProductCollectionFactory_1 = require("./ProductCollectionFactory");
+const ProductCollection_1 = require("../../models/ProductCollection");
+class ProductCollectionFromFormState extends ProductCollectionFactory_1.default {
+    createProductCollection(fs) {
+        const productCollectionAttributes = {
+            preTitle: fs.fields.preTitle.inputValue || '',
+            title: fs.fields.title.inputValue || '',
+            subTitle: fs.fields.subTitle.inputValue || '',
+            description: fs.fields.description.inputValue || '',
+            type: fs.fields.type.selectedValue || '',
+            imgUrl: fs.fields.imgUrl.inputValue || '',
+            refinements: fs.fields.refinements.selectedValue || {},
+        };
+        return new ProductCollection_1.default(Object.assign({}, productCollectionAttributes));
+    }
+}
+exports.default = ProductCollectionFromFormState;

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

@@ -6,9 +6,11 @@ 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;
     refundLineItemChangeHandler(val: {
         lineItemLike: ReRobeOrderLineItem | RefundLineItem;
-        quantity: number;
+        quantityRefund: number | string;
+        quantityCancel: number | string;
         unitOrderDiscount: number;
     }): void;
     private fieldFactory;

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

@@ -25,54 +25,49 @@ class RefundFormState extends FormState_1.default {
             Number(this.fields.refundShipping.inputValue) +
             Number(this.fields.totalTax.inputValue)).toFixed(2);
     }
+    getUpdatedRefundLineItem(lineItem, quantityRefund, quantityCancel, unitOrderDiscountAmount) {
+        var _a;
+        const lineItemPriceAmount = Number((_a = lineItem.originalUnitPrice) === null || _a === void 0 ? void 0 : _a.amount);
+        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);
+        return {
+            lineItem,
+            quantityRefund: quantityRefundValue,
+            quantityCancel: quantityCancelValue,
+            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 }),
+        };
+    }
     refundLineItemChangeHandler(val) {
-        var _a, _b;
         const currentLineItems = this.fields.refundLineItems.selectedValues;
         const unitOrderDiscountAmount = val.unitOrderDiscount || 0;
         // Add new product to line items
         if (val.lineItemLike.productId) {
             const lineItem = val.lineItemLike;
-            const quantity = Number(val.quantity || 0);
-            const discountRefundAmount = Number(unitOrderDiscountAmount * quantity);
-            const subtotalLineItem = Number(Number((_a = lineItem.originalUnitPrice) === null || _a === void 0 ? void 0 : _a.amount) * quantity);
-            const lineItemToUpdate = {
-                lineItem,
-                quantityRefund: quantity,
-                discountRefund: Object.assign(Object.assign({}, lineItem.originalUnitPrice), { amount: discountRefundAmount }),
-                subtotalRefund: Object.assign(Object.assign({}, lineItem.originalUnitPrice), { amount: subtotalLineItem - discountRefundAmount }),
-            };
-            this.fields.refundLineItems.selectedValues = [...currentLineItems, lineItemToUpdate];
+            const newRefundLineItem = this.getUpdatedRefundLineItem(lineItem, val.quantityRefund, val.quantityCancel, unitOrderDiscountAmount);
+            this.fields.refundLineItems.selectedValues = [...currentLineItems, newRefundLineItem];
         }
         // Update quantity of a line item
-        if (val.quantity && val.lineItemLike.lineItem) {
+        if ((val.quantityRefund || val.quantityCancel) && val.lineItemLike.lineItem) {
             const refundLineItem = val.lineItemLike;
-            const quantity = Number(val.quantity);
-            const discountRefundAmount = Number(unitOrderDiscountAmount * quantity);
-            const subtotalLineItem = Number(Number((_b = refundLineItem.lineItem.originalUnitPrice) === null || _b === void 0 ? void 0 : _b.amount) * quantity);
-            const updatedLineItem = {
-                lineItem: refundLineItem.lineItem,
-                quantityRefund: quantity,
-                discountRefund: Object.assign(Object.assign({}, refundLineItem.lineItem.originalTotalPrice), { amount: discountRefundAmount }),
-                subtotalRefund: Object.assign(Object.assign({}, refundLineItem.lineItem.originalTotalPrice), { amount: subtotalLineItem }),
-            };
+            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, updatedLineItem);
+            lineItemsClone.splice(lineItemToUpdateIndex, 1, updatedRefundLineItem);
             this.fields.refundLineItems.selectedValues = lineItemsClone;
         }
-        // Remove a line item
-        if (val.lineItemLike.quantityRefund && !val.quantity) {
-            const refundLineItem = val.lineItemLike;
-            const newLineItems = currentLineItems.filter((li) => li.lineItem.productId !== refundLineItem.lineItem.productId);
-            this.fields.refundLineItems.selectedValues = newLineItems;
-        }
         // Update discount price
         this.fields.refundDiscount.inputValue = this.fields.refundLineItems.selectedValues
             .map((item) => { var _a; return Number((_a = item.discountRefund) === null || _a === void 0 ? void 0 : _a.amount); })
             .reduce((a, b) => a + b, 0);
         // Update subtotal price
         this.fields.subtotalRefunded.inputValue = this.fields.refundLineItems.selectedValues
-            .map((item) => { var _a; return Number((_a = item.subtotalRefund) === null || _a === void 0 ? void 0 : _a.amount); })
+            .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 total price
         this.updateTotalRefunded();

package/lib/form-states/Product/ProductFormState.js

@@ -68,6 +68,9 @@ class ProductFormState extends FormState_1.default {
         this.fields.editorAuthorizations = this.fieldFactory('singleSelect', 'editorAuthorizations', Object.keys(new Product_1.default().toObj()).map((v) => ({ label: this.utilities.startCase(v), value: v })));
         this.fields.vendorId = this.fieldFactory('singleSelect', 'vendorId');
         this.fields.vendorName = this.fieldFactory('singleSelect', 'vendorName');
+        this.fields.rfidTag = this.fieldFactory('textInput', 'rfidTag');
+        this.fields.locationIds = this.fieldFactory('multiSelect', 'locationIds');
+        this.fields.featuredCollections = this.fieldFactory('multiSelect', 'featuredCollections');
     }
     autoCreateTitle() {
         return this.createProduct().autoCreateTitle();
@@ -604,7 +607,7 @@ class ProductFormState extends FormState_1.default {
                 onChangeHandler = (val) => this.priceInputChangeHandler(val);
             }
             if (fieldKey === 'reRobeCommission') {
-                inputValue = this.props[fieldKey] || '0.35';
+                inputValue = this.props[fieldKey] || '0.5';
                 valid = true;
             }
             if (fieldKey === 'discountValue') {

package/lib/form-states/ProductCollection/ProductCollectionFormState.d.ts

@@ -0,0 +1,13 @@
+import FormState from '../FormState';
+import ProductCollection from '../../models/ProductCollection';
+export default class ProductCollectionFormState extends FormState {
+    fields: ProductCollectionFormFields;
+    props: CompleteProductCollection;
+    opts: {
+        productAttrOptions: ProductAttrRefinementsOptions[];
+        productAttrValuesOptions: string[];
+    };
+    constructor(props?: any, opts?: any);
+    createProductCollection(): ProductCollection;
+    private fieldFactory;
+}

package/lib/form-states/ProductCollection/ProductCollectionFormState.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const FormState_1 = require("../FormState");
+const ProductCollection_1 = require("../../models/ProductCollection");
+const ProductCollectionFromFormState_1 = require("../../factories/ProductCollection/ProductCollectionFromFormState");
+class ProductCollectionFormState extends FormState_1.default {
+    constructor(props, opts) {
+        super();
+        this.props = new ProductCollection_1.default(props).toObj();
+        this.opts = opts;
+        this.fields.preTitle = this.fieldFactory('textInput', 'preTitle');
+        this.fields.title = this.fieldFactory('textInput', 'title');
+        this.fields.subTitle = this.fieldFactory('textInput', 'subTitle');
+        this.fields.description = this.fieldFactory('textInput', 'description');
+        this.fields.type = this.fieldFactory('singleSelect', 'type');
+        this.fields.imgUrl = this.fieldFactory('textInput', 'imgUrl');
+        this.fields.refinements = this.fieldFactory('singleSelect', 'refinements');
+    }
+    createProductCollection() {
+        const productCollectionFactory = new ProductCollectionFromFormState_1.default();
+        return productCollectionFactory.createProductCollection(this);
+    }
+    fieldFactory(fieldType, fieldKey, fieldOptions) {
+        if (fieldType === 'singleSelect') {
+            const options = fieldOptions || [];
+            const selectedValue = this.props[fieldKey] || '';
+            const valid = !!this.props[fieldKey];
+            const onChangeHandler = (val) => this.singleSelectChangeHandler(fieldKey, String(val));
+            return {
+                options,
+                selectedValue,
+                valid,
+                onChangeHandler,
+            };
+        }
+        if (fieldType === 'textInput') {
+            const inputValue = this.props[fieldKey] || '';
+            const valid = !!this.props[fieldKey];
+            const onChangeHandler = (val) => this.textInputChangeHandler(fieldKey, String(val));
+            return {
+                inputValue,
+                valid,
+                onChangeHandler,
+            };
+        }
+        return {
+            valid: false,
+        };
+    }
+}
+exports.default = ProductCollectionFormState;

package/lib/helpers/OrderHelpers.d.ts

@@ -4,7 +4,9 @@ export default class OrderHelpers {
     getPaymentTypeUsingTags(tags: string | null | undefined): string | null;
     getSalesChannelUsingTags(tags: string | null | undefined): string | null;
     buildLineItemFromProduct(product: CompleteProduct, currencyCode: string, quantity?: number): ReRobeOrderLineItem;
-    fixPrice(price: number | string): string;
+    toFixedPointPrice(price: number | string): string;
     getAmountSumByField(array: OrderRefund[], fieldKey: string): number;
-    getOrderInfoWithRefunds(order: CompleteOrder): OrderWithRefundsInfoObj;
+    getOrderInfoWithRefundsAndFulfillments(order: CompleteOrder): OrderWithRefundsAndFulfillmentsInfoObj;
+    getUpdatedOrderObjWithRefunds(orderObj: CompleteOrder, refundObj: OrderRefund): CompleteOrder;
+    getUpdatedOrderObjWithFulfillment(orderObj: CompleteOrder, fulfillmentObj: FulfillmentAdmin, totalUnfulfilledItems: number): CompleteOrder;
 }

package/lib/helpers/OrderHelpers.js

@@ -77,17 +77,19 @@ class OrderHelpers {
             productId: product.documentId,
         };
     }
-    fixPrice(price) {
+    toFixedPointPrice(price) {
         return Number(price).toFixed(2);
     }
     getAmountSumByField(array, fieldKey) {
         return array.map((item) => Number(item[fieldKey].amount)).reduce((a, b) => a + b, 0);
     }
-    getOrderInfoWithRefunds(order) {
+    getOrderInfoWithRefundsAndFulfillments(order) {
         var _a;
-        const orderRefunds = order.refunds || [];
+        const orderRefunds = order.refunds ? [...order.refunds] : [];
+        const orderFulfillment = order.fulfillments ? [...order.fulfillments] : [];
         const preparedOrder = {
             documentId: order.documentId || '',
+            name: order.name || '',
             currencyCode: order.currencyCode,
             fulfillmentStatus: order.fulfillmentStatus || '',
             totalDiscount: order.totalDiscount ? Object.assign({}, order.totalDiscount) : { amount: 0 },
@@ -96,12 +98,37 @@ class OrderHelpers {
             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 },
-            lineItems: order.lineItems,
+            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',
+            unfulfilledItems: [],
+            fulfilledItems: [],
             refundedItems: [],
-            orderRefunds,
+            canceledItems: [],
+            refunds: orderRefunds,
         };
+        if (!preparedOrder.activeLineItems.length) {
+            return preparedOrder;
+        }
+        if (orderFulfillment.length) {
+            preparedOrder.activeLineItems = preparedOrder.activeLineItems.map((item) => {
+                const currentItem = item.productId;
+                const fulfilledWithRefundedQuantity = orderFulfillment.reduce((result, { fulfillmentLineItems }) => {
+                    if (fulfillmentLineItems.length) {
+                        const fulfillmentProdItem = fulfillmentLineItems.find((fli) => fli.lineItem.productId === currentItem);
+                        if (fulfillmentProdItem) {
+                            result = result + Number(fulfillmentProdItem.quantity);
+                        }
+                    }
+                    return result;
+                }, 0);
+                return Object.assign(Object.assign({}, item), { unfulfilledQuantity: item.unfulfilledQuantity - fulfilledWithRefundedQuantity, fulfilledQuantity: fulfilledWithRefundedQuantity });
+            });
+            preparedOrder.fulfilledItems = preparedOrder.activeLineItems.filter(({ fulfilledQuantity }) => fulfilledQuantity > 0);
+        }
+        preparedOrder.unfulfilledItems = preparedOrder.activeLineItems.filter(({ unfulfilledQuantity }) => unfulfilledQuantity > 0);
         if (!orderRefunds.length) {
             return preparedOrder;
         }
@@ -113,22 +140,49 @@ class OrderHelpers {
             Number(((_a = order.totalShippingPrice) === null || _a === void 0 ? void 0 : _a.amount) || 0) - this.getAmountSumByField(orderRefunds, 'refundShipping');
         preparedOrder.totalPrice.amount =
             Number(order.totalPrice.amount) - this.getAmountSumByField(orderRefunds, 'totalRefunded');
-        const lineItemsWithRefundedQuantity = order.lineItems.map((item) => {
+        const lineItemsWithQuantityInfo = preparedOrder.activeLineItems.map((item) => {
             const currentItem = item.productId;
-            const refundedQuantity = orderRefunds.reduce((result, { refundLineItems }) => {
+            const refundedAndCanceledQuantity = orderRefunds.reduce((result, { refundLineItems }) => {
                 if (refundLineItems.length) {
                     const refundProdItem = refundLineItems.find(({ lineItem }) => lineItem.productId === currentItem);
                     if (refundProdItem) {
-                        result = result + Number(refundProdItem.quantityRefund);
+                        result.refundedQuantity = result.refundedQuantity + Number(refundProdItem.quantityRefund);
+                        result.canceledQuantity = result.canceledQuantity + Number(refundProdItem.quantityCancel);
                     }
                 }
                 return result;
-            }, 0);
-            return Object.assign(Object.assign({}, item), { quantity: Number(item.quantity) - refundedQuantity, refundedQuantity });
+            }, { refundedQuantity: 0, canceledQuantity: 0 });
+            // 3. fulfilledQuantity = (sum of order.fulfillment) - refundedQuantity
+            // 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);
         });
-        preparedOrder.lineItems = lineItemsWithRefundedQuantity.filter(({ quantity }) => quantity > 0);
-        preparedOrder.refundedItems = lineItemsWithRefundedQuantity.filter(({ refundedQuantity }) => refundedQuantity > 0);
+        preparedOrder.activeLineItems = lineItemsWithQuantityInfo.filter(({ unfulfilledQuantity, fulfilledQuantity }) => unfulfilledQuantity + fulfilledQuantity > 0);
+        preparedOrder.unfulfilledItems = lineItemsWithQuantityInfo.filter(({ unfulfilledQuantity }) => unfulfilledQuantity > 0);
+        preparedOrder.fulfilledItems = lineItemsWithQuantityInfo.filter(({ fulfilledQuantity }) => fulfilledQuantity > 0);
+        preparedOrder.refundedItems = lineItemsWithQuantityInfo.filter(({ refundedQuantity }) => refundedQuantity > 0);
+        preparedOrder.canceledItems = lineItemsWithQuantityInfo.filter(({ canceledQuantity }) => canceledQuantity > 0);
         return preparedOrder;
     }
+    getUpdatedOrderObjWithRefunds(orderObj, refundObj) {
+        const updatedOrder = Object.assign(Object.assign({}, orderObj), { refunds: orderObj.refunds ? [...orderObj.refunds] : [], totalRefunded: orderObj.totalRefunded ? Object.assign({}, orderObj.totalRefunded) : { amount: 0 } });
+        const totalRefundedAmount = Number(updatedOrder.totalRefunded.amount) + Number(refundObj.totalRefunded.amount);
+        updatedOrder.refunds = [...updatedOrder.refunds, Object.assign({}, refundObj)];
+        updatedOrder.totalRefunded.amount = Number(totalRefundedAmount).toFixed(2);
+        updatedOrder.financialStatus =
+            Number(orderObj.totalPrice.amount) - totalRefundedAmount > 0 ? 'PARTIALLY_REFUNDED' : 'REFUNDED';
+        return updatedOrder;
+    }
+    getUpdatedOrderObjWithFulfillment(orderObj, fulfillmentObj, totalUnfulfilledItems) {
+        const updatedOrder = Object.assign(Object.assign({}, orderObj), { fulfillments: orderObj.fulfillments ? [...orderObj.fulfillments] : [] });
+        const fulfilledItemsQuantity = !fulfillmentObj.fulfillmentLineItems.length
+            ? 0
+            : fulfillmentObj.fulfillmentLineItems
+                .map(({ quantity }) => Number(quantity))
+                .reduce((a, b) => a + b, 0);
+        updatedOrder.fulfillments = [...updatedOrder.fulfillments, fulfillmentObj];
+        updatedOrder.fulfillmentStatus =
+            totalUnfulfilledItems - fulfilledItemsQuantity > 0 ? 'PARTIALLY_FULFILLED' : 'FULFILLED';
+        return updatedOrder;
+    }
 }
 exports.default = OrderHelpers;

package/lib/helpers/ReRobeProductHelpers.js

@@ -23,7 +23,7 @@ class ReRobeProductHelpers {
     static buildReRobeEarnings(arrayLike) {
         const products = Array.isArray(arrayLike) ? arrayLike : [arrayLike];
         return products.reduce((acc, cur) => {
-            const commission = cur.reRobeCommission ? Number(cur.reRobeCommission) : 0.35;
+            const commission = cur.reRobeCommission ? Number(cur.reRobeCommission) : 0.5;
             const priceToUse = cur.isOnSale === 'yes' && cur.salePrice ? cur.salePrice : cur.price;
             const listingPrice = Number(Number(priceToUse) <= 1 ? cur.suggestedResalePrice : priceToUse);
             const inventoryValue = acc[0] + listingPrice;
@@ -172,6 +172,7 @@ class ReRobeProductHelpers {
       <br>
       Vi har 14 dagars öppet köp från då din order har packats och levererats till dig. Returer är endast giltiga om prislappen sitter kvar, samt att varan är i samma skick som när du köpte den. Om du vill returnera något till oss, se till att kontakta vårt kundtjänst team på help@rerobe.se för att begära en förbetald, spårbar fraktetikett. Observera att vi inte accepterar returer som skickas utan vår fraktsedel.
       <br>
+      <br>
       Returavgiften är 63 SEK. Detta kommer att dras från ditt ursprungliga köp när vi har tagit emot den returnerade varan.
     </p>
     

package/lib/index.d.ts

@@ -2,6 +2,7 @@ import ProductFromShopifyJSClientJSONDoc from './factories/Product/ProductFromSh
 import ProductFromAlgoliaJSONDoc from './factories/Product/ProductFromAlgoliaJSONDoc';
 import ProductFromShopifyWebhookJSONDoc from './factories/Product/ProductFromShopifyWebhookJSONDoc';
 import ProductFormStateFactory from './factories/FormState/Product/ProductFormStateFactory';
+import ProductCollectionFormState from './form-states/ProductCollection/ProductCollectionFormState';
 import SellRequestFormStateFactory from './factories/FormState/SellRequest/SellRequestFormStateFactory';
 import PickUpFormStateFactory from './factories/FormState/PickUp/PickUpFormStateFactory';
 import UserFormStateFactory from './factories/FormState/User/UserFormStateFactory';
@@ -31,4 +32,4 @@ import WebhookFormState from './form-states/Merchant/WebhookFormState';
 import ReRobeProductHelpers from './helpers/ReRobeProductHelpers';
 import AnalyticsHelpers from './helpers/AnalyticsHelpers';
 import OrderHelpers from './helpers/OrderHelpers';
-export { ProductFromAlgoliaJSONDoc, ProductFromShopifyWebhookJSONDoc, ProductFromShopifyJSClientJSONDoc, ProductFormStateFactory, SellRequestFormStateFactory, PickUpFormStateFactory, AddressFormStateFactory, UserFormStateFactory, UserFromShopifyWebhookJSONDoc, UserFromAuthTemplateMethod, DraftOrderFromMirakl, DraftOrderFromApp, ChatRoomFromNewUserSignUp, KlarnaSessionFactory, Product, ProductStateManager, Order, OrderFromShopifyWebhook, OrderFromShopifyAdminApi, OrderFromShopifyStorefrontApi, OrderFromApp, OrderFormStateFactory, RefundFormStateFactory, PayoutAccount, PayoutAccountFormState, Merchant, MerchantFormState, MerchantFormStateFactory, ReRobeProductHelpers, User, AnalyticsHelpers, OrderHelpers, WebhookFormState, };
+export { ProductFromAlgoliaJSONDoc, ProductFromShopifyWebhookJSONDoc, ProductFromShopifyJSClientJSONDoc, ProductFormStateFactory, ProductCollectionFormState, SellRequestFormStateFactory, PickUpFormStateFactory, AddressFormStateFactory, UserFormStateFactory, UserFromShopifyWebhookJSONDoc, UserFromAuthTemplateMethod, DraftOrderFromMirakl, DraftOrderFromApp, ChatRoomFromNewUserSignUp, KlarnaSessionFactory, Product, ProductStateManager, Order, OrderFromShopifyWebhook, OrderFromShopifyAdminApi, OrderFromShopifyStorefrontApi, OrderFromApp, OrderFormStateFactory, RefundFormStateFactory, PayoutAccount, PayoutAccountFormState, Merchant, MerchantFormState, MerchantFormStateFactory, ReRobeProductHelpers, User, AnalyticsHelpers, OrderHelpers, WebhookFormState, };

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebhookFormState = exports.OrderHelpers = exports.AnalyticsHelpers = exports.User = exports.ReRobeProductHelpers = exports.MerchantFormStateFactory = exports.MerchantFormState = exports.Merchant = exports.PayoutAccountFormState = exports.PayoutAccount = exports.RefundFormStateFactory = exports.OrderFormStateFactory = exports.OrderFromApp = exports.OrderFromShopifyStorefrontApi = exports.OrderFromShopifyAdminApi = exports.OrderFromShopifyWebhook = exports.Order = exports.ProductStateManager = exports.Product = exports.KlarnaSessionFactory = exports.ChatRoomFromNewUserSignUp = exports.DraftOrderFromApp = exports.DraftOrderFromMirakl = exports.UserFromAuthTemplateMethod = exports.UserFromShopifyWebhookJSONDoc = exports.UserFormStateFactory = exports.AddressFormStateFactory = exports.PickUpFormStateFactory = exports.SellRequestFormStateFactory = exports.ProductFormStateFactory = exports.ProductFromShopifyJSClientJSONDoc = exports.ProductFromShopifyWebhookJSONDoc = exports.ProductFromAlgoliaJSONDoc = void 0;
+exports.WebhookFormState = exports.OrderHelpers = exports.AnalyticsHelpers = exports.User = exports.ReRobeProductHelpers = exports.MerchantFormStateFactory = exports.MerchantFormState = exports.Merchant = exports.PayoutAccountFormState = exports.PayoutAccount = exports.RefundFormStateFactory = exports.OrderFormStateFactory = exports.OrderFromApp = exports.OrderFromShopifyStorefrontApi = exports.OrderFromShopifyAdminApi = exports.OrderFromShopifyWebhook = exports.Order = exports.ProductStateManager = exports.Product = exports.KlarnaSessionFactory = exports.ChatRoomFromNewUserSignUp = exports.DraftOrderFromApp = exports.DraftOrderFromMirakl = exports.UserFromAuthTemplateMethod = exports.UserFromShopifyWebhookJSONDoc = exports.UserFormStateFactory = exports.AddressFormStateFactory = exports.PickUpFormStateFactory = exports.SellRequestFormStateFactory = exports.ProductCollectionFormState = exports.ProductFormStateFactory = exports.ProductFromShopifyJSClientJSONDoc = exports.ProductFromShopifyWebhookJSONDoc = exports.ProductFromAlgoliaJSONDoc = void 0;
 const ProductFromShopifyJSClientJSONDoc_1 = require("./factories/Product/ProductFromShopifyJSClientJSONDoc");
 exports.ProductFromShopifyJSClientJSONDoc = ProductFromShopifyJSClientJSONDoc_1.default;
 const ProductFromAlgoliaJSONDoc_1 = require("./factories/Product/ProductFromAlgoliaJSONDoc");
@@ -9,6 +9,8 @@ const ProductFromShopifyWebhookJSONDoc_1 = require("./factories/Product/ProductF
 exports.ProductFromShopifyWebhookJSONDoc = ProductFromShopifyWebhookJSONDoc_1.default;
 const ProductFormStateFactory_1 = require("./factories/FormState/Product/ProductFormStateFactory");
 exports.ProductFormStateFactory = ProductFormStateFactory_1.default;
+const ProductCollectionFormState_1 = require("./form-states/ProductCollection/ProductCollectionFormState");
+exports.ProductCollectionFormState = ProductCollectionFormState_1.default;
 const SellRequestFormStateFactory_1 = require("./factories/FormState/SellRequest/SellRequestFormStateFactory");
 exports.SellRequestFormStateFactory = SellRequestFormStateFactory_1.default;
 const PickUpFormStateFactory_1 = require("./factories/FormState/PickUp/PickUpFormStateFactory");

package/lib/models/Order.d.ts

@@ -24,6 +24,7 @@ export default class Order extends Base {
     };
     static FULFILLMENT_TYPES: {
         fulfilled: string;
+        partiallyFulfilled: string;
         unfulfilled: string;
         inProgress: string;
         canceled: string;

package/lib/models/Order.js

@@ -184,6 +184,7 @@ Order.SALES_CHANNELS = {
 };
 Order.FULFILLMENT_TYPES = {
     fulfilled: 'FULFILLED',
+    partiallyFulfilled: 'PARTIALLY_FULFILLED',
     unfulfilled: 'UNFULFILLED',
     inProgress: 'IN_PROGRESS',
     canceled: 'CANCELED',

package/lib/models/Product.js

@@ -49,6 +49,7 @@ class Product extends Base_1.default {
             priceRange: (props === null || props === void 0 ? void 0 : props.priceRange) || '',
             condition: (props === null || props === void 0 ? void 0 : props.condition) || '',
             measurements: (props === null || props === void 0 ? void 0 : props.measurements) || {},
+            featuredCollections: (props === null || props === void 0 ? void 0 : props.featuredCollections) || [],
         };
         this.consignmentAttributes = {
             sellRequestImageUrls: (props === null || props === void 0 ? void 0 : props.sellRequestImageUrls) || [],
@@ -77,6 +78,7 @@ class Product extends Base_1.default {
             discountType: (props === null || props === void 0 ? void 0 : props.discountType) || '',
             discountValue: (props === null || props === void 0 ? void 0 : props.discountValue) || '',
             selectedForClearance: (props === null || props === void 0 ? void 0 : props.selectedForClearance) || '',
+            locationIds: (props === null || props === void 0 ? void 0 : props.locationIds) || [],
         };
     }
     toPartialObj() {

package/lib/models/ProductCollection.d.ts

@@ -0,0 +1,13 @@
+import Base from '../Base';
+export default class ProductCollection extends Base {
+    documentId: string;
+    preTitle: string;
+    title: string;
+    subTitle: string;
+    description: string;
+    type: CollectionType;
+    imgUrl: string;
+    refinements: ProductRefinements;
+    constructor(props?: any);
+    toObj(): ProductCollectionType;
+}

package/lib/models/ProductCollection.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Base_1 = require("../Base");
+class ProductCollection extends Base_1.default {
+    constructor(props) {
+        super();
+        this.documentId = (props === null || props === void 0 ? void 0 : props.documentId) || '';
+        this.preTitle = (props === null || props === void 0 ? void 0 : props.preTitle) || '';
+        this.title = (props === null || props === void 0 ? void 0 : props.title) || '';
+        this.subTitle = (props === null || props === void 0 ? void 0 : props.subTitle) || '';
+        this.description = (props === null || props === void 0 ? void 0 : props.description) || '';
+        this.type = (props === null || props === void 0 ? void 0 : props.type) || 'AUTOMATED';
+        this.imgUrl = (props === null || props === void 0 ? void 0 : props.imgUrl) || '';
+        this.refinements = (props === null || props === void 0 ? void 0 : props.refinements) || {};
+    }
+    toObj() {
+        const productCollectionObj = {
+            documentId: this.documentId,
+            preTitle: this.preTitle,
+            title: this.title,
+            subTitle: this.subTitle,
+            description: this.description,
+            type: this.type,
+            imgUrl: this.imgUrl,
+            refinements: this.refinements,
+        };
+        return productCollectionObj;
+    }
+}
+exports.default = ProductCollection;

package/lib/types/product-collection-types.d.ts

@@ -0,0 +1,43 @@
+declare type ProductAttrRefinementsOptions = 'brand' | 'clothingSize' | 'color' | 'condition' | 'gender' | 'jeanSize' | 'materialComposition' | 'priceRange' | 'productCategory' | 'productType' | 'productStyle' | 'shoeSize';
+interface Refinements {
+    featuredCollections?: string;
+}
+interface ProductRefinements extends Refinements {
+    brandRefinement?: string[];
+    clothingSizeRefinement?: string[];
+    colorRefinement?: string[];
+    conditionRefinement?: string[];
+    genderRefinement?: string[];
+    jeanSizeRefinement?: string[];
+    materialCompositionRefinement?: string[];
+    priceRangeRefinement?: string[];
+    productCategoryRefinement?: string[];
+    productTypeRefinement?: string[];
+    productStyleRefinement?: string[];
+    shoeSizeRefinement?: string[];
+}
+declare type CollectionType = 'AUTOMATED' | 'MANUAL';
+declare type ProductCollectionType = {
+    createdAt?: string;
+    updatedAt?: string;
+    documentId?: string;
+    preTitle: string;
+    title: string;
+    subTitle: string;
+    description: string;
+    type: CollectionType;
+    imgUrl: string;
+    refinements: ProductRefinements;
+};
+declare type CompleteProductCollection = ProductCollectionType & {
+    [key: string]: any;
+};
+declare type ProductCollectionFormFields = {
+    preTitle: TextInputFormField<string>;
+    title: TextInputFormField<string>;
+    subTitle: TextInputFormField<string>;
+    description: TextInputFormField<string>;
+    type: SingleSelectFormField<CollectionType>;
+    imgUrl: TextInputFormField<string>;
+    refinements: SingleSelectFormField<ProductRefinements>;
+};

package/lib/types/product-collection-types.js

@@ -0,0 +1,13 @@
+"use strict";
+// //from shopify product collection
+// type ComparisonOptions =
+//   | 'IS_EQUAL_TO'
+//   | 'IS_NOT_EQUAL_TO'
+//   | 'IS_GREATER_THAN'
+//   | 'IS_LESS_THAN'
+//   | 'STARTS_WITH'
+//   | 'ENDS_WITH'
+//   | 'CONTAINS'
+//   | 'DOES_NOT_CONTAINS'
+//   | 'IS_EMPTY'
+//   | 'IS_NOT_EMPTY';

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

@@ -62,8 +62,9 @@ declare type ReRobeOrderObj = {
     createdAt?: string;
     updatedAt?: string;
 };
-declare type OrderWithRefundsInfoObj = {
+declare type OrderWithRefundsAndFulfillmentsInfoObj = {
     documentId?: string;
+    name?: string;
     currencyCode: string;
     fulfillmentStatus?: FulfillmentStatusTypes | string;
     totalDiscount: Money;
@@ -72,11 +73,14 @@ declare type OrderWithRefundsInfoObj = {
     totalShippingPrice?: Money;
     totalTax?: Money;
     subtotalPrice: Money;
-    lineItems: ReRobeOrderLineItem[];
     discountType: string;
     shippingRate: string;
-    orderRefunds: OrderRefund[];
+    refunds: OrderRefund[];
+    activeLineItems: ReRobeOrderLineItem[];
+    unfulfilledItems: ReRobeOrderLineItem[];
+    fulfilledItems: ReRobeOrderLineItem[];
     refundedItems: ReRobeOrderLineItem[];
+    canceledItems: ReRobeOrderLineItem[];
 };
 declare type OrderInput = {
     id?: string | null;
@@ -201,7 +205,10 @@ interface ReRobeOrderLineItem extends OrderLineItem {
     brand?: string | null;
     productId?: string | null;
     shopifyProductId?: string | number | null;
-    refundedQuantity?: number;
+    refundedQuantity?: number | string;
+    canceledQuantity?: number | string;
+    fulfilledQuantity?: number | string;
+    unfulfilledQuantity?: number | string;
 }
 declare type OrderLineItemConnection = {
     edges: OrderLineItemEdge[];
@@ -301,8 +308,10 @@ declare type OrderRefund = {
 declare type RefundLineItem = {
     lineItem: ReRobeOrderLineItem;
     quantityRefund: number;
+    quantityCancel: number;
     discountRefund?: Money;
     subtotalRefund?: Money;
+    subtotalCanceled?: Money;
 };
 declare type TaxLine = {
     title: string;
@@ -336,7 +345,7 @@ declare type FulfillmentLineItemEdge = {
     node: FulfillmentLineItem;
 };
 declare type FulfillmentLineItem = {
-    lineItem: OrderLineItem;
+    lineItem: ReRobeOrderLineItem;
     quantity: number;
 };
 declare type FulfillmentAdmin = {
@@ -346,7 +355,7 @@ declare type FulfillmentAdmin = {
     displayStatus?: FulfillmentDisplayStatusTypes;
     deliveredAt?: string;
     estimatedDeliveryAt?: string;
-    fulfillmentLineItems: FulfillmentLineItemConnection;
+    fulfillmentLineItems: FulfillmentLineItem[] | FulfillmentLineItemConnection;
     inTransitAt?: string;
     location?: OrderLocation;
     order?: ShopifyAdminOrderObj;

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

@@ -38,6 +38,7 @@ declare type ProductFilterAttributes = {
     productStyle: string[];
     shoeSize: string;
     measurements: Measurements;
+    featuredCollections?: string[];
 };
 declare type ProductConsignmentAttributes = {
     sellRequestImageUrls: string[];
@@ -66,6 +67,7 @@ declare type ProductConsignmentAttributes = {
     discountType: string;
     discountValue: string;
     selectedForClearance: string;
+    locationIds?: string[];
 };
 declare type TranslatableAttributes = {
     description: string;
@@ -120,6 +122,7 @@ declare type ProductAttributesFormFields = {
     editorAuthorizations: SingleSelectFormField<EditorAuthorization>;
     vendorId: SingleSelectFormField<string>;
     vendorName: SingleSelectFormField<string>;
+    rfidTag: TextInputFormField<string>;
 };
 declare type ProductFilterAttributesFormFields = {
     brand: SingleSelectFormField<string>;
@@ -134,6 +137,7 @@ declare type ProductFilterAttributesFormFields = {
     productType: SingleSelectFormField<string>;
     productStyle: MultiSelectFormField<string>;
     shoeSize: SingleSelectFormField<string>;
+    featuredCollections: MultiSelectFormField<string>;
 };
 declare type ProductConsignmentAttributesFormFields = {
     previousSellers: MultiSelectFormField<string>;
@@ -159,6 +163,7 @@ declare type ProductConsignmentAttributesFormFields = {
     isOnSale: SingleSelectFormField<string>;
     discountType: SingleSelectFormField<string>;
     discountValue: TextInputFormField<string>;
+    locationIds: MultiSelectFormField<string>;
 };
 declare type ProductFormFields = ProductAttributesFormFields & ProductFilterAttributesFormFields & ProductConsignmentAttributesFormFields;
 interface ParamsForBuildProductInputObjForShopify {

package/package.json

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