';
@@ -1273,12 +1273,13 @@ ORDER BY date_sort ASC";
echo '
Договора:';
while ($doc_row = mysql_fetch_assoc($rez_inner_docs)) {
- echo '
';
+ echo '
';
if (!empty($doc_row['comment'])) {
- echo '
Примечание: ' . htmlspecialchars($doc_row['comment']) . '
';
+ echo '
Примечание: ' . htmlspecialchars($doc_row['comment']) . '
';
}
echo '
';
}
diff --git a/api/v2/app/src/controllers/CommonController.php b/api/v2/app/src/controllers/CommonController.php
index a690d5a..4126b1e 100755
--- a/api/v2/app/src/controllers/CommonController.php
+++ b/api/v2/app/src/controllers/CommonController.php
@@ -8412,7 +8412,23 @@ class CommonController extends ApiController
$data['deal']['id'] = intval($deal_row['id']);
$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']['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;
$deal_sides = [];
@@ -8474,11 +8490,26 @@ class CommonController extends ApiController
'id' => intval($dd_row['id']),
'name' => $dd_row['name'],
'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;
+
+ $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']['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']['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;
$deal_sides = [];
@@ -9184,11 +9231,26 @@ class CommonController extends ApiController
'id' => intval($dd_row['id']),
'name' => $dd_row['name'],
'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;
+
+ $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;
}
}