@rebilly/instruments 2.0.0-beta → 3.0.1-beta.0

package/dist/functions/show.spec.js

@@ -6,8 +6,6 @@ var confirmation = _interopRequireWildcard(require("../views/confirmation"));
 
 var _rebillyInstrumentsMock = require("../../tests/mocks/rebilly-instruments-mock");
 
-var _show = require("./show");
-
 var _index = require("../index");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -27,7 +25,10 @@ describe('RebillyInstruments show', () => {
     };
     await instance.show('result', payload);
     expect(mountResult).toBeCalledTimes(1);
-    expect(mountResult).toBeCalledWith(payload);
+    expect(mountResult).toBeCalledWith({
+      payload,
+      state: instance.state
+    });
     expect(instance.state.iframeComponents).toEqual([]);
   });
   it('should show confirmation component', async () => {
@@ -39,11 +40,14 @@ describe('RebillyInstruments show', () => {
     };
     await instance.show('confirmation', payload);
     expect(mountConfirmation).toBeCalledTimes(1);
-    expect(mountConfirmation).toBeCalledWith(payload);
+    expect(mountConfirmation).toBeCalledWith({
+      payload,
+      state: instance.state
+    });
     expect(instance.state.iframeComponents).toEqual([]);
   });
   it('should fail for non supported component', async () => {
-    const rebillyInstruments = await (0, _rebillyInstrumentsMock.RenderMockRebillyInstruments)();
+    const rebillyInstruments = new _index.RebillyInstrumentsInstance();
     let error;
 
     try {

package/dist/functions/update.js

@@ -7,17 +7,32 @@ exports.update = update;
 
 var _lodash = _interopRequireDefault(require("lodash.merge"));
 
-var _lodash2 = _interopRequireDefault(require("lodash.isequal"));
-
 var _destroy = require("./destroy");
 
 var _mount = require("./mount");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-async function update(state, newConfig = {}) {
-  var _state$options;
+function sanitizeOldPurchaseData({
+  newOptions
+}) {
+  let purchaseData = {};
+  const hasPurchaseDataKeys = Object.keys(newOptions).some(key => ['items', 'money', 'invoiceId', 'transactionId'].includes(key));
+  purchaseData = hasPurchaseDataKeys ? {
+    items: null,
+    money: null,
+    invoiceId: null,
+    transactionId: null
+  } : purchaseData;
+  return purchaseData;
+}
+
+;
 
+async function update({
+  state,
+  newOptions = {}
+}) {
   if (!state.hasMounted) {
     throw Error('Update method cannot be called before mounting instruments');
   }
@@ -26,26 +41,27 @@ async function update(state, newConfig = {}) {
    * https://github.com/Rebilly/framepay/issues/450
    * That's why this toggle disables real time locale update until that issue is fixed.
    */
+  // const updatingJustLocale =
+  //   newOptions?.options && isEqual(Object.keys(newOptions), ['locale']);
+  // if (updatingJustLocale) {
+  //   const updatedOptions = merge(state.options, newOptions);
+  //   const newLocale = newOptions?.locale;
+  //   state.options = updatedOptions;
+  //   state.translate.updateTranslationsToNewLocale(newLocale);
+  //   state.iframeComponents.forEach((iframe) =>
+  //     iframe.component.call('changeLocale', newLocale)
+  //   );
+  //   return;
+  // }
 
 
-  const temporaryDisableRealTimeLocaleUpdate = true;
-  const updatingJustLocale = (newConfig === null || newConfig === void 0 ? void 0 : newConfig.options) && (0, _lodash2.default)(Object.keys(newConfig), ['locale']);
-
-  if (updatingJustLocale && !temporaryDisableRealTimeLocaleUpdate) {
-    const updatedOptions = (0, _lodash.default)(state.options, newConfig);
-    const newLocale = newConfig === null || newConfig === void 0 ? void 0 : newConfig.locale;
-    state.options = updatedOptions;
-    state.translate.updateTranslationsToNewLocale(newLocale);
-    state.iframeComponents.forEach(iframe => iframe.component.call('changeLocale', newLocale));
-    return;
-  } // Check if the provided intent items object is different to avoid merging the items entries
-
-
-  if (newConfig !== null && newConfig !== void 0 && newConfig.items && !(0, _lodash2.default)((_state$options = state.options) === null || _state$options === void 0 ? void 0 : _state$options.items, newConfig === null || newConfig === void 0 ? void 0 : newConfig.items)) {
-    state.options.items = newConfig === null || newConfig === void 0 ? void 0 : newConfig.items;
-  }
-
-  const updatedOptions = (0, _lodash.default)(state.options, newConfig);
+  const oldOptions = { ...state.options,
+    ...sanitizeOldPurchaseData({
+      newOptions
+    })
+  };
+  const updatedOptions = (0, _lodash.default)({ ...oldOptions
+  }, newOptions);
   await (0, _destroy.destroy)({
     state
   });
@@ -53,7 +69,6 @@ async function update(state, newConfig = {}) {
     state,
     form: state.form,
     summary: state.summary,
-    ...updatedOptions,
-    _dev: state._dev
+    ...updatedOptions
   });
 }

package/dist/functions/update.spec.js

@@ -57,8 +57,6 @@ describe('RebillyInstruments Update', () => {
       countryCode: 'ES'
     });
     expect(rebillyInstruments.state.options.countryCode).toEqual('ES');
-    expect(formElement.innerHTML).toEqual('');
-    expect(summaryElement.innerHTML).toEqual('');
     await (0, _asyncUtilities.avoidUnhandledPromises)();
   });
   it('should replace the items with different options', async () => {
@@ -83,8 +81,6 @@ describe('RebillyInstruments Update', () => {
       }]
     });
     expect(rebillyInstruments.state.options.items[0].quantity).toEqual(5);
-    expect(formElement.innerHTML).toEqual('');
-    expect(summaryElement.innerHTML).toEqual('');
     await (0, _asyncUtilities.avoidUnhandledPromises)();
   });
 });

package/dist/i18n/en.json

@@ -2,7 +2,7 @@
   "en": {
     "summary": {
       "subTotal": "Sub Total",
-      "discounts": "Discouts",
+      "discounts": "Discounts",
       "taxes": "Taxes",
       "shipping": "Shipping",
       "total": "Total"
@@ -10,7 +10,10 @@
     "form": {
       "expressCheckout": "Express checkout",
       "or": "Or",
-      "popupOverlayText": "Click here to show popup window"
+      "popupOverlayText": "Click here to show popup window",
+      "error": {
+        "noPaymentMethods": "No payment methods available for this transaction, please contact support."
+      }
     },
     "paymentMethods": {
       "payment-card": "Payment card"

package/dist/i18n/es.json

@@ -10,7 +10,10 @@
     "form": {
       "expressCheckout": "Chequeo rápido",
       "or": "O pague con",
-      "popupOverlayText": "Haga clic aquí para mostrar la ventana emergente"
+      "popupOverlayText": "Haga clic aquí para mostrar la ventana emergente",
+      "error": {
+        "noPaymentMethods": "No hay métodos de pago disponibles para esta transacción, por favor, póngase en contacto con el servicio de asistencia."
+      }
     },
     "paymentMethods": {
       "payment-card": "Tarjeta de crédito"

package/dist/index.js

@@ -9,6 +9,8 @@ var _mount = require("./functions/mount");
 
 var _purchase = require("./functions/purchase");
 
+var _setup = require("./functions/setup");
+
 var _on = require("./functions/on");
 
 var _update = require("./functions/update");
@@ -24,6 +26,7 @@ var _show = require("./functions/show");
 class InstrumentsState {
   constructor() {
     this.options = null;
+    this.data = {};
     this.mountingPoints = null;
     this.storefront = null;
     this.form = null;
@@ -59,7 +62,10 @@ class RebillyInstrumentsInstance {
   }
 
   async update(newOptions) {
-    await (0, _update.update)(this.state, newOptions);
+    await (0, _update.update)({
+      state: this.state,
+      newOptions
+    });
   }
 
   async purchase(payload) {
@@ -69,16 +75,24 @@ class RebillyInstrumentsInstance {
     });
   }
 
+  async setup(payload) {
+    await (0, _setup.setup)({
+      state: this.state,
+      payload
+    });
+  }
+
   async show(componentName, payload) {
     await (0, _show.show)({
+      state: this.state,
       componentName,
-      payload,
-      state: this.state
+      payload
     });
   }
 
   on(eventName, callback) {
     (0, _on.on)({
+      state: this.state,
       eventName,
       callback
     });

package/dist/index.spec.js

@@ -10,13 +10,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 describe('RebillyInstruments instance', () => {
   let rebillyInstruments;
-
-  function setupInstance(options = {
-    test: 'value'
-  }) {
-    rebillyInstruments.mount(options);
-  }
-
   beforeEach(() => {
     rebillyInstruments = _index.default;
   });
@@ -31,18 +24,12 @@ describe('RebillyInstruments instance', () => {
     `;
     const options = {
       form: '.form-selector',
-      test: 'value'
+      summary: '.summary-selector',
+      items: []
     };
-    setupInstance(options);
+    await rebillyInstruments.mount(options);
     expect(rebillyInstruments.mount).toHaveBeenCalledTimes(1);
     expect(rebillyInstruments.mount).toHaveBeenCalledWith(options);
     await (0, _asyncUtilities.avoidUnhandledPromises)();
   });
-  it('should be able to trigger a purchase', () => {
-    jest.spyOn(rebillyInstruments, 'purchase');
-    const instrument = {};
-    setupInstance();
-    rebillyInstruments.purchase(instrument);
-    expect(rebillyInstruments.purchase).toHaveBeenCalledTimes(1);
-  });
 });

package/dist/loader/index.js

@@ -27,11 +27,8 @@ class Loader {
     section = 'form',
     el = null
   } = {}) {
-    const minHeight = '200px';
-
     if ((0, _isDomElement.default)(el)) {
       el.style.position = 'relative';
-      el.style.minHeight = minHeight;
       this.DOM[section] = el;
     }
   }
@@ -42,6 +39,7 @@ class Loader {
   } = {}) {
     var _this$DOM;
 
+    const minHeight = '200px';
     this[section].push(id);
 
     if ((_this$DOM = this.DOM) !== null && _this$DOM !== void 0 && _this$DOM[section]) {
@@ -50,6 +48,8 @@ class Loader {
       } else {
         this.DOM[section].querySelector('.rebilly-instruments-loader').classList.add('is-active');
       }
+
+      this.DOM[section].style.minHeight = minHeight;
     }
   }
 
@@ -65,6 +65,7 @@ class Loader {
 
     if (!this[section].length && this.DOM[section].querySelector('.rebilly-instruments-loader')) {
       this.DOM[section].querySelector('.rebilly-instruments-loader').classList.remove('is-active');
+      this.DOM[section].style.minHeight = '';
     }
   }
 

package/dist/storefront/index.js

@@ -3,10 +3,43 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.validateStateForStorefront = validateStateForStorefront;
+exports.Endpoint = Endpoint;
 exports.default = exports.StorefrontInstance = void 0;
 
 var _rebillyJsSdk = require("rebilly-js-sdk");
 
+function validateStateForStorefront({
+  state
+}) {
+  if (!state.storefront) {
+    throw new Error('Could not access rebilly-js-sdk instance');
+  }
+
+  if (!state.options) {
+    throw new Error('Could not use Rebilly Instruments mount options to fetch Rebilly data');
+  }
+}
+
+async function Endpoint({
+  state
+} = {}, callback) {
+  try {
+    validateStateForStorefront({
+      state
+    });
+    return await callback();
+  } catch (error) {
+    // TODO: standard error handling for all endpoints
+    // console.error(error);
+    if (error.status === 422) {
+      error.details.forEach(e => console.error(e));
+    }
+
+    throw error;
+  }
+}
+
 class StorefrontInstance {
   constructor({
     publishableKey = null,

package/dist/storefront/invoices.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fetchInvoice = fetchInvoice;
+
+var _invoiceModel = _interopRequireDefault(require("./models/invoice-model"));
+
+var _index = require("./index");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+async function fetchInvoice({
+  data = null,
+  state = null
+}) {
+  return (0, _index.Endpoint)({
+    state
+  }, async () => {
+    state.storefront.setSessionToken(state.options.customerJwt);
+    const {
+      fields
+    } = await state.storefront.invoices.get(data);
+    return new _invoiceModel.default(fields);
+  });
+}

package/dist/storefront/models/base-model.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+class BaseModel {
+  constructor({ ...fields
+  } = {}) {
+    Object.entries(fields).forEach(([key, value]) => {
+      this[key] = value;
+    });
+  }
+
+}
+
+exports.default = BaseModel;

package/dist/storefront/models/invoice-model.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _baseModel = _interopRequireDefault(require("./base-model"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class InvoiceModel extends _baseModel.default {}
+
+exports.default = InvoiceModel;

package/dist/storefront/models/plan-model.js

@@ -5,41 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-class PlanModel {
-  constructor({
-    id = '',
-    name = '',
-    productId = '',
-    productOptions = {},
-    currency = '',
-    currencySign = '',
-    pricing = {},
-    recurringInterval = {},
-    trial = null,
-    isTrialOnly = false,
-    setup = null,
-    customFields = {},
-    createdTime = '',
-    updatedTime = '',
-    invoiceTimeShift = {}
-  } = {}) {
-    this.id = id;
-    this.name = name;
-    this.productId = productId;
-    this.productOptions = productOptions;
-    this.currency = currency;
-    this.currencySign = currencySign;
-    this.pricing = pricing;
-    this.recurringInterval = recurringInterval;
-    this.trial = trial;
-    this.isTrialOnly = isTrialOnly;
-    this.setup = setup;
-    this.customFields = customFields;
-    this.createdTime = createdTime;
-    this.updatedTime = updatedTime;
-    this.invoiceTimeShift = invoiceTimeShift;
-  }
+var _baseModel = _interopRequireDefault(require("./base-model"));
 
-}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class PlanModel extends _baseModel.default {}
 
 exports.default = PlanModel;

package/dist/storefront/models/product-model.js

@@ -5,29 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-class ProductModel {
-  constructor({
-    id = '',
-    name = '',
-    unitLabel = '',
-    description = {},
-    requiresShipping = false,
-    options = [],
-    customFields = {},
-    createdTime = '',
-    updatedTime = ''
-  } = {}) {
-    this.id = id;
-    this.name = name;
-    this.unitLabel = unitLabel;
-    this.description = description;
-    this.requiresShipping = requiresShipping;
-    this.options = options;
-    this.customFields = customFields;
-    this.createdTime = createdTime;
-    this.updatedTime = updatedTime;
-  }
+var _baseModel = _interopRequireDefault(require("./base-model"));
 
-}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class ProductModel extends _baseModel.default {}
 
 exports.default = ProductModel;

package/dist/storefront/models/summary-model.js

@@ -5,51 +5,38 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.SummaryDiscountModel = exports.SummaryTaxModel = exports.SummaryLineItemModel = void 0;
 
-class SummaryLineItemModel {
+var _baseModel = _interopRequireDefault(require("./base-model"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class SummaryLineItemModel extends _baseModel.default {
   constructor({
-    type = '',
-    description = '',
     unitPrice = 0.0,
     quantity = 0,
     price = 0.0,
-    planId = '',
-    productId = ''
+    ...fields
   } = {}) {
-    this.type = type;
-    this.description = description;
+    super(fields);
     this.unitPrice = unitPrice;
     this.quantity = quantity;
     this.price = price;
-    this.planId = planId;
-    this.productId = productId;
   }
 
 }
 
 exports.SummaryLineItemModel = SummaryLineItemModel;
 
-class SummaryTaxModel {
-  constructor({
-    amount = '',
-    description = ''
-  } = {}) {
-    this.amount = amount;
-    this.description = description;
-  }
-
-}
+class SummaryTaxModel extends _baseModel.default {}
 
 exports.SummaryTaxModel = SummaryTaxModel;
 
-class SummaryDiscountModel {
+class SummaryDiscountModel extends _baseModel.default {
   constructor({
-    couponId = '',
     amount = 0,
-    description = ''
-  } = {}) {
-    this.couponId = couponId;
+    ...fields
+  }) {
+    super(fields);
     this.amount = amount;
-    this.description = description;
   }
 
 }

package/dist/storefront/models/transaction-model.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _baseModel = _interopRequireDefault(require("./base-model"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class TransactionModel extends _baseModel.default {
+  constructor({
+    invoiceIds = [],
+    ...fields
+  }) {
+    super(fields);
+    this.invoiceIds = invoiceIds || [];
+  }
+
+  get invoiceId() {
+    return this.invoiceIds[0] || null;
+  }
+
+  get hasInvoice() {
+    return !!this.invoiceId;
+  }
+
+}
+
+exports.default = TransactionModel;

package/dist/storefront/payment-instruments.js

@@ -0,0 +1,47 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setupPaymentInstrument = setupPaymentInstrument;
+
+var _index = require("./index");
+
+async function setupPaymentInstrument({
+  data,
+  state
+}) {
+  return (0, _index.Endpoint)({
+    state
+  }, async () => {
+    // Create payment instrument
+    const {
+      fields: instrument
+    } = await state.storefront.paymentInstruments.create({
+      data
+    }); // Setup the payment instrument
+
+    state.storefront.setSessionToken(instrument.token);
+    const setupPayload = {
+      id: instrument.id,
+      data: {
+        websiteId: state.options.websiteId,
+        ...data
+      }
+    };
+
+    if (state.data.getAmountAndCurrency) {
+      setupPayload.data = { ...setupPayload.data,
+        ...state.data.getAmountAndCurrency
+      };
+    }
+
+    const {
+      fields: transaction
+    } = await state.storefront.paymentInstruments.setup(setupPayload);
+    return {
+      instrument,
+      transaction
+    };
+  });
+}