rerobe-js-orm 2.9.5 → 2.9.6

package/lib/factories/Order/OrderFromFormState.d.ts

@@ -1,5 +1,6 @@
 import OrderFactory from './OrderFactory';
 import OrderFormState from '../../form-states/Order/OrderFormState';
 export default class OrderFromFormState extends OrderFactory {
+    getCustomerNameFromOrderFormState(fs: OrderFormState): string;
     createOrder(fs: OrderFormState): ReRobeOrderObj;
 }

package/lib/factories/Order/OrderFromFormState.js

@@ -2,41 +2,66 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const OrderFactory_1 = require("./OrderFactory");
 const Order_1 = require("../../models/Order");
+const order_constants_1 = require("../../constants/order-constants");
 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, _t;
-        const currencyCode = fs.fields.currencyCode.inputValue || 'SEK';
+    getCustomerNameFromOrderFormState(fs) {
+        var _a, _b;
         const customer = fs.fields.customer.selectedValue || {};
         const firstName = fs.fields.firstName.inputValue;
         const lastName = fs.fields.lastName.inputValue;
-        const orderAttributes = {
-            id: ((_a = fs.props) === null || _a === void 0 ? void 0 : _a.id) || '',
-            appliedDiscount: ((_b = fs.props) === null || _b === void 0 ? void 0 : _b.appliedDiscount) || {
-                amount: 0,
-            },
-            documentId: ((_c = fs.props) === null || _c === void 0 ? void 0 : _c.documentId) || '',
-            name: ((_d = fs.props) === null || _d === void 0 ? void 0 : _d.name) || '',
-            orderNumber: (_e = fs.props) === null || _e === void 0 ? void 0 : _e.orderNumber,
-            ribbnOrderNumber: (_f = fs.props) === null || _f === void 0 ? void 0 : _f.ribbnOrderNumber,
-            state: ((_g = fs.props) === null || _g === void 0 ? void 0 : _g.state) || Order_1.default.ORDER_STATES.draft,
-            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: ((_l = fs.props) === null || _l === void 0 ? void 0 : _l.fulfillments) || [],
-            shippingAddress: fs.fields.shippingAddress.selectedValue || {
-                id: '',
-                address1: '',
-                address2: '',
-                city: '',
-                country: '',
-                countryCode: '',
-                province: '',
-                zip: '',
+        if ((_a = fs.props) === null || _a === void 0 ? void 0 : _a.customerName) {
+            return (_b = fs.props) === null || _b === void 0 ? void 0 : _b.customerName;
+        }
+        if (customer.displayName) {
+            return customer.displayName;
+        }
+        if (customer.firstName || customer.lastName) {
+            return `${customer.firstName} ${customer.lastName}`.trim();
+        }
+        if (firstName || lastName) {
+            return `${firstName} ${lastName}`.trim();
+        }
+        return '';
+    }
+    createOrder(fs) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+        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) || '',
+            customerName: this.getCustomerNameFromOrderFormState(fs),
+            email: (customer === null || customer === void 0 ? void 0 : customer.email) || fs.fields.email.inputValue || '',
+            phone: (customer === null || customer === void 0 ? void 0 : customer.phone) || fs.fields.phone.inputValue || '',
+            customerUrl: ((_a = fs.props) === null || _a === void 0 ? void 0 : _a.customerUrl) || '',
+        };
+        const discountsAttr = {
+            appliedDiscount: {
+                amount: ((_b = fs.fields) === null || _b === void 0 ? void 0 : _b.totalDiscount.inputValue) || 0,
+                value: ((_c = fs.fields) === null || _c === void 0 ? void 0 : _c.totalDiscount.inputValue) || 0,
+                title: ((_d = fs.fields) === null || _d === void 0 ? void 0 : _d.discountTitle.inputValue) || '',
+                valueType: 'FIXED_AMOUNT',
             },
-            shippingDiscountAllocations: ((_m = fs.props) === null || _m === void 0 ? void 0 : _m.shippingDiscountAllocations) || [],
+            discountApplications: ((_e = fs.props) === null || _e === void 0 ? void 0 : _e.discountApplications) || [],
+            creditDiscount: { amount: fs.fields.creditDiscount.inputValue || 0, currencyCode },
+            saleDiscount: { amount: fs.fields.saleDiscount.inputValue || 0, currencyCode },
+            additionalDiscount: { amount: fs.fields.additionalDiscount.inputValue || 0, currencyCode },
+        };
+        const initShippingAddress = {
+            id: '',
+            address1: '',
+            address2: '',
+            city: '',
+            country: '',
+            countryCode: '',
+            province: '',
+            zip: '',
+        };
+        const shippingAndLocationAttr = {
+            fulfillmentLocations: ((_f = fs.fields.shippingInfo.selectedValue) === null || _f === void 0 ? void 0 : _f.productsLocationsMapping) || [],
+            shippingAddress: fs.fields.shippingType.selectedValue === order_constants_1.SHIPPING_TYPES.localPickUp
+                ? initShippingAddress
+                : fs.fields.shippingAddress.selectedValue || initShippingAddress,
+            shippingDiscountAllocations: ((_g = fs.props) === null || _g === void 0 ? void 0 : _g.shippingDiscountAllocations) || [],
             shippingLine: fs.fields.shippingLine
                 ? fs.fields.shippingLine.selectedValue
                 : {
@@ -47,19 +72,6 @@ class OrderFromFormState extends OrderFactory_1.default {
                     source: '',
                 },
             shippingType: fs.fields.shippingType.selectedValue,
-            paymentType: fs.fields.paymentType.selectedValue,
-            subtotalPrice: { amount: fs.fields.subtotalPrice.inputValue || 0, currencyCode },
-            totalDiscount: { amount: fs.fields.totalDiscount.inputValue || 0, currencyCode },
-            totalPrice: { amount: fs.fields.totalPrice.inputValue || 0, currencyCode },
-            totalRefunded: { amount: fs.fields.totalRefunded.inputValue || 0, currencyCode },
-            totalShippingPrice: { amount: fs.fields.totalShippingPrice.inputValue || 0, currencyCode },
-            totalTax: { amount: fs.fields.totalTax.inputValue || 0, currencyCode },
-            originalTotalPrice: { amount: fs.fields.originalTotalPrice.inputValue || 0, currencyCode },
-            lineItems: fs.fields.lineItems.selectedValues || [],
-            cancelReason: fs.fields.cancelReason.selectedValue || '',
-            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,
@@ -76,28 +88,33 @@ class OrderFromFormState extends OrderFactory_1.default {
                 isActive: false,
                 name: 'string',
             },
-            notes: fs.fields.notes.inputValue || '',
-            userId: (customer === null || customer === void 0 ? void 0 : customer.uid) || '',
-            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}` : ''),
-            email: (customer === null || customer === void 0 ? void 0 : customer.email) || fs.fields.email.inputValue || '',
-            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: ((_s = fs.props) === null || _s === void 0 ? void 0 : _s.merchantId) || '',
-            tags: fs.fields.tags.selectedValues || [],
-            refunds: ((_t = fs.props) === null || _t === void 0 ? void 0 : _t.refunds) || [],
+        };
+        const presentmentTotalPricesAttr = {
             subtotalPricePresentment: fs.props.subtotalPricePresentment,
             totalDiscountPresentment: fs.props.totalDiscountPresentment,
             totalPricePresentment: fs.props.totalPricePresentment,
             totalRefundedPresentment: fs.props.totalRefundedPresentment,
             totalShippingPricePresentment: fs.props.totalShippingPricePresentment,
             totalTaxPresentment: fs.props.totalTaxPresentment,
-            createdAtTimestamp: 0,
-            updatedAtTimestamp: 0,
         };
+        const totalPricesAttr = {
+            subtotalPrice: { amount: fs.fields.subtotalPrice.inputValue || 0, currencyCode },
+            subTotalWithSalePriceIncluded: { amount: fs.fields.subTotalWithSalePriceIncluded.inputValue || 0, currencyCode },
+            subTotalWithShipping: { amount: fs.fields.subTotalWithShipping.inputValue || 0, currencyCode },
+            totalDiscount: { amount: fs.fields.totalDiscount.inputValue || 0, currencyCode },
+            totalPrice: { amount: fs.fields.totalPrice.inputValue || 0, currencyCode },
+            totalRefunded: { amount: fs.fields.totalRefunded.inputValue || 0, currencyCode },
+            totalShippingPrice: { amount: fs.fields.totalShippingPrice.inputValue || 0, currencyCode },
+            totalTax: { amount: fs.fields.totalTax.inputValue || 0, currencyCode },
+            originalTotalPrice: { amount: fs.fields.originalTotalPrice.inputValue || 0, currencyCode },
+        };
+        const statusesAttr = {
+            state: ((_h = fs.props) === null || _h === void 0 ? void 0 : _h.state) || Order_1.default.ORDER_STATES.draft,
+            financialStatus: fs.fields.financialStatus.selectedValue,
+            fulfillmentStatus: fs.fields.fulfillmentStatus.selectedValue,
+            statusUrl: ((_j = fs.props) === null || _j === void 0 ? void 0 : _j.statusUrl) || '',
+        };
+        const orderAttributes = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, totalPricesAttr), presentmentTotalPricesAttr), discountsAttr), shippingAndLocationAttr), customerAttr), statusesAttr), { id: ((_k = fs.props) === null || _k === void 0 ? void 0 : _k.id) || '', documentId: ((_l = fs.props) === null || _l === void 0 ? void 0 : _l.documentId) || '', name: ((_m = fs.props) === null || _m === void 0 ? void 0 : _m.name) || '', orderNumber: (_o = fs.props) === null || _o === void 0 ? void 0 : _o.orderNumber, ribbnOrderNumber: (_p = fs.props) === null || _p === void 0 ? void 0 : _p.ribbnOrderNumber, merchantId: ((_q = fs.props) === null || _q === void 0 ? void 0 : _q.merchantId) || '', currencyCode: fs.fields.currencyCode.inputValue, lineItems: fs.fields.lineItems.selectedValues || [], fulfillments: ((_r = fs.props) === null || _r === void 0 ? void 0 : _r.fulfillments) || [], refunds: ((_s = fs.props) === null || _s === void 0 ? void 0 : _s.refunds) || [], paymentType: fs.fields.paymentType.selectedValue, paymentMethod: fs.fields.paymentMethod.selectedValue || '', paymentDetails: fs.fields.paymentDetails.selectedValue || {}, notes: fs.fields.notes.inputValue || '', tags: fs.fields.tags.selectedValues || [], cancelReason: fs.fields.cancelReason.selectedValue || '', canceledAt: ((_t = fs.props) === null || _t === void 0 ? void 0 : _t.canceledAt) || '', processedAt: ((_u = fs.props) === null || _u === void 0 ? void 0 : _u.processedAt) || new Date().toUTCString(), createdAtTimestamp: 0, updatedAtTimestamp: 0 });
         return new Order_1.default(Object.assign({}, orderAttributes));
     }
 }

package/lib/form-states/FormState.d.ts

@@ -9,4 +9,10 @@ export default abstract class FormState extends Base {
     onAddNewOptionToFormFieldOptions(key: keyof FormStateObject, option: FormFieldOption): void;
     onSetNewFormFieldOptions(key: keyof FormStateObject, options: FormFieldOption[]): void;
     editExistingOption(key: keyof FormStateObject, oldOptionValue: string, option: FormFieldOption): void;
+    setTextInputFormStateFields(formStateSlice: {
+        [key: string]: string | number | null;
+    }): void;
+    setSingleSelectFormStateFields(formStateSlice: {
+        [key: string]: any;
+    }): void;
 }

package/lib/form-states/FormState.js

@@ -50,5 +50,17 @@ class FormState extends Base_1.default {
             formField.options[existingOptionIndex] = option;
         }
     }
+    setTextInputFormStateFields(formStateSlice) {
+        Object.keys(formStateSlice).forEach((key) => {
+            const field = this.fields[key];
+            field.inputValue = formStateSlice[key] || '';
+        });
+    }
+    setSingleSelectFormStateFields(formStateSlice) {
+        Object.keys(formStateSlice).forEach((key) => {
+            const field = this.fields[key];
+            field.selectedValue = formStateSlice[key] || '';
+        });
+    }
 }
 exports.default = FormState;

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

@@ -15,7 +15,7 @@ class OrderFormState extends FormState_1.default {
         this.fields.financialStatus = this.fieldFactory('singleSelect', 'financialStatus', options_1.financialStatusOptions);
         this.fields.fulfillmentStatus = this.fieldFactory('singleSelect', 'fulfillmentStatus', options_1.fulfillmentStatusOptions);
         this.fields.shippingAddress = this.fieldFactory('singleSelect', 'shippingAddress');
-        this.fields.shippingType = this.fieldFactory('singleSelect', 'shippingType');
+        this.fields.shippingType = this.fieldFactory('singleSelect', 'shippingType', options_1.defaultShippingTypeOptions);
         this.fields.paymentType = this.fieldFactory('singleSelect', 'paymentType');
         this.fields.subtotalPrice = this.fieldFactory('textInput', 'subtotalPrice');
         this.fields.totalPrice = this.fieldFactory('textInput', 'totalPrice');
@@ -36,6 +36,15 @@ class OrderFormState extends FormState_1.default {
         this.fields.paymentMethod = this.fieldFactory('singleSelect', 'paymentMethod');
         this.fields.paymentDetails = this.fieldFactory('singleSelect', 'paymentDetails');
         this.fields.tags = this.fieldFactory('multiSelect', 'tags', options_1.defaultTags);
+        this.fields.subTotalWithSalePriceIncluded = this.fieldFactory('textInput', 'subTotalWithSalePriceIncluded');
+        this.fields.subTotalWithShipping = this.fieldFactory('textInput', 'subTotalWithShipping');
+        this.fields.discountTitle = this.fieldFactory('textInput', 'discountTitle');
+        this.fields.creditDiscount = this.fieldFactory('textInput', 'creditDiscount');
+        this.fields.saleDiscount = this.fieldFactory('textInput', 'saleDiscount');
+        this.fields.availableCredit = this.fieldFactory('textInput', 'availableCredit');
+        this.fields.additionalDiscount = this.fieldFactory('textInput', 'additionalDiscount');
+        this.fields.shippingInfo = this.fieldFactory('singleSelect', 'shippingInfo');
+        this.fields.pickupLocation = this.fieldFactory('singleSelect', 'pickupLocation');
     }
     createOrder() {
         const orderFactory = new OrderFromFormState_1.default();
@@ -103,7 +112,11 @@ class OrderFormState extends FormState_1.default {
                 fieldKey === 'totalShippingPrice' ||
                 fieldKey === 'totalTax' ||
                 fieldKey === 'totalRefunded' ||
-                fieldKey === 'originalTotalPrice') {
+                fieldKey === 'originalTotalPrice' ||
+                fieldKey === 'creditDiscount' ||
+                fieldKey === 'saleDiscount' ||
+                fieldKey === 'additionalDiscount' ||
+                fieldKey === 'subTotalWithShipping') {
                 // @ts-ignore
                 inputValue = this.props[fieldKey] ? this.props[fieldKey].amount : 0;
             }

package/lib/form-states/Order/options.d.ts

@@ -14,3 +14,10 @@ export const defaultTags: {
     label: string;
     value: string;
 }[];
+export const defaultShippingTypeOptions: {
+    label: string;
+    value: string;
+    description: string;
+    price: number;
+    disabled: boolean;
+}[];

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultTags = exports.cancelTypeOptions = exports.fulfillmentStatusOptions = exports.financialStatusOptions = void 0;
+exports.defaultShippingTypeOptions = exports.defaultTags = exports.cancelTypeOptions = exports.fulfillmentStatusOptions = exports.financialStatusOptions = void 0;
 const financialStatusOptions = [
     { label: 'Authorized', value: 'AUTHORIZED' },
     { label: 'Paid', value: 'PAID' },
@@ -34,3 +34,27 @@ const defaultTags = [
     { label: 'third-party-channel', value: 'third-party-channel' },
 ];
 exports.defaultTags = defaultTags;
+const defaultShippingTypeOptions = [
+    {
+        label: 'Local pick up',
+        value: 'LOCAL_PICK_UP',
+        description: 'FREE',
+        price: 0,
+        disabled: false,
+    },
+    {
+        label: 'Local delivery',
+        value: 'LOCAL_DELIVERY',
+        description: '',
+        price: 0,
+        disabled: true,
+    },
+    {
+        label: 'Shipping',
+        value: 'SHIPPING',
+        description: '',
+        price: 0,
+        disabled: true,
+    },
+];
+exports.defaultShippingTypeOptions = defaultShippingTypeOptions;

package/lib/models/Order.d.ts

@@ -72,6 +72,9 @@ export default class Order extends Base {
     customerUrl: string;
     email: string;
     phone: string;
+    creditDiscount: Money;
+    saleDiscount: Money;
+    additionalDiscount: Money;
     discountApplications: DiscountApplication[];
     physicalLocation: OrderLocation;
     paymentType: ReRobePaymentTypes;
@@ -84,6 +87,8 @@ export default class Order extends Base {
     merchantId: string;
     refunds: OrderRefund[];
     subtotalPricePresentment: Money;
+    subTotalWithSalePriceIncluded: Money;
+    subTotalWithShipping: Money;
     totalDiscountPresentment: Money;
     totalPricePresentment: Money;
     totalRefundedPresentment: Money;

package/lib/models/Order.js

@@ -52,34 +52,25 @@ class Order extends Base_1.default {
         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,
-        };
+        this.subtotalPrice = (props === null || props === void 0 ? void 0 : props.subtotalPrice) || { amount: 0 };
+        this.subTotalWithSalePriceIncluded = (props === null || props === void 0 ? void 0 : props.subTotalWithSalePriceIncluded) || { amount: 0 };
+        this.subTotalWithShipping = (props === null || props === void 0 ? void 0 : props.subTotalWithShipping) || { amount: 0 };
         this.tags = (props === null || props === void 0 ? void 0 : props.tags) || [];
-        this.totalDiscount = (props === null || props === void 0 ? void 0 : props.totalDiscount) || {
-            amount: 0,
-        };
-        this.totalPrice = (props === null || props === void 0 ? void 0 : props.totalPrice) || {
-            amount: 0,
-        };
-        this.totalRefunded = (props === null || props === void 0 ? void 0 : props.totalRefunded) || {
-            amount: 0,
-        };
-        this.totalShippingPrice = (props === null || props === void 0 ? void 0 : props.totalShippingPrice) || {
-            amount: 0,
-        };
-        this.totalTax = (props === null || props === void 0 ? void 0 : props.totalTax) || {
-            amount: 0,
-        };
-        this.originalTotalPrice = (props === null || props === void 0 ? void 0 : props.originalTotalPrice) || {
-            amount: 0,
-        };
+        this.totalDiscount = (props === null || props === void 0 ? void 0 : props.totalDiscount) || { amount: 0 };
+        this.totalPrice = (props === null || props === void 0 ? void 0 : props.totalPrice) || { amount: 0 };
+        this.totalRefunded = (props === null || props === void 0 ? void 0 : props.totalRefunded) || { amount: 0 };
+        this.totalShippingPrice = (props === null || props === void 0 ? void 0 : props.totalShippingPrice) || { amount: 0 };
+        this.totalTax = (props === null || props === void 0 ? void 0 : props.totalTax) || { amount: 0 };
+        this.originalTotalPrice = (props === null || props === void 0 ? void 0 : props.originalTotalPrice) || { amount: 0 };
         this.lineItems = (props === null || props === void 0 ? void 0 : props.lineItems) || [];
         this.cancelReason = (props === null || props === void 0 ? void 0 : props.cancelReason) ? props === null || props === void 0 ? void 0 : props.cancelReason.toUpperCase() : '';
         this.canceledAt = (props === null || props === void 0 ? void 0 : props.canceledAt) || '';
         this.customerUrl = (props === null || props === void 0 ? void 0 : props.customerUrl) || '';
         this.email = (props === null || props === void 0 ? void 0 : props.email) || '';
         this.phone = (props === null || props === void 0 ? void 0 : props.phone) || '';
+        this.creditDiscount = (props === null || props === void 0 ? void 0 : props.creditDiscount) || { amount: 0 };
+        this.saleDiscount = (props === null || props === void 0 ? void 0 : props.saleDiscount) || { amount: 0 };
+        this.additionalDiscount = (props === null || props === void 0 ? void 0 : props.additionalDiscount) || { amount: 0 };
         this.discountApplications = (props === null || props === void 0 ? void 0 : props.discountApplications) || [];
         this.physicalLocation = (props === null || props === void 0 ? void 0 : props.physicalLocation) || {
             id: '',
@@ -150,6 +141,8 @@ class Order extends Base_1.default {
             shopifyOrderNumber: this.shopifyOrderNumber,
             ribbnOrderNumber: this.ribbnOrderNumber,
             subtotalPrice: this.subtotalPrice,
+            subTotalWithSalePriceIncluded: this.subTotalWithSalePriceIncluded,
+            subTotalWithShipping: this.subTotalWithShipping,
             tags: this.tags,
             totalDiscount: this.totalDiscount,
             totalPrice: this.totalPrice,
@@ -163,6 +156,9 @@ class Order extends Base_1.default {
             customerUrl: this.customerUrl,
             email: this.email,
             phone: this.phone,
+            creditDiscount: this.creditDiscount,
+            saleDiscount: this.saleDiscount,
+            additionalDiscount: this.additionalDiscount,
             discountApplications: this.discountApplications,
             physicalLocation: this.physicalLocation,
             state: this.state,

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

@@ -26,7 +26,7 @@ interface FormFieldOption {
     label: string;
     value: string | boolean;
     description?: string;
-    key?: string;
+    [key: string]: any;
 }
 interface FileObj {
     uri: string;

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

@@ -18,6 +18,9 @@ declare type DraftOrderObj = {
 declare type ReRobeOrderObj = {
     id: string;
     appliedDiscount: AppliedDiscount;
+    creditDiscount?: Money;
+    saleDiscount?: Money;
+    additionalDiscount?: Money;
     documentId?: string;
     name: string;
     orderNumber: number;
@@ -42,6 +45,8 @@ declare type ReRobeOrderObj = {
     shopifyOrderNumber?: number | null;
     ribbnOrderNumber?: number | null;
     subtotalPrice: Money;
+    subTotalWithSalePriceIncluded?: Money;
+    subTotalWithShipping?: Money;
     tags?: string[] | string | null;
     totalDiscount: Money;
     totalPrice: Money;
@@ -629,6 +634,36 @@ declare type ShippingLineRest = {
     tax_lines: TaxLineRest[];
     carrier_identifier: string | null;
 };
+declare type FulfillmentLocationInfo = {
+    locationId: string;
+    name: string;
+    address1: string;
+    address2: string;
+    city: string;
+    country: string;
+    countryCode: string;
+    province: string;
+    zip: string;
+};
+declare type ShippingTypeOption = {
+    label: string;
+    value: ReRobeShippingAndDeliveryTypes;
+    description: string;
+    price: string | number;
+    disabled: boolean;
+};
+declare type ProductLocationMapping = {
+    location: FulfillmentLocationInfo;
+    productsIds: string[];
+    shippingPrice: number | string;
+    shippingRateName: string;
+};
+declare type OrderShippingInfo = {
+    description: string;
+    price: string | number | null;
+    disabled: boolean;
+    productsLocationsMapping: ProductLocationMapping[];
+};
 declare type CompleteOrder = ReRobeOrderObj & {
     [key: string]: any;
 };
@@ -667,6 +702,15 @@ declare type OrderAttributesFormFields = {
     paymentDetails: SingleSelectFormField<PaymentDetails>;
     tags: MultiSelectFormField<string>;
     refunds: MultiSelectFormField<OrderRefund>;
+    subTotalWithSalePriceIncluded: TextInputFormField<string | number>;
+    subTotalWithShipping: TextInputFormField<string | number>;
+    discountTitle: TextInputFormField<string>;
+    creditDiscount: TextInputFormField<string | number>;
+    saleDiscount: TextInputFormField<string | number>;
+    availableCredit: TextInputFormField<string | number>;
+    additionalDiscount: TextInputFormField<string | number>;
+    shippingInfo: SingleSelectFormField<OrderShippingInfo>;
+    pickupLocation: SingleSelectFormField<string>;
 };
 declare type OrderRefundFormFields = {
     totalRefunded: TextInputFormField<string | number>;

package/package.json

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