Pokaz oferty show extra services info

SE/se-lib/PokazOfertyView.php

@@ -469,6 +469,7 @@ jQuery(document).ready(function(){
 									echo '<th>' . "ID_OFFERS" . '</th>';
 									echo '<th>' . "description" . '</th>';
 									echo '<th>' . "parametry (ses_x_a)" . '</th>';
+									echo '<th>' . "dodatkowe (extra_srv.)" . '</th>';
 									echo '<th>' . "T WHEN CONNECTED" . '</th>';
 									echo '<th>' . "STATUS" . '</th>';
 									echo '<th>' . "HANGUP" . '</th>';
@@ -546,6 +547,18 @@ jQuery(document).ready(function(){
 													}
 												}
 											echo '</td>';
+											echo '<td>';
+												$dodatkowe = V::get($k_srv_id, null, $v_deal->extra_services);
+												if (!empty($dodatkowe)) {
+													$dodatkoweOut = array();
+													foreach ($dodatkowe as $esrvKey => $esrv) {
+														$dodatkoweOut[] = "{$esrv->E_SERVICE},{$esrv->E_S_V}";
+													}
+													if (!empty($dodatkoweOut)) {
+														echo implode('<br>', $dodatkoweOut);
+													}
+												}
+											echo '</td>';
 											echo '<td>';
 												if ($ses_x_a) {
 													echo $ses_x_a->T_WHEN_CONNECTED;

SE/superedit-POKAZ_OFERTY_AKTUALNE_FUNC.php

@@ -1044,6 +1044,28 @@ body {font:11px helvetica, arial;}
 		$active_deals_by_id = PokazOfertyHelper::get_deals_active_by_user($user->ID_BILLING_USERS, false);
 		if(V::get('DBG',0,$_GET)){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;display:none">active_deals_by_id (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($active_deals_by_id);echo'</pre>';}
 
+		foreach ($active_deals_by_id as $v_deal_ind => $v_deal) {
+			$esrv_rows = array();
+			$db = DB::getDB();
+			$sql_srv_ids = array();
+			if (!empty($v_deal->services_by_id)) {
+				$sql_srv_ids = array_keys($v_deal->services_by_id);
+			}
+			if (!empty($sql_srv_ids)) {
+				$sql_srv_ids = implode(",", $sql_srv_ids);
+				$sql = "select e.`ID`, e.`ID_SERVICES`, e.`E_SERVICE`, e.`E_S_V`
+					from `EXTRA_SERVICES` as e
+					where e.`ID_SERVICES` in({$sql_srv_ids})
+				";
+				$res = $db->query($sql);
+				while ($r = $db->fetch($res)) {
+					$esrv_rows[$r->ID_SERVICES][] = $r;
+				}
+			}
+			$active_deals_by_id[$v_deal_ind]->extra_services = $esrv_rows;
+		}
+		if(V::get('DBG',0,$_GET)){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left">active_deals_by_id (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($active_deals_by_id);echo'</pre>';}
+
 		$pokaz_oferty_view = new PokazOfertyView();
 		echo $pokaz_oferty_view->print_css();
 		$pokaz_oferty_view->user_with_services($user, $active_deals_by_id);