fix: bind HWID top-ups to subscription periods

frontend/src/lib/admin/tariffDraft.js

@@ -49,6 +49,8 @@ export function rowsFromPackages(packageSet, currency, valueKey) {
   return (packageSet?.[currency] || []).map((pkg) => ({
     [valueKey]: pkg[valueKey],
     price: pkg.price,
+    prices: pkg.prices ? structuredCloneSafe(pkg.prices) : undefined,
+    min_price: pkg.min_price ?? "",
   }));
 }
 
@@ -115,10 +117,20 @@ export function compactMap(obj) {
 
 export function packagesFromRows(rows, valueKey) {
   return (rows || [])
-    .map((row) => ({
-      [valueKey]: parseNumber(row[valueKey]),
-      price: parseNumber(row.price),
-    }))
+    .map((row) => {
+      const pkg = {
+        [valueKey]: parseNumber(row[valueKey]),
+        price: parseNumber(row.price),
+      };
+      if (row.prices && typeof row.prices === "object") {
+        pkg.prices = structuredCloneSafe(row.prices);
+      }
+      const minPrice = parseNumber(row.min_price);
+      if (minPrice !== null) {
+        pkg.min_price = minPrice;
+      }
+      return pkg;
+    })
     .filter((row) => row[valueKey] > 0 && row.price !== null && row.price >= 0);
 }
 

frontend/src/lib/webapp/billingActions.js

@@ -53,7 +53,7 @@ export function createBillingActions({ api }) {
       months: plan.device_count || plan.months,
       device_count: plan.device_count || plan.months,
       tariff_key: plan.tariff_key || fallbackTariffKey,
-      sale_mode: "hwid_devices",
+      sale_mode: plan.sale_mode || "hwid_devices",
       method,
     };
   }

frontend/src/lib/webapp/previewMock.js

@@ -669,6 +669,10 @@ export function applyPreviewMock(kind) {
       tariff_key: "standard",
       tariff_name: "Стандарт",
       current_limit: 5,
+      extra_hwid_devices: 2,
+      extra_hwid_devices_valid_until_text: "01.06.2026 12:00",
+      renewal_available: false,
+      renewal_recommended_count: 0,
       plans: [
         {
           id: "standard:hwid:1",
@@ -702,6 +706,8 @@ export function applyPreviewMock(kind) {
       ...DEV_MOCK.data.subscription,
       active: true,
       max_devices: 5,
+      extra_hwid_devices: 2,
+      extra_hwid_devices_valid_until_text: "01.06.2026 12:00",
     };
   } else if (mode === "trial") {
     DEV_MOCK.data.settings.traffic_mode = false;

frontend/src/lib/webapp/stores/billingStore.js

@@ -43,9 +43,14 @@ export function createBillingStore({
 
   function isSubscriptionSale(plan) {
     const saleMode = String(plan?.sale_mode || "subscription").toLowerCase();
-    return !["traffic", "traffic_package", "topup", "premium_topup", "hwid_devices"].includes(
-      saleMode
-    );
+    return ![
+      "traffic",
+      "traffic_package",
+      "topup",
+      "premium_topup",
+      "hwid_devices",
+      "hwid_devices_renewal",
+    ].includes(saleMode);
   }
 
   function paymentSuccessContext(s, response = {}) {
@@ -53,6 +58,8 @@ export function createBillingStore({
       paymentId: response.payment_id || "",
       initialSubscriptionPayment:
         !s.paymentStartedWithActiveSubscription && isSubscriptionSale(s.selectedPlan),
+      renewalSubscriptionPayment:
+        s.paymentStartedWithActiveSubscription && isSubscriptionSale(s.selectedPlan),
     };
   }
 
@@ -64,7 +71,15 @@ export function createBillingStore({
       paymentPollToken += 1;
     }
     showToast(t("wa_payment_success", {}, "Payment successful"));
-    await loadData({ fresh: true });
+    const payload = await loadData({ fresh: true });
+    if (
+      successContext.renewalSubscriptionPayment &&
+      payload?.subscription?.device_topup_renewal_available &&
+      payload?.subscription?.can_topup_devices
+    ) {
+      showToast(t("wa_hwid_devices_renewal_prompt"));
+      openDeviceTopupModal(payload.payment_methods?.[0]?.id || "");
+    }
     if (
       successContext.initialSubscriptionPayment &&
       typeof onSubscriptionActivated === "function"
@@ -190,6 +205,8 @@ export function createBillingStore({
     state.update((s) => ({
       ...s,
       deviceTopupModalOpen: true,
+      deviceTopupOptions: null,
+      selectedDeviceTopupPlan: null,
       selectedMethod: s.selectedMethod || defaultMethod,
     }));
     loadDeviceTopupOptions();