rerobe-js-orm 2.4.6 → 2.4.8

package/lib/factories/FormState/Product/ProductFormStateFactory.d.ts

@@ -1,5 +1,5 @@
 import FormStateFactory from '../FormStateFactory';
 import ProductFormState from '../../../form-states/Product/ProductFormState';
 export default class ProductFormStateFactory extends FormStateFactory {
-    createFormState(props?: CompleteProduct): ProductFormState;
+    createFormState(props?: CompleteProduct, opts?: any): ProductFormState;
 }

package/lib/factories/FormState/Product/ProductFormStateFactory.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const FormStateFactory_1 = require("../FormStateFactory");
 const ProductFormState_1 = require("../../../form-states/Product/ProductFormState");
 class ProductFormStateFactory extends FormStateFactory_1.default {
-    createFormState(props) {
-        return new ProductFormState_1.default(props);
+    createFormState(props, opts) {
+        return new ProductFormState_1.default(props, opts);
     }
 }
 exports.default = ProductFormStateFactory;

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, opts);
+    }
+}
+exports.default = ProductCollectionFormStateFactory;

package/lib/factories/Order/OrderFromApp.js

@@ -6,7 +6,7 @@ const OrderHelpers_1 = require("../../helpers/OrderHelpers");
 const orderHelpers = new OrderHelpers_1.default();
 class OrderFromApp extends OrderFactory_1.default {
     createOrder(order) {
-        const { id, orderNumber, amount, currencyCode = 'SEK', shippingDetails, appliedDiscount, products, paymentType, paymentMethod, shippingType, shopifyId, shopifyOrderNumber, state, userId, email, salesChannel, tags, paymentDetails, financialStatus, fulfillmentStatus, } = order;
+        const { id, orderNumber, amount, currencyCode = 'SEK', shippingDetails, appliedDiscount, products, paymentType, paymentMethod, shippingType, shopifyId, ribbnOrderNumber, shopifyOrderNumber, state, userId, email, customerName, salesChannel, tags, paymentDetails, financialStatus, fulfillmentStatus, } = order;
         let discount = 0;
         let shippingFee = 0;
         let subTotal = 0;
@@ -52,12 +52,14 @@ class OrderFromApp extends OrderFactory_1.default {
             paymentType: paymentType ? this.utilities.constantCase(paymentType) : Order_1.default.PAYMENT_TYPES.creditCard,
             shippingType: shippingType ? this.utilities.constantCase(shippingType) : Order_1.default.SHIPPING_TYPES.localPickUp,
             shopifyId,
+            ribbnOrderNumber,
             shopifyOrderNumber,
             shippingAddress: shippingDetails && shippingDetails.deliveryAddress ? shippingDetails.deliveryAddress : null,
             lineItems,
             state,
             userId,
             email,
+            customerName,
             paymentDetails,
             tags,
             salesChannel,

package/lib/factories/Order/OrderFromFormState.js

@@ -4,7 +4,7 @@ const OrderFactory_1 = require("./OrderFactory");
 const Order_1 = require("../../models/Order");
 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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         const currencyCode = fs.fields.currencyCode.inputValue || 'SEK';
         const customer = fs.fields.customer.selectedValue || {};
         const firstName = fs.fields.firstName.inputValue;
@@ -17,13 +17,14 @@ class OrderFromFormState extends OrderFactory_1.default {
             documentId: ((_c = fs.props) === null || _c === void 0 ? void 0 : _c.documentId) || '',
             name: ((_d = fs.props) === null || _d === void 0 ? void 0 : _d.name) || '',
             orderNumber: (_e = fs.props) === null || _e === void 0 ? void 0 : _e.orderNumber,
-            state: ((_f = fs.props) === null || _f === void 0 ? void 0 : _f.state) || Order_1.default.ORDER_STATES.draft,
+            ribbnOrderNumber: (_f = fs.props) === null || _f === void 0 ? void 0 : _f.ribbnOrderNumber,
+            state: ((_g = fs.props) === null || _g === void 0 ? void 0 : _g.state) || Order_1.default.ORDER_STATES.draft,
             currencyCode: fs.fields.currencyCode.inputValue,
-            statusUrl: ((_g = fs.props) === null || _g === void 0 ? void 0 : _g.statusUrl) || '',
-            processedAt: ((_h = fs.props) === null || _h === void 0 ? void 0 : _h.processedAt) || new Date().toUTCString(),
+            statusUrl: ((_h = fs.props) === null || _h === void 0 ? void 0 : _h.statusUrl) || '',
+            processedAt: ((_j = fs.props) === null || _j === void 0 ? void 0 : _j.processedAt) || new Date().toUTCString(),
             financialStatus: fs.fields.financialStatus.selectedValue,
             fulfillmentStatus: fs.fields.fulfillmentStatus.selectedValue,
-            fulfillments: ((_j = fs.props) === null || _j === void 0 ? void 0 : _j.fulfillments) || [],
+            fulfillments: ((_k = fs.props) === null || _k === void 0 ? void 0 : _k.fulfillments) || [],
             shippingAddress: fs.fields.shippingAddress.selectedValue || {
                 id: '',
                 address1: '',
@@ -34,7 +35,7 @@ class OrderFromFormState extends OrderFactory_1.default {
                 province: '',
                 zip: '',
             },
-            shippingDiscountAllocations: ((_k = fs.props) === null || _k === void 0 ? void 0 : _k.shippingDiscountAllocations) || [],
+            shippingDiscountAllocations: ((_l = fs.props) === null || _l === void 0 ? void 0 : _l.shippingDiscountAllocations) || [],
             shippingLine: fs.fields.shippingLine
                 ? fs.fields.shippingLine.selectedValue
                 : {
@@ -55,9 +56,9 @@ class OrderFromFormState extends OrderFactory_1.default {
             originalTotalPrice: { amount: fs.fields.originalTotalPrice.inputValue || 0, currencyCode },
             lineItems: fs.fields.lineItems.selectedValues || [],
             cancelReason: fs.fields.cancelReason.selectedValue || '',
-            canceledAt: ((_l = fs.props) === null || _l === void 0 ? void 0 : _l.canceledAt) || '',
-            customerUrl: ((_m = fs.props) === null || _m === void 0 ? void 0 : _m.customerUrl) || '',
-            discountApplications: ((_o = fs.props) === null || _o === void 0 ? void 0 : _o.discountApplications) || [],
+            canceledAt: ((_m = fs.props) === null || _m === void 0 ? void 0 : _m.canceledAt) || '',
+            customerUrl: ((_o = fs.props) === null || _o === void 0 ? void 0 : _o.customerUrl) || '',
+            discountApplications: ((_p = fs.props) === null || _p === void 0 ? void 0 : _p.discountApplications) || [],
             physicalLocation: fs.fields.physicalLocation.selectedValue || {
                 id: '',
                 activatable: true,
@@ -76,7 +77,7 @@ class OrderFromFormState extends OrderFactory_1.default {
             },
             notes: fs.fields.notes.inputValue || '',
             userId: (customer === null || customer === void 0 ? void 0 : customer.uid) || '',
-            customerName: ((_p = fs.props) === null || _p === void 0 ? void 0 : _p.customerName) ||
+            customerName: ((_q = fs.props) === null || _q === void 0 ? void 0 : _q.customerName) ||
                 (customer.displayName ? customer.displayName : '') ||
                 (customer.firstName && customer.lastName ? `${customer.firstName} ${customer.lastName}` : '') ||
                 (firstName && lastName ? `${firstName} ${lastName}` : ''),
@@ -84,9 +85,9 @@ class OrderFromFormState extends OrderFactory_1.default {
             phone: (customer === null || customer === void 0 ? void 0 : customer.phone) || fs.fields.phone.inputValue || '',
             paymentMethod: fs.fields.paymentMethod.selectedValue || '',
             paymentDetails: fs.fields.paymentDetails.selectedValue || {},
-            merchantId: ((_q = fs.props) === null || _q === void 0 ? void 0 : _q.merchantId) || '',
+            merchantId: ((_r = fs.props) === null || _r === void 0 ? void 0 : _r.merchantId) || '',
             tags: fs.fields.tags.selectedValues || [],
-            refunds: ((_r = fs.props) === null || _r === void 0 ? void 0 : _r.refunds) || [],
+            refunds: ((_s = fs.props) === null || _s === void 0 ? void 0 : _s.refunds) || [],
         };
         return new Order_1.default(Object.assign({}, orderAttributes));
     }

package/lib/factories/Order/OrderFromShopifyWebhook.js

@@ -4,6 +4,18 @@ const OrderFactory_1 = require("./OrderFactory");
 const Order_1 = require("../../models/Order");
 const OrderHelpers_1 = require("../../helpers/OrderHelpers");
 const orderHelpers = new OrderHelpers_1.default();
+const fulfillmentStatusRestMapping = {
+    fulfilled: 'FULFILLED',
+    null: '',
+    partial: 'PARTIALLY_FULFILLED',
+    restocked: 'RESTOCKED',
+    pending: 'PENDING_FULFILLMENT',
+    open: 'OPEN',
+    success: 'SUCCESS',
+    cancelled: 'CANCELED',
+    error: 'ERROR',
+    failure: 'FAILURE',
+};
 class OrderFromShopifyWebhook extends OrderFactory_1.default {
     createOrder(order) {
         const { id, financial_status, fulfillment_status, cancel_reason, line_items, discount_applications, shipping_address, subtotal_price_set, total_price_set, total_shipping_price_set, currency, cancelled_at, closed_at, created_at, order_number, processed_at, updated_at, shipping_lines, tax_lines, name, total_discounts, tags = '', } = order;
@@ -78,23 +90,123 @@ class OrderFromShopifyWebhook extends OrderFactory_1.default {
             }
             : null;
         const fulfillments = order.fulfillments
-            ? order.fulfillments.map((item) => (Object.assign(Object.assign({}, item), { createdAt: item.created_at, updatedAt: item.updated_at, location: {
+            ? order.fulfillments.map((item) => ({
+                name: item.name,
+                id: item.id,
+                createdAt: item.created_at,
+                updatedAt: item.updated_at,
+                location: {
                     id: item.location_id || '',
-                }, order: {
-                    id: item.order_id || '',
-                }, shipmentStatus: item.shipment_status ? item.shipment_status.toUpperCase() : '', service: {
+                },
+                shipmentStatus: item.shipment_status ? item.shipment_status.toUpperCase() : '',
+                service: {
                     serviceType: item.service ? item.service.toUpperCase() : '',
-                }, status: item.status ? item.status.toUpperCase() : '', trackingInfo: {
+                },
+                status: item.status ? item.status.toUpperCase() : '',
+                trackingInfo: {
                     company: item.tracking_company,
                     number: item.tracking_numbers && !!item.tracking_numbers.length ? item.tracking_numbers[0] : '',
                     url: item.tracking_urls && !!item.tracking_urls.length ? item.tracking_urls[0] : '',
-                }, fulfillmentLineItems: item.line_items
+                },
+                fulfillmentLineItems: item.line_items
                     ? item.line_items.map((lineItem) => ({
-                        lineItem,
+                        lineItem: { shopifyProductId: lineItem === null || lineItem === void 0 ? void 0 : lineItem.product_id },
                         quantity: lineItem.quantity,
                     }))
-                    : [] })))
+                    : [],
+            }))
+            : [];
+        const refunds = order.refunds
+            ? order.refunds.map((rawRefundItem) => {
+                const currencyCode = currency;
+                const refundedShippingAmount = !rawRefundItem.order_adjustments.length
+                    ? 0
+                    : rawRefundItem.order_adjustments.reduce((result, item) => {
+                        if (item.kind === 'shipping_refund') {
+                            result = result - Number(item.amount);
+                        }
+                        return result;
+                    }, 0);
+                const totalRefundedAmount = !rawRefundItem.transactions.length
+                    ? 0
+                    : rawRefundItem.transactions.reduce((result, item) => {
+                        if (item.kind === 'refund') {
+                            result = result + Number(item.amount);
+                        }
+                        return result;
+                    }, 0);
+                let refundDiscountAmount = 0;
+                const subtotalRefundedAmount = !rawRefundItem.refund_line_items.length
+                    ? 0
+                    : rawRefundItem.refund_line_items.reduce((result, item) => {
+                        if (item.line_item) {
+                            const itemSubtotal = Number(Number(item.line_item.price) * item.quantity);
+                            result = result + itemSubtotal;
+                            refundDiscountAmount = refundDiscountAmount + itemSubtotal - Number(item.subtotal);
+                        }
+                        return result;
+                    }, 0);
+                let refundLineItems = !rawRefundItem.refund_line_items || !rawRefundItem.refund_line_items.length
+                    ? []
+                    : rawRefundItem.refund_line_items.map((item) => {
+                        var _a, _b;
+                        const quantityRefund = !item.location_id ? item.quantity : 0;
+                        const quantityCancel = item.location_id ? item.quantity : 0;
+                        const discountRefundAmount = Number(Number((_a = item.line_item) === null || _a === void 0 ? void 0 : _a.price) * item.quantity) - Number(item.subtotal);
+                        const subtotalRefundAmount = !item.location_id ? item.subtotal : 0;
+                        const subtotalCanceledAmount = item.location_id ? item.subtotal : 0;
+                        return {
+                            lineItem: { shopifyProductId: (_b = item.line_item) === null || _b === void 0 ? void 0 : _b.product_id },
+                            quantityRefund,
+                            quantityCancel,
+                            discountRefund: { currencyCode, amount: discountRefundAmount },
+                            subtotalRefund: { currencyCode, amount: subtotalRefundAmount },
+                            subtotalCanceled: { currencyCode, amount: subtotalCanceledAmount },
+                        };
+                    });
+                if (refundLineItems.length) {
+                    refundLineItems = refundLineItems.reduce((result, item) => {
+                        var _a;
+                        const existedLineItemsIds = !result.length ? [] : result.map((itm) => itm.lineItem.shopifyProductId);
+                        const existedLineItemIdx = existedLineItemsIds.indexOf((_a = item.lineItem) === null || _a === void 0 ? void 0 : _a.shopifyProductId);
+                        if (existedLineItemIdx < 0) {
+                            result.push(item);
+                        }
+                        else {
+                            result[existedLineItemIdx] = {
+                                lineItem: result[existedLineItemIdx].lineItem,
+                                quantityRefund: result[existedLineItemIdx].quantityRefund + item.quantityRefund,
+                                quantityCancel: result[existedLineItemIdx].quantityCancel + item.quantityCancel,
+                                discountRefund: Object.assign(Object.assign({}, result[existedLineItemIdx].discountRefund), { amount: result[existedLineItemIdx].discountRefund.amount + item.discountRefund.amount }),
+                                subtotalRefund: Object.assign(Object.assign({}, result[existedLineItemIdx].subtotalRefund), { amount: result[existedLineItemIdx].subtotalRefund.amount + item.subtotalRefund.amount }),
+                                subtotalCanceled: Object.assign(Object.assign({}, result[existedLineItemIdx].subtotalCanceled), { amount: result[existedLineItemIdx].subtotalCanceled.amount + item.subtotalCanceled.amount }),
+                            };
+                        }
+                        return result;
+                    }, []);
+                }
+                return {
+                    documentId: rawRefundItem.id,
+                    createdAt: rawRefundItem.created_at,
+                    note: rawRefundItem.note,
+                    totalRefunded: { amount: totalRefundedAmount, currencyCode },
+                    subtotalRefunded: { amount: subtotalRefundedAmount, currencyCode },
+                    refundDiscount: { amount: refundDiscountAmount, currencyCode },
+                    refundShipping: { amount: refundedShippingAmount, currencyCode },
+                    totalTax: { amount: 0, currencyCode },
+                    refundLineItems,
+                };
+            })
             : [];
+        const totalRefunded = {
+            currencyCode: currency,
+            amount: !refunds || !refunds.length
+                ? 0
+                : refunds.reduce((result, item) => {
+                    result = result + Number(item.totalRefunded.amount);
+                    return result;
+                }, 0),
+        };
         const taxLines = tax_lines
             ? tax_lines.map((item) => ({
                 rate: item.rate,
@@ -150,13 +262,17 @@ class OrderFromShopifyWebhook extends OrderFactory_1.default {
                 },
                 source: '',
             };
-        const rerobeOrder = new Order_1.default(Object.assign(Object.assign({}, order), { id: orderHelpers.getOrderIdFromShopifyObj(order), shopifyId: `gid://shopify/Order/${id}`, shopifyOrderNumber: name ? Number(name.split('#')[1]) : 0, financialStatus: financial_status ? financial_status.toUpperCase() : '', fulfillmentStatus: fulfillment_status ? fulfillment_status.toUpperCase() : '', cancelReason: cancel_reason ? cancel_reason.toUpperCase() : '', lineItems,
+        // @ts-ignore
+        const fulfillmentStatus = !fulfillment_status ? '' : fulfillmentStatusRestMapping[fulfillment_status];
+        const rerobeOrder = new Order_1.default(Object.assign(Object.assign({}, order), { id: orderHelpers.getOrderIdFromShopifyObj(order), shopifyId: `gid://shopify/Order/${id}`, shopifyOrderNumber: name ? Number(name.split('#')[1]) : 0, financialStatus: financial_status ? financial_status.toUpperCase() : '', fulfillmentStatus, cancelReason: cancel_reason ? cancel_reason.toUpperCase() : '', lineItems,
             subtotalPrice,
             totalPrice,
             totalShippingPrice,
-            totalDiscount, canceledAt: cancelled_at, closedAt: closed_at, createdAt: created_at, orderNumber: order_number, processedAt: processed_at, updatedAt: updated_at, shippingAddress,
+            totalDiscount,
+            totalRefunded, canceledAt: cancelled_at, closedAt: closed_at, createdAt: created_at, orderNumber: order_number, processedAt: processed_at, updatedAt: updated_at, shippingAddress,
             discountApplications,
             fulfillments,
+            refunds,
             taxLines,
             shippingLine, state: Order_1.default.ORDER_STATES.completed, shippingType: orderHelpers.getShippingTypeFromShopifyObj(shipping_lines), paymentType: orderHelpers.getPaymentTypeUsingTags(tags), salesChannel: orderHelpers.getSalesChannelUsingTags(tags), tags: tags ? tags.split(', ') : [] }));
         return rerobeOrder.toObj();

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, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11;
         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,12 @@ 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 || [],
+            tags: props.fields.tags.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,20 +63,43 @@ 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));
+        const timestampAttributes = {
+            sellRequestReviewTimestamp: (_s = props.props) === null || _s === void 0 ? void 0 : _s.sellRequestReviewTimestamp,
+            sellRequestReviewDraftTimestamp: (_t = props.props) === null || _t === void 0 ? void 0 : _t.sellRequestReviewDraftTimestamp,
+            rejectedTimestamp: (_u = props.props) === null || _u === void 0 ? void 0 : _u.rejectedTimestamp,
+            holdTimestamp: (_v = props.props) === null || _v === void 0 ? void 0 : _v.holdTimestamp,
+            acceptedTimestamp: (_w = props.props) === null || _w === void 0 ? void 0 : _w.acceptedTimestamp,
+            sellerToDropOffTimestamp: (_x = props.props) === null || _x === void 0 ? void 0 : _x.sellerToDropOffTimestamp,
+            sellerToShipTimestamp: (_y = props.props) === null || _y === void 0 ? void 0 : _y.sellerToShipTimestamp,
+            sellerToGetPickUpTimestamp: (_z = props.props) === null || _z === void 0 ? void 0 : _z.sellerToGetPickUpTimestamp,
+            qualityControlTimestamp: (_0 = props.props) === null || _0 === void 0 ? void 0 : _0.qualityControlTimestamp,
+            pendingPublicationTimestamp: (_1 = props.props) === null || _1 === void 0 ? void 0 : _1.pendingPublicationTimestamp,
+            listedTimestamp: (_2 = props.props) === null || _2 === void 0 ? void 0 : _2.listedTimestamp,
+            clearanceTimestamp: (_3 = props.props) === null || _3 === void 0 ? void 0 : _3.clearanceTimestamp,
+            reservedTimestamp: (_4 = props.props) === null || _4 === void 0 ? void 0 : _4.reservedTimestamp,
+            soldTimestamp: (_5 = props.props) === null || _5 === void 0 ? void 0 : _5.soldTimestamp,
+            returnedTimestamp: (_6 = props.props) === null || _6 === void 0 ? void 0 : _6.returnedTimestamp,
+            soldSellerToBePaidTimestamp: (_7 = props.props) === null || _7 === void 0 ? void 0 : _7.soldSellerToBePaidTimestamp,
+            soldSellerPaidTimestamp: (_8 = props.props) === null || _8 === void 0 ? void 0 : _8.soldSellerPaidTimestamp,
+            sellerSelfRejectTimestamp: (_9 = props.props) === null || _9 === void 0 ? void 0 : _9.sellerSelfRejectTimestamp,
+            liquidationRequestedTimestamp: (_10 = props.props) === null || _10 === void 0 ? void 0 : _10.liquidationRequestedTimestamp,
+            sellerLiquidatedTimestamp: (_11 = props.props) === null || _11 === void 0 ? void 0 : _11.sellerLiquidatedTimestamp,
+        };
+        return new Product_1.default(Object.assign(Object.assign(Object.assign(Object.assign({}, productAttributes), productFilterAttributes), consignmentAttributes), timestampAttributes));
     }
 }
 exports.default = ProductFromFormState;

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,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ProductCollectionFactory_1 = require("./ProductCollectionFactory");
+const ProductCollection_1 = require("../../models/ProductCollection");
+// @ts-ignore
+const lodash_1 = require("lodash");
+class ProductCollectionFromFormState extends ProductCollectionFactory_1.default {
+    createProductCollection(fs) {
+        var _a;
+        let collectionId = fs.fields.collectionId.inputValue;
+        if (!collectionId) {
+            collectionId = lodash_1.camelCase(fs.fields.title.inputValue) + new Date().toISOString().split('T')[0];
+        }
+        const productCollectionAttributes = {
+            documentId: ((_a = fs.props) === null || _a === void 0 ? void 0 : _a.documentId) || '',
+            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 || {},
+            tags: fs.fields.tags.selectedValues || [],
+            collectionId,
+        };
+        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.d.ts

@@ -3,7 +3,13 @@ import Product from '../../models/Product';
 export default class ProductFormState extends FormState {
     fields: ProductFormFields;
     props: CompleteProduct;
-    constructor(props?: any);
+    opts: {
+        featuredCollectionOpts: {
+            label: string;
+            value: string;
+        }[];
+    };
+    constructor(props?: any, opts?: any);
     autoCreateTitle(): string;
     autoCreateDescription(): string;
     createProduct(): Product;

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

@@ -5,9 +5,10 @@ const options_1 = require("./options");
 const Product_1 = require("../../models/Product");
 const ProductFromFormState_1 = require("../../factories/Product/ProductFromFormState");
 class ProductFormState extends FormState_1.default {
-    constructor(props) {
+    constructor(props, opts) {
         super();
         this.props = new Product_1.default(props).toObj();
+        this.opts = opts;
         // ProductAttributesFormFields
         this.fields.availableForSale = this.fieldFactory('singleSelect', 'availableForSale', options_1.availableForSaleOptions);
         this.fields.description = this.fieldFactory('textInput', 'description');
@@ -68,6 +69,10 @@ 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');
+        this.fields.tags = this.fieldFactory('multiSelect', 'tags');
     }
     autoCreateTitle() {
         return this.createProduct().autoCreateTitle();
@@ -505,6 +510,21 @@ class ProductFormState extends FormState_1.default {
                 }
                 hidden = this.props.productStyle.length < 1;
             }
+            if (fieldKey === 'tags') {
+                if (this.props.tags && Array.isArray(this.props.tags) && this.props.tags.length > 0) {
+                    this.props.tags.forEach((tag) => {
+                        if (!options.map((o) => o.value).includes(tag)) {
+                            options.splice(0, 0, { label: tag, value: tag });
+                        }
+                    });
+                }
+                hidden = Boolean(this.props.tags && Array.isArray(this.props.tags) && this.props.tags.length < 1);
+            }
+            if (fieldKey === 'featuredCollections') {
+                if (this.opts && this.opts.featuredCollectionOpts && this.opts.featuredCollectionOpts.length > 0) {
+                    options = this.utilities.uniqObjArray([...options, ...this.opts.featuredCollectionOpts.map((o) => ({ label: o.label, value: o.value }))], 'value');
+                }
+            }
             if (fieldKey === 'clothingSize') {
                 if (this.props.gender === 'Woman') {
                     options = [
@@ -604,7 +624,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') {