rerobe-js-orm 2.4.67 → 2.4.71

package/lib/factories/FormState/ProductCollection/ProductCollectionFormStateFactory.js

@@ -4,7 +4,7 @@ const FormStateFactory_1 = require("../FormStateFactory");
 const ProductCollectionFormState_1 = require("../../../form-states/ProductCollection/ProductCollectionFormState");
 class ProductCollectionFormStateFactory extends FormStateFactory_1.default {
     createFormState(props, opts) {
-        return new ProductCollectionFormState_1.default(props);
+        return new ProductCollectionFormState_1.default(props, opts);
     }
 }
 exports.default = ProductCollectionFormStateFactory;

package/lib/factories/Order/OrderFromApp.js

@@ -6,7 +6,7 @@ const OrderHelpers_1 = require("../../helpers/OrderHelpers");
 const orderHelpers = new OrderHelpers_1.default();
 class OrderFromApp extends OrderFactory_1.default {
     createOrder(order) {
-        const { id, orderNumber, amount, currencyCode = 'SEK', shippingDetails, appliedDiscount, products, paymentType, paymentMethod, shippingType, shopifyId, shopifyOrderNumber, state, userId, email, salesChannel, tags, paymentDetails, financialStatus, fulfillmentStatus, } = order;
+        const { id, orderNumber, amount, currencyCode = 'SEK', shippingDetails, appliedDiscount, products, paymentType, paymentMethod, shippingType, shopifyId, ribbnOrderNumber, shopifyOrderNumber, state, userId, email, customerName, salesChannel, tags, paymentDetails, financialStatus, fulfillmentStatus, } = order;
         let discount = 0;
         let shippingFee = 0;
         let subTotal = 0;
@@ -52,12 +52,14 @@ class OrderFromApp extends OrderFactory_1.default {
             paymentType: paymentType ? this.utilities.constantCase(paymentType) : Order_1.default.PAYMENT_TYPES.creditCard,
             shippingType: shippingType ? this.utilities.constantCase(shippingType) : Order_1.default.SHIPPING_TYPES.localPickUp,
             shopifyId,
+            ribbnOrderNumber,
             shopifyOrderNumber,
             shippingAddress: shippingDetails && shippingDetails.deliveryAddress ? shippingDetails.deliveryAddress : null,
             lineItems,
             state,
             userId,
             email,
+            customerName,
             paymentDetails,
             tags,
             salesChannel,

package/lib/factories/ProductCollection/ProductCollectionFromFormState.js

@@ -2,9 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ProductCollectionFactory_1 = require("./ProductCollectionFactory");
 const ProductCollection_1 = require("../../models/ProductCollection");
+// @ts-ignore
+const lodash_1 = require("lodash");
 class ProductCollectionFromFormState extends ProductCollectionFactory_1.default {
     createProductCollection(fs) {
+        var _a;
+        let collectionId = fs.fields.collectionId.inputValue;
+        if (!collectionId) {
+            collectionId = lodash_1.camelCase(fs.fields.title.inputValue) + new Date().toISOString().split('T')[0];
+        }
         const productCollectionAttributes = {
+            documentId: ((_a = fs.props) === null || _a === void 0 ? void 0 : _a.documentId) || '',
             preTitle: fs.fields.preTitle.inputValue || '',
             title: fs.fields.title.inputValue || '',
             subTitle: fs.fields.subTitle.inputValue || '',
@@ -12,6 +20,8 @@ class ProductCollectionFromFormState extends ProductCollectionFactory_1.default
             type: fs.fields.type.selectedValue || '',
             imgUrl: fs.fields.imgUrl.inputValue || '',
             refinements: fs.fields.refinements.selectedValue || {},
+            tags: fs.fields.tags.selectedValues || [],
+            collectionId,
         };
         return new ProductCollection_1.default(Object.assign({}, productCollectionAttributes));
     }

package/lib/form-states/ProductCollection/ProductCollectionFormState.d.ts

@@ -4,8 +4,7 @@ export default class ProductCollectionFormState extends FormState {
     fields: ProductCollectionFormFields;
     props: CompleteProductCollection;
     opts: {
-        productAttrOptions: ProductAttrRefinementsOptions[];
-        productAttrValuesOptions: string[];
+        tagOptions: string[];
     };
     constructor(props?: any, opts?: any);
     createProductCollection(): ProductCollection;

package/lib/form-states/ProductCollection/ProductCollectionFormState.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const FormState_1 = require("../FormState");
 const ProductCollection_1 = require("../../models/ProductCollection");
 const ProductCollectionFromFormState_1 = require("../../factories/ProductCollection/ProductCollectionFromFormState");
+// @ts-ignore
+const lodash_1 = require("lodash");
 class ProductCollectionFormState extends FormState_1.default {
     constructor(props, opts) {
         super();
@@ -15,17 +17,19 @@ class ProductCollectionFormState extends FormState_1.default {
         this.fields.type = this.fieldFactory('singleSelect', 'type');
         this.fields.imgUrl = this.fieldFactory('textInput', 'imgUrl');
         this.fields.refinements = this.fieldFactory('singleSelect', 'refinements');
+        this.fields.tags = this.fieldFactory('multiSelect', 'tags', []);
+        this.fields.collectionId = this.fieldFactory('textInput', 'collectionId');
     }
     createProductCollection() {
         const productCollectionFactory = new ProductCollectionFromFormState_1.default();
         return productCollectionFactory.createProductCollection(this);
     }
     fieldFactory(fieldType, fieldKey, fieldOptions) {
+        let options = fieldOptions || [];
         if (fieldType === 'singleSelect') {
-            const options = fieldOptions || [];
             const selectedValue = this.props[fieldKey] || '';
             const valid = !!this.props[fieldKey];
-            const onChangeHandler = (val) => this.singleSelectChangeHandler(fieldKey, String(val));
+            const onChangeHandler = (val) => this.singleSelectChangeHandler(fieldKey, val);
             return {
                 options,
                 selectedValue,
@@ -36,13 +40,38 @@ class ProductCollectionFormState extends FormState_1.default {
         if (fieldType === 'textInput') {
             const inputValue = this.props[fieldKey] || '';
             const valid = !!this.props[fieldKey];
-            const onChangeHandler = (val) => this.textInputChangeHandler(fieldKey, String(val));
+            let onChangeHandler = (val) => this.textInputChangeHandler(fieldKey, String(val));
+            if (fieldKey === 'collectionId') {
+                onChangeHandler = (val) => this.textInputChangeHandler(fieldKey, lodash_1.camelCase(String(val)));
+            }
             return {
                 inputValue,
                 valid,
                 onChangeHandler,
             };
         }
+        if (fieldType === 'multiSelect') {
+            let selectedValues = [];
+            let valid = true;
+            const onChangeHandler = (val) => this.multiSelectChangeHandler(fieldKey, val);
+            if (fieldKey === 'tags') {
+                if (this.props.tags) {
+                    if (Array.isArray(this.props.tags)) {
+                        selectedValues = this.props.tags;
+                    }
+                }
+                if (this.opts && this.opts.tagOptions && this.opts.tagOptions.length > 0) {
+                    options = this.utilities.uniqObjArray([...options, ...this.opts.tagOptions.map((t) => ({ label: t, value: t }))], 'value');
+                }
+                valid = true;
+            }
+            return {
+                options,
+                selectedValues,
+                valid,
+                onChangeHandler,
+            };
+        }
         return {
             valid: false,
         };

package/lib/helpers/ProductCollectionHelpers.d.ts

@@ -0,0 +1,4 @@
+export default class ProductCollectionHelpers {
+    getFiltersByCollectionConditions(collectionRefinementsVal: ProductRefinements): FiltersObj;
+    getCollectionRefinementsFromFilters(filtersList: FiltersObj): ProductRefinements;
+}

package/lib/helpers/ProductCollectionHelpers.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class ProductCollectionHelpers {
+    getFiltersByCollectionConditions(collectionRefinementsVal) {
+        if (!collectionRefinementsVal && !Object.keys(collectionRefinementsVal).length) {
+            return {};
+        }
+        return Object.keys(collectionRefinementsVal).reduce((result, key) => {
+            const keyName = key.replace('Refinement', '');
+            result[keyName] = collectionRefinementsVal[key];
+            return result;
+        }, {});
+    }
+    getCollectionRefinementsFromFilters(filtersList) {
+        if (!filtersList && !Object.keys(filtersList).length) {
+            return {};
+        }
+        return Object.keys(filtersList).reduce((result, key) => {
+            if (!filtersList[key].length) {
+                return result;
+            }
+            result[`${key}Refinement`] = [...filtersList[key]];
+            return result;
+        }, {});
+    }
+}
+exports.default = ProductCollectionHelpers;

package/lib/index.d.ts

@@ -2,7 +2,8 @@ import ProductFromShopifyJSClientJSONDoc from './factories/Product/ProductFromSh
 import ProductFromAlgoliaJSONDoc from './factories/Product/ProductFromAlgoliaJSONDoc';
 import ProductFromShopifyWebhookJSONDoc from './factories/Product/ProductFromShopifyWebhookJSONDoc';
 import ProductFormStateFactory from './factories/FormState/Product/ProductFormStateFactory';
-import ProductCollectionFormState from './form-states/ProductCollection/ProductCollectionFormState';
+import ProductCollectionFormStateFactory from './factories/FormState/ProductCollection/ProductCollectionFormStateFactory';
+import ProductCollectionHelpers from './helpers/ProductCollectionHelpers';
 import SellRequestFormStateFactory from './factories/FormState/SellRequest/SellRequestFormStateFactory';
 import PickUpFormStateFactory from './factories/FormState/PickUp/PickUpFormStateFactory';
 import UserFormStateFactory from './factories/FormState/User/UserFormStateFactory';
@@ -32,4 +33,4 @@ import WebhookFormState from './form-states/Merchant/WebhookFormState';
 import ReRobeProductHelpers from './helpers/ReRobeProductHelpers';
 import AnalyticsHelpers from './helpers/AnalyticsHelpers';
 import OrderHelpers from './helpers/OrderHelpers';
-export { ProductFromAlgoliaJSONDoc, ProductFromShopifyWebhookJSONDoc, ProductFromShopifyJSClientJSONDoc, ProductFormStateFactory, ProductCollectionFormState, SellRequestFormStateFactory, PickUpFormStateFactory, AddressFormStateFactory, UserFormStateFactory, UserFromShopifyWebhookJSONDoc, UserFromAuthTemplateMethod, DraftOrderFromMirakl, DraftOrderFromApp, ChatRoomFromNewUserSignUp, KlarnaSessionFactory, Product, ProductStateManager, Order, OrderFromShopifyWebhook, OrderFromShopifyAdminApi, OrderFromShopifyStorefrontApi, OrderFromApp, OrderFormStateFactory, RefundFormStateFactory, PayoutAccount, PayoutAccountFormState, Merchant, MerchantFormState, MerchantFormStateFactory, ReRobeProductHelpers, User, AnalyticsHelpers, OrderHelpers, WebhookFormState, };
+export { ProductFromAlgoliaJSONDoc, ProductFromShopifyWebhookJSONDoc, ProductFromShopifyJSClientJSONDoc, ProductFormStateFactory, ProductCollectionFormStateFactory, ProductCollectionHelpers, SellRequestFormStateFactory, PickUpFormStateFactory, AddressFormStateFactory, UserFormStateFactory, UserFromShopifyWebhookJSONDoc, UserFromAuthTemplateMethod, DraftOrderFromMirakl, DraftOrderFromApp, ChatRoomFromNewUserSignUp, KlarnaSessionFactory, Product, ProductStateManager, Order, OrderFromShopifyWebhook, OrderFromShopifyAdminApi, OrderFromShopifyStorefrontApi, OrderFromApp, OrderFormStateFactory, RefundFormStateFactory, PayoutAccount, PayoutAccountFormState, Merchant, MerchantFormState, MerchantFormStateFactory, ReRobeProductHelpers, User, AnalyticsHelpers, OrderHelpers, WebhookFormState, };

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebhookFormState = exports.OrderHelpers = exports.AnalyticsHelpers = exports.User = exports.ReRobeProductHelpers = exports.MerchantFormStateFactory = exports.MerchantFormState = exports.Merchant = exports.PayoutAccountFormState = exports.PayoutAccount = exports.RefundFormStateFactory = exports.OrderFormStateFactory = exports.OrderFromApp = exports.OrderFromShopifyStorefrontApi = exports.OrderFromShopifyAdminApi = exports.OrderFromShopifyWebhook = exports.Order = exports.ProductStateManager = exports.Product = exports.KlarnaSessionFactory = exports.ChatRoomFromNewUserSignUp = exports.DraftOrderFromApp = exports.DraftOrderFromMirakl = exports.UserFromAuthTemplateMethod = exports.UserFromShopifyWebhookJSONDoc = exports.UserFormStateFactory = exports.AddressFormStateFactory = exports.PickUpFormStateFactory = exports.SellRequestFormStateFactory = exports.ProductCollectionFormState = exports.ProductFormStateFactory = exports.ProductFromShopifyJSClientJSONDoc = exports.ProductFromShopifyWebhookJSONDoc = exports.ProductFromAlgoliaJSONDoc = void 0;
+exports.WebhookFormState = exports.OrderHelpers = exports.AnalyticsHelpers = exports.User = exports.ReRobeProductHelpers = exports.MerchantFormStateFactory = exports.MerchantFormState = exports.Merchant = exports.PayoutAccountFormState = exports.PayoutAccount = exports.RefundFormStateFactory = exports.OrderFormStateFactory = exports.OrderFromApp = exports.OrderFromShopifyStorefrontApi = exports.OrderFromShopifyAdminApi = exports.OrderFromShopifyWebhook = exports.Order = exports.ProductStateManager = exports.Product = exports.KlarnaSessionFactory = exports.ChatRoomFromNewUserSignUp = exports.DraftOrderFromApp = exports.DraftOrderFromMirakl = exports.UserFromAuthTemplateMethod = exports.UserFromShopifyWebhookJSONDoc = exports.UserFormStateFactory = exports.AddressFormStateFactory = exports.PickUpFormStateFactory = exports.SellRequestFormStateFactory = exports.ProductCollectionHelpers = exports.ProductCollectionFormStateFactory = exports.ProductFormStateFactory = exports.ProductFromShopifyJSClientJSONDoc = exports.ProductFromShopifyWebhookJSONDoc = exports.ProductFromAlgoliaJSONDoc = void 0;
 const ProductFromShopifyJSClientJSONDoc_1 = require("./factories/Product/ProductFromShopifyJSClientJSONDoc");
 exports.ProductFromShopifyJSClientJSONDoc = ProductFromShopifyJSClientJSONDoc_1.default;
 const ProductFromAlgoliaJSONDoc_1 = require("./factories/Product/ProductFromAlgoliaJSONDoc");
@@ -9,8 +9,10 @@ const ProductFromShopifyWebhookJSONDoc_1 = require("./factories/Product/ProductF
 exports.ProductFromShopifyWebhookJSONDoc = ProductFromShopifyWebhookJSONDoc_1.default;
 const ProductFormStateFactory_1 = require("./factories/FormState/Product/ProductFormStateFactory");
 exports.ProductFormStateFactory = ProductFormStateFactory_1.default;
-const ProductCollectionFormState_1 = require("./form-states/ProductCollection/ProductCollectionFormState");
-exports.ProductCollectionFormState = ProductCollectionFormState_1.default;
+const ProductCollectionFormStateFactory_1 = require("./factories/FormState/ProductCollection/ProductCollectionFormStateFactory");
+exports.ProductCollectionFormStateFactory = ProductCollectionFormStateFactory_1.default;
+const ProductCollectionHelpers_1 = require("./helpers/ProductCollectionHelpers");
+exports.ProductCollectionHelpers = ProductCollectionHelpers_1.default;
 const SellRequestFormStateFactory_1 = require("./factories/FormState/SellRequest/SellRequestFormStateFactory");
 exports.SellRequestFormStateFactory = SellRequestFormStateFactory_1.default;
 const PickUpFormStateFactory_1 = require("./factories/FormState/PickUp/PickUpFormStateFactory");

package/lib/models/Order.d.ts

@@ -55,6 +55,7 @@ export default class Order extends Base {
     shippingType: ReRobeShippingAndDeliveryTypes;
     shopifyId: string | null;
     shopifyOrderNumber: number | null;
+    ribbnOrderNumber: number | null;
     subtotalPrice: Money;
     tags: string[] | string | null;
     totalDiscount: Money;

package/lib/models/Order.js

@@ -49,6 +49,7 @@ class Order extends Base_1.default {
         this.shippingType = (props === null || props === void 0 ? void 0 : props.shippingType) || Order.SHIPPING_TYPES.localPickUp;
         this.shopifyId = (props === null || props === void 0 ? void 0 : props.shopifyId) || null;
         this.shopifyOrderNumber = (props === null || props === void 0 ? void 0 : props.shopifyOrderNumber) || null;
+        this.ribbnOrderNumber = (props === null || props === void 0 ? void 0 : props.ribbnOrderNumber) || null;
         this.subtotalPrice = (props === null || props === void 0 ? void 0 : props.subtotalPrice) || {
             amount: 0,
         };
@@ -124,6 +125,7 @@ class Order extends Base_1.default {
             shippingType: this.shippingType,
             shopifyId: this.shopifyId,
             shopifyOrderNumber: this.shopifyOrderNumber,
+            ribbnOrderNumber: this.ribbnOrderNumber,
             subtotalPrice: this.subtotalPrice,
             tags: this.tags,
             totalDiscount: this.totalDiscount,

package/lib/models/ProductCollection.d.ts

@@ -8,6 +8,8 @@ export default class ProductCollection extends Base {
     type: CollectionType;
     imgUrl: string;
     refinements: ProductRefinements;
+    tags: string[];
+    collectionId: string;
     constructor(props?: any);
     toObj(): ProductCollectionType;
 }

package/lib/models/ProductCollection.js

@@ -4,7 +4,7 @@ const Base_1 = require("../Base");
 class ProductCollection extends Base_1.default {
     constructor(props) {
         super();
-        this.documentId = (props === null || props === void 0 ? void 0 : props.documentId) || '';
+        this.documentId = (props === null || props === void 0 ? void 0 : props.documentId) || this.utilities.makeRandId(28);
         this.preTitle = (props === null || props === void 0 ? void 0 : props.preTitle) || '';
         this.title = (props === null || props === void 0 ? void 0 : props.title) || '';
         this.subTitle = (props === null || props === void 0 ? void 0 : props.subTitle) || '';
@@ -12,6 +12,8 @@ class ProductCollection extends Base_1.default {
         this.type = (props === null || props === void 0 ? void 0 : props.type) || 'AUTOMATED';
         this.imgUrl = (props === null || props === void 0 ? void 0 : props.imgUrl) || '';
         this.refinements = (props === null || props === void 0 ? void 0 : props.refinements) || {};
+        this.tags = (props === null || props === void 0 ? void 0 : props.tags) || [];
+        this.collectionId = (props === null || props === void 0 ? void 0 : props.collectionId) || '';
     }
     toObj() {
         const productCollectionObj = {
@@ -23,6 +25,8 @@ class ProductCollection extends Base_1.default {
             type: this.type,
             imgUrl: this.imgUrl,
             refinements: this.refinements,
+            tags: this.tags,
+            collectionId: this.collectionId,
         };
         return productCollectionObj;
     }

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

@@ -1,8 +1,22 @@
-declare type ProductAttrRefinementsOptions = 'brand' | 'clothingSize' | 'color' | 'condition' | 'gender' | 'jeanSize' | 'materialComposition' | 'priceRange' | 'productCategory' | 'productType' | 'productStyle' | 'shoeSize';
-interface Refinements {
-    featuredCollections?: string;
-}
-interface ProductRefinements extends Refinements {
+declare type ProductAttrRefinementsOptions = 'brand' | 'clothingSize' | 'color' | 'condition' | 'gender' | 'jeanSize' | 'materialComposition' | 'priceRange' | 'productCategory' | 'productType' | 'productStyle' | 'shoeSize' | 'status' | 'salesChannel';
+declare type FiltersOptions = 'brandRefinement' | 'clothingSizeRefinement' | 'colorRefinement' | 'conditionRefinement' | 'genderRefinement' | 'jeanSizeRefinement' | 'materialCompositionRefinement' | 'priceRangeRefinement' | 'productCategoryRefinement' | 'productTypeRefinement' | 'productStyleRefinement' | 'shoeSizeRefinement' | 'statusRefinement' | 'salesChannelRefinement';
+declare type FiltersObj = {
+    brand?: string[];
+    clothingSize?: string[];
+    color?: string[];
+    condition?: string[];
+    gender?: string[];
+    jeanSize?: string[];
+    materialComposition?: string[];
+    priceRange?: string[];
+    productCategory?: string[];
+    productType?: string[];
+    productStyle?: string[];
+    shoeSize?: string[];
+    status?: string[];
+    salesChannel?: string[];
+};
+interface ProductRefinements {
     brandRefinement?: string[];
     clothingSizeRefinement?: string[];
     colorRefinement?: string[];
@@ -15,6 +29,8 @@ interface ProductRefinements extends Refinements {
     productTypeRefinement?: string[];
     productStyleRefinement?: string[];
     shoeSizeRefinement?: string[];
+    statusRefinement?: string[];
+    salesChannelRefinement?: string[];
 }
 declare type CollectionType = 'AUTOMATED' | 'MANUAL';
 declare type ProductCollectionType = {
@@ -28,6 +44,8 @@ declare type ProductCollectionType = {
     type: CollectionType;
     imgUrl: string;
     refinements: ProductRefinements;
+    tags: string[];
+    collectionId: string;
 };
 declare type CompleteProductCollection = ProductCollectionType & {
     [key: string]: any;
@@ -40,4 +58,6 @@ declare type ProductCollectionFormFields = {
     type: SingleSelectFormField<CollectionType>;
     imgUrl: TextInputFormField<string>;
     refinements: SingleSelectFormField<ProductRefinements>;
+    tags: MultiSelectFormField<string>;
+    collectionId: TextInputFormField<string>;
 };

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

@@ -39,6 +39,7 @@ declare type ReRobeOrderObj = {
     shippingType: ReRobeShippingAndDeliveryTypes | string;
     shopifyId?: string | null;
     shopifyOrderNumber?: number | null;
+    ribbnOrderNumber?: number | null;
     subtotalPrice: Money;
     tags?: string[] | string | null;
     totalDiscount: Money;
@@ -95,10 +96,12 @@ declare type OrderInput = {
     products: CompleteProduct[];
     appliedDiscount?: AppliedDiscount;
     shopifyId?: string | null;
+    ribbnOrderNumber?: number | null;
     shopifyOrderNumber?: number | null;
     state?: ReRobeOrderStates | string | null;
     userId?: string | null;
     email?: string | null;
+    customerName?: string | null;
     tags?: string[];
     salesChannel?: SalesChannels | string | null;
     paymentDetails?: PaymentDetails | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rerobe-js-orm",
-  "version": "2.4.67",
+  "version": "2.4.71",
   "description": "ReRobe's Javascript ORM Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -14,7 +14,8 @@
     "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",
     "version": "npm run format && git add -A src",
-    "postversion": "git push && git push --tags"
+    "postversion": "git push && git push --tags",
+    "clean": "npm run format && npm run lint"
   },
   "repository": {
     "type": "git",