rerobe-js-orm 2.7.26 → 2.7.28

package/lib/helpers/ReRobeProductHelpers.d.ts

@@ -4,7 +4,7 @@ export default class ReRobeProductHelpers {
     static isValidCommission(commission: any): boolean;
     static commissionFixer(commisssion: any): string;
     static buildReRobeEarnings(arrayLike: CompleteProduct | CompleteProduct[]): number[];
-    static buildReRobeEarningsV2(arrayLike: CompleteProduct | CompleteProduct[]): number[];
+    static buildReRobeEarningsV2(arrayLike: CompleteProduct | CompleteProduct[], isCanonicalMerchant?: boolean): number[];
     static materialCompJoinedString(materialComposition?: MaterialComposition): string;
     static measurementsJoinedString(measurementsObj?: Measurements): string;
     static sizeCommentPretty(sizeComment: string): string;

package/lib/helpers/ReRobeProductHelpers.js

@@ -55,17 +55,17 @@ class ReRobeProductHelpers {
             return [inventoryValue, listingFeeEarnings, productionFeeEarnings, fulfillmentFeeEarnings];
         }, [0, 0, 0, 0]);
     }
-    static buildReRobeEarningsV2(arrayLike) {
+    static buildReRobeEarningsV2(arrayLike, isCanonicalMerchant) {
         const products = Array.isArray(arrayLike) ? arrayLike : [arrayLike];
         return products.reduce((acc, cur) => {
             const commission = cur.reRobeCommission ? Number(this.commissionFixer(cur.reRobeCommission)) : 0.5;
             const priceToUse = cur.isOnSale === 'yes' && cur.salePrice ? cur.salePrice : cur.price;
             const listingPrice = Number.isNaN(priceToUse) ? 0 : Number(priceToUse);
-            const inventoryValue = acc[0] + listingPrice;
-            const listingFeeEarnings = acc[1] + listingPrice * commission;
-            const productionFeeEarnings = acc[2] + this.calculateProductionFee(commission);
-            const fulfillmentFeeEarnings = acc[3] + this.calculateFulfillmentFee(commission);
-            return [inventoryValue, listingFeeEarnings, productionFeeEarnings, fulfillmentFeeEarnings].map((v) => Number(Number(v).toFixed(2)));
+            const priceSold = acc[0] + listingPrice;
+            const commissionFee = acc[1] + priceSold * commission;
+            const productionFee = acc[2] + (Boolean(isCanonicalMerchant) ? this.calculateProductionFee(commission) : 0);
+            const fulfillmentFee = acc[3] + (Boolean(isCanonicalMerchant) ? this.calculateFulfillmentFee(commission) : 0);
+            return [priceSold, commissionFee, productionFee, fulfillmentFee].map((v) => Number(Number(v).toFixed(2)));
         }, [0, 0, 0, 0]);
     }
     static materialCompJoinedString(materialComposition = {}) {

package/lib/models/SellerLedgerTransaction.d.ts

@@ -18,6 +18,9 @@ export default class SellerLedgerTransaction extends Base {
     productTitle: string;
     productImgUrl: string;
     productCommission: string | number;
+    commissionFee: string | number;
+    productionFee: string | number;
+    fulfillmentFee: string | number;
     constructor(props?: any);
     toObj(): SellerLedgerTransactionType;
     generateSchemaForTypesense(name?: string): {

package/lib/models/SellerLedgerTransaction.js

@@ -22,6 +22,9 @@ class SellerLedgerTransaction extends Base_1.default {
         this.productTitle = (props === null || props === void 0 ? void 0 : props.productTitle) || '';
         this.productImgUrl = (props === null || props === void 0 ? void 0 : props.productImgUrl) || '';
         this.productCommission = Number((props === null || props === void 0 ? void 0 : props.productCommission) || 0);
+        this.commissionFee = Number(props === null || props === void 0 ? void 0 : props.commissionFee) || 0;
+        this.productionFee = Number(props === null || props === void 0 ? void 0 : props.productionFee) || 0;
+        this.fulfillmentFee = Number(props === null || props === void 0 ? void 0 : props.fulfillmentFee) || 0;
     }
     toObj() {
         const transactionObj = {
@@ -43,6 +46,9 @@ class SellerLedgerTransaction extends Base_1.default {
             productTitle: this.productTitle,
             productImgUrl: this.productImgUrl,
             productCommission: this.productCommission,
+            commissionFee: this.commissionFee,
+            productionFee: this.productionFee,
+            fulfillmentFee: this.fulfillmentFee,
         };
         return transactionObj;
     }
@@ -145,6 +151,21 @@ class SellerLedgerTransaction extends Base_1.default {
                     name: 'productCommission',
                     type: 'float',
                 },
+                {
+                    facet: true,
+                    name: 'commissionFee',
+                    type: 'float',
+                },
+                {
+                    facet: true,
+                    name: 'productionFee',
+                    type: 'float',
+                },
+                {
+                    facet: true,
+                    name: 'fulfillmentFee',
+                    type: 'float',
+                },
             ],
             name: 'dev_sellerLedgerTransactions_20221026',
         };
@@ -170,6 +191,9 @@ class SellerLedgerTransaction extends Base_1.default {
             productTitle: this.utilities.sanitizeString(this.productTitle),
             productImgUrl: this.utilities.sanitizeString(this.productImgUrl),
             productCommission: this.utilities.sanitizeNumber(this.productCommission),
+            commissionFee: this.utilities.sanitizeNumber(this.commissionFee),
+            productionFee: this.utilities.sanitizeNumber(this.productionFee),
+            fulfillmentFee: this.utilities.sanitizeNumber(this.fulfillmentFee),
         };
         return stagedObj;
     }

package/lib/types/sellerLedgerTransaction-types.d.ts

@@ -20,6 +20,9 @@ declare type SellerLedgerTransactionType = {
     productTitle?: string;
     productImgUrl?: string;
     productCommission?: string | number;
+    commissionFee?: string | number;
+    productionFee?: string | number;
+    fulfillmentFee?: string | number;
 };
 declare type TypesenseSellerLedgerTransactionObj = {
     id: string;
@@ -41,4 +44,7 @@ declare type TypesenseSellerLedgerTransactionObj = {
     productTitle: string;
     productImgUrl: string;
     productCommission: number;
+    commissionFee: number;
+    productionFee: number;
+    fulfillmentFee: number;
 };

package/package.json

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