Add time in close last step

This commit is contained in:
mac 2026-07-07 10:04:18 +03:00
parent 4ff54ade67
commit 4be3ba418d
2 changed files with 44 additions and 1 deletions

View File

@ -6293,7 +6293,14 @@ $(document).ready(function() {
var factCommission = $('#fact_agent_commission').val(); var factCommission = $('#fact_agent_commission').val();
param.summa = (factPrice !== '' && !isNaN(parseInt(factPrice))) ? parseInt(factPrice) : (window.dealCloseData.contract_price || 0); param.summa = (factPrice !== '' && !isNaN(parseInt(factPrice))) ? parseInt(factPrice) : (window.dealCloseData.contract_price || 0);
param.commission = (factCommission !== '' && !isNaN(parseInt(factCommission))) ? parseInt(factCommission) : (window.dealCloseData.total_commission || 0); param.commission = (factCommission !== '' && !isNaN(parseInt(factCommission))) ? parseInt(factCommission) : (window.dealCloseData.total_commission || 0);
param.datazakl = Date.parse(dataZZ); var factDealDate = $('#fact_deal_date').val();
if (factDealDate) {
var fdParts = factDealDate.split(' ');
var fdDateParts = fdParts[0].split('.');
param.datazakl = Date.parse(fdDateParts[2] + '-' + fdDateParts[1] + '-' + fdDateParts[0] + (fdParts[1] ? 'T' + fdParts[1] : 'T00:00'));
} else {
param.datazakl = Date.parse(dataZZ);
}
// var factPayload = {}; // var factPayload = {};
// if (factPrice !== '' && !isNaN(parseInt(factPrice))) factPayload.contract_price = parseInt(factPrice) || 0; // if (factPrice !== '' && !isNaN(parseInt(factPrice))) factPayload.contract_price = parseInt(factPrice) || 0;

View File

@ -4215,6 +4215,7 @@ $user_id = $_SESSION['id'];
}); });
}); });
function resetDealCloseModal() { function resetDealCloseModal() {
window.dealCloseData = null;
$('#luck').prop('checked', false); $('#luck').prop('checked', false);
$('#deal_close_content').empty(); $('#deal_close_content').empty();
$('#deal_close_block').hide(); $('#deal_close_block').hide();
@ -4327,6 +4328,12 @@ $user_id = $_SESSION['id'];
var html = '<div style="margin-top: 12px; padding-top: 10px; border-top: 1px solid #e0e0e0;"><b>Фактические данные</b></div>'; var html = '<div style="margin-top: 12px; padding-top: 10px; border-top: 1px solid #e0e0e0;"><b>Фактические данные</b></div>';
html += '<div style="display:flex;flex-wrap:wrap;gap:8px 16px;margin-top:8px;">'; html += '<div style="display:flex;flex-wrap:wrap;gap:8px 16px;margin-top:8px;">';
var dealDate = d.deal_date || '';
html += '<div style="flex:1;min-width:200px;">';
html += '<label style="font-size:12px;color:#666;">Дата и время сделки</label>';
html += '<input type="text" name="fact_deal_date" id="fact_deal_date" class="text fact-deal-date-picker" style="width:100%;box-sizing:border-box;" value="' + dealDate + '">';
html += '</div>';
html += '<div style="flex:1;min-width:200px;">'; html += '<div style="flex:1;min-width:200px;">';
html += '<label style="font-size:12px;color:#666;">Стоимость (руб.)</label>'; html += '<label style="font-size:12px;color:#666;">Стоимость (руб.)</label>';
html += '<input type="number" name="fact_contract_price" id="fact_contract_price" class="text" style="width:100%;box-sizing:border-box;" value="' + (d.contract_price || '') + '">'; html += '<input type="number" name="fact_contract_price" id="fact_contract_price" class="text" style="width:100%;box-sizing:border-box;" value="' + (d.contract_price || '') + '">';
@ -4339,6 +4346,35 @@ $user_id = $_SESSION['id'];
html += '</div>'; html += '</div>';
$('#deal_close_content').append(html); $('#deal_close_content').append(html);
// Инициализация datepicker для поля даты сделки
if ($('#fact_deal_date').length) {
var startDate = d.deal_date ? new Date(d.deal_date.replace(' ', 'T')) : new Date();
// Форматируем значение под формат datepicker (без секунд)
if (d.deal_date) {
var parts = d.deal_date.split(' ');
var dateParts = parts[0] ? parts[0].split('-') : [];
var timePart = parts[1] ? parts[1].substring(0, 5) : '00:00';
if (dateParts.length === 3) {
$('#fact_deal_date').val(dateParts[2] + '.' + dateParts[1] + '.' + dateParts[0] + ' ' + timePart);
}
}
$('#fact_deal_date').datepicker({
language: 'ru',
timepicker: true,
autoClose: true,
position: 'bottom left',
startDate: startDate,
onSelect: function(formattedDate, date) {
var dd = ('0' + date.getDate()).slice(-2);
var mm = ('0' + (date.getMonth() + 1)).slice(-2);
var yyyy = date.getFullYear();
var hh = ('0' + date.getHours()).slice(-2);
var min = ('0' + date.getMinutes()).slice(-2);
$('#fact_deal_date').val(dd + '.' + mm + '.' + yyyy + ' ' + hh + ':' + min);
}
});
}
} }
</script> </script>
<?php } ?> <?php } ?>