From e4d1f4a77061dec190bd8d7434dea257e9064ca7 Mon Sep 17 00:00:00 2001
From: mac <weborsha@gmail.com>
Date: Mon, 6 Jul 2026 10:03:03 +0300
Subject: [PATCH] Fix commission

---
 js/crm.js            | 14 ++++++++++++--
 templates/footer.php |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/js/crm.js b/js/crm.js
index 5109268..37fc3be 100644
--- a/js/crm.js
+++ b/js/crm.js
@@ -6294,12 +6294,12 @@ $(document).ready(function() {
                 var factPrice = $('#fact_contract_price').val();
                 var factCommission = $('#fact_agent_commission').val();
                 param.summa = (factPrice !== '' && !isNaN(parseInt(factPrice))) ? parseInt(factPrice) : (window.dealCloseData.contract_price || 0);
-                param.commission = (factCommission !== '' && !isNaN(parseInt(factCommission))) ? parseInt(factCommission) : (window.dealCloseData.agent_commission || 0);
+                param.commission = (factCommission !== '' && !isNaN(parseInt(factCommission))) ? parseInt(factCommission) : (window.dealCloseData.total_commission || 0);
                 param.datazakl = Date.parse(dataZZ);
 
                 var factPayload = {};
                 if (factPrice !== '' && !isNaN(parseInt(factPrice))) factPayload.contract_price = parseInt(factPrice) || 0;
-                if (factCommission !== '' && !isNaN(parseInt(factCommission))) factPayload.agent_commission = parseInt(factCommission) || 0;
+                if (factCommission !== '' && !isNaN(parseInt(factCommission))) factPayload.total_commission = parseInt(factCommission) || 0;
                 if (Object.keys(factPayload).length > 0) {
                     $.ajax({
                         url: '/deal/index.php?path=deals/' + window.dealCloseData.id,
@@ -6308,6 +6308,16 @@ $(document).ready(function() {
                         data: JSON.stringify(factPayload)
                     });
                 }
+
+                // Ставим calendar_view = 1 для событий сделки после закрытия
+                if (window.dealCloseData && window.dealCloseData.id) {
+                    var dealId = window.dealCloseData.id;
+                    $.ajax({
+                        url: '/deal/index.php?path=deals/' + dealId + '/events/calendar-view',
+                        type: 'GET',
+                        contentType: 'application/json',
+                    });
+                }
             } else {
                 if (isNaN(parseInt($('#summa_sdelki').val()))) {
                     alert("Введите сумму сделки");
diff --git a/templates/footer.php b/templates/footer.php
index 79fba6c..fffbade 100644
--- a/templates/footer.php
+++ b/templates/footer.php
@@ -4219,7 +4219,7 @@ $user_id = $_SESSION['id'];
                             var html = '';
                             if (d.title) html += '<div style="margin-bottom: 8px;"><span style="font-weight: 500;">Название:</span> ' + d.title + '</div>';
                             if (d.contract_price) html += '<div style="margin-bottom: 8px;"><span style="font-weight: 500;">Сумма в договоре:</span> ' + Number(d.contract_price).toLocaleString('ru-RU') + ' руб.</div>';
-                            if (d.agent_commission) html += '<div style="margin-bottom: 8px;"><span style="font-weight: 500;">Комиссия агента:</span> ' + Number(d.agent_commission).toLocaleString('ru-RU') + ' руб.</div>';
+                            if (d.total_commission) html += '<div style="margin-bottom: 8px;"><span style="font-weight: 500;">Комиссия:</span> ' + Number(d.total_commission).toLocaleString('ru-RU') + ' руб.</div>';
                             $('#deal_close_content').html(html);
 
                             // Собираем ID заявок и объектов
@@ -4317,7 +4317,7 @@ $user_id = $_SESSION['id'];
 
                             html += '<div style="flex:1;min-width:200px;">';
                             html += '<label style="font-size:12px;color:#666;">Комиссия (руб.)</label>';
-                            html += '<input type="number" name="fact_agent_commission" id="fact_agent_commission" class="text" style="width:100%;box-sizing:border-box;" value="' + (d.agent_commission || '') + '">';
+                            html += '<input type="number" name="fact_agent_commission" id="fact_agent_commission" class="text" style="width:100%;box-sizing:border-box;" value="' + (d.total_commission || '') + '">';
                             html += '</div>';
 
                             html += '</div>';