rerobe-js-orm 2.5.4 → 2.5.7

package/lib/factories/ChatRoom/ChatRoomFactory.d.ts

@@ -4,5 +4,5 @@ export default abstract class ChatRoomFactory extends Base {
     abstract createChatRoom(user: {
         uid: string;
         displayName: string;
-    }, admins: ChatRoomUserInfo[], welcomeMessage: LastMessageObj, chatRoomType: ChatRoomType): ChatRoom;
+    }, admins: ChatRoomUserInfo[], welcomeMessage: LastMessageObj, chatRoomType: ChatRoomType, merchantId: string): ChatRoom;
 }

package/lib/factories/ChatRoom/ChatRoomFromNewUserSignUp.d.ts

@@ -4,5 +4,5 @@ export default class ChatRoomFromNewUserSignUp extends ChatRoomFactory {
     createChatRoom(user: {
         uid: string;
         displayName: string;
-    }, admins: ChatRoomUserInfo[], welcomeMessageObj: LastMessageObj, chatRoomType: ChatRoomType): ChatRoom;
+    }, admins: ChatRoomUserInfo[], welcomeMessageObj: LastMessageObj, chatRoomType: ChatRoomType, merchantId: string): ChatRoom;
 }

package/lib/factories/ChatRoom/ChatRoomFromNewUserSignUp.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ChatRoomFactory_1 = require("./ChatRoomFactory");
 const ChatRoom_1 = require("../../models/ChatRoom");
 class ChatRoomFromNewUserSignUp extends ChatRoomFactory_1.default {
-    createChatRoom(user, admins, welcomeMessageObj, chatRoomType) {
+    createChatRoom(user, admins, welcomeMessageObj, chatRoomType, merchantId) {
         const chatRoomAttributes = {
             userIdsToBeNotified: [user.uid],
             type: chatRoomType,
@@ -18,6 +18,7 @@ class ChatRoomFromNewUserSignUp extends ChatRoomFactory_1.default {
                     online: false,
                     typing: false,
                 } }),
+            merchantId: merchantId || '',
         };
         return new ChatRoom_1.default(Object.assign({}, chatRoomAttributes));
     }

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/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];

package/lib/models/ChatRoom.d.ts

@@ -1,10 +1,22 @@
 import Base from '../Base';
 export default class ChatRoom extends Base {
+    documentId: string;
     userIdsToBeNotified: string[];
     type: ChatRoomType;
     lastMessage: LastMessageObj;
     userIds: string[];
     userInfo: ChatRoomUserInfoObj;
+    merchantId: string;
     constructor(props?: any);
     toObj(): ChatRoomAttributes;
+    generateSchemaForTypesense(name?: string): {
+        default_sorting_field: string;
+        fields: {
+            facet: boolean;
+            name: string;
+            type: string;
+        }[];
+        name: string;
+    };
+    toObjForTypesense(): TypesenseChatRoomObj;
 }

package/lib/models/ChatRoom.js

@@ -4,20 +4,112 @@ const Base_1 = require("../Base");
 class ChatRoom extends Base_1.default {
     constructor(props) {
         super();
+        this.documentId = (props === null || props === void 0 ? void 0 : props.documentId) || this.utilities.makeRandId(28);
         this.userIdsToBeNotified = (props === null || props === void 0 ? void 0 : props.userIdsToBeNotified) || [];
         this.type = (props === null || props === void 0 ? void 0 : props.type) || 'CUSTOMER_SUPPORT';
         this.lastMessage = (props === null || props === void 0 ? void 0 : props.lastMessage) || {};
         this.userIds = (props === null || props === void 0 ? void 0 : props.userIds) || [];
         this.userInfo = (props === null || props === void 0 ? void 0 : props.userInfo) || {};
+        this.merchantId = (props === null || props === void 0 ? void 0 : props.merchantId) || '';
     }
     toObj() {
         return {
+            documentId: this.documentId,
             userIdsToBeNotified: this.userIdsToBeNotified,
             type: this.type,
             lastMessage: this.lastMessage,
             userIds: this.userIds,
             userInfo: this.userInfo,
+            merchantId: this.merchantId,
         };
     }
+    generateSchemaForTypesense(name = 'prod_chatRooms_20220704') {
+        return {
+            default_sorting_field: 'lastMessage.createdAtTimestamp',
+            fields: [
+                {
+                    facet: false,
+                    name: 'documentId',
+                    type: 'string',
+                },
+                {
+                    facet: true,
+                    name: 'type',
+                    type: 'string',
+                },
+                {
+                    facet: false,
+                    name: 'userIds',
+                    type: 'string[]',
+                },
+                {
+                    facet: false,
+                    name: 'userIdsToBeNotified',
+                    type: 'string[]',
+                },
+                {
+                    facet: false,
+                    name: 'lastMessage.authorId',
+                    type: 'string',
+                },
+                {
+                    facet: true,
+                    name: 'lastMessage.authorName',
+                    type: 'string',
+                },
+                {
+                    facet: false,
+                    name: 'lastMessage.content',
+                    type: 'string',
+                },
+                {
+                    facet: true,
+                    name: 'lastMessage.createdAtTimestamp',
+                    type: 'int64',
+                },
+                {
+                    facet: true,
+                    name: 'adminMemberNames',
+                    type: 'string[]',
+                },
+                {
+                    facet: true,
+                    name: 'userNames',
+                    type: 'string[]',
+                },
+                {
+                    facet: true,
+                    name: 'merchantId',
+                    type: 'string',
+                },
+            ],
+            name,
+        };
+    }
+    toObjForTypesense() {
+        const userNames = [];
+        const sanitizedAdminMembersNames = Object.keys(this.userInfo).reduce((result, key) => {
+            const currentUserInfo = this.userInfo[key];
+            userNames.push(this.utilities.sanitizeString(currentUserInfo.displayName));
+            if (currentUserInfo.isChatAdmin) {
+                result.push(this.utilities.sanitizeString(currentUserInfo.displayName));
+            }
+            return result;
+        }, []);
+        const stagedObj = {
+            documentId: this.utilities.sanitizeString(this.documentId),
+            type: this.utilities.sanitizeString(this.type),
+            userIds: this.utilities.sanitzeStringArr(this.userIds),
+            userIdsToBeNotified: this.utilities.sanitzeStringArr(this.userIdsToBeNotified),
+            'lastMessage.authorId': this.utilities.sanitizeString(this.lastMessage.authorId),
+            'lastMessage.authorName': this.utilities.sanitizeString(this.lastMessage.authorName),
+            'lastMessage.content': this.utilities.sanitizeString(this.lastMessage.content),
+            'lastMessage.createdAtTimestamp': this.utilities.sanitizeMillisTimeStamp(this.lastMessage.createdAt),
+            adminMemberNames: sanitizedAdminMembersNames,
+            userNames,
+            merchantId: this.utilities.sanitizeString(this.merchantId),
+        };
+        return stagedObj;
+    }
 }
 exports.default = ChatRoom;

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/types/rerobe-chatroom-types.d.ts

@@ -1,9 +1,11 @@
 declare type ChatRoomAttributes = {
+    documentId: string;
     userIdsToBeNotified: string[];
     type: ChatRoomType;
     lastMessage: LastMessageObj;
     userIds: string[];
     userInfo: ChatRoomUserInfoObj;
+    merchantId: string;
 };
 declare type ChatRoomType = 'CUSTOMER_SUPPORT' | 'SELLER_CONCIERGE';
 declare type LastMessageObj = {
@@ -23,5 +25,19 @@ declare type ChatRoomUserInfo = {
     typing: boolean;
     isChatAdmin?: boolean;
     isReRobeStaff?: boolean;
+    isSeller?: boolean;
     firstName?: string;
 };
+declare type TypesenseChatRoomObj = {
+    documentId: string;
+    type: string;
+    userIds: string[];
+    userIdsToBeNotified: string[];
+    'lastMessage.authorId': string;
+    'lastMessage.authorName': string;
+    'lastMessage.content': string;
+    'lastMessage.createdAtTimestamp': number;
+    adminMemberNames: string[];
+    userNames: string[];
+    merchantId: string;
+};

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/package.json

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