weborsha/Joywork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix commission

Browse Source
This commit is contained in:
mac 2026-07-06 10:03:03 +03:00
parent 176425bb52
commit e4d1f4a770
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/crm.js
View File

@ -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("Введите сумму сделки");

4
templates/footer.php
View File

@ -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>';