Changeset 3751456

Timestamp:

10/17/2026 06:11:25 AM (4 weeks ago)

Author:

addonsorg

Message:

Release new version

Location:

cf7-cost-calculator-price-calculation

Files:

• tags/10.5 (added)
• tags/10.5/backend (added)
• tags/10.5/backend/checkbox.php (added)
• tags/10.5/backend/index.php (added)
• tags/10.5/backend/js (added)
• tags/10.5/backend/js/cf7_calculator.js (added)
• tags/10.5/backend/libs (added)
• tags/10.5/backend/libs/tribute (added)
• tags/10.5/backend/libs/tribute/tribute.css (added)
• tags/10.5/backend/libs/tribute/tribute.esm.js (added)
• tags/10.5/backend/libs/tribute/tribute.js (added)
• tags/10.5/backend/libs/tribute/tribute.min.js (added)
• tags/10.5/backend/libs/tribute/tribute.min.js.map (added)
• tags/10.5/backend/number_format.php (added)
• tags/10.5/backend/select.php (added)
• tags/10.5/frontend (added)
• tags/10.5/frontend/index.php (added)
• tags/10.5/frontend/js (added)
• tags/10.5/frontend/js/autoNumeric-1.9.45.js (added)
• tags/10.5/frontend/js/cf7_calculator.js (added)
• tags/10.5/frontend/js/formula_evaluator-min.js (added)
• tags/10.5/frontend/js/style.css (added)
• tags/10.5/index.php (added)
• tags/10.5/languages (added)
• tags/10.5/languages/cf7-cost-calculator-price-calculation.pot (added)
• tags/10.5/readme.txt (added)
• tags/10.5/yeekit (added)
• tags/10.5/yeekit/document.php (added)
• tags/10.5/yeekit/yeekit.css (added)
• tags/10.5/yeekit/yeekit.js (added)
• trunk/frontend/js/cf7_calculator.js (modified) (3 diffs)
• trunk/index.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)

cf7-cost-calculator-price-calculation/trunk/frontend/js/cf7_calculator.js

@@ -65 +65 @@
             var field_regexp = new RegExp('(' + reg.join("|") + ')(?!\\()');
             $(".ctf7-total").each(function (index) {
-                var eq = $(this).data('formulas');
+                // Use attr() instead of data(): jQuery's data() coerces numeric
+                // strings like "40" to numbers, which breaks eq.replace below.
+                var eq = $(this).attr('data-formulas');
                 var value_key_vl = false;
-                if (eq == "") {
+                if (eq === undefined || eq === null || String(eq).trim() === "") {
                     return;
                 }
+                eq = String(eq);
                 eq = eq.replace(/ /g, '');
                 // Convert function names in formulas to lowercase to make them case-insensitive
@@ -264 +267 @@
                     $(this).autoNumeric();
                     $(this).autoNumeric("set", total);
+                    // Keep the default value in sync so a native form.reset()
+                    // (CF7 calls it on load when wpcf7.cached is set) does not
+                    // revert the field to the initial "0".
+                    $(this).attr("value", $(this).val());
                     $(this).parent().find('.cf7-calculated-name').autoNumeric();
                     $(this).parent().find('.cf7-calculated-name').autoNumeric("set", total);
@@ -612 +619 @@
             $(".cf7-hide").closest('p').css('display', 'none');
         }
+        // Re-run calculations whenever CF7 resets the form: the native reset
+        // event fires before values are restored, so defer to the next tick;
+        // wpcf7reset fires after CF7 finishes its refill request.
+        $(document).on("reset", "form.wpcf7-form", function () {
+            setTimeout(function () {
+                $.cf7_formulas();
+            }, 0);
+        });
+        $(document).on("wpcf7reset", function () {
+            $.cf7_formulas();
+        });
     })
 })(jQuery);

cf7-cost-calculator-price-calculation/trunk/index.php

@@ -7 +7 @@
  * Description: Create forms with field values calculated based in other form field values for contact form 7
  * Author: add-ons.org
- * Version: 10.4
+ * Version: 10.5
  * Author URI: https://add-ons.org/
  * License: GPL v2 or later

cf7-cost-calculator-price-calculation/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 2.5
 Tested up to: 7.1
-Stable tag: 10.4
+Stable tag: 10.5
 Requires PHP: 5.2
 License: GPLv2 or later
@@ -117 +117 @@
 
 == Changelog ==
-= 10.4 =
+= 10.5 =
+Fixed: Comatible with Contact Form 7 version 6.2
+
 Added: SWITCH function
 Example: [calculated name1 "switch(field1,1,10,2,20,3,30,40)"]