rerobe-js-orm 3.0.27 → 3.0.29

package/lib/factories/Order/OrderFromFormState.js

@@ -93,7 +93,7 @@ class OrderFromFormState extends OrderFactory_1.default {
             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,
+            state: ((_h = fs.fields) === null || _h === void 0 ? void 0 : _h.state.selectedValue) || 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) || '',

package/lib/factories/Order/OrderToShipmondo.js

@@ -0,0 +1,53 @@
+"use strict";
+// import OrderFactory from './OrderFactory';
+// import Order from '../../models/Order';
+// import OrderHelpers from '../../helpers/OrderHelpers';
+// const orderHelpers: OrderHelpers = new OrderHelpers();
+// export default class OrderToShipmondo extends OrderFactory {
+//   createOrder(order: ReRobeOrderObj): any {
+//     const { amount, currencyCode } = {
+//       amount: order.originalTotalPrice?.amount ?? 0,
+//       currencyCode: order.originalTotalPrice?.currencyCode ?? '',
+//     };
+//     const taxAmount = order.totalTax?.amount ?? 0;
+//     const shipmondoOrder = {
+//       order_id: order.orderNumber,
+//       ship_to: {
+//         name: '',
+//         address1: order.shippingAddress?.address1,
+//         zipcode: order.shippingAddress?.zip,
+//         city: order.shippingAddress?.zip,
+//         country_code: order.shippingAddress?.countryCode,
+//       },
+//       //   bill_to: {
+//       //     name,
+//       //     address1: shipping_address,
+//       //     zipcode: '',
+//       //     city: '',
+//       //     country_code: '',
+//       //   },
+//       sender: {
+//         // name,
+//         // address1: shipping_address,
+//         // zipcode: '',
+//         // city: '',
+//         // country_code: '',
+//       },
+//       payment_details: {
+//         amount_including_vat: +amount + +taxAmount,
+//         currency_code: currencyCode,
+//         vat_amount: taxAmount,
+//       },
+//       order_lines: order.lineItems.map((item: ReRobeOrderLineItem) => ({
+//         line_type: 'item',
+//         item_name: item.title,
+//         quantity: item.quantity,
+//         unit_price_excluding_vat: item.presentmentUnitPrice?.amount,
+//         discount_amount_excluding_vat: item.discountedTotalPrice?.amount,
+//         currency_code: item.presentmentUnitPrice?.currencyCode || item.discountedTotalPrice?.currencyCode,
+//         image_url: item.image?.originalSrc,
+//       })),
+//     };
+//     return shipmondoOrder;
+//   }
+// }

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

@@ -18,5 +18,6 @@ export default class OrderFormState extends FormState {
     }): void;
     discountChangeHandler(val: string): void;
     shippingPriceChangeHandler(val: string): void;
+    private orderStateChangeHandler;
     private fieldFactory;
 }

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

@@ -47,6 +47,7 @@ class OrderFormState extends FormState_1.default {
         this.fields.shippingInfo = this.fieldFactory('singleSelect', 'shippingInfo');
         this.fields.pickupLocation = this.fieldFactory('singleSelect', 'pickupLocation');
         this.fields.presentmentData = this.fieldFactory('singleSelect', 'presentmentData');
+        this.fields.state = this.fieldFactory('singleSelect', 'state');
     }
     createOrder() {
         const orderFactory = new OrderFromFormState_1.default();
@@ -97,6 +98,15 @@ class OrderFormState extends FormState_1.default {
         // Update total price
         this.fields.totalPrice.inputValue = Number(Number(this.fields.subtotalPrice.inputValue) - Number(this.fields.totalDiscount.inputValue) + Number(val)).toFixed(2);
     }
+    orderStateChangeHandler(val) {
+        const values = Object.values(order_constants_1.ORDER_STATES);
+        if (!values.includes(val)) {
+            this.fields.state.selectedValue = order_constants_1.ORDER_STATES.draft;
+        }
+        else {
+            this.fields.state.selectedValue = val;
+        }
+    }
     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, _w, _x, _y, _z, _0;
         let options = fieldOptions || [];
@@ -145,6 +155,7 @@ class OrderFormState extends FormState_1.default {
         }
         if (fieldType === 'singleSelect') {
             let selectedValue = this.props[fieldKey] || '';
+            let onChangeHandler = (val) => this.singleSelectChangeHandler(fieldKey, val);
             if (fieldKey === 'pickupLocation') {
                 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) &&
@@ -188,8 +199,15 @@ class OrderFormState extends FormState_1.default {
                     displayName: this.props.customerName,
                 };
             }
+            if (fieldKey === 'state') {
+                const values = Object.values(order_constants_1.ORDER_STATES);
+                if (!values.includes(selectedValue)) {
+                    selectedValue = order_constants_1.ORDER_STATES.draft;
+                }
+                options = values.map((i) => ({ label: i, value: i }));
+                onChangeHandler = (val) => this.orderStateChangeHandler(val);
+            }
             const valid = !!this.props[fieldKey];
-            const onChangeHandler = (val) => this.singleSelectChangeHandler(fieldKey, val);
             if (fieldKey === 'shippingType') {
                 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/types/rerobe-order-types.d.ts

@@ -731,6 +731,7 @@ declare type OrderAttributesFormFields = {
     shippingInfo: SingleSelectFormField<OrderShippingInfo>;
     pickupLocation: SingleSelectFormField<string>;
     presentmentData: SingleSelectFormField<OrderPresentmentData>;
+    state: SingleSelectFormField<string>;
 };
 declare type OrderRefundFormFields = {
     totalRefunded: TextInputFormField<string | number>;

package/package.json

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