@4site/engrid-scripts 0.22.12 → 0.22.14

package/dist/events/donation-amount.js

@@ -33,6 +33,8 @@ export class DonationAmount {
                 this.amount = ENGrid.cleanAmount(otherField.value);
             });
         }
+        // Load the current amount
+        this.load();
     }
     static getInstance(radios = "transaction.donationAmt", other = "transaction.donationAmt.other") {
         if (!DonationAmount.instance) {

package/dist/frequency-upsell.js

@@ -89,6 +89,7 @@ export class FrequencyUpsell {
                 this.upsellModal.updateModalContent();
                 this.logger.log("Frequency upsell modal opened");
                 (_a = this.upsellModal) === null || _a === void 0 ? void 0 : _a.open();
+                this.options.onOpen();
                 this.modalSeen = true;
                 this._form.submit = false;
                 return false;

package/dist/interfaces/frequency-upsell-options.d.ts

@@ -7,6 +7,7 @@ export interface FrequencyUpsellOptions {
     upsellAmount: (currentAmount: number) => number;
     upsellFromFrequency: Array<"onetime" | "monthly" | "quarterly" | "semi_annual" | "annual">;
     customClass: string;
+    onOpen: () => void;
     onAccept: () => void;
     onDecline: () => void;
 }

package/dist/interfaces/frequency-upsell-options.js

@@ -7,6 +7,7 @@ export const FrequencyUpsellOptionsDefaults = {
     upsellFromFrequency: ["onetime"],
     customClass: "",
     upsellAmount: (currentAmount) => currentAmount,
+    onOpen: () => { },
     onAccept: () => { },
     onDecline: () => { },
 };

package/dist/swap-amounts.d.ts

@@ -33,14 +33,10 @@ export declare class SwapAmounts {
     constructor();
     loadAmountsFromUrl(): void;
     swapAmounts(): void;
-    loadEnAmounts(amountArray: {
-        amounts: [string, number];
-        default: number;
-    }): {
-        selected: boolean;
-        label: string;
-        value: string;
-    }[];
+    /**
+     * Convert the internal config object into the structure Engaging Networks expects
+     */
+    private toEnAmountList;
     shouldRun(): boolean;
     ignoreCurrentValue(): boolean;
 }

package/dist/swap-amounts.js

@@ -34,79 +34,94 @@ export class SwapAmounts {
         this.logger = new EngridLogger("SwapAmounts", "purple", "white", "💰");
         this._amount = DonationAmount.getInstance();
         this._frequency = DonationFrequency.getInstance();
-        this.defaultChange = false;
-        this.swapped = false;
+        this.defaultChange = false; // Tracks if user changed away from default after swap
+        this.swapped = false; // Tracks if we've already executed at least one swap
         this.loadAmountsFromUrl();
         if (!this.shouldRun())
             return;
+        // Respond when frequency changes
         this._frequency.onFrequencyChange.subscribe(() => this.swapAmounts());
+        // Track if donor moves away from the swapped default amount
         this._amount.onAmountChange.subscribe(() => {
-            if (this._frequency.frequency in window.EngridAmounts === false)
+            const configs = window.EngridAmounts;
+            if (!configs)
                 return;
-            this.defaultChange = false;
-            if (!this.swapped)
+            const freq = this._frequency.frequency;
+            if (!(freq in configs))
                 return;
-            // Check if the amount is not default amount for the frequency
-            if (this._amount.amount !=
-                window.EngridAmounts[this._frequency.frequency].default) {
-                this.defaultChange = true;
-            }
+            if (!this.swapped)
+                return; // ignore early changes before initial swap
+            const currentConfig = configs[freq];
+            this.defaultChange = this._amount.amount !== currentConfig.default;
         });
     }
     loadAmountsFromUrl() {
         const urlParams = new URLSearchParams(window.location.search);
         const amounts = urlParams.get("engrid-amounts");
         if (amounts) {
-            this.defaultChange = true;
-            const amountArray = amounts.split(",").map((amt) => amt.trim());
-            const defaultAmount = parseFloat(ENGrid.getUrlParameter("transaction.donationAmt")) || parseFloat(amountArray[0]);
+            this.defaultChange = true; // if amounts come from URL, treat as user-set
+            const amountArray = amounts
+                .split(",")
+                .map((amt) => amt.trim())
+                .filter(Boolean);
+            if (!amountArray.length)
+                return;
+            const urlDefaultParam = ENGrid.getUrlParameter("transaction.donationAmt");
+            const parsedFirst = parseFloat(amountArray[0]);
+            const defaultAmount = (urlDefaultParam && parseFloat(urlDefaultParam)) ||
+                parsedFirst;
             const amountsObj = {};
-            for (let i = 0; i < amountArray.length; i++) {
-                amountsObj[amountArray[i].toString()] = isNaN(parseFloat(amountArray[i]))
-                    ? amountArray[i]
-                    : parseFloat(amountArray[i]);
-            }
+            amountArray.forEach((raw) => {
+                const numeric = parseFloat(raw);
+                amountsObj[raw] = isNaN(numeric) ? raw : numeric;
+            });
+            // Ensure Other choice always present at the end
             amountsObj["Other"] = "other";
+            const config = {
+                amounts: amountsObj,
+                default: defaultAmount,
+            };
             window.EngridAmounts = {
-                onetime: { amounts: amountsObj, default: defaultAmount },
-                monthly: { amounts: amountsObj, default: defaultAmount },
+                onetime: config,
+                monthly: config,
             };
         }
     }
     swapAmounts() {
-        if (this._frequency.frequency in window.EngridAmounts) {
-            window.EngagingNetworks.require._defined.enjs.swapList("donationAmt", this.loadEnAmounts(window.EngridAmounts[this._frequency.frequency]), {
-                ignoreCurrentValue: this.ignoreCurrentValue(),
-            });
-            this._amount.load();
-            this.logger.log("Amounts Swapped To", window.EngridAmounts[this._frequency.frequency], {
-                ignoreCurrentValue: this.ignoreCurrentValue(),
-            });
-            this.swapped = true;
-        }
+        const configs = window.EngridAmounts;
+        if (!configs)
+            return;
+        const freq = this._frequency.frequency;
+        const config = configs[freq];
+        if (!config)
+            return;
+        const ignoreCurrentValue = this.ignoreCurrentValue();
+        window.EngagingNetworks.require._defined.enjs.swapList("donationAmt", this.toEnAmountList(config), { ignoreCurrentValue });
+        this._amount.load();
+        this.logger.log("Amounts Swapped To", config, { ignoreCurrentValue });
+        this.swapped = true;
     }
-    loadEnAmounts(amountArray) {
-        let ret = [];
-        for (let amount in amountArray.amounts) {
-            ret.push({
-                selected: amountArray.amounts[amount] === amountArray.default,
-                label: amount,
-                value: amountArray.amounts[amount].toString(),
-            });
-        }
-        return ret;
+    /**
+     * Convert the internal config object into the structure Engaging Networks expects
+     */
+    toEnAmountList(config) {
+        return Object.entries(config.amounts).map(([label, value]) => ({
+            selected: value === config.default,
+            label,
+            value: value.toString(),
+        }));
     }
     shouldRun() {
-        return "EngridAmounts" in window;
+        return !!window.EngridAmounts;
     }
     ignoreCurrentValue() {
-        if (ENGrid.getUrlParameter("transaction.donationAmt") !== null) {
-            return this._amount.amount ===
-                parseFloat(ENGrid.getUrlParameter("transaction.donationAmt"))
-                ? false
-                : true;
+        const urlParam = ENGrid.getUrlParameter("transaction.donationAmt");
+        if (urlParam !== null) {
+            const urlAmount = parseFloat(urlParam);
+            return this._amount.amount !== urlAmount;
         }
-        return !(window.EngagingNetworks.require._defined.enjs.checkSubmissionFailed() ||
-            this.defaultChange);
+        // If submission failed or donor manually changed away from default, respect current value
+        const submissionFailed = window.EngagingNetworks.require._defined.enjs.checkSubmissionFailed();
+        return !(submissionFailed || this.defaultChange);
     }
 }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const AppVersion = "0.22.12";
+export declare const AppVersion = "0.22.14";

package/dist/version.js

@@ -1 +1 @@
-export const AppVersion = "0.22.12";
+export const AppVersion = "0.22.14";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4site/engrid-scripts",
-  "version": "0.22.12",
+  "version": "0.22.14",
   "description": "Scripts for the ENGRID Project",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -25,7 +25,7 @@
     "strongly-typed-events": "^2.0.9"
   },
   "homepage": "https://github.com/4site-interactive-studios/engrid#readme",
-  "gitHead": "eba6f194c3b3b70b2551c6842dc2af0eb2a9b3a0",
+  "gitHead": "83a15dbeaa859e1952497ae2e932a630df690eb8",
   "devDependencies": {
     "nodemon": "^2.0.20"
   }