Fix validate and hide old deal close req

This commit is contained in:
mac 2026-06-30 16:20:54 +03:00
parent 364ae130a2
commit 122b12e99c
2 changed files with 48 additions and 25 deletions

View File

@ -6246,30 +6246,35 @@ $(document).ready(function() {
if ($('#luck').prop('checked')) {
if (isNaN(parseInt($('#summa_sdelki').val()))) {
alert("Введите сумму сделки");
if (window.dealCloseData && window.dealCloseData.id) {
param.luck = 10;
param.summa = window.dealCloseData.contract_price || 0;
param.datazakl = Date.parse(dataZZ);
var factPayload = {};
var factPrice = $('#fact_contract_price').val();
var factCommission = $('#fact_agent_commission').val();
if (factPrice !== '') factPayload.contract_price = parseInt(factPrice) || 0;
if (factCommission !== '') factPayload.agent_commission = parseInt(factCommission) || 0;
if (Object.keys(factPayload).length > 0) {
$.ajax({
url: '/deal/index.php?path=deals/' + window.dealCloseData.id,
type: 'PUT',
contentType: 'application/json',
data: JSON.stringify(factPayload)
});
}
} else {
if (isNaN(parseInt($('#summa_sdelki').val()))) {
alert("Введите сумму сделки");
return;
}
param.luck = 10;
param.summa = parseInt($('#summa_sdelki').val());
param.datazakl = Date.parse(dataZZ)
param.datazakl = Date.parse(dataZZ);
}
if (window.dealCloseData && window.dealCloseData.id) {
var factPayload = {};
var factPrice = $('#fact_contract_price').val();
var factCommission = $('#fact_agent_commission').val();
if (factPrice !== '') factPayload.contract_price = parseInt(factPrice) || 0;
if (factCommission !== '') factPayload.agent_commission = parseInt(factCommission) || 0;
if (Object.keys(factPayload).length > 0) {
$.ajax({
url: '/deal/index.php?path=deals/' + window.dealCloseData.id,
type: 'PUT',
contentType: 'application/json',
data: JSON.stringify(factPayload)
});
}
}
$.post('/ajax/delClient.php', param, function(data) {
$.post('/ajax/delClient.php', param, function(data) {
//console.log(data)
$('#client__' + id_client + ' .stage').addClass('active');
$('#addEditNew .stage').addClass('active');
@ -6787,8 +6792,15 @@ $(document).ready(function() {
$('body').on('change', '#luck', function() {
var today = new Date().toLocaleDateString();
if ($(this).prop('checked')) {
$('#datazaklgr').show();
$('#summa_sdelki').show();
if (window.dealCloseData && window.dealCloseData.id) {
$('#datazaklgr').hide();
$('#summa_sdelki').hide();
$('#deal_close_block').show();
} else {
$('#datazaklgr').show();
$('#summa_sdelki').show();
$('#deal_close_block').hide();
}
$('#denial_work').hide();
$('#denial_work').val(0);
$('#datazakl').val(today);
@ -6797,6 +6809,7 @@ $(document).ready(function() {
} else {
$('#datazaklgr').hide();
$('#summa_sdelki').hide();
$('#deal_close_block').hide();
$('#denial_work').show();
$('#denial_work').val(1);
$('#denial_work-input').show();

View File

@ -4188,11 +4188,21 @@ $user_id = $_SESSION['id'];
<script>
$(document).ready(function() {
$('#luck').on('change', function() {
if ($(this).is(':checked') && window.dealCloseData) {
renderDealCloseContent();
$('#deal_close_block').show();
if ($(this).is(':checked')) {
if (window.dealCloseData && window.dealCloseData.id) {
renderDealCloseContent();
$('#deal_close_block').show();
$('#datazaklgr').hide();
$('#summa_sdelki').hide();
} else {
$('#deal_close_block').hide();
$('#datazaklgr').show();
$('#summa_sdelki').show();
}
} else {
$('#deal_close_block').hide();
$('#datazaklgr').hide();
$('#summa_sdelki').hide();
}
});
});