@kiva/kv-shop 3.2.9 → 3.3.0

package/dist/basketItems.js

@@ -1,9 +1,9 @@
 import { gql as r } from "@apollo/client/core";
 import p from "numeral";
 import { callShopMutation as m } from "./shopQueries.js";
-async function d({ amount: a, apollo: o, metadata: e }) {
-  var i;
-  const n = p(a).format("0.00"), t = await m(o, {
+async function u({ amount: i, apollo: e, metadata: o }) {
+  var a;
+  const n = p(i).format("0.00"), t = await m(e, {
     awaitRefetchQueries: !0,
     mutation: r`mutation setTipDonation($price: Money!, $basketId: String, $metadata: String) {
 			shop (basketId: $basketId) {
@@ -14,16 +14,21 @@ async function d({ amount: a, apollo: o, metadata: e }) {
 					metadata: $metadata,
 				})
 				{
+					basketItemType
 					id
-					price
 					isTip
+					isUserEdited
+					metadata {
+						campaignId
+					}
+					price
 				}
 			}
 		}`,
-    variables: { price: n, metadata: e }
+    variables: { price: n, metadata: o }
   });
-  return (i = t == null ? void 0 : t.shop) == null ? void 0 : i.updateDonation;
+  return (a = t == null ? void 0 : t.shop) == null ? void 0 : a.updateDonation;
 }
 export {
-  d as setTipDonation
+  u as setTipDonation
 };

package/dist/index.d.ts

@@ -114,7 +114,7 @@ export declare function executeNewSubscriptionCheckout({ amount, apollo, dayOfMo
 
 export declare function executeOneTimeCheckout({ apollo, braintree, emailAddress, emailOptIn, valetInviter, deactivateRedirect, }: OneTimeCheckoutOptions): Promise<CheckoutStatusQueryResult>;
 
-export declare function executeOneTimeCheckoutForGivingFund({ amount, apollo, braintree, emailAddress, emailOptIn, fundTarget, userId, useKivaCredit, }: OneTimeCheckoutForGivingFundOptions): Promise<CheckoutStatusQueryResult>;
+export declare function executeOneTimeCheckoutForGivingFund({ amount, apollo, braintree, emailAddress, emailOptIn, fundTarget, userId, useKivaCredit, }: OneTimeCheckoutForGivingFundOptions): Promise<OneTimeCheckoutForGivingFundResult>;
 
 export declare function getBasketID(): string;
 
@@ -154,6 +154,17 @@ export declare interface OneTimeCheckoutForGivingFundOptions {
     useKivaCredit?: boolean;
 }
 
+export declare interface OneTimeCheckoutForGivingFundResult {
+    data: {
+        checkoutStatus: any;
+        donation: any;
+        givingFund: {
+            id: string;
+        };
+    } | null;
+    errors?: any;
+}
+
 export declare interface OneTimeCheckoutOptions {
     apollo: ApolloClient<any>;
     braintree?: DropInWrapper;

package/dist/oneTimeCheckout.js

@@ -1,20 +1,20 @@
 import { gql as $ } from "@apollo/client/core";
-import { trackTransaction as x } from "@kiva/kv-analytics";
-import T from "numeral";
-import { pollForFinishedCheckout as q } from "./checkoutStatus.js";
+import { trackTransaction as E } from "@kiva/kv-analytics";
+import R from "numeral";
+import { pollForFinishedCheckout as D } from "./checkoutStatus.js";
 import { ShopError as v, parseShopError as S } from "./shopError.js";
-import { callShopQuery as B, callShopMutation as D } from "./shopQueries.js";
-import { validatePreCheckout as N } from "./validatePreCheckout.js";
-import { wait as E } from "./util/poll.js";
-import { getVisitorID as P } from "./util/visitorId.js";
-import { redirectTo as _ } from "./util/redirect.js";
-import { getCheckoutTrackingData as G } from "./receipt.js";
-import { addGivingFund as O } from "./givingFunds.js";
-import { setTipDonation as K } from "./basketItems.js";
-import { removeKivaCredit as Q } from "./basketCredits.js";
-async function R(e) {
+import { callShopQuery as _, callShopMutation as N } from "./shopQueries.js";
+import { validatePreCheckout as P } from "./validatePreCheckout.js";
+import { wait as G } from "./util/poll.js";
+import { getVisitorID as l } from "./util/visitorId.js";
+import { redirectTo as O } from "./util/redirect.js";
+import { getCheckoutTrackingData as K } from "./receipt.js";
+import { addGivingFund as Q } from "./givingFunds.js";
+import { setTipDonation as U } from "./basketItems.js";
+import { removeKivaCredit as V } from "./basketCredits.js";
+async function A(e) {
   var r, o, i;
-  const t = await B(e, {
+  const t = await _(e, {
     query: $`
 			query creditAmountNeeded($basketId: String) {
 				shop (basketId: $basketId) {
@@ -32,7 +32,7 @@ async function R(e) {
   }, 0);
   return (i = (o = (r = t == null ? void 0 : t.shop) == null ? void 0 : r.basket) == null ? void 0 : o.totals) == null ? void 0 : i.creditAmountNeeded;
 }
-const U = $`
+const j = $`
 	mutation creditCheckout(
 		$basketId: String,
 		$visitorId: String
@@ -42,7 +42,7 @@ const U = $`
 			transactionId: checkoutAsync (visitorId: $visitorId)
 		}
 	}
-`, V = $`
+`, z = $`
 	mutation depositCheckout(
 		$basketId: String,
 		$amount: Money!,
@@ -63,15 +63,15 @@ const U = $`
 		}
 	}
 `;
-function A(e) {
-  return D(e, {
-    mutation: U,
+function F(e) {
+  return N(e, {
+    mutation: j,
     variables: {
-      visitorId: P()
+      visitorId: l()
     }
   }, 0);
 }
-async function F({
+async function x({
   apollo: e,
   braintree: t,
   amount: r
@@ -83,18 +83,18 @@ async function F({
         { code: "shop.dropinNoPaymentMethod" },
         "No payment method returned from braintree dropin"
       );
-    const { nonce: i, deviceData: u, type: a } = o;
+    const { nonce: i, deviceData: u, type: d } = o;
     return {
-      paymentType: a,
-      mutation: D(e, {
-        mutation: V,
+      paymentType: d,
+      mutation: N(e, {
+        mutation: z,
         variables: {
           nonce: i,
           amount: r,
           savePaymentMethod: !1,
           // save payment methods handled by braintree drop in UI
           deviceData: u,
-          visitorId: P()
+          visitorId: l()
         }
       }, 0)
     };
@@ -102,19 +102,19 @@ async function F({
     throw S(o);
   }
 }
-async function l(e, t, r) {
+async function B(e, t, r) {
   try {
-    const o = await G(
+    const o = await K(
       e,
       t,
       r
     );
-    x(o), await E(800);
+    E(o), await G(800);
   } catch (o) {
     console.error("Error tracking transaction", o);
   }
 }
-async function nt({
+async function ct({
   apollo: e,
   braintree: t,
   emailAddress: r,
@@ -122,91 +122,105 @@ async function nt({
   valetInviter: i,
   deactivateRedirect: u
 }) {
-  var I, d, g, h, p;
-  await N({
+  var h, y, a, w, g;
+  await P({
     apollo: e,
     emailAddress: r,
     emailOptIn: o,
     valetInviter: i
   });
-  const a = await R(e), f = T(a).value() > 0;
-  if (f && !t)
+  const d = await A(e), k = R(d).value() > 0;
+  if (k && !t)
     throw new v({ code: "shop.dropinRequired" }, "Braintree dropin required for credit deposit checkout");
-  let s, y = "";
-  if (f) {
-    const k = await F({
+  let n, f = "";
+  if (k) {
+    const p = await x({
       apollo: e,
       braintree: t,
-      amount: a
+      amount: d
     });
-    y = k.paymentType, s = await k.mutation;
+    f = p.paymentType, n = await p.mutation;
   } else
-    s = await A(e);
-  const w = (I = s == null ? void 0 : s.shop) == null ? void 0 : I.transactionId, c = await q({
+    n = await F(e);
+  const I = (h = n == null ? void 0 : n.shop) == null ? void 0 : h.transactionId, s = await D({
     apollo: e,
-    transactionSagaId: w,
+    transactionSagaId: I,
     timeout: 3e5
     // five minutes
   });
-  if ((d = c.errors) != null && d.length)
-    throw S(c.errors[0]);
-  const n = (p = (h = (g = c.data) == null ? void 0 : g.checkoutStatus) == null ? void 0 : h.receipt) == null ? void 0 : p.checkoutId;
-  if (await l(e, n, y), u)
-    return c;
-  let m = `/checkout/post-purchase?kiva_transaction_id=${n}`;
-  i != null && i.inviterId && (m += `&valet_inviter=${i.inviterId}`), await _(m);
+  if ((y = s.errors) != null && y.length)
+    throw S(s.errors[0]);
+  const m = (g = (w = (a = s.data) == null ? void 0 : a.checkoutStatus) == null ? void 0 : w.receipt) == null ? void 0 : g.checkoutId;
+  if (await B(e, m, f), u)
+    return s;
+  let c = `/checkout/post-purchase?kiva_transaction_id=${m}`;
+  i != null && i.inviterId && (c += `&valet_inviter=${i.inviterId}`), await O(c);
 }
-async function at({
+async function dt({
   amount: e,
   apollo: t,
   braintree: r,
   emailAddress: o,
   emailOptIn: i,
   fundTarget: u,
-  userId: a,
-  useKivaCredit: f = !0
+  userId: d,
+  useKivaCredit: k = !0
 }) {
-  var h, p, k, C, b;
-  await N({
+  var p, b, C, M, T;
+  await P({
     apollo: t,
     emailAddress: o,
     emailOptIn: i
   });
-  const y = `campaignId: ${(await O({
+  const n = await Q({
     apollo: t,
     fundTarget: u,
-    userId: a ? `${a}` : void 0
-  })).id}`;
-  await K({
+    userId: d ? `${d}` : void 0
+  }), f = `campaignId: ${n.id}`, I = await U({
     amount: e,
-    metadata: y,
+    metadata: f,
     apollo: t
-  }), f || await Q(t);
-  const w = await R(t), c = T(w).value() > 0;
-  if (c && !r)
+  });
+  k || await V(t);
+  const s = await A(t), m = R(s).value() > 0;
+  if (m && !r)
     throw new v({ code: "shop.dropinRequired" }, "Braintree dropin required for credit deposit checkout");
-  let n, m = "";
-  if (c) {
-    const M = await F({
+  let c, h = "";
+  if (m) {
+    const q = await x({
       apollo: t,
       braintree: r,
-      amount: w
+      amount: s
     });
-    m = M.paymentType, n = await M.mutation;
+    h = q.paymentType, c = await q.mutation;
   } else
-    n = await A(t);
-  const I = (h = n == null ? void 0 : n.shop) == null ? void 0 : h.transactionId, d = await q({
+    c = await F(t);
+  const y = (p = c == null ? void 0 : c.shop) == null ? void 0 : p.transactionId, a = await D({
     apollo: t,
-    transactionSagaId: I,
+    transactionSagaId: y,
     timeout: 3e5
     // five minutes
   });
-  if ((p = d.errors) != null && p.length)
-    throw S(d.errors[0]);
-  const g = (b = (C = (k = d.data) == null ? void 0 : k.checkoutStatus) == null ? void 0 : C.receipt) == null ? void 0 : b.checkoutId;
-  return await l(t, g, m), d;
+  if ((b = a.errors) != null && b.length)
+    throw S(a.errors[0]);
+  const w = (T = (M = (C = a.data) == null ? void 0 : C.checkoutStatus) == null ? void 0 : M.receipt) == null ? void 0 : T.checkoutId;
+  return await B(t, w, h), {
+    data: {
+      ...a.data,
+      checkoutStatus: {
+        ...a.data.checkoutStatus
+      },
+      donation: {
+        ...I
+      },
+      givingFund: {
+        id: n.id
+      }
+    },
+    errors: a.errors ?? []
+  };
 }
 export {
-  nt as executeOneTimeCheckout,
-  at as executeOneTimeCheckoutForGivingFund
+  ct as executeOneTimeCheckout,
+  dt as executeOneTimeCheckoutForGivingFund
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kiva/kv-shop",
-    "version": "3.2.9",
+    "version": "3.3.0",
     "type": "module",
     "publishConfig": {
         "access": "public"
@@ -55,5 +55,5 @@
         "numeral": "2.x",
         "vue": "3.x"
     },
-    "gitHead": "c153687be5fd01c127a6c117eb061899d3da5105"
+    "gitHead": "66f2edef6330f52bb77fd6acb06b70cced0b883f"
 }