rerobe-js-orm 2.9.8 → 2.9.9

package/lib/factories/Order/OrderFromFormState.js

@@ -9,7 +9,7 @@ class OrderFromFormState extends OrderFactory_1.default {
         const currencyCode = fs.fields.currencyCode.inputValue || 'SEK';
         const customer = fs.fields.customer.selectedValue || {};
         const customerAttr = {
-            userId: (customer === null || customer === void 0 ? void 0 : customer.uid) || '',
+            userId: (customer === null || customer === void 0 ? void 0 : customer.uid) || (customer === null || customer === void 0 ? void 0 : customer.documentId) || '',
             customerName: ((_a = fs.props) === null || _a === void 0 ? void 0 : _a.customerName) || `${fs.fields.firstName.inputValue} ${fs.fields.lastName.inputValue}`.trim(),
             email: fs.fields.email.inputValue || '',
             phone: fs.fields.phone.inputValue || '',
@@ -71,6 +71,9 @@ class OrderFromFormState extends OrderFactory_1.default {
             },
         };
         const presentmentTotalPricesAttr = {
+            creditDiscountPresentment: fs.fields.presentmentData.selectedValue.creditDiscountPresentment,
+            saleDiscountPresentment: fs.fields.presentmentData.selectedValue.saleDiscountPresentment,
+            additionalDiscountPresentment: fs.fields.presentmentData.selectedValue.additionalDiscountPresentment,
             subtotalPricePresentment: fs.fields.presentmentData.selectedValue.subtotalPricePresentment,
             totalDiscountPresentment: fs.fields.presentmentData.selectedValue.totalDiscountPresentment,
             totalPricePresentment: fs.fields.presentmentData.selectedValue.totalPricePresentment,

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

@@ -105,7 +105,7 @@ class OrderFormState extends FormState_1.default {
         this.fields.lastName.inputValue = !(customer === null || customer === void 0 ? void 0 : customer.displayName) && (customer === null || customer === void 0 ? void 0 : customer.lastName) ? customer === null || customer === void 0 ? void 0 : customer.lastName : '';
     }
     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;
+        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 || [];
         const hidden = false;
         if (fieldType === 'textInput') {
@@ -116,6 +116,9 @@ class OrderFormState extends FormState_1.default {
             if (fieldKey === 'lastName') {
                 inputValue = this.props.name && this.props.name.split(' ').length > 1 ? this.props.name.split(' ')[1] : '';
             }
+            if (fieldKey === 'discountTitle') {
+                inputValue = ((_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.appliedDiscount) === null || _b === void 0 ? void 0 : _b.title) || '';
+            }
             if (fieldKey === 'subtotalPrice' ||
                 fieldKey === 'totalPrice' ||
                 fieldKey === 'totalDiscount' ||
@@ -148,36 +151,39 @@ class OrderFormState extends FormState_1.default {
         if (fieldType === 'singleSelect') {
             let selectedValue = this.props[fieldKey] || '';
             if (fieldKey === 'pickupLocation') {
-                if (((_a = this.props) === null || _a === void 0 ? void 0 : _a.shippingType) === order_constants_1.SHIPPING_TYPES.localPickUp) {
-                    selectedValue =
-                        ((_b = this.props) === null || _b === void 0 ? void 0 : _b.fulfillmentLocations) && ((_c = this.props.fulfillmentLocations[0]) === null || _c === void 0 ? void 0 : _c.location)
-                            ? this.props.fulfillmentLocations[0].location.locationId ||
-                                this.props.fulfillmentLocations[0].location.documentId ||
-                                ''
-                            : '';
+                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) &&
+                    ((_e = this.props.fulfillmentLocations[0]) === null || _e === void 0 ? void 0 : _e.location)) {
+                    const location = this.props.fulfillmentLocations[0].location;
+                    const locationId = location.locationId || location.documentId || '';
+                    selectedValue = locationId;
+                    options = [{ label: location.address1 ? this.utilities.getAddressLabel(location) : '', value: locationId }];
                 }
-                if ((_e = (_d = this.opts) === null || _d === void 0 ? void 0 : _d.pickupLocationOptions) === null || _e === void 0 ? void 0 : _e.length) {
-                    options = this.utilities.uniqObjArray(this.opts.pickupLocationOptions, 'value');
+                if ((_g = (_f = this.opts) === null || _f === void 0 ? void 0 : _f.pickupLocationOptions) === null || _g === void 0 ? void 0 : _g.length) {
+                    options = this.utilities.uniqObjArray([...options, ...this.opts.pickupLocationOptions], 'value');
                 }
             }
             if (fieldKey === 'shippingInfo') {
                 selectedValue = {
-                    productsLocationsMapping: ((_f = this.props) === null || _f === void 0 ? void 0 : _f.fulfillmentLocations) || [],
+                    productsLocationsMapping: ((_h = this.props) === null || _h === void 0 ? void 0 : _h.fulfillmentLocations) || [],
                     description: '',
-                    price: ((_h = (_g = this.props) === null || _g === void 0 ? void 0 : _g.totalShippingPrice) === null || _h === void 0 ? void 0 : _h.amount) || 0,
+                    price: ((_k = (_j = this.props) === null || _j === void 0 ? void 0 : _j.totalShippingPrice) === null || _k === void 0 ? void 0 : _k.amount) || 0,
                     disabled: false,
                 };
             }
             if (fieldKey === 'presentmentData') {
                 selectedValue = {
-                    presentmentCurrencyCode: ((_k = (_j = this.props) === null || _j === void 0 ? void 0 : _j.totalPricePresentment) === null || _k === void 0 ? void 0 : _k.currencyCode) || '',
-                    discountTitlePresentment: ((_m = (_l = this.props) === null || _l === void 0 ? void 0 : _l.appliedDiscount) === null || _m === void 0 ? void 0 : _m.title) || '',
-                    subtotalPricePresentment: ((_o = this.props) === null || _o === void 0 ? void 0 : _o.subtotalPricePresentment) || { amount: 0 },
-                    totalDiscountPresentment: ((_p = this.props) === null || _p === void 0 ? void 0 : _p.totalDiscountPresentment) || { amount: 0 },
-                    totalShippingPricePresentment: ((_q = this.props) === null || _q === void 0 ? void 0 : _q.totalShippingPricePresentment) || { amount: 0 },
-                    totalPricePresentment: ((_r = this.props) === null || _r === void 0 ? void 0 : _r.totalPricePresentment) || { amount: 0 },
-                    totalRefundedPresentment: ((_s = this.props) === null || _s === void 0 ? void 0 : _s.totalRefundedPresentment) || { amount: 0 },
-                    totalTaxPresentment: ((_t = this.props) === null || _t === void 0 ? void 0 : _t.totalTaxPresentment) || { amount: 0 },
+                    presentmentCurrencyCode: ((_m = (_l = this.props) === null || _l === void 0 ? void 0 : _l.totalPricePresentment) === null || _m === void 0 ? void 0 : _m.currencyCode) || '',
+                    discountTitlePresentment: ((_p = (_o = this.props) === null || _o === void 0 ? void 0 : _o.appliedDiscount) === null || _p === void 0 ? void 0 : _p.title) || '',
+                    subtotalPricePresentment: ((_q = this.props) === null || _q === void 0 ? void 0 : _q.subtotalPricePresentment) || { amount: 0 },
+                    totalDiscountPresentment: ((_r = this.props) === null || _r === void 0 ? void 0 : _r.totalDiscountPresentment) || { amount: 0 },
+                    totalShippingPricePresentment: ((_s = this.props) === null || _s === void 0 ? void 0 : _s.totalShippingPricePresentment) || { amount: 0 },
+                    totalPricePresentment: ((_t = this.props) === null || _t === void 0 ? void 0 : _t.totalPricePresentment) || { amount: 0 },
+                    totalRefundedPresentment: ((_u = this.props) === null || _u === void 0 ? void 0 : _u.totalRefundedPresentment) || { amount: 0 },
+                    totalTaxPresentment: ((_v = this.props) === null || _v === void 0 ? void 0 : _v.totalTaxPresentment) || { amount: 0 },
+                    creditDiscountPresentment: ((_w = this.props) === null || _w === void 0 ? void 0 : _w.creditDiscountPresentment) || { amount: 0 },
+                    saleDiscountPresentment: ((_x = this.props) === null || _x === void 0 ? void 0 : _x.saleDiscountPresentment) || { amount: 0 },
+                    additionalDiscountPresentment: ((_y = this.props) === null || _y === void 0 ? void 0 : _y.additionalDiscountPresentment) || { amount: 0 },
                 };
             }
             const valid = !!this.props[fieldKey];
@@ -191,7 +197,7 @@ class OrderFormState extends FormState_1.default {
                 onChangeHandler = (val) => this.customerChangeHandler(val);
             }
             if (fieldKey === 'shippingType') {
-                if ((_v = (_u = this.opts) === null || _u === void 0 ? void 0 : _u.shippingTypeOptions) === null || _v === void 0 ? void 0 : _v.length) {
+                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/helpers/Utilities.d.ts

@@ -16,4 +16,5 @@ export default class Utilities {
     sanitizeMillisTimeStamp(t: any): number;
     isProperString(name: any): boolean;
     toProperString(name: any): string;
+    getAddressLabel(address: AddressInput): string;
 }

package/lib/helpers/Utilities.js

@@ -128,5 +128,14 @@ class Utilities {
         // Capitalize each word and join the words together
         return words.map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(' ');
     }
+    getAddressLabel(address) {
+        const { address1 = '', address2 = '', zip = '', city = '', province = '', country = '' } = address;
+        return [address1, address2, zip, city, province, country].reduce((res, item) => {
+            if (item) {
+                return (res === null || res === void 0 ? void 0 : res.length) ? `${res}, ${item}` : item;
+            }
+            return res;
+        }, '');
+    }
 }
 exports.default = Utilities;

package/lib/models/Order.d.ts

@@ -94,6 +94,9 @@ export default class Order extends Base {
     totalRefundedPresentment: Money;
     totalShippingPricePresentment: Money;
     totalTaxPresentment: Money;
+    creditDiscountPresentment: Money;
+    saleDiscountPresentment: Money;
+    additionalDiscountPresentment: Money;
     createdAtTimestamp: number;
     updatedAtTimestamp: number;
     constructor(props?: any);

package/lib/models/Order.js

@@ -115,6 +115,15 @@ class Order extends Base_1.default {
         this.totalTaxPresentment = (props === null || props === void 0 ? void 0 : props.totalTaxPresentment) || {
             amount: 0,
         };
+        this.creditDiscountPresentment = (props === null || props === void 0 ? void 0 : props.creditDiscountPresentment) || {
+            amount: 0,
+        };
+        this.saleDiscountPresentment = (props === null || props === void 0 ? void 0 : props.saleDiscountPresentment) || {
+            amount: 0,
+        };
+        this.additionalDiscountPresentment = (props === null || props === void 0 ? void 0 : props.additionalDiscountPresentment) || {
+            amount: 0,
+        };
         this.createdAtTimestamp = (props === null || props === void 0 ? void 0 : props.createdAtTimestamp) || 0;
         this.updatedAtTimestamp = (props === null || props === void 0 ? void 0 : props.updatedAtTimestamp) || 0;
     }
@@ -173,6 +182,9 @@ class Order extends Base_1.default {
             totalRefundedPresentment: this.totalRefundedPresentment,
             totalShippingPricePresentment: this.totalShippingPricePresentment,
             totalTaxPresentment: this.totalTaxPresentment,
+            creditDiscountPresentment: this.creditDiscountPresentment,
+            saleDiscountPresentment: this.saleDiscountPresentment,
+            additionalDiscountPresentment: this.additionalDiscountPresentment,
             createdAtTimestamp: this.createdAtTimestamp,
             updatedAtTimestamp: this.updatedAtTimestamp,
         };

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

@@ -74,6 +74,9 @@ declare type ReRobeOrderObj = {
     totalRefundedPresentment?: Money;
     totalShippingPricePresentment?: Money;
     totalTaxPresentment?: Money;
+    creditDiscountPresentment?: Money;
+    saleDiscountPresentment?: Money;
+    additionalDiscountPresentment?: Money;
     createdAtTimestamp: number;
     updatedAtTimestamp: number;
 };
@@ -676,6 +679,9 @@ declare type OrderPresentmentData = {
     totalPricePresentment: Money;
     totalRefundedPresentment?: Money;
     totalTaxPresentment?: Money;
+    creditDiscountPresentment?: Money;
+    saleDiscountPresentment?: Money;
+    additionalDiscountPresentment?: Money;
 };
 declare type CompleteOrder = ReRobeOrderObj & {
     [key: string]: any;

package/package.json

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