@betterstore/react 0.3.79 → 0.3.81

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @betterstore/sdk
 
+## 0.3.81
+
+### Patch Changes
+
+- debugging
+
+## 0.3.80
+
+### Patch Changes
+
+- bug fixes
+
 ## 0.3.79
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -35750,33 +35750,58 @@ function CheckoutEmbedComponent({ checkoutId, config }) {
     };
     function generatePaymentSecret() {
         return __awaiter(this, void 0, void 0, function* () {
+            console.log("[Payment Debug] Generating new payment secret");
             const { paymentSecret, publicKey, checkoutSession } = yield storeClient.generateCheckoutPaymentSecret(clientSecret, checkoutId);
             setPaymentSecret(paymentSecret);
             setPublicKey(publicKey);
             setCheckout(checkoutSession);
+            console.log("[Payment Debug] New payment secret generated");
         });
     }
     React.useEffect(() => {
         if (step === "payment" &&
             !paymentSecret &&
             !paymentSecretPromiseRef.current) {
+            console.log("[Payment Debug] Initial payment secret generation triggered by useEffect");
             paymentSecretPromiseRef.current = generatePaymentSecret().finally(() => {
                 paymentSecretPromiseRef.current = null;
             });
         }
     }, [paymentSecret, step]);
     const applyDiscountCode = (code) => __awaiter(this, void 0, void 0, function* () {
+        console.log("[Payment Debug] Applying discount code:", code);
         const newCheckout = yield storeClient.applyDiscountCode(clientSecret, checkoutId, code);
         setCheckout(newCheckout);
         if (step === "payment") {
-            yield generatePaymentSecret();
-            setPaymentComponentKey((prev) => prev + 1);
+            const newTotal = calculateTotalWithDiscounts(newCheckout);
+            const currentTotal = calculateTotalWithDiscounts(checkout);
+            console.log("[Payment Debug] Discount applied - New total:", newTotal, "Current total:", currentTotal);
+            if (newTotal !== currentTotal) {
+                console.log("[Payment Debug] Total changed, regenerating payment secret");
+                yield generatePaymentSecret();
+                setPaymentComponentKey((prev) => prev + 1);
+            }
+            else {
+                console.log("[Payment Debug] Total unchanged, skipping payment secret regeneration");
+            }
         }
     });
     const revalidateDiscounts = () => __awaiter(this, void 0, void 0, function* () {
+        console.log("[Payment Debug] Revalidating discounts");
         if (step === "payment") {
-            yield generatePaymentSecret();
-            setPaymentComponentKey((prev) => prev + 1);
+            const newCheckout = yield storeClient.revalidateDiscounts(clientSecret, checkoutId);
+            const newTotal = calculateTotalWithDiscounts(newCheckout);
+            const currentTotal = calculateTotalWithDiscounts(checkout);
+            console.log("[Payment Debug] Discounts revalidated - New total:", newTotal, "Current total:", currentTotal);
+            if (newTotal !== currentTotal) {
+                console.log("[Payment Debug] Total changed, regenerating payment secret");
+                yield generatePaymentSecret();
+                setPaymentComponentKey((prev) => prev + 1);
+            }
+            else {
+                console.log("[Payment Debug] Total unchanged, skipping payment secret regeneration");
+            }
+            setCheckout(newCheckout);
         }
         else {
             const newCheckout = yield storeClient.revalidateDiscounts(clientSecret, checkoutId);
@@ -35784,20 +35809,62 @@ function CheckoutEmbedComponent({ checkoutId, config }) {
         }
     });
     const removeDiscount = (id) => __awaiter(this, void 0, void 0, function* () {
+        console.log("[Payment Debug] Removing discount:", id);
         const newCheckout = yield storeClient.removeDiscount(clientSecret, checkoutId, id);
         setCheckout(newCheckout);
         if (step === "payment") {
-            yield generatePaymentSecret();
-            setPaymentComponentKey((prev) => prev + 1);
+            const newTotal = calculateTotalWithDiscounts(newCheckout);
+            const currentTotal = calculateTotalWithDiscounts(checkout);
+            console.log("[Payment Debug] Discount removed - New total:", newTotal, "Current total:", currentTotal);
+            if (newTotal !== currentTotal) {
+                console.log("[Payment Debug] Total changed, regenerating payment secret");
+                yield generatePaymentSecret();
+                setPaymentComponentKey((prev) => prev + 1);
+            }
+            else {
+                console.log("[Payment Debug] Total unchanged, skipping payment secret regeneration");
+            }
         }
     });
+    const calculateTotalWithDiscounts = (checkout) => {
+        var _a, _b;
+        if (!checkout)
+            return 0;
+        const subtotal = checkout.lineItems.reduce((acc, item) => {
+            var _a, _b;
+            const productItem = ((_a = item.productData) === null || _a === void 0 ? void 0 : _a.selectedVariant) || item.productData;
+            return acc + ((_b = productItem === null || productItem === void 0 ? void 0 : productItem.priceInCents) !== null && _b !== void 0 ? _b : 0) * item.quantity;
+        }, 0);
+        const shippingPrice = (_a = checkout.shipping) !== null && _a !== void 0 ? _a : 0;
+        const total = subtotal + ((_b = checkout.tax) !== null && _b !== void 0 ? _b : 0) + shippingPrice;
+        const isShippingFree = subtotal > shippingPrice &&
+            checkout.appliedDiscounts.some((discount) => discount.discount.type === "FREE_SHIPPING");
+        const filteredDiscounts = checkout.appliedDiscounts.filter((discount) => discount.discount.type !== "FREE_SHIPPING");
+        const finalTotal = total -
+            filteredDiscounts.reduce((acc, { amount }) => acc + amount, 0) -
+            (isShippingFree ? shippingPrice : 0);
+        console.log("[Payment Debug] Total calculation:", {
+            subtotal,
+            shippingPrice,
+            tax: checkout.tax,
+            isShippingFree,
+            discountAmount: filteredDiscounts.reduce((acc, { amount }) => acc + amount, 0),
+            finalTotal,
+        });
+        return finalTotal;
+    };
     React.useEffect(() => {
+        console.log("[Payment Debug] Setting up discount revalidation interval");
         const interval = setTimeout(() => {
             if (step !== "payment") {
+                console.log("[Payment Debug] Interval triggered revalidation");
                 revalidateDiscounts();
             }
         }, 1000 * 5);
-        return () => clearInterval(interval);
+        return () => {
+            console.log("[Payment Debug] Clearing revalidation interval");
+            clearInterval(interval);
+        };
     }, []);
     return (React.createElement(IframeWrapper, { iframeRef: iframeRef },
         React.createElement("div", { className: "checkout-embed h-max gap-6 md:gap-0 py-4 md:py-12 flex flex-col md:grid md:grid-cols-7 " },

package/dist/index.mjs

@@ -35730,33 +35730,58 @@ function CheckoutEmbedComponent({ checkoutId, config }) {
     };
     function generatePaymentSecret() {
         return __awaiter(this, void 0, void 0, function* () {
+            console.log("[Payment Debug] Generating new payment secret");
             const { paymentSecret, publicKey, checkoutSession } = yield storeClient.generateCheckoutPaymentSecret(clientSecret, checkoutId);
             setPaymentSecret(paymentSecret);
             setPublicKey(publicKey);
             setCheckout(checkoutSession);
+            console.log("[Payment Debug] New payment secret generated");
         });
     }
     useEffect(() => {
         if (step === "payment" &&
             !paymentSecret &&
             !paymentSecretPromiseRef.current) {
+            console.log("[Payment Debug] Initial payment secret generation triggered by useEffect");
             paymentSecretPromiseRef.current = generatePaymentSecret().finally(() => {
                 paymentSecretPromiseRef.current = null;
             });
         }
     }, [paymentSecret, step]);
     const applyDiscountCode = (code) => __awaiter(this, void 0, void 0, function* () {
+        console.log("[Payment Debug] Applying discount code:", code);
         const newCheckout = yield storeClient.applyDiscountCode(clientSecret, checkoutId, code);
         setCheckout(newCheckout);
         if (step === "payment") {
-            yield generatePaymentSecret();
-            setPaymentComponentKey((prev) => prev + 1);
+            const newTotal = calculateTotalWithDiscounts(newCheckout);
+            const currentTotal = calculateTotalWithDiscounts(checkout);
+            console.log("[Payment Debug] Discount applied - New total:", newTotal, "Current total:", currentTotal);
+            if (newTotal !== currentTotal) {
+                console.log("[Payment Debug] Total changed, regenerating payment secret");
+                yield generatePaymentSecret();
+                setPaymentComponentKey((prev) => prev + 1);
+            }
+            else {
+                console.log("[Payment Debug] Total unchanged, skipping payment secret regeneration");
+            }
         }
     });
     const revalidateDiscounts = () => __awaiter(this, void 0, void 0, function* () {
+        console.log("[Payment Debug] Revalidating discounts");
         if (step === "payment") {
-            yield generatePaymentSecret();
-            setPaymentComponentKey((prev) => prev + 1);
+            const newCheckout = yield storeClient.revalidateDiscounts(clientSecret, checkoutId);
+            const newTotal = calculateTotalWithDiscounts(newCheckout);
+            const currentTotal = calculateTotalWithDiscounts(checkout);
+            console.log("[Payment Debug] Discounts revalidated - New total:", newTotal, "Current total:", currentTotal);
+            if (newTotal !== currentTotal) {
+                console.log("[Payment Debug] Total changed, regenerating payment secret");
+                yield generatePaymentSecret();
+                setPaymentComponentKey((prev) => prev + 1);
+            }
+            else {
+                console.log("[Payment Debug] Total unchanged, skipping payment secret regeneration");
+            }
+            setCheckout(newCheckout);
         }
         else {
             const newCheckout = yield storeClient.revalidateDiscounts(clientSecret, checkoutId);
@@ -35764,20 +35789,62 @@ function CheckoutEmbedComponent({ checkoutId, config }) {
         }
     });
     const removeDiscount = (id) => __awaiter(this, void 0, void 0, function* () {
+        console.log("[Payment Debug] Removing discount:", id);
         const newCheckout = yield storeClient.removeDiscount(clientSecret, checkoutId, id);
         setCheckout(newCheckout);
         if (step === "payment") {
-            yield generatePaymentSecret();
-            setPaymentComponentKey((prev) => prev + 1);
+            const newTotal = calculateTotalWithDiscounts(newCheckout);
+            const currentTotal = calculateTotalWithDiscounts(checkout);
+            console.log("[Payment Debug] Discount removed - New total:", newTotal, "Current total:", currentTotal);
+            if (newTotal !== currentTotal) {
+                console.log("[Payment Debug] Total changed, regenerating payment secret");
+                yield generatePaymentSecret();
+                setPaymentComponentKey((prev) => prev + 1);
+            }
+            else {
+                console.log("[Payment Debug] Total unchanged, skipping payment secret regeneration");
+            }
         }
     });
+    const calculateTotalWithDiscounts = (checkout) => {
+        var _a, _b;
+        if (!checkout)
+            return 0;
+        const subtotal = checkout.lineItems.reduce((acc, item) => {
+            var _a, _b;
+            const productItem = ((_a = item.productData) === null || _a === void 0 ? void 0 : _a.selectedVariant) || item.productData;
+            return acc + ((_b = productItem === null || productItem === void 0 ? void 0 : productItem.priceInCents) !== null && _b !== void 0 ? _b : 0) * item.quantity;
+        }, 0);
+        const shippingPrice = (_a = checkout.shipping) !== null && _a !== void 0 ? _a : 0;
+        const total = subtotal + ((_b = checkout.tax) !== null && _b !== void 0 ? _b : 0) + shippingPrice;
+        const isShippingFree = subtotal > shippingPrice &&
+            checkout.appliedDiscounts.some((discount) => discount.discount.type === "FREE_SHIPPING");
+        const filteredDiscounts = checkout.appliedDiscounts.filter((discount) => discount.discount.type !== "FREE_SHIPPING");
+        const finalTotal = total -
+            filteredDiscounts.reduce((acc, { amount }) => acc + amount, 0) -
+            (isShippingFree ? shippingPrice : 0);
+        console.log("[Payment Debug] Total calculation:", {
+            subtotal,
+            shippingPrice,
+            tax: checkout.tax,
+            isShippingFree,
+            discountAmount: filteredDiscounts.reduce((acc, { amount }) => acc + amount, 0),
+            finalTotal,
+        });
+        return finalTotal;
+    };
     useEffect(() => {
+        console.log("[Payment Debug] Setting up discount revalidation interval");
         const interval = setTimeout(() => {
             if (step !== "payment") {
+                console.log("[Payment Debug] Interval triggered revalidation");
                 revalidateDiscounts();
             }
         }, 1000 * 5);
-        return () => clearInterval(interval);
+        return () => {
+            console.log("[Payment Debug] Clearing revalidation interval");
+            clearInterval(interval);
+        };
     }, []);
     return (React__default.createElement(IframeWrapper, { iframeRef: iframeRef },
         React__default.createElement("div", { className: "checkout-embed h-max gap-6 md:gap-0 py-4 md:py-12 flex flex-col md:grid md:grid-cols-7 " },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@betterstore/react",
-  "version": "0.3.79",
+  "version": "0.3.81",
   "description": "E-commerce for Developers",
   "private": false,
   "publishConfig": {