Deals rozlicz add suma abonament netto/brutto

SE/VERSION

@@ -1 +1 @@
-3.9.10-12
+3.9.10-13

SE/superedit-POKAZ_OFERTY_AKTUALNE_FUNC.php

@@ -6452,6 +6452,8 @@ class Column_users2_offers_groups extends Column_Base {
 	}
 
 	function recount_costs() {
+		$this->suma_NETTO = 0;// suma abonamentu netto (bez instalacji tylko abonament)
+		$this->suma_BRUTTO = 0;// suma abonamentu brutto
 		$this->suma_P_PROMO_INSTALL_PRICE = 0;
 		$this->suma_P_PROMO_MONTH_PRICE = 0;
 		$this->suma_P_CONTRACT_PRICE = 0;
@@ -6464,6 +6466,10 @@ class Column_users2_offers_groups extends Column_Base {
 		$oferty_costs_start = PokazOfertyHelper::get_offers_costs_start_by_offer_ids(array_keys($this->_offers_by_id));
 
 		foreach ($this->_offers_by_id as $v_offer) {
+			$vOfferSumaNetto = (($this->get('P_DEALTERM_MONTHS') - $v_offer->P_DEAL_PROMO_MONTHS) * $v_offer->P_CONTRACT_PRICE_NETTO) + ($v_offer->P_DEAL_PROMO_MONTHS * $v_offer->P_PROMO_MONTH_PRICE_NETTO);
+			$vOfferSumaBrutto = (($this->get('P_DEALTERM_MONTHS') - $v_offer->P_DEAL_PROMO_MONTHS) * $v_offer->P_CONTRACT_PRICE) + ($v_offer->P_DEAL_PROMO_MONTHS * $v_offer->P_PROMO_MONTH_PRICE);
+			$this->suma_NETTO += $vOfferSumaNetto;
+			$this->suma_BRUTTO += $vOfferSumaBrutto;
 			$this->suma_P_PROMO_INSTALL_PRICE += $v_offer->P_INSTALL_QUOTE;
 			$this->suma_P_PROMO_MONTH_PRICE += $v_offer->P_PROMO_MONTH_PRICE;
 			$this->suma_P_CONTRACT_PRICE += $v_offer->P_CONTRACT_PRICE;
@@ -6474,7 +6480,7 @@ class Column_users2_offers_groups extends Column_Base {
 			$this->suma_P_OFFER_SREDNIA += $v_offer->srednia;
 
 			if (!isset($v_offer->srednia_netto)) {
-				$v_offer->srednia_netto = round(( (($this->get('P_DEALTERM_MONTHS') - $v_offer->P_DEAL_PROMO_MONTHS) * $v_offer->P_CONTRACT_PRICE_NETTO) + ($v_offer->P_DEAL_PROMO_MONTHS * $v_offer->P_PROMO_MONTH_PRICE_NETTO) + ($v_offer->P_INSTALL_QUOTE/1.23)) / $this->get('P_DEALTERM_MONTHS'), 2);
+				$v_offer->srednia_netto = round(( $vOfferSumaNetto + ($v_offer->P_INSTALL_QUOTE/1.23)) / $this->get('P_DEALTERM_MONTHS'), 2);
 			}
 			$this->suma_P_OFFER_SREDNIA_NETTO += $v_offer->srednia_netto;
 
@@ -6507,6 +6513,14 @@ class Column_users2_offers_groups extends Column_Base {
 		return $this->suma_P_OFFER_SREDNIA_NETTO;
 	}
 
+	public function get_suma_netto() {
+		return $this->suma_NETTO;
+	}
+
+	public function get_suma_brutto() {
+		return $this->suma_BRUTTO;
+	}
+
 	function has_service($p_service) {
 		foreach ($this->_group_external_offers_id as $k_external_id => $v_p_service) {
 			if ($v_p_service == $p_service) {
@@ -7215,6 +7229,7 @@ function POKAZ_OFERTY_AKTUALNE_FUNC__rozlicz_month($month) {
  .tbl_deals th { font-size:11px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
  .tbl_deals .tbl_deals-col_offers { width:80px; color:#999; }
  .tbl_deals .tbl_deals-col_num { width:40px; }
+ .tbl_deals .tbl_deals-col_big_num { width:50px; }
  .tbl_deals .tbl_deals-col_date { width:60px; }
  .tbl_deals .tbl_deals-col_street { width:100px; }
  .tbl_deals .tbl_deals-col_prefix { width:80px; }
@@ -7252,6 +7267,8 @@ function POKAZ_OFERTY_AKTUALNE_FUNC__rozlicz_month($month) {
 	$tblOutCells['RODZAJ_DZIALANIA_HANDLOWEGO'] = (object)array('class'=>'dzialanie');
 	$tblOutCells['DEALDESC'] = 		(object)array('class'=>'opis');
 	$tblOutCells['deal_type'] = 	(object)array('class'=>'deal_type', 'label'=>'Wykryty rodzaj dokumentu');
+	$tblOutCells['abonament_suma_netto'] = (object)array('class'=>'big_num', 'type'=>'number', 'label'=>'Suma abonament netto (bez instalacji)');
+	$tblOutCells['abonament_suma_brutto'] = (object)array('class'=>'big_num', 'type'=>'number', 'label'=>'Suma abonament brutto (bez instalacji)');
 	$tblOutCells['abonament_srednia_netto'] = (object)array('class'=>'num', 'type'=>'number', 'label'=>'Średni miesięczny abonament netto');
 	$tblOutCells['zysk'] = 				(object)array('class'=>'num', 'type'=>'number', 'label'=>'Średni miesięczny zysk netto');
 	$tblOutCells['miesiecy'] = 		(object)array('class'=>'num', 'label'=>'Ilość miesięcy obowiązywania umowy');
@@ -7324,6 +7341,8 @@ function POKAZ_OFERTY_AKTUALNE_FUNC__rozlicz_month($month) {
 					$group->fetch_offers();
 					$v_deal_row->zysk = $group->get_zysk_netto();
 					$v_deal_row->abonament_srednia_netto = $group->get_srednia_netto();
+					$v_deal_row->abonament_suma_netto = $group->get_suma_netto();
+					$v_deal_row->abonament_suma_brutto = $group->get_suma_brutto();
 				}
 			}