Pokaz oferty - oblicz koszty add oferty info

SE/VERSION

@@ -1 +1 @@
-3.9.8
+3.9.8.1

SE/superedit-POKAZ_OFERTY_AKTUALNE_FUNC.php

@@ -1309,7 +1309,8 @@ foreach ($oferty_opcje_all as $k_service => $v_oferty) {
 			echo '</td>';
 			foreach ($oferty_opcje_cols as $k_field => $v_type_label) {
 				if ($k_field == 'koszt') {
-					echo '<td>' . number_format($v_oferta->$k_field, 2, ',', ' ') . '</td>';
+					$koszt = (double)$v_oferta->$k_field;
+					echo '<td>' . number_format($koszt, 2, ',', ' ') . '</td>';
 				} else {
 					echo '<td>' . $v_oferta->$k_field . '</td>';
 				}
@@ -3024,7 +3025,7 @@ class PokazOfertyHelper {
 		";
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
-			$oferty_costs[$r->ID_OFERTY] = $r->P_OFFER_COSTS;
+			$oferty_costs[$r->ID_OFERTY] = (double)$r->P_OFFER_COSTS;
 		}
 		return $oferty_costs;
 	}
@@ -8904,7 +8905,19 @@ function POKAZ_OFERTY_AKTUALNE_FUNC__ajaxUmowaZysk_createJson() {
 
 	ob_start();
 	?>
-<b>Zysk</b> <i>(netto)</i>: <?php echo number_format($jsonData->zysk, 2, ',', ''); ?>
+
+<b>Oferty</b> <i>(w promocji/po promocji)</i>
+<?php foreach ($group->_offers_by_id as $nrOferty => $oferta) : ?>
+	<br>&nbsp;&nbsp; <span title="<?php echo $oferta->P_SERVICE_NAME; ?>">
+		<?php echo $oferta->ID; ?> <?php echo $oferta->P_SERVICE; ?>
+		<i>(<?php echo number_format($oferta->P_PROMO_MONTH_PRICE, 2, ',', ''); ?>
+			/
+			<?php echo number_format($oferta->P_CONTRACT_PRICE, 2, ',', ''); ?>)
+		</i>
+	</span>
+<?php endforeach; ?>
+
+<br><b>Zysk</b> <i>(netto)</i>: <?php echo number_format($jsonData->zysk, 2, ',', ''); ?>
 <?php foreach ($procenty as $procent) : ?>
 	<br>&nbsp;&nbsp;&nbsp; <?php echo $procent; ?>%: <?php echo number_format($jsonData->zysk * $procent / 100, 2, ',', ''); ?>
 <?php endforeach; ?>