@bunnyapp/components 1.0.38 → 1.0.39

package/dist/cjs/index.js

@@ -471,14 +471,21 @@ var usePlugins = function (_a) {
     var entityId = _a.entityId, apiHost = _a.apiHost, token = _a.token;
     var response = reactQuery.useQuery({
         queryKey: common.QueryKeyFactory.default.pluginsKey(token),
-        queryFn: function () {
-            var plugins = common.getPlugins({
-                entityId: entityId,
-                token: token,
-                apiHost: apiHost,
+        queryFn: function () { return __awaiter(void 0, void 0, void 0, function () {
+            var plugins;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, common.getPlugins({
+                            entityId: entityId,
+                            token: token,
+                            apiHost: apiHost,
+                        })];
+                    case 1:
+                        plugins = _a.sent();
+                        return [2 /*return*/, plugins];
+                }
             });
-            return plugins;
-        },
+        }); },
         enabled: Boolean(entityId),
     });
     return response;
@@ -1276,7 +1283,6 @@ var CardIcon = function () {
 var Text$c = antd.Typography.Text;
 var PaymentMethodSelector = function (_a) {
     var paymentMethodAllowedPlugins = _a.paymentMethodAllowedPlugins, onSelect = _a.onSelect, value = _a.value;
-    console.log("COMPS paymentMethodAllowedPlugins", paymentMethodAllowedPlugins);
     return (jsxRuntime.jsx("div", __assign({ className: "flex flex-col gap-2" }, { children: paymentMethodAllowedPlugins === null || paymentMethodAllowedPlugins === void 0 ? void 0 : paymentMethodAllowedPlugins.map(function (plugin, index) { return (jsxRuntime.jsx(PaymentOption, { name: plugin.name, onClick: onSelect, paymentPlugin: plugin, selected: (value === null || value === void 0 ? void 0 : value.id) === plugin.id }, index)); }) })));
 };
 var PaymentOption = function (_a) {
@@ -1341,23 +1347,28 @@ function useRemovePaymentMethod(paymentPlugins, apiHost, entityId, token, accoun
 var Panel = antd.Collapse.Panel;
 var PaymentForm = function (_a) {
     var _b;
-    var entityId = _a.entityId, invoice = _a.invoice, onFail = _a.onFail, onPaymentSuccess = _a.onPaymentSuccess, quote = _a.quote, accountId = _a.accountId, onSavePaymentMethod = _a.onSavePaymentMethod, overrideToken = _a.overrideToken, graphQLClient = _a.graphQLClient, customCheckoutFunction = _a.customCheckoutFunction, currencyIdFromProps = _a.currencyId, customPaymentForms = _a.customPaymentForms;
+    var entityId = _a.entityId, invoice = _a.invoice, onFail = _a.onFail, onPaymentSuccess = _a.onPaymentSuccess, quote = _a.quote, accountId = _a.accountId, onSavePaymentMethod = _a.onSavePaymentMethod, overrideToken = _a.overrideToken, graphQLClient = _a.graphQLClient, customCheckoutFunction = _a.customCheckoutFunction, currencyIdFromProps = _a.currencyId, customPaymentForms = _a.customPaymentForms, _c = _a.useAllPaymentPlugins, useAllPaymentPlugins = _c === void 0 ? false : _c;
     // Local state
-    var _c = react.useState(), selectedPaymentMethod = _c[0], setSelectedPaymentMethod = _c[1];
-    var _d = react.useState(false), showPaymentMethodForm = _d[0], setShowPaymentMethodForm = _d[1];
+    var _d = react.useState(), selectedPaymentMethod = _d[0], setSelectedPaymentMethod = _d[1];
+    var _e = react.useState(false), showPaymentMethodForm = _e[0], setShowPaymentMethodForm = _e[1];
     var paying = !!(quote || invoice);
     var currencyId = (_b = ((quote === null || quote === void 0 ? void 0 : quote.currencyId) ||
         (invoice === null || invoice === void 0 ? void 0 : invoice.currencyId) ||
         currencyIdFromProps)) === null || _b === void 0 ? void 0 : _b.toLowerCase();
     // Hooks
     var apiHost = react.useContext(BunnyContext).apiHost;
-    var token = useToken();
-    var _e = usePaymentMethod(graphQLClient, entityId, overrideToken || token, accountId), storedPaymentMethod = _e.data, isPaymentMethodLoading = _e.isLoading;
-    console.log("COMPS accountId", accountId);
-    console.log("COMPS storedPaymentMethod", storedPaymentMethod);
+    var tokenFromContexts = useToken();
+    var token = overrideToken || tokenFromContexts;
+    var _f = usePaymentMethod(graphQLClient, entityId, token, accountId), storedPaymentMethod = _f.data, isPaymentMethodLoading = _f.isLoading;
     var isPaymentMethodFetched = storedPaymentMethod !== undefined;
-    var _f = usePaymentPlugins({ entityId: entityId, apiHost: apiHost, token: overrideToken || token }), paymentMethodAllowedPlugins = _f.paymentPlugins, arePluginsFetched = _f.isFetched;
-    var onClickRemove = useRemovePaymentMethod(paymentMethodAllowedPlugins || [], apiHost, entityId, overrideToken || token, accountId);
+    var _g = usePaymentPlugins({ entityId: entityId, apiHost: apiHost, token: token }), allPaymentMethodAllowedPlugins = _g.paymentMethodAllowedPlugins, allPaymentPlugins = _g.paymentPlugins, arePluginsFetched = _g.isFetched;
+    var paymentMethodAllowedPlugins = react.useMemo(function () {
+        if (useAllPaymentPlugins) {
+            return allPaymentPlugins;
+        }
+        return allPaymentMethodAllowedPlugins;
+    }, [allPaymentMethodAllowedPlugins, allPaymentPlugins, useAllPaymentPlugins]);
+    var onClickRemove = useRemovePaymentMethod(paymentMethodAllowedPlugins || [], apiHost, entityId, token, accountId);
     var queryClient = reactQuery.useQueryClient();
     // Set default plugin
     react.useEffect(function () {
@@ -19945,7 +19956,6 @@ function PriceListDisplay(_a) {
     var priceListData = _a.priceListData, topNavImageUrl = _a.topNavImageUrl;
     if (!priceListData)
         return null;
-    console.log("topNavImageUrl", topNavImageUrl);
     return (jsxRuntime.jsx(jsxRuntime.Fragment, { children: jsxRuntime.jsx("div", __assign({ className: "flex flex-col justify-between h-full my-12" }, { children: jsxRuntime.jsxs("div", __assign({ className: "flex flex-col space-y-8" }, { children: [jsxRuntime.jsx(antd.Image, { width: 24, src: topNavImageUrl, alt: "Logo", preview: false }), jsxRuntime.jsxs("div", __assign({ className: "flex flex-col" }, { children: [jsxRuntime.jsx(Text$3, __assign({ className: "text-slate-500 font-bold text-lg" }, { children: priceListData.name })), jsxRuntime.jsxs(Text$3, __assign({ className: "font-bold text-xl" }, { children: [common.formatCurrency(priceListData.basePrice, priceListData.currencyId), " ", "/ month"] }))] })), priceListData.trialAllowed ? (jsxRuntime.jsxs("div", __assign({ className: "flex flex-col" }, { children: [jsxRuntime.jsxs(Text$3, __assign({ style: { fontSize: "16px" }, className: "text-slate-500" }, { children: [priceListData.trialLengthDays, " day trial"] })), jsxRuntime.jsx(Text$3, __assign({ className: "text-slate-500", style: { fontSize: "12px" } }, { children: "You will not be charged until the last day of the trial." }))] }))) : null] })) })) }));
 }
 
@@ -19954,12 +19964,13 @@ function Signup(_a) {
     var companyName = _a.companyName, entityId = _a.entityId, priceListCode = _a.priceListCode, returnUrl = _a.returnUrl, _b = _a.isCardEnabled, isCardEnabled = _b === void 0 ? true : _b, className = _a.className, _c = _a.shadow, shadow = _c === void 0 ? "shadow-md" : _c, style = _a.style;
     // Hooks
     var _d = react.useContext(BunnyContext), apiHost = _d.apiHost, graphQLClient = _d.graphQLClient;
-    var token = useToken();
+    var tokenFromContexts = useToken();
     var isMobile = common.useIsMobile();
     var topNavImageUrl = react.useContext(BrandContext).topNavImageUrl;
     var _e = react.useState(undefined), quote = _e[0], setQuote = _e[1];
     var _f = react.useState(undefined), accountId = _f[0], setAccountId = _f[1];
     var _g = react.useState(undefined), portalSessionToken = _g[0], setPortalSessionToken = _g[1];
+    var token = portalSessionToken || tokenFromContexts;
     var _h = react.useState(false), proceedingToPayment = _h[0], setProceedingToPayment = _h[1];
     var _j = react.useState(false), purchaseSucceeded = _j[0], setPurchaseSucceeded = _j[1];
     var _k = react.useState(undefined), paymentMethodGraphQLClient = _k[0], setPaymentMethodGraphQLClient = _k[1];
@@ -20006,7 +20017,7 @@ function Signup(_a) {
                     case 2:
                         error_1 = _a.sent();
                         setProceedingToPayment(false);
-                        showErrorNotification(error_1);
+                        showErrorNotification(error_1.response.message);
                         return [3 /*break*/, 3];
                     case 3: return [2 /*return*/];
                 }
@@ -20051,7 +20062,7 @@ function Signup(_a) {
         });
     }
     function handlePaymentFail(error) {
-        showErrorNotification(error.message);
+        showErrorNotification(error.response.message);
     }
     var WrapperComponent = function (_a) {
         var children = _a.children, className = _a.className, style = _a.style;

package/dist/cjs/src/components/PaymentForm/PaymentForm.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { FormattedInvoice, PluginData, Quote } from "@bunnyapp/common";
 import { GraphQLClient } from "graphql-request";
-export declare const PaymentForm: ({ entityId, invoice, onFail, onPaymentSuccess, quote, accountId, onSavePaymentMethod, overrideToken, graphQLClient, customCheckoutFunction, currencyId: currencyIdFromProps, customPaymentForms, }: {
+export declare const PaymentForm: ({ entityId, invoice, onFail, onPaymentSuccess, quote, accountId, onSavePaymentMethod, overrideToken, graphQLClient, customCheckoutFunction, currencyId: currencyIdFromProps, customPaymentForms, useAllPaymentPlugins, }: {
     entityId: string;
     invoice?: FormattedInvoice | undefined;
     quote?: Quote | undefined;
@@ -14,4 +14,5 @@ export declare const PaymentForm: ({ entityId, invoice, onFail, onPaymentSuccess
     customCheckoutFunction?: ((plugin: PluginData | undefined) => Promise<any>) | undefined;
     currencyId?: string | undefined;
     customPaymentForms?: Record<string, import("react").ReactNode> | undefined;
+    useAllPaymentPlugins?: boolean | undefined;
 }) => import("react/jsx-runtime").JSX.Element;

package/dist/esm/index.js

@@ -443,14 +443,21 @@ var usePlugins = function (_a) {
     var entityId = _a.entityId, apiHost = _a.apiHost, token = _a.token;
     var response = useQuery({
         queryKey: QueryKeyFactory.default.pluginsKey(token),
-        queryFn: function () {
-            var plugins = getPlugins({
-                entityId: entityId,
-                token: token,
-                apiHost: apiHost,
+        queryFn: function () { return __awaiter(void 0, void 0, void 0, function () {
+            var plugins;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, getPlugins({
+                            entityId: entityId,
+                            token: token,
+                            apiHost: apiHost,
+                        })];
+                    case 1:
+                        plugins = _a.sent();
+                        return [2 /*return*/, plugins];
+                }
             });
-            return plugins;
-        },
+        }); },
         enabled: Boolean(entityId),
     });
     return response;
@@ -1248,7 +1255,6 @@ var CardIcon = function () {
 var Text$c = Typography.Text;
 var PaymentMethodSelector = function (_a) {
     var paymentMethodAllowedPlugins = _a.paymentMethodAllowedPlugins, onSelect = _a.onSelect, value = _a.value;
-    console.log("COMPS paymentMethodAllowedPlugins", paymentMethodAllowedPlugins);
     return (jsx("div", __assign({ className: "flex flex-col gap-2" }, { children: paymentMethodAllowedPlugins === null || paymentMethodAllowedPlugins === void 0 ? void 0 : paymentMethodAllowedPlugins.map(function (plugin, index) { return (jsx(PaymentOption, { name: plugin.name, onClick: onSelect, paymentPlugin: plugin, selected: (value === null || value === void 0 ? void 0 : value.id) === plugin.id }, index)); }) })));
 };
 var PaymentOption = function (_a) {
@@ -1313,23 +1319,28 @@ function useRemovePaymentMethod(paymentPlugins, apiHost, entityId, token, accoun
 var Panel = Collapse.Panel;
 var PaymentForm = function (_a) {
     var _b;
-    var entityId = _a.entityId, invoice = _a.invoice, onFail = _a.onFail, onPaymentSuccess = _a.onPaymentSuccess, quote = _a.quote, accountId = _a.accountId, onSavePaymentMethod = _a.onSavePaymentMethod, overrideToken = _a.overrideToken, graphQLClient = _a.graphQLClient, customCheckoutFunction = _a.customCheckoutFunction, currencyIdFromProps = _a.currencyId, customPaymentForms = _a.customPaymentForms;
+    var entityId = _a.entityId, invoice = _a.invoice, onFail = _a.onFail, onPaymentSuccess = _a.onPaymentSuccess, quote = _a.quote, accountId = _a.accountId, onSavePaymentMethod = _a.onSavePaymentMethod, overrideToken = _a.overrideToken, graphQLClient = _a.graphQLClient, customCheckoutFunction = _a.customCheckoutFunction, currencyIdFromProps = _a.currencyId, customPaymentForms = _a.customPaymentForms, _c = _a.useAllPaymentPlugins, useAllPaymentPlugins = _c === void 0 ? false : _c;
     // Local state
-    var _c = useState(), selectedPaymentMethod = _c[0], setSelectedPaymentMethod = _c[1];
-    var _d = useState(false), showPaymentMethodForm = _d[0], setShowPaymentMethodForm = _d[1];
+    var _d = useState(), selectedPaymentMethod = _d[0], setSelectedPaymentMethod = _d[1];
+    var _e = useState(false), showPaymentMethodForm = _e[0], setShowPaymentMethodForm = _e[1];
     var paying = !!(quote || invoice);
     var currencyId = (_b = ((quote === null || quote === void 0 ? void 0 : quote.currencyId) ||
         (invoice === null || invoice === void 0 ? void 0 : invoice.currencyId) ||
         currencyIdFromProps)) === null || _b === void 0 ? void 0 : _b.toLowerCase();
     // Hooks
     var apiHost = useContext(BunnyContext).apiHost;
-    var token = useToken();
-    var _e = usePaymentMethod(graphQLClient, entityId, overrideToken || token, accountId), storedPaymentMethod = _e.data, isPaymentMethodLoading = _e.isLoading;
-    console.log("COMPS accountId", accountId);
-    console.log("COMPS storedPaymentMethod", storedPaymentMethod);
+    var tokenFromContexts = useToken();
+    var token = overrideToken || tokenFromContexts;
+    var _f = usePaymentMethod(graphQLClient, entityId, token, accountId), storedPaymentMethod = _f.data, isPaymentMethodLoading = _f.isLoading;
     var isPaymentMethodFetched = storedPaymentMethod !== undefined;
-    var _f = usePaymentPlugins({ entityId: entityId, apiHost: apiHost, token: overrideToken || token }), paymentMethodAllowedPlugins = _f.paymentPlugins, arePluginsFetched = _f.isFetched;
-    var onClickRemove = useRemovePaymentMethod(paymentMethodAllowedPlugins || [], apiHost, entityId, overrideToken || token, accountId);
+    var _g = usePaymentPlugins({ entityId: entityId, apiHost: apiHost, token: token }), allPaymentMethodAllowedPlugins = _g.paymentMethodAllowedPlugins, allPaymentPlugins = _g.paymentPlugins, arePluginsFetched = _g.isFetched;
+    var paymentMethodAllowedPlugins = useMemo(function () {
+        if (useAllPaymentPlugins) {
+            return allPaymentPlugins;
+        }
+        return allPaymentMethodAllowedPlugins;
+    }, [allPaymentMethodAllowedPlugins, allPaymentPlugins, useAllPaymentPlugins]);
+    var onClickRemove = useRemovePaymentMethod(paymentMethodAllowedPlugins || [], apiHost, entityId, token, accountId);
     var queryClient = useQueryClient();
     // Set default plugin
     useEffect(function () {
@@ -19917,7 +19928,6 @@ function PriceListDisplay(_a) {
     var priceListData = _a.priceListData, topNavImageUrl = _a.topNavImageUrl;
     if (!priceListData)
         return null;
-    console.log("topNavImageUrl", topNavImageUrl);
     return (jsx(Fragment, { children: jsx("div", __assign({ className: "flex flex-col justify-between h-full my-12" }, { children: jsxs("div", __assign({ className: "flex flex-col space-y-8" }, { children: [jsx(Image, { width: 24, src: topNavImageUrl, alt: "Logo", preview: false }), jsxs("div", __assign({ className: "flex flex-col" }, { children: [jsx(Text$3, __assign({ className: "text-slate-500 font-bold text-lg" }, { children: priceListData.name })), jsxs(Text$3, __assign({ className: "font-bold text-xl" }, { children: [formatCurrency(priceListData.basePrice, priceListData.currencyId), " ", "/ month"] }))] })), priceListData.trialAllowed ? (jsxs("div", __assign({ className: "flex flex-col" }, { children: [jsxs(Text$3, __assign({ style: { fontSize: "16px" }, className: "text-slate-500" }, { children: [priceListData.trialLengthDays, " day trial"] })), jsx(Text$3, __assign({ className: "text-slate-500", style: { fontSize: "12px" } }, { children: "You will not be charged until the last day of the trial." }))] }))) : null] })) })) }));
 }
 
@@ -19926,12 +19936,13 @@ function Signup(_a) {
     var companyName = _a.companyName, entityId = _a.entityId, priceListCode = _a.priceListCode, returnUrl = _a.returnUrl, _b = _a.isCardEnabled, isCardEnabled = _b === void 0 ? true : _b, className = _a.className, _c = _a.shadow, shadow = _c === void 0 ? "shadow-md" : _c, style = _a.style;
     // Hooks
     var _d = useContext(BunnyContext), apiHost = _d.apiHost, graphQLClient = _d.graphQLClient;
-    var token = useToken();
+    var tokenFromContexts = useToken();
     var isMobile = useIsMobile();
     var topNavImageUrl = useContext(BrandContext).topNavImageUrl;
     var _e = useState(undefined), quote = _e[0], setQuote = _e[1];
     var _f = useState(undefined), accountId = _f[0], setAccountId = _f[1];
     var _g = useState(undefined), portalSessionToken = _g[0], setPortalSessionToken = _g[1];
+    var token = portalSessionToken || tokenFromContexts;
     var _h = useState(false), proceedingToPayment = _h[0], setProceedingToPayment = _h[1];
     var _j = useState(false), purchaseSucceeded = _j[0], setPurchaseSucceeded = _j[1];
     var _k = useState(undefined), paymentMethodGraphQLClient = _k[0], setPaymentMethodGraphQLClient = _k[1];
@@ -19978,7 +19989,7 @@ function Signup(_a) {
                     case 2:
                         error_1 = _a.sent();
                         setProceedingToPayment(false);
-                        showErrorNotification(error_1);
+                        showErrorNotification(error_1.response.message);
                         return [3 /*break*/, 3];
                     case 3: return [2 /*return*/];
                 }
@@ -20023,7 +20034,7 @@ function Signup(_a) {
         });
     }
     function handlePaymentFail(error) {
-        showErrorNotification(error.message);
+        showErrorNotification(error.response.message);
     }
     var WrapperComponent = function (_a) {
         var children = _a.children, className = _a.className, style = _a.style;

package/dist/esm/src/components/PaymentForm/PaymentForm.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { FormattedInvoice, PluginData, Quote } from "@bunnyapp/common";
 import { GraphQLClient } from "graphql-request";
-export declare const PaymentForm: ({ entityId, invoice, onFail, onPaymentSuccess, quote, accountId, onSavePaymentMethod, overrideToken, graphQLClient, customCheckoutFunction, currencyId: currencyIdFromProps, customPaymentForms, }: {
+export declare const PaymentForm: ({ entityId, invoice, onFail, onPaymentSuccess, quote, accountId, onSavePaymentMethod, overrideToken, graphQLClient, customCheckoutFunction, currencyId: currencyIdFromProps, customPaymentForms, useAllPaymentPlugins, }: {
     entityId: string;
     invoice?: FormattedInvoice | undefined;
     quote?: Quote | undefined;
@@ -14,4 +14,5 @@ export declare const PaymentForm: ({ entityId, invoice, onFail, onPaymentSuccess
     customCheckoutFunction?: ((plugin: PluginData | undefined) => Promise<any>) | undefined;
     currencyId?: string | undefined;
     customPaymentForms?: Record<string, import("react").ReactNode> | undefined;
+    useAllPaymentPlugins?: boolean | undefined;
 }) => import("react/jsx-runtime").JSX.Element;

package/dist/index.d.ts

@@ -82,7 +82,7 @@ declare const PaymentMethod: ({ entityId, className, shadow, cardEnabled, useMod
     useModal?: boolean | undefined;
 }) => react_jsx_runtime.JSX.Element;
 
-declare const PaymentForm: ({ entityId, invoice, onFail, onPaymentSuccess, quote, accountId, onSavePaymentMethod, overrideToken, graphQLClient, customCheckoutFunction, currencyId: currencyIdFromProps, customPaymentForms, }: {
+declare const PaymentForm: ({ entityId, invoice, onFail, onPaymentSuccess, quote, accountId, onSavePaymentMethod, overrideToken, graphQLClient, customCheckoutFunction, currencyId: currencyIdFromProps, customPaymentForms, useAllPaymentPlugins, }: {
     entityId: string;
     invoice?: FormattedInvoice | undefined;
     quote?: Quote$1 | undefined;
@@ -95,6 +95,7 @@ declare const PaymentForm: ({ entityId, invoice, onFail, onPaymentSuccess, quote
     customCheckoutFunction?: ((plugin: PluginData | undefined) => Promise<any>) | undefined;
     currencyId?: string | undefined;
     customPaymentForms?: Record<string, react.ReactNode> | undefined;
+    useAllPaymentPlugins?: boolean | undefined;
 }) => react_jsx_runtime.JSX.Element;
 
 type CheckoutProps = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bunnyapp/components",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "description": "Components from the Bunny portal to embed Bunny UI functionality into your application.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",