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

Fix deal

Browse Source
This commit is contained in:
mac 2026-07-15 10:58:57 +03:00
parent f88a721080
commit 6ab1f8e69c
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
css/base.css
View File

@ -19588,3 +19588,18 @@ a[href="/newbuildings.php"]::before {
color: #237ef7 !important; color: #237ef7 !important;
border-bottom: 1px solid #237ef7; border-bottom: 1px solid #237ef7;
} }
/* box-sizing: border-box только для сделки */
#deal-app,
#deal-app *,
#deal-app *::before,
#deal-app *::after {
box-sizing: border-box !important;
}
.p-dialog-content,
.p-dialog-content *,
.p-dialog-content *::before,
.p-dialog-content *::after {
box-sizing: border-box !important;
}

10
engine/classes/Complex.php
View File

@ -2309,7 +2309,7 @@ class Complex
FROM complex_rooms FROM complex_rooms
LEFT JOIN complex_rooms_plans c_room_p ON c_room_p.room_id = complex_rooms.id LEFT JOIN complex_rooms_plans c_room_p ON c_room_p.room_id = complex_rooms.id
LEFT JOIN complex_room_advert cra ON cra.complex_room_id = complex_rooms.id LEFT JOIN complex_room_advert cra ON cra.complex_room_id = complex_rooms.id
LEFT JOIN complex_house_plans_images c_house_p_i ON c_room_p.plan_id = c_house_p_i.plan_id AND c_house_p_i.position = 1 LEFT JOIN complex_house_plans_images c_house_p_i ON c_room_p.plan_id = c_house_p_i.plan_id
LEFT JOIN complex_house_plans c_house_p ON c_room_p.plan_id = c_house_p.id LEFT JOIN complex_house_plans c_house_p ON c_room_p.plan_id = c_house_p.id
LEFT JOIN complex_status cs ON complex_rooms.complex_status_id = cs.id AND cs.is_archive = 0 LEFT JOIN complex_status cs ON complex_rooms.complex_status_id = cs.id AND cs.is_archive = 0
LEFT JOIN complex_room_notes crn ON crn.room_id = complex_rooms.id LEFT JOIN complex_room_notes crn ON crn.room_id = complex_rooms.id
@ -2617,7 +2617,7 @@ class Complex
) AS figures ) AS figures
FROM complex_rooms FROM complex_rooms
JOIN complex_rooms_plans c_room_p ON c_room_p.room_id = complex_rooms.id JOIN complex_rooms_plans c_room_p ON c_room_p.room_id = complex_rooms.id
JOIN complex_house_plans_images c_house_p_i ON c_room_p.plan_id = c_house_p_i.plan_id AND c_house_p_i.position = 1 JOIN complex_house_plans_images c_house_p_i ON c_room_p.plan_id = c_house_p_i.plan_id
JOIN complex_house_plans c_house_p ON c_room_p.plan_id = c_house_p.id JOIN complex_house_plans c_house_p ON c_room_p.plan_id = c_house_p.id
JOIN complex_floor_plan_figures c_f_p_f ON c_f_p_f.room_plan_id = c_house_p.id JOIN complex_floor_plan_figures c_f_p_f ON c_f_p_f.room_plan_id = c_house_p.id
WHERE complex_rooms.id = {$room_id}; WHERE complex_rooms.id = {$room_id};
@ -7096,7 +7096,7 @@ class Complex
c_house_p.light_angle FROM complex_rooms c_house_p.light_angle FROM complex_rooms
LEFT JOIN complex_rooms_plans c_room_p ON c_room_p.room_id = complex_rooms.id AND c_room_p.plan_id = {$figure['room_plan_id']} LEFT JOIN complex_rooms_plans c_room_p ON c_room_p.room_id = complex_rooms.id AND c_room_p.plan_id = {$figure['room_plan_id']}
LEFT JOIN complex_house_plans_images c_house_p_i ON c_room_p.plan_id = c_house_p_i.plan_id AND c_house_p_i.position = 1 LEFT JOIN complex_house_plans_images c_house_p_i ON c_room_p.plan_id = c_house_p_i.plan_id
LEFT JOIN complex_status cs ON complex_rooms.complex_status_id = cs.id and cs.is_archive = 0 LEFT JOIN complex_status cs ON complex_rooms.complex_status_id = cs.id and cs.is_archive = 0
JOIN complex_houses ch on ch.id = {$house_id} JOIN complex_houses ch on ch.id = {$house_id}
LEFT JOIN complex_house_plans c_house_p ON c_room_p.plan_id = c_house_p.id LEFT JOIN complex_house_plans c_house_p ON c_room_p.plan_id = c_house_p.id
@ -7730,7 +7730,7 @@ public function save_document($blank_id, $req_id, $room,$user_id){
JOIN complex_floors ON complex_floors.id = complex_rooms.floor_id JOIN complex_floors ON complex_floors.id = complex_rooms.floor_id
JOIN complex_entrances ON complex_entrances.id = complex_floors.complex_entrance_id JOIN complex_entrances ON complex_entrances.id = complex_floors.complex_entrance_id
LEFT JOIN complex_rooms_plans c_room_p ON c_room_p.room_id = complex_rooms.id LEFT JOIN complex_rooms_plans c_room_p ON c_room_p.room_id = complex_rooms.id
LEFT JOIN complex_house_plans_images c_house_p_i ON c_room_p.plan_id = c_house_p_i.plan_id AND c_house_p_i.position = 1 LEFT JOIN complex_house_plans_images c_house_p_i ON c_room_p.plan_id = c_house_p_i.plan_id
LEFT JOIN complex_status cs ON complex_rooms.complex_status_id = cs.id AND cs.is_archive = 0 LEFT JOIN complex_status cs ON complex_rooms.complex_status_id = cs.id AND cs.is_archive = 0
JOIN complex_houses ch ON ch.id = {$house_id} JOIN complex_houses ch ON ch.id = {$house_id}
LEFT JOIN complex_house_plans c_house_p ON c_room_p.plan_id = c_house_p.id LEFT JOIN complex_house_plans c_house_p ON c_room_p.plan_id = c_house_p.id
@ -8017,7 +8017,7 @@ public function save_document($blank_id, $req_id, $room,$user_id){
MIN(c_house_p.light_angle) AS light_angle MIN(c_house_p.light_angle) AS light_angle
FROM complex_rooms AS room FROM complex_rooms AS room
JOIN complex_rooms_plans rooms_plans ON rooms_plans.room_id = room.id JOIN complex_rooms_plans rooms_plans ON rooms_plans.room_id = room.id
LEFT JOIN complex_house_plans_images c_house_p_i ON rooms_plans.plan_id = c_house_p_i.plan_id AND c_house_p_i.position = 1 LEFT JOIN complex_house_plans_images c_house_p_i ON rooms_plans.plan_id = c_house_p_i.plan_id
LEFT JOIN complex_status cs ON room.complex_status_id = cs.id AND cs.is_archive = 0 LEFT JOIN complex_status cs ON room.complex_status_id = cs.id AND cs.is_archive = 0
JOIN complex_floors floors ON floors.id = room.floor_id JOIN complex_floors floors ON floors.id = room.floor_id
JOIN complex_entrances entrances ON entrances.id = floors.complex_entrance_id JOIN complex_entrances entrances ON entrances.id = floors.complex_entrance_id

10
requisitions.php
View File

@ -2071,6 +2071,11 @@ $_SESSION['event_id_temp'] *= -1;
</svg> </svg>
</a> </a>
</div> </div>
<div v-if="item.is_deal == 1" style="margin-right: 7px;" class="kanban__item-icon">
<a href="javascript:{};" class="whatsappBtn_mini" style="color: #43A047;" title="Сделка" @click="initEditDealFromList(item.id)">
<i class="fas fa-handshake"></i>
</a>
</div>
</div> </div>
<hr class="kanban-line"> <hr class="kanban-line">
@ -2348,6 +2353,11 @@ $_SESSION['event_id_temp'] *= -1;
</svg> </svg>
</a> </a>
</div> </div>
<div v-if="item.is_deal == 1" style="margin-right: 7px;" class="kanban__item-icon">
<a href="javascript:{};" class="whatsappBtn_mini" style="color: #43A047;" title="Сделка" @click="initEditDealFromList(item.id)">
<i class="fas fa-handshake"></i>
</a>
</div>
<div v-if="item.union_total > 0" class="kanban__item-icon" style="margin-right: 7px;"> <div v-if="item.union_total > 0" class="kanban__item-icon" style="margin-right: 7px;">
<span v-if="item.can_see_joint == 1" @click="open_joint_req(item.id)" class="jw__tab__counter" style="background: #757575;cursor:pointer; padding-bottom:4px">{{ item.union_total }}</span> <span v-if="item.can_see_joint == 1" @click="open_joint_req(item.id)" class="jw__tab__counter" style="background: #757575;cursor:pointer; padding-bottom:4px">{{ item.union_total }}</span>
<span v-else class="jw__tab__counter" style="background: #757575;cursor:pointer; padding-bottom:4px">{{ item.union_total }}</span> <span v-else class="jw__tab__counter" style="background: #757575;cursor:pointer; padding-bottom:4px">{{ item.union_total }}</span>