From d7f88b661f5bbdd3ae161fbf1c30cc11a68e032a Mon Sep 17 00:00:00 2001
From: ant <ant@noreply.local>
Date: Tue, 21 Jul 2026 08:44:52 +0000
Subject: [PATCH] =?UTF-8?q?[598-51][@ant]=20fix:=20=D0=BF=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=B7=D0=B0=D1=82=D1=8C=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7?=
 =?UTF-8?q?=D1=87=D0=B8=D0=BA=D1=83=20=D0=B8=20=D0=BF=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B2=D1=89=D0=B8=D0=BA=D1=83=20=D0=BA=D0=BE=D1=80=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=BD=D1=83=D1=8E=20=D1=81=D1=83=D0=BC=D0=BC?=
 =?UTF-8?q?=D1=83=20=D1=81=20=D1=87=D0=BB=D0=B5=D0=BD=D1=81=D0=BA=D0=B8?=
 =?UTF-8?q?=D0=BC=20=D0=B2=D0=B7=D0=BD=D0=BE=D1=81=D0=BE=D0=BC=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B2=D1=81=D0=B5=D1=85=20=D1=8D=D0=BA=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=85=20=D0=A1=D1=82=D0=BE=D0=BB=D0=B0=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=B0=D0=B7=D0=BE=D0=B2,=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B8=D1=82=D1=8C=20=D1=82=D0=BE=D1=87=D0=B5=D1=87=D0=BD=D1=8B?=
 =?UTF-8?q?=D0=B5=20UI-=D0=B1=D0=B0=D0=B3=D0=B8=20=D0=B8=20TS-=D0=BE=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B1=D0=BA=D0=B8=20=E2=80=94=20=D1=80=D0=B5=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=20=D0=BF=D0=BE=D1=81=D1=82=D0=B0=D0=B2=D1=89=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=B2=20=D0=B8=20=D0=BF=D1=83=D0=BD=D0=BA=D1=82?=
 =?UTF-8?q?=D1=8B=20=D0=B2=D1=8B=D0=B4=D0=B0=D1=87=D0=B8=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=83=D1=87=D0=B8=D0=BB=D0=B8=20=D0=A4=D0=98=D0=9E/?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20=D0=B3?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=BE=D0=B3=D0=BE=20username,=20=D1=81=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BB=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=D0=B8=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=B0=D1=82=D0=BE=D1=80=D0=B0=20=D0=B8=20=D0=BE=D0=BD=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B4=D0=B8=D0=BD=D0=B3=20=D0=BF=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B2=D1=89=D0=B8=D0=BA=D0=B0=20=D0=BF=D0=BE=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BF=D0=BE=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D1=88=D0=BB=D1=8B=D0=BC=20=D0=B7=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=87=D0=B0=D0=BD=D0=B8=D1=8F=D0=BC,=20=D0=B4=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=BB=D0=B0=D0=B4=D0=BA=D0=B0=20=D1=83=20=D1=81=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B9=D0=BA=D0=B8=20=D0=B2=D1=8B=D0=B4=D0=B0=D1=87=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BF=D1=83=D1=81=D0=BA=D0=B0=D0=BB=D0=B0=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=8F=D0=B7=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D1=83=D1=8E=20=D0=BF=D0=BE=D0=B4=D0=BF=D0=B8=D1=81=D1=8C=20?=
 =?UTF-8?q?=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=B0=20=D0=B8?=
 =?UTF-8?q?=20=D0=BF=D0=B0=D0=B4=D0=B0=D0=BB=D0=B0=20=D0=B1=D1=8B=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B1=D1=8D=D0=BA=D0=B5,=20=D0=BF=D0=BB=D1=8E=D1=81?=
 =?UTF-8?q?=20=D0=B7=D0=B0=D0=BA=D1=80=D1=8B=D1=82=D1=8B=20=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D0=B2=D1=88=D0=B8=D0=B5=D1=81=D1=8F=20unknown/null?=
 =?UTF-8?q?able=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=BF=D0=B8=D0=BB=D1=8F=D1=86=D0=B8=D0=B8=20desktop?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 .../desktop/extensions/market/install.ts      |  2 +-
 .../pages/PostingsPage/ui/PostingsPage.vue    |  2 +-
 .../desktop/src-ssr/middlewares/injectEnv.ts  |  1 +
 components/desktop/src/boot/index.ts          |  1 -
 .../ui/AdminIssuancePointsPage.vue            | 22 +++++-------
 .../AdminOrders/ui/AdminOrdersPage.vue        |  9 +++--
 .../pages/Marketplace/Cart/ui/CartPage.vue    | 14 ++++----
 .../MarketplaceCatalog/ui/AddToCartDialog.vue | 27 +++++++++++----
 .../ui/MarketplaceCatalogPage.vue             |  3 +-
 .../MarketplaceOfferDetail/api/index.ts       |  2 +-
 .../ui/MarketplaceOfferDetailPage.vue         | 26 ++++++++++++--
 .../Marketplace/MyOrders/ui/MyOrdersPage.vue  |  6 ++--
 .../ui/OffererIncomingOrdersPage.vue          |  7 +++-
 .../OffererSupplyPreparation/lib/ttn.ts       |  2 +-
 .../ui/OnboardingMemberPickCppPage.vue        |  4 +--
 .../ui/OperatorBranchEconomyPage.vue          |  2 +-
 .../ui/OperatorReceptionPage.vue              |  4 +--
 .../ui/OrdererConsolidatedPage.vue            |  3 +-
 .../ui/OrdererOrderDetailPage.vue             | 14 ++++++--
 .../ui/SupplierRegistryPage.vue               |  3 +-
 .../Registrator/SignUp/SelectProgram.vue      |  2 +-
 .../desktop/src/shared/config/Environment.ts  |  1 +
 .../src/shared/config/createEnvObject.ts      |  1 +
 .../src/shared/lib/marketplace/index.ts       |  1 +
 .../shared/lib/marketplace/membership-fee.ts  | 11 ++++--
 .../lib/marketplace/reception-grouping.ts     |  4 +--
 .../src/shared/ui/Providers/Bank/Bank.vue     |  2 +-
 .../shared/ui/base/BaseInput/BaseInput.vue    |  6 ++--
 .../CatalogOfferCard/CatalogOfferCard.vue     |  3 +-
 .../model/useOnsiteSignatureGate.ts           | 28 +++++++++------
 .../Marketplace/OrderCard/OrderCard.vue       | 14 ++++++++
 .../OrderCard/lib/toOrderCardModel.ts         | 22 ++++++++++--
 .../StockRestockPanel/StockRestockPanel.vue   | 34 +++++++++++++++++--
 .../SupplyPartyCard/SupplyPartyCard.vue       | 12 +++++++
 .../ProcessDetailCard/ProcessDetailCard.vue   |  3 +-
 35 files changed, 219 insertions(+), 79 deletions(-)

diff --git a/components/desktop/extensions/market/install.ts b/components/desktop/extensions/market/install.ts
index 48b2d03c912..2d05133975b 100644
--- a/components/desktop/extensions/market/install.ts
+++ b/components/desktop/extensions/market/install.ts
@@ -708,7 +708,7 @@ export default async function (): Promise<IWorkspaceConfig[]> {
               component: markRaw(AdminOffersPage),
               meta: {
                 title: 'Реестр предложений',
-                icon: 'storefront',
+                icon: 'sell',
                 requires: 'Offer:read:all',
                 requiresAuth: true,
                 agreements: agreementsBase,
diff --git a/components/desktop/extensions/reports/pages/PostingsPage/ui/PostingsPage.vue b/components/desktop/extensions/reports/pages/PostingsPage/ui/PostingsPage.vue
index e680c8625bc..c315b80efce 100644
--- a/components/desktop/extensions/reports/pages/PostingsPage/ui/PostingsPage.vue
+++ b/components/desktop/extensions/reports/pages/PostingsPage/ui/PostingsPage.vue
@@ -209,7 +209,7 @@
               EntityIdBadge(
                 v-if='props.row.processHash'
                 :rawId='shortHash(props.row.processHash)'
-                @click='copyFullHash(props.row.processHash)'
+                @click='copyText(props.row.processHash)'
               )
 </template>
 
diff --git a/components/desktop/src-ssr/middlewares/injectEnv.ts b/components/desktop/src-ssr/middlewares/injectEnv.ts
index 461a00e3fb2..8d3629bc61c 100644
--- a/components/desktop/src-ssr/middlewares/injectEnv.ts
+++ b/components/desktop/src-ssr/middlewares/injectEnv.ts
@@ -26,6 +26,7 @@ export default ssrMiddleware(({ app }) => {
       VAPID_PUBLIC_KEY: process.env.VAPID_PUBLIC_KEY as string,
       SENTRY_DSN: process.env.SENTRY_DSN as string,
       OPENREPLAY_PROJECT_KEY: process.env.OPENREPLAY_PROJECT_KEY as string,
+      YANDEX_MAPS_API_KEY: process.env.YANDEX_MAPS_API_KEY as string,
     };
 
     // Создаем скрипт, который добавит переменные в window.__ENV__
diff --git a/components/desktop/src/boot/index.ts b/components/desktop/src/boot/index.ts
index 0766154b410..1b804666a23 100644
--- a/components/desktop/src/boot/index.ts
+++ b/components/desktop/src/boot/index.ts
@@ -1,5 +1,4 @@
 export { default as init } from './init';
 export { default as axios } from './axios';
 export { default as sentry } from './sentry';
-export { default as map } from './map';
 export { default as chatwoot } from './chatwoot';
diff --git a/components/desktop/src/pages/Marketplace/AdminIssuancePoints/ui/AdminIssuancePointsPage.vue b/components/desktop/src/pages/Marketplace/AdminIssuancePoints/ui/AdminIssuancePointsPage.vue
index b03149abeb3..2ff65758ddf 100644
--- a/components/desktop/src/pages/Marketplace/AdminIssuancePoints/ui/AdminIssuancePointsPage.vue
+++ b/components/desktop/src/pages/Marketplace/AdminIssuancePoints/ui/AdminIssuancePointsPage.vue
@@ -14,7 +14,7 @@ import { GeocodeStatus, KuDetailsStatus } from 'src/entities/MarketplaceKUDetail
 import type { IMarketplaceKUDetails } from 'src/entities/MarketplaceKUDetails'
 import { BaseBadge, BaseButton, BaseDialog, EmptyState, TableSkeleton } from 'src/shared/ui/base'
 import type { BaseBadgeVariant, TableSkeletonColumn } from 'src/shared/ui/base'
-import { PageHint } from 'src/shared/ui/domain'
+import { IdentityCell, PageHint } from 'src/shared/ui/domain'
 import { useMarketplaceRealtime } from 'src/shared/lib/marketplace'
 // Map экспортируется как `Map` — импортируем под алиасом, чтобы не затенять
 // глобальный `Map` (используется в `rows`).
@@ -81,6 +81,10 @@ function statusOf(row: IssuancePointRow): { label: string; variant: BaseBadgeVar
   return STATUS_LABEL[row.details.status]
 }
 
+function branchName(row: IssuancePointRow): string {
+  return row.branch.short_name || row.branch.full_name || ''
+}
+
 function addressOf(row: IssuancePointRow): string {
   return (
     row.details?.addressFull ||
@@ -213,8 +217,10 @@ q-page.admin-pvz
         tbody
           tr(v-for='row in rows', :key='row.branch.braname')
             td.col-ku
-              .admin-pvz__ku-name {{ row.branch.short_name || row.branch.full_name || row.branch.braname }}
-              .admin-pvz__ku-acc {{ row.branch.braname }}
+              IdentityCell(
+                :account-name='row.branch.braname',
+                :full-name='branchName(row)'
+              )
             td.col-city {{ row.branch.city || '—' }}
             td.admin-pvz__address {{ addressOf(row) }}
             td.col-status
@@ -334,16 +340,6 @@ q-page.admin-pvz
     font-size: 0.875rem;
   }
 
-  &__ku-name {
-    font-weight: 600;
-  }
-
-  &__ku-acc {
-    font-family: var(--font-mono);
-    font-size: 0.8125rem;
-    color: var(--p-ink-3);
-  }
-
   &__address {
     color: var(--p-ink-2);
   }
diff --git a/components/desktop/src/pages/Marketplace/AdminOrders/ui/AdminOrdersPage.vue b/components/desktop/src/pages/Marketplace/AdminOrders/ui/AdminOrdersPage.vue
index 0c57285f42d..f0c8e5069a0 100644
--- a/components/desktop/src/pages/Marketplace/AdminOrders/ui/AdminOrdersPage.vue
+++ b/components/desktop/src/pages/Marketplace/AdminOrders/ui/AdminOrdersPage.vue
@@ -90,8 +90,11 @@ function shortId(id: string | null | undefined): string {
 function unitLabel(o: AdminOrderView): string {
   return marketplaceUnitShort(o.unit_of_measure);
 }
-function formatTotal(v: string | null | undefined): string {
-  return v ? formatAsset2Digits(String(v)) : '—';
+// requirement b6: реестр показывает сумму, которую реально заплатил пайщик
+// (себестоимость + членский взнос, зафиксированный в заказе контрактом) —
+// не голую себестоимость товара.
+function formatTotalWithFee(o: AdminOrderView): string {
+  return formatAsset2Digits(o.total_cost_with_fee);
 }
 function formatDate(d: unknown): string {
   if (d === null || d === undefined) return '—';
@@ -255,7 +258,7 @@ q-page.admin-orders(role="region", aria-label="Реестр заказов ко
           q-td {{ ordererTitle(props.row) }}
           q-td {{ supplierTitle(props.row) }}
           q-td.text-right {{ props.row.quantity }} {{ unitLabel(props.row) }}
-          q-td.text-right.font-monospace {{ formatTotal(props.row.total_cost) }}
+          q-td.text-right.font-monospace {{ formatTotalWithFee(props.row) }}
           q-td {{ formatDate(props.row.created_at) }}
 
         q-tr.q-virtual-scroll--with-prev(
diff --git a/components/desktop/src/pages/Marketplace/Cart/ui/CartPage.vue b/components/desktop/src/pages/Marketplace/Cart/ui/CartPage.vue
index 3f41365e492..670deae726f 100644
--- a/components/desktop/src/pages/Marketplace/Cart/ui/CartPage.vue
+++ b/components/desktop/src/pages/Marketplace/Cart/ui/CartPage.vue
@@ -11,7 +11,7 @@ import {
 import { BaseCard, BaseButton, BaseChip, EmptyState } from 'src/shared/ui/base';
 import { KUHeaderBar } from 'src/widgets/Marketplace/KUHeaderBar';
 import { marketplaceUnitShort } from 'src/shared/lib/consts';
-import { useMarketplaceRealtime, getMembershipFeePercent } from 'src/shared/lib/marketplace';
+import { useMarketplaceRealtime, getMembershipFeePercent, applyMembershipFee } from 'src/shared/lib/marketplace';
 
 /**
  * Эпик 16 / Story 16.1 + 16.2: страница корзины заказчика и оформление.
@@ -35,12 +35,12 @@ const coopname = computed(() => String(route.params.coopname ?? ''));
 
 const symbol = computed(() => system.governSymbol);
 
-function unitShort(u: string): string {
-  return marketplaceUnitShort(u as Parameters<typeof marketplaceUnitShort>[0]);
+function unitShort(u: string | null | undefined): string {
+  return marketplaceUnitShort((u ?? '') as Parameters<typeof marketplaceUnitShort>[0]);
 }
 
-function money(value: string | number): string {
-  return Number(value).toLocaleString('ru-RU');
+function money(value: string | number | null | undefined): string {
+  return Number(value ?? 0).toLocaleString('ru-RU');
 }
 
 // Низкоуровневый коммит количества (целое ≥ 1). Кламп делает changeQty.
@@ -156,8 +156,8 @@ useMarketplaceRealtime(
 // requirement b6: членский взнос входит в общую стоимость заказа — сводка
 // показывает его отдельной строкой и итог с учётом взноса.
 const feePercent = ref(0);
-const feeAmount = computed(() => (cartStore.totalCost * feePercent.value) / 100);
-const totalWithFee = computed(() => cartStore.totalCost + feeAmount.value);
+const totalWithFee = computed(() => applyMembershipFee(Number(cartStore.totalCost), feePercent.value));
+const feeAmount = computed(() => totalWithFee.value - Number(cartStore.totalCost));
 
 onMounted(async () => {
   try {
diff --git a/components/desktop/src/pages/Marketplace/MarketplaceCatalog/ui/AddToCartDialog.vue b/components/desktop/src/pages/Marketplace/MarketplaceCatalog/ui/AddToCartDialog.vue
index 00c1f2af8b5..8aae6f1c855 100644
--- a/components/desktop/src/pages/Marketplace/MarketplaceCatalog/ui/AddToCartDialog.vue
+++ b/components/desktop/src/pages/Marketplace/MarketplaceCatalog/ui/AddToCartDialog.vue
@@ -4,6 +4,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
 import { useSystemStore } from 'src/entities/System/model';
 import { useMarketplaceCartStore } from 'src/entities/MarketplaceCart';
+import { applyMembershipFee } from 'src/shared/lib/marketplace';
 import { BaseDialog, BaseInput, BaseButton } from 'src/shared/ui/base';
 import type { MarketplaceOfferView } from '../types';
 
@@ -29,10 +30,16 @@ const cartStore = useMarketplaceCartStore();
 const router = useRouter();
 const route = useRoute();
 
-const props = defineProps<{
-  modelValue: boolean;
-  offer: CartOffer | null;
-}>();
+const props = withDefaults(
+  defineProps<{
+    modelValue: boolean;
+    offer: CartOffer | null;
+    // Единая ставка членского взноса кооператива, проценты (requirement b6).
+    // Цена и итог показываются заказчику с учётом взноса — как в каталоге.
+    feePercent?: number;
+  }>(),
+  { feePercent: 0 },
+);
 
 const emit = defineEmits<{
   (e: 'update:modelValue', value: boolean): void;
@@ -64,10 +71,14 @@ const maxQuantity = computed(() => {
   return props.offer.quantity_available;
 });
 
-const totalSum = computed(() => {
+const priceWithFee = computed(() => {
   if (!props.offer) return 0;
+  return applyMembershipFee(Number(props.offer.price_per_unit), props.feePercent);
+});
+
+const totalSum = computed(() => {
   const q = Number(quantity.value) || 0;
-  return q * Number(props.offer.price_per_unit);
+  return q * priceWithFee.value;
 });
 
 // Сколько этой позиции уже в корзине — подсказка, чтобы заказчик не дублировал.
@@ -148,7 +159,9 @@ BaseDialog(
       .add-to-cart__note(v-if="alreadyInCart > 0")
         | Уже в корзине: {{ alreadyInCart }} {{ unitLabel }} — добавление суммируется.
       .add-to-cart__price(v-if="offer")
-        | Цена: {{ Number(offer.price_per_unit).toLocaleString('ru-RU') }} {{ system.governSymbol }} за {{ unitLabel }}
+        | Цена: {{ priceWithFee.toLocaleString('ru-RU') }} {{ system.governSymbol }} за {{ unitLabel }}
+        template(v-if="feePercent > 0")
+          |  (с членским взносом {{ feePercent }}%)
       .add-to-cart__total(v-if="offer")
         | Итого: {{ totalSum.toLocaleString('ru-RU') }} {{ system.governSymbol }}
   template(#footer)
diff --git a/components/desktop/src/pages/Marketplace/MarketplaceCatalog/ui/MarketplaceCatalogPage.vue b/components/desktop/src/pages/Marketplace/MarketplaceCatalog/ui/MarketplaceCatalogPage.vue
index 540b028a161..e780517d7f4 100644
--- a/components/desktop/src/pages/Marketplace/MarketplaceCatalog/ui/MarketplaceCatalogPage.vue
+++ b/components/desktop/src/pages/Marketplace/MarketplaceCatalog/ui/MarketplaceCatalogPage.vue
@@ -410,7 +410,8 @@ q-page.catalog(role="region", aria-label="Каталог Стола заказо
 
   AddToCartDialog(
     v-model="cartDialogOpen",
-    :offer="cartDialogOffer"
+    :offer="cartDialogOffer",
+    :fee-percent="feePercent"
   )
 </template>
 
diff --git a/components/desktop/src/pages/Marketplace/MarketplaceOfferDetail/api/index.ts b/components/desktop/src/pages/Marketplace/MarketplaceOfferDetail/api/index.ts
index f9a15fa4688..13c15441274 100644
--- a/components/desktop/src/pages/Marketplace/MarketplaceOfferDetail/api/index.ts
+++ b/components/desktop/src/pages/Marketplace/MarketplaceOfferDetail/api/index.ts
@@ -12,5 +12,5 @@ export async function fetchOffer(id: string): Promise<MarketplaceOfferDetailView
     Queries.Marketplace.GetOffer.query,
     { variables: { id } },
   );
-  return offer;
+  return offer as MarketplaceOfferDetailView | null;
 }
diff --git a/components/desktop/src/pages/Marketplace/MarketplaceOfferDetail/ui/MarketplaceOfferDetailPage.vue b/components/desktop/src/pages/Marketplace/MarketplaceOfferDetail/ui/MarketplaceOfferDetailPage.vue
index 17b6609cbe1..29426859a23 100644
--- a/components/desktop/src/pages/Marketplace/MarketplaceOfferDetail/ui/MarketplaceOfferDetailPage.vue
+++ b/components/desktop/src/pages/Marketplace/MarketplaceOfferDetail/ui/MarketplaceOfferDetailPage.vue
@@ -9,7 +9,7 @@ import { OfferGallery } from 'src/widgets/Marketplace/OfferGallery';
 import { CartHeaderButton } from 'src/widgets/Marketplace/CartHeaderButton';
 import { marketplaceUnitShort } from 'src/shared/lib/consts';
 import { marketplaceOfferImageUrls } from 'src/shared/lib/utils';
-import { useMarketplaceRealtime } from 'src/shared/lib/marketplace';
+import { useMarketplaceRealtime, getMembershipFeePercent, applyMembershipFee } from 'src/shared/lib/marketplace';
 import { useMarketplaceCartStore } from 'src/entities/MarketplaceCart';
 import { useOfferModeration } from 'src/features/Marketplace/OfferModeration';
 import { fetchCategories } from '../../MarketplaceCatalog/api';
@@ -105,9 +105,16 @@ const stockLabel = computed(() => {
     : `В наличии: ${offer.value.quantity_available} ${unitShort.value}`;
 });
 
+// requirement b6: единая ставка членского взноса входит в цену, которую видит
+// заказчик — как в карточке каталога (CatalogOfferCard). Раздельная
+// себестоимость без взноса остаётся только на столе поставщика.
+const feePercent = ref(0);
+const priceWithFee = computed(() =>
+  offer.value ? applyMembershipFee(Number(offer.value.price_per_unit), feePercent.value) : 0,
+);
 const priceLabel = computed(() =>
   offer.value
-    ? `${Number(offer.value.price_per_unit).toLocaleString('ru-RU')} ${system.governSymbol} / ${unitShort.value}`
+    ? `${priceWithFee.value.toLocaleString('ru-RU')} ${system.governSymbol} / ${unitShort.value}`
     : '',
 );
 
@@ -157,6 +164,11 @@ useMarketplaceRealtime(
 );
 
 onMounted(async () => {
+  try {
+    feePercent.value = await getMembershipFeePercent();
+  } catch {
+    // Без ставки показываем цену без строки взноса.
+  }
   await load();
   // В режиме заказа нужен текущий КУ (для кнопки «В корзину» и диалога).
   if (!readonly.value) {
@@ -209,6 +221,7 @@ q-page.offer-detail(role="region", aria-label="Описание предложе
         span {{ offer.supplier_name }}
 
       .offer-detail__price {{ priceLabel }}
+      .offer-detail__fee-note(v-if="feePercent > 0") Цена с членским взносом {{ feePercent }}%
 
       BaseButton(
         v-if="!readonly",
@@ -257,7 +270,8 @@ q-page.offer-detail(role="region", aria-label="Описание предложе
   AddToCartDialog(
     v-if="!readonly",
     v-model="cartDialogOpen",
-    :offer="offer"
+    :offer="offer",
+    :fee-percent="feePercent"
   )
 </template>
 
@@ -333,6 +347,12 @@ q-page.offer-detail(role="region", aria-label="Описание предложе
     color: var(--p-primary-strong);
   }
 
+  &__fee-note {
+    font-size: var(--p-fs-body-sm);
+    color: var(--p-ink-3);
+    margin-top: calc(var(--p-1, 4px) * -1);
+  }
+
   &__sections {
     display: flex;
     flex-direction: column;
diff --git a/components/desktop/src/pages/Marketplace/MyOrders/ui/MyOrdersPage.vue b/components/desktop/src/pages/Marketplace/MyOrders/ui/MyOrdersPage.vue
index b01b91e6aba..86034570f13 100644
--- a/components/desktop/src/pages/Marketplace/MyOrders/ui/MyOrdersPage.vue
+++ b/components/desktop/src/pages/Marketplace/MyOrders/ui/MyOrdersPage.vue
@@ -143,13 +143,13 @@ function groupByCheckout(list: MarketplaceOrderView[]): OrderGroup[] {
   }
   const result: OrderGroup[] = Array.from(map.entries()).map(([key, orders]) => {
     const first = orders[0];
-    const recent = Math.max(...orders.map((o) => new Date(o.updated_at).getTime()));
+    const recent = Math.max(...orders.map((o) => new Date(String(o.updated_at)).getTime()));
     return {
       key,
       isAggregate: orders.length > 1,
       orders,
       count: orders.length,
-      totalCost: orders.reduce((s, o) => s + Number(o.total_cost), 0),
+      totalCost: orders.reduce((s, o) => s + Number(o.total_cost_with_fee), 0),
       deliveryName: first?.delivery_point_name || first?.delivery_braname || '',
       createdAt: first?.created_at ?? '',
       recent,
@@ -250,7 +250,7 @@ async function onLoadMore(): Promise<void> {
 function confirmCancel(order: MarketplaceOrderView): void {
   Dialog.create({
     title: 'Отменить заказ?',
-    message: `Заказ № ${order.id.slice(0, 8)} (${order.quantity} ед., ${order.total_cost} ₽) будет отменён. Средства разблокируются на кошельке Стола заказов.`,
+    message: `Заказ № ${order.id.slice(0, 8)} (${order.quantity} ед., ${money(order.total_cost_with_fee)} ₽) будет отменён. Средства разблокируются на кошельке Стола заказов.`,
     cancel: { label: 'Не отменять', flat: true },
     ok: { label: 'Отменить заказ', color: 'negative', unelevated: true },
     persistent: true,
diff --git a/components/desktop/src/pages/Marketplace/OffererIncomingOrders/ui/OffererIncomingOrdersPage.vue b/components/desktop/src/pages/Marketplace/OffererIncomingOrders/ui/OffererIncomingOrdersPage.vue
index 7762cc1c980..ce1d69090f5 100644
--- a/components/desktop/src/pages/Marketplace/OffererIncomingOrders/ui/OffererIncomingOrdersPage.vue
+++ b/components/desktop/src/pages/Marketplace/OffererIncomingOrders/ui/OffererIncomingOrdersPage.vue
@@ -122,6 +122,8 @@ interface SupplierParty {
   orders: MarketplaceOrderView[];
   totalUnits: number;
   totalCost: number;
+  /** Сумма членских взносов пайщиков по заказам партии (requirement b6) — справочно, не деньги поставщика. */
+  totalFee: number;
   /** Целевой минимальный объём поставки на этот КУ (для накопителя). */
   minVolume: number | null;
   stageStatus: MarketplaceOrderStatusView;
@@ -150,6 +152,7 @@ const parties = computed<SupplierParty[]>(() => {
         orders: [],
         totalUnits: 0,
         totalCost: 0,
+        totalFee: 0,
         minVolume: collecting
           ? (minVolumeMap.value.get(`${o.offer_id}::${o.delivery_braname}`) ?? null)
           : null,
@@ -160,6 +163,7 @@ const parties = computed<SupplierParty[]>(() => {
     p.orders.push(o);
     p.totalUnits += o.quantity;
     p.totalCost += parseFloat(o.total_cost) || 0;
+    p.totalFee += Number(o.membership_fee ?? 0) || 0;
     const candidate = STAGE_RANK[o.status];
     const current = STAGE_RANK[p.stageStatus];
     if (candidate < 90 && (current >= 90 || candidate < current)) {
@@ -340,7 +344,8 @@ q-page.incoming-orders(role='region', aria-label='Входящие заказы
         :bar-color='barColor(p)',
         :members='[]',
         total-label='Итого',
-        :total-value='`${formatCost(p.totalCost)} · ${p.totalUnits} ${p.unitLabel}`'
+        :total-value='`${formatCost(p.totalCost)} · ${p.totalUnits} ${p.unitLabel}`',
+        :total-fee-note='p.totalFee > 0 ? `С учётом взноса пайщиков: ${formatCost(p.totalCost + p.totalFee)}` : undefined'
       )
         template(#actions)
           template(v-if='p.kind === "collecting"')
diff --git a/components/desktop/src/pages/Marketplace/OffererSupplyPreparation/lib/ttn.ts b/components/desktop/src/pages/Marketplace/OffererSupplyPreparation/lib/ttn.ts
index 60b0c1baf41..4c770607fdc 100644
--- a/components/desktop/src/pages/Marketplace/OffererSupplyPreparation/lib/ttn.ts
+++ b/components/desktop/src/pages/Marketplace/OffererSupplyPreparation/lib/ttn.ts
@@ -64,7 +64,7 @@ export function buildTtnData(
       const boxes = unitsPerBox && unitsPerBox > 0 ? Math.ceil(o.quantity / unitsPerBox) : undefined;
       return {
         sku: o.offer_id ? String(o.offer_id).slice(0, 8) : '—',
-        title: o.product_name,
+        title: o.product_name || 'Товар по предложению',
         qty: o.quantity,
         unit: marketplaceUnitShort(o.unit_of_measure),
         price: parseFloat(o.price_per_unit) || 0,
diff --git a/components/desktop/src/pages/Marketplace/OnboardingMemberPickCpp/ui/OnboardingMemberPickCppPage.vue b/components/desktop/src/pages/Marketplace/OnboardingMemberPickCpp/ui/OnboardingMemberPickCppPage.vue
index 82ce315095a..c91aa8820d3 100644
--- a/components/desktop/src/pages/Marketplace/OnboardingMemberPickCpp/ui/OnboardingMemberPickCppPage.vue
+++ b/components/desktop/src/pages/Marketplace/OnboardingMemberPickCpp/ui/OnboardingMemberPickCppPage.vue
@@ -230,8 +230,8 @@ q-page.mp-role-orderer.mp-member-cpp(role="region", aria-label="Подключе
         .mp-member-cpp__head-icon
           q-icon(name="location_on", size="22px")
         .mp-member-cpp__head-text
-          .text-subtitle1.text-weight-medium Выберите пункт выдачи
-          .text-body2.text-grey-7 Где будете забирать заказы. Каталог отфильтруется под выбранный участок.
+          .text-subtitle1.text-weight-medium Выберите пункт выдачи заказов
+          .text-body2.text-grey-7 Выбирайте участок, где вам удобно забирать заказы, — сменить его можно в любой момент.
         BaseChip.mp-member-cpp__picked(v-if="selectedName", variant="pos", size="sm")
           q-icon(name="check", size="14px")
           | {{ selectedName }}
diff --git a/components/desktop/src/pages/Marketplace/OperatorBranchEconomy/ui/OperatorBranchEconomyPage.vue b/components/desktop/src/pages/Marketplace/OperatorBranchEconomy/ui/OperatorBranchEconomyPage.vue
index c3a575ed5fb..ee0c3c6dc74 100644
--- a/components/desktop/src/pages/Marketplace/OperatorBranchEconomy/ui/OperatorBranchEconomyPage.vue
+++ b/components/desktop/src/pages/Marketplace/OperatorBranchEconomy/ui/OperatorBranchEconomyPage.vue
@@ -170,7 +170,7 @@ const planSaving = ref(false)
 function planDueLabel(plan: ExpensePlanView): string {
   if (plan.priority === Zeus.ExpensePlanPriority.URGENT) return 'Срочный'
   if (plan.priority === Zeus.ExpensePlanPriority.OPTIONAL) return 'Необязательный'
-  return plan.due_date ? new Date(plan.due_date).toLocaleDateString('ru-RU') : '—'
+  return plan.due_date ? new Date(String(plan.due_date)).toLocaleDateString('ru-RU') : '—'
 }
 
 async function onAddPlan(): Promise<void> {
diff --git a/components/desktop/src/pages/Marketplace/OperatorReception/ui/OperatorReceptionPage.vue b/components/desktop/src/pages/Marketplace/OperatorReception/ui/OperatorReceptionPage.vue
index f1fe2a61c6f..cc8d008d31f 100644
--- a/components/desktop/src/pages/Marketplace/OperatorReception/ui/OperatorReceptionPage.vue
+++ b/components/desktop/src/pages/Marketplace/OperatorReception/ui/OperatorReceptionPage.vue
@@ -258,7 +258,7 @@ function aggregateLines(orders: MarketplaceSupplierPickupOrderView[]): DeliveryL
       map.set(key, {
         key,
         productName: o.product_name || 'Товар по предложению',
-        unit: o.unit_of_measure,
+        unit: o.unit_of_measure ?? '',
         quantity: qty,
         boxes,
       });
@@ -382,7 +382,7 @@ function groupOrdersByProduct(orders: MarketplaceSupplierPickupOrderView[]): Pic
       map.set(key, {
         key,
         productName: o.product_name || 'Товар по предложению',
-        unit: o.unit_of_measure,
+        unit: o.unit_of_measure ?? '',
         orderedTotal: qty,
         orders: [o],
       });
diff --git a/components/desktop/src/pages/Marketplace/OrdererConsolidated/ui/OrdererConsolidatedPage.vue b/components/desktop/src/pages/Marketplace/OrdererConsolidated/ui/OrdererConsolidatedPage.vue
index 82de6100109..5a65cd2603c 100644
--- a/components/desktop/src/pages/Marketplace/OrdererConsolidated/ui/OrdererConsolidatedPage.vue
+++ b/components/desktop/src/pages/Marketplace/OrdererConsolidated/ui/OrdererConsolidatedPage.vue
@@ -88,6 +88,7 @@ interface CollectiveParty {
   orders: MarketplaceOrderView[];
   /** Свой вклад (сумма собственных заказов в этой партии). */
   ownUnits: number;
+  /** С учётом членского взноса (requirement b6) — то, что заказчик реально платит. */
   ownCost: number;
   /** Накоплено всеми пайщиками (с бэкенда): пул сбора или объём партии. */
   groupAccumulated: number | null;
@@ -127,7 +128,7 @@ const parties = computed<CollectiveParty[]>(() => {
     }
     p.orders.push(o);
     p.ownUnits += o.quantity;
-    p.ownCost += parseFloat(o.total_cost) || 0;
+    p.ownCost += Number(o.total_cost_with_fee);
     const candidate = STAGE_RANK[o.status];
     const current = STAGE_RANK[p.stageStatus];
     if (candidate < 90 && (current >= 90 || candidate < current)) {
diff --git a/components/desktop/src/pages/Marketplace/OrdererOrderDetail/ui/OrdererOrderDetailPage.vue b/components/desktop/src/pages/Marketplace/OrdererOrderDetail/ui/OrdererOrderDetailPage.vue
index 743f72d0753..8f2b0450ea5 100644
--- a/components/desktop/src/pages/Marketplace/OrdererOrderDetail/ui/OrdererOrderDetailPage.vue
+++ b/components/desktop/src/pages/Marketplace/OrdererOrderDetail/ui/OrdererOrderDetailPage.vue
@@ -46,6 +46,14 @@ const status = computed(() => (order.value ? orderStatusDisplay(order.value.stat
 const unitShort = computed(() => marketplaceUnitShort(order.value?.unit_of_measure));
 const cancellable = computed(() => order.value?.status === 'ACTIVE');
 
+// requirement b6: заказчику показываем цену С членским взносом (как в
+// каталоге) — order.total_cost_with_fee уже посчитан бэком (total_cost +
+// membership_fee, зафиксированный контрактом по ставке на момент заказа).
+const totalWithFee = computed(() => (order.value ? Number(order.value.total_cost_with_fee) : 0));
+const unitPriceWithFee = computed(() =>
+  order.value && order.value.quantity > 0 ? totalWithFee.value / order.value.quantity : 0,
+);
+
 const pvzName = computed(() => order.value?.delivery_point_name || order.value?.delivery_braname || '');
 const pvzAddress = computed(() => order.value?.delivery_point_address || '');
 
@@ -129,7 +137,7 @@ function confirmCancel(): void {
   if (!o) return;
   Dialog.create({
     title: 'Отменить заказ?',
-    message: `Заказ № ${o.id.slice(0, 8)} (${o.quantity} ед., ${o.total_cost} ₽) будет отменён. Средства разблокируются на кошельке Стола заказов.`,
+    message: `Заказ № ${o.id.slice(0, 8)} (${o.quantity} ед., ${formatPrice(o.total_cost_with_fee)}) будет отменён. Средства разблокируются на кошельке Стола заказов.`,
     cancel: { label: 'Не отменять', flat: true },
     ok: { label: 'Отменить заказ', color: 'negative', unelevated: true },
     persistent: true,
@@ -199,13 +207,13 @@ q-page.order-detail(role="region", aria-label="Заказ")
             .order-detail__facts
               .order-detail__fact
                 .order-detail__fact-label Сумма заказа
-                .order-detail__fact-value--money {{ formatPrice(order.total_cost) }}
+                .order-detail__fact-value--money {{ formatPrice(String(totalWithFee)) }}
               .order-detail__fact
                 .order-detail__fact-label Количество
                 .order-detail__fact-value {{ order.quantity }} {{ unitShort }}
               .order-detail__fact
                 .order-detail__fact-label Цена за единицу
-                .order-detail__fact-value {{ formatPrice(order.price_per_unit) }}
+                .order-detail__fact-value {{ formatPrice(String(unitPriceWithFee)) }}
 
       BaseCard.order-detail__card(v-if="pvzName || pvzAddress")
         template(#head)
diff --git a/components/desktop/src/pages/Marketplace/SupplierRegistry/ui/SupplierRegistryPage.vue b/components/desktop/src/pages/Marketplace/SupplierRegistry/ui/SupplierRegistryPage.vue
index bc6aad50a93..c0ecaf52eaf 100644
--- a/components/desktop/src/pages/Marketplace/SupplierRegistry/ui/SupplierRegistryPage.vue
+++ b/components/desktop/src/pages/Marketplace/SupplierRegistry/ui/SupplierRegistryPage.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref } from 'vue';
+import { Zeus } from '@coopenomics/sdk';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
 import { useSessionStore } from 'src/entities/Session/model';
 import { BaseBadge, BaseButton, BaseInput, BaseDialog, EmptyState } from 'src/shared/ui/base';
@@ -124,7 +125,7 @@ async function onAdd(): Promise<void> {
   try {
     await addSupplier({
       member_account: addMember.value.trim(),
-      model: 'MEMBERSHIP',
+      model: Zeus.MarketplaceSupplierModel.MEMBERSHIP,
       contract_number: addNumber.value.trim(),
       contract_date: addDate.value,
     });
diff --git a/components/desktop/src/pages/Registrator/SignUp/SelectProgram.vue b/components/desktop/src/pages/Registrator/SignUp/SelectProgram.vue
index c4e541d9698..00dfdbab431 100644
--- a/components/desktop/src/pages/Registrator/SignUp/SelectProgram.vue
+++ b/components/desktop/src/pages/Registrator/SignUp/SelectProgram.vue
@@ -15,7 +15,7 @@ div
           :value='program.key',
           :title='program.title',
           :description='program.description',
-          :meta='program.requirements',
+          :meta='program.requirements ?? undefined',
           @update:model-value='selectProgram(program.key)'
         )
 
diff --git a/components/desktop/src/shared/config/Environment.ts b/components/desktop/src/shared/config/Environment.ts
index 665618e289d..cd78fd8e023 100644
--- a/components/desktop/src/shared/config/Environment.ts
+++ b/components/desktop/src/shared/config/Environment.ts
@@ -119,6 +119,7 @@ function getEnv(): EnvVars {
       VAPID_PUBLIC_KEY: '',
       SENTRY_DSN: '',
       OPENREPLAY_PROJECT_KEY: '',
+      YANDEX_MAPS_API_KEY: '',
     };
   }
 
diff --git a/components/desktop/src/shared/config/createEnvObject.ts b/components/desktop/src/shared/config/createEnvObject.ts
index 07da71fe549..560e602fa5c 100644
--- a/components/desktop/src/shared/config/createEnvObject.ts
+++ b/components/desktop/src/shared/config/createEnvObject.ts
@@ -27,6 +27,7 @@ export function createEnvObject(): EnvVars {
     VAPID_PUBLIC_KEY: process.env.VAPID_PUBLIC_KEY as string,
     SENTRY_DSN: process.env.SENTRY_DSN as string,
     OPENREPLAY_PROJECT_KEY: process.env.OPENREPLAY_PROJECT_KEY as string,
+    YANDEX_MAPS_API_KEY: process.env.YANDEX_MAPS_API_KEY as string,
   };
 
   return envObj;
diff --git a/components/desktop/src/shared/lib/marketplace/index.ts b/components/desktop/src/shared/lib/marketplace/index.ts
index b1664d75889..4db8b1229a9 100644
--- a/components/desktop/src/shared/lib/marketplace/index.ts
+++ b/components/desktop/src/shared/lib/marketplace/index.ts
@@ -20,6 +20,7 @@ export {
 export { useActsPreview } from './useActsPreview';
 export {
   getMembershipFeePercent,
+  applyMembershipFee,
   computeIssuanceDiff,
   type IssuanceDiffLine,
 } from './membership-fee';
diff --git a/components/desktop/src/shared/lib/marketplace/membership-fee.ts b/components/desktop/src/shared/lib/marketplace/membership-fee.ts
index 07d91c51c22..0a2b360add9 100644
--- a/components/desktop/src/shared/lib/marketplace/membership-fee.ts
+++ b/components/desktop/src/shared/lib/marketplace/membership-fee.ts
@@ -13,6 +13,14 @@ export async function getMembershipFeePercent(): Promise<number> {
   return result.membership_fee_percent;
 }
 
+/**
+ * Цена с учётом членского взноса — единая формула для всех экранов заказчика
+ * (каталог, деталь предложения, добавление в корзину, сводка корзины).
+ */
+export function applyMembershipFee(price: number, feePercent: number): number {
+  return price * (1 + feePercent / 100);
+}
+
 export interface IssuanceDiffLine {
   /** Сумма позиции по заказу (заблокированный резерв без взноса). */
   orderedTotal: number;
@@ -41,6 +49,5 @@ export function computeIssuanceDiff(
     if (diff > 0) refund += diff;
     else if (diff < 0) surcharge += -diff;
   }
-  const withFee = 1 + feePercent / 100;
-  return { refund: refund * withFee, surcharge: surcharge * withFee };
+  return { refund: applyMembershipFee(refund, feePercent), surcharge: applyMembershipFee(surcharge, feePercent) };
 }
diff --git a/components/desktop/src/shared/lib/marketplace/reception-grouping.ts b/components/desktop/src/shared/lib/marketplace/reception-grouping.ts
index 15652f3d673..266156a5951 100644
--- a/components/desktop/src/shared/lib/marketplace/reception-grouping.ts
+++ b/components/desktop/src/shared/lib/marketplace/reception-grouping.ts
@@ -29,7 +29,7 @@ export interface GroupableReception {
   fact_quantity_per_order: ReadonlyArray<{
     product_name?: string | null;
     fact_quantity: number | string;
-    unit_of_measure: string;
+    unit_of_measure?: string | null;
     fact_unit_price?: string | null;
   }>;
 }
@@ -115,7 +115,7 @@ export function groupAplReceptions<T extends GroupableReception>(
           lineMap.set(lk, {
             key: lk,
             productName: f.product_name || 'Товар по предложению',
-            unit: f.unit_of_measure,
+            unit: f.unit_of_measure ?? '',
             quantity: qty,
             amount: qty * price,
           });
diff --git a/components/desktop/src/shared/ui/Providers/Bank/Bank.vue b/components/desktop/src/shared/ui/Providers/Bank/Bank.vue
index 9312fdbb0f5..c1116d6cfe3 100644
--- a/components/desktop/src/shared/ui/Providers/Bank/Bank.vue
+++ b/components/desktop/src/shared/ui/Providers/Bank/Bank.vue
@@ -75,7 +75,7 @@ const generateQRCode = () => {
   if (qrElement.value && props.paymentOrder.payment_details?.data) {
     QRCode.toCanvas(
       qrElement.value,
-      props.paymentOrder.payment_details.data,
+      props.paymentOrder.payment_details.data as string,
       { width: 400 },
       function (error) {
         if (error) console.error(error);
diff --git a/components/desktop/src/shared/ui/base/BaseInput/BaseInput.vue b/components/desktop/src/shared/ui/base/BaseInput/BaseInput.vue
index 15de03ab3ce..4ccbc8ac8bf 100644
--- a/components/desktop/src/shared/ui/base/BaseInput/BaseInput.vue
+++ b/components/desktop/src/shared/ui/base/BaseInput/BaseInput.vue
@@ -61,11 +61,13 @@ const props = withDefaults(defineProps<BaseInputProps>(), {
   autogrow: false,
 });
 
+// Quasar QInput форвардит нативные blur/focus как обычный Event, не строго
+// FocusEvent — типизация здесь под то, что реально приходит из q-input.
 const emit = defineEmits<{
   'update:modelValue': [value: string];
   clear: [];
-  blur: [event: FocusEvent];
-  focus: [event: FocusEvent];
+  blur: [event: Event];
+  focus: [event: Event];
 }>();
 
 const autoId = useId();
diff --git a/components/desktop/src/widgets/Marketplace/CatalogOfferCard/CatalogOfferCard.vue b/components/desktop/src/widgets/Marketplace/CatalogOfferCard/CatalogOfferCard.vue
index 1aaecab967c..bec847ab3e4 100644
--- a/components/desktop/src/widgets/Marketplace/CatalogOfferCard/CatalogOfferCard.vue
+++ b/components/desktop/src/widgets/Marketplace/CatalogOfferCard/CatalogOfferCard.vue
@@ -70,6 +70,7 @@
 <script setup lang="ts">
 import { computed, type PropType } from 'vue'
 import { OfferGallery } from 'src/widgets/Marketplace/OfferGallery'
+import { applyMembershipFee } from 'src/shared/lib/marketplace'
 
 export type CatalogOfferStatus = 'draft' | 'published' | 'paused' | 'sold-out' | 'completed' | 'moderation' | 'withdrawn'
 
@@ -165,7 +166,7 @@ const unitCostWithFee = computed<number | string>(() => {
   if (!hasFee.value) return base
   const n = typeof base === 'number' ? base : Number(base)
   if (Number.isNaN(n)) return base
-  return n * (1 + props.feePercent / 100)
+  return applyMembershipFee(n, props.feePercent)
 })
 
 const feeLabel = computed(() => {
diff --git a/components/desktop/src/widgets/Marketplace/OnsiteSignatureGate/model/useOnsiteSignatureGate.ts b/components/desktop/src/widgets/Marketplace/OnsiteSignatureGate/model/useOnsiteSignatureGate.ts
index 9f4d9826505..7685f865868 100644
--- a/components/desktop/src/widgets/Marketplace/OnsiteSignatureGate/model/useOnsiteSignatureGate.ts
+++ b/components/desktop/src/widgets/Marketplace/OnsiteSignatureGate/model/useOnsiteSignatureGate.ts
@@ -7,7 +7,7 @@ import {
   signReceptionGroupAsSupplier,
   type MarketplaceAplReceptionView,
 } from 'src/pages/Marketplace/OffererPendingAplReceptions/api';
-import { Classes } from '@coopenomics/sdk';
+import { Classes, Zeus } from '@coopenomics/sdk';
 import {
   listStockProposals,
   finalizeStockIssuance,
@@ -96,7 +96,7 @@ async function refresh(source = 'ручной'): Promise<void> {
   try {
     const [receptions, proposals] = await Promise.all([
       listAplReceptionsAsSupplier().catch(() => [] as MarketplaceAplReceptionView[]),
-      listStockProposals({ statuses: ['PROPOSED'] }).catch(
+      listStockProposals({ statuses: [Zeus.MarketplaceStockProposalStatus.PROPOSED] }).catch(
         () => [] as MarketplaceStockProposalView[],
       ),
     ]);
@@ -203,15 +203,21 @@ async function signProposal(task: MarketplaceStockProposalView): Promise<void> {
     //    строке — документ НЕ перегенерируется, берётся агрегат rawDocument +
     //    document с подписью оператора (канон 2-подписи).
     const order_lines: IStockFinalizeOrderLine[] = await Promise.all(
-      payload.order_lines.map(async (line) => ({
-        order_hash: line.order_hash,
-        signed_signiss2_act: (await signer.signDocument(
-          line.signiss1_aggregate.rawDocument,
-          global.username,
-          2,
-          [line.signiss1_aggregate.document],
-        )) as IStockFinalizeOrderLine['signed_signiss2_act'],
-      })),
+      payload.order_lines.map(async (line) => {
+        const rawDocument = line.signiss1_aggregate.rawDocument;
+        if (!rawDocument) {
+          throw new Error(`Не найден исходный документ АПП-выдачи для заказа ${line.order_hash}`);
+        }
+        return {
+          order_hash: line.order_hash,
+          signed_signiss2_act: (await signer.signDocument(
+            rawDocument,
+            global.username,
+            2,
+            [line.signiss1_aggregate.document],
+          )) as IStockFinalizeOrderLine['signed_signiss2_act'],
+        };
+      }),
     );
 
     const { order_ids } = await finalizeStockIssuance(task.id, order_lines, signed_convert);
diff --git a/components/desktop/src/widgets/Marketplace/OrderCard/OrderCard.vue b/components/desktop/src/widgets/Marketplace/OrderCard/OrderCard.vue
index d13bf1b087b..ea5f091a99d 100644
--- a/components/desktop/src/widgets/Marketplace/OrderCard/OrderCard.vue
+++ b/components/desktop/src/widgets/Marketplace/OrderCard/OrderCard.vue
@@ -24,6 +24,7 @@
       <div class="order-card__fact">
         <div class="order-card__fact-label">Сумма</div>
         <div class="order-card__fact-value order-card__fact-value--money">{{ formatPrice(order.totalCost) }}</div>
+        <div v-if="order.feeNote" class="order-card__fee-note">{{ order.feeNote }}</div>
       </div>
       <div class="order-card__fact">
         <div class="order-card__fact-label">Кол-во</div>
@@ -87,6 +88,13 @@ export interface Order {
   units: number
   unitLabel?: string
   totalCost: number
+  /**
+   * Пояснение под суммой (requirement b6) — например «С учётом взноса
+   * пайщика: 1 300 ₽» на столе поставщика, где `totalCost` — его
+   * себестоимость без взноса. Заказчику не показывается — там `totalCost`
+   * уже включает взнос.
+   */
+  feeNote?: string
   /** Card-status — управляет набором действий per-role (ACTIONS_PER_ROLE). */
   status: OrderStatus
   /** Человекочитаемая подпись доменного статуса для бейджа (из orderStatusDisplay). */
@@ -310,6 +318,12 @@ function formatPrice(v: number) {
     }
   }
 
+  &__fee-note {
+    font-size: var(--p-fs-body-sm, 12px);
+    color: var(--p-ink-3);
+    margin-top: 2px;
+  }
+
   // ПВЗ — отдельный блок с иконкой: наименование КУ (основное) + адрес.
   &__pvz {
     display: flex;
diff --git a/components/desktop/src/widgets/Marketplace/OrderCard/lib/toOrderCardModel.ts b/components/desktop/src/widgets/Marketplace/OrderCard/lib/toOrderCardModel.ts
index 6261619de83..4c217b42431 100644
--- a/components/desktop/src/widgets/Marketplace/OrderCard/lib/toOrderCardModel.ts
+++ b/components/desktop/src/widgets/Marketplace/OrderCard/lib/toOrderCardModel.ts
@@ -38,6 +38,10 @@ export interface OrderCardSource {
   quantity: number;
   unit_of_measure?: string | null;
   total_cost: string;
+  /** Членский взнос, включённый в стоимость заказа (requirement b6) — on-chain, null до первой sync-дельты. */
+  membership_fee?: string | null;
+  /** Готовая сумма total_cost + membership_fee (считает бэк — см. toMarketplaceOrderDTO). */
+  total_cost_with_fee: string;
   status: DomainOrderStatus;
   created_at: string | Date;
   delivery_braname: string;
@@ -47,17 +51,31 @@ export interface OrderCardSource {
   delivery_point_lng?: number | null;
 }
 
-export function toOrderCardModel(o: OrderCardSource): Order {
+/**
+ * `role` определяет, что показывает «Сумма» карточки (requirement b6):
+ *  - 'orderer' (по умолчанию) — цена С членским взносом, как в каталоге:
+ *    это то, что заказчик реально платит.
+ *  - 'offerer' — себестоимость поставщика БЕЗ взноса (его деньги), плюс
+ *    отдельная строка-подсказка со взносом пайщика для справки.
+ */
+export function toOrderCardModel(o: OrderCardSource, role: 'orderer' | 'offerer' = 'orderer'): Order {
   const name = o.delivery_point_name || undefined;
   const address = o.delivery_point_address || undefined;
   const display = orderStatusDisplay(o.status);
+  const rawCost = parseFloat(o.total_cost) || 0;
+  const isOfferer = role === 'offerer';
+  const feeAmount = Number(o.membership_fee ?? 0);
   return {
     id: o.id,
     shortId: o.id.slice(0, 8),
     title: o.product_name || 'Товар по предложению',
     units: o.quantity,
     unitLabel: marketplaceUnitShort(o.unit_of_measure),
-    totalCost: parseFloat(o.total_cost) || 0,
+    totalCost: isOfferer ? rawCost : Number(o.total_cost_with_fee),
+    feeNote:
+      isOfferer && feeAmount > 0
+        ? `С учётом взноса пайщика: ${new Intl.NumberFormat('ru-RU').format(Number(o.total_cost_with_fee))} ₽`
+        : undefined,
     status: STATUS_TO_CARD[o.status],
     // Бейдж карточки рисуем по доменному статусу (исчерпывающая карта), а не по
     // грубому card-status — иначе на карточке два разных текста статуса.
diff --git a/components/desktop/src/widgets/Marketplace/StockRestockPanel/StockRestockPanel.vue b/components/desktop/src/widgets/Marketplace/StockRestockPanel/StockRestockPanel.vue
index 6aa3cff259e..214aa93de3b 100644
--- a/components/desktop/src/widgets/Marketplace/StockRestockPanel/StockRestockPanel.vue
+++ b/components/desktop/src/widgets/Marketplace/StockRestockPanel/StockRestockPanel.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { computed, onMounted, ref, watch } from 'vue';
-import { Queries } from '@coopenomics/sdk';
+import { Classes, Queries, Zeus } from '@coopenomics/sdk';
 import { client } from 'src/shared/api/client';
+import { useGlobalStore } from 'src/shared/store';
 import { BaseBadge, BaseButton } from 'src/shared/ui/base';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
 import { formatAsset2Digits } from 'src/shared/lib/utils/formatAsset2Digits';
@@ -9,10 +10,13 @@ import { useMarketplaceRealtime } from 'src/shared/lib/marketplace';
 import {
   createStockProposal,
   cancelStockProposal,
+  getStockIssuancePayloads,
   listStockProposals,
   type MarketplaceStockProposalView,
 } from 'src/pages/Marketplace/OperatorIssuance/api';
 
+const globalStore = useGlobalStore();
+
 /**
  * Докладка у стойки выдачи (requirement 76): оператор накидывает пайщику
  * опубликованный остаток склада своего КУ. Пайщику немедленно уходит
@@ -78,7 +82,7 @@ async function loadProposals(): Promise<void> {
   try {
     proposals.value = await listStockProposals({
       braname: props.braname,
-      statuses: ['PROPOSED'],
+      statuses: [Zeus.MarketplaceStockProposalStatus.PROPOSED],
     });
   } catch {
     proposals.value = [];
@@ -92,13 +96,37 @@ function bump(offer: CoopStockOffer, delta: number): void {
 }
 
 async function sendProposal(): Promise<void> {
+  const wifKey = globalStore.wif?.toString();
+  if (!wifKey) {
+    FailAlert(new Error('Приватный ключ не найден. Войдите в кооператив.'));
+    return;
+  }
   sending.value = true;
   try {
-    await createStockProposal({
+    // Двухфазно (канон — см. IssueActOpenDialog.vue): сначала бэк готовит по
+    // каждой строке order_hash + акт приёма-передачи (signiss1_document),
+    // затем оператор подписывает его локально своим ключом (первая подпись
+    // АПП-выдачи) — и только с готовой подписью бандл уходит на создание
+    // предложения. До подписи пайщика в блокчейне ничего не происходит.
+    const docSigner = new Classes.Document(wifKey);
+    const payloads = await getStockIssuancePayloads({
       braname: props.braname,
       member_account: props.memberAccount,
       items: composedLines.value.map((l) => ({ offer_id: l.offer.id, quantity: l.quantity })),
     });
+    const items = await Promise.all(
+      payloads.map(async (p) => ({
+        offer_id: p.offer_id,
+        quantity: p.quantity,
+        order_hash: p.order_hash,
+        signiss1_act: await docSigner.signDocument(p.signiss1_document, globalStore.username, 1),
+      })),
+    );
+    await createStockProposal({
+      braname: props.braname,
+      member_account: props.memberAccount,
+      items,
+    });
     SuccessAlert('Предложение отправлено — у пайщика всплыло окно решения.');
     quantities.value = {};
     await loadProposals();
diff --git a/components/desktop/src/widgets/Marketplace/SupplyPartyCard/SupplyPartyCard.vue b/components/desktop/src/widgets/Marketplace/SupplyPartyCard/SupplyPartyCard.vue
index 36bbb490d55..491fa999670 100644
--- a/components/desktop/src/widgets/Marketplace/SupplyPartyCard/SupplyPartyCard.vue
+++ b/components/desktop/src/widgets/Marketplace/SupplyPartyCard/SupplyPartyCard.vue
@@ -47,6 +47,12 @@ const props = defineProps<{
   totalLabel: string;
   /** Значение итога, напр. «1 200 ₽ · 5 кг». */
   totalValue: string;
+  /**
+   * Пояснение под итогом (requirement b6) — например «С учётом взноса
+   * пайщиков: 1 300 ₽» на столе поставщика, где `totalValue` — его
+   * себестоимость без взноса. У заказчика не передаётся.
+   */
+  totalFeeNote?: string;
   /**
    * Карточка кликабельна (курсор-указатель + role=button + emit `card-click`).
    * У заказчика на «Коллективном заказе» клик ведёт в карточку предложения; у
@@ -115,6 +121,7 @@ function onCardClick(): void {
     .supply-party__total
       span.t-muted {{ totalLabel }}
       span.supply-party__total-val {{ totalValue }}
+      span.supply-party__total-fee-note(v-if="totalFeeNote") {{ totalFeeNote }}
     q-space
     slot(name="actions")
 </template>
@@ -229,5 +236,10 @@ function onCardClick(): void {
     color: var(--p-ink-1);
     font-variant-numeric: tabular-nums;
   }
+
+  &__total-fee-note {
+    font-size: var(--p-fs-body-sm, 12px);
+    color: var(--p-ink-3);
+  }
 }
 </style>
diff --git a/components/desktop/src/widgets/Process/ProcessDetailCard/ProcessDetailCard.vue b/components/desktop/src/widgets/Process/ProcessDetailCard/ProcessDetailCard.vue
index 78ce172249c..ec8448be628 100644
--- a/components/desktop/src/widgets/Process/ProcessDetailCard/ProcessDetailCard.vue
+++ b/components/desktop/src/widgets/Process/ProcessDetailCard/ProcessDetailCard.vue
@@ -115,7 +115,8 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
-import { FailAlert } from 'src/shared/api'
+import { copyToClipboard } from 'quasar'
+import { FailAlert, SuccessAlert } from 'src/shared/api'
 import { EntityIdBadge } from 'src/shared/ui'
 import { DocumentRow, type DocumentRowDoc } from 'src/shared/ui/domain/DocumentRow'
 import { DocumentViewerDialog } from 'src/shared/ui/domain/DocumentViewerDialog'