Fix deal
This commit is contained in:
parent
1e6df1bcb9
commit
cb1b619a8b
@ -1267,7 +1267,7 @@ ORDER BY date_sort ASC";
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Договора сделки (inner_docs)
|
// Договора сделки (inner_docs)
|
||||||
$sql_inner_docs = "SELECT d.id, d.name, did.comment FROM inner_docs d JOIN deal_inner_doc did ON did.inner_doc_id = d.id WHERE did.deal_id = " . intval($deal_id_for_edit);
|
$sql_inner_docs = "SELECT d.id, d.name, did.comment FROM inner_docs d JOIN deal_inner_doc did ON did.inner_doc_id = d.id WHERE did.deal_id = " . intval($deal_id_for_edit) . " AND d.deleted_at IS NULL";
|
||||||
$rez_inner_docs = mysql_query($sql_inner_docs);
|
$rez_inner_docs = mysql_query($sql_inner_docs);
|
||||||
if ($rez_inner_docs && mysql_num_rows($rez_inner_docs) > 0) {
|
if ($rez_inner_docs && mysql_num_rows($rez_inner_docs) > 0) {
|
||||||
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;">';
|
||||||
|
|||||||
@ -481,6 +481,17 @@ if ($_SESSION['id'] && $objIdNum) {
|
|||||||
<div class="chat-content" id="chat_content_<?=$event['id']?>">
|
<div class="chat-content" id="chat_content_<?=$event['id']?>">
|
||||||
<div class="head"><span>Модератор подтвердил рекламу</span></div>
|
<div class="head"><span>Модератор подтвердил рекламу</span></div>
|
||||||
<div class="message"><?=$event['comment']?></div>
|
<div class="message"><?=$event['comment']?></div>
|
||||||
|
<?php
|
||||||
|
// старые события создавались без списка площадок — блок только при его наличии
|
||||||
|
require_once($_SERVER['DOCUMENT_ROOT'] . '/engine/helpers/advert_publish_journal.php');
|
||||||
|
$approved_list = advert_reject_platforms_list($event['platforms_advert']);
|
||||||
|
if (!empty($approved_list)) { ?>
|
||||||
|
<div class="message">Подтверждённые площадки:<br>
|
||||||
|
<?php foreach ($approved_list as $approved_item) { ?>
|
||||||
|
- <?=$approved_item?><br>
|
||||||
|
<?php } ?>
|
||||||
|
</div>
|
||||||
|
<?php } ?>
|
||||||
<span class="time"><?=date("H:i", strtotime($time_zone, strtotime($event['create_date'])))?></span>
|
<span class="time"><?=date("H:i", strtotime($time_zone, strtotime($event['create_date'])))?></span>
|
||||||
<!--<?php if($event['user_id'] == $_SESSION['id']){ ?>
|
<!--<?php if($event['user_id'] == $_SESSION['id']){ ?>
|
||||||
<div class="message" style="margin-top: 10px;"><?= $movedBadge ?>
|
<div class="message" style="margin-top: 10px;"><?= $movedBadge ?>
|
||||||
@ -705,6 +716,69 @@ if ($_SESSION['id'] && $objIdNum) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($event['type'] == 'moderation_reject') {
|
||||||
|
// задача агенту об отказе — вид как у задачи модерации, но заголовок и состав другие;
|
||||||
|
// площадки берём только из platforms_advert: заявки после решения уже нет
|
||||||
|
$date = date("d.m.Y", strtotime($event['schedule_date']));
|
||||||
|
list($d, $m, $y) = explode(".", $date);
|
||||||
|
?>
|
||||||
|
<div class="chat-block<?=$class_ev?>">
|
||||||
|
<div class="chat-author">
|
||||||
|
<div class="pic">
|
||||||
|
<?php if(empty($event['user_logo'])){ ?>
|
||||||
|
<img src="/images/user-pic.svg"/>
|
||||||
|
<?php } else { ?>
|
||||||
|
<img src="/photos/agency/<?=$event['user_logo']?>">
|
||||||
|
<?php } ?>
|
||||||
|
<div class="fio_user" title="<?=$event['user_fio']?>"><?=$event['user_fio']?></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="chat-message meeting">
|
||||||
|
<div class="chat-complete">
|
||||||
|
<div class="complete-button" data-id="<?=$event['id']?>">
|
||||||
|
<input type="checkbox" />
|
||||||
|
<div class="complete-action-button-obj<?=($event['calendar_view'] == 1) ? ' active' : ''?>" id="groupAB__<?=$event['id']?>" data-from="<?=$events_from?>" title="Выполнено">
|
||||||
|
<span class="check-button-box"></span>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 512 512" width="512px" height="512px">
|
||||||
|
<g><g><path d="M505.943,79.594c-8.077-8.077-21.172-8.077-29.249,0L167.755,388.532L35.306,256.083c-8.076-8.077-21.172-8.077-29.248,0 c-8.077,8.077-8.077,21.172,0,29.249l147.074,147.074c4.038,4.039,9.332,6.058,14.625,6.058c5.293,0,10.587-2.019,14.625-6.059 l323.562-323.562C514.019,100.767,514.019,87.672,505.943,79.594z" fill="#388e3c"/></g></g>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="chat-content" id="chat_content_<?=$event['id']?>">
|
||||||
|
<div class="head"><span>Отказ в модерации</span></div>
|
||||||
|
<?php
|
||||||
|
$sql_who = "SELECT CONCAT(last_name, ' ', first_name, ' ', middle_name) as who_fio FROM users WHERE id = {$event['user_id']}";
|
||||||
|
$who_user = mysql_fetch_assoc(mysql_query($sql_who));
|
||||||
|
if($who_user){ ?>
|
||||||
|
<div class="message"><span class="author">Ответственный: <?=$who_user['who_fio']?></span></div>
|
||||||
|
<?php } ?>
|
||||||
|
|
||||||
|
<div class="message">Устранить замечания <?=$d?> <?=getRusMonth($m)?> <?=$y?> в <?=date("H:i", strtotime($event['schedule_date']))?></div>
|
||||||
|
|
||||||
|
<?php if(!empty($event['comment'])){ ?>
|
||||||
|
<div class="message">Причина: <?=$event['comment']?></div>
|
||||||
|
<?php } ?>
|
||||||
|
|
||||||
|
<?php
|
||||||
|
require_once($_SERVER['DOCUMENT_ROOT'] . '/engine/helpers/advert_publish_journal.php');
|
||||||
|
$platforms_reject_list = advert_reject_platforms_list($event['platforms_advert']);
|
||||||
|
if(!empty($platforms_reject_list)){ ?>
|
||||||
|
<div class="message">Отклонённые площадки:
|
||||||
|
<?php foreach($platforms_reject_list as $platform_reject_item){ ?>
|
||||||
|
<br><?=$platform_reject_item?>
|
||||||
|
<?php } ?>
|
||||||
|
<div class="clear"></div>
|
||||||
|
</div>
|
||||||
|
<?php } ?>
|
||||||
|
<span class="time"><?=date("H:i", strtotime($time_zone, strtotime($event['create_date'])))?></span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="clear"></div>
|
||||||
|
</div>
|
||||||
|
<?php
|
||||||
|
}
|
||||||
|
|
||||||
if ($event['type'] == 'moderation') {
|
if ($event['type'] == 'moderation') {
|
||||||
$date = date("d.m.Y", strtotime($event['schedule_date']));
|
$date = date("d.m.Y", strtotime($event['schedule_date']));
|
||||||
list($d, $m, $y) = explode(".", $date);
|
list($d, $m, $y) = explode(".", $date);
|
||||||
@ -1187,7 +1261,7 @@ if ($_SESSION['id'] && $objIdNum) {
|
|||||||
echo '</div>';
|
echo '</div>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$sql_inner_docs = "SELECT d.id, d.name FROM inner_docs d JOIN deal_inner_doc did ON did.inner_doc_id = d.id WHERE did.deal_id = " . intval($deal_id_for_edit);
|
$sql_inner_docs = "SELECT d.id, d.name FROM inner_docs d JOIN deal_inner_doc did ON did.inner_doc_id = d.id WHERE did.deal_id = " . intval($deal_id_for_edit) . " AND d.deleted_at IS NULL";
|
||||||
$rez_inner_docs = mysql_query($sql_inner_docs);
|
$rez_inner_docs = mysql_query($sql_inner_docs);
|
||||||
if ($rez_inner_docs && mysql_num_rows($rez_inner_docs) > 0) {
|
if ($rez_inner_docs && mysql_num_rows($rez_inner_docs) > 0) {
|
||||||
echo '<div class="message" style="margin-top:5px;font-size:13px;"><b>Документы:</b><br/>';
|
echo '<div class="message" style="margin-top:5px;font-size:13px;"><b>Документы:</b><br/>';
|
||||||
@ -1196,12 +1270,6 @@ if ($_SESSION['id'] && $objIdNum) {
|
|||||||
}
|
}
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
}
|
}
|
||||||
<?php
|
|
||||||
if ($deal_data['status'] == 1) {
|
|
||||||
echo '<div class="message" style="margin-top:8px;font-size:13px;color:#388e3c;font-weight:500;">✓ Сделка закрыта успешно</div>';
|
|
||||||
} else if ($deal_data['status'] == 2) {
|
|
||||||
echo '<div class="message" style="margin-top:8px;font-size:13px;color:#e57373;font-weight:500;">✗ Сделка отменена</div>';
|
|
||||||
}
|
|
||||||
?>
|
?>
|
||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
<?php if ($event['sum']) { ?>
|
<?php if ($event['sum']) { ?>
|
||||||
@ -1277,7 +1345,7 @@ if ($_SESSION['id'] && $objIdNum) {
|
|||||||
$sql_obj = "SELECT id, nazv, adres FROM `objects` WHERE `id` = '$params[object_id]' LIMIT 1";
|
$sql_obj = "SELECT id, nazv, adres FROM `objects` WHERE `id` = '$params[object_id]' LIMIT 1";
|
||||||
$rez_obj = mysql_query($sql_obj);
|
$rez_obj = mysql_query($sql_obj);
|
||||||
if ($doc_obj = mysql_fetch_assoc($rez_obj)) {
|
if ($doc_obj = mysql_fetch_assoc($rez_obj)) {
|
||||||
$doc_parties .= '<li>Объект: <a href="javascript:{}" onclick="openObjectModal('.$doc_obj['id'].', 1)">'.$doc_obj['nazv'].' ('.$doc_obj['adres'].')</a><li/>';
|
$doc_parties .= '<li>Объект: <a href="javascript:{}" data-id="'.$doc_obj['id'].'" data-client="'.$params['client_id'].'" class="show_object">'.$doc_obj['nazv'].' ('.$doc_obj['adres'].')</a><li/>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -8482,7 +8482,7 @@ class CommonController extends ApiController
|
|||||||
$data['deal']['sides'] = $deal_sides;
|
$data['deal']['sides'] = $deal_sides;
|
||||||
|
|
||||||
$deal_docs = [];
|
$deal_docs = [];
|
||||||
$sql_ddocs = "SELECT d.id, d.name, did.comment FROM inner_docs d JOIN deal_inner_doc did ON did.inner_doc_id = d.id WHERE did.deal_id = " . $deal_id_val;
|
$sql_ddocs = "SELECT d.id, d.name, did.comment FROM inner_docs d JOIN deal_inner_doc did ON did.inner_doc_id = d.id WHERE did.deal_id = " . $deal_id_val . " AND d.deleted_at IS NULL";
|
||||||
$rez_ddocs = mysql_query($sql_ddocs);
|
$rez_ddocs = mysql_query($sql_ddocs);
|
||||||
if ($rez_ddocs && mysql_num_rows($rez_ddocs) > 0) {
|
if ($rez_ddocs && mysql_num_rows($rez_ddocs) > 0) {
|
||||||
while ($dd_row = mysql_fetch_assoc($rez_ddocs)) {
|
while ($dd_row = mysql_fetch_assoc($rez_ddocs)) {
|
||||||
@ -9223,7 +9223,7 @@ class CommonController extends ApiController
|
|||||||
$data['deal']['sides'] = $deal_sides;
|
$data['deal']['sides'] = $deal_sides;
|
||||||
|
|
||||||
$deal_docs = [];
|
$deal_docs = [];
|
||||||
$sql_ddocs = "SELECT d.id, d.name, did.comment FROM inner_docs d JOIN deal_inner_doc did ON did.inner_doc_id = d.id WHERE did.deal_id = " . $deal_id_val;
|
$sql_ddocs = "SELECT d.id, d.name, did.comment FROM inner_docs d JOIN deal_inner_doc did ON did.inner_doc_id = d.id WHERE did.deal_id = " . $deal_id_val . " AND d.deleted_at IS NULL";
|
||||||
$rez_ddocs = mysql_query($sql_ddocs);
|
$rez_ddocs = mysql_query($sql_ddocs);
|
||||||
if ($rez_ddocs && mysql_num_rows($rez_ddocs) > 0) {
|
if ($rez_ddocs && mysql_num_rows($rez_ddocs) > 0) {
|
||||||
while ($dd_row = mysql_fetch_assoc($rez_ddocs)) {
|
while ($dd_row = mysql_fetch_assoc($rez_ddocs)) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user