Fix modal

api/v2/app/src/controllers/RequisitionsController.php

@@ -373,6 +373,9 @@ class RequisitionsController extends ApiController
 	        if (isset($filters['is_partner']))
 		        $req_filter['isPartner'] = boolval($filters['is_partner']);
 
+	        if (isset($filters['is_deal']))
+		        $req_filter['is_deal'] = boolval($filters['is_deal']);
+
 				
 			// Цены на объекты в заявках
 			if (isset($filters['priceFrom']))
@@ -1606,6 +1609,10 @@ class RequisitionsController extends ApiController
 		if (isset($data['commission']))
 			$commission = intval($data['commission']);
 
+		$deal_date = null;
+		if (isset($data['deal_date']))
+			$deal_date = trim($data['deal_date']);
+
 
 		if (($user_id = $_SESSION['id']) && is_array($requisitions_ids)) {
 
@@ -1626,7 +1633,9 @@ class RequisitionsController extends ApiController
 							'tempid' => 0,
 							'luck' => ($is_deal) ? 10 : 0,
 							'denial' => $denial,
-							'summa' => $commission
+							'summa' => isset($data['summa']) ? intval($data['summa']) : $commission,
+							'commission' => $commission,
+							'deal_date' => $deal_date,
 						]);
 					}
 				}

engine/classes/Clients.php

@@ -5584,6 +5584,9 @@ ini_set('display_errors', 1);*/
                                 $this->db->query($sql_update_event_req);
                                 $sql_cancel = "UPDATE requisitions SET cancel = 1 WHERE id = {$r_req_dop['id']}";
                                 $this->db->query($sql_cancel);
+                                // Записываем объединение в union_requisitions
+                                $sql_union = "INSERT INTO union_requisitions (main_id, req_id, user_id, agency_id) VALUES ({$req['id']}, {$r_req_dop['id']}, {$user_id}, {$this->agencyId})";
+                                $this->db->query($sql_union);
                             }
                         }