added ROZLICZ_ZYSK updated in rozlicz_month - Pokaż oferty

SE/superedit-POKAZ_OFERTY_AKTUALNE_FUNC.php

@@ -6,6 +6,7 @@
  */
 
 Lib::loadClass('PokazOfertyView');
+Lib::loadClass('UI');
 
 function POKAZ_OFERTY_AKTUALNE_FUNC() {
 	$_GET['task'] = V::get('task', '', $_GET);
@@ -45,7 +46,7 @@ class PokazOfertyRouter {
 							[1] => 1247
 			[id_options_TV] => Array
 							[0] => 598
-			[print] => 
+			[print] =>
 	 */
 
 		$view = new PokazOfertyView();
@@ -164,7 +165,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:
 				[P_NAME] => Agnieszka
 				[P_NAME_SECOND] => Katka
 				[P_NIP] => AIX286269
-				[P_PESEL] => 
+				[P_PESEL] =>
 				[P_PHONE] => 303-38-75; 507-093-885
 				[P_ADDRESS_REGION] => 11
 				[P_ADDRESS_CITY] => Gdańsk
@@ -173,7 +174,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:
 				[P_ADDRESS_HOME] => 38
 				[P_ADDRESS_HOUSE] => 50
 				[user_mail_contact] => sole@chelmnet.pl
-		 * 
+		 *
 		 * kwerenda ODBC
 			, '' as KLIENT_ID
 			, '' as KLIENT_IS_FIRMA		-- X or ''
@@ -301,7 +302,7 @@ function deal_select_deal(n){
 			echo '</form>';// #deal_form
 		} else {
 			// OK utworzono umowę - pokaz dodane rekordy? link do edycji rekordu?
-			
+
 			return;
 		}
 
@@ -669,7 +670,7 @@ function deal_select_deal(n){
 								$loss = PokazOfertyHelper::get_aneks_loss($old_offers_ids, $diff_months, $old_deal_months, $loss_log);
 	echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;display:none">loss('.$loss.') (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($loss_log);echo'</pre>';
 								foreach ($loss_log as $k_offer_id => $v_loss) {
-									
+
 								}
 							}
 						}
@@ -706,15 +707,15 @@ function deal_select_deal(n){
 			+ (OF_NEW.P_CONTRACT_PRICE_NETTO * (OF_NEW.P_DEALTERM_MONTHS - OF_NEW.P_DEAL_PROMO_MONTHS))
 		) * 1
 		-- tutaj odejmiemy utracony zysk, czyli ilosc od daty umowy do konca  * (zysk - koszt starych ofert)
-		- 
+		-
 		if (PERIOD_DIFF(date_format(USERS2_DEALS.P_DEALTERM_OLD, '%Y%m'), date_format(USERS2_DEALS.DATA_DOK, '%Y%m')) * OF_OLD.P_CONTRACT_PRICE_NETTO > 0
 			, PERIOD_DIFF(date_format(USERS2_DEALS.P_DEALTERM_OLD,'%Y%m'), date_format(USERS2_DEALS.DATA_DOK,'%Y%m')) * (OF_OLD.P_CONTRACT_PRICE_NETTO - COSTS_GROUPS.P_OFFER_COSTS)
 		,0) * 1
-		-- tutaj okreslamy koszt biezacej oferty NEW 
+		-- tutaj okreslamy koszt biezacej oferty NEW
 		-
 		(UOCG2_B.P_OFFER_COSTS * OF_NEW.P_DEALTERM_MONTHS) * 1
 	)
-	-- dajemy warunek jezeli nie jest to wypowiedzenie 
+	-- dajemy warunek jezeli nie jest to wypowiedzenie
 	*
 	if(USERS2_DEALS.RODZAJ_DZIALANIA_HANDLOWEGO='UMOWA_BEZPOSREDNIA',
 		0.15,
@@ -724,12 +725,12 @@ function deal_select_deal(n){
 		)
 	)
 
-	LEFT JOIN USERS2_OFFERS as OF_OLD on OF_OLD.ID=USERS2_DEALS.P_OFFER_ID_OLD 
+	LEFT JOIN USERS2_OFFERS as OF_OLD on OF_OLD.ID=USERS2_DEALS.P_OFFER_ID_OLD
 	left join USERS2_OFFERS_GROUPS as UOG_B on UOG_B.ID=OF_OLD.ID_COSTS_GROUPS
-	left join USERS2_OFFERS_COSTS_GROUPS as COSTS_GROUPS on ( COSTS_GROUPS.ID=UOG_B.ID  ) 
-	LEFT JOIN USERS2_OFFERS as OF_NEW on OF_NEW.ID=USERS2_DEALS.P_OFFER_ID_NEW 
+	left join USERS2_OFFERS_COSTS_GROUPS as COSTS_GROUPS on ( COSTS_GROUPS.ID=UOG_B.ID  )
+	LEFT JOIN USERS2_OFFERS as OF_NEW on OF_NEW.ID=USERS2_DEALS.P_OFFER_ID_NEW
 	left join USERS2_OFFERS_GROUPS as UOG2_B on UOG2_B.ID=OF_NEW.ID_COSTS_GROUPS
-	left join USERS2_OFFERS_COSTS_GROUPS as UOCG2_B on ( UOCG2_B.ID=UOG2_B.ID  ) 
+	left join USERS2_OFFERS_COSTS_GROUPS as UOCG2_B on ( UOCG2_B.ID=UOG2_B.ID  )
 	 */
 
 		$conv = new Services_Converter();
@@ -1566,17 +1567,17 @@ body {font:11px helvetica, arial;}
 		$statsByFoundType = array();
 		/** @2014-08-20
 		 * [13245] KOMORKA bok_nowa_umowa_wartosc_sprzed_kontrakt bok nowa um. wart.sprzed.kontr. Jaka wartość wynika ze sprzedanych kontraktów z tytułu nowych umów. Czyli kwota abonamentu razy długość kontraktu.
-		 * 
+		 *
 		 * [13246] KOMORKA bok_nowa_umowa_zysk_kontrakt bok nowa um. zysk kontakt Jaki jest zysk wynikły ze sprzedanych kontraktów z tytułu nowej umowy.
-		 * 
+		 *
 		 * [13247] KOMORKA bok_aneks_wartosc_sprzed_kontrakt bok aneks wart.sprzed. Jaka jest wartość sprzedaży wynikła z podpisania aneksu. Czyli jeżeli klient przeszedł z umowy na czas nieokreślony, będzie to okres umowy razy ilość abonamentów. Jeżeli zmienił umowę z innej umowy na czas określony, to z zysku należy odjąć wartość, jaka wynikała z jego poprzedniej umowy i terminu obowiązywania.
-		 * 
+		 *
 		 * [13248] KOMORKA bok_aneks_zysk_kontrakt bok aneks zysk kontrakt Jaki jest zysk z tytułu kontraktów jakie zamówił klient w wyniku podpisania aneksu. Należy odjąć zysk od usług które były wcześniej zamówione na okres pokrywający się. Czyli jeżeli klient miał umowę na rok za usługę z zyskiem 50zł, to jeżeli podpisał umowę na 2 lata na usługę z takim samym zyskiem, to należy od zysku 24m-c x 50 PLN odjąć pozostały okres umowy 12m-c x 50 PLN = 1200-600 = 600 PLN.
-		 * 
+		 *
 		 * [13249] KOMORKA bok_rezygnacja_strata_zysk_1_mies bok rez.wart.strac.zysk 1mies. Należy zsumować wartość zysku jaka przestanie wpływać do firmy z tytułu zakupywanych usług przez klientów.
-		 * 
+		 *
 		 * [13250] KOMORKA bok_rezygnacja_strata_wartosc_sprzed bok rez.wart.straty 1mies Należy tutaj zsumować wartość abonamentów jakie przestaną wpływać do firmy z tytułu zakupywanych usług przez klientów, którzy złożyli rezygnacje.
-		 * 
+		 *
 		 * $statsByFoundType:
 		 *   zysk_total - KPI: [13246], [13248]
 		 *   abonament_srednia_netto
@@ -1707,12 +1708,27 @@ body {font:11px helvetica, arial;}
 							</tbody>
 						</table>
 					<?php endif; ?>
-					
+
 					<?php if($DBG){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;"> (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($errosNoGroupIDInOldDeal);echo'</pre>';} ?>
 				</td>
 			</tr>
 		</table>
 		<?php
+
+		{// update ROZLICZ_ZYSK by zysk_total
+			$totalAffeced = 0;
+			foreach ($dealsOut as $deal) {
+				$idDeal = $deal->ID;
+				$zyskTotal = $deal->zysk_total;
+				$zysk = $deal->ROZLICZ_ZYSK;
+				if ($zysk != $zyskTotal) {
+					$affected = DB::getPDO()->exec("update DEALS_TABLE set ROZLICZ_ZYSK = '{$zyskTotal}' where ID = {$idDeal} ");
+					// DBG: UI::alert('info', "affected {$affected} rows for id deal {$idDeal}");
+					$totalAffeced += $affected;
+				}
+			}
+			UI::alert('info', "Zaktualizowano pole ROZLICZ_ZYSK w {$totalAffeced} rekordach");
+		}
 	}
 
 	public function activate_services_tv() {
@@ -2094,7 +2110,7 @@ body {font:11px helvetica, arial;}
 
 	public function ajaxUmowaZysk() {
 		$jsonData = new stdClass();
-		
+
 		try {
 			$jsonData = $this->ajaxUmowaZysk_createJson();
 		}
@@ -2192,7 +2208,7 @@ p{margin:3px 5px;}
 				/* SELECT COUNT( * ) AS  `Rekordów` ,  `A_STATUS`  FROM  `BUILDINGS`  GROUP BY  `A_STATUS`  ORDER BY  `A_STATUS` ;
 						337		NORMAL
 						13		WARNING
-						2			
+						2
 						139		WAITING
 						596		MONITOR
 						2			TO_OFF
@@ -2791,7 +2807,7 @@ SELECT
  t0.`M_REWIR` as `0_1627` ,
  t0.`P_OFFER_TARGET` as `P_OFFER_TARGET` ,
 
--- internet: 
+-- internet:
  t1.ID as `1_1385` ,
  t1.P_SERVICE as `1_449` ,
  t1.P_SERVICE_NAME as `1_450` ,
@@ -2805,8 +2821,8 @@ SELECT
  t1.P_NORMAL_PRICE*t0.P_DEALTERM_MONTHS - t1.P_DEAL_PROMO_MONTHS*t1.P_PROMO_MONTH_PRICE - (t0.P_DEALTERM_MONTHS-t1.P_DEAL_PROMO_MONTHS)*t1.P_CONTRACT_PRICE + (t1.P_INSTALL_QUOTE_NORMAL-t1.P_INSTALL_QUOTE) as `t1_1580`,
  ROUND(( ((t0.P_DEALTERM_MONTHS-t1.P_DEAL_PROMO_MONTHS)*t1.P_CONTRACT_PRICE) + (t1.P_DEAL_PROMO_MONTHS*t1.P_PROMO_MONTH_PRICE) + (t1.P_INSTALL_QUOTE))/t0.P_DEALTERM_MONTHS, 2) as `t1_srednia`,
  ROUND(( ((t0.P_DEALTERM_MONTHS-t1.P_DEAL_PROMO_MONTHS)*t1.P_CONTRACT_PRICE_NETTO) + (t1.P_DEAL_PROMO_MONTHS*t1.P_PROMO_MONTH_PRICE_NETTO) + (t1.P_INSTALL_QUOTE/1.23))/t0.P_DEALTERM_MONTHS, 2) as `t1_srednia_netto`,
- t1.P_S_PARAM1 as `[1_452]` , t1.P_S_PARAM2 as `[1_453]` , t1.P_S_LIMIT as `[1_454]`, t1.P_S_MAILBOX_SIZE as `[1_462]`, t1.P_S_WWW_SIZE as `[1_463]` , 
- if(t1.ID,t0.P_PROMOTION_NAME,'') as `1_451` , 
+ t1.P_S_PARAM1 as `[1_452]` , t1.P_S_PARAM2 as `[1_453]` , t1.P_S_LIMIT as `[1_454]`, t1.P_S_MAILBOX_SIZE as `[1_462]`, t1.P_S_WWW_SIZE as `[1_463]` ,
+ if(t1.ID,t0.P_PROMOTION_NAME,'') as `1_451` ,
 
 -- telewizja analogowa
  t2.ID as `2_1385` ,
@@ -2823,7 +2839,7 @@ SELECT
  ROUND(( (t0.P_DEALTERM_MONTHS-t2.P_DEAL_PROMO_MONTHS)*t2.P_CONTRACT_PRICE + t2.P_DEAL_PROMO_MONTHS*t2.P_PROMO_MONTH_PRICE + t2.P_INSTALL_QUOTE)/t0.P_DEALTERM_MONTHS, 2) as `t2_srednia`,
  ROUND(( (t0.P_DEALTERM_MONTHS-t2.P_DEAL_PROMO_MONTHS)*t2.P_CONTRACT_PRICE_NETTO + t2.P_DEAL_PROMO_MONTHS*t2.P_PROMO_MONTH_PRICE_NETTO + t2.P_INSTALL_QUOTE/1.23)/t0.P_DEALTERM_MONTHS, 2) as `t2_srednia_netto`,
  if(t0.ID='1','',if(t2.ID,'TAK','NIE')) as `2_IF` ,
- if(t2.ID,t0.P_PROMOTION_NAME,'') as `2_451` ,  
+ if(t2.ID,t0.P_PROMOTION_NAME,'') as `2_451` ,
 
 -- telewizja cyfrowa
  t3.ID as `3_1385` ,
@@ -2840,7 +2856,7 @@ SELECT
  ROUND(( (t0.P_DEALTERM_MONTHS-t3.P_DEAL_PROMO_MONTHS)*t3.P_CONTRACT_PRICE + t3.P_DEAL_PROMO_MONTHS*t3.P_PROMO_MONTH_PRICE + t3.P_INSTALL_QUOTE)/t0.P_DEALTERM_MONTHS, 2) as `t3_srednia`,
  ROUND(( (t0.P_DEALTERM_MONTHS-t3.P_DEAL_PROMO_MONTHS)*t3.P_CONTRACT_PRICE_NETTO + t3.P_DEAL_PROMO_MONTHS*t3.P_PROMO_MONTH_PRICE_NETTO + t3.P_INSTALL_QUOTE/1.23)/t0.P_DEALTERM_MONTHS, 2) as `t3_srednia_netto`,
  if(t0.ID='1','',if(t3.ID,'TAK','NIE')) as `3_IF` ,
- if(t3.ID,t0.P_PROMOTION_NAME,'') as `3_451` ,  
+ if(t3.ID,t0.P_PROMOTION_NAME,'') as `3_451` ,
 -- 2169 S_DEKODER_SD_OPTION
 -- 2170 S_MODUL_PCMCIA_OPTION
 -- 2171 S_DEKODER_HD_OPTION
@@ -2851,7 +2867,7 @@ SELECT
 	if(t2.S_DEKODER_HD_OPTION='TAK','X','') as `1_2171_TAK` ,
 	if(t2.S_DEKODER_HD_OPTION='NIE','X','') as `1_2171_NIE` ,
 
--- telewizja cyfrowa pakiety 
+-- telewizja cyfrowa pakiety
  t4.ID as `4_1385` ,
  t4.P_SERVICE as `4_449` ,
  t4.P_SERVICE_NAME as `4_450` ,
@@ -2866,7 +2882,7 @@ SELECT
  ROUND(( (t0.P_DEALTERM_MONTHS-t4.P_DEAL_PROMO_MONTHS)*t4.P_CONTRACT_PRICE + t4.P_DEAL_PROMO_MONTHS*t4.P_PROMO_MONTH_PRICE + t4.P_INSTALL_QUOTE)/t0.P_DEALTERM_MONTHS, 2) as `t4_srednia`,
  ROUND(( (t0.P_DEALTERM_MONTHS-t4.P_DEAL_PROMO_MONTHS)*t4.P_CONTRACT_PRICE_NETTO + t4.P_DEAL_PROMO_MONTHS*t4.P_PROMO_MONTH_PRICE_NETTO + t4.P_INSTALL_QUOTE/1.23)/t0.P_DEALTERM_MONTHS, 2) as `t4_srednia_netto`,
  if(t0.ID='1','',if(t4.ID,'TAK','NIE')) as `4_IF` ,
- if(t4.ID,t0.P_PROMOTION_NAME,'') as `4_451` ,  
+ if(t4.ID,t0.P_PROMOTION_NAME,'') as `4_451` ,
 
 -- telefon
  t5.ID as `5_1385` ,
@@ -2900,7 +2916,7 @@ SELECT
  ROUND(( (t0.P_DEALTERM_MONTHS-t6.P_DEAL_PROMO_MONTHS)*t6.P_CONTRACT_PRICE + t6.P_DEAL_PROMO_MONTHS*t6.P_PROMO_MONTH_PRICE + t6.P_INSTALL_QUOTE)/t0.P_DEALTERM_MONTHS, 2) as `t6_srednia`,
  ROUND(( (t0.P_DEALTERM_MONTHS-t6.P_DEAL_PROMO_MONTHS)*t6.P_CONTRACT_PRICE_NETTO + t6.P_DEAL_PROMO_MONTHS*t6.P_PROMO_MONTH_PRICE_NETTO + t6.P_INSTALL_QUOTE/1.23)/t0.P_DEALTERM_MONTHS, 2) as `t6_srednia_netto`,
  if(t0.ID='1','',if(t6.ID,'TAK','NIE')) as `6_IF` ,
- if(t6.ID,t0.P_PROMOTION_NAME,'') as `6_451` ,  
+ if(t6.ID,t0.P_PROMOTION_NAME,'') as `6_451` ,
 
 -- telewizja cyfrowa pakiety 3
  t7.ID as `7_1385` ,
@@ -2916,8 +2932,8 @@ SELECT
  ROUND(( (t0.P_DEALTERM_MONTHS-t7.P_DEAL_PROMO_MONTHS)*t7.P_CONTRACT_PRICE_NETTO + t7.P_DEAL_PROMO_MONTHS*t7.P_PROMO_MONTH_PRICE_NETTO + t7.P_INSTALL_QUOTE/1.23)/t0.P_DEALTERM_MONTHS, 2) as `t7_srednia_netto`,
  if(t0.ID='1','',if(t7.ID,'TAK','NIE')) as `7_IF` ,
  if(t7.ID,t0.P_PROMOTION_NAME,'') as `7_451`,
- if(t0.A_STATUS='NORMAL','1','') as t0_STATUS_NORMAL , 
- if(t0.A_STATUS='WAITING','1','') as t0_STATUS_WAITING 
+ if(t0.A_STATUS='NORMAL','1','') as t0_STATUS_NORMAL ,
+ if(t0.A_STATUS='WAITING','1','') as t0_STATUS_WAITING
 
 -- TV - dane z ID_TV lub ID_TVC jesli nie ma ID_TV
 , if (t0.`ID_TV`>0, t0.`ID_TV`, IF(t0.`ID_TVC`>0, t0.`ID_TVC`, null)) as TV_ID
@@ -3553,7 +3569,7 @@ class PokazOfertyController {
 			[id_deals] => Array -- active deals do zastapienia
 							[0] => 1234
 							[1] => 5678
-			[print] => 
+			[print] =>
 	 */
 
 	function __construct() {
@@ -3699,16 +3715,16 @@ class PokazOfertyController {
 				switch ($kService) {
 					case 'TVC':
 						$sqlObj->ID_TVC = $vOfferId;
-						$sqlObj->S_ALIAS .= " + {$offersByIds[$vOfferId]->S_ALIAS}"; 
-						$sqlObj->P_PROMOTION_NAME .= " + {$offersByIds[$vOfferId]->P_SERVICE_NAME}"; 
+						$sqlObj->S_ALIAS .= " + {$offersByIds[$vOfferId]->S_ALIAS}";
+						$sqlObj->P_PROMOTION_NAME .= " + {$offersByIds[$vOfferId]->P_SERVICE_NAME}";
 						if ($sqlObj->RABAT_IF_OPCJA_TVC > 0) {
 							$rabat += $sqlObj->RABAT_IF_OPCJA_TVC;
 						}
 						break;
 					case 'TEL':
 						$sqlObj->ID_TEL = $vOfferId;
-						$sqlObj->S_ALIAS .= " + {$offersByIds[$vOfferId]->S_ALIAS}"; 
-						$sqlObj->P_PROMOTION_NAME .= " + {$offersByIds[$vOfferId]->P_SERVICE_NAME}"; 
+						$sqlObj->S_ALIAS .= " + {$offersByIds[$vOfferId]->S_ALIAS}";
+						$sqlObj->P_PROMOTION_NAME .= " + {$offersByIds[$vOfferId]->P_SERVICE_NAME}";
 						if ($sqlObj->RABAT_IF_OPCJA_TEL > 0) {
 							$rabat += $sqlObj->RABAT_IF_OPCJA_TEL;
 						}
@@ -3787,7 +3803,7 @@ class PokazOfertyController {
 
 	/**
 	 * Get user selected options id.
-	 * 
+	 *
 	 * @returns Array(P_SERVICE => Array of offers ID)
 	 */
 	function get_id_options() {
@@ -3796,7 +3812,7 @@ class PokazOfertyController {
 
 	/**
 	 * Create url based on current params and given $params_add.
-	 * 
+	 *
 	 * @returns String - url
 	 */
 	function url($params_add = array()) {
@@ -3825,7 +3841,7 @@ class PokazOfertyController {
 
 	/**
 	 * Get param.
-	 * 
+	 *
 	 * @returns String or Array - param value
 	 */
 	function get_param($key) {
@@ -3836,7 +3852,7 @@ class PokazOfertyController {
 
 	/**
 	 * Get group defined in params.
-	 * 
+	 *
 	 * @return Column_users2_offers_groups - group with offers and options
 	 */
 	function get_group() {
@@ -3861,9 +3877,9 @@ class PokazOfertyController {
 
 	/**
 	 * Get deal with services.
-	 * 
+	 *
 	 * @param $deal_id - deal ID
-	 * 
+	 *
 	 * @returns deal info with connected services.
 	 */
 	function get_deal_with_services($deal_id) {
@@ -3884,7 +3900,7 @@ class PokazOfertyController {
 
 	/**
 	 * Save deal form.
-	 * 
+	 *
 	 * @param int $active_deal_id - 0 not set, -1 nowa umowa, > 0 nr umowy
 	 * @param $users2_deals - Column_users2_deals to create rows in USERS2_DEALS
 	 */
@@ -3932,7 +3948,7 @@ class PokazOfertyController {
 			$users2_deals->set_p_dealnumber_new($new_deal_id);
 			$ret = $users2_deals->create_rows_try();
 			if ($ret == -1) {
-				
+
 			}
 			echo '</div>';
 		}
@@ -4774,7 +4790,7 @@ class PokazOfertyHelper {
 				, o.`P_MULTIROOM_ADD_DEKODER_HD`
 				, o.`P_MULTIROOM_ADD_MODUL_CAM`
 			from `USERS2_OFFERS` as o
-			where o.`P_SERVICE`='OPCJE' 
+			where o.`P_SERVICE`='OPCJE'
 				and o.`A_STATUS`='NORMAL'
 				and o.`P_SERVICE_COMPANY`='BN'
 			order by o.`ID_PRODUKT` desc, o.`P_CONTRACT_PRICE` desc
@@ -5064,9 +5080,9 @@ class Services_Converter {
 	var $_services;
 	var $_old_deals_data;// user current active deals with services info
 	var $_old_deal;// current choosen old deal
-	var $_old_srv_data;// 
-	var $_new_srv_data;// 
-	var $_srv_map;// 
+	var $_old_srv_data;//
+	var $_new_srv_data;//
+	var $_srv_map;//
 	var $_srv_to_create;
 	var $_srv_to_off;
 	var $_errors;
@@ -5423,7 +5439,7 @@ class Services_Converter {
  * 		id_list_sww									(int) ??
  * 		SERV_ID_BILLING_PREFIXES		0
  * TODO: VAT czasem jest 0 i VAT_NAME na ZW
- * 
+ *
  * SES_USERS2_A
  * 		ID_BILLING_USERS					user.ID
  * 		ID_SERVICES								SERVICES.ID
@@ -5449,7 +5465,7 @@ class Services_Converter {
  * SES_TV_A
  * SES_USERS2_A
  * SES_VOIP_A
- * 
+ *
  * SES_DOMAINS_A
  * SES_EMAIL_A
  * SES_E_WLAN_A
@@ -5511,13 +5527,13 @@ class Services_Converter {
         <option selected value="">---- Status ---</option>
 <?php
 //    $sqll = "SELECT HANGUP_FROM,HANGUP_TILL,HANGUP_STATUS FROM SERVICES WHERE ID='$uid'";
-    $sqll = "SELECT HANGUP_FROM,HANGUP_TILL,HANGUP_STATUS,HANGUP_RATIO  FROM SERVICES WHERE ID='$posid' AND NAME_LIST_SERVICES='$uservice' ";    
+    $sqll = "SELECT HANGUP_FROM,HANGUP_TILL,HANGUP_STATUS,HANGUP_RATIO  FROM SERVICES WHERE ID='$posid' AND NAME_LIST_SERVICES='$uservice' ";
 echo "  ***** $sqll ***** ";
     $resultl = $vdb->sql_query($sqll);
     list($ffrom,$fto,$fstat,$fHANGUP_RATIO)=$vdb->sql_fetchrow($resultl);
- * 
+ *
  * save
- * 
+ *
         $sqlsh="INSERT INTO SERVICES_HIST ( ID_SERVICES , ID_BILLING_USERS , A_RECORD_UPDATE_AUTHOR,HANGUP_FROM,HANGUP_TILL,HANGUP_STATUS,HANGUP_RATIO
         ) values ( '$SERVICES_ID','$uID', '".$_SESSION['u_id']."' ,'$data_start','$data_end','$Hstatus','$fHANGUP_RATIO'
         )" ;
@@ -5585,7 +5601,7 @@ echo "  ***** $sqll ***** ";
 				$srv->set_old_srv($this->get_old_srv_by_id($old_deal_id, $old_srv_id));
 				$srv->set('A_STATUS', 'NORMAL');
 				// TODO: HANGUP_FROM i inne parametry wymagane do uruchomienia usługi
-				
+
 				// _srv_to_off
 				$this->_srv_to_off [$old_srv_id] = true;
 			}
@@ -5991,18 +6007,18 @@ class Column_deals_table extends Column_Base {
 	function __construct() {
 		parent::__construct();
 
-		$this->_data['ID_BILLING_USERS'] = '';// 
-		$this->_data['P_DEALPREFIX'] = '';// 
-		$this->_data['P_DEALNUMBER'] = '';// 
-		$this->_data['P_DEALNUMBER_OLD'] = '';// 
-		$this->_data['P_DEALDATE'] = '';// 
-		$this->_data['P_DEALDATE_TERM'] = '';// 
-		$this->_data['ANEX_NEEDED'] = '';// 
-		$this->_data['ANEX_CONFIRM_DATE'] = '';// 
-		$this->_data['DEALDESC'] = '';// 
-		$this->_data['A_STATUS'] = 'WAITING';// 
-		$this->_data['ID_OFFERS_GROUP'] = '';// 
-		$this->_data['S_ADDRESS_STREET'] = '';// 
+		$this->_data['ID_BILLING_USERS'] = '';//
+		$this->_data['P_DEALPREFIX'] = '';//
+		$this->_data['P_DEALNUMBER'] = '';//
+		$this->_data['P_DEALNUMBER_OLD'] = '';//
+		$this->_data['P_DEALDATE'] = '';//
+		$this->_data['P_DEALDATE_TERM'] = '';//
+		$this->_data['ANEX_NEEDED'] = '';//
+		$this->_data['ANEX_CONFIRM_DATE'] = '';//
+		$this->_data['DEALDESC'] = '';//
+		$this->_data['A_STATUS'] = 'WAITING';//
+		$this->_data['ID_OFFERS_GROUP'] = '';//
+		$this->_data['S_ADDRESS_STREET'] = '';//
 		$this->_data['P_ID'] = 0;
 
 		$this->_group = null;
@@ -6235,7 +6251,7 @@ class Column_deals_table extends Column_Base {
  * 		id_list_sww									(int) ??
  * 		SERV_ID_BILLING_PREFIXES		0
  * TODO: VAT czasem jest 0 i VAT_NAME na ZW
- * 
+ *
  * SES_USERS2_A
  * 		ID_BILLING_USERS					user.ID
  * 		ID_SERVICES								SERVICES.ID
@@ -6261,7 +6277,7 @@ class Column_deals_table extends Column_Base {
  * SES_TV_A
  * SES_USERS2_A
  * SES_VOIP_A
- * 
+ *
  * SES_DOMAINS_A
  * SES_EMAIL_A
  * SES_E_WLAN_A
@@ -6360,7 +6376,7 @@ class Column_deals_table extends Column_Base {
 			$sql_data["`ID_OFFERS_OFF`"] = "'" . implode(",", $this->_old_offers_ids) . "'";
 		}
 		$sql = "insert into `DEALS_TABLE` (" . implode(", ", array_keys($sql_data)) . ") select " . implode(", ", array_values($sql_data)) . " from `DEALS_TABLE`; ";
-//insert into `DEALS_TABLE` (`ID_BILLING_USERS`, `P_DEALDATE`, `P_DEALDATE_TERM`, `A_STATUS`, `ID_OFFERS_GROUP`, `S_ADDRESS_STREET`, `P_DEALNUMBER`) select '5861', '2013-01-28', '2015-01-27', 'WAITING', '2044', 'MWZ24A/22', (ifnull(MAX(DEALS_TABLE.P_DEALNUMBER),1)+1) from `DEALS_TABLE`; 
+//insert into `DEALS_TABLE` (`ID_BILLING_USERS`, `P_DEALDATE`, `P_DEALDATE_TERM`, `A_STATUS`, `ID_OFFERS_GROUP`, `S_ADDRESS_STREET`, `P_DEALNUMBER`) select '5861', '2013-01-28', '2015-01-27', 'WAITING', '2044', 'MWZ24A/22', (ifnull(MAX(DEALS_TABLE.P_DEALNUMBER),1)+1) from `DEALS_TABLE`;
 		if (!$db->query($sql)) {
 			return false;
 		}
@@ -6584,7 +6600,7 @@ class Column_users2_deals extends Column_Base {
 							$out_value = $v_srv->ABONAMENT_VALUE;
 							break;
 						default:
-							
+
 					}
 
 					if (!empty($v_value)) {
@@ -6620,7 +6636,7 @@ class Column_users2_deals extends Column_Base {
 	}
 
 	/**
-	 * Numery ofert do wyłączenia zgodnie z numerem starej umowy 
+	 * Numery ofert do wyłączenia zgodnie z numerem starej umowy
 	 * (P_DEALNUMBER_OLD) oraz wygenerowaną mapą (srv_map)
 	 */
 	function get_old_offers_ids() {
@@ -6730,7 +6746,7 @@ echo'<pre style="max-height:300px;overflow:auto;border:1px solid red;text-align:
 	/**
 	 * Create rows test
 	 * @use $this->_old_deal for aneks
-	 * 
+	 *
 	 * @use $this->_old_srv_map[desl_ID][srv_ID] = offer_ID
 	 */
 	function create_rows_try() {
@@ -6995,7 +7011,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:
 			[P_DEALNUMBER] => 9106
 			[P_DEALDATE] => 2011-10-24
 			[P_DEALDATE_TERM] => 2013-04-23
-			[ID_OFFERS_GROUP] => 
+			[ID_OFFERS_GROUP] =>
 			[services] => Array
 				(
 					[NET] => Array
@@ -7014,14 +7030,14 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:
 									[A_STATUS_DESC] => NORMALNY
 									[P_SERVICE] => NET
 									[out_id] => NET_1
-	* 
+	*
 	$this->_old_fields['ID_BILLING_USERS_OLD'] = 'ID_BILLING_USERS';
 	$this->_old_fields['ID_SERVICES_OLD'] = 'ID_SERVICES';
 	$this->_old_fields['P_OFFER_ID_OLD'] = 'OFFER_ID';
 	$this->_old_fields['P_DEAL_DATE_OLD'] = 'P_DEAL_DATE';
 	$this->_old_fields['P_DEALNUMBER_OLD'] = 'P_DEALNUMBER';
 	$this->_old_fields['MONTH_COST_OLD'] = 'MONTH_COST';
-	* 
+	*
 		for(var srv_id in srv_map){
 			out_offer_id=srv_map[srv_id];
 			if (out_offer_id > 0) {
@@ -7820,7 +7836,7 @@ class Column_ses_x_c extends Column_Base {
 
 		/* @from superedit-UPDATEDB.php after POST from superedit-A_PROBLEM.php
 		 * insert into SES_X_C (ID,ID_SERVICES,ID_BILLING_USERS,TYPE,VALUE1,VALUE2)
-		 * 
+		 *
 		 * A_PROBLEM dodaje TYPE 14 i 15:
 		 *    14	PROBLEM_START_STOP	Poczatek i koniec problemu uniemozliwiajacy korzys...
 		 *    15	CZYNNOSCI_SERWISOWE_USLUGI	Data i kwota czynnosci serwisowych, do rozliczenia...
@@ -7899,7 +7915,7 @@ class Column_ses_x_b extends Column_Base {
 
 		/* @from superedit-UPDATEDB.php after POST from superedit-A_PROBLEM.php
 		 * insert into SES_X_C (ID,ID_SERVICES,ID_BILLING_USERS,TYPE,VALUE1,VALUE2)
-		 * 
+		 *
 		 * A_PROBLEM dodaje TYPE 14 i 15:
 		 *    14	PROBLEM_START_STOP	Poczatek i koniec problemu uniemozliwiajacy korzys...
 		 *    15	CZYNNOSCI_SERWISOWE_USLUGI	Data i kwota czynnosci serwisowych, do rozliczenia...
@@ -8718,7 +8734,7 @@ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:
 				$srv->set_old_srv($this->get_old_srv_by_id($old_deal_id, $old_srv_id));
 				$srv->set('A_STATUS', 'NORMAL');
 				// TODO: HANGUP_FROM i inne parametry wymagane do uruchomienia usługi
-				
+
 				// _srv_to_off
 				$this->_srv_to_off [$old_srv_id] = true;
 			}