rerobe-js-orm 2.4.98 → 2.5.1

package/lib/factories/Order/OrderFromFormState.js

@@ -4,7 +4,7 @@ const OrderFactory_1 = require("./OrderFactory");
 const Order_1 = require("../../models/Order");
 class OrderFromFormState extends OrderFactory_1.default {
     createOrder(fs) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
         const currencyCode = fs.fields.currencyCode.inputValue || 'SEK';
         const customer = fs.fields.customer.selectedValue || {};
         const firstName = fs.fields.firstName.inputValue;
@@ -22,9 +22,10 @@ class OrderFromFormState extends OrderFactory_1.default {
             currencyCode: fs.fields.currencyCode.inputValue,
             statusUrl: ((_h = fs.props) === null || _h === void 0 ? void 0 : _h.statusUrl) || '',
             processedAt: ((_j = fs.props) === null || _j === void 0 ? void 0 : _j.processedAt) || new Date().toUTCString(),
+            fulfillmentLocations: ((_k = fs.props) === null || _k === void 0 ? void 0 : _k.fulfillmentLocations) || [],
             financialStatus: fs.fields.financialStatus.selectedValue,
             fulfillmentStatus: fs.fields.fulfillmentStatus.selectedValue,
-            fulfillments: ((_k = fs.props) === null || _k === void 0 ? void 0 : _k.fulfillments) || [],
+            fulfillments: ((_l = fs.props) === null || _l === void 0 ? void 0 : _l.fulfillments) || [],
             shippingAddress: fs.fields.shippingAddress.selectedValue || {
                 id: '',
                 address1: '',
@@ -35,7 +36,7 @@ class OrderFromFormState extends OrderFactory_1.default {
                 province: '',
                 zip: '',
             },
-            shippingDiscountAllocations: ((_l = fs.props) === null || _l === void 0 ? void 0 : _l.shippingDiscountAllocations) || [],
+            shippingDiscountAllocations: ((_m = fs.props) === null || _m === void 0 ? void 0 : _m.shippingDiscountAllocations) || [],
             shippingLine: fs.fields.shippingLine
                 ? fs.fields.shippingLine.selectedValue
                 : {
@@ -56,9 +57,9 @@ class OrderFromFormState extends OrderFactory_1.default {
             originalTotalPrice: { amount: fs.fields.originalTotalPrice.inputValue || 0, currencyCode },
             lineItems: fs.fields.lineItems.selectedValues || [],
             cancelReason: fs.fields.cancelReason.selectedValue || '',
-            canceledAt: ((_m = fs.props) === null || _m === void 0 ? void 0 : _m.canceledAt) || '',
-            customerUrl: ((_o = fs.props) === null || _o === void 0 ? void 0 : _o.customerUrl) || '',
-            discountApplications: ((_p = fs.props) === null || _p === void 0 ? void 0 : _p.discountApplications) || [],
+            canceledAt: ((_o = fs.props) === null || _o === void 0 ? void 0 : _o.canceledAt) || '',
+            customerUrl: ((_p = fs.props) === null || _p === void 0 ? void 0 : _p.customerUrl) || '',
+            discountApplications: ((_q = fs.props) === null || _q === void 0 ? void 0 : _q.discountApplications) || [],
             physicalLocation: fs.fields.physicalLocation.selectedValue || {
                 id: '',
                 activatable: true,
@@ -77,7 +78,7 @@ class OrderFromFormState extends OrderFactory_1.default {
             },
             notes: fs.fields.notes.inputValue || '',
             userId: (customer === null || customer === void 0 ? void 0 : customer.uid) || '',
-            customerName: ((_q = fs.props) === null || _q === void 0 ? void 0 : _q.customerName) ||
+            customerName: ((_r = fs.props) === null || _r === void 0 ? void 0 : _r.customerName) ||
                 (customer.displayName ? customer.displayName : '') ||
                 (customer.firstName && customer.lastName ? `${customer.firstName} ${customer.lastName}` : '') ||
                 (firstName && lastName ? `${firstName} ${lastName}` : ''),
@@ -85,9 +86,9 @@ class OrderFromFormState extends OrderFactory_1.default {
             phone: (customer === null || customer === void 0 ? void 0 : customer.phone) || fs.fields.phone.inputValue || '',
             paymentMethod: fs.fields.paymentMethod.selectedValue || '',
             paymentDetails: fs.fields.paymentDetails.selectedValue || {},
-            merchantId: ((_r = fs.props) === null || _r === void 0 ? void 0 : _r.merchantId) || '',
+            merchantId: ((_s = fs.props) === null || _s === void 0 ? void 0 : _s.merchantId) || '',
             tags: fs.fields.tags.selectedValues || [],
-            refunds: ((_s = fs.props) === null || _s === void 0 ? void 0 : _s.refunds) || [],
+            refunds: ((_t = fs.props) === null || _t === void 0 ? void 0 : _t.refunds) || [],
         };
         return new Order_1.default(Object.assign({}, orderAttributes));
     }

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

@@ -86,7 +86,7 @@ class ProductFormState extends FormState_1.default {
         return productFactory.createProduct(this);
     }
     priceInputChangeHandler(value) {
-        const priceValAsValNumberString = Number(value) > 0 ? String(value) : '0';
+        const priceValAsValNumberString = Number(value) > 0 ? String(value) : '';
         // Mutate price inputValue and valid prop
         this.fields.price.inputValue = priceValAsValNumberString;
         this.fields.price.valid = Number(value) > 0;

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 { status, sellRequestReviewDraftTimestamp, sellRequestReviewTimestamp, rejectedTimestamp, holdTimestamp, acceptedTimestamp, sellerToDropOffTimestamp, sellerToShipTimestamp, sellerToGetPickUpTimestamp, qualityControlTimestamp, pendingPublicationTimestamp, listedTimestamp, clearanceTimestamp, reservedTimestamp, soldTimestamp, soldSellerToBePaidTimestamp, soldSellerPaidTimestamp, returnedTimestamp, sellerSelfRejectTimestamp, liquidationRequestedTimestamp, sellerLiquidatedTimestamp, archivedTimestamp, } = productObj;
             if (status === ProductStateManager_1.default.PRODUCT_STATES.sellRequestReviewDraft && !sellRequestReviewDraftTimestamp) {
                 docFieldsToUpdate.sellRequestReviewDraftTimestamp = new Date().getTime();
             }
@@ -298,6 +298,9 @@ class ReRobeProductHelpers {
             if (status === ProductStateManager_1.default.PRODUCT_STATES.sellerLiquidated && !sellerLiquidatedTimestamp) {
                 docFieldsToUpdate.sellerLiquidatedTimestamp = new Date().getTime();
             }
+            if (status === ProductStateManager_1.default.PRODUCT_STATES.archived && !archivedTimestamp) {
+                docFieldsToUpdate.archivedTimestamp = new Date().getTime();
+            }
         }
         return docFieldsToUpdate;
     }

package/lib/models/Order.d.ts

@@ -45,6 +45,7 @@ export default class Order extends Base {
     currencyCode: string;
     statusUrl: string;
     processedAt: string;
+    fulfillmentLocations: FulfillmentLocationItem[];
     financialStatus: FinancialStatusTypes | string;
     fulfillmentStatus: FulfillmentStatusTypes | string;
     fulfillments: FulfillmentAdmin[];

package/lib/models/Order.js

@@ -17,6 +17,7 @@ class Order extends Base_1.default {
         this.financialStatus = (props === null || props === void 0 ? void 0 : props.financialStatus)
             ? props === null || props === void 0 ? void 0 : props.financialStatus.toUpperCase()
             : Order.FINANCIAL_TYPES.pending;
+        this.fulfillmentLocations = (props === null || props === void 0 ? void 0 : props.fulfillmentLocations) || [];
         this.fulfillmentStatus = (props === null || props === void 0 ? void 0 : props.fulfillmentStatus)
             ? props === null || props === void 0 ? void 0 : props.fulfillmentStatus.toUpperCase()
             : Order.FULFILLMENT_TYPES.unfulfilled;
@@ -116,6 +117,7 @@ class Order extends Base_1.default {
             processedAt: this.processedAt,
             statusUrl: this.statusUrl,
             financialStatus: this.financialStatus,
+            fulfillmentLocations: this.fulfillmentLocations,
             fulfillmentStatus: this.fulfillmentStatus,
             fulfillments: this.fulfillments,
             salesChannel: this.salesChannel,

package/lib/models/Product.js

@@ -113,6 +113,7 @@ class Product extends Base_1.default {
                 ? Number(props === null || props === void 0 ? void 0 : props.liquidationRequestedTimestamp)
                 : null,
             sellerLiquidatedTimestamp: (props === null || props === void 0 ? void 0 : props.sellerLiquidatedTimestamp) ? Number(props === null || props === void 0 ? void 0 : props.sellerLiquidatedTimestamp) : null,
+            archivedTimestamp: (props === null || props === void 0 ? void 0 : props.archivedTimestamp) ? Number(props === null || props === void 0 ? void 0 : props.archivedTimestamp) : null,
         };
     }
     toPartialObj() {
@@ -277,6 +278,7 @@ class Product extends Base_1.default {
             sellerSelfRejectTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.sellerSelfRejectTimestamp),
             liquidationRequestedTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.liquidationRequestedTimestamp),
             sellerLiquidatedTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.sellerLiquidatedTimestamp),
+            archivedTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.archivedTimestamp),
             selectedForClearance: this.utilities.sanitizeString(this.consignmentAttributes.selectedForClearance),
             availableForSale: !!this.attributes.availableForSale,
             color: this.utilities.sanitizeString(this.filterAttributes.color),
@@ -350,6 +352,9 @@ class Product extends Base_1.default {
         if (productType === 'Suit Jacket' || productType === 'Shirts & Blouses' || productType === 'Outerwear') {
             productType = '';
         }
+        if (['Blazers', 'Dresses', 'Jumpsuits', 'Skirts', 'Tops'].includes(productType)) {
+            productType = productType.substring(0, productType.length - 1);
+        }
         let result;
         if (brand.includes('Vintage')) {
             if (productType !== '') {
@@ -407,7 +412,7 @@ class Product extends Base_1.default {
             return acc;
         }, '');
     }
-    generateSchemaForTypesense(name = 'prod_products_20210108') {
+    generateSchemaForTypesense(name = 'prod_products_20220503') {
         return {
             default_sorting_field: 'createdAtTimestamp',
             fields: [
@@ -547,18 +552,18 @@ class Product extends Base_1.default {
                     type: 'string',
                 },
                 {
-                    facet: false,
+                    facet: true,
                     optional: true,
                     name: '.*Timestamp',
                     type: 'int32',
                 },
                 {
-                    facet: false,
+                    facet: true,
                     name: 'createdAtTimestamp',
                     type: 'int32',
                 },
                 {
-                    facet: false,
+                    facet: true,
                     name: 'updatedAtTimestamp',
                     type: 'int32',
                 },

package/lib/types/merchant-types.d.ts

@@ -69,3 +69,7 @@ declare type WebhookFormFields = {
     event: SingleSelectFormField<string>;
     callBackUrl: TextInputFormField<string>;
 };
+interface LocationInput extends AddressInput {
+    name?: string;
+    locationId?: string;
+}

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

@@ -26,6 +26,7 @@ declare type ReRobeOrderObj = {
     discountApplications?: DiscountApplication[];
     statusUrl?: string;
     processedAt?: string;
+    fulfillmentLocations?: FulfillmentLocationItem[];
     financialStatus?: FinancialStatusTypes | string;
     fulfillmentStatus?: FulfillmentStatusTypes | string;
     fulfillments?: FulfillmentAdmin[];
@@ -336,6 +337,12 @@ declare type OrderLocation = {
     name?: string;
     shipsInventory?: boolean;
 };
+declare type FulfillmentLocationItem = {
+    location: LocationInput;
+    productsIds: string[];
+    shippingRateName?: string;
+    shippingPrice?: string | number;
+};
 declare type Fulfillment = {
     fulfillmentLineItems: FulfillmentLineItemConnection;
     trackingCompany: string;
@@ -619,6 +626,7 @@ declare type CompleteRefund = OrderRefund & {
 };
 declare type OrderAttributesFormFields = {
     currencyCode: TextInputFormField<string>;
+    fulfillmentLocations: MultiSelectFormField<FulfillmentLocationItem>;
     financialStatus: SingleSelectFormField<FinancialStatusTypes>;
     fulfillmentStatus: SingleSelectFormField<FulfillmentStatusTypes>;
     fulfillments: MultiSelectFormField<FulfillmentAdmin>;

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

@@ -94,6 +94,7 @@ declare type ProductTimestampAttributes = {
     sellerSelfRejectTimestamp: number | null;
     liquidationRequestedTimestamp: number | null;
     sellerLiquidatedTimestamp: number | null;
+    archivedTimestamp: number | null;
 };
 declare type TranslatableAttributes = {
     description: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rerobe-js-orm",
-  "version": "2.4.98",
+  "version": "2.5.1",
   "description": "ReRobe's Javascript ORM Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -10,7 +10,7 @@
     "build": "tsc",
     "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
     "lint": "tslint -p tsconfig.json",
-    "prepare": "npm run build",
+    "prepare": "npm run clean && npm run build && npm run test",
     "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",
     "version": "npm run format && git add -A src",