rerobe-js-orm 3.8.7 → 3.8.9

package/lib/factories/Merchant/MerchantFromFormState.js

@@ -20,6 +20,7 @@ class MerchantFromFormState extends MerchantFactory_1.default {
             webhooks: fs.fields.webhooks.selectedValues,
             primaryDomain: fs.fields.primaryDomain.inputValue,
             socialLinks: fs.fields.socialLinks.selectedValue,
+            organizationNumber: fs.fields.organizationNumber.inputValue,
         };
         return new Merchant_1.default(Object.assign(Object.assign({}, fs.props), MerchantMutableData));
     }

package/lib/factories/Order/OrderFromFormState.js

@@ -5,7 +5,7 @@ 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, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
+        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, _1, _2, _3, _4, _5, _6;
         const currencyCode = fs.fields.currencyCode.inputValue || 'SEK';
         const customer = fs.fields.customer.selectedValue || {};
         const customerAttr = {
@@ -98,7 +98,7 @@ class OrderFromFormState extends OrderFactory_1.default {
             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(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(), adjustments: ((_v = fs.props) === null || _v === void 0 ? void 0 : _v.adjustments) || [], createdAtTimestamp: 0, updatedAtTimestamp: 0, createdByUserId: ((_w = fs.props) === null || _w === void 0 ? void 0 : _w.createdByUserId) || '', taxTitle: fs.fields.taxTitle.inputValue || '' }), (((_x = fs.props) === null || _x === void 0 ? void 0 : _x.zettleTransactionObj) && {
+        const orderAttributes = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(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(), adjustments: ((_v = fs.props) === null || _v === void 0 ? void 0 : _v.adjustments) || [], createdAtTimestamp: 0, updatedAtTimestamp: 0, createdByUserId: ((_w = fs.props) === null || _w === void 0 ? void 0 : _w.createdByUserId) || '', taxTitle: fs.fields.taxTitle.inputValue || '' }), (((_x = fs.props) === null || _x === void 0 ? void 0 : _x.zettleTransactionObj) && {
             zettleTransactionObj: (_y = fs.props) === null || _y === void 0 ? void 0 : _y.zettleTransactionObj,
         })), (((_z = fs.props) === null || _z === void 0 ? void 0 : _z.paymentIntentObj) && {
             paymentIntentObj: (_0 = fs.props) === null || _0 === void 0 ? void 0 : _0.paymentIntentObj,
@@ -106,6 +106,8 @@ class OrderFromFormState extends OrderFactory_1.default {
             paymentIntentId: (_2 = fs.props) === null || _2 === void 0 ? void 0 : _2.paymentIntentId,
         })), (((_3 = fs.props) === null || _3 === void 0 ? void 0 : _3.receiptObj) && {
             receiptObj: (_4 = fs.props) === null || _4 === void 0 ? void 0 : _4.receiptObj,
+        })), (((_5 = fs.props) === null || _5 === void 0 ? void 0 : _5.channelPartnerOrderId) && {
+            channelPartnerOrderId: (_6 = fs.props) === null || _6 === void 0 ? void 0 : _6.channelPartnerOrderId,
         }));
         return new Order_1.default(Object.assign({}, orderAttributes));
     }

package/lib/form-states/Merchant/MerchantFormState.js

@@ -14,6 +14,7 @@ class MerchantFormState extends FormState_1.default {
         this.fields.senderEmail = this.fieldFactory('textInput', 'senderEmail');
         this.fields.industry = this.fieldFactory('singleSelect', 'industry', options_1.industryOptions);
         this.fields.legalName = this.fieldFactory('textInput', 'legalName');
+        this.fields.organizationNumber = this.fieldFactory('textInput', 'organizationNumber');
         this.fields.phone = this.fieldFactory('textInput', 'phone');
         this.fields.address = this.fieldFactory('singleSelect', 'address');
         this.fields.currency = this.fieldFactory('singleSelect', 'currency', options_1.currencyOptions);

package/lib/helpers/OrderHelpers.d.ts

@@ -217,10 +217,11 @@ export default class OrderHelpers {
     getPaymentTerminalReceiptInfo(payload?: any): PaymentTerminalReceiptInfo;
     getFormattedFulfillmentLocation(order: ReRobeOrderObj): string;
     generateReceiptLabels(locale: string, paymentMethod: string, entryMode?: string): ReceiptLabels;
-    buildReceiptObjFromOrder({ order, merchant, merchantLogoUrl, receiptNumber, }: {
+    buildReceiptObjFromOrder({ order, merchant, merchantLogoUrl, receiptNumber, additionalInfo, }: {
         order: ReRobeOrderObj;
         merchant: MerchantObj;
         merchantLogoUrl: string;
         receiptNumber: string;
+        additionalInfo: string;
     }): ReceiptObj;
 }

package/lib/helpers/OrderHelpers.js

@@ -547,7 +547,7 @@ class OrderHelpers {
             entryModeLabel,
         };
     }
-    buildReceiptObjFromOrder({ order, merchant, merchantLogoUrl = '', receiptNumber = '', }) {
+    buildReceiptObjFromOrder({ order, merchant, merchantLogoUrl = '', receiptNumber = '', additionalInfo = '', }) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const { address: merchantAddress, legalName, contactEmail, phone = '', organizationNumber = '', primaryDomain, currency: storeCurrencyCode, } = merchant;
         const currencyCode = ((_a = order.totalPricePresentment) === null || _a === void 0 ? void 0 : _a.currencyCode) || storeCurrencyCode;
@@ -635,7 +635,8 @@ class OrderHelpers {
         return Object.assign(Object.assign({ merchantLogoUrl, merchantName: legalName, storeAddress: buildStoreAddress(), phone,
             contactEmail,
             organizationNumber,
-            primaryDomain, storeUrl: `https://${primaryDomain}`, orderDate: (0, Utilities_1.getFormattedTimestamp)(presentmentLocale), receiptNumber, lineItems: buildLineItems(), subTotal: (0, Utilities_1.formatPrice)({
+            primaryDomain, storeUrl: `https://${primaryDomain}`, orderDate: (0, Utilities_1.getFormattedTimestamp)(presentmentLocale), receiptNumber,
+            additionalInfo, lineItems: buildLineItems(), subTotal: (0, Utilities_1.formatPrice)({
                 currencyCode,
                 amount: (_e = (_d = order.subtotalPricePresentment) === null || _d === void 0 ? void 0 : _d.amount) !== null && _e !== void 0 ? _e : '',
                 fractionDigits: 2,

package/lib/models/Merchant.d.ts

@@ -79,6 +79,10 @@ export default class Merchant extends Base {
     primaryDomain: string;
     webshopHomePageId: string;
     socialLinks: SocialLinksType | null;
+    isChannelPartner?: boolean;
+    isZettleUser?: boolean;
+    hasStripeBluetoothReader?: boolean;
+    organizationNumber?: string;
     constructor(props?: any);
     toObj(): MerchantObj;
     toMerchantMutableData(): MerchantMutableData;

package/lib/models/Merchant.js

@@ -47,9 +47,19 @@ class Merchant extends Base_1.default {
             pinterest: '',
             tiktok: '',
         };
+        this.organizationNumber = (props === null || props === void 0 ? void 0 : props.organizationNumber) || '';
+        if (props === null || props === void 0 ? void 0 : props.isChannelPartner) {
+            this.isChannelPartner = props.isChannelPartner;
+        }
+        if (props === null || props === void 0 ? void 0 : props.isZettleUser) {
+            this.isZettleUser = props.isZettleUser;
+        }
+        if (props === null || props === void 0 ? void 0 : props.hasStripeBluetoothReader) {
+            this.hasStripeBluetoothReader = props.hasStripeBluetoothReader;
+        }
     }
     toObj() {
-        return {
+        const mObj = {
             name: this.name,
             type: this.type,
             paymentTier: this.paymentTier,
@@ -76,7 +86,18 @@ class Merchant extends Base_1.default {
             primaryDomain: this.primaryDomain,
             webshopHomePageId: this.webshopHomePageId,
             socialLinks: this.socialLinks,
+            organizationNumber: this.organizationNumber,
         };
+        if (this.isChannelPartner) {
+            mObj.isChannelPartner = this.isChannelPartner;
+        }
+        if (this.isZettleUser) {
+            mObj.isZettleUser = this.isZettleUser;
+        }
+        if (this.hasStripeBluetoothReader) {
+            mObj.hasStripeBluetoothReader = this.hasStripeBluetoothReader;
+        }
+        return mObj;
     }
     toMerchantMutableData() {
         return {

package/lib/models/Order.d.ts

@@ -110,6 +110,7 @@ export default class Order extends Base {
     paymentIntentObj?: any;
     paymentIntentId?: string;
     receiptObj?: ReceiptObj;
+    channelPartnerOrderId?: string;
     constructor(props?: any);
     toObj(): ReRobeOrderObj;
     generateSchemaForTypesense(name?: string): {

package/lib/models/Order.js

@@ -141,6 +141,9 @@ class Order extends Base_1.default {
         if (props === null || props === void 0 ? void 0 : props.receiptObj) {
             this.receiptObj = props.receiptObj;
         }
+        if (props === null || props === void 0 ? void 0 : props.channelPartnerOrderId) {
+            this.channelPartnerOrderId = props.channelPartnerOrderId;
+        }
     }
     toObj() {
         const orderObj = {
@@ -229,6 +232,9 @@ class Order extends Base_1.default {
         if (this.receiptObj) {
             orderObj.receiptObj = this.receiptObj;
         }
+        if (this.channelPartnerOrderId) {
+            orderObj.channelPartnerOrderId = this.channelPartnerOrderId;
+        }
         return orderObj;
     }
     generateSchemaForTypesense(name = 'prod_orders_20220809') {

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

@@ -37,6 +37,8 @@ type MerchantSystemOnlyMutableData = {
     webshopHomePageId: string;
     defaultLocation: string;
     isZettleUser?: boolean;
+    isChannelPartner?: boolean;
+    hasStripeBluetoothReader?: boolean;
 };
 type MerchantObj = MerchantMutableData & MerchantSystemOnlyMutableData;
 type MerchantTypes = 'INDIVIDUAL' | 'BUSINESS';
@@ -69,6 +71,7 @@ type MerchantFormFields = {
     senderEmail: TextInputFormField<string>;
     industry: SingleSelectFormField<string>;
     legalName: TextInputFormField<string>;
+    organizationNumber: TextInputFormField<string>;
     phone: TextInputFormField<string>;
     address: SingleSelectFormField<AddressInput>;
     currency: SingleSelectFormField<string>;

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

@@ -73,6 +73,7 @@ type ReceiptObj = {
     taxRates: {
         [key: string]: string;
     };
+    additionalInfo: string;
 } & ReceiptLabelsAndPaymentTerminalInfo;
 type ReRobeOrderObj = {
     id: string;
@@ -145,6 +146,7 @@ type ReRobeOrderObj = {
     paymentIntentObj?: any;
     paymentIntentId?: string;
     receiptObj?: ReceiptObj;
+    channelPartnerOrderId?: string;
 };
 type OrderWithRefundsAndFulfillmentsInfoObj = {
     documentId?: string;

package/package.json

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