rerobe-js-orm 2.7.27 → 2.7.29

package/lib/helpers/ReRobeProductHelpers.d.ts

@@ -1,10 +1,12 @@
 export default class ReRobeProductHelpers {
     static calculateProductionFee(commission: number): number;
     static calculateFulfillmentFee(commission: number): number;
+    static calculateSalePrice(productObj: CompleteProduct): string;
     static isValidCommission(commission: any): boolean;
     static commissionFixer(commisssion: any): string;
+    static isValidSalePrice(productObj: CompleteProduct): boolean;
     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

@@ -20,6 +20,24 @@ class ReRobeProductHelpers {
         }
         return 0;
     }
+    static calculateSalePrice(productObj) {
+        const { discountType, discountValue, price, isOnSale } = productObj;
+        const dt = discountType || 'percentage';
+        const dv = discountValue || '0';
+        if (!price) {
+            return '';
+        }
+        if (!isOnSale || isOnSale === 'no') {
+            return '';
+        }
+        if (dt === 'percentage') {
+            return (Number(price) * (1 - Number(dv))).toFixed(2);
+        }
+        if (dt === 'amount') {
+            return (Number(price) - Number(dv)).toFixed(2);
+        }
+        return '';
+    }
     static isValidCommission(commission) {
         if (typeof commission === 'string' &&
             !!commission &&
@@ -42,6 +60,14 @@ class ReRobeProductHelpers {
         }
         return String(Math.abs(Number(fix)));
     }
+    static isValidSalePrice(productObj) {
+        const { salePrice } = productObj;
+        const calculatedSalePrice = this.calculateSalePrice(productObj);
+        if (salePrice !== calculatedSalePrice) {
+            return false;
+        }
+        return true;
+    }
     static buildReRobeEarnings(arrayLike) {
         const products = Array.isArray(arrayLike) ? arrayLike : [arrayLike];
         return products.reduce((acc, cur) => {
@@ -55,17 +81,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/package.json

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