Changeset 3419489

Timestamp:

12/14/2025 05:58:03 PM (2 months ago)

Author:

dbee78

Message:

Release 1.0.21: set default electricity rate to 0.17 and remove unused US/UK pages

Location:

keiste-solar-report/trunk

Files:

• .gitignore (deleted)
• assets/js/solar-calculator-main.js (modified) (1 diff)
• assets/pages/backup/ie-commercial.html (modified) (1 diff)
• assets/pages/backup/ie-residential.html (modified) (1 diff)
• assets/pages/backup/uk-commercial.html (deleted)
• assets/pages/backup/uk-residential.html (deleted)
• assets/pages/backup/us-commercial.html (deleted)
• assets/pages/backup/us-residential.html (deleted)
• assets/pages/ie-commercial.html (modified) (1 diff)
• assets/pages/ie-residential.html (modified) (1 diff)
• assets/pages/uk-commercial.html (deleted)
• assets/pages/uk-residential.html (deleted)
• assets/pages/us-commercial.html (deleted)
• assets/pages/us-residential.html (deleted)
• assets/webfonts (deleted)
• docs/index.html (modified) (1 diff)
• includes/admin-settings.php (modified) (7 diffs)
• includes/class-ksrad-admin.php (modified) (2 diffs)

keiste-solar-report/trunk/assets/js/solar-calculator-main.js

@@ -34 +34 @@
     const DEFAULT_PANELS = 0;
     const DEFAULT_EXPORT_PERCENT = 0.10;   // 10% of production exported
-    const DEFAULT_RETAIL_RATE = 0.35;     // €/kWh – sensible default if blank
+    const DEFAULT_RETAIL_RATE = 0.17;     // €/kWh – sensible default if blank
     const DEFAULT_FEED_IN_TARIFF = FEED_IN_TARIFF_DEFAULT;
     const DEFAULT_APR = LOAN_APR_DEFAULT;

keiste-solar-report/trunk/assets/pages/backup/ie-commercial.html

@@ -866 +866 @@
             const DEFAULT_PANELS = 0;
             const DEFAULT_EXPORT_PERCENT = 0.4;   // 40% of production exported (assumption if no slider)
-            const DEFAULT_RETAIL_RATE = 0.35;     // €/kWh – sensible default if blank
+            const DEFAULT_RETAIL_RATE = 0.17;     // €/kWh – sensible default if blank
             const DEFAULT_FEED_IN_TARIFF = FEED_IN_TARIFF_DEFAULT;
             const DEFAULT_APR = LOAN_APR_DEFAULT;

keiste-solar-report/trunk/assets/pages/backup/ie-residential.html

@@ -866 +866 @@
             const DEFAULT_PANELS = 0;
             const DEFAULT_EXPORT_PERCENT = 0.4;   // 40% of production exported (assumption if no slider)
-            const DEFAULT_RETAIL_RATE = 0.35;     // €/kWh – sensible default if blank
+            const DEFAULT_RETAIL_RATE = 0.17;     // €/kWh – sensible default if blank
             const DEFAULT_FEED_IN_TARIFF = FEED_IN_TARIFF_DEFAULT;
             const DEFAULT_APR = LOAN_APR_DEFAULT;

keiste-solar-report/trunk/assets/pages/ie-commercial.html

@@ -866 +866 @@
             const DEFAULT_PANELS = 0;
             const DEFAULT_EXPORT_PERCENT = 0.4;   // 40% of production exported (assumption if no slider)
-            const DEFAULT_RETAIL_RATE = 0.35;     // €/kWh – sensible default if blank
+            const DEFAULT_RETAIL_RATE = 0.17;     // €/kWh – sensible default if blank
             const DEFAULT_FEED_IN_TARIFF = FEED_IN_TARIFF_DEFAULT;
             const DEFAULT_APR = LOAN_APR_DEFAULT;

keiste-solar-report/trunk/assets/pages/ie-residential.html

@@ -866 +866 @@
             const DEFAULT_PANELS = 0;
             const DEFAULT_EXPORT_PERCENT = 0.4;   // 40% of production exported (assumption if no slider)
-            const DEFAULT_RETAIL_RATE = 0.35;     // €/kWh – sensible default if blank
+            const DEFAULT_RETAIL_RATE = 0.17;     // €/kWh – sensible default if blank
             const DEFAULT_FEED_IN_TARIFF = FEED_IN_TARIFF_DEFAULT;
             const DEFAULT_APR = LOAN_APR_DEFAULT;

keiste-solar-report/trunk/docs/index.html

@@ -866 +866 @@
             const DEFAULT_PANELS = 0;
             const DEFAULT_EXPORT_PERCENT = 0.4;   // 40% of production exported (assumption if no slider)
-            const DEFAULT_RETAIL_RATE = 0.35;     // €/kWh – sensible default if blank
+            const DEFAULT_RETAIL_RATE = 0.17;     // €/kWh – sensible default if blank
             const DEFAULT_FEED_IN_TARIFF = FEED_IN_TARIFF_DEFAULT;
             const DEFAULT_APR = LOAN_APR_DEFAULT;

keiste-solar-report/trunk/includes/admin-settings.php

@@ -253 +253 @@
         add_settings_field(
             'default_electricity_rate',
-            'Default Electricity Rate (€/kWh)',
+            'Default Electricity Rate (cost/kWh)',
             array($this, 'default_electricity_rate_callback'),
             'keiste-solar-admin',
@@ -269 +269 @@
         add_settings_field(
             'default_feed_in_tariff',
-            'Feed-in Tariff (€/kWh)',
+            'Feed-in Tariff (cost/kWh)',
             array($this, 'default_feed_in_tariff_callback'),
             'keiste-solar-admin',
@@ -459 +459 @@
         if (isset($input['default_electricity_rate'])) {
             $rate = floatval($input['default_electricity_rate']);
-            $new_input['default_electricity_rate'] = ($rate >= 0 && $rate <= 10) ? $rate : 0.35;
+            $new_input['default_electricity_rate'] = ($rate >= 0 && $rate <= 10) ? $rate : 0.17;
         }
         
@@ -498 +498 @@
                 'Canada' => '$'
             );
-            $new_input['currency'] = isset($currency_map[$new_input['country']]) ? $currency_map[$new_input['country']] : '€';
+            $new_input['currency'] = isset($currency_map[$new_input['country']]) ? $currency_map[$new_input['country']] : '$';
         }
         
@@ -711 +711 @@
         printf(
             '<input type="number" step="0.01" id="default_electricity_rate" name="ksrad_options[default_electricity_rate]" value="%s" />',
-            isset($this->options['default_electricity_rate']) ? esc_attr($this->options['default_electricity_rate']) : '0.35'
-        );
-        echo ' <span class="description">€/kWh (e.g., 0.35 for €0.35/kWh)</span>';
+            isset($this->options['default_electricity_rate']) ? esc_attr($this->options['default_electricity_rate']) : '0.17'
+        );
+        echo ' <span class="description">per kWh (e.g., 0.17 for 0.17/kWh)</span>';
     }
     
@@ -729 +729 @@
             isset($this->options['default_feed_in_tariff']) ? esc_attr($this->options['default_feed_in_tariff']) : '0.15'
         );
-        echo ' <span class="description">€/kWh</span>';
+        echo ' <span class="description">per kWh</span>';
     }
     
@@ -1190 +1190 @@
         $countries = array('United States', 'Canada', 'United Kingdom', 'Rep. of Ireland');
         $building_types = array('Residential', 'Commercial Small', 'Commercial Medium', 'Commercial Large');
-        $currency = isset($this->options['currency']) ? $this->options['currency'] : '€';
+        $currency = isset($this->options['currency']) ? $this->options['currency'] : '$';
         ?>
         <div class="system-size-table-wrapper">

keiste-solar-report/trunk/includes/class-ksrad-admin.php

@@ -289 +289 @@
             
             // Validate and sanitize electricity rate (0.01 to 10.00)
-            $electricity_rate = isset($_POST['ksrad_default_electricity_rate']) ? floatval($_POST['ksrad_default_electricity_rate']) : 0.13;
+            $electricity_rate = isset($_POST['ksrad_default_electricity_rate']) ? floatval($_POST['ksrad_default_electricity_rate']) : 0.17;
             if ($electricity_rate > 0 && $electricity_rate <= 10) {
                 update_option('ksrad_default_electricity_rate', $electricity_rate);
@@ -312 +312 @@
         $notification_email = get_option('ksrad_notification_email', get_option('admin_email'));
         $send_confirmation = get_option('ksrad_send_confirmation', '1');
-        $electricity_rate = get_option('ksrad_default_electricity_rate', '0.13');
+        $electricity_rate = get_option('ksrad_default_electricity_rate', '0.17');
         $cost_per_watt = get_option('ksrad_cost_per_watt', '2.75');
         $tax_credit = get_option('ksrad_tax_credit', '0.30');