rerobe-js-orm 3.0.26 → 3.0.28

package/lib/factories/Order/OrderToShipmondo.js

@@ -0,0 +1,53 @@
+"use strict";
+// import OrderFactory from './OrderFactory';
+// import Order from '../../models/Order';
+// import OrderHelpers from '../../helpers/OrderHelpers';
+// const orderHelpers: OrderHelpers = new OrderHelpers();
+// export default class OrderToShipmondo extends OrderFactory {
+//   createOrder(order: ReRobeOrderObj): any {
+//     const { amount, currencyCode } = {
+//       amount: order.originalTotalPrice?.amount ?? 0,
+//       currencyCode: order.originalTotalPrice?.currencyCode ?? '',
+//     };
+//     const taxAmount = order.totalTax?.amount ?? 0;
+//     const shipmondoOrder = {
+//       order_id: order.orderNumber,
+//       ship_to: {
+//         name: '',
+//         address1: order.shippingAddress?.address1,
+//         zipcode: order.shippingAddress?.zip,
+//         city: order.shippingAddress?.zip,
+//         country_code: order.shippingAddress?.countryCode,
+//       },
+//       //   bill_to: {
+//       //     name,
+//       //     address1: shipping_address,
+//       //     zipcode: '',
+//       //     city: '',
+//       //     country_code: '',
+//       //   },
+//       sender: {
+//         // name,
+//         // address1: shipping_address,
+//         // zipcode: '',
+//         // city: '',
+//         // country_code: '',
+//       },
+//       payment_details: {
+//         amount_including_vat: +amount + +taxAmount,
+//         currency_code: currencyCode,
+//         vat_amount: taxAmount,
+//       },
+//       order_lines: order.lineItems.map((item: ReRobeOrderLineItem) => ({
+//         line_type: 'item',
+//         item_name: item.title,
+//         quantity: item.quantity,
+//         unit_price_excluding_vat: item.presentmentUnitPrice?.amount,
+//         discount_amount_excluding_vat: item.discountedTotalPrice?.amount,
+//         currency_code: item.presentmentUnitPrice?.currencyCode || item.discountedTotalPrice?.currencyCode,
+//         image_url: item.image?.originalSrc,
+//       })),
+//     };
+//     return shipmondoOrder;
+//   }
+// }

package/lib/form-states/Order/OrderFormState.d.ts

@@ -18,5 +18,6 @@ export default class OrderFormState extends FormState {
     }): void;
     discountChangeHandler(val: string): void;
     shippingPriceChangeHandler(val: string): void;
+    private orderStateChangeHandler;
     private fieldFactory;
 }

package/lib/form-states/Order/OrderFormState.js

@@ -47,6 +47,7 @@ class OrderFormState extends FormState_1.default {
         this.fields.shippingInfo = this.fieldFactory('singleSelect', 'shippingInfo');
         this.fields.pickupLocation = this.fieldFactory('singleSelect', 'pickupLocation');
         this.fields.presentmentData = this.fieldFactory('singleSelect', 'presentmentData');
+        this.fields.state = this.fieldFactory('singleSelect', 'state');
     }
     createOrder() {
         const orderFactory = new OrderFromFormState_1.default();
@@ -97,6 +98,15 @@ class OrderFormState extends FormState_1.default {
         // Update total price
         this.fields.totalPrice.inputValue = Number(Number(this.fields.subtotalPrice.inputValue) - Number(this.fields.totalDiscount.inputValue) + Number(val)).toFixed(2);
     }
+    orderStateChangeHandler(val) {
+        const values = Object.values(order_constants_1.ORDER_STATES);
+        if (!values.includes(val)) {
+            this.fields.state.selectedValue = order_constants_1.ORDER_STATES.draft;
+        }
+        else {
+            this.fields.state.selectedValue = val;
+        }
+    }
     fieldFactory(fieldType, fieldKey, fieldOptions) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
         let options = fieldOptions || [];
@@ -145,6 +155,7 @@ class OrderFormState extends FormState_1.default {
         }
         if (fieldType === 'singleSelect') {
             let selectedValue = this.props[fieldKey] || '';
+            let onChangeHandler = (val) => this.singleSelectChangeHandler(fieldKey, val);
             if (fieldKey === 'pickupLocation') {
                 if (((_c = this.props) === null || _c === void 0 ? void 0 : _c.shippingType) === order_constants_1.SHIPPING_TYPES.localPickUp &&
                     ((_d = this.props) === null || _d === void 0 ? void 0 : _d.fulfillmentLocations) &&
@@ -188,8 +199,15 @@ class OrderFormState extends FormState_1.default {
                     displayName: this.props.customerName,
                 };
             }
+            if (fieldKey === 'state') {
+                const values = Object.values(order_constants_1.ORDER_STATES);
+                if (!values.includes(selectedValue)) {
+                    selectedValue = order_constants_1.ORDER_STATES.draft;
+                }
+                options = values.map((i) => ({ label: i, value: i }));
+                onChangeHandler = (val) => this.orderStateChangeHandler(val);
+            }
             const valid = !!this.props[fieldKey];
-            const onChangeHandler = (val) => this.singleSelectChangeHandler(fieldKey, val);
             if (fieldKey === 'shippingType') {
                 if ((_0 = (_z = this.opts) === null || _z === void 0 ? void 0 : _z.shippingTypeOptions) === null || _0 === void 0 ? void 0 : _0.length) {
                     options = this.utilities.uniqObjArray(this.opts.shippingTypeOptions, 'value');

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

@@ -42,7 +42,7 @@ export default class ProductFormState extends FormState {
     private productTypeSelectHandler;
     private setPriceRangeFromPrice;
     private setGenderFromPassedOptions;
-    private setProductCategoreisFromGender;
+    private setProductCategoriesFromGender;
     private setProductTypesFromCategory;
     private setProductTypesFromPassedOptions;
     private setProductStylesFromCategoryAndType;

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

@@ -35,7 +35,7 @@ class ProductFormState extends FormState_1.default {
         this.fields.condition = this.fieldFactory('singleSelect', 'condition', options_1.conditions);
         this.fields.majorDefects = this.fieldFactory('multiSelect', 'majorDefects', options_1.majorDefectOptions);
         this.fields.minorDefects = this.fieldFactory('multiSelect', 'minorDefects', options_1.minorDefectOptions);
-        this.fields.gender = this.fieldFactory('singleSelect', 'gender', options_1.gender);
+        this.fields.gender = this.fieldFactory('singleSelect', 'gender', options_1.genderOptions);
         this.fields.materialComposition = this.fieldFactory('singleSelect', 'materialComposition', options_1.clothingMaterials);
         this.fields.priceRange = this.fieldFactory('textInput', 'priceRange');
         this.fields.productCategory = this.fieldFactory('singleSelect', 'productCategory', options_1.productCategories);
@@ -105,7 +105,7 @@ class ProductFormState extends FormState_1.default {
         this.fields.gender.selectedValue = value;
         this.fields.gender.valid = !!value;
         // Reset productCategory fields except options
-        this.fields.productCategory.options = this.setProductCategoreisFromGender(value);
+        this.fields.productCategory.options = this.setProductCategoriesFromGender(value);
         this.fields.productCategory.hidden = true;
         this.fields.productCategory.valid = false;
         this.fields.productCategory.selectedValue = '';
@@ -256,25 +256,35 @@ class ProductFormState extends FormState_1.default {
         return '1000+';
     }
     setGenderFromPassedOptions() {
+        let options = options_1.genderOptions;
+        let selectedGenderOptions = [];
+        if (this.props.gender) {
+            selectedGenderOptions = [{ label: this.props.gender, value: this.props.gender }];
+            if (!options.map((o) => o.value).includes(this.props.gender)) {
+                options.splice(0, 0, ...selectedGenderOptions);
+            }
+        }
         if (this.opts && this.opts.taxonomy && Object.keys(this.opts.taxonomy).length > 0) {
-            return Object.keys(this.opts.taxonomy).map((t) => ({ label: t, value: t }));
+            const passedOptions = Object.keys(this.opts.taxonomy).map((t) => ({ label: t, value: t }));
+            options = this.utilities.uniqObjArray([...selectedGenderOptions, ...passedOptions], 'value');
         }
-        return options_1.gender;
+        return options;
     }
-    setProductCategoreisFromGender(genderSelected) {
-        let productCategoryOptions = [];
+    setProductCategoriesFromGender(genderSelected) {
+        let options = options_1.productCategories;
+        let selectedProductCategoryOptions = [];
+        if (this.props.productCategory) {
+            selectedProductCategoryOptions = [{ label: this.props.productCategory, value: this.props.productCategory }];
+            if (!options.map((o) => o.value).includes(this.props.productCategory)) {
+                options.splice(0, 0, ...selectedProductCategoryOptions);
+            }
+        }
         if (this.opts && this.opts.taxonomy && Object.keys(this.opts.taxonomy).length > 0 && genderSelected) {
             const t = this.opts.taxonomy;
             const { [genderSelected]: genderObj = {} } = t;
-            productCategoryOptions = Object.keys(genderObj).map((k) => ({ label: k, value: k }));
-        }
-        else {
-            productCategoryOptions = options_1.productCategories;
+            const passedOptions = Object.keys(genderObj).map((k) => ({ label: k, value: k }));
+            options = this.utilities.uniqObjArray([...selectedProductCategoryOptions, ...passedOptions], 'value');
         }
-        const selectedCategoryOptions = this.props.productCategory
-            ? [{ label: this.props.productCategory, value: this.props.productCategory }]
-            : [];
-        const options = this.utilities.uniqObjArray([...productCategoryOptions, ...selectedCategoryOptions], 'value');
         return options;
     }
     setProductTypesFromCategory(productCategory, genderSelected) {
@@ -324,6 +334,7 @@ class ProductFormState extends FormState_1.default {
         }
     }
     setProductTypesFromPassedOptions(productCategory, genderSelected) {
+        let options = this.setProductTypesFromCategory(productCategory, genderSelected);
         if (productCategory &&
             genderSelected &&
             this.opts &&
@@ -331,9 +342,16 @@ class ProductFormState extends FormState_1.default {
             Object.keys(this.opts.taxonomy).length > 0) {
             const t = this.opts.taxonomy;
             const { [genderSelected]: { [productCategory]: productTypeArr = [] } = {} } = t;
-            return productTypeArr;
+            options = productTypeArr;
+        }
+        let selectedProductTypeOptions = [];
+        if (this.props.productType) {
+            selectedProductTypeOptions = [{ label: this.props.productType, value: this.props.productType, styles: [] }];
+            if (!options.map((o) => o.value).includes(this.props.productType)) {
+                options.splice(0, 0, ...selectedProductTypeOptions);
+            }
         }
-        return this.setProductTypesFromCategory(productCategory, genderSelected);
+        return options;
     }
     setProductStylesFromCategoryAndType(productCategory, productType) {
         switch (productCategory) {
@@ -397,6 +415,7 @@ class ProductFormState extends FormState_1.default {
         }
     }
     setProductStylesFromPassedOptions(productCategory, productType) {
+        let options = this.setProductStylesFromCategoryAndType(productCategory, productType);
         if (this.opts &&
             this.opts.taxonomy &&
             Object.keys(this.opts.taxonomy).length > 0 &&
@@ -407,11 +426,16 @@ class ProductFormState extends FormState_1.default {
             const { [genderSelected]: { [productCategory]: productTypeArr = [] } = {} } = t;
             const [pType] = productTypeArr.filter((p) => p.value === productType);
             if (pType) {
-                return pType.styles.map((s) => ({ label: s, value: s }));
+                options = pType.styles.map((s) => ({ label: s, value: s }));
             }
-            return [];
         }
-        return this.setProductStylesFromCategoryAndType(productCategory, productType);
+        if (this.props.productStyle && Array.isArray(this.props.productStyle) && this.props.productStyle.length > 0) {
+            options = [...new Set([...this.props.productStyle, ...options.map((o) => o.value)])].map((s) => ({
+                label: s,
+                value: s,
+            }));
+        }
+        return options;
     }
     discountTypeChangeHandler(val) {
         const prevVal = this.fields.discountType.selectedValue;
@@ -521,7 +545,7 @@ class ProductFormState extends FormState_1.default {
                 onChangeHandler = (val) => this.genderSelectHandler(val);
             }
             if (fieldKey === 'productCategory') {
-                options = this.setProductCategoreisFromGender(this.props.gender);
+                options = this.setProductCategoriesFromGender(this.props.gender);
                 onChangeHandler = (val) => this.productCategorySelectHandler(val);
             }
             if (fieldKey === 'productType') {

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

@@ -59,7 +59,7 @@ export const conditions: ({
     key: string;
     color?: undefined;
 })[];
-export const gender: {
+export const genderOptions: {
     label: string;
     value: string;
 }[];
@@ -79,7 +79,6 @@ export const clothingMaterials: {
 export const productCategories: {
     label: string;
     value: string;
-    color: string;
 }[];
 export const clothing: {
     label: string;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.measurementCategoryOptions = 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;
+exports.measurementCategoryOptions = 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.genderOptions = 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 = [
@@ -1816,7 +1816,7 @@ const minorDefectOptions = [
     { label: 'Other minor Issue', value: 'Other minor issue' },
 ];
 exports.minorDefectOptions = minorDefectOptions;
-const gender = [
+const genderOptions = [
     {
         label: 'Woman',
         value: 'Woman',
@@ -1842,7 +1842,7 @@ const gender = [
         value: 'NA',
     },
 ];
-exports.gender = gender;
+exports.genderOptions = genderOptions;
 const jeanSizes = [
     { label: '24', value: '24' },
     { label: '25', value: '25' },
@@ -2089,27 +2089,22 @@ const productCategories = [
     {
         label: 'Clothing',
         value: 'Clothing',
-        color: '#cfdfff',
     },
     {
         label: 'Shoes',
         value: 'Shoes',
-        color: '#d0f0fd',
     },
     {
         label: 'Bags',
         value: 'Bags',
-        color: '#d0f0fd',
     },
     {
         label: 'Accessories',
         value: 'Accessories',
-        color: '#d0f0fd',
     },
     {
         label: 'Jewelry',
         value: 'Jewelry',
-        color: '#d0f0fd',
     },
 ];
 exports.productCategories = productCategories;

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

@@ -731,6 +731,7 @@ declare type OrderAttributesFormFields = {
     shippingInfo: SingleSelectFormField<OrderShippingInfo>;
     pickupLocation: SingleSelectFormField<string>;
     presentmentData: SingleSelectFormField<OrderPresentmentData>;
+    state: SingleSelectFormField<string>;
 };
 declare type OrderRefundFormFields = {
     totalRefunded: TextInputFormField<string | number>;

package/package.json

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