rerobe-js-orm 2.5.3 → 2.5.6

package/lib/factories/Order/OrderFromFormState.js

@@ -89,6 +89,12 @@ class OrderFromFormState extends OrderFactory_1.default {
             merchantId: ((_s = fs.props) === null || _s === void 0 ? void 0 : _s.merchantId) || '',
             tags: fs.fields.tags.selectedValues || [],
             refunds: ((_t = fs.props) === null || _t === void 0 ? void 0 : _t.refunds) || [],
+            subtotalPricePresentment: fs.props.subtotalPricePresentment,
+            totalDiscountPresentment: fs.props.totalDiscountPresentment,
+            totalPricePresentment: fs.props.totalPricePresentment,
+            totalRefundedPresentment: fs.props.totalRefundedPresentment,
+            totalShippingPricePresentment: fs.props.totalShippingPricePresentment,
+            totalTaxPresentment: fs.props.totalTaxPresentment,
         };
         return new Order_1.default(Object.assign({}, orderAttributes));
     }

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, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14;
+        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, _12, _13, _14, _15;
         const productAttributes = {
             availableForSale: props.fields.availableForSale.selectedValue,
             description: props.fields.description.inputValue,
@@ -102,6 +102,7 @@ class ProductFromFormState extends ProductFactory_1.default {
             liquidationRequestedTimestamp: (_12 = props.props) === null || _12 === void 0 ? void 0 : _12.liquidationRequestedTimestamp,
             sellerLiquidatedTimestamp: (_13 = props.props) === null || _13 === void 0 ? void 0 : _13.sellerLiquidatedTimestamp,
             archivedTimestamp: (_14 = props.props) === null || _14 === void 0 ? void 0 : _14.archivedTimestamp,
+            liquidationReadyTimestamp: (_15 = props.props) === null || _15 === void 0 ? void 0 : _15.liquidationReadyTimestamp,
         };
         return new Product_1.default(Object.assign(Object.assign(Object.assign(Object.assign({}, productAttributes), productFilterAttributes), consignmentAttributes), timestampAttributes));
     }

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.productOptions = exports.productIsOnSaleOptions = exports.discountTypeOptions = exports.conditionTypeOptions = exports.salesChannelOptions = exports.unisexJewelry = exports.mensJewelry = exports.jewelry = exports.unisexAccessories = exports.mensAccessories = exports.accessories = exports.unisexBags = exports.mensBags = exports.bags = exports.unisexShoes = exports.mensShoes = exports.shoes = exports.unisexClothing = exports.mensClothing = exports.clothing = exports.productCategories = exports.clothingMaterials = exports.shoeSizes = exports.jeanSizes = exports.gender = exports.conditions = exports.colors = exports.brands = exports.sizeCommentOptions = exports.clothingSizeOptions = exports.statusOptions = exports.publishTypeOptions = exports.availableForSaleOptions = void 0;
+exports.productOptions = exports.productIsOnSaleOptions = exports.discountTypeOptions = exports.salesChannelOptions = exports.unisexJewelry = exports.mensJewelry = exports.jewelry = exports.unisexAccessories = exports.mensAccessories = exports.accessories = exports.unisexBags = exports.mensBags = exports.bags = exports.unisexShoes = exports.mensShoes = exports.shoes = exports.unisexClothing = exports.mensClothing = exports.clothing = exports.productCategories = exports.clothingMaterials = exports.shoeSizes = exports.jeanSizes = exports.gender = exports.conditions = exports.colors = exports.brands = exports.sizeCommentOptions = exports.clothingSizeOptions = exports.statusOptions = exports.publishTypeOptions = exports.availableForSaleOptions = void 0;
 const ProductStateManager_1 = require("../../models/ProductStateManager");
 const lodash_1 = require("lodash");
 const availableForSaleOptions = [

package/lib/helpers/OrderHelpers.d.ts

@@ -9,4 +9,8 @@ export default class OrderHelpers {
     getOrderInfoWithRefundsAndFulfillments(order: CompleteOrder): OrderWithRefundsAndFulfillmentsInfoObj;
     getUpdatedOrderObjWithRefunds(orderObj: CompleteOrder, refundObj: OrderRefund): CompleteOrder;
     getUpdatedOrderObjWithFulfillment(orderObj: CompleteOrder, fulfillmentObj: FulfillmentAdmin, totalUnfulfilledItems: number): CompleteOrder;
+    getSubtotalPrice(lineItems: ReRobeOrderLineItem[] | any[], userAvailableCredit?: number | string): number;
+    getCreditDiscount(lineItems: ReRobeOrderLineItem[] | undefined, userAvailableCredit: number | string): number;
+    getSaleDiscount(lineItems?: ReRobeOrderLineItem[]): number;
+    getDiscountAmount(lineItems?: ReRobeOrderLineItem[], userAvailableCredit?: number | string): number;
 }

package/lib/helpers/OrderHelpers.js

@@ -84,6 +84,9 @@ class OrderHelpers {
             },
             shopifyProductId: product.shopifyId || null,
             productId: product.documentId,
+            status: product.status || '',
+            isOnSale: product.isOnSale || '',
+            salePrice: product.salePrice || '',
         };
     }
     toFixedPointPrice(price) {
@@ -193,5 +196,49 @@ class OrderHelpers {
             totalUnfulfilledItems - fulfilledItemsQuantity > 0 ? 'PARTIALLY_FULFILLED' : 'FULFILLED';
         return updatedOrder;
     }
+    getSubtotalPrice(lineItems, userAvailableCredit = 0) {
+        // Get subtotal without saleDiscount (products on sale) and creditDiscount (userAvailableCredit)
+        if (!lineItems || !lineItems.length) {
+            return 0;
+        }
+        const subtotalWithoutSaleDiscount = lineItems.reduce((acc, lineItem) => {
+            var _a;
+            const isSaleItem = lineItem.isOnSale === 'yes' && (lineItem.status === 'CLEARANCE' || lineItem.status === 'RESERVED');
+            const itemPrice = isSaleItem ? lineItem.salePrice : (_a = lineItem.originalTotalPrice) === null || _a === void 0 ? void 0 : _a.amount;
+            return acc + Number(itemPrice);
+        }, 0);
+        let subtotal = subtotalWithoutSaleDiscount;
+        if (userAvailableCredit && Number(userAvailableCredit) > 0) {
+            subtotal = subtotalWithoutSaleDiscount - Number(userAvailableCredit);
+        }
+        if (subtotal < 0) {
+            subtotal = 0;
+        }
+        return Number(Number(subtotal).toFixed(2));
+    }
+    getCreditDiscount(lineItems = [], userAvailableCredit) {
+        if (!userAvailableCredit || Number(userAvailableCredit) <= 0) {
+            return 0;
+        }
+        const subtotal = this.getSubtotalPrice(lineItems);
+        return subtotal > userAvailableCredit ? Number(userAvailableCredit) : subtotal;
+    }
+    getSaleDiscount(lineItems = []) {
+        return lineItems.reduce((acc, cur) => {
+            var _a;
+            const isSaleItem = cur.isOnSale === 'yes' && (cur.status === 'CLEARANCE' || cur.status === 'RESERVED');
+            let prodDiscount = 0;
+            if (isSaleItem) {
+                prodDiscount = Number((Number((_a = cur.originalTotalPrice) === null || _a === void 0 ? void 0 : _a.amount) - Number(cur.salePrice)).toFixed(2));
+            }
+            return acc + prodDiscount;
+        }, 0);
+    }
+    getDiscountAmount(lineItems = [], userAvailableCredit = 0) {
+        const creditDiscount = this.getCreditDiscount(lineItems, userAvailableCredit);
+        const saleDiscount = this.getSaleDiscount(lineItems);
+        const discount = Number(Number(creditDiscount + saleDiscount).toFixed(2));
+        return discount;
+    }
 }
 exports.default = OrderHelpers;

package/lib/helpers/ReRobeProductHelpers.js

@@ -6,19 +6,19 @@ const options_1 = require("../form-states/Product/options");
 const ProductStateManager_1 = require("../models/ProductStateManager");
 class ReRobeProductHelpers {
     static calculateProductionFee(commission) {
-        if (commission >= 0.5 || commission === 0.2 || commission === 0.15 || commission === 0) {
-            return 0;
-        }
         if (commission === 0.16) {
             return 19;
         }
-        return 40;
+        if (commission === 0.35) {
+            return 40;
+        }
+        return 0;
     }
     static calculateFulfillmentFee(commission) {
-        if (commission >= 0.5 || commission === 0.2 || commission === 0.15 || commission === 0 || commission === 0.16) {
-            return 0;
+        if (commission === 0.35) {
+            return 24;
         }
-        return 24;
+        return 0;
     }
     static buildReRobeEarnings(arrayLike) {
         const products = Array.isArray(arrayLike) ? arrayLike : [arrayLike];
@@ -226,7 +226,7 @@ class ReRobeProductHelpers {
     static createTimestampsForStates(productObj) {
         const docFieldsToUpdate = {};
         if (productObj) {
-            const { status, sellRequestReviewDraftTimestamp, sellRequestReviewTimestamp, rejectedTimestamp, holdTimestamp, acceptedTimestamp, sellerToDropOffTimestamp, sellerToShipTimestamp, sellerToGetPickUpTimestamp, qualityControlTimestamp, pendingPublicationTimestamp, listedTimestamp, clearanceTimestamp, reservedTimestamp, soldTimestamp, soldSellerToBePaidTimestamp, soldSellerPaidTimestamp, returnedTimestamp, sellerSelfRejectTimestamp, liquidationRequestedTimestamp, sellerLiquidatedTimestamp, archivedTimestamp, } = productObj;
+            const { status, sellRequestReviewDraftTimestamp, sellRequestReviewTimestamp, rejectedTimestamp, holdTimestamp, acceptedTimestamp, sellerToDropOffTimestamp, sellerToShipTimestamp, sellerToGetPickUpTimestamp, qualityControlTimestamp, pendingPublicationTimestamp, listedTimestamp, clearanceTimestamp, reservedTimestamp, soldTimestamp, soldSellerToBePaidTimestamp, soldSellerPaidTimestamp, returnedTimestamp, sellerSelfRejectTimestamp, liquidationRequestedTimestamp, sellerLiquidatedTimestamp, archivedTimestamp, liquidationReadyTimestamp, } = productObj;
             if (status === ProductStateManager_1.default.PRODUCT_STATES.sellRequestReviewDraft && !sellRequestReviewDraftTimestamp) {
                 docFieldsToUpdate.sellRequestReviewDraftTimestamp = new Date().getTime();
             }
@@ -301,6 +301,9 @@ class ReRobeProductHelpers {
             if (status === ProductStateManager_1.default.PRODUCT_STATES.archived && !archivedTimestamp) {
                 docFieldsToUpdate.archivedTimestamp = new Date().getTime();
             }
+            if (status === ProductStateManager_1.default.PRODUCT_STATES.liquidationReady && !liquidationReadyTimestamp) {
+                docFieldsToUpdate.liquidationReadyTimestamp = new Date().getTime();
+            }
         }
         return docFieldsToUpdate;
     }

package/lib/models/Order.d.ts

@@ -82,6 +82,12 @@ export default class Order extends Base {
     customerName: string;
     merchantId: string;
     refunds: OrderRefund[];
+    subtotalPricePresentment: Money;
+    totalDiscountPresentment: Money;
+    totalPricePresentment: Money;
+    totalRefundedPresentment: Money;
+    totalShippingPricePresentment: Money;
+    totalTaxPresentment: Money;
     constructor(props?: any);
     toObj(): ReRobeOrderObj;
 }

package/lib/models/Order.js

@@ -105,6 +105,24 @@ class Order extends Base_1.default {
         this.customerName = (props === null || props === void 0 ? void 0 : props.customerName) || '';
         this.merchantId = (props === null || props === void 0 ? void 0 : props.merchantId) || '';
         this.refunds = (props === null || props === void 0 ? void 0 : props.refunds) || [];
+        this.subtotalPricePresentment = (props === null || props === void 0 ? void 0 : props.subtotalPricePresentment) || {
+            amount: 0,
+        };
+        this.totalDiscountPresentment = (props === null || props === void 0 ? void 0 : props.totalDiscountPresentment) || {
+            amount: 0,
+        };
+        this.totalPricePresentment = (props === null || props === void 0 ? void 0 : props.totalPricePresentment) || {
+            amount: 0,
+        };
+        this.totalRefundedPresentment = (props === null || props === void 0 ? void 0 : props.totalRefundedPresentment) || {
+            amount: 0,
+        };
+        this.totalShippingPricePresentment = (props === null || props === void 0 ? void 0 : props.totalShippingPricePresentment) || {
+            amount: 0,
+        };
+        this.totalTaxPresentment = (props === null || props === void 0 ? void 0 : props.totalTaxPresentment) || {
+            amount: 0,
+        };
     }
     toObj() {
         const orderObj = {
@@ -150,6 +168,12 @@ class Order extends Base_1.default {
             customerName: this.customerName,
             merchantId: this.merchantId,
             refunds: this.refunds,
+            subtotalPricePresentment: this.subtotalPricePresentment,
+            totalDiscountPresentment: this.totalDiscountPresentment,
+            totalPricePresentment: this.totalPricePresentment,
+            totalRefundedPresentment: this.totalRefundedPresentment,
+            totalShippingPricePresentment: this.totalShippingPricePresentment,
+            totalTaxPresentment: this.totalTaxPresentment,
         };
         if (this.paymentType) {
             orderObj.paymentType = this.paymentType;

package/lib/models/Product.js

@@ -114,6 +114,7 @@ class Product extends Base_1.default {
                 : null,
             sellerLiquidatedTimestamp: (props === null || props === void 0 ? void 0 : props.sellerLiquidatedTimestamp) ? Number(props === null || props === void 0 ? void 0 : props.sellerLiquidatedTimestamp) : null,
             archivedTimestamp: (props === null || props === void 0 ? void 0 : props.archivedTimestamp) ? Number(props === null || props === void 0 ? void 0 : props.archivedTimestamp) : null,
+            liquidationReadyTimestamp: (props === null || props === void 0 ? void 0 : props.liquidationReadyTimestamp) ? Number(props === null || props === void 0 ? void 0 : props.liquidationReadyTimestamp) : null,
         };
     }
     toPartialObj() {
@@ -279,6 +280,7 @@ class Product extends Base_1.default {
             liquidationRequestedTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.liquidationRequestedTimestamp),
             sellerLiquidatedTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.sellerLiquidatedTimestamp),
             archivedTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.archivedTimestamp),
+            liquidationReadyTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.liquidationReadyTimestamp),
             selectedForClearance: this.utilities.sanitizeString(this.consignmentAttributes.selectedForClearance),
             availableForSale: !!this.attributes.availableForSale,
             color: this.utilities.sanitizeString(this.filterAttributes.color),

package/lib/models/ProductStateManager.d.ts

@@ -22,6 +22,7 @@ export default class ProductStateManager extends Base {
         soldSellerPaid: string;
         sellerSelfReject: string;
         liquidationRequested: string;
+        liquidationReady: string;
         sellerLiquidated: string;
         loading: string;
         shoppingBag: string;

package/lib/models/ProductStateManager.js

@@ -371,6 +371,7 @@ ProductStateManager.PRODUCT_STATES = {
     soldSellerPaid: 'SOLD_SELLER_PAID',
     sellerSelfReject: 'SELLER_SELF_REJECT',
     liquidationRequested: 'LIQUIDATION_REQUESTED',
+    liquidationReady: 'LIQUIDATION_READY',
     sellerLiquidated: 'SELLER_LIQUIDATED',
     loading: 'LOADING',
     shoppingBag: 'IN_SHOPPING_BAG',

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

@@ -63,6 +63,12 @@ declare type ReRobeOrderObj = {
     refunds?: OrderRefund[];
     createdAt?: string;
     updatedAt?: string;
+    subtotalPricePresentment?: Money;
+    totalDiscountPresentment?: Money;
+    totalPricePresentment?: Money;
+    totalRefundedPresentment?: Money;
+    totalShippingPricePresentment?: Money;
+    totalTaxPresentment?: Money;
 };
 declare type OrderWithRefundsAndFulfillmentsInfoObj = {
     documentId?: string;
@@ -213,6 +219,9 @@ interface ReRobeOrderLineItem extends OrderLineItem {
     canceledQuantity?: number | string;
     fulfilledQuantity?: number | string;
     unfulfilledQuantity?: number | string;
+    status?: ProductSellStatusKeys | string;
+    isOnSale?: string;
+    salePrice?: string;
 }
 declare type OrderLineItemConnection = {
     edges: OrderLineItemEdge[];

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

@@ -95,6 +95,7 @@ declare type ProductTimestampAttributes = {
     liquidationRequestedTimestamp: number | null;
     sellerLiquidatedTimestamp: number | null;
     archivedTimestamp: number | null;
+    liquidationReadyTimestamp: number | null;
 };
 declare type TranslatableAttributes = {
     description: string;
@@ -281,6 +282,7 @@ declare type TypesenseProductObj = {
     liquidationRequestedTimestamp: number;
     sellerLiquidatedTimestamp: number;
     archivedTimestamp: number;
+    liquidationReadyTimestamp: number;
     availableForSale: boolean;
     color: string;
     description: string;

package/package.json

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