@4site/engrid-scripts 0.22.11 → 0.22.13

package/dist/data-layer.js

@@ -103,12 +103,12 @@ export class DataLayer {
             for (const property in pageJson) {
                 if (!Number.isNaN(pageJson[property])) {
                     dataLayerEvents.push(`EN_PAGEJSON_${property.toUpperCase()}-${pageJson[property]}`);
-                    dataLayerData[`'EN_PAGEJSON_${property.toUpperCase()}'`] =
+                    dataLayerData[`EN_PAGEJSON_${property.toUpperCase()}`] =
                         pageJson[property];
                 }
                 else {
                     dataLayerEvents.push(`EN_PAGEJSON_${property.toUpperCase()}-${this.transformJSON(pageJson[property])}`);
-                    dataLayerData[`'EN_PAGEJSON_${property.toUpperCase()}'`] =
+                    dataLayerData[`EN_PAGEJSON_${property.toUpperCase()}`] =
                         this.transformJSON(pageJson[property]);
                 }
                 dataLayerEvents.push("EN_PAGEJSON_" + property.toUpperCase());
@@ -116,13 +116,13 @@ export class DataLayer {
             }
             if (ENGrid.getPageCount() === ENGrid.getPageNumber()) {
                 dataLayerEvents.push("EN_SUBMISSION_SUCCESS_" + pageJson.pageType.toUpperCase());
-                dataLayerData[`'EN_SUBMISSION_SUCCESS_${pageJson.pageType.toUpperCase()}'`] = "TRUE";
+                dataLayerData[`EN_SUBMISSION_SUCCESS_${pageJson.pageType.toUpperCase()}`] = "TRUE";
             }
         }
         const urlParams = new URLSearchParams(window.location.search);
         urlParams.forEach((value, key) => {
             dataLayerEvents.push(`EN_URLPARAM_${key.toUpperCase()}-${this.transformJSON(value)}`);
-            dataLayerData[`'EN_URLPARAM_${key.toUpperCase()}'`] =
+            dataLayerData[`EN_URLPARAM_${key.toUpperCase()}`] =
                 this.transformJSON(value);
         });
         if (ENGrid.getPageType() === "DONATION") {
@@ -170,14 +170,15 @@ export class DataLayer {
         else {
             dataLayerEvents.push("EN_FASTFORMFILL_ALL_FAILURE");
         }
-        // Push all collected events individually (GTM requirement)
-        dataLayerEvents.forEach((event) => {
-            this.dataLayer.push({ event });
-        });
         // Push all collected variables at once
         if (Object.keys(dataLayerData).length > 0) {
+            dataLayerData.event = "pageJsonVariablesReady";
             this.dataLayer.push(dataLayerData);
         }
+        // Push all collected events individually (GTM requirement)
+        dataLayerEvents.forEach((event) => {
+            this.dataLayer.push({ event });
+        });
         this.attachEventListeners();
     }
     onSubmit() {

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/version.d.ts

@@ -1 +1 @@
-export declare const AppVersion = "0.22.11";
+export declare const AppVersion = "0.22.13";

package/dist/version.js

@@ -1 +1 @@
-export const AppVersion = "0.22.11";
+export const AppVersion = "0.22.13";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4site/engrid-scripts",
-  "version": "0.22.11",
+  "version": "0.22.13",
   "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": "ca99b189c78dbe2123d662fe1335063f3bddb8f1",
+  "gitHead": "631db2b96fc7e475d6f85b926700d8a5fd1eb03b",
   "devDependencies": {
     "nodemon": "^2.0.20"
   }