@rebilly/instruments 9.28.0 → 9.28.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [9.28.1](https://github.com/Rebilly/rebilly/compare/instruments/core-v9.28.0...instruments/core-v9.28.1) (2024-04-08)
+
+
+### Bug Fixes
+
+* **instruments:** Passing `invoiceId` and `transactionId` on the options object doesn't work ([#4514](https://github.com/Rebilly/rebilly/issues/4514)) ([2e99107](https://github.com/Rebilly/rebilly/commit/2e9910731426d7b6460978de035393c41d79c877))
+
 ## [9.28.0](https://github.com/Rebilly/rebilly/compare/instruments/core-v9.27.2...instruments/core-v9.28.0) (2024-04-08)
 
 

package/dist/index.js

@@ -5963,7 +5963,7 @@ function Jt(e2, t2) {
   return s;
 }
 var Gt = P$1;
-const Yt = /* @__PURE__ */ wt(Gt), Qt = "56.11.2";
+const Yt = /* @__PURE__ */ wt(Gt), Qt = "56.12.0";
 let Xt = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict", Zt = (e2 = 21) => {
   let t2 = "", s = e2;
   for (; s--; )
@@ -15092,7 +15092,7 @@ function filterReadyToPay(readyToPay) {
 }
 async function fetchReadyToPay() {
   return Endpoint(async () => {
-    var _a, _b, _c, _d, _e2, _f, _g;
+    var _a, _b, _c, _d, _e2, _f, _g, _h, _i;
     if (!state.data.riskMetadata) {
       const { riskMetadata: data2 } = await Me();
       state.data.riskMetadata = data2;
@@ -15104,15 +15104,15 @@ async function fetchReadyToPay() {
     if ((_b = state.options) == null ? void 0 : _b.items) {
       data.items = mapItemsQuantities(state.options.items);
     }
-    if (((_c = state.options) == null ? void 0 : _c.money) && ((_d = state.data) == null ? void 0 : _d.amountAndCurrency)) {
-      const money = state.data.amountAndCurrency;
-      data.amount = money.amount;
-      data.currency = money.currency;
+    if ((((_c = state.options) == null ? void 0 : _c.money) || ((_d = state.data) == null ? void 0 : _d.invoice) || ((_e2 = state.data) == null ? void 0 : _e2.transaction)) && ((_f = state.data) == null ? void 0 : _f.amountAndCurrency)) {
+      const { amount, currency } = state.data.amountAndCurrency;
+      data.amount = amount;
+      data.currency = currency;
     }
-    if ((_f = (_e2 = state.data) == null ? void 0 : _e2.account) == null ? void 0 : _f.address) {
+    if ((_h = (_g = state.data) == null ? void 0 : _g.account) == null ? void 0 : _h.address) {
       data.billingAddress = state.data.account.address;
     }
-    if ((_g = state.data) == null ? void 0 : _g.deposit) {
+    if ((_i = state.data) == null ? void 0 : _i.deposit) {
       data.amount = state.data.deposit.amount;
       data.currency = state.data.deposit.currency;
     }
@@ -15662,11 +15662,29 @@ async function fetchData({
         id: state.options.payout.payoutRequestId
       });
     }
+    if ((_d = state.options) == null ? void 0 : _d.transactionId) {
+      state.data.transaction = await fetchTransaction$1({
+        data: {
+          id: state.options.transactionId
+        }
+      });
+    }
+    let productsPromise;
+    const invoiceId = ((_e2 = state.options) == null ? void 0 : _e2.invoiceId) || ((_g = (_f = state.data) == null ? void 0 : _f.transaction) == null ? void 0 : _g.invoiceId);
+    if (invoiceId) {
+      const { invoice, products: products2 } = await fetchInvoiceAndProducts$1({
+        data: {
+          id: invoiceId
+        }
+      });
+      productsPromise = Promise.resolve(products2);
+      state.data.invoice = invoice;
+    }
     let readyToPayPromise = Promise.resolve(null);
     let readyToPayoutPromise = Promise.resolve(null);
     let fetchAccountAndWebsitePromise = Promise.resolve();
     let availableInstrumentsPromise = null;
-    if ((_d = state.options) == null ? void 0 : _d.jwt) {
+    if ((_h = state.options) == null ? void 0 : _h.jwt) {
       fetchAccountAndWebsitePromise = fetchAccountAndWebsite$1().then(
         ({ account, website }) => {
           if (state.data == null) {
@@ -15676,7 +15694,7 @@ async function fetchData({
           state.data.website = website;
         }
       );
-      if ((_e2 = state.options) == null ? void 0 : _e2.payout) {
+      if ((_i = state.options) == null ? void 0 : _i.payout) {
         readyToPayoutPromise = fetchAccountAndWebsitePromise.then(
           () => fetchReadyToPayout()
         );
@@ -15687,30 +15705,12 @@ async function fetchData({
       }
       availableInstrumentsPromise = fetchInstruments();
     } else {
-      if ((_f = state.options) == null ? void 0 : _f.payout) {
+      if ((_j = state.options) == null ? void 0 : _j.payout) {
         readyToPayoutPromise = fetchReadyToPayout();
       } else {
         readyToPayPromise = fetchReadyToPay();
       }
     }
-    if ((_g = state.options) == null ? void 0 : _g.transactionId) {
-      state.data.transaction = await fetchTransaction$1({
-        data: {
-          id: state.options.transactionId
-        }
-      });
-    }
-    let productsPromise;
-    const invoiceId = ((_h = state.options) == null ? void 0 : _h.invoiceId) || ((_j = (_i = state.data) == null ? void 0 : _i.transaction) == null ? void 0 : _j.invoiceId);
-    if (invoiceId) {
-      const { invoice, products: products2 } = await fetchInvoiceAndProducts$1({
-        data: {
-          id: invoiceId
-        }
-      });
-      productsPromise = Promise.resolve(products2);
-      state.data.invoice = invoice;
-    }
     const previewPurchasePromise = ((_k = state.options) == null ? void 0 : _k.items) ? fetchSummary() : null;
     if (!((_l = state.options) == null ? void 0 : _l.jwt)) {
       productsPromise = fetchProductsFromPlans();
@@ -24485,7 +24485,7 @@ function handleComputedProperty(options) {
   var _a;
   return Object.assign({}, options, {
     _computed: {
-      version: "9.27.2",
+      version: "9.28.0",
       paymentMethodsUrl: ((_a = options._dev) == null ? void 0 : _a.paymentMethodsUrl) ?? "https://forms.secure-payments.app"
     }
   });
@@ -27827,7 +27827,7 @@ class RebillyInstrumentsInstance {
     await show({ componentName, payload });
   }
   get version() {
-    return `RebillyInstruments Ver.${"9.27.2"}`;
+    return `RebillyInstruments Ver.${"9.28.0"}`;
   }
   on(eventName, callback) {
     on({ eventName, callback });