rerobe-js-orm 4.2.4 → 4.2.6

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

@@ -73,20 +73,20 @@ const measurementCategoryOptions = [
         value: 'Accessories',
         measurementFields: ['width', 'height', 'depth'],
     },
-    {
-        label: 'Bottoms (Jeans, Pants, Shorts, Skirts, etc.)',
-        value: 'Bottoms (Jeans, Pants, Shorts, Skirts, etc.)',
-        measurementFields: ['waistCircumference', 'innerLeg', 'outerLeg', 'footCircumference'],
-    },
     {
         label: 'Bags',
         value: 'Bags',
         measurementFields: ['length', 'height', 'width', 'handDrop', 'shoulderDrop'],
     },
     {
-        label: 'Jackets (Blazers, Outerwear, Coats)',
-        value: 'Jackets (Blazers, Outerwear, Coats)',
-        measurementFields: ['chestCircumference', 'waistCircumference', 'length', 'shoulderWidth', 'sleeveLength'],
+        label: 'Bottoms (Pants, Shorts, Skirts, etc.)',
+        value: 'Bottoms (Pants, Shorts, Skirts, etc.)',
+        measurementFields: ['waistCircumference', 'innerLeg', 'outerLeg', 'footCircumference'],
+    },
+    {
+        label: 'Collared Shirts & Tops',
+        value: 'Collared Shirts & Tops',
+        measurementFields: ['neckCircumference', 'collarLength', 'sleeveLength', 'chestCircumference'],
     },
     {
         label: 'Eyewear',
@@ -108,15 +108,37 @@ const measurementCategoryOptions = [
         value: 'Hats',
         measurementFields: ['headCircumference', 'brimWidth', 'crownHeight'],
     },
+    {
+        label: 'Jackets (Blazers, Outerwear, Coats)',
+        value: 'Jackets (Blazers, Outerwear, Coats)',
+        measurementFields: ['chestCircumference', 'waistCircumference', 'length', 'shoulderWidth', 'sleeveLength'],
+    },
+    {
+        label: 'Jeans',
+        value: 'Jeans',
+        measurementFields: ['waistCircumference', 'innerLeg', 'outerLeg', 'footCircumference'],
+    },
     {
         label: 'Jewelry',
         value: 'Jewelry',
         measurementFields: ['length', 'width', 'diameter'],
     },
     {
-        label: 'Collared Shirts & Tops',
-        value: 'Collared Shirts & Tops',
-        measurementFields: ['neckCircumference', 'collarLength', 'sleeveLength', 'chestCircumference'],
+        label: 'Non-collared Shirts & Tops (Sweaters, Knitwear, etc.)',
+        value: 'Non-collared Shirts & Tops (Sweaters, Knitwear, etc.)',
+        measurementFields: ['chestCircumference', 'waistCircumference', 'length', 'shoulderWidth', 'sleeveLength'],
+    },
+    {
+        label: 'One-piece Apparel (Dresses, Jumpsuits, etc.)',
+        value: 'One-piece Apparel (Dresses, Jumpsuits, etc.)',
+        measurementFields: [
+            'bustCircumference',
+            'waistCircumference',
+            'hipCircumference',
+            'length',
+            'shoulderWidth',
+            'sleeveLength',
+        ],
     },
     {
         label: 'Shoes',
@@ -124,8 +146,8 @@ const measurementCategoryOptions = [
         measurementFields: ['footLength', 'footWidth', 'heelHeight', 'shaftHeight', 'calfCircumference'],
     },
     {
-        label: 'Suits',
-        value: 'Suits',
+        label: 'Suits & Sets',
+        value: 'Suits & Sets',
         measurementFields: [
             'chestCircumference',
             'length',
@@ -137,23 +159,6 @@ const measurementCategoryOptions = [
             'footCircumference',
         ],
     },
-    {
-        label: 'Non-collared Shirts & Tops (Sweaters, Knitwear, etc.)',
-        value: 'Non-collared Shirts & Tops (Sweaters, Knitwear, etc.)',
-        measurementFields: ['chestCircumference', 'waistCircumference', 'length', 'shoulderWidth', 'sleeveLength'],
-    },
-    {
-        label: 'One-piece Apparel (Dresses, Jumpsuits, etc.)',
-        value: 'One-piece Apparel (Dresses, Jumpsuits, etc.)',
-        measurementFields: [
-            'bustCircumference',
-            'waistCircumference',
-            'hipCircumference',
-            'length',
-            'shoulderWidth',
-            'sleeveLength',
-        ],
-    },
     {
         label: 'Tops (Blouses, Shirts, Sweaters, etc.)',
         value: 'Tops (Blouses, Shirts, Sweaters, etc.)',

package/lib/helpers/Utilities.js

@@ -80,7 +80,7 @@ class Utilities {
     }
     sanitizeMillisTimeStamp(t) {
         if (t && typeof t === 'number') {
-            return t;
+            return Math.max(t, 0);
         }
         if (t && typeof t === 'string') {
             const result = Date.parse(t);

package/lib/models/Product.d.ts

@@ -60,11 +60,11 @@ export default class Product extends Base {
         label: string;
         value: string;
     }[];
+    sanitizeCommission(): number;
     private materialCompTagsArrayForShopify;
     private materialCompJoinedString;
     private measurementsJoinedString;
     private convertMaterialCompJoinedStrToObj;
     private sanitizeMaterialComp;
-    private sanitizeCommission;
     private validateInventoryLocation;
 }

package/lib/models/Product.js

@@ -316,7 +316,7 @@ class Product extends Base_1.default {
             productCategory: this.utilities.sanitizeString(this.filterAttributes.productCategory),
             productType: this.utilities.sanitizeString(this.filterAttributes.productType),
             productStyle: this.utilities.sanitzeStringArr(this.filterAttributes.productStyle),
-            calculatedCommission: this.utilities.sanitizeNumber(calculatedCommission),
+            calculatedCommission: this.utilities.sanitizeNumber(calculatedCommission, this.sanitizeCommission()),
             reRobeCommission: this.sanitizeCommission(),
             rfidTag: this.utilities.sanitizeString(this.attributes.rfidTag),
             sku: this.utilities.sanitizeString(this.attributes.sku),
@@ -1000,6 +1000,12 @@ class Product extends Base_1.default {
                     value: key,
                 };
             }
+            if (key === 'size') {
+                return {
+                    label: 'Label Size',
+                    value: key,
+                };
+            }
             if (key === 'gender') {
                 return {
                     label: this.utilities.humanize('primarySegment'),
@@ -1017,9 +1023,18 @@ class Product extends Base_1.default {
                 value: key,
             };
         })
-            .filter((obj) => ![...restrictedKeys, ...systemManagedKeys, ...configurableAfterCreationKeys, ...obsoleteKeys].includes(obj.value));
+            .filter((obj) => ![
+            ...restrictedKeys,
+            ...systemManagedKeys,
+            ...configurableAfterCreationKeys,
+            ...obsoleteKeys,
+            ...timestampAttributeKeys,
+        ].includes(obj.value));
         return options;
     }
+    sanitizeCommission() {
+        return parseFloat(ReRobeProductHelpers_1.default.commissionFixer(this.consignmentAttributes.reRobeCommission));
+    }
     materialCompTagsArrayForShopify() {
         return Object.keys(this.filterAttributes.materialComposition).reduce((acc, cur, idx) => {
             acc.push(`${cur} ${Object.values(this.filterAttributes.materialComposition)[idx]}`);
@@ -1087,16 +1102,6 @@ class Product extends Base_1.default {
         }
         return materialComp;
     }
-    sanitizeCommission() {
-        const com = this.consignmentAttributes.reRobeCommission;
-        if (Number.isNaN(parseFloat(String(com)))) {
-            return 0.5;
-        }
-        if (parseFloat(String(com)) <= 1) {
-            return parseFloat(String(com));
-        }
-        return parseFloat(String(com)) / 100;
-    }
     validateInventoryLocation(locationLike) {
         if (locationLike && Array.isArray(locationLike) && locationLike.length > 0) {
             return locationLike

package/package.json

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