diff --git a/css/base.css b/css/base.css index 38cf8bf..bd8f235 100644 --- a/css/base.css +++ b/css/base.css @@ -19585,6 +19585,21 @@ a[href="/newbuildings.php"]::before { } .chat-message .message a{ - color: #237ef7 !important; - border-bottom: 1px solid #237ef7; + color: #237ef7 !important; + 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; } \ No newline at end of file diff --git a/engine/classes/Complex.php b/engine/classes/Complex.php index 947443f..b07f871 100644 --- a/engine/classes/Complex.php +++ b/engine/classes/Complex.php @@ -2309,7 +2309,7 @@ class Complex FROM complex_rooms 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_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_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 @@ -2617,7 +2617,7 @@ class Complex ) AS figures FROM complex_rooms 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_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}; @@ -7096,7 +7096,7 @@ class Complex 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_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 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 @@ -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_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_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 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 @@ -8017,7 +8017,7 @@ public function save_document($blank_id, $req_id, $room,$user_id){ MIN(c_house_p.light_angle) AS light_angle FROM complex_rooms AS room 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 JOIN complex_floors floors ON floors.id = room.floor_id JOIN complex_entrances entrances ON entrances.id = floors.complex_entrance_id diff --git a/requisitions.php b/requisitions.php index 3508cf4..73b2708 100644 --- a/requisitions.php +++ b/requisitions.php @@ -2071,6 +2071,11 @@ $_SESSION['event_id_temp'] *= -1; +