rerobe-js-orm 2.4.56 → 2.4.61

package/lib/factories/Merchant/MerchantFromFormState.js

@@ -4,7 +4,7 @@ const MerchantFactory_1 = require("./MerchantFactory");
 const Merchant_1 = require("../../models/Merchant");
 class MerchantFromFormState extends MerchantFactory_1.default {
     createMerchant(fs) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const merchantAttributes = {
             id: ((_a = fs.props) === null || _a === void 0 ? void 0 : _a.id) || '',
             name: fs.fields.name.inputValue,
@@ -30,6 +30,7 @@ class MerchantFromFormState extends MerchantFactory_1.default {
             theme: (_j = fs.props) === null || _j === void 0 ? void 0 : _j.theme,
             webshopTenantId: (_k = fs.props) === null || _k === void 0 ? void 0 : _k.webshopTenantId,
             webhooks: fs.fields.webhooks.selectedValues,
+            sharedSecret: (_l = fs.props) === null || _l === void 0 ? void 0 : _l.sharedSecret,
         };
         return new Merchant_1.default(Object.assign({}, merchantAttributes));
     }

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

@@ -6,19 +6,16 @@ class WebhookFormState extends FormState_1.default {
     constructor(props) {
         super();
         this.props = {
-            key: (props === null || props === void 0 ? void 0 : props.key) || '',
-            method: (props === null || props === void 0 ? void 0 : props.method) || '',
-            url: (props === null || props === void 0 ? void 0 : props.url) || '',
+            event: (props === null || props === void 0 ? void 0 : props.event) || '',
+            callBackUrl: (props === null || props === void 0 ? void 0 : props.callBackUrl) || '',
         };
-        this.fields.key = this.fieldFactory('singleSelect', 'key', options_1.webhookKeyOptions);
-        this.fields.method = this.fieldFactory('singleSelect', 'method', options_1.httpRequestMethodOptions);
-        this.fields.url = this.fieldFactory('textInput', 'url');
+        this.fields.event = this.fieldFactory('singleSelect', 'event', options_1.webhookKeyOptions);
+        this.fields.callBackUrl = this.fieldFactory('textInput', 'callBackUrl');
     }
     toObj() {
         return {
-            key: this.fields.key.selectedValue,
-            method: this.fields.method.selectedValue,
-            url: this.fields.url.inputValue,
+            event: this.fields.event.selectedValue,
+            callBackUrl: this.fields.callBackUrl.inputValue,
         };
     }
     fieldFactory(fieldType, fieldKey, fieldOptions) {

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

@@ -363,9 +363,9 @@ const tzArr = [
 const timeZoneOptions = tzArr.map((tz) => ({ label: `${tz[2]}`, value: `${tz[2]}` }));
 exports.timeZoneOptions = timeZoneOptions;
 const webhookKeyOptions = [
-    { label: 'Create Product', value: Merchant_1.default.RIBBN_WEBHOOK_DICT.createProductWebhook },
-    { label: 'Update Product', value: Merchant_1.default.RIBBN_WEBHOOK_DICT.updateProductWebhook },
-    { label: 'Delete Product', value: Merchant_1.default.RIBBN_WEBHOOK_DICT.deleteProductWebhook },
+    { label: 'Create Product', value: Merchant_1.default.RIBBN_WEBHOOK_EVENT_DICT.productCreate },
+    { label: 'Update Product', value: Merchant_1.default.RIBBN_WEBHOOK_EVENT_DICT.productUpdate },
+    { label: 'Delete Product', value: Merchant_1.default.RIBBN_WEBHOOK_EVENT_DICT.productDelete },
 ];
 exports.webhookKeyOptions = webhookKeyOptions;
 const httpRequestMethodOptions = [

package/lib/helpers/ReRobeProductHelpers.d.ts

@@ -7,10 +7,13 @@ export default class ReRobeProductHelpers {
     static sizeCommentPretty(sizeComment: string): string;
     static getSizeLabel(clothingSize: string[], shoeSize: string, jeanSize: string): string;
     static generateArrForDetailsBulletList(productObj: CompleteProduct): string[];
+    static autoCreateFullDescriptionHTML(productObj: CompleteProduct, customHeading?: string): string;
+    static autoCreateFullSwedishDescriptionForTraderaHTML(productObj: CompleteProduct, merchantName?: string): string;
     static prepareProductForMutation(productObj: CompleteProduct, mediaInputArr?: {
         originalSource: string;
     }[]): CompleteProduct;
     static getSubtitle(title: string): string;
     static sizeFinder(sizeLabel: string, sizeToMatch: string): boolean;
+    static convertReRobeSizeToStandardSize(productObj: CompleteProduct): string;
     static buildLineItem(productObj: CompleteProduct, quantity?: number): ProductLineItem;
 }

package/lib/helpers/ReRobeProductHelpers.js

@@ -69,6 +69,7 @@ class ReRobeProductHelpers {
         }
         return '';
     }
+    // ToDo: refactor
     static getSizeLabel(clothingSize, shoeSize, jeanSize) {
         let sizeLabel = 'NA';
         if (clothingSize && clothingSize.length > 0 && clothingSize[0].trim()) {
@@ -98,6 +99,98 @@ class ReRobeProductHelpers {
         ];
         return descriptionArr.filter((d) => d);
     }
+    static autoCreateFullDescriptionHTML(productObj, customHeading) {
+        const productStyle = productObj.productStyle.join(', ');
+        const size = this.getSizeLabel(productObj.clothingSize, productObj.shoeSize, productObj.jeanSize);
+        const sizeComment = productObj.sizeComment;
+        const color = productObj.color;
+        const productRemarks = productObj.productRemarks;
+        const condition = productObj.condition;
+        const priceNew = productObj.purchasePrice;
+        const yearPurchased = productObj.yearPurchased;
+        const materials = this.materialCompJoinedString();
+        const measurements = this.measurementsJoinedString(productObj.measurements);
+        const fit = options_1.sizeCommentOptions.filter((option) => option.value === sizeComment)[0].label;
+        const descriptionObj = {
+            title: customHeading ? `<p>${customHeading}</p>\n` : 'REMOVE_ME',
+            line0: `<ul>`,
+            line1: size ? `\n<li>Size: ${size}</li>` : 'REMOVE_ME',
+            line2: fit ? `\n<li>Fit: ${fit}</li>` : 'REMOVE_ME',
+            line3: condition ? `\n<li>Condition: ${condition}</li>` : 'REMOVE_ME',
+            line4: color ? `\n<li>Color: ${color}</li>` : 'REMOVE_ME',
+            line5: productStyle && productStyle.length > 0 ? `\n<li>Style: ${productStyle}</li>` : 'REMOVE_ME',
+            line6: materials ? `\n<li>Material: ${materials}</li>` : 'REMOVE_ME',
+            line7: measurements ? `\n<li>Measurements: ${measurements}</li>` : 'REMOVE_ME',
+            line8: productRemarks ? `\n<li>Remarks: ${productRemarks}</li>` : 'REMOVE_ME',
+            line9: priceNew ? `\n<li>Purchase price: ${priceNew}</li>` : 'REMOVE_ME',
+            line10: yearPurchased ? `\n<li>Year purchased: ${yearPurchased}</li>` : 'REMOVE_ME',
+            line11: `\n</ul>`,
+        };
+        return Object.values(descriptionObj).reduce((acc, cur) => {
+            if (!cur.includes('REMOVE_ME')) {
+                acc = acc.concat(cur);
+            }
+            return acc;
+        }, '');
+    }
+    static autoCreateFullSwedishDescriptionForTraderaHTML(productObj, merchantName = 'våra') {
+        return `
+    <p>
+      <strong>Beskrivning</strong>
+      ${String(this.autoCreateFullDescriptionHTML(productObj)).trim()}
+    </p>
+
+    <p>
+      <strong>Angiven storlek</strong>
+      <br>
+      Storlekar beskrivs enligt befintliga lappar på plaggen samt från före detta ägare av plagget. Om en lapp eller angiven storlek saknas, uppskattas en ungefärlig storlek av oss. Vi försöker även alltid att mäta produkter som underdelar, väskor och accessoarer. Vid mer information kring specifika plagg och dess mått finns vi ett meddelande bort med snabbt svar på detta..
+    </p>
+    
+    <p>
+      <strong>Skick</strong>
+      <br>
+      Alla våra produkter är begagnade och säljs i befintligt skick. Varje plagg genomgår en noga genomförd kvalitetskontroll där de kontrolleras och autentiseras av ${merchantName}’s produktions team och säljs endast i bästa möjliga skick. Läs mer om detta under vår FAQ-flik på vår hemsida samt i vår app. 
+    </p>
+
+    <p>
+      <strong>Prissättning</strong>
+      <br>
+      Våra priser är baserade på de accepterade prisförslag som angetts vid inlämning av plagg. Vi ger prisförslag enligt vår egen historiska data, research från andra plattformar samt vår djupa kunskap om modebranschen, dess nuvarande trender och stilar.
+    </p>
+
+    <p>
+      <strong>Betalning</strong>
+      <br>
+      Vi använder oss av "Tradera betalning" vilket innebär att du som köpare kan välja att betala med Swish, kort eller PayPal. ${merchantName}’s rabatter och erbjudanden gäller endast vid köp på vår hemsida samt via vår app.
+      <br>
+      <br>
+      Tänk på att produkter kan ligga i flera varukorgar samtidigt. Om din vara står som ”slut/såld” vid utcheckningen beror det på att någon annan hunnit före.
+    </p>
+    
+    <p>
+      <strong>Retur</strong>
+      <br>
+      Vi har 14 dagars öppet köp från då din order har packats och levererats till dig. Returer är endast giltiga om prislappen sitter kvar, samt att varan är i samma skick som när du köpte den. Via Tradera är det du som kund som står för frakten vid returer. Läs mer om detta under vår FAQ-flik.
+    </p>
+    
+    <p>
+      <strong>Frakt</strong>
+      <br>
+      Vi skickar alla våra ordrar via Postnord till hela Sverige, samt internationellt. Vi packar och skickar din order inom 24h, och din order ska vara hos dig inom 1-3 arbetsdagar. Om din order ska skickas till annan adress än den som är angiven på Tradera kontakt gärna oss innan betalning. 
+    </p>
+
+    <p>
+      <strong>Frakt 69:- oavsett antal varor</strong>
+      <br>
+      <br>
+      * Det vill säga, endast en fraktkostnad vid köp av flertalet varor.
+      <br>
+      * Vi samfraktar alla varor som beställs vid ett och samma tillfälle.
+      <br>
+      * For international buyers within the EU the displayed shipping cost is accurate.
+    </p>
+    `;
+    }
     static prepareProductForMutation(productObj, mediaInputArr = []) {
         const productObjClone = Object.assign({}, productObj);
         const { status, dateInQualityControl, dateInPendingPublication, dateListedOnline, publishedAt, price } = productObj;
@@ -189,6 +282,31 @@ class ReRobeProductHelpers {
         }
         return false;
     }
+    static convertReRobeSizeToStandardSize(productObj) {
+        let size = 'Not Applicable';
+        if (productObj.productCategory === 'Clothing' && productObj.productType !== 'Jeans') {
+            if (productObj.clothingSize && productObj.clothingSize.length > 0) {
+                const arr = productObj.clothingSize[0].split('(');
+                if (arr.length === 2) {
+                    const [universalSize] = arr;
+                    size = universalSize.trim();
+                }
+                if (arr.length === 1) {
+                    [size] = productObj.clothingSize;
+                }
+            }
+        }
+        if (productObj.productType === 'Jeans') {
+            size = productObj.jeanSize;
+        }
+        if (productObj.productCategory === 'Shoes') {
+            size = productObj.shoeSize;
+        }
+        if (size === 'No Size') {
+            size = 'Not Applicable';
+        }
+        return size;
+    }
     // RibbnProductHelper candidate
     static buildLineItem(productObj, quantity = 1) {
         const { documentId, title, price, coverPhotoUrl, imageUrls, brand } = productObj;

package/lib/index.d.ts

@@ -27,7 +27,8 @@ import ProductStateManager from './models/ProductStateManager';
 import PayoutAccount from './models/PayoutAccount';
 import PayoutAccountFormState from './form-states/PayoutAccount/PayoutAccountFormState';
 import MerchantFormState from './form-states/Merchant/MerchantFormState';
+import WebhookFormState from './form-states/Merchant/WebhookFormState';
 import ReRobeProductHelpers from './helpers/ReRobeProductHelpers';
 import AnalyticsHelpers from './helpers/AnalyticsHelpers';
 import OrderHelpers from './helpers/OrderHelpers';
-export { ProductFromAlgoliaJSONDoc, ProductFromShopifyWebhookJSONDoc, ProductFromShopifyJSClientJSONDoc, ProductFormStateFactory, SellRequestFormStateFactory, PickUpFormStateFactory, AddressFormStateFactory, UserFormStateFactory, UserFromShopifyWebhookJSONDoc, UserFromAuthTemplateMethod, DraftOrderFromMirakl, DraftOrderFromApp, ChatRoomFromNewUserSignUp, KlarnaSessionFactory, Product, ProductStateManager, Order, OrderFromShopifyWebhook, OrderFromShopifyAdminApi, OrderFromShopifyStorefrontApi, OrderFromApp, OrderFormStateFactory, RefundFormStateFactory, PayoutAccount, PayoutAccountFormState, Merchant, MerchantFormState, MerchantFormStateFactory, ReRobeProductHelpers, User, AnalyticsHelpers, OrderHelpers, };
+export { ProductFromAlgoliaJSONDoc, ProductFromShopifyWebhookJSONDoc, ProductFromShopifyJSClientJSONDoc, ProductFormStateFactory, SellRequestFormStateFactory, PickUpFormStateFactory, AddressFormStateFactory, UserFormStateFactory, UserFromShopifyWebhookJSONDoc, UserFromAuthTemplateMethod, DraftOrderFromMirakl, DraftOrderFromApp, ChatRoomFromNewUserSignUp, KlarnaSessionFactory, Product, ProductStateManager, Order, OrderFromShopifyWebhook, OrderFromShopifyAdminApi, OrderFromShopifyStorefrontApi, OrderFromApp, OrderFormStateFactory, RefundFormStateFactory, PayoutAccount, PayoutAccountFormState, Merchant, MerchantFormState, MerchantFormStateFactory, ReRobeProductHelpers, User, AnalyticsHelpers, OrderHelpers, WebhookFormState, };

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OrderHelpers = exports.AnalyticsHelpers = exports.User = exports.ReRobeProductHelpers = exports.MerchantFormStateFactory = exports.MerchantFormState = exports.Merchant = exports.PayoutAccountFormState = exports.PayoutAccount = exports.RefundFormStateFactory = exports.OrderFormStateFactory = exports.OrderFromApp = exports.OrderFromShopifyStorefrontApi = exports.OrderFromShopifyAdminApi = exports.OrderFromShopifyWebhook = exports.Order = exports.ProductStateManager = exports.Product = exports.KlarnaSessionFactory = exports.ChatRoomFromNewUserSignUp = exports.DraftOrderFromApp = exports.DraftOrderFromMirakl = exports.UserFromAuthTemplateMethod = exports.UserFromShopifyWebhookJSONDoc = exports.UserFormStateFactory = exports.AddressFormStateFactory = exports.PickUpFormStateFactory = exports.SellRequestFormStateFactory = exports.ProductFormStateFactory = exports.ProductFromShopifyJSClientJSONDoc = exports.ProductFromShopifyWebhookJSONDoc = exports.ProductFromAlgoliaJSONDoc = void 0;
+exports.WebhookFormState = exports.OrderHelpers = exports.AnalyticsHelpers = exports.User = exports.ReRobeProductHelpers = exports.MerchantFormStateFactory = exports.MerchantFormState = exports.Merchant = exports.PayoutAccountFormState = exports.PayoutAccount = exports.RefundFormStateFactory = exports.OrderFormStateFactory = exports.OrderFromApp = exports.OrderFromShopifyStorefrontApi = exports.OrderFromShopifyAdminApi = exports.OrderFromShopifyWebhook = exports.Order = exports.ProductStateManager = exports.Product = exports.KlarnaSessionFactory = exports.ChatRoomFromNewUserSignUp = exports.DraftOrderFromApp = exports.DraftOrderFromMirakl = exports.UserFromAuthTemplateMethod = exports.UserFromShopifyWebhookJSONDoc = exports.UserFormStateFactory = exports.AddressFormStateFactory = exports.PickUpFormStateFactory = exports.SellRequestFormStateFactory = exports.ProductFormStateFactory = exports.ProductFromShopifyJSClientJSONDoc = exports.ProductFromShopifyWebhookJSONDoc = exports.ProductFromAlgoliaJSONDoc = void 0;
 const ProductFromShopifyJSClientJSONDoc_1 = require("./factories/Product/ProductFromShopifyJSClientJSONDoc");
 exports.ProductFromShopifyJSClientJSONDoc = ProductFromShopifyJSClientJSONDoc_1.default;
 const ProductFromAlgoliaJSONDoc_1 = require("./factories/Product/ProductFromAlgoliaJSONDoc");
@@ -59,6 +59,8 @@ const PayoutAccountFormState_1 = require("./form-states/PayoutAccount/PayoutAcco
 exports.PayoutAccountFormState = PayoutAccountFormState_1.default;
 const MerchantFormState_1 = require("./form-states/Merchant/MerchantFormState");
 exports.MerchantFormState = MerchantFormState_1.default;
+const WebhookFormState_1 = require("./form-states/Merchant/WebhookFormState");
+exports.WebhookFormState = WebhookFormState_1.default;
 const ReRobeProductHelpers_1 = require("./helpers/ReRobeProductHelpers");
 exports.ReRobeProductHelpers = ReRobeProductHelpers_1.default;
 const AnalyticsHelpers_1 = require("./helpers/AnalyticsHelpers");

package/lib/models/Merchant.d.ts

@@ -31,10 +31,10 @@ export default class Merchant extends Base {
         pound: string;
         once: string;
     };
-    static RIBBN_WEBHOOK_DICT: {
-        createProductWebhook: string;
-        updateProductWebhook: string;
-        deleteProductWebhook: string;
+    static RIBBN_WEBHOOK_EVENT_DICT: {
+        productCreate: string;
+        productUpdate: string;
+        productDelete: string;
     };
     name: string;
     id: string;
@@ -60,6 +60,7 @@ export default class Merchant extends Base {
     theme: MerchantTheme;
     webshopTenantId: string;
     webhooks: MerchantWebHook[];
+    sharedSecret: string;
     constructor(props?: any);
     toObj(): MerchantObj;
 }

package/lib/models/Merchant.js

@@ -49,6 +49,7 @@ class Merchant extends Base_1.default {
         };
         this.webshopTenantId = (props === null || props === void 0 ? void 0 : props.webshopTenantId) || '';
         this.webhooks = (props === null || props === void 0 ? void 0 : props.webhooks) || [];
+        this.sharedSecret = (props === null || props === void 0 ? void 0 : props.sharedSecret) || '';
     }
     toObj() {
         return {
@@ -76,6 +77,7 @@ class Merchant extends Base_1.default {
             theme: this.theme,
             webshopTenantId: this.webshopTenantId,
             webhooks: this.webhooks,
+            sharedSecret: this.sharedSecret,
         };
     }
 }
@@ -111,9 +113,9 @@ Merchant.IMPERIAL_WEIGHT_TYPES = {
     pound: 'POUND',
     once: 'ONCE',
 };
-Merchant.RIBBN_WEBHOOK_DICT = {
-    createProductWebhook: 'CREATE_PRODUCT_WEBHOOK',
-    updateProductWebhook: 'UPDATE_PRODUCT_WEBHOOK',
-    deleteProductWebhook: 'DELETE_PRODUCT_WEBHOOK',
-    // TODO: Add webhook keys for other models (Orders, User, etc)
+Merchant.RIBBN_WEBHOOK_EVENT_DICT = {
+    productCreate: 'PRODUCT_CREATE',
+    productUpdate: 'PRODUCT_UPDATE',
+    productDelete: 'PRODUCT_DELETE',
+    // TODO: Add webhook events for other models (Orders, User, etc)
 };

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

@@ -23,6 +23,7 @@ declare type MerchantObj = {
     theme: MerchantTheme;
     webhooks: MerchantWebHook[];
     webshopTenantId: string;
+    sharedSecret: string;
 };
 declare type MerchantTypes = 'INDIVIDUAL' | 'BUSINESS';
 declare type RibbnPaymentTiers = 'FREE' | 'TIER_ONE';
@@ -44,9 +45,8 @@ declare type MerchantTheme = {
     warningColor: string;
 };
 declare type MerchantWebHook = {
-    key: string;
-    method: string;
-    url: string;
+    event: string;
+    callBackUrl: string;
 };
 declare type MerchantFormFields = {
     name: TextInputFormField<string>;
@@ -65,7 +65,6 @@ declare type MerchantFormFields = {
     webhooks: MultiSelectFormField<MerchantWebHook>;
 };
 declare type WebhookFormFields = {
-    key: SingleSelectFormField<string>;
-    method: SingleSelectFormField<string>;
-    url: TextInputFormField<string>;
+    event: SingleSelectFormField<string>;
+    callBackUrl: TextInputFormField<string>;
 };

package/package.json

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