rerobe-js-orm 3.7.2 → 3.7.4

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

@@ -36,9 +36,9 @@ const statusOptions = Object.values(product_constants_1.PRODUCT_STATES).map((val
 exports.statusOptions = statusOptions;
 const measurementCategoryOptions = [
     {
-        label: 'Suits & Blazers',
-        value: 'Suits & Blazers',
-        measurementFields: ['chestCircumference', 'waistCircumference', 'length', 'shoulderWidth', 'sleeveLength'],
+        label: 'Accessories',
+        value: 'Accessories',
+        measurementFields: ['width', 'height', 'depth'],
     },
     {
         label: 'Bottoms',
@@ -51,20 +51,15 @@ const measurementCategoryOptions = [
         measurementFields: ['length', 'height', 'width', 'handDrop', 'shoulderDrop'],
     },
     {
-        label: 'Shirts',
-        value: 'Shirts',
-        measurementFields: ['neckCircumference', 'collarLength', 'sleeveLength', 'chestCircumference'],
+        label: 'Blazers & Jackets',
+        value: 'Blazers & Jackets',
+        measurementFields: ['chestCircumference', 'waistCircumference', 'length', 'shoulderWidth', 'sleeveLength'],
     },
     {
         label: 'Coats',
         value: 'Coats',
         measurementFields: ['chestCircumference', 'waistCircumference', 'length', 'shoulderWidth', 'sleeveLength'],
     },
-    {
-        label: 'Shoes',
-        value: 'Shoes',
-        measurementFields: ['footLength', 'footWidth', 'heelHeight', 'shaftHeight', 'calfCircumference'],
-    },
     {
         label: 'Dresses',
         value: 'Dresses',
@@ -78,9 +73,14 @@ const measurementCategoryOptions = [
         ],
     },
     {
-        label: 'Hats',
-        value: 'Hats',
-        measurementFields: ['headCircumference', 'brimWidth', 'crownHeight'],
+        label: 'Eyewear',
+        value: 'Eyewear',
+        measurementFields: ['lensWidth', 'bridgeWidth', 'templeLength'],
+    },
+    {
+        label: 'General Items',
+        value: 'General Items',
+        measurementFields: ['width', 'height', 'depth'],
     },
     {
         label: 'Gloves',
@@ -88,19 +88,34 @@ const measurementCategoryOptions = [
         measurementFields: ['handLength', 'handCircumference', 'fingerLength'],
     },
     {
-        label: 'Accessories',
-        value: 'Accessories',
-        measurementFields: ['width', 'height', 'depth'],
+        label: 'Hats',
+        value: 'Hats',
+        measurementFields: ['headCircumference', 'brimWidth', 'crownHeight'],
     },
     {
-        label: 'Eyewear',
-        value: 'Eyewear',
-        measurementFields: ['lensWidth', 'bridgeWidth', 'templeLength'],
+        label: 'Shirts',
+        value: 'Shirts',
+        measurementFields: ['neckCircumference', 'collarLength', 'sleeveLength', 'chestCircumference'],
     },
     {
-        label: 'General Items',
-        value: 'General Items',
-        measurementFields: ['width', 'height', 'depth'],
+        label: 'Shoes',
+        value: 'Shoes',
+        measurementFields: ['footLength', 'footWidth', 'heelHeight', 'shaftHeight', 'calfCircumference'],
+    },
+    {
+        label: 'Suits',
+        value: 'Suits',
+        measurementFields: [
+            'chestCircumference',
+            'waistCircumference',
+            'length',
+            'shoulderWidth',
+            'sleeveLength',
+            'waistCircumference',
+            'innerLeg',
+            'outerLeg',
+            'footCircumference',
+        ],
     },
 ];
 exports.measurementCategoryOptions = measurementCategoryOptions;

package/lib/helpers/OrderHelpers.js

@@ -356,8 +356,10 @@ class OrderHelpers {
             .map((item) => {
             // Determine if the product is on sale and set the price accordingly
             const price = item.product.isOnSale && item.product.clearanceTimestamp ? item.product.salePrice : item.product.price;
-            const basePrice = Number(price || 0) * Number(item.quantity);
-            // Apply tax if the item is taxable
+            let basePrice = Number(price || 0) * Number(item.quantity);
+            if (item.discountedPrice !== undefined) {
+                basePrice = Number(item.discountedPrice); // Discounted price includes quantity
+            }
             if (item.isTaxable && item.taxRate) {
                 const taxAmount = basePrice * Number(item.taxRate); // Calculate the tax based on the base price
                 return basePrice + taxAmount; // Return the total including tax

package/lib/models/Product.js

@@ -1046,7 +1046,16 @@ class Product extends Base_1.default {
     }
     validateInventoryLocation(locationLike) {
         if (locationLike && Array.isArray(locationLike) && locationLike.length > 0) {
-            return locationLike.filter((v) => v && Object.keys(v).every((e) => ['id', 'name', 'availableAmount', 'incomingAmount'].includes(e)));
+            return locationLike
+                .filter((v) => v && v.id && v.name)
+                .map((v) => {
+                return {
+                    id: v.id,
+                    name: v.name,
+                    availableAmount: (v === null || v === void 0 ? void 0 : v.availableAmount) || 0,
+                    incomingAmount: (v === null || v === void 0 ? void 0 : v.incomingAmount) || 0,
+                };
+            });
         }
         return [];
     }

package/package.json

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