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

Fix history

Browse Source
This commit is contained in:
mac 2026-07-16 13:51:57 +03:00
parent 22e29ab4a3
commit bb51da8f8f
2 changed files with 70 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ajax/getClientLogForEventsNew.php
View File

@ -1251,7 +1251,7 @@ ORDER BY date_sort ASC";
echo '<hr style="border:none;border-top:1px solid #e0e0e0;margin:10px 0;">'; echo '<hr style="border:none;border-top:1px solid #e0e0e0;margin:10px 0;">';
echo '<div class="message" style="padding-top: 0; font-size:13px;"><b>Документы:</b>'; echo '<div class="message" style="padding-top: 0; font-size:13px;"><b>Документы:</b>';
while ($doc_row = mysql_fetch_assoc($rez_docs)) { while ($doc_row = mysql_fetch_assoc($rez_docs)) {
$fileUrl = '/' . ltrim($doc_row['file'], '/'); $fileUrl = 'https://joywork.ru/deal/index.php?path=documents/' . intval($doc_row['id']) . '/download';
$displayName = htmlspecialchars($doc_row['name']); $displayName = htmlspecialchars($doc_row['name']);
$origName = htmlspecialchars($doc_row['original_name']); $origName = htmlspecialchars($doc_row['original_name']);
echo '<div style="margin-top:5px;display:flex;align-items:center;">'; echo '<div style="margin-top:5px;display:flex;align-items:center;">';
@ -1273,12 +1273,13 @@ ORDER BY date_sort ASC";
echo '<hr style="border:none;border-top:1px solid #e0e0e0;margin:10px 0;">'; echo '<hr style="border:none;border-top:1px solid #e0e0e0;margin:10px 0;">';
echo '<div class="message" style="padding-top: 0; font-size:13px;"><b>Договора:</b>'; echo '<div class="message" style="padding-top: 0; font-size:13px;"><b>Договора:</b>';
while ($doc_row = mysql_fetch_assoc($rez_inner_docs)) { while ($doc_row = mysql_fetch_assoc($rez_inner_docs)) {
echo '<div class="document" data-id="' . $doc_row['id'] . '" style="margin-top:5px;display:flex;align-items:center;position:relative; border: none; padding: 0;">'; echo '<div style="margin-top:5px;">';
echo '<div class="document" data-id="' . $doc_row['id'] . '" style="display:flex;align-items:center;position:relative;border:none;padding:0;">';
echo '<a href="/ajax/getInnerDoc.php?id=' . $doc_row['id'] . '&download_pdf=true&t=' . time() . '" style="margin-left:5px;color:#000;display:inline-flex;align-items:center;text-decoration:none;border:none;" title="Скачать файл">'; echo '<a href="/ajax/getInnerDoc.php?id=' . $doc_row['id'] . '&download_pdf=true&t=' . time() . '" style="margin-left:5px;color:#000;display:inline-flex;align-items:center;text-decoration:none;border:none;" title="Скачать файл">';
echo '<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 01-2 2H5a2 2 0 01-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>'; echo '<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="#000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 01-2 2H5a2 2 0 01-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>';
echo '</a>'; echo '</a>';
echo '<a style="margin-left:5px;color:#000;border-bottom:1px dashed #000;display:inline-flex;align-items:center;" title="Скачать файл" download="" href="/ajax/getInnerDoc.php?id=' . $doc_row['id'] . '&download_pdf=true&t=' . time() . '">'; echo '<a style="margin-left:5px;color:#000;border-bottom:1px dashed #000;display:inline-flex;align-items:center;" title="Скачать файл" download="" href="/ajax/getInnerDoc.php?id=' . $doc_row['id'] . '&download_pdf=true&t=' . time() . '">';
echo '<span style="color:#000!important; max-width:400px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:inline-block;">' . htmlspecialchars($doc_row['name']) . '.pdf</span>'; echo '<span style="color:#000!important;max-width:400px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:inline-block;">' . htmlspecialchars($doc_row['name']) . '.pdf</span>';
echo '</a>'; echo '</a>';
echo '<span class="jw__small-popup ti-more" data-id="document_' . $doc_row['id'] . '" style="margin-left:5px;cursor:pointer;color:#999;font-size:12px;"></span>'; echo '<span class="jw__small-popup ti-more" data-id="document_' . $doc_row['id'] . '" style="margin-left:5px;cursor:pointer;color:#999;font-size:12px;"></span>';
echo '<div class="jw__popup actions-document" id="popup__document_' . $doc_row['id'] . '">'; echo '<div class="jw__popup actions-document" id="popup__document_' . $doc_row['id'] . '">';
@ -1289,8 +1290,9 @@ ORDER BY date_sort ASC";
echo '<a href="javascript:{}" onclick="confirmDeleteInnerDoc(' . $doc_row['id'] . ')" style="border: none;color: #000 !important;">Удалить</a>'; echo '<a href="javascript:{}" onclick="confirmDeleteInnerDoc(' . $doc_row['id'] . ')" style="border: none;color: #000 !important;">Удалить</a>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</div>';
if (!empty($doc_row['comment'])) { if (!empty($doc_row['comment'])) {
echo '<div style="font-size:12px;color:#888;margin-top:2px;padding-left:0;width:100%;">Примечание: ' . htmlspecialchars($doc_row['comment']) . '</div>'; echo '<div style="font-size:12px;color:#888;margin-top:2px;padding-left:19px;">Примечание: ' . htmlspecialchars($doc_row['comment']) . '</div>';
} }
echo '</div>'; echo '</div>';
} }

66
api/v2/app/src/controllers/CommonController.php
View File

@ -8412,7 +8412,23 @@ class CommonController extends ApiController
$data['deal']['id'] = intval($deal_row['id']); $data['deal']['id'] = intval($deal_row['id']);
$data['deal']['contract_price'] = floatval($deal_row['contract_price']); $data['deal']['contract_price'] = floatval($deal_row['contract_price']);
$data['deal']['object_price'] = floatval($deal_row['object_price']);
$data['deal']['commission_buyer'] = floatval($deal_row['commission_buyer']);
$data['deal']['commission_seller'] = floatval($deal_row['commission_seller']);
$data['deal']['agent_commission'] = floatval($deal_row['agent_commission']); $data['deal']['agent_commission'] = floatval($deal_row['agent_commission']);
$data['deal']['total_commission'] = floatval($deal_row['total_commission']);
$data['deal']['sellers_count'] = intval($deal_row['sellers_count']);
$data['deal']['buyers_count'] = intval($deal_row['buyers_count']);
$data['deal']['proxy_sale'] = intval($deal_row['proxy_sale']);
$data['deal']['e_registration'] = intval($deal_row['e_registration']);
$data['deal']['mortgaged'] = intval($deal_row['mortgaged']);
$data['deal']['mortgagee'] = $deal_row['mortgagee'] ?? '';
$data['deal']['debt_amount'] = floatval($deal_row['debt_amount']);
$data['deal']['has_counter_agent'] = intval($deal_row['has_counter_agent']);
$data['deal']['counter_agent_name'] = $deal_row['counter_agent_name'] ?? '';
$data['deal']['counter_agent_commission'] = floatval($deal_row['counter_agent_commission']);
$data['deal']['counter_agent_phone'] = $deal_row['counter_agent_phone'] ?? '';
$data['deal']['status'] = intval($deal_row['status']);
$data['deal']['deal_date'] = !empty($deal_row['deal_date']) && $deal_row['deal_date'] != '0000-00-00 00:00:00' ? $deal_row['deal_date'] : null; $data['deal']['deal_date'] = !empty($deal_row['deal_date']) && $deal_row['deal_date'] != '0000-00-00 00:00:00' ? $deal_row['deal_date'] : null;
$deal_sides = []; $deal_sides = [];
@ -8474,11 +8490,26 @@ class CommonController extends ApiController
'id' => intval($dd_row['id']), 'id' => intval($dd_row['id']),
'name' => $dd_row['name'], 'name' => $dd_row['name'],
'comment' => isset($dd_row['comment']) ? $dd_row['comment'] : '', 'comment' => isset($dd_row['comment']) ? $dd_row['comment'] : '',
'url' => $host . '/ajax/getInnerDoc.php?id=' . intval($dd_row['id']) . '&download_pdf=true&t=' . time(), 'url' => str_replace('m.joywork.ru', 'joywork.ru', $host) . '/ajax/getInnerDoc.php?id=' . intval($dd_row['id']) . '&download_pdf=true&t=' . time(),
]; ];
} }
} }
$data['deal']['documents'] = $deal_docs; $data['deal']['documents'] = $deal_docs;
$deal_files = [];
$sql_dfiles = "SELECT id, name, original_name, file FROM deal_documents WHERE deal_id = " . $deal_id_val . " AND deleted_at IS NULL";
$rez_dfiles = mysql_query($sql_dfiles);
if ($rez_dfiles && mysql_num_rows($rez_dfiles) > 0) {
while ($df_row = mysql_fetch_assoc($rez_dfiles)) {
$deal_files[] = [
'id' => intval($df_row['id']),
'name' => $df_row['name'],
'original_name' => $df_row['original_name'],
'url' => 'https://joywork.ru/deal/index.php?path=documents/' . intval($df_row['id']) . '/download',
];
}
}
$data['deal']['deal_files'] = $deal_files;
} }
} }
@ -9122,7 +9153,23 @@ class CommonController extends ApiController
$data['deal']['id'] = intval($deal_row['id']); $data['deal']['id'] = intval($deal_row['id']);
$data['deal']['contract_price'] = floatval($deal_row['contract_price']); $data['deal']['contract_price'] = floatval($deal_row['contract_price']);
$data['deal']['object_price'] = floatval($deal_row['object_price']);
$data['deal']['commission_buyer'] = floatval($deal_row['commission_buyer']);
$data['deal']['commission_seller'] = floatval($deal_row['commission_seller']);
$data['deal']['agent_commission'] = floatval($deal_row['agent_commission']); $data['deal']['agent_commission'] = floatval($deal_row['agent_commission']);
$data['deal']['total_commission'] = floatval($deal_row['total_commission']);
$data['deal']['sellers_count'] = intval($deal_row['sellers_count']);
$data['deal']['buyers_count'] = intval($deal_row['buyers_count']);
$data['deal']['proxy_sale'] = intval($deal_row['proxy_sale']);
$data['deal']['e_registration'] = intval($deal_row['e_registration']);
$data['deal']['mortgaged'] = intval($deal_row['mortgaged']);
$data['deal']['mortgagee'] = $deal_row['mortgagee'] ?? '';
$data['deal']['debt_amount'] = floatval($deal_row['debt_amount']);
$data['deal']['has_counter_agent'] = intval($deal_row['has_counter_agent']);
$data['deal']['counter_agent_name'] = $deal_row['counter_agent_name'] ?? '';
$data['deal']['counter_agent_commission'] = floatval($deal_row['counter_agent_commission']);
$data['deal']['counter_agent_phone'] = $deal_row['counter_agent_phone'] ?? '';
$data['deal']['status'] = intval($deal_row['status']);
$data['deal']['deal_date'] = !empty($deal_row['deal_date']) && $deal_row['deal_date'] != '0000-00-00 00:00:00' ? $deal_row['deal_date'] : null; $data['deal']['deal_date'] = !empty($deal_row['deal_date']) && $deal_row['deal_date'] != '0000-00-00 00:00:00' ? $deal_row['deal_date'] : null;
$deal_sides = []; $deal_sides = [];
@ -9184,11 +9231,26 @@ class CommonController extends ApiController
'id' => intval($dd_row['id']), 'id' => intval($dd_row['id']),
'name' => $dd_row['name'], 'name' => $dd_row['name'],
'comment' => isset($dd_row['comment']) ? $dd_row['comment'] : '', 'comment' => isset($dd_row['comment']) ? $dd_row['comment'] : '',
'url' => $host . '/ajax/getInnerDoc.php?id=' . intval($dd_row['id']) . '&download_pdf=true&t=' . time(), 'url' => str_replace('m.joywork.ru', 'joywork.ru', $host) . '/ajax/getInnerDoc.php?id=' . intval($dd_row['id']) . '&download_pdf=true&t=' . time(),
]; ];
} }
} }
$data['deal']['documents'] = $deal_docs; $data['deal']['documents'] = $deal_docs;
$deal_files = [];
$sql_dfiles = "SELECT id, name, original_name, file FROM deal_documents WHERE deal_id = " . $deal_id_val . " AND deleted_at IS NULL";
$rez_dfiles = mysql_query($sql_dfiles);
if ($rez_dfiles && mysql_num_rows($rez_dfiles) > 0) {
while ($df_row = mysql_fetch_assoc($rez_dfiles)) {
$deal_files[] = [
'id' => intval($df_row['id']),
'name' => $df_row['name'],
'original_name' => $df_row['original_name'],
'url' => 'https://joywork.ru/deal/index.php?path=documents/' . intval($df_row['id']) . '/download',
];
}
}
$data['deal']['deal_files'] = $deal_files;
} }
} }