@kiva/kv-shop 3.1.1 → 3.2.0

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, }: OneTimeCheckoutForGivingFundOptions): Promise<CheckoutStatusQueryResult>;
+export declare function executeOneTimeCheckoutForGivingFund({ amount, apollo, braintree, emailAddress, emailOptIn, fundTarget, userId, useKivaCredit, }: OneTimeCheckoutForGivingFundOptions): Promise<CheckoutStatusQueryResult>;
 
 export declare function getBasketID(): string;
 
@@ -144,14 +144,14 @@ export declare function isBasketVerified(state: VerificationState): boolean;
 export { KvPaymentSelect }
 
 export declare interface OneTimeCheckoutForGivingFundOptions {
+    amount: string;
     apollo: ApolloClient<any>;
     braintree?: DropInWrapper;
     emailAddress?: string;
     emailOptIn?: boolean;
-    userId?: string;
     fundTarget: string;
-    amount: string;
-    visitorId?: string;
+    userId?: string;
+    useKivaCredit?: boolean;
 }
 
 export declare interface OneTimeCheckoutOptions {

package/dist/oneTimeCheckout.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kiva/kv-shop",
-    "version": "3.1.1",
+    "version": "3.2.0",
     "type": "module",
     "publishConfig": {
         "access": "public"
@@ -26,7 +26,7 @@
     "devDependencies": {
         "@apollo/client": "^3.13.1",
         "@kiva/kv-analytics": "^1.3.0",
-        "@kiva/kv-components": "^6.39.0",
+        "@kiva/kv-components": "^6.40.0",
         "@kiva/vite-plugin-vue-lib-css": "^2.0.0",
         "@types/braintree-web-drop-in": "^1.39.3",
         "@types/jest": "^29.5.14",
@@ -55,5 +55,5 @@
         "numeral": "2.x",
         "vue": "3.x"
     },
-    "gitHead": "d1f5e8422acc9bd1cbd36398e524e01b500c192d"
+    "gitHead": "07d41069c31f0c897a5bb17149e8ae31e338cb21"
 }