feat: add currency support, stats sensors, and bug fixes

Made-with: Cursor

Author: WrenchDesk Dev

custom_components/uber_eats/coordinator.py

@@ -561,17 +561,18 @@ async def fetch_user_profile(self):
                 async with session.post(url, headers=headers, json={}) as resp:
                     if resp.status != 200:
                         _LOGGER.error("getUserV1 API returned %s", resp.status)
-                        return {"picture_url": None, "first_name": "", "last_name": ""}
+                        return {"picture_url": None, "first_name": "", "last_name": "", "country_code": "US"}
                     data = await resp.json()
                     user_data = data.get("data", {})
                     return {
                         "picture_url": user_data.get("pictureUrl"),
                         "first_name": user_data.get("firstName", ""),
                         "last_name": user_data.get("lastName", ""),
+                        "country_code": user_data.get("geoIpCountryCode", "US"),
                     }
             except Exception as e:
                 _LOGGER.error("Error fetching user profile: %s", e, exc_info=True)
-                return {"picture_url": None, "first_name": "", "last_name": ""}
+                return {"picture_url": None, "first_name": "", "last_name": "", "country_code": "US"}
 
     def _compute_order_statistics(self, orders, year):
         """Compute statistics from orders list."""
@@ -742,13 +743,16 @@ def _process_tts_events(self, current_data):
         curr_with_status = dict(current_data)
         curr_active = current_data.get("active")
         messages_to_send = []
+        
+        # Use first name only for TTS messages (sensor names still use full account_name)
+        tts_name = (self._cached_user_profile or {}).get("first_name", "").strip() or self.account_name
 
         # 1. New order: same logic as active order sensor — was off, now on (with restaurant for message)
         if not prev.get("active") and current_data.get("active"):
             rest = (current_data.get("restaurant_name") or "").strip()
             if rest and rest not in ("No Restaurant", "Unknown"):
                 msg = tts_notifications.build_message(
-                    prefix, self.account_name, curr_with_status, "new_order"
+                    prefix, tts_name, curr_with_status, "new_order"
                 )
                 if msg:
                     messages_to_send.append(("new_order", msg))
@@ -760,7 +764,7 @@ def _process_tts_events(self, current_data):
         has_driver = _has_driver(curr_driver)
         if not had_driver and has_driver:
             msg = tts_notifications.build_message(
-                prefix, self.account_name, curr_with_status, "driver_assigned"
+                prefix, tts_name, curr_with_status, "driver_assigned"
             )
             if msg:
                 messages_to_send.append(("driver_assigned", msg))
@@ -775,7 +779,7 @@ def _process_tts_events(self, current_data):
         curr_order_status = current_data.get("order_status", "")
         if curr_active and curr_order_status and curr_order_status != prev_order_status:
             msg = tts_notifications.build_message(
-                prefix, self.account_name, curr_with_status, "status_change"
+                prefix, tts_name, curr_with_status, "status_change"
             )
             if msg:
                 messages_to_send.append(("status_change", msg))
@@ -786,7 +790,7 @@ def _process_tts_events(self, current_data):
             elapsed = (now - self._last_interval_tts_time).total_seconds()
             if elapsed >= interval_minutes * 60:
                 msg = tts_notifications.build_message(
-                    prefix, self.account_name, curr_with_status, "interval_update"
+                    prefix, tts_name, curr_with_status, "interval_update"
                 )
                 if msg:
                     messages_to_send.append(("interval_update", msg))

custom_components/uber_eats/frontend/uber-eats-panel.js

@@ -22,6 +22,47 @@ const UBER_EATS_LOGO_SIMPLE = `
 </span>
 `;
 
+// Currency symbols by country code (ISO 3166-1 alpha-2)
+const CURRENCY_SYMBOLS = {
+  US: "$", CA: "$", AU: "$", NZ: "$", SG: "$", HK: "$", MX: "$", CL: "$", CO: "$", AR: "$",
+  GB: "£", UK: "£",
+  EU: "€", DE: "€", FR: "€", IT: "€", ES: "€", NL: "€", BE: "€", AT: "€", IE: "€", PT: "€", FI: "€", GR: "€",
+  JP: "¥", CN: "¥",
+  KR: "₩",
+  IN: "₹",
+  BR: "R$",
+  ZA: "R",
+  AE: "د.إ", SA: "﷼",
+  TH: "฿",
+  PL: "zł",
+  SE: "kr", NO: "kr", DK: "kr",
+  CH: "CHF",
+  RU: "₽",
+  TR: "₺",
+  IL: "₪",
+  MY: "RM",
+  PH: "₱",
+  ID: "Rp",
+  VN: "₫",
+  TW: "NT$",
+  CZ: "Kč",
+  HU: "Ft",
+  RO: "lei",
+  UA: "₴",
+  NG: "₦",
+  EG: "E£",
+  KE: "KSh",
+  PK: "₨",
+  BD: "৳",
+  LK: "Rs",
+};
+
+function getCurrencySymbol(countryCode) {
+  if (!countryCode) return "$";
+  const code = countryCode.toUpperCase();
+  return CURRENCY_SYMBOLS[code] || "$";
+}
+
 class UberEatsPanel extends HTMLElement {
   constructor() {
     super();
@@ -2658,6 +2699,22 @@ class UberEatsPanel extends HTMLElement {
     return div.innerHTML;
   }
 
+  /** Get currency symbol based on user's country from profile */
+  _getCurrencySymbol() {
+    const countryCode = this._userProfile?.country_code || "US";
+    return getCurrencySymbol(countryCode);
+  }
+
+  /** Format a currency value with the correct symbol */
+  _formatCurrency(value, fallback = "—") {
+    if (typeof value !== "number") return fallback;
+    const symbol = this._getCurrencySymbol();
+    if (value < 0) {
+      return `-${symbol}${Math.abs(value).toFixed(2)}`;
+    }
+    return `${symbol}${value.toFixed(2)}`;
+  }
+
   /** Parse simple YAML-like key: value lines into a dict. */
   _parseYamlOptions(text) {
     const result = {};
@@ -2706,15 +2763,16 @@ class UberEatsPanel extends HTMLElement {
 
     const year = stats.year || new Date().getFullYear();
     const totalOrders = stats.total_orders || 0;
-    const totalSpent = typeof stats.total_spent === "number" ? `$${stats.total_spent.toFixed(2)}` : "$0.00";
-    const totalDeliveryFees = typeof stats.total_delivery_fees === "number" ? `$${stats.total_delivery_fees.toFixed(2)}` : "$0.00";
+    const currencySymbol = this._getCurrencySymbol();
+    const totalSpent = typeof stats.total_spent === "number" ? `${currencySymbol}${stats.total_spent.toFixed(2)}` : `${currencySymbol}0.00`;
+    const totalDeliveryFees = typeof stats.total_delivery_fees === "number" ? `${currencySymbol}${stats.total_delivery_fees.toFixed(2)}` : `${currencySymbol}0.00`;
     const topRestaurants = stats.top_restaurants || [];
 
     const topRestaurantsHtml = topRestaurants.length > 0 
       ? topRestaurants.map((r, idx) => {
           const name = this._escapeHtml(r.name || "Unknown");
           const orderCount = r.order_count || 0;
-          const spent = typeof r.total_spent === "number" ? `$${r.total_spent.toFixed(2)}` : "$0.00";
+          const spent = typeof r.total_spent === "number" ? `${currencySymbol}${r.total_spent.toFixed(2)}` : `${currencySymbol}0.00`;
           const medals = ["🥇", "🥈", "🥉"];
           return `
             <div class="top-restaurant-row">
@@ -2788,11 +2846,22 @@ class UberEatsPanel extends HTMLElement {
       const imgUrl = order.hero_image_url || "";
       const name = this._escapeHtml(order.restaurant_name || "Unknown");
       const date = this._escapeHtml(order.date || "");
-      const subtotal = typeof order.subtotal === "number" ? `$${order.subtotal.toFixed(2)}` : "—";
-      const deliveryFee = typeof order.delivery_fee === "number" ? `$${order.delivery_fee.toFixed(2)}` : "—";
-      const tax = typeof order.tax === "number" ? `$${order.tax.toFixed(2)}` : null;
-      const promotions = typeof order.promotions === "number" && order.promotions < 0 ? `-$${Math.abs(order.promotions).toFixed(2)}` : null;
-      const total = typeof order.total === "number" ? `$${order.total.toFixed(2)}` : "—";
+      const currencySymbol = this._getCurrencySymbol();
+      const subtotal = typeof order.subtotal === "number" ? `${currencySymbol}${order.subtotal.toFixed(2)}` : "—";
+      const deliveryFee = typeof order.delivery_fee === "number" ? `${currencySymbol}${order.delivery_fee.toFixed(2)}` : "—";
+      const tax = typeof order.tax === "number" ? `${currencySymbol}${order.tax.toFixed(2)}` : null;
+      const promotions = typeof order.promotions === "number" && order.promotions < 0 ? `-${currencySymbol}${Math.abs(order.promotions).toFixed(2)}` : null;
+      const total = typeof order.total === "number" ? `${currencySymbol}${order.total.toFixed(2)}` : "—";
+      
+      // Calculate "Other Fees" if breakdown doesn't match total
+      const subtotalNum = typeof order.subtotal === "number" ? order.subtotal : 0;
+      const deliveryFeeNum = typeof order.delivery_fee === "number" ? order.delivery_fee : 0;
+      const taxNum = typeof order.tax === "number" ? order.tax : 0;
+      const promotionsNum = typeof order.promotions === "number" ? order.promotions : 0;
+      const totalNum = typeof order.total === "number" ? order.total : 0;
+      const expectedTotal = subtotalNum + deliveryFeeNum + taxNum + promotionsNum;
+      const otherFeesNum = totalNum - expectedTotal;
+      const otherFees = Math.abs(otherFeesNum) > 0.01 ? `${currencySymbol}${otherFeesNum.toFixed(2)}` : null;
       // Clean address: remove empty fields (double commas, leading/trailing commas)
       const rawAddress = order.store_address || "—";
       const cleanAddress = rawAddress
@@ -2832,6 +2901,12 @@ class UberEatsPanel extends HTMLElement {
               <span class="past-order-value">${promotions}</span>
             </div>
             ` : ""}
+            ${otherFees ? `
+            <div class="past-order-row">
+              <span class="past-order-label">Other Fees</span>
+              <span class="past-order-value">${otherFees}</span>
+            </div>
+            ` : ""}
             <div class="past-order-row total">
               <span class="past-order-label">Total</span>
               <span class="past-order-value">${total}</span>

custom_components/uber_eats/manifest.json

@@ -6,7 +6,7 @@
   "dependencies": ["http", "frontend", "panel_custom"],
   "codeowners": ["@zodyking"],
   "iot_class": "cloud_polling",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "config_flow": true,
   "integration_type": "service"
 }

custom_components/uber_eats/sensor.py

@@ -5,7 +5,7 @@
 from typing import Any
 
 from .const import DOMAIN, CONF_ACCOUNT_NAME
-from homeassistant.components.sensor import SensorEntity
+from homeassistant.components.sensor import SensorEntity, SensorStateClass
 from homeassistant.helpers.entity_registry import async_get as async_get_entity_reg
 from homeassistant.util import dt as dt_util
 
@@ -71,6 +71,11 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         UberEatsDriverLocationAddress(coordinator, account_name),
 
         UberEatsDriverETT(coordinator, account_name),
+
+        # Statistics sensors
+        UberEatsTotalDeliveries(coordinator, account_name),
+        UberEatsTotalSpent(coordinator, account_name),
+        UberEatsTotalDeliveryFees(coordinator, account_name),
     ]
 
     async_add_entities(entities)
@@ -221,8 +226,15 @@ class UberEatsDriverLatitude(UberEatsEntity):
     _attr_translation_key = "driver_latitude"
     _attr_native_unit_of_measurement = "°"
     @property
-    def native_value(self) -> str:
-        return _order_count_state(self.coordinator)
+    def native_value(self) -> float:
+        """Return driver latitude or HA home latitude when no active order."""
+        orders = _get_orders(self.coordinator)
+        if orders:
+            lat = orders[0].get("driver_location_lat")
+            if isinstance(lat, (int, float)):
+                return float(lat)
+        # Fall back to HA home latitude
+        return float(self.coordinator.hass.config.latitude or 0.0)
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         return _multi_order_attrs(self.coordinator, "driver_location_lat", "No Active Order")
@@ -231,8 +243,15 @@ class UberEatsDriverLongitude(UberEatsEntity):
     _attr_translation_key = "driver_longitude"
     _attr_native_unit_of_measurement = "°"
     @property
-    def native_value(self) -> str:
-        return _order_count_state(self.coordinator)
+    def native_value(self) -> float:
+        """Return driver longitude or HA home longitude when no active order."""
+        orders = _get_orders(self.coordinator)
+        if orders:
+            lon = orders[0].get("driver_location_lon")
+            if isinstance(lon, (int, float)):
+                return float(lon)
+        # Fall back to HA home longitude
+        return float(self.coordinator.hass.config.longitude or 0.0)
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         return _multi_order_attrs(self.coordinator, "driver_location_lon", "No Active Order")
@@ -296,3 +315,60 @@ def extra_state_attributes(self) -> dict[str, Any]:
             minutes = o.get("minutes_remaining", None)
             attrs[f"order{i}_minutes_remaining"] = minutes if minutes is not None else "No ETT Available"
         return attrs
+
+
+# ---------- Statistics Sensors ----------
+def _get_statistics(coordinator) -> dict[str, Any]:
+    """Get statistics from coordinator's cached past orders."""
+    cached = getattr(coordinator, "_cached_past_orders", None)
+    if cached and isinstance(cached, dict):
+        return cached.get("statistics", {})
+    return {}
+
+
+class UberEatsTotalDeliveries(UberEatsEntity):
+    _attr_translation_key = "total_deliveries"
+    _attr_state_class = SensorStateClass.TOTAL
+    _attr_native_unit_of_measurement = "orders"
+
+    @property
+    def native_value(self) -> int:
+        stats = _get_statistics(self.coordinator)
+        return stats.get("total_orders", 0)
+
+    @property
+    def extra_state_attributes(self) -> dict[str, Any]:
+        stats = _get_statistics(self.coordinator)
+        return {"year": stats.get("year", datetime.now().year)}
+
+
+class UberEatsTotalSpent(UberEatsEntity):
+    _attr_translation_key = "total_spent"
+    _attr_state_class = SensorStateClass.TOTAL
+    _attr_native_unit_of_measurement = "USD"
+
+    @property
+    def native_value(self) -> float:
+        stats = _get_statistics(self.coordinator)
+        return stats.get("total_spent", 0.0)
+
+    @property
+    def extra_state_attributes(self) -> dict[str, Any]:
+        stats = _get_statistics(self.coordinator)
+        return {"year": stats.get("year", datetime.now().year)}
+
+
+class UberEatsTotalDeliveryFees(UberEatsEntity):
+    _attr_translation_key = "total_delivery_fees"
+    _attr_state_class = SensorStateClass.TOTAL
+    _attr_native_unit_of_measurement = "USD"
+
+    @property
+    def native_value(self) -> float:
+        stats = _get_statistics(self.coordinator)
+        return stats.get("total_delivery_fees", 0.0)
+
+    @property
+    def extra_state_attributes(self) -> dict[str, Any]:
+        stats = _get_statistics(self.coordinator)
+        return {"year": stats.get("year", datetime.now().year)}