rerobe-js-orm 4.7.9 → 4.8.1

package/lib/factories/Merchant/MerchantFromFormState.js

@@ -4,6 +4,7 @@ const MerchantFactory_1 = require("./MerchantFactory");
 const Merchant_1 = require("../../models/Merchant");
 class MerchantFromFormState extends MerchantFactory_1.default {
     createMerchant(fs) {
+        var _a;
         const MerchantMutableData = {
             name: fs.fields.name.inputValue,
             type: fs.fields.type.selectedValue,
@@ -23,6 +24,11 @@ class MerchantFromFormState extends MerchantFactory_1.default {
             organizationNumber: fs.fields.organizationNumber.inputValue,
             returnPolicy: fs.fields.returnPolicy.inputValue,
         };
+        // Include organizationNumbers if it has entries
+        const orgNumbers = (_a = fs.fields.organizationNumbers) === null || _a === void 0 ? void 0 : _a.selectedValue;
+        if (orgNumbers && Object.keys(orgNumbers).length > 0) {
+            MerchantMutableData.organizationNumbers = orgNumbers;
+        }
         return new Merchant_1.default(Object.assign(Object.assign({}, fs.props), MerchantMutableData));
     }
 }

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

@@ -15,6 +15,7 @@ class MerchantFormState extends FormState_1.default {
         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.organizationNumbers = this.fieldFactory('singleSelect', 'organizationNumbers');
         this.fields.returnPolicy = this.fieldFactory('textInput', 'returnPolicy');
         this.fields.phone = this.fieldFactory('textInput', 'phone');
         this.fields.address = this.fieldFactory('singleSelect', 'address');
@@ -32,7 +33,11 @@ class MerchantFormState extends FormState_1.default {
     }
     fieldFactory(fieldType, fieldKey, fieldOptions) {
         const options = fieldOptions || [];
-        if (fieldType === 'textInput' && fieldKey !== 'address' && fieldKey !== 'webhooks' && fieldKey !== 'socialLinks') {
+        if (fieldType === 'textInput' &&
+            fieldKey !== 'address' &&
+            fieldKey !== 'webhooks' &&
+            fieldKey !== 'socialLinks' &&
+            fieldKey !== 'organizationNumbers') {
             const inputValue = this.props[fieldKey] || '';
             const valid = !!this.props[fieldKey];
             let onChangeHandler = (val) => this.textInputChangeHandler(fieldKey, String(val));
@@ -102,6 +107,10 @@ class MerchantFormState extends FormState_1.default {
                         !!Object.keys(this.props.socialLinks).length &&
                         !!Object.values(this.props.socialLinks).filter((item) => !!item).length;
             }
+            else if (fieldKey === 'organizationNumbers') {
+                selectedValue = this.props.organizationNumbers || {};
+                valid = true; // organizationNumbers is optional
+            }
             else if (fieldKey === 'unitSystem') {
                 onChangeHandler = (val) => this.unitSystemSelectHandler(val);
                 selectedValue = this.props[fieldKey] || '';

package/lib/models/Merchant.d.ts

@@ -84,6 +84,7 @@ export default class Merchant extends Base {
     isZettleUser?: boolean;
     hasStripeBluetoothReader?: boolean;
     organizationNumber?: string;
+    organizationNumbers?: Record<string, string>;
     returnPolicy?: string;
     stripeRegion?: string;
     hasAutomatedPayouts?: boolean;

package/lib/models/Merchant.js

@@ -49,6 +49,9 @@ class Merchant extends Base_1.default {
             tiktok: '',
         };
         this.organizationNumber = (props === null || props === void 0 ? void 0 : props.organizationNumber) || '';
+        if ((props === null || props === void 0 ? void 0 : props.organizationNumbers) && typeof props.organizationNumbers === 'object') {
+            this.organizationNumbers = props.organizationNumbers;
+        }
         this.returnPolicy = (props === null || props === void 0 ? void 0 : props.returnPolicy) || '';
         this.subscriptionStatus = (props === null || props === void 0 ? void 0 : props.subscriptionStatus) || merchant_constants_1.SUBSCRIPTION_STATUSES.trialing;
         this.hasActiveWebshop = (props === null || props === void 0 ? void 0 : props.hasActiveWebshop) || false;
@@ -135,16 +138,20 @@ class Merchant extends Base_1.default {
         if (this.hasReceiptPrinter) {
             mObj.hasReceiptPrinter = this.hasReceiptPrinter;
         }
+        if (this.organizationNumbers && Object.keys(this.organizationNumbers).length > 0) {
+            mObj.organizationNumbers = this.organizationNumbers;
+        }
         return mObj;
     }
     toMerchantMutableData() {
-        return {
+        const data = {
             name: this.name,
             type: this.type,
             contactEmail: this.contactEmail,
             senderEmail: this.senderEmail,
             industry: this.industry,
             legalName: this.legalName,
+            organizationNumber: this.organizationNumber,
             phone: this.phone,
             address: this.address,
             currency: this.currency,
@@ -155,6 +162,10 @@ class Merchant extends Base_1.default {
             webhooks: this.webhooks,
             socialLinks: this.socialLinks,
         };
+        if (this.organizationNumbers && Object.keys(this.organizationNumbers).length > 0) {
+            data.organizationNumbers = this.organizationNumbers;
+        }
+        return data;
     }
 }
 Merchant.MERCHANT_TYPES = merchant_constants_1.MERCHANT_TYPES;

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

@@ -23,6 +23,7 @@ type MerchantMutableData = {
     webhooks: MerchantWebHook[];
     socialLinks: SocialLinksType | null;
     organizationNumber?: string;
+    organizationNumbers?: Record<string, string>;
     returnPolicy?: string;
 };
 type MerchantSystemOnlyMutableData = {
@@ -85,6 +86,7 @@ type MerchantFormFields = {
     industry: SingleSelectFormField<string>;
     legalName: TextInputFormField<string>;
     organizationNumber: TextInputFormField<string>;
+    organizationNumbers: SingleSelectFormField<Record<string, string>>;
     returnPolicy: TextInputFormField<string>;
     phone: TextInputFormField<string>;
     address: SingleSelectFormField<AddressInput>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rerobe-js-orm",
-  "version": "4.7.9",
+  "version": "4.8.1",
   "description": "ReRobe's Javascript ORM Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -21,7 +21,7 @@
     "type": "git",
     "url": "git+https://github.com/ReRobe/rerobe-object-factories.git"
   },
-  "keywords": [],
+  "keywords": ["ribbn"],
   "license": "ISC",
   "bugs": {
     "url": "https://github.com/ReRobe/rerobe-product/issues"