From 8f50a686875211e666d0158030284f0fb7c59477 Mon Sep 17 00:00:00 2001
From: root <root@cgvcpusuzr.local>
Date: Wed, 27 May 2026 14:59:57 +0000
Subject: [PATCH] feat: delivery_date_source tracking + manual date in
 analytics funnel

---
 src/components/admin/AdminDashboard.jsx       | 1 +
 src/services/supabase/orderGroupRepository.js | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/admin/AdminDashboard.jsx b/src/components/admin/AdminDashboard.jsx
index f922cbd..6688054 100644
--- a/src/components/admin/AdminDashboard.jsx
+++ b/src/components/admin/AdminDashboard.jsx
@@ -115,6 +115,7 @@ export const AdminDashboard = () => {
     { label: 'Согласовано после 1-й SMS', value: econ.confirmed_after_sms1 || 0, color: '#22c55e' },
     { label: 'Согласовано после 2-й SMS', value: econ.confirmed_after_sms2 || 0, color: '#14b8a6' },
     { label: 'Согласовано вручную', value: econ.confirmed_via_manual || 0, color: '#eab308' },
+    { label: 'Ручное назначение даты', value: econ.manual_date_set_count || 0, color: '#f97316' },
     { label: 'Платное хранение', value: econ.paid_storage_count || 0, color: '#06b6d4' },
     { label: 'Отмена', value: econ.cancelled_count || 0, color: '#ef4444' },
   ];
diff --git a/src/services/supabase/orderGroupRepository.js b/src/services/supabase/orderGroupRepository.js
index 838a0f5..a646b26 100644
--- a/src/services/supabase/orderGroupRepository.js
+++ b/src/services/supabase/orderGroupRepository.js
@@ -139,6 +139,7 @@ export const mapOrderGroupRowToDeliveryGroup = (row) => {
     displaySubtitle: [customerPhone, customerDate].filter(Boolean).join(" · ") || row.group_key || row.id,
     deliveryDate,
     deliveryTime,
+    deliveryDateSource: row.delivery_date_source || null,
     deliveryHalfDay: getOrderGroupDeliveryHalfDay({
       deliveryHalfDay: rawDeliveryHalfDay,
       deliveryTime: rawDeliveryTime,
@@ -189,6 +190,7 @@ export const updateOrderGroupDeliveryChoice = async ({
         delivery_status: "agreed",
         delivery_date: deliveryDate,
         delivery_time: deliveryTime,
+        delivery_date_source: "manual",
         notification_status: "confirmed",
         updated_at: new Date().toISOString(),
       })
@@ -200,7 +202,7 @@ export const updateOrderGroupDeliveryChoice = async ({
 
     const { data, error } = await client
       .from("order_groups")
-      .select("id, group_key, order_numbers, status, delivery_status, sms_sent_at, created_at, updated_at, created_from_exchange_at, source_key, customer_name, customer_phone, customer_phone_normalized, customer_date, orders_total, orders_ready, orders_not_ready, source_orders, order_list, order_list_structured, delivery_invitation_id, delivery_link, notification_status, sms_attempts, first_sms_sent_at, second_sms_sent_at, last_sms_error, next_notification_check_at, delivery_date, delivery_time, delivery_address, manual_confirmation_at, paid_storage_at, assigned_driver_id, assigned_driver:users!order_groups_assigned_driver_id_fkey(id, name)")
+      .select("id, group_key, order_numbers, status, delivery_status, sms_sent_at, created_at, updated_at, created_from_exchange_at, source_key, customer_name, customer_phone, customer_phone_normalized, customer_date, orders_total, orders_ready, orders_not_ready, source_orders, order_list, order_list_structured, delivery_invitation_id, delivery_link, notification_status, sms_attempts, first_sms_sent_at, second_sms_sent_at, last_sms_error, next_notification_check_at, delivery_date, delivery_time, delivery_address, delivery_date_source, manual_confirmation_at, paid_storage_at, assigned_driver_id, assigned_driver:users!order_groups_assigned_driver_id_fkey(id, name)")
       .eq("id", orderGroupId)
       .single();
 
@@ -340,7 +342,7 @@ export const fetchOrderGroups = async () => {
     const client = requireSupabase();
     const { data, error } = await client
       .from("order_groups")
-      .select("id, group_key, order_numbers, status, delivery_status, sms_sent_at, created_at, updated_at, created_from_exchange_at, source_key, customer_name, customer_phone, customer_phone_normalized, customer_date, orders_total, orders_ready, orders_not_ready, source_orders, order_list, order_list_structured, delivery_invitation_id, delivery_link, notification_status, sms_attempts, first_sms_sent_at, second_sms_sent_at, last_sms_error, next_notification_check_at, delivery_date, delivery_time, delivery_address, manual_confirmation_at, paid_storage_at, assigned_driver_id, assigned_driver:users!order_groups_assigned_driver_id_fkey(id, name)")
+      .select("id, group_key, order_numbers, status, delivery_status, sms_sent_at, created_at, updated_at, created_from_exchange_at, source_key, customer_name, customer_phone, customer_phone_normalized, customer_date, orders_total, orders_ready, orders_not_ready, source_orders, order_list, order_list_structured, delivery_invitation_id, delivery_link, notification_status, sms_attempts, first_sms_sent_at, second_sms_sent_at, last_sms_error, next_notification_check_at, delivery_date, delivery_time, delivery_address, delivery_date_source, manual_confirmation_at, paid_storage_at, assigned_driver_id, assigned_driver:users!order_groups_assigned_driver_id_fkey(id, name)")
       .order("updated_at", { ascending: false });
 
     if (error) {