rerobe-js-orm 2.4.79 → 2.4.84

package/lib/factories/Product/ProductFromFormState.js

@@ -76,6 +76,7 @@ class ProductFromFormState extends ProductFactory_1.default {
             discountValue: props.fields.discountValue.inputValue || '',
             selectedForClearance: ((_r = props.props) === null || _r === void 0 ? void 0 : _r.selectedForClearance) || '',
             locationIds: props.fields.locationIds.selectedValues || [],
+            inventoryLocations: props.fields.inventoryLocations.selectedValues || [],
         };
         const timestampAttributes = {
             sellRequestReviewTimestamp: (_s = props.props) === null || _s === void 0 ? void 0 : _s.sellRequestReviewTimestamp,

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

@@ -24,5 +24,6 @@ export default class ProductFormState extends FormState {
     private discountTypeChangeHandler;
     private discountValueChangeHandler;
     private calculateSalePrice;
+    private inventoryLocationsChangeHandler;
     private fieldFactory;
 }

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

@@ -71,6 +71,7 @@ class ProductFormState extends FormState_1.default {
         this.fields.vendorName = this.fieldFactory('singleSelect', 'vendorName');
         this.fields.rfidTag = this.fieldFactory('textInput', 'rfidTag');
         this.fields.locationIds = this.fieldFactory('multiSelect', 'locationIds');
+        this.fields.inventoryLocations = this.fieldFactory('multiSelect', 'inventoryLocations');
         this.fields.featuredCollections = this.fieldFactory('multiSelect', 'featuredCollections');
         this.fields.tags = this.fieldFactory('multiSelect', 'tags');
     }
@@ -413,6 +414,24 @@ class ProductFormState extends FormState_1.default {
         }
         return '';
     }
+    inventoryLocationsChangeHandler(val) {
+        const { id, incomingAmount, availableAmount } = val;
+        const existingIds = this.fields.inventoryLocations.selectedValues.map((i) => i.id);
+        if (existingIds.includes(id)) {
+            const foundInd = this.fields.inventoryLocations.selectedValues.findIndex((i) => i.id === id);
+            const foundI = this.fields.inventoryLocations.selectedValues[foundInd];
+            // Delete case: val is exact same object
+            if (incomingAmount === foundI.incomingAmount && availableAmount === foundI.availableAmount) {
+                this.fields.inventoryLocations.selectedValues.splice(foundInd, 1);
+            }
+            else {
+                this.fields.inventoryLocations.selectedValues.splice(foundInd, 1, val);
+            }
+        }
+        else {
+            this.multiSelectChangeHandler('inventoryLocations', val);
+        }
+    }
     fieldFactory(fieldType, fieldKey, fieldOptions) {
         let options = fieldOptions || [];
         let hidden = false;
@@ -499,6 +518,7 @@ class ProductFormState extends FormState_1.default {
             };
         }
         if (fieldType === 'multiSelect') {
+            let onChangeHandler = (val) => this.multiSelectChangeHandler(fieldKey, val);
             if (fieldKey === 'productStyle') {
                 options = this.setProductStylesFromCategoryAndType(this.props.productCategory, this.props.productType);
                 if (this.props.productStyle && this.props.productStyle.length > 0) {
@@ -608,12 +628,15 @@ class ProductFormState extends FormState_1.default {
                 }
                 hidden = this.props.productCategory !== 'Clothing' || this.props.productType === 'Jeans';
             }
+            if (fieldKey === 'inventoryLocations') {
+                onChangeHandler = (val) => this.inventoryLocationsChangeHandler(val);
+            }
             return {
                 options,
                 hidden,
                 selectedValues: this.props[fieldKey] || [],
                 valid: this.props[fieldKey].length > 0,
-                onChangeHandler: (val) => this.multiSelectChangeHandler(fieldKey, val),
+                onChangeHandler,
             };
         }
         if (fieldType === 'textInput') {

package/lib/helpers/OrderHelpers.js

@@ -16,6 +16,15 @@ class OrderHelpers {
     }
     getShippingTypeFromShopifyObj(shippingLines) {
         if (shippingLines && shippingLines[0]) {
+            if (shippingLines[0].title === 'Local pickup') {
+                return Order_1.default.SHIPPING_TYPES.localPickUp;
+            }
+            if (shippingLines[0].title === 'Shipping fee') {
+                return Order_1.default.SHIPPING_TYPES.shipping;
+            }
+            if (shippingLines[0].title === 'Localy delivery') {
+                return Order_1.default.SHIPPING_TYPES.localDelivery;
+            }
             return shippingLines[0].price_set.shop_money.amount > 0
                 ? Order_1.default.SHIPPING_TYPES.localDelivery
                 : Order_1.default.SHIPPING_TYPES.localPickUp;

package/lib/helpers/ReRobeProductHelpers.js

@@ -226,7 +226,7 @@ class ReRobeProductHelpers {
     static createTimestampsForStates(productObj) {
         const docFieldsToUpdate = {};
         if (productObj) {
-            const { status, sellRequestReviewDraftTimestamp, sellRequestReviewTimestamp, rejectedTimestamp, holdTimestamp, acceptedTimestamp, sellerToDropOffTimestamp, sellerToShipTimestamp, sellerToGetPickUpTimestamp, qualityControlTimestamp, pendingPublicationTimestamp, listedTimestamp, clearanceTimestamp, reservedTimestamp, soldTimestamp, soldSellerToBePaidTimestamp, soldSellerPaidTimestamp, returnedTimestamp, sellerSelfRejectTimestamp, liquidationRequestedTimestamp, sellerLiquidatedTimestamp, } = productObj;
+            const { dateSold, status, sellRequestReviewDraftTimestamp, sellRequestReviewTimestamp, rejectedTimestamp, holdTimestamp, acceptedTimestamp, sellerToDropOffTimestamp, sellerToShipTimestamp, sellerToGetPickUpTimestamp, qualityControlTimestamp, pendingPublicationTimestamp, listedTimestamp, clearanceTimestamp, reservedTimestamp, soldTimestamp, soldSellerToBePaidTimestamp, soldSellerPaidTimestamp, returnedTimestamp, sellerSelfRejectTimestamp, liquidationRequestedTimestamp, sellerLiquidatedTimestamp, } = productObj;
             if (status === ProductStateManager_1.default.PRODUCT_STATES.sellRequestReviewDraft && !sellRequestReviewDraftTimestamp) {
                 docFieldsToUpdate.sellRequestReviewDraftTimestamp = new Date().getTime();
             }
@@ -270,10 +270,21 @@ class ReRobeProductHelpers {
                 docFieldsToUpdate.soldTimestamp = new Date().getTime();
             }
             if (status === ProductStateManager_1.default.PRODUCT_STATES.soldSellerToBePaid && !soldSellerToBePaidTimestamp) {
-                docFieldsToUpdate.soldSellerToBePaidTimestamp = new Date().getTime();
+                const timeNow = new Date().getTime();
+                docFieldsToUpdate.soldSellerToBePaidTimestamp = timeNow;
+                if (!soldTimestamp) {
+                    docFieldsToUpdate.soldTimestamp = timeNow;
+                }
             }
             if (status === ProductStateManager_1.default.PRODUCT_STATES.soldSellerPaid && !soldSellerPaidTimestamp) {
-                docFieldsToUpdate.soldSellerPaidTimestamp = new Date().getTime();
+                const timeNow = new Date().getTime();
+                docFieldsToUpdate.soldSellerPaidTimestamp = timeNow;
+                if (!soldSellerToBePaidTimestamp) {
+                    docFieldsToUpdate.soldSellerToBePaidTimestamp = timeNow;
+                }
+                if (!soldTimestamp) {
+                    docFieldsToUpdate.soldTimestamp = timeNow;
+                }
             }
             if (status === ProductStateManager_1.default.PRODUCT_STATES.returned && !returnedTimestamp) {
                 docFieldsToUpdate.returnedTimestamp = new Date().getTime();

package/lib/models/Order.js

@@ -178,7 +178,7 @@ Order.ORDER_STATES = {
 };
 Order.SALES_CHANNELS = {
     mobileApp: 'MOBILE_APP',
-    webApp: 'WEB_APP',
+    webApp: 'DRAFT_ORDER',
     store: 'STORE',
     onlineStore: 'ONLINE_STORE',
     thirdParty: 'THIRD_PARTY',

package/lib/models/Product.js

@@ -80,6 +80,7 @@ class Product extends Base_1.default {
             discountValue: (props === null || props === void 0 ? void 0 : props.discountValue) || '',
             selectedForClearance: (props === null || props === void 0 ? void 0 : props.selectedForClearance) || '',
             locationIds: (props === null || props === void 0 ? void 0 : props.locationIds) || [],
+            inventoryLocations: (props === null || props === void 0 ? void 0 : props.inventoryLocations) || [],
         };
         this.timestampAttributes = {
             sellRequestReviewDraftTimestamp: (props === null || props === void 0 ? void 0 : props.sellRequestReviewDraftTimestamp)

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

@@ -69,6 +69,7 @@ declare type ProductConsignmentAttributes = {
     discountValue: string;
     selectedForClearance: string;
     locationIds?: string[];
+    inventoryLocations: InventoryLocation[];
 };
 declare type ProductTimestampAttributes = {
     sellRequestReviewTimestamp: number | null;
@@ -188,6 +189,7 @@ declare type ProductConsignmentAttributesFormFields = {
     discountType: SingleSelectFormField<string>;
     discountValue: TextInputFormField<string>;
     locationIds: MultiSelectFormField<string>;
+    inventoryLocations: MultiSelectFormField<InventoryLocation>;
 };
 declare type ProductFormFields = ProductAttributesFormFields & ProductFilterAttributesFormFields & ProductConsignmentAttributesFormFields;
 interface ParamsForBuildProductInputObjForShopify {
@@ -221,3 +223,9 @@ declare type ProductLineItem = {
     image: string;
     quantity: number;
 };
+declare type InventoryLocation = {
+    id: string;
+    name: string;
+    incomingAmount: number;
+    availableAmount: number;
+};

package/package.json

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