rerobe-js-orm 2.3.5 → 2.3.9

package/lib/factories/Order/OrderFromApp.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const js_base64_1 = require("js-base64");
 const OrderFactory_1 = require("./OrderFactory");
 const Order_1 = require("../../models/Order");
+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;
@@ -34,23 +35,7 @@ class OrderFromApp extends OrderFactory_1.default {
             amount: discount.toFixed(2),
             currencyCode,
         };
-        const lineItems = products.map((item) => ({
-            title: item.title,
-            quantity: 1,
-            variant: {
-                id: item.variantId ? js_base64_1.Base64.atob(item.variantId) : '',
-            },
-            brand: item.brand,
-            originalTotalPrice: {
-                amount: item.price,
-                currencyCode,
-            },
-            image: {
-                originalSrc: item.imageUrls && !!item.imageUrls.length ? item.imageUrls[0] : '',
-            },
-            shopifyProductId: item.shopifyId || null,
-            productId: item.documentId,
-        }));
+        const lineItems = products.map((product) => (orderHelpers.buildLineItemFromProduct(product, currencyCode)));
         const rerobeOrder = new Order_1.default({
             id,
             appliedDiscount,

package/lib/helpers/OrderHelpers.d.ts

@@ -3,4 +3,5 @@ export default class OrderHelpers {
     getShippingTypeFromShopifyObj(shippingLines: ShippingLineRest[] | null | undefined): string;
     getPaymentTypeUsingTags(tags: string | null | undefined): string | null;
     getSalesChannelUsingTags(tags: string | null | undefined): string | null;
+    buildLineItemFromProduct(product: CompleteProduct, currencyCode: string, quantity?: number): ReRobeOrderLineItem;
 }

package/lib/helpers/OrderHelpers.js

@@ -53,5 +53,29 @@ class OrderHelpers {
         }
         return null;
     }
+    buildLineItemFromProduct(product, currencyCode, quantity = 1) {
+        const q = quantity || 1;
+        return {
+            title: product.title,
+            quantity: q,
+            variant: {
+                id: product.variantId || '',
+            },
+            brand: product.brand,
+            originalTotalPrice: {
+                amount: q * Number(Number(product.price).toFixed(2)),
+                currencyCode,
+            },
+            originalUnitPrice: {
+                amount: Number(Number(product.price).toFixed(2)),
+                currencyCode,
+            },
+            image: {
+                originalSrc: product.imageUrls && !!product.imageUrls.length ? product.imageUrls[0] : '',
+            },
+            shopifyProductId: product.shopifyId || null,
+            productId: product.documentId,
+        };
+    }
 }
 exports.default = OrderHelpers;

package/lib/models/FormStates/Order/OrderFormState.d.ts

@@ -1,12 +1,20 @@
 import FormState from '../FormState';
 import Order from '../../Order';
+import OrderHelpers from '../../../helpers/OrderHelpers';
 export default class OrderFormState extends FormState {
     fields: OrderAttributesFormFields;
     props: CompleteOrder;
     opts: {
         tagOptions: string[];
     };
+    orderHelpers: OrderHelpers;
     constructor(props?: any, opts?: any);
     createOrder(): Order;
+    lineItemChangeHandler(val: {
+        lineItemLike: CompleteProduct | ReRobeOrderLineItem;
+        quantity: number;
+    }): void;
+    discountChangeHandler(val: string): void;
+    shippingPriceChangeHandler(val: string): void;
     private fieldFactory;
 }

package/lib/models/FormStates/Order/OrderFormState.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const FormState_1 = require("../FormState");
 const Order_1 = require("../../Order");
 const OrderFromFormState_1 = require("../../../factories/Order/OrderFromFormState");
+const OrderHelpers_1 = require("../../../helpers/OrderHelpers");
 const options_1 = require("./options");
 class OrderFormState extends FormState_1.default {
     constructor(props, opts) {
         super();
+        this.orderHelpers = new OrderHelpers_1.default();
         this.props = new Order_1.default(props).toObj();
         this.opts = opts;
         this.fields.currencyCode = this.fieldFactory('textInput', 'currencyCode');
@@ -39,6 +41,49 @@ class OrderFormState extends FormState_1.default {
         const orderFactory = new OrderFromFormState_1.default();
         return orderFactory.createOrder(this);
     }
+    lineItemChangeHandler(val) {
+        var _a;
+        const currentlineItems = this.fields.lineItems.selectedValues;
+        // Add new product to line items
+        if (val.lineItemLike.documentId) {
+            const product = val.lineItemLike;
+            const lineItemToUpdate = this.orderHelpers.buildLineItemFromProduct(product, this.fields.currencyCode.inputValue || 'SEK', val.quantity);
+            this.fields.lineItems.selectedValues = [...currentlineItems, lineItemToUpdate];
+        }
+        // Update quantity of a line item
+        if (val.quantity && val.lineItemLike.productId) {
+            const lineItem = val.lineItemLike;
+            const quantity = val.quantity;
+            const updatedLineItem = Object.assign(Object.assign({}, lineItem), { quantity, originalTotalPrice: Object.assign(Object.assign({}, lineItem.originalTotalPrice), { amount: Number((_a = lineItem.originalUnitPrice) === null || _a === void 0 ? void 0 : _a.amount) * quantity }) });
+            const lineItemToUpdateIndex = currentlineItems.findIndex((li) => (li.productId === lineItem.productId));
+            const lineItemsClone = [...currentlineItems];
+            lineItemsClone.splice(lineItemToUpdateIndex, 1, updatedLineItem);
+            const newLineItems = lineItemsClone;
+            this.fields.lineItems.selectedValues = newLineItems;
+        }
+        // Remove a line item
+        if (val.lineItemLike.productId && !val.quantity) {
+            const lineItem = val.lineItemLike;
+            const newLineItems = currentlineItems.filter((li) => (li.productId !== lineItem.productId));
+            this.fields.lineItems.selectedValues = newLineItems;
+        }
+        // Update subtotal price
+        this.fields.subtotalPrice.inputValue = this.fields.lineItems.selectedValues
+            .map((item) => { var _a; return Number((_a = item.originalTotalPrice) === null || _a === void 0 ? void 0 : _a.amount); })
+            .reduce((a, b) => a + b, 0);
+        // Update total price
+        this.fields.totalPrice.inputValue = Number((Number(this.fields.subtotalPrice.inputValue) - Number(this.fields.totalDiscount.inputValue)) + Number(this.fields.totalShippingPrice.inputValue)).toFixed(2);
+    }
+    discountChangeHandler(val) {
+        this.fields.totalDiscount.inputValue = val;
+        // Update total price
+        this.fields.totalPrice.inputValue = Number((Number(this.fields.subtotalPrice.inputValue) - Number(val)) + Number(this.fields.totalShippingPrice.inputValue)).toFixed(2);
+    }
+    shippingPriceChangeHandler(val) {
+        this.fields.totalShippingPrice.inputValue = val;
+        // Update total price
+        this.fields.totalPrice.inputValue = Number((Number(this.fields.subtotalPrice.inputValue) - Number(this.fields.totalDiscount.inputValue)) + Number(val)).toFixed(2);
+    }
     fieldFactory(fieldType, fieldKey, fieldOptions) {
         let options = fieldOptions || [];
         const hidden = false;
@@ -54,8 +99,14 @@ class OrderFormState extends FormState_1.default {
                 // @ts-ignore
                 inputValue = this.props[fieldKey] ? this.props[fieldKey].amount : 0;
             }
+            let onChangeHandler = (val) => this.textInputChangeHandler(fieldKey, String(val));
+            if (fieldKey === 'totalDiscount') {
+                onChangeHandler = (val) => this.discountChangeHandler(String(val));
+            }
+            if (fieldKey === 'totalShippingPrice') {
+                onChangeHandler = (val) => this.shippingPriceChangeHandler(String(val));
+            }
             const valid = !!this.props[fieldKey];
-            const onChangeHandler = (val) => this.textInputChangeHandler(fieldKey, String(val));
             return {
                 inputValue,
                 valid,
@@ -84,9 +135,11 @@ class OrderFormState extends FormState_1.default {
         if (fieldType === 'multiSelect') {
             let selectedValues = [];
             let valid = !!selectedValues.length;
+            let onChangeHandler = (val) => this.multiSelectChangeHandler(fieldKey, val);
             if (fieldKey === 'lineItems') {
                 selectedValues = this.props.lineItems || [];
                 valid = this.props.lineItems && this.props.lineItems.length > 0;
+                onChangeHandler = (val) => this.lineItemChangeHandler(val);
             }
             if (fieldKey === 'tags') {
                 selectedValues = [];
@@ -110,7 +163,7 @@ class OrderFormState extends FormState_1.default {
                 options,
                 selectedValues,
                 valid,
-                onChangeHandler: (val) => this.multiSelectChangeHandler(fieldKey, val),
+                onChangeHandler,
             };
         }
         return {

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

@@ -174,6 +174,7 @@ interface OrderLineItem {
     quantity: number;
     variant: ProductVariant | null;
     originalTotalPrice?: Money;
+    originalUnitPrice?: Money;
     discountedTotalPrice?: Money;
     image?: Image;
 }
@@ -226,7 +227,7 @@ declare type ProductVariant = {
     weight?: number | null;
 };
 declare type Image = {
-    id: string;
+    id?: string;
     originalSrc: string;
     altText?: string;
 };
@@ -583,7 +584,7 @@ declare type OrderAttributesFormFields = {
     phone: TextInputFormField<string>;
     firstName: TextInputFormField<string>;
     lastName: TextInputFormField<string>;
-    lineItems: MultiSelectFormField<OrderLineItem>;
+    lineItems: MultiSelectFormField<ReRobeOrderLineItem>;
     discountApplications: MultiSelectFormField<DiscountApplication>;
     notes: TextInputFormField<string>;
     customer: SingleSelectFormField<UserAttributes>;

package/package.json

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