From 239e46037eb9626f53b4398015cda08ba2becd5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?=
 <donnalee11681676@gmail.com>
Date: Sat, 23 May 2026 14:22:27 +0300
Subject: [PATCH] =?UTF-8?q?fix(billing-v2):=20BillingView=20=E2=80=94=20dr?=
 =?UTF-8?q?op=20=C2=AB=D0=BB=D0=B8=D0=B4=D0=BE=D0=B2=20=D0=B7=D0=B0=D0=BF?=
 =?UTF-8?q?=D0=B0=D1=81=C2=BB,=20wire=20new=20BalanceCard=20props?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/resources/js/views/BillingView.vue | 12 ++++--------
 app/tests/Frontend/BillingView.spec.ts | 21 ++++++++++++++++-----
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/resources/js/views/BillingView.vue b/app/resources/js/views/BillingView.vue
index 6da1475c..10e14d4d 100644
--- a/app/resources/js/views/BillingView.vue
+++ b/app/resources/js/views/BillingView.vue
@@ -29,10 +29,10 @@ const topupSnackbar = ref(false);
 const txTableRef = ref<InstanceType<typeof TransactionsTable> | null>(null);
 
 const walletRub = computed(() => Number(wallet.value?.balance_rub ?? 0));
-const leadsBalance = computed(() => wallet.value?.balance_leads ?? 0);
+const affordableLeads = computed(() => wallet.value?.affordable_leads ?? 0);
+const currentTierPriceRub = computed(() => wallet.value?.current_tier?.price_rub ?? '0.00');
 const runwayDays = computed(() => wallet.value?.runway_days ?? null);
 const tariffName = computed(() => wallet.value?.tariff?.name ?? null);
-const tariffPrice = computed(() => wallet.value?.tariff?.price_monthly ?? null);
 const tariffFeatures = computed<string[]>(() => (wallet.value?.tariff?.features ?? []).map(featureLabel));
 
 async function loadWallet(): Promise<void> {
@@ -73,10 +73,6 @@ defineExpose({ loadWallet, wallet, topupOpen });
                     <span
                         ><span class="num text-primary">{{ formatPlain(walletRub) }}</span> кошелёк</span
                     >
-                    <span class="sep">·</span>
-                    <span
-                        ><span class="num">{{ leadsBalance }}</span> лидов запас</span
-                    >
                     <template v-if="runwayDays !== null">
                         <span class="sep">·</span>
                         <span
@@ -111,9 +107,9 @@ defineExpose({ loadWallet, wallet, topupOpen });
                 <template v-else-if="wallet">
                     <BalanceCard
                         :wallet-rub="walletRub"
-                        :leads-balance="leadsBalance"
+                        :affordable-leads="affordableLeads"
+                        :current-tier-price-rub="currentTierPriceRub"
                         :tariff-name="tariffName"
-                        :tariff-price="tariffPrice"
                         :tariff-features="tariffFeatures"
                         @topup="topupOpen = true"
                     />
diff --git a/app/tests/Frontend/BillingView.spec.ts b/app/tests/Frontend/BillingView.spec.ts
index 6b0a9961..b8c3647e 100644
--- a/app/tests/Frontend/BillingView.spec.ts
+++ b/app/tests/Frontend/BillingView.spec.ts
@@ -12,13 +12,15 @@ const vuetify = createVuetify();
 function makeWallet(): Wallet {
     return {
         balance_rub: '14250.00',
-        balance_leads: 285,
+        affordable_leads: 28,
+        current_tier: { no: 1, price_rub: '500.00', leads_left_in_tier: 100 },
+        next_tier: { no: 2, price_rub: '450.00', leads_in_tier: 200 },
+        delivered_in_month: 0,
         runway_days: 142,
+        tiers_preview: [],
         tariff: {
             code: 'pro',
             name: 'Про',
-            price_monthly: '990.00',
-            billing_model: 'hybrid',
             features: ['webhook', 'kanban', 'api'],
         },
     };
@@ -49,7 +51,12 @@ describe('BillingView.vue', () => {
         expect(billingApi.getWallet).toHaveBeenCalled();
         const text = wrapper.text();
         expect(text).toMatch(/14\s+250\s*₽/);
-        expect(text).toContain('285');
+    });
+
+    it('не показывает чип «лидов запас» в шапке', async () => {
+        const wrapper = factory();
+        await flushPromises();
+        expect(wrapper.text()).not.toContain('лидов запас');
     });
 
     it('показывает тариф из API в BalanceCard', async () => {
@@ -64,8 +71,12 @@ describe('BillingView.vue', () => {
     it('показывает «Тариф не выбран» при tariff=null', async () => {
         vi.mocked(billingApi.getWallet).mockResolvedValue({
             balance_rub: '0.00',
-            balance_leads: 0,
+            affordable_leads: 0,
+            current_tier: null,
+            next_tier: null,
+            delivered_in_month: 0,
             runway_days: null,
+            tiers_preview: [],
             tariff: null,
         });
         const wrapper = factory();