rerobe-js-orm 3.0.14 → 3.0.16

package/lib/factories/Product/ProductFromAlgoliaJSONDoc.js

@@ -20,6 +20,8 @@ class ProductFromAlgoliaJSONDoc extends ProductFactory_1.default {
             weight: String(props.grams),
             variantId: '',
             reservedBy: [],
+            weightRange: '',
+            weightUnit: 'GRAMS',
         };
         const productFilterAttributes = this.shopifyHelpers.tagsExtractor(props.named_tags);
         return new Product_1.default(Object.assign(Object.assign({}, productAttributes), productFilterAttributes));

package/lib/factories/Product/ProductFromFormState.js

@@ -20,6 +20,8 @@ class ProductFromFormState extends ProductFactory_1.default {
             vendorId: props.fields.vendorId.selectedValue || ((_h = props.props) === null || _h === void 0 ? void 0 : _h.vendorId) || '',
             vendorName: props.fields.vendorName.selectedValue || '',
             weight: props.fields.weight.inputValue,
+            weightRange: props.fields.weightRange.selectedValue || '',
+            weightUnit: props.fields.weightUnit.selectedValue || '',
             variantId: ((_j = props.props) === null || _j === void 0 ? void 0 : _j.variantId) || '',
             reservedBy: ((_k = props.props) === null || _k === void 0 ? void 0 : _k.reservedBy) || [],
             options: props.fields.options.selectedValue,

package/lib/factories/Product/ProductFromShopifyJSClientJSONDoc.js

@@ -20,6 +20,8 @@ class ProductFromShopifyJSClientJSONDoc extends ProductFactory_1.default {
             vendorId: props.vendor,
             variantId: this.getVariantId(props.variants),
             reservedBy: [],
+            weightRange: '',
+            weightUnit: 'GRAMS',
         };
         const productFilterAttributes = this.shopifyHelpers.tagsExtractor(props.tags);
         return new Product_1.default(Object.assign(Object.assign({}, productAttributes), productFilterAttributes));

package/lib/factories/Product/ProductFromShopifyWebhookJSONDoc.js

@@ -20,6 +20,8 @@ class ProductFromShopifyWebhookJSONDoc extends ProductFactory_1.default {
             vendorId: props.vendor,
             variantId: this.getVariantId(props.variants),
             reservedBy: [],
+            weightRange: '',
+            weightUnit: 'GRAMS',
         };
         const productFilterAttributes = this.shopifyHelpers.tagsExtractor(props.tags.split(', '));
         return new Product_1.default(Object.assign(Object.assign({}, productAttributes), productFilterAttributes));

package/lib/form-states/Product/ProductFormState.d.ts

@@ -34,6 +34,10 @@ export default class ProductFormState extends FormState {
     private priceInputChangeHandler;
     private setGenderFromPassedOptions;
     private genderSelectHandler;
+    private geWeightArray;
+    private findWeightRange;
+    private weightRangeSelectHandler;
+    private weightInputChangeHandler;
     private conditionSelectHandler;
     private productCategorySelectHandler;
     private productTypeSelectHandler;

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

@@ -15,6 +15,8 @@ class ProductFormState extends FormState_1.default {
         this.fields.title = this.fieldFactory('textInput', 'title');
         this.fields.price = this.fieldFactory('textInput', 'price');
         this.fields.weight = this.fieldFactory('textInput', 'weight');
+        this.fields.weightRange = this.fieldFactory('singleSelect', 'weightRange', options_1.productWeightRanges);
+        this.fields.weightUnit = this.fieldFactory('singleSelect', 'weightUnit', options_1.weightUnits);
         this.fields.officialFilesToUpload = {
             selectedValues: [],
             valid: false,
@@ -144,6 +146,41 @@ class ProductFormState extends FormState_1.default {
         this.fields.size.valid = false;
         this.fields.size.selectedValue = '';
     }
+    geWeightArray(range) {
+        if (!range)
+            return ['', ''];
+        if (range.endsWith('+')) {
+            return ['0', range.replace('+', '').trim()];
+        }
+        const [min, max] = range.split('-');
+        return [min.trim(), max.trim()];
+    }
+    findWeightRange(weightRanges, weight) {
+        for (const rangeStr of weightRanges) {
+            const [min, max] = this.geWeightArray(rangeStr);
+            if (weight >= parseFloat(min) && weight <= parseFloat(max)) {
+                return rangeStr;
+            }
+        }
+        return weightRanges[weightRanges.length - 1];
+    }
+    weightRangeSelectHandler(value) {
+        const [_, max] = this.geWeightArray(value);
+        // Mutate weightRange selectedValue and valid prop
+        this.fields.weightRange.selectedValue = value;
+        this.fields.weightRange.valid = !!value;
+        // Reset weight fields except options
+        this.fields.weight.hidden = false;
+        this.fields.weight.valid = !!max;
+        this.fields.weight.inputValue = max;
+    }
+    weightInputChangeHandler(value) {
+        const weightRanges = this.fields.weightRange.options.map((i) => i.value);
+        const matchRange = this.findWeightRange(weightRanges, parseFloat(value));
+        this.fields.weightRange.selectedValue = matchRange;
+        this.fields.weightRange.valid = !!matchRange;
+        this.fields.weight.inputValue = value;
+    }
     conditionSelectHandler(value) {
         // Mutate condition selectedValue and valid prop
         this.fields.condition.selectedValue = value;
@@ -557,6 +594,16 @@ class ProductFormState extends FormState_1.default {
                     options = this.utilities.uniqObjArray([...selectedColorOptions, ...colorsOptions], 'value');
                 }
             }
+            if (fieldKey === 'weightRange') {
+                onChangeHandler = (val) => this.weightRangeSelectHandler(val);
+                let selectedOptions = [];
+                if (this.props.weightRange) {
+                    selectedOptions = [{ label: this.props.weightRange, value: this.props.weightRange }];
+                    if (!options.map((o) => o.value).includes(this.props.weightRange)) {
+                        options.splice(0, 0, ...selectedOptions);
+                    }
+                }
+            }
             if (fieldKey === 'primaryAgeCategory') {
                 let selectedPrimaryAgeCategoryOptions = [];
                 if (this.props.primaryAgeCategory) {
@@ -573,13 +620,20 @@ class ProductFormState extends FormState_1.default {
                 }
             }
             if (fieldKey === 'condition') {
+                let selectedOptions = [];
+                if (this.props.condition) {
+                    selectedOptions = [{ label: this.props.condition, value: this.props.condition, description: '' }];
+                    if (!options.map((o) => o.value).includes(this.props.condition)) {
+                        options.splice(0, 0, ...selectedOptions);
+                    }
+                }
                 if ((_p = (_o = this.opts) === null || _o === void 0 ? void 0 : _o.conditions) === null || _p === void 0 ? void 0 : _p.length) {
                     const conditionsOptions = this.opts.conditions.map((t) => ({
                         label: t.label || '',
                         value: t.value || '',
                         description: t.description || '',
                     }));
-                    options = this.utilities.uniqObjArray(conditionsOptions, 'value');
+                    options = this.utilities.uniqObjArray([...selectedOptions, ...conditionsOptions], 'value');
                 }
                 onChangeHandler = (val) => this.conditionSelectHandler(val);
             }
@@ -682,6 +736,9 @@ class ProductFormState extends FormState_1.default {
                 valid = true;
                 onChangeHandler = (val) => this.discountValueChangeHandler(val);
             }
+            if (fieldKey === 'weight') {
+                onChangeHandler = (val) => this.weightInputChangeHandler(val);
+            }
             return {
                 inputValue,
                 valid,

package/lib/form-states/Product/options.d.ts

@@ -111,6 +111,14 @@ export const unisexShoes: {
     value: string;
     styles: string[];
 }[];
+export const productWeightRanges: {
+    label: string;
+    value: string;
+}[];
+export const weightUnits: {
+    label: string;
+    value: string;
+}[];
 export const bags: {
     label: string;
     value: string;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.minorDefectOptions = exports.majorDefectOptions = 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.manClothingSizeOptions = exports.womanClothingSizeOptions = exports.clothingSizeOptions = exports.sizeOptions = exports.statusOptions = exports.publishTypeOptions = exports.availableForSaleOptions = void 0;
+exports.minorDefectOptions = exports.majorDefectOptions = 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.weightUnits = exports.productWeightRanges = 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.manClothingSizeOptions = exports.womanClothingSizeOptions = exports.clothingSizeOptions = exports.sizeOptions = exports.statusOptions = exports.publishTypeOptions = exports.availableForSaleOptions = void 0;
 const product_constants_1 = require("../../constants/product-constants");
 const lodash_1 = require("lodash");
 const availableForSaleOptions = [
@@ -1818,6 +1818,25 @@ const shoeSizes = [
     { label: '45.3', value: '45.3' },
 ];
 exports.shoeSizes = shoeSizes;
+const productWeightRanges = [
+    '0.01 - 0.1',
+    '0.01 - 0.2',
+    '0.01 - 0.5',
+    '0.2 - 1.0',
+    '0.5 - 1.0',
+    '1.0 - 2.0',
+    '2.0 - 5.0',
+    '5.0 - 10.0',
+    '10.0 - 20.0',
+    '20.0 - 50.0',
+    '50.0 - 100.0',
+    '100.0 - 200.0',
+    '100.0+',
+    '200.0+',
+].map((i) => ({ label: i, value: i }));
+exports.productWeightRanges = productWeightRanges;
+const weightUnits = ['GRAMS', 'KILOGRAMS', 'OUNCES', 'POUNDS'].map((i) => ({ label: i, value: i }));
+exports.weightUnits = weightUnits;
 const clothingMaterials = [
     {
         label: 'Acetate',

package/lib/helpers/OrderHelpers.js

@@ -25,7 +25,7 @@ class OrderHelpers {
             if (shippingLines[0].title === 'Localy delivery') {
                 return Order_1.default.SHIPPING_TYPES.localDelivery;
             }
-            return shippingLines[0].price_set.shop_money.amount > 0
+            return Number(shippingLines[0].price_set.shop_money.amount) > 0
                 ? Order_1.default.SHIPPING_TYPES.localDelivery
                 : Order_1.default.SHIPPING_TYPES.localPickUp;
         }
@@ -221,7 +221,7 @@ class OrderHelpers {
             return 0;
         }
         const subtotal = this.getSubtotalPrice(lineItems);
-        return subtotal > userAvailableCredit ? Number(userAvailableCredit) : subtotal;
+        return subtotal > Number(userAvailableCredit) ? Number(userAvailableCredit) : subtotal;
     }
     getSaleDiscount(lineItems = []) {
         return lineItems.reduce((acc, cur) => {

package/lib/models/Product.js

@@ -19,6 +19,8 @@ class Product extends Base_1.default {
             updatedAt: (props === null || props === void 0 ? void 0 : props.updatedAt) || '',
             publishedAt: (props === null || props === void 0 ? void 0 : props.publishedAt) || '',
             weight: (props === null || props === void 0 ? void 0 : props.weight) || '999',
+            weightRange: (props === null || props === void 0 ? void 0 : props.weightRange) || '',
+            weightUnit: (props === null || props === void 0 ? void 0 : props.weightUnit) || 'GRAMS',
             vendorId: (props === null || props === void 0 ? void 0 : props.vendorId) || '',
             vendorName: (props === null || props === void 0 ? void 0 : props.vendorName) || '',
             variantId: (props === null || props === void 0 ? void 0 : props.variantId) || '',
@@ -292,6 +294,8 @@ class Product extends Base_1.default {
             title: this.utilities.sanitizeString(this.attributes.title),
             vendorName: this.utilities.sanitizeString(this.attributes.vendorName),
             vendorId: this.utilities.sanitizeString(this.attributes.vendorId),
+            weightRange: this.utilities.sanitizeString(this.attributes.weightRange),
+            weightUnit: this.utilities.sanitizeString(this.attributes.weightUnit),
             createdAtTimestamp,
             createdAtHour,
             createdAtDay,
@@ -769,6 +773,18 @@ class Product extends Base_1.default {
                     type: 'string',
                     optional: true,
                 },
+                {
+                    facet: true,
+                    name: 'weightRange',
+                    type: 'string',
+                    optional: true,
+                },
+                {
+                    facet: true,
+                    name: 'weightUnit',
+                    type: 'string',
+                    optional: true,
+                },
             ],
             name,
         };

package/lib/types/rerobe-product-types.d.ts

@@ -11,6 +11,8 @@ declare type ProductAttributes = {
     updatedAt: string;
     publishedAt: string;
     weight: string;
+    weightRange: string;
+    weightUnit: WeightUnit;
     vendorId: string;
     vendorName?: string;
     variantId: string;
@@ -141,6 +143,8 @@ declare type ProductAttributesFormFields = {
     title: TextInputFormField<string>;
     price: TextInputFormField<string>;
     weight: TextInputFormField<string>;
+    weightRange: SingleSelectFormField<string>;
+    weightUnit: SingleSelectFormField<WeightUnit>;
     officialFilesToUpload: MultiMediaSelectFormField;
     options: SingleSelectFormField<ProductOptions>;
     costPerItem: TextInputFormField<string>;
@@ -214,6 +218,7 @@ declare type Measurements = {
     unit?: string;
     [key: string]: any;
 };
+declare type WeightUnit = 'GRAMS' | 'KILOGRAMS' | 'OUNCES' | 'POUNDS';
 declare type ProductLineItem = {
     title: string;
     variant: {
@@ -303,5 +308,7 @@ declare type TypesenseProductObj = {
     createdAtMonth: string;
     createdAtHour: string;
     createdAtYear: string;
+    weightRange: string;
+    weightUnit: string;
     [key: string]: any;
 };

package/package.json

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